Skip to content

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

dmime: COM cleanup for IDirectMusicTrack of DMSysExTrack.

parent ac18130e
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 32 deletions
dlls/dmime/sysextrack.c
View file @ 9a47a46a
...@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); ...@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
*/ */
typedef struct IDirectMusicSysExTrack { typedef struct IDirectMusicSysExTrack {
const IUnknownVtbl *UnknownVtbl; const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface;
const IPersistStreamVtbl *PersistStreamVtbl; const IPersistStreamVtbl *PersistStreamVtbl;
LONG ref; LONG ref;
DMUS_OBJECTDESC *pDesc; DMUS_OBJECTDESC *pDesc;
...@@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN ...@@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN
return S_OK; return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack) } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|| IsEqualIID (riid, &IID_IDirectMusicTrack8)) { || IsEqualIID (riid, &IID_IDirectMusicTrack8)) {
*ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; *ppobj = &This->IDirectMusicTrack8_iface;
IUnknown_AddRef(iface); IUnknown_AddRef(iface);
return S_OK; return S_OK;
} else if (IsEqualIID (riid, &IID_IPersistStream)) { } else if (IsEqualIID (riid, &IID_IPersistStream)) {
...@@ -90,48 +90,57 @@ static const IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = { ...@@ -90,48 +90,57 @@ static const IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = {
/* IDirectMusicSysExTrack IDirectMusicTrack8 part: */ /* IDirectMusicSysExTrack IDirectMusicTrack8 part: */
static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
{ {
return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, TrackVtbl); return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, IDirectMusicTrack8_iface);
} }
static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); void **ppobj)
{
IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
} }
static ULONG WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) { static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); {
IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
} }
static ULONG WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) { static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); {
IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
} }
static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment) static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
IDirectMusicSegment *pSegment)
{ {
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pSegment); FIXME("(%p, %p): stub\n", This, pSegment);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSysExTrack_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(IDirectMusicSysExTrack, TrackVtbl, iface); IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
{ {
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pStateData); FIXME("(%p, %p): stub\n", This, pStateData);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSysExTrack_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(IDirectMusicSysExTrack, TrackVtbl, iface); IDirectMusicSysExTrack *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); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -182,14 +191,19 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic ...@@ -182,14 +191,19 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{
IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags,
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{
IDirectMusicSysExTrack *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), 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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
...@@ -234,21 +248,21 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, ...@@ -234,21 +248,21 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface, IDirectMusicTrack8Impl_QueryInterface,
IDirectMusicSysExTrack_IDirectMusicTrack_AddRef, IDirectMusicTrack8Impl_AddRef,
IDirectMusicSysExTrack_IDirectMusicTrack_Release, IDirectMusicTrack8Impl_Release,
IDirectMusicSysExTrack_IDirectMusicTrack_Init, IDirectMusicTrack8Impl_Init,
IDirectMusicSysExTrack_IDirectMusicTrack_InitPlay, IDirectMusicTrack8Impl_InitPlay,
IDirectMusicSysExTrack_IDirectMusicTrack_EndPlay, IDirectMusicTrack8Impl_EndPlay,
IDirectMusicSysExTrack_IDirectMusicTrack_Play, IDirectMusicTrack8Impl_Play,
IDirectMusicTrack8Impl_GetParam, IDirectMusicTrack8Impl_GetParam,
IDirectMusicTrack8Impl_SetParam, IDirectMusicTrack8Impl_SetParam,
IDirectMusicTrack8Impl_IsParamSupported, IDirectMusicTrack8Impl_IsParamSupported,
IDirectMusicTrack8Impl_AddNotificationType, IDirectMusicTrack8Impl_AddNotificationType,
IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicTrack8Impl_RemoveNotificationType,
IDirectMusicSysExTrack_IDirectMusicTrack_Clone, IDirectMusicTrack8Impl_Clone,
IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx, IDirectMusicTrack8Impl_PlayEx,
IDirectMusicTrack8Impl_GetParamEx, IDirectMusicTrack8Impl_GetParamEx,
IDirectMusicTrack8Impl_SetParamEx, IDirectMusicTrack8Impl_SetParamEx,
IDirectMusicTrack8Impl_Compose, IDirectMusicTrack8Impl_Compose,
...@@ -314,7 +328,7 @@ HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj) ...@@ -314,7 +328,7 @@ HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl; track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl;
track->TrackVtbl = &DirectMusicSysExTrack_Track_Vtbl; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
track->PersistStreamVtbl = &DirectMusicSysExTrack_PersistStream_Vtbl; track->PersistStreamVtbl = &DirectMusicSysExTrack_PersistStream_Vtbl;
track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
DM_STRUCT_INIT(track->pDesc); 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