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

Timestamp:

Nov 16, 2012 12:19:08 PM (12 years ago)

Author:

vboxsync

Message:

Windows Guest Additions: Added credential provider installation for Windows 8, extended logging.

File:

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

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

@@ -701 +701 @@
   ${If} $0 != ""
     ${If} $0 != "VBoxGINA.dll"
+      DetailPrint "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"
       goto skip
     ${EndIf}
@@ -709 +711 @@
 
   ; Do we need VBoxCredProv or VBoxGINA?
-  ${If}   $R0 == 'Vista' ; Use VBoxCredProv on newer Windows OSes (>= Vista)
-  ${OrIf} $R0 == '7'
+  ${If}   $R0 == 'Vista' ; Windows Vista.
+  ${OrIf} $R0 == '7'     ; Windows 7.
+  ${OrIf} $R0 == '8'     ; Windows 8.
+    ; Use VBoxCredProv on Vista and up.
+    DetailPrint "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
@@ -717 +722 @@
     WriteRegStr HKCR "CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32" "ThreadingModel" "Apartment"
   ${Else} ; Use VBoxGINA on older Windows OSes (< Vista)
+    DetailPrint "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"