Commit 4361a1f0 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

winmm/tests: Use todo_wine_if() in tests.

parent e8704b6b
...@@ -721,10 +721,8 @@ static void test_recordWAVE(HWND hwnd) ...@@ -721,10 +721,8 @@ static void test_recordWAVE(HWND hwnd)
/* A few ME machines pass all tests except set format tag pcm! */ /* A few ME machines pass all tests except set format tag pcm! */
err = mciSendStringA("record x to 2000 wait", NULL, 0, hwnd); 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)); 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 */ 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)); 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));
if(err) { if(err) {
if (err==MCIERR_WAVE_INPUTSUNSUITABLE) if (err==MCIERR_WAVE_INPUTSUNSUITABLE)
skip("Please install audio driver. Everything is skipped.\n"); skip("Please install audio driver. Everything is skipped.\n");
...@@ -1165,10 +1163,8 @@ static void test_AutoOpenWAVE(HWND hwnd) ...@@ -1165,10 +1163,8 @@ static void test_AutoOpenWAVE(HWND hwnd)
test_notification(hwnd, "-prior to auto-open-", 0); test_notification(hwnd, "-prior to auto-open-", 0);
err = mciSendStringA("play tempfile.wav notify", buf, sizeof(buf), hwnd); err = mciSendStringA("play tempfile.wav notify", buf, sizeof(buf), hwnd);
if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ 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)); 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));
if(err) /* FIXME: don't open twice yet, it confuses Wine. */ if(err) /* FIXME: don't open twice yet, it confuses Wine. */
err = mciSendStringA("play tempfile.wav", buf, sizeof(buf), hwnd); err = mciSendStringA("play tempfile.wav", buf, sizeof(buf), hwnd);
......
...@@ -800,11 +800,9 @@ static void test_midi_outfns(HWND hwnd) ...@@ -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)); 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); rc = midiOutOpen(&hm, MIDIMAPPER, 0, 0, CALLBACK_NULL);
if (rc==MIDIERR_INVALIDSETUP) todo_wine /* Wine without snd-seq */ todo_wine_if (rc == MIDIERR_INVALIDSETUP) /* Wine without snd-seq */
ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k*/), "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); ok(rc == MMSYSERR_BADDEVICEID || broken(rc == MMSYSERR_NODRIVER /*w2k sound disabled*/),
else "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc));
ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k sound disabled*/),
"midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc));
if (!rc) { if (!rc) {
rc = midiOutClose(hm); rc = midiOutClose(hm);
ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment