Changeset 57375 in vbox for trunk/src/VBox

Timestamp:

Aug 17, 2015 11:16:04 AM (9 years ago)

Author:

vboxsync

Message:

Audio/DSound: Get rid of custom logging and use RTLogRelMax* instead, a lot of logging format fixes.

File:

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

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

@@ -28 +28 @@
 #include "VBoxDD.h"
 
-#define DSLOG(a) do { LogRel2(a); } while(0)
-#define DSLOGF(a) do { LogRel3(a); } while(0)
-#define DSLOGREL(a)                 \
-    do {                            \
-        static int8_t scLogged = 0; \
-        if (scLogged < 8) {         \
-            ++scLogged;             \
-            LogRel(a);              \
-        }                           \
-        else {                      \
-            DSLOG(a);               \
-        }                           \
-    } while (0)
-
 typedef struct DSOUNDHOSTCFG
 {
@@ -62 +48 @@
     /** List of found host output devices. */
     RTLISTANCHOR  lstDevOutput;
-    /** Configuration options. */
+    /** DirectSound configuration options. */
     DSOUNDHOSTCFG cfg;
 } DRVHOSTDSOUND, *PDRVHOSTDSOUND;
@@ -68 +54 @@
 typedef struct DSOUNDSTREAMOUT
 {
-    PDMAUDIOHSTSTRMOUT   hw; /* Always must come first! */
+    PDMAUDIOHSTSTRMOUT   strmOut; /* Always must come first! */
     LPDIRECTSOUND8       pDS;
     LPDIRECTSOUNDBUFFER8 pDSB;
@@ -79 +65 @@
 typedef struct DSOUNDSTREAMIN
 {
-    PDMAUDIOHSTSTRMIN           hw; /* Always must come first! */
+    PDMAUDIOHSTSTRMIN           strmIn; /* Always must come first! */
     LPDIRECTSOUNDCAPTURE8       pDSC;
     LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB;
@@ -105 +91 @@
 } DSOUNDDEV, *PDSOUNDDEV;
 
+/** Maximum number of release logging entries. */
+static uint32_t s_cMaxRelLogEntries = 32;
+
 /** Makes DRVHOSTDSOUND out of PDMIHOSTAUDIO. */
 #define PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface) \
@@ -157 +146 @@
 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;
+    if (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 RTStrDup("<GUID not found>");
 }
 
@@ -193 +185 @@
         return VINF_SUCCESS;
 
-    DSLOGREL(("DSound: Restore playback buffer %Rhrc\n", hr));
+    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error restoring playback buffer: %Rhrc\n", hr));
     return VERR_INVALID_STATE;
 }
@@ -205 +197 @@
         return VINF_SUCCESS;
 
-    DSLOG(("DSound: Unable to unlock output buffer, hr=%Rhrc\n", hr));
+    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error unlocking output buffer: %Rhrc\n", hr));
     return VERR_ACCESS_DENIED;
 }
@@ -217 +209 @@
         return VINF_SUCCESS;
 
-    DSLOG(("DSound: Unable to unlock input buffer, hr=%Rhrc\n", hr));
+    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error unlocking input buffer: %Rhrc\n", hr));
     return VERR_ACCESS_DENIED;
 }
@@ -241 +233 @@
         {
             hr = IDirectSoundBuffer8_Lock(pDSB, dwOffset, dwBytes, &pv1, &cb1, &pv2, &cb2, dwFlags);
-        }
-    }
-
-    if (FAILED(hr) || RT_FAILURE(rc))
-    {
-        DSLOG(("DSound: Unable to lock output buffer, hr=%Rhrc\n", hr));
-        return RT_SUCCESS(rc) ? VERR_ACCESS_DENIED: rc;
+            if (FAILED(hr))
+                rc = VERR_ACCESS_DENIED;
+        }
+    }
+
+    if (RT_FAILURE(rc))
+    {
+        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error locking output buffer: %Rhrc\n", hr));
+        return rc;
     }
 
@@ -253 +247 @@
         || (pv2 && (cb2 & pProps->uAlign)))
     {
-        DSLOG(("DSound: lock output returned misaligned buffer: cb1=%d, cb2=%d\n", cb1, cb2));
+        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;
@@ -281 +276 @@
     if (FAILED(hr))
     {
-        DSLOG(("DSound: Unable to lock capturing buffer, hr=%Rhrc\n", hr));
+        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error locking capturing buffer: %Rhrc\n", hr));
         return VERR_ACCESS_DENIED;
     }
@@ -288 +283 @@
         || (pv2 && (cb2 & pProps->uAlign)))
     {
-        DSLOG(("DSound: lock input returned misaligned buffer: cb1=%d, cb2=%d\n", cb1, cb2));
+        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;
@@ -319 +315 @@
     if (pDSoundStrmOut->pDS != NULL)
     {
-        DSLOG(("DSound: DirectSound instance already exists\n"));
+        LogFlowFunc(("DirectSound instance already exists\n"));
         return VINF_SUCCESS;
     }
@@ -327 +323 @@
     if (FAILED(hr))
     {
-        DSLOGREL(("DSound: DirectSound create instance %Rhrc\n", hr));
+        LogRel(("DSound: Error creating DirectSound instance: %Rhrc\n", hr));
     }
     else
@@ -334 +330 @@
         if (SUCCEEDED(hr))
         {
-            HWND hwnd = GetDesktopWindow();
-            hr = IDirectSound8_SetCooperativeLevel(pDSoundStrmOut->pDS, hwnd, DSSCL_PRIORITY);
-            if (FAILED (hr))
-            {
-                DSLOGREL(("DSound: Set cooperative level for window %p %Rhrc\n", hwnd, hr));
-            }
+            HWND hWnd = GetDesktopWindow();
+            hr = IDirectSound8_SetCooperativeLevel(pDSoundStrmOut->pDS, hWnd, DSSCL_PRIORITY);
+            if (FAILED(hr))
+                LogRel(("DSound: Error setting cooperative level for window %p: %Rhrc\n", hWnd, hr));
         }
         if (FAILED(hr))
         {
             if (hr == DSERR_NODRIVER)
-            {
-                DSLOGREL(("DSound: DirectSound playback is currently unavailable\n"));
-            }
+                LogRel(("DSound: DirectSound playback is currently unavailable\n"));
             else
-            {
-                DSLOGREL(("DSound: DirectSound initialize %Rhrc\n", hr));
-            }
+                LogRel(("DSound: Error initializing DirectSound: %Rhrc\n", hr));
+
             dsoundPlayInterfaceRelease(pDSoundStrmOut);
         }
@@ -360 +351 @@
 static void dsoundPlayClose(PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
-    DSLOG(("DSound: playback close %p buffer %p\n", pDSoundStrmOut, pDSoundStrmOut->pDSB));
+    LogFlowFunc(("Closing playback stream %p (buffer %p)\n", pDSoundStrmOut, pDSoundStrmOut->pDSB));
 
     if (pDSoundStrmOut->pDSB)
@@ -366 +357 @@
         HRESULT hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
         if (FAILED(hr))
-        {
-            DSLOGREL(("DSound: Playback close Stop %Rhrc\n", hr));
-        }
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error closing playback stream %p: %Rhrc\n", pDSoundStrmOut, hr));
 
         IDirectSoundBuffer8_Release(pDSoundStrmOut->pDSB);
@@ -379 +368 @@
 static int dsoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
-    DSLOG(("DSound: playback open %p size %u bytes, freq %u, chan %u, bits %u, sign %d\n",
-           pDSoundStrmOut,
-           pThis->cfg.cbBufferOut,
-           pDSoundStrmOut->hw.Props.uHz,
-           pDSoundStrmOut->hw.Props.cChannels,
-           pDSoundStrmOut->hw.Props.cBits,
-           pDSoundStrmOut->hw.Props.fSigned));
+    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));
 
     if (pDSoundStrmOut->pDSB != NULL)
     {
         /* Should not happen but be forgiving. */
-        DSLOGREL(("DSound: DirectSoundBuffer already exists\n"));
+        LogFlowFunc(("DirectSoundBuffer already exists\n"));
         dsoundPlayClose(pDSoundStrmOut);
     }
@@ -418 +410 @@
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Playback CreateSoundBuffer %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error creating playback stream: %Rhrc\n", hr));
             break;
         }
@@ -426 +418 @@
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Playback QueryInterface %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying interface for playback stream: %Rhrc\n", hr));
             break;
         }
 
         /* Query the actual parameters. */
-
         hr = IDirectSoundBuffer8_GetFormat(pDSoundStrmOut->pDSB, &wfx, sizeof(wfx), NULL);
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Playback GetFormat %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying format for playback stream: %Rhrc\n", hr));
             break;
         }
@@ -445 +436 @@
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Playback GetCaps %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying capabilities for playback stream: %Rhrc\n", hr));
             break;
         }
 
-        DSLOG(("DSound: playback format: size %d bytes\n"
-                "  tag             = %d\n"
-                "  nChannels       = %d\n"
-                "  nSamplesPerSec  = %d\n"
-                "  nAvgBytesPerSec = %d\n"
-                "  nBlockAlign     = %d\n"
-                "  wBitsPerSample  = %d\n"
-                "  cbSize          = %d\n",
+        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,
@@ -466 +458 @@
                 wfx.cbSize));
 
-        if (bc.dwBufferBytes & pDSoundStrmOut->hw.Props.uAlign)
-        {
-            DSLOGREL(("DSound: Playback GetCaps returned misaligned buffer size %ld, alignment %d\n",
-                      bc.dwBufferBytes, pDSoundStrmOut->hw.Props.uAlign + 1));
-        }
+        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));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferOut)
-        {
-            DSLOGREL(("DSound: Playback buffer size mismatch dsound %d, requested %d bytes\n",
-                      bc.dwBufferBytes, pThis->cfg.cbBufferOut));
-        }
-
-        /* Initial state.
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Playback buffer size mismatched (DirectSound %ld, requested %ld bytes)\n",
+                           bc.dwBufferBytes, pThis->cfg.cbBufferOut));
+
+        /*
+         * Initial state.
          * dsoundPlayStart initializes part of it to make sure that Stop/Start continues with a correct
          * playback buffer position.
          */
-        pDSoundStrmOut->csPlaybackBufferSize = bc.dwBufferBytes >> pDSoundStrmOut->hw.Props.cShift;
-        DSLOG(("DSound: playback open csPlaybackBufferSize %d samples\n", pDSoundStrmOut->csPlaybackBufferSize));
+        pDSoundStrmOut->csPlaybackBufferSize = bc.dwBufferBytes >> pDSoundStrmOut->strmOut.Props.cShift;
+        LogFlowFunc(("csPlaybackBufferSize=%ld\n", pDSoundStrmOut->csPlaybackBufferSize));
+
     } while (0);
 
@@ -495 +485 @@
 static void dsoundPlayClearSamples(PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
+    AssertPtrReturnVoid(pDSoundStrmOut);
+
     LPVOID pv1, pv2;
     DWORD cb1, cb2;
-    int rc = dsoundLockOutput(pDSoundStrmOut->pDSB, &pDSoundStrmOut->hw.Props,
-                              0, pDSoundStrmOut->csPlaybackBufferSize << pDSoundStrmOut->hw.Props.cShift,
+    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))
     {
-        int len1 = cb1 >> pDSoundStrmOut->hw.Props.cShift;
-        int len2 = cb2 >> pDSoundStrmOut->hw.Props.cShift;
+        int len1 = cb1 >> pDSoundStrmOut->strmOut.Props.cShift;
+        int len2 = cb2 >> pDSoundStrmOut->strmOut.Props.cShift;
 
         if (pv1 && len1)
-            audio_pcm_info_clear_buf(&pDSoundStrmOut->hw.Props, pv1, len1);
+            audio_pcm_info_clear_buf(&pDSoundStrmOut->strmOut.Props, pv1, len1);
 
         if (pv2 && len2)
-            audio_pcm_info_clear_buf(&pDSoundStrmOut->hw.Props, pv2, len2);
+            audio_pcm_info_clear_buf(&pDSoundStrmOut->strmOut.Props, pv2, len2);
 
         dsoundUnlockOutput(pDSoundStrmOut->pDSB, pv1, pv2, cb1, cb2);
@@ -517 +509 @@
 static int dsoundPlayGetStatus(LPDIRECTSOUNDBUFFER8 pDSB, DWORD *pStatus)
 {
+    AssertPtrReturn(pDSB, VERR_INVALID_POINTER);
+    /* pStatus is optional. */
+
     int rc = VINF_SUCCESS;
 
@@ -527 +522 @@
             rc = dsoundPlayRestore(pDSB);
             if (RT_SUCCESS(rc))
-            {
                 hr = IDirectSoundBuffer8_GetStatus(pDSB, &dwStatus);
-            }
         }
     }
@@ -535 +528 @@
     if (FAILED(hr))
     {
-        DSLOG(("DSound: playback GetStatus %Rhrc\n", hr));
+        LogRelMax(s_cMaxRelLogEntries, ("DSound: Error getting playback status: %Rhrc\n", hr));
         if (RT_SUCCESS(rc))
-        {
             rc = VERR_NOT_SUPPORTED;
-        }
     }
 
     if (RT_SUCCESS(rc))
     {
-        *pStatus = dwStatus;
+        if (pStatus)
+            *pStatus = dwStatus;
     }
 
@@ -552 +544 @@
 static void dsoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
+    AssertPtrReturnVoid(pThis);
+    AssertPtrReturnVoid(pDSoundStrmOut);
+
     if (pDSoundStrmOut->pDSB != NULL)
     {
@@ -558 +553 @@
         dsoundPlayGetStatus(pDSoundStrmOut->pDSB, &dwStatus);
 
-        DSLOG(("DSound: playback stop\n"));
+        LogFlowFunc(("Playback stopped\n"));
 
         HRESULT hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
         if (FAILED(hr))
-        {
-            DSLOG(("DSound: stop playback buffer %Rhrc\n", hr));
-        }
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Errpor stopping playback buffer: %Rhrc\n", hr));
     }
 }
@@ -570 +563 @@
 static int dsoundPlayStart(PDSOUNDSTREAMOUT pDSoundStrmOut)
 {
-    int rc = VINF_SUCCESS;
+    AssertPtrReturn(pDSoundStrmOut, VERR_INVALID_POINTER);
+
+    int rc;
 
     if (pDSoundStrmOut->pDSB != NULL)
     {
         DWORD dwStatus;
-        int rc2 = dsoundPlayGetStatus(pDSoundStrmOut->pDSB, &dwStatus);
-        if (RT_FAILURE(rc2))
-        {
-            DSLOG(("DSound: playback start GetStatus %Rrc\n", rc2));
-            rc = rc2;   /* Propagate error. */
-        }
-        else
+        rc = dsoundPlayGetStatus(pDSoundStrmOut->pDSB, &dwStatus);
+        if (RT_SUCCESS(rc))
         {
             if (dwStatus & DSBSTATUS_PLAYING)
             {
-                DSLOG(("DSound: already playing\n"));
+                LogFlowFunc(("Already playing\n"));
             }
             else
@@ -593 +583 @@
                 pDSoundStrmOut->fReinitPlayPos = true;
 
-                DSLOG(("DSound: playback start\n"));
+                LogFlowFunc(("Playback started\n"));
 
                 HRESULT hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, DSBPLAY_LOOPING);
                 if (FAILED(hr))
                 {
-                    DSLOGREL(("DSound: Playback start %Rhrc\n", hr));
+                    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error starting playback: %Rhrc\n", hr));
                     rc = VERR_NOT_SUPPORTED;
                 }
@@ -605 +595 @@
     }
     else
-    {
         rc = VERR_INVALID_STATE;
-    }
 
     return rc;
@@ -618 +606 @@
 static LPCGUID dsoundCaptureSelectDevice(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
 {
+    AssertPtrReturn(pThis, NULL);
+    AssertPtrReturn(pDSoundStrmIn, NULL);
+
     LPCGUID pGUID = pThis->cfg.pGuidCapture;
 
@@ -630 +621 @@
                 RTListForEach(&pThis->lstDevInput, pDev, DSOUNDDEV, Node)
                 {
-                    if (RTStrIStr(pDev->pszName, "Mic"))    /** @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;
+
+                break;
+            }
 
             case PDMAUDIORECSOURCE_LINE_IN:
@@ -645 +638 @@
         if (pDev)
         {
-            DSLOG(("DSound: Guest \"%s\" is using host \"%s\"\n",
-                   drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pDev->pszName));
+            LogRel2(("DSound: Guest \"%s\" is using host \"%s\"\n",
+                     drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pDev->pszName));
 
             pGUID = &pDev->Guid;
@@ -653 +646 @@
 
     char *pszGUID = dsoundGUIDToUtf8StrA(pGUID);
-    LogRel(("DSound: Guest \"%s\" is using host device with GUID: %s\n",
-           drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pszGUID ? pszGUID : "NULL"));
-    RTStrFree(pszGUID);
+    if (pszGUID)
+    {
+        LogRel(("DSound: Guest \"%s\" is using host device with GUID: %s\n",
+                drvAudioRecSourceToString(pDSoundStrmIn->enmRecSource), pszGUID));
+        RTStrFree(pszGUID);
+    }
 
     return pGUID;
@@ -673 +669 @@
     if (pDSoundStrmIn->pDSC != NULL)
     {
-        DSLOG(("DSound: DirectSoundCapture instance already exists\n"));
+        LogFunc(("DSound: DirectSoundCapture instance already exists\n"));
         return VINF_SUCCESS;
     }
@@ -681 +677 @@
     if (FAILED(hr))
     {
-        DSLOGREL(("DSound: DirectSoundCapture create instance %Rhrc\n", hr));
+        LogRel(("DSound: Error creating capture instance: %Rhrc\n", hr));
     }
     else
@@ -690 +686 @@
         {
             if (hr == DSERR_NODRIVER)
-            {
-                DSLOGREL(("DSound: DirectSound capture is currently unavailable\n"));
-            }
+                LogRel(("DSound: DirectSound capture is currently unavailable\n"));
             else
-            {
-                DSLOGREL(("DSound: DirectSoundCapture initialize %Rhrc\n", hr));
-            }
+                LogRel(("DSound: Error initializing capture: %Rhrc\n", hr));
             dsoundCaptureInterfaceRelease(pDSoundStrmIn);
         }
@@ -706 +698 @@
 static void dsoundCaptureClose(PDSOUNDSTREAMIN pDSoundStrmIn)
 {
-    DSLOG(("DSound: capture close %p buffer %p\n", pDSoundStrmIn, pDSoundStrmIn->pDSCB));
+    AssertPtrReturnVoid(pDSoundStrmIn);
+
+    LogFlowFunc(("pDSoundStrmIn=%p, pDSCB=%p\n", pDSoundStrmIn, pDSoundStrmIn->pDSCB));
 
     if (pDSoundStrmIn->pDSCB)
@@ -712 +706 @@
         HRESULT hr = IDirectSoundCaptureBuffer_Stop(pDSoundStrmIn->pDSCB);
         if (FAILED (hr))
-        {
-            DSLOG(("DSound: close capture buffer stop %Rhrc\n", hr));
-        }
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error stopping capture buffer: %Rhrc\n", hr));
 
         IDirectSoundCaptureBuffer8_Release(pDSoundStrmIn->pDSCB);
@@ -725 +717 @@
 static int dsoundCaptureOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
 {
-    DSLOG(("DSound: capture open %p size %u bytes freq %u, chan %u, bits %u, sign %d\n",
-           pDSoundStrmIn,
-           pThis->cfg.cbBufferIn,
-           pDSoundStrmIn->hw.Props.uHz,
-           pDSoundStrmIn->hw.Props.cChannels,
-           pDSoundStrmIn->hw.Props.cBits,
-           pDSoundStrmIn->hw.Props.fSigned));
+    AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pDSoundStrmIn, VERR_INVALID_PARAMETER);
+
+    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));
 
     if (pDSoundStrmIn->pDSCB != NULL)
     {
         /* Should not happen but be forgiving. */
-        DSLOGREL(("DSound: DirectSoundCaptureBuffer already exists\n"));
+        LogFlowFunc(("Capture buffer already exists\n"));
         dsoundCaptureClose(pDSoundStrmIn);
     }
@@ -761 +756 @@
         hr = IDirectSoundCapture_CreateCaptureBuffer(pDSoundStrmIn->pDSC,
                                                      &bd, &pDSCB, NULL);
-
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Create capture buffer %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error creating capture buffer: %Rhrc\n", hr));
             pDSoundStrmIn->pDSCB = NULL;
             break;
@@ -773 +767 @@
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Querying capture buffer %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying for capture buffer interface: %Rhrc\n", hr));
             break;
         }
 
         /* Query the actual parameters. */
-
         DWORD cbReadPos = 0;
         hr = IDirectSoundCaptureBuffer8_GetCurrentPosition(pDSoundStrmIn->pDSCB, NULL, &cbReadPos);
@@ -784 +777 @@
         {
             cbReadPos = 0;
-            DSLOG(("DSound: open GetCurrentPosition %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error retrieving current position for capture stream: %Rhrc\n", hr));
         }
 
@@ -791 +784 @@
         if (FAILED(hr))
         {
-            DSLOGREL(("DSound: Capture buffer GetFormat %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying format for capture stream: %Rhrc\n", hr));
             break;
         }
@@ -801 +794 @@
         if (FAILED (hr))
         {
-            DSLOGREL(("DSound: Capture buffer GetCaps %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error querying capabilities for capture stream: %Rhrc\n", hr));
             break;
         }
 
-        DSLOG(("DSound: capture buffer format: size %d bytes\n"
-                "  tag             = %d\n"
-                "  nChannels       = %d\n"
-                "  nSamplesPerSec  = %d\n"
-                "  nAvgBytesPerSec = %d\n"
-                "  nBlockAlign     = %d\n"
-                "  wBitsPerSample  = %d\n"
-                "  cbSize          = %d\n",
+        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,
@@ -822 +816 @@
                 wfx.cbSize));
 
-        if (bc.dwBufferBytes & pDSoundStrmIn->hw.Props.uAlign)
-        {
-            DSLOGREL(("DSound: GetCaps returned misaligned buffer size %ld, alignment %d\n",
-                      bc.dwBufferBytes, pDSoundStrmIn->hw.Props.uAlign + 1));
-        }
+        if (bc.dwBufferBytes & pDSoundStrmIn->strmIn.Props.uAlign)
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Capture capabilities returned misaligned buffer (size %ld, alignment %RU32)\n",
+                      bc.dwBufferBytes, pDSoundStrmIn->strmIn.Props.uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferIn)
-        {
-            DSLOGREL(("DSound: Buffer size mismatch dsound %u, requested %u bytes\n",
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Capture buffer size mismatched (DirectSound %ld, requested %ld bytes)\n",
                       bc.dwBufferBytes, pThis->cfg.cbBufferIn));
-        }
 
         /* Initial state: reading at the initial capture position. */
-        pDSoundStrmIn->csCaptureReadPos = cbReadPos >> pDSoundStrmIn->hw.Props.cShift;
-        pDSoundStrmIn->csCaptureBufferSize = bc.dwBufferBytes >> pDSoundStrmIn->hw.Props.cShift;
-        DSLOG(("DSound: capture open csCaptureReadPos %d, csCaptureBufferSize %d samples\n",
-               pDSoundStrmIn->csCaptureReadPos, pDSoundStrmIn->csCaptureBufferSize));
-
+        pDSoundStrmIn->csCaptureReadPos    = cbReadPos >> pDSoundStrmIn->strmIn.Props.cShift;
+        pDSoundStrmIn->csCaptureBufferSize = bc.dwBufferBytes >> pDSoundStrmIn->strmIn.Props.cShift;
+
+        LogFlowFunc(("csCaptureReadPos=%ld, csCaptureBufferSize=%ld\n",
+                     pDSoundStrmIn->csCaptureReadPos, pDSoundStrmIn->csCaptureBufferSize));
+
+        /* Update status. */
         pDSoundStrmIn->hrLastCaptureIn = S_OK;
+
     } while (0);
 
@@ -852 +845 @@
 static void dsoundCaptureStop(PDSOUNDSTREAMIN pDSoundStrmIn)
 {
+    AssertPtrReturnVoid(pDSoundStrmIn);
+
     if (pDSoundStrmIn->pDSCB)
     {
-        DSLOG(("DSound: capture stop\n"));
+        LogFlowFunc(("Capturing stopped\n"));
 
         HRESULT hr = IDirectSoundCaptureBuffer_Stop(pDSoundStrmIn->pDSCB);
         if (FAILED(hr))
-        {
-            DSLOG(("DSound: stop capture buffer %Rhrc\n", hr));
-        }
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error stopping capture buffer: %Rhrc\n", hr));
     }
 }
@@ -866 +859 @@
 static int dsoundCaptureStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStrmIn)
 {
+    AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pDSoundStrmIn, VERR_INVALID_PARAMETER);
+
     HRESULT hr;
 
@@ -874 +870 @@
         if (FAILED(hr))
         {
-            DSLOG(("DSound: start GetStatus %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error getting capture buffer status: %Rhrc\n", hr));
         }
         else
@@ -880 +876 @@
             if (dwStatus & DSCBSTATUS_CAPTURING)
             {
-                DSLOG(("DSound: already capturing\n"));
+                LogFlowFunc(("Already capturing\n"));
             }
             else
             {
-                DSLOG(("DSound: capture start\n"));
-
+                LogFlowFunc(("Capturig started\n"));
                 hr = IDirectSoundCaptureBuffer8_Start(pDSoundStrmIn->pDSCB, DSCBSTART_LOOPING);
                 if (FAILED (hr))
-                {
-                    DSLOGREL(("DSound: Start %Rhrc\n", hr));
-                }
+                    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error starting capture: %Rhrc\n", hr));
             }
         }
@@ -896 +889 @@
     else
     {
+        AssertMsgFailed(("No/invalid capture buffer\n"));
         hr = E_FAIL;
     }
@@ -941 +935 @@
 static void dsoundLogDevice(const char *pszType, LPGUID lpGUID, LPCWSTR lpwstrDescription, LPCWSTR lpwstrModule)
 {
+    AssertPtrReturnVoid(pszType);
+    AssertPtrReturnVoid(lpGUID);
+    AssertPtrReturnVoid(lpwstrDescription);
+    AssertPtrReturnVoid(lpwstrModule);
+
     char *pszGUID = dsoundGUIDToUtf8StrA(lpGUID);
-
-    LogRel(("DSound: %s: GUID: %s [%ls] (Module: %ls)\n",
-           pszType, pszGUID? pszGUID: "no GUID", lpwstrDescription, lpwstrModule));
-
-    RTStrFree(pszGUID);
+    if (pszGUID)
+    {
+        LogRel(("DSound: %s: GUID: %s [%ls] (Module: %ls)\n",
+                pszType, pszGUID, lpwstrDescription, lpwstrModule));
+
+        RTStrFree(pszGUID);
+    }
 }
 
@@ -952 +953 @@
                                         LPCWSTR lpwstrModule, LPVOID lpContext)
 {
+   AssertPtrReturn(lpContext, FALSE);
+
     PDSOUNDENUMCBCTX pCtx = (PDSOUNDENUMCBCTX)lpContext;
     AssertPtrReturn(pCtx, FALSE);
@@ -960 +963 @@
         return TRUE;
 
+    AssertPtrReturn(lpwstrDescription, FALSE);
+    AssertPtrReturn(lpwstrModule, FALSE);
+
     dsoundLogDevice("Output", lpGUID, lpwstrDescription, lpwstrModule);
 
@@ -986 +992 @@
 
     int rc = dsoundDevAdd(&pCtx->pDrv->lstDevInput,
-                                 lpGUID, lpwstrDescription, NULL /* ppDev */);
+                          lpGUID, lpwstrDescription, NULL /* ppDev */);
     if (RT_FAILURE(rc))
         return FALSE; /* Abort enumeration. */
