From 0369da5c9ed71cbc99f0d7eea4a57cc9791c1ea0 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Fri, 13 Aug 2004 23:50:18 +0000 Subject: [PATCH] More WAVEOUTCAPSW tests. --- dlls/winmm/tests/wave.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 3660fbeeae8..9752bc3dc3f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -557,7 +557,8 @@ static void wave_out_test_device(int device) static void wave_out_tests() { - WAVEOUTCAPS caps; + WAVEOUTCAPSA capsA; + WAVEOUTCAPSW capsW; WAVEFORMATEX format; HWAVEOUT wout; MMRESULT rc; @@ -566,11 +567,15 @@ static void wave_out_tests() ndev=waveOutGetNumDevs(); trace("found %d WaveOut devices\n",ndev); - rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps)); + rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveOutGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc)); - rc=waveOutGetDevCapsA(WAVE_MAPPER,&caps,sizeof(caps)); + rc=waveOutGetDevCapsW(ndev+1,&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutGetDevCapsW: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc)); + + rc=waveOutGetDevCapsA(WAVE_MAPPER,&capsA,sizeof(capsA)); if (ndev>0) ok(rc==MMSYSERR_NOERROR, "waveOutGetDevCapsA: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); @@ -578,6 +583,14 @@ static void wave_out_tests() ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, "waveOutGetDevCapsA: MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER expected, got %s\n",mmsys_error(rc)); + rc=waveOutGetDevCapsW(WAVE_MAPPER,&capsW,sizeof(capsW)); + if (ndev>0) + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); + else + ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, + "waveOutGetDevCapsW: MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER expected, got %s\n",mmsys_error(rc)); + format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=2; format.wBitsPerSample=16;