Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 23 +---------------------- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 ---------- dlls/quartz/parser.h | 1 - dlls/quartz/waveparser.c | 2 +- 8 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 3c1c7cf..77256b7 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -413,7 +413,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index c9ca760..f8e4a9c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -431,7 +431,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f3ecced..564ccd3 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1421,7 +1421,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 0413eb4..bcce0e1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -547,27 +547,6 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart return S_OK; }
-/** IBaseFilter methods **/ - -static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("%p->(%s, %p)\n", This, debugstr_w(Id), ppPin); - - if (!Id || !ppPin) - return E_POINTER; - - if (strcmpW(Id, wszOutputPinName)) - { - *ppPin = NULL; - return VFW_E_NOT_FOUND; - } - - *ppPin = This->pOutputPin; - IPin_AddRef(*ppPin); - return S_OK; -} - static const IBaseFilterVtbl AsyncReader_Vtbl = { AsyncReader_QueryInterface, @@ -581,7 +560,7 @@ static const IBaseFilterVtbl AsyncReader_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AsyncReader_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 41221d4..5869f16 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -804,7 +804,7 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f15f364..034bca0 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -402,16 +402,6 @@ HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) return BaseFilterImpl_EnumPins(iface,ppEnum); }
-HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - ParserImpl *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s,%p)\n", This, debugstr_w(Id), ppPin); - - /* FIXME: critical section */ - - return E_NOTIMPL; -} - HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { return BaseFilterImpl_QueryFilterInfo(iface, pInfo); diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 996415a..840e475 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -70,7 +70,6 @@ extern HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTime extern HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); extern HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock); extern HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum); -extern HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo); extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName); extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index f6bea2c..0a84fcb 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -410,7 +410,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/strmbase/transform.c | 9 --------- include/wine/strmbase.h | 1 - 2 files changed, 10 deletions(-)
diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 139c581..4d7069d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -427,15 +427,6 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s
/** IBaseFilter implementation **/
-HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - - TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); - - return E_NOTIMPL; -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b07dfa2..83a9084 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -260,7 +260,6 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm);
HRESULT TransformFilter_Construct( const IBaseFilterVtbl *filterVtbl, LONG filter_size, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, IBaseFilter ** ppTransformFilter);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/qcap/audiorecord.c | 9 +-------- dlls/qcap/avico.c | 9 +-------- dlls/qcap/smartteefilter.c | 22 +--------------------- dlls/qcap/vfwcapture.c | 9 +-------- 4 files changed, 4 insertions(+), 45 deletions(-)
diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 1187d4a..3674bbb 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -152,13 +152,6 @@ static HRESULT WINAPI AudioRecord_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return E_NOTIMPL; }
-static HRESULT WINAPI AudioRecord_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AudioRecord *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s, %p): stub\n", This, debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl AudioRecordVtbl = { AudioRecord_QueryInterface, AudioRecord_AddRef, @@ -171,7 +164,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AudioRecord_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 32f3b56..d5a44b2 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -211,13 +211,6 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar return S_OK; }
-static HRESULT WINAPI AVICompressor_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); - return VFW_E_NOT_FOUND; -} - static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -244,7 +237,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AVICompressor_FindPin, + BaseFilterImpl_FindPin, AVICompressor_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, AVICompressor_QueryVendorInfo diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 220f5eb..f052e2d 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -180,26 +180,6 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta return hr; }
-static HRESULT WINAPI SmartTeeFilter_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(Id), ppPin); - if (lstrcmpW(Id, This->input->pin.pinInfo.achName) == 0) { - *ppPin = &This->input->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } else if (lstrcmpW(Id, This->capture->pin.pinInfo.achName) == 0) { - *ppPin = &This->capture->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } else if (lstrcmpW(Id, This->preview->pin.pinInfo.achName) == 0) { - *ppPin = &This->preview->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } - return VFW_E_NOT_FOUND; -} - static const IBaseFilterVtbl SmartTeeFilterVtbl = { SmartTeeFilter_QueryInterface, SmartTeeFilter_AddRef, @@ -212,7 +192,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - SmartTeeFilter_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index fd35b26..ca804fe 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -298,13 +298,6 @@ static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) return qcap_driver_run(This->driver_info, &This->filter.state); }
-/** IBaseFilter methods **/ -static HRESULT WINAPI VfwCapture_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - FIXME("(%s, %p) - stub\n", debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl VfwCapture_Vtbl = { VfwCapture_QueryInterface, @@ -318,7 +311,7 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - VfwCapture_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/amstream/mediastreamfilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 5abcb2f..8636718 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -159,9 +159,8 @@ static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface,
static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_w(id), pin); - - return E_NOTIMPL; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_FindPin(&This->filter.IBaseFilter_iface, id, pin); }
static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info)
Zebediah Figura z.figura12@gmail.com writes:
Signed-off-by: Zebediah Figura z.figura12@gmail.com
dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 23 +---------------------- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 ---------- dlls/quartz/parser.h | 1 - dlls/quartz/waveparser.c | 2 +- 8 files changed, 6 insertions(+), 38 deletions(-)
This breaks the tests:
../../../tools/runtest -q -P wine -T ../../.. -M quartz.dll -p quartz_test.exe.so filtergraph && touch filtergraph.ok filtergraph.c:566: Tests skipped: L"test.avi": codec not supported; skipping test filtergraph.c:589: Test failed: CreateFile failed: err=32 filtergraph.c:566: Tests skipped: L"test.mpg": codec not supported; skipping test filtergraph.c:589: Test failed: CreateFile failed: err=32 filtergraph.c:57: Test failed: file creation failed, at L"C:\users\julliard\Temp\test.avi", error 32 filtergraph.c:64: Test failed: couldn't write resource Makefile:280: recipe for target 'filtergraph.ok' failed make: *** [filtergraph.ok] Error 4
On 05/07/18 19:18, Alexandre Julliard wrote:
Zebediah Figura z.figura12@gmail.com writes:
Signed-off-by: Zebediah Figura z.figura12@gmail.com
dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 23 +---------------------- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 ---------- dlls/quartz/parser.h | 1 - dlls/quartz/waveparser.c | 2 +- 8 files changed, 6 insertions(+), 38 deletions(-)
This breaks the tests:
../../../tools/runtest -q -P wine -T ../../.. -M quartz.dll -p quartz_test.exe.so filtergraph && touch filtergraph.ok filtergraph.c:566: Tests skipped: L"test.avi": codec not supported; skipping test filtergraph.c:589: Test failed: CreateFile failed: err=32 filtergraph.c:566: Tests skipped: L"test.mpg": codec not supported; skipping test filtergraph.c:589: Test failed: CreateFile failed: err=32 filtergraph.c:57: Test failed: file creation failed, at L"C:\users\julliard\Temp\test.avi", error 32 filtergraph.c:64: Test failed: couldn't write resource Makefile:280: recipe for target 'filtergraph.ok' failed make: *** [filtergraph.ok] Error 4
Thanks for the catch; it was a leak in my implementation of CBaseFilter::FindPin(). I've sent a patch which should fix this.
-
Alexandre Julliard -
Zebediah Figura