[PATCH] dmusic: Simplify ParseDescriptor by checking DLS header first and exit if it is wrong.
Christian Costa
titan.costa at gmail.com
Fri Apr 20 07:57:37 CDT 2012
---
dlls/dmusic/collection.c | 371 +++++++++++++++++++++++++---------------------
1 files changed, 202 insertions(+), 169 deletions(-)
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 3d9dc18..f5a4d39 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -234,177 +234,210 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto
return S_OK;
}
-static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc)
+static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)
{
- ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface);
- DMUS_PRIVATE_CHUNK Chunk;
- DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
- LARGE_INTEGER liMove; /* used when skipping chunks */
-
- TRACE("(%p, %p, %p)\n", This, pStream, pDesc);
-
- /* FIXME: should this be determined from stream? */
- pDesc->dwValidData |= DMUS_OBJ_CLASS;
- pDesc->guidClass = CLSID_DirectMusicCollection;
-
- IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
- switch (Chunk.fccID) {
- case FOURCC_RIFF: {
- IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL);
- TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID));
- StreamSize = Chunk.dwSize - sizeof(FOURCC);
- StreamCount = 0;
- if (Chunk.fccID == mmioFOURCC('D','L','S',' ')) {
- TRACE_(dmfile)(": collection form\n");
- do {
- IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
- StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
- switch (Chunk.fccID) {
- case FOURCC_DLID: {
- TRACE_(dmfile)(": GUID chunk\n");
- pDesc->dwValidData |= DMUS_OBJ_OBJECT;
- IStream_Read (pStream, &pDesc->guidObject, Chunk.dwSize, NULL);
- break;
- }
- case DMUS_FOURCC_VERSION_CHUNK: {
- TRACE_(dmfile)(": version chunk\n");
- pDesc->dwValidData |= DMUS_OBJ_VERSION;
- IStream_Read (pStream, &pDesc->vVersion, Chunk.dwSize, NULL);
- break;
- }
- case DMUS_FOURCC_CATEGORY_CHUNK: {
- TRACE_(dmfile)(": category chunk\n");
- pDesc->dwValidData |= DMUS_OBJ_CATEGORY;
- IStream_Read (pStream, pDesc->wszCategory, Chunk.dwSize, NULL);
- break;
- }
- case FOURCC_LIST: {
- IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL);
- TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID));
- ListSize[0] = Chunk.dwSize - sizeof(FOURCC);
- ListCount[0] = 0;
- switch (Chunk.fccID) {
- /* pure INFO list, such can be found in dls collections */
- case mmioFOURCC('I','N','F','O'): {
- TRACE_(dmfile)(": INFO list\n");
- do {
- IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
- ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
- switch (Chunk.fccID) {
- case mmioFOURCC('I','N','A','M'):{
- CHAR szName[DMUS_MAX_NAME];
- TRACE_(dmfile)(": name chunk\n");
- pDesc->dwValidData |= DMUS_OBJ_NAME;
- IStream_Read (pStream, szName, Chunk.dwSize, NULL);
- MultiByteToWideChar (CP_ACP, 0, szName, -1, pDesc->wszName, DMUS_MAX_NAME);
- if (even_or_odd(Chunk.dwSize)) {
- ListCount[0] ++;
- liMove.QuadPart = 1;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- }
- break;
- }
- case mmioFOURCC('I','A','R','T'): {
- TRACE_(dmfile)(": artist chunk (ignored)\n");
- if (even_or_odd(Chunk.dwSize)) {
- ListCount[0] ++;
- Chunk.dwSize++;
- }
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- case mmioFOURCC('I','C','O','P'): {
- TRACE_(dmfile)(": copyright chunk (ignored)\n");
- if (even_or_odd(Chunk.dwSize)) {
- ListCount[0] ++;
- Chunk.dwSize++;
- }
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- case mmioFOURCC('I','S','B','J'): {
- TRACE_(dmfile)(": subject chunk (ignored)\n");
- if (even_or_odd(Chunk.dwSize)) {
- ListCount[0] ++;
- Chunk.dwSize++;
- }
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- case mmioFOURCC('I','C','M','T'): {
- TRACE_(dmfile)(": comment chunk (ignored)\n");
- if (even_or_odd(Chunk.dwSize)) {
- ListCount[0] ++;
- Chunk.dwSize++;
- }
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- default: {
- TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
- if (even_or_odd(Chunk.dwSize)) {
- ListCount[0] ++;
- Chunk.dwSize++;
- }
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- }
- TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
- } while (ListCount[0] < ListSize[0]);
- break;
- }
- default: {
- TRACE_(dmfile)(": unknown (skipping)\n");
- liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC);
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- }
- break;
- }
- default: {
- TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- }
- TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize);
- } while (StreamCount < StreamSize);
- } else {
- TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
- liMove.QuadPart = StreamSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
- return E_FAIL;
- }
-
- TRACE_(dmfile)(": reading finished\n");
- break;
- }
- default: {
- TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
- return DMUS_E_INVALIDFILE;
- }
- }
-
- if (TRACE_ON(dmusic))
- {
- TRACE("Returning descriptor:\n");
- dump_DMUS_OBJECTDESC(pDesc);
- }
+ ULONG read;
+ HRESULT hr;
+
+ hr = IStream_Read(stream, data, size, &read);
+ if (FAILED(hr)) {
+ TRACE("IStream_Read failed: %08x\n", hr);
+ return hr;
+ }
+ if (read < size) {
+ TRACE("Didn't read full chunk: %u < %u\n", read, size);
+ return E_FAIL;
+ }
+
+ return S_OK;
+}
- return S_OK;
+static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM stream, LPDMUS_OBJECTDESC desc)
+{
+ ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface);
+ DMUS_PRIVATE_CHUNK chunk;
+ DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
+ LARGE_INTEGER liMove; /* used when skipping chunks */
+ HRESULT hr;
+
+ TRACE("(%p)->(%p, %p)\n", This, stream, desc);
+
+ /* FIXME: should this be determined from stream? */
+ desc->dwValidData |= DMUS_OBJ_CLASS;
+ desc->guidClass = CLSID_DirectMusicCollection;
+
+ hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD));
+ if (FAILED(hr))
+ return hr;
+ TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+
+ if (chunk.fccID != FOURCC_RIFF) {
+ TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
+ return DMUS_E_INVALIDFILE;
+ }
+
+ hr = read_from_stream(stream, &chunk.fccID, sizeof(FOURCC));
+ if (FAILED(hr))
+ return hr;
+ TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID));
+ StreamSize = chunk.dwSize - sizeof(FOURCC);
+
+ if (chunk.fccID != mmioFOURCC('D','L','S',' ')) {
+ TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
+ liMove.QuadPart = StreamSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
+ return E_FAIL;
+ }
+
+ StreamCount = 0;
+ TRACE_(dmfile)(": collection form\n");
+
+ do {
+ hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD));
+ if (FAILED(hr))
+ return hr;
+ StreamCount += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize;
+ TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ switch (chunk.fccID) {
+ case FOURCC_DLID:
+ TRACE_(dmfile)(": GUID chunk\n");
+ desc->dwValidData |= DMUS_OBJ_OBJECT;
+ hr = read_from_stream(stream, &desc->guidObject, chunk.dwSize);
+ if (FAILED(hr))
+ return hr;
+ break;
+
+ case DMUS_FOURCC_VERSION_CHUNK:
+ TRACE_(dmfile)(": version chunk\n");
+ desc->dwValidData |= DMUS_OBJ_VERSION;
+ hr = read_from_stream(stream, &desc->vVersion, chunk.dwSize);
+ if (FAILED(hr))
+ return hr;
+ break;
+
+ case DMUS_FOURCC_CATEGORY_CHUNK:
+ TRACE_(dmfile)(": category chunk\n");
+ desc->dwValidData |= DMUS_OBJ_CATEGORY;
+ hr = read_from_stream(stream, desc->wszCategory, chunk.dwSize);
+ if (FAILED(hr))
+ return hr;
+ break;
+
+ case FOURCC_LIST:
+ hr = read_from_stream(stream, &chunk.fccID, sizeof(FOURCC));
+ if (FAILED(hr))
+ return hr;
+ TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(chunk.fccID));
+ ListSize[0] = chunk.dwSize - sizeof(FOURCC);
+ ListCount[0] = 0;
+ switch (chunk.fccID) {
+ /* pure INFO list, such can be found in dls collections */
+ case mmioFOURCC('I','N','F','O'):
+ TRACE_(dmfile)(": INFO list\n");
+ do {
+ hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD));
+ if (FAILED(hr))
+ return hr;
+ ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize;
+ TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize);
+ switch (chunk.fccID) {
+ case mmioFOURCC('I','N','A','M'): {
+ CHAR szName[DMUS_MAX_NAME];
+ TRACE_(dmfile)(": name chunk\n");
+ desc->dwValidData |= DMUS_OBJ_NAME;
+ hr = read_from_stream(stream, szName, chunk.dwSize);
+ if (FAILED(hr))
+ return hr;
+ MultiByteToWideChar (CP_ACP, 0, szName, -1, desc->wszName, DMUS_MAX_NAME);
+ if (even_or_odd(chunk.dwSize)) {
+ ListCount[0]++;
+ liMove.QuadPart = 1;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ }
+ break;
+ }
+
+ case mmioFOURCC('I','A','R','T'):
+ TRACE_(dmfile)(": artist chunk (ignored)\n");
+ if (even_or_odd(chunk.dwSize)) {
+ ListCount[0]++;
+ chunk.dwSize++;
+ }
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+
+ case mmioFOURCC('I','C','O','P'):
+ TRACE_(dmfile)(": copyright chunk (ignored)\n");
+ if (even_or_odd(chunk.dwSize)) {
+ ListCount[0]++;
+ chunk.dwSize++;
+ }
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+
+ case mmioFOURCC('I','S','B','J'):
+ TRACE_(dmfile)(": subject chunk (ignored)\n");
+ if (even_or_odd(chunk.dwSize)) {
+ ListCount[0]++;
+ chunk.dwSize++;
+ }
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+
+ case mmioFOURCC('I','C','M','T'):
+ TRACE_(dmfile)(": comment chunk (ignored)\n");
+ if (even_or_odd(chunk.dwSize)) {
+ ListCount[0]++;
+ chunk.dwSize++;
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+ }
+
+ default:
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
+ if (even_or_odd(chunk.dwSize)) {
+ ListCount[0] ++;
+ chunk.dwSize++;
+ }
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+ }
+ TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+ } while (ListCount[0] < ListSize[0]);
+ break;
+
+ default:
+ TRACE_(dmfile)(": unknown (skipping)\n");
+ liMove.QuadPart = chunk.dwSize - sizeof(FOURCC);
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+ }
+ break;
+
+ default:
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
+ liMove.QuadPart = chunk.dwSize;
+ IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL);
+ break;
+ }
+ TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize);
+ } while (StreamCount < StreamSize);
+
+ TRACE_(dmfile)(": reading finished\n");
+
+ if (TRACE_ON(dmusic)) {
+ TRACE("Returning descriptor:\n");
+ dump_DMUS_OBJECTDESC(desc);
+ }
+
+ return S_OK;
}
static const IDirectMusicObjectVtbl DirectMusicCollection_Object_Vtbl = {
More information about the wine-patches
mailing list