Changeset 94368 in vbox

Timestamp:

Mar 25, 2022 7:26:37 AM (3 years ago)

Author:

vboxsync

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

150674

Message:

Main,UsbWebcam: Drop passing pointers through CFGM in favor of using VMM2USERMETHODS::pfnQueryGenericObject, bugref:10053

Location:

trunk

Files:

• include/VBox/vrdpusb.h (modified) (2 diffs)
• src/VBox/Main/include/EmulatedUSBImpl.h (modified) (4 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-client/EmulatedUSBImpl.cpp (modified) (6 diffs)
• src/VBox/Main/src-client/UsbWebcamInterface.cpp (modified) (1 diff)

trunk/include/VBox/vrdpusb.h

@@ -90 +90 @@
 typedef struct REMOTEUSBIF
 {
-    /** Opqaue user data to pass as the first parameter to the callbacks. */
+    /** Opaque user data to pass as the first parameter to the callbacks. */
     void                        *pvUser;
 
@@ -109 +109 @@
 #define REMOTEUSBIF_OID "87012f58-2ad6-4f89-b7b1-92f72c7ea8cc"
 
+
+typedef struct EMULATEDUSBIF
+{
+    /** Opaque user data to pass as the first parameter to the callbacks. */
+    void                        *pvUser;
+
+    DECLCALLBACKMEMBER(int, pfnQueryEmulatedUsbDataById, (void *pvUser, const char *pszId, void **ppvEmUsbCb, void **ppvEmUsbCbData, void **ppvObject));
+} EMULATEDUSBIF;
+typedef EMULATEDUSBIF *PEMULATEDUSBIF;
+
+#define EMULATEDUSBIF_OID "b7b4e194-ada0-4722-8e4e-1700ed9064f3"
+
 /** @} */
 

trunk/src/VBox/Main/include/EmulatedUSBImpl.h

@@ -24 +24 @@
 #include "EmulatedUSBWrap.h"
 
+#include <VBox/vrdpusb.h>
+
 class Console;
 class EUSBWEBCAM;
@@ -47 +49 @@
                                             const void *pvData, uint32_t cbData);
 
+    PEMULATEDUSBIF i_getEmulatedUsbIf();
+
     HRESULT i_webcamAttachInternal(const com::Utf8Str &aPath,
                                    const com::Utf8Str &aSettings,
@@ -57 +61 @@
     static DECLCALLBACK(int) eusbCallbackEMT(EmulatedUSB *pThis, char *pszId, uint32_t iEvent,
                                              void *pvData, uint32_t cbData);
+
+    static DECLCALLBACK(int) i_QueryEmulatedUsbDataById(void *pvUser, const char *pszId, void **ppvEmUsbCb, void **ppvEmUsbCbData, void **ppvObject);
 
     HRESULT webcamPathFromId(com::Utf8Str *pPath, const char *pszId);
@@ -80 +86 @@
 
     Data m;
+    EMULATEDUSBIF mEmUsbIf;
 };
 

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

@@ -10983 +10983 @@
         return &pConsole->mRemoteUsbIf;
 
+    if (UuidCopy == EMULATEDUSBIF_OID)
+        return pConsole->mEmulatedUSB->i_getEmulatedUsbIf();
+
     return NULL;
 }

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

@@ -101 +101 @@
     bool HasId(const char *pszId) { return RTStrCmp(pszId, mszUuid) == 0;}
 
+    void *getObjectPtr() { return mpvObject; }
+
     EUSBDEVICESTATUS enmStatus;
 };
@@ -145 +147 @@
     rc = pVMM->pfnCFGMR3InsertString(pEUSB,         "Id", pThis->mszUuid);
     AssertRCReturn(rc, rc);
-    /** @todo BUGBUG: No pointers via CFGM in 7.0!   */
-    rc = pVMM->pfnCFGMR3InsertInteger(pEUSB,        "pfnCallback", (uintptr_t)EmulatedUSB::i_eusbCallback);
-    AssertRCReturn(rc, rc);
-    rc = pVMM->pfnCFGMR3InsertInteger(pEUSB,        "pvCallback", (uintptr_t)pThis->mpEmulatedUSB);
-    AssertRCReturn(rc, rc);
 
     PCFGMNODE pLunL0;
