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

Timestamp:

Sep 14, 2015 1:11:50 PM (9 years ago)

Author:

vboxsync

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

102658

Message:

DrvHostDSound: dynamically load dsound.dll

Location:

trunk/src/VBox/Devices

Files:

• Audio/DrvHostDSound.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (1 diff)

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

@@ -28 +28 @@
 #include "VBoxDD.h"
 
+/* Dynamically load dsound.dll. */
+typedef HRESULT WINAPI FNDIRECTSOUNDENUMERATEW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
+typedef FNDIRECTSOUNDENUMERATEW *PFNDIRECTSOUNDENUMERATEW;
+typedef HRESULT WINAPI FNDIRECTSOUNDCAPTUREENUMERATEW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
+typedef FNDIRECTSOUNDCAPTUREENUMERATEW *PFNDIRECTSOUNDCAPTUREENUMERATEW;
+
 typedef struct DSOUNDHOSTCFG
 {
@@ -323 +329 @@
     if (FAILED(hr))
     {
-        LogRel(("DSound: Error creating DirectSound instance: %Rhrc\n", hr));
+        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error creating DirectSound instance: %Rhrc\n", hr));
     }
     else
@@ -1487 +1493 @@
     pCfg->cMaxHstStrmsIn  = 0;
 
-    DSOUNDENUMCBCTX ctx = { pThis, pCfg };
-
-    HRESULT hr = DirectSoundEnumerateW(&dsoundEnumCallback, &ctx);
-    if (FAILED(hr))
-        LogRel(("DSound: Error enumerating host playback devices: %Rhrc\n", hr));
-
-    LogRel(("DSound: Found %RU32 host playback devices\n", pCfg->cMaxHstStrmsOut));
+    RTLDRMOD hDSound = NULL;
+    int rc = RTLdrLoadSystem("dsound.dll", true /*fNoUnload*/, &hDSound);
+    if (RT_SUCCESS(rc))
+    {
+        PFNDIRECTSOUNDENUMERATEW pfnDirectSoundEnumerateW = NULL;
+        PFNDIRECTSOUNDCAPTUREENUMERATEW pfnDirectSoundCaptureEnumerateW = NULL;
+
+        rc = RTLdrGetSymbol(hDSound, "DirectSoundEnumerateW", (void**)&pfnDirectSoundEnumerateW);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTLdrGetSymbol(hDSound, "DirectSoundCaptureEnumerateW", (void**)&pfnDirectSoundCaptureEnumerateW);
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            DSOUNDENUMCBCTX ctx = { pThis, pCfg };
+
+            HRESULT hr = pfnDirectSoundEnumerateW(&dsoundEnumCallback, &ctx);
+            if (FAILED(hr))
+                LogRel(("DSound: Error enumerating host playback devices: %Rhrc\n", hr));
+
+            LogRel(("DSound: Found %RU32 host playback devices\n", pCfg->cMaxHstStrmsOut));
+
+            hr = pfnDirectSoundCaptureEnumerateW(&dsoundCaptureEnumCallback, &ctx);
+            if (FAILED(hr))
+                LogRel(("DSound: Error enumerating host capturing devices: %Rhrc\n", hr));
+
+            LogRel(("DSound: Found %RU32 host capturing devices\n", pCfg->cMaxHstStrmsIn));
+        }
+
+        RTLdrClose(hDSound);
+    }
+    else
+    {
+        /* No dsound.dll on this system.  */
+        LogRel(("DSound: could not load dsound.dll %Rrc\n", rc));
+    }
+
+    /* Always return success and at least default values to make the caller happy. */
     if (pCfg->cMaxHstStrmsOut == 0)
+    {
+        LogRel(("DSound: Adjusting the number of host playback devices to 1\n"));
         pCfg->cMaxHstStrmsOut = 1; /* Support at least one stream. */
-
-    hr = DirectSoundCaptureEnumerateW(&dsoundCaptureEnumCallback, &ctx);
-    if (FAILED(hr))
-        LogRel(("DSound: Error enumerating host capturing devices: %Rhrc\n", hr));
-
-    LogRel(("DSound: Found %RU32 host capturing devices\n", pCfg->cMaxHstStrmsIn));
+    }
+
     if (pCfg->cMaxHstStrmsIn < 2)
     {

trunk/src/VBox/Devices/Makefile.kmk

@@ -559 +559 @@
   VBoxDD_SOURCES += \
    Audio/DrvHostDSound.cpp
-  VBoxDD_LIBS    += \
-   $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dsound.lib
  endif