Changeset 89269 in vbox for trunk/src/VBox/Devices

Timestamp:

May 25, 2021 12:10:57 PM (4 years ago)

Author:

vboxsync

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

144612

Message:

DrvHostAudioDSound: Use RTUuidToStr instead of UuidFromStringW because the string is bracketed and it seems the windows API doesn't like that nor give us any failure. Set PDMAUDIOHOSTDEV::pszId. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp

@@ -183 +183 @@
     /** The GUID if handy. */
     GUID            Guid;
+    /** The GUID as a string (empty if default). */
+    char            szGuid[RTUUID_STR_LENGTH];
 } DSOUNDDEV;
 /** Pointer to a DirectSound device entry. */
@@ -814 +816 @@
             RTStrFree(pszName);
 
-            if (pGUID) /* pGUID == NULL means default device. */
+            if (!pGUID)
+                pDev->Core.fFlags |= PDMAUDIOHOSTDEV_F_DEFAULT_OUT;
+            else
+            {
                 memcpy(&pDev->Guid, pGUID, sizeof(pDev->Guid));
+                rc = RTUuidToStr((PCRTUUID)pGUID, pDev->szGuid, sizeof(pDev->szGuid));
+                AssertRC(rc);
+            }
+            pDev->Core.pszId = &pDev->szGuid[0];
 
             PDMAudioHostEnumAppend(pDevEnm, &pDev->Core);
@@ -872 +881 @@
             RTStrFree(pszName);
 
-            if (pGUID) /* pGUID == NULL means default capture device. */
+            if (!pGUID)
+                pDev->Core.fFlags |= PDMAUDIOHOSTDEV_F_DEFAULT_IN;
+            else
+            {
                 memcpy(&pDev->Guid, pGUID, sizeof(pDev->Guid));
+                rc = RTUuidToStr((PCRTUUID)pGUID, pDev->szGuid, sizeof(pDev->szGuid));
+                AssertRC(rc);
+            }
+            pDev->Core.pszId = &pDev->szGuid[0];
 
             PDMAudioHostEnumAppend(pDevEnm, &pDev->Core);
@@ -1040 +1056 @@
                         pDev->Core.enmUsage = enmType == eRender ? PDMAUDIODIR_OUT : PDMAUDIODIR_IN;
                         pDev->Core.enmType  = PDMAUDIODEVICETYPE_BUILTIN;
+                        if (fDefault)
+                            pDev->Core.fFlags |= enmType == eRender
+                                                 ? PDMAUDIOHOSTDEV_F_DEFAULT_OUT : PDMAUDIOHOSTDEV_F_DEFAULT_IN;
                         if (enmType == eRender)
                             pDev->Core.cMaxOutputChannels = pFormat->nChannels;
@@ -1045 +1064 @@
                             pDev->Core.cMaxInputChannels  = pFormat->nChannels;
 
-                        RT_NOREF(fDefault);
                         //if (fDefault)
-                            hrc = UuidFromStringW(VarGUID.pwszVal, &pDev->Guid);
-                        if (SUCCEEDED(hrc))
+                            rc = RTUuidFromUtf16((PRTUUID)&pDev->Guid, VarGUID.pwszVal);
+                        if (RT_SUCCESS(rc))
                         {
+                            rc = RTUuidToStr((PCRTUUID)&pDev->Guid, pDev->szGuid, sizeof(pDev->szGuid));
+                            AssertRC(rc);
+                            pDev->Core.pszId = &pDev->szGuid[0];
+
                             char *pszName;
                             rc = RTUtf16ToUtf8(VarName.pwszVal, &pszName);
@@ -1064 +1086 @@
                         else
                         {
-                            LogFunc(("UuidFromStringW(%ls): %Rhrc\n", VarGUID.pwszVal, hrc));
+                            LogFunc(("RTUuidFromUtf16(%ls): %Rrc\n", VarGUID.pwszVal, rc));
                             PDMAudioHostDevFree(&pDev->Core);
                         }