June 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : qcap/smartteefilter: Store the sink pin inline in the AviCompressor structure.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 2481b53da35b96ffbf1ff30b4b26e6186db4bbb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2481b53da35b96ffbf1ff30b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 12 18:58:38 2019 -0500 qcap/smartteefilter: Store the sink pin inline in the AviCompressor structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 49 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 02503ec..69341af 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; - BaseInputPin *input; + BaseInputPin sink; BaseOutputPin *capture; BaseOutputPin *preview; } SmartTeeFilter; @@ -91,7 +91,7 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta /* We share an allocator among all pins, an allocator can only get committed * once, state transitions occur in upstream order, and only output pins * commit allocators, so let the filter attached to the input pin worry about it. */ - if (This->input->pin.pConnectedTo) + if (This->sink.pin.pConnectedTo) This->filter.state = State_Running; else hr = VFW_E_NOT_CONNECTED; @@ -123,7 +123,7 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) SmartTeeFilter *filter = impl_from_BaseFilter(iface); if (index == 0) - return &filter->input->pin.IPin_iface; + return &filter->sink.pin.IPin_iface; else if (index == 1) return &filter->capture->pin.IPin_iface; else if (index == 2) @@ -135,8 +135,7 @@ static void smart_tee_destroy(BaseFilter *iface) { SmartTeeFilter *filter = impl_from_BaseFilter(iface); - if (filter->input) - BaseInputPinImpl_Release(&filter->input->pin.IPin_iface); + strmbase_sink_cleanup(&filter->sink); if (filter->capture) BaseOutputPinImpl_Release(&filter->capture->pin.IPin_iface); if (filter->preview) @@ -204,10 +203,12 @@ static HRESULT WINAPI SmartTeeFilterInput_GetMediaType(BasePin *base, int iPosit if (iPosition) return S_FALSE; EnterCriticalSection(&This->filter.csFilter); - if (This->input->pin.pConnectedTo) { - CopyMediaType(amt, &This->input->pin.mtCurrent); + if (This->sink.pin.pConnectedTo) + { + CopyMediaType(amt, &This->sink.pin.mtCurrent); hr = S_OK; - } else + } + else hr = S_FALSE; LeaveCriticalSection(&This->filter.csFilter); return hr; @@ -360,9 +361,9 @@ static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMed HRESULT hr; TRACE("(%p)->(%p)\n", This, ppEnum); EnterCriticalSection(&This->filter.csFilter); - if (This->input->pin.pConnectedTo) { + if (This->sink.pin.pConnectedTo) hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - } else + else hr = VFW_E_NOT_CONNECTED; LeaveCriticalSection(&This->filter.csFilter); return hr; @@ -400,7 +401,7 @@ static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPos SmartTeeFilter *This = impl_from_BasePin(base); TRACE("(%p, %d, %p)\n", This, iPosition, amt); if (iPosition == 0) { - CopyMediaType(amt, &This->input->pin.mtCurrent); + CopyMediaType(amt, &This->sink.pin.mtCurrent); return S_OK; } else return S_FALSE; @@ -410,9 +411,9 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base, { SmartTeeFilter *This = impl_from_BasePin(&base->pin); TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); - *pAlloc = This->input->pAllocator; - IMemAllocator_AddRef(This->input->pAllocator); - return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); + *pAlloc = This->sink.pAllocator; + IMemAllocator_AddRef(This->sink.pAllocator); + return IMemInputPin_NotifyAllocator(pPin, This->sink.pAllocator, TRUE); } static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { @@ -443,9 +444,9 @@ static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMed HRESULT hr; TRACE("(%p)->(%p)\n", This, ppEnum); EnterCriticalSection(&This->filter.csFilter); - if (This->input->pin.pConnectedTo) { + if (This->sink.pin.pConnectedTo) hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - } else + else hr = VFW_E_NOT_CONNECTED; LeaveCriticalSection(&This->filter.csFilter); return hr; @@ -483,7 +484,7 @@ static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPos SmartTeeFilter *This = impl_from_BasePin(base); TRACE("(%p, %d, %p)\n", This, iPosition, amt); if (iPosition == 0) { - CopyMediaType(amt, &This->input->pin.mtCurrent); + CopyMediaType(amt, &This->sink.pin.mtCurrent); return S_OK; } else return S_FALSE; @@ -493,9 +494,9 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base, { SmartTeeFilter *This = impl_from_BasePin(&base->pin); TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); - *pAlloc = This->input->pAllocator; - IMemAllocator_AddRef(This->input->pAllocator); - return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); + *pAlloc = This->sink.pAllocator; + IMemAllocator_AddRef(This->sink.pAllocator); + return IMemInputPin_NotifyAllocator(pPin, This->sink.pAllocator, TRUE); } static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { @@ -526,12 +527,10 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) (DWORD_PTR)(__FILE__ ": SmartTeeFilter.csFilter"), &SmartTeeFilterFuncs); inputPinInfo.pFilter = &This->filter.IBaseFilter_iface; - hr = BaseInputPin_Construct(&SmartTeeFilterInputVtbl, sizeof(BaseInputPin), &inputPinInfo, - &SmartTeeFilterInputFuncs, &This->filter.csFilter, NULL, (IPin**)&This->input); - if (FAILED(hr)) - goto end; + strmbase_sink_init(&This->sink, &SmartTeeFilterInputVtbl, &inputPinInfo, + &SmartTeeFilterInputFuncs, &This->filter.csFilter, NULL); hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&This->input->pAllocator); + &IID_IMemAllocator, (void**)&This->sink.pAllocator); if (FAILED(hr)) goto end;

