Changeset 58071 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Oct 7, 2015 6:23:04 AM (9 years ago)

Author:

vboxsync

Message:

DrvHostDSound: restored optional release logging, IPRT rc vs HRESULT cleanup

File:

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

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

@@ -28 +28 @@
 #include "VBoxDD.h"
 
+/*
+ * IDirectSound* interface uses HRESULT status codes and the driver callbacks use
+ * the IPRT status codes. To minimize HRESULT->IPRT conversion most internal functions
+ * in the driver return HRESULT and conversion is done in the driver callbacks.
+ *
+ * Naming convention:
+ * 'dsound*' functions return IPRT status code;
+ * 'directSound*' - return HRESULT.
+ */
+
+/*
+ * Optional release logging, which a user can turn on with the
+ * 'VBoxManage debugvm' command.
+ * Debug logging still uses the common Log* macros from IPRT.
+ * Messages which always should go to the release log use LogRel.
+ */
+/* General code behavior. */
+#define DSLOG(a) do { LogRel2(a); } while(0)
+/* Something which produce a lot of logging during playback/recording. */
+#define DSLOGF(a) do { LogRel3(a); } while(0)
+/* Important messages like errors. Limited in the default release log to avoid log flood. */
+#define DSLOGREL(a)                 \
+    do {                            \
+        static int8_t scLogged = 0; \
+        if (scLogged < 8) {         \
+            ++scLogged;             \
+            LogRel(a);              \
+        }                           \
+        else {                      \
+            DSLOG(a);               \
+        }                           \
+    } while (0)
+
 /* Dynamically load dsound.dll. */
 typedef HRESULT WINAPI FNDIRECTSOUNDENUMERATEW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
@@ -97 +130 @@
 } DSOUNDDEV, *PDSOUNDDEV;
 
-/** Maximum number of release logging entries. */
-static uint32_t s_cMaxRelLogEntries = 32;
-
 /** Makes DRVHOSTDSOUND out of PDMIHOSTAUDIO. */
 #define PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface) \
@@ -166 +196 @@
     }
 
-    return RTStrDup("<GUID not found>");
+    return RTStrDup("{Default device}");
 }
 
@@ -185 +215 @@
 }
 
-static int dsoundPlayRestore(LPDIRECTSOUNDBUFFER8 pDSB)
+static HRESULT directSoundPlayRestore(LPDIRECTSOUNDBUFFER8 pDSB)
 {
     HRESULT hr = IDirectSoundBuffer8_Restore(pDSB);
-    if (SUCCEEDED(hr))
-        return VINF_SUCCESS;
-
-    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error restoring playback buffer: %Rhrc\n", hr));
-    return VERR_INVALID_STATE;
-}
-
-static int dsoundUnlockOutput(LPDIRECTSOUNDBUFFER8 pDSB,
-                              LPVOID pv1, LPVOID pv2,
-                              DWORD cb1, DWORD cb2)
+    if (FAILED(hr))
+        DSLOGREL(("DSound: Restore playback buffer %Rhrc\n", hr));
+    return hr;
+}
+
+static HRESULT directSoundPlayUnlock(LPDIRECTSOUNDBUFFER8 pDSB,
+                                     LPVOID pv1, LPVOID pv2,
+                                     DWORD cb1, DWORD cb2)
 {
     HRESULT hr = IDirectSoundBuffer8_Unlock(pDSB, pv1, cb1, pv2, cb2);
-    if (SUCCEEDED(hr))
-        return VINF_SUCCESS;
-
-    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error unlocking output buffer: %Rhrc\n", hr));
-    return VERR_ACCESS_DENIED;
-}
-
-static int dsoundUnlockInput(LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB,
-                             LPVOID pv1, LPVOID pv2,
-                             DWORD cb1, DWORD cb2)
+    if (FAILED(hr))
+        DSLOGREL(("DSound: Unlock playback buffer %Rhrc\n", hr));
+    return hr;
+}
+
+static HRESULT directSoundCaptureUnlock(LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB,
+                                        LPVOID pv1, LPVOID pv2,
+                                        DWORD cb1, DWORD cb2)
 {
     HRESULT hr = IDirectSoundCaptureBuffer8_Unlock(pDSCB, pv1, cb1, pv2, cb2);
-    if (SUCCEEDED(hr))
-        return VINF_SUCCESS;
-
-    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error unlocking input buffer: %Rhrc\n", hr));
-    return VERR_ACCESS_DENIED;
-}
-
-static int dsoundLockOutput(LPDIRECTSOUNDBUFFER8 pDSB, PDMPCMPROPS *pProps,
-                            DWORD dwOffset, DWORD dwBytes,
-                            LPVOID *ppv1, LPVOID *ppv2,
-                            DWORD *pcb1, DWORD *pcb2,
-                            DWORD dwFlags)
-{
-    int rc = VINF_SUCCESS;
-
+    if (FAILED(hr))
+        DSLOGREL(("DSound: Unlock capture buffer %Rhrc\n", hr));
+    return hr;
+}
+
+static HRESULT directSoundPlayLock(LPDIRECTSOUNDBUFFER8 pDSB, PDMPCMPROPS *pProps,
+                                   DWORD dwOffset, DWORD dwBytes,
+                                   LPVOID *ppv1, LPVOID *ppv2,
+                                   DWORD *pcb1, DWORD *pcb2,
+                                   DWORD dwFlags)
+{
     LPVOID pv1 = NULL;
     LPVOID pv2 = NULL;
@@ -235 +257 @@
     if (hr == DSERR_BUFFERLOST)
     {
-        rc = dsoundPlayRestore(pDSB);
-        if (RT_SUCCESS(rc))
+        hr = directSoundPlayRestore(pDSB);
+        if (SUCCEEDED(hr))
         {
             hr = IDirectSoundBuffer8_Lock(pDSB, dwOffset, dwBytes, &pv1, &cb1, &pv2, &cb2, dwFlags);
-            if (FAILED(hr))
-                rc = VERR_ACCESS_DENIED;
-        }
-    }
-
-    if (RT_FAILURE(rc))
-    {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error locking output buffer: %Rhrc\n", hr));
-        return rc;
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        DSLOGREL(("DSound: Lock playback buffer %Rhrc\n", hr));
+        return hr;
     }
 
@@ -253 +273 @@
         || (pv2 && (cb2 & pProps->uAlign)))
     {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Locking playback buffer returned misaligned buffer: cb1=%RI32, cb2=%RI32 (alignment: %RU32)\n",
-                       cb1, cb2, pProps->uAlign));
-        dsoundUnlockOutput(pDSB, pv1, pv2, cb1, cb2);
-        return VERR_INVALID_STATE;
+        DSLOGREL(("DSound: Locking playback buffer returned misaligned buffer: cb1=%RI32, cb2=%RI32 (alignment: %RU32)\n",
+                  cb1, cb2, pProps->uAlign));
+        directSoundPlayUnlock(pDSB, pv1, pv2, cb1, cb2);
+        return E_FAIL;
     }
 
@@ -264 +284 @@
     *pcb2 = cb2;
 
-    return VINF_SUCCESS;
-}
-
-static int dsoundLockInput(LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB, PPDMPCMPROPS pProps,
-                           DWORD dwOffset, DWORD dwBytes,
-                           LPVOID *ppv1, LPVOID *ppv2,
-                           DWORD *pcb1, DWORD *pcb2,
-                           DWORD dwFlags)
+    return S_OK;
+}
+
+static HRESULT directSoundCaptureLock(LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB, PPDMPCMPROPS pProps,
+                                      DWORD dwOffset, DWORD dwBytes,
+                                      LPVOID *ppv1, LPVOID *ppv2,
+                                      DWORD *pcb1, DWORD *pcb2,
+                                      DWORD dwFlags)
 {
     LPVOID pv1 = NULL;
@@ -282 +302 @@
     if (FAILED(hr))
     {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error locking capturing buffer: %Rhrc\n", hr));
-        return VERR_ACCESS_DENIED;
+        DSLOGREL(("DSound: Lock capture buffer %Rhrc\n", hr));
+        return hr;
     }
 
@@ -289 +309 @@
         || (pv2 && (cb2 & pProps->uAlign)))
     {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Locking capture buffer returned misaligned buffer: cb1=%RI32, cb2=%RI32 (alignment: %RU32)\n",
-                       cb1, cb2, pProps->uAlign));
-        dsoundUnlockInput(pDSCB, pv1, pv2, cb1, cb2);
-        return VERR_INVALID_PARAMETER;
+        DSLOGREL(("DSound: Locking capture buffer returned misaligned buffer: cb1=%RI32, cb2=%RI32 (alignment: %RU32)\n",
+                  cb1, cb2, pProps->uAlign));
+        directSoundCaptureUnlock(pDSCB, pv1, pv2, cb1, cb2);
+        return E_FAIL;
     }
 
@@ -300 +320 @@
     *pcb2 = cb2;
 
-    return VINF_SUCCESS;
+    return S_OK;
 }
 
@@ -308 +328 @@
  */
 
-static void dsoundPlayInterfaceRelease(PDSOUNDSTREAMOUT pDSoundStrmOut)
+static void directSoundPlayInterfaceRelease(PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
     if (pDSoundStrmOut->pDS)
@@ -317 +337 @@
 }
 
-static int dsoundPlayInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
+static HRESULT directSoundPlayInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
     if (pDSoundStrmOut->pDS != NULL)
     {
-        LogFlowFunc(("DirectSound instance already exists\n"));
-        return VINF_SUCCESS;
+        DSLOG(("DSound: DirectSound instance already exists\n"));
+        return S_OK;
     }
 
@@ -329 +349 @@
     if (FAILED(hr))
     {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error creating DirectSound instance: %Rhrc\n", hr));
+        DSLOGREL(("DSound: Create DirectSound instance %Rhrc\n", hr));
     }
     else
@@ -339 +359 @@
             hr = IDirectSound8_SetCooperativeLevel(pDSoundStrmOut->pDS, hWnd, DSSCL_PRIORITY);
             if (FAILED(hr))
-                LogRel(("DSound: Error setting cooperative level for window %p: %Rhrc\n", hWnd, hr));
-        }
+                DSLOGREL(("DSound: Set cooperative level for window %p %Rhrc\n", hWnd, hr));
+        }
+
         if (FAILED(hr))
         {
-            if (hr == DSERR_NODRIVER)
-                LogRel(("DSound: DirectSound playback is currently unavailable\n"));
+            if (hr == DSERR_NODRIVER) /* Usually means that no playback devices are attached. */
+                DSLOGREL(("DSound: DirectSound playback is currently unavailable\n"));
             else
-                LogRel(("DSound: Error initializing DirectSound: %Rhrc\n", hr));
-
-            dsoundPlayInterfaceRelease(pDSoundStrmOut);
-        }
-    }
-
-    return SUCCEEDED(hr) ? VINF_SUCCESS: VERR_NOT_SUPPORTED;
-}
-
-static void dsoundPlayClose(PDSOUNDSTREAMOUT pDSoundStrmOut)
-{
-    LogFlowFunc(("Closing playback stream %p (buffer %p)\n", pDSoundStrmOut, pDSoundStrmOut->pDSB));
+                DSLOGREL(("DSound: DirectSound playback initialize %Rhrc\n", hr));
+
+            directSoundPlayInterfaceRelease(pDSoundStrmOut);
+        }
+    }
+
+    return hr;
+}
+
+static void directSoundPlayClose(PDSOUNDSTREAMOUT pDSoundStrmOut)
+{
+    DSLOG(("DSound: Closing playback stream %p, buffer %p\n", pDSoundStrmOut, pDSoundStrmOut->pDSB));
 
     if (pDSoundStrmOut->pDSB)
@@ -363 +384 @@
         HRESULT hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
         if (FAILED(hr))
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error closing playback stream %p: %Rhrc\n", pDSoundStrmOut, hr));
+            DSLOGREL(("DSound: Stop playback stream %p when closing %Rhrc\n", pDSoundStrmOut, hr));
 
         IDirectSoundBuffer8_Release(pDSoundStrmOut->pDSB);
@@ -369 +390 @@
     }
 
-    dsoundPlayInterfaceRelease(pDSoundStrmOut);
-}
-
-static int dsoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
-{
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-    AssertPtrReturn(pDSoundStrmOut, VERR_INVALID_POINTER);
-
-    LogFlowFunc(("pDSoundStrmOut=%p, cbBufferOut=%ld, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
-                 pDSoundStrmOut,
-                 pThis->cfg.cbBufferOut,
-                 pDSoundStrmOut->strmOut.Props.uHz,
-                 pDSoundStrmOut->strmOut.Props.cChannels,
-                 pDSoundStrmOut->strmOut.Props.cBits,
-                 pDSoundStrmOut->strmOut.Props.fSigned));
+    directSoundPlayInterfaceRelease(pDSoundStrmOut);
+}
+
+static HRESULT directSoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
+{
+    AssertPtrReturn(pThis, E_POINTER);
+    AssertPtrReturn(pDSoundStrmOut, E_POINTER);
+
+    DSLOG(("DSound: pDSoundStrmOut=%p, cbBufferOut=%ld, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
+           pDSoundStrmOut,
+           pThis->cfg.cbBufferOut,
+           pDSoundStrmOut->strmOut.Props.uHz,
+           pDSoundStrmOut->strmOut.Props.cChannels,
+           pDSoundStrmOut->strmOut.Props.cBits,
+           pDSoundStrmOut->strmOut.Props.fSigned));
 
     if (pDSoundStrmOut->pDSB != NULL)
     {
         /* Should not happen but be forgiving. */
-        LogFlowFunc(("DirectSoundBuffer already exists\n"));
-        dsoundPlayClose(pDSoundStrmOut);
+        DSLOGREL(("DSound: DirectSoundBuffer already exists\n"));
+        directSoundPlayClose(pDSoundStrmOut);
     }
 
@@ -395 +416 @@
     int rc = dsoundWaveFmtFromCfg(&pDSoundStrmOut->streamCfg, &wfx);
     if (RT_FAILURE(rc))
-        return rc;
-
-    rc = dsoundPlayInterfaceCreate(pThis, pDSoundStrmOut);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    HRESULT hr = S_OK;
+        return E_INVALIDARG;
+
+    HRESULT hr = directSoundPlayInterfaceCreate(pThis, pDSoundStrmOut);
+    if (FAILED(hr))
+        return hr;
 
     do /* To use breaks. */
     {
+        LPDIRECTSOUNDBUFFER pDSB = NULL;
         DSBUFFERDESC bd;
-        LPDIRECTSOUNDBUFFER pDSB;
         RT_ZERO(bd);
         bd.dwSize = sizeof(bd);
@@ -413 +432 @@
         bd.dwBufferBytes = pThis->cfg.cbBufferOut;
         hr = IDirectSound8_CreateSoundBuffer(pDSoundStrmOut->pDS,
-                                            &bd, &pDSB, NULL);
+                                             &bd, &pDSB, NULL);
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error creating playback stream: %Rhrc\n", hr));
-            break;
-        }
-
+            DSLOGREL(("DSound: CreateSoundBuffer %Rhrc\n", hr));
+            break;
+        }
+
+        /* "Upgrade" to IDirectSoundBuffer8 intarface. */
         hr = IDirectSoundBuffer_QueryInterface(pDSB, IID_IDirectSoundBuffer8, (void **)&pDSoundStrmOut->pDSB);
         pDSB->Release();
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying interface for playback stream: %Rhrc\n", hr));
-            break;
-        }
-
-        /* Query the actual parameters. */
+            DSLOGREL(("DSound: Query IDirectSoundBuffer8 %Rhrc\n", hr));
+            break;
+        }
+
+        /*
+         * Query the actual parameters.
+         */
         hr = IDirectSoundBuffer8_GetFormat(pDSoundStrmOut->pDSB, &wfx, sizeof(wfx), NULL);
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying format for playback stream: %Rhrc\n", hr));
+            DSLOGREL(("DSound: Playback GetFormat %Rhrc\n", hr));
             break;
         }
@@ -442 +464 @@
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying capabilities for playback stream: %Rhrc\n", hr));
-            break;
-        }
-
-        LogFunc(("Playback format:\n"
-                 "\tdwBufferBytes   = %RI32\n"
-                 "\twFormatTag      = %RI16\n"
-                 "\tnChannels       = %RI16\n"
-                 "\tnSamplesPerSec  = %RU32\n"
-                 "\tnAvgBytesPerSec = %RU32\n"
-                 "\tnBlockAlign     = %RI16\n"
-                 "\twBitsPerSample  = %RI16\n"
-                 "\tcbSize          = %RI16\n",
-                bc.dwBufferBytes,
-                wfx.wFormatTag,
-                wfx.nChannels,
-                wfx.nSamplesPerSec,
-                wfx.nAvgBytesPerSec,
-                wfx.nBlockAlign,
-                wfx.wBitsPerSample,
-                wfx.cbSize));
+            DSLOGREL(("DSound: Playback GetCaps %Rhrc\n", hr));
+            break;
+        }
+
+        DSLOG(("DSound: Playback format:\n"
+               "  dwBufferBytes   = %RI32\n"
+               "  wFormatTag      = %RI16\n"
+               "  nChannels       = %RI16\n"
+               "  nSamplesPerSec  = %RU32\n"
+               "  nAvgBytesPerSec = %RU32\n"
+               "  nBlockAlign     = %RI16\n"
+               "  wBitsPerSample  = %RI16\n"
+               "  cbSize          = %RI16\n",
+               bc.dwBufferBytes,
+               wfx.wFormatTag,
+               wfx.nChannels,
+               wfx.nSamplesPerSec,
+               wfx.nAvgBytesPerSec,
+               wfx.nBlockAlign,
+               wfx.wBitsPerSample,
+               wfx.cbSize));
 
         if (bc.dwBufferBytes & pDSoundStrmOut->strmOut.Props.uAlign)
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Playback capabilities returned misaligned buffer (size %ld, alignment %RU32)\n",
-                           bc.dwBufferBytes, pDSoundStrmOut->strmOut.Props.uAlign + 1));
+            DSLOGREL(("DSound: Playback GetCaps returned misaligned buffer: size %RU32, alignment %RU32\n",
+                      bc.dwBufferBytes, pDSoundStrmOut->strmOut.Props.uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferOut)
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Playback buffer size mismatched (DirectSound %ld, requested %ld bytes)\n",
-                           bc.dwBufferBytes, pThis->cfg.cbBufferOut));
+            DSLOGREL(("DSound: Playback buffer size mismatched: DirectSound %RU32, requested %RU32 bytes\n",
+                      bc.dwBufferBytes, pThis->cfg.cbBufferOut));
 
         /*
@@ -478 +500 @@
          */
         pDSoundStrmOut->csPlaybackBufferSize = bc.dwBufferBytes >> pDSoundStrmOut->strmOut.Props.cShift;
-        LogFlowFunc(("csPlaybackBufferSize=%ld\n", pDSoundStrmOut->csPlaybackBufferSize));
+        DSLOG(("DSound: csPlaybackBufferSize=%RU32\n", pDSoundStrmOut->csPlaybackBufferSize));
 
     } while (0);
 
-    if (SUCCEEDED(hr))
-        return VINF_SUCCESS;
-
-    dsoundPlayClose(pDSoundStrmOut);
-    return VERR_NOT_SUPPORTED;
+    if (FAILED(hr))
+        directSoundPlayClose(pDSoundStrmOut);
+
+    return hr;
 }
 
@@ -495 +516 @@
     LPVOID pv1, pv2;
     DWORD cb1, cb2;
-    int rc = dsoundLockOutput(pDSoundStrmOut->pDSB, &pDSoundStrmOut->strmOut.Props,
-                              0, pDSoundStrmOut->csPlaybackBufferSize << pDSoundStrmOut->strmOut.Props.cShift,
-                              &pv1, &pv2, &cb1, &cb2, DSBLOCK_ENTIREBUFFER);
-    if (RT_SUCCESS(rc))
+    HRESULT hr = directSoundPlayLock(pDSoundStrmOut->pDSB, &pDSoundStrmOut->strmOut.Props,
+                                     0, pDSoundStrmOut->csPlaybackBufferSize << pDSoundStrmOut->strmOut.Props.cShift,
+                                     &pv1, &pv2, &cb1, &cb2, DSBLOCK_ENTIREBUFFER);
+    if (SUCCEEDED(hr))
     {
         int len1 = cb1 >> pDSoundStrmOut->strmOut.Props.cShift;
@@ -509 +530 @@
             drvAudioClearBuf(&pDSoundStrmOut->strmOut.Props, pv2, len2);
 
-        dsoundUnlockOutput(pDSoundStrmOut->pDSB, pv1, pv2, cb1, cb2);
-    }
-}
-
-static int dsoundPlayGetStatus(LPDIRECTSOUNDBUFFER8 pDSB, DWORD *pStatus)
-{
-    AssertPtrReturn(pDSB, VERR_INVALID_POINTER);
+        directSoundPlayUnlock(pDSoundStrmOut->pDSB, pv1, pv2, cb1, cb2);
+    }
+}
+
+static HRESULT directSoundPlayGetStatus(LPDIRECTSOUNDBUFFER8 pDSB, DWORD *pStatus)
+{
+    AssertPtrReturn(pDSB, E_POINTER);
     /* pStatus is optional. */
-
-    int rc = VINF_SUCCESS;
 
     DWORD dwStatus = 0;
@@ -526 +545 @@
         if ((dwStatus & DSBSTATUS_BUFFERLOST) != 0)
         {
-            rc = dsoundPlayRestore(pDSB);
-            if (RT_SUCCESS(rc))
+            hr = directSoundPlayRestore(pDSB);
+            if (SUCCEEDED(hr))
                 hr = IDirectSoundBuffer8_GetStatus(pDSB, &dwStatus);
         }
     }
 
-    if (FAILED(hr))
-    {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error getting playback status: %Rhrc\n", hr));
-        if (RT_SUCCESS(rc))
-            rc = VERR_NOT_SUPPORTED;
-    }
-
-    if (RT_SUCCESS(rc))
+    if (SUCCEEDED(hr))
     {
         if (pStatus)
             *pStatus = dwStatus;
     }
-
-    return rc;
-}
-
-static void dsoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
+    else
+        DSLOGREL(("DSound: Playback GetStatus %Rhrc\n", hr));
+
+    return hr;
+}
+
+static void directSoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
     AssertPtrReturnVoid(pThis);
@@ -556 +570 @@
     {
         /* This performs some restore, so call it anyway and ignore result. */
-        dsoundPlayGetStatus(pDSoundStrmOut->pDSB, NULL /* Status */);
-
-        LogFlowFunc(("Playback stopped\n"));
+        directSoundPlayGetStatus(pDSoundStrmOut->pDSB, NULL /* Status */);
+
+        DSLOG(("DSound: Stopping playback\n"));
 
         /* @todo Wait until all data in the buffer has been played. */
         HRESULT hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
         if (SUCCEEDED(hr))
-        {
             dsoundPlayClearSamples(pDSoundStrmOut);
-        }
         else
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Errpor stopping playback buffer: %Rhrc\n", hr));
-    }
-}
-
-static int dsoundPlayStart(PDSOUNDSTREAMOUT pDSoundStrmOut)
-{
-    AssertPtrReturn(pDSoundStrmOut, VERR_INVALID_POINTER);
-
-    int rc;
-
+            DSLOGREL(("DSound: Stop playback %Rhrc\n", hr));
+    }
+}
+
+static HRESULT directSoundPlayStart(PDSOUNDSTREAMOUT pDSoundStrmOut)
+{
+    AssertPtrReturn(pDSoundStrmOut, E_POINTER);
+
+    HRESULT hr;
     if (pDSoundStrmOut->pDSB != NULL)
     {
         DWORD dwStatus;
-        rc = dsoundPlayGetStatus(pDSoundStrmOut->pDSB, &dwStatus);
-        if (RT_SUCCESS(rc))
+        hr = directSoundPlayGetStatus(pDSoundStrmOut->pDSB, &dwStatus);
+        if (SUCCEEDED(hr))
         {
             if (dwStatus & DSBSTATUS_PLAYING)
             {
-                LogFlowFunc(("Already playing\n"));
+                DSLOG(("DSound: Already playing\n"));
             }
             else
@@ -593 +604 @@
                 pDSoundStrmOut->fRestartPlayback = true;
 
-                LogFlowFunc(("Playback started\n"));
+                DSLOG(("DSound: Playback start\n"));
 
                 /* The actual IDirectSoundBuffer8_Play call will be made in drvHostDSoundPlayOut,
@@ -602 +613 @@
     }
     else
-        rc = VERR_INVALID_STATE;
-
-    return rc;
+        hr = E_UNEXPECTED;
+
+    return hr;
 }
 
@@ -645 +656 @@
         if (pDev)
         {
-            LogRel2(("DSound: Guest \"%s\" is using host \"%s\"\n",
-                     drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pDev->pszName));
+            DSLOG(("DSound: Guest \"%s\" is using host \"%s\"\n",
+                   drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pDev->pszName));
 
             pGUID = &pDev->Guid;
@@ -653 +664 @@
 
     char *pszGUID = dsoundGUIDToUtf8StrA(pGUID);
-    if (pszGUID)
-    {
-        LogRel(("DSound: Guest \"%s\" is using host device with GUID: %s\n",
-                drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pszGUID));
-        RTStrFree(pszGUID);
-    }
+    /* This always has to be in the release log. */
+    LogRel(("DSound: Guest \"%s\" is using host device with GUID: %s\n",
+            drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pszGUID? pszGUID: "{?}"));
+    RTStrFree(pszGUID);
 
     return pGUID;
 }
 
-static void dsoundCaptureInterfaceRelease(PDSOUNDSTREAMIN pDSoundStrmIn)
+static void directSoundCaptureInterfaceRelease(PDSOUNDSTREAMIN pDSoundStrmIn)
 {
     if (pDSoundStrmIn->pDSC)
@@ -672 +681 @@
 }
 
-static int dsoundCaptureInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
+static HRESULT directSoundCaptureInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
 {
     if (pDSoundStrmIn->pDSC != NULL)
     {
-        LogFunc(("DSound: DirectSoundCapture instance already exists\n"));
-        return VINF_SUCCESS;
+        DSLOG(("DSound: DirectSoundCapture instance already exists\n"));
+        return S_OK;
     }
 
@@ -684 +693 @@
     if (FAILED(hr))
     {
-        LogRel(("DSound: Error creating capture instance: %Rhrc\n", hr));
+        DSLOGREL(("DSound: DirectSoundCapture create %Rhrc\n", hr));
     }
     else
@@ -692 +701 @@
         if (FAILED(hr))
         {
-            if (hr == DSERR_NODRIVER)
-                LogRel(("DSound: DirectSound capture is currently unavailable\n"));
+            if (hr == DSERR_NODRIVER) /* Usually means that no capture devices are attached. */
+                DSLOGREL(("DSound: DirectSound capture is currently unavailable\n"));
             else
-                LogRel(("DSound: Error initializing capture: %Rhrc\n", hr));
-            dsoundCaptureInterfaceRelease(pDSoundStrmIn);
-        }
-    }
-
-    return SUCCEEDED(hr) ? VINF_SUCCESS: VERR_NOT_SUPPORTED;
-}
-
-static void dsoundCaptureClose(PDSOUNDSTREAMIN pDSoundStrmIn)
+                DSLOGREL(("DSound: DirectSoundCapture initialize %Rhrc\n", hr));
+
+            directSoundCaptureInterfaceRelease(pDSoundStrmIn);
+        }
+    }
+
+    return hr;
+}
+
+static void directSoundCaptureClose(PDSOUNDSTREAMIN pDSoundStrmIn)
 {
     AssertPtrReturnVoid(pDSoundStrmIn);
 
-    LogFlowFunc(("pDSoundStrmIn=%p, pDSCB=%p\n", pDSoundStrmIn, pDSoundStrmIn->pDSCB));
+    DSLOG(("DSound: pDSoundStrmIn=%p, pDSCB=%p\n", pDSoundStrmIn, pDSoundStrmIn->pDSCB));
 
     if (pDSoundStrmIn->pDSCB)
     {
         HRESULT hr = IDirectSoundCaptureBuffer_Stop(pDSoundStrmIn->pDSCB);
-        if (FAILED (hr))
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error stopping capture buffer: %Rhrc\n", hr));
+        if (FAILED(hr))
+            DSLOGREL(("DSound: Stop capture buffer %Rhrc\n", hr));
 
         IDirectSoundCaptureBuffer8_Release(pDSoundStrmIn->pDSCB);
@@ -719 +729 @@
     }
 
-    dsoundCaptureInterfaceRelease(pDSoundStrmIn);
-}
-
-static int dsoundCaptureOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
-{
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-    AssertPtrReturn(pDSoundStrmIn, VERR_INVALID_POINTER);
-
-    LogFlowFunc(("pDSoundStrmIn=%p, cbBufferIn=%ld, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
-                 pDSoundStrmIn,
-                 pThis->cfg.cbBufferIn,
-                 pDSoundStrmIn->strmIn.Props.uHz,
-                 pDSoundStrmIn->strmIn.Props.cChannels,
-                 pDSoundStrmIn->strmIn.Props.cBits,
-                 pDSoundStrmIn->strmIn.Props.fSigned));
+    directSoundCaptureInterfaceRelease(pDSoundStrmIn);
+}
+
+static HRESULT directSoundCaptureOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
+{
+    AssertPtrReturn(pThis, E_POINTER);
+    AssertPtrReturn(pDSoundStrmIn, E_POINTER);
+
+    DSLOG(("DSound: pDSoundStrmIn=%p, cbBufferIn=%ld, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
+           pDSoundStrmIn,
+           pThis->cfg.cbBufferIn,
+           pDSoundStrmIn->strmIn.Props.uHz,
+           pDSoundStrmIn->strmIn.Props.cChannels,
+           pDSoundStrmIn->strmIn.Props.cBits,
+           pDSoundStrmIn->strmIn.Props.fSigned));
 
     if (pDSoundStrmIn->pDSCB != NULL)
     {
         /* Should not happen but be forgiving. */
-        LogFlowFunc(("Capture buffer already exists\n"));
-        dsoundCaptureClose(pDSoundStrmIn);
+        DSLOGREL(("DSound: DirectSoundCaptureBuffer already exists\n"));
+        directSoundCaptureClose(pDSoundStrmIn);
     }
 
@@ -745 +755 @@
     int rc = dsoundWaveFmtFromCfg(&pDSoundStrmIn->streamCfg, &wfx);
     if (RT_FAILURE(rc))
-        return rc;
-
-    rc = dsoundCaptureInterfaceCreate(pThis, pDSoundStrmIn);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    HRESULT hr = S_OK;
+        return E_INVALIDARG;
+
+    HRESULT hr = directSoundCaptureInterfaceCreate(pThis, pDSoundStrmIn);
+    if (FAILED(hr))
+        return hr;
 
     do /* To use breaks. */
     {
+        LPDIRECTSOUNDCAPTUREBUFFER pDSCB = NULL;
         DSCBUFFERDESC bd;
-        LPDIRECTSOUNDCAPTUREBUFFER pDSCB = NULL;
         RT_ZERO(bd);
         bd.dwSize = sizeof(bd);
@@ -765 +773 @@
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error creating capture buffer: %Rhrc\n", hr));
-            pDSoundStrmIn->pDSCB = NULL;
+            DSLOGREL(("DSound: CreateCaptureBuffer %Rhrc\n", hr));
             break;
         }
@@ -774 +781 @@
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying for capture buffer interface: %Rhrc\n", hr));
-            break;
-        }
-
-        /* Query the actual parameters. */
+            DSLOGREL(("DSound: Query IDirectSoundCaptureBuffer8 %Rhrc\n", hr));
+            break;
+        }
+
+        /*
+         * Query the actual parameters.
+         */
         DWORD cbReadPos = 0;
         hr = IDirectSoundCaptureBuffer8_GetCurrentPosition(pDSoundStrmIn->pDSCB, NULL, &cbReadPos);
@@ -784 +793 @@
         {
             cbReadPos = 0;
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error retrieving current position for capture stream: %Rhrc\n", hr));
+            DSLOGREL(("DSound: Capture (open) GetCurrentPosition %Rhrc\n", hr));
         }
 
@@ -791 +800 @@
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying format for capture stream: %Rhrc\n", hr));
+            DSLOGREL(("DSound: Capture GetFormat %Rhrc\n", hr));
             break;
         }
@@ -799 +808 @@
         bc.dwSize = sizeof(bc);
         hr = IDirectSoundCaptureBuffer8_GetCaps(pDSoundStrmIn->pDSCB, &bc);
