marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmime: Simplify the track list parser. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Michael Stefaniuc 2018-07-11 23:43:28 +02:00 committed by Alexandre Julliard
parent acb879c9d2
commit 23629d069a
1 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
dlls/dmime/segment.c
View File

@ -659,8 +659,7 @@ static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream
return S_OK; return S_OK;
} }
static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm)
IStream *pStm)
{ {
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
DMUS_PRIVATE_CHUNK Chunk; DMUS_PRIVATE_CHUNK Chunk;
@ -671,12 +670,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU
DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr;
IDirectMusicTrack* pTrack = NULL; IDirectMusicTrack* pTrack = NULL;
if (pChunk->fccID != DMUS_FOURCC_TRACK_FORM) { StreamSize = size - sizeof(FOURCC);
ERR_(dmfile)(": %s chunk should be a TRACK form\n", debugstr_fourcc (pChunk->fccID));
return E_FAIL;
}
StreamSize = pChunk->dwSize - sizeof(FOURCC);
StreamCount = 0; StreamCount = 0;
do { do {
@ -819,52 +813,19 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU
return S_OK; return S_OK;
} }
static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream,
const struct chunk_entry *trkl)
{ {
HRESULT hr = E_FAIL; struct chunk_entry chunk = {.parent = trkl};
DMUS_PRIVATE_CHUNK Chunk; HRESULT hr;
DWORD ListSize[3], ListCount[3];
LARGE_INTEGER liMove; /* used when skipping chunks */
ListSize[0] = StreamSize - sizeof(FOURCC); TRACE("Parsing track list in %p: %s\n", stream, debugstr_chunk(trkl));
ListCount[0] = 0;
do { while ((hr = stream_next_chunk(stream, &chunk)) == S_OK)
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); if (chunk.id == FOURCC_RIFF && chunk.type == DMUS_FOURCC_TRACK_FORM)
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; hr = parse_track_form(This, chunk.size, stream);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case FOURCC_RIFF: {
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID));
StreamSize = Chunk.dwSize - sizeof(FOURCC);
switch (Chunk.fccID) {
case DMUS_FOURCC_TRACK_FORM: {
TRACE_(dmfile)(": TRACK form\n");
hr = parse_track_form(This, &Chunk, pStm);
if (FAILED(hr)) return hr;
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = StreamSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
}
}
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
}
}
TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]);
return S_OK; return SUCCEEDED(hr) ? S_OK : hr;
} }
static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size)
@ -920,7 +881,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea
break; break;
case FOURCC_LIST: case FOURCC_LIST:
if (chunk.type == DMUS_FOURCC_TRACK_LIST) if (chunk.type == DMUS_FOURCC_TRACK_LIST)
if (FAILED(hr = parse_track_list(This, chunk.size, stream))) if (FAILED(hr = parse_track_list(This, stream, &chunk)))
return hr; return hr;
break; break;
case FOURCC_RIFF: case FOURCC_RIFF: