Changeset 39600 in vbox for trunk/src/VBox

Timestamp:

Dec 14, 2011 8:58:22 AM (13 years ago)

Author:

vboxsync

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

75373

Message:

Windows Guest Additions installer: Always do D3D file verification.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh (modified) (1 diff)

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

@@ -27 +27 @@
   ${EndIf}
 
-  ${If} $g_bWithD3D == "true"
-    ; Validate D3D files
-    Call ValidateD3DFiles
-    Pop $0
-    ${If} $0 == "1" ; D3D files are invalid
-      ${If} $g_bWithWDDM == "true"
-        MessageBox MB_ICONSTOP|MB_OK $(VBOX_COMPONENT_D3D_INVALID_WDDM) /SD IDOK
-        goto failure
-      ${Else}
-        MessageBox MB_ICONSTOP|MB_OKCANCEL $(VBOX_COMPONENT_D3D_INVALID_XPDM) /SD IDCANCEL IDCANCEL failure
-      ${EndIf}
+  ; Validate D3D files, regardless whether D3D support is selected or not
+  Call ValidateD3DFiles
+  Pop $0
+  ${If} $0 == "1" ; D3D files are invalid
+    ${If} $g_bWithWDDM == "true"
+    MessageBox MB_ICONSTOP|MB_OK $(VBOX_COMPONENT_D3D_INVALID_WDDM) /SD IDOK
+    goto failure
+    ${Else}
+    MessageBox MB_ICONSTOP|MB_OKCANCEL $(VBOX_COMPONENT_D3D_INVALID_XPDM) /SD IDCANCEL IDCANCEL failure
     ${EndIf}
   ${EndIf}