Changeset 89951 in vbox for trunk/src

Timestamp:

Jun 29, 2021 1:22:29 PM (4 years ago)

Author:

vboxsync

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

145409

Message:

Main/{MouseImpl,KeyboardImpl,ConsoleImpl): Drop passing pointers through CFGM in favor of using VMM2USERMETHODS::pfnQueryGenericObject, bugref:10053

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (5 diffs)
• KeyboardImpl.cpp (modified) (2 diffs)
• MouseImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -10730 +10730 @@
     }
 
+    if (UuidCopy == COM_IIDOF(IKeyboard))
+    {
+        IKeyboard *pIKeyboard = pConsole->mKeyboard;
+        return pIKeyboard;
+    }
+
+    if (UuidCopy == COM_IIDOF(IMouse))
+    {
+        IMouse *pIMouse = pConsole->mMouse;
+        return pIMouse;
+    }
+
     if (UuidCopy == COM_IIDOF(ISnapshot))
         return ((MYVMM2USERMETHODS *)pThis)->pISnapshot;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1702 +1702 @@
             InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
             InsertConfigString(pLunL1, "Driver",               "MainKeyboard");
-            InsertConfigNode(pLunL1,   "Config", &pCfg);
-            Keyboard *pKeyboard = mKeyboard;
-            InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pKeyboard);
         }
 
@@ -1718 +1715 @@
             InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
             InsertConfigString(pLunL1, "Driver",               "MainMouse");
-            InsertConfigNode(pLunL1,   "Config", &pCfg);
-            Mouse *pMouse = mMouse;
-            InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
         }
 
@@ -2235 +2229 @@
                 InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
                 InsertConfigString(pLunL1, "Driver",        "MainMouse");
-                InsertConfigNode(pLunL1,   "Config", &pCfg);
-                Mouse *pMouse = mMouse;
-                InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
             }
             if (aPointingHID == PointingHIDType_USBMultiTouch)
@@ -2252 +2243 @@
                 InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
                 InsertConfigString(pLunL1, "Driver",        "MainMouse");
-                InsertConfigNode(pLunL1,   "Config", &pCfg);
-                Mouse *pMouse = mMouse;
-                InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
             }
 
@@ -2271 +2259 @@
                 InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
                 InsertConfigString(pLunL1, "Driver",               "MainKeyboard");
-                InsertConfigNode(pLunL1,   "Config", &pCfg);
-                Keyboard *pKeyboard = mKeyboard;
-                InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pKeyboard);
             }
         }

trunk/src/VBox/Main/src-client/KeyboardImpl.cpp

@@ -437 +437 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
+    if (!CFGMR3AreValuesValid(pCfg, ""))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
     AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
@@ -464 +464 @@
      * Get the Keyboard object pointer and update the mpDrv member.
      */
-    void *pv;
-    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Rrc\n", rc));
-        return rc;
-    }
-    pThis->pKeyboard = (Keyboard *)pv;        /** @todo Check this cast! */
+    com::Guid uuid(COM_IIDOF(IKeyboard));
+    IKeyboard *pIKeyboard = (IKeyboard *)PDMDrvHlpQueryGenericUserObject(pDrvIns, uuid.raw());
+    if (!pIKeyboard)
+    {
+        AssertMsgFailed(("Configuration error: No/bad Keyboard object!\n"));
+        return VERR_NOT_FOUND;
+    }
+    pThis->pKeyboard = static_cast<Keyboard *>(pIKeyboard);
+
     unsigned cDev;
     for (cDev = 0; cDev < KEYBOARD_MAX_DEVICES; ++cDev)

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -1242 +1242 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
+    if (!CFGMR3AreValuesValid(pCfg, ""))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
     AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
@@ -1268 +1268 @@
      * Get the Mouse object pointer and update the mpDrv member.
      */
-    void *pv;
-    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Rrc\n", rc));
-        return rc;
-    }
-    pThis->pMouse = (Mouse *)pv;        /** @todo Check this cast! */
+    com::Guid uuid(COM_IIDOF(IMouse));
+    IMouse *pIMouse = (IMouse *)PDMDrvHlpQueryGenericUserObject(pDrvIns, uuid.raw());
+    if (!pIMouse)
+    {
+        AssertMsgFailed(("Configuration error: No/bad Mouse object!\n"));
+        return VERR_NOT_FOUND;
+    }
+    pThis->pMouse = static_cast<Mouse *>(pIMouse);
+
     unsigned cDev;
     {