[PATCH v2] dsound: Correctly report hardware audio buffers as unsupported.

[Eduard Permyakov]

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com>
---
 dlls/dsound/dsound.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 3085d86e5b5..bcff0d8642a 100644
--- 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) {
-- 
2.25.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=102147

Your paranoid android.


=== debiant2 (build log) ===

0048:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0048:err:winediag:nodrv_CreateWindow Unknown error (998).
0040:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0040:err:winediag:nodrv_CreateWindow Unknown error (998).
0050:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0050:err:winediag:nodrv_CreateWindow Unknown error (998).
002c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
002c:err:winediag:nodrv_CreateWindow Unknown error (998).
0080:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0080:err:winediag:nodrv_CreateWindow Unknown error (998).
00c4:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
00c4:err:winediag:nodrv_CreateWindow Unknown error (998).
006c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
006c:err:winediag:nodrv_CreateWindow Unknown error (998).
Error: Mount manager not running, most likely your WINEPREFIX wasn't created correctly.
Task: WineTest did not produce the wow32 report

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>

On Wed, Nov 17, 2021 at 03:48:52PM +0300, Eduard Permyakov wrote:
> Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com>
> ---
>  dlls/dsound/dsound.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
> index 3085d86e5b5..bcff0d8642a 100644
> --- 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) {
> -- 
> 2.25.1