ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strmbase: COM cleanup for BasePin, BaseInputPin, and BaseOutputPin.

This commit is contained in:
Aric Stewart 2012-03-24 11:42:32 -05:00 committed by Alexandre Julliard
parent 29d3c75442
commit eb5d8b969f
7 changed files with 79 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/quartz/pin.c
View File

@ -186,7 +186,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI
QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, PullPin * pPinImpl) QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, PullPin * pPinImpl)
{ {
/* Common attributes */ /* Common attributes */
pPinImpl->pin.lpVtbl = PullPin_Vtbl; pPinImpl->pin.IPin_iface.lpVtbl = PullPin_Vtbl;
pPinImpl->pin.refCount = 1; pPinImpl->pin.refCount = 1;
pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pConnectedTo = NULL;
pPinImpl->pin.pCritSec = pCritSec; pPinImpl->pin.pCritSec = pCritSec;
@ -240,7 +240,7 @@ HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInf
if (SUCCEEDED(PullPin_Init(PullPin_Vtbl, pPinInfo, pSampleProc, pUserData, pQueryAccept, pCleanUp, pCustomRequest, pDone, pCritSec, pPinImpl))) if (SUCCEEDED(PullPin_Init(PullPin_Vtbl, pPinInfo, pSampleProc, pUserData, pQueryAccept, pCleanUp, pCustomRequest, pDone, pCritSec, pPinImpl)))
{ {
*ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); *ppPin = &pPinImpl->pin.IPin_iface;
return S_OK; return S_OK;
} }

4
dlls/strmbase/mediatype.c
View File

@ -118,7 +118,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e
pEnumMediaTypes->uIndex = 0; pEnumMediaTypes->uIndex = 0;
pEnumMediaTypes->enumMediaFunction = enumFunc; pEnumMediaTypes->enumMediaFunction = enumFunc;
pEnumMediaTypes->mediaVersionFunction = versionFunc; pEnumMediaTypes->mediaVersionFunction = versionFunc;
IPin_AddRef((IPin*)basePin); IPin_AddRef(&basePin->IPin_iface);
pEnumMediaTypes->basePin = basePin; pEnumMediaTypes->basePin = basePin;
i = 0; i = 0;
@ -188,7 +188,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface)
if (This->enumMediaDetails.pMediaTypes[i].pbFormat) if (This->enumMediaDetails.pMediaTypes[i].pbFormat)
CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat);
CoTaskMemFree(This->enumMediaDetails.pMediaTypes); CoTaskMemFree(This->enumMediaDetails.pMediaTypes);
IPin_Release((IPin*)This->basePin); IPin_Release(&This->basePin->IPin_iface);
CoTaskMemFree(This); CoTaskMemFree(This);
} }
return refCount; return refCount;

8
dlls/strmbase/outputqueue.c
View File

