diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-09-16 19:54:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@hemulen.(none)> | 2010-09-16 20:13:26 +0300 |
| commit | 4042d9e0e354e4512ac2858ae1c900aa1b482816 (patch) | |
| tree | d8a0530d3102710c5d05e8a169505ac2df3ae61d /desktop/win32/source/setup/setup.cpp | |
| parent | 91291b26d7d00bc16dba678ded366b5a7206b3d3 (diff) | |
Drop requirements needed only for Win9x support
Don't require and distribute unicows.dll and instmsia.exe (Windows
Installer 2.0 installer for Win9x). Drop the Win9x-specific code in
setup.exe. Do still require and distribute gdiplus.dll for Win2k
support (bnc#522833).
Diffstat (limited to 'desktop/win32/source/setup/setup.cpp')
| -rwxr-xr-x | desktop/win32/source/setup/setup.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp index 7bfd544b2494..e37ebb311144 100755 --- a/desktop/win32/source/setup/setup.cpp +++ b/desktop/win32/source/setup/setup.cpp @@ -1321,9 +1321,7 @@ boolean SetupAppX::AlreadyRunning() const const TCHAR sGUniqueName[] = TEXT( "Global\\_MSISETUP_{EA8130C1-8D3D-4338-9309-1A52D530D846}" ); const TCHAR sUniqueName[] = TEXT( "_MSISETUP_{EA8130C1-8D3D-4338-9309-1A52D530D846}" ); - if ( IsWin9x() ) - sMutexName = sUniqueName; - else if ( ( GetOSVersion() < 5 ) && ! IsTerminalServerInstalled() ) + if ( ( GetOSVersion() < 5 ) && ! IsTerminalServerInstalled() ) sMutexName = sUniqueName; else sMutexName = sGUniqueName; @@ -1394,8 +1392,7 @@ void SetupAppX::Log( LPCTSTR pMessage, LPCTSTR pText ) const if ( !bInit ) { bInit = true; - if ( ! IsWin9x() ) - _ftprintf( m_pLogFile, TEXT("%c"), 0xfeff ); + _ftprintf( m_pLogFile, TEXT("%c"), 0xfeff ); _tsetlocale( LC_ALL, TEXT("") ); _ftprintf( m_pLogFile, TEXT("\nCodepage=%s\nMultiByte Codepage=[%d]\n"), @@ -1653,9 +1650,6 @@ boolean SetupAppX::GetCmdLineParameters( LPTSTR *pCmdLine ) //-------------------------------------------------------------------------- boolean SetupAppX::IsAdmin() { - if ( IsWin9x() ) - return true; - PSID aPsidAdmin; SID_IDENTIFIER_AUTHORITY aAuthority = SECURITY_NT_AUTHORITY; |