Changeset 83305 in vbox

Timestamp:

Mar 17, 2020 12:26:16 PM (5 years ago)

Author:

vboxsync

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

136478

Message:

VMSVGA: Explicitly turn cursor on and off when enabling/disabling VMSVGA. Fix AND mask alignment when converting non-alpha cursors.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (2 diffs)

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

@@ -1696 +1696 @@
                 for (uint32_t idScreen = 0; idScreen < pThis->cMonitors; ++idScreen)
                     pThisCC->pDrv->pfnVBVAEnable(pThisCC->pDrv, idScreen, NULL /*pHostFlags*/);
+
+                /* Make the cursor visible again as needed. */
+                if (pSVGAState->Cursor.fActive)
+                    pThisCC->pDrv->pfnVBVAMousePointerShape(pThisCC->pDrv, true /*fVisible*/, false, 0, 0, 0, 0, NULL);
             }
             else
             {
+                /* Make sure the cursor is off. */
+                if (pSVGAState->Cursor.fActive)
+                    pThisCC->pDrv->pfnVBVAMousePointerShape(pThisCC->pDrv, false /*fVisible*/, false, 0, 0, 0, 0, NULL);
+
                 /* Restore the text mode backup. */
                 memcpy(pThisCC->pbVRam, pThisCC->svga.pbVgaFrameBufferR3, VMSVGA_VGA_FB_BACKUP_SIZE);
@@ -2908 +2916 @@
 
     /* Convert the XOR mask. */
-    uint32_t *pu32Dst = (uint32_t *)(pbCopy + cbDstAndMask);
+    uint32_t *pu32Dst = (uint32_t *)(pbCopy + RT_ALIGN_32(cbDstAndMask, 4));
     pbSrc  = pbSrcXorMask;
     switch (pCursor->xorMaskDepth)