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

Timestamp:

Feb 19, 2010 1:42:35 PM (15 years ago)

Author:

vboxsync

Message:

pdmifs,DevPS2,DrvMouseQueue,MouseImpl: hungarian changes and some other cleanups.

File:

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

trunk/src/VBox/Main/MouseImpl.cpp

@@ -46 +46 @@
 } DRVMAINMOUSE, *PDRVMAINMOUSE;
 
-/** Converts a PDMIMOUSECONNECTOR pointer to a DRVMAINMOUSE pointer. */
-#define PPDMIMOUSECONNECTOR_2_MAINMOUSE(pInterface) ( (PDRVMAINMOUSE) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINMOUSE, IConnector)) )
 
 // constructor / destructor
@@ -403 +401 @@
                                           LONG buttonState)
 {
-    HRESULT rc = S_OK;
-
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -414 +410 @@
 
     uint32_t mouseXAbs;
-    rc = convertDisplayWidth(x, &mouseXAbs);
+    HRESULT rc = convertDisplayWidth(x, &mouseXAbs);
     ComAssertComRCRet(rc, rc);
     if (mouseXAbs > 0xffff)
         mouseXAbs = mLastAbsX;
+
     uint32_t mouseYAbs;
     rc = convertDisplayHeight(y, &mouseYAbs);
@@ -423 +420 @@
     if (mouseYAbs > 0xffff)
         mouseYAbs = mLastAbsY;
+
     uint32_t fButtons = mouseButtonsToPDM(buttonState);
+
     /* Older guest additions rely on a small phony movement event on the
      * PS/2 device to notice absolute events. */
@@ -435 +434 @@
         rc = getVMMDevMouseCaps(&mouseCaps);
         ComAssertComRCRet(rc, rc);
+
         /*
          * This method being called implies that the host wants
@@ -449 +449 @@
         fNeedsJiggle = !(mouseCaps & VMMDEV_MOUSE_GUEST_USES_VMMDEV);
     }
-    ComAssertComRCRet (rc, rc);
+    ComAssertComRCRet(rc, rc);
+
     mLastAbsX = mouseXAbs;
     mLastAbsY = mouseYAbs;
+
     if (!(uDevCaps & MOUSE_DEVCAP_ABSOLUTE))
     {
@@ -460 +462 @@
          * the way. */
         if (fNeedsJiggle || fButtons != mLastButtons || dz || dw)
+        {
             rc = reportRelEventToMouseDev(fNeedsJiggle ? 1 : 0, 0, dz, dw,
                                           fButtons);
-        ComAssertComRCRet (rc, rc);
+            ComAssertComRCRet(rc, rc);
+        }
     }
     mLastButtons = fButtons;
@@ -471 +475 @@
 /////////////////////////////////////////////////////////////////////////////
 
-/**
- * @interface_method_impl{PDMIBASE,pfnQueryInterface}
- */
-DECLCALLBACK(void *)  Mouse::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
-{
-    PPDMDRVINS      pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-    PDRVMAINMOUSE   pDrv    = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
-
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUSECONNECTOR, &pDrv->IConnector);
-    return NULL;
-}
-
-
-/**
- * Destruct a mouse driver instance.
- *
- * @returns VBox status.
- * @param   pDrvIns     The driver instance data.
- */
-DECLCALLBACK(void) Mouse::drvDestruct(PPDMDRVINS pDrvIns)
-{
-    PDRVMAINMOUSE pData = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
-    LogFlow(("Mouse::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
-    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-
-    if (pData->pMouse)
-    {
-        AutoWriteLock mouseLock(pData->pMouse COMMA_LOCKVAL_SRC_POS);
-        pData->pMouse->mpDrv = NULL;
-    }
-}
-
-
-DECLCALLBACK(void) Mouse::mouseAbsModeChange (PPDMIMOUSECONNECTOR pInterface, bool fAbs)
-{
-    PDRVMAINMOUSE pDrv = PPDMIMOUSECONNECTOR_2_MAINMOUSE (pInterface);
-    if (fAbs)
+
+/**
+ * @interface_method_impl{PDMIMOUSECONNECTOR,pfnAbsModeChange}
+ */
+DECLCALLBACK(void) Mouse::mouseAbsModeChange(PPDMIMOUSECONNECTOR pInterface, bool fEnabled)
+{
+    PDRVMAINMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVMAINMOUSE, IConnector);
+    if (fEnabled)
         pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_ABSOLUTE;
     else
         pDrv->pMouse->uDevCaps &= ~MOUSE_DEVCAP_ABSOLUTE;
+
     /** @todo we have to hack around the fact that VMMDev may not be
      * initialised too close to startup.  The real fix is to change the
@@ -523 +498 @@
         rc = pDrv->pMouse->getVMMDevMouseCaps(&fMouseCaps);
     AssertComRCReturnVoid(rc);
-    pDrv->pMouse->getParent()->onMouseCapabilityChange (fAbs, fMouseCaps & VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
+    pDrv->pMouse->getParent()->onMouseCapabilityChange(fEnabled, fMouseCaps & VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
+}
+
+
+/**
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+DECLCALLBACK(void *)  Mouse::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    PPDMDRVINS      pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVMAINMOUSE   pDrv    = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
+
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUSECONNECTOR, &pDrv->IConnector);
+    return NULL;
+}
+
+
+/**
+ * Destruct a mouse driver instance.
+ *
+ * @returns VBox status.
+ * @param   pDrvIns     The driver instance data.
+ */
+DECLCALLBACK(void) Mouse::drvDestruct(PPDMDRVINS pDrvIns)
+{
+    PDRVMAINMOUSE pData = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
+    LogFlow(("Mouse::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+
+    if (pData->pMouse)
+    {
+        AutoWriteLock mouseLock(pData->pMouse COMMA_LOCKVAL_SRC_POS);
+        pData->pMouse->mpDrv = NULL;
+    }
 }