Changeset 36311 in vbox

Timestamp:

Mar 18, 2011 11:02:24 AM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Check if VBoxGINA already is installed and do an automated upgrade (whether /with_autologon is specified or not), put app mode (32-/64-bit) switching in own function.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (8 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)

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

@@ -535 +535 @@
 FunctionEnd
 
-Function PrepareForUpdate
-
-  StrCmp $g_strAddVerMaj "1" v1     ; Handle major version "v1.x"
-  StrCmp $g_strAddVerMaj "2" v2     ; Handle major version "v2.x"
-  StrCmp $g_strAddVerMaj "3" v3     ; Handle major version "v3.x"
-  Goto exit
-
-v3:
-
-  Goto exit
-
-v2:
-
-  Goto exit
-
-v1:
-
-  StrCmp $g_strAddVerMin "5" v1_5   ; Handle minor version "v1.5.x"
-  StrCmp $g_strAddVerMin "6" v1_6   ; Handle minor version "v1.6.x"
-
-v1_5:
-
-  Goto exit
-
-v1_6:
-
-  Goto exit
-
-exit:
+Function CheckForInstalledComponents
+
+  Push $0
+
+  DetailPrint "Checking for installed components ..."
+
+  Call SetAppMode64
+
+  ; VBoxGINA already installed? So we need to update the installed version as well,
+  ; regardless whether the user used "/with_autologon" or not
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
+  ${If} $0 == "VBoxGINA.dll"
+    DetailPrint "Found installed VBoxGINA"
+    StrCpy $g_bWithAutoLogon "true"
+  ${EndIf}
+
+  Pop $0
 
 FunctionEnd
@@ -601 +589 @@
   SetOverwrite on
 
-  ; Because this NSIS installer is always built in 32-bit mode, we have to
-  ; do some tricks for the Windows paths
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ; Because the next two lines will crash at the license page (??) we have to re-enable that here again
-  ${DisableX64FSRedirection}
-  SetRegView 64
-!endif
+  Call SetAppMode64
 
   StrCpy $g_strSystemDir "$SYSDIR"
 
   Call EnableLog
-  Call PrepareForUpdate
 
   DetailPrint "Version: $%VBOX_VERSION_STRING% (Rev $%VBOX_SVN_REV%)"
@@ -709 +690 @@
 Section /o -$(VBOX_COMPONENT_AUTOLOGON) SEC02
 
-  ; Because this NSIS installer is always built in 32-bit mode, we have to
-  ; do some tricks for the Windows paths
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ; Because the next two lines will crash at the license page (??) we have to re-enable that here again
-  ${DisableX64FSRedirection}
-  SetRegView 64
-!endif
+  Call SetAppMode64
 
   Call GetWindowsVersion
@@ -1139 +1114 @@
   ${EndIf}
 
+  Call CheckForInstalledComponents
+
   ; Set section bits
   ${If} $g_bWithAutoLogon == "true" ; Auto-logon support
@@ -1156 +1133 @@
 !endif
 
-  ; Because this NSIS installer is always built in 32-bit mode, we have to
-  ; do some tricks for the Windows paths for checking for old additions
-  ; in block below
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ${DisableX64FSRedirection}
-  SetRegView 64
-!endif
+  Call SetAppMode64
 
   ; Check for old additions
@@ -1171 +1142 @@
   ; 64-bit registry view, so as a workaround switch back to 32-bit (Wow6432Node)
   ; mode for now
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ${EnableX64FSRedirection}
-  SetRegView 32
-!endif
+  Call SetAppMode32
 
 !endif ; UNINSTALLER_ONLY
@@ -1209 +1177 @@
 proceed:
 
-  ; Because this NSIS installer is always built in 32-bit mode, we have to
-  ; do some tricks for the Windows paths
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ${DisableX64FSRedirection}
-  SetRegView 64
-!endif
+  Call un.SetAppMode64
 
   ; Set system directory
@@ -1234 +1197 @@
 !endif
 
-  ; Because this NSIS installer is always built in 32-bit mode, we have to
-  ; do some tricks for the Windows paths
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ; Do *not* add this line in .onInit - it will crash at the license page (??) because of a weird NSIS bug
-  ${DisableX64FSRedirection}
-  SetRegView 64
-!endif
+  Call un.SetAppMode64
 
   ; Call the uninstall main function

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

@@ -543 +543 @@
 !insertmacro CheckForCapabilities "un."
 
+; Switches (back) the path + registry view to
+; 32-bit mode (SysWOW64) on 64-bit guests
+!macro SetAppMode32 un
+Function ${un}SetAppMode32
+  !if $%BUILD_TARGET_ARCH% == "amd64"
+    ${EnableX64FSRedirection}
+    SetRegView 32
+  !endif
+FunctionEnd
+!macroend
+!insertmacro SetAppMode32 ""
+!insertmacro SetAppMode32 "un."
+
+; Because this NSIS installer is always built in 32-bit mode, we have to
+; do some tricks for the Windows paths + registry on 64-bit guests
+!macro SetAppMode64 un
+Function ${un}SetAppMode64
+  !if $%BUILD_TARGET_ARCH% == "amd64"
+    ${DisableX64FSRedirection}
+    SetRegView 64
+  !endif
+FunctionEnd
+!macroend
+!insertmacro SetAppMode64 ""
+!insertmacro SetAppMode64 "un."
+