Changeset 57199 in vbox for trunk/src

Timestamp:

Aug 5, 2015 4:56:20 PM (10 years ago)

Author:

vboxsync

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

101951

Message:

DSound: Careful when enumerating input devices; more release logging.

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (5 diffs)

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

@@ -155 +155 @@
 }
 
+static char *dsoundGUIDToUtf8StrA(LPCGUID lpGUID)
+{
+    LPOLESTR lpOLEStr;
+    HRESULT hr = StringFromCLSID(*lpGUID, &lpOLEStr);
+    if (SUCCEEDED(hr))
+    {
+        char *pszGUID;
+        int rc = RTUtf16ToUtf8(lpOLEStr, &pszGUID);
+        CoTaskMemFree(lpOLEStr);
+
+        return RT_SUCCESS(rc) ? pszGUID : NULL;
+    }
+
+    return NULL;
+}
+
 static void dsoundFreeDeviceLists(PDRVHOSTDSOUND pThis)
 {
@@ -605 +621 @@
     if (!pGUID)
     {
-        PDSOUNDDEV pDev = NULL;
+        PDSOUNDDEV  pDev = NULL;
 
         switch (pDSoundStrmIn->enmRecSource)
@@ -613 +629 @@
                 RTListForEach(&pThis->lstDevInput, pDev, DSOUNDDEV, Node)
                 {
-                    if (RTStrIStr(pDev->pszName, "Mic") == 0) /** @todo what is with non en_us windows versions? */
+                    if (RTStrIStr(pDev->pszName, "Mic"))    /** @todo what is with non en_us windows versions? */
                         break;
                 }
+                if (RTListNodeIsDummy(&pThis->lstDevInput, pDev, DSOUNDDEV, Node))
+                    pDev = NULL;    /* Found nothing. */
             } break;
 
@@ -632 +650 @@
         }
     }
+
+    char *pszGUID = dsoundGUIDToUtf8StrA(pGUID);
+    LogRel(("DSound: Guest \"%s\" is using host device with GUID: %s\n",
+           drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pszGUID ? pszGUID : "NULL"));
+    RTStrFree(pszGUID);
 
     return pGUID;
@@ -915 +938 @@
 }
 
-static char *dsoundGUIDToUtf8StrA(LPCGUID lpGUID)
-{
-    LPOLESTR lpOLEStr;
-    HRESULT hr = StringFromCLSID(*lpGUID, &lpOLEStr);
-    if (SUCCEEDED(hr))
-    {
-        char *pszGUID;
-        int rc = RTUtf16ToUtf8(lpOLEStr, &pszGUID);
-        CoTaskMemFree(lpOLEStr);
-
-        return RT_SUCCESS(rc) ? pszGUID : NULL;
-    }
-
-    return NULL;
-}
-
 static void dsoundLogDevice(const char *pszType, LPGUID lpGUID, LPCWSTR lpwstrDescription, LPCWSTR lpwstrModule)
 {
     char *pszGUID = dsoundGUIDToUtf8StrA(lpGUID);
 
-    DSLOG(("DSound: %s: GUID: %s [%ls] (Module: %ls)\n",
+    LogRel(("DSound: %s: GUID: %s [%ls] (Module: %ls)\n",
            pszType, pszGUID? pszGUID: "no GUID", lpwstrDescription, lpwstrModule));