Changeset 39513 in vbox

Timestamp:

Dec 2, 2011 12:11:04 PM (13 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Attempt to fix SysWOW64 problems for D3D installation on 64-bit.

File:

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

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

@@ -835 +835 @@
 
   !if $%BUILD_TARGET_ARCH% == "amd64"
+    ; We need a special directory set to SysWOW64 because some
+    ; shell operations don't support file redirection (yet)
+    Var SYSWOW64DIR
+    StrCpy SYSWOW64DIR "$WINDIR\SysWOW64"
     ; Only 64-bit installer:
     ; Also copy 32-bit DLLs on 64-bit Windows in SysWOW64 node
-    ${EnableX64FSRedirection}
-    SetOutPath $SYSDIR
-    DetailPrint "Installing Direct3D support (SysWOW64: $SYSDIR) ..."
+    SetOutPath $SYSWOW64DIR
+    DetailPrint "Installing Direct3D support (SysWOW64: $SYSWOW64DIR) ..."
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\libWine.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
@@ -850 +853 @@
 
     ; Save original DLLs (only if msd3d*.dll does not exist) ...
-    SetOutPath "$SYSDIR\dllcache"
-    IfFileExists "$SYSDIR\dllcache\msd3d8.dll" +2
-      CopyFiles /SILENT "$SYSDIR\dllcache\d3d8.dll" "$SYSDIR\dllcache\msd3d8.dll"
-    IfFileExists "$SYSDIR\dllcache\msd3d9.dll" +2
-      CopyFiles /SILENT "$SYSDIR\dllcache\d3d9.dll" "$SYSDIR\dllcache\msd3d9.dll"
-
-    Push "$SYSDIR\dllcache\d3d8.dll"
+    SetOutPath "$SYSWOW64DIR\dllcache"
+    IfFileExists "$SYSWOW64DIR\dllcache\msd3d8.dll" +2
+      CopyFiles /SILENT "$SYSWOW64DIR\dllcache\d3d8.dll" "$SYSWOW64DIR\dllcache\msd3d8.dll"
+    IfFileExists "$SYSWOW64DIR\dllcache\msd3d9.dll" +2
+      CopyFiles /SILENT "$SYSWOW64DIR\dllcache\d3d9.dll" "$SYSWOW64DIR\dllcache\msd3d9.dll"
+
+    Push "$SYSWOW64DIR\dllcache\d3d8.dll"
     Call PrepareWRPFile
 
-    Push "$SYSDIR\dllcache\d3d9.dll"
+    Push "$SYSWOW64DIR\dllcache\d3d9.dll"
     Call PrepareWRPFile
 
     ; Exchange DLLs
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSDIR\dllcache\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\dllcache\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\dllcache\d3d9.dll" "$TEMP"
 
     ; If exchange above failed, do it on reboot
-    !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"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\dllcache\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\dllcache\d3d9.dll" "$TEMP"
 
     ;
@@ -875 +878 @@
 
     ; Save original DLLs (only if msd3d*.dll does not exist) ...
-    SetOutPath $SYSDIR
-    IfFileExists "$SYSDIR\msd3d8.dll" +2
-      CopyFiles /SILENT "$SYSDIR\d3d8.dll" "$SYSDIR\msd3d8.dll"
-    IfFileExists "$SYSDIR\msd3d9.dll" +2
-      CopyFiles /SILENT "$SYSDIR\d3d9.dll" "$SYSDIR\msd3d9.dll"
-
-    Push "$SYSDIR\d3d8.dll"
+    IfFileExists "$SYSWOW64DIR\msd3d8.dll" +2
+      CopyFiles /SILENT "$SYSWOW64DIR\d3d8.dll" "$SYSWOW64DIR\msd3d8.dll"
+    IfFileExists "$SYSWOW64DIR\msd3d9.dll" +2
+      CopyFiles /SILENT "$SYSWOW64DIR\d3d9.dll" "$SYSWOW64DIR\msd3d9.dll"
+
+    Push "$SYSWOW64DIR\d3d8.dll"
     Call PrepareWRPFile
 
-    Push "$SYSDIR\d3d9.dll"
+    Push "$SYSWOW64DIR\d3d9.dll"
     Call PrepareWRPFile
 
     ; Exchange DLLs
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSDIR\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSDIR\d3d9.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\d3d9.dll" "$TEMP"
 
     ; If exchange above failed, do it on reboot
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSDIR\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSDIR\d3d9.dll" "$TEMP"
-
-    ${DisableX64FSRedirection}
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\d3d9.dll" "$TEMP"
+
   !endif ; amd64
   Goto done