Changeset 104836 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 4, 2024 4:06:02 PM (8 months ago)

Author:

vboxsync

Message:

Additions/Graphics: Implemented missing support for reporting the mouse cursor positions to the host within the XPDM + WDDM mini port drivers. bugref:10650

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Files:

• common/VBoxMPCommon.cpp (modified) (1 diff)
• common/VBoxMPCommon.h (modified) (1 diff)
• wddm/VBoxMPTypes.h (modified) (1 diff)
• wddm/VBoxMPWddm.cpp (modified) (3 diffs)
• xpdm/VBoxMPDriver.cpp (modified) (1 diff)
• xpdm/VBoxMPIOCTL.cpp (modified) (1 diff)
• xpdm/VBoxMPInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp

@@ -131 +131 @@
     return RT_SUCCESS(rc);
 }
+
+/**
+ * Reports the current mouse cursor position to the host and optionally retrieves the current position from the host.
+ *
+ * @returns VBox status code.
+ * @param   pCommon             VBoxMP common context to use.
+ * @param   pPos                Mouse position to report to the host.
+ * @param   pxHost              X position reported from the host. Optional and can be NULL.
+ * @param   pyHost              Y position reported from the host. Optional and can be NULL.
+ */
+int VBoxMPCmnReportCursorPositionEx(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_POSITION pPos, uint32_t *pxHost, uint32_t *pyHost)
+{
+    return VBoxHGSMIReportCursorPosition(&pCommon->guestCtx, true /* fReport */, pPos->Column, pPos->Row, pxHost, pyHost);
+}
+
+/**
+ * Reports the current mouse cursor position to the host.
+ *
+ * @returns VBox status code.
+ * @param   pCommon             VBoxMP common context to use.
+ * @param   pPos                Mouse position to report to the host.
+ */
+int VBoxMPCmnReportCursorPosition(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_POSITION pPos)
+{
+    return VBoxMPCmnReportCursorPositionEx(pCommon, pPos, NULL /* pxHost */, NULL /* pyHost */);
+}
+

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h

@@ -66 +66 @@
 /* Pointer related */
 bool VBoxMPCmnUpdatePointerShape(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_ATTRIBUTES pAttrs, uint32_t cbLength);
+int VBoxMPCmnReportCursorPositionEx(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_POSITION pPos, uint32_t *pxHost, uint32_t *pyHost);
+int VBoxMPCmnReportCursorPosition(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_POSITION pPos);
 
 RT_C_DECLS_END

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPTypes.h

@@ -103 +103 @@
 typedef struct _VBOXWDDM_GLOBAL_POINTER_INFO
 {
+    /** Last updated X position. */
+    uint32_t iLastPosX;
+    /** Last updated Y position. */
+    uint32_t iLastPosY;
     uint32_t iLastReportedScreen;
 } VBOXWDDM_GLOBAL_POINTER_INFO, *PVBOXWDDM_GLOBAL_POINTER_INFO;

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

@@ -3131 +3131 @@
 }
 
+/**
+ * Reports the current mouse cursor position to the host.
+ *
+ * @returns VBox status code.
+ * @param   pDevExt             Device extension to use.
+ * @param   xPos                X position to report to the host.
+ * @param   yPos                Y position to report to the host.
+ */
+static int vboxWddmReportCursorPosition(PVBOXMP_DEVEXT pDevExt, uint32_t xPos, uint32_t yPos)
+{
+    VIDEO_POINTER_POSITION Pos;
+    RT_ZERO(Pos);
+    Pos.Column = xPos;
+    Pos.Row    = yPos;
+
+    return VBoxMPCmnReportCursorPosition(VBoxCommonFromDeviceExt(pDevExt), &Pos);
+}
+
 NTSTATUS
 APIENTRY
@@ -3169 +3187 @@
     pGlobalPointerInfo->iLastReportedScreen = pSetPointerPosition->VidPnSourceId;
 
