[PATCH 09/10] winealsa.drv: Rewrite waveout, try 2

Maarten Lankhorst m.b.lankhorst at gmail.com
Fri Apr 23 10:40:33 CDT 2010


---
 dlls/winealsa.drv/waveout.c | 1504 ++++++++++++++-----------------------------
 1 files changed, 493 insertions(+), 1011 deletions(-)

diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 4001f26..3445b71 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -1,11 +1,11 @@
 /*
- * Sample Wine Driver for Advanced Linux Sound System (ALSA)
- *      Based on version <final> of the ALSA API
+ * Wine Driver for ALSA api, based on winecoreaudio.drv
  *
  * Copyright    2002 Eric Pouech
  *              2002 Marco Pietrobono
  *              2003 Christian Costa : WaveIn support
  *              2006-2007 Maarten Lankhorst
+ *              2010 Maarten Lankhorst for Codeweavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,10 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/*======================================================================*
- *                  Low level WAVE OUT implementation			*
- *======================================================================*/
-
 #include "config.h"
 #include "wine/port.h"
 
@@ -57,1151 +53,637 @@
 #include "wine/library.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/list.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wave);
 
 #ifdef HAVE_ALSA
 
 WINE_WAVEDEV	*WOutDev;
-DWORD            ALSA_WodNumMallocedDevs;
-DWORD            ALSA_WodNumDevs;
+DWORD           ALSA_WodNumMallocedDevs;
+DWORD           ALSA_WodNumDevs;
 
-/**************************************************************************
- * 			wodNotifyClient			[internal]
- */
-static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
-{
-    TRACE("wMsg = 0x%04x dwParm1 = %lx dwParam2 = %lx\n", wMsg, dwParam1, dwParam2);
+static DWORD wave_timerid;
 
-    switch (wMsg) {
-    case WOM_OPEN:
-    case WOM_CLOSE:
-    case WOM_DONE:
-	if (wwo->wFlags != DCB_NULL &&
-	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave,
-			    wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) {
-	    WARN("can't notify client !\n");
-	    return MMSYSERR_ERROR;
-	}
-	break;
-    default:
-	FIXME("Unknown callback message %u\n", wMsg);
-        return MMSYSERR_INVALPARAM;
-    }
-    return MMSYSERR_NOERROR;
-}
+typedef struct waveimpl {
+    DWORD devid;
+    WCHAR *friendlyname;
+    DWORD vol;
+    CRITICAL_SECTION crst;
+    struct list head;
+} waveimpl;
 
-/**************************************************************************
- * 				wodUpdatePlayedTotal	[internal]
- *
- */
-static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps)
-{
-    snd_pcm_sframes_t delay;
-    snd_pcm_sframes_t avail;
-    snd_pcm_uframes_t buf_size = 0;
-    snd_pcm_state_t state;
-
-    state = snd_pcm_state(wwo->pcm);
-    avail = snd_pcm_avail_update(wwo->pcm);
-    snd_pcm_hw_params_get_buffer_size(wwo->hw_params, &buf_size);
-    delay = buf_size - avail;
-
-    if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED)
-    {
-        WARN("Unexpected state (%d) while updating Total Played, resetting\n", state);
-        snd_pcm_recover(wwo->pcm, -EPIPE, 0);
-        delay=0;
-    }
+typedef struct wavestreamimpl {
+    WAVEFORMATEX *wfx;
 
-    /* A delay < 0 indicates an underrun; for our purposes that's 0.  */
-    if (delay < 0)
-    {
-        WARN("Unexpected delay (%ld) while updating Total Played, resetting\n", delay);
-        delay=0;
-    }
+    WAVEHDR *queue, *loop;
+    DWORD ofs, numloops, stopped, bytesplayed;
 
-    InterlockedExchange((LONG*)&wwo->dwPlayedTotal, wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->pcm, delay));
-    return TRUE;
-}
+    /* callback stuff */
+    DWORD_PTR cbflags, cbhandle, cbinstance;
+    HDRVR wavehandle;
 