@@ -160 +157 @@
     rc = pVMM->pfnCFGMR3InsertString(pConfig,       "DevicePath", pThis->mPath.c_str());
     AssertRCReturn(rc, rc);
-    /** @todo BUGBUG: No pointers via CFGM in 7.0!   */
-    rc = pVMM->pfnCFGMR3InsertInteger(pConfig,      "Object", (uintptr_t)pThis->mpvObject);
+    rc = pVMM->pfnCFGMR3InsertString(pConfig,       "Id", pThis->mszUuid);
     AssertRCReturn(rc, rc);
     rc = emulatedWebcamInsertSettings(pConfig, pVMM, &pThis->mDrvSettings);
@@ -337 +333 @@
     m.pConsole = pConsole;
 
+    mEmUsbIf.pvUser = this;
+    mEmUsbIf.pfnQueryEmulatedUsbDataById = EmulatedUSB::i_QueryEmulatedUsbDataById;
+
     /* Confirm a successful initialization */
     autoInitSpan.setSucceeded();
@@ -400 +399 @@
 
     return hrc;
+}
+
+PEMULATEDUSBIF EmulatedUSB::i_getEmulatedUsbIf()
+{
+    return &mEmUsbIf;
 }
 
@@ -603 +607 @@
 }
 
+/*static*/
+DECLCALLBACK(int) EmulatedUSB::i_QueryEmulatedUsbDataById(void *pvUser, const char *pszId, void **ppvEmUsbCb, void **ppvEmUsbCbData, void **ppvObject)
+{
+    EmulatedUSB *pEmUsb = (EmulatedUSB *)pvUser;
+
+    AutoReadLock alock(pEmUsb COMMA_LOCKVAL_SRC_POS);
+    WebcamsMap::const_iterator it;
+    for (it = pEmUsb->m.webcams.begin(); it != pEmUsb->m.webcams.end(); ++it)
+    {
+        EUSBWEBCAM *p = it->second;
+        if (p->HasId(pszId))
+        {
+            if (ppvEmUsbCb)
+                *ppvEmUsbCb = (void *)EmulatedUSB::i_eusbCallback;
+            if (ppvEmUsbCbData)
+                *ppvEmUsbCbData = pEmUsb;
+            if (ppvObject)
+                *ppvObject = p->getObjectPtr();
+
+            return VINF_SUCCESS;
+        }
+    }
+
+    return VERR_NOT_FOUND;
+}
+
 HRESULT EmulatedUSB::webcamPathFromId(com::Utf8Str *pPath, const char *pszId)
 {

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

@@ -404 +404 @@
     }
 
-    void *pv = NULL;
-    int rc = pDrvIns->pHlpR3->pfnCFGMQueryPtr(pCfg, "Object", &pv);
-    if (!RT_VALID_PTR(pv))
-         rc = VERR_INVALID_PARAMETER;
-    AssertMsgRCReturn(rc, ("Configuration error: No/bad \"Object\" %p value! rc=%Rrc\n", pv, rc), rc);
+    char *pszId = NULL;
+    int rc = pDrvIns->pHlpR3->pfnCFGMQueryStringAlloc(pCfg, "Id", &pszId);
+    if (RT_SUCCESS(rc))
+    {
+        RTUUID UuidEmulatedUsbIf;
+        rc = RTUuidFromStr(&UuidEmulatedUsbIf, EMULATEDUSBIF_OID); AssertRC(rc);
+
+        PEMULATEDUSBIF pEmulatedUsbIf = (PEMULATEDUSBIF)PDMDrvHlpQueryGenericUserObject(pDrvIns, &UuidEmulatedUsbIf);
+        AssertPtrReturn(pEmulatedUsbIf, VERR_INVALID_PARAMETER);
+
+        rc = pEmulatedUsbIf->pfnQueryEmulatedUsbDataById(pEmulatedUsbIf->pvUser, pszId,
+                                                         NULL /*ppvEmUsbCb*/, NULL /*ppvEmUsbCbData*/, (void **)&pThis->pRemote);
+        pDrvIns->pHlpR3->pfnMMHeapFree(pDrvIns, pszId);
+        AssertRCReturn(rc, rc);
+    }
+    else
+        return rc;
 
     /* Everything ok. Initialize. */
-    pThis->pRemote = (EMWEBCAMREMOTE *)pv;
     pThis->pRemote->pEmWebcam->EmWebcamConstruct(pThis);