[ADVPACK]

* Sync to Wine 1.3.37.

svn path=/trunk/; revision=55097

diff --git a/reactos/dll/win32/advpack/advpack.c b/reactos/dll/win32/advpack/advpack.c
index 112d38a..919c0bc 100644 (file)
--- a/reactos/dll/win32/advpack/advpack.c
+++ b/reactos/dll/win32/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/reactos/dll/win32/advpack/advpack_private.h b/reactos/dll/win32/advpack/advpack_private.h
index 3f81bba..cbbbf48 100644 (file)
--- a/reactos/dll/win32/advpack/advpack_private.h
+++ b/reactos/dll/win32/advpack/advpack_private.h
@@ -21,10 +21,10 @@
 #ifndef __ADVPACK_PRIVATE_H
 #define __ADVPACK_PRIVATE_H
 
-HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg);
-LPWSTR get_parameter(LPWSTR *params, WCHAR separator);
-void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir);
+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;
 
-HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE);
+HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN;
 
 #endif /* __ADVPACK_PRIVATE_H */

diff --git a/reactos/dll/win32/advpack/install.c b/reactos/dll/win32/advpack/install.c
index 129ea82..6079625 100644 (file)
--- a/reactos/dll/win32/advpack/install.c
+++ b/reactos/dll/win32/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);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 63dac4c..97d84fe 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -40,7 +40,7 @@ reactos/dll/directx/dxdiagn       # Synced to Wine-0_9_5
 reactos/dll/directx/msdmo         # Autosync
 reactos/dll/directx/qedit         # Autosync
 reactos/dll/directx/quartz        # Autosync
-reactos/dll/win32/advpack         # Autosync
+reactos/dll/win32/advpack         # Synced to Wine-1.3.37
 reactos/dll/win32/atl             # Autosync
 reactos/dll/win32/avifil32        # Autosync
 reactos/dll/win32/bcrypt          # Autosync