Skip to content

W
wine-winehq
Commit 06e988a5 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC.

parent c64d41fa
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 10 deletions
dlls/dmcompos/chordmap.c
View file @ 06e988a5
...@@ -30,7 +30,6 @@ typedef struct IDirectMusicChordMapImpl { ...@@ -30,7 +30,6 @@ typedef struct IDirectMusicChordMapImpl {
IDirectMusicChordMap IDirectMusicChordMap_iface; IDirectMusicChordMap IDirectMusicChordMap_iface;
struct dmobject dmobj; struct dmobject dmobj;
LONG ref; LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicChordMapImpl; } IDirectMusicChordMapImpl;
/* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */
...@@ -296,20 +295,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -296,20 +295,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
switch (chunkID) { switch (chunkID) {
case DMUS_FOURCC_GUID_CHUNK: { case DMUS_FOURCC_GUID_CHUNK: {
TRACE_(dmfile)(": GUID chunk\n"); TRACE_(dmfile)(": GUID chunk\n");
This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT;
IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); IStream_Read (pStm, &This->dmobj.desc.guidObject, chunkSize, NULL);
break; break;
} }
case DMUS_FOURCC_VERSION_CHUNK: { case DMUS_FOURCC_VERSION_CHUNK: {
TRACE_(dmfile)(": version chunk\n"); TRACE_(dmfile)(": version chunk\n");
This->pDesc->dwValidData |= DMUS_OBJ_VERSION; This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION;
IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); IStream_Read (pStm, &This->dmobj.desc.vVersion, chunkSize, NULL);
break; break;
} }
case DMUS_FOURCC_CATEGORY_CHUNK: { case DMUS_FOURCC_CATEGORY_CHUNK: {
TRACE_(dmfile)(": category chunk\n"); TRACE_(dmfile)(": category chunk\n");
This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY;
IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); IStream_Read (pStm, This->dmobj.desc.wszCategory, chunkSize, NULL);
break; break;
} }
case FOURCC_LIST: { case FOURCC_LIST: {
...@@ -331,8 +330,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -331,8 +330,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
case mmioFOURCC('I','N','A','M'): case mmioFOURCC('I','N','A','M'):
case DMUS_FOURCC_UNAM_CHUNK: { case DMUS_FOURCC_UNAM_CHUNK: {
TRACE_(dmfile)(": name chunk\n"); TRACE_(dmfile)(": name chunk\n");
This->pDesc->dwValidData |= DMUS_OBJ_NAME; This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME;
IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); IStream_Read (pStm, This->dmobj.desc.wszName, chunkSize, NULL);
break; break;
} }
case mmioFOURCC('I','A','R','T'): case mmioFOURCC('I','A','R','T'):
...@@ -443,7 +442,6 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) ...@@ -443,7 +442,6 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj)
(IUnknown *)&obj->IDirectMusicChordMap_iface); (IUnknown *)&obj->IDirectMusicChordMap_iface);
obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl;
obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
obj->pDesc = &obj->dmobj.desc;
DMCOMPOS_LockModule(); DMCOMPOS_LockModule();
hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment