dsound: Correctly report hardware audio buffers as unsupported.

Signed-off-by: Eduard Permyakov <epermyakov@codeweavers.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dsound: Correctly report hardware audio buffers as unsupported.
68069542 · Eduard Permyakov · Alexandre Julliard · 9d79f721 · 68069542
Commit 68069542 authored Nov 17, 2021 by Eduard Permyakov Committed by Alexandre Julliard Nov 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

dsound.c dlls/dsound/dsound.c +7 -8

No files found.
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -373,12 +373,12 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU
    device->drvcaps.dwPrimaryBuffers = 1;
    device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN;
    device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;
-    device->drvcaps.dwMaxHwMixingAllBuffers = 16;
+    device->drvcaps.dwMaxHwMixingAllBuffers = 1;
    device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers;
    device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers;
-    device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers;
-    device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers;
-    device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers;
+    device->drvcaps.dwFreeHwMixingAllBuffers = 0;
+    device->drvcaps.dwFreeHwMixingStaticBuffers = 0;
+    device->drvcaps.dwFreeHwMixingStreamingBuffers = 0;

    ZeroMemory(&device->volpan, sizeof(device->volpan));

@@ -435,11 +435,10 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer(
    }

    if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) &&
-        dsbd->dwFlags & DSBCAPS_LOCHARDWARE &&
-        device->drvcaps.dwFreeHwMixingAllBuffers == 0)
+        dsbd->dwFlags & DSBCAPS_LOCHARDWARE)
    {
-        WARN("ran out of emulated hardware buffers\n");
-        return DSERR_ALLOCATED;
+        WARN("unable to create hardware buffer\n");
+        return DSERR_UNSUPPORTED;
    }

    if (dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) {