Module: wine Branch: master Commit: 8d48b7455509e1ca6720e697531dfc7e2a8a9ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d48b7455509e1ca6720e69753...
Author: Octavian Voicu octavian.voicu@gmail.com Date: Thu Jul 29 20:16:17 2010 +0300
mmdevapi/tests: Prevent crash when GetMixFormat fails.
---
dlls/mmdevapi/tests/capture.c | 37 +++++++++++++++++++------------------ dlls/mmdevapi/tests/render.c | 37 +++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 1bedfc6..724753c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -193,26 +193,27 @@ static void test_audioclient(IAudioClient *ac) hr = IAudioClient_GetMixFormat(ac, &pwfx); ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr);
- trace("Tag: %04x\n", pwfx->wFormatTag); - trace("bits: %u\n", pwfx->wBitsPerSample); - trace("chan: %u\n", pwfx->nChannels); - trace("rate: %u\n", pwfx->nSamplesPerSec); - trace("align: %u\n", pwfx->nBlockAlign); - trace("extra: %u\n", pwfx->cbSize); - ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); - if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - { - WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; - trace("Res: %u\n", pwfxe->Samples.wReserved); - trace("Mask: %x\n", pwfxe->dwChannelMask); - trace("Alg: %s\n", - IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": - (IsEqualGUID(&pwfxe->SubFormat, - &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)?"FLOAT":"Other")); - } - if (hr == S_OK) { + trace("pwfx: %p\n", pwfx); + trace("Tag: %04x\n", pwfx->wFormatTag); + trace("bits: %u\n", pwfx->wBitsPerSample); + trace("chan: %u\n", pwfx->nChannels); + trace("rate: %u\n", pwfx->nSamplesPerSec); + trace("align: %u\n", pwfx->nBlockAlign); + trace("extra: %u\n", pwfx->cbSize); + ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); + if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; + trace("Res: %u\n", pwfxe->Samples.wReserved); + trace("Mask: %x\n", pwfxe->dwChannelMask); + trace("Alg: %s\n", + IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": + (IsEqualGUID(&pwfxe->SubFormat, + &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)?"FLOAT":"Other")); + } + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 56fea02..43cb341 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -126,26 +126,27 @@ static void test_audioclient(IAudioClient *ac) hr = IAudioClient_GetMixFormat(ac, &pwfx); ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr);
- trace("Tag: %04x\n", pwfx->wFormatTag); - trace("bits: %u\n", pwfx->wBitsPerSample); - trace("chan: %u\n", pwfx->nChannels); - trace("rate: %u\n", pwfx->nSamplesPerSec); - trace("align: %u\n", pwfx->nBlockAlign); - trace("extra: %u\n", pwfx->cbSize); - ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); - if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - { - WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; - trace("Res: %u\n", pwfxe->Samples.wReserved); - trace("Mask: %x\n", pwfxe->dwChannelMask); - trace("Alg: %s\n", - IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": - (IsEqualGUID(&pwfxe->SubFormat, - &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)?"FLOAT":"Other")); - } - if (hr == S_OK) { + trace("pwfx: %p\n", pwfx); + trace("Tag: %04x\n", pwfx->wFormatTag); + trace("bits: %u\n", pwfx->wBitsPerSample); + trace("chan: %u\n", pwfx->nChannels); + trace("rate: %u\n", pwfx->nSamplesPerSec); + trace("align: %u\n", pwfx->nBlockAlign); + trace("extra: %u\n", pwfx->cbSize); + ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); + if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; + trace("Res: %u\n", pwfxe->Samples.wReserved); + trace("Mask: %x\n", pwfxe->dwChannelMask); + trace("Alg: %s\n", + IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": + (IsEqualGUID(&pwfxe->SubFormat, + &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)?"FLOAT":"Other")); + } + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n");