Changeset 33087 in vbox for trunk/src

Timestamp:

Oct 13, 2010 7:29:41 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66616

Message:

Windows Guest Additions installer: Added switch for not shutting down VBoxService when installing, ignore unknown command line parameters in silent mode.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (4 diffs)
• VBoxGuestAdditionsNT4.nsh (modified) (1 diff)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -159 +159 @@
 RequestExecutionLevel highest
 
-Var g_iSystemMode       ; Current system mode (0 = Normal boot, 1 = Fail-safe boot, 2 = Fail-safe with network boot)
-Var g_strSystemDir      ; Windows system directory
-Var g_strCurUser        ; Current user using the system
-Var g_strAddVerMaj      ; Installed Guest Additions: Major version
-Var g_strAddVerMin      ; Installed Guest Additions: Minor version
-Var g_strAddVerBuild    ; Installed Guest Additions: Build number
-Var g_strAddVerRev      ; Installed Guest Additions: SVN revision
-Var g_strWinVersion     ; Current Windows version we're running on
-Var g_bLogEnable        ; Do logging when installing? "true" or "false"
-Var g_bFakeWHQL         ; Cmd line: Fake Windows to install non WHQL certificated drivers (only for W2K and XP currently!!) ("/unsig_drv")
-Var g_bForceInstall     ; Cmd line: Force installation on unknown Windows OS version.
-Var g_bUninstall        ; Cmd line: Just uninstall any previous Guest Additions and exit
-Var g_bRebootOnExit     ; Cmd line: Auto-Reboot on successful installation. Good for unattended installations ("/reboot")
-Var g_iScreenBpp        ; Cmd line: Screen depth ("/depth=X")
-Var g_iScreenX          ; Cmd line: Screen resolution X ("/resx=X")
-Var g_iScreenY          ; Cmd line: Screen resolution Y ("/resy=Y")
-Var g_iSfOrder          ; Cmd line: Order of Shared Folders network provider (0=first, 1=second, ...)
-Var g_bNoVideoDrv       ; Cmd line: Do not install the VBoxVideo driver
-Var g_bNoGuestDrv       ; Cmd line: Do not install the VBoxGuest driver
-Var g_bNoMouseDrv       ; Cmd line: Do not install the VBoxMouse driver
-Var g_bWithAutoLogon    ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
-Var g_bWithD3D          ; Cmd line: Install Direct3D support
-Var g_bWithWDDM         ; Install the WDDM driver instead of the normal one
-Var g_bOnlyExtract      ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
-Var g_bCapWDDM          ; Capability: Is the guest able to handle/use our WDDM driver?
+Var g_iSystemMode           ; Current system mode (0 = Normal boot, 1 = Fail-safe boot, 2 = Fail-safe with network boot)
+Var g_strSystemDir          ; Windows system directory
+Var g_strCurUser            ; Current user using the system
+Var g_strAddVerMaj          ; Installed Guest Additions: Major version
+Var g_strAddVerMin          ; Installed Guest Additions: Minor version
+Var g_strAddVerBuild        ; Installed Guest Additions: Build number
+Var g_strAddVerRev          ; Installed Guest Additions: SVN revision
+Var g_strWinVersion         ; Current Windows version we're running on
+Var g_bLogEnable            ; Do logging when installing? "true" or "false"
+Var g_bFakeWHQL             ; Cmd line: Fake Windows to install non WHQL certificated drivers (only for W2K and XP currently!!) ("/unsig_drv")
+Var g_bForceInstall         ; Cmd line: Force installation on unknown Windows OS version.
+Var g_bUninstall            ; Cmd line: Just uninstall any previous Guest Additions and exit
+Var g_bRebootOnExit         ; Cmd line: Auto-Reboot on successful installation. Good for unattended installations ("/reboot")
+Var g_iScreenBpp            ; Cmd line: Screen depth ("/depth=X")
+Var g_iScreenX              ; Cmd line: Screen resolution X ("/resx=X")
+Var g_iScreenY              ; Cmd line: Screen resolution Y ("/resy=Y")
+Var g_iSfOrder              ; Cmd line: Order of Shared Folders network provider (0=first, 1=second, ...)
+Var g_bNoVBoxServiceExit    ; Cmd line: Do not quit VBoxService before updating - install on next reboot
+Var g_bNoVideoDrv           ; Cmd line: Do not install the VBoxVideo driver
+Var g_bNoGuestDrv           ; Cmd line: Do not install the VBoxGuest driver
+Var g_bNoMouseDrv           ; Cmd line: Do not install the VBoxMouse driver
+Var g_bWithAutoLogon        ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
+Var g_bWithD3D              ; Cmd line: Install Direct3D support
+Var g_bWithWDDM             ; Install the WDDM driver instead of the normal one
+Var g_bOnlyExtract          ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
+Var g_bCapWDDM              ; Capability: Is the guest able to handle/use our WDDM driver?
 
 ; Platform parts of this installer
@@ -260 +261 @@
       ${Case} '/logging'
         StrCpy $g_bLogEnable "true"
-      ${Break}
+        ${Break}
 
       ${Case} '/ncrc' ; NSIS: /NCRC switch, skip
         ${Break}
 
-      ${Case} '/no_videodrv'
+      ${Case} '/no_vboxservice_exit' ; Not officially documented
+        StrCpy $g_bNoVBoxServiceExit "true"
+        ${Break}
+
+      ${Case} '/no_videodrv' ; Not officially documented
         StrCpy $g_bNoVideoDrv "true"
-      ${Break}
-
-      ${Case} '/no_guestdrv'
+        ${Break}
+
+      ${Case} '/no_guestdrv' ; Not officially documented
         StrCpy $g_bNoGuestDrv "true"
-      ${Break}
-
-      ${Case} '/no_mousedrv'
+        ${Break}
+
+      ${Case} '/no_mousedrv' ; Not officially documented
         StrCpy $g_bNoMouseDrv "true"
-      ${Break}
+        ${Break}
 
       ${Case} '/reboot'
@@ -321 +326 @@
 
       ${Default} ; Unknown parameter, print usage message
+        ; Prevent popping up usage message on (yet) unknown parameters
+        ; in silent mode, just skip
+        IfSilent 0 +2
+          ${Break}
         goto usage
         ${Break}
@@ -970 +979 @@
   StrCpy $g_iScreenBpp "0"
   StrCpy $g_iSfOrder "0"
+  StrCpy $g_bNoVBoxServiceExit "false"
   StrCpy $g_bNoVideoDrv "false"
   StrCpy $g_bNoGuestDrv "false"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsNT4.nsh

@@ -74 +74 @@
 Function NT_Prepare
 
-  ; Stop / kill VBoxService
-  Call StopVBoxService
+  ${If} $g_bNoVBoxServiceExit == "false"
+    ; Stop / kill VBoxService
+    Call StopVBoxService
+  ${EndIf}
 
   ; Stop / kill VBoxTray

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -133 +133 @@
 Function W2K_Prepare
 
-  ; Stop / kill VBoxService
-  Call StopVBoxService
+  ${If} $g_bNoVBoxServiceExit == "false"
+    ; Stop / kill VBoxService
+    Call StopVBoxService
+  ${EndIf}
 
   ; Stop / kill VBoxTray