Changeset 44352 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

Timestamp:

Jan 24, 2013 12:05:12 PM (12 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Fixed updating auto-logon modules when not specified explicitly, implemented new logging facility to also support proper unattended logging.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (27 diffs)

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2012 Oracle Corporation
+; Copyright (C) 2012-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -240 +240 @@
 
 ; Platform parts of this installer
+!include "VBoxGuestAdditionsLog.nsh"
 !include "VBoxGuestAdditionsCommon.nsh"
 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit only
-!include "VBoxGuestAdditionsNT4.nsh"
+  !include "VBoxGuestAdditionsNT4.nsh"
 !endif
 !include "VBoxGuestAdditionsW2KXP.nsh"
@@ -445 +446 @@
 done:
 
-  IfSilent 0 +2
-    LogText "Installer is in silent mode!"
-
-  LogText "Property: XRes: $g_iScreenX"
-  LogText "Property: YRes: $g_iScreenY"
-  LogText "Property: BPP: $g_iScreenBpp"
-  LogText "Property: Logging enabled: $g_bLogEnable"
-
+!ifdef _DEBUG
+  ${LogVerbose} "Property: XRes: $g_iScreenX"
+  ${LogVerbose} "Property: YRes: $g_iScreenY"
+  ${LogVerbose} "Property: BPP: $g_iScreenBpp"
+  ${LogVerbose} "Property: Logging enabled: $g_bLogEnable"
+!endif
+  
 exit:
 
@@ -545 +545 @@
   Push $1
 
-  DetailPrint "Checking for installed components ..."
-
+  ${LogVerbose} "Checking for installed components ..."
+  StrCpy $1 ""
+  
   Call SetAppMode64
 
@@ -553 +554 @@
   ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${If} $0 == "VBoxGINA.dll"
-    StrCpy $g_bWithAutoLogon "true"
-    StrCpy $1 "1"
-  ${EndIf}
-
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}" ""
-  ${If} $0 == "VBoxCredProv.dll"
-    StrCpy $g_bWithAutoLogon "true"
-    StrCpy $1 "1"
-  ${EndIf}
-
-  ${If} $1 == "1"
-    DetailPrint "Auto-logon support was not installed previously"
-  ${EndIf}
-
-  ${If} $g_bWithAutoLogon == "true"
-    DetailPrint "Found already installed auto-logon support ..."
+    StrCpy $1 "GINA"
+  ${Else}
+    ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}" ""
+    ${If} $0 == "VBoxCredProv"
+      StrCpy $1 "Credential Provider"
+    ${EndIf}
+  ${EndIf}
+
+!ifdef _DEBUG
+  ${LogVerbose} "Auto-logon module: $0"
+!endif
+  
+  ${IfNot} $1 == ""
+    ${LogVerbose} "Auto-logon support ($1) was installed previously"
+    StrCpy $g_bWithAutoLogon "true" ; Force update
+  ${Else}
+    ${LogVerbose} "Auto-logon support was not installed previously"
   ${EndIf}
 
@@ -580 +582 @@
 
   SectionIn RO ; Section cannot be unselected (read-only)
-
-  Push "${PRODUCT_NAME} update started, please wait ..."
-  Push 0 ; Message type = info
-  Call WriteLogVBoxTray
+  ${If} $g_bPostInstallStatus == "true"
+    ${LogToVBoxTray} "0" "${PRODUCT_NAME} update started, please wait ..."
+  ${EndIf}
 
   SetOutPath "$INSTDIR"
@@ -592 +593 @@
   StrCpy $g_strSystemDir "$SYSDIR"
 
-  Call EnableLog
-
-  DetailPrint "Version: $%VBOX_VERSION_STRING% (Rev $%VBOX_SVN_REV%)"
+  ${LogVerbose}  "$g_bLogEnable"
+
+  ${LogVerbose} "Version: $%VBOX_VERSION_STRING% (Rev $%VBOX_SVN_REV%)"
   ${If} $g_strAddVerMaj != ""
