Changeset 44417 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 28, 2013 11:45:52 AM (12 years ago)

Author:

vboxsync

Message:

More DetailPrint -> LogVerbose.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditionsNT4.nsh (modified) (11 diffs)
• VBoxGuestAdditionsUninstall.nsh (modified) (3 diffs)
• VBoxGuestAdditionsUninstallOld.nsh (modified) (4 diffs)
• VBoxGuestAdditionsVista.nsh (modified) (3 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (30 diffs)

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 missingParms:
 
-  DetailPrint "Missing display parameters for NT4, setting default (640x480, 8 BPP) ..."
+  ${LogVerbose} "Missing display parameters for NT4, setting default (640x480, 8 BPP) ..."
 
   StrCpy $g_iScreenX '640'   ; Default value
@@ -37 +37 @@
 haveParms:
 
-  DetailPrint "Setting display parameters for NT4 ($g_iScreenXx$g_iScreenY, $g_iScreenBpp BPP) ..."
+  ${LogVerbose} "Setting display parameters for NT4 ($g_iScreenXx$g_iScreenY, $g_iScreenBpp BPP) ..."
 
   WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vboxvideo\Device0" "DefaultSettings.BitsPerPel" $g_iScreenBpp
@@ -68 +68 @@
   StrCmp $0 "" 0 exists
 
-  DetailPrint "Saving mouse driver info ..."
+  ${LogVerbose} "Saving mouse driver info ..."
   ReadRegStr $0 HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath"
   WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" ${ORG_MOUSE_PATH} $0
@@ -75 +75 @@
 exists:
 
-  DetailPrint "Mouse driver info already saved."
+  ${LogVerbose} "Mouse driver info already saved."
   Goto exit
 
@@ -81 +81 @@
 
 !ifdef _DEBUG
-  DetailPrint "Mouse driver info: $0"
+  ${LogVerbose} "Mouse driver info: $0"
 !endif
 
@@ -110 +110 @@
 Function NT4_CopyFiles
 
-  DetailPrint "Copying files for NT4 ..."
+  ${LogVerbose} "Copying files for NT4 ..."
 
   SetOutPath "$INSTDIR"
@@ -137 +137 @@
 Function NT4_InstallFiles
 
-  DetailPrint "Installing drivers for NT4 ..."
+  ${LogVerbose} "Installing drivers for NT4 ..."
 
   ; Install guest driver
@@ -155 +155 @@
   IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
 
-  DetailPrint "Installing VirtualBox service ..."
+  ${LogVerbose} "Installing VirtualBox service ..."
 
   ; Create the VBoxService service
@@ -166 +166 @@
 
 !ifdef _DEBUG
-  ;DetailPrint "SCM::Install VBoxSFNT.sys: $0"
+  ;${LogVerbose} "SCM::Install VBoxSFNT.sys: $0"
 !endif
 
@@ -260 +260 @@
   ${If} $0 == "System32\DRIVERS\VBoxMouseNT.sys"
     WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath" "System32\DRIVERS\i8042prt.sys"
-    DetailPrint "Old mouse driver is set to VBoxMouseNT.sys, defaulting to i8042prt.sys ..."
+    ${LogVerbose} "Old mouse driver is set to VBoxMouseNT.sys, defaulting to i8042prt.sys ..."
   ${Else}
     WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath" $0

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -70 +70 @@
 Function ${un}Uninstall
 
-  DetailPrint "Uninstalling system files ..."
+  ${LogVerbose} "Uninstalling system files ..."
 !ifdef _DEBUG
-  DetailPrint "Detected OS version: Windows $g_strWinVersion"
-  DetailPrint "System Directory: $g_strSystemDir"
+  ${LogVerbose} "Detected OS version: Windows $g_strWinVersion"
+  ${LogVerbose} "System Directory: $g_strSystemDir"
 !endif
 
@@ -128 +128 @@
 Function ${un}UninstallInstDir
 
-  DetailPrint "Uninstalling directory ..."
+  ${LogVerbose} "Uninstalling directory ..."
 !ifdef _DEBUG
-  DetailPrint "Detected OS version: Windows $g_strWinVersion"
-  DetailPrint "System Directory: $g_strSystemDir"
+  ${LogVerbose} "Detected OS version: Windows $g_strWinVersion"
+  ${LogVerbose} "System Directory: $g_strSystemDir"
 !endif
 

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

@@ -6 +6 @@
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -91 +91 @@
 
   ; Do some basic sanity checks for not screwing up too fatal ...
-  DetailPrint "Removing old installation directory ($0) ..."
+  ${LogVerbose} "Removing old installation directory ($0) ..."
   ${If} $0    != $PROGRAMFILES
   ${AndIf} $0 != $PROGRAMFILES32
@@ -99 +99 @@
   ${AndIf} $0 != $WINDIR
   ${AndIf} $0 != $SYSDIR
-    DetailPrint "Wiping ($0) ..."
+    ${LogVerbose} "Wiping ($0) ..."
     Goto wipe
   ${EndIf}
@@ -112 +112 @@
 wipe_abort:
 
-  DetailPrint "Won't remove directory ($0)!"
+  ${LogVerbose} "Won't remove directory ($0)!"
   StrCpy $0 1 ; Signal some failure
   Goto exit

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

@@ -20 +20 @@
   Push $0
 
-  DetailPrint "Checking for installation requirements for Vista / Windows 7 / Windows 8 ..."
+  ${LogVerbose} "Checking for installation requirements for Vista / Windows 7 / Windows 8 ..."
 
   ${If} $g_bForceInstall == "true"
-    DetailPrint "Forcing installation, checking requirements skipped"
+    ${LogVerbose} "Forcing installation, checking requirements skipped"
     goto success
   ${EndIf}
@@ -84 +84 @@
 Function Vista_InstallFiles
 
-  DetailPrint "Installing drivers for Vista / Windows 7 / Windows 8 ..."
+  ${LogVerbose} "Installing drivers for Vista / Windows 7 / Windows 8 ..."
 
   SetOutPath "$INSTDIR"
@@ -129 +129 @@
 
    ; Remove credential provider
-   DetailPrint "Removing auto-logon support ..."
+   ${LogVerbose} "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

@@ -30 +30 @@
   StrCmp $g_iScreenBpp "0" exit
 
-  DetailPrint "Setting display parameters ($g_iScreenXx$g_iScreenY, $g_iScreenBpp BPP) ..."
+  ${LogVerbose} "Setting display parameters ($g_iScreenXx$g_iScreenY, $g_iScreenBpp BPP) ..."
 
   ; Enumerate all video devices (up to 32 at the moment, use key "MaxObjectNumber" key later)
@@ -56 +56 @@
     ReadRegStr $dev_desc HKLM "$tmppath" "Device Description"
 !ifdef _DEBUG
-    DetailPrint "Registry path: $tmppath"
-    DetailPrint "Registry path to device name: $temp"
-!endif
-    DetailPrint "Detected video device: $dev_desc"
+    ${LogVerbose} "Registry path: $tmppath"
+    ${LogVerbose} "Registry path to device name: $temp"
+!endif
+    ${LogVerbose} "Detected video device: $dev_desc"
 
     ${If} $dev_desc == "VirtualBox Graphics Adapter"
-      DetailPrint "VirtualBox video device found!"
+      ${LogVerbose} "VirtualBox video device found!"
       Goto dev_found
     ${EndIf}
@@ -79 +79 @@
 
   StrCpy $i 0 ; Start at index 0
-  DetailPrint "Detecting device ID ..."
+  ${LogVerbose} "Detecting device ID ..."
 
 dev_found_detect_id_loop:
@@ -87 +87 @@
   StrCmp $dev_id "" dev_not_found ; No more entries? Jump out
 !ifdef _DEBUG
-  DetailPrint "Got device ID: $dev_id"
+  ${LogVerbose} "Got device ID: $dev_id"
 !endif
   ReadRegStr $dev_desc HKLM "SYSTEM\CurrentControlSet\Control\Video\$dev_id\0000" "Device Description" ; Try to read device name
   ${If} $dev_desc == "VirtualBox Graphics Adapter"
-    DetailPrint "Device ID of $dev_desc: $dev_id"
+    ${LogVerbose} "Device ID of $dev_desc: $dev_id"
     Goto change_res
   ${EndIf}
@@ -100 +100 @@
 dev_not_found:
 
-  DetailPrint "No VirtualBox video device (yet) detected! No custom mode set."
+  ${LogVerbose} "No VirtualBox video device (yet) detected! No custom mode set."
   Goto exit
 
@@ -106 +106 @@
 
 !ifdef _DEBUG
-  DetailPrint "Device description: $dev_desc"
-  DetailPrint "Device ID: $dev_id"
+  ${LogVerbose} "Device description: $dev_desc"
+  ${LogVerbose} "Device ID: $dev_id"
 !endif
 
@@ -113 +113 @@
   Var /GLOBAL reg_path_monitor
 
-  DetailPrint "Custom mode set: Platform is Windows $g_strWinVersion"
+  ${LogVerbose} "Custom mode set: Platform is Windows $g_strWinVersion"
   ${If} $g_strWinVersion == "2000"
   ${OrIf} $g_strWinVersion == "Vista"
@@ -124 +124 @@
     StrCpy $reg_path_monitor "SYSTEM\CurrentControlSet\Control\VIDEO\$dev_id\0000\Mon00000001"
   ${Else}
-    DetailPrint "Custom mode set: Windows $g_strWinVersion not supported yet"
+    ${LogVerbose} "Custom mode set: Windows $g_strWinVersion not supported yet"
     Goto exit
   ${EndIf}
@@ -142 +142 @@
   WriteRegDWORD HKCC $reg_path_monitor "DefaultSettings.BitsPerPixel" "$g_iScreenBpp"
 
-  DetailPrint "Custom mode set to $g_iScreenXx$g_iScreenY, $g_iScreenBpp BPP on next restart."
+  ${LogVerbose} "Custom mode set to $g_iScreenXx$g_iScreenY, $g_iScreenBpp BPP on next restart."
 
 exit:
@@ -214 +214 @@
     GetTempFileName $0
     IfErrors 0 +3
-      DetailPrint "Error getting temp file for VBoxService.exe"
+      ${LogVerbose} "Error getting temp file for VBoxService.exe"
       StrCpy "$0" "$INSTDIR\VBoxServiceTemp.exe"
-    DetailPrint "VBoxService is in use, will be installed on next reboot (from '$0')"
+    ${LogVerbose} "VBoxService is in use, will be installed on next reboot (from '$0')"
     File "/oname=$0" "$%PATH_OUT%\bin\additions\VBoxService.exe"
     IfErrors 0 +2
-      DetailPrint "Error copying VBoxService.exe to '$0'"
+      ${LogVerbose} "Error copying VBoxService.exe to '$0'"
     Rename /REBOOTOK "$0" "$g_strSystemDir\VBoxService.exe"
     IfErrors 0 +2
-      DetailPrint "Error renaming '$0' to '$g_strSystemDir\VBoxService.exe'"
+      ${LogVerbose} "Error renaming '$0' to '$g_strSystemDir\VBoxService.exe'"
     Pop $0
   ${EndIf}
@@ -337 +337 @@
 do:
 
-  DetailPrint "Turning off WHQL protection..."
+  ${LogVerbose} "Turning off WHQL protection..."
   nsExec::ExecToLog '"$INSTDIR\VBoxWHQLFake.exe" "ignore"'
 
@@ -351 +351 @@
 do:
 
-  DetailPrint "Turning back on WHQL protection..."
+  ${LogVerbose} "Turning back on WHQL protection..."
   nsExec::ExecToLog '"$INSTDIR\VBoxWHQLFake.exe" "warn"'
 
@@ -376 +376 @@
   AccessControl::GrantOnFile "$g_strSystemDir\VBoxHook.dll" "(BU)" "GenericRead"
 
-  DetailPrint "Installing drivers ..."
+  ${LogVerbose} "Installing drivers ..."
 
   Push $0 ; For fetching results
@@ -383 +383 @@
 
   ${If} $g_bNoGuestDrv == "false"
-    DetailPrint "Installing guest driver ..."
+    ${LogVerbose} "Installing guest driver ..."
     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxGuest.inf" "$INSTDIR\install_drivers.log"'
     Pop $0 ; Ret value
@@ -396 +396 @@
   !if $%VBOX_WITH_WDDM_W8% == "1"
       ${If} $g_strWinVersion == "8"
-        DetailPrint "Installing WDDM video driver for Windows 8..."
+        ${LogVerbose} "Installing WDDM video driver for Windows 8..."
         nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoW8.inf" "$INSTDIR\install_drivers.log"'
       ${Else}
   !endif
-        DetailPrint "Installing WDDM video driver for Windows Vista and 7..."
+        ${LogVerbose} "Installing WDDM video driver for Windows Vista and 7..."
         nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf" "$INSTDIR\install_drivers.log"'
   !if $%VBOX_WITH_WDDM_W8% == "1"
@@ -406 +406 @@
   !endif
     ${Else}
-      DetailPrint "Installing video driver ..."
+      ${LogVerbose} "Installing video driver ..."
       nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideo.inf" "$INSTDIR\install_drivers.log"'
     ${EndIf}
@@ -417 +417 @@
 
   ${If} $g_bNoMouseDrv == "false"
-    DetailPrint "Installing mouse driver ..."
+    ${LogVerbose} "Installing mouse driver ..."
     ; The mouse filter does not contain any device IDs but a "DefaultInstall" section;
     ; so this .INF file needs to be installed using "InstallHinfSection" which is implemented
@@ -431 +431 @@
   ; Create the VBoxService service
   ; No need to stop/remove the service here! Do this only on uninstallation!
-  DetailPrint "Installing VirtualBox service ..."
+  ${LogVerbose} "Installing VirtualBox service ..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service create "VBoxService" "VirtualBox Guest Additions Service" 16 2 "system32\VBoxService.exe" "Base"'
   Pop $0 ; Ret value
@@ -441 +441 @@
 sf:
 
-  DetailPrint "Installing Shared Folders service ..."
+  ${LogVerbose} "Installing Shared Folders service ..."
 
   ; Create the Shared Folders service ...
@@ -458 +458 @@
 
   ; Add the shared folders network provider
-  DetailPrint "Adding network provider (Order = $g_iSfOrder) ..."
+  ${LogVerbose} "Adding network provider (Order = $g_iSfOrder) ..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider add VBoxSF $g_iSfOrder'
   Pop $0 ; Ret value
@@ -468 +468 @@
     ; Nothing to do here
   ${Else}
-    DetailPrint "Installing 3D OpenGL support ..."
+    ${LogVerbose} "Installing 3D OpenGL support ..."
     WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Version" 2
     WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "DriverVersion" 1
@@ -606 +606 @@
 
   ; Remove VirtualBox video driver
-  DetailPrint "Uninstalling video driver ..."
+  ${LogVerbose} "Uninstalling video driver ..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideo.inf'
   Pop $0 ; Ret value
@@ -618 +618 @@
 
   !if $%VBOX_WITH_WDDM_W8% == "1"
-  DetailPrint "Uninstalling WDDM video driver for Windows 8..."
+  ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoW8.inf"'
   Pop $0 ; Ret value
@@ -629 +629 @@
   !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 
-  DetailPrint "Uninstalling WDDM video driver for Windows Vista and 7..."
+  ${LogVerbose} "Uninstalling WDDM video driver for Windows Vista and 7..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoWddm.inf"'
   Pop $0 ; Ret value
@@ -643 +643 @@
 !if $%VBOX_WITH_CROGL% == "1"
 
-  DetailPrint "Removing Direct3D support ..."
+  ${LogVerbose} "Removing Direct3D support ..."
 
   ; Do file validation before we uninstall
@@ -649 +649 @@
   Pop $0
   ${If} $0 == "1" ; D3D files are invalid
-    DetailPrint $(VBOX_UNINST_INVALID_D3D)
+    ${LogVerbose} $(VBOX_UNINST_INVALID_D3D)
     MessageBox MB_ICONSTOP|MB_OK $(VBOX_UNINST_INVALID_D3D) /SD IDOK
     Goto d3d_uninstall_end
@@ -731 +731 @@
 
   ; Remove mouse driver
-  DetailPrint "Removing mouse driver ..."
+  ${LogVerbose} "Removing mouse driver ..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxMouse'
   Pop $0 ; Ret value
@@ -750 +750 @@
   ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${If} $0 == "VBoxGINA.dll"
-    DetailPrint "Removing auto-logon support ..."
+    ${LogVerbose} "Removing auto-logon support ..."
     DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${EndIf}
@@ -760 +760 @@
 
   ; Remove guest driver
-  DetailPrint "Removing guest driver ..."
+  ${LogVerbose} "Removing guest driver ..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxGuest.inf"'
   Pop $0 ; Ret value
@@ -775 +775 @@
 
   ; Remove shared folders driver
-  DetailPrint "Removing shared folders driver ..."
+  ${LogVerbose} "Removing shared folders driver ..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" netprovider remove VBoxSF'
   Pop $0 ; Ret value