summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2010-09-16 19:54:46 +0300
committerTor Lillqvist <tml@hemulen.(none)>2010-09-16 20:13:26 +0300
commit0e970254da8039cb174f832b957e2d78a26e4ee6 (patch)
tree9ea720848079757b19c62c5d4fbb37cb37577ec3 /desktop/win32
parent39ce8a9906652dd9d2ef4ec1cc14bcb6d11cadd3 (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')
-rw-r--r--desktop/win32/source/setup/makefile.mk1
-rwxr-xr-xdesktop/win32/source/setup/setup.cpp10
-rw-r--r--desktop/win32/source/setup/setup_main.cxx8
-rw-r--r--desktop/win32/source/setup/setup_main.hxx3
4 files changed, 3 insertions, 19 deletions
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index d910572403..15b7b1937e 100644
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
@@ -58,7 +58,6 @@ ULFDIR:=.
.ENDIF # "$(WITH_LANG)"!=""
OBJFILES= $(OBJ)$/setup_main.obj \
- $(OBJ)$/setup_a.obj \
$(OBJ)$/setup_w.obj
# --- Targets ------------------------------------------------------
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 9cd13ef841..61d5238057 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;
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index af6b42bd18..3cf7d54145 100644
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.cxx
@@ -63,7 +63,6 @@ SetupApp::SetupApp()
m_nOSVersion = sInfoOS.dwMajorVersion;
m_nMinorVersion = sInfoOS.dwMinorVersion;
- m_bIsWin9x = ( VER_PLATFORM_WIN32_NT != sInfoOS.dwPlatformId );
m_bNeedReboot = false;
m_bAdministrative = false;
}
@@ -88,14 +87,9 @@ extern "C" int __stdcall WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )
GetVersionEx( &sInfoOS );
- boolean bIsWin9x = ( VER_PLATFORM_WIN32_NT != sInfoOS.dwPlatformId );
-
SetupApp *pSetup;
- if ( bIsWin9x )
- pSetup = Create_SetupAppA();
- else
- pSetup = Create_SetupAppW();
+ pSetup = Create_SetupAppW();
try
{
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index 419d658ac0..9f4eb92ee6 100644
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
@@ -33,7 +33,6 @@ class SetupApp
{
DWORD m_nOSVersion;
DWORD m_nMinorVersion;
- boolean m_bIsWin9x : 1;
boolean m_bNeedReboot : 1;
boolean m_bAdministrative : 1;
@@ -57,7 +56,6 @@ public:
virtual void DisplayError( UINT nErr ) const = 0;
void SetError( UINT nErr ) { m_uiRet = nErr; }
- boolean IsWin9x() const { return m_bIsWin9x; }
DWORD GetOSVersion() const { return m_nOSVersion; }
DWORD GetMinorVersion() const { return m_nMinorVersion; }
@@ -68,7 +66,6 @@ public:
boolean NeedReboot() const { return m_bNeedReboot; }
};
-SetupApp* Create_SetupAppA();
SetupApp* Create_SetupAppW();
#endif