diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:31:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:31:36 +0000 |
| commit | a33a92251248cbe4a819a91e94747477003b491b (patch) | |
| tree | 9bb8cebe0528e7dd7054a5e9b12d7f963fa6722f /desktop/win32 | |
| parent | c7f61dbd3bad5898a6d5cf47dbe68eeb933a8e43 (diff) | |
INTEGRATION: CWS nativefixer4 (1.6.20); FILE MERGED
2005/02/15 08:57:11 dv 1.6.20.1: #119703# Added new option '-ignore_running'
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/setup/setup.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp index db688e3437..3c7013ad40 100644 --- a/desktop/win32/source/setup/setup.cpp +++ b/desktop/win32/source/setup/setup.cpp @@ -2,9 +2,9 @@ * * $RCSfile: setup.cpp,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2005-02-16 16:53:01 $ + * last change: $Author: vg $ $Date: 2005-02-24 16:31:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,6 +93,8 @@ #define PARAM_TRANSFORM TEXT( " TRANSFORMS=" ) #define PARAM_REBOOT TEXT( " REBOOT=Force" ) +#define PARAM_RUNNING TEXT( "ignore_running" ) + #define MSI_DLL TEXT( "msi.dll" ) #define ADVAPI32_DLL TEXT( "advapi32.dll" ) #define PROFILE_NAME TEXT( "setup.ini" ) @@ -138,6 +140,7 @@ SetupAppX::SetupAppX() m_bQuiet = false; m_bAdministrative = false; + m_bIgnoreAlreadyRunning = false; } //-------------------------------------------------------------------------- @@ -1175,8 +1178,13 @@ boolean SetupAppX::IsTerminalServerInstalled() const //-------------------------------------------------------------------------- boolean SetupAppX::AlreadyRunning() const - { + if ( m_bIgnoreAlreadyRunning ) + { + Log( TEXT("Ignoring already running MSI instance!\r\n") ); + return false; + } + const TCHAR *sMutexName = NULL; const TCHAR sGUniqueName[] = TEXT( "Global\\_MSISETUP_{EA8130C1-8D3D-4338-9309-1A52D530D846}" ); const TCHAR sUniqueName[] = TEXT( "_MSISETUP_{EA8130C1-8D3D-4338-9309-1A52D530D846}" ); @@ -1432,6 +1440,10 @@ boolean SetupAppX::GetCmdLineParameters( LPTSTR *pCmdLine ) break; } } + else if ( _tcsnicmp( pSub, PARAM_RUNNING, _tcslen( PARAM_RUNNING ) ) == 0 ) + { + m_bIgnoreAlreadyRunning = true; + } else if ( (*pSub) == 'i' || (*pSub) == 'I' || (*pSub) == 'f' || (*pSub) == 'F' || (*pSub) == 'p' || (*pSub) == 'P' || (*pSub) == 'x' || (*pSub) == 'X' || (*pSub) == 'y' || (*pSub) == 'Y' || (*pSub) == 'z' || (*pSub) == 'Z' ) |