Anton Baskanov : dmime: Correctly requeue messages with changed time.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 00a77f0137ef73c363d0aedc977eefb500eac54f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/00a77f0137ef73c363d0aedc977eefb...

Author: Anton Baskanov 
Date:   Sat Nov 18 17:20:24 2023 +0700

dmime: Correctly requeue messages with changed time.

---

dlls/dmime/performance.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index aa892d108c0..1236766afd9 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -147,7 +147,7 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG *
     return hr;
 }

-static HRESULT performance_queue_message(struct performance *This, struct message *message, struct list *hint)
+static HRESULT performance_queue_message(struct performance *This, struct message *message)
 {
     static const DWORD delivery_flags = DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME;
     struct message *prev;
@@ -160,7 +160,7 @@ static HRESULT performance_queue_message(struct performance *This, struct messag
             return hr;
     }

-    LIST_FOR_EACH_ENTRY_REV(prev, hint ? hint : &This->messages, struct message, entry)
+    LIST_FOR_EACH_ENTRY_REV(prev, &This->messages, struct message, entry)
     {
         if (&prev->entry == &This->messages) break;
         if (prev->msg.rtTime <= message->msg.rtTime) break;
@@ -185,20 +185,18 @@ static DWORD WINAPI message_thread_proc(void *args)
     {
         DWORD timeout = INFINITE;
         struct message *message;
-        struct list *next;

if (!(message = performance_get_message(This, &timeout)))
         {
             SleepConditionVariableCS(&This->cond, &This->safe, timeout);
             continue;
         }
-        next = message->entry.next;

list_remove(&message->entry);
         list_init(&message->entry);

hr = performance_process_message(This, &message->msg);
-        if (hr == DMUS_S_REQUEUE) performance_queue_message(This, message, next);
+        if (hr == DMUS_S_REQUEUE) performance_queue_message(This, message);
     }

LeaveCriticalSection(&This->safe);
@@ -841,7 +839,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS
             msg->dwFlags |= DMUS_PMSGF_REFTIME;
         }

-        hr = performance_queue_message(This, message, NULL);
+        hr = performance_queue_message(This, message);
     }

done: