Module: wine Branch: master Commit: 4361a1f0902a574daf1dcb0c8b1bacf5b875dd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4361a1f0902a574daf1dcb0c8b...
Author: André Hentschel nerv@dawncrow.de Date: Fri Feb 19 23:12:21 2016 +0100
winmm/tests: Use todo_wine_if() in tests.
Signed-off-by: André Hentschel nerv@dawncrow.de Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winmm/tests/mci.c | 12 ++++-------- dlls/winmm/tests/midi.c | 8 +++----- 2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 7470ed1..14500a5 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -721,10 +721,8 @@ static void test_recordWAVE(HWND hwnd) /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendStringA("record x to 2000 wait", NULL, 0, hwnd); ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); - if(!ndevs) todo_wine /* with sound disabled */ - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); - else - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); + todo_wine_if (!ndevs) /* with sound disabled */ + ok(ndevs > 0 ? !err : err == MCIERR_WAVE_INPUTSUNSUITABLE, "mci record to 2000 returned %s\n", dbg_mcierr(err)); if(err) { if (err==MCIERR_WAVE_INPUTSUNSUITABLE) skip("Please install audio driver. Everything is skipped.\n"); @@ -1165,10 +1163,8 @@ static void test_AutoOpenWAVE(HWND hwnd) test_notification(hwnd, "-prior to auto-open-", 0);
err = mciSendStringA("play tempfile.wav notify", buf, sizeof(buf), hwnd); - if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); - else - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + todo_wine_if (ok_saved == MCIERR_FILE_NOT_FOUND) /* same as above */ + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err));
if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendStringA("play tempfile.wav", buf, sizeof(buf), hwnd); diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 6438dba..b80d5d2 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -800,11 +800,9 @@ static void test_midi_outfns(HWND hwnd) ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*nt,w2k*/), "midiOutGetDevCaps MAPPER with no MIDI rc=%s\n", mmsys_error(rc));
rc = midiOutOpen(&hm, MIDIMAPPER, 0, 0, CALLBACK_NULL); - if (rc==MIDIERR_INVALIDSETUP) todo_wine /* Wine without snd-seq */ - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k*/), "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k sound disabled*/), - "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); + todo_wine_if (rc == MIDIERR_INVALIDSETUP) /* Wine without snd-seq */ + ok(rc == MMSYSERR_BADDEVICEID || broken(rc == MMSYSERR_NODRIVER /*w2k sound disabled*/), + "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); if (!rc) { rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc));