[PATCH 0/3] MR8142: dmime: Cut down on the fixmes for unsupported MIDI meta events

[Michael Stefaniuc (＠mstefani)]

Noticed while testing https://bugs.winehq.org/show_bug.cgi?id=22018 .

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8142

[PATCH 1/3] dmime: Handle (skip over) text MIDI meta events.

[Michael Stefaniuc]

From: Michael Stefaniuc <mstefani(a)winehq.org>

---
 dlls/dmime/midi.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c
index 57fd5b078ad..2120cc00fcc 100644
--- a/dlls/dmime/midi.c
+++ b/dlls/dmime/midi.c
@@ -146,6 +146,20 @@ static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE *
 
         switch (event->meta_type)
         {
+        case MIDI_META_TEXT_EVENT:
+        case MIDI_META_COPYRIGHT_NOTICE:
+        case MIDI_META_TRACK_NAME:
+        case MIDI_META_INSTRUMENT_NAME:
+        case MIDI_META_LYRIC:
+        case MIDI_META_MARKER:
+        case MIDI_META_CUE_POINT:
+            char *str = malloc(length);
+            if (FAILED(hr = stream_read_at_most(stream, str, length, bytes_left)))
+                return hr;
+            TRACE("MIDI meta event type %#02x, text: %s\n", event->meta_type, debugstr_an(str, length));
+            free(str);
+            /* Skip over this event */
+            return read_midi_event(stream, event, last_status, bytes_left);
         case MIDI_META_SET_TEMPO:
             if (length != 3)
             {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8142

[PATCH 2/3] dmime: Print the MIDI meta event type for unhandled messages.

[Michael Stefaniuc]

From: Michael Stefaniuc <mstefani(a)winehq.org>

---
 dlls/dmime/midi.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c
index 2120cc00fcc..159546fee1c 100644
--- a/dlls/dmime/midi.c
+++ b/dlls/dmime/midi.c
@@ -382,8 +382,18 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment
         while ((hr = read_midi_event(parser->stream, &event, &last_status, &length)) == S_OK)
         {
             parser->time += event.delta_time;
-            if (event.status == 0xff && event.meta_type == MIDI_META_SET_TEMPO)
-                hr = midi_parser_handle_set_tempo(parser, &event);
+            if (event.status == MIDI_META)
+            {
+                switch (event.meta_type)
+                {
+                case MIDI_META_SET_TEMPO:
+                    hr = midi_parser_handle_set_tempo(parser, &event);
+                    break;
+                default:
+                    FIXME("Unhandled MIDI meta event type %#02x at time +%lu\n", event.meta_type, parser->time);
+                    break;
+                }
+            }
             else
             {
                 switch (event.status & 0xf0)
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8142

[PATCH 3/3] dmime: Support the MIDI meta end of track event.

[Michael Stefaniuc]

From: Michael Stefaniuc <mstefani(a)winehq.org>

No real behavior change as this event must appear at the end of the
track and must be the last message in the track.
---
 dlls/dmime/midi.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c
index 159546fee1c..62dd9a755ce 100644
--- a/dlls/dmime/midi.c
+++ b/dlls/dmime/midi.c
@@ -160,6 +160,13 @@ static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE *
             free(str);
             /* Skip over this event */
             return read_midi_event(stream, event, last_status, bytes_left);
+        case MIDI_META_END_OF_TRACK:
+            if (length)
+            {
+                ERR("Invalid MIDI meta event length %lu for end of track event.\n", length);
+                return E_FAIL;
+            }
+            break;
         case MIDI_META_SET_TEMPO:
             if (length != 3)
             {
@@ -384,6 +391,8 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment
             parser->time += event.delta_time;
             if (event.status == MIDI_META)
             {
+                if (event.meta_type == MIDI_META_END_OF_TRACK)
+                    break;
                 switch (event.meta_type)
                 {
                 case MIDI_META_SET_TEMPO:
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8142

[Michael Stefaniuc (＠mstefani)]

None of the test failures are DMusic related.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8142#note_104480