Changeset 22469 in vbox for trunk

Timestamp:

Aug 26, 2009 12:50:12 PM (15 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• VBoxVideo.cpp (modified) (4 diffs)
• VBoxVideo.h (modified) (2 diffs)

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

@@ -1375 +1375 @@
 
 /**
+ * Send a request to the host to make the absolute pointer visible
+ */
+static BOOLEAN ShowPointer(PVOID HwDeviceExtension)
+{
+    LogRelFlowFunc(("\n"));
+    BOOLEAN Result;
+
+    if (DEV_MOUSE_HIDDEN((PDEVICE_EXTENSION)HwDeviceExtension))
+    {
+        // tell the host to use the guest's pointer
+        VIDEO_POINTER_ATTRIBUTES PointerAttributes;
+
+        /* Visible and No Shape means Show the pointer.
+         * It is enough to init only this field.
+         */
+        PointerAttributes.Enable = VBOX_MOUSE_POINTER_VISIBLE;
+
+#ifndef VBOX_WITH_HGSMI
+        Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
+#else
+        Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, &PointerAttributes, sizeof (PointerAttributes));
+#endif /* VBOX_WITH_HGSMI */
+
+        if (Result)
+            DEV_SET_MOUSE_SHOWN((PDEVICE_EXTENSION)HwDeviceExtension);
+        else
+            dprintf(("VBoxVideo::ShowPointer: Could not show the hardware pointer -> fallback\n"));
+    }
+    LogRelFlowFunc(("returning %d\n", Result));
+    return Result;
+}
+
+/**
  * VBoxVideoStartIO
  *
@@ -1584 +1617 @@
             dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_ENABLE_POINTER\n"));
             // find out whether the host wants absolute positioning
+            /// @todo this is now obsolete - remove it?
             if (vboxQueryHostWantsAbsolute())
-            {
-                // tell the host to use the guest's pointer
+                Result = ShowPointer(HwDeviceExtension);
+            else
+            {
+                // fallback to software pointer
+                RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
+                Result = FALSE;
+            }
+            break;
+        }
+
+        // hide the pointer
+        case IOCTL_VIDEO_DISABLE_POINTER:
+        {
+            dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_DISABLE_POINTER\n"));
+            // find out whether the host wants absolute positioning
+            if (vboxQueryHostWantsAbsolute())
+            {
+                // tell the host to hide pointer
                 VIDEO_POINTER_ATTRIBUTES PointerAttributes;
 
-                /* Visible and No Shape means Show the pointer.
+                /* Enable == 0 means no shape, not visible.
                  * It is enough to init only this field.
                  */
-                PointerAttributes.Enable = VBOX_MOUSE_POINTER_VISIBLE;
+                PointerAttributes.Enable = 0;
 
 #ifndef VBOX_WITH_HGSMI
@@ -1600 +1650 @@
 #endif /* VBOX_WITH_HGSMI */
 
-                if (!Result)
-                    dprintf(("VBoxVideo::VBoxVideoStartIO: Could not hide hardware pointer -> fallback\n"));
-            } else
-            {
-                // fallback to software pointer
-                RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
-                Result = FALSE;
-            }
-            break;
-        }
-
-        // hide the pointer
-        case IOCTL_VIDEO_DISABLE_POINTER:
-        {
-            dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_DISABLE_POINTER\n"));
-            // find out whether the host wants absolute positioning
-            if (vboxQueryHostWantsAbsolute())
-            {
-                // tell the host to hide pointer
-                VIDEO_POINTER_ATTRIBUTES PointerAttributes;
-
-                /* Enable == 0 means no shape, not visible.
-                 * It is enough to init only this field.
-                 */
-                PointerAttributes.Enable = 0;
-
-#ifndef VBOX_WITH_HGSMI
-                Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
-#else
-                Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, &PointerAttributes, sizeof (PointerAttributes));
-#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
@@ -1702 +1722 @@
         case IOCTL_VIDEO_SET_POINTER_POSITION:
         {
-            /// @todo There is an issue when we disable pointer integration.
-            // The guest pointer will be invisible. We have to somehow cause
-            // the pointer attributes to be set again. But how? The same holds
-            // true for the opposite case where we get two pointers.
-
-            //dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_SET_POINTER_POSITION\n"));
             // find out whether the host wants absolute positioning
+            /// @todo this is now obsolete - remove it?
             if (vboxQueryHostWantsAbsolute())
-            {
-                // @todo we are supposed to show currently invisible pointer?
-                Result = TRUE;
-            } else
+                Result = ShowPointer(HwDeviceExtension);
+            else
             {
                 // fallback to software pointer

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

@@ -126 +126 @@
            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:
@@ -164 +166 @@
 #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"