[PATCH 4/7] dmcompos: COM cleanup for IDirectMusicTrack8 of DMSignPostTrack
Michael Stefaniuc
mstefani at redhat.de
Sun Jun 28 16:35:47 CDT 2015
---
Odd identation fixes itself after patch 6.
dlls/dmcompos/signposttrack.c | 118 ++++++++++++++++++++++++++----------------
1 file changed, 72 insertions(+), 46 deletions(-)
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c
index ed7b706..c368874 100644
--- a/dlls/dmcompos/signposttrack.c
+++ b/dlls/dmcompos/signposttrack.c
@@ -22,7 +22,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface);
-static ULONG WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface);
static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface);
/*****************************************************************************
@@ -30,7 +29,7 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST
*/
typedef struct IDirectMusicSignPostTrack {
const IUnknownVtbl *UnknownVtbl;
- const IDirectMusicTrack8Vtbl *TrackVtbl;
+ IDirectMusicTrack8 IDirectMusicTrack8_iface;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
@@ -47,8 +46,8 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNO
return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|| IsEqualIID (riid, &IID_IDirectMusicTrack8)) {
- *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl;
- IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
+ *ppobj = &This->IDirectMusicTrack8_iface;
+ IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
return S_OK;
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
*ppobj = &This->PersistStreamVtbl;
@@ -95,44 +94,57 @@ static const IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = {
/* IDirectMusicSignPostTrack IDirectMusicTrack8 part: */
static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
{
- return CONTAINING_RECORD(iface, IDirectMusicSignPostTrack, TrackVtbl);
+ return CONTAINING_RECORD(iface, IDirectMusicSignPostTrack, IDirectMusicTrack8_iface);
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
+ void **ppobj)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
}
-static ULONG WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
return IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
}
-static ULONG WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
+ IDirectMusicSegment *pSegment)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pSegment);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
+ IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance,
+ void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
+{
+ IDirectMusicSignPostTrack *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 IDirectMusicSignPostTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pStateData);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) {
- IDirectMusicSignPostTrack *This = (IDirectMusicSignPostTrack *)iface;
+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)
+{
+ IDirectMusicSignPostTrack *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;
}
@@ -165,26 +177,35 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
+ REFGUID rguidNotificationType)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+ REFGUID rguidNotificationType)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
+ MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_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(IDirectMusicSignPostTrack, 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)
+{
+ IDirectMusicSignPostTrack *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;
@@ -210,37 +231,42 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
- IDirectMusicSignPostTrack *This = (IDirectMusicSignPostTrack *)iface;
+static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext,
+ DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
+static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
+ IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup,
+ IDirectMusicTrack **ppResultTrack)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
return S_OK;
}
-static const IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl = {
- IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface,
- IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef,
- IDirectMusicSignPostTrack_IDirectMusicTrack_Release,
- IDirectMusicSignPostTrack_IDirectMusicTrack_Init,
- IDirectMusicSignPostTrack_IDirectMusicTrack_InitPlay,
- IDirectMusicSignPostTrack_IDirectMusicTrack_EndPlay,
- IDirectMusicSignPostTrack_IDirectMusicTrack_Play,
+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,
- IDirectMusicSignPostTrack_IDirectMusicTrack_AddNotificationType,
- IDirectMusicSignPostTrack_IDirectMusicTrack_RemoveNotificationType,
- IDirectMusicSignPostTrack_IDirectMusicTrack_Clone,
- IDirectMusicSignPostTrack_IDirectMusicTrack_PlayEx,
+ IDirectMusicTrack8Impl_AddNotificationType,
+ IDirectMusicTrack8Impl_RemoveNotificationType,
+ IDirectMusicTrack8Impl_Clone,
+ IDirectMusicTrack8Impl_PlayEx,
IDirectMusicTrack8Impl_GetParamEx,
IDirectMusicTrack8Impl_SetParamEx,
- IDirectMusicSignPostTrack_IDirectMusicTrack_Compose,
- IDirectMusicSignPostTrack_IDirectMusicTrack_Join
+ IDirectMusicTrack8Impl_Compose,
+ IDirectMusicTrack8Impl_Join
};
/* IDirectMusicSignPostTrack IPersistStream part: */
@@ -304,7 +330,7 @@ HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl;
- track->TrackVtbl = &DirectMusicSignPostTrack_Track_Vtbl;
+ 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);
--
2.1.0
More information about the wine-patches
mailing list