-/**************************************************************************
- * 				wodPlayer_BeginWaveHdr          [internal]
- *
- * Makes the specified lpWaveHdr the currently playing wave header.
- * If the specified wave header is a begin loop and we're not already in
- * a loop, setup the loop.
- */
-static void wodPlayer_BeginWaveHdr(WINE_WAVEDEV* wwo, LPWAVEHDR lpWaveHdr)
-{
-    wwo->lpPlayPtr = lpWaveHdr;
-
-    if (!lpWaveHdr) return;
-
-    if (lpWaveHdr->dwFlags & WHDR_BEGINLOOP) {
-	if (wwo->lpLoopPtr) {
-	    WARN("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr);
-	} else {
-            TRACE("Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr);
-	    wwo->lpLoopPtr = lpWaveHdr;
-	    /* Windows does not touch WAVEHDR.dwLoops,
-	     * so we need to make an internal copy */
-	    wwo->dwLoops = lpWaveHdr->dwLoops;
-	}
-    }
-    wwo->dwPartialOffset = 0;
-}
+    struct list entry;
+    DWORD cachevol;
+    snd_pcm_hw_params_t *hw_params;
+    snd_pcm_t *pcm;
+} wavestreamimpl;
 
-/**************************************************************************
- * 				wodPlayer_PlayPtrNext	        [internal]
- *
- * Advance the play pointer to the next waveheader, looping if required.
- */
-static LPWAVEHDR wodPlayer_PlayPtrNext(WINE_WAVEDEV* wwo)
-{
-    LPWAVEHDR lpWaveHdr = wwo->lpPlayPtr;
-
-    wwo->dwPartialOffset = 0;
-    if ((lpWaveHdr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr) {
-	/* We're at the end of a loop, loop if required */
-	if (--wwo->dwLoops > 0) {
-	    wwo->lpPlayPtr = wwo->lpLoopPtr;
-	} else {
-	    /* Handle overlapping loops correctly */
-	    if (wwo->lpLoopPtr != lpWaveHdr && (lpWaveHdr->dwFlags & WHDR_BEGINLOOP)) {
-		FIXME("Correctly handled case ? (ending loop buffer also starts a new loop)\n");
-		/* shall we consider the END flag for the closing loop or for
-		 * the opening one or for both ???
-		 * code assumes for closing loop only
-		 */
-	    } else {
-                lpWaveHdr = lpWaveHdr->lpNext;
-            }
-            wwo->lpLoopPtr = NULL;
-            wodPlayer_BeginWaveHdr(wwo, lpWaveHdr);
-	}
-    } else {
-	/* We're not in a loop.  Advance to the next wave header */
-	wodPlayer_BeginWaveHdr(wwo, lpWaveHdr = lpWaveHdr->lpNext);
-    }
+static waveimpl *waveout_head;
+static DWORD waveout_count;
 
-    return lpWaveHdr;
-}
+static void wodNotifyClient(wavestreamimpl *wwo, DWORD msg, DWORD_PTR par1, DWORD_PTR par2) {
+    if (wwo->cbflags == DCB_NULL)
+        return;
 
-/**************************************************************************
- * 			     wodPlayer_DSPWait			[internal]
- * Returns the number of milliseconds to wait for the DSP buffer to play a
- * period
- */
-static DWORD wodPlayer_DSPWait(const WINE_WAVEDEV *wwo)
-{
-    /* time for one period to be played */
-    unsigned int val=0;
-    int dir=0;
-    int err=0;
-    err = snd_pcm_hw_params_get_period_time(wwo->hw_params, &val, &dir);
-    return val / 1000;
+    DriverCallback(wwo->cbhandle, wwo->cbflags, wwo->wavehandle,
+                   msg, wwo->cbinstance, par1, par2);
 }
 
-/**************************************************************************
- * 			     wodPlayer_NotifyWait               [internal]
- * Returns the number of milliseconds to wait before attempting to notify
- * completion of the specified wavehdr.
- * This is based on the number of bytes remaining to be written in the
- * wave.
- */
-static DWORD wodPlayer_NotifyWait(const WINE_WAVEDEV* wwo, LPWAVEHDR lpWaveHdr)
-{
-    DWORD dwMillis;
-
-    if (lpWaveHdr->reserved < wwo->dwPlayedTotal) {
-        dwMillis = 1;
-    } else {
-        dwMillis = (lpWaveHdr->reserved - wwo->dwPlayedTotal) * 1000 / wwo->format.Format.nAvgBytesPerSec;
-        if (!dwMillis) dwMillis = 1;
-    }
-
-    return dwMillis;
-}
+static void wodNotifyDoneList(wavestreamimpl *wwo, LPWAVEHDR lpWaveHdr) {
+    while (lpWaveHdr) {
+        LPWAVEHDR lpNext = lpWaveHdr->lpNext;
 
+        lpWaveHdr->lpNext = NULL;
+        lpWaveHdr->dwFlags = (lpWaveHdr->dwFlags & ~WHDR_INQUEUE) | WHDR_DONE;
+        wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0);
 
-/**************************************************************************
- * 			     wodPlayer_WriteMaxFrags            [internal]
- * Writes the maximum number of frames possible to the DSP and returns
- * the number of frames written.
- */
-static int wodPlayer_WriteMaxFrags(WINE_WAVEDEV* wwo, DWORD* frames)
-{
-    /* Only attempt to write to free frames */
-    LPWAVEHDR lpWaveHdr = wwo->lpPlayPtr;
-    DWORD dwLength = snd_pcm_bytes_to_frames(wwo->pcm, lpWaveHdr->dwBufferLength - wwo->dwPartialOffset);
-    int toWrite = min(dwLength, *frames);
-    int written;
-
-    TRACE("Writing wavehdr %p.%u[%u]\n", lpWaveHdr, wwo->dwPartialOffset, lpWaveHdr->dwBufferLength);
-
-    if (toWrite > 0) {
-	written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite);
-	if ( written < 0) {
-	    /* XRUN occurred. let's try to recover */
-	    ALSA_XRUNRecovery(wwo, written);
-	    written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite);
-	}
-	if (written <= 0) {
-	    /* still in error */
-	    ERR("Error in writing wavehdr. Reason: %s\n", snd_strerror(written));
-	    return written;
-	}
-    } else
-	written = 0;
-
-    wwo->dwPartialOffset += snd_pcm_frames_to_bytes(wwo->pcm, written);
-    if (wwo->dwPartialOffset + wwo->format.Format.nBlockAlign - 1 >= lpWaveHdr->dwBufferLength) {
-	/* this will be used to check if the given wave header has been fully played or not... */
-	wwo->dwPartialOffset = lpWaveHdr->dwBufferLength;
-	/* If we wrote all current wavehdr, skip to the next one */
-	wodPlayer_PlayPtrNext(wwo);
+        lpWaveHdr = lpNext;
     }
-    *frames -= written;
-    wwo->dwWrittenTotal += snd_pcm_frames_to_bytes(wwo->pcm, written);
-    TRACE("dwWrittenTotal=%u\n", wwo->dwWrittenTotal);
-
-    return written;
 }
 
+static void wodNext(wavestreamimpl *wwo, WAVEHDR **beginnotify, WAVEHDR **endnotify) {
+    LPWAVEHDR hdr = wwo->queue;
 
-/**************************************************************************
- * 				wodPlayer_NotifyCompletions	[internal]
- *
- * Notifies and remove from queue all wavehdrs which have been played to
- * the speaker (ie. they have cleared the ALSA buffer).  If force is true,
- * we notify all wavehdrs and remove them all from the queue even if they
- * are unplayed or part of a loop.
- */
-static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force)
-{
-    LPWAVEHDR		lpWaveHdr;
-
-    /* Start from lpQueuePtr and keep notifying until:
-     * - we hit an unwritten wavehdr
-     * - we hit the beginning of a running loop
-     * - we hit a wavehdr which hasn't finished playing
-     */
-    for (;;)
-    {
-        lpWaveHdr = wwo->lpQueuePtr;
-        if (!lpWaveHdr) {TRACE("Empty queue\n"); break;}
-        if (!force)
-        {
-            snd_pcm_uframes_t frames;
-            snd_pcm_hw_params_get_period_size(wwo->hw_params, &frames, NULL);
-
-            if (lpWaveHdr == wwo->lpPlayPtr) {TRACE("play %p\n", lpWaveHdr); break;}
-            if (lpWaveHdr == wwo->lpLoopPtr) {TRACE("loop %p\n", lpWaveHdr); break;}
-            if (lpWaveHdr->reserved > wwo->dwPlayedTotal + frames) {TRACE("still playing %p (%lu/%u)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;}
+    hdr->dwBytesRecorded = wwo->ofs;
+    wwo->ofs = 0;
+    if (wwo->loop && wwo->queue->dwFlags & WHDR_ENDLOOP) {
+        if (wwo->numloops-- > 1) {
+            wwo->queue = wwo->loop;
+            return;
         }
-        wwo->dwPlayedTotal += lpWaveHdr->reserved - wwo->dwPlayedTotal;
-	wwo->lpQueuePtr = lpWaveHdr->lpNext;
 
-	lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
-	lpWaveHdr->dwFlags |= WHDR_DONE;
+        if (!*beginnotify)
+            *beginnotify = wwo->loop;
+        wwo->loop = NULL;
+    }
 
-	wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0);
+    if (!wwo->loop) {
+        if (!*beginnotify)
+            *beginnotify = hdr;
+        *endnotify = hdr;
     }
-    return  (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != wwo->lpLoopPtr) ?
-        wodPlayer_NotifyWait(wwo, lpWaveHdr) : INFINITE;
-}
+    wwo->queue = hdr->lpNext;
 
+    if (wwo->queue && wwo->queue->dwFlags & WHDR_BEGINLOOP) {
+        if (!wwo->loop) {
+            TRACE("Starting loop (%d) with %p\n", wwo->queue->dwLoops, wwo->queue);
 
-/**************************************************************************
- * 				wodPlayer_Reset			[internal]
- *
- * wodPlayer helper. Resets current output stream.
- */
-static	void	wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset)
-{
-    int                         err;
-    TRACE("(%p)\n", wwo);
-
-    wodUpdatePlayedTotal(wwo, NULL);
-    /* updates current notify list */
-    wodPlayer_NotifyCompletions(wwo, FALSE);
-
-    if ( (err = snd_pcm_drop(wwo->pcm)) < 0) {
-	FIXME("flush: %s\n", snd_strerror(err));
-	wwo->hThread = 0;
-	wwo->state = WINE_WS_STOPPED;
-	ExitThread(-1);
+            wwo->loop = wwo->queue;
+            wwo->numloops = wwo->queue->dwLoops;
+        } else
+            WARN("Already in a loop. Discarding loop on this header (%p)\n", wwo->queue);
     }
-    if ( (err = snd_pcm_prepare(wwo->pcm)) < 0 )
-        ERR("pcm prepare failed: %s\n", snd_strerror(err));
-
-    if (reset) {
-        enum win_wm_message	msg;
-        DWORD_PTR	        param;
-        HANDLE		        ev;
-
-        /* remove any buffer */
-        wodPlayer_NotifyCompletions(wwo, TRUE);
-
-        wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL;
-        wwo->state = WINE_WS_STOPPED;
-        wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0;
-        /* Clear partial wavehdr */
-        wwo->dwPartialOffset = 0;
-
-        /* remove any existing message in the ring */
-        EnterCriticalSection(&wwo->msgRing.msg_crst);
-        /* return all pending headers in queue */
-        while (ALSA_RetrieveRingMessage(&wwo->msgRing, &msg, &param, &ev))
-        {
-            if (msg != WINE_WM_HEADER)
-            {
-                FIXME("shouldn't have headers left\n");
-                SetEvent(ev);
+}
+
+static void CALLBACK wodTick(UINT id, UINT msg, DWORD_PTR dwUser,
+                             DWORD_PTR dw1, DWORD_PTR dw2) {
+    DWORD x;
+    wavestreamimpl *cur;
+
+    for (x = 0; x < waveout_count; ++x) {
+        EnterCriticalSection(&waveout_head[x].crst);
+        LIST_FOR_EACH_ENTRY(cur, &waveout_head[x].head, wavestreamimpl, entry) {
+            DWORD pad, avail;
+            WAVEHDR *begin = NULL, *end = NULL;
+            DWORD block = cur->wfx->nBlockAlign;
+            snd_pcm_uframes_t buflen, psize;
+
+            if (cur->stopped)
                 continue;
+            snd_pcm_hw_params_get_buffer_size(cur->hw_params, &buflen);
+            snd_pcm_hw_params_get_period_size(cur->hw_params, &psize, NULL);
+            if (buflen > 4 * psize)
+                buflen = 4 * psize;
+            pad = snd_pcm_avail_update(cur->pcm);
+            if (pad > buflen)
+                pad = buflen;
+            pad *= block;
+
+            while (pad && cur->queue) {
+                int ret;
+                avail = cur->queue->dwBufferLength - cur->ofs;
+                if (avail > pad)
+                    avail = pad;
+
+                ret = snd_pcm_writei(cur->pcm, cur->queue->lpData + cur->ofs, avail/block);
+                if (ret < 0) {
+                    ret = snd_pcm_recover(cur->pcm, ret, 0);
+                    if (ret >= 0)
+                        ret = snd_pcm_writei(cur->pcm, cur->queue->lpData + cur->ofs, avail/block);
+                    else {
+                        WARN("Could not write: %s\n", snd_strerror(ret));
+                        break;
+                    }
+                }
+                avail = ret * block;
+                cur->ofs += avail;
+                pad -= avail;
+                if (cur->queue->dwBufferLength - cur->ofs < block)
+                    wodNext(cur, &begin, &end);
+                cur->bytesplayed += avail;
             }
-            ((LPWAVEHDR)param)->dwFlags &= ~WHDR_INQUEUE;
-            ((LPWAVEHDR)param)->dwFlags |= WHDR_DONE;
-
-                wodNotifyClient(wwo, WOM_DONE, param, 0);
-        }
-        ALSA_ResetRingMessage(&wwo->msgRing);
-        LeaveCriticalSection(&wwo->msgRing.msg_crst);
-    } else {
-        if (wwo->lpLoopPtr) {
-            /* complicated case, not handled yet (could imply modifying the loop counter */
-            FIXME("Pausing while in loop isn't correctly handled yet, expect strange results\n");
-            wwo->lpPlayPtr = wwo->lpLoopPtr;
-            wwo->dwPartialOffset = 0;
-            wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */
-        } else {
-            LPWAVEHDR   ptr;
-            DWORD       sz = wwo->dwPartialOffset;
-
-            /* reset all the data as if we had written only up to lpPlayedTotal bytes */
-            /* compute the max size playable from lpQueuePtr */
-            for (ptr = wwo->lpQueuePtr; ptr != wwo->lpPlayPtr; ptr = ptr->lpNext) {
-                sz += ptr->dwBufferLength;
+            if (begin) {
+                end->lpNext = NULL;
+                wodNotifyDoneList(cur, begin);
             }
-            /* because the reset lpPlayPtr will be lpQueuePtr */
-            if (wwo->dwWrittenTotal > wwo->dwPlayedTotal + sz) ERR("grin\n");
-            wwo->dwPartialOffset = sz - (wwo->dwWrittenTotal - wwo->dwPlayedTotal);
-            wwo->dwWrittenTotal = wwo->dwPlayedTotal;
-            wwo->lpPlayPtr = wwo->lpQueuePtr;
         }
-        wwo->state = WINE_WS_PAUSED;
+        LeaveCriticalSection(&waveout_head[x].crst);
     }
 }
 
-/**************************************************************************
- * 		      wodPlayer_ProcessMessages			[internal]
- */
-static void wodPlayer_ProcessMessages(WINE_WAVEDEV* wwo)
-{
-    LPWAVEHDR           lpWaveHdr;
-    enum win_wm_message	msg;
-    DWORD_PTR		param;
-    HANDLE		ev;
-    int                 err;
-
-    while (ALSA_RetrieveRingMessage(&wwo->msgRing, &msg, &param, &ev)) {
-     TRACE("Received %s %lx\n", ALSA_getCmdString(msg), param);
-
-	switch (msg) {
-	case WINE_WM_PAUSING:
-	    if ( snd_pcm_state(wwo->pcm) == SND_PCM_STATE_RUNNING )
-	     {
-                if ( snd_pcm_hw_params_can_pause(wwo->hw_params) )
-		{
-		    err = snd_pcm_pause(wwo->pcm, 1);
-		    if ( err < 0 )
-			ERR("pcm_pause failed: %s\n", snd_strerror(err));
-		    wwo->state = WINE_WS_PAUSED;
-		}
-		else
-		{
-		    wodPlayer_Reset(wwo,FALSE);
-		}
-	     }
-	    SetEvent(ev);
-	    break;
-	case WINE_WM_RESTARTING:
-            if (wwo->state == WINE_WS_PAUSED)
-            {
-		if ( snd_pcm_state(wwo->pcm) == SND_PCM_STATE_PAUSED )
-		 {
-		    err = snd_pcm_pause(wwo->pcm, 0);
-		    if ( err < 0 )
-		        ERR("pcm_pause failed: %s\n", snd_strerror(err));
-		 }
-                wwo->state = WINE_WS_PLAYING;
-            }
-	    SetEvent(ev);
-	    break;
-	case WINE_WM_HEADER:
-	    lpWaveHdr = (LPWAVEHDR)param;
-
-	    /* insert buffer at the end of queue */
-	    {
-		LPWAVEHDR*	wh;
-		for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext));
-		*wh = lpWaveHdr;
-	    }
-            if (!wwo->lpPlayPtr)
-                wodPlayer_BeginWaveHdr(wwo,lpWaveHdr);
-	    if (wwo->state == WINE_WS_STOPPED)
-		wwo->state = WINE_WS_PLAYING;
-	    break;
-	case WINE_WM_RESETTING:
-	    wodPlayer_Reset(wwo,TRUE);
-	    SetEvent(ev);
-	    break;
-        case WINE_WM_BREAKLOOP:
-            if (wwo->state == WINE_WS_PLAYING && wwo->lpLoopPtr != NULL) {
-                /* ensure exit at end of current loop */
-                wwo->dwLoops = 1;
-            }
-	    SetEvent(ev);
-            break;
-	case WINE_WM_CLOSING:
-	    /* sanity check: this should not happen since the device must have been reset before */
-	    if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n");
-	    wwo->hThread = 0;
-	    wwo->state = WINE_WS_CLOSED;
-	    SetEvent(ev);
-	    ExitThread(0);
-	    /* shouldn't go here */
-	default:
-	    FIXME("unknown message %d\n", msg);
-	    break;
-	}
-    }
+static DWORD wodGetDevCaps(waveimpl *dev, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) {
+    WAVEOUTCAPSW caps;
+    TRACE("(%p, %p, %u)\n", dev, lpCaps, dwSize);
+
+    if (!lpCaps)
+        return MMSYSERR_NOTENABLED;
+
+    caps.wMid = MM_CREATIVE;
+    caps.wPid = MM_CREATIVE_SBP16_WAVEOUT;
+    caps.vDriverVersion = 0x0100;
+    lstrcpynW(caps.szPname, dev->friendlyname, sizeof(caps.szPname)/sizeof(*caps.szPname));
+    caps.dwFormats = 0xfffff;
+    caps.wChannels = 2;
+    caps.wReserved1 = 1;
+    caps.dwSupport = WAVECAPS_SAMPLEACCURATE|WAVECAPS_VOLUME
+                     |WAVECAPS_LRVOLUME|WAVECAPS_DIRECTSOUND;
+    memcpy(lpCaps, &caps, min(dwSize, sizeof(caps)));
+    return MMSYSERR_NOERROR;
 }
 
-/**************************************************************************
- * 			     wodPlayer_FeedDSP			[internal]
- * Feed as much sound data as we can into the DSP and return the number of
- * milliseconds before it will be necessary to feed the DSP again.
- */
-static DWORD wodPlayer_FeedDSP(WINE_WAVEDEV* wwo)
-{
-    DWORD               availInQ;
+static snd_pcm_format_t get_format(WAVEFORMATEX *wfx) {
+    WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE *)wfx;
 
-    wodUpdatePlayedTotal(wwo, NULL);
-    availInQ = snd_pcm_avail_update(wwo->pcm);
+    if (!wfx->nChannels || wfx->nSamplesPerSec < 8000 || wfx->nSamplesPerSec > 192000)
+        return SND_PCM_FORMAT_UNKNOWN;
 
-    /* no more room... no need to try to feed */
-    if (availInQ > 0) {
-        /* Feed from partial wavehdr */
-        if (wwo->lpPlayPtr && wwo->dwPartialOffset != 0) {
-            wodPlayer_WriteMaxFrags(wwo, &availInQ);
+    if (wfx->wFormatTag == WAVE_FORMAT_PCM) {
+        switch (wfx->wBitsPerSample) {
+            case 8: return SND_PCM_FORMAT_U8;
+            case 16: return SND_PCM_FORMAT_S16_LE;
+            default:
+                WARN("Unknown bpp for WAVE_FORMAT_PCM: %i\n", wfx->wBitsPerSample);
+                return SND_PCM_FORMAT_UNKNOWN;
         }
-
-        /* Feed wavehdrs until we run out of wavehdrs or DSP space */
-        if (wwo->dwPartialOffset == 0 && wwo->lpPlayPtr) {
-            do {
-                TRACE("Setting time to elapse for %p to %u\n",
-                      wwo->lpPlayPtr, wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength);
-                /* note the value that dwPlayedTotal will return when this wave finishes playing */
-                wwo->lpPlayPtr->reserved = wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength;
-            } while (wodPlayer_WriteMaxFrags(wwo, &availInQ) && wwo->lpPlayPtr && availInQ > 0);
+    } else if (wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
+        if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) {
+            if ((wfe->Samples.wValidBitsPerSample == 32 ||
+                !wfe->Samples.wValidBitsPerSample) &&
+                wfx->wBitsPerSample == 32)
+                return SND_PCM_FORMAT_FLOAT_LE;
+        } else if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) {
+            switch (wfx->wBitsPerSample) {
+                case 8: return SND_PCM_FORMAT_U8;
+                case 16: return SND_PCM_FORMAT_S16_LE;
+                case 24: return SND_PCM_FORMAT_S24_3LE;
+                case 32:
+                    if (wfe->Samples.wValidBitsPerSample == 32 ||
+                        !wfe->Samples.wValidBitsPerSample)
+                        return SND_PCM_FORMAT_S32_LE;
+                    if (wfe->Samples.wValidBitsPerSample == 24)
+                        return SND_PCM_FORMAT_S24_LE;
+                default:
+                    WARN("Unknown bpp for WAVE_FORMAT_PCM: %i\n", wfx->wBitsPerSample);
+                    return SND_PCM_FORMAT_UNKNOWN;
+            }
         }
     }
-
-    return wodPlayer_DSPWait(wwo);
+    WARN("Unknown tag %x\n", wfx->wFormatTag);
+    return SND_PCM_FORMAT_UNKNOWN;
 }
 
-/**************************************************************************
- * 				wodPlayer			[internal]
- */
-static	DWORD	CALLBACK	wodPlayer(LPVOID pmt)
-{
-    WORD	  uDevID = (DWORD_PTR)pmt;
-    WINE_WAVEDEV* wwo = &WOutDev[uDevID];
-    DWORD         dwNextFeedTime = INFINITE;   /* Time before DSP needs feeding */
-    DWORD         dwNextNotifyTime = INFINITE; /* Time before next wave completion */
-    DWORD         dwSleepTime;
-
-    wwo->state = WINE_WS_STOPPED;
-    SetEvent(wwo->hStartUpEvent);
-
-    for (;;) {
-        /** Wait for the shortest time before an action is required.  If there
-         *  are no pending actions, wait forever for a command.
-         */
-        dwSleepTime = min(dwNextFeedTime, dwNextNotifyTime);
-        TRACE("waiting %ums (%u,%u)\n", dwSleepTime, dwNextFeedTime, dwNextNotifyTime);
-        ALSA_WaitRingMessage(&wwo->msgRing, dwSleepTime);
-	wodPlayer_ProcessMessages(wwo);
-	if (wwo->state == WINE_WS_PLAYING) {
-	    dwNextFeedTime = wodPlayer_FeedDSP(wwo);
-	    dwNextNotifyTime = wodPlayer_NotifyCompletions(wwo, FALSE);
-	    if (dwNextFeedTime == INFINITE) {
-		/* FeedDSP ran out of data, but before giving up, */
-		/* check that a notification didn't give us more */
-		wodPlayer_ProcessMessages(wwo);
-		if (wwo->lpPlayPtr) {
-		    TRACE("recovering\n");
-		    dwNextFeedTime = wodPlayer_FeedDSP(wwo);
-		}
-	    }
-	} else {
-	    dwNextFeedTime = dwNextNotifyTime = INFINITE;
-	}
+static DWORD wodOpen(waveimpl *dev, wavestreamimpl **pInstance, LPWAVEOPENDESC lpDesc, DWORD dwFlags) {
+    wavestreamimpl *wwo;
+    WAVEFORMATEX *wfx;
+    DWORD extra, ret;
+    snd_pcm_format_t format;
+    snd_pcm_hw_params_t *hw_params;
+    snd_pcm_sw_params_t *sw_params;
+    snd_pcm_uframes_t size;
+    unsigned rate;
+    int err;
+
+    TRACE("(%p, %p, %p, %08x)\n", dev, pInstance, lpDesc, dwFlags);
+    if (!lpDesc) {
+        WARN("Invalid Parameter!\n");
+        return MMSYSERR_INVALPARAM;
     }
-    return 0;
-}
+    wfx = lpDesc->lpFormat;
 
-/**************************************************************************
- * 			wodGetDevCaps				[internal]
- */
-static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize)
-{
-    TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize);
+    TRACE("Format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d\n",
+          wfx->wFormatTag, wfx->nChannels, wfx->nSamplesPerSec, wfx->wBitsPerSample);
 
-    if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
+    format = get_format(wfx);
+    if (format == SND_PCM_FORMAT_UNKNOWN)
+        return WAVERR_BADFORMAT;
 
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
+    if (wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+        extra = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+    else
+        extra = 0;
 
-    memcpy(lpCaps, &WOutDev[wDevID].outcaps, min(dwSize, sizeof(*lpCaps)));
-    return MMSYSERR_NOERROR;
-}
+    wwo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wwo));
+    if (!wwo)
+        return MMSYSERR_NOMEM;
 
-/**************************************************************************
- * 				wodOpen				[internal]
- */
-static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
-{
-    WINE_WAVEDEV*	        wwo;
-    snd_pcm_t *                 pcm = NULL;
-    snd_hctl_t *                hctl = NULL;
-    snd_pcm_hw_params_t *       hw_params = NULL;
-    snd_pcm_sw_params_t *       sw_params;
-    snd_pcm_access_t            access;
-    snd_pcm_format_t            format = -1;
-    unsigned int                rate;
-    unsigned int                buffer_time = 120000;
-    unsigned int                period_time = 22000;
-    snd_pcm_uframes_t           buffer_size;
-    snd_pcm_uframes_t           period_size;
-    int                         flags;
-    int                         err=0;
-    int                         dir=0;
-    DWORD                       retcode = 0;
-
-    TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags);
-    if (lpDesc == NULL) {
-	WARN("Invalid Parameter !\n");
-	return MMSYSERR_INVALPARAM;
-    }
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
+    ret = MMSYSERR_NOMEM;
+    wwo->wfx = HeapAlloc(GetProcessHeap(), 0, sizeof(*wwo)+extra);
+    if (!wwo->wfx)
+        goto error;
 
-    /* only PCM format is supported so far... */
-    if (!ALSA_supportedFormat(lpDesc->lpFormat)) {
-	WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
-	     lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
-	     lpDesc->lpFormat->nSamplesPerSec);
-	return WAVERR_BADFORMAT;
+    err = snd_pcm_open(&wwo->pcm, WOutDev[dev->devid].pcmname, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+    if (err < 0) {
+        FIXME("Could not open sound device: %s\n", snd_strerror(err));
+        ret = MMSYSERR_NOTENABLED;
+        goto error;
     }
 
-    if (dwFlags & WAVE_FORMAT_QUERY) {
-	TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
-	     lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
-	     lpDesc->lpFormat->nSamplesPerSec);
-	return MMSYSERR_NOERROR;
-    }
+    if (wfx->wFormatTag == WAVE_FORMAT_PCM)
+        memcpy(wwo->wfx, wfx, sizeof(PCMWAVEFORMAT));
+    else
+        memcpy(wwo->wfx, wfx, sizeof(*wwo)+extra);
+    wwo->wfx->cbSize = extra;
+    wwo->wfx->nBlockAlign = wfx->nChannels*wfx->wBitsPerSample/8;
+    wwo->wfx->nAvgBytesPerSec = wfx->nSamplesPerSec*wfx->nBlockAlign;
 
-    wwo = &WOutDev[wDevID];
+    wwo->hw_params = hw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_hw_params_sizeof() );
+    sw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof() );
+    snd_pcm_hw_params_any(wwo->pcm, hw_params);
+
+    snd_pcm_hw_params_set_access(wwo->pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
+    snd_pcm_hw_params_set_channels(wwo->pcm, hw_params, wwo->wfx->nChannels);
+    ret = WAVERR_BADFORMAT;
+    if ((err = snd_pcm_hw_params_set_format(wwo->pcm, hw_params, format)) < 0) {
+        WARN("unable to set required format %s: %s\n", snd_pcm_format_name(format), snd_strerror(err));
+        goto error;
+    }
+    rate = wwo->wfx->nSamplesPerSec;
+    err = snd_pcm_hw_params_set_rate_near(wwo->pcm, hw_params, &rate, NULL);
+    if (err < 0 || !ALSA_NearMatch(rate, wwo->wfx->nSamplesPerSec)) {
+        WARN("Could not set rate to %i\n", wwo->wfx->nSamplesPerSec);
+        goto error;
+    }
+    rate = 10000;
+    snd_pcm_hw_params_set_period_time_near(wwo->pcm, hw_params, &rate, NULL);
+    rate = 100000;
+    snd_pcm_hw_params_set_buffer_time_near(wwo->pcm, hw_params, &rate, NULL);
+    if ((err = snd_pcm_hw_params(wwo->pcm, hw_params)) < 0) {
+        WARN("unable to set required hardware parameters: %s\n", snd_strerror(err));
+        goto error;
+    }
+
+    snd_pcm_hw_params_get_period_size(hw_params, &size, NULL);
+    snd_pcm_sw_params_current(wwo->pcm, sw_params);
+    snd_pcm_sw_params_set_start_threshold(wwo->pcm, sw_params, 1);
+    snd_pcm_sw_params_set_silence_size(wwo->pcm, sw_params, 0);
+    snd_pcm_sw_params_set_avail_min(wwo->pcm, sw_params, size);
+    snd_pcm_sw_params_set_silence_threshold(wwo->pcm, sw_params, 0);
+    snd_pcm_sw_params(wwo->pcm, sw_params);
+
+    snd_pcm_prepare(wwo->pcm);
+    snd_pcm_start(wwo->pcm);
+
+    wwo->cachevol = 0xffffffff;
+    wwo->cbflags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
+    wwo->cbhandle = lpDesc->dwCallback;
+    wwo->cbinstance = lpDesc->dwInstance;
+    wwo->wavehandle = (HDRVR)lpDesc->hWave;
+
+    ret = MMSYSERR_NOERROR;
+    if (dwFlags & WAVE_FORMAT_QUERY)
+        goto error;
+
+    HeapFree(GetProcessHeap(), 0, sw_params);
+
+    EnterCriticalSection(&dev->crst);
+    list_add_before(&dev->head, &wwo->entry);
+    if (!wave_timerid) {
+        timeBeginPeriod(1);
+        wave_timerid = timeSetEvent(10, 1, wodTick, 0L, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS);
+    }
+    LeaveCriticalSection(&dev->crst);
+    *pInstance = wwo;
+    TRACE("opened instance %p\n", wwo);
+
+    wodNotifyClient(wwo, WOM_OPEN, 0L, 0L);
+    return MMSYSERR_NOERROR;
 
-    if (wwo->pcm != NULL) {
-        WARN("%d already allocated\n", wDevID);
-        return MMSYSERR_ALLOCATED;
+error:
+    if (wwo->pcm) {
+        snd_pcm_drop(wwo->pcm);
+        snd_pcm_close(wwo->pcm);
     }
+    HeapFree(GetProcessHeap(), 0, sw_params);
+    HeapFree(GetProcessHeap(), 0, wwo->hw_params);
+    HeapFree(GetProcessHeap(), 0, wwo->wfx);
+    HeapFree(GetProcessHeap(), 0, wwo);
+    return ret;
+}
 
-    if (dwFlags & WAVE_DIRECTSOUND)
-        FIXME("Why are we called with DirectSound flag? It doesn't use MMSYSTEM any more\n");
-        /* not supported, ignore it */
-    dwFlags &= ~WAVE_DIRECTSOUND;
-
-    flags = SND_PCM_NONBLOCK;
-
-    if ( (err = snd_pcm_open(&pcm, wwo->pcmname, SND_PCM_STREAM_PLAYBACK, flags)) < 0)
-    {
-        ERR("Error open: %s\n", snd_strerror(err));
-	return MMSYSERR_NOTENABLED;
-    }
+static DWORD wodClose(waveimpl *dev, wavestreamimpl *wwo) {
+    TRACE("(%p, %p)\n", dev, wwo);
 
-    if (wwo->ctlname)
-    {
-        err = snd_hctl_open(&hctl, wwo->ctlname, 0);
-        if (err >= 0)
-        {
-            snd_hctl_load(hctl);
-        }
-        else
-        {
-            WARN("Could not open hctl for [%s]: %s\n", wwo->ctlname, snd_strerror(err));
-            hctl = NULL;
-        }
+    EnterCriticalSection(&dev->crst);
+    if (wwo->queue) {
+        LeaveCriticalSection(&dev->crst);
+        WARN("buffers still playing !\n");
+        return WAVERR_STILLPLAYING;
     }
 
-    wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
-
-    wwo->waveDesc = *lpDesc;
-    ALSA_copyFormat(lpDesc->lpFormat, &wwo->format);
+    snd_pcm_drop(wwo->pcm);
+    snd_pcm_close(wwo->pcm);
+    list_remove(&wwo->entry);
+    LeaveCriticalSection(&dev->crst);
 
-    TRACE("Requested this format: %dx%dx%d %s\n",
-          wwo->format.Format.nSamplesPerSec,
-          wwo->format.Format.wBitsPerSample,
-          wwo->format.Format.nChannels,
-          ALSA_getFormat(wwo->format.Format.wFormatTag));
+    wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L);
+    HeapFree(GetProcessHeap(), 0, wwo->hw_params);
+    HeapFree(GetProcessHeap(), 0, wwo->wfx);
+    HeapFree(GetProcessHeap(), 0, wwo);
 
-    if (wwo->format.Format.wBitsPerSample == 0) {
-	WARN("Resetting zeroed wBitsPerSample\n");
-	wwo->format.Format.wBitsPerSample = 8 *
-	    (wwo->format.Format.nAvgBytesPerSec /
-	     wwo->format.Format.nSamplesPerSec) /
-	    wwo->format.Format.nChannels;
-    }
+    return MMSYSERR_NOERROR;
+}
 
-#define EXIT_ON_ERROR(f,e,txt) do \
-{ \
-    int err; \
-    if ( (err = (f) ) < 0) \
-    { \
-	WARN(txt ": %s\n", snd_strerror(err)); \
-	retcode=e; \
-	goto errexit; \
-    } \
-} while(0)
+static DWORD wodWrite(waveimpl *dev, wavestreamimpl *wwo, LPWAVEHDR hdr, DWORD dwSize) {
+    LPWAVEHDR *wh;
 
-    sw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof() );
-    snd_pcm_hw_params_malloc(&hw_params);
-    if (! hw_params)
-    {
-        retcode = MMSYSERR_NOMEM;
-        goto errexit;
-    }
-    snd_pcm_hw_params_any(pcm, hw_params);
-
-    access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-    if ( ( err = snd_pcm_hw_params_set_access(pcm, hw_params, access ) ) < 0) {
-        WARN("mmap not available. switching to standard write.\n");
-        access = SND_PCM_ACCESS_RW_INTERLEAVED;
-	EXIT_ON_ERROR( snd_pcm_hw_params_set_access(pcm, hw_params, access ), MMSYSERR_INVALPARAM, "unable to set access for playback");
-	wwo->write = snd_pcm_writei;
-    }
-    else
-	wwo->write = snd_pcm_mmap_writei;
+    TRACE("(%p, %p, %p, %u, %08X)\n", dev, wwo, hdr, hdr->dwBufferLength, dwSize);
 
-    if ((err = snd_pcm_hw_params_set_channels(pcm, hw_params, wwo->format.Format.nChannels)) < 0) {
-        WARN("unable to set required channels: %d\n", wwo->format.Format.nChannels);
-        EXIT_ON_ERROR( snd_pcm_hw_params_set_channels(pcm, hw_params, wwo->format.Format.nChannels ), WAVERR_BADFORMAT, "unable to set required channels" );
+    if (!hdr->lpData || !(hdr->dwFlags & WHDR_PREPARED)) {
+        WARN("unprepared\n");
+        return WAVERR_UNPREPARED;
     }
 
-    if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_PCM) ||
-        ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) &&
-        IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) {
-        format = (wwo->format.Format.wBitsPerSample == 8) ? SND_PCM_FORMAT_U8 :
-                 (wwo->format.Format.wBitsPerSample == 16) ? SND_PCM_FORMAT_S16_LE :
-                 (wwo->format.Format.wBitsPerSample == 24) ? SND_PCM_FORMAT_S24_3LE :
-                 (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_S32_LE : -1;
-    } else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) &&
-        IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){
-        format = (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_FLOAT_LE : -1;
-    } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_MULAW) {
-        FIXME("unimplemented format: WAVE_FORMAT_MULAW\n");
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
-    } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ALAW) {
-        FIXME("unimplemented format: WAVE_FORMAT_ALAW\n");
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
-    } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ADPCM) {
-        FIXME("unimplemented format: WAVE_FORMAT_ADPCM\n");
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
-    } else {
-        ERR("invalid format: %0x04x\n", wwo->format.Format.wFormatTag);
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
+    if (hdr->dwFlags & WHDR_INQUEUE) {
+        TRACE("still playing %p\n", hdr);
+        return WAVERR_STILLPLAYING;
     }
 
-    if ((err = snd_pcm_hw_params_set_format(pcm, hw_params, format)) < 0) {
-        WARN("unable to set required format: %s\n", snd_pcm_format_name(format));
-        EXIT_ON_ERROR( snd_pcm_hw_params_set_format(pcm, hw_params, format), WAVERR_BADFORMAT, "unable to set required format" );
-    }
+    hdr->dwFlags = (hdr->dwFlags & ~WHDR_DONE) | WHDR_INQUEUE;
+    hdr->lpNext = NULL;
 
-    rate = wwo->format.Format.nSamplesPerSec;
-    dir=0;
-    err = snd_pcm_hw_params_set_rate_near(pcm, hw_params, &rate, &dir);
-    if (err < 0) {
-	WARN("Rate %d Hz not available for playback: %s\n", wwo->format.Format.nSamplesPerSec, snd_strerror(rate));
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
+    EnterCriticalSection(&dev->crst);
+    if (!wwo->queue && hdr->dwFlags & WHDR_BEGINLOOP) {
+        wwo->loop = hdr;
+        wwo->numloops = hdr->dwLoops;
     }
-    if (!ALSA_NearMatch(rate, wwo->format.Format.nSamplesPerSec)) {
-        WARN("Rate doesn't match (requested %d Hz, got %d Hz)\n", wwo->format.Format.nSamplesPerSec, rate);
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
-    }
-
-    TRACE("Got this format: %dx%dx%d %s\n",
-          wwo->format.Format.nSamplesPerSec,
-          wwo->format.Format.wBitsPerSample,
-          wwo->format.Format.nChannels,
-          ALSA_getFormat(wwo->format.Format.wFormatTag));
-
-    dir=0;
-    EXIT_ON_ERROR( snd_pcm_hw_params_set_buffer_time_near(pcm, hw_params, &buffer_time, &dir), MMSYSERR_INVALPARAM, "unable to set buffer time");
-    dir=0;
-    EXIT_ON_ERROR( snd_pcm_hw_params_set_period_time_near(pcm, hw_params, &period_time, &dir), MMSYSERR_INVALPARAM, "unable to set period time");
+    if (!wwo->queue)
+        wwo->ofs = 0;
 
-    EXIT_ON_ERROR( snd_pcm_hw_params(pcm, hw_params), MMSYSERR_INVALPARAM, "unable to set hw params for playback");
+    wh = &(wwo->queue);
+    while (*wh)
+        wh = &((*wh)->lpNext);
+    *wh = hdr;
+    LeaveCriticalSection(&dev->crst);
 
-    err = snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir);
-    err = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size);
-
-    snd_pcm_sw_params_current(pcm, sw_params);
-
-    EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold");
-    EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size");
-    EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min");
-    EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold");
-    EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback");
-#undef EXIT_ON_ERROR
-
-    snd_pcm_prepare(pcm);
-
-    if (TRACE_ON(wave))
-	ALSA_TraceParameters(hw_params, sw_params, FALSE);
-
-    /* now, we can save all required data for later use... */
-
-    wwo->dwBufferSize = snd_pcm_frames_to_bytes(pcm, buffer_size);
-    wwo->lpQueuePtr = wwo->lpPlayPtr = wwo->lpLoopPtr = NULL;
-    wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0;
-    wwo->dwPartialOffset = 0;
+    return MMSYSERR_NOERROR;
+}
 
-    ALSA_InitRingMessage(&wwo->msgRing);
+static DWORD wodPause(waveimpl *dev, wavestreamimpl *wwo) {
+    TRACE("(%p, %p)\n", dev, wwo);
 
-    wwo->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
-    wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwo->dwThreadID));
-    if (wwo->hThread)
-        SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL);
+    EnterCriticalSection(&dev->crst);
+    wwo->stopped = 1;
+    if (snd_pcm_state(wwo->pcm) == SND_PCM_STATE_RUNNING)
+        snd_pcm_drain(wwo->pcm);
     else
