July 2021 - Wine-Devel - list.winehq.org

[PATCH 06/10] gdi32: Use ntgdi interface for path functions.
by Jacek Caban July 23, 2021

July 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 27 ++++++++++----------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 --- dlls/gdi32/enhmfdrv/init.c | 6 ++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 36 ++++++++++++++++++++++++++++ dlls/gdi32/path.c | 29 +++++++--------------- dlls/gdi32/tests/metafile.c | 22 ++++++++++------- 7 files changed, 77 insertions(+), 49 deletions(-)

2 1

[PATCH 05/10] gdi32: Use NtGdiCloseFigure for CloseFigure implementation.
by Jacek Caban July 23, 2021

July 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 19 +++---------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 6 ++---- 6 files changed, 20 insertions(+), 23 deletions(-)

2 1

[PATCH 04/10] gdi32: Use NtGdiExtTextOutW for ExtTextOutW implementation.
by Jacek Caban July 23, 2021

July 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 15 +------------ dlls/gdi32/enhmfdrv/graphics.c | 41 +++++++++++++++++++++------------- dlls/gdi32/font.c | 6 ++--- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 +++++++++++++ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 -- dlls/gdi32/mfdrv/text.c | 20 ++++++++--------- include/ntgdi.h | 2 ++ 9 files changed, 61 insertions(+), 46 deletions(-)

2 1

[PATCH 03/10] gdi32: Store text alignment in DC_ATTR.
by Jacek Caban July 23, 2021

July 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 26 +++++--------------------- dlls/gdi32/enhmfdrv/graphics.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 17 insertions(+), 24 deletions(-)

2 1

[PATCH 02/10] gdi32: Use NtGdiPolyPolyDraw for CreatePolyPolygonRgn implementation.
by Jacek Caban July 23, 2021

July 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 10 ++++++++++ dlls/gdi32/painting.c | 4 ++++ dlls/gdi32/region.c | 9 --------- 3 files changed, 14 insertions(+), 9 deletions(-)

2 1

[PATCH 01/10] gdi32: Use NtGdiPolyDraw for PolyDraw implementation.
by Jacek Caban July 23, 2021

July 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/graphics.c | 22 ++++++++++++++++------ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/painting.c | 13 +++++-------- dlls/gdi32/tests/metafile.c | 9 +++++++++ 6 files changed, 47 insertions(+), 27 deletions(-)

2 1

[PATCH 1/4] quartz: Factor out more of AdviseTime() and AdvisePeriodic().
by Zebediah Figura July 22, 2021

July 22, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/systemclock.c | 74 ++++++++++++++------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 24d8651aaba..cbe5f395258 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -169,8 +169,29 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) } } -static void notify_thread(struct system_clock *clock) +static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, + REFERENCE_TIME due_time, REFERENCE_TIME period, DWORD_PTR *cookie) { + struct advise_sink *sink; + + if (!handle) + return E_INVALIDARG; + + if (!cookie) + return E_POINTER; + + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; + + sink->handle = (HANDLE)handle; + sink->due_time = due_time; + sink->period = period; + sink->cookie = InterlockedIncrement(&cookie_counter); + + EnterCriticalSection(&clock->cs); + list_add_tail(&clock->sinks, &sink->entry); + LeaveCriticalSection(&clock->cs); + if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -178,6 +199,9 @@ static void notify_thread(struct system_clock *clock) clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } SetEvent(clock->notify_event); + + *cookie = sink->cookie; + return S_OK; } static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) @@ -225,72 +249,28 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) { struct system_clock *clock = impl_from_IReferenceClock(iface); - struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", clock, debugstr_time(base), debugstr_time(offset), event, cookie); - if (!event) - return E_INVALIDARG; - if (base + offset <= 0) return E_INVALIDARG; - if (!cookie) - return E_POINTER; - - if (!(sink = heap_alloc_zero(sizeof(*sink)))) - return E_OUTOFMEMORY; - - sink->handle = (HANDLE)event; - sink->due_time = base + offset; - sink->period = 0; - sink->cookie = InterlockedIncrement(&cookie_counter); - - EnterCriticalSection(&clock->cs); - list_add_tail(&clock->sinks, &sink->entry); - LeaveCriticalSection(&clock->cs); - - notify_thread(clock); - - *cookie = sink->cookie; - return S_OK; + return add_sink(clock, event, base + offset, 0, cookie); } static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) { struct system_clock *clock = impl_from_IReferenceClock(iface); - struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", clock, debugstr_time(start), debugstr_time(period), semaphore, cookie); - if (!semaphore) - return E_INVALIDARG; - if (start <= 0 || period <= 0) return E_INVALIDARG; - if (!cookie) - return E_POINTER; - - if (!(sink = heap_alloc_zero(sizeof(*sink)))) - return E_OUTOFMEMORY; - - sink->handle = (HANDLE)semaphore; - sink->due_time = start; - sink->period = period; - sink->cookie = InterlockedIncrement(&cookie_counter); - - EnterCriticalSection(&clock->cs); - list_add_tail(&clock->sinks, &sink->entry); - LeaveCriticalSection(&clock->cs); - - notify_thread(clock); - - *cookie = sink->cookie; - return S_OK; + return add_sink(clock, semaphore, start, period, cookie); } static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) -- 2.32.0

