system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

advpack: Pass all the specified parameters to do_ocx_reg.

Browse source
This commit is contained in:
Alexandre Julliard 2011-11-07 11:45:18 +01:00
parent 30a7d0a5a7
commit 2d60d91460
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/advpack/advpack.c
View file

@ -452,7 +452,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF,
} }
/* registers the OCX if do_reg is TRUE, unregisters it otherwise */ /* 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; DLLREGISTER reg_func;
@ -519,7 +519,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
if (!hm) if (!hm)
goto done; goto done;
hr = do_ocx_reg(hm, TRUE); hr = do_ocx_reg(hm, TRUE, str_flags, param);
done: done:
FreeLibrary(hm); FreeLibrary(hm);

2
dlls/advpack/advpack_private.h
View file

@ -21,7 +21,7 @@
#ifndef __ADVPACK_PRIVATE_H #ifndef __ADVPACK_PRIVATE_H
#define __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; LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN;
void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN;

2
dlls/advpack/install.c
View file

@ -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); hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (hm) if (hm)
{ {
if (do_ocx_reg(hm, TRUE) != S_OK) if (do_ocx_reg(hm, TRUE, NULL, NULL) != S_OK)
hr = E_FAIL; hr = E_FAIL;
FreeLibrary(hm); FreeLibrary(hm);