Alistair Leslie-Hughes : dmime: Store flags when parsing track data.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7dd53d89c33781089619d40281f332d910527415
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7dd53d89c33781089619d4028...

Author: Alistair Leslie-Hughes 
Date:   Thu Mar 26 19:09:25 2020 +0100

dmime: Store flags when parsing track data.

Signed-off-by: Alistair Leslie-Hughes 
Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/dmime/dmime_private.h |  1 +
 dlls/dmime/segment.c       | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 576ebc1ae8..9759039a03 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -77,6 +77,7 @@ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSo
 typedef struct _DMUS_PRIVATE_SEGMENT_TRACK {
   struct list entry; /* for listing elements */
   DWORD dwGroupBits;
+  DWORD flags;
   IDirectMusicTrack* pTrack;
 } DMUS_PRIVATE_SEGMENT_TRACK, *LPDMUS_PRIVATE_SEGMENT_TRACK;

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 0455b6c5dd..f5dbf4b995 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -614,8 +614,9 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream,
     IPersistStream *ps = NULL;
     IStream *clone;
     DMUS_IO_TRACK_HEADER thdr;
-    DMUS_IO_TRACK_EXTRAS_HEADER txhdr;
+    DMUS_IO_TRACK_EXTRAS_HEADER txhdr = {0};
     HRESULT hr;
+    DMUS_PRIVATE_SEGMENT_TRACK *item;

TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff));

@@ -647,7 +648,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream,

if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK &&
                 SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) {
-            FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n");
+            FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n");
             TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority);
         }
     }
@@ -672,6 +673,11 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream,
         goto done;

hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup);
+    if (FAILED(hr))
+        goto done;
+
+    item = LIST_ENTRY(list_tail(&This->Tracks), DMUS_PRIVATE_SEGMENT_TRACK, entry);
+    item->flags = txhdr.dwFlags;

done:
     if (ps)