Rémi Bernon : dmime: Send MIDI_SYSTEM_RESET message on performance reset.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 051418c0c0bc6e0739c7f34aaa4a4472907a5dc3
URL:    https://gitlab.winehq.org/wine/wine/-/commit/051418c0c0bc6e0739c7f34aaa4a447...

Author: Rémi Bernon 
Date:   Thu Oct 26 12:55:43 2023 +0200

dmime: Send MIDI_SYSTEM_RESET message on performance reset.

---

dlls/dmime/performance.c  | 71 ++++++++++++++++++++++++++++-------------------
 dlls/dmusic/dmusic_midi.h |  1 +
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index f85c5bf7586..0a39e86ef96 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -472,6 +472,35 @@ static HRESULT performance_init_dmusic(struct performance *This, IDirectSound *d
     return hr;
 }

+static HRESULT performance_send_midi_pmsg(struct performance *This, DMUS_PMSG *msg, UINT flags,
+        BYTE status, BYTE byte1, BYTE byte2)
+{
+    IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface;
+    DMUS_MIDI_PMSG *midi;
+    HRESULT hr;
+
+    if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*midi),
+            (DMUS_PMSG **)&midi)))
+        return hr;
+
+    if (flags & DMUS_PMSGF_REFTIME) midi->rtTime = msg->rtTime;
+    if (flags & DMUS_PMSGF_MUSICTIME) midi->mtTime = msg->mtTime;
+    midi->dwFlags = flags;
+    midi->dwPChannel = msg->dwPChannel;
+    midi->dwVirtualTrackID = msg->dwVirtualTrackID;
+    midi->dwVoiceID = msg->dwVoiceID;
+    midi->dwGroupID = msg->dwGroupID;
+    midi->dwType = DMUS_PMSGT_MIDI;
+    midi->bStatus = status;
+    midi->bByte1 = byte1;
+    midi->bByte2 = byte2;
+
+    if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)midi)))
+        IDirectMusicPerformance8_FreePMsg(performance, (DMUS_PMSG *)midi);
+
+    return hr;
+}
+
 static HRESULT WINAPI performance_Init(IDirectMusicPerformance8 *iface, IDirectMusic **dmusic,
         IDirectSound *dsound, HWND hwnd)
 {
@@ -631,6 +660,7 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM
     struct performance *This = impl_from_IDirectMusicPerformance8(iface);
     struct list states = LIST_INIT(states);
     struct state_entry *entry, *next;
+    DMUS_PMSG msg = {.mtTime = -1};
     HRESULT hr;

FIXME("(%p, %p, %p, %ld, %ld): semi-stub\n", This, segment, state, music_time, flags);
@@ -670,6 +700,13 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM
         free(entry);
     }

+    if (!state && !segment)
+    {
+        if (FAILED(hr = performance_send_midi_pmsg(This, &msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE,
+                MIDI_SYSTEM_RESET, 0, 0)))
+            ERR("Failed to send MIDI_SYSTEM_RESET message, hr %#lx\n", hr);
+    }
+
     LeaveCriticalSection(&This->safe);

return S_OK;
@@ -1368,6 +1405,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface)
     struct performance *This = impl_from_IDirectMusicPerformance8(iface);
     struct list states = LIST_INIT(states);
     struct state_entry *entry, *next;
+    DMUS_PMSG msg = {.mtTime = -1};
     HANDLE message_thread;
     HRESULT hr;

@@ -1400,6 +1438,10 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface)
         free(entry);
     }

+    if (FAILED(hr = performance_send_midi_pmsg(This, &msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE,
+            MIDI_SYSTEM_RESET, 0, 0)))
+        ERR("Failed to send MIDI_SYSTEM_RESET message, hr %#lx\n", hr);
+
     performance_set_primary_segment(This, NULL);
     performance_set_control_segment(This, NULL);

@@ -1953,35 +1995,6 @@ static HRESULT WINAPI performance_tool_GetMediaTypes(IDirectMusicTool *iface, DW
     return E_NOTIMPL;
 }

-static HRESULT performance_send_midi_pmsg(struct performance *This, DMUS_PMSG *msg, UINT flags,
-        BYTE status, BYTE byte1, BYTE byte2)
-{
-    IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface;
-    DMUS_MIDI_PMSG *midi;
-    HRESULT hr;
-
-    if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*midi),
-            (DMUS_PMSG **)&midi)))
-        return hr;
-
-    if (flags & DMUS_PMSGF_REFTIME) midi->rtTime = msg->rtTime;
-    if (flags & DMUS_PMSGF_MUSICTIME) midi->mtTime = msg->mtTime;
-    midi->dwFlags = flags;
-    midi->dwPChannel = msg->dwPChannel;
-    midi->dwVirtualTrackID = msg->dwVirtualTrackID;
-    midi->dwVoiceID = msg->dwVoiceID;
-    midi->dwGroupID = msg->dwGroupID;
-    midi->dwType = DMUS_PMSGT_MIDI;
-    midi->bStatus = status;
-    midi->bByte1 = byte1;
-    midi->bByte2 = byte2;
-
-    if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)midi)))
-        IDirectMusicPerformance8_FreePMsg(performance, (DMUS_PMSG *)midi);
-
-    return hr;
-}
-
 static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface,
         IDirectMusicPerformance *performance, DMUS_PMSG *msg)
 {
diff --git a/dlls/dmusic/dmusic_midi.h b/dlls/dmusic/dmusic_midi.h
index e545bcaf8cb..574961c12d0 100644
--- a/dlls/dmusic/dmusic_midi.h
+++ b/dlls/dmusic/dmusic_midi.h
@@ -31,6 +31,7 @@ enum midi_message
     MIDI_PROGRAM_CHANGE = 0xc0,
     MIDI_CHANNEL_PRESSURE = 0xd0,
     MIDI_PITCH_BEND_CHANGE = 0xe0,
+    MIDI_SYSTEM_RESET = 0xff,
 };

enum midi_control