[PATCH 1/3] strmbase: Check that the output pin supports the given media type before connecting.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/strmbase/pin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 48f2497..a3117dd 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -718,7 +718,8 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei TRACE("(%p, %p)\n", pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt);
- /* FIXME: call queryacceptproc */ + if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) + return hr;
This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/amstream/mediastream.c | 4 ++-- dlls/qcap/avimux.c | 8 +++++++- dlls/qcap/smartteefilter.c | 16 ++++++++++++++-- dlls/qcap/vfwcapture.c | 8 +++++++- dlls/quartz/filesource.c | 11 +++++------ dlls/quartz/parser.c | 10 +++++----- dlls/strmbase/pin.c | 13 +++---------- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 10 ++++------ dlls/winegstreamer/gstdemux.c | 17 ++++++++--------- dlls/wineqtdecoder/qtsplitter.c | 8 +++++++- 11 files changed, 63 insertions(+), 44 deletions(-)
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 787690d..4971bf1 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -499,7 +499,7 @@ static const IPinVtbl DirectDrawMediaStreamInputPin_IPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseInputPinImpl_EndOfStream, @@ -1068,7 +1068,7 @@ static const IPinVtbl AudioMediaStreamInputPin_IPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseInputPinImpl_EndOfStream, diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index c335737..427b019 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1223,6 +1223,12 @@ static const ISpecifyPropertyPagesVtbl SpecifyPropertyPagesVtbl = { SpecifyPropertyPages_GetPages };
+static HRESULT WINAPI AviMuxOut_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) +{ + FIXME("(%p) stub\n", base); + return S_OK; +} + static HRESULT WINAPI AviMuxOut_AttemptConnection(BasePin *base, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { @@ -1299,7 +1305,7 @@ static HRESULT WINAPI AviMuxOut_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { { - NULL, + AviMuxOut_CheckMediaType, AviMuxOut_AttemptConnection, AviMuxOut_GetMediaTypeVersion, AviMuxOut_GetMediaType diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 27aee47..220f5eb 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -499,6 +499,12 @@ static const IPinVtbl SmartTeeFilterCaptureVtbl = { BasePinImpl_NewSegment };
+static HRESULT WINAPI SmartTeeFilterCapture_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) +{ + FIXME("(%p) stub\n", base); + return S_OK; +} + static LONG WINAPI SmartTeeFilterCapture_GetMediaTypeVersion(BasePin *base) { SmartTeeFilter *This = impl_from_BasePin(base); @@ -535,7 +541,7 @@ static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { { - NULL, + SmartTeeFilterCapture_CheckMediaType, BaseOutputPinImpl_AttemptConnection, SmartTeeFilterCapture_GetMediaTypeVersion, SmartTeeFilterCapture_GetMediaType @@ -592,6 +598,12 @@ static const IPinVtbl SmartTeeFilterPreviewVtbl = { BasePinImpl_NewSegment };
+static HRESULT WINAPI SmartTeeFilterPreview_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) +{ + FIXME("(%p) stub\n", base); + return S_OK; +} + static LONG WINAPI SmartTeeFilterPreview_GetMediaTypeVersion(BasePin *base) { SmartTeeFilter *This = impl_from_BasePin(base); @@ -628,7 +640,7 @@ static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { { - NULL, + SmartTeeFilterPreview_CheckMediaType, BaseOutputPinImpl_AttemptConnection, SmartTeeFilterPreview_GetMediaTypeVersion, SmartTeeFilterPreview_GetMediaType diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 46ae6c0..fd35b26 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -665,6 +665,12 @@ static inline VfwPinImpl *impl_from_BasePin(BasePin *pin) return CONTAINING_RECORD(pin, VfwPinImpl, pin.pin); }
+static HRESULT WINAPI VfwPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *amt) +{ + FIXME("(%p) stub\n", pin); + return E_NOTIMPL; +} + static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_TYPE *pmt) { VfwPinImpl *This = impl_from_BasePin(pin); @@ -707,7 +713,7 @@ static HRESULT WINAPI VfwPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocato
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { { - NULL, + VfwPin_CheckMediaType, BaseOutputPinImpl_AttemptConnection, VfwPin_GetMediaTypeVersion, VfwPin_GetMediaType diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 4290ac3..0413eb4 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -783,12 +783,11 @@ static inline FileAsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) return CONTAINING_RECORD(iface, FileAsyncReader, IAsyncReader_iface); }
-static HRESULT WINAPI FileAsyncReaderPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt) { - FileAsyncReader *This = impl_from_IPin(iface); - AM_MEDIA_TYPE *pmt_filter = impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter)->pmt; + AM_MEDIA_TYPE *pmt_filter = impl_from_IBaseFilter(pin->pinInfo.pFilter)->pmt;
- FIXME("(%p, %p)\n", iface, pmt); + FIXME("(%p, %p)\n", pin, pmt);
if (IsEqualGUID(&pmt->majortype, &pmt_filter->majortype) && IsEqualGUID(&pmt->subtype, &pmt_filter->subtype) && @@ -874,7 +873,7 @@ static const IPinVtbl FileAsyncReaderPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - FileAsyncReaderPin_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, @@ -933,7 +932,7 @@ static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(BaseOutputPin *iface,
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { { - NULL, + FileAsyncReaderPin_CheckMediaType, FileAsyncReaderPin_AttemptConnection, BasePinImpl_GetMediaTypeVersion, FileAsyncReaderPin_GetMediaType diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index a2ff407..f15f364 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -44,6 +44,7 @@ static HRESULT WINAPI Parser_ChangeStart(IMediaSeeking *iface); static HRESULT WINAPI Parser_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI Parser_ChangeRate(IMediaSeeking *iface); static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); +static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This); @@ -428,7 +429,7 @@ HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo)
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { { - NULL, + Parser_OutputPin_CheckMediaType, BaseOutputPinImpl_AttemptConnection, BasePinImpl_GetMediaTypeVersion, Parser_OutputPin_GetMediaType @@ -695,11 +696,10 @@ static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, return BaseOutputPinImpl_Connect(iface, pReceivePin, pmt); }
-static HRESULT WINAPI Parser_OutputPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE * pmt) +static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt) { - Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); + Parser_OutputPin *This = (Parser_OutputPin *)pin;
- TRACE("()\n"); dump_AM_MEDIA_TYPE(pmt);
return (memcmp(This->pmt, pmt, sizeof(AM_MEDIA_TYPE)) == 0); @@ -718,7 +718,7 @@ static const IPinVtbl Parser_OutputPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - Parser_OutputPin_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index a3117dd..59a80bd 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -310,9 +310,11 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id)
HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) { + BasePin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", iface, pmt);
- return S_OK; + return (This->pFuncsTable->pfnCheckMediaType(This, pmt) == S_OK ? S_OK : S_FALSE); }
HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) @@ -933,15 +935,6 @@ static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) return IPin_EndOfStream( pin ); }
-HRESULT WINAPI BaseInputPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) -{ - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); - - TRACE("(%p/%p)->(%p)\n", This, iface, pmt); - - return (This->pin.pFuncsTable->pfnCheckMediaType(&This->pin, pmt) == S_OK ? S_OK : S_FALSE); -} - HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) { HRESULT hr = S_OK; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 366e6d6..dc1ece2 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -185,7 +185,7 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseRenderer_InputPin_EndOfStream, diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index accb4f1..139c581 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -120,12 +120,10 @@ static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSa return hr; }
-static HRESULT WINAPI TransformFilter_Output_QueryAccept(IPin *iface, const AM_MEDIA_TYPE * pmt) +static HRESULT WINAPI TransformFilter_Output_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) { - BasePin *This = impl_BasePin_from_IPin(iface); TransformFilter *pTransformFilter = impl_from_IBaseFilter(This->pinInfo.pFilter); AM_MEDIA_TYPE* outpmt = &pTransformFilter->pmt; - TRACE("%p\n", iface);
if (IsEqualIID(&pmt->majortype, &outpmt->majortype) && (IsEqualIID(&pmt->subtype, &outpmt->subtype) || IsEqualIID(&outpmt->subtype, &GUID_NULL))) @@ -186,7 +184,7 @@ static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = {
static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = { { - NULL, + TransformFilter_Output_CheckMediaType, BaseOutputPinImpl_AttemptConnection, BasePinImpl_GetMediaTypeVersion, TransformFilter_Output_GetMediaType @@ -571,7 +569,7 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, TransformFilter_InputPin_EndOfStream, @@ -593,7 +591,7 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - TransformFilter_Output_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fc33ca4..f133ce6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -598,13 +598,6 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; }
-static HRESULT WINAPI GST_OutPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *pmt) -{ - GSTOutPin *pin = (GSTOutPin*)iface; - FIXME("stub %p\n", pin); - return S_OK; -} - static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buf) { GSTOutPin *pin = gst_pad_get_element_private(pad); @@ -1783,6 +1776,12 @@ static ULONG WINAPI GSTOutPin_Release(IPin *iface) return refCount; }
+static HRESULT WINAPI GSTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) +{ + FIXME("(%p) stub\n", base); + return S_OK; +} + static HRESULT WINAPI GSTOutPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) { GSTOutPin *This = (GSTOutPin *)iface; @@ -1863,7 +1862,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - GST_OutPin_QueryAccept, + BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, @@ -1874,7 +1873,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = {
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { { - NULL, + GSTOutPin_CheckMediaType, BaseOutputPinImpl_AttemptConnection, BasePinImpl_GetMediaTypeVersion, GSTOutPin_GetMediaType diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 7db7a28..096d384 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1388,6 +1388,12 @@ static ULONG WINAPI QTOutPin_Release(IPin *iface) return refCount; }
+static HRESULT WINAPI QTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) +{ + FIXME("(%p) stub\n", base); + return S_OK; +} + static HRESULT WINAPI QTOutPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) { QTOutPin *This = impl_QTOutPin_from_BasePin(iface); @@ -1516,7 +1522,7 @@ static const IQualityControlVtbl QTOutPin_QualityControl_Vtbl = {
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { { - NULL, + QTOutPin_CheckMediaType, BaseOutputPinImpl_AttemptConnection, BasePinImpl_GetMediaTypeVersion, QTOutPin_GetMediaType
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/strmbase/pin.c | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 59a80bd..ef22a57 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -199,7 +199,7 @@ HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface) HRESULT hr; BasePin *This = impl_from_IPin(iface);
- TRACE("()\n"); + TRACE("(%p)->()\n", This);
EnterCriticalSection(This->pCritSec); { @@ -224,7 +224,7 @@ HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) HRESULT hr; BasePin *This = impl_from_IPin(iface);
- TRACE("(%p)\n", ppPin); + TRACE("(%p)->(%p)\n", This, ppPin);
EnterCriticalSection(This->pCritSec); { @@ -250,7 +250,7 @@ HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt HRESULT hr; BasePin *This = impl_from_IPin(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, pmt); + TRACE("(%p)->(%p)\n", This, pmt);
EnterCriticalSection(This->pCritSec); { @@ -274,7 +274,7 @@ HRESULT WINAPI BasePinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) { BasePin *This = impl_from_IPin(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); + TRACE("(%p)->(%p)\n", This, pInfo);
Copy_PinInfo(pInfo, &This->pinInfo); IBaseFilter_AddRef(pInfo->pFilter); @@ -286,7 +286,7 @@ HRESULT WINAPI BasePinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) { BasePin *This = impl_from_IPin(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir); + TRACE("(%p)->(%p)\n", This, pPinDir);
*pPinDir = This->pinInfo.dir;
@@ -297,7 +297,7 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id) { BasePin *This = impl_from_IPin(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, Id); + TRACE("(%p)->(%p)\n", This, Id);
*Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); if (!*Id) @@ -321,7 +321,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnu { BasePin *This = impl_from_IPin(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); + TRACE("(%p)->(%p)\n", This, ppEnum);
/* override this method to allow enumeration of your types */
@@ -332,7 +332,7 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, { BasePin *This = impl_from_IPin(iface);
- TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); + TRACE("(%p)->(%p, %p)\n", This, apPin, cPin);
return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } @@ -341,7 +341,7 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { BasePin *This = impl_from_IPin(iface);
- TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate);
This->tStart = tStart; This->tStop = tStop; @@ -366,7 +366,7 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
- TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
*ppv = NULL;
@@ -409,7 +409,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const HRESULT hr; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
- TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt);
if (!pReceivePin) @@ -489,10 +489,9 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const return hr; }
-HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { - ERR("Incoming connection on an output pin! (%p, %p)\n", pReceivePin, pmt); - + ERR("(%p)->(%p, %p) incoming connection on an output pin!\n", iface, pin, pmt); return E_UNEXPECTED; }
@@ -501,7 +500,7 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) HRESULT hr; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
- TRACE("()\n"); + TRACE("(%p)->()\n", This);
EnterCriticalSection(This->pin.pCritSec); { @@ -528,7 +527,7 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface)
HRESULT WINAPI BaseOutputPinImpl_EndOfStream(IPin * iface) { - TRACE("()\n"); + TRACE("(%p)->()\n", iface);
/* not supposed to do anything in an output pin */
@@ -557,7 +556,7 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa { HRESULT hr;
- TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); + TRACE("(%p)->(%p, %p, %p, %x)\n", This, ppSample, tStart, tStop, dwFlags);
if (!This->pin.pConnectedTo) hr = VFW_E_NOT_CONNECTED; @@ -717,7 +716,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei HRESULT hr; IMemAllocator * pMemAlloc = NULL;
- TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt);
if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) @@ -769,7 +768,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei
static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, BaseOutputPin * pPinImpl) { - TRACE("\n"); + TRACE("(%p)\n", pPinImpl);
/* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = OutputPin_Vtbl; @@ -881,10 +880,9 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) return refCount; }
-HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt) +HRESULT WINAPI BaseInputPinImpl_Connect(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { - ERR("Outgoing connection on an input pin! (%p, %p)\n", pConnector, pmt); - + ERR("(%p)->(%p, %p) outgoing connection on an input pin!\n", iface, pin, pmt); return E_UNEXPECTED; }
@@ -895,7 +893,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP PIN_DIRECTION pindirReceive; HRESULT hr = S_OK;
- TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt);
EnterCriticalSection(This->pin.pCritSec); @@ -940,7 +938,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) HRESULT hr = S_OK; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
- TRACE("(%p)\n", This); + TRACE("(%p)->()\n", This);
EnterCriticalSection(This->pin.pCritSec); if (This->flushing) @@ -963,7 +961,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); HRESULT hr; - TRACE("() semi-stub\n"); + TRACE("(%p) semi-stub\n", This);
EnterCriticalSection(This->pin.pCritSec); This->flushing = TRUE; @@ -983,7 +981,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); HRESULT hr; - TRACE("(%p)\n", This); + TRACE("(%p)->()\n", This);
EnterCriticalSection(This->pin.pCritSec); This->flushing = This->end_of_stream = FALSE; @@ -1011,7 +1009,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args;
- TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate);
args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; @@ -1155,7 +1153,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi const BaseInputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, BaseInputPin * pPinImpl) { - TRACE("\n"); + TRACE("(%p)\n", pPinImpl);
/* Common attributes */ pPinImpl->pin.refCount = 1;
-
Zebediah Figura