Changeset 44382 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 25, 2013 2:14:51 PM (12 years ago)

Author:

vboxsync

Message:

Main/DisplayImpl: Fix for access violation in case of multimonitor.

Display requests a resize of 4 framebuffers simultaneously. When one of framebuffers is resized, Display calls InvalidateAndUpdateEMT which is updating _all_ framebuffers but some of them are not yet finished with the resize. As a result, InvalidateAndUpdateEMT is assuming that all the framebuffers have right size, which is not true. Thus, crash while copying from source to destination recatangle .

File:

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

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

@@ -2774 +2774 @@
 }
 
-void Display::InvalidateAndUpdateEMT(Display *pDisplay)
+void Display::InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll)
 {
     pDisplay->vbvaLock();
     unsigned uScreenId;
-    for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
+    for (uScreenId = (fUpdateAll ? 0 : uId); uScreenId < pDisplay->mcMonitors; uScreenId++)
     {
         DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId];
@@ -2789 +2789 @@
         {
             if (   !pFBInfo->pFramebuffer.isNull()
-                && !(pFBInfo->fDisabled))
+                && !(pFBInfo->fDisabled)
+                && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
             {
                 /* Render complete VRAM screen to the framebuffer.
@@ -2797 +2798 @@
                 {
                     BYTE *address = NULL;
+                    ULONG uWidth = 0;
+                    ULONG uHeight = 0;
+                    pFBInfo->pFramebuffer->COMGETTER(Width) (&uWidth);
+                    pFBInfo->pFramebuffer->COMGETTER(Height) (&uHeight);
                     HRESULT hrc = pFBInfo->pFramebuffer->COMGETTER(Address) (&address);
                     if (SUCCEEDED(hrc) && address != NULL)
@@ -2820 +2825 @@
                         uint32_t u32DstBitsPerPixel = 32;
 
-                        pDisplay->mpDrv->pUpPort->pfnCopyRect(pDisplay->mpDrv->pUpPort,
-                                                              width, height,
-                                                              pu8Src,
-                                                              xSrc, ySrc,
-                                                              u32SrcWidth, u32SrcHeight,
-                                                              u32SrcLineSize, u32SrcBitsPerPixel,
-                                                              pu8Dst,
-                                                              xDst, yDst,
-                                                              u32DstWidth, u32DstHeight,
-                                                              u32DstLineSize, u32DstBitsPerPixel);
+                        /* if uWidth != pFBInfo->w and uHeight != pFBInfo->h
+                         * implies resize of Framebuffer is in progress and
+                         * copyrect should not be called.
+                         */
+                        if (uWidth == pFBInfo->w && uHeight == pFBInfo->h)
+                        {
+
+                            pDisplay->mpDrv->pUpPort->pfnCopyRect(pDisplay->mpDrv->pUpPort,
+                                                                  width, height,
+                                                                  pu8Src,
+                                                                  xSrc, ySrc,
+                                                                  u32SrcWidth, u32SrcHeight,
+                                                                  u32SrcLineSize, u32SrcBitsPerPixel,
+                                                                  pu8Dst,
+                                                                  xDst, yDst,
+                                                                  u32DstWidth, u32DstHeight,
+                                                                  u32DstLineSize, u32DstBitsPerPixel);
+                        }
                     }
                 }
@@ -2836 +2849 @@
             }
         }
+        if (!fUpdateAll)
+            break;
     }
     pDisplay->vbvaUnlock();
@@ -2870 +2885 @@
     /* pdm.h says that this has to be called from the EMT thread */
     int rcVBox = VMR3ReqCallVoidWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::InvalidateAndUpdateEMT,
-                                      1, this);
+                                      3, this, 0, true);
     alock.acquire();
 
@@ -3228 +3243 @@
              * Repaint all displays because VM continued to run during the framebuffer resize.
              */
-            pDisplay->InvalidateAndUpdateEMT(pDisplay);
+            pDisplay->InvalidateAndUpdateEMT(pDisplay, uScreenId, false);
         }
         else if (u32ResizeStatus == ResizeStatus_InProgress)