Changeset 46086 in vbox

Timestamp:

May 15, 2013 7:29:54 AM (12 years ago)

Author:

vboxsync

Message:

DisplayImpl: fix and cleanup for postponed seamless region update

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -834 +834 @@
         }
         LogRelFlow(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
-        
+
         /* Handle the case if there are some saved visible region that needs to be 
          * applied after the resize of the framebuffer is completed 
          */
         SaveSeamlessRectLock();
-        PRTRECT pSavedSeamlessRgn = pFBInfo->mpSavedVisibleRegion;
-        uint32_t ucSavedSeamlessRgn = pFBInfo->mcSavedVisibleRegion;
+        PRTRECT pSavedVisibleRegion = pFBInfo->mpSavedVisibleRegion;
+        uint32_t cSavedVisibleRegion = pFBInfo->mcSavedVisibleRegion;
+        pFBInfo->mpSavedVisibleRegion = NULL;
+        pFBInfo->mcSavedVisibleRegion = 0;
         SaveSeamlessRectUnLock();
-        if (pSavedSeamlessRgn && ucSavedSeamlessRgn)
-        {
-            handleSetVisibleRegion(ucSavedSeamlessRgn, pSavedSeamlessRgn);
-            SaveSeamlessRectLock();
-            if (pFBInfo->mpSavedVisibleRegion)
-                RTMemFree(pFBInfo->mpSavedVisibleRegion);
-            pFBInfo->mpSavedVisibleRegion = NULL;
-            pFBInfo->mcSavedVisibleRegion = 0;
-            SaveSeamlessRectUnLock();
-        }
-
+
+        if (pSavedVisibleRegion)
+        {
+            handleSetVisibleRegion(cSavedVisibleRegion, pSavedVisibleRegion);
+            RTMemFree(pSavedVisibleRegion);
+        }
 
 #ifdef DEBUG_sunlover
@@ -1130 +1127 @@
                  */
                 SaveSeamlessRectLock();
-                if(pFBInfo->mpSavedVisibleRegion)
-                    RTMemFree(pFBInfo->mpSavedVisibleRegion);
-                
+                RTMemFree(pFBInfo->mpSavedVisibleRegion);
+
                 pFBInfo->mpSavedVisibleRegion = (RTRECT *)RTMemAlloc( RT_MAX(cRect, 1)
                                                                      * sizeof (RTRECT));
@@ -1142 +1138 @@
                 else
                 {
-                    /* memory allocation failed */
                     pFBInfo->mcSavedVisibleRegion = 0;
                 }