Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
2d60d914
Commit
2d60d914
authored
Nov 07, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
advpack: Pass all the specified parameters to do_ocx_reg.
parent
30a7d0a5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
advpack.c
dlls/advpack/advpack.c
+2
-2
advpack_private.h
dlls/advpack/advpack_private.h
+1
-1
install.c
dlls/advpack/install.c
+1
-1
No files found.
dlls/advpack/advpack.c
View file @
2d60d914
...
...
@@ -452,7 +452,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF,
}
/* registers the OCX if do_reg is TRUE, unregisters it otherwise */
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
)
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
,
const
WCHAR
*
flags
,
const
WCHAR
*
param
)
{
DLLREGISTER
reg_func
;
...
...
@@ -519,7 +519,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
if
(
!
hm
)
goto
done
;
hr
=
do_ocx_reg
(
hm
,
TRUE
);
hr
=
do_ocx_reg
(
hm
,
TRUE
,
str_flags
,
param
);
done:
FreeLibrary
(
hm
);
...
...
dlls/advpack/advpack_private.h
View file @
2d60d914
...
...
@@ -21,7 +21,7 @@
#ifndef __ADVPACK_PRIVATE_H
#define __ADVPACK_PRIVATE_H
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
)
DECLSPEC_HIDDEN
;
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
,
const
WCHAR
*
flags
,
const
WCHAR
*
param
)
DECLSPEC_HIDDEN
;
LPWSTR
get_parameter
(
LPWSTR
*
params
,
WCHAR
separator
)
DECLSPEC_HIDDEN
;
void
set_ldids
(
HINF
hInf
,
LPCWSTR
pszInstallSection
,
LPCWSTR
pszWorkingDir
)
DECLSPEC_HIDDEN
;
...
...
dlls/advpack/install.c
View file @
2d60d914
...
...
@@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg)
hm
=
LoadLibraryExW
(
buffer
,
NULL
,
LOAD_WITH_ALTERED_SEARCH_PATH
);
if
(
hm
)
{
if
(
do_ocx_reg
(
hm
,
TRUE
)
!=
S_OK
)
if
(
do_ocx_reg
(
hm
,
TRUE
,
NULL
,
NULL
)
!=
S_OK
)
hr
=
E_FAIL
;
FreeLibrary
(
hm
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment