Zebediah Figura : quartz/avisplit: Use BaseFilterImpl_Release().
Alexandre Julliard
julliard at winehq.org
Tue May 28 15:06:49 CDT 2019
Module: wine
Branch: master
Commit: af34a88673d37078ce80c48eb84e7cccb271df70
URL: https://source.winehq.org/git/wine.git/?a=commit;h=af34a88673d37078ce80c48eb84e7cccb271df70
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon May 27 23:09:59 2019 -0500
quartz/avisplit: Use BaseFilterImpl_Release().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 e6f7c2f..f77efa3 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)
More information about the wine-cvs
mailing list