Michael Stefaniuc : dmime: Implement the remaining E_NOTIMPL methods of IDirectMusicTrack8.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jul 6 06:37:35 CDT 2015


Module: wine
Branch: master
Commit: 8e959e1203c4a9f39e30ade35adf217cc1f353a6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8e959e1203c4a9f39e30ade35adf217cc1f353a6

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Mon Jul  6 00:02:51 2015 +0200

dmime: Implement the remaining E_NOTIMPL methods of IDirectMusicTrack8.

---

 dlls/dmime/segtriggertrack.c | 58 +++++++++++++++++++++++++++++---------------
 dlls/dmime/tempotrack.c      | 44 +++++++++++++++++++++------------
 2 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 882ada2..e37454e 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -91,6 +91,11 @@ static const IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl = {
 };
 
 /* IDirectMusicSegTriggerTrack IDirectMusicTrack8 part: */
+static inline IDirectMusicSegTriggerTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
+{
+    return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, TrackVtbl);
+}
+
 static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
 	return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
@@ -155,16 +160,22 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_IsParamSuppo
 	return DMUS_E_TYPE_UNSUPPORTED;
 }
 
-static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
-	ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
-	FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
-	return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
+        REFGUID notiftype)
+{
+    IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+    return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
-	ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface);
-	FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
-	return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+        REFGUID notiftype)
+{
+    IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
@@ -194,16 +205,23 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParamEx (
 	return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
-	ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, 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)
+{
+    IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
-	ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, 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)
+{
+    IDirectMusicSegTriggerTrack *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 DirectMusicSegTriggerTrack_Track_Vtbl = {
@@ -217,14 +235,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = {
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParam,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParam,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_IsParamSupported,
-	IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddNotificationType,
-	IDirectMusicSegTriggerTrack_IDirectMusicTrack_RemoveNotificationType,
+    IDirectMusicTrack8Impl_AddNotificationType,
+    IDirectMusicTrack8Impl_RemoveNotificationType,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_Clone,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_PlayEx,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParamEx,
 	IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParamEx,
-	IDirectMusicSegTriggerTrack_IDirectMusicTrack_Compose,
-	IDirectMusicSegTriggerTrack_IDirectMusicTrack_Join
+    IDirectMusicTrack8Impl_Compose,
+    IDirectMusicTrack8Impl_Join
 };
 
 /* IDirectMusicSegTriggerTrack IPersistStream part: */
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index 569a61e..104e65c 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -92,6 +92,11 @@ static const IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl = {
 };
 
 /* IDirectMusicTempoTrack IDirectMusicTrack8 part: */
+static inline IDirectMusicTempoTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
+{
+    return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, TrackVtbl);
+}
+
 static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) {
   ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface);
   return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
@@ -228,16 +233,22 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_IsParamSupported
   return DMUS_E_TYPE_UNSUPPORTED;
 }
 
-static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
-  ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface);
-  FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
-  return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
+        REFGUID notiftype)
+{
+    IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+    return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) {
-  ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface);
-  FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
-  return S_OK;
+static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+        REFGUID notiftype)
+{
+    IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) {
@@ -267,10 +278,13 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_SetParamEx (LPDIR
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
-  ICOM_THIS_MULTI(IDirectMusicTempoTrack, 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)
+{
+    IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
@@ -290,13 +304,13 @@ static const IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl = {
   IDirectMusicTempoTrack_IDirectMusicTrack_GetParam,
   IDirectMusicTempoTrack_IDirectMusicTrack_SetParam,
   IDirectMusicTempoTrack_IDirectMusicTrack_IsParamSupported,
-  IDirectMusicTempoTrack_IDirectMusicTrack_AddNotificationType,
-  IDirectMusicTempoTrack_IDirectMusicTrack_RemoveNotificationType,
+    IDirectMusicTrack8Impl_AddNotificationType,
+    IDirectMusicTrack8Impl_RemoveNotificationType,
   IDirectMusicTempoTrack_IDirectMusicTrack_Clone,
   IDirectMusicTempoTrack_IDirectMusicTrack_PlayEx,
   IDirectMusicTempoTrack_IDirectMusicTrack_GetParamEx,
   IDirectMusicTempoTrack_IDirectMusicTrack_SetParamEx,
-  IDirectMusicTempoTrack_IDirectMusicTrack_Compose,
+    IDirectMusicTrack8Impl_Compose,
   IDirectMusicTempoTrack_IDirectMusicTrack_Join
 };
 




More information about the wine-cvs mailing list