[PATCH 2/5] qcap/avico: Use strmbase_filter_cleanup().

Zebediah Figura z.figura12 at gmail.com
Wed May 22 21:44:52 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/qcap/avico.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index 83a7804801..5ea4016a65 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -150,7 +150,7 @@ static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID ri
 static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface)
 {
     AVICompressor *This = impl_from_IBaseFilter(iface);
-    ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface);
+    ULONG ref = InterlockedDecrement(&This->filter.refCount);
 
     TRACE("(%p) ref=%d\n", This, ref);
 
@@ -162,6 +162,7 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface)
             BaseInputPinImpl_Release(&This->in->pin.IPin_iface);
         if(This->out)
             BaseOutputPinImpl_Release(&This->out->pin.IPin_iface);
+        strmbase_filter_cleanup(&This->filter);
         heap_free(This);
     }
 
@@ -685,7 +686,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr)
     hres = BaseInputPin_Construct(&AVICompressorInputPinVtbl, sizeof(BaseInputPin), &in_pin_info,
             &AVICompressorBaseInputPinVtbl, &compressor->filter.csFilter, NULL, (IPin**)&compressor->in);
     if(FAILED(hres)) {
-        IBaseFilter_Release(&compressor->filter.IBaseFilter_iface);
+        strmbase_filter_cleanup(&compressor->filter);
         *phr = hres;
         return NULL;
     }
@@ -694,7 +695,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr)
     hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info,
             &AVICompressorBaseOutputPinVtbl, &compressor->filter.csFilter, (IPin**)&compressor->out);
     if(FAILED(hres)) {
-        IBaseFilter_Release(&compressor->filter.IBaseFilter_iface);
+        strmbase_filter_cleanup(&compressor->filter);
         *phr = hres;
         return NULL;
     }
-- 
2.21.0




More information about the wine-devel mailing list