@@ -1004 +1010 @@
                                               uint32_t *pcSamples)
 {
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pHstStrmOut, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
+    /* pcSamples is optional. */
+
     LogFlowFunc(("pHstStrmOut=%p, pCfg=%p\n", pHstStrmOut, pCfg));
 
@@ -1012 +1023 @@
     pDSoundStrmOut->streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
 
-    int rc = drvAudioStreamCfgToProps(&pDSoundStrmOut->streamCfg, &pDSoundStrmOut->hw.Props);
+    int rc = drvAudioStreamCfgToProps(&pDSoundStrmOut->streamCfg, &pDSoundStrmOut->strmOut.Props);
     if (RT_SUCCESS(rc))
     {
@@ -1061 +1072 @@
                 rc = dsoundPlayStart(pDSoundStrmOut);
             }
-        } break;
+
+            break;
+        }
 
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
             dsoundPlayStop(pThis, pDSoundStrmOut);
-        } break;
+            break;
+        }
 
         default:
@@ -1072 +1086 @@
             AssertMsgFailed(("Invalid command %ld\n", enmStreamCmd));
             rc = VERR_INVALID_PARAMETER;
-        } break;
+            break;
+        }
     }
 
@@ -1083 +1098 @@
                                               uint32_t *pcSamplesPlayed)
 {
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pHstStrmOut, VERR_INVALID_POINTER);
+    /* pcSamplesPlayed is optional. */
+
     PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
     PDSOUNDSTREAMOUT pDSoundStrmOut = (PDSOUNDSTREAMOUT)pHstStrmOut;
-    LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStrmOut->pDSB;
 
     int rc = VINF_SUCCESS;
