Changeset 51361 in vbox

Timestamp:

May 22, 2014 9:29:44 PM (11 years ago)

Author:

vboxsync

Message:

wddm/crOpenGL: misc bugfixes

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (4 diffs)
• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (2 diffs)

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

@@ -1062 +1062 @@
     VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType;
     volatile uint32_t cRefs;
+    PVOID pvUm;
     MDL Mdl;
 } VBOXVIDEOCM_ALLOC_REF, *PVBOXVIDEOCM_ALLOC_REF;
@@ -1183 +1184 @@
                 if (pvUm)
                 {
+                    pAllocRef->pvUm = pvUm;
                     pAllocRef->pContext = pContext;
                     pAllocRef->pAlloc = pAlloc;
@@ -1197 +1199 @@
                         return STATUS_SUCCESS;
                     }
+
+                    MmUnmapLockedPages(pvUm, &pAllocRef->Mdl);
                 }
                 else
@@ -1237 +1241 @@
         /* wait for the dereference, i.e. for all commands involving this allocation to complete */
         vboxWddmCounterU32Wait(&pAllocRef->cRefs, 1);
+
+        MmUnmapLockedPages(pAllocRef->pvUm, &pAllocRef->Mdl);
 
         MmUnlockPages(&pAllocRef->Mdl);

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

@@ -1324 +1324 @@
 
 #ifdef VBOX_WITH_CROGL
+    if (pDevExt->u32CrConDefaultClientID)
+        VBoxMpCrCtlConDisconnect(pDevExt, &pDevExt->CrCtlCon, pDevExt->u32CrConDefaultClientID);
+
     VBoxMpCrShgsmiTransportTerm(&pDevExt->CrHgsmiTransport);
 #endif

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -269 +269 @@
     NOREF(pvClient);
 
+    if (g_u32fCrHgcmDisabled)
+    {
+        WARN(("connect not expected"));
+        return VERR_INVALID_STATE;
+    }
+
     Log(("SHARED_CROPENGL svcConnect: u32ClientID = %d\n", u32ClientID));
 
@@ -281 +287 @@
 
     NOREF(pvClient);
+
+    if (g_u32fCrHgcmDisabled)
+    {
+        WARN(("disconnect not expected"));
+        return VINF_SUCCESS;
+    }
 
     Log(("SHARED_CROPENGL svcDisconnect: u32ClientID = %d\n", u32ClientID));