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

Timestamp:

Dec 18, 2023 6:29:29 PM (13 months ago)

Author:

vboxsync

Message:

Audio/WAS: Attempt to fix crashes when invalidating the cached audio interfaces of the device entry configurations. This is needed when the audio interface becomes invalid on a host device switch.

This patch modifies the original one so that we don't remove the current device entry from the cache, but just create a new cached entry with the new audio interface instead. The former approach apparently caused crashes when putting back a stale cache entry back to the cache when completing the device switch.

bugref:10503

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (2 diffs)

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

@@ -812 +812 @@
 }
 
-/**
- * Invalidates device cache entry configurations.
- *
- * This is needed in order to not run into deadlocks when trying to release a stale device interface
- * via Release().
- *
- * @param   pThis       The WASAPI host audio driver instance data.
- * @param   pDevEntry   The device entry to invalidate.
- */
-static void drvHostAudioWasCacheInvalidateDevEntryConfig(PDRVHOSTAUDIOWAS pThis, PDRVHOSTAUDIOWASCACHEDEV pDevEntry)
-{
-    RT_NOREF(pThis);
-
-    Log8Func(("Invalidating cache entry configurations: %p - '%ls'\n", pDevEntry, pDevEntry->wszDevId));
-
-    PDRVHOSTAUDIOWASCACHEDEVCFG pDevCfg, pDevCfgNext;
-    RTListForEachSafe(&pDevEntry->ConfigList, pDevCfg, pDevCfgNext, DRVHOSTAUDIOWASCACHEDEVCFG, ListEntry)
-        pDevCfg->pIAudioClient = NULL;
-}
 
 /**
@@ -1255 +1236 @@
                  * actually matches the one we have in the cache entry.
                  *
-                 * If it doesn't, invalidate + remove the cache entry from the cache and bail out.
-                 * Add a new device entry to the cache with the new interface below then.
+                 * If it doesn't, bail out and add a new device entry to the cache with the new interface below then.
                  *
                  * This is needed when switching audio interfaces and the device interface becomes invalid via
                  * AUDCLNT_E_DEVICE_INVALIDATED.  See @bugref{10503}
                  */
-                if (pIDevice != pDevEntry->pIDevice)
+                if (pDevEntry->pIDevice != pIDevice)
                 {
                     LogRel2(("WasAPI: Cache hit for device '%ls': Stale interface (new: %p, old: %p)\n",
                               pDevEntry->wszDevId, pIDevice, pDevEntry->pIDevice));
 
-                    LogRel(("WasAPI: Stale audio interface '%ls' detected! Invalidating audio interface ...\n",
-                            pDevEntry->wszDevId));
-
-                    drvHostAudioWasCacheInvalidateDevEntryConfig(pThis, pDevEntry);
-                    RTListNodeRemove(&pDevEntry->ListEntry);
-                    drvHostAudioWasCacheDestroyDevEntry(pThis, pDevEntry);
-                    pDevEntry = NULL;
+                    LogRel(("WasAPI: Stale audio interface '%ls' detected!\n", pDevEntry->wszDevId));
                     break;
                 }