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

Timestamp:

Oct 4, 2011 2:28:42 PM (13 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Use WDDM driver by default on Windows 8.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (3 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)

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

@@ -651 +651 @@
 !endif
 
-vista: ; Windows Vista / Windows 7
+vista: ; Windows Vista / Windows 7 / Windows 8
 
   ; Copy some common files ...
@@ -963 +963 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
+    ; If we're running Windows 8 we always need the WDDM driver
+    ; -- so just print a hint about the required VRAM size and bail out
+    ${If} $g_strWinVersion == "8"
+      MessageBox MB_ICONINFORMATION|MB_OK $(VBOX_COMPONENT_D3D_HINT_VRAM) /SD IDOK
+      goto exit
+    ${EndIf}
+
     ; If we're able to use the WDDM driver just use it instead of the replaced
     ; D3D components below
@@ -1003 +1010 @@
     ${EndIf}
   ${Else} ; D3D unselected again
-    StrCpy $g_bWithWDDM "false"
+    ${If} $g_strWinVersion != "8" ; On Windows 8 WDDM is mandatory
+      StrCpy $g_bWithWDDM "false"
+    ${EndIf}
   ${EndIf}
   Goto exit

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

@@ -512 +512 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
-  ; If we're on a 32-bit Windows Vista / 7 we can use the WDDM driver
+  ; If we're on a 32-bit Windows Vista / 7 / 8 we can use the WDDM driver
   ${If} $g_strWinVersion == "Vista"
   ${OrIf} $g_strWinVersion == "7"
   ${OrIf} $g_strWinVersion == "8"
     StrCpy $g_bCapWDDM "true"
+  ${EndIf}
+  ; If we're on Windows 8 we *have* to use the WDDM driver, so select it
+  ; by default
+  ${If} $g_strWinVersion == "8"
+    StrCpy $g_bWithWDDM "true"
   ${EndIf}
 !endif