Skip to content

W
wine-winehq
Commit 360a2467 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

dmime: COM cleanup for IDirectMusicTrack of DMSegTriggerTrack.

parent 3de79096
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 47 deletions
dlls/dmime/segtriggertrack.c
View file @ 360a2467
......@@ -28,7 +28,7 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
*/
typedef struct IDirectMusicSegTriggerTrack {
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
IDirectMusicTrack8 IDirectMusicTrack8_iface;
const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref;
DMUS_OBJECTDESC *pDesc;
......@@ -46,7 +46,7 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IUnknown_QueryInterface (LPUNK
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 DirectMusicSegTriggerTrack_Unknown_Vtbl = {
/* IDirectMusicSegTriggerTrack IDirectMusicTrack8 part: */
static inline IDirectMusicSegTriggerTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, TrackVtbl);
return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, IDirectMusicTrack8_iface);
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
void **ppobj)
{
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
}
static ULONG WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
{
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
}
static ULONG WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
{
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment)
static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
IDirectMusicSegment *pSegment)
{
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pSegment);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_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(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
IDirectMusicSegTriggerTrack *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 IDirectMusicSegTriggerTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData)
static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
{
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pStateData);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_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(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
IDirectMusicSegTriggerTrack *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 IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
{
IDirectMusicSegTriggerTrack *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 IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, void *pParam)
{
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
REFGUID rguidType)
{
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
/* didn't find any params */
......@@ -178,28 +193,38 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{
IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSegTriggerTrack_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(IDirectMusicSegTriggerTrack, 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)
{
IDirectMusicSegTriggerTrack *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 IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface,
REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam,
void *pStateData, DWORD dwFlags)
{
IDirectMusicSegTriggerTrack *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 IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) {
ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface,
REFGUID rguidType, REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{
IDirectMusicSegTriggerTrack *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;
......@@ -224,23 +249,23 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
return E_NOTIMPL;
}
static const IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = {
IDirectMusicSegTriggerTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddRef,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_Release,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_Init,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_InitPlay,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_EndPlay,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_Play,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParam,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParam,
IDirectMusicSegTriggerTrack_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,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_Clone,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_PlayEx,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParamEx,
IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParamEx,
IDirectMusicTrack8Impl_Clone,
IDirectMusicTrack8Impl_PlayEx,
IDirectMusicTrack8Impl_GetParamEx,
IDirectMusicTrack8Impl_SetParamEx,
IDirectMusicTrack8Impl_Compose,
IDirectMusicTrack8Impl_Join
};
......@@ -559,7 +584,7 @@ HRESULT WINAPI create_dmsegtriggertrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicSegTriggerTrack_Unknown_Vtbl;
track->TrackVtbl = &DirectMusicSegTriggerTrack_Track_Vtbl;
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
track->PersistStreamVtbl = &DirectMusicSegTriggerTrack_PersistStream_Vtbl;
track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
DM_STRUCT_INIT(track->pDesc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment