[PATCH 5/5] quartz/avisplit: Use BaseFilterImpl_Release().

Zebediah Figura z.figura12 at gmail.com
Mon May 27 23:09:59 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/quartz/avisplit.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index e6f7c2ff43f..f77efa37c5a 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -1266,24 +1266,6 @@ static HRESULT AVISplitter_Disconnect(LPVOID iface)
     return S_OK;
 }
 
-static ULONG WINAPI AVISplitter_Release(IBaseFilter *iface)
-{
-    AVISplitterImpl *This = impl_from_IBaseFilter(iface);
-    ULONG ref;
-
-    ref = InterlockedDecrement(&This->Parser.filter.refCount);
-
-    TRACE("(%p)->() Release from %d\n", This, ref + 1);
-
-    if (!ref)
-    {
-        AVISplitter_Flush(This);
-        Parser_Destroy(&This->Parser);
-    }
-
-    return ref;
-}
-
 static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface)
 {
     AVISplitterImpl *This = impl_from_IMediaSeeking(iface);
@@ -1414,7 +1396,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl =
 {
     Parser_QueryInterface,
     Parser_AddRef,
-    AVISplitter_Release,
+    BaseFilterImpl_Release,
     Parser_GetClassID,
     Parser_Stop,
     Parser_Pause,
@@ -1429,9 +1411,17 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl =
     Parser_QueryVendorInfo
 };
 
+static void avi_splitter_destroy(BaseFilter *iface)
+{
+    AVISplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface);
+    AVISplitter_Flush(filter);
+    Parser_Destroy(&filter->Parser);
+}
+
 static const BaseFilterFuncTable avi_splitter_func_table =
 {
     .filter_get_pin = parser_get_pin,
+    .filter_destroy = avi_splitter_destroy,
 };
 
 HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)
-- 
2.21.0




More information about the wine-devel mailing list