-        if (FAILED (hr))
-        {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying capabilities for capture stream: %Rhrc\n", hr));
-            break;
-        }
-
-        LogFunc(("Capture format:\n"
-                 "\tdwBufferBytes   = %RI32\n"
-                 "\twFormatTag      = %RI16\n"
-                 "\tnChannels       = %RI16\n"
-                 "\tnSamplesPerSec  = %RU32\n"
-                 "\tnAvgBytesPerSec = %RU32\n"
-                 "\tnBlockAlign     = %RI16\n"
-                 "\twBitsPerSample  = %RI16\n"
-                 "\tcbSize          = %RI16\n",
-                bc.dwBufferBytes,
-                wfx.wFormatTag,
-                wfx.nChannels,
-                wfx.nSamplesPerSec,
-                wfx.nAvgBytesPerSec,
-                wfx.nBlockAlign,
-                wfx.wBitsPerSample,
-                wfx.cbSize));
+        if (FAILED(hr))
+        {
+            DSLOGREL(("DSound: Capture GetCaps %Rhrc\n", hr));
+            break;
+        }
+
+        DSLOG(("DSound: Capture format:\n"
+               "  dwBufferBytes   = %RI32\n"
+               "  wFormatTag      = %RI16\n"
+               "  nChannels       = %RI16\n"
+               "  nSamplesPerSec  = %RU32\n"
+               "  nAvgBytesPerSec = %RU32\n"
+               "  nBlockAlign     = %RI16\n"
+               "  wBitsPerSample  = %RI16\n"
+               "  cbSize          = %RI16\n",
+               bc.dwBufferBytes,
+               wfx.wFormatTag,
+               wfx.nChannels,
+               wfx.nSamplesPerSec,
+               wfx.nAvgBytesPerSec,
+               wfx.nBlockAlign,
+               wfx.wBitsPerSample,
+               wfx.cbSize));
 
         if (bc.dwBufferBytes & pDSoundStrmIn->strmIn.Props.uAlign)
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Capture capabilities returned misaligned buffer (size %ld, alignment %RU32)\n",
+            DSLOGREL(("DSound: Capture GetCaps returned misaligned buffer: size %RU32, alignment %RU32\n",
                       bc.dwBufferBytes, pDSoundStrmIn->strmIn.Props.uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferIn)
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Capture buffer size mismatched (DirectSound %ld, requested %ld bytes)\n",
+            DSLOGREL(("DSound: Capture buffer size mismatched: DirectSound %RU32, requested %RU32 bytes\n",
                       bc.dwBufferBytes, pThis->cfg.cbBufferIn));
 
-        /* Initial state: reading at the initial capture position. */
+        /* Initial state: reading at the initial capture position, no error. */
         pDSoundStrmIn->csCaptureReadPos    = cbReadPos >> pDSoundStrmIn->strmIn.Props.cShift;
         pDSoundStrmIn->csCaptureBufferSize = bc.dwBufferBytes >> pDSoundStrmIn->strmIn.Props.cShift;
-
-        LogFlowFunc(("csCaptureReadPos=%ld, csCaptureBufferSize=%ld\n",
+        pDSoundStrmIn->hrLastCaptureIn = S_OK;
+
+        DSLOG(("DSound: csCaptureReadPos=%RU32, csCaptureBufferSize=%RU32\n",
                      pDSoundStrmIn->csCaptureReadPos, pDSoundStrmIn->csCaptureBufferSize));
 
-        /* Update status. */
-        pDSoundStrmIn->hrLastCaptureIn = S_OK;
-
     } while (0);
 
-    if (SUCCEEDED(hr))
-        return VINF_SUCCESS;
-
-    dsoundCaptureClose(pDSoundStrmIn);
-    return VERR_NOT_SUPPORTED;
-}
-
-static void dsoundCaptureStop(PDSOUNDSTREAMIN pDSoundStrmIn)
+    if (FAILED(hr))
+        directSoundCaptureClose(pDSoundStrmIn);
+
+    return hr;
+}
+
+static void directSoundCaptureStop(PDSOUNDSTREAMIN pDSoundStrmIn)
 {
     AssertPtrReturnVoid(pDSoundStrmIn);
@@ -856 +862 @@
     if (pDSoundStrmIn->pDSCB)
     {
-        LogFlowFunc(("Capturing stopped\n"));
+        DSLOG(("DSound: Stopping capture\n"));
 
         HRESULT hr = IDirectSoundCaptureBuffer_Stop(pDSoundStrmIn->pDSCB);
         if (FAILED(hr))
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error stopping capture buffer: %Rhrc\n", hr));
-    }
-}
-
-static int dsoundCaptureStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
+            DSLOGREL(("DSound: Capture buffer stop %Rhrc\n", hr));
+    }
+}
+
+static HRESULT directSoundCaptureStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -870 +876 @@
 
     HRESULT hr;
-
     if (pDSoundStrmIn->pDSCB != NULL)
     {
@@ -877 +882 @@
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error getting capture buffer status: %Rhrc\n", hr));
+            DSLOGREL(("DSound: Capture start GetStatus %Rhrc\n", hr));
         }
         else
@@ -883 +888 @@
             if (dwStatus & DSCBSTATUS_CAPTURING)
             {
-                LogFlowFunc(("Already capturing\n"));
+                DSLOG(("DSound: Already capturing\n"));
             }
             else
             {
-                LogFlowFunc(("Capturig started\n"));
+                DSLOG(("DSound: Capture start\n"));
                 hr = IDirectSoundCaptureBuffer8_Start(pDSoundStrmIn->pDSCB, DSCBSTART_LOOPING);
-                if (FAILED (hr))
-                    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error starting capture: %Rhrc\n", hr));
+                if (FAILED(hr))
+                    DSLOGREL(("DSound: Capture started %Rhrc\n", hr));
             }
         }
@@ -896 +901 @@
     else
     {
-        AssertMsgFailed(("No/invalid capture buffer\n"));
-        hr = E_FAIL;
-    }
-
-    return SUCCEEDED(hr) ? VINF_SUCCESS: VERR_NOT_SUPPORTED;
+        hr = E_UNEXPECTED;
+    }
+
+    return hr;
 }
 
@@ -942 +946 @@
 static void dsoundLogDevice(const char *pszType, LPGUID lpGUID, LPCWSTR lpwstrDescription, LPCWSTR lpwstrModule)
 {
-    AssertPtrReturnVoid(pszType);
-    AssertPtrReturnVoid(lpGUID);
-    AssertPtrReturnVoid(lpwstrDescription);
-    AssertPtrReturnVoid(lpwstrModule);
-
     char *pszGUID = dsoundGUIDToUtf8StrA(lpGUID);
-    if (pszGUID)
-    {
-        LogRel(("DSound: %s: GUID: %s [%ls] (Module: %ls)\n",
-                pszType, pszGUID, lpwstrDescription, lpwstrModule));
-
-        RTStrFree(pszGUID);
-    }
+    /* This always has to be in the release log. */
+    LogRel(("DSound: %s: GUID: %s [%ls] (Module: %ls)\n",
+            pszType, pszGUID? pszGUID: "{?}", lpwstrDescription, lpwstrModule));
+    RTStrFree(pszGUID);
 }
 
@@ -960 +956 @@
                                         LPCWSTR lpwstrModule, LPVOID lpContext)
 {
-   AssertPtrReturn(lpContext, FALSE);
-
     PDSOUNDENUMCBCTX pCtx = (PDSOUNDENUMCBCTX)lpContext;
     AssertPtrReturn(pCtx, FALSE);
@@ -971 +965 @@
 
     AssertPtrReturn(lpwstrDescription, FALSE);
-    AssertPtrReturn(lpwstrModule, FALSE);
+    /* Do not care about lpwstrModule */
 
     dsoundLogDevice("Output", lpGUID, lpwstrDescription, lpwstrModule);
@@ -1043 +1037 @@
 
         /* Try to open playback in case the device is already there. */
-        dsoundPlayOpen(pThis, pDSoundStrmOut);
+        directSoundPlayOpen(pThis, pDSoundStrmOut);
     }
     else
