Changeset 26750 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 24, 2010 2:46:25 PM (15 years ago)

Author:

vboxsync

Message:

Main/MouseImpl: hopefully fix assertions in the absolute PS/2 device code

File:

• trunk/src/VBox/Main/MouseImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -165 +165 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    CHECK_CONSOLE_DRV (mpDrv);
+
     if (uDevCaps & MOUSE_DEVCAP_ABSOLUTE)
         *absoluteSupported = TRUE;
     else
     {
-        CHECK_CONSOLE_DRV (mpDrv);
-
         uint32_t mouseCaps;
         int rc = getVMMDevMouseCaps(&mouseCaps);
@@ -234 +234 @@
                                     int32_t dw, uint32_t fButtons)
 {
-    CHECK_CONSOLE_DRV (mpDrv);
-
     if (dx || dy || dz || dw || fButtons != mLastButtons)
     {
@@ -259 +257 @@
                                     int32_t dz, int32_t dw, uint32_t fButtons)
 {
-    CHECK_CONSOLE_DRV (mpDrv);
-
     if (   mouseXAbs != mLastAbsX
         || mouseYAbs != mLastAbsY
@@ -408 +404 @@
     LogRel3(("%s: x=%d, y=%d, dz=%d, dw=%d, buttonState=0x%x\n",
              __PRETTY_FUNCTION__, x, y, dz, dw, buttonState));
+
+    CHECK_CONSOLE_DRV(mpDrv);
 
     uint32_t mouseXAbs;