diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 21:30:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 21:30:00 +0000 |
| commit | 7b9a362ffdbbe9ebfab83676a1deb6809b5cf95f (patch) | |
| tree | 6a234b52e9d8d93db21d63d2d0db6c002e78f4ec /desktop/win32 | |
| parent | db6b03972226955f71815de5f270cb01dce94beb (diff) | |
INTEGRATION: CWS sysint1 (1.2.118); FILE MERGED
2004/11/12 07:11:22 dv 1.2.118.1: #i36911# Force reboot after installing msi on Win98
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/setup/setup_main.cxx | 6 | ||||
| -rw-r--r-- | desktop/win32/source/setup/setup_main.hxx | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx index e63632ce5f2d..7853896bc74a 100644 --- a/desktop/win32/source/setup/setup_main.cxx +++ b/desktop/win32/source/setup/setup_main.cxx @@ -2,9 +2,9 @@ * * $RCSfile: setup_main.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: svesik $ $Date: 2004-04-20 12:40:58 $ + * last change: $Author: hr $ $Date: 2004-11-26 22:29:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,9 @@ SetupApp::SetupApp() GetVersionEx( &sInfoOS ); m_nOSVersion = sInfoOS.dwMajorVersion; + m_nMinorVersion = sInfoOS.dwMinorVersion; m_bIsWin9x = ( VER_PLATFORM_WIN32_NT != sInfoOS.dwPlatformId ); + m_bNeedReboot = false; } //-------------------------------------------------------------------------- diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx index b8eec6d13312..a4ac2096b4fc 100644 --- a/desktop/win32/source/setup/setup_main.hxx +++ b/desktop/win32/source/setup/setup_main.hxx @@ -2,9 +2,9 @@ * * $RCSfile: setup_main.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: svesik $ $Date: 2004-04-20 12:41:13 $ + * last change: $Author: hr $ $Date: 2004-11-26 22:30:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,9 @@ class SetupApp { UINT m_uiRet; DWORD m_nOSVersion; - boolean m_bIsWin9x; + DWORD m_nMinorVersion; + boolean m_bIsWin9x : 1; + boolean m_bNeedReboot : 1; public: SetupApp(); @@ -86,6 +88,10 @@ public: 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; } + + void SetRebootNeeded( boolean bNeedReboot ) { m_bNeedReboot = bNeedReboot; } + boolean NeedReboot() const { return m_bNeedReboot; } }; SetupApp* Create_SetupAppA(); |