4 7

[PATCH] nsiproxy: Include sys/socket.h
by Gerald Pfeifer July 22, 2021

July 22, 2021

This addresses invalid use of undefined type 'struct sock addr' and AF_INET being unknown when building on FreeBSD 11.x. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index ab1b6294bea..93fdefa24cc 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -21,6 +21,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -- 2.31.1

2 1

[PATCH] include: Add _tcsxfrm_l declaration.
by Daniel Lehman July 22, 2021

July 22, 2021

1 0

[PATCH vkd3d v5 3/5] vkd3d: Introduce a vkd3d_bound_range() helper.
by Zebediah Figura July 22, 2021

July 22, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + include/private/vkd3d_common.h | 11 +++++++++++ libs/vkd3d/command.c | 4 ++-- libs/vkd3d/device.c | 5 ++--- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 275bca26..88d58e40 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,7 @@ AS_IF([test "x$with_xcb" != "xno"], dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) +VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__builtin_add_overflow(0, 0, (int *)0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 4ce2a2e3..8e729177 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -138,6 +138,17 @@ static inline void *vkd3d_memmem( const void *haystack, size_t haystack_len, con return NULL; } +static inline bool vkd3d_bound_range(uint64_t start, uint64_t count, uint64_t limit) +{ +#ifdef HAVE_BUILTIN_ADD_OVERFLOW + uint64_t sum; + + return !__builtin_add_overflow(start, count, &sum) && sum <= limit; +#else + return start <= limit && count <= limit - start; +#endif +} + static inline int ascii_isupper(int c) { return 'A' <= c && c <= 'Z'; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 116a8a62..60c4b37c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4421,7 +4421,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi null_resources = &list->device->null_resources; gpu_va_allocator = &list->device->gpu_va_allocator; - if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) + if (!vkd3d_bound_range(start_slot, view_count, ARRAY_SIZE(list->strides))) { WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); return; @@ -4476,7 +4476,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsComm return; } - if (start_slot >= ARRAY_SIZE(buffers) || view_count > ARRAY_SIZE(buffers) - start_slot) + if (!vkd3d_bound_range(start_slot, view_count, ARRAY_SIZE(buffers))) { WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); return; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 159bc470..ac6f14c7 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1925,7 +1925,7 @@ static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_fallback(struct base = allocator->fallback_floor; ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0; ceiling -= alignment - 1; - if (aligned_size > ceiling || ceiling - aligned_size < base) + if (!vkd3d_bound_range(base, aligned_size, ceiling)) return 0; base = (base + (alignment - 1)) & ~((D3D12_GPU_VIRTUAL_ADDRESS)alignment - 1); @@ -3515,8 +3515,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i array_size = d3d12_resource_desc_get_layer_count(desc); - if (first_sub_resource >= desc->MipLevels * array_size - || sub_resource_count > desc->MipLevels * array_size - first_sub_resource) + if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, desc->MipLevels * array_size)) { WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count); return; -- 2.32.0

1 0