Changeset 37300 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Jun 1, 2011 7:45:51 PM (14 years ago)

Author:

vboxsync

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

72046

Message:

wddm: memory leaks fixes, some cleanup

Location:

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

Files:

• VBoxMPMisc.cpp (modified) (12 diffs)
• VBoxMPMisc.h (modified) (1 diff)
• VBoxMPTypes.h (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -21 +21 @@
 #include <stdio.h>
 
+/* simple handle -> value table API */
 NTSTATUS vboxWddmHTableCreate(PVBOXWDDM_HTABLE pTbl, uint32_t cSize)
 {
@@ -35 +36 @@
 VOID vboxWddmHTableDestroy(PVBOXWDDM_HTABLE pTbl)
 {
+    if (!pTbl->paData)
+        return;
+
     vboxWddmMemFree(pTbl->paData);
 }
@@ -54 +58 @@
     {
         PVOID *pvNewData = (PVOID*)vboxWddmMemAllocZero(sizeof (pTbl->paData[0]) * cNewSize);
+        if (!pvNewData)
+        {
+            WARN(("vboxWddmMemAllocZero failed for size (%d)", sizeof (pTbl->paData[0]) * cNewSize));
+            return STATUS_NO_MEMORY;
+        }
         memcpy(pvNewData, pTbl->paData, sizeof (pTbl->paData[0]) * pTbl->cSize);
+        vboxWddmMemFree(pTbl->paData);
         pTbl->iNext2Search = pTbl->cSize;
         pTbl->cSize = cNewSize;
@@ -61 +71 @@
     }
     else if (cNewSize >= pTbl->cData)
+    {
+        AssertFailed();
         return STATUS_NOT_IMPLEMENTED;
+    }
     return STATUS_INVALID_PARAMETER;
 
@@ -324 +337 @@
     Assert(pTst == pSwapchain);
     RemoveEntryList(&pSwapchain->DevExtListEntry);
-//    pSwapchain->pContext = NULL;
     pSwapchain->hSwapchainKm = NULL;
     if (pSwapchain->pLastReportedRects)
@@ -334 +346 @@
 }
 
+/* adds the given swapchain to the context's swapchain list
+ * @return true on success */
 BOOLEAN vboxWddmSwapchainCtxAdd(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_SWAPCHAIN pSwapchain)
 {
@@ -343 +357 @@
 }
 
+/* removes the given swapchain from the context's swapchain list
+ * */
 VOID vboxWddmSwapchainCtxRemove(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_SWAPCHAIN pSwapchain)
 {
@@ -350 +366 @@
 }
 
+/* destroys all swapchains for the given context
+ * */
 VOID vboxWddmSwapchainCtxDestroyAll(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext)
 {
@@ -370 +388 @@
 }
 
+/* process the swapchain info passed from user-mode display driver & synchronizes the driver state with it */
 NTSTATUS vboxWddmSwapchainCtxEscape(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXDISPIFESCAPE_SWAPCHAININFO pSwapchainInfo, UINT cbSize)
 {
@@ -403 +422 @@
     if (pSwapchainInfo->SwapchainInfo.hSwapchainKm)
     {
-//            ExAcquireFastMutex(&pContext->SwapchainMutex);
         ExAcquireFastMutex(&pDevExt->ContextMutex);
         pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableGet(&pContext->Swapchains, (VBOXWDDM_HANDLE)pSwapchainInfo->SwapchainInfo.hSwapchainKm);
@@ -455 +473 @@
     }
 
-//    ExReleaseFastMutex(&pContext->SwapchainMutex);
     ExReleaseFastMutex(&pDevExt->ContextMutex);
 
@@ -471 +488 @@
 
     return STATUS_SUCCESS;
+}
+
+NTSTATUS vboxWddmSwapchainCtxInit(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext)
+{
+    NTSTATUS Status = vboxWddmHTableCreate(&pContext->Swapchains, 4);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN(("vboxWddmHTableCreate failes, Status (x%x)", Status));
+        return Status;
+    }
+
+    return STATUS_SUCCESS;
+}
+
+VOID vboxWddmSwapchainCtxTerm(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext)
+{
+    vboxWddmSwapchainCtxDestroyAll(pDevExt, pContext);
+    vboxWddmHTableDestroy(&pContext->Swapchains);
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.h

@@ -79 +79 @@
 VOID vboxWddmSwapchainCtxDestroyAll(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext);
 NTSTATUS vboxWddmSwapchainCtxEscape(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXDISPIFESCAPE_SWAPCHAININFO pSwapchainInfo, UINT cbSize);
+NTSTATUS vboxWddmSwapchainCtxInit(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext);
+VOID vboxWddmSwapchainCtxTerm(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext);
 
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPTypes.h

@@ -197 +197 @@
     UINT  EngineAffinity;
 //    UINT uLastCompletedCmdFenceId;
-    FAST_MUTEX SwapchainMutex;
     VBOXWDDM_HTABLE Swapchains;
     VBOXVIDEOCM_CTX CmContext;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -1228 +1228 @@
     /* DxgkDdiUnload should be made pageable. */
     PAGED_CODE();
-    LOGF(("ENTER"));
+    LOGF((": unloading"));
 
     vboxVDbgBreakFv();
 
-    LOGF(("LEAVE"));
+    PRTLOGGER pLogger = RTLogRelSetDefaultInstance(NULL);
+    if (pLogger)
+    {
+        RTLogDestroy(pLogger);
+    }
+    pLogger = RTLogSetDefaultInstance(NULL);
+    if (pLogger)
+    {
+        RTLogDestroy(pLogger);
+    }
 }
 
@@ -3586 +3595 @@
         {
             /* @todo: check that we actually need the current source->target */
-            D3DKMDT_2DREGION Resolution;
             PVBOXWDDM_VIDEOMODES_INFO pInfo = &pInfos[i];
             VIDEO_MODE_INFORMATION *pModeInfo = &pInfo->aModes[pInfo->iPreferredMode];
+#if 1
+            D3DKMDT_2DREGION Resolution;
             Resolution.cx = pModeInfo->VisScreenWidth;
             Resolution.cy = pModeInfo->VisScreenHeight;
             Status = vboxVidPnCheckAddMonitorModes(pDevExt, i, D3DKMDT_MCO_DRIVER, &Resolution, 1);
+#else
+            Status = vboxVidPnCheckAddMonitorModes(pDevExt, i, D3DKMDT_MCO_DRIVER, pInfo->aResolutions, pInfo->cResolutions);
+#endif
             Assert(Status == STATUS_SUCCESS);
             if (Status != STATUS_SUCCESS)
@@ -5053 +5066 @@
                         if (Status == STATUS_SUCCESS)
                         {
-                            ExInitializeFastMutex(&pContext->SwapchainMutex);
-                            Status = vboxWddmHTableCreate(&pContext->Swapchains, 4);
+                            Status = vboxWddmSwapchainCtxInit(pDevExt, pContext);
                             Assert(Status == STATUS_SUCCESS);
                             if (Status == STATUS_SUCCESS)
@@ -5069 +5081 @@
                                     break;
                                 }
-                                vboxWddmHTableDestroy(&pContext->Swapchains);
+
+                                vboxWddmSwapchainCtxTerm(pDevExt, pContext);
                             }
                         }
@@ -5149 +5162 @@
         if (Status == STATUS_SUCCESS)
         {
-            vboxWddmSwapchainCtxDestroyAll(pDevExt, pContext);
+            vboxWddmSwapchainCtxTerm(pDevExt, pContext);
             vboxWddmMemFree(pContext);
         }