[PATCH 2/4] dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8
Michael Stefaniuc
mstefani at redhat.de
Wed Jun 24 17:38:37 CDT 2015
---
dlls/dmcompos/chordmaptrack.c | 44 ++++++++++++++++---------
dlls/dmcompos/signposttrack.c | 77 +++++++++++++++++++++++++++----------------
2 files changed, 77 insertions(+), 44 deletions(-)
diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c
index 9077c88..99cdd10 100644
--- a/dlls/dmcompos/chordmaptrack.c
+++ b/dlls/dmcompos/chordmaptrack.c
@@ -85,6 +85,11 @@ static const IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = {
};
/* IDirectMusicChordMapTrack IDirectMusicTrack8 part: */
+static inline IDirectMusicChordMapTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
+{
+ return CONTAINING_RECORD(iface, IDirectMusicChordMapTrack, TrackVtbl);
+}
+
static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface);
return IDirectMusicChordMapTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
@@ -151,16 +156,22 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_IsParamSupport
return DMUS_E_TYPE_UNSUPPORTED;
}
-static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
- ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface);
- FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
- return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
+ REFGUID notiftype)
+{
+ IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+ return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
- ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface);
- FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
- return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+ REFGUID notiftype)
+{
+ IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+ return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
@@ -190,10 +201,13 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_SetParamEx (LP
return S_OK;
}
-static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
- ICOM_THIS_MULTI(IDirectMusicChordMapTrack, 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)
+{
+ IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+ return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
@@ -213,13 +227,13 @@ static const IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl = {
IDirectMusicChordMapTrack_IDirectMusicTrack_GetParam,
IDirectMusicChordMapTrack_IDirectMusicTrack_SetParam,
IDirectMusicChordMapTrack_IDirectMusicTrack_IsParamSupported,
- IDirectMusicChordMapTrack_IDirectMusicTrack_AddNotificationType,
- IDirectMusicChordMapTrack_IDirectMusicTrack_RemoveNotificationType,
+ IDirectMusicTrack8Impl_AddNotificationType,
+ IDirectMusicTrack8Impl_RemoveNotificationType,
IDirectMusicChordMapTrack_IDirectMusicTrack_Clone,
IDirectMusicChordMapTrack_IDirectMusicTrack_PlayEx,
IDirectMusicChordMapTrack_IDirectMusicTrack_GetParamEx,
IDirectMusicChordMapTrack_IDirectMusicTrack_SetParamEx,
- IDirectMusicChordMapTrack_IDirectMusicTrack_Compose,
+ IDirectMusicTrack8Impl_Compose,
IDirectMusicChordMapTrack_IDirectMusicTrack_Join
};
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c
index 586c085..28f3367 100644
--- a/dlls/dmcompos/signposttrack.c
+++ b/dlls/dmcompos/signposttrack.c
@@ -85,6 +85,11 @@ static const IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = {
};
/* IDirectMusicSignPostTrack IDirectMusicTrack8 part: */
+static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
+{
+ return CONTAINING_RECORD(iface, IDirectMusicSignPostTrack, TrackVtbl);
+}
+
static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
@@ -124,24 +129,32 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Play (LPDIRECT
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
- FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
- return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type,
+ MUSIC_TIME time, MUSIC_TIME *next, void *param)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time,
+ next, param);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
- FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam);
- return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID type,
+ MUSIC_TIME time, void *param)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface);
- TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
- /* didn't find any params */
- TRACE("param unsupported\n");
- return DMUS_E_TYPE_UNSUPPORTED;
+static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
+ REFGUID type)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type));
+ return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
@@ -169,18 +182,24 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_PlayEx (LPDIRE
return S_OK;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, 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 IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type,
+ REFERENCE_TIME time, REFERENCE_TIME *next, void *param, void *state, DWORD flags)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type),
+ wine_dbgstr_longlong(time), next, param, state, flags);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) {
- ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, 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;
+static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type,
+ REFERENCE_TIME time, void *param, void *state, DWORD flags)
+{
+ IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+ TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type),
+ wine_dbgstr_longlong(time), param, state, flags);
+ return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
@@ -203,15 +222,15 @@ static const IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl = {
IDirectMusicSignPostTrack_IDirectMusicTrack_InitPlay,
IDirectMusicSignPostTrack_IDirectMusicTrack_EndPlay,
IDirectMusicSignPostTrack_IDirectMusicTrack_Play,
- IDirectMusicSignPostTrack_IDirectMusicTrack_GetParam,
- IDirectMusicSignPostTrack_IDirectMusicTrack_SetParam,
- IDirectMusicSignPostTrack_IDirectMusicTrack_IsParamSupported,
+ IDirectMusicTrack8Impl_GetParam,
+ IDirectMusicTrack8Impl_SetParam,
+ IDirectMusicTrack8Impl_IsParamSupported,
IDirectMusicSignPostTrack_IDirectMusicTrack_AddNotificationType,
IDirectMusicSignPostTrack_IDirectMusicTrack_RemoveNotificationType,
IDirectMusicSignPostTrack_IDirectMusicTrack_Clone,
IDirectMusicSignPostTrack_IDirectMusicTrack_PlayEx,
- IDirectMusicSignPostTrack_IDirectMusicTrack_GetParamEx,
- IDirectMusicSignPostTrack_IDirectMusicTrack_SetParamEx,
+ IDirectMusicTrack8Impl_GetParamEx,
+ IDirectMusicTrack8Impl_SetParamEx,
IDirectMusicSignPostTrack_IDirectMusicTrack_Compose,
IDirectMusicSignPostTrack_IDirectMusicTrack_Join
};
--
2.1.0
More information about the wine-patches
mailing list