Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-14 23:03:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVPACK]

Browse source 
* Sync to Wine 1.3.37.

svn path=/trunk/; revision=55097
This commit is contained in:
Amine Khaldi 2012-01-23 12:26:32 +00:00
parent d15876f775
commit 7b65a2d418
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/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);

8
reactos/dll/win32/advpack/advpack_private.h
View file

@ -21,10 +21,10 @@
#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); HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN;
LPWSTR get_parameter(LPWSTR *params, WCHAR separator); LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN;
void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir); 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 */ #endif /* __ADVPACK_PRIVATE_H */

2
reactos/dll/win32/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);

2
reactos/media/doc/README.WINE
View file

@ -40,7 +40,7 @@ reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5
reactos/dll/directx/msdmo # Autosync reactos/dll/directx/msdmo # Autosync
reactos/dll/directx/qedit # Autosync reactos/dll/directx/qedit # Autosync
reactos/dll/directx/quartz # 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/atl # Autosync
reactos/dll/win32/avifil32 # Autosync reactos/dll/win32/avifil32 # Autosync
reactos/dll/win32/bcrypt # Autosync reactos/dll/win32/bcrypt # Autosync