[PATCH] dswave: Reimplement ParseDescriptor() for DirectSoundWave
Michael Stefaniuc
mstefani at winehq.org
Tue Jul 17 16:55:33 CDT 2018
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/dswave/dswave.c | 167 +++++++--------------------------------------
dlls/dswave/tests/dswave.c | 28 +++++---
2 files changed, 42 insertions(+), 153 deletions(-)
diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c
index 0127634570..4f1481ce5b 100644
--- a/dlls/dswave/dswave.c
+++ b/dlls/dswave/dswave.c
@@ -100,153 +100,32 @@ static const IUnknownVtbl unknown_vtbl = {
};
/* IDirectMusicWaveImpl IDirectMusicObject part: */
-static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface,
- IStream *pStream, DMUS_OBJECTDESC *pDesc)
+static HRESULT WINAPI wave_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface,
+ IStream *stream, DMUS_OBJECTDESC *desc)
{
- DMUS_PRIVATE_CHUNK Chunk;
- DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
- LARGE_INTEGER liMove; /* used when skipping chunks */
+ struct chunk_entry riff = {0};
+ HRESULT hr;
- TRACE("(%p, %p)\n", pStream, pDesc);
+ TRACE("(%p, %p, %p)\n", iface, stream, desc);
- /* FIXME: should this be determined from stream? */
- pDesc->dwValidData |= DMUS_OBJ_CLASS;
- pDesc->guidClass = CLSID_DirectMusicSegment;
+ if (!stream || !desc)
+ return E_POINTER;
- 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('W','A','V','E')) {
- TRACE_(dmfile)(": wave 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 DMUS_FOURCC_GUID_CHUNK: {
- 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) {
- /* evil M$ UNFO list, which can (!?) contain INFO elements */
- case DMUS_FOURCC_UNFO_LIST: {
- TRACE_(dmfile)(": UNFO 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) {
- /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes
- (though strings seem to be valid unicode) */
- case mmioFOURCC('I','N','A','M'):
- case DMUS_FOURCC_UNAM_CHUNK: {
- TRACE_(dmfile)(": name chunk\n");
- pDesc->dwValidData |= DMUS_OBJ_NAME;
- IStream_Read (pStream, pDesc->wszName, Chunk.dwSize, NULL);
- break;
- }
- case mmioFOURCC('I','A','R','T'):
- case DMUS_FOURCC_UART_CHUNK: {
- TRACE_(dmfile)(": artist chunk (ignored)\n");
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- case mmioFOURCC('I','C','O','P'):
- case DMUS_FOURCC_UCOP_CHUNK: {
- TRACE_(dmfile)(": copyright chunk (ignored)\n");
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- case mmioFOURCC('I','S','B','J'):
- case DMUS_FOURCC_USBJ_CHUNK: {
- TRACE_(dmfile)(": subject chunk (ignored)\n");
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- case mmioFOURCC('I','C','M','T'):
- case DMUS_FOURCC_UCMT_CHUNK: {
- TRACE_(dmfile)(": comment chunk (ignored)\n");
- liMove.QuadPart = Chunk.dwSize;
- IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
- break;
- }
- default: {
- TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
- 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;
- }
- }
-
- TRACE(": returning descriptor: %s\n", debugstr_DMUS_OBJECTDESC (pDesc));
-
- return S_OK;
+ if ((hr = stream_get_chunk(stream, &riff)) != S_OK)
+ return hr;
+ if (riff.id != FOURCC_RIFF || riff.type != mmioFOURCC('W','A','V','E')) {
+ TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff));
+ stream_skip_chunk(stream, &riff);
+ return DMUS_E_CHUNKNOTFOUND;
+ }
+
+ hr = dmobj_parsedescriptor(stream, &riff, desc,
+ DMUS_OBJ_NAME_INFO | DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION);
+ if (FAILED(hr))
+ return hr;
+
+ TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(desc));
+ return S_OK;
}
static const IDirectMusicObjectVtbl dmobject_vtbl = {
@@ -255,7 +134,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = {
dmobj_IDirectMusicObject_Release,
dmobj_IDirectMusicObject_GetDescriptor,
dmobj_IDirectMusicObject_SetDescriptor,
- IDirectMusicObjectImpl_ParseDescriptor
+ wave_IDirectMusicObject_ParseDescriptor
};
/* IDirectMusicWaveImpl IPersistStream part: */
diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c
index be36fd2fc9..29b6815265 100644
--- a/dlls/dswave/tests/dswave.c
+++ b/dlls/dswave/tests/dswave.c
@@ -156,7 +156,7 @@ static IStream *gen_riff_stream(const FOURCC *ids)
ck->size = 5;
p += CHUNK_HDR_SIZE;
strcpy(p, "INAM");
- p += ck->size;
+ p += ck->size + 1; /* WORD aligned */
break;
default:
{
@@ -227,14 +227,24 @@ static void test_parsedescriptor(void)
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
+ ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
IStream_Release(stream);
+ /* NULL pointers */
+ if (0) {
+ /* Crashes on Windows */
+ memset(&desc, 0, sizeof(desc));
+ hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc);
+ ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr);
+ }
+ hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL);
+ ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr);
+
/* Wrong form */
empty[1] = DMUS_FOURCC_CONTAINER_FORM;
stream = gen_riff_stream(empty);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND,
+ ok(hr == DMUS_E_CHUNKNOTFOUND,
"ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr);
/* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_VERSION supported */
@@ -242,7 +252,7 @@ static void test_parsedescriptor(void)
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION),
+ ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION),
"Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData);
ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n",
wine_dbgstr_guid(&desc.guidClass));
@@ -257,7 +267,7 @@ static void test_parsedescriptor(void)
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
+ ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
IStream_Release(stream);
/* INFO list with INAM */
@@ -266,9 +276,9 @@ static void test_parsedescriptor(void)
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- todo_wine ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n",
+ ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n",
desc.dwValidData);
- todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n",
+ ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName));
IStream_Release(stream);
@@ -277,10 +287,10 @@ static void test_parsedescriptor(void)
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION),
+ ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION),
"Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n",
desc.dwValidData);
- todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n",
+ ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName));
IStream_Release(stream);
--
2.14.4
More information about the wine-devel
mailing list