-
-    if (!pDSB)
-    {
-        if (pcSamplesPlayed) /** @todo single point of return */
-            *pcSamplesPlayed = 0;
-        return VINF_SUCCESS;
-    }
-
-    int cShift = pHstStrmOut->Props.cShift;
-    DWORD cbBuffer = pDSoundStrmOut->csPlaybackBufferSize << cShift;
-
-    DWORD cbPlayPos, cbWritePos;
-    HRESULT hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, &cbWritePos);
-    if (hr == DSERR_BUFFERLOST)
-    {
-        rc = dsoundPlayRestore(pDSB);
+    uint32_t cReadTotal = 0;
+
+    do
+    {
+        LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStrmOut->pDSB;
+        if (!pDSB)
+            break;
+
+        int cShift = pHstStrmOut->Props.cShift;
+        DWORD cbBuffer = pDSoundStrmOut->csPlaybackBufferSize << cShift;
+
+        DWORD cbPlayPos, cbWritePos;
+        HRESULT hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, &cbWritePos);
+        if (hr == DSERR_BUFFERLOST)
+        {
+            rc = dsoundPlayRestore(pDSB);
+            if (RT_FAILURE(rc))
+                break;
+
+            hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, &cbWritePos);
+            if (hr == DSERR_BUFFERLOST) /* Avoid log flooding if the error is still there. */
+                break;
+        }
+
+        if (FAILED(hr))
+        {
+            LogRelMax(s_cMaxRelLogEntries, ("Error retrieving current playback position: %Rhrc\n", hr));
+            break;
+        }
+
+        DWORD cbFree;
+        DWORD cbPlayWritePos;
+        if (pDSoundStrmOut->fReinitPlayPos)
+        {
+            pDSoundStrmOut->fReinitPlayPos = false;
+
+            pDSoundStrmOut->cbPlayWritePos = cbWritePos;
+
+            cbPlayWritePos = pDSoundStrmOut->cbPlayWritePos;
+            cbFree = cbBuffer - dsoundRingDistance(cbWritePos, cbPlayPos, cbBuffer);
+        }
+        else
+        {
+            /* Full buffer? */
+            if (pDSoundStrmOut->cbPlayWritePos == cbPlayPos)
+                break;
+
+            cbPlayWritePos = pDSoundStrmOut->cbPlayWritePos;
+            cbFree         = dsoundRingDistance(cbPlayPos, cbPlayWritePos, cbBuffer);
+        }
+
+        uint32_t csLive = drvAudioHstOutSamplesLive(pHstStrmOut, NULL /* pcStreamsLive */);
+        uint32_t cbLive = csLive << cShift;
+
+        /* Do not write more than available space in the DirectSound playback buffer. */
+        cbLive = RT_MIN(cbFree, cbLive);
+
+        cbLive &= ~pHstStrmOut->Props.uAlign;
+        if (cbLive == 0 || cbLive > cbBuffer)
+        {
+            LogFlowFunc(("cbLive=%RU32, cbBuffer=%ld, cbPlayWritePos=%ld, cbPlayPos=%ld\n",
+                         cbLive, cbBuffer, cbPlayWritePos, cbPlayPos));
+            break;
+        }
+
+        LPVOID pv1, pv2;
+        DWORD cb1, cb2;
+        rc = dsoundLockOutput(pDSB, &pHstStrmOut->Props, cbPlayWritePos, cbLive,
+                              &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
         if (RT_FAILURE(rc))
-        {
-            if (pcSamplesPlayed)
-                *pcSamplesPlayed = 0;
-            return VINF_SUCCESS;
-        }
-
-        hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, &cbWritePos);
-        if (hr == DSERR_BUFFERLOST)
-        {
-            /* Avoid log flooding if the error is still there. */
-            if (pcSamplesPlayed)
-                *pcSamplesPlayed = 0;
-            return VINF_SUCCESS;
-        }
-    }
-    if (FAILED (hr))
-    {
-        DSLOG(("DSound: get playback buffer position %Rhrc\n", hr));
-        if (pcSamplesPlayed)
-            *pcSamplesPlayed = 0;
-        return VINF_SUCCESS;
-    }
-
-    DWORD cbFree;
-    DWORD cbPlayWritePos;
-    if (pDSoundStrmOut->fReinitPlayPos)
-    {
-        pDSoundStrmOut->fReinitPlayPos = false;
-
-        pDSoundStrmOut->cbPlayWritePos = cbWritePos;
-
-        cbPlayWritePos = pDSoundStrmOut->cbPlayWritePos;
-        cbFree = cbBuffer - dsoundRingDistance(cbWritePos, cbPlayPos, cbBuffer);
-    }
-    else
-    {
-        if (pDSoundStrmOut->cbPlayWritePos == cbPlayPos)
-        {
-            /* Full buffer. */
-            if (pcSamplesPlayed)
-                *pcSamplesPlayed = 0;
-            return VINF_SUCCESS;
-        }
-
-        cbPlayWritePos = pDSoundStrmOut->cbPlayWritePos;
-        cbFree = dsoundRingDistance(cbPlayPos, cbPlayWritePos, cbBuffer);
-    }
-
-    uint32_t csLive = drvAudioHstOutSamplesLive(pHstStrmOut, NULL /* pcStreamsLive */);
-    uint32_t cbLive = csLive << cShift;
-
-    /* Do not write more than available space in the DirectSound playback buffer. */
-    cbLive = RT_MIN(cbFree, cbLive);
-
-    cbLive &= ~pHstStrmOut->Props.uAlign;
-    if (cbLive == 0 || cbLive > cbBuffer)
-    {
-        DSLOG(("DSound: cbLive=%d cbBuffer=%d cbPlayWritePos=%d cbPlayPos=%d\n",
-              cbLive, cbBuffer, cbPlayWritePos, cbPlayPos));
-        if (pcSamplesPlayed)
-            *pcSamplesPlayed = 0;
-        return VINF_SUCCESS;
-    }
-
-    LPVOID pv1, pv2;
-    DWORD cb1, cb2;
-    rc = dsoundLockOutput(pDSB, &pHstStrmOut->Props, cbPlayWritePos, cbLive,
-                          &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
-    if (RT_FAILURE(rc))
-    {
-        if (pcSamplesPlayed)
-            *pcSamplesPlayed = 0;
-        return VINF_SUCCESS;
-    }
-
-    DWORD len1 = cb1 >> cShift;
-    DWORD len2 = cb2 >> cShift;
-
-    uint32_t cReadTotal = 0;
-    uint32_t cRead = 0;
-
-    if (pv1 && cb1)
-    {
-        rc = AudioMixBufReadCirc(&pHstStrmOut->MixBuf, pv1, cb1, &cRead);
-        if (RT_SUCCESS(rc))
-            cReadTotal += cRead;
-    }
-
-    if (   RT_SUCCESS(rc)
-        && cReadTotal == len1
-        && pv2 && cb2)
-    {
-        rc = AudioMixBufReadCirc(&pHstStrmOut->MixBuf, pv2, cb2, &cRead);
-        if (RT_SUCCESS(rc))
-            cReadTotal += cRead;
-    }
-
-    dsoundUnlockOutput(pDSB, pv1, pv2, cb1, cb2);
-
-    pDSoundStrmOut->cbPlayWritePos = (cbPlayWritePos + (cReadTotal << cShift)) % cbBuffer;
-
-    DSLOGF(("DSound: PlayOut %RU32 (%RU32 samples) out of %d%s, ds write pos %d -> %d, rc=%Rrc\n",
-            AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal), cReadTotal, cbLive,
-            cbLive != AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal) ? " !!!": "",
-            cbPlayWritePos, pDSoundStrmOut->cbPlayWritePos, rc));
-
-    if (cReadTotal)
-    {
-        AudioMixBufFinish(&pHstStrmOut->MixBuf, cReadTotal);
-        rc = VINF_SUCCESS; /* Played something. */
-    }
+            break;
+
+        DWORD len1 = cb1 >> cShift;
+        DWORD len2 = cb2 >> cShift;
+
+        uint32_t cRead = 0;
+
+        if (pv1 && cb1)
+        {
+            rc = AudioMixBufReadCirc(&pHstStrmOut->MixBuf, pv1, cb1, &cRead);
+            if (RT_SUCCESS(rc))
+                cReadTotal += cRead;
+        }
+
+        if (   RT_SUCCESS(rc)
+            && cReadTotal == len1
+            && pv2 && cb2)
+        {
+            rc = AudioMixBufReadCirc(&pHstStrmOut->MixBuf, pv2, cb2, &cRead);
+            if (RT_SUCCESS(rc))
+                cReadTotal += cRead;
+        }
+
+        dsoundUnlockOutput(pDSB, pv1, pv2, cb1, cb2);
+
+        pDSoundStrmOut->cbPlayWritePos = (cbPlayWritePos + (cReadTotal << cShift)) % cbBuffer;
+
+        LogFlowFunc(("%RU32 (%RU32 samples) out of %RU32%s, buffer write pos %ld -> %ld, rc=%Rrc\n",
+                     AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal), cReadTotal, cbLive,
+                     cbLive != AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal) ? " !!!": "",
+                     cbPlayWritePos, pDSoundStrmOut->cbPlayWritePos, rc));
+
+        if (cReadTotal)
+        {
+            AudioMixBufFinish(&pHstStrmOut->MixBuf, cReadTotal);
+            rc = VINF_SUCCESS; /* Played something. */
+        }
+
+    } while (0);
 
     if (pcSamplesPlayed)
@@ -1345 +1344 @@
         if (hr != pDSoundStrmIn->hrLastCaptureIn)
         {
-            DSLOGREL(("DSound: CaptureIn GetCurrentPosition %Rhrc\n", hr));
+            LogRelMax(s_cMaxRelLogEntries, ("DSound: Error retrieving current capture position: %Rhrc\n", hr));
             pDSoundStrmIn->hrLastCaptureIn = hr;
         }
