Changeset 22446 in vbox for trunk/src

Timestamp:

Aug 25, 2009 8:40:15 PM (15 years ago)

Author:

vboxsync

Message:

Additions/WINNT: re-enable the host mouse cursor when the guest requests it

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/pointer.c (modified) (2 diffs)
• Miniport/VBoxVideo.cpp (modified) (3 diffs)
• Miniport/VBoxVideo.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/pointer.c

@@ -116 +116 @@
     else
     {
-        NewPointerPosition.Column = (SHORT) x - (SHORT) (ppdev->ptlHotSpot.x);
-        NewPointerPosition.Row    = (SHORT) y - (SHORT) (ppdev->ptlHotSpot.y);
-
-        //
-        // Call miniport driver to move Pointer.
-        //
-
         if (EngDeviceIoControl(ppdev->hDriver,
-                               IOCTL_VIDEO_SET_POINTER_POSITION,
-                               &NewPointerPosition,
-                               sizeof(VIDEO_POINTER_POSITION),
+                               IOCTL_VIDEO_ENABLE_POINTER,
+                               NULL,
+                               0,
                                NULL,
                                0,
@@ -135 +128 @@
             //
 
-            DISPDBG((1, "DISP vMoveHardwarePointer failed IOCTL_VIDEO_SET_POINTER_POSITION\n"));
+            DISPDBG((1, "DISP vMoveHardwarePointer failed IOCTL_VIDEO_ENABLE_POINTER\n"));
         }
     }

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

@@ -1583 +1583 @@
             dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_ENABLE_POINTER\n"));
             // find out whether the host wants absolute positioning
-            if (vboxQueryHostWantsAbsolute())
+            if (   DEV_MOUSE_HIDDEN((PDEVICE_EXTENSION)HwDeviceExtension)
+                && vboxQueryHostWantsAbsolute())
             {
                 // tell the host to use the guest's pointer
@@ -1599 +1600 @@
 #endif /* VBOX_WITH_HGSMI */
 
-                if (!Result)
+            if (Result)
+                    DEV_SET_MOUSE_SHOWN((PDEVICE_EXTENSION)HwDeviceExtension);
+                else
                     dprintf(("VBoxVideo::VBoxVideoStartIO: Could not hide hardware pointer -> fallback\n"));
+
             } else
             {
@@ -1631 +1635 @@
 #endif /* VBOX_WITH_HGSMI */
 
-                if (!Result)
+                if (Result)
+                    DEV_SET_MOUSE_HIDDEN((PDEVICE_EXTENSION)HwDeviceExtension);
+                else
                     dprintf(("VBoxVideo::VBoxVideoStartIO: Could not hide hardware pointer -> fallback\n"));
             } else

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

@@ -127 +127 @@
            ULONG ulMaxFrameBufferSize;         /* The size of the VRAM allocated for the a single framebuffer. */
 
+           BOOLEAN fMouseHidden;               /* Has the mouse cursor been hidden by the guest? */
+
 #ifndef VBOX_WITH_HGSMI
            ULONG ulDisplayInformationSize;     /* The size of the Display information, which is at offset:
@@ -162 +164 @@
 #endif /* VBOX_WITH_HGSMI */
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION;
+
+#define DEV_MOUSE_HIDDEN(dev) ((dev)->pPrimary->u.primary.fMouseHidden)
+#define DEV_SET_MOUSE_HIDDEN(dev)   \
+do { \
+    (dev)->pPrimary->u.primary.fMouseHidden = TRUE; \
+} while (0)
+#define DEV_SET_MOUSE_SHOWN(dev)   \
+do { \
+    (dev)->pPrimary->u.primary.fMouseHidden = FALSE; \
+} while (0)
 
 extern "C"