-    DetailPrint "Previous version: $g_strAddVerMaj.$g_strAddVerMin.$g_strAddVerBuild (Rev $g_strAddVerRev)"
+    ${LogVerbose} "Previous version: $g_strAddVerMaj.$g_strAddVerMin.$g_strAddVerBuild (Rev $g_strAddVerRev)"
   ${Else}
-    DetailPrint "No previous version of ${PRODUCT_NAME} detected."
+    ${LogVerbose} "No previous version of ${PRODUCT_NAME} detected."
   ${EndIf}
 !if $%BUILD_TARGET_ARCH% == "amd64"
-  DetailPrint "Detected OS: Windows $g_strWinVersion (64-bit)"
+  ${LogVerbose} "Detected OS: Windows $g_strWinVersion (64-bit)"
 !else
-  DetailPrint "Detected OS: Windows $g_strWinVersion (32-bit)"
-!endif
-  DetailPrint "System Directory: $g_strSystemDir"
+  ${LogVerbose} "Detected OS: Windows $g_strWinVersion (32-bit)"
+!endif
+  ${LogVerbose} "System Directory: $g_strSystemDir"
 
 !ifdef _DEBUG
-  DetailPrint "Debug!"
+  ${LogVerbose} "Installer runs in debug mode"
 !endif
 
@@ -691 +692 @@
 exit:
 
-  Call WriteLogUI
-
 SectionEnd
 
@@ -703 +702 @@
   Pop $R0 ; Windows Version
 
-  DetailPrint "Installing auto-logon support ..."
+  ${LogVerbose} "Installing auto-logon support ..."
 
   ; Another GINA already is installed? Check if this is ours, otherwise let the user decide (unless it's a silent setup)
@@ -710 +709 @@
   ${If} $0 != ""
     ${If} $0 != "VBoxGINA.dll"
-      DetailPrint "Found another already installed GINA module: $0"
+      ${LogVerbose} "Found another already installed GINA module: $0"
       MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON1 $(VBOX_COMPONENT_AUTOLOGON_WARN_3RDPARTY) /SD IDYES IDYES install
-      DetailPrint "Skipping GINA installation, keeping: $0"
+      ${LogVerbose} "Skipping GINA installation, keeping: $0"
       goto skip
     ${EndIf}
@@ -724 +723 @@
   ${OrIf} $R0 == '8'     ; Windows 8.
     ; Use VBoxCredProv on Vista and up.
-    DetailPrint "Installing VirtualBox credential provider ..."
+    ${LogVerbose} "Installing VirtualBox credential provider ..."
     !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxCredProv.dll" "$g_strSystemDir\VBoxCredProv.dll" "$INSTDIR"
     WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}" "" "VBoxCredProv" ; adding to (default) key
@@ -731 +730 @@
     WriteRegStr HKCR "CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32" "ThreadingModel" "Apartment"
   ${Else} ; Use VBoxGINA on older Windows OSes (< Vista)
-    DetailPrint "Installing VirtualBox GINA ..."
+    ${LogVerbose} "Installing VirtualBox GINA ..."
     !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxGINA.dll" "$g_strSystemDir\VBoxGINA.dll" "$INSTDIR"
     WriteRegStr HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL" "VBoxGINA.dll"
@@ -755 +754 @@
 
   ${IfNot} ${FileExists} "$0"
-    LogText "WRP: File $0 does not exist, skipping"
+    ${LogVerbose} "WRP: File $0 does not exist, skipping"
     Return
   ${EndIf}
@@ -762 +761 @@
     nsExec::ExecToLog '"$g_strSystemDir\takeown.exe" /F "$0"'
     Pop $1 ; Ret value
-    LogText "WRP: Taking ownership for $0 returned: $1"
+    ${LogVerbose} "WRP: Taking ownership for $0 returned: $1"
   ${Else}
-    LogText "WRP: Warning: takeown.exe not found, skipping"
+    ${LogVerbose} "WRP: Warning: takeown.exe not found, skipping"
   ${EndIf}
 
   AccessControl::SetFileOwner "$0" "(S-1-5-32-545)"
   Pop $1
-  DetailPrint "WRP: Setting file owner for $0 returned: $1"
+  ${LogVerbose} "WRP: Setting file owner for $0 returned: $1"
 
   AccessControl::GrantOnFile "$0" "(S-1-5-32-545)" "FullAccess"
   Pop $1
-  DetailPrint "WRP: Setting access rights for $0 returned: $1"
+  ${LogVerbose} "WRP: Setting access rights for $0 returned: $1"
 
 !if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
@@ -779 +778 @@
     VBoxGuestInstallHelper::DisableWFP "$0"
     Pop $1 ; Get return value (ignored for now)
-    DetailPrint "WRP: Setting WFP exception for $0 returned: $1"
+    ${LogVerbose} "WRP: Setting WFP exception for $0 returned: $1"
   !endif
 !endif
@@ -802 +801 @@
 
   SetOutPath $g_strSystemDir
-  DetailPrint "Installing Direct3D support ..."
+  ${LogVerbose} "Installing Direct3D support ..."
   FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll"
   FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll"
@@ -826 +825 @@
       ${InstallFileEx} "" "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP"
     ${Else}
-        DetailPrint "DLL cache does not exist, skipping"
+        ${LogVerbose} "DLL cache does not exist, skipping"
     ${EndIf}
   ${EndIf}
@@ -851 +850 @@
     ; Also copy 32-bit DLLs on 64-bit Windows in SysWOW64 node
     SetOutPath $g_strSysWow64
-    DetailPrint "Installing Direct3D support for 32-bit applications (SysWOW64: $g_strSysWow64) ..."
+    ${LogVerbose} "Installing Direct3D support for 32-bit applications (SysWOW64: $g_strSysWow64) ..."
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D9.dll"
@@ -875 +874 @@
         ${InstallFileEx} "" "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "$TEMP"
       ${Else}
-        DetailPrint "DLL cache does not exist, skipping"
+        ${LogVerbose} "DLL cache does not exist, skipping"
       ${EndIf}
     ${EndIf}
@@ -944 +943 @@
 
 !ifdef _DEBUG
-  DetailPrint "Doing post install ..."
+  ${LogVerbose} "Doing post install ..."
 !endif
 
@@ -974 +973 @@
 !endif
 
-  DetailPrint "Installation completed."
+  ${LogVerbose} "Installation completed."
 
 SectionEnd
@@ -1058 +1057 @@
   MessageBox MB_ICONSTOP $(VBOX_ERROR_INST_FAILED) /SD IDOK
 
-  Push "Error while installing ${PRODUCT_NAME}!"
-  Push 2 ; Message type = error
-  Call WriteLogVBoxTray
-
-  StrCpy $g_bLogEnable "true"
-  Call WriteLogUI
+  ${If} $g_bPostInstallStatus == "true"
+    ${LogToVBoxTray} "2" "Error while installing ${PRODUCT_NAME}!"
+  ${EndIf}
+
+  ; Set overall exit code
   SetErrorLevel 1
 
@@ -1071 +1069 @@
 Function .onInstSuccess
 
-  Push "${PRODUCT_NAME} successfully updated!"
-  Push 0 ; Message type = info
-  Call WriteLogVBoxTray
+  ${If} $g_bPostInstallStatus == "true"
+    ${LogToVBoxTray} "0" "${PRODUCT_NAME} successfully updated!"
+  ${EndIf}
 
 FunctionEnd
@@ -1144 +1142 @@
   ${EndIf}
 
+  IfSilent 0 +3
+    ${LogEnable} "true" ; Force logging in silent mode
+    ${LogVerbose} "Installer runs in silent mode"
+
   ; Retrieve Windows version and store result in $g_strWinVersion
   Call GetWindowsVer
@@ -1153 +1155 @@
   AccessControl::GetCurrentUserName
   Pop $g_strCurUser
-  DetailPrint "Current user: $g_strCurUser"
+  ${LogVerbose} "Current user is: $g_strCurUser"
 
   ; Only extract files? This action can be called even from non-Admin users
@@ -1282 +1284 @@
 
 !ifdef _DEBUG
-  ; Enable logging
-  Call un.EnableLog
+  ${LogEnable} "true"
 !endif
 
@@ -1304 +1305 @@
 restart:
 
-  DetailPrint "Rebooting ..."
+  ${LogVerbose} "Rebooting ..."
   Reboot