Maarten Lankhorst : winealsa.drv: Don't hang on last few bytes not played.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 717df5b2972b3cb998ca5a43279ae2283b117eaa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=717df5b2972b3cb998ca5a4327...

Author: Maarten Lankhorst 
Date:   Sat Oct  4 12:04:12 2008 +0200

winealsa.drv: Don't hang on last few bytes not played.

Fixes winmm:wave test hanging.

---

dlls/winealsa.drv/waveout.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 8149a4a..6cb2da8 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -104,11 +104,13 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps)
     snd_pcm_delay(wwo->pcm, &delay);

/* A delay < 0 indicates an underrun; for our purposes that's 0.  */
-    if ( (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) || (delay < 0))
+    if (delay < 0)
     {
         WARN("Unexpected state (%d) or delay (%ld) while updating Total Played, resetting\n", state, delay);
         delay=0;
     }
+    if (state == SND_PCM_STATE_XRUN)
+        snd_pcm_start(wwo->pcm);
     InterlockedExchange((LONG*)&wwo->dwPlayedTotal, wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->pcm, delay));
     return TRUE;
 }
@@ -281,10 +283,14 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force)
         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) {TRACE("still playing %p (%u/%u)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;}
+            if (lpWaveHdr->reserved > wwo->dwPlayedTotal + frames) {TRACE("still playing %p (%u/%u)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;}
         }
+        wwo->dwPlayedTotal += lpWaveHdr->reserved - wwo->dwPlayedTotal;
    wwo->lpQueuePtr = lpWaveHdr->lpNext;

lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;