儲存庫 vbox 的更動 34363

時間撮記:

2010-11-25 下午12:43:01 (14 年以前)

作者:

vboxsync

訊息:

wddm: disable for guest installer

位置:

trunk/src/VBox/Additions/WINNT

檔案:

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

-              r34346
+              r34363
             /* 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

-              r34098
+              r34363
  endif
 endif
 ifdef VBOX_WITH_WDDM
+if 0 #def VBOX_WITH_WDDM
  ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \
 …
         -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))' \

-              r34362
+              r34363
   ${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
 …
       Goto exit
     ${EndIf}
+!endif
     ${If} $g_bForceInstall != "true"

-              r34362
+              r34363
   ;       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"
 …
     StrCpy $g_bCapWDDM "true"
   ${EndIf}
+ !endif
 !endif

注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器