Changeset 44459 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 30, 2013 11:23:57 AM (12 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Invoke external calls via own function to also log stdout/stderr output into installer log files.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (2 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
• VBoxGuestAdditionsExternal.nsh (added)
• VBoxGuestAdditionsNT4.nsh (modified) (6 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (17 diffs)

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

@@ -241 +241 @@
 ; Platform parts of this installer
 !include "VBoxGuestAdditionsLog.nsh"
+!include "VBoxGuestAdditionsExternal.nsh"
 !include "VBoxGuestAdditionsCommon.nsh"
 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit only
@@ -757 +758 @@
 
   ${If} ${FileExists} "$g_strSystemDir\takeown.exe"
-    nsExec::ExecToLog '"$g_strSystemDir\takeown.exe" /F "$0"'
-    Pop $1 ; Ret value
-    ${LogVerbose} "WRP: Taking ownership for $0 returned: $1"
+    ${CmdExecute} "$\"$g_strSystemDir\takeown.exe$\" /F $\"$0$\"" "true"
   ${Else}
     ${LogVerbose} "WRP: Warning: takeown.exe not found, skipping"

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

@@ -483 +483 @@
 Function ${un}AbortShutdown
 
-  Push $0
-
-  ; Try to abort the shutdown
-  nsExec::ExecToLog '"$g_strSystemDir\shutdown.exe" -a' $0
-
-  Pop $0
+  ${If} ${FileExists} "$g_strSystemDir\shutdown.exe"
+    ; Try to abort the shutdown
+    ${CmdExecute} "$\"$g_strSystemDir\shutdown.exe$\" -a" "true"
+  ${Else}
+    ${LogVerbose} "Shutting down not supported: Binary $\"$g_strSystemDir\shutdown.exe$\" not found"
+  ${EndIf}
 
 FunctionEnd

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

@@ -140 +140 @@
 
   ; Install guest driver
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service create "VBoxGuest" "VBoxGuest Support Driver" 1 1 "$SYSDIR\drivers\VBoxGuestNT.sys" "Base"'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxGuest$\" $\"VBoxGuest Support Driver$\" 1 1 $\"$SYSDIR\drivers\VBoxGuestNT.sys$\" $\"Base$\"" "false"
 
   ; Bugfix: Set "Start" to 1, otherwise, VBoxGuest won't start on boot-up!
@@ -151 +151 @@
 
   ; Video driver
-  nsExec::ExecToLog '"$INSTDIR\VBoxGuestDrvInst.exe" /i'
-  Pop $0                      ; Ret value
-  IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
+  ${CmdExecute} "$\"$INSTDIR\VBoxGuestDrvInst.exe$\" /i" "false"
 
   ${LogVerbose} "Installing VirtualBox service ..."
@@ -159 +157 @@
   ; Create the VBoxService service
   ; No need to stop/remove the service here! Do this only on uninstallation!
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service create "VBoxService" "VirtualBox Guest Additions Service" 16 2 "system32\VBoxServiceNT.exe" "Base"'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"system32\VBoxServiceNT.exe$\" $\"Base$\"" "false"
 
    ; Create the Shared Folders service ...
@@ -177 +175 @@
 
   ; Add the shared folders network provider
-  ;nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider add VBoxSF'
-  ;Pop $0                      ; Ret value
-  ;IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
+  ;${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add VBoxSF" "false"
 
   Goto done
@@ -227 +223 @@
 
   ; Remove the guest driver service
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxGuest'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxGuest" "true"
   Delete /REBOOTOK "$SYSDIR\drivers\VBoxGuestNT.sys"
 
   ; Delete the VBoxService service
   Call ${un}StopVBoxService
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxService'
-  Pop $0    ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxService" "true"
   DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxService"
   Delete /REBOOTOK "$SYSDIR\VBoxServiceNT.exe"
@@ -248 +243 @@
 
   ; Delete the VBoxVideo service
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxVideo'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideo" "true"
 
   ; Delete the VBox video driver files

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

@@ -129 +129 @@
 
   ; Write the new value in the adapter config (VBoxVideo.sys) using hex values in binary format
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" registry write HKLM $reg_path_device CustomXRes REG_BIN $g_iScreenX DWORD'
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" registry write HKLM $reg_path_device CustomYRes REG_BIN $g_iScreenY DWORD'
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" registry write HKLM $reg_path_device CustomBPP REG_BIN $g_iScreenBpp DWORD'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry write HKLM $reg_path_device CustomXRes REG_BIN $g_iScreenX DWORD" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry write HKLM $reg_path_device CustomYRes REG_BIN $g_iScreenY DWORD" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry write HKLM $reg_path_device CustomBPP REG_BIN $g_iScreenBpp DWORD" "false"
 
   ; ... and tell Windows to use that mode on next start!
@@ -338 +338 @@
 
   ${LogVerbose} "Turning off WHQL protection..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxWHQLFake.exe" "ignore"'
+  ${CmdExecute} "$\"$INSTDIR\VBoxWHQLFake.exe$\" $\"ignore$\"" "true"
 
 exit:
@@ -352 +352 @@
 
   ${LogVerbose} "Turning back on WHQL protection..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxWHQLFake.exe" "warn"'
+  ${CmdExecute} "$\"$INSTDIR\VBoxWHQLFake.exe$\" $\"warn$\"" "true"
 
 exit:
@@ -384 +384 @@
   ${If} $g_bNoGuestDrv == "false"
     ${LogVerbose} "Installing guest driver ..."
-    nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxGuest.inf" "$INSTDIR\install_drivers.log"'
-    Pop $0 ; Ret value
-    ${LogVerbose} "Guest driver returned: $0"
-    IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
+    ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxGuest.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
   ${Else}
     ${LogVerbose} "Guest driver installation skipped!"
@@ -397 +394 @@
       ${If} $g_strWinVersion == "8"
         ${LogVerbose} "Installing WDDM video driver for Windows 8..."
-        nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoW8.inf" "$INSTDIR\install_drivers.log"'
+        ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoW8.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
       ${Else}
   !endif
         ${LogVerbose} "Installing WDDM video driver for Windows Vista and 7..."
-        nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf" "$INSTDIR\install_drivers.log"'
+        ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
   !if $%VBOX_WITH_WDDM_W8% == "1"
       ${EndIf}
@@ -407 +404 @@
     ${Else}
       ${LogVerbose} "Installing video driver ..."
-      nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideo.inf" "$INSTDIR\install_drivers.log"'
+      ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideo.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
     ${EndIf}
-    Pop $0 ; Ret value
-    ${LogVerbose} "Video driver returned: $0"
-    IntCmp $0 0 +1 error error ; Check ret value (0=OK, 1=Error)
   ${Else}
     ${LogVerbose} "Video driver installation skipped!"
@@ -421 +415 @@
     ; so this .INF file needs to be installed using "InstallHinfSection" which is implemented
     ; with VBoxDrvInst's "driver executeinf" routine
-    nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver executeinf "$INSTDIR\VBoxMouse.inf"'
-    Pop $0  ; Ret value
-    ${LogVerbose} "Mouse driver returned: $0"
-    IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
+    ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver executeinf $\"$INSTDIR\VBoxMouse.inf$\"" "false"
   ${Else}
     ${LogVerbose} "Mouse driver installation skipped!"
@@ -432 +423 @@
   ; No need to stop/remove the service here! Do this only on uninstallation!
   ${LogVerbose} "Installing VirtualBox service ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service create "VBoxService" "VirtualBox Guest Additions Service" 16 2 "system32\VBoxService.exe" "Base"'
-  Pop $0 ; Ret value
-  ${LogVerbose} "VBoxService returned: $0"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"system32\VBoxService.exe$\" $\"Base$\"" "false"
 
   ; Set service description
@@ -445 +434 @@
   ; Create the Shared Folders service ...
   ; No need to stop/remove the service here! Do this only on uninstallation!
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service create "VBoxSF" "VirtualBox Shared Folders" 2 1 "system32\drivers\VBoxSF.sys" "NetworkProvider"'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxSF$\" $\"VirtualBox Shared Folders$\" 2 1 $\"system32\drivers\VBoxSF.sys$\" $\"NetworkProvider$\"" "false"
 
   ; ... and the link to the network provider
@@ -453 +442 @@
 
   ; Add default network providers (if not present or corrupted)
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider add WebClient'
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider add LanmanWorkstation'
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider add RDPNP'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add WebClient" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add LanmanWorkstation" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add RDPNP" "false"
 
   ; Add the shared folders network provider
   ${LogVerbose} "Adding network provider (Order = $g_iSfOrder) ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider add VBoxSF $g_iSfOrder'
-  Pop $0 ; Ret value
-  IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add VBoxSF $g_iSfOrder" "false"
 
 !if $%VBOX_WITH_CROGL% == "1"
@@ -492 +479 @@
   Goto done
 
-error:
-
-  Abort "ERROR: Could not install files for Windows 2000 / XP / Vista! Installation aborted."
-
 done:
 
@@ -607 +590 @@
   ; Remove VirtualBox video driver
   ${LogVerbose} "Uninstalling video driver ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideo.inf'
-  Pop $0 ; Ret value
-  ; @todo Add error handling here!
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxVideo'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideo.inf$\"" "true"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideo" "true"
   Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
   Delete /REBOOTOK "$g_strSystemDir\VBoxDisp.dll"
@@ -619 +600 @@
   !if $%VBOX_WITH_WDDM_W8% == "1"
   ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoW8.inf"'
-  Pop $0 ; Ret value
-  ; Always try to remove both VBoxVideoW8 & VBoxVideoWddm services no matter what is installed currently
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxVideoW8'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\"" "true"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideoW8" "true"
   ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
   ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
@@ -630 +608 @@
 
   ${LogVerbose} "Uninstalling WDDM video driver for Windows Vista and 7..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoWddm.inf"'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoWddm.inf$\"" "true"
   ; Always try to remove both VBoxVideoWddm & VBoxVideo services no matter what is installed currently
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxVideoWddm'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideoWddm" "true"
   ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
   ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
@@ -732 +708 @@
   ; Remove mouse driver
   ${LogVerbose} "Removing mouse driver ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxMouse'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxMouse" "true"
   Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxMouse.sys"
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" registry delmultisz "SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}" "UpperFilters" "VBoxMouse"'
-  Pop $0 ; Ret value
-  ; @todo Add error handling here!
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry delmultisz $\"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}$\" $\"UpperFilters$\" $\"VBoxMouse$\"" "true"
 
   ; Delete the VBoxService service
   Call ${un}StopVBoxService
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxService'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxService" "true"
   DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxService"
   Delete /REBOOTOK "$g_strSystemDir\VBoxService.exe"
@@ -761 +733 @@
   ; Remove guest driver
   ${LogVerbose} "Removing guest driver ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxGuest.inf"'
-  Pop $0 ; Ret value
-  ; @todo Add error handling here!
-
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxGuest'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxGuest.inf$\"" "true"
+
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxGuest" "true"
   Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxGuest.sys"
   Delete /REBOOTOK "$g_strSystemDir\VBCoInst.dll" ; Deprecated, does not get installed anymore
@@ -776 +745 @@
   ; Remove shared folders driver
   ${LogVerbose} "Removing shared folders driver ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider remove VBoxSF'
-  Pop $0 ; Ret value
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxSF'
-  Pop $0 ; Ret value
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider remove VBoxSF" "true"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxSF" "true"
   Delete /REBOOTOK "$g_strSystemDir\VBoxMRXNP.dll" ; The network provider DLL will be locked
   !if $%BUILD_TARGET_ARCH% == "amd64"