Zebediah Figura : strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable.
Alexandre Julliard
julliard at winehq.org
Mon May 13 16:24:16 CDT 2019
Module: wine
Branch: master
Commit: df05902b96734005f1ab31e689b9ddb1455add32
URL: https://source.winehq.org/git/wine.git/?a=commit;h=df05902b96734005f1ab31e689b9ddb1455add32
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sat May 11 14:46:21 2019 -0500
strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qcap/avico.c | 7 -------
dlls/qcap/avimux.c | 7 -------
dlls/qcap/smartteefilter.c | 16 ----------------
dlls/qcap/vfwcapture.c | 1 -
dlls/quartz/filesource.c | 1 -
dlls/quartz/parser.c | 1 -
dlls/strmbase/pin.c | 25 -------------------------
dlls/strmbase/transform.c | 1 -
dlls/winegstreamer/gstdemux.c | 1 -
dlls/wineqtdecoder/qtsplitter.c | 1 -
include/wine/strmbase.h | 3 ---
11 files changed, 64 deletions(-)
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index 49ac2d8..f8eade9 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -657,12 +657,6 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base,
return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc);
}
-static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base)
-{
- FIXME("(%p)\n", base);
- return E_NOTIMPL;
-}
-
static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
{
NULL,
@@ -671,7 +665,6 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
BaseOutputPinImpl_AttemptConnection,
AVICompressorOut_DecideBufferSize,
AVICompressorOut_DecideAllocator,
- AVICompressorOut_BreakConnect
};
IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr)
diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c
index 2bb6e12..dd78d71 100644
--- a/dlls/qcap/avimux.c
+++ b/dlls/qcap/avimux.c
@@ -1292,12 +1292,6 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base,
return IMemInputPin_NotifyAllocator(pPin, *pAlloc, TRUE);
}
-static HRESULT WINAPI AviMuxOut_BreakConnect(BaseOutputPin *base)
-{
- FIXME("(%p)\n", base);
- return E_NOTIMPL;
-}
-
static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
{
AviMuxOut_CheckMediaType,
@@ -1306,7 +1300,6 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
AviMuxOut_AttemptConnection,
NULL,
AviMuxOut_DecideAllocator,
- AviMuxOut_BreakConnect
};
static inline AviMux* impl_from_out_IPin(IPin *iface)
diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c
index 72794d0..4e22b95 100644
--- a/dlls/qcap/smartteefilter.c
+++ b/dlls/qcap/smartteefilter.c
@@ -498,13 +498,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base,
return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE);
}
-static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base)
-{
- SmartTeeFilter *This = impl_from_BasePin(&base->pin);
- FIXME("(%p): stub\n", This);
- return E_NOTIMPL;
-}
-
static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
{
SmartTeeFilterCapture_CheckMediaType,
@@ -513,7 +506,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
BaseOutputPinImpl_AttemptConnection,
NULL,
SmartTeeFilterCapture_DecideAllocator,
- SmartTeeFilterCapture_BreakConnect
};
static ULONG WINAPI SmartTeeFilterPreview_AddRef(IPin *iface)
@@ -589,13 +581,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base,
return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE);
}
-static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base)
-{
- SmartTeeFilter *This = impl_from_BasePin(&base->pin);
- FIXME("(%p): stub\n", This);
- return E_NOTIMPL;
-}
-
static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
{
SmartTeeFilterPreview_CheckMediaType,
@@ -604,7 +589,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
BaseOutputPinImpl_AttemptConnection,
NULL,
SmartTeeFilterPreview_DecideAllocator,
- SmartTeeFilterPreview_BreakConnect
};
IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr)
{
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 3d737bb..178609a 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -707,7 +707,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection,
VfwPin_DecideBufferSize,
BaseOutputPinImpl_DecideAllocator,
- BaseOutputPinImpl_BreakConnect
};
static HRESULT
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 293914d..a54e948 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -914,7 +914,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
FileAsyncReaderPin_AttemptConnection,
FileAsyncReaderPin_DecideBufferSize,
BaseOutputPinImpl_DecideAllocator,
- BaseOutputPinImpl_BreakConnect
};
static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin)
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index d92161f..c3b69cd 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -428,7 +428,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection,
Parser_OutputPin_DecideBufferSize,
Parser_OutputPin_DecideAllocator,
- NULL,
};
HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index 58fe0e5..2fa0b9a 100644
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -639,31 +639,6 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This)
return hr;
}
-/* replaces OutputPin_DeliverDisconnect */
-HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This)
-{
- HRESULT hr;
-
- TRACE("(%p)->()\n", This);
-
- EnterCriticalSection(This->pin.pCritSec);
- {
- if (!This->pin.pConnectedTo || !This->pMemInputPin)
- hr = VFW_E_NOT_CONNECTED;
- else
- {
- hr = IMemAllocator_Decommit(This->pAllocator);
-
- if (SUCCEEDED(hr))
- hr = IPin_Disconnect(This->pin.pConnectedTo);
- }
- IPin_Disconnect(&This->pin.IPin_iface);
- }
- LeaveCriticalSection(This->pin.pCritSec);
-
- return hr;
-}
-
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc)
{
return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);
diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c
index 1ce6283..544b77a 100644
--- a/dlls/strmbase/transform.c
+++ b/dlls/strmbase/transform.c
@@ -165,7 +165,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection,
TransformFilter_Output_DecideBufferSize,
BaseOutputPinImpl_DecideAllocator,
- BaseOutputPinImpl_BreakConnect
};
static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, TransformFilter* pTransformFilter)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 1a369a1..32b871d 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1879,7 +1879,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection,
GSTOutPin_DecideBufferSize,
GSTOutPin_DecideAllocator,
- NULL,
};
static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt)
diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
index cd146db..4855069 100644
--- a/dlls/wineqtdecoder/qtsplitter.c
+++ b/dlls/wineqtdecoder/qtsplitter.c
@@ -1520,7 +1520,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection,
QTOutPin_DecideBufferSize,
QTOutPin_DecideAllocator,
- NULL,
};
static const OutputQueueFuncTable output_OutputQueueFuncTable = {
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index cb7112b..120642c 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -67,7 +67,6 @@ typedef struct BaseOutputPin
typedef HRESULT (WINAPI *BaseOutputPin_AttemptConnection)(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt);
typedef HRESULT (WINAPI *BaseOutputPin_DecideBufferSize)(BaseOutputPin *This, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest);
typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc);
-typedef HRESULT (WINAPI *BaseOutputPin_BreakConnect)(BaseOutputPin * This);
typedef struct BaseOutputPinFuncTable {
BasePinFuncTable base;
@@ -78,7 +77,6 @@ typedef struct BaseOutputPinFuncTable {
BaseOutputPin_DecideBufferSize pfnDecideBufferSize;
/* Required for BaseOutputPinImpl_AttemptConnection */
BaseOutputPin_DecideAllocator pfnDecideAllocator;
- BaseOutputPin_BreakConnect pfnBreakConnect;
} BaseOutputPinFuncTable;
typedef struct BaseInputPin
@@ -129,7 +127,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface);
HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags);
HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin * This, IMediaSample * pSample);
-HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin * This);
HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin * This);
HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin * This);
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc);
More information about the wine-cvs
mailing list