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

dmband: COM cleanup for IDirectMusicBand.

This commit is contained in:
Michael Stefaniuc 2014-01-30 01:04:58 +01:00 committed by Alexandre Julliard
parent 0d94b4b0f0
commit 868ad7dc72
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/dmband/band.c
View File

@ -26,6 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/***************************************************************************** /*****************************************************************************
* IDirectMusicBandImpl implementation * IDirectMusicBandImpl implementation
*/ */
static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface);
}
/* IDirectMusicBandImpl IUnknown part: */ /* IDirectMusicBandImpl IUnknown part: */
static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface);
@ -36,7 +41,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN if
IUnknown_AddRef (iface); IUnknown_AddRef (iface);
return S_OK; return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicBand)) { } else if (IsEqualIID (riid, &IID_IDirectMusicBand)) {
*ppobj = &This->BandVtbl; *ppobj = &This->IDirectMusicBand_iface;
IUnknown_AddRef (iface); IUnknown_AddRef (iface);
return S_OK; return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) {
@ -89,26 +94,26 @@ static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = {
static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid,
void **ppobj) void **ppobj)
{ {
ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface);
return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
} }
static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface)
{ {
ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface);
return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
} }
static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface)
{ {
ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface);
return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
} }
static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface,
IDirectMusicSegment **ppSegment) IDirectMusicSegment **ppSegment)
{ {
ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface);
FIXME("(%p, %p): stub\n", This, ppSegment); FIXME("(%p, %p): stub\n", This, ppSegment);
return S_OK; return S_OK;
} }
@ -116,7 +121,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface
static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface,
IDirectMusicPerformance *pPerformance) IDirectMusicPerformance *pPerformance)
{ {
ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface);
FIXME("(%p, %p): stub\n", This, pPerformance); FIXME("(%p, %p): stub\n", This, pPerformance);
return S_OK; return S_OK;
} }
@ -124,12 +129,12 @@ static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface,
static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface, static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface,
IDirectMusicPerformance *pPerformance) IDirectMusicPerformance *pPerformance)
{ {
ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface);
FIXME("(%p, %p): stub\n", This, pPerformance); FIXME("(%p, %p): stub\n", This, pPerformance);
return S_OK; return S_OK;
} }
static const IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = { static const IDirectMusicBandVtbl dmband_vtbl = {
IDirectMusicBandImpl_QueryInterface, IDirectMusicBandImpl_QueryInterface,
IDirectMusicBandImpl_AddRef, IDirectMusicBandImpl_AddRef,
IDirectMusicBandImpl_Release, IDirectMusicBandImpl_Release,
@ -707,7 +712,7 @@ HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl; obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl;
obj->BandVtbl = &DirectMusicBand_Band_Vtbl; obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl;
obj->ObjectVtbl = &DirectMusicBand_Object_Vtbl; obj->ObjectVtbl = &DirectMusicBand_Object_Vtbl;
obj->PersistStreamVtbl = &DirectMusicBand_PersistStream_Vtbl; obj->PersistStreamVtbl = &DirectMusicBand_PersistStream_Vtbl;
obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));

2
dlls/dmband/dmband_private.h
View File

@ -88,7 +88,7 @@ typedef struct _DMUS_PRIVATE_BAND {
struct IDirectMusicBandImpl { struct IDirectMusicBandImpl {
/* IUnknown fields */ /* IUnknown fields */
const IUnknownVtbl *UnknownVtbl; const IUnknownVtbl *UnknownVtbl;
const IDirectMusicBandVtbl *BandVtbl; IDirectMusicBand IDirectMusicBand_iface;
const IDirectMusicObjectVtbl *ObjectVtbl; const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl; const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref; LONG ref;