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

Timestamp:

Mar 9, 2010 12:31:03 PM (15 years ago)

Author:

vboxsync

Message:

Main/MouseImpl: some fixes and a todo

File:

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

trunk/src/VBox/Main/MouseImpl.cpp

@@ -403 +403 @@
     if (FAILED(rc)) return rc;
 
-    *pcX = displayWidth ? (x * 0xFFFF) / displayWidth: 0;
+    *pcX = displayWidth ? ((x - 1) * 0xFFFF) / displayWidth: 0;
     return S_OK;
 }
@@ -422 +422 @@
     if (FAILED(rc)) return rc;
 
-    *pcY = displayHeight ? (y * 0xFFFF) / displayHeight: 0;
+    *pcY = displayHeight ? ((y - 1) * 0xFFFF) / displayHeight: 0;
     return S_OK;
 }
@@ -449 +449 @@
 
     uint32_t mouseXAbs;
+    /** @todo the front end should do this conversion to avoid races */
     HRESULT rc = convertDisplayWidth(x, &mouseXAbs);
     if (FAILED(rc)) return rc;
@@ -594 +595 @@
     {
         AutoWriteLock mouseLock(pData->pMouse COMMA_LOCKVAL_SRC_POS);
-        RT_ZERO(pData->pMouse->mpDrv);
+        for (unsigned cDev = 0; cDev < MOUSE_MAX_DEVICES; ++cDev)
+            if (pData->pMouse->mpDrv[cDev] == pData)
+            {
+                pData->pMouse->mpDrv[cDev] = NULL;
+                break;
+            }
     }
 }