Module: wine Branch: master Commit: d88218324bade6d39eb6e0529e8b995258bdfed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88218324bade6d39eb6e0529...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Jul 5 00:34:41 2018 +0200
quartz: Use CBaseFilter::FindPin().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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