-    {
-        ERR("Thread creation for the wodPlayer failed!\n");
-        CloseHandle(wwo->hStartUpEvent);
-        retcode = MMSYSERR_NOMEM;
-        goto errexit;
-    }
-    WaitForSingleObject(wwo->hStartUpEvent, INFINITE);
-    CloseHandle(wwo->hStartUpEvent);
-    wwo->hStartUpEvent = INVALID_HANDLE_VALUE;
-
-    TRACE("handle=%p\n", pcm);
-    TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n",
-	  wwo->format.Format.wBitsPerSample, wwo->format.Format.nAvgBytesPerSec,
-	  wwo->format.Format.nSamplesPerSec, wwo->format.Format.nChannels,
-	  wwo->format.Format.nBlockAlign);
-
-    HeapFree( GetProcessHeap(), 0, sw_params );
-    wwo->pcm = pcm;
-    wwo->hctl = hctl;
-    if ( wwo->hw_params )
-	snd_pcm_hw_params_free(wwo->hw_params);
-    wwo->hw_params = hw_params;
-
-    return wodNotifyClient(wwo, WOM_OPEN, 0L, 0L);
-
-errexit:
-    if (pcm)
-        snd_pcm_close(pcm);
-
-    if (hctl)
-    {
-        snd_hctl_free(hctl);
-        snd_hctl_close(hctl);
-    }
-
-    if ( hw_params )
-	snd_pcm_hw_params_free(hw_params);
-
-    HeapFree( GetProcessHeap(), 0, sw_params );
-    if (wwo->msgRing.ring_buffer_size > 0)
-        ALSA_DestroyRingMessage(&wwo->msgRing);
+        snd_pcm_drop(wwo->pcm);
+    LeaveCriticalSection(&dev->crst);
 
