Changeset 90079 in vbox for trunk

Timestamp:

Jul 7, 2021 5:18:31 PM (4 years ago)

Author:

vboxsync

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

145576

Message:

Audio/ValKit: Device detection / enumeration fixes. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (2 diffs)
• vkatCommon.cpp (modified) (3 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -663 +663 @@
     int rc = AudioTestSvcCreate(&TstEnv.u.Guest.Srv);
 
-    const char *pszDevice     = NULL; /* Custom device to use. Can be NULL if not being used. */
     const char *pszTag        = NULL; /* Custom tag to use. Can be NULL if not being used. */
     PCPDMDRVREG pDrvReg       = AudioTestGetDefaultBackend();
@@ -740 +739 @@
 
             case VKAT_TEST_OPT_DEV:
-                pszDevice = ValueUnion.psz;
+                rc = RTStrCopy(TstEnv.szDev, sizeof(TstEnv.szDev), ValueUnion.psz);
+                if (RT_FAILURE(rc))
+                    return RTMsgErrorExitFailure("Failed to copy out device: %Rrc", rc);
                 break;
 

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -88 +88 @@
 static int audioTestDevicesEnumerateAndCheck(PAUDIOTESTENV pTstEnv, const char *pszDev, PPDMAUDIOHOSTDEV *ppDev)
 {
-#ifdef DEBUG_andy
-    return VINF_SUCCESS;
-#endif
-
-    RTTestSubF(g_hTest, "Enumerating audio devices and checking for device '%s'", pszDev ? pszDev : "<Default>");
+    RTTestSubF(g_hTest, "Enumerating audio devices and checking for device '%s'", pszDev && *pszDev ? pszDev : "<Default>");
 
     if (!pTstEnv->DrvStack.pIHostAudio->pfnGetDevices)
@@ -121 +117 @@
             RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Enum:   Output channels = %RU8\n", pDev->cMaxOutputChannels);
 
-            if (   pszDev
+            if (   (pszDev && *pszDev)
                 && !RTStrCmp(pDev->pszName, pszDev))
             {
@@ -131 +127 @@
         RTTestFailed(g_hTest, "Enumerating audio devices failed with %Rrc", rc);
 
+    if (RT_SUCCESS(rc))
+    {
+        if (   (pszDev && *pszDev)
+            && *ppDev == NULL)
+        {
+            RTTestFailed(g_hTest, "Audio device '%s' not found", pszDev);
+            rc = VERR_NOT_FOUND;
+        }
+    }
+
     RTTestSubDone(g_hTest);
-
-    if (   pszDev
-        && *ppDev == NULL)
-    {
-        RTTestFailed(g_hTest, "Audio device '%s' not found", pszDev);
-        return VERR_NOT_FOUND;
-    }
-
-    return VINF_SUCCESS;
+    return rc;
 }