From: Giovanni Mascellani <gmascellani@codeweavers.com> --- dlls/mmdevapi/tests/capture.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 918a6d0c2f6..b02645f767c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -575,15 +575,6 @@ static void test_formats(AUDCLNT_SHAREMODE mode, BOOL extensible) for (k = 0; k < ARRAY_SIZE(sample_formats); k++) { char format_chr[3]; - 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.Format.wFormatTag = extensible ? WAVE_FORMAT_EXTENSIBLE : sample_formats[k][0]; fmt.Format.nSamplesPerSec = sampling_rates[i]; fmt.Format.wBitsPerSample = sample_formats[k][1]; @@ -592,8 +583,6 @@ static void test_formats(AUDCLNT_SHAREMODE mode, BOOL extensible) fmt.Format.nAvgBytesPerSec= fmt.Format.nBlockAlign * fmt.Format.nSamplesPerSec; if (extensible) { - WAVEFORMATEXTENSIBLE *pxwfx = (WAVEFORMATEXTENSIBLE*)pwfx; - fmt.Samples.wValidBitsPerSample = fmt.Format.wBitsPerSample; switch (fmt.Format.nChannels) { case 1: fmt.dwChannelMask = KSAUDIO_SPEAKER_MONO; break; @@ -602,11 +591,6 @@ static void test_formats(AUDCLNT_SHAREMODE mode, BOOL extensible) case 6: fmt.dwChannelMask = KSAUDIO_SPEAKER_5POINT1; break; case 8: fmt.dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; break; } - /* We don't want to fight with the driver over the speaker configuration, - * so just take whatever they give us, if it's valid. */ - if (fmt.Format.nChannels == pwfx->nChannels && pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE - && pxwfx->dwChannelMask != 0) - fmt.dwChannelMask = ((WAVEFORMATEXTENSIBLE*)pwfx)->dwChannelMask; fmt.SubFormat = sample_formats[k][0] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; } @@ -615,6 +599,25 @@ static void test_formats(AUDCLNT_SHAREMODE mode, BOOL extensible) format_chr[1] = extensible ? 'X' : '\0'; format_chr[2] = '\0'; + 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); + + if (extensible) { + WAVEFORMATEXTENSIBLE *pxwfx = (WAVEFORMATEXTENSIBLE*)pwfx; + + /* We don't want to fight with the driver over the speaker configuration, + * so just take whatever they give us, if it's valid. */ + if (fmt.Format.nChannels == pwfx->nChannels && pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE + && pxwfx->dwChannelMask != 0) + fmt.dwChannelMask = ((WAVEFORMATEXTENSIBLE*)pwfx)->dwChannelMask; + } + pwfx2 = (WAVEFORMATEX*)0xDEADF00D; hr = IAudioClient_IsFormatSupported(ac, mode, (WAVEFORMATEX*)&fmt, &pwfx2); hrs = hr; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10088