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

Timestamp:

Feb 11, 2014 4:08:18 PM (11 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Fixed checking for wrong target architecture when restore backed up D3D files on XPDM->WDDM upgrade -- these DLLs are 32-bit even on 64-bit systems.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (3 diffs)

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

@@ -876 +876 @@
 
   ; We need to switch to 64-bit app mode to handle the "real" 64-bit files in
-  ; ""system32" on a 64-bit guest
+  ; "system32" on a 64-bit guest
   Call ${un}SetAppMode64
 
@@ -1032 +1032 @@
 
   ; We need to switch to 64-bit app mode to handle the "real" 64-bit files in
-  ; ""system32" on a 64-bit guest
+  ; "system32" on a 64-bit guest
   Call ${un}SetAppMode64
 
@@ -1054 +1054 @@
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
-  ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d8.dll" "$g_strSysWow64\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
-  ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d9.dll" "$g_strSysWow64\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
+  ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d8.dll" "$g_strSysWow64\d3d8.dll" "Microsoft Corporation" "x86"
+  ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d9.dll" "$g_strSysWow64\d3d9.dll" "Microsoft Corporation" "x86"
 
   ${If} $g_bCapDllCache == "true"
-    ${CopyFileEx} "${un}" "$g_strSysWow64\dllcache\msd3d8.dll" "$g_strSysWow64\dllcache\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
-    ${CopyFileEx} "${un}" "$g_strSysWow64\dllcache\msd3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
+    ${CopyFileEx} "${un}" "$g_strSysWow64\dllcache\msd3d8.dll" "$g_strSysWow64\dllcache\d3d8.dll" "Microsoft Corporation" "x86"
+    ${CopyFileEx} "${un}" "$g_strSysWow64\dllcache\msd3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "Microsoft Corporation" "x86"
   ${EndIf}
 !endif