1 0

Zebediah Figura : qcap/avico: Store the sink pin inline in the AviCompressor structure.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: f2206d3db6881d94ad427b537f876912d211fa5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2206d3db6881d94ad427b53… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 12 18:58:37 2019 -0500 qcap/avico: Store the sink pin inline in the AviCompressor structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 20 +++++++------------- dlls/strmbase/pin.c | 4 ++-- include/wine/strmbase.h | 3 +++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index d257051..841db70 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -37,7 +37,7 @@ typedef struct { BaseFilter filter; IPersistPropertyBag IPersistPropertyBag_iface; - BaseInputPin *in; + BaseInputPin sink; BaseOutputPin *out; DWORD fcc_handler; @@ -183,7 +183,7 @@ static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index) AVICompressor *filter = impl_from_BaseFilter(iface); if (index == 0) - return &filter->in->pin.IPin_iface; + return &filter->sink.pin.IPin_iface; else if (index == 1) return &filter->out->pin.IPin_iface; return NULL; @@ -196,8 +196,7 @@ static void avi_compressor_destroy(BaseFilter *iface) if (filter->hic) ICClose(filter->hic); heap_free(filter->videoinfo); - if (filter->in) - BaseInputPinImpl_Release(&filter->in->pin.IPin_iface); + strmbase_sink_cleanup(&filter->sink); if (filter->out) BaseOutputPinImpl_Release(&filter->out->pin.IPin_iface); strmbase_filter_cleanup(&filter->filter); @@ -484,7 +483,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * if((This->driver_flags & VIDCF_TEMPORAL) && !(This->driver_flags & VIDCF_FASTTEMPORALC)) FIXME("Unsupported temporal compression\n"); - src_videoinfo = (VIDEOINFOHEADER*)This->in->pin.mtCurrent.pbFormat; + src_videoinfo = (VIDEOINFOHEADER *)This->sink.pin.mtCurrent.pbFormat; This->videoinfo->bmiHeader.biSizeImage = This->max_frame_size; res = ICCompress(This->hic, sync_point ? ICCOMPRESS_KEYFRAME : 0, &This->videoinfo->bmiHeader, buf, &src_videoinfo->bmiHeader, ptr, 0, &comp_flags, This->frame_cnt, 0, 0, NULL, NULL); @@ -572,7 +571,7 @@ static HRESULT WINAPI AVICompressorOut_GetMediaType(BasePin *base, int iPosition amt->subtype = MEDIASUBTYPE_PCM; amt->bFixedSizeSamples = FALSE; amt->bTemporalCompression = (This->driver_flags & VIDCF_TEMPORAL) != 0; - amt->lSampleSize = This->in->pin.mtCurrent.lSampleSize; + amt->lSampleSize = This->sink.pin.mtCurrent.lSampleSize; amt->formattype = FORMAT_VideoInfo; amt->pUnk = NULL; amt->cbFormat = This->videoinfo_size; @@ -633,13 +632,8 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; in_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; - hres = BaseInputPin_Construct(&AVICompressorInputPinVtbl, sizeof(BaseInputPin), &in_pin_info, - &AVICompressorBaseInputPinVtbl, &compressor->filter.csFilter, NULL, (IPin**)&compressor->in); - if(FAILED(hres)) { - strmbase_filter_cleanup(&compressor->filter); - *phr = hres; - return NULL; - } + strmbase_sink_init(&compressor->sink, &AVICompressorInputPinVtbl, &in_pin_info, + &AVICompressorBaseInputPinVtbl, &compressor->filter.csFilter, NULL); out_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info, diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 688a5bc..aa195c3 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1109,7 +1109,7 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = MemInputPin_ReceiveCanBlock }; -static void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, +void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, IMemAllocator *allocator) { @@ -1150,7 +1150,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size return S_OK; } -static void strmbase_sink_cleanup(BaseInputPin *pin) +void strmbase_sink_cleanup(BaseInputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); if (pin->pAllocator) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 2833f5e..8c6123c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -151,6 +151,9 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size 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); typedef struct BaseFilter {

1 0

Zebediah Figura : strmbase: Return void from InputPin_Init().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: a1d65ac38cc7adc5748fb401dafa588c8aad7eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d65ac38cc7adc5748fb401… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 12 18:58:35 2019 -0500 strmbase: Return void from InputPin_Init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0

Alexandre Julliard : mssign32: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: b514903cff444c43907387716d12de73cd297f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b514903cff444c4390738771… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:46:20 2019 +0200 mssign32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/Makefile.in | 2 ++ dlls/mssign32/mssign32_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mssign32/Makefile.in b/dlls/mssign32/Makefile.in index ea66c51..1ca4697 100644 --- a/dlls/mssign32/Makefile.in +++ b/dlls/mssign32/Makefile.in @@ -1,4 +1,6 @@ MODULE = mssign32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mssign32_main.c diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 8b0720e..da7551e 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msrle32: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: fb3cca30a67a9bff319fbeaa12bb00ea1b127dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb3cca30a67a9bff319fbeaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:57 2019 +0200 msrle32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 6368cd8..fd5c6e3 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -1,6 +1,8 @@ MODULE = msrle32.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msrle32.c RC_SRCS = msrle32.rc

1 0

Alexandre Julliard : msisys.ocx: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 1c6bf6f7de45e8d316843021d57964988e9451f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6bf6f7de45e8d316843021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:44:39 2019 +0200 msisys.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisys.ocx/Makefile.in | 2 ++ dlls/msisys.ocx/msisys.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msisys.ocx/Makefile.in b/dlls/msisys.ocx/Makefile.in index a1957f3..66cb5c1 100644 --- a/dlls/msisys.ocx/Makefile.in +++ b/dlls/msisys.ocx/Makefile.in @@ -1,4 +1,6 @@ MODULE = msisys.ocx IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msisys.c diff --git a/dlls/msisys.ocx/msisys.c b/dlls/msisys.ocx/msisys.c index e4b0df0..b0aaded 100644 --- a/dlls/msisys.ocx/msisys.c +++ b/dlls/msisys.ocx/msisys.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Rémi Bernon : ntdll: Clarify NtAllocateVirtualMemory zero_bits parameter semantics.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 00451d5edf9a13fd8f414a0d06869e38cf66b754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00451d5edf9a13fd8f414a0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 13 11:48:31 2019 +0100 ntdll: Clarify NtAllocateVirtualMemory zero_bits parameter semantics. This parameter was misinterpreted as an alignment parameter for the lower bits of the allocated memory region, although it is a constraint on the higher bits. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/heap.c | 5 ++--- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 12 ++++++------ dlls/ntdll/signal_arm64.c | 16 +++++++-------- dlls/ntdll/signal_i386.c | 16 +++++++-------- dlls/ntdll/signal_powerpc.c | 12 ++++++------ dlls/ntdll/signal_x86_64.c | 16 +++++++-------- dlls/ntdll/tests/virtual.c | 4 +--- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 47 +++++++++++++++++++++++++++++++-------------- 11 files changed, 77 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00451d5edf9a13fd8f41…

1 0

Zebediah Figura : strmbase: Factor out strmbase_sink_cleanup().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: cec43c1822f82063c1a4464153b46951431b674e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec43c1822f82063c1a44641… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 12 18:58:36 2019 -0500 strmbase: Factor out strmbase_sink_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 6bc9927..688a5bc 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1150,13 +1150,18 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size return S_OK; } +static void strmbase_sink_cleanup(BaseInputPin *pin) +{ + FreeMediaType(&pin->pin.mtCurrent); + if (pin->pAllocator) + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; + pin->pin.IPin_iface.lpVtbl = NULL; +} + HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - This->pin.IPin_iface.lpVtbl = NULL; + strmbase_sink_cleanup(This); CoTaskMemFree(This); return S_OK; }

1 0

Zebediah Figura : strmbase: Factor out strmbase_pin_init().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: d16bc95b95f7d90f411838057a36a9f62468f896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d16bc95b95f7d90f41183805… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 12 18:58:34 2019 -0500 strmbase: Factor out strmbase_pin_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 74 +++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2fa0b9a..c60deed 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -728,26 +728,24 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *This, IPin *pR return hr; } -static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, BaseOutputPin * pPinImpl) -{ - TRACE("(%p)\n", pPinImpl); - - /* Common attributes */ - pPinImpl->pin.IPin_iface.lpVtbl = OutputPin_Vtbl; - pPinImpl->pin.refCount = 1; - pPinImpl->pin.pConnectedTo = NULL; - pPinImpl->pin.pCritSec = pCritSec; - pPinImpl->pin.tStart = 0; - pPinImpl->pin.tStop = 0; - pPinImpl->pin.dRate = 1.0; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); - pPinImpl->pin.pFuncsTable = &vtbl->base; - ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); - - /* Output pin attributes */ - pPinImpl->pMemInputPin = NULL; - pPinImpl->pAllocator = NULL; - pPinImpl->pFuncsTable = vtbl; +static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, + const BasePinFuncTable *func_table, const PIN_INFO *info, CRITICAL_SECTION *cs) +{ + memset(pin, 0, sizeof(*pin)); + pin->IPin_iface.lpVtbl = vtbl; + pin->refCount = 1; + pin->pCritSec = cs; + pin->dRate = 1.0; + Copy_PinInfo(&pin->pinInfo, info); + pin->pFuncsTable = func_table; +} + +static HRESULT OutputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, + const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs, BaseOutputPin *pin) +{ + memset(pin, 0, sizeof(*pin)); + strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); + pin->pFuncsTable = func_table; return S_OK; } @@ -1111,31 +1109,17 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = MemInputPin_ReceiveCanBlock }; -static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, - const BaseInputPinFuncTable* vtbl, - LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, BaseInputPin * pPinImpl) -{ - TRACE("(%p)\n", pPinImpl); - - /* Common attributes */ - pPinImpl->pin.refCount = 1; - pPinImpl->pin.pConnectedTo = NULL; - pPinImpl->pin.pCritSec = pCritSec; - pPinImpl->pin.tStart = 0; - pPinImpl->pin.tStop = 0; - pPinImpl->pin.dRate = 1.0; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); - ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); - pPinImpl->pin.pFuncsTable = &vtbl->base; - - /* Input pin attributes */ - pPinImpl->pFuncsTable = vtbl; - pPinImpl->pAllocator = pPinImpl->preferred_allocator = allocator; - if (pPinImpl->preferred_allocator) - IMemAllocator_AddRef(pPinImpl->preferred_allocator); - pPinImpl->pin.IPin_iface.lpVtbl = InputPin_Vtbl; - pPinImpl->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; - pPinImpl->flushing = pPinImpl->end_of_stream = FALSE; +static HRESULT InputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, + const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, + IMemAllocator *allocator, BaseInputPin *pin) +{ + memset(pin, 0, sizeof(*pin)); + strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); + pin->pFuncsTable = func_table; + pin->pAllocator = pin->preferred_allocator = allocator; + if (pin->preferred_allocator) + IMemAllocator_AddRef(pin->preferred_allocator); + pin->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; return S_OK; }

