Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh	(revision 40719)
+++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh	(revision 40720)
@@ -862,5 +862,9 @@
   ; 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,4 +872,6 @@
     Goto verify_msd3d
   ${EndIf}
+!endif
+  
   ${VerifyFileEx} "${un}" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -875,4 +881,5 @@
 
   ${If} $g_bCapDllCache == "true"
+!if $%BUILD_TARGET_ARCH% == "x86"
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -880,4 +887,5 @@
       Goto verify_msd3d
     ${EndIf}
+!endif
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -888,5 +896,4 @@
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
-
   ${VerifyFileEx} "${un}" "$g_strSysWow64\d3d8.dll" "Microsoft Corporation" "x86"
   Pop $0
@@ -919,4 +926,5 @@
 verify_msd3d:
 
+!if $%BUILD_TARGET_ARCH% == "x86"
   ${VerifyFileEx} "${un}" "$SYSDIR\msd3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -924,4 +932,5 @@
     Goto invalid
   ${EndIf}
+!endif
   ${VerifyFileEx} "${un}" "$SYSDIR\msd3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
   Pop $0
@@ -931,4 +940,5 @@
 
   ${If} $g_bCapDllCache == "true"
+!if $%BUILD_TARGET_ARCH% == "x86"
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\msd3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -936,4 +946,5 @@
       Goto invalid
     ${EndIf}
+!endif
     ${VerifyFileEx} "${un}" "$SYSDIR\dllcache\msd3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     Pop $0
@@ -944,5 +955,4 @@
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
-
   ${VerifyFileEx} "${un}" "$g_strSysWow64\msd3d8.dll" "Microsoft Corporation" "x86"
   Pop $0
@@ -968,5 +978,4 @@
     ${EndIf}
   ${EndIf}
-
 !endif