-    if ((fVisStateChanged || fScreenChanged) && VBoxQueryHostWantsAbsolute())
+    const bool fWantsAbsolute = VBoxQueryHostWantsAbsolute();
+
+    if ((fVisStateChanged || fScreenChanged) && fWantsAbsolute)
     {
         if (fScreenChanged)
@@ -3184 +3204 @@
     }
 
-//    LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));
+    /* Report the mouse cursor position to the host if changed. */
+    if (   fWantsAbsolute
+        && (   pGlobalPointerInfo->iLastPosX != (uint32_t)pSetPointerPosition->X
+            || pGlobalPointerInfo->iLastPosY != (uint32_t)pSetPointerPosition->Y))
+    {
+        vboxWddmReportCursorPosition(pDevExt, (uint32_t)pSetPointerPosition->X, (uint32_t)pSetPointerPosition->Y);
+
+        pGlobalPointerInfo->iLastPosX = (uint32_t)pSetPointerPosition->X;
+        pGlobalPointerInfo->iLastPosY = (uint32_t)pSetPointerPosition->Y;
+    }
+
+    //    LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));
 
     return STATUS_SUCCESS;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -394 +394 @@
         }
 
-        /* Sets pointer position, is called after IOCTL_VIDEO_ENABLE_POINTER. */
+        /* Sets (reports) pointer position, is called after IOCTL_VIDEO_ENABLE_POINTER. */
         case IOCTL_VIDEO_SET_POINTER_POSITION:
         {
             STARTIO_IN(VIDEO_POINTER_POSITION, pPos);
 
-            NOREF(pPos); /** @todo set pointer position*/
-            bResult = VBoxMPEnablePointer(pExt, TRUE, pStatus);
+            bResult = VBoxMPReportCursorPosition(pExt, pPos, pStatus);
             break;
         }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

@@ -346 +346 @@
 }
 
-
+/**
+ * Called by IOCTL_VIDEO_SET_POINTER_POSITION to report the current mouse cursor position to the host.
+ *
+ * @returns \c TRUE on success, \c FALSE on failure.
+ * @param   pExt                Device extension to use.
+ * @param   pPos                Mouse pointer position to report.
+ * @param   pStatus             Status to return.
+ */
+BOOLEAN VBoxMPReportCursorPosition(PVBOXMP_DEVEXT pExt, PVIDEO_POINTER_POSITION pPos, PSTATUS_BLOCK pStatus)
+{
+    LOGF_ENTER();
+
+    BOOLEAN fRc;
+    if (VBoxQueryHostWantsAbsolute())
+    {
+        fRc = RT_SUCCESS(VBoxMPCmnReportCursorPosition(VBoxCommonFromDeviceExt(pExt), pPos));
+    }
+    else
+    {
+        LOG(("Fallback to sw pointer."));
+        fRc = FALSE;
+    }
+
+    if (!fRc)
+        pStatus->Status = ERROR_INVALID_FUNCTION;
+
+    LOGF_LEAVE();
+    return fRc;
+}
 
 /* Called for IOCTL_VIDEO_ENABLE_POINTER/IOCTL_VIDEO_DISABLE_POINTER.

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.h

@@ -63 +63 @@
 BOOLEAN VBoxMPSetColorRegisters(PVBOXMP_DEVEXT pExt, PVIDEO_CLUT pClut, PSTATUS_BLOCK pStatus);
 BOOLEAN VBoxMPSetPointerAttr(PVBOXMP_DEVEXT pExt, PVIDEO_POINTER_ATTRIBUTES pPointerAttrs, uint32_t cbLen, PSTATUS_BLOCK pStatus);
+BOOLEAN VBoxMPReportCursorPosition(PVBOXMP_DEVEXT pExt, PVIDEO_POINTER_POSITION pPos, PSTATUS_BLOCK pStatus);
 BOOLEAN VBoxMPEnablePointer(PVBOXMP_DEVEXT pExt, BOOLEAN bEnable, PSTATUS_BLOCK pStatus);
 BOOLEAN VBoxMPQueryPointerPosition(PVBOXMP_DEVEXT pExt, PVIDEO_POINTER_POSITION pPos, PSTATUS_BLOCK pStatus);