[PATCH v3 0/5] MR8559: mmdevapi: Error out if the channel count or sampling rate doesn't match the mix format.
This fixes the voice chat in Farming Simulator 22. -- v3: mmdevapi: Error out if the channel count or sampling rate doesn't match the mix format. https://gitlab.winehq.org/wine/wine/-/merge_requests/8559
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 236a4ff71c8..08579741676 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -553,11 +553,14 @@ static void test_formats(AUDCLNT_SHAREMODE mode) mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels); - /* Change GetMixFormat wBitsPerSample only => S_OK */ - if (mode == AUDCLNT_SHAREMODE_SHARED - && fmt.nSamplesPerSec == pwfx->nSamplesPerSec - && fmt.nChannels == pwfx->nChannels) - ok(hr == S_OK, "Varying BitsPerSample %u\n", fmt.wBitsPerSample); + /* In shared mode you can only change bit width, not sampling rate or channel count. */ + if (mode == AUDCLNT_SHAREMODE_SHARED) + { + BOOL compatible = fmt.nSamplesPerSec == pwfx->nSamplesPerSec && fmt.nChannels == pwfx->nChannels; + HRESULT expected = compatible ? S_OK : S_FALSE; + todo_wine_if(expected == S_FALSE) + ok(hr == expected, "Got %lx expected %lx\n", hr, expected); + } ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %lx<->suggest %p\n", hr, pwfx2); if (pwfx2 == (WAVEFORMATEX*)0xDEADF00D) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8559
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 08579741676..323ae5f024e 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -563,8 +563,6 @@ static void test_formats(AUDCLNT_SHAREMODE mode) } ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %lx<->suggest %p\n", hr, pwfx2); - if (pwfx2 == (WAVEFORMATEX*)0xDEADF00D) - pwfx2 = NULL; /* broken in Wine < 1.3.28 */ if (pwfx2) { ok(pwfx2->nSamplesPerSec == pwfx->nSamplesPerSec && pwfx2->nChannels == pwfx->nChannels && -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8559
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 73 +++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 323ae5f024e..8772d6e3828 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -41,17 +41,31 @@ #include "audiopolicy.h" #include "endpointvolume.h" +#define PCM WAVE_FORMAT_PCM +#define FLOAT WAVE_FORMAT_IEEE_FLOAT + static const unsigned int win_formats[][4] = { - { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, - {11025, 8, 1}, {11025, 8, 2}, {11025, 16, 1}, {11025, 16, 2}, - {12000, 8, 1}, {12000, 8, 2}, {12000, 16, 1}, {12000, 16, 2}, - {16000, 8, 1}, {16000, 8, 2}, {16000, 16, 1}, {16000, 16, 2}, - {22050, 8, 1}, {22050, 8, 2}, {22050, 16, 1}, {22050, 16, 2}, - {44100, 8, 1}, {44100, 8, 2}, {44100, 16, 1}, {44100, 16, 2}, - {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, - {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} + {PCM, 8000, 8, 1}, {PCM, 8000, 8, 2}, {PCM, 8000, 16, 1}, {PCM, 8000, 16, 2}, + {PCM, 11025, 8, 1}, {PCM, 11025, 8, 2}, {PCM, 11025, 16, 1}, {PCM, 11025, 16, 2}, + {PCM, 12000, 8, 1}, {PCM, 12000, 8, 2}, {PCM, 12000, 16, 1}, {PCM, 12000, 16, 2}, + {PCM, 16000, 8, 1}, {PCM, 16000, 8, 2}, {PCM, 16000, 16, 1}, {PCM, 16000, 16, 2}, + {PCM, 22050, 8, 1}, {PCM, 22050, 8, 2}, {PCM, 22050, 16, 1}, {PCM, 22050, 16, 2}, + {PCM, 44100, 8, 1}, {PCM, 44100, 8, 2}, {PCM, 44100, 16, 1}, {PCM, 44100, 16, 2}, + {PCM, 48000, 8, 1}, {PCM, 48000, 8, 2}, {PCM, 48000, 16, 1}, {PCM, 48000, 16, 2}, + {PCM, 96000, 8, 1}, {PCM, 96000, 8, 2}, {PCM, 96000, 16, 1}, {PCM, 96000, 16, 2}, + {FLOAT, 8000, 32, 1}, {FLOAT, 8000, 32, 2}, + {FLOAT, 11025, 32, 1}, {FLOAT, 11025, 32, 2}, + {FLOAT, 12000, 32, 1}, {FLOAT, 12000, 32, 2}, + {FLOAT, 16000, 32, 1}, {FLOAT, 16000, 32, 2}, + {FLOAT, 22050, 32, 1}, {FLOAT, 22050, 32, 2}, + {FLOAT, 44100, 32, 1}, {FLOAT, 44100, 32, 2}, + {FLOAT, 48000, 32, 1}, {FLOAT, 48000, 32, 2}, + {FLOAT, 96000, 32, 1}, {FLOAT, 96000, 32, 2}, }; +#undef PCM +#undef FLOAT + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) /* undocumented error code */ @@ -518,10 +532,11 @@ static void test_formats(AUDCLNT_SHAREMODE mode) WAVEFORMATEX fmt, *pwfx, *pwfx2; int i; - fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; for(i = 0; i < ARRAY_SIZE(win_formats); i++) { + char format_chr; + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08lx\n", hr); @@ -531,12 +546,15 @@ static void test_formats(AUDCLNT_SHAREMODE mode) hr = IAudioClient_GetMixFormat(ac, &pwfx); ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); - fmt.nSamplesPerSec = win_formats[i][0]; - fmt.wBitsPerSample = win_formats[i][1]; - fmt.nChannels = win_formats[i][2]; + fmt.wFormatTag = win_formats[i][0]; + fmt.nSamplesPerSec = win_formats[i][1]; + fmt.wBitsPerSample = win_formats[i][2]; + fmt.nChannels = win_formats[i][3]; fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; fmt.nAvgBytesPerSec= fmt.nBlockAlign * fmt.nSamplesPerSec; + format_chr = fmt.wFormatTag == WAVE_FORMAT_PCM ? 'P' : 'F'; + pwfx2 = (WAVEFORMATEX*)0xDEADF00D; hr = IAudioClient_IsFormatSupported(ac, mode, &fmt, &pwfx2); hrs = hr; @@ -546,12 +564,12 @@ static void test_formats(AUDCLNT_SHAREMODE mode) /* 5:1 card exception when asked for 1 channel at mixer rate */ pwfx->nChannels > 2 && fmt.nSamplesPerSec == pwfx->nSamplesPerSec) : (hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == hexcl)), - "IsFormatSupported(%d, %lux%2ux%u) returns %08lx\n", mode, - fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + "IsFormatSupported(%d, %c%lux%2ux%u) returns %08lx\n", mode, + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (hr == S_OK) - trace("IsSupported(%s, %lux%2ux%u)\n", + trace("IsSupported(%s, %c%lux%2ux%u)\n", mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", - fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels); + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels); /* In shared mode you can only change bit width, not sampling rate or channel count. */ if (mode == AUDCLNT_SHAREMODE_SHARED) @@ -564,28 +582,29 @@ static void test_formats(AUDCLNT_SHAREMODE mode) ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %lx<->suggest %p\n", hr, pwfx2); if (pwfx2) { - ok(pwfx2->nSamplesPerSec == pwfx->nSamplesPerSec && + ok(pwfx2->wFormatTag == pwfx->wFormatTag && + pwfx2->nSamplesPerSec == pwfx->nSamplesPerSec && pwfx2->nChannels == pwfx->nChannels && pwfx2->wBitsPerSample == pwfx->wBitsPerSample, - "Suggestion %lux%2ux%u differs from GetMixFormat\n", - pwfx2->nSamplesPerSec, pwfx2->wBitsPerSample, pwfx2->nChannels); + "Suggestion %c%lux%2ux%u differs from GetMixFormat\n", + format_chr, pwfx2->nSamplesPerSec, pwfx2->wBitsPerSample, pwfx2->nChannels); } /* Vista returns E_INVALIDARG upon AUDCLNT_STREAMFLAGS_RATEADJUST */ hr = IAudioClient_Initialize(ac, mode, 0, 5000000, 0, &fmt, NULL); if ((hrs == S_OK) ^ (hr == S_OK)) - trace("Initialize (%s, %lux%2ux%u) returns %08lx unlike IsFormatSupported\n", + trace("Initialize (%s, %c%lux%2ux%u) returns %08lx unlike IsFormatSupported\n", mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", - fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (mode == AUDCLNT_SHAREMODE_SHARED) ok(hrs == S_OK ? hr == S_OK : hr == AUDCLNT_E_UNSUPPORTED_FORMAT, - "Initialize(shared, %lux%2ux%u) returns %08lx\n", - fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + "Initialize(shared, %c%lux%2ux%u) returns %08lx\n", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); else if (hrs == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED) /* Unsupported format implies "create failed" and shadows "not allowed" */ ok(hrs == hexcl && (hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || hr == hrs), - "Initialize(noexcl., %lux%2ux%u) returns %08lx(%08lx)\n", - fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); + "Initialize(noexcl., %c%lux%2ux%u) returns %08lx(%08lx)\n", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. * Some cards Initialize 44100|48000x16x1 yet claim no support; @@ -595,8 +614,8 @@ static void test_formats(AUDCLNT_SHAREMODE mode) broken(hr == S_OK && ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), - "Initialize(exclus., %lux%2ux%u) returns %08lx\n", - fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + "Initialize(exclus., %c%lux%2ux%u) returns %08lx\n", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); /* Bug in native (Vista/w2k8/w7): after Initialize failed, better * Release this ac and Activate a new one. -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8559
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Based on the similar test in render.c. --- dlls/mmdevapi/tests/capture.c | 115 ++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index e3ae87fd9bd..17281bf3108 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -36,6 +36,31 @@ #include "mmdeviceapi.h" #include "audioclient.h" +#define PCM WAVE_FORMAT_PCM +#define FLOAT WAVE_FORMAT_IEEE_FLOAT + +static const unsigned int win_formats[][4] = { + {PCM, 8000, 8, 1}, {PCM, 8000, 8, 2}, {PCM, 8000, 16, 1}, {PCM, 8000, 16, 2}, + {PCM, 11025, 8, 1}, {PCM, 11025, 8, 2}, {PCM, 11025, 16, 1}, {PCM, 11025, 16, 2}, + {PCM, 12000, 8, 1}, {PCM, 12000, 8, 2}, {PCM, 12000, 16, 1}, {PCM, 12000, 16, 2}, + {PCM, 16000, 8, 1}, {PCM, 16000, 8, 2}, {PCM, 16000, 16, 1}, {PCM, 16000, 16, 2}, + {PCM, 22050, 8, 1}, {PCM, 22050, 8, 2}, {PCM, 22050, 16, 1}, {PCM, 22050, 16, 2}, + {PCM, 44100, 8, 1}, {PCM, 44100, 8, 2}, {PCM, 44100, 16, 1}, {PCM, 44100, 16, 2}, + {PCM, 48000, 8, 1}, {PCM, 48000, 8, 2}, {PCM, 48000, 16, 1}, {PCM, 48000, 16, 2}, + {PCM, 96000, 8, 1}, {PCM, 96000, 8, 2}, {PCM, 96000, 16, 1}, {PCM, 96000, 16, 2}, + {FLOAT, 8000, 32, 1}, {FLOAT, 8000, 32, 2}, + {FLOAT, 11025, 32, 1}, {FLOAT, 11025, 32, 2}, + {FLOAT, 12000, 32, 1}, {FLOAT, 12000, 32, 2}, + {FLOAT, 16000, 32, 1}, {FLOAT, 16000, 32, 2}, + {FLOAT, 22050, 32, 1}, {FLOAT, 22050, 32, 2}, + {FLOAT, 44100, 32, 1}, {FLOAT, 44100, 32, 2}, + {FLOAT, 48000, 32, 1}, {FLOAT, 48000, 32, 2}, + {FLOAT, 96000, 32, 1}, {FLOAT, 96000, 32, 2}, +}; + +#undef PCM +#undef FLOAT + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) /* undocumented error code */ @@ -556,6 +581,94 @@ cleanup: CoTaskMemFree(pwfx); } +static void test_formats(AUDCLNT_SHAREMODE mode) +{ + IAudioClient *ac; + HRESULT hr, hrs; + WAVEFORMATEX fmt, *pwfx, *pwfx2; + int i; + + fmt.cbSize = 0; + + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { + char format_chr; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); + if(hr != S_OK) + continue; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); + + fmt.wFormatTag = win_formats[i][0]; + fmt.nSamplesPerSec = win_formats[i][1]; + fmt.wBitsPerSample = win_formats[i][2]; + fmt.nChannels = win_formats[i][3]; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec= fmt.nBlockAlign * fmt.nSamplesPerSec; + + format_chr = fmt.wFormatTag == WAVE_FORMAT_PCM ? 'P' : 'F'; + + pwfx2 = (WAVEFORMATEX*)0xDEADF00D; + hr = IAudioClient_IsFormatSupported(ac, mode, &fmt, &pwfx2); + hrs = hr; + /* Only shared mode suggests something ... GetMixFormat! */ + ok(hr == S_OK || (mode == AUDCLNT_SHAREMODE_SHARED + ? hr == S_FALSE : hr == AUDCLNT_E_UNSUPPORTED_FORMAT), + "IsFormatSupported(%d, %c%lux%2ux%u) returns %08lx\n", mode, + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + if (hr == S_OK) + trace("IsSupported(%s, %c%lux%2ux%u)\n", + mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels); + + /* In shared mode you can only change bit width, not sampling rate or channel count. */ + if (mode == AUDCLNT_SHAREMODE_SHARED) + { + BOOL compatible = fmt.nSamplesPerSec == pwfx->nSamplesPerSec && fmt.nChannels == pwfx->nChannels; + HRESULT expected = compatible ? S_OK : S_FALSE; + todo_wine_if(expected == S_FALSE) + ok(hr == expected, "Got %lx expected %lx\n", hr, expected); + } + + ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %lx<->suggest %p\n", hr, pwfx2); + if (pwfx2) { + ok(pwfx2->wFormatTag == pwfx->wFormatTag && + pwfx2->nSamplesPerSec == pwfx->nSamplesPerSec && + pwfx2->nChannels == pwfx->nChannels && + pwfx2->wBitsPerSample == pwfx->wBitsPerSample, + "Suggestion %c%lux%2ux%u differs from GetMixFormat\n", + format_chr, pwfx2->nSamplesPerSec, pwfx2->wBitsPerSample, pwfx2->nChannels); + } + + hr = IAudioClient_Initialize(ac, mode, 0, 5000000, 0, &fmt, NULL); + if ((hrs == S_OK) ^ (hr == S_OK)) + trace("Initialize (%s, %c%lux%2ux%u) returns %08lx unlike IsFormatSupported\n", + mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + if (mode == AUDCLNT_SHAREMODE_SHARED) + ok(hrs == S_OK ? hr == S_OK : hr == AUDCLNT_E_UNSUPPORTED_FORMAT, + "Initialize(shared, %c%lux%2ux%u) returns %08lx\n", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + else if (hrs == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED) + /* Unsupported format implies "create failed" and shadows "not allowed" */ + ok(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || hr == hrs, + "Initialize(noexcl., %c%lux%2ux%u) returns %08lx(%08lx)\n", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); + else + ok(hrs == S_OK ? hr == S_OK + : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, + "Initialize(exclus., %c%lux%2ux%u) returns %08lx\n", + format_chr, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + + CoTaskMemFree(pwfx2); + CoTaskMemFree(pwfx); + IAudioClient_Release(ac); + } +} + static void test_streamvolume(void) { IAudioClient *ac; @@ -1094,6 +1207,8 @@ START_TEST(capture) } test_audioclient(); + test_formats(AUDCLNT_SHAREMODE_EXCLUSIVE); + test_formats(AUDCLNT_SHAREMODE_SHARED); test_streamvolume(); test_channelvolume(); test_simplevolume(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8559
From: Giovanni Mascellani <giovanni(a)mascellani.eu> This fixes the voice chat in Farming Simulator 22. --- dlls/mmdevapi/client.c | 34 +++++++++++++++++++++++++++++++++- dlls/mmdevapi/tests/capture.c | 1 - dlls/mmdevapi/tests/render.c | 1 - 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 39cbae27b34..61b9167f3c6 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -398,6 +398,22 @@ static HRESULT stream_init(struct audio_client *client, const BOOLEAN force_def_ return E_INVALIDARG; } + if (mode == AUDCLNT_SHAREMODE_SHARED) { + WAVEFORMATEX *mix_fmt; + HRESULT hr; + + if (FAILED(hr = IAudioClient3_GetMixFormat(&client->IAudioClient3_iface, &mix_fmt))) + return hr; + + if (fmt->nChannels != mix_fmt->nChannels || fmt->nSamplesPerSec != mix_fmt->nSamplesPerSec) + { + CoTaskMemFree(mix_fmt); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + + CoTaskMemFree(mix_fmt); + } + sessions_lock(); if (client->stream) { @@ -760,9 +776,25 @@ static HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHA TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); - if (fmt) + if (fmt) { dump_fmt(fmt); + if (mode == AUDCLNT_SHAREMODE_SHARED) { + WAVEFORMATEX *mix_fmt; + HRESULT hr; + + if (FAILED(hr = IAudioClient3_GetMixFormat(iface, &mix_fmt))) + return hr; + + if (fmt->nChannels != mix_fmt->nChannels || fmt->nSamplesPerSec != mix_fmt->nSamplesPerSec) { + *out = mix_fmt; + return S_FALSE; + } + + CoTaskMemFree(mix_fmt); + } + } + params.device = This->device_name; params.flow = This->dataflow; params.share = mode; diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 17281bf3108..678fda5baca 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -629,7 +629,6 @@ static void test_formats(AUDCLNT_SHAREMODE mode) { BOOL compatible = fmt.nSamplesPerSec == pwfx->nSamplesPerSec && fmt.nChannels == pwfx->nChannels; HRESULT expected = compatible ? S_OK : S_FALSE; - todo_wine_if(expected == S_FALSE) ok(hr == expected, "Got %lx expected %lx\n", hr, expected); } diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8772d6e3828..f674935de00 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -576,7 +576,6 @@ static void test_formats(AUDCLNT_SHAREMODE mode) { BOOL compatible = fmt.nSamplesPerSec == pwfx->nSamplesPerSec && fmt.nChannels == pwfx->nChannels; HRESULT expected = compatible ? S_OK : S_FALSE; - todo_wine_if(expected == S_FALSE) ok(hr == expected, "Got %lx expected %lx\n", hr, expected); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8559
On Tue Jul 15 11:55:05 2025 +0000, Nikolay Sivov wrote:
It should free on error path too. Good point, done.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8559#note_109937
nit: Could we stick to commit msg prefixes of `mmdevapi/tests:` ? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8559#note_109966
participants (3)
-
Giovanni Mascellani -
Giovanni Mascellani (＠giomasce)
-
Huw Davies (＠huw)