From b0d62bb73f71aa659c68c11b21b0bbfb87637d6c Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Fri, 21 May 2004 20:53:45 +0000 Subject: [PATCH] Fixed a bug I introduced in waveInGetDevCapsA(WAVE_MAPPER) test. Moved format structure array to header file and restored NB_WIN_FORMATS macro to calculate array size. Added more error results and used macro as suggested by Andreas Mohr. Cleaned up error result printing to be more consistent. --- dlls/winmm/tests/capture.c | 46 +++++++++--------- dlls/winmm/tests/wave.c | 108 ++++++++++++++++++------------------------ dlls/winmm/tests/winmm_test.h | 27 +++++++++-- 3 files changed, 95 insertions(+), 86 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 6c9c5fd7d02..0294bf5caee 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -35,12 +35,15 @@ static const char * wave_in_error(MMRESULT error) { static char msg[1024]; + static char long_msg[1100]; MMRESULT rc; rc = waveInGetErrorText(error, msg, sizeof(msg)); if (rc != MMSYSERR_NOERROR) - sprintf(msg, "waveInGetErrorText(%x) failed with error %x", error, rc); - return msg; + sprintf(long_msg, "waveInGetErrorText(%x) failed with error %x", error, rc); + else + sprintf(long_msg, "%s(%s)", mmsys_error(error), msg); + return long_msg; } static void wave_in_test_deviceIn(int device, int format, DWORD flags, LPWAVEINCAPS pcaps) @@ -71,9 +74,9 @@ static void wave_in_test_deviceIn(int device, int format, DWORD flags, LPWAVEINC ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || (rc==WAVERR_BADFORMAT && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & win_formats[format][0])) || (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), - "waveInOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%d(%s)\n",device, + "waveInOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%s\n",device, wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),rc,wave_in_error(rc)); + wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc)); if (rc!=MMSYSERR_NOERROR) { CloseHandle(hevent); return; @@ -98,18 +101,18 @@ static void wave_in_test_deviceIn(int device, int format, DWORD flags, LPWAVEINC frag.lpNext=0; rc=waveInPrepareHeader(win, &frag, sizeof(frag)); - ok(rc==MMSYSERR_NOERROR, "waveInPrepareHeader: device=%d rc=%s(%s)\n",device,mmsys_error(rc),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR, "waveInPrepareHeader: device=%d rc=%s\n",device,wave_in_error(rc)); ok(frag.dwFlags&WHDR_PREPARED,"waveInPrepareHeader: prepared flag not set\n"); if (winetest_interactive && rc==MMSYSERR_NOERROR) { - trace("Recording for 1 second at %ldx%2dx%d %04lx\n", + trace("Recording for 1 second at %5ldx%2dx%d %04lx\n", wfx.nSamplesPerSec, wfx.wBitsPerSample,wfx.nChannels,flags); rc=waveInAddBuffer(win, &frag, sizeof(frag)); - ok(rc==MMSYSERR_NOERROR,"waveInAddBuffer: device=%d rc=%s(%s)\n",device,mmsys_error(rc),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR,"waveInAddBuffer: device=%d rc=%s\n",device,wave_in_error(rc)); rc=waveInStart(win); - ok(rc==MMSYSERR_NOERROR,"waveInStart: device=%d rc=%s(%s)\n",device,mmsys_error(rc),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR,"waveInStart: device=%d rc=%s\n",device,wave_in_error(rc)); res = WaitForSingleObject(hevent,1200); ok(res==WAIT_OBJECT_0,"WaitForSingleObject failed for header\n"); @@ -120,13 +123,13 @@ static void wave_in_test_deviceIn(int device, int format, DWORD flags, LPWAVEINC if (res!=WAIT_OBJECT_0) { rc=waveInStop(win); ok(rc==MMSYSERR_NOERROR, - "waveInStop: device=%d rc=%s(%s)\n",device,mmsys_error(rc),wave_in_error(rc)); + "waveInStop: device=%d rc=%s\n",device,wave_in_error(rc)); } } rc=waveInUnprepareHeader(win, &frag, sizeof(frag)); ok(rc==MMSYSERR_NOERROR, - "waveInUnprepareHeader: device=%d rc=%s(%s)\n",device,mmsys_error(rc),wave_in_error(rc)); + "waveInUnprepareHeader: device=%d rc=%s\n",device,wave_in_error(rc)); waveInClose(win); res=WaitForSingleObject(hevent,1000); @@ -151,15 +154,15 @@ static void wave_in_tests() rc=waveInGetDevCapsA(ndev+1,&caps,sizeof(caps)); ok(rc==MMSYSERR_BADDEVICEID, - "waveInGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %s(%s)\n",mmsys_error(rc),wave_in_error(rc)); + "waveInGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %s\n",wave_in_error(rc)); rc=waveInGetDevCapsA(WAVE_MAPPER,&caps,sizeof(caps)); if (ndev>0) ok(rc==MMSYSERR_NOERROR, - "waveInGetDevCapsA: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); + "waveInGetDevCapsA: MMSYSERR_NOERROR expected, got %s\n",wave_in_error(rc)); else - ok(rc==MMSYSERR_BADDEVICEID || MMSYSERR_NODRIVER, - "waveInGetDevCapsA: MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER expected, got %s\n",mmsys_error(rc)); + ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, + "waveInGetDevCapsA: MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER expected, got %s\n",wave_in_error(rc)); format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=2; @@ -170,31 +173,30 @@ static void wave_in_tests() format.cbSize=0; rc=waveInOpen(&win,ndev+1,&format,0,0,CALLBACK_NULL); ok(rc==MMSYSERR_BADDEVICEID, - "waveInOpen: MMSYSERR_BADDEVICEID expected, got %s(%s)\n",mmsys_error(rc),wave_in_error(rc)); + "waveInOpen: MMSYSERR_BADDEVICEID expected, got %s\n",wave_in_error(rc)); for (d=0;ddwFormats & win_formats[format][0])) || (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), - "waveOutOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%d(%s)\n",device, + "waveOutOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%s\n",device, wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),rc,wave_out_error(rc)); + wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc)); if (rc!=MMSYSERR_NOERROR) { CloseHandle(hevent); return; @@ -248,30 +234,30 @@ static void wave_out_test_deviceOut(int device, double duration, int format, DWO frag.dwLoops=0; rc=waveOutGetVolume(wout,&volume); - ok(rc==MMSYSERR_NOERROR,"waveOutGetVolume: device=%d rc=%d\n",device,rc); + ok(rc==MMSYSERR_NOERROR,"waveOutGetVolume: device=%d rc=%s\n",device,wave_out_error(rc)); rc=waveOutPrepareHeader(wout, &frag, sizeof(frag)); ok(rc==MMSYSERR_NOERROR, - "waveOutPrepareHeader: device=%d rc=%d\n",device,rc); + "waveOutPrepareHeader: device=%d rc=%s\n",device,wave_out_error(rc)); if (winetest_interactive && rc==MMSYSERR_NOERROR) { - trace("Playing %g second 440Hz tone at %ldx%2dx%d %04lx\n",duration, + trace("Playing %g second 440Hz tone at %5ldx%2dx%d %04lx\n",duration, wfx.nSamplesPerSec, wfx.wBitsPerSample,wfx.nChannels,flags); rc=waveOutSetVolume(wout,0x20002000); - ok(rc==MMSYSERR_NOERROR,"waveOutSetVolume: device=%d rc=%d\n",device,rc); + ok(rc==MMSYSERR_NOERROR,"waveOutSetVolume: device=%d rc=%s\n",device,wave_out_error(rc)); WaitForSingleObject(hevent,INFINITE); rc=waveOutWrite(wout, &frag, sizeof(frag)); - ok(rc==MMSYSERR_NOERROR,"waveOutWrite: device=%d rc=%d\n",device,rc); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite: device=%d rc=%s\n",device,wave_out_error(rc)); WaitForSingleObject(hevent,INFINITE); rc=waveOutSetVolume(wout,volume); - ok(rc==MMSYSERR_NOERROR,"waveOutSetVolume: device=%d rc=%d\n",device,rc); + ok(rc==MMSYSERR_NOERROR,"waveOutSetVolume: device=%d rc=%s\n",device,wave_out_error(rc)); } rc=waveOutUnprepareHeader(wout, &frag, sizeof(frag)); ok(rc==MMSYSERR_NOERROR, - "waveOutUnprepareHeader: device=%d rc=%d\n",device,rc); + "waveOutUnprepareHeader: device=%d rc=%s\n",device,wave_out_error(rc)); free(frag.lpData); CloseHandle(hevent); @@ -318,18 +304,18 @@ static void wave_out_tests() for (d=0;d