1 0

Alexandre Julliard : mstask: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: da15e5cb37a4951baf44627750622f950a384532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da15e5cb37a4951baf446277… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:47:12 2019 +0200 mstask: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 2 ++ dlls/mstask/mstask_private.h | 3 +-- dlls/mstask/task.c | 6 +++--- dlls/mstask/task_scheduler.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 086d3c0..7febde2 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,6 +1,8 @@ MODULE = mstask.dll IMPORTS = rpcrt4 ole32 oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ factory.c \ mstask_main.c \ diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index dbaf543..aed4c80 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -20,7 +20,6 @@ #define __MSTASK_PRIVATE_H__ #include "wine/heap.h" -#include "wine/unicode.h" extern LONG dll_ref DECLSPEC_HIDDEN; @@ -38,7 +37,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *src) WCHAR *dst; unsigned len; if (!src) return NULL; - len = (strlenW(src) + 1) * sizeof(WCHAR); + len = (lstrlenW(src) + 1) * sizeof(WCHAR); if ((dst = heap_alloc(len))) memcpy(dst, src, len); return dst; } diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 6ab9263..a15e016 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1813,10 +1813,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile(IPersistFile *iface, LPOLES TRACE("(%p, %p)\n", iface, file_name); - *file_name = CoTaskMemAlloc((strlenW(This->task_name) + 1) * sizeof(WCHAR)); + *file_name = CoTaskMemAlloc((lstrlenW(This->task_name) + 1) * sizeof(WCHAR)); if (!*file_name) return E_OUTOFMEMORY; - strcpyW(*file_name, This->task_name); + lstrcpyW(*file_name, This->task_name); return S_OK; } @@ -1893,7 +1893,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) TRACE("(%s, %p)\n", debugstr_w(name), task); - if (strchrW(name, '.')) return E_INVALIDARG; + if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); lstrcatW(task_name, tasksW); diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index ebf25d0..54ca360 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -423,7 +423,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWST TRACE("%p, %s\n", iface, debugstr_w(name)); - if (strchrW(name, '.')) return E_INVALIDARG; + if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); lstrcatW(task_name, tasksW); @@ -467,7 +467,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, L TRACE("%p, %s, %p\n", iface, debugstr_w(name), item); - if (strchrW(name, '.')) return E_INVALIDARG; + if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); lstrcatW(task_name, tasksW);

1 0