Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 18:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINMM_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71789
This commit is contained in:
Amine Khaldi 2016-07-03 11:58:56 +00:00
parent 26ffc33b4f
commit 0f78ecdf45
2 changed files with 48 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
rostests/winetests/winmm/mci.c
View file

@ -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,9 +1163,7 @@ 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));
else
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));
if(err) /* FIXME: don't open twice yet, it confuses Wine. */ if(err) /* FIXME: don't open twice yet, it confuses Wine. */
@ -1395,6 +1391,46 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd)
test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED); test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED);
} }
static DWORD CALLBACK thread_cb(void *p)
{
HANDLE evt = p;
MCIERROR mr;
mr = mciSendStringA("play x", NULL, 0, NULL);
ok(mr == MCIERR_INVALID_DEVICE_NAME, "play gave: 0x%x\n", mr);
mr = mciSendStringA("close x", NULL, 0, NULL);
ok(mr == MCIERR_INVALID_DEVICE_NAME, "close gave: 0x%x\n", mr);
SetEvent(evt);
return 0;
}
static void test_threads(void)
{
MCIERROR mr;
HANDLE evt;
mr = mciSendStringA("open tempfile.wav alias x", NULL, 0, NULL);
ok(mr == 0 || mr == ok_saved, "open gave: 0x%x\n", mr);
if(mr){
skip("Cannot open tempfile.wav for playing (%s), skipping\n", dbg_mcierr(mr));
return;
}
evt = CreateEventW( NULL, TRUE, FALSE, NULL );
CloseHandle(CreateThread(NULL, 0, &thread_cb, evt, 0, NULL));
WaitForSingleObject(evt, INFINITE);
CloseHandle(evt);
mr = mciSendStringA("close x", NULL, 0, NULL);
ok(mr == 0, "close gave: 0x%x\n", mr);
}
START_TEST(mci) START_TEST(mci)
{ {
char curdir[MAX_PATH], tmpdir[MAX_PATH]; char curdir[MAX_PATH], tmpdir[MAX_PATH];
@ -1411,6 +1447,7 @@ START_TEST(mci)
test_openCloseWAVE(hwnd); test_openCloseWAVE(hwnd);
test_recordWAVE(hwnd); test_recordWAVE(hwnd);
if(waveOutGetNumDevs()){ if(waveOutGetNumDevs()){
test_threads();
test_playWAVE(hwnd); test_playWAVE(hwnd);
test_asyncWAVE(hwnd); test_asyncWAVE(hwnd);
test_AutoOpenWAVE(hwnd); test_AutoOpenWAVE(hwnd);

6
rostests/winetests/winmm/midi.c
View file

@ -802,10 +802,8 @@ 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
ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k sound disabled*/),
"midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc));
if (!rc) { if (!rc) {
rc = midiOutClose(hm); rc = midiOutClose(hm);