Changeset 84465 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

May 22, 2020 5:34:44 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: VMSVGA mouse pointer masks must have dword aligned scanlines.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -2685 +2685 @@
 }
 
-BOOL vboxWddmPointerCopyColorData(CONST DXGKARG_SETPOINTERSHAPE* pSetPointerShape, PVIDEO_POINTER_ATTRIBUTES pPointerAttributes)
+BOOL vboxWddmPointerCopyColorData(CONST DXGKARG_SETPOINTERSHAPE* pSetPointerShape, PVIDEO_POINTER_ATTRIBUTES pPointerAttributes,
+                                  bool fDwordAlignScanlines)
 {
     ULONG srcMaskW, srcMaskH;
@@ -2713 +2714 @@
     pDst = pPointerAttributes->Pixels;
     dstBytesPerLine = (pPointerAttributes->Width+7)/8;
+    if (fDwordAlignScanlines)
+        dstBytesPerLine = RT_ALIGN_T(dstBytesPerLine, 4, ULONG);
 
     /* sanity check */
@@ -2752 +2755 @@
 }
 
-BOOL vboxWddmPointerCopyMonoData(CONST DXGKARG_SETPOINTERSHAPE* pSetPointerShape, PVIDEO_POINTER_ATTRIBUTES pPointerAttributes)
+BOOL vboxWddmPointerCopyMonoData(CONST DXGKARG_SETPOINTERSHAPE* pSetPointerShape, PVIDEO_POINTER_ATTRIBUTES pPointerAttributes,
+                                 bool fDwordAlignScanlines)
 {
     ULONG srcMaskW, srcMaskH;
@@ -2790 +2794 @@
     pDst = pPointerAttributes->Pixels;
     dstBytesPerLine = (pPointerAttributes->Width+7)/8;
+    if (fDwordAlignScanlines)
+        dstBytesPerLine = RT_ALIGN_T(dstBytesPerLine, 4, ULONG);
 
     for (y=0; y<pPointerAttributes->Height; ++y)
@@ -2814 +2820 @@
 }
 
-static BOOLEAN vboxVddmPointerShapeToAttributes(CONST DXGKARG_SETPOINTERSHAPE* pSetPointerShape, PVBOXWDDM_POINTER_INFO pPointerInfo)
+static BOOLEAN vboxVddmPointerShapeToAttributes(CONST DXGKARG_SETPOINTERSHAPE* pSetPointerShape, PVBOXWDDM_POINTER_INFO pPointerInfo,
+                                                bool fDwordAlignScanlines)
 {
     PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = &pPointerInfo->Attributes.data;
@@ -2823 +2830 @@
     if (pSetPointerShape->Flags.Color)
     {
-        if (vboxWddmPointerCopyColorData(pSetPointerShape, pPointerAttributes))
+        if (vboxWddmPointerCopyColorData(pSetPointerShape, pPointerAttributes, fDwordAlignScanlines))
         {
             pPointerAttributes->Flags = VIDEO_MODE_COLOR_POINTER;
@@ -2838 +2845 @@
     else if (pSetPointerShape->Flags.Monochrome)
     {
-        if (vboxWddmPointerCopyMonoData(pSetPointerShape, pPointerAttributes))
+        if (vboxWddmPointerCopyMonoData(pSetPointerShape, pPointerAttributes, fDwordAlignScanlines))
         {
             pPointerAttributes->Flags = VIDEO_MODE_MONO_POINTER;
@@ -2887 +2894 @@
         {
             /* Size of the pointer data: sizeof(AND mask) + sizeof(XOR mask) */
-            cbAndMask = ((((cWidth + 7) / 8) * cHeight + 3) & ~3);
+            /* "Each scanline is padded to a 32-bit boundary." */
+            cbAndMask = ((((cWidth + 7) / 8) + 3) & ~3) * cHeight;
             cbXorMask = cWidth * 4 * cHeight;
 
@@ -3028 +3036 @@
         PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
         PVBOXWDDM_POINTER_INFO pPointerInfo = &pDevExt->aSources[pSetPointerShape->VidPnSourceId].PointerInfo;
+        bool const fDwordAlignScanlines = pDevExt->enmHwType != VBOXVIDEO_HWTYPE_VBOX;
         /** @todo to avoid extra data copy and extra heap allocation,
          *  need to maintain the pre-allocated HGSMI buffer and convert the data directly to it */
-        if (vboxVddmPointerShapeToAttributes(pSetPointerShape, pPointerInfo))
+        if (vboxVddmPointerShapeToAttributes(pSetPointerShape, pPointerInfo, fDwordAlignScanlines))
         {
             pDevExt->PointerInfo.iLastReportedScreen = pSetPointerShape->VidPnSourceId;