-    return retcode;
+    return MMSYSERR_NOERROR;
 }
 
+static DWORD wodRestart(waveimpl *dev, wavestreamimpl *wwo) {
+    TRACE("(%p, %p)\n", dev, wwo);
 
-/**************************************************************************
- * 				wodClose			[internal]
- */
-static DWORD wodClose(WORD wDevID)
-{
-    DWORD		ret = MMSYSERR_NOERROR;
-    WINE_WAVEDEV*	wwo;
-
-    TRACE("(%u);\n", wDevID);
-
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to close already closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    wwo = &WOutDev[wDevID];
-    if (wwo->lpQueuePtr) {
-	WARN("buffers still playing !\n");
-	ret = WAVERR_STILLPLAYING;
-    } else {
-	if (wwo->hThread != INVALID_HANDLE_VALUE) {
-	    ALSA_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE);
-	}
-        ALSA_DestroyRingMessage(&wwo->msgRing);
-
-        if (wwo->hw_params)
-	    snd_pcm_hw_params_free(wwo->hw_params);
-	wwo->hw_params = NULL;
-
-        if (wwo->pcm)
-            snd_pcm_close(wwo->pcm);
-	wwo->pcm = NULL;
-
-        if (wwo->hctl)
-        {
-            snd_hctl_free(wwo->hctl);
-            snd_hctl_close(wwo->hctl);
-        }
-	wwo->hctl = NULL;
-
-	ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L);
-    }
+    EnterCriticalSection(&dev->crst);
+    wwo->stopped = 0;
+    snd_pcm_prepare(wwo->pcm);
+    snd_pcm_start(wwo->pcm);
+    LeaveCriticalSection(&dev->crst);
 
