Changeset 74498 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Sep 27, 2018 1:45:06 PM (6 years ago)

Author:

vboxsync

Message:

DrvAudio.cpp,pdmaudioifs.h: Added a HACK to avoid asserting in dsoundStreamReset when cleaning up after a failed stream creation attempt.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)

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

@@ -2436 +2436 @@
         AssertPtr(pDrvAudioInst->pReg);
 
+#if 0 /** @todo r=bird: Don't use strlen to check for empty strings.  Don't use RTStrPrintf to do RTStrCopy work. */
         char szDriver[64];
         RTStrPrintf(szDriver, RT_ELEMENTS(szDriver), "%s", pDrvAudioInst->pReg->szName);
@@ -2446 +2447 @@
         RTStrPrintf(pStream->szName, RT_ELEMENTS(pStream->szName), "[%s] %s",
                     szDriver, strlen(pCfgHost->szName) ? pCfgHost->szName : "<Untitled>");
+#else
+        Assert(pDrvAudioInst->pReg->szName[0] != '\0');
+        RTStrPrintf(pStream->szName, RT_ELEMENTS(pStream->szName), "[%s] %s",
+                    pDrvAudioInst->pReg->szName[0] != '\0' ? pDrvAudioInst->pReg->szName : "Untitled",
+                    pCfgHost->szName[0] != '\0' ? pCfgHost->szName : "<Untitled>");
+#endif
         pStream->enmDir = pCfgHost->enmDir;
 
@@ -3025 +3032 @@
         return rc;
     }
+    pStream->fValidBackendData = true;
 
     /* Validate acquired configuration. */
@@ -3082 +3090 @@
         /* Check if the pointer to  the host audio driver is still valid.
          * It can be NULL if we were called in drvAudioDestruct, for example. */
-        if (pThis->pHostDrvAudio)
+        if (pThis->pHostDrvAudio && pStream->fValidBackendData)
+        {
             rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pStream->pvBackend);
-
+            pStream->fValidBackendData = false;
+        }
+
+        /** @todo r=bird: Who frees pvBackend? drvAudioStreamFree, right?
+         *        So, you cannot set to NULL here, can you? */
         pStream->pvBackend = NULL;
         pStream->cbBackend = 0;