Module: wine Branch: master Commit: 61343bdce6038a5d1d9580f89f6b334ba441720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=61343bdce6038a5d1d9580f89f...
Author: Michael Stefaniuc mstefani@redhat.de Date: Sun Jun 28 23:36:13 2015 +0200
dmcompos: Remove the extraneous IUnknown from DMSignPostTrack.
Also lock/unlock the module only on creation/destruction of the object.
---
dlls/dmcompos/signposttrack.c | 127 +++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 77 deletions(-)
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index c368874..e91f7bb 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -21,76 +21,16 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
-static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicSignPostTrack implementation */ typedef struct IDirectMusicSignPostTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicSignPostTrack;
-/* IDirectMusicSignPostTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicSignPostTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMCOMPOS_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMCOMPOS_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = { - IDirectMusicSignPostTrack_IUnknown_QueryInterface, - IDirectMusicSignPostTrack_IUnknown_AddRef, - IDirectMusicSignPostTrack_IUnknown_Release -}; - /* IDirectMusicSignPostTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMus }
static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; }
static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; }
static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMCOMPOS_UnlockModule(); + } + + return ref; }
static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -272,17 +241,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicSignPostTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); }
static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); }
static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); }
static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -322,21 +291,25 @@ static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = /* for ClassFactory */ HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicSignPostTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl; + IDirectMusicSignPostTrack *track; + HRESULT hr; + + track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicSignPostTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicSignPostTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMCOMPOS_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);
- return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }