Module: wine Branch: master Commit: 1637360fa8261cb25c3a4c428fc57eaaac322546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1637360fa8261cb25c3a4c428f...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jul 3 10:10:37 2015 +0200
dmime: Implement the E_NOTIMPL methods in DMLyricsTrack.
---
dlls/dmime/lyricstrack.c | 58 +++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-)
diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 7323532..408ba5d 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl = { };
/* IDirectMusicLyricsTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -152,16 +157,22 @@ static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_IsParamSupported return DMUS_E_TYPE_UNSUPPORTED; }
-static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; }
-static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; }
static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -191,16 +202,23 @@ static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_SetParamEx (LPDI return S_OK; }
-static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; }
-static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, + resulttrack); + return E_NOTIMPL; }
static const IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = { @@ -214,14 +232,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = { IDirectMusicLyricsTrack_IDirectMusicTrack_GetParam, IDirectMusicLyricsTrack_IDirectMusicTrack_SetParam, IDirectMusicLyricsTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicLyricsTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicLyricsTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicLyricsTrack_IDirectMusicTrack_Clone, IDirectMusicLyricsTrack_IDirectMusicTrack_PlayEx, IDirectMusicLyricsTrack_IDirectMusicTrack_GetParamEx, IDirectMusicLyricsTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicLyricsTrack_IDirectMusicTrack_Compose, - IDirectMusicLyricsTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join };
/* IDirectMusicLyricsTrack IPersistStream part: */
-
Alexandre Julliard