-    return ret;
+    return MMSYSERR_NOERROR;
 }
 
+static DWORD wodReset(waveimpl *dev, wavestreamimpl *wwo) {
+    LPWAVEHDR savedqueue;
 
-/**************************************************************************
- * 				wodWrite			[internal]
- *
- */
-static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
-{
-    TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize);
-
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to write to closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (lpWaveHdr->lpData == NULL || !(lpWaveHdr->dwFlags & WHDR_PREPARED))
-	return WAVERR_UNPREPARED;
+    TRACE("(%p, %p)\n", dev, wwo);
 
-    if (lpWaveHdr->dwFlags & WHDR_INQUEUE)
-	return WAVERR_STILLPLAYING;
+    EnterCriticalSection(&dev->crst);
 
-    lpWaveHdr->dwFlags &= ~WHDR_DONE;
-    lpWaveHdr->dwFlags |= WHDR_INQUEUE;
-    lpWaveHdr->lpNext = 0;
+    if (wwo->loop)
+        savedqueue = wwo->loop;
+    else
+        savedqueue = wwo->queue;
+    wwo->queue = wwo->loop = NULL;
+    wwo->ofs = 0;
+    wwo->stopped = 1;
+    snd_pcm_drop(wwo->pcm);
+    LeaveCriticalSection(&dev->crst);
 
-    ALSA_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE);
+    wodNotifyDoneList(wwo, savedqueue);
 
     return MMSYSERR_NOERROR;
 }
 
