From cfcc0dda15eb04c87319e2a0cd61212cdf8dcce7 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 5 Oct 2017 05:15:45 +0000 Subject: [PATCH] qedit: Support IAMTimelineGroup interface in IAMTimelineObj. Signed-off-by: Alistair Leslie-Hughes Signed-off-by: Alexandre Julliard --- dlls/qedit/tests/timeline.c | 12 ++- dlls/qedit/timeline.c | 195 ++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 4801743116b..b1011fc6610 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -124,11 +124,17 @@ static void test_timelineobj_interfaces(void) if(hr == S_OK) { IAMTimelineGroup *group; + IAMTimelineObj *obj2; hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimelineGroup, (void **)&group); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - IAMTimelineGroup_Release(group); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IAMTimelineGroup_QueryInterface(group, &IID_IAMTimelineObj, (void **)&obj2); + ok(hr == S_OK, "got %08x\n", hr); + ok(obj == obj2, "Different pointers\n"); + IAMTimelineObj_Release(obj2); + + IAMTimelineGroup_Release(group); IAMTimelineObj_Release(obj); } diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 906efd5fd7a..5d3fb461ff0 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -51,6 +51,7 @@ static inline TimelineImpl *impl_from_IAMTimeline(IAMTimeline *iface) typedef struct { IAMTimelineObj IAMTimelineObj_iface; + IAMTimelineGroup IAMTimelineGroup_iface; LONG ref; TIMELINE_MAJOR_TYPE timeline_type; } TimelineObjImpl; @@ -60,7 +61,13 @@ static inline TimelineObjImpl *impl_from_IAMTimelineObj(IAMTimelineObj *iface) return CONTAINING_RECORD(iface, TimelineObjImpl, IAMTimelineObj_iface); } +static inline TimelineObjImpl *impl_from_IAMTimelineGroup(IAMTimelineGroup *iface) +{ + return CONTAINING_RECORD(iface, TimelineObjImpl, IAMTimelineGroup_iface); +} + static const IAMTimelineObjVtbl IAMTimelineObj_VTable; +static const IAMTimelineGroupVtbl IAMTimelineGroup_VTable; /* Timeline inner IUnknown */ @@ -170,6 +177,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, I obj_impl->ref = 1; obj_impl->IAMTimelineObj_iface.lpVtbl = &IAMTimelineObj_VTable; + obj_impl->IAMTimelineGroup_iface.lpVtbl = &IAMTimelineGroup_VTable; obj_impl->timeline_type = type; *obj = &obj_impl->IAMTimelineObj_iface; @@ -453,6 +461,8 @@ static HRESULT WINAPI TimelineObj_QueryInterface(IAMTimelineObj *iface, REFIID r *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAMTimelineObj)) *ppv = &This->IAMTimelineObj_iface; + else if (IsEqualIID(riid, &IID_IAMTimelineGroup)) + *ppv = &This->IAMTimelineGroup_iface; else WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); @@ -803,3 +813,188 @@ static const IAMTimelineObjVtbl IAMTimelineObj_VTable = TimelineObj_GetGroupIBelongTo, TimelineObj_GetEmbedDepth, }; + +static HRESULT WINAPI timelinegrp_QueryInterface(IAMTimelineGroup *iface, REFIID riid, void **object) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + return IAMTimelineObj_QueryInterface(&This->IAMTimelineObj_iface, riid, object); +} + +static ULONG WINAPI timelinegrp_AddRef(IAMTimelineGroup *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + return IAMTimelineObj_AddRef(&This->IAMTimelineObj_iface); +} + +static ULONG WINAPI timelinegrp_Release(IAMTimelineGroup *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + return IAMTimelineObj_Release(&This->IAMTimelineObj_iface); +} + +static HRESULT WINAPI timelinegrp_SetTimeline(IAMTimelineGroup *iface, IAMTimeline *timeline) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, timeline); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetTimeline(IAMTimelineGroup *iface, IAMTimeline **timeline) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, timeline); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetPriority(IAMTimelineGroup *iface, LONG *priority) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, priority); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetMediaType(IAMTimelineGroup *iface, AM_MEDIA_TYPE *mediatype) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, mediatype); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetMediaType(IAMTimelineGroup *iface, AM_MEDIA_TYPE *mediatype) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, mediatype); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetOutputFPS(IAMTimelineGroup *iface, double fps) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%f)\n", This, fps); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetOutputFPS(IAMTimelineGroup *iface, double *fps) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, fps); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetGroupName(IAMTimelineGroup *iface, BSTR name) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetGroupName(IAMTimelineGroup *iface, BSTR *name) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetPreviewMode(IAMTimelineGroup *iface, BOOL preview) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%d)\n", This, preview); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetPreviewMode(IAMTimelineGroup *iface, BOOL *preview) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, preview); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetMediaTypeForVB(IAMTimelineGroup *iface, LONG type) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%d)\n", This, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetOutputBuffering(IAMTimelineGroup *iface, int *buffer) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetOutputBuffering(IAMTimelineGroup *iface, int buffer) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%d)\n", This, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetSmartRecompressFormat(IAMTimelineGroup *iface, LONG *format) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetSmartRecompressFormat(IAMTimelineGroup *iface, LONG **format) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_IsSmartRecompressFormatSet(IAMTimelineGroup *iface, BOOL *set) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, set); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_IsRecompressFormatDirty(IAMTimelineGroup *iface, BOOL *dirty) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_ClearRecompressFormatDirty(IAMTimelineGroup *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetRecompFormatFromSource(IAMTimelineGroup *iface, IAMTimelineSrc *source) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, source); + return E_NOTIMPL; +} + +static const IAMTimelineGroupVtbl IAMTimelineGroup_VTable = +{ + timelinegrp_QueryInterface, + timelinegrp_AddRef, + timelinegrp_Release, + timelinegrp_SetTimeline, + timelinegrp_GetTimeline, + timelinegrp_GetPriority, + timelinegrp_GetMediaType, + timelinegrp_SetMediaType, + timelinegrp_SetOutputFPS, + timelinegrp_GetOutputFPS, + timelinegrp_SetGroupName, + timelinegrp_GetGroupName, + timelinegrp_SetPreviewMode, + timelinegrp_GetPreviewMode, + timelinegrp_SetMediaTypeForVB, + timelinegrp_GetOutputBuffering, + timelinegrp_SetOutputBuffering, + timelinegrp_SetSmartRecompressFormat, + timelinegrp_GetSmartRecompressFormat, + timelinegrp_IsSmartRecompressFormatSet, + timelinegrp_IsRecompressFormatDirty, + timelinegrp_ClearRecompressFormatDirty, + timelinegrp_SetRecompFormatFromSource +};