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

Timestamp:

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

Author:

vboxsync

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

145411

Message:

Main/{DisplayImpl,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) (1 diff)
• DisplayImpl.cpp (modified) (3 diffs)

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

@@ -10742 +10742 @@
     }
 
+    if (UuidCopy == COM_IIDOF(IDisplay))
+    {
+        IDisplay *pIDisplay = pConsole->mDisplay;
+        return pIDisplay;
+    }
+
     if (UuidCopy == VMMDEV_OID)
         return pConsole->m_pVMMDev;

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

@@ -4168 +4168 @@
         InsertConfigString(pLunL0, "Driver",               "MainDisplay");
         InsertConfigNode(pLunL0,   "Config", &pCfg);
-        Display *pDisplay = mDisplay;
-        InsertConfigInteger(pCfg,  "Object", (uintptr_t)pDisplay);
     }
     catch (ConfigError &x)

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

@@ -3736 +3736 @@
      * 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,
@@ -3791 +3791 @@
      * Get the Display 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;
-    }
-    Display *pDisplay = (Display *)pv;      /** @todo Check this cast! */
-    pThis->pDisplay = pDisplay;
+    com::Guid uuid(COM_IIDOF(IDisplay));
+    IDisplay *pIDisplay = (IDisplay *)PDMDrvHlpQueryGenericUserObject(pDrvIns, uuid.raw());
+    if (!pIDisplay)
+    {
+        AssertMsgFailed(("Configuration error: No/bad Keyboard object!\n"));
+        return VERR_NOT_FOUND;
+    }
+    pThis->pDisplay = static_cast<Display *>(pIDisplay);
     pThis->pDisplay->mpDrv = pThis;
 
@@ -3811 +3810 @@
     pThis->pUpPort->pfnSetRefreshRate(pThis->pUpPort, 20);
 
-    return rc;
+    return VINF_SUCCESS;
 }