From 9c8dd0a2948ef4a81c4461ee70a056f704cf3af5 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Mon, 18 Oct 2004 23:14:54 +0000 Subject: [PATCH] Don't consider MMSYSERR_NOTSUPPORTED an error for wide functions. --- dlls/winmm/tests/capture.c | 12 ++++++------ dlls/winmm/tests/mixer.c | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 93e46dbb278..3f5e3c78f8d 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -586,15 +586,15 @@ static void wave_in_tests() "expected, got %s\n",dev_name(ndev+1),wave_in_error(rc)); rc=waveInGetDevCapsW(ndev+1,&capsW,sizeof(capsW)); - ok(rc==MMSYSERR_BADDEVICEID, - "waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID expected, got %s\n", - dev_name(ndev+1),wave_in_error(rc)); + ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTSUPPORTED, + "waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NOTSUPPORTED " + "expected, got %s\n",dev_name(ndev+1),wave_in_error(rc)); rc=waveInGetDevCapsW(WAVE_MAPPER,&capsW,sizeof(capsW)); if (ndev>0) - ok(rc==MMSYSERR_NOERROR, - "waveInGetDevCapsW(%s): MMSYSERR_NOERROR expected, got %s\n", - dev_name(ndev+1),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " + "expected, got %s\n",dev_name(ndev+1),wave_in_error(rc)); else ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, "waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER " diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index a9022547267..10f4a9380da 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -995,9 +995,11 @@ void mixer_testsW() trace("found %d Mixer devices\n",ndev); rc=mixerGetDevCapsW(ndev+1,&capsW,sizeof(capsW)); - ok(rc==MMSYSERR_BADDEVICEID, - "mixerGetDevCapsW: MMSYSERR_BADDEVICEID expected, got %s\n", - mmsys_error(rc)); + ok(rc==MMSYSERR_BADDEVICEID||rc==MMSYSERR_NOTSUPPORTED, + "mixerGetDevCapsW: MMSYSERR_BADDEVICEID or MMSYSERR_NOTSUPPORTED " + "expected, got %s\n", mmsys_error(rc)); + if (rc==MMSYSERR_NOTSUPPORTED) + return; rc=mixerOpen(&mix, ndev+1, 0, 0, 0); ok(rc==MMSYSERR_BADDEVICEID,