Changeset 44484 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 31, 2013 11:36:25 AM (12 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Relative jump bugfixes, simplified OS detection, logging.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (10 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (7 diffs)
• VBoxGuestAdditionsExternal.nsh (modified) (2 diffs)
• VBoxGuestAdditionsLog.nsh (modified) (1 diff)

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

@@ -402 +402 @@
         ; Prevent popping up usage message on (yet) unknown parameters
         ; in silent mode, just skip
-        IfSilent 0 +2
+        IfSilent +1 +2
           ${Break}
         goto usage
@@ -473 +473 @@
 begin:
 
+  ${LogVerbose} "Checking for old Guest Additions ..."
+
 sun_check:
 
@@ -587 +589 @@
   ${EndIf}
 
+  IfSilent +1 +2
+    StrCpy $g_bLogEnable "true" ; Force logging in silent mode
+
+  ${LogEnable} "$g_bLogEnable"
+  IfSilent +1 +2 ; NSIS will expand ${LogVerbose} before doing relative jumps!
+    LogText "Installer runs in silent mode"
+
   SetOutPath "$INSTDIR"
   SetOverwrite on
@@ -598 +607 @@
     ${LogVerbose} "Previous version: $g_strAddVerMaj.$g_strAddVerMin.$g_strAddVerBuild (Rev $g_strAddVerRev)"
   ${Else}
-    ${LogVerbose} "No previous version of ${PRODUCT_NAME} detected."
+    ${LogVerbose} "No previous version of ${PRODUCT_NAME} detected"
   ${EndIf}
 !if $%BUILD_TARGET_ARCH% == "amd64"
@@ -610 +619 @@
   ${LogVerbose} "Installer runs in debug mode"
 !endif
+
+  ; Retrieve capabilities
+  Call CheckForCapabilities
 
   ;
@@ -1049 +1061 @@
 FunctionEnd
 
-; This function is called when a critical error occurred
+; This function is called when a critical error occurred, caused by
+; the Abort command
 Function .onInstFailed
 
+  ${LogVerbose} "$(VBOX_ERROR_INST_FAILED)"
   MessageBox MB_ICONSTOP $(VBOX_ERROR_INST_FAILED) /SD IDOK
 
@@ -1066 +1080 @@
 Function .onInstSuccess
 
+  ${LogVerbose} "${PRODUCT_NAME} successfully installed"
+
   ${If} $g_bPostInstallStatus == "true"
     ${LogToVBoxTray} "0" "${PRODUCT_NAME} successfully updated!"
   ${EndIf}
+
+  SetErrorLevel 0
 
 FunctionEnd
@@ -1139 +1157 @@
   ${EndIf}
 
-  IfSilent 0 +2
-    StrCpy $g_bLogEnable "true" ; Force logging in silent mode
-
-  ${LogEnable} "$g_bLogEnable"
-  IfSilent 0 +2
-    ${LogVerbose} "Installer runs in silent mode"
-
   ; Retrieve Windows version and store result in $g_strWinVersion
-  Call GetWindowsVer
-
-  ; Retrieve capabilities
-  Call CheckForCapabilities
+  Call GetWindowsVersionEx
+  Pop $g_strWinVersion
 
   ; Get user Name
   AccessControl::GetCurrentUserName
   Pop $g_strCurUser
-  ${LogVerbose} "Current user is: $g_strCurUser"
+  ${LogVerbose} "Current user: $g_strCurUser"
 
   ; Only extract files? This action can be called even from non-Admin users
@@ -1174 +1183 @@
     MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_X86) /SD IDOK
 !endif
-    Abort
+    Abort "$(VBOX_NOTICE_ARCH_AMD64)"
   ${EndIf}
 
@@ -1274 +1283 @@
 
   ; Retrieve Windows version we're running on and store it in $g_strWinVersion
-  Call un.GetWindowsVer
+  Call un.GetWindowsVersionEx
+  Pop $g_strWinVersion
 
   ; Retrieve capabilities

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

@@ -137 +137 @@
     !endif ; $%VBOX_WITH_CROGL% == "1"
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
-  
+
   !if $%VBOX_WITH_WDDM_W8% == "1"
   ; WDDM Video driver for Win8
@@ -277 +277 @@
 !insertmacro CheckArchitecture "un."
 
-!macro GetWindowsVer un
-Function ${un}GetWindowsVer
-
-  ; Check if we are running on w2k or above
-  ; For other windows versions (>XP) it may be necessary to change winver.nsh
+;
+; Macro for retrieving the Windows version this installer is running on.
+;
+; @return  Stack: Windows version string. Empty on error /
+;                 if not able to identify.
+;
+!macro GetWindowsVersionEx un
+Function ${un}GetWindowsVersionEx
+
+  Push $0
+  Push $1
+
+  ; Check if we are running on Windows 2000 or above
+  ; For other windows versions (> XP) it may be necessary to change winver.nsh
   Call ${un}GetWindowsVersion
-  Pop $R3     ; Windows Version
-
-  Push $R3    ; The windows version string
-  Push "NT"   ; String to search for. Win 2k family returns no string containing 'NT'
+  Pop $0         ; Windows Version
+
+  Push $0        ; The windows version string
+  Push "NT"      ; String to search for. W2K+ returns no string containing "NT"
   Call ${un}StrStr
-  Pop $R0
-  StrCmp $R0 '' nt5plus       ; Not NT 3.XX or 4.XX
-
-  ; Ok we know it is NT. Must be a string like NT X.XX
-  Push $R3    ; The windows version string
-  Push "4."   ; String to search for
-  Call ${un}StrStr
-  Pop $R0
-  StrCmp $R0 "" nt5plus nt4   ; If empty -> not NT 4
-
-nt5plus:    ; Windows 2000+ (XP, Vista, ...)
-
-  StrCpy $g_strWinVersion $R3
-  goto exit
-
-nt4:        ; NT 4.0
-
-  StrCpy $g_strWinVersion "NT4"
-  goto exit
-
-exit:
-
-FunctionEnd
-!macroend
-!insertmacro GetWindowsVer ""
-!insertmacro GetWindowsVer "un."
+  Pop $1
+
+  ${If} $1 == "" ; If empty -> not NT 3.XX or 4.XX
+    StrCpy $g_strWinVersion $0 ; Use original version string
+  ${Else}
+    ; Ok we know it is NT. Must be a string like NT X.XX
+    Push $0        ; The windows version string
+    Push "4."      ; String to search for
+    Call ${un}StrStr
+    Pop $1
+    ${If} $1 == "" ; If empty -> not NT 4
+      ;; @todo NT <= 3.x ?
+      StrCpy $g_strWinVersion $0 ; Use original version string
+    ${Else}
+      StrCpy $g_strWinVersion "NT4"
+    ${EndIf}
+  ${EndIf}
+
+  Pop $1
+  Exch $0
+
+FunctionEnd
+!macroend
+!insertmacro GetWindowsVersionEx ""
+!insertmacro GetWindowsVersionEx "un."
 
 !macro GetAdditionsVersion un
@@ -415 +423 @@
   ${LogVerbose} "Stopping attempt #$3"
 !endif
-  
+
   ${If} $g_strWinVersion == "NT4"
     StrCpy $2 "VBoxServiceNT.exe"
@@ -748 +756 @@
 
 ;
-; Macro for copying a file only if the source file is verified 
+; Macro for copying a file only if the source file is verified
 ; to be from a certain vendor and architecture.
 ; @return  Stack: "0" if copied, "1" if not, "2" on error / not found.
@@ -761 +769 @@
   Push "${Architecture}"
   Push "${Vendor}"
-  Push "${FileSrc}"  
+  Push "${FileSrc}"
   Call ${un}VerifyFile
   Pop $0
@@ -837 +845 @@
   ; Note: Not finding a file (like *d3d8.dll) on Windows Vista/7 is fine;
   ;       it simply is not present there.
-  
-  ; Note 2: On 64-bit systems there are no 64-bit *d3d8 DLLs, only 32-bit ones 
+
+  ; Note 2: On 64-bit systems there are no 64-bit *d3d8 DLLs, only 32-bit ones
   ;         in SysWOW64 (or in system32 on 32-bit systems).
 
@@ -848 +856 @@
   ${EndIf}
 !endif
-  
+
   ${VerifyFileEx} "${un}" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; VBoxGuestAdditionExternal.nsh - Utility function for invoking external 
+; VBoxGuestAdditionExternal.nsh - Utility function for invoking external
 ;                                 applications.
 ;
@@ -32 +32 @@
   Push $0
   Push $1
-  
+
   !define _macroLoc ${__LINE__}
-  
+
   ${LogVerbose} "Executing: ${cmdline}"
-  IfSilent 0 +6
-    nsExec::ExecToStack "${cmdline}"
+  IfSilent silent_${_macroLoc} +1
+    nsExec::ExecToLog "${cmdline}"
     Pop $0 ; Return value (exit code)
-    Pop $1 ; Stdout/stderr output (up to ${NSIS_MAX_STRLEN})
-    ${LogVerbose} "$1"
     goto done_${_macroLoc}
-    
-  nsExec::ExecToLog "${cmdline}"
+
+silent_${_macroLoc}:
+
+  nsExec::ExecToStack "${cmdline}"
   Pop $0 ; Return value (exit code)
+  Pop $1 ; Stdout/stderr output (up to ${NSIS_MAX_STRLEN})
+  ${LogVerbose} "$1"
   goto done_${_macroLoc}
-    
+
 done_${_macroLoc}:
 
-  ${LogVerbose} "Execution returned: $0"
+  ${LogVerbose} "Execution returned exit code: $0"
   IntCmp $0 0 +1 error_${_macroLoc} error_${_macroLoc} ; Check ret value (0=OK, 1=Error)
   goto return_${_macroLoc}
-  
+
 error_${_macroLoc}:
- 
+
   ${If} ${optional} == "false"
-    ${LogVerbose} "Error excuting $\"${cmdline}$\" (Return value: $0) -- aborting installation"  
-    Abort
+    ${LogVerbose} "Error excuting $\"${cmdline}$\" (exit code: $0) -- aborting installation"
+    Abort "Error excuting $\"${cmdline}$\" (exit code: $0) -- aborting installation"
   ${Else}
     ${LogVerbose} "Warning: Executing $\"${cmdline}$\" returned with exit code $0"
   ${EndIf}
   goto return_${_macroLoc}
- 
+
 return_${_macroLoc}:
-  
+
   Pop $1
   Pop $0
-  
+
   !undef _macroLoc
 

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

@@ -39 +39 @@
 !macro _logVerbose text
 
-  LogText  "${text}"
+  LogText "${text}"
   IfSilent +2
     DetailPrint "${text}"