Changeset 27214 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 9, 2010 1:15:08 PM (15 years ago)

Author:

vboxsync

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

58587

Message:

Windows guest additions: fixed showpointer processing in multimonitor case.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (modified) (2 diffs)

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

@@ -1991 +1991 @@
     BOOLEAN Result = TRUE;
 
-    if (DEV_MOUSE_HIDDEN((PDEVICE_EXTENSION)HwDeviceExtension))
+    /* Use primary device extension, because the show pointer request should be processed
+     * in vboxUpdatePointerShape regardless of the device. */
+    PDEVICE_EXTENSION PrimaryExtension = ((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary;
+    if (DEV_MOUSE_HIDDEN(PrimaryExtension))
     {
         // tell the host to use the guest's pointer
@@ -2004 +2007 @@
         Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
 #else
-        Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
+        Result = vboxUpdatePointerShape(PrimaryExtension, &PointerAttributes, sizeof (PointerAttributes));
 #endif /* VBOX_WITH_HGSMI */
 
         if (Result)
-            DEV_SET_MOUSE_SHOWN((PDEVICE_EXTENSION)HwDeviceExtension);
+            DEV_SET_MOUSE_SHOWN(PrimaryExtension);
         else
             dprintf(("VBoxVideo::ShowPointer: Could not show the hardware pointer -> fallback\n"));