Eric Pouech : dmime: Fully implement IDirectMusicSegmentState::GetRepeats().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed92095f28808282c5338a5cb89ec758f7b3b4e5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ed92095f28808282c5338a5cb89ec75...

Author: Eric Pouech 
Date:   Mon Jan 22 17:57:08 2024 +0100

dmime: Fully implement IDirectMusicSegmentState::GetRepeats().

Signed-off-by: Eric Pouech

---

dlls/dmime/segmentstate.c | 10 ++++++----
 dlls/dmime/tests/dmime.c  |  3 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c
index 3b939bc95ca..38ff9185534 100644
--- a/dlls/dmime/segmentstate.c
+++ b/dlls/dmime/segmentstate.c
@@ -53,7 +53,7 @@ struct segment_state
     MUSIC_TIME end_point;
     MUSIC_TIME played;
     BOOL auto_download;
-    DWORD repeats;
+    DWORD repeats, actual_repeats;

struct list tracks;
 };
@@ -117,7 +117,8 @@ static ULONG WINAPI segment_state_Release(IDirectMusicSegmentState8 *iface)
 static HRESULT WINAPI segment_state_GetRepeats(IDirectMusicSegmentState8 *iface, DWORD *repeats)
 {
     struct segment_state *This = impl_from_IDirectMusicSegmentState8(iface);
-    FIXME("(%p, %p): semi-stub\n", This, repeats);
+    TRACE("(%p, %p)\n", This, repeats);
+    *repeats = This->repeats;
     return S_OK;
 }

@@ -236,6 +237,7 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time
     if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetStartPoint(segment, &This->start_point);
     if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetLength(segment, &This->end_point);
     if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetRepeats(segment, &This->repeats);
+    if (SUCCEEDED(hr)) This->actual_repeats = This->repeats;

for (i = 0; SUCCEEDED(hr); i++)
     {
@@ -315,7 +317,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic

while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE)
     {
-        if (!This->repeats)
+        if (!This->actual_repeats)
         {
             MUSIC_TIME end_time = This->start_time + This->played;

@@ -332,7 +334,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic
                 &This->end_point)))
             break;
         This->start_time += This->end_point - This->start_point;
-        This->repeats--;
+        This->actual_repeats--;

if (next_time <= This->start_time || This->end_point <= This->start_point) break;
     }
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index 26fdf3ef2a5..f6f34915547 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -4540,7 +4540,6 @@ static void test_segment_state(void)
     value = 0xdeadbeef;
     hr = IDirectMusicSegmentState_GetRepeats(state, &value);
     ok(hr == S_OK, "got %#lx\n", hr);
-    todo_wine
     ok(value == 0, "got %#lx\n", value);
     time = 0xdeadbeef;
     hr = IDirectMusicSegmentState_GetStartTime(state, &time);
@@ -4624,7 +4623,6 @@ static void test_segment_state(void)
     value = 0xdeadbeef;
     hr = IDirectMusicSegmentState_GetRepeats(state, &value);
     ok(hr == S_OK, "got %#lx\n", hr);
-    todo_wine
     ok(value == 0, "got %#lx\n", value);
     time = 0xdeadbeef;
     hr = IDirectMusicSegmentState_GetStartTime(state, &time);
@@ -4655,7 +4653,6 @@ static void test_segment_state(void)
     value = 0xdeadbeef;
     hr = IDirectMusicSegmentState_GetRepeats(state, &value);
     ok(hr == S_OK, "got %#lx\n", hr);
-    todo_wine
     ok(value == 0, "got %#lx\n", value);
     time = 0xdeadbeef;
     hr = IDirectMusicSegmentState_GetStartTime(state, &time);