June 2020 - Wine-devel - list.winehq.org

[PATCH 5/8] ntdll: Reimplement _allrem using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

2 1

[PATCH] vcruntime140_1: Add support for pointer to object in unwind info.
by Piotr Caban 08 Jun '20

08 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49307 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)

1 0

[PATCH] strmbase: Release the allocator in IPin::Disconnect() (Valgrind).
by Zebediah Figura 08 Jun '20

08 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f08c6d0186..e5017c2ff9 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -594,6 +594,13 @@ static HRESULT WINAPI source_Disconnect(IPin *iface) IMemInputPin_Release(This->pMemInputPin); This->pMemInputPin = NULL; } + + if (This->pAllocator) + { + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + } + if (This->pin.peer) { IPin_Release(This->pin.peer); @@ -930,6 +937,12 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) if (pin->pFuncsTable->sink_disconnect) pin->pFuncsTable->sink_disconnect(pin); + if (pin->pAllocator) + { + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; + } + IPin_Release(pin->pin.peer); pin->pin.peer = NULL; FreeMediaType(&pin->pin.mt); -- 2.27.0

2 1

[PATCH v2] quartz/filtergraph: Add a stub IVideoFrameStep interface.
by Zebediah Figura 08 Jun '20

08 Jun '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> wine-bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Avoid Hungarian notation and "This"; use a more readable trace format. dlls/quartz/filtergraph.c | 57 ++++++++++++++++++++++++++++++++- dlls/quartz/tests/filtergraph.c | 1 + include/axextend.idl | 13 ++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..918c41a3d6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -181,7 +181,7 @@ typedef struct _IFilterGraphImpl { /* IRegisterServiceProvider */ /* IResourceManager */ /* IServiceProvider */ - /* IVideoFrameStep */ + IVideoFrameStep IVideoFrameStep_iface; IUnknown *outer_unk; LONG ref; @@ -454,6 +454,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphVersion_iface; TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IVideoFrameStep, riid)) { + *ppvObj = &This->IVideoFrameStep_iface; + TRACE(" returning IVideoFrameStep interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -5638,6 +5641,57 @@ static const IGraphVersionVtbl IGraphVersion_VTable = GraphVersion_QueryVersion, }; +static IFilterGraphImpl *impl_from_IVideoFrameStep(IVideoFrameStep *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoFrameStep_iface); +} + +static HRESULT WINAPI VideoFrameStep_QueryInterface(IVideoFrameStep *iface, REFIID iid, void **out) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); +} + +static ULONG WINAPI VideoFrameStep_AddRef(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_AddRef(graph->outer_unk); +} + +static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_Release(graph->outer_unk); +} + +static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frame_count, IUnknown *filter) +{ + FIXME("iface %p, frame_count %u, filter %p, stub!\n", iface, frame_count, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *filter) +{ + FIXME("iface %p, multiple %d, filter %p, stub!\n", iface, multiple, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CancelStep(IVideoFrameStep *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static const IVideoFrameStepVtbl VideoFrameStep_vtbl = +{ + VideoFrameStep_QueryInterface, + VideoFrameStep_AddRef, + VideoFrameStep_Release, + VideoFrameStep_Step, + VideoFrameStep_CanStep, + VideoFrameStep_CancelStep +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5668,6 +5722,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; fimpl->ref = 1; list_init(&fimpl->filters); list_init(&fimpl->sorted_filters); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..a3378efe0b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -125,6 +125,7 @@ static void test_interfaces(void) check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); diff --git a/include/axextend.idl b/include/axextend.idl index 8b46d665b5..7630ea247c 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1471,3 +1471,16 @@ interface IAMTVTuner : IAMTuner HRESULT get_VideoFrequency([out] long *freq); HRESULT get_AudioFrequency([out] long *freq); } + +[ + local, + object, + uuid(e46a9787-2b71-444d-a4b5-1fab7b708d6a), + pointer_default(unique), +] +interface IVideoFrameStep : IUnknown +{ + HRESULT Step(DWORD frame_count, [in] IUnknown *filter); + HRESULT CanStep(long multiple, [in] IUnknown *filter); + HRESULT CancelStep(); +} -- 2.27.0

3 2

[PATCH 7/8] ntdll/tests: Add long long builtins tests.
by Jacek Caban 08 Jun '20

08 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/large_int.c | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)

1 0

[PATCH 6/8] ntdll: Reimplement _allmul using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] ntdll: Reimplement _alldiv using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 3/8] ntdll: Reimplement _aullrem using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 2/8] ntdll: Reimplement _aulldiv using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Current solution uses native implementation for that. Once we move ntdll to PE file, compiler could use those (like MSVC does) to implement 64-bit arithmetic, creating an infinite recursion. dlls/ntdll/large_int.c | 179 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] winnt.h: Add BitScanForward and BitScanReverse implementation.
by Jacek Caban 08 Jun '20

08 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winnt.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

1 0