@@ -1356 +1355 @@
 
     if (cbReadPos & pHstStrmIn->Props.uAlign)
-    {
-        DSLOG(("DSound: CaptureIn misaligned read position %d(%d)\n", cbReadPos, pHstStrmIn->Props.uAlign));
-    }
+        LogFunc(("Misaligned read position %ld (alignment: %RU32)\n", cbReadPos, pHstStrmIn->Props.uAlign));
 
     /* Capture position in samples. */
-    int csReadPos = cbReadPos >> pHstStrmIn->Props.cShift;
+    DWORD csReadPos = cbReadPos >> pHstStrmIn->Props.cShift;
 
     /* Number of samples available in the DirectSound capture buffer. */
@@ -1379 +1376 @@
     if (csMixFree == 0)
     {
-        DSLOG(("DSound: capture mix buffer full\n"));
+        LogRelMax(s_cMaxRelLogEntries, ("DSound: Capture buffer full\n"));
         if (pcSamplesCaptured)
             *pcSamplesCaptured = 0;
@@ -1385 +1382 @@
     }
 
-    DSLOGF(("DSound: CaptureIn csMixFree = %u, csReadPos = %d, csCaptureReadPos = %d, csCaptured = %u\n",
-            csMixFree, csReadPos, pDSoundStrmIn->csCaptureReadPos, csCaptured));
+    LogFlowFunc(("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. */
@@ -1442 +1439 @@
     {
         pDSoundStrmIn->csCaptureReadPos = (pDSoundStrmIn->csCaptureReadPos + csProcessed) % pDSoundStrmIn->csCaptureBufferSize;
-        DSLOGF(("DSound: CaptureIn %d (%d+%d), processed %d/%d\n",
-                csCaptured, len1, len2, csProcessed, csWrittenTotal));
+        LogFlowFunc(("%ld (%ld+%ld), processed %RU32/%RU32\n",
+                     csCaptured, len1, len2, csProcessed, csWrittenTotal));
     }
 
@@ -1459 +1456 @@
     dsoundCaptureClose(pDSoundStrmIn);
 
-    pDSoundStrmIn->csCaptureReadPos = 0;
+    pDSoundStrmIn->csCaptureReadPos    = 0;
     pDSoundStrmIn->csCaptureBufferSize = 0;
     RT_ZERO(pDSoundStrmIn->streamCfg);
@@ -1491 +1488 @@
     HRESULT hr = DirectSoundEnumerateW(&dsoundEnumCallback, &ctx);
     if (FAILED(hr))
-        DSLOG(("DSound: Enumerating host playback devices failed %Rhrc\n", hr));
-
-    DSLOGREL(("DSound: Found %RU32 host playback devices\n", pCfg->cMaxHstStrmsOut));
+        LogRel(("DSound: Error enumerating host playback devices: %Rhrc\n", hr));
+
+    LogRel(("DSound: Found %RU32 host playback devices\n", pCfg->cMaxHstStrmsOut));
     if (pCfg->cMaxHstStrmsOut == 0)
         pCfg->cMaxHstStrmsOut = 1; /* Support at least one stream. */
@@ -1499 +1496 @@
     hr = DirectSoundCaptureEnumerateW(&dsoundCaptureEnumCallback, &ctx);
     if (FAILED(hr))
-        DSLOG(("DSound: Enumerating host capturing devices failed %Rhrc\n", hr));
-
-    DSLOGREL(("DSound: Found %RU32 host capturing devices\n", pCfg->cMaxHstStrmsIn));
+        LogRel(("DSound: Error nnumerating host capturing devices: %Rhrc\n", hr));
+
+    LogRel(("DSound: Found %RU32 host capturing devices\n", pCfg->cMaxHstStrmsIn));
     if (pCfg->cMaxHstStrmsIn < 2)
     {
-        DSLOGREL(("DSound: Adjusting the number of host capturing devices from %RU32 to 2\n", pCfg->cMaxHstStrmsIn));
+        LogRel(("DSound: Adjusting the number of host capturing devices from %RU32 to 2\n", pCfg->cMaxHstStrmsIn));
         pCfg->cMaxHstStrmsIn = 2; /* Support at least two streams (line in + mic). */
     }
@@ -1529 +1526 @@
         IDirectSound_Release(pDirectSound);
     else
-        DSLOGREL(("DSound: Not available %Rhrc\n", hr));
+        LogRel(("DSound: DirectSound not available: %Rhrc\n", hr));
 
     int rc = SUCCEEDED(hr) ? VINF_SUCCESS: VERR_NOT_SUPPORTED;
@@ -1581 +1578 @@
             pGuid = (LPCGUID)&pUuid;
         else
-            DSLOGREL(("DSound: Parse DirectSound %s %Rrc\n", pszName, rc));
+            LogRel(("DSound: Error parsing device GUID for device '%s': %Rrc\n", pszName, rc));
 
         RTStrFree(pszGuid);
@@ -1601 +1598 @@
     pThis->cfg.pGuidCapture = dsoundConfigQueryGUID(pCfg, "DeviceGuidIn",  &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));
+    LogFlowFunc(("BufsizeOut %u, BufsizeIn %u, DeviceGuidOut {%RTuuid}, DeviceGuidIn {%RTuuid}\n",
+                 pThis->cfg.cbBufferOut,
+                 pThis->cfg.cbBufferIn,
+                 &pThis->cfg.uuidPlay,
+                 &pThis->cfg.uuidCapture));
 }
 
@@ -1634 +1631 @@
     if (FAILED(hr))
     {
-        LogRel(("DSound: COM initialize %Rhrc\n", hr));
+        LogRel(("DSound: Error initializing COM: %Rhrc\n", hr));
         return VERR_NOT_SUPPORTED;
     }