[PATCH 1/5] strmbase: Rename BaseFilter_Destroy() to strmbase_filter_cleanup().
Zebediah Figura
z.figura12 at gmail.com
Wed May 22 00:02:12 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/qcap/vfwcapture.c | 2 +-
dlls/quartz/filesource.c | 2 +-
dlls/quartz/parser.c | 2 +-
dlls/strmbase/filter.c | 4 ++--
dlls/strmbase/renderer.c | 2 +-
dlls/strmbase/transform.c | 2 +-
dlls/winegstreamer/gstdemux.c | 2 +-
dlls/wineqtdecoder/qtsplitter.c | 2 +-
include/wine/strmbase.h | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 0139dbca88..feb9c08e85 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -177,7 +177,7 @@ static ULONG WINAPI unknown_inner_Release(IUnknown *iface)
IPin_Release(conn);
}
IPin_Release(This->pOutputPin);
- BaseFilter_Destroy(&This->filter);
+ strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This);
ObjectRefCount(FALSE);
}
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index b4afae92ed..a331d3359a 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface)
CoTaskMemFree(This->pszFileName);
if (This->pmt)
DeleteMediaType(This->pmt);
- BaseFilter_Destroy(&This->filter);
+ strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This);
return 0;
}
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index a8917d99ec..9798ea71a2 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -193,7 +193,7 @@ void Parser_Destroy(ParserImpl *This)
}
CoTaskMemFree(This->ppPins);
- BaseFilter_Destroy(&This->filter);
+ strmbase_filter_cleanup(&This->filter);
TRACE("Destroying parser\n");
CoTaskMemFree(This);
diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c
index 3a39ec4e06..325620e8de 100644
--- a/dlls/strmbase/filter.c
+++ b/dlls/strmbase/filter.c
@@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface)
TRACE("(%p)->() Release from %d\n", This, refCount + 1);
if (!refCount)
- BaseFilter_Destroy(This);
+ strmbase_filter_cleanup(This);
return refCount;
}
@@ -227,7 +227,7 @@ void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID
This->pFuncsTable = pBaseFuncsTable;
}
-HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This)
+HRESULT WINAPI strmbase_filter_cleanup(BaseFilter * This)
{
if (This->pClock)
IReferenceClock_Release(This->pClock);
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index d263b208eb..c6c7978235 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -298,7 +298,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter)
CloseHandle(filter->ThreadSignal);
CloseHandle(filter->RenderEvent);
QualityControlImpl_Destroy(filter->qcimpl);
- BaseFilter_Destroy(&filter->filter);
+ strmbase_filter_cleanup(&filter->filter);
}
HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample)
diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c
index 9cb18b2c3e..8b63d2d5aa 100644
--- a/dlls/strmbase/transform.c
+++ b/dlls/strmbase/transform.c
@@ -194,7 +194,7 @@ static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface)
FreeMediaType(&This->pmt);
QualityControlImpl_Destroy(This->qcimpl);
IUnknown_Release(This->seekthru_unk);
- BaseFilter_Destroy(&This->filter);
+ strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This);
}
return refCount;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 8e9278dca9..3653f647c4 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1298,7 +1298,7 @@ static void GST_Destroy(GSTImpl *This)
gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL);
gst_object_unref(This->bus);
}
- BaseFilter_Destroy(&This->filter);
+ strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This);
}
diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
index 19042ed5d1..651a4a8c6b 100644
--- a/dlls/wineqtdecoder/qtsplitter.c
+++ b/dlls/wineqtdecoder/qtsplitter.c
@@ -337,7 +337,7 @@ static void QT_Destroy(QTSplitter *This)
This->csReceive.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->csReceive);
- BaseFilter_Destroy(&This->filter);
+ strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This);
}
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 18336c037d..d51fdb47c7 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -192,7 +192,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This);
void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl,
const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table);
-HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This);
+HRESULT WINAPI strmbase_filter_cleanup(BaseFilter *filter);
/* Enums */
HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);
--
2.21.0
More information about the wine-devel
mailing list