Zebediah Figura : qcap: Use CBaseFilter::FindPin().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ec290906a08b69ff23e119966b30b7b0d2b9f16d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ec290906a08b69ff23e119966...

Author: Zebediah Figura 
Date:   Thu Jul  5 00:34:43 2018 +0200

qcap: Use CBaseFilter::FindPin().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

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