Changeset 72621 in vbox for trunk

Timestamp:

Jun 20, 2018 11:27:14 AM (7 years ago)

Author:

vboxsync

Message:

WDDM: display driver: handle the case when VBOXWDDMDISP_DEVICE::DefaultContext is not initialized

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm

Files:

• VBoxD3DIf.cpp (modified) (2 diffs)
• VBoxD3DIf.h (modified) (1 diff)
• VBoxDispCm.cpp (modified) (1 diff)
• VBoxDispD3D.cpp (modified) (3 diffs)
• VBoxUhgsmiDisp.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp

@@ -846 +846 @@
         {
             Assert(hostId);
+            Assert(pDevice->DefaultContext.ContextInfo.hContext);
 
             VBOXDISPIFESCAPE Data;
@@ -876 +877 @@
 }
 
-int vboxD3DIfSetHostId(PVBOXWDDMDISP_ALLOCATION pAlloc, uint32_t hostID, uint32_t *pHostID)
+static int vboxD3DIfSetHostId(PVBOXWDDMDISP_ALLOCATION pAlloc, uint32_t hostID, uint32_t *pHostID)
 {
     struct VBOXWDDMDISP_RESOURCE *pRc = pAlloc->pRc;
     PVBOXWDDMDISP_DEVICE pDevice = pRc->pDevice;
+
+    AssertReturn(pDevice->DefaultContext.ContextInfo.hContext, VERR_GENERAL_FAILURE);
 
     VBOXDISPIFESCAPE_SETALLOCHOSTID SetHostID = {0};

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.h

@@ -40 +40 @@
 void VBoxD3DIfLockUnlockMemSynch(struct VBOXWDDMDISP_ALLOCATION *pAlloc, D3DLOCKED_RECT *pLockInfo, RECT *pRect, bool bToLockInfo);
 
-int vboxD3DIfSetHostId(PVBOXWDDMDISP_ALLOCATION pAlloc, uint32_t hostID, uint32_t *pHostID);
 IUnknown* vboxD3DIfCreateSharedPrimary(PVBOXWDDMDISP_ALLOCATION pAlloc);
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispCm.cpp

@@ -209 +209 @@
 HRESULT vboxDispCmCtxDestroy(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_CONTEXT pContext)
 {
+    if (!pContext->ContextInfo.hContext)
+        return S_OK;
+
     return vboxDispCmSessionCtxDestroy(&g_pVBoxCmMgr.Session, pDevice, pContext);
 }

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -291 +291 @@
 static HRESULT vboxWddmDalNotifyChange(PVBOXWDDMDISP_DEVICE pDevice)
 {
+    if (!pDevice->DefaultContext.ContextInfo.hContext)
+        return E_FAIL;
+
     VBOXWDDMDISP_NSCADD NscAdd = { NULL }; /* Shuts up MSC. */
     BOOL bReinitRenderData = TRUE;
@@ -471 +474 @@
         else
         {
-            WARN(("vboxWddmDalNotifyChange failed %#x", hr));
+            // WARN(("vboxWddmDalNotifyChange failed %#x", hr));
             if (pAlloc->DirtyAllocListEntry.pNext)
                 vboxWddmDalRemove(pAlloc);
@@ -749 +752 @@
     if (cAllocsKm == Buf.SwapchainInfo.SwapchainInfo.cAllocs)
     {
+        AssertReturn(pDevice->DefaultContext.ContextInfo.hContext, E_FAIL);
+
         D3DDDICB_ESCAPE DdiEscape = {0};
         DdiEscape.hContext = pDevice->DefaultContext.ContextInfo.hContext;

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.cpp

@@ -163 +163 @@
     PVBOXUHGSMI_PRIVATE_D3D pHg = VBOXUHGSMID3D_GET(pHgsmi);
     PVBOXWDDMDISP_DEVICE pDevice = pHg->pDevice;
+
+    AssertReturn(pDevice->DefaultContext.ContextInfo.hContext, VERR_GENERAL_FAILURE);
+
     UINT cbDmaCmd = pDevice->DefaultContext.ContextInfo.CommandBufferSize;
     int rc = vboxUhgsmiBaseDxDmaFill(aBuffers, cBuffers,
@@ -207 +210 @@
     PVBOXUHGSMI_PRIVATE_D3D pPrivate = VBOXUHGSMID3D_GET(pHgsmi);
     PVBOXWDDMDISP_DEVICE pDevice = pPrivate->pDevice;
+
+    AssertReturn(pDevice->DefaultContext.ContextInfo.hContext, VERR_GENERAL_FAILURE);
+
     D3DDDICB_ESCAPE DdiEscape = {0};
     DdiEscape.hContext = pDevice->DefaultContext.ContextInfo.hContext;