Module: wine Branch: master Commit: a1d65ac38cc7adc5748fb401dafa588c8aad7eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d65ac38cc7adc5748fb401d...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Jun 12 18:58:35 2019 -0500
strmbase: Return void from InputPin_Init().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/strmbase/pin.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c60deed..6bc9927 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1109,9 +1109,9 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = MemInputPin_ReceiveCanBlock };
-static HRESULT InputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, - const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, - IMemAllocator *allocator, BaseInputPin *pin) +static void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, + const PIN_INFO *info, const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, + IMemAllocator *allocator) { memset(pin, 0, sizeof(*pin)); strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); @@ -1120,8 +1120,6 @@ static HRESULT InputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, if (pin->preferred_allocator) IMemAllocator_AddRef(pin->preferred_allocator); pin->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; - - return S_OK; }
HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, @@ -1146,14 +1144,10 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size if (!pPinImpl) return E_OUTOFMEMORY;
- if (SUCCEEDED(InputPin_Init(InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator, pPinImpl))) - { - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; - } + strmbase_sink_init(pPinImpl, InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator);
- CoTaskMemFree(pPinImpl); - return E_FAIL; + *ppPin = &pPinImpl->pin.IPin_iface; + return S_OK; }
HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This)