Changeset 24709 in vbox for trunk/src/VBox

Timestamp:

Nov 17, 2009 9:41:15 AM (15 years ago)

Author:

vboxsync

Message:

Windows guest video driver: report mouse pointer shape only for primary screen (xTracker 4168)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (3 diffs)
• VBoxVideo.h (modified) (1 diff)
• VBoxVideoHGSMI.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1511 +1511 @@
         Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
 #else
-        Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, &PointerAttributes, sizeof (PointerAttributes));
+        Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
 #endif /* VBOX_WITH_HGSMI */
 
@@ -1762 +1762 @@
                 Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
 #else
-                Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, &PointerAttributes, sizeof (PointerAttributes));
+                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
 #endif /* VBOX_WITH_HGSMI */
 
@@ -1811 +1811 @@
                 Result = vboxUpdatePointerShape(pPointerAttributes, RequestPacket->InputBufferLength);
 #else
-                Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, pPointerAttributes, RequestPacket->InputBufferLength);
+                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, pPointerAttributes, RequestPacket->InputBufferLength);
 #endif /* VBOX_WITH_HGSMI */
                 if (!Result)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -307 +307 @@
                              PVIDEO_PORT_CONFIG_INFO pConfigInfo,
                              ULONG AdapterMemorySize);
-BOOLEAN vboxUpdatePointerShape (PDEVICE_EXTENSION PrimaryExtension,
+BOOLEAN vboxUpdatePointerShape (PDEVICE_EXTENSION DeviceExtension,
                                 PVIDEO_POINTER_ATTRIBUTES pointerAttr,
                                 uint32_t cbLength);

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideoHGSMI.cpp

@@ -900 +900 @@
     p->fu32Flags = pCtx->pPointerAttr->Enable & 0x0000FFFF;
 
-    /* Even if pointer is invisible, we have to pass following data,
-     * so host could create the pointer with initial status - invisible
-     */
     p->u32HotX   = (pCtx->pPointerAttr->Enable >> 16) & 0xFF;
     p->u32HotY   = (pCtx->pPointerAttr->Enable >> 24) & 0xFF;
@@ -910 +907 @@
     if (p->fu32Flags & VBOX_MOUSE_POINTER_SHAPE)
     {
+        /* If shape is supplied, then alway create the pointer visible.
+         * See comments in 'vboxUpdatePointerShape'
+         */
+        p->fu32Flags |= VBOX_MOUSE_POINTER_VISIBLE;
+
         /* Copy the actual pointer data. */
         memcpy (p->au8Data, pCtx->pPointerAttr->Pixels, pCtx->cbData);
@@ -929 +931 @@
 }
 
-BOOLEAN vboxUpdatePointerShape (PDEVICE_EXTENSION PrimaryExtension,
+BOOLEAN vboxUpdatePointerShape (PDEVICE_EXTENSION DeviceExtension,
                                 PVIDEO_POINTER_ATTRIBUTES pointerAttr,
                                 uint32_t cbLength)
 {
+    PDEVICE_EXTENSION PrimaryExtension = DeviceExtension->pPrimary;
+
+    /* In multimonitor case the HW mouse pointer is the same on all screens,
+     * and Windows calls each display driver with the same pointer data: visible for
+     * the screen where the pointer is and invisible for other screens.
+     *
+     * This driver passes the shape to the host only from primary screen and makes
+     * the pointer always visible (in vbvaInitMousePointerShape).
+     *
+     * The simple solution makes it impossible to create the shape and keep the mouse
+     * pointer invisible. New shapes will be created visible.
+     * But:
+     * 1) VBox frontends actually ignore the visibility flag if VBOX_MOUSE_POINTER_SHAPE
+     *    is set and always create new pointers visible.
+     * 2) Windows uses DrvMovePointer to hide the pointer, which will still work.
+     */
+
+    if (DeviceExtension->iDevice != PrimaryExtension->iDevice)
+    {
+        dprintf(("vboxUpdatePointerShape: ignore non primary device %d(%d)\n",
+                 DeviceExtension->iDevice, PrimaryExtension->iDevice));
+        /* Success. */
+        return TRUE;
+    }
+
     uint32_t cbData = 0;