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

Timestamp:

Aug 26, 2009 11:49:44 AM (15 years ago)

Author:

vboxsync

Message:

Additions/WINNT: reverted r51445

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_ENABLE_POINTER,
-                               NULL,
-                               0,
+                               IOCTL_VIDEO_SET_POINTER_POSITION,
+                               &NewPointerPosition,
+                               sizeof(VIDEO_POINTER_POSITION),
                                NULL,
                                0,
@@ -128 +135 @@
             //
 
-            DISPDBG((1, "DISP vMoveHardwarePointer failed IOCTL_VIDEO_ENABLE_POINTER\n"));
+            DISPDBG((1, "DISP vMoveHardwarePointer failed IOCTL_VIDEO_SET_POINTER_POSITION\n"));
         }
     }

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

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

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