[PATCH 2/4] qedit/samplegrabber: Correctly delegate IUnknown methods on the IMemInputPin interface.

Zebediah Figura z.figura12 at gmail.com
Fri May 17 00:31:04 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/qedit/samplegrabber.c | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 9474a5826c..56947a1f6b 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -672,31 +672,22 @@ SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB
     return S_OK;
 }
 
-
-/* SampleGrabber implementation of IMemInputPin interface */
-
-/* IUnknown */
-static HRESULT WINAPI
-SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppv)
+static HRESULT WINAPI SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID iid, void **out)
 {
-    SG_Impl *This = impl_from_IMemInputPin(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ppv);
+    SG_Impl *filter = impl_from_IMemInputPin(iface);
+    return IPin_QueryInterface(&filter->pin_in.IPin_iface, iid, out);
 }
 
-/* IUnknown */
-static ULONG WINAPI
-SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface)
+static ULONG WINAPI SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface)
 {
-    SG_Impl *This = impl_from_IMemInputPin(iface);
-    return IUnknown_AddRef(This->outer_unk);
+    SG_Impl *filter = impl_from_IMemInputPin(iface);
+    return IPin_AddRef(&filter->pin_in.IPin_iface);
 }
 
-/* IUnknown */
-static ULONG WINAPI
-SampleGrabber_IMemInputPin_Release(IMemInputPin *iface)
+static ULONG WINAPI SampleGrabber_IMemInputPin_Release(IMemInputPin *iface)
 {
-    SG_Impl *This = impl_from_IMemInputPin(iface);
-    return IUnknown_Release(This->outer_unk);
+    SG_Impl *filter = impl_from_IMemInputPin(iface);
+    return IPin_Release(&filter->pin_in.IPin_iface);
 }
 
 /* IMemInputPin */
-- 
2.21.0




More information about the wine-devel mailing list