Changeset 50626 in vbox for trunk/src/VBox/HostServices

Timestamp:

Feb 27, 2014 10:35:21 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL/win: proper deal with HRGN

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -1233 +1233 @@
 }
 
+static void renderspuWindowRgnApply(WindowInfo *window)
+{
+    HRGN hRgn = window->hRgn;
+    if (hRgn)
+    {
+        /* note: according to the docs, SetWindowRgn owns the regions after it is called,
+         * and the regions will be freed automatically when needed,
+         * i.e. the caller should not do that.
+         * this is why we need to make a copy of the regions to be passed in */
+
+        int result;
+        hRgn = CreateRectRgn(0, 0, 0, 0);
+        if (!hRgn)
+        {
+            WARN(("CreateRectRgn failed"));
+            return;
+        }
+
+        result =  CombineRgn(hRgn, window->hRgn, NULL, RGN_COPY);
+        if (result == ERROR)
+        {
+            WARN(("CombineRgn failed"));
+            return;
+        }
+    }
+
+    SetWindowRgn(window->hWnd, hRgn, true);
+}
+
 /* Either show or hide the render SPU's window. */
 void renderspu_SystemShowWindow( WindowInfo *window, GLboolean showIt )
@@ -1239 +1268 @@
     {
         crDebug("SHOW renderspu_SystemShowWindow: %x", window->hWnd);
-        SetWindowRgn(window->hWnd, window->hRgn, true);
+        renderspuWindowRgnApply(window);
     }
     else
@@ -1247 +1276 @@
         hRgn = CreateRectRgn(0, 0, 0, 0);
         SetWindowRgn(window->hWnd, hRgn, true);
-        DeleteObject(hRgn);
+        /* note: according to the docs, SetWindowRgn owns the regions after it is called,
+         * and the regions will be freed automatically when needed,
+         * i.e. the caller should not do that */
     }
     window->visible = showIt;
@@ -1572 +1603 @@
     }
 
+    window->hRgn = hRgn;
+
     if (window->visible)
-        SetWindowRgn(window->hWnd, hRgn, true);
+        renderspuWindowRgnApply(window);
 
     crDebug("Render SPU: SetWindowRgn (%x, cRects=%i)", window->hWnd, cRects);
-
-    window->hRgn = hRgn;
 }