@ -97,7 +97,7 @@ HRESULT WINAPI OutputQueue_Construct(
list_init(This->SampleList); list_init(This->SampleList);
This->pInputPin = pInputPin; This->pInputPin = pInputPin;
IPin_AddRef((IPin*)pInputPin); IPin_AddRef(&pInputPin->pin.IPin_iface);
EnterCriticalSection(&This->csQueue); EnterCriticalSection(&This->csQueue);
if (bAuto && pInputPin->pMemInputPin) if (bAuto && pInputPin->pMemInputPin)
@ -133,7 +133,7 @@ HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue)
HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList); HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList);
IPin_Release((IPin*)pOutputQueue->pInputPin); IPin_Release(&pOutputQueue->pInputPin->pin.IPin_iface);
HeapFree(GetProcessHeap(),0,pOutputQueue); HeapFree(GetProcessHeap(),0,pOutputQueue);
return S_OK; return S_OK;
} }
@ -219,7 +219,7 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue)
else else
{ {
IPin* ppin = NULL; IPin* ppin = NULL;
IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin);
if (ppin) if (ppin)
{ {
IPin_EndOfStream(ppin); IPin_EndOfStream(ppin);
@ -285,7 +285,7 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue)
if (qev->type == EOS_PACKET) if (qev->type == EOS_PACKET)
{ {
IPin* ppin = NULL; IPin* ppin = NULL;
IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin);
if (ppin) if (ppin)
{ {
IPin_EndOfStream(ppin); IPin_EndOfStream(ppin);

105
dlls/strmbase/pin.c
View File

@ -37,6 +37,11 @@ static const IMemInputPinVtbl MemInputPin_Vtbl;
typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg );
static inline BasePin *impl_from_IPin( IPin *iface )
{
return CONTAINING_RECORD(iface, BasePin, IPin_iface);
}
/** Helper function, there are a lot of places where the error code is inherited /** Helper function, there are a lot of places where the error code is inherited
* The following rules apply: * The following rules apply:
* *
@ -184,7 +189,7 @@ LONG WINAPI BasePinImpl_GetMediaTypeVersion(BasePin *iface)
ULONG WINAPI BasePinImpl_AddRef(IPin * iface) ULONG WINAPI BasePinImpl_AddRef(IPin * iface)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1);
@ -195,7 +200,7 @@ ULONG WINAPI BasePinImpl_AddRef(IPin * iface)
HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface) HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface)
{ {
HRESULT hr; HRESULT hr;
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("()\n"); TRACE("()\n");
@ -220,7 +225,7 @@ HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface)
HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin)
{ {
HRESULT hr; HRESULT hr;
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p)\n", ppPin); TRACE("(%p)\n", ppPin);
@ -246,7 +251,7 @@ HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin)
HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt) HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt)
{ {
HRESULT hr; HRESULT hr;
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, pmt); TRACE("(%p/%p)->(%p)\n", This, iface, pmt);
@ -270,7 +275,7 @@ HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt
HRESULT WINAPI BasePinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) HRESULT WINAPI BasePinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); TRACE("(%p/%p)->(%p)\n", This, iface, pInfo);
@ -282,7 +287,7 @@ HRESULT WINAPI BasePinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo)
HRESULT WINAPI BasePinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) HRESULT WINAPI BasePinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir); TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir);
@ -293,7 +298,7 @@ HRESULT WINAPI BasePinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir)
HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id) HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, Id); TRACE("(%p/%p)->(%p)\n", This, iface, Id);
@ -315,7 +320,7 @@ HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt)
HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum);
@ -326,7 +331,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnu
HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin);
@ -335,7 +340,7 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin,
HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{ {
BasePin *This = (BasePin *)iface; BasePin *This = impl_from_IPin(iface);
TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate);
@ -348,9 +353,19 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER
/*** OutputPin implementation ***/ /*** OutputPin implementation ***/
static inline BaseOutputPin *impl_BaseOutputPin_from_IPin( IPin *iface )
{
return CONTAINING_RECORD(iface, BaseOutputPin, pin.IPin_iface);
}
static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin( BasePin *iface )
{
return CONTAINING_RECORD(iface, BaseOutputPin, pin);
}
HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv)
{ {
BaseOutputPin *This = (BaseOutputPin *)iface; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv);
@ -379,7 +394,7 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI
ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface)
{ {
BaseOutputPin *This = (BaseOutputPin *)iface; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
ULONG refCount = InterlockedDecrement(&This->pin.refCount); ULONG refCount = InterlockedDecrement(&This->pin.refCount);
TRACE("(%p)->() Release from %d\n", iface, refCount + 1); TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
@ -396,7 +411,7 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface)
HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt)
{ {
HRESULT hr; HRESULT hr;
BaseOutputPin *This = (BaseOutputPin *)iface; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt);
dump_AM_MEDIA_TYPE(pmt); dump_AM_MEDIA_TYPE(pmt);
@ -411,7 +426,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
/* if we have been a specific type to connect with, then we can either connect /* if we have been a specific type to connect with, then we can either connect
* with that or fail. We cannot choose different AM_MEDIA_TYPE */ * with that or fail. We cannot choose different AM_MEDIA_TYPE */
if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL))
hr = This->pin.pFuncsTable->pfnAttemptConnection((BasePin*)This, pReceivePin, pmt); hr = This->pin.pFuncsTable->pfnAttemptConnection(&This->pin, pReceivePin, pmt);
else else
{ {
/* negotiate media type */ /* negotiate media type */
@ -432,7 +447,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
&& !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype)) && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype))
assert(pmtCandidate->pbFormat); assert(pmtCandidate->pbFormat);
if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) &&
(This->pin.pFuncsTable->pfnAttemptConnection((BasePin*)This, pReceivePin, pmtCandidate) == S_OK)) (This->pin.pFuncsTable->pfnAttemptConnection(&This->pin, pReceivePin, pmtCandidate) == S_OK))
{ {
hr = S_OK; hr = S_OK;
DeleteMediaType(pmtCandidate); DeleteMediaType(pmtCandidate);
@ -454,7 +469,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const
assert(pmtCandidate); assert(pmtCandidate);
dump_AM_MEDIA_TYPE(pmtCandidate); dump_AM_MEDIA_TYPE(pmtCandidate);
if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) &&
(This->pin.pFuncsTable->pfnAttemptConnection((BasePin*)This, pReceivePin, pmtCandidate) == S_OK)) (This->pin.pFuncsTable->pfnAttemptConnection(&This->pin, pReceivePin, pmtCandidate) == S_OK))
{ {
hr = S_OK; hr = S_OK;
DeleteMediaType(pmtCandidate); DeleteMediaType(pmtCandidate);
@ -483,7 +498,7 @@ HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceive
HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface)
{ {
HRESULT hr; HRESULT hr;
BaseOutputPin *This = (BaseOutputPin *)iface; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);
TRACE("()\n"); TRACE("()\n");
@ -716,7 +731,7 @@ HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = IPin_Disconnect(This->pin.pConnectedTo); hr = IPin_Disconnect(This->pin.pConnectedTo);
} }
IPin_Disconnect((IPin *)This); IPin_Disconnect(&This->pin.IPin_iface);
} }
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
@ -759,7 +774,7 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputP
/* specific AM_MEDIA_TYPE - it cannot be NULL */ /* specific AM_MEDIA_TYPE - it cannot be NULL */
HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt)
{ {
BaseOutputPin *This = (BaseOutputPin *)iface; BaseOutputPin *This = impl_BaseOutputPin_from_BasePin(iface);
HRESULT hr; HRESULT hr;
IMemAllocator * pMemAlloc = NULL; IMemAllocator * pMemAlloc = NULL;
@ -772,7 +787,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei
IPin_AddRef(pReceivePin); IPin_AddRef(pReceivePin);
CopyMediaType(&This->pin.mtCurrent, pmt); CopyMediaType(&This->pin.mtCurrent, pmt);
hr = IPin_ReceiveConnection(pReceivePin, (IPin*)iface, pmt); hr = IPin_ReceiveConnection(pReceivePin, &iface->IPin_iface, pmt);
/* get the IMemInputPin interface we will use to deliver samples to the /* get the IMemInputPin interface we will use to deliver samples to the
* connected pin */ * connected pin */
@ -815,7 +830,7 @@ static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * p
TRACE("\n"); TRACE("\n");
/* Common attributes */ /* Common attributes */
pPinImpl->pin.lpVtbl = OutputPin_Vtbl; pPinImpl->pin.IPin_iface.lpVtbl = OutputPin_Vtbl;
pPinImpl->pin.refCount = 1; pPinImpl->pin.refCount = 1;
pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pConnectedTo = NULL;
pPinImpl->pin.pCritSec = pCritSec; pPinImpl->pin.pCritSec = pCritSec;
@ -855,7 +870,7 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp
if (SUCCEEDED(OutputPin_Init(OutputPin_Vtbl, pPinInfo, pBaseFuncsTable, pBaseOutputFuncsTable, pCritSec, pPinImpl))) if (SUCCEEDED(OutputPin_Init(OutputPin_Vtbl, pPinInfo, pBaseFuncsTable, pBaseOutputFuncsTable, pCritSec, pPinImpl)))
{ {
*ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); *ppPin = &pPinImpl->pin.IPin_iface;
return S_OK; return S_OK;
} }
@ -865,9 +880,19 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp
/*** Input Pin implementation ***/ /*** Input Pin implementation ***/
static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface )
{
return CONTAINING_RECORD(iface, BaseInputPin, pin.IPin_iface);
}
static inline BaseInputPin *impl_BaseInputPin_from_BasePin( BasePin *iface )
{
return CONTAINING_RECORD(iface, BaseInputPin, pin);
}
HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
@ -878,7 +903,7 @@ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID
else if (IsEqualIID(riid, &IID_IPin)) else if (IsEqualIID(riid, &IID_IPin))
*ppv = iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IMemInputPin)) else if (IsEqualIID(riid, &IID_IMemInputPin))
*ppv = &This->lpVtblMemInput; *ppv = &This->IMemInputPin_iface;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
{ {
return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv);
@ -897,7 +922,7 @@ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID
ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) ULONG WINAPI BaseInputPinImpl_Release(IPin * iface)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
ULONG refCount = InterlockedDecrement(&This->pin.refCount); ULONG refCount = InterlockedDecrement(&This->pin.refCount);
TRACE("(%p)->() Release from %d\n", iface, refCount + 1); TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
@ -908,7 +933,7 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface)
if (This->pAllocator) if (This->pAllocator)
IMemAllocator_Release(This->pAllocator); IMemAllocator_Release(This->pAllocator);
This->pAllocator = NULL; This->pAllocator = NULL;
This->pin.lpVtbl = NULL; This->pin.IPin_iface.lpVtbl = NULL;
CoTaskMemFree(This); CoTaskMemFree(This);
return 0; return 0;
} }
@ -926,7 +951,7 @@ HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const A
HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
PIN_DIRECTION pindirReceive; PIN_DIRECTION pindirReceive;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -938,7 +963,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP
if (This->pin.pConnectedTo) if (This->pin.pConnectedTo)
hr = VFW_E_ALREADY_CONNECTED; hr = VFW_E_ALREADY_CONNECTED;
if (SUCCEEDED(hr) && This->pin.pFuncsTable->pfnCheckMediaType((BasePin*)This, pmt) != S_OK) if (SUCCEEDED(hr) && This->pin.pFuncsTable->pfnCheckMediaType(&This->pin, pmt) != S_OK)
hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto
* VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */ * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */
@ -972,17 +997,17 @@ static HRESULT deliver_endofstream(IPin* pin, LPVOID unused)
HRESULT WINAPI BaseInputPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI BaseInputPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, pmt); TRACE("(%p/%p)->(%p)\n", This, iface, pmt);
return (This->pin.pFuncsTable->pfnCheckMediaType((BasePin*)This, pmt) == S_OK ? S_OK : S_FALSE); return (This->pin.pFuncsTable->pfnCheckMediaType(&This->pin, pmt) == S_OK ? S_OK : S_FALSE);
} }
HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -1005,7 +1030,7 @@ static HRESULT deliver_beginflush(IPin* pin, LPVOID unused)
HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
HRESULT hr; HRESULT hr;
TRACE("() semi-stub\n"); TRACE("() semi-stub\n");
@ -1025,7 +1050,7 @@ static HRESULT deliver_endflush(IPin* pin, LPVOID unused)
HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -1052,7 +1077,7 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data)
HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{ {
BaseInputPin *This = (BaseInputPin *)iface; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface);
newsegmentargs args; newsegmentargs args;
TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate);
@ -1090,28 +1115,28 @@ static const IPinVtbl InputPin_Vtbl =
static inline BaseInputPin *impl_from_IMemInputPin( IMemInputPin *iface ) static inline BaseInputPin *impl_from_IMemInputPin( IMemInputPin *iface )
{ {
return (BaseInputPin *)((char*)iface - FIELD_OFFSET(BaseInputPin, lpVtblMemInput)); return CONTAINING_RECORD(iface, BaseInputPin, IMemInputPin_iface);
} }
static HRESULT WINAPI MemInputPin_QueryInterface(IMemInputPin * iface, REFIID riid, LPVOID * ppv) static HRESULT WINAPI MemInputPin_QueryInterface(IMemInputPin * iface, REFIID riid, LPVOID * ppv)
{ {
BaseInputPin *This = impl_from_IMemInputPin(iface); BaseInputPin *This = impl_from_IMemInputPin(iface);
return IPin_QueryInterface((IPin *)&This->pin, riid, ppv); return IPin_QueryInterface(&This->pin.IPin_iface, riid, ppv);
} }
static ULONG WINAPI MemInputPin_AddRef(IMemInputPin * iface) static ULONG WINAPI MemInputPin_AddRef(IMemInputPin * iface)
{ {
BaseInputPin *This = impl_from_IMemInputPin(iface); BaseInputPin *This = impl_from_IMemInputPin(iface);
return IPin_AddRef((IPin *)&This->pin); return IPin_AddRef(&This->pin.IPin_iface);
} }
static ULONG WINAPI MemInputPin_Release(IMemInputPin * iface) static ULONG WINAPI MemInputPin_Release(IMemInputPin * iface)
{ {
BaseInputPin *This = impl_from_IMemInputPin(iface); BaseInputPin *This = impl_from_IMemInputPin(iface);
return IPin_Release((IPin *)&This->pin); return IPin_Release(&This->pin.IPin_iface);
} }
static HRESULT WINAPI MemInputPin_GetAllocator(IMemInputPin * iface, IMemAllocator ** ppAllocator) static HRESULT WINAPI MemInputPin_GetAllocator(IMemInputPin * iface, IMemAllocator ** ppAllocator)
@ -1239,8 +1264,8 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi
pPinImpl->pAllocator = pPinImpl->preferred_allocator = allocator; pPinImpl->pAllocator = pPinImpl->preferred_allocator = allocator;
if (pPinImpl->preferred_allocator) if (pPinImpl->preferred_allocator)
IMemAllocator_AddRef(pPinImpl->preferred_allocator); IMemAllocator_AddRef(pPinImpl->preferred_allocator);
pPinImpl->pin.lpVtbl = InputPin_Vtbl; pPinImpl->pin.IPin_iface.lpVtbl = InputPin_Vtbl;
pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; pPinImpl->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl;
pPinImpl->flushing = pPinImpl->end_of_stream = 0; pPinImpl->flushing = pPinImpl->end_of_stream = 0;
return S_OK; return S_OK;

