Zebediah Figura : quartz/videorenderer: Don't expose IAMFilterMiscFlags.
Alexandre Julliard
julliard at winehq.org
Tue May 21 16:45:22 CDT 2019
Module: wine
Branch: master
Commit: 75af3556a8dc73e0d8c2068a9768f375bdeb38db
URL: https://source.winehq.org/git/wine.git/?a=commit;h=75af3556a8dc73e0d8c2068a9768f375bdeb38db
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon May 20 17:44:04 2019 -0500
quartz/videorenderer: Don't expose IAMFilterMiscFlags.
This reverts 822c3fe9eab143c0213a0e5a95d9ecdf77c93b38.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/videorenderer.c | 2 +-
dlls/quartz/videorenderer.c | 40 ---------------------------------------
2 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 93ce8d1..fdd4dfb 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -74,7 +74,7 @@ static void test_interfaces(void)
check_interface(filter, &IID_IUnknown, TRUE);
check_interface(filter, &IID_IVideoWindow, TRUE);
- todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE);
+ check_interface(filter, &IID_IAMFilterMiscFlags, FALSE);
check_interface(filter, &IID_IBasicAudio, FALSE);
check_interface(filter, &IID_IDispatch, FALSE);
check_interface(filter, &IID_IOverlay, FALSE);
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index f3d817b..3a84aba 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -47,7 +47,6 @@ typedef struct VideoRendererImpl
BaseControlVideo baseControlVideo;
IUnknown IUnknown_inner;
- IAMFilterMiscFlags IAMFilterMiscFlags_iface;
IUnknown *outer_unk;
BOOL init;
@@ -659,8 +658,6 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown *iface, REFIID
*ppv = &This->baseControlVideo.IBasicVideo_iface;
else if (IsEqualIID(riid, &IID_IVideoWindow))
*ppv = &This->baseControlWindow.IVideoWindow_iface;
- else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))
- *ppv = &This->IAMFilterMiscFlags_iface;
else
{
HRESULT hr;
@@ -980,42 +977,6 @@ static const IVideoWindowVtbl IVideoWindow_VTable =
BaseControlWindowImpl_IsCursorHidden
};
-static VideoRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface)
-{
- return CONTAINING_RECORD(iface, VideoRendererImpl, IAMFilterMiscFlags_iface);
-}
-
-static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid,
- void **ppv)
-{
- VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_QueryInterface(This->outer_unk, riid, ppv);
-}
-
-static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface)
-{
- VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_AddRef(This->outer_unk);
-}
-
-static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface)
-{
- VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_Release(This->outer_unk);
-}
-
-static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface)
-{
- return AM_FILTER_MISC_FLAGS_IS_RENDERER;
-}
-
-static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = {
- AMFilterMiscFlags_QueryInterface,
- AMFilterMiscFlags_AddRef,
- AMFilterMiscFlags_Release,
- AMFilterMiscFlags_GetMiscFlags
-};
-
HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv)
{
static const WCHAR sink_name[] = {'I','n',0};
@@ -1028,7 +989,6 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv)
pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl));
pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable;
- pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl;
pVideoRenderer->init = FALSE;
ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT));
More information about the wine-cvs
mailing list