Changeset 25969 in vbox

Timestamp:

Jan 22, 2010 12:22:38 PM (15 years ago)

Author:

vboxsync

Message:

pdmifs.h: Converted the mouse interface ids. Committing early to see how MSC likes PDMIBASE_QUERY_INTERFACE.

Location:

trunk

Files:

• include/VBox/pdmifs.h (modified) (5 diffs)
• src/VBox/Devices/Input/DevPS2.cpp (modified) (2 diffs)
• src/VBox/Devices/Input/DrvMouseQueue.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxBFE/MouseImpl.cpp (modified) (3 diffs)
• src/VBox/Main/MouseImpl.cpp (modified) (3 diffs)

trunk/include/VBox/pdmifs.h

@@ -41 +41 @@
  */
 
+
 /** @name Common Driver Interface Identficators.
  * @todo Convert all these to _IID.
  * @{
  */
-/** PDMIMOUSEPORT           - The mouse port interface.             (Down)  Coupled with PDMINTERFACE_MOUSE_CONNECTOR. */
-#define PDMINTERFACE_MOUSE_PORT                 "dcf20e6b-6cd5-4517-8759-91064605b8a8"
-/** PDMIMOUSECONNECTOR      - The mouse connector interface.        (Up)    Coupled with PDMINTERFACE_MOUSE_PORT. */
-#define PDMINTERFACE_MOUSE_CONNECTOR            "847f965f-0eb8-4363-88ac-b0ee58a05bde"
 /** PDMIKEYBOARDPORT        - The keyboard port interface.          (Down)  Coupled with PDMINTERFACE_KEYBOARD_CONNECTOR. */
 #define PDMINTERFACE_KEYBOARD_PORT              "2a0844f0-410b-40ab-a6ed-6575f3aa3e29"
@@ -176 +173 @@
 #define PDMIBASE_IID                            "a2299c0d-b709-4551-aa5a-73f59ffbed74"
 
+/**
+ * Helper macro for quering an interface from PDMIBASE.
+ *
+ * @returns Correctly typed PDMIBASE::pfnQueryInterface return value.
+ *
+ * @param    pIBase         Pointer to the base interface.
+ * @param    InterfaceType  The interface type name.  The interface ID is
+ *                          derived from this by appending _IID.
+ */
+#define PDMIBASE_QUERY_INTERFACE(pIBase, InterfaceType)  \
+    ( (InterfaceType *)(pIBase)->pfnQueryInterface(pIBase, InterfaceType##_IID ) )
+
 
 /**
@@ -190 +199 @@
 
 
+/** PDMIMOUSEPORT interface ID. */
+#define PDMIMOUSEPORT_IID "dcf20e6b-6cd5-4517-8759-91064605b8a8"
 /** Pointer to a mouse port interface. */
 typedef struct PDMIMOUSEPORT *PPDMIMOUSEPORT;
 /**
- * Mouse port interface.
+ * Mouse port interface (down).
  * Pair with PDMIMOUSECONNECTOR.
  */
@@ -226 +237 @@
 
 /**
- * Mouse connector interface.
+ * Mouse connector interface (up).
  * Pair with PDMIMOUSEPORT.
  */
@@ -232 +243 @@
  /** Pointer to a mouse connector interface. */
 typedef PDMIMOUSECONNECTOR *PPDMIMOUSECONNECTOR;
+/** PDMIMOUSECONNECTOR interface ID.  */
+#define PDMIMOUSECONNECTOR_IID                  "847f965f-0eb8-4363-88ac-b0ee58a05bde"
 
 

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -1401 +1401 @@
     if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
         return &pThis->Mouse.Base;
-    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_MOUSE_PORT) == 0)
+    if (RTUuidCompare2Strs(pszIID, PDMIMOUSEPORT_IID) == 0)
         return &pThis->Mouse.Port;
     return NULL;
@@ -1488 +1488 @@
             if (RT_SUCCESS(rc))
             {
-                pThis->Mouse.pDrv = (PDMIMOUSECONNECTOR*)(pThis->Mouse.pDrvBase->pfnQueryInterface(pThis->Mouse.pDrvBase, PDMINTERFACE_MOUSE_CONNECTOR));
+                pThis->Mouse.pDrv = PDMIBASE_QUERY_INTERFACE(pThis->Mouse.pDrvBase, PDMIMOUSECONNECTOR);
                 if (!pThis->Mouse.pDrv)
                 {

trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp

@@ -89 +89 @@
     if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
         return &pDrvIns->IBase;
-    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_MOUSE_PORT) == 0)
+    if (RTUuidCompare2Strs(pszIID, PDMIMOUSEPORT_IID) == 0)
         return &pThis->Port;
-    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_MOUSE_CONNECTOR) == 0)
+    if (RTUuidCompare2Strs(pszIID, PDMIMOUSECONNECTOR_IID) == 0)
         return &pThis->Connector;
     return NULL;
@@ -249 +249 @@
      * Get the IMousePort interface of the above driver/device.
      */
-    pDrv->pUpPort = (PPDMIMOUSEPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_MOUSE_PORT);
+    pDrv->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIMOUSEPORT);
     if (!pDrv->pUpPort)
     {
@@ -266 +266 @@
         return rc;
     }
-    pDrv->pDownConnector = (PPDMIMOUSECONNECTOR)pDownBase->pfnQueryInterface(pDownBase, PDMINTERFACE_MOUSE_CONNECTOR);
+    pDrv->pDownConnector = PDMIBASE_QUERY_INTERFACE(pDownBase, PDMIMOUSECONNECTOR);
     if (!pDrv->pDownConnector)
     {

trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp

@@ -53 +53 @@
 } DRVMAINMOUSE, *PDRVMAINMOUSE;
 
-/** Converts PDMIMOUSECONNECTOR pointer to a DRVMAINMOUSE pointer. */
-#define PDMIMOUSECONNECTOR_2_MAINMOUSE(pInterface) ( (PDRVMAINMOUSE) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINMOUSE, Connector)) )
 
 // IMouse methods
@@ -186 +184 @@
     if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
         return &pDrvIns->IBase;
-    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_MOUSE_CONNECTOR) == 0)
+    if (RTUuidCompare2Strs(pszIID, PDMIMOUSECONNECTOR_IID) == 0)
         return &pDrv->Connector;
     return NULL;
@@ -232 +230 @@
      * Get the IMousePort interface of the above driver/device.
      */
-    pData->pUpPort = (PPDMIMOUSEPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_MOUSE_PORT);
+        pData->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIMOUSEPORT);
     if (!pData->pUpPort)
     {

trunk/src/VBox/Main/MouseImpl.cpp

@@ -46 +46 @@
 } DRVMAINMOUSE, *PDRVMAINMOUSE;
 
-/** Converts PDMIMOUSECONNECTOR pointer to a DRVMAINMOUSE pointer. */
-#define PDMIMOUSECONNECTOR_2_MAINMOUSE(pInterface) ( (PDRVMAINMOUSE) ((uintptr_t)pInterface - OFFSETOF(DRVMAINMOUSE, Connector)) )
 
 
@@ -364 +362 @@
     if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
         return &pDrvIns->IBase;
-    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_MOUSE_CONNECTOR) == 0)
+    if (RTUuidCompare2Strs(pszIID, PDMIMOUSECONNECTOR_IID) == 0)
         return &pDrv->Connector;
     return NULL;
@@ -415 +413 @@
      * Get the IMousePort interface of the above driver/device.
      */
-    pData->pUpPort = (PPDMIMOUSEPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_MOUSE_PORT);
+    pData->pUpPort = (PPDMIMOUSEPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMIMOUSEPORT_IID);
     if (!pData->pUpPort)
     {