Changeset 46075 in vbox

Timestamp:

May 14, 2013 4:52:57 PM (12 years ago)

Author:

vboxsync

Message:

Main/DisplayImpl: 6711: Code fix for SMP and code improvement.

File:

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

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

@@ -149 +149 @@
     }
     
-    if (RTCritSectIsInitialized (&mSaveSeamlessRectLock))
-    {
-        RTCritSectDelete (&mSaveSeamlessRectLock);
-        memset (&mSaveSeamlessRectLock, 0, sizeof (mSaveSeamlessRectLock));
+    if (RTCritSectIsInitialized(&mSaveSeamlessRectLock))
+    {
+        RTCritSectDelete(&mSaveSeamlessRectLock);
+        memset(&mSaveSeamlessRectLock, 0, sizeof (mSaveSeamlessRectLock));
     }
     BaseFinalRelease();
@@ -483 +483 @@
         maFramebuffers[ul].fDefaultFormat = false;
 
+        maFramebuffers[ul].mcSavedVisibleRegion = 0;
+        maFramebuffers[ul].mpSavedVisibleRegion = NULL;
+
         memset (&maFramebuffers[ul].dirtyRect, 0 , sizeof (maFramebuffers[ul].dirtyRect));
         memset (&maFramebuffers[ul].pendingResize, 0 , sizeof (maFramebuffers[ul].pendingResize));
@@ -835 +838 @@
          * applied after the resize of the framebuffer is completed 
          */
-        if (pFBInfo->mcSavedVisibleRegion)
-        {
-            handleSetVisibleRegion(pFBInfo->mcSavedVisibleRegion,
-                                   pFBInfo->mpSavedVisibleRegion);
-
+        SaveSeamlessRectLock();
+        PRTRECT pSavedSeamlessRgn = pFBInfo->mpSavedVisibleRegion;
+        uint32_t ucSavedSeamlessRgn = pFBInfo->mcSavedVisibleRegion;
+        SaveSeamlessRectUnLock();
+        if (pSavedSeamlessRgn && ucSavedSeamlessRgn)
+        {
+            handleSetVisibleRegion(ucSavedSeamlessRgn, pSavedSeamlessRgn);
             SaveSeamlessRectLock();
             if (pFBInfo->mpSavedVisibleRegion)
@@ -1128 +1133 @@
                     RTMemFree(pFBInfo->mpSavedVisibleRegion);
                 
-                pFBInfo->mpSavedVisibleRegion = (RTRECT *)RTMemTmpAlloc(  RT_MAX(cRect, 1)
-                                                                        * sizeof (RTRECT));
+                pFBInfo->mpSavedVisibleRegion = (RTRECT *)RTMemAlloc( RT_MAX(cRect, 1)
+                                                                     * sizeof (RTRECT));
                 if (pFBInfo->mpSavedVisibleRegion)
                 {
                     memcpy(pFBInfo->mpSavedVisibleRegion, pRect, cRect * sizeof(RTRECT));
                     pFBInfo->mcSavedVisibleRegion = cRect;
+                }
+                else
+                {
+                    /* memory allocation failed */
+                    pFBInfo->mcSavedVisibleRegion = 0;
                 }
                 SaveSeamlessRectUnLock();