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

Timestamp:

Dec 1, 2011 1:26:47 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75154

Message:

Logging.

File:

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

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

@@ -743 +743 @@
   AccessControl::SetFileOwner "$0" "(S-1-5-32-545)"
   Pop $1
-  DetailPrint "Setting file owner for '$0': $1"
+  DetailPrint "Setting file owner for $0 returned $1"
   AccessControl::GrantOnFile "$0" "(S-1-5-32-545)" "FullAccess"
   Pop $1
-  DetailPrint "Setting access rights for '$0': $1"
+  DetailPrint "Setting access rights for $0 returned $1"
 
 !if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
@@ -752 +752 @@
     VBoxGuestInstallHelper::DisableWFP "$0"
     Pop $1 ; Get return value (ignored for now)
-    DetailPrint "Setting WFP exception for '$0': $1"
+    DetailPrint "Setting WFP exception for $0 returned $1"
   !endif
 !endif
@@ -826 +826 @@
 
   !if $%BUILD_TARGET_ARCH% == "amd64"
-    ; Only 64-bit installer: Also copy 32-bit DLLs on 64-bit target arch in
-    ; Wow64 node (32-bit sub system)
+    ; Only 64-bit installer:
+    ; Also copy 32-bit DLLs on 64-bit Windows in SysWOW64 node
     ${EnableX64FSRedirection}
     SetOutPath $SYSDIR
-    DetailPrint "Installing Direct3D support (Wow64) ..."
+    DetailPrint "Installing Direct3D support (SysWOW64: $SYSDIR) ..."
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\libWine.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
@@ -836 +836 @@
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\wined3d.dll"
 
+    ;
     ; Update DLL cache
+    ;
+
+    ; Save original DLLs (only if msd3d*.dll does not exist) ...
     SetOutPath "$SYSDIR\dllcache"
     IfFileExists "$SYSDIR\dllcache\msd3d8.dll" +1
@@ -856 +860 @@
     !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSDIR\dllcache\d3d8.dll" "$TEMP"
     !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "$TEMP"
+
+    ;
+    ; Update original DLLs
+    ;
 
     ; Save original DLLs (only if msd3d*.dll does not exist) ...