@@ -1071 +1065 @@
         {
             /* Try to start playback. If it fails, then reopen and try again. */
-            rc = dsoundPlayStart(pDSoundStrmOut);
-            if (RT_FAILURE(rc))
+            HRESULT hr = directSoundPlayStart(pDSoundStrmOut);
+            if (FAILED(hr))
             {
-                dsoundPlayClose(pDSoundStrmOut);
-                dsoundPlayOpen(pThis, pDSoundStrmOut);
-
-                rc = dsoundPlayStart(pDSoundStrmOut);
+                directSoundPlayClose(pDSoundStrmOut);
+                directSoundPlayOpen(pThis, pDSoundStrmOut);
+
+                hr = directSoundPlayStart(pDSoundStrmOut);
             }
 
+            if (FAILED(hr))
+                rc = VERR_NOT_SUPPORTED;
+
             break;
         }
@@ -1085 +1082 @@
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
-            dsoundPlayStop(pThis, pDSoundStrmOut);
+            directSoundPlayStop(pThis, pDSoundStrmOut);
             break;
         }
@@ -1100 +1097 @@
     return rc;
 }
-
 
 static DECLCALLBACK(int) drvHostDSoundPlayOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut,
@@ -1115 +1111 @@
     uint32_t cReadTotal = 0;
 
-    do
+    do /* to use 'break' */
     {
         LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStrmOut->pDSB;
@@ -1129 +1125 @@
         if (hr == DSERR_BUFFERLOST)
         {
-            rc = dsoundPlayRestore(pDSB);
-            if (RT_FAILURE(rc))
-                break;
-
-            hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
-            if (hr == DSERR_BUFFERLOST) /* Avoid log flooding if the error is still there. */
-                break;
+            hr = directSoundPlayRestore(pDSB);
+            if (SUCCEEDED(hr))
+            {
+                hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
+            }
         }
 
         if (FAILED(hr))
         {
-            LogRelMax(s_cMaxRelLogEntries, ("Error retrieving current playback position: %Rhrc\n", hr));
+            if (hr != DSERR_BUFFERLOST) /* Avoid log flooding if the error is still there. */
+                DSLOGREL(("DSound: Playback GetCurrentPosition %Rhrc\n", hr));
             break;
         }
@@ -1162 +1157 @@
         if (cbLive == 0 || cbLive > cbBuffer)
         {
-            LogFlowFunc(("cbLive=%RU32, cbBuffer=%ld, cbPlayWritePos=%ld, cbPlayPos=%ld\n",
-                         cbLive, cbBuffer, pDSoundStrmOut->cbPlayWritePos, cbPlayPos));
+            DSLOG(("DSound: cbLive=%RU32, cbBuffer=%ld, cbPlayWritePos=%ld, cbPlayPos=%ld\n",
+                   cbLive, cbBuffer, pDSoundStrmOut->cbPlayWritePos, cbPlayPos));
             break;
         }
@@ -1169 +1164 @@
         LPVOID pv1, pv2;
         DWORD cb1, cb2;
-        rc = dsoundLockOutput(pDSB, &pHstStrmOut->Props, pDSoundStrmOut->cbPlayWritePos, cbLive,
-                              &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
-        if (RT_FAILURE(rc))
+        hr = directSoundPlayLock(pDSB, &pHstStrmOut->Props, pDSoundStrmOut->cbPlayWritePos, cbLive,
+                                 &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
+        if (FAILED(hr))
             break;
 
@@ -1195 +1190 @@
         }
 
-        dsoundUnlockOutput(pDSB, pv1, pv2, cb1, cb2);
+        directSoundPlayUnlock(pDSB, pv1, pv2, cb1, cb2);
 
         pDSoundStrmOut->cbPlayWritePos = (pDSoundStrmOut->cbPlayWritePos + (cReadTotal << cShift)) % cbBuffer;
 
-        LogFlowFunc(("%RU32 (%RU32 samples) out of %RU32%s, buffer write pos %ld, rc=%Rrc\n",
-                     AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal), cReadTotal, cbLive,
-                     cbLive != AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal) ? " !!!": "",
-                     pDSoundStrmOut->cbPlayWritePos, rc));
+        DSLOGF(("DSound: %RU32 (%RU32 samples) out of %RU32%s, buffer write pos %ld, rc=%Rrc\n",
+                AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal), cReadTotal, cbLive,
+                cbLive != AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal) ? " !!!": "",
+                pDSoundStrmOut->cbPlayWritePos, rc));
 
         if (cReadTotal)
@@ -1209 +1204 @@
             rc = VINF_SUCCESS; /* Played something. */
         }
+
+        if (RT_FAILURE(rc))
+            break;
 
         if (pDSoundStrmOut->fRestartPlayback)
@@ -1217 +1215 @@
              */
             pDSoundStrmOut->fRestartPlayback = false;
-            HRESULT hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, DSBPLAY_LOOPING);
+            hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, DSBPLAY_LOOPING);
             if (FAILED(hr))
             {
-                LogRelMax(s_cMaxRelLogEntries, ("DSound: Error starting playback: %Rhrc\n", hr));
+                DSLOGREL(("DSound: Playback start %Rhrc\n", hr));
                 rc = VERR_NOT_SUPPORTED;
             }
@@ -1237 +1235 @@
     PDSOUNDSTREAMOUT pDSoundStrmOut = (PDSOUNDSTREAMOUT)pHstStrmOut;
 
-    dsoundPlayClose(pDSoundStrmOut);
+    directSoundPlayClose(pDSoundStrmOut);
 
     pDSoundStrmOut->cbPlayWritePos = 0;
@@ -1277 +1275 @@
 
         /* Try to open capture in case the device is already there. */
-        dsoundCaptureOpen(pThis, pDSoundStrmIn);
+        directSoundCaptureOpen(pThis, pDSoundStrmIn);
     }
     else
@@ -1306 +1304 @@
         {
             /* Try to start capture. If it fails, then reopen and try again. */
-            rc = dsoundCaptureStart(pThis, pDSoundStrmIn);
-            if (RT_FAILURE(rc))
+            HRESULT hr = directSoundCaptureStart(pThis, pDSoundStrmIn);
+            if (FAILED(hr))
             {
-                dsoundCaptureClose(pDSoundStrmIn);
-                dsoundCaptureOpen(pThis, pDSoundStrmIn);
-
-                rc = dsoundCaptureStart(pThis, pDSoundStrmIn);
+                directSoundCaptureClose(pDSoundStrmIn);
+                directSoundCaptureOpen(pThis, pDSoundStrmIn);
+
+                hr = directSoundCaptureStart(pThis, pDSoundStrmIn);
             }
+
+            if (FAILED(hr))
+                rc = VERR_NOT_SUPPORTED;
         } break;
 
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
-            dsoundCaptureStop(pDSoundStrmIn);
+            directSoundCaptureStop(pDSoundStrmIn);
         } break;
 
