dmime: Don't crash when DMSegment loads a MIDI file.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31829Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dmime: Don't crash when DMSegment loads a MIDI file.
c8e493cb · Michael Stefaniuc · Alexandre Julliard · 235f6da8 · c8e493cb
Commit c8e493cb authored Jul 16, 2018 by Michael Stefaniuc Committed by Alexandre Julliard Jul 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

segment.c dlls/dmime/segment.c +8 -2

No files found.
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -790,10 +790,16 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st
    if (!stream)
        return E_POINTER;

-    if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF)
+    if (stream_get_chunk(stream, &riff) != S_OK ||
+            (riff.id != FOURCC_RIFF && riff.id != mmioFOURCC('M','T','h','d')))
        return DMUS_E_UNSUPPORTED_STREAM;
-
    stream_reset_chunk_start(stream, &riff);
+
+    if (riff.id == mmioFOURCC('M','T','h','d')) {
+        FIXME("MIDI file loading not supported\n");
+        return S_OK;
+    }
+
    hr = IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream,
            &This->dmobj.desc);
    if (FAILED(hr))