Changeset 37226 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

May 26, 2011 5:06:02 PM (14 years ago)

Author:

vboxsync

Message:

VBoxMouse/VBoxGuest/win: avoid poller thread for mouse events notifications over NEW_PROTOCOL

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-win.cpp (modified) (3 diffs)
• VBoxGuest-win.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -810 +810 @@
     switch (uCmd)
     {
-        case VBOXGUEST_IOCTL_INTERNAL_SET_MOUSE_NOTIFY_EVENT:
+        case VBOXGUEST_IOCTL_INTERNAL_SET_MOUSE_NOTIFY_CALLBACK:
         {
             PVOID pvBuf = pStack->Parameters.Others.Argument1;
             size_t cbData = (size_t)pStack->Parameters.Others.Argument2;
             fProcessed = true;
-            if (cbData != sizeof (PKEVENT))
+            if (cbData != sizeof(VBoxGuestMouseSetNotifyCallback))
             {
                 AssertFailed();
@@ -823 +823 @@
 
             KIRQL OldIrql;
+            VBoxGuestMouseSetNotifyCallback *pInfo = (VBoxGuestMouseSetNotifyCallback*)pvBuf;
             /* we need a lock here to avoid concurrency with the set event functionality */
             KeAcquireSpinLock(&pDevExt->win.s.MouseEventAccessLock, &OldIrql);
-            pDevExt->win.s.pMouseEvent =  (PKEVENT)pvBuf;
+            pDevExt->win.s.pfnMouseNotify =  pInfo->pfnNotify;
+            pDevExt->win.s.pvMouseNotify =  pInfo->pvNotify;
             KeReleaseSpinLock(&pDevExt->win.s.MouseEventAccessLock, OldIrql);
 
@@ -940 +942 @@
          * i.e. to prevent the event from destroyed while we're using it */
         KeAcquireSpinLockAtDpcLevel(&pDevExt->win.s.MouseEventAccessLock);
-        PKEVENT pEvent = pDevExt->win.s.pMouseEvent;
-        if (pEvent)
-        {
-            KeSetEvent(pEvent, 0, FALSE);
+        if (pDevExt->win.s.pfnMouseNotify)
+        {
+            pDevExt->win.s.pfnMouseNotify(pDevExt->win.s.pvMouseNotify);
         }
         KeReleaseSpinLockFromDpcLevel(&pDevExt->win.s.MouseEventAccessLock);

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h

@@ -119 +119 @@
 
     KSPIN_LOCK MouseEventAccessLock;
-    /* event to be signalled on mouse event arrival from host */
-    PKEVENT pMouseEvent;
+    PFNVBOXMOUSENOTIFYCB pfnMouseNotify;
+    void *pvMouseNotify;
 } VBOXGUESTDEVEXTWIN, *PVBOXGUESTDEVEXTWIN;