strmbase: Reimplement BaseFilterImpl_Release() using a destructor callback.

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

strmbase: Reimplement BaseFilterImpl_Release() using a destructor callback.
3c98e11b · Zebediah Figura · Alexandre Julliard · 1fc5c6b7 · 3c98e11b · 3c98e11b
Commit 3c98e11b authored May 23, 2019 by Zebediah Figura Committed by Alexandre Julliard May 24, 2019
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

filter.c dlls/strmbase/filter.c +2 -2

strmbase.h include/wine/strmbase.h +1 -0

No files found.
--- a/dlls/strmbase/filter.c
+++ b/dlls/strmbase/filter.c
@@ -54,7 +54,7 @@ ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface)
    return refCount;
 }

-ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface)
+ULONG WINAPI BaseFilterImpl_Release(IBaseFilter *iface)
 {
    BaseFilter *This = impl_from_IBaseFilter(iface);
    ULONG refCount = InterlockedDecrement(&This->refCount);
@@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface)
    TRACE("(%p)->() Release from %d\n", This, refCount + 1);

    if (!refCount)
-        strmbase_filter_cleanup(This);
+        This->pFuncsTable->filter_destroy(This);

    return refCount;
 }

--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -171,6 +171,7 @@ typedef struct BaseFilter
 typedef struct BaseFilterFuncTable
 {
    IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index);
+    void (*filter_destroy)(BaseFilter *iface);
 } BaseFilterFuncTable;

 HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);