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

Timestamp:

May 12, 2011 10:16:29 AM (14 years ago)

Author:

vboxsync

Message:

Adjusted/added logging.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (4 diffs)
• VBoxGuestAdditionsVista.nsh (modified) (1 diff)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

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

@@ -549 +549 @@
   ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${If} $0 == "VBoxGINA.dll"
-    DetailPrint "Found installed VBoxGINA"
+    DetailPrint "Found already installed auto-logon support ..."
     StrCpy $g_bWithAutoLogon "true"
   ${EndIf}
@@ -706 +706 @@
     ${If} $0 != "VBoxGINA.dll"
       MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON1 $(VBOX_COMPONENT_AUTOLOGON_WARN_3RDPARTY) /SD IDYES IDYES install
-      goto exit
+      goto skip
     ${EndIf}
   ${EndIf}
@@ -713 +713 @@
 
   ; Do we need VBoxCredProv or VBoxGINA?
-  ${If}   $R0 == 'Vista'
+  ${If}   $R0 == 'Vista' ; Use VBoxCredProv on newer Windows OSes (>= Vista)
   ${OrIf} $R0 == '7'
     !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxCredProv.dll" "$g_strSystemDir\VBoxCredProv.dll" "$INSTDIR"
@@ -720 +720 @@
     WriteRegStr HKCR "CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32" "" "VBoxCredProv.dll"    ; adding to (Default) key
     WriteRegStr HKCR "CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32" "ThreadingModel" "Apartment"
-  ${Else}
+  ${Else} ; Use VBoxGINA on older Windows OSes (< Vista)
     !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxGINA.dll" "$g_strSystemDir\VBoxGINA.dll" "$INSTDIR"
     WriteRegStr HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL" "VBoxGINA.dll"
   ${EndIf}
+
+skip:
+
+  ; Nothing to do here right now
 
 exit:

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

@@ -70 +70 @@
 
    ; Remove credential provider
+   DetailPrint "Removing auto-logon support ..."
    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}"
    DeleteRegKey HKCR "CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}"

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

@@ -662 +662 @@
   Delete /REBOOTOK "$g_strSystemDir\VBoxService.exe"
 
-  ; GINA
+  ; VBoxGINA
   Delete /REBOOTOK "$g_strSystemDir\VBoxGINA.dll"
   ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${If} $0 == "VBoxGINA.dll"
-    DetailPrint "Removing GINA ..."
+    DetailPrint "Removing auto-logon support ..."
     DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${EndIf}