Changeset 27955 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

Timestamp:

Apr 2, 2010 9:12:26 AM (15 years ago)

Author:

vboxsync

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

59659

Message:

wddm: vboxtray: abstraction display driver API for passing escape codes (using ExtEscape for XPDM & PFND3DKMT stugg for WDDM); WDDM miniport driver: basics for handling autoresize & seamles

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

@@ -38 +38 @@
     BOOL    (* pfnVBoxRemoveHook)();
 
-    LPRGNDATA lpRgnData;
+    PVBOXDISPIFESCAPE lpEscapeData;
 } VBOXSEAMLESSCONTEXT;
 
@@ -144 +144 @@
         gCtx.pfnVBoxRemoveHook();
 
-    if (gCtx.lpRgnData)
-    {
-        free(gCtx.lpRgnData);
-        gCtx.lpRgnData = NULL;
+    if (gCtx.lpEscapeData)
+    {
+        free(gCtx.lpEscapeData);
+        gCtx.lpEscapeData = NULL;
     }
 }
@@ -238 +238 @@
         if (cbSize)
         {
-            LPRGNDATA lpRgnData = (LPRGNDATA)malloc(cbSize);
-            if (lpRgnData)
-            {
+            PVBOXDISPIFESCAPE lpEscapeData = (PVBOXDISPIFESCAPE)malloc(VBOXDISPIFESCAPE_SIZE(cbSize));
+            if (lpEscapeData)
+            {
+                lpEscapeData->escapeCode = VBOXESC_SETVISIBLEREGION;
+                LPRGNDATA lpRgnData = VBOXDISPIFESCAPE_DATA(lpEscapeData, RGNDATA);
                 memset(lpRgnData, 0, cbSize);
                 cbSize = GetRegionData(param.hrgn, cbSize, lpRgnData);
@@ -254 +256 @@
                     }
 #endif
-                    if (    !gCtx.lpRgnData
-                        ||  (gCtx.lpRgnData->rdh.dwSize + gCtx.lpRgnData->rdh.nRgnSize != cbSize)
-                        ||  memcmp(gCtx.lpRgnData, lpRgnData, cbSize))
+                    LPRGNDATA lpCtxRgnData = VBOXDISPIFESCAPE_DATA(gCtx.lpEscapeData, RGNDATA);
+                    if (    !gCtx.lpEscapeData
+                        ||  (lpCtxRgnData->rdh.dwSize + lpCtxRgnData->rdh.nRgnSize != cbSize)
+                        ||  memcmp(lpCtxRgnData, lpRgnData, cbSize))
                     {
                         /* send to display driver */
-                        ExtEscape(param.hdc, VBOXESC_SETVISIBLEREGION, cbSize, (LPCSTR)lpRgnData, 0, NULL);
-
-                        if (gCtx.lpRgnData)
-                            free(gCtx.lpRgnData);
-                        gCtx.lpRgnData = lpRgnData;
+                        VBoxDispIfEscape(&gCtx.pEnv->dispIf, lpEscapeData, cbSize);
+
+                        if (gCtx.lpEscapeData)
+                            free(gCtx.lpEscapeData);
+                        gCtx.lpEscapeData = lpEscapeData;
                     }
                     else
                         Log(("Visible rectangles haven't changed; ignore\n"));
                 }
-                if (lpRgnData != gCtx.lpRgnData)
-                    free(lpRgnData);
+                if (lpEscapeData != gCtx.lpEscapeData)
+                    free(lpEscapeData);
             }
         }