[PATCH 1/6] strmbase: Get rid of the "debug_info" parameter to strmbase_filter_init().
Zebediah Figura
z.figura12 at gmail.com
Tue Aug 27 20:45:15 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/evr/evr.c | 4 ++--
dlls/qcap/audiorecord.c | 3 +--
dlls/qcap/avico.c | 3 +--
dlls/qcap/avimux.c | 3 +--
dlls/qcap/smartteefilter.c | 3 +--
dlls/qcap/vfwcapture.c | 3 +--
dlls/qedit/nullrenderer.c | 3 +--
dlls/qedit/samplegrabber.c | 3 +--
dlls/quartz/dsoundrender.c | 3 +--
dlls/quartz/filesource.c | 3 +--
dlls/quartz/parser.c | 3 +--
dlls/quartz/videorenderer.c | 3 +--
dlls/quartz/vmr9.c | 10 +---------
dlls/strmbase/filter.c | 4 ++--
dlls/strmbase/renderer.c | 4 ++--
dlls/strmbase/transform.c | 3 +--
dlls/winegstreamer/gstdemux.c | 3 +--
dlls/wineqtdecoder/qtsplitter.c | 3 +--
include/wine/strmbase.h | 4 ++--
19 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
index 655ca79b0d7..690741ee748 100644
--- a/dlls/evr/evr.c
+++ b/dlls/evr/evr.c
@@ -90,8 +90,8 @@ HRESULT evr_filter_create(IUnknown *outer, void **out)
if (!object)
return E_OUTOFMEMORY;
- strmbase_filter_init(&object->filter, &basefilter_vtbl, outer, &CLSID_EnhancedVideoRenderer,
- (DWORD_PTR)(__FILE__ ": EVR.csFilter"), &basefilter_functable);
+ strmbase_filter_init(&object->filter, &basefilter_vtbl, outer,
+ &CLSID_EnhancedVideoRenderer, &basefilter_functable);
*out = &object->filter.IUnknown_inner;
diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c
index e002bb2d691..de2d271aa53 100644
--- a/dlls/qcap/audiorecord.c
+++ b/dlls/qcap/audiorecord.c
@@ -213,8 +213,7 @@ IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr)
memset(This, 0, sizeof(*This));
This->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl;
- strmbase_filter_init(&This->filter, &AudioRecordVtbl, outer, &CLSID_AudioRecord,
- (DWORD_PTR)(__FILE__ ": AudioRecord.csFilter"), &AudioRecordFuncs);
+ strmbase_filter_init(&This->filter, &AudioRecordVtbl, outer, &CLSID_AudioRecord, &AudioRecordFuncs);
*phr = S_OK;
return &This->filter.IUnknown_inner;
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index bcfdc6b0876..7ef7b51b11d 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -600,8 +600,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr)
return NULL;
}
- strmbase_filter_init(&compressor->filter, &AVICompressorVtbl, outer, &CLSID_AVICo,
- (DWORD_PTR)(__FILE__ ": AVICompressor.csFilter"), &filter_func_table);
+ strmbase_filter_init(&compressor->filter, &AVICompressorVtbl, outer, &CLSID_AVICo, &filter_func_table);
compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl;
diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c
index d2475eedb02..fb0ae4188e7 100644
--- a/dlls/qcap/avimux.c
+++ b/dlls/qcap/avimux.c
@@ -2251,8 +2251,7 @@ IUnknown * WINAPI QCAP_createAVIMux(IUnknown *outer, HRESULT *phr)
return NULL;
}
- strmbase_filter_init(&avimux->filter, &AviMuxVtbl, outer, &CLSID_AviDest,
- (DWORD_PTR)(__FILE__ ": AviMux.csFilter"), &filter_func_table);
+ strmbase_filter_init(&avimux->filter, &AviMuxVtbl, outer, &CLSID_AviDest, &filter_func_table);
avimux->IConfigAviMux_iface.lpVtbl = &ConfigAviMuxVtbl;
avimux->IConfigInterleaving_iface.lpVtbl = &ConfigInterleavingVtbl;
avimux->IMediaSeeking_iface.lpVtbl = &MediaSeekingVtbl;
diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c
index caaaaab43ba..b93b3324d75 100644
--- a/dlls/qcap/smartteefilter.c
+++ b/dlls/qcap/smartteefilter.c
@@ -483,8 +483,7 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr)
}
memset(This, 0, sizeof(*This));
- strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee,
- (DWORD_PTR)(__FILE__ ": SmartTeeFilter.csFilter"), &SmartTeeFilterFuncs);
+ strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, &SmartTeeFilterFuncs);
inputPinInfo.pFilter = &This->filter.IBaseFilter_iface;
strmbase_sink_init(&This->sink, &SmartTeeFilterInputVtbl, &inputPinInfo,
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 519543e1478..e194bbf010e 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -642,8 +642,7 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *outer, HRESULT *phr)
return NULL;
}
- strmbase_filter_init(&object->filter, &VfwCapture_Vtbl, outer, &CLSID_VfwCapture,
- (DWORD_PTR)(__FILE__ ": VfwCapture.csFilter"), &BaseFuncTable);
+ strmbase_filter_init(&object->filter, &VfwCapture_Vtbl, outer, &CLSID_VfwCapture, &BaseFuncTable);
object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable;
object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable;
diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c
index aeae6be85b2..2c9aff8bc0f 100644
--- a/dlls/qedit/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -93,8 +93,7 @@ HRESULT NullRenderer_create(IUnknown *outer, void **out)
pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl));
hr = strmbase_renderer_init(&pNullRenderer->renderer, &NullRenderer_Vtbl, outer,
- &CLSID_NullRenderer, sink_name,
- (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable);
+ &CLSID_NullRenderer, sink_name, &RendererFuncTable);
if (FAILED(hr))
CoTaskMemFree(pNullRenderer);
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 9836d9e3740..20525401335 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -1154,8 +1154,7 @@ HRESULT SampleGrabber_create(IUnknown *outer, void **out)
}
ZeroMemory(obj, sizeof(SG_Impl));
- strmbase_filter_init(&obj->filter, &IBaseFilter_VTable, outer, &CLSID_SampleGrabber,
- (DWORD_PTR)(__FILE__ ": SG_Impl.csFilter"), &basefunc_vtbl);
+ strmbase_filter_init(&obj->filter, &IBaseFilter_VTable, outer, &CLSID_SampleGrabber, &basefunc_vtbl);
obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable;
obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable;
obj->pin_in.IPin_iface.lpVtbl = &IPin_In_VTable;
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index ae4bdf8239b..6451f85b5ad 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -629,8 +629,7 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out)
ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl));
hr = strmbase_renderer_init(&pDSoundRender->renderer, &DSoundRender_Vtbl,
- outer, &CLSID_DSoundRender, sink_name,
- (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"), &BaseFuncTable);
+ outer, &CLSID_DSoundRender, sink_name, &BaseFuncTable);
pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl;
pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl;
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 05c453a1f61..d93375e1e9c 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -409,8 +409,7 @@ HRESULT AsyncReader_create(IUnknown *outer, void **out)
if (!pAsyncRead)
return E_OUTOFMEMORY;
- strmbase_filter_init(&pAsyncRead->filter, &AsyncReader_Vtbl, outer, &CLSID_AsyncReader,
- (DWORD_PTR)(__FILE__ ": AsyncReader.csFilter"), &BaseFuncTable);
+ strmbase_filter_init(&pAsyncRead->filter, &AsyncReader_Vtbl, outer, &CLSID_AsyncReader, &BaseFuncTable);
pAsyncRead->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl;
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index 3c0f4d55f4c..ee6a4a57938 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -82,8 +82,7 @@ HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *vtbl, IUnknown
HRESULT hr;
PIN_INFO piInput;
- strmbase_filter_init(&pParser->filter, vtbl, outer, clsid,
- (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"), func_table);
+ strmbase_filter_init(&pParser->filter, vtbl, outer, clsid, func_table);
pParser->fnDisconnect = fnDisconnect;
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index d541cca6c41..26bb05f8d92 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -801,8 +801,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out)
pVideoRenderer->FullScreenMode = OAFALSE;
hr = strmbase_renderer_init(&pVideoRenderer->renderer, &VideoRenderer_Vtbl,
- outer, &CLSID_VideoRenderer, sink_name,
- (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"), &BaseFuncTable);
+ outer, &CLSID_VideoRenderer, sink_name, &BaseFuncTable);
if (FAILED(hr))
goto fail;
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index dd060e1466c..184937b0385 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -2155,15 +2155,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid)
pVMR->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl;
pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl;
- if (IsEqualGUID(clsid, &CLSID_VideoMixingRenderer))
- hr = strmbase_renderer_init(&pVMR->renderer, &VMR_Vtbl, outer,
- &CLSID_VideoMixingRenderer, sink_name,
- (DWORD_PTR)(__FILE__ ": VMR7Impl.csFilter"), &BaseFuncTable);
- else
- hr = strmbase_renderer_init(&pVMR->renderer, &VMR_Vtbl, outer,
- &CLSID_VideoMixingRenderer9, sink_name,
- (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable);
-
+ hr = strmbase_renderer_init(&pVMR->renderer, &VMR_Vtbl, outer, clsid, sink_name, &BaseFuncTable);
if (FAILED(hr))
goto fail;
diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c
index 9ed588cf803..b1c955825d3 100644
--- a/dlls/strmbase/filter.c
+++ b/dlls/strmbase/filter.c
@@ -292,7 +292,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter *filter)
}
void strmbase_filter_init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer,
- const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table)
+ const CLSID *clsid, const BaseFilterFuncTable *func_table)
{
memset(filter, 0, sizeof(*filter));
@@ -302,8 +302,8 @@ void strmbase_filter_init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, IUnkn
filter->refcount = 1;
InitializeCriticalSection(&filter->csFilter);
+ filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BaseFilter.csFilter");
filter->clsid = *clsid;
- filter->csFilter.DebugInfo->Spare[0] = debug_info;
filter->pin_version = 1;
filter->pFuncsTable = func_table;
}
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index e823e6bc7c1..0972f499c5a 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -232,13 +232,13 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = {
HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtbl *vtbl,
- IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, DWORD_PTR debug_info,
+ IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name,
const BaseRendererFuncTable *pBaseFuncsTable)
{
PIN_INFO piInput;
HRESULT hr;
- strmbase_filter_init(&filter->filter, vtbl, outer, clsid, debug_info, &RendererBaseFilterFuncTable);
+ strmbase_filter_init(&filter->filter, vtbl, outer, clsid, &RendererBaseFilterFuncTable);
filter->pFuncsTable = pBaseFuncsTable;
diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c
index 39b601af4eb..c14142fcf4d 100644
--- a/dlls/strmbase/transform.c
+++ b/dlls/strmbase/transform.c
@@ -277,8 +277,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid,
PIN_INFO piInput;
PIN_INFO piOutput;
- strmbase_filter_init(&filter->filter, &transform_vtbl, outer, clsid,
- (DWORD_PTR)(__FILE__ ": TransformFilter.csFilter"), &tfBaseFuncTable);
+ strmbase_filter_init(&filter->filter, &transform_vtbl, outer, clsid, &tfBaseFuncTable);
InitializeCriticalSection(&filter->csReceive);
filter->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": TransformFilter.csReceive");
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 5e44c92e31c..0ce64e2b9a8 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1267,8 +1267,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr)
}
memset(This, 0, sizeof(*This));
- strmbase_filter_init(&This->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter,
- (DWORD_PTR)(__FILE__ ": GSTImpl.csFilter"), &BaseFuncTable);
+ strmbase_filter_init(&This->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &BaseFuncTable);
This->cStreams = 0;
This->ppPins = NULL;
diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
index c5d3efa6b08..fb85d576dbd 100644
--- a/dlls/wineqtdecoder/qtsplitter.c
+++ b/dlls/wineqtdecoder/qtsplitter.c
@@ -301,8 +301,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr)
}
ZeroMemory(This,sizeof(*This));
- strmbase_filter_init(&This->filter, &QT_Vtbl, outer, &CLSID_QTSplitter,
- (DWORD_PTR)(__FILE__ ": QTSplitter.csFilter"), &BaseFuncTable);
+ strmbase_filter_init(&This->filter, &QT_Vtbl, outer, &CLSID_QTSplitter, &BaseFuncTable);
InitializeCriticalSection(&This->csReceive);
This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive");
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 0c2c9db8744..b1483fc26c9 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -200,7 +200,7 @@ HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVend
VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This);
void strmbase_filter_init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer,
- const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table);
+ const CLSID *clsid, const BaseFilterFuncTable *func_table);
void strmbase_filter_cleanup(BaseFilter *filter);
/* Enums */
@@ -600,7 +600,7 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface);
HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface);
HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtbl *vtbl,
- IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, DWORD_PTR debug_info,
+ IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name,
const BaseRendererFuncTable *func_table);
void strmbase_renderer_cleanup(BaseRenderer *filter);
--
2.22.0
More information about the wine-devel
mailing list