Changeset 40387 in vbox for trunk/src/VBox/Additions/common/VBoxVideo

Timestamp:

Mar 6, 2012 8:38:49 PM (13 years ago)

Author:

vboxsync

Message:

wddm: concurrency fixes

File:

• trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp (modified) (14 diffs)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -128 +128 @@
                                     uint16_t u16Op)
 {
-#ifdef VBOX_WITH_WDDM
-    /* @todo: add synchronization */
+#ifdef VBOX_WDDM_MINIPORT
+    return VBoxSHGSMIHeapAlloc (&pCtx->heapCtx, cbData, u8Ch, u16Op);
+#else
+    return HGSMIHeapAlloc (&pCtx->heapCtx, cbData, u8Ch, u16Op);
 #endif
-    return HGSMIHeapAlloc (&pCtx->heapCtx, cbData, u8Ch, u16Op);
 }
 
@@ -144 +145 @@
                                  void *pvBuffer)
 {
-#ifdef VBOX_WITH_WDDM
-    /* @todo: add synchronization */
+#ifdef VBOX_WDDM_MINIPORT
+    VBoxSHGSMIHeapFree (&pCtx->heapCtx, pvBuffer);
+#else
+    HGSMIHeapFree (&pCtx->heapCtx, pvBuffer);
 #endif
-    HGSMIHeapFree (&pCtx->heapCtx, pvBuffer);
 }
 
@@ -161 +163 @@
 {
     /* Initialize the buffer and get the offset for port IO. */
-    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&pCtx->heapCtx, pvBuffer);
+    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (HGSMIGUESTCMDHEAP_GET(&pCtx->heapCtx), pvBuffer);
 
     Assert(offBuffer != HGSMIOFFSET_VOID);
@@ -184 +186 @@
 
     /* Allocate the IO buffer. */
-    p = (HGSMIBUFFERLOCATION *)HGSMIHeapAlloc(&pCtx->heapCtx,
+    p = (HGSMIBUFFERLOCATION *)VBoxHGSMIBufferAlloc(pCtx,
                                               sizeof(HGSMIBUFFERLOCATION),
                                               HGSMI_CH_HGSMI,
@@ -195 +197 @@
         rc = VBoxHGSMIBufferSubmit(pCtx, p);
         /* Free the IO buffer. */
-        HGSMIHeapFree (&pCtx->heapCtx, p);
+        VBoxHGSMIBufferFree(pCtx, p);
     }
     else
@@ -212 +214 @@
 
     /* Allocate the IO buffer. */
-    pCaps = (VBVACAPS *)HGSMIHeapAlloc(&pCtx->heapCtx,
+    pCaps = (VBVACAPS *)VBoxHGSMIBufferAlloc(pCtx,
                                        sizeof(VBVACAPS), HGSMI_CH_VBVA,
                                        VBVA_INFO_CAPS);
@@ -228 +230 @@
         }
         /* Free the IO buffer. */
-        HGSMIHeapFree(&pCtx->heapCtx, pCaps);
+        VBoxHGSMIBufferFree(pCtx, pCaps);
     }
     else
@@ -245 +247 @@
 
     /* Allocate the IO buffer. */
-    p = (VBVAINFOHEAP *)HGSMIHeapAlloc(&pCtx->heapCtx,
+    p = (VBVAINFOHEAP *)VBoxHGSMIBufferAlloc(pCtx,
                                        sizeof (VBVAINFOHEAP), HGSMI_CH_VBVA,
                                        VBVA_INFO_HEAP);
@@ -255 +257 @@
         rc = VBoxHGSMIBufferSubmit(pCtx, p);
         /* Free the IO buffer. */
-        HGSMIHeapFree(&pCtx->heapCtx, p);
+        VBoxHGSMIBufferFree(pCtx, p);
     }
     else
@@ -322 +324 @@
     /** @todo should we be using a fixed ISA port value here? */
     pCtx->port = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
+#ifdef VBOX_WDDM_MINIPORT
+    return VBoxSHGSMIInit(&pCtx->heapCtx, pvGuestHeapMemory,
+                          cbGuestHeapMemory, offVRAMGuestHeapMemory,
+                          false /*fOffsetBased*/);
+#else
     return HGSMIHeapSetup(&pCtx->heapCtx, pvGuestHeapMemory,
                           cbGuestHeapMemory, offVRAMGuestHeapMemory,
                           false /*fOffsetBased*/);
+#endif
 }
 
@@ -460 +468 @@
 
     /* Allocate the IO buffer. */
-    p = (VBVACONF32 *)HGSMIHeapAlloc(&pCtx->heapCtx,
+    p = (VBVACONF32 *)VBoxHGSMIBufferAlloc(pCtx,
                                      sizeof(VBVACONF32), HGSMI_CH_VBVA,
                                      VBVA_QUERY_CONF32);
@@ -475 +483 @@
         }
         /* Free the IO buffer. */
-        HGSMIHeapFree(&pCtx->heapCtx, p);
+        VBoxHGSMIBufferFree(pCtx, p);
     }
     else
@@ -528 +536 @@
     }
     /* Allocate the IO buffer. */
-    p = (VBVAMOUSEPOINTERSHAPE *)HGSMIHeapAlloc(&pCtx->heapCtx,
+    p = (VBVAMOUSEPOINTERSHAPE *)VBoxHGSMIBufferAlloc(pCtx,
                                                   sizeof(VBVAMOUSEPOINTERSHAPE)
                                                 + cbData,
@@ -551 +559 @@
             rc = p->i32Result;
         /* Free the IO buffer. */
-        HGSMIHeapFree(&pCtx->heapCtx, p);
+        VBoxHGSMIBufferFree(pCtx, p);
     }
     else