Changeset 30483 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispMp.cpp

Timestamp:

Jun 28, 2010 7:00:55 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: visible regions impl & fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispMp.cpp (modified) (5 diffs)

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

@@ -56 +56 @@
 static VBOXDISPMP g_VBoxDispMp;
 
-HRESULT vboxDispMpEnable()
+DECLCALLBACK(HRESULT) vboxDispMpEnableEvents()
 {
     g_VBoxDispMp.pEscapeCmd = NULL;
@@ -65 +65 @@
 
 
-HRESULT vboxDispMpDisable()
+DECLCALLBACK(HRESULT) vboxDispMpDisableEvents()
 {
     if (g_VBoxDispMp.pEscapeCmd)
@@ -76 +76 @@
 #define VBOXDISPMP_BUF_MAXSIZE  ((4096*4096)-96)
 
-HRESULT vboxDispMpGetRegions(PVBOXDISPMP_REGIONS pRegions, DWORD dwMilliseconds)
+DECLCALLBACK(HRESULT) vboxDispMpGetRegions(PVBOXDISPMP_REGIONS pRegions, DWORD dwMilliseconds)
 {
     HRESULT hr = S_OK;
@@ -106 +106 @@
                     break;
                 }
-                else if (g_VBoxDispMp.pEscapeCmd->Hdr.cbRemainingCmds)
+                else
                 {
+                    Assert(g_VBoxDispMp.pEscapeCmd->Hdr.cbRemainingCmds);
+                    Assert(g_VBoxDispMp.pEscapeCmd->Hdr.cbRemainingFirstCmd);
                     RTMemFree(g_VBoxDispMp.pEscapeCmd);
                     uint32_t newSize = RT_MAX(g_VBoxDispMp.cbEscapeCmd + VBOXDISPMP_BUF_INCREASE, g_VBoxDispMp.pEscapeCmd->Hdr.cbRemainingFirstCmd);
                     if (newSize < VBOXDISPMP_BUF_MAXSIZE)
                         newSize = RT_MAX(newSize, RT_MIN(g_VBoxDispMp.pEscapeCmd->Hdr.cbRemainingCmds, VBOXDISPMP_BUF_MAXSIZE));
+                    Assert(g_VBoxDispMp.cbEscapeCmd < newSize);
                     g_VBoxDispMp.pEscapeCmd = (PVBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD)RTMemAlloc(newSize);
                     Assert(g_VBoxDispMp.pEscapeCmd);
                     if (g_VBoxDispMp.pEscapeCmd)
                         g_VBoxDispMp.cbEscapeCmd = newSize;
+                    else
+                    {
+                        g_VBoxDispMp.pEscapeCmd = NULL;
+                        g_VBoxDispMp.cbEscapeCmd = 0;
+                        hr = E_OUTOFMEMORY;
+                        break;
+                    }
                 }
             }
@@ -133 +143 @@
     return hr;
 }
+
+VBOXDISPMP_DECL(HRESULT) VBoxDispMpGetCallbacks(uint32_t u32Version, PVBOXDISPMP_CALLBACKS pCallbacks)
+{
+    Assert(u32Version == VBOXDISPMP_VERSION);
+    if (u32Version != VBOXDISPMP_VERSION)
+        return E_INVALIDARG;
+
+    pCallbacks->pfnEnableEvents = vboxDispMpEnableEvents;
+    pCallbacks->pfnDisableEvents = vboxDispMpDisableEvents;
+    pCallbacks->pfnGetRegions = vboxDispMpGetRegions;
+    return S_OK;
+}