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

Timestamp:

Jul 30, 2009 1:51:20 PM (15 years ago)

Author:

vboxsync

Message:

Additions/WINNT: fix problems of the mouse cursor not being shown when mouse integration is enabled or disabled

Location:

trunk/src/VBox/Additions/WINNT

Files:

• VBoxGuest/VBoxGuest.cpp (modified) (7 diffs)
• VBoxTray/VBoxDisplay.cpp (modified) (4 diffs)
• VBoxTray/VBoxTray.cpp (modified) (2 diffs)
• VBoxTray/VBoxTray.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -77 +77 @@
 #endif
 
+#ifdef DEBUG
+static VOID testVBoxGuest(VOID);
+#endif
+
 /*******************************************************************************
 *   Exported Functions                                                         *
@@ -123 +127 @@
     PsGetVersion(&majorVersion, &minorVersion, &buildNumber, NULL);
     dprintf(("VBoxGuest::DriverEntry: running on Windows NT version %d.%d, build %d\n", majorVersion, minorVersion, buildNumber));
+#ifdef DEBUG
+    testVBoxGuest();
+#endif
     switch (majorVersion)
     {
@@ -783 +790 @@
 }
 
+/** A quick implementation of AtomicTestAndClear for uint32_t and multiple
+ *  bits.
+ */
+static uint32_t guestAtomicBitsTestAndClear(void *pu32Bits, uint32_t u32Mask)
+{
+    AssertPtrReturn(pu32Bits, 0);
+    LogFlowFunc(("*pu32Bits=0x%x, u32Mask=0x%x\n", *(long *)pu32Bits,
+                 u32Mask));
+    uint32_t u32Result = 0;
+    uint32_t u32WorkingMask = u32Mask;
+    int iBitOffset = ASMBitFirstSetU32 (u32WorkingMask);
+
+    while (iBitOffset > 0)
+    {
+        bool fSet = ASMAtomicBitTestAndClear(pu32Bits, iBitOffset - 1);
+        if (fSet)
+            u32Result |= 1 << (iBitOffset - 1);
+        u32WorkingMask &= ~(1 << (iBitOffset - 1));
+        iBitOffset = ASMBitFirstSetU32 (u32WorkingMask);
+    }
+    LogFlowFunc(("Returning 0x%x\n", u32Result));
+    return u32Result;
+}
+
 /**
  * Device I/O Control entry point.
@@ -850 +881 @@
             VBoxGuestWaitEventInfo *eventInfo = (VBoxGuestWaitEventInfo *)pBuf;
 
-            if (!eventInfo->u32EventMaskIn || !IsPowerOfTwo (eventInfo->u32EventMaskIn)) {
+            if (!eventInfo->u32EventMaskIn) {
                 dprintf (("VBoxGuest::VBoxGuestDeviceControl: Invalid input mask %#x\n",
                           eventInfo->u32EventMaskIn));
@@ -858 +889 @@
 
             eventInfo->u32EventFlagsOut = 0;
-            int iBitOffset = ASMBitFirstSetU32 (eventInfo->u32EventMaskIn) - 1;
             bool fTimeout = (eventInfo->u32TimeoutIn != ~0L);
-
-            dprintf (("mask = %d, iBitOffset = %d\n", iBitOffset, eventInfo->u32EventMaskIn));
 
             /* Possible problem with request completion right between the pending event check and KeWaitForSingleObject
@@ -874 +902 @@
             for (;;)
             {
-                bool fEventPending = ASMAtomicBitTestAndClear(&pDevExt->u32Events, iBitOffset);
-                if (fEventPending)
+                uint32_t u32EventsPending =
+                    guestAtomicBitsTestAndClear(&pDevExt->u32Events,
+                                                eventInfo->u32EventMaskIn);
+                dprintf (("mask = 0x%x, pending = 0x%x\n",
+                          eventInfo->u32EventMaskIn, u32EventsPending));
+
+                if (u32EventsPending)
                 {
-                    eventInfo->u32EventFlagsOut = 1 << iBitOffset;
+                    eventInfo->u32EventFlagsOut = u32EventsPending;
                     break;
                 }
@@ -1882 +1915 @@
     dprintf(("VBoxGuest::vboxIdleThread leaving\n"));
 }
+
+#ifdef DEBUG
+static VOID testAtomicTestAndClearBitsU32(uint32_t u32Mask, uint32_t u32Bits,
+                                          uint32_t u32Exp)
+{
+    ULONG u32Bits2 = u32Bits;
+    uint32_t u32Result = guestAtomicBitsTestAndClear(&u32Bits2, u32Mask);
+    if (   u32Result != u32Exp
+        || (u32Bits2 & u32Mask)
+        || (u32Bits2 & u32Result)
+        || ((u32Bits2 | u32Result) != u32Bits)
+       )
+        AssertLogRelMsgFailed(("%s: TEST FAILED: u32Mask=0x%x, u32Bits (before)=0x%x, u32Bits (after)=0x%x, u32Result=0x%x, u32Exp=ox%x\n",
+                               __PRETTY_FUNCTION__, u32Mask, u32Bits, u32Bits2,
+                               u32Result));
+}
+
+static VOID testVBoxGuest(VOID)
+{
+    testAtomicTestAndClearBitsU32(0x00, 0x23, 0);
+    testAtomicTestAndClearBitsU32(0x11, 0, 0);
+    testAtomicTestAndClearBitsU32(0x11, 0x22, 0);
+    testAtomicTestAndClearBitsU32(0x11, 0x23, 0x1);
+    testAtomicTestAndClearBitsU32(0x11, 0x32, 0x10);
+    testAtomicTestAndClearBitsU32(0x22, 0x23, 0x22);
+}
+#endif

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -386 +386 @@
     DWORD cbReturned;
 
-    maskInfo.u32OrMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
+    maskInfo.u32OrMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
     maskInfo.u32NotMask = 0;
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
@@ -403 +403 @@
         VBoxGuestWaitEventInfo waitEvent;
         waitEvent.u32TimeoutIn = 1000;
-        waitEvent.u32EventMaskIn = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
+        waitEvent.u32EventMaskIn = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
@@ -591 +591 @@
                 }
             }
+            if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED)
+                VBoxServiceReloadCursor();
         } else
         {
@@ -604 +606 @@
 
     maskInfo.u32OrMask = 0;
-    maskInfo.u32NotMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
+    maskInfo.u32NotMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -215 +215 @@
 
 
+/** Attempt to force Windows to reload the cursor image by attaching to the
+ * thread of the window currently under the mouse, hiding the cursor and
+ * showing it again.  This could fail to work in any number of ways (no
+ * window under the cursor, the cursor has moved to a different window while
+ * we are processing), but we just accept this, as the cursor will be reloaded
+ * at some point anyway. */
+void VBoxServiceReloadCursor(void)
+{
+    LogFlowFunc(("\n"));
+    POINT mousePos;
+    HWND hWin;
+    DWORD hThread, hCurrentThread;
+    
+    GetCursorPos(&mousePos);
+    hWin = WindowFromPoint(mousePos);
+    if (hWin)
+    {
+        hThread = GetWindowThreadProcessId(hWin, NULL);
+        hCurrentThread = GetCurrentThreadId();
+        if (hCurrentThread != hThread)
+            AttachThreadInput(hCurrentThread, hThread, TRUE);
+    }
+    ShowCursor(false);
+    ShowCursor(true);
+    if (hWin && (hCurrentThread != hThread))
+        AttachThreadInput(hCurrentThread, hThread, FALSE);
+    LogFlowFunc(("exiting\n"));
+}
+
+
 void WINAPI VBoxServiceStart(void)
 {
@@ -264 +294 @@
             status = GetLastError();
         else
-        {
-            /* move the window beneach the mouse pointer so that we get access to it */
-            POINT mousePos;
-            GetCursorPos(&mousePos);
-            SetWindowPos(gToolWindow, HWND_TOPMOST, mousePos.x - 10, mousePos.y - 10, 0, 0,
-                         SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOREDRAW | SWP_NOSIZE);
-            /* change the mouse pointer so that we can go for a hardware shape */
-            SetCursor(LoadCursor(NULL, IDC_APPSTARTING));
-            SetCursor(LoadCursor(NULL, IDC_ARROW));
-            /* move back our tool window */
-            SetWindowPos(gToolWindow, HWND_TOPMOST, -200, -200, 0, 0,
-                         SWP_NOACTIVATE | SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOREDRAW | SWP_NOSIZE);
-        }
+            VBoxServiceReloadCursor();
     }
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

@@ -67 +67 @@
 extern HWND  gToolWindow;
 
+extern void VBoxServiceReloadCursor(void);
+
 #endif /* !___VBOXTRAY_H */