Changeset 49265 in vbox for trunk

Timestamp:

Oct 23, 2013 5:57:33 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Quartz2D frame-buffer: Next iteration in EMT vs GUI thread sync; also build-fix for r90175.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp

@@ -76 +76 @@
              (unsigned long)aCount));
 
+    /* Make sure rectangles were passed: */
+    if (!pRectangles)
+    {
+        LogRel2(("UIFrameBufferQuartz2D::SetVisibleRegion: Invalid pRectangles pointer!\n"));
+
+        return E_POINTER;
+    }
+
+    /* Lock access to frame-buffer: */
+    lock();
+
     /* Make sure frame-buffer is used: */
-    if (isMarkedAsUnused())
+    if (m_fIsMarkedAsUnused)
     {
         LogRel2(("UIFrameBufferQuartz2D::SetVisibleRegion: Ignored!\n"));
+
+        /* Unlock access to frame-buffer: */
+        unlock();
 
         /* Ignore SetVisibleRegion: */
         return E_FAIL;
     }
-
-    /* Make sure rectangles were passed: */
-    PRTRECT rects = (PRTRECT)pRectangles;
-    if (!rects)
-        return E_POINTER;
 
     /** @todo r=bird: Is this thread safe? If I remember the code flow correctly, the
@@ -108 +117 @@
         rgnRcts = (RegionRects *)RTMemAlloc(RT_OFFSETOF(RegionRects, rcts[allocated]));
         if (!rgnRcts)
+        {
+            /* Unlock access to frame-buffer: */
+            unlock();
+
             return E_OUTOFMEMORY;
+        }
         rgnRcts->allocated = allocated;
     }
@@ -115 +129 @@
     /* Compose region: */
     QRegion reg;
+    PRTRECT rects = (PRTRECT)pRectangles;
     QRect vmScreenRect(0, 0, width(), height());
     for (ULONG ind = 0; ind < aCount; ++ ind)
@@ -153 +168 @@
     LogRel2(("UIFrameBufferQuartz2D::SetVisibleRegion: Sending to async-handler...\n"));
     emit sigSetVisibleRegion(reg);
+
+    /* Unlock access to frame-buffer: */
+    unlock();
 
     /* Confirm SetVisibleRegion: */