Zebediah Figura : qedit/nullrenderer: Don't expose IAMFilterMiscFlags.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c48320199324289e4ab9c38fe7dd45d6d70c8503
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c48320199324289e4ab9c38fe...

Author: Zebediah Figura 
Date:   Mon May 20 17:44:06 2019 -0500

qedit/nullrenderer: Don't expose IAMFilterMiscFlags.

This reverts 443e24fe887f6c0233b159fd6e034f2dfb09fdf2.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/qedit/nullrenderer.c       | 40 ----------------------------------------
 dlls/qedit/tests/nullrenderer.c |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c
index 6ba70cb..c9319fb 100644
--- a/dlls/qedit/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -30,7 +30,6 @@ typedef struct NullRendererImpl
 {
     BaseRenderer renderer;
     IUnknown IUnknown_inner;
-    IAMFilterMiscFlags IAMFilterMiscFlags_iface;
     IUnknown *outer_unk;
 } NullRendererImpl;

@@ -82,8 +81,6 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r

if (IsEqualIID(riid, &IID_IUnknown))
         *ppv = &This->IUnknown_inner;
-    else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))
-        *ppv = &This->IAMFilterMiscFlags_iface;
     else
     {
         HRESULT hr;
@@ -174,42 +171,6 @@ static const IBaseFilterVtbl NullRenderer_Vtbl =
     BaseFilterImpl_QueryVendorInfo
 };

-static NullRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface)
-{
-    return CONTAINING_RECORD(iface, NullRendererImpl, IAMFilterMiscFlags_iface);
-}
-
-static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid,
-        void **ppv)
-{
-    NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ppv);
-}
-
-static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface)
-{
-    NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface)
-{
-    NullRendererImpl *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 NullRenderer_create(IUnknown *pUnkOuter, void **ppv)
 {
     static const WCHAR sink_name[] = {'I','n',0};
@@ -223,7 +184,6 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv)

pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl));
     pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable;
-    pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl;

if (pUnkOuter)
         pNullRenderer->outer_unk = pUnkOuter;
diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c
index 0ae17b1..a45f30a 100644
--- a/dlls/qedit/tests/nullrenderer.c
+++ b/dlls/qedit/tests/nullrenderer.c
@@ -68,7 +68,7 @@ static void test_interfaces(void)
     check_interface(filter, &IID_IPersist, TRUE);
     check_interface(filter, &IID_IUnknown, 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_IBasicVideo, FALSE);
     check_interface(filter, &IID_IKsPropertySet, FALSE);