Changeset 50552 in vbox

Timestamp:

Feb 24, 2014 9:34:35 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92406

Message:

DisplayImpl,DevVGA: take correct screenshot if VBVA is paused

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -5160 +5160 @@
     AssertRC(rc);
 
+    /* This method only works if the VGA device is in a VBE mode. */
+    if ((pThis->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) == 0)
+    {
+        PDMCritSectLeave(&pThis->CritSect);
+        return VERR_INVALID_STATE;
+    }
+
     vga_draw_line = vga_draw_line_table[v * 4 + get_depth_index(u32DstBitsPerPixel)];
 

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

@@ -2687 +2687 @@
                 {
                     RTMemFree(pu8Data);
+
+                    /* CopyRect can fail if VBVA was paused in VGA device, retry using the generic method. */
+                    if (   rc == VERR_INVALID_STATE
+                        && aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+                    {
+                        rc = pDisplay->mpDrv->pUpPort->pfnTakeScreenshot(pDisplay->mpDrv->pUpPort,
+                                                                         ppu8Data, pcbData, pu32Width, pu32Height);
+                    }
                 }
             }