[PATCH 18/20] dmime: COM cleanup for IDirectMusicTrack of DMWaveTrack
Michael Stefaniuc
mstefani at redhat.de
Fri Jul 3 03:33:45 CDT 2015
---
dlls/dmime/wavetrack.c | 119 ++++++++++++++++++++++++++++++-------------------
1 file changed, 72 insertions(+), 47 deletions(-)
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index 25420d1..ec5a177 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
*/
typedef struct IDirectMusicWaveTrack {
const IUnknownVtbl *UnknownVtbl;
- const IDirectMusicTrack8Vtbl *TrackVtbl;
+ IDirectMusicTrack8 IDirectMusicTrack8_iface;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
@@ -46,7 +46,7 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN i
return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|| IsEqualIID (riid, &IID_IDirectMusicTrack8)) {
- *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl;
+ *ppobj = &This->IDirectMusicTrack8_iface;
IUnknown_AddRef (iface);
return S_OK;
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
@@ -93,66 +93,81 @@ static const IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl = {
/* IDirectMusicWaveTrack IDirectMusicTrack8 part: */
static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
{
- return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, TrackVtbl);
+ return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface);
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
+ void **ppobj)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
}
-static ULONG WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
}
-static ULONG WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment)
+static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
+ IDirectMusicSegment *pSegment)
{
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pSegment);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
+static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
+ IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance,
+ void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData)
+static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
{
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pStateData);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID)
+static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData,
+ MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags,
+ IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
+ MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
+ MUSIC_TIME mtTime, void *pParam)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
+ REFGUID rguidType)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
if (IsEqualGUID (rguidType, &GUID_Disable_Auto_Download)
@@ -184,28 +199,38 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
+ MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
+ REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags,
+ IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface,
+ REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam,
+ void *pStateData, DWORD dwFlags)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface,
+ REFGUID rguidType, REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK;
@@ -230,23 +255,23 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
return E_NOTIMPL;
}
-static const IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = {
- IDirectMusicWaveTrack_IDirectMusicTrack_QueryInterface,
- IDirectMusicWaveTrack_IDirectMusicTrack_AddRef,
- IDirectMusicWaveTrack_IDirectMusicTrack_Release,
- IDirectMusicWaveTrack_IDirectMusicTrack_Init,
- IDirectMusicWaveTrack_IDirectMusicTrack_InitPlay,
- IDirectMusicWaveTrack_IDirectMusicTrack_EndPlay,
- IDirectMusicWaveTrack_IDirectMusicTrack_Play,
- IDirectMusicWaveTrack_IDirectMusicTrack_GetParam,
- IDirectMusicWaveTrack_IDirectMusicTrack_SetParam,
- IDirectMusicWaveTrack_IDirectMusicTrack_IsParamSupported,
+static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
+ IDirectMusicTrack8Impl_QueryInterface,
+ IDirectMusicTrack8Impl_AddRef,
+ IDirectMusicTrack8Impl_Release,
+ IDirectMusicTrack8Impl_Init,
+ IDirectMusicTrack8Impl_InitPlay,
+ IDirectMusicTrack8Impl_EndPlay,
+ IDirectMusicTrack8Impl_Play,
+ IDirectMusicTrack8Impl_GetParam,
+ IDirectMusicTrack8Impl_SetParam,
+ IDirectMusicTrack8Impl_IsParamSupported,
IDirectMusicTrack8Impl_AddNotificationType,
IDirectMusicTrack8Impl_RemoveNotificationType,
- IDirectMusicWaveTrack_IDirectMusicTrack_Clone,
- IDirectMusicWaveTrack_IDirectMusicTrack_PlayEx,
- IDirectMusicWaveTrack_IDirectMusicTrack_GetParamEx,
- IDirectMusicWaveTrack_IDirectMusicTrack_SetParamEx,
+ IDirectMusicTrack8Impl_Clone,
+ IDirectMusicTrack8Impl_PlayEx,
+ IDirectMusicTrack8Impl_GetParamEx,
+ IDirectMusicTrack8Impl_SetParamEx,
IDirectMusicTrack8Impl_Compose,
IDirectMusicTrack8Impl_Join
};
@@ -310,7 +335,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicWaveTrack_Unknown_Vtbl;
- track->TrackVtbl = &DirectMusicWaveTrack_Track_Vtbl;
+ track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
track->PersistStreamVtbl = &DirectMusicWaveTrack_PersistStream_Vtbl;
track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
DM_STRUCT_INIT(track->pDesc);
--
2.1.0
More information about the wine-patches
mailing list