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

Timestamp:

Apr 23, 2021 7:57:31 PM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioDSound, DrvHostAudioWasApi: No need to call CoInitializeEx in the constructor as all EMTs do so when they're created (MTA). (For SMP VMs it wouldn't be enough it EMTs wasn't all initialized already.) bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHdaStream.cpp (modified) (1 diff)
• DrvHostAudioDSound.cpp (modified) (2 diffs)
• DrvHostAudioWasApi.cpp (modified) (2 diffs)

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

@@ -2538 +2538 @@
  *
  * This will do the heavy lifting work for us as soon as it's getting notified
- * by another thread.}
+ * by the DMA timer callout.}
  */
 static DECLCALLBACK(int) hdaR3StreamAsyncIOThread(RTTHREAD hThreadSelf, void *pvUser)

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

@@ -2697 +2697 @@
     PDMAudioHostEnumDelete(&pThis->DeviceEnum);
 
-    if (pThis->pDrvIns)
-        CoUninitialize();
-
     int rc2 = RTCritSectDelete(&pThis->CritSect);
     AssertRC(rc2);
@@ -2783 +2780 @@
      * Verify that IDirectSound is available.
      */
-    HRESULT hrc = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    LPDIRECTSOUND pDirectSound = NULL;
+    HRESULT hrc = CoCreateInstance(CLSID_DirectSound, NULL, CLSCTX_ALL, IID_IDirectSound, (void **)&pDirectSound);
     if (SUCCEEDED(hrc))
-    {
-        LPDIRECTSOUND pDirectSound = NULL;
-        hrc = CoCreateInstance(CLSID_DirectSound, NULL, CLSCTX_ALL, IID_IDirectSound, (void **)&pDirectSound);
-        if (SUCCEEDED(hrc))
-            IDirectSound_Release(pDirectSound);
-        else
-        {
-            LogRel(("DSound: DirectSound not available: %Rhrc\n", hrc));
-            return VERR_AUDIO_BACKEND_INIT_FAILED;
-        }
-    }
+        IDirectSound_Release(pDirectSound);
     else
     {
-        LogRel(("DSound: CoInitializeEx(,COINIT_MULTITHREADED) failed: %Rhrc\n", hrc));
+        LogRel(("DSound: DirectSound not available: %Rhrc\n", hrc));
         return VERR_AUDIO_BACKEND_INIT_FAILED;
     }

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

@@ -2290 +2290 @@
         uint32_t cRefs = pThis->pIEnumerator->Release(); RT_NOREF(cRefs);
         LogFlowFunc(("cRefs=%d\n", cRefs));
-        CoUninitialize();
     }
 
@@ -2367 +2366 @@
      * as well as do enumeration thru.
      */
-    HRESULT hrc = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-    AssertLogRelMsgReturn(SUCCEEDED(hrc), ("CoInitializeEx -> %Rhrc\n", hrc), VERR_AUDIO_BACKEND_INIT_FAILED);
-
-    hrc = CoCreateInstance(__uuidof(MMDeviceEnumerator), 0, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator),
-                           (void **)&pThis->pIEnumerator);
+    HRESULT hrc = CoCreateInstance(__uuidof(MMDeviceEnumerator), 0, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator),
+                                   (void **)&pThis->pIEnumerator);
     if (FAILED(hrc))
     {
         pThis->pIEnumerator = NULL;
-        CoUninitialize(); /* uninitialize here so destructor can use pEnumeration as indicator. */
         LogRel(("WasAPI: Failed to create an MMDeviceEnumerator object: %Rhrc\n", hrc));
         return VERR_AUDIO_BACKEND_INIT_FAILED;