ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmcompos: COM cleanup for IDirectMusicComposer. 

Also lock/unlock the module only on creation/destruction of the object.
This commit is contained in:
Michael Stefaniuc 2014-01-17 01:14:48 +01:00 committed by Alexandre Julliard
parent 29fe708970
commit 604e395184
2 changed files with 93 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
dlls/dmcompos/composer.c
View File

@ -21,85 +21,116 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
/* IDirectMusicComposerImpl IUnknown part: */ typedef struct IDirectMusicComposerImpl {
static HRESULT WINAPI IDirectMusicComposerImpl_QueryInterface (LPDIRECTMUSICCOMPOSER iface, REFIID riid, LPVOID *ppobj) { IDirectMusicComposer IDirectMusicComposer_iface;
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; LONG ref;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); } IDirectMusicComposerImpl;
if (IsEqualIID (riid, &IID_IUnknown) || static inline IDirectMusicComposerImpl *impl_from_IDirectMusicComposer(IDirectMusicComposer *iface)
IsEqualIID (riid, &IID_IDirectMusicComposer)) { {
IUnknown_AddRef(iface); return CONTAINING_RECORD(iface, IDirectMusicComposerImpl, IDirectMusicComposer_iface);
*ppobj = This;
return S_OK;
}
WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE;
} }
static ULONG WINAPI IDirectMusicComposerImpl_AddRef (LPDIRECTMUSICCOMPOSER iface) { static HRESULT WINAPI IDirectMusicComposerImpl_QueryInterface(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; REFIID riid, void **ret_iface)
ULONG ref = InterlockedIncrement(&This->ref); {
TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
TRACE("(%p): AddRef from %d\n", This, ref - 1); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicComposer))
{
DMCOMPOS_LockModule(); *ret_iface = iface;
IDirectMusicComposer_AddRef(iface);
return ref; return S_OK;
}
WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface);
*ret_iface = NULL;
return E_NOINTERFACE;
} }
static ULONG WINAPI IDirectMusicComposerImpl_Release (LPDIRECTMUSICCOMPOSER iface) { static ULONG WINAPI IDirectMusicComposerImpl_AddRef(IDirectMusicComposer *iface)
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; {
ULONG ref = InterlockedDecrement(&This->ref); IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p): ReleaseRef to %d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if (ref == 0) { return ref;
HeapFree(GetProcessHeap(), 0, This); }
}
static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface)
DMCOMPOS_UnlockModule(); {
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
return ref; ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
if (ref == 0) {
HeapFree(GetProcessHeap(), 0, This);
DMCOMPOS_UnlockModule();
}
return ref;
} }
/* IDirectMusicComposerImpl IDirectMusicComposer part: */ /* IDirectMusicComposerImpl IDirectMusicComposer part: */
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate (LPDIRECTMUSICCOMPOSER iface, IDirectMusicStyle* pStyle, IDirectMusicSegment* pTemplate, WORD wActivity, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppSegment) { static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; IDirectMusicStyle *pStyle, IDirectMusicSegment *pTemplate, WORD wActivity,
IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppSegment)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment); FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape (LPDIRECTMUSICCOMPOSER iface, IDirectMusicStyle* pStyle, WORD wNumMeasures, WORD wShape, WORD wActivity, BOOL fIntro, BOOL fEnd, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppSegment) { static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; IDirectMusicStyle *pStyle, WORD wNumMeasures, WORD wShape, WORD wActivity, BOOL fIntro,
BOOL fEnd, IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppSegment)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %d, %d, %d, %d, %d, %p, %p): stub\n", This, pStyle, wNumMeasures, wShape, wActivity, fIntro, fEnd, pChordMap, ppSegment); FIXME("(%p, %p, %d, %d, %d, %d, %d, %p, %p): stub\n", This, pStyle, wNumMeasures, wShape, wActivity, fIntro, fEnd, pChordMap, ppSegment);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeTransition (LPDIRECTMUSICCOMPOSER iface, IDirectMusicSegment* pFromSeg, IDirectMusicSegment* pToSeg, MUSIC_TIME mtTime, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppTransSeg) { static HRESULT WINAPI IDirectMusicComposerImpl_ComposeTransition(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; IDirectMusicSegment *pFromSeg, IDirectMusicSegment *pToSeg, MUSIC_TIME mtTime,
WORD wCommand, DWORD dwFlags, IDirectMusicChordMap *pChordMap,
IDirectMusicSegment **ppTransSeg)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %p, %d, %d, %d, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg); FIXME("(%p, %p, %p, %d, %d, %d, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicComposerImpl_AutoTransition (LPDIRECTMUSICCOMPOSER iface, IDirectMusicPerformance* pPerformance, IDirectMusicSegment* pToSeg, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppTransSeg, IDirectMusicSegmentState** ppToSegState, IDirectMusicSegmentState** ppTransSegState) { static HRESULT WINAPI IDirectMusicComposerImpl_AutoTransition(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; IDirectMusicPerformance *pPerformance, IDirectMusicSegment *pToSeg, WORD wCommand,
DWORD dwFlags, IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppTransSeg,
IDirectMusicSegmentState **ppToSegState, IDirectMusicSegmentState **ppTransSegState)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %d, %d, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState); FIXME("(%p, %p, %d, %d, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeTemplateFromShape (LPDIRECTMUSICCOMPOSER iface, WORD wNumMeasures, WORD wShape, BOOL fIntro, BOOL fEnd, WORD wEndLength, IDirectMusicSegment** ppTemplate) { static HRESULT WINAPI IDirectMusicComposerImpl_ComposeTemplateFromShape(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; WORD wNumMeasures, WORD wShape, BOOL fIntro, BOOL fEnd, WORD wEndLength,
IDirectMusicSegment **ppTemplate)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %d, %d, %d, %d, %d, %p): stub\n", This, wNumMeasures, wShape, fIntro, fEnd, wEndLength, ppTemplate); FIXME("(%p, %d, %d, %d, %d, %d, %p): stub\n", This, wNumMeasures, wShape, fIntro, fEnd, wEndLength, ppTemplate);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMPOSER iface, IDirectMusicSegment* pSegment, BOOL fTrackScale, IDirectMusicChordMap* pChordMap) { static HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap(IDirectMusicComposer *iface,
IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface; IDirectMusicSegment *pSegment, BOOL fTrackScale, IDirectMusicChordMap *pChordMap)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %d, %p): stub\n", This, pSegment, fTrackScale, pChordMap); FIXME("(%p, %p, %d, %p): stub\n", This, pSegment, fTrackScale, pChordMap);
return S_OK; return S_OK;
} }
static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = { static const IDirectMusicComposerVtbl dmcomposer_vtbl = {
IDirectMusicComposerImpl_QueryInterface, IDirectMusicComposerImpl_QueryInterface,
IDirectMusicComposerImpl_AddRef, IDirectMusicComposerImpl_AddRef,
IDirectMusicComposerImpl_Release, IDirectMusicComposerImpl_Release,
@ -112,17 +143,22 @@ static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = {
}; };
/* for ClassFactory */ /* for ClassFactory */
HRESULT WINAPI create_dmcomposer(REFIID lpcGUID, void **ppobj) HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface)
{ {
IDirectMusicComposerImpl* obj; IDirectMusicComposerImpl *obj;
HRESULT hr;
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicComposerImpl));
if (NULL == obj) { obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj));
*ppobj = NULL; if (!obj) {
return E_OUTOFMEMORY; *ret_iface = NULL;
} return E_OUTOFMEMORY;
obj->lpVtbl = &DirectMusicComposer_Vtbl; }
obj->ref = 0; /* will be inited by QueryInterface */ obj->IDirectMusicComposer_iface.lpVtbl = &dmcomposer_vtbl;
obj->ref = 1;
return IDirectMusicComposerImpl_QueryInterface ((LPDIRECTMUSICCOMPOSER)obj, lpcGUID, ppobj);
DMCOMPOS_LockModule();
hr = IDirectMusicComposer_QueryInterface(&obj->IDirectMusicComposer_iface, riid, ret_iface);
IDirectMusicComposer_Release(&obj->IDirectMusicComposer_iface);
return hr;
} }

12
dlls/dmcompos/dmcompos_private.h
View File

@ -46,7 +46,6 @@
* Interfaces * Interfaces
*/ */
typedef struct IDirectMusicChordMapImpl IDirectMusicChordMapImpl; typedef struct IDirectMusicChordMapImpl IDirectMusicChordMapImpl;
typedef struct IDirectMusicComposerImpl IDirectMusicComposerImpl;
typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack;
typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack;
@ -74,17 +73,6 @@ struct IDirectMusicChordMapImpl {
}; };
/*****************************************************************************
* IDirectMusicComposerImpl implementation structure
*/
struct IDirectMusicComposerImpl {
/* IUnknown fields */
const IDirectMusicComposerVtbl *lpVtbl;
LONG ref;
/* IDirectMusicComposerImpl fields */
};
/***************************************************************************** /*****************************************************************************
* IDirectMusicChordMapTrack implementation structure * IDirectMusicChordMapTrack implementation structure
*/ */