Changeset 41643 in vbox

Timestamp:

Jun 11, 2012 10:43:28 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78443

Message:

VBoxGuest: Drop duplicate mouse callback data, fix member names and add a comment.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

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

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

@@ -962 +962 @@
  * @param   pContext    Context specific pointer.
  */
-void vboxguestwinDpcHandler(PKDPC pDPC, PDEVICE_OBJECT pDevObj,
-                            PIRP pIrp, PVOID pContext)
+void vboxguestwinDpcHandler(PKDPC pDPC, PDEVICE_OBJECT pDevObj, PIRP pIrp, PVOID pContext)
 {
     PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pDevObj->DeviceExtension;
@@ -971 +970 @@
     if (ASMAtomicXchgU32(&pDevExt->u32MousePosChangedSeq, 0))
     {
-        Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
         /* we need a lock here to avoid concurrency with the set event ioctl handler thread,
          * i.e. to prevent the event from destroyed while we're using it */
+        Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
         KeAcquireSpinLockAtDpcLevel(&pDevExt->win.s.MouseEventAccessLock);
-        if (pDevExt->win.s.pfnMouseNotify)
-        {
-            pDevExt->win.s.pfnMouseNotify(pDevExt->win.s.pvMouseNotify);
-        }
+
+        if (pDevExt->MouseNotifyCallback.pfnNotify)
+            pDevExt->MouseNotifyCallback.pfnNotify(pDevExt->MouseNotifyCallback.pvUser);
+
         KeReleaseSpinLockFromDpcLevel(&pDevExt->win.s.MouseEventAccessLock);
     }
 
     /* Process the wake-up list we were asked by the scheduling a DPC
-     *  in vboxguestwinIsrHandler(). */
+     * in vboxguestwinIsrHandler(). */
     VBoxGuestWaitDoWakeUps(pDevExt);
 }

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

@@ -117 +117 @@
     PVBOXGUESTSESSION pKernelSession;
 
-
+    /** Spinlock protecting MouseNotifyCallback. Required since the consumer is
+     *  in a DPC callback and not the ISR. */
     KSPIN_LOCK MouseEventAccessLock;
-    PFNVBOXMOUSENOTIFYCB pfnMouseNotify;
-    void *pvMouseNotify;
 } VBOXGUESTDEVEXTWIN, *PVBOXGUESTDEVEXTWIN;