ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmime: Accept a DMUS_IO_SEGMENT_HEADER without rtPlayStart field. 

Tron 2.0 has a segment header of 56, so is missing the rtPlayStart field.
Based on a patch by Alistair Leslie-Hughes.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2021-11-03 00:54:50 +01:00 committed by Alexandre Julliard
parent fbb633750f
commit 460ae3d82c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/dmime/segment.c
View File

@ -727,7 +727,8 @@ static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size)
if (dx == 9) { if (dx == 9) {
TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart));
TRACE("\trtLoopEnd: %s\n", wine_dbgstr_longlong(h->rtLoopEnd)); TRACE("\trtLoopEnd: %s\n", wine_dbgstr_longlong(h->rtLoopEnd));
TRACE("\trtPlayStart: %s\n", wine_dbgstr_longlong(h->rtPlayStart)); if (size > offsetof(DMUS_IO_SEGMENT_HEADER, rtPlayStart))
TRACE("\trtPlayStart: %s\n", wine_dbgstr_longlong(h->rtPlayStart));
} }
} }
@ -742,8 +743,11 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea
while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) {
switch (chunk.id) { switch (chunk.id) {
case DMUS_FOURCC_SEGMENT_CHUNK: case DMUS_FOURCC_SEGMENT_CHUNK:
/* DX9 without rtPlayStart field */
if (chunk.size == offsetof(DMUS_IO_SEGMENT_HEADER, rtPlayStart))
WARN("Missing rtPlayStart field in %s\n", debugstr_chunk(&chunk));
/* DX7, DX8 and DX9 structure sizes */ /* DX7, DX8 and DX9 structure sizes */
if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) && else if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) &&
chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart) && chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart) &&
chunk.size != sizeof(DMUS_IO_SEGMENT_HEADER)) { chunk.size != sizeof(DMUS_IO_SEGMENT_HEADER)) {
WARN("Invalid size of %s\n", debugstr_chunk(&chunk)); WARN("Invalid size of %s\n", debugstr_chunk(&chunk));