mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We don't support Win9x anymore, remove legacy code

Browse Source 
Change-Id: I12afdc1c25bb09d20fd0698831642b953e08bb63
This commit is contained in:
Jesús Corrius
2013-09-02 16:30:41 +02:00
parent b23999755a
commit a03b1876c7
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setup_native/source/win32/customactions/regactivex/regactivex.cxx
View File

@@ -71,12 +71,6 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
//---------------------------------------------------------- //----------------------------------------------------------
void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit ) void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
{ {
// For Win98/WinME the values should be written to the local machine
OSVERSIONINFO aVerInfo;
aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
if ( GetVersionEx( &aVerInfo ) && aVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT )
InstallForAllUser = TRUE;
HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ); HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) ) if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) )
{ {
@@ -104,12 +98,6 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
//---------------------------------------------------------- //----------------------------------------------------------
void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit ) void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
{ {
// For Win98/WinME the values should be written to the local machine
OSVERSIONINFO aVerInfo;
aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
if ( GetVersionEx( &aVerInfo ) && aVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT )
InstallForAllUser = TRUE;
HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ); HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) ) if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) )
{ {