Rémi Bernon : dmime: Send notification messages with DMUS_PMSGF_TOOL_IMMEDIATE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 87dba38469cd65c8aca9d8c6e093587641d41e9d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/87dba38469cd65c8aca9d8c6e093587...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Oct 25 10:13:17 2023 +0200

dmime: Send notification messages with DMUS_PMSGF_TOOL_IMMEDIATE.

Then send them again with DMUS_PMSGF_TOOL_ATTIME for the notification
queue.

---

 dlls/dmime/performance.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 942452d353e..b58a7d9cd18 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -199,7 +199,7 @@ static HRESULT performance_send_notification_pmsg(struct performance *This, MUSI
         return hr;
 
     msg->mtTime = music_time;
-    msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE;
+    msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE;
     msg->dwType = DMUS_PMSGT_NOTIFICATION;
     if ((msg->punkUser = object)) IUnknown_AddRef(object);
     msg->guidNotificationType = type;
@@ -1230,7 +1230,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface,
         hr = performance_send_notification_pmsg(This, start_time, This->notification_segment,
                 GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state);
     if (SUCCEEDED(hr))
-        hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL);
+        hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL);
 
     if (SUCCEEDED(hr))
         hr = segment_state_play(state, iface);
@@ -1242,7 +1242,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface,
         hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment,
                 GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state);
     if (SUCCEEDED(hr))
-        hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL);
+        hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL);
     if (SUCCEEDED(hr))
         hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance,
                 GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL);
@@ -1790,6 +1790,21 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface,
             enabled = This->notification_segment;
         if (!enabled) return DMUS_S_FREE;
 
+        if (msg->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE)
+        {
+            /* re-send the message for queueing at the expected time */
+            msg->dwFlags &= ~DMUS_PMSGF_TOOL_IMMEDIATE;
+            msg->dwFlags |= DMUS_PMSGF_TOOL_ATTIME;
+
+            if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg)))
+            {
+                ERR("Failed to send notification message, hr %#lx\n", hr);
+                return DMUS_S_FREE;
+            }
+
+            return S_OK;
+        }
+
         list_add_tail(&This->notifications, &message->entry);
 
         /* discard old notification messages */