winmm: Always check for open and close enents in wave test.

Always check for open and close events. Send WM_APP message to thread to terminate it rather than TerminateThread. Fix CreateThread/waveOutOpen race by waiting for background thread to run before waveOutOpen is called. Add more non-hardware supported formats. There is a bug in wave mapper GetPosition when multiple headers are used and this helps trigger it.

winmm: Always check for open and close enents in wave test.
2b3247a4 · Robert Reif · Alexandre Julliard · 15c0db36 · 2b3247a4 · 2b3247a4
Commit 2b3247a4 authored May 30, 2006 by Robert Reif Committed by Alexandre Julliard May 31, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 13 deletions

wave.c dlls/winmm/tests/wave.c +22 -13

winmm_test.h dlls/winmm/tests/winmm_test.h +3 -0

No files found.
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -535,14 +535,20 @@ static DWORD WINAPI callback_thread(LPVOID lpParameter)
 {
    MSG msg;

+    SetEvent((HANDLE)lpParameter);
+
    while (GetMessage(&msg, 0, 0, 0)) {
        UINT message = msg.message;
        /* for some reason XP sends a WM_USER message before WOM_OPEN */
        ok (message == WOM_OPEN || message == WOM_DONE ||
-            message == WOM_CLOSE || message == WM_USER,
+            message == WOM_CLOSE || message == WM_USER || message == WM_APP,
            "GetMessage returned unexpected message: %u\n", message);
        if (message == WOM_OPEN || message == WOM_DONE || message == WOM_CLOSE)
            SetEvent((HANDLE)lpParameter);
+        else if (message == WM_APP) {
+            SetEvent((HANDLE)lpParameter);
+            return 0;
+        }
    }

    return 0;
@@ -556,7 +562,7 @@ static void wave_out_test_deviceOut(int device, double duration,
 {
    HWAVEOUT wout;
    HANDLE hevent;
-    WAVEHDR *frags;
+    WAVEHDR *frags = 0;
    MMRESULT rc;
    DWORD volume;
    WORD nChannels = pwfx->nChannels;
@@ -568,7 +574,8 @@ static void wave_out_test_deviceOut(int device, double duration,
    DWORD callback = 0;
    DWORD callback_instance = 0;
    HANDLE thread = 0;
-    BYTE * buffer;
+    DWORD thread_id;
+    char * buffer;
    DWORD length;
    DWORD frag_length;
    int i, j;
@@ -585,9 +592,10 @@ static void wave_out_test_deviceOut(int device, double duration,
        callback = (DWORD)callback_func;
        callback_instance = (DWORD)hevent;
    } else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) {
-        DWORD thread_id;
        thread = CreateThread(NULL, 0, callback_thread, hevent, 0, &thread_id);
        if (thread) {
+            /* make sure thread is running */
+            WaitForSingleObject(hevent,INFINITE);
            callback = thread_id;
            callback_instance = 0;
        } else {
@@ -636,12 +644,10 @@ static void wave_out_test_deviceOut(int device, double duration,
              pwfx->wBitsPerSample,pwfx->nChannels,
              flags & WAVE_FORMAT_DIRECT ? "flags=WAVE_FORMAT_DIRECT" :
              flags & WAVE_MAPPED ? "flags=WAVE_MAPPED" : "", mmsys_error(rc));
-    if (rc!=MMSYSERR_NOERROR) {
-        if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD)
-            TerminateThread(thread, 0);
-        CloseHandle(hevent);
-        return;
-    }
+    if (rc!=MMSYSERR_NOERROR)
+        goto EXIT;
+
+    WaitForSingleObject(hevent,INFINITE);

    ok(pwfx->nChannels==nChannels &&
       pwfx->wBitsPerSample==wBitsPerSample &&
@@ -699,7 +705,6 @@ static void wave_out_test_deviceOut(int device, double duration,
        rc=waveOutSetVolume(wout,0x20002000);
        ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED,
           "waveOutSetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc));
-        WaitForSingleObject(hevent,INFINITE);

        rc=waveOutSetVolume(wout,volume);
        ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED,
@@ -779,8 +784,12 @@ static void wave_out_test_deviceOut(int device, double duration,
    rc=waveOutClose(wout);
    ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device),
       wave_out_error(rc));
-    if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD)
-        TerminateThread(thread, 0);
+    WaitForSingleObject(hevent,INFINITE);
+EXIT:
+    if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) {
+        PostThreadMessage(thread_id, WM_APP, 0, 0);
+        WaitForSingleObject(hevent,INFINITE);
+    }
    CloseHandle(hevent);
    free(frags);
 }

--- a/dlls/winmm/tests/winmm_test.h
+++ b/dlls/winmm/tests/winmm_test.h
@@ -43,6 +43,9 @@ static const unsigned int win_formats[][4] = {
    {WAVE_FORMAT_1S08,  11025,  8, 2},
    {WAVE_FORMAT_1M16,  11025, 16, 1},
    {WAVE_FORMAT_1S16,  11025, 16, 2},
+    {0,                 12000,  8, 1},
+    {0,                 12000,  8, 2},
+    {0,                 12000, 16, 1},
    {0,                 12000, 16, 2},
    {0,                 16000,  8, 1},
    {0,                 16000,  8, 2},