[PATCH 0/2] MR7230: dmime: Fix loading and default soundfont collection.

[Yuxuan Shui (＠yshui)]

* * *

BTW I did try to create tests to make sure we connect collection the same way Windows does it. Problem is `GUID_ConnectToDLSCollection` is not gettable. Then I tried to create a `IDirectMusicPerformance` implementation and intercept `DownloadInstrument`. Interestingly Windows `IDirectMusicSegment::Download` doesn't call `DownloadInstrument` at all, instead it downloads instruments through a private, undocumented interface. So there seems to be no way to test this.

[PATCH 1/2] dmime: Handle IStream EOF correctly in MIDI parser.

[Yuxuan Shui]

From: Yuxuan Shui

Read returns E_FAIL when the EOF is encountered, which was treated as a failure.
---
 dlls/dmime/midi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c
index 57b6a3adf90..3f211e75a8c 100644
--- a/dlls/dmime/midi.c
+++ b/dlls/dmime/midi.c
@@ -339,7 +339,12 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment
         struct midi_event event = {0};

TRACE("Start parsing track %u\n", i);
-        if ((hr = IStream_Read(parser->stream, magic, sizeof(magic), &read)) != S_OK) break;
+        hr = IStream_Read(parser->stream, magic, sizeof(magic), &read);
+        if (hr == E_FAIL || read < sizeof(magic)) {
+            hr = S_OK;
+            break;
+        }
+        if (FAILED(hr)) break;
         if (read < sizeof(magic)) break;
         if (memcmp(magic, "MTrk", 4) != 0) break;

[PATCH 2/2] dmimi: Connect default collection to MIDI bandtrack.

[Yuxuan Shui]

From: Yuxuan Shui

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

diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c
index 3f211e75a8c..81e7fa14ad4 100644
--- a/dlls/dmime/midi.c
+++ b/dlls/dmime/midi.c
@@ -327,8 +327,19 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment
     MUSIC_TIME music_length = 0;
     DMUS_IO_SEQ_ITEM *seq_items = NULL;
     struct midi_seqtrack_item *item;
+    DMUS_OBJECTDESC default_desc =
+    {
+        .dwSize = sizeof(DMUS_OBJECTDESC),
+        .dwValidData = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS,
+        .guidClass = CLSID_DirectMusicCollection,
+        .guidObject = GUID_DefaultGMCollection,
+    };
+    IDirectMusicObject *collection = NULL;

TRACE("(%p, %p): semi-stub\n", parser, segment);
+    if (FAILED(hr = stream_get_object(parser->stream, &default_desc, &IID_IDirectMusicCollection,
+            (void **)&collection)))
+        WARN("Failed to load default collection from loader, hr %#lx\n", hr);

for (i = 0;; i++)
     {
@@ -404,6 +415,7 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment
     qsort(seq_items, parser->seqtrack_items_count, sizeof(DMUS_IO_SEQ_ITEM), midi_seqtrack_item_compare);

music_length = (ULONGLONG)music_length * DMUS_PPQ / parser->division + 1;
+    if (collection) IDirectMusicTrack_SetParam(parser->bandtrack, &GUID_ConnectToDLSCollection, 0, collection);
     if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_SetLength(segment, music_length);
     if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_InsertTrack(segment, parser->bandtrack, 0xffff);
     if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_InsertTrack(segment, parser->chordtrack, 0xffff);

[PATCH 2/2] dmimi: Connect default collection to MIDI bandtrack.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=151161

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got hook 0x0005 instead
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got winevent_hook 0x0003 instead
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x030f instead
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x001c instead
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x0086 instead
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x0006 instead
msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got hook 0x0009 instead