Alexandre Julliard : advpack: Pass all the specified parameters to do_ocx_reg.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2d60d9146097c4f8daad27c11891c6a71c439193
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d60d9146097c4f8daad27c118...

Author: Alexandre Julliard 
Date:   Mon Nov  7 11:45:18 2011 +0100

advpack: Pass all the specified parameters to do_ocx_reg.

---

dlls/advpack/advpack.c         |    4 ++--
 dlls/advpack/advpack_private.h |    2 +-
 dlls/advpack/install.c         |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index 112d38a..919c0bc 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -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);
diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h
index 23babf6..cbbbf48 100644
--- a/dlls/advpack/advpack_private.h
+++ b/dlls/advpack/advpack_private.h
@@ -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;

diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c
index 129ea82..6079625 100644
--- a/dlls/advpack/install.c
+++ b/dlls/advpack/install.c
@@ -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);