Zebediah Figura : strmbase: Get rid of the no longer used pin constructor and destructor helpers.
Alexandre Julliard
julliard at winehq.org
Fri Sep 6 16:05:42 CDT 2019
Module: wine
Branch: master
Commit: 0a105660613211c8d3ab7026572078b333e9e91d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a105660613211c8d3ab7026572078b333e9e91d
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Sep 5 19:02:13 2019 -0500
strmbase: Get rid of the no longer used pin constructor and destructor helpers.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/strmbase/pin.c | 67 -------------------------------------------------
include/wine/strmbase.h | 6 -----
2 files changed, 73 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index 4478855..1386f6b 100644
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -731,31 +731,6 @@ void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl,
pin->pFuncsTable = func_table;
}
-HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IPin ** ppPin)
-{
- BaseOutputPin * pPinImpl;
-
- *ppPin = NULL;
-
- if (pPinInfo->dir != PINDIR_OUTPUT)
- {
- ERR("Pin direction(%x) != PINDIR_OUTPUT\n", pPinInfo->dir);
- return E_INVALIDARG;
- }
-
- assert(outputpin_size >= sizeof(BaseOutputPin));
- assert(vtbl->pfnAttemptConnection);
-
- pPinImpl = CoTaskMemAlloc(outputpin_size);
-
- if (!pPinImpl)
- return E_OUTOFMEMORY;
-
- strmbase_source_init(pPinImpl, OutputPin_Vtbl, pPinInfo, vtbl, pCritSec);
- *ppPin = &pPinImpl->pin.IPin_iface;
- return S_OK;
-}
-
void strmbase_source_cleanup(BaseOutputPin *pin)
{
FreeMediaType(&pin->pin.mtCurrent);
@@ -764,13 +739,6 @@ void strmbase_source_cleanup(BaseOutputPin *pin)
pin->pAllocator = NULL;
}
-HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This)
-{
- strmbase_source_cleanup(This);
- CoTaskMemFree(This);
- return S_OK;
-}
-
/*** Input Pin implementation ***/
static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface )
@@ -1090,34 +1058,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl,
pin->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl;
}
-HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo,
- const BaseInputPinFuncTable* vtbl,
- LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, IPin ** ppPin)
-{
- BaseInputPin * pPinImpl;
-
- *ppPin = NULL;
-
- assert(inputpin_size >= sizeof(BaseInputPin));
- assert(vtbl->base.pfnCheckMediaType);
-
- if (pPinInfo->dir != PINDIR_INPUT)
- {
- ERR("Pin direction(%x) != PINDIR_INPUT\n", pPinInfo->dir);
- return E_INVALIDARG;
- }
-
- pPinImpl = CoTaskMemAlloc(inputpin_size);
-
- if (!pPinImpl)
- return E_OUTOFMEMORY;
-
- strmbase_sink_init(pPinImpl, InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator);
-
- *ppPin = &pPinImpl->pin.IPin_iface;
- return S_OK;
-}
-
void strmbase_sink_cleanup(BaseInputPin *pin)
{
FreeMediaType(&pin->pin.mtCurrent);
@@ -1126,10 +1066,3 @@ void strmbase_sink_cleanup(BaseInputPin *pin)
pin->pAllocator = NULL;
pin->pin.IPin_iface.lpVtbl = NULL;
}
-
-HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This)
-{
- strmbase_sink_cleanup(This);
- CoTaskMemFree(This);
- return S_OK;
-}
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index d23231e..6bd00e1 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -132,8 +132,6 @@ HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocato
HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc);
HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt);
-HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin);
-HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This);
void strmbase_source_cleanup(BaseOutputPin *pin);
void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info,
const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs);
@@ -148,10 +146,6 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface);
HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface);
HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate);
-HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo,
- const BaseInputPinFuncTable* pBaseInputFuncsTable,
- LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin);
-HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This);
void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info,
const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, IMemAllocator *allocator);
void strmbase_sink_cleanup(BaseInputPin *pin);
More information about the wine-cvs
mailing list