diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-08 07:11:22 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-08 07:11:22 +0000 |
| commit | 278407d541117a7283874e1d2e937b363e1f189d (patch) | |
| tree | 5cce5468526cb73a69da875c68e59f7d9a78a97f | |
| parent | a47fbfe1653a6df930c03b196c12ec837ef7db9a (diff) | |
INTEGRATION: CWS fwk90 (1.16.38); FILE MERGED
2008/06/06 06:46:03 mav 1.16.38.1: #i87524# provide the path to register activex control
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index ece047913aa3..fb861a24ffc3 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: regactivex.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * This file is part of OpenOffice.org. * @@ -51,7 +51,8 @@ // #define OWN_DEBUG_PRINT -typedef int ( __stdcall * DllNativeProc ) ( int, BOOL ); +typedef int ( __stdcall * DllNativeRegProc ) ( int, BOOL, const char* ); +typedef int ( __stdcall * DllNativeUnregProc ) ( int, BOOL ); BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 ) { @@ -100,9 +101,9 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ); if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) ) { - DllNativeProc pNativeProc = ( DllNativeProc )GetProcAddress( hModule, "DllRegisterServerNative" ); + DllNativeRegProc pNativeProc = ( DllNativeRegProc )GetProcAddress( hModule, "DllRegisterServerNative" ); if( pNativeProc!=NULL ) - ( *pNativeProc )( nMode, InstallForAllUser ); + ( *pNativeProc )( nMode, InstallForAllUser, pActiveXPath ); FreeLibrary( hModule ); } @@ -120,7 +121,7 @@ void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallF HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ); if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) ) { - DllNativeProc pNativeProc = ( DllNativeProc )GetProcAddress( hModule, "DllUnregisterServerNative" ); + DllNativeUnregProc pNativeProc = ( DllNativeUnregProc )GetProcAddress( hModule, "DllUnregisterServerNative" ); if( pNativeProc!=NULL ) ( *pNativeProc )( nMode, InstallForAllUser ); |