-/**************************************************************************
- * 			wodPause				[internal]
- */
-static DWORD wodPause(WORD wDevID)
-{
-    TRACE("(%u);!\n", wDevID);
-
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to pause closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
+static DWORD wodBreakLoop(waveimpl *dev, wavestreamimpl *wwo) {
+    TRACE("(%p, %p)\n", dev, wwo);
 
-    ALSA_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_PAUSING, 0, TRUE);
+    EnterCriticalSection(&dev->crst);
+    if (wwo->loop != NULL)
+        wwo->numloops = 1;
+    LeaveCriticalSection(&dev->crst);
 
     return MMSYSERR_NOERROR;
 }
 
-/**************************************************************************
- * 			wodRestart				[internal]
- */
-static DWORD wodRestart(WORD wDevID)
-{
-    TRACE("(%u);\n", wDevID);
+static DWORD wodGetPosition(waveimpl *dev, wavestreamimpl *wwo, LPMMTIME lpTime, DWORD uSize) {
+    DWORD val;
 
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to restart closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
+    TRACE("(%p, %p, %p, %u)\n", dev, wwo, lpTime, uSize);
 
-    if (WOutDev[wDevID].state == WINE_WS_PAUSED) {
-	ALSA_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_RESTARTING, 0, TRUE);
-    }
+    if (!lpTime)
+        return MMSYSERR_INVALPARAM;
 
-    /* FIXME: is NotifyClient with WOM_DONE right ? (Comet Busters 1.3.3 needs this notification) */
-    /* FIXME: Myst crashes with this ... hmm -MM
-       return wodNotifyClient(wwo, WOM_DONE, 0L, 0L);
-    */
+    EnterCriticalSection(&dev->crst);
+    val = wwo->bytesplayed;
+    LeaveCriticalSection(&dev->crst);
 
-    return MMSYSERR_NOERROR;
+    return ALSA_bytes_to_mmtime(lpTime, val, (WAVEFORMATPCMEX*)wwo->wfx);
 }
 
