Changeset 38994 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

Timestamp:

Oct 14, 2011 9:10:48 AM (13 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Use WDDM driver by default on Windows 8. Enable the 3D section by default and make it read-only.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (6 diffs)

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

@@ -759 +759 @@
 
 ; Direct3D support
-!if $%VBOX_WITH_CROGL% == "1"
 Section /o $(VBOX_COMPONENT_D3D) SEC03
 
@@ -897 +896 @@
 
 SectionEnd
-!endif ; VBOX_WITH_CROGL
 
 !ifdef USE_MUI
@@ -963 +961 @@
 
 !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
@@ -1054 +1045 @@
 ; This function is called at the very beginning of installer execution
 Function .onInit
+
+  Push $0
 
   ; Init values
@@ -1170 +1163 @@
   ${EndIf}
 !endif
+  ; On Windows 8 we always select the 3D section and
+  ; disable it so that it cannot be deselected again
+  ${If} $g_strWinVersion == "8"
+    IntOp $0 ${SF_SELECTED} | ${SF_RO}
+    SectionSetFlags ${SEC03} $0
+  ${EndIf}
 
 !ifdef USE_MUI
@@ -1190 +1189 @@
 
 !endif ; UNINSTALLER_ONLY
+
+  Pop $0
 
 FunctionEnd