Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods in DMWaveTrack.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 3 09:02:37 CDT 2015
Module: wine
Branch: master
Commit: b90599976134b41a4d83ef2d2f84b38098fa3cae
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90599976134b41a4d83ef2d2f84b38098fa3cae
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Jul 3 10:32:51 2015 +0200
dmime: Implement the E_NOTIMPL methods in DMWaveTrack.
---
dlls/dmime/wavetrack.c | 58 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 20 deletions(-)
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index b895c27..25420d1 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -91,6 +91,11 @@ static const IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl = {
};
/* IDirectMusicWaveTrack IDirectMusicTrack8 part: */
+static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
+{
+ return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, TrackVtbl);
+}
+
static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
@@ -161,16 +166,22 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_IsParamSupported (
return DMUS_E_TYPE_UNSUPPORTED;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
- FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
- return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
+ REFGUID notiftype)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+ return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface);
- FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
- return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+ REFGUID notiftype)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+ return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
@@ -200,16 +211,23 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_SetParamEx (LPDIRE
return S_OK;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, 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)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, 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)
+{
+ IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+ TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context,
+ trackgroup, resulttrack);
+ return E_NOTIMPL;
}
static const IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = {
@@ -223,14 +241,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = {
IDirectMusicWaveTrack_IDirectMusicTrack_GetParam,
IDirectMusicWaveTrack_IDirectMusicTrack_SetParam,
IDirectMusicWaveTrack_IDirectMusicTrack_IsParamSupported,
- IDirectMusicWaveTrack_IDirectMusicTrack_AddNotificationType,
- IDirectMusicWaveTrack_IDirectMusicTrack_RemoveNotificationType,
+ IDirectMusicTrack8Impl_AddNotificationType,
+ IDirectMusicTrack8Impl_RemoveNotificationType,
IDirectMusicWaveTrack_IDirectMusicTrack_Clone,
IDirectMusicWaveTrack_IDirectMusicTrack_PlayEx,
IDirectMusicWaveTrack_IDirectMusicTrack_GetParamEx,
IDirectMusicWaveTrack_IDirectMusicTrack_SetParamEx,
- IDirectMusicWaveTrack_IDirectMusicTrack_Compose,
- IDirectMusicWaveTrack_IDirectMusicTrack_Join
+ IDirectMusicTrack8Impl_Compose,
+ IDirectMusicTrack8Impl_Join
};
/* IDirectMusicWaveTrack IPersistStream part: */
More information about the wine-cvs
mailing list