Module: wine Branch: master Commit: e483b4a336d7c7fb58ea85e010f0dc623247bad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e483b4a336d7c7fb58ea85e01...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Jun 18 20:17:35 2019 -0500
strmbase: Use base pin reference counting methods.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/strmbase/renderer.c | 16 ++-------------- dlls/strmbase/transform.c | 32 ++++---------------------------- 2 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 36e934f..b216166 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -45,18 +45,6 @@ static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { QualityControlImpl_SetSink };
-static ULONG WINAPI BaseRenderer_InputPin_AddRef(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI BaseRenderer_InputPin_Release(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -176,8 +164,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) static const IPinVtbl BaseRenderer_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - BaseRenderer_InputPin_AddRef, - BaseRenderer_InputPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, BaseRenderer_InputPin_ReceiveConnection, BaseRenderer_InputPin_Disconnect, diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 4c32d67..c4a0789 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -381,18 +381,6 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); }
-static ULONG WINAPI TransformFilter_InputPin_AddRef(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI TransformFilter_InputPin_Release(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); @@ -516,8 +504,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC static const IPinVtbl TransformFilter_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - TransformFilter_InputPin_AddRef, - TransformFilter_InputPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, TransformFilter_InputPin_ReceiveConnection, TransformFilter_InputPin_Disconnect, @@ -555,23 +543,11 @@ static HRESULT WINAPI transform_source_QueryInterface(IPin *iface, REFIID iid, v return S_OK; }
-static ULONG WINAPI transform_source_AddRef(IPin *iface) -{ - BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI transform_source_Release(IPin *iface) -{ - BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static const IPinVtbl TransformFilter_OutputPin_Vtbl = { transform_source_QueryInterface, - transform_source_AddRef, - transform_source_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,