Changeset 33684 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Nov 2, 2010 12:17:19 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67308

Message:

wddm/3d: fix hgcm fallback (for insufficient hgsmi resources)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxCrHgsmi.cpp (modified) (1 diff)
• VBoxDispD3D.cpp (modified) (5 diffs)
• VBoxUhgsmiKmt.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxCrHgsmi.cpp

@@ -122 +122 @@
             hClient = g_VBoxCrHgsmiCallbacks.pfnClientCreate(&pHgsmiGL->BasePrivate.Base);
             Assert(hClient);
-            pHgsmiGL->BasePrivate.hClient = hClient;
-            gt_pHgsmiGL = pHgsmiGL;
-        }
-    }
-    else
-        hClient = NULL;
-    return hClient;
+            if (hClient)
+            {
+                pHgsmiGL->BasePrivate.hClient = hClient;
+                gt_pHgsmiGL = pHgsmiGL;
+                return hClient;
+            }
+            vboxUhgsmiKmtDestroy(pHgsmiGL);
+        }
+        RTMemFree(pHgsmiGL);
+    }
+
+    return NULL;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -1883 +1883 @@
         else if (pSwapchain->iBB == iRt)
         {
-            Assert(0);
             pSwapchain->iBB = 0;
         }
@@ -1997 +1996 @@
     if (!pSwapchain)
     {
-#ifdef DEBUG_misha
-        Assert(0);
-#endif
         /* first search for the swapchain the alloc might be added to */
         PVBOXWDDMDISP_SWAPCHAIN pCur = RTListNodeGetFirst(&pDevice->SwapchainList, VBOXWDDMDISP_SWAPCHAIN, ListEntry);
@@ -5391 +5387 @@
 //                Assert(pScreen->hWnd);
 //                Assert(pScreen->pDevice9If);
+                hr = E_FAIL;
                 Assert(0);
             }
@@ -6722 +6719 @@
     {
         case D3DDDIQUERYTYPE_EVENT:
-            Assert(0);
             pQuery->data.bData = TRUE;
             Assert(pData->pData);
@@ -8180 +8176 @@
         case 0x40010006: /* <- OutputDebugString exception, ignore */
         case 0xe06d7363: /* <- ms compiler - generated exception related to C++ exception */
+        case 0x000006d9: /* <- RPC exception, ignore */
             break;
         default:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp

@@ -170 +170 @@
             return VINF_SUCCESS;
         }
+        else
+        {
+            rc = VERR_OUT_OF_RESOURCES;
+        }
 
         RTMemFree(pBuf);
@@ -325 +329 @@
 
             return VINF_SUCCESS;
+        }
+        else
+        {
+            rc = VERR_OUT_OF_RESOURCES;
         }