4
dlls/winegstreamer/gstdemux.c
View File

@ -1062,7 +1062,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) {
piInput->dir = PINDIR_INPUT; piInput->dir = PINDIR_INPUT;
piInput->pFilter = (IBaseFilter *)This; piInput->pFilter = (IBaseFilter *)This;
lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0]));
This->pInputPin.pin.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl;
This->pInputPin.pin.refCount = 1; This->pInputPin.pin.refCount = 1;
This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pConnectedTo = NULL;
This->pInputPin.pin.pCritSec = &This->filter.csFilter; This->pInputPin.pin.pCritSec = &This->filter.csFilter;
@ -1604,7 +1604,7 @@ static ULONG WINAPI GSTInPin_Release(IPin *iface) {
if (This->pAlloc) if (This->pAlloc)
IMemAllocator_Release(This->pAlloc); IMemAllocator_Release(This->pAlloc);
This->pAlloc = NULL; This->pAlloc = NULL;
This->pin.lpVtbl = NULL; This->pin.IPin_iface.lpVtbl = NULL;
return 0; return 0;
} else } else
return refCount; return refCount;

4
dlls/wineqtdecoder/qtsplitter.c
View File

@ -266,7 +266,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr)
piInput->dir = PINDIR_INPUT; piInput->dir = PINDIR_INPUT;
piInput->pFilter = (IBaseFilter *)This; piInput->pFilter = (IBaseFilter *)This;
lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0]));
This->pInputPin.pin.lpVtbl = &QT_InputPin_Vtbl; This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl;
This->pInputPin.pin.refCount = 1; This->pInputPin.pin.refCount = 1;
This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pConnectedTo = NULL;
This->pInputPin.pin.pCritSec = &This->filter.csFilter; This->pInputPin.pin.pCritSec = &This->filter.csFilter;
@ -763,7 +763,7 @@ static ULONG WINAPI QTInPin_Release(IPin *iface)
if (This->pAlloc) if (This->pAlloc)
IMemAllocator_Release(This->pAlloc); IMemAllocator_Release(This->pAlloc);
This->pAlloc = NULL; This->pAlloc = NULL;
This->pin.lpVtbl = NULL; This->pin.IPin_iface.lpVtbl = NULL;
return 0; return 0;
} }
else else

4
include/wine/strmbase.h
View File

@ -28,7 +28,7 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType);
typedef struct BasePin typedef struct BasePin
{ {
const struct IPinVtbl * lpVtbl; IPin IPin_iface;
LONG refCount; LONG refCount;
LPCRITICAL_SECTION pCritSec; LPCRITICAL_SECTION pCritSec;
PIN_INFO pinInfo; PIN_INFO pinInfo;
@ -82,7 +82,7 @@ typedef struct BaseInputPin
/* inheritance C style! */ /* inheritance C style! */
BasePin pin; BasePin pin;
const IMemInputPinVtbl * lpVtblMemInput; IMemInputPin IMemInputPin_iface;
IMemAllocator * pAllocator; IMemAllocator * pAllocator;
BOOL flushing, end_of_stream; BOOL flushing, end_of_stream;
IMemAllocator *preferred_allocator; IMemAllocator *preferred_allocator;