-/**************************************************************************
- * 			wodReset				[internal]
- */
-static DWORD wodReset(WORD wDevID)
-{
-    TRACE("(%u);\n", wDevID);
-
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to reset closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
+static DWORD wodGetVolume(waveimpl *dev, wavestreamimpl *wwo, LPDWORD lpdwVol) {
+    TRACE("(%p, %p, %p)\n", dev, wwo, lpdwVol);
 
-    ALSA_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_RESETTING, 0, TRUE);
+    if (wwo)
+        *lpdwVol = wwo->cachevol;
+    else
+        *lpdwVol = dev->vol;
 
     return MMSYSERR_NOERROR;
 }
 
-/**************************************************************************
- * 				wodGetPosition			[internal]
- */
-static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
-{
-    WINE_WAVEDEV*	wwo;
-
-    TRACE("(%u, %p, %u);\n", wDevID, lpTime, uSize);
+static DWORD wodSetVolume(waveimpl *dev, wavestreamimpl *wwo, DWORD dwParam) {
+    TRACE("(%p, %p, %08x)\n", dev, wwo, dwParam);
 
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to get position of closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
-
-    if (lpTime == NULL)	return MMSYSERR_INVALPARAM;
+    if (wwo)
+        wwo->cachevol = dwParam;
+    else
+        dev->vol = dwParam;
 
-    wwo = &WOutDev[wDevID];
-    return ALSA_bytes_to_mmtime(lpTime, wwo->dwPlayedTotal, &wwo->format);
+    return MMSYSERR_NOERROR;
 }
 
-/**************************************************************************
- * 				wodBreakLoop			[internal]
- */
-static DWORD wodBreakLoop(WORD wDevID)
-{
-    TRACE("(%u);\n", wDevID);
+static DWORD wodGetNumDevs(void) {
+    TRACE("\n");
 
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
+    return waveout_count;
+}
 
-    if (WOutDev[wDevID].pcm == NULL) {
-	WARN("Requested to breakloop of closed device %d!\n", wDevID);
-	return MMSYSERR_BADDEVICEID;
-    }
+static DWORD wodDevInterfaceSize(waveimpl *dev, LPDWORD dwParam1) {
+    TRACE("(%p, %p)\n", dev, dwParam1);
 
-    ALSA_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_BREAKLOOP, 0, TRUE);
+    *dwParam1 = (lstrlenW(dev->friendlyname)+1)*sizeof(*dev->friendlyname);
     return MMSYSERR_NOERROR;
 }
 
-/**************************************************************************
- * 				wodGetVolume			[internal]
- */
-static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol)
-{
-    WORD	       wleft, wright;
-    WINE_WAVEDEV*      wwo;
-    int                min, max;
-    int                left, right;
-    DWORD              rc;
-
-    TRACE("(%u, %p);\n", wDevID, lpdwVol);
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
+static DWORD wodDevInterface(waveimpl *dev, PWCHAR dwParam1, DWORD dwParam2) {
+    DWORD size;
+
+    TRACE("\n");
+    wodDevInterfaceSize(dev, &size);
+    if (dwParam2 >= size) {
+        lstrcpyW(dwParam1, dev->friendlyname);
+        return MMSYSERR_NOERROR;
     }
+    return MMSYSERR_INVALPARAM;
+}
 
-    if (lpdwVol == NULL)
-	return MMSYSERR_NOTENABLED;
+static DWORD wodInit(void) {
+    DWORD i = 0;
+    ALSA_WaveInit();
+    waveout_count = ALSA_WodNumDevs;
 
-    wwo = &WOutDev[wDevID];
+    waveout_head = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*waveout_head) * waveout_count);
+    while (i < waveout_count) {
+        waveimpl *wave = waveout_head + i;
 
-    rc = ALSA_CheckSetVolume(wwo->hctl, &left, &right, &min, &max, NULL, NULL, NULL);
-    if (rc == MMSYSERR_NOERROR)
-    {
-#define VOLUME_ALSA_TO_WIN(x) (  ( (((x)-min) * 65535) + (max-min)/2 ) /(max-min))
-        wleft = VOLUME_ALSA_TO_WIN(left);
-        wright = VOLUME_ALSA_TO_WIN(right);
-#undef VOLUME_ALSA_TO_WIN
-        TRACE("left=%d,right=%d,converted to windows left %d, right %d\n", left, right, wleft, wright);
-        *lpdwVol = MAKELONG( wleft, wright );
+        wave->friendlyname = WOutDev[i].outcaps.szPname;
+        wave->devid = i++;
+        InitializeCriticalSection(&wave->crst);
+        wave->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": waveimpl.crst");
+        list_init(&wave->head);
     }
-    else
-        TRACE("CheckSetVolume failed; rc %d\n", rc);
-
-    return rc;
+    return 1;
 }
 
