vbox的更動 61740 路徑 trunk/src/VBox/Main

時間撮記:

2016-6-17 上午10:19:23 (8 年 以前)

作者:

vboxsync

訊息:

Main/Display: when taking a screenshot of a blanked/disabled screen, return all black pixels (and there is no need to get the screen content, which might be garbage)

檔案:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (修改) (8 筆差異)

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

@@ -170 +170 @@
 
 #ifdef VBOX_WITH_CRHGSMI
-    if (RTCritSectRwIsInitialized (&mCrOglLock))
-    {
-        RTCritSectRwDelete (&mCrOglLock);
+    if (RTCritSectRwIsInitialized(&mCrOglLock))
+    {
+        RTCritSectRwDelete(&mCrOglLock);
         RT_ZERO(mCrOglLock);
     }
@@ -884 +884 @@
 
     if (uScreenId >= mcMonitors)
-    {
         return VINF_SUCCESS;
-    }
 
     DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
@@ -1024 +1022 @@
         return; */
 
-    i_checkCoordBounds (&x, &y, &w, &h, maFramebuffers[uScreenId].w,
-                                        maFramebuffers[uScreenId].h);
+    i_checkCoordBounds(&x, &y, &w, &h, maFramebuffers[uScreenId].w,
+                                       maFramebuffers[uScreenId].h);
 
     IFramebuffer *pFramebuffer = maFramebuffers[uScreenId].pFramebuffer;
@@ -1208 +1206 @@
     CHECK_CONSOLE_DRV(mpDrv);
     alock.release();  /* Release before calling up for lock order reasons. */
-    mpDrv->pUpPort->pfnReportHostCursorCapabilities (mpDrv->pUpPort, fCapabilitiesAdded, fCapabilitiesRemoved);
+    mpDrv->pUpPort->pfnReportHostCursorCapabilities(mpDrv->pUpPort, fCapabilitiesAdded, fCapabilitiesRemoved);
     mfHostCursorCapabilities = fHostCursorCapabilities;
     return S_OK;
@@ -1485 +1483 @@
          * disabled.
          */
-        Assert (fEnable == false);
+        Assert(fEnable == false);
 
         mfVideoAccelVRDP = false;
@@ -1504 +1502 @@
         /* The first client has connected. Enable the accel.
          */
-        Assert (fEnable == true);
+        Assert(fEnable == true);
 
         mfVideoAccelVRDP = true;
@@ -1917 +1915 @@
             if (pbDst != NULL)
             {
-                /* Copy guest VRAM to the allocated 32bpp buffer. */
-                const uint8_t *pu8Src       = pFBInfo->pu8FramebufferVRAM;
-                int32_t xSrc                = 0;
-                int32_t ySrc                = 0;
-                uint32_t u32SrcWidth        = width;
-                uint32_t u32SrcHeight       = height;
-                uint32_t u32SrcLineSize     = pFBInfo->u32LineSize;
-                uint32_t u32SrcBitsPerPixel = pFBInfo->u16BitsPerPixel;
-
-                int32_t xDst                = 0;
-                int32_t yDst                = 0;
-                uint32_t u32DstWidth        = u32SrcWidth;
-                uint32_t u32DstHeight       = u32SrcHeight;
-                uint32_t u32DstLineSize     = u32DstWidth * 4;
-                uint32_t u32DstBitsPerPixel = 32;
-
-                rc = pDisplay->mpDrv->pUpPort->pfnCopyRect(pDisplay->mpDrv->pUpPort,
-                                                           width, height,
-                                                           pu8Src,
-                                                           xSrc, ySrc,
-                                                           u32SrcWidth, u32SrcHeight,
-                                                           u32SrcLineSize, u32SrcBitsPerPixel,
-                                                           pbDst,
-                                                           xDst, yDst,
-                                                           u32DstWidth, u32DstHeight,
-                                                           u32DstLineSize, u32DstBitsPerPixel);
+                if (pFBInfo->flags & VBVA_SCREEN_F_ACTIVE)
+                {
+                    /* Copy guest VRAM to the allocated 32bpp buffer. */
+                    const uint8_t *pu8Src       = pFBInfo->pu8FramebufferVRAM;
+                    int32_t xSrc                = 0;
+                    int32_t ySrc                = 0;
+                    uint32_t u32SrcWidth        = width;
+                    uint32_t u32SrcHeight       = height;
+                    uint32_t u32SrcLineSize     = pFBInfo->u32LineSize;
+                    uint32_t u32SrcBitsPerPixel = pFBInfo->u16BitsPerPixel;
+
+                    int32_t xDst                = 0;
+                    int32_t yDst                = 0;
+                    uint32_t u32DstWidth        = u32SrcWidth;
+                    uint32_t u32DstHeight       = u32SrcHeight;
+                    uint32_t u32DstLineSize     = u32DstWidth * 4;
+                    uint32_t u32DstBitsPerPixel = 32;
+
+                    rc = pDisplay->mpDrv->pUpPort->pfnCopyRect(pDisplay->mpDrv->pUpPort,
+                                                               width, height,
+                                                               pu8Src,
+                                                               xSrc, ySrc,
+                                                               u32SrcWidth, u32SrcHeight,
+                                                               u32SrcLineSize, u32SrcBitsPerPixel,
+                                                               pbDst,
+                                                               xDst, yDst,
+                                                               u32DstWidth, u32DstHeight,
+                                                               u32DstLineSize, u32DstBitsPerPixel);
+                }
+                else
+                {
+                    memset(pbDst, 0, cbRequired);
+                    rc = VINF_SUCCESS;
+                }
                 if (RT_SUCCESS(rc))
                 {
@@ -2509 +2515 @@
 //    {
 //        /* All ok. Redraw the screen. */
-//        handleDisplayUpdate (x, y, width, height);
+//        handleDisplayUpdate(x, y, width, height);
 //    }