Eric Pouech : dmime: Generate track flags while in loop.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef2830b62033a0feb66471ce83f88cb9f5602370
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ef2830b62033a0feb66471ce83f88cb...

Author: Eric Pouech <epouech(a)codeweavers.com>
Date:   Tue Jan 30 15:41:12 2024 +0100

dmime: Generate track flags while in loop.

Store track_flags inside segment state so that they can be reused in
subsequent calls.  The start/seek/loop flags are now properly set when
calling IDirectMusicTrack_Play().

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>

---

 dlls/dmime/segmentstate.c | 13 ++++++++-----
 dlls/dmime/wavetrack.c    |  7 +++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c
index 51067d21d3d..0deb396d384 100644
--- a/dlls/dmime/segmentstate.c
+++ b/dlls/dmime/segmentstate.c
@@ -56,6 +56,7 @@ struct segment_state
     MUSIC_TIME played;
     BOOL auto_download;
     DWORD repeats, actual_repeats;
+    DWORD track_flags;
 
     struct list tracks;
 };
@@ -385,12 +386,13 @@ static HRESULT segment_state_play_until(struct segment_state *This, IDirectMusic
     }
 
     This->played = played;
+    This->track_flags &= ~(DMUS_TRACKF_START|DMUS_TRACKF_DIRTY);
     if (This->start_point + This->played >= This->end_point) return S_FALSE;
     return S_OK;
 }
 
 static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance,
-        REFERENCE_TIME duration, DWORD track_flags)
+        REFERENCE_TIME duration)
 {
     IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface;
     MUSIC_TIME next_time;
@@ -404,7 +406,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic
             time + duration, &next_time)))
         return hr;
 
-    while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE)
+    while ((hr = segment_state_play_until(This, performance, next_time, This->track_flags)) == S_FALSE)
     {
         if (!This->actual_repeats)
         {
@@ -424,6 +426,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic
             break;
         This->start_time += This->end_point - This->start_point;
         This->actual_repeats--;
+        This->track_flags |= DMUS_TRACKF_LOOP | DMUS_TRACKF_SEEK;
 
         if (next_time <= This->start_time || This->end_point <= This->start_point) break;
     }
@@ -444,8 +447,8 @@ HRESULT segment_state_play(IDirectMusicSegmentState *iface, IDirectMusicPerforma
         return hr;
     }
 
-    if (FAILED(hr = segment_state_play_chunk(This, performance, 10000000,
-            DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY)))
+    This->track_flags = DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY;
+    if (FAILED(hr = segment_state_play_chunk(This, performance, 10000000)))
         return hr;
 
     if (hr == S_FALSE) return S_OK;
@@ -458,7 +461,7 @@ HRESULT segment_state_tick(IDirectMusicSegmentState *iface, IDirectMusicPerforma
 
     TRACE("%p %p\n", iface, performance);
 
-    return segment_state_play_chunk(This, performance, 10000000, 0);
+    return segment_state_play_chunk(This, performance, 10000000);
 }
 
 HRESULT segment_state_stop(IDirectMusicSegmentState *iface, IDirectMusicPerformance8 *performance)
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index 7f2fe4a8e5f..3d64e6e84c5 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -147,6 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat
         MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD track_flags,
         IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id)
 {
+    static const DWORD handled_track_flags = DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY | DMUS_TRACKF_LOOP;
     struct wave_track *This = impl_from_IDirectMusicTrack8(iface);
     LONG volume = This->header.lVolume;
     IDirectMusicGraph *graph;
@@ -157,9 +158,11 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat
     TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time,
             time_offset, track_flags, performance, segment_state, track_id);
 
-    if (track_flags) FIXME("track_flags %#lx not implemented\n", track_flags);
+    if (track_flags & ~handled_track_flags)
+        FIXME("track_flags %#lx not implemented\n", track_flags & ~handled_track_flags);
     if (segment_state) FIXME("segment_state %p not implemented\n", segment_state);
-    if (!(track_flags & DMUS_TRACKF_START)) return S_OK;
+
+    if (!(track_flags & (DMUS_TRACKF_START | DMUS_TRACKF_LOOP))) return S_OK;
 
     if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance,
             &IID_IDirectMusicGraph, (void **)&graph)))