-/**************************************************************************
- * 				wodSetVolume			[internal]
- */
-static DWORD wodSetVolume(WORD wDevID, DWORD dwParam)
-{
-    WORD	       wleft, wright;
-    WINE_WAVEDEV*      wwo;
-    int                min, max;
-    int                left, right;
-    DWORD              rc;
-
-    TRACE("(%u, %08X);\n", wDevID, dwParam);
-    if (wDevID >= ALSA_WodNumDevs) {
-	TRACE("Asked for device %d, but only %d known!\n", wDevID, ALSA_WodNumDevs);
-	return MMSYSERR_BADDEVICEID;
-    }
+static DWORD wodExit(void) {
+    DWORD i;
 
-    wwo = &WOutDev[wDevID];
-
-    rc = ALSA_CheckSetVolume(wwo->hctl, NULL, NULL, &min, &max, NULL, NULL, NULL);
-    if (rc == MMSYSERR_NOERROR)
-    {
-        wleft  = LOWORD(dwParam);
-        wright = HIWORD(dwParam);
-#define VOLUME_WIN_TO_ALSA(x) ( (  ( ((x) * (max-min)) + 32767) / 65535) + min )
-        left = VOLUME_WIN_TO_ALSA(wleft);
-        right = VOLUME_WIN_TO_ALSA(wright);
-#undef VOLUME_WIN_TO_ALSA
-        rc = ALSA_CheckSetVolume(wwo->hctl, NULL, NULL, NULL, NULL, NULL, &left, &right);
-        if (rc == MMSYSERR_NOERROR)
-            TRACE("set volume:  wleft=%d, wright=%d, converted to alsa left %d, right %d\n", wleft, wright, left, right);
-        else
-            TRACE("SetVolume failed; rc %d\n", rc);
+    if (wave_timerid) {
+        timeKillEvent(wave_timerid);
+        timeEndPeriod(1);
     }
 
-    return rc;
-}
+    for (i = 0; i < waveout_count; ++i) {
+        waveimpl *wave = waveout_head + i;
+        wavestreamimpl *cur, *next;
 
-/**************************************************************************
- * 				wodGetNumDevs			[internal]
- */
-static	DWORD	wodGetNumDevs(void)
-{
-    return ALSA_WodNumDevs;
+        LIST_FOR_EACH_ENTRY_SAFE(cur, next, &wave->head, wavestreamimpl, entry) {
+            wodReset(wave, cur);
+            wodClose(wave, cur);
+        }
+        HeapFree(GetProcessHeap(), 0, wave->friendlyname);
+        wave->crst.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&wave->crst);
+    }
+    HeapFree(GetProcessHeap(), 0, waveout_head);
+    waveout_count = 0;
+    return 1;
 }
 
-/**************************************************************************
- * 				wodDevInterfaceSize		[internal]
- */
-static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1)
+DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+                             DWORD_PTR dwParam1, DWORD_PTR dwParam2)
 {
-    TRACE("(%u, %p)\n", wDevID, dwParam1);
+    wavestreamimpl *wwo = (wavestreamimpl*)dwUser;
+    waveimpl *dev = &waveout_head[wDevID];
 
-    *dwParam1 = MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].interface_name, -1,
-                                    NULL, 0 ) * sizeof(WCHAR);
-    return MMSYSERR_NOERROR;
-}
+    TRACE("(%u, %04x, %p, %p, %p)\n",
+          wDevID, wMsg, (void*)dwUser, (void*)dwParam1, (void*)dwParam2);
 
-/**************************************************************************
- * 				wodDevInterface			[internal]
- */
-static DWORD wodDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2)
-{
-    if (dwParam2 >= MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].interface_name, -1,
-                                        NULL, 0 ) * sizeof(WCHAR))
-    {
-        MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].interface_name, -1,
-                            dwParam1, dwParam2 / sizeof(WCHAR));
-	return MMSYSERR_NOERROR;
+    switch (wMsg) {
+        case DRVM_INIT:
+            return wodInit();
+        case DRVM_EXIT:
+            return wodExit();
+        case DRVM_ENABLE:
+        case DRVM_DISABLE:
+            return TRUE;
+        case WODM_GETNUMDEVS:
+            return wodGetNumDevs();
     }
-    return MMSYSERR_INVALPARAM;
-}
 
-/**************************************************************************
- * 				wodMessage (WINEALSA.@)
- */
-DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
-                             DWORD_PTR dwParam1, DWORD_PTR dwParam2)
-{
-    TRACE("(%u, %s, %08lX, %08lX, %08lX);\n",
-	  wDevID, ALSA_getMessage(wMsg), dwUser, dwParam1, dwParam2);
+    if (wDevID >= waveout_count) {
+        ERR("Bad device id %u/%u\n", wDevID, waveout_count);
+        return MMSYSERR_BADDEVICEID;
+    }
 
     switch (wMsg) {
-    case DRVM_INIT:
-        ALSA_WaveInit();
-    case DRVM_EXIT:
-    case DRVM_ENABLE:
-    case DRVM_DISABLE:
-	/* FIXME: Pretend this is supported */
-	return 0;
-    case WODM_OPEN:	 	return wodOpen		(wDevID, (LPWAVEOPENDESC)dwParam1,	dwParam2);
-    case WODM_CLOSE:	 	return wodClose		(wDevID);
-    case WODM_GETDEVCAPS:	return wodGetDevCaps	(wDevID, (LPWAVEOUTCAPSW)dwParam1,	dwParam2);
-    case WODM_GETNUMDEVS:	return wodGetNumDevs	();
-    case WODM_GETPITCH:	 	return MMSYSERR_NOTSUPPORTED;
-    case WODM_SETPITCH:	 	return MMSYSERR_NOTSUPPORTED;
-    case WODM_GETPLAYBACKRATE:	return MMSYSERR_NOTSUPPORTED;
-    case WODM_SETPLAYBACKRATE:	return MMSYSERR_NOTSUPPORTED;
-    case WODM_WRITE:	 	return wodWrite		(wDevID, (LPWAVEHDR)dwParam1,		dwParam2);
-    case WODM_PAUSE:	 	return wodPause		(wDevID);
-    case WODM_GETPOS:	 	return wodGetPosition	(wDevID, (LPMMTIME)dwParam1, 		dwParam2);
-    case WODM_BREAKLOOP: 	return wodBreakLoop     (wDevID);
-    case WODM_PREPARE:	 	return MMSYSERR_NOTSUPPORTED;
-    case WODM_UNPREPARE: 	return MMSYSERR_NOTSUPPORTED;
-    case WODM_GETVOLUME:	return wodGetVolume	(wDevID, (LPDWORD)dwParam1);
-    case WODM_SETVOLUME:	return wodSetVolume	(wDevID, dwParam1);
-    case WODM_RESTART:		return wodRestart	(wDevID);
-    case WODM_RESET:		return wodReset		(wDevID);
-    case DRV_QUERYDEVICEINTERFACESIZE: return wodDevInterfaceSize       (wDevID, (LPDWORD)dwParam1);
-    case DRV_QUERYDEVICEINTERFACE:     return wodDevInterface           (wDevID, (PWCHAR)dwParam1, dwParam2);
-    case DRV_QUERYDSOUNDIFACE:	return wodDsCreate	(wDevID, (PIDSDRIVER*)dwParam1);
-    case DRV_QUERYDSOUNDDESC:	return wodDsDesc	(wDevID, (PDSDRIVERDESC)dwParam1);
-
-    default:
-	FIXME("unknown message %d!\n", wMsg);
+        case WODM_OPEN:
+            return wodOpen(dev, (wavestreamimpl**)dwUser, (LPWAVEOPENDESC)dwParam1, dwParam2);
+        case WODM_CLOSE:
+            return wodClose(dev, wwo);
+        case WODM_WRITE:
+            return wodWrite(dev, wwo, (LPWAVEHDR)dwParam1, dwParam2);
+        case WODM_PAUSE:
+            return wodPause(dev, wwo);
+        case WODM_GETPOS:
+            return wodGetPosition(dev, wwo, (LPMMTIME)dwParam1, dwParam2);
+        case WODM_BREAKLOOP:
+            return wodBreakLoop(dev, wwo);
+        case WODM_GETDEVCAPS:
+            return wodGetDevCaps(dev, (LPWAVEOUTCAPSW)dwParam1, dwParam2);
+
+        case WODM_GETVOLUME:
+            return wodGetVolume(dev, wwo, (LPDWORD)dwParam1);
+        case WODM_SETVOLUME:
+            return wodSetVolume(dev, wwo, dwParam1);
+        case WODM_RESTART:
+            return wodRestart(dev, wwo);
+        case WODM_RESET:
+            return wodReset(dev, wwo);
+
+        case DRV_QUERYDEVICEINTERFACESIZE:
+            return wodDevInterfaceSize(dev, (LPDWORD)dwParam1);
+        case DRV_QUERYDEVICEINTERFACE:
+            return wodDevInterface(dev, (PWCHAR)dwParam1, dwParam2);
+
+        case DRV_QUERYDSOUNDDESC:
+            return wodDsDesc(wDevID, (DSDRIVERDESC*)dwParam1);
+        case DRV_QUERYDSOUNDIFACE:
+            return wodDsCreate(wDevID, (IDsDriver**)dwParam1);
+
+        default:
+            FIXME("unknown message %04x!\n", wMsg);
+        case WODM_PREPARE:
+        case WODM_UNPREPARE:
+        case WODM_GETPITCH:
+        case WODM_SETPITCH:
+        case WODM_GETPLAYBACKRATE:
+        case WODM_SETPLAYBACKRATE:
+            return MMSYSERR_NOTSUPPORTED;
     }
-    return MMSYSERR_NOTSUPPORTED;
 }
 
 #else /* HAVE_ALSA */
-- 
1.7.0.4


--------------030603070709090307060903--



More information about the wine-patches mailing list