Changeset 40720 in vbox

Timestamp:

Mar 30, 2012 9:33:11 AM (13 years ago)

Author:

vboxsync

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

77184

Message:

Windows Guest Additions installer: Skip checking 32-bit *d3d8 DLLs on 64-bit guests.

File:

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

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

@@ -862 +862 @@
   ; Note: Not finding a file (like *d3d8.dll) on Windows Vista/7 is fine;
   ;       it simply is not present there.
-
+  
+  ; Note 2: On 64-bit systems there are no 64-bit *d3d8 DLLs, only 32-bit ones 
+  ;         in SysWOW64 (or in system32 on 32-bit systems).
+
+!if $%BUILD_TARGET_ARCH% == "x86"
   ${VerifyFileEx} "${un}" "$SYSDIR\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -868 +872 @@
     Goto verify_msd3d
   ${EndIf}
+!endif
+  
   ${VerifyFileEx} "${un}" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -875 +881 @@
 
   ${If} $g_bCapDllCache == "true"
+!if $%BUILD_TARGET_ARCH% == "x86"
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -880 +887 @@
       Goto verify_msd3d
     ${EndIf}
+!endif
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -888 +896 @@
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
-
   ${VerifyFileEx} "${un}" "$g_strSysWow64\d3d8.dll" "Microsoft Corporation" "x86"
   Pop $0
@@ -919 +926 @@
 verify_msd3d:
 
+!if $%BUILD_TARGET_ARCH% == "x86"
   ${VerifyFileEx} "${un}" "$SYSDIR\msd3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -924 +932 @@
     Goto invalid
   ${EndIf}
+!endif
   ${VerifyFileEx} "${un}" "$SYSDIR\msd3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -931 +940 @@
 
   ${If} $g_bCapDllCache == "true"
+!if $%BUILD_TARGET_ARCH% == "x86"
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\msd3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -936 +946 @@
       Goto invalid
     ${EndIf}
+!endif
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\msd3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -944 +955 @@
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
-
   ${VerifyFileEx} "${un}" "$g_strSysWow64\msd3d8.dll" "Microsoft Corporation" "x86"
   Pop $0
@@ -968 +978 @@
     ${EndIf}
   ${EndIf}
-
 !endif