Changeset 34363 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 25, 2010 12:43:01 PM (14 years ago)

Author:

vboxsync

Message:

wddm: disable for guest installer

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Miniport/wddm/VBoxVideoWddm.cpp (modified) (1 diff)
• Installer/Makefile.kmk (modified) (2 diffs)
• Installer/VBoxGuestAdditions.nsi (modified) (2 diffs)
• Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -957 +957 @@
             /* this is not entirely correct since host may concurrently complete some commands and raise a new IRQ while we are here,
              * still this allows to check that the host flags are correctly cleared after the ISR */
-            Assert(commonFromDeviceExt(pDevExt)->HostCtx.pfHostFlags);
-            uint32_t flags = commonFromDeviceExt(pDevExt)->HostCtx.pfHostFlags->u32HostFlags;
+            Assert(commonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags);
+            uint32_t flags = commonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags->u32HostFlags;
             Assert(flags == 0);
 #endif

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -133 +133 @@
  endif
 endif
-ifdef VBOX_WITH_WDDM
+if 0 #def VBOX_WITH_WDDM
  ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \
@@ -166 +166 @@
         -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),1,0)' \
         -E 'VBOX_WITH_GUEST_INSTALL_HELPER=$(if $(VBOX_WITH_GUEST_INSTALL_HELPER),1,0)' \
-        -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
+        -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),0,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
         -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

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

@@ -950 +950 @@
   ${If} $0 == ${SF_SELECTED}
 
+!if $%VBOX_WITH_WDDM% == "1"
     ; If we're able to use the WDDM driver just use it instead of the replaced
     ; D3D components below
@@ -956 +957 @@
       Goto exit
     ${EndIf}
+!endif
 
     ${If} $g_bForceInstall != "true"

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

@@ -448 +448 @@
   ;       DetailPrint and friends won't work here!
 
-!if $%BUILD_TARGET_ARCH% == "x86"
+!if $%VBOX_WITH_WDDM% == "1"
+ !if $%BUILD_TARGET_ARCH% == "x86"
   ; If we're on a 32-bit Windows Vista / 7 we can use the WDDM driver
   ${If} $g_strWinVersion == "Vista"
@@ -454 +455 @@
     StrCpy $g_bCapWDDM "true"
   ${EndIf}
+ !endif
 !endif