Zebediah Figura : winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface().

Alexandre Julliard julliard at winehq.org
Fri May 31 15:53:31 CDT 2019


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu May 30 22:59:35 2019 -0500

winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winegstreamer/gstdemux.c | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 64b8dcf..81c6168 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1307,34 +1307,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr)
     return obj;
 }
 
-static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv)
-{
-    GSTImpl *This = impl_from_IBaseFilter(iface);
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
-
-    *ppv = NULL;
-
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-        IsEqualIID(riid, &IID_IPersist) ||
-        IsEqualIID(riid, &IID_IMediaFilter) ||
-        IsEqualIID(riid, &IID_IBaseFilter))
-    {
-        *ppv = &This->filter.IBaseFilter_iface;
-    }
-
-    if (*ppv) {
-        IUnknown_AddRef((IUnknown *)(*ppv));
-        return S_OK;
-    }
-
-    if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) &&
-        !IsEqualIID(riid, &IID_IAMFilterMiscFlags))
-        FIXME("No interface for %s!\n", debugstr_guid(riid));
-
-    return E_NOINTERFACE;
-}
-
 static HRESULT WINAPI GST_Stop(IBaseFilter *iface)
 {
     GSTImpl *This = impl_from_IBaseFilter(iface);
@@ -1456,7 +1428,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout,
 }
 
 static const IBaseFilterVtbl GST_Vtbl = {
-    GST_QueryInterface,
+    BaseFilterImpl_QueryInterface,
     BaseFilterImpl_AddRef,
     BaseFilterImpl_Release,
     BaseFilterImpl_GetClassID,




More information about the wine-cvs mailing list