@@ -1338 +1339 @@
     LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB = pDSoundStrmIn->pDSCB;
 
-    int rc;
+    int rc = VINF_SUCCESS;
 
     if (pDSCB == NULL)
@@ -1354 +1355 @@
         if (hr != pDSoundStrmIn->hrLastCaptureIn)
         {
-            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error retrieving current capture position: %Rhrc\n", hr));
+            DSLOGREL(("DSound: Capture GetCurrentPosition %Rhrc\n", hr));
             pDSoundStrmIn->hrLastCaptureIn = hr;
         }
@@ -1365 +1366 @@
 
     if (cbReadPos & pHstStrmIn->Props.uAlign)
-        LogFunc(("Misaligned read position %ld (alignment: %RU32)\n", cbReadPos, pHstStrmIn->Props.uAlign));
+        DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", cbReadPos, pHstStrmIn->Props.uAlign));
 
     /* Capture position in samples. */
@@ -1386 +1387 @@
     if (csMixFree == 0)
     {
-        LogRelMax(s_cMaxRelLogEntries, ("DSound: Capture buffer full\n"));
+        DSLOGF(("DSound: Capture buffer full\n"));
         if (pcSamplesCaptured)
             *pcSamplesCaptured = 0;
@@ -1392 +1393 @@
     }
 
-    LogFlowFunc(("csMixFree=%RU32, csReadPos=%ld, csCaptureReadPos=%ld, csCaptured=%ld\n",
-                 csMixFree, csReadPos, pDSoundStrmIn->csCaptureReadPos, csCaptured));
+    DSLOGF(("DSound: Capture csMixFree=%RU32, csReadPos=%ld, csCaptureReadPos=%ld, csCaptured=%ld\n",
+            csMixFree, csReadPos, pDSoundStrmIn->csCaptureReadPos, csCaptured));
 
     /* No need to fetch more samples than mix buffer can receive. */
@@ -1401 +1402 @@
     LPVOID pv1, pv2;
     DWORD cb1, cb2;
-    rc = dsoundLockInput(pDSCB, &pHstStrmIn->Props,
-                         pDSoundStrmIn->csCaptureReadPos << pHstStrmIn->Props.cShift,
-                         csCaptured << pHstStrmIn->Props.cShift,
-                         &pv1, &pv2, &cb1, &cb2,
-                         0 /* dwFlags */);
-    if (RT_FAILURE(rc))
+    hr = directSoundCaptureLock(pDSCB, &pHstStrmIn->Props,
+                                pDSoundStrmIn->csCaptureReadPos << pHstStrmIn->Props.cShift,
+                                csCaptured << pHstStrmIn->Props.cShift,
+                                &pv1, &pv2, &cb1, &cb2,
+                                0 /* dwFlags */);
+    if (FAILED(hr))
     {
         if (pcSamplesCaptured)
@@ -1436 +1437 @@
     }
 
-    dsoundUnlockInput(pDSCB, pv1, pv2, cb1, cb2);
+    directSoundCaptureUnlock(pDSCB, pv1, pv2, cb1, cb2);
 
     uint32_t csProcessed = 0;
@@ -1449 +1450 @@
     {
         pDSoundStrmIn->csCaptureReadPos = (pDSoundStrmIn->csCaptureReadPos + csProcessed) % pDSoundStrmIn->csCaptureBufferSize;
-        LogFlowFunc(("%ld (%ld+%ld), processed %RU32/%RU32\n",
-                     csCaptured, len1, len2, csProcessed, csWrittenTotal));
+        DSLOGF(("DSound: Capture %ld (%ld+%ld), processed %RU32/%RU32\n",
+                csCaptured, len1, len2, csProcessed, csWrittenTotal));
     }
 
@@ -1464 +1465 @@
     PDSOUNDSTREAMIN pDSoundStrmIn = (PDSOUNDSTREAMIN)pHstStrmIn;
 
-    dsoundCaptureClose(pDSoundStrmIn);
+    directSoundCaptureClose(pDSoundStrmIn);
 
     pDSoundStrmIn->csCaptureReadPos    = 0;
@@ -1529 +1530 @@
     {
         /* No dsound.dll on this system.  */
-        LogRel(("DSound: could not load dsound.dll %Rrc\n", rc));
+        LogRel(("DSound: Could not load dsound.dll %Rrc\n", rc));
     }
 
@@ -1566 +1567 @@
         IDirectSound_Release(pDirectSound);
     else
-        LogRel(("DSound: DirectSound not available: %Rhrc\n", hr));
+        DSLOGREL(("DSound: DirectSound not available %Rhrc\n", hr));
 
     int rc = SUCCEEDED(hr) ? VINF_SUCCESS: VERR_NOT_SUPPORTED;
@@ -1592 +1593 @@
     if (RT_SUCCESS(rc))
     {
-        int rc = RTUuidFromStr(pUuid, pszGuid);
+        rc = RTUuidFromStr(pUuid, pszGuid);
         if (RT_SUCCESS(rc))
             pGuid = (LPCGUID)&pUuid;
         else
-            LogRel(("DSound: Error parsing device GUID for device '%s': %Rrc\n", pszName, rc));
+            DSLOGREL(("DSound: Error parsing device GUID for device '%s': %Rrc\n", pszName, rc));
 
         RTStrFree(pszGuid);
@@ -1616 +1617 @@
     pThis->cfg.pGuidCapture = dsoundConfigQueryGUID(pCfg, "DeviceGuidIn",  &pThis->cfg.uuidCapture);
 
-    LogFlowFunc(("BufsizeOut %u, BufsizeIn %u, DeviceGuidOut {%RTuuid}, DeviceGuidIn {%RTuuid}\n",
-                 pThis->cfg.cbBufferOut,
-                 pThis->cfg.cbBufferIn,
-                 &pThis->cfg.uuidPlay,
-                 &pThis->cfg.uuidCapture));
+    DSLOG(("DSound: BufsizeOut %u, BufsizeIn %u, DeviceGuidOut {%RTuuid}, DeviceGuidIn {%RTuuid}\n",
+           pThis->cfg.cbBufferOut,
+           pThis->cfg.cbBufferIn,
+           &pThis->cfg.uuidPlay,
+           &pThis->cfg.uuidCapture));
 }
 
@@ -1643 +1644 @@
 {
     PDRVHOSTDSOUND pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTDSOUND);
+
     LogRel(("Audio: Initializing DirectSound audio driver\n"));
+
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
@@ -1649 +1652 @@
     if (FAILED(hr))
     {
-        LogRel(("DSound: Error initializing COM: %Rhrc\n", hr));
+        DSLOGREL(("DSound: CoInitializeEx %Rhrc\n", hr));
         return VERR_NOT_SUPPORTED;
     }