[WINMM_WINETEST] Sync with Wine Staging 2.9. CORE-13362

[reactos.git] / rostests / winetests / winmm / mci.c

diff --git a/rostests/winetests/winmm/mci.c b/rostests/winetests/winmm/mci.c
index 7e9b33a..52790c8 100644 (file)
--- a/rostests/winetests/winmm/mci.c
+++ b/rostests/winetests/winmm/mci.c
@@ -198,7 +198,7 @@ static void test_mciParser(HWND hwnd)
 
     buf[0]='z';
     err = mciSendStringA("", buf, sizeof(buf), NULL);
-    todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err));
+    ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err));
     ok(!buf[0], "error buffer %s\n", buf);
 
     buf[0]='d';
@@ -365,6 +365,10 @@ static void test_mciParser(HWND hwnd)
     ok(!err,"capability device type: %s\n", dbg_mcierr(err));
     if(!err) ok(!strcmp(buf, "waveaudio"), "capability device type is %s\n", buf);
 
+    err = mciSendStringA("info a version", buf, sizeof(buf), hwnd);
+    ok(!err,"info version: %s\n", dbg_mcierr(err));
+    if(!err) ok(!strcmp(buf, "1.1"), "info version is %s\n", buf);
+
     err = mciSendCommandA(wDeviceID, MCI_CLOSE, 0, 0);
     ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err));
 
@@ -668,10 +672,6 @@ static void test_recordWAVE(HWND hwnd)
     ok(!err,"mci status samplespersec returned %s\n", dbg_mcierr(err));
     if(!err) ok(!strcmp(buf,"11025"), "mci status samplespersec expected 11025, got: %s\n", buf);
 
-    /* MCI seems to solely support PCM, no need for ACM conversion. */
-    err = mciSendStringA("set x format tag 2", NULL, 0, NULL);
-    ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned %s\n", dbg_mcierr(err));
-
     /* MCI appears to scan the available devices for support of this format,
      * returning MCIERR_OUTOFRANGE on machines with no sound.
      * However some w2k8/w7 machines return no error when there's no wave
@@ -1116,6 +1116,8 @@ static void test_asyncWAVE(HWND hwnd)
     trace("position after resume: %sms\n",buf);
     test_notification(hwnd,"play (aborted by pause/resume/pause)",0);
 
+    /* A small Sleep() here prevents the notification test failing with MCI_NOTIFY_SUCCESSFUL */
+    Sleep(10);
     err = mciSendStringA("close mysound wait", NULL, 0, NULL);
     ok(!err,"mci close wait returned %s\n", dbg_mcierr(err));
     test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED);