October 2023 - Wine-commits

Paul Gofman : server: Hold socket reference in sock_poll_event().
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 2c2740629bd40d981d9e6010eee3d54c3f430588 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c2740629bd40d981d9e6010eee3d5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 7 15:04:55 2022 -0500 server: Hold socket reference in sock_poll_event(). --- server/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/sock.c b/server/sock.c index 52175b08987..2d454d9667b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1338,6 +1338,8 @@ static void sock_poll_event( struct fd *fd, int event ) int error = 0; assert( sock->obj.ops == &sock_ops ); + grab_object( sock ); + if (debug_level) fprintf(stderr, "socket %p select event: %x\n", sock, event); @@ -1426,6 +1428,7 @@ static void sock_poll_event( struct fd *fd, int event ) complete_async_polls( sock, event, error ); sock_reselect( sock ); + release_object( sock ); } static void sock_dump( struct object *obj, int verbose )

1 0

Alistair Leslie-Hughes : vkd3d-shader: Fix compiler warning.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: vkd3d Branch: master Commit: 71715cc4345d58abfbebd9003e121e8bc7dde5e2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/71715cc4345d58abfbebd9003e121… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 29 16:51:52 2023 +1000 vkd3d-shader: Fix compiler warning. vkd3d-shader/tpf.c:3810:39: warning: passing argument 2 of ‘sm4_register_from_node’ from incompatible pointer type [-Wincompatible-pointer-types] vkd3d-shader/tpf.c:4750:59: warning: passing argument 3 of ‘sm4_register_from_deref’ from incompatible pointer type [-Wincompatible-pointer-types] Change to use uint32_t as requested. --- gitlab/build-mingw | 2 +- libs/vkd3d-shader/tpf.c | 17 ++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 383f9c4b..1334a18a 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d6902f8b..fbd84583 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3645,7 +3645,7 @@ struct sm4_instruction }; static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct vkd3d_shader_register *reg, - unsigned int *writemask, const struct hlsl_deref *deref) + uint32_t *writemask, const struct hlsl_deref *deref) { const struct hlsl_type *data_type = hlsl_deref_get_type(ctx, deref); const struct hlsl_ir_var *var = deref->var; @@ -3774,7 +3774,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct vkd3d_shader_re static void sm4_src_from_deref(const struct tpf_writer *tpf, struct vkd3d_shader_src_param *src, const struct hlsl_deref *deref, unsigned int map_writemask) { - unsigned int writemask, hlsl_swizzle; + unsigned int hlsl_swizzle; + uint32_t writemask; sm4_register_from_deref(tpf->ctx, &src->reg, &writemask, deref); if (vkd3d_sm4_get_default_swizzle_type(&tpf->lookup, src->reg.type) == VKD3D_SM4_SWIZZLE_VEC4) @@ -3784,7 +3785,7 @@ static void sm4_src_from_deref(const struct tpf_writer *tpf, struct vkd3d_shader } } -static void sm4_register_from_node(struct vkd3d_shader_register *reg, unsigned int *writemask, +static void sm4_register_from_node(struct vkd3d_shader_register *reg, uint32_t *writemask, const struct hlsl_ir_node *instr) { assert(instr->reg.allocated); @@ -3826,9 +3827,10 @@ static void sm4_src_from_constant_value(struct vkd3d_shader_src_param *src, } static void sm4_src_from_node(const struct tpf_writer *tpf, struct vkd3d_shader_src_param *src, - const struct hlsl_ir_node *instr, unsigned int map_writemask) + const struct hlsl_ir_node *instr, uint32_t map_writemask) { - unsigned int writemask, hlsl_swizzle; + unsigned int hlsl_swizzle; + uint32_t writemask; if (instr->type == HLSL_IR_CONSTANT) { @@ -5470,7 +5472,7 @@ static void write_sm4_store(const struct tpf_writer *tpf, const struct hlsl_ir_s { const struct hlsl_ir_node *rhs = store->rhs.node; struct sm4_instruction instr; - unsigned int writemask; + uint32_t writemask; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; @@ -5487,8 +5489,9 @@ static void write_sm4_store(const struct tpf_writer *tpf, const struct hlsl_ir_s static void write_sm4_swizzle(const struct tpf_writer *tpf, const struct hlsl_ir_swizzle *swizzle) { - unsigned int writemask, hlsl_swizzle; + unsigned int hlsl_swizzle; struct sm4_instruction instr; + uint32_t writemask; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index af75ef3b..f006d2db 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -758,7 +758,7 @@ void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_reg struct vkd3d_shader_dst_param { struct vkd3d_shader_register reg; - DWORD write_mask; + uint32_t write_mask; DWORD modifiers; DWORD shift; };

1 0

Nikolay Sivov : d3d10/effect: Add support for 'rsq' instruction.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 03e17a357235f7c8be52e65032e11b271f1be64e URL: https://gitlab.winehq.org/wine/wine/-/commit/03e17a357235f7c8be52e65032e11b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 15:34:14 2023 +0200 d3d10/effect: Add support for 'rsq' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 169 ++++++++++++++++++++++++++++------------------ 2 files changed, 113 insertions(+), 66 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'log' instruction.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 347ed9a82bf4adbf6398da136aed9c76772f0900 URL: https://gitlab.winehq.org/wine/wine/-/commit/347ed9a82bf4adbf6398da136aed9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 16:53:10 2023 +0200 d3d10/effect: Add support for 'log' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 174 ++++++++++++++++++++++++++++------------------ 2 files changed, 116 insertions(+), 68 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'exp' instruction.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 2055f7e20b4b7605fb64f80dfb350946e0aa4553 URL: https://gitlab.winehq.org/wine/wine/-/commit/2055f7e20b4b7605fb64f80dfb3509… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 4 16:14:16 2023 +0200 d3d10/effect: Add support for 'exp' instruction. --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 176 ++++++++++++++++++++++++++++------------------ 2 files changed, 116 insertions(+), 70 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'not' instruction.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 42a57b3e70846043f27a1ecf648dac26072ba887 URL: https://gitlab.winehq.org/wine/wine/-/commit/42a57b3e70846043f27a1ecf648dac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 20:49:16 2023 +0200 d3d10/effect: Add support for 'not' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 14 ++++ dlls/d3d10/tests/effect.c | 189 ++++++++++++++++++++++++++++------------------ 2 files changed, 131 insertions(+), 72 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'or' instruction.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: fcfe2972111dc06af3c01b109111693ace9e084a URL: https://gitlab.winehq.org/wine/wine/-/commit/fcfe2972111dc06af3c01b10911169… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 21:47:57 2023 +0200 d3d10/effect: Add support for 'or' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++ dlls/d3d10/tests/effect.c | 197 +++++++++++++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 73 deletions(-)

1 0

Paul Gofman : secur32: Synchronize access to schannel handle table.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 8a571b263b9576c745debb761366f75f31c58249 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a571b263b9576c745debb761366f7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 3 16:02:55 2023 -0600 secur32: Synchronize access to schannel handle table. --- dlls/secur32/schannel.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d16692a4c3c..d2e4a07fa23 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -71,6 +71,7 @@ static struct schan_handle *schan_handle_table; static struct schan_handle *schan_free_handles; static SIZE_T schan_handle_table_size; static SIZE_T schan_handle_count; +static SRWLOCK handle_table_lock = SRWLOCK_INIT; /* Protocols enabled, only those may be used for the connection. */ static DWORD config_enabled_protocols; @@ -81,22 +82,24 @@ static DWORD config_default_disabled_protocols; static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) { struct schan_handle *handle; + ULONG_PTR index = SCHAN_INVALID_HANDLE; + AcquireSRWLockExclusive(&handle_table_lock); if (schan_free_handles) { - DWORD index = schan_free_handles - schan_handle_table; /* Use a free handle */ handle = schan_free_handles; if (handle->type != SCHAN_HANDLE_FREE) { - ERR("Handle %ld(%p) is in the free list, but has type %#x.\n", index, handle, handle->type); - return SCHAN_INVALID_HANDLE; + ERR("Handle %p is in the free list, but has type %#x.\n", handle, handle->type); + goto done; } + index = schan_free_handles - schan_handle_table; schan_free_handles = handle->object; handle->object = object; handle->type = type; - return index; + goto done; } if (!(schan_handle_count < schan_handle_table_size)) { @@ -106,7 +109,7 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) if (!new_table) { ERR("Failed to grow the handle table\n"); - return SCHAN_INVALID_HANDLE; + goto done; } schan_handle_table = new_table; schan_handle_table_size = new_size; @@ -116,21 +119,30 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) handle->object = object; handle->type = type; - return handle - schan_handle_table; + index = handle - schan_handle_table; + +done: + ReleaseSRWLockExclusive(&handle_table_lock); + return index; } static void *schan_free_handle(ULONG_PTR handle_idx, enum schan_handle_type type) { struct schan_handle *handle; - void *object; + void *object = NULL; if (handle_idx == SCHAN_INVALID_HANDLE) return NULL; - if (handle_idx >= schan_handle_count) return NULL; + + AcquireSRWLockExclusive(&handle_table_lock); + + if (handle_idx >= schan_handle_count) + goto done; + handle = &schan_handle_table[handle_idx]; if (handle->type != type) { ERR("Handle %Id(%p) is not of type %#x\n", handle_idx, handle, type); - return NULL; + goto done; } object = handle->object; @@ -138,23 +150,32 @@ static void *schan_free_handle(ULONG_PTR handle_idx, enum schan_handle_type type handle->type = SCHAN_HANDLE_FREE; schan_free_handles = handle; +done: + ReleaseSRWLockExclusive(&handle_table_lock); return object; } static void *schan_get_object(ULONG_PTR handle_idx, enum schan_handle_type type) { struct schan_handle *handle; + void *object = NULL; if (handle_idx == SCHAN_INVALID_HANDLE) return NULL; - if (handle_idx >= schan_handle_count) return NULL; + + AcquireSRWLockShared(&handle_table_lock); + if (handle_idx >= schan_handle_count) + goto done; handle = &schan_handle_table[handle_idx]; if (handle->type != type) { - ERR("Handle %Id(%p) is not of type %#x\n", handle_idx, handle, type); - return NULL; + ERR("Handle %Id(%p) is not of type %#x (%#x)\n", handle_idx, handle, type, handle->type); + goto done; } + object = handle->object; - return handle->object; +done: + ReleaseSRWLockShared(&handle_table_lock); + return object; } static void read_config(void)

1 0

Connor McAdams : uiautomationcore/tests: Add tests for COM event handler event advisement.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: f420b65a82e3099a3e82268c2b523e8bc3d0c564 URL: https://gitlab.winehq.org/wine/wine/-/commit/f420b65a82e3099a3e82268c2b523e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 16 09:26:20 2023 -0400 uiautomationcore/tests: Add tests for COM event handler event advisement. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 382 ++++++++++++++++++++++++++++- 1 file changed, 372 insertions(+), 10 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for passing WinEvents to the COM API.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 6666670929102c38f48477511da0128830645236 URL: https://gitlab.winehq.org/wine/wine/-/commit/6666670929102c38f48477511da012… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 4 07:47:57 2023 -0400 uiautomationcore: Add support for passing WinEvents to the COM API. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_com_client.c | 9 +++++++++ dlls/uiautomationcore/uia_event.c | 8 ++++++-- dlls/uiautomationcore/uia_private.h | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 19540b19dc0..8f8d5d0170e 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -958,6 +958,12 @@ struct uia_com_event { struct uia_event_handler_map_entry *handler_map; }; +HRESULT uia_com_win_event_callback(DWORD event_id, HWND hwnd, LONG obj_id, LONG child_id, DWORD thread_id, DWORD event_time) +{ + FIXME("%ld, %p, %ld, %ld, %ld, %ld: stub\n", event_id, hwnd, obj_id, child_id, thread_id, event_time); + return S_OK; +} + static HRESULT uia_event_handlers_add_handler(IUnknown *handler_iface, SAFEARRAY *runtime_id, int event_id, struct uia_com_event *event) { @@ -3311,6 +3317,9 @@ static HRESULT uia_add_com_event_handler(IUIAutomation6 *iface, EVENTID event_id if (FAILED(hr)) goto exit; + if (!uia_clientside_event_start_event_thread((struct uia_event *)com_event->event)) + WARN("Failed to start event thread, WinEvents may not be delivered.\n"); + hr = uia_event_handlers_add_handler(handler_unk, runtime_id, event_id, com_event); exit: diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 395b20e0537..0008b543808 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -78,7 +78,6 @@ static BOOL CALLBACK uia_win_event_enum_top_level_hwnds(HWND hwnd, LPARAM lparam return TRUE; } -static BOOL uia_clientside_event_start_event_thread(struct uia_event *event); HRESULT uia_event_add_win_event_hwnd(struct uia_event *event, HWND hwnd) { if (!uia_clientside_event_start_event_thread(event)) @@ -844,6 +843,11 @@ static void uia_event_thread_process_queue(struct list *event_queue) { struct uia_queue_win_event *win_event = (struct uia_queue_win_event *)event; + hr = uia_com_win_event_callback(win_event->event_id, win_event->hwnd, win_event->obj_id, win_event->child_id, + win_event->thread_id, win_event->event_time); + if (FAILED(hr)) + WARN("uia_com_win_event_callback failed with hr %#lx\n", hr); + hr = uia_event_for_each(win_event_to_uia_event_id(win_event->event_id), uia_win_event_for_each_callback, (void *)win_event, TRUE); break; @@ -990,7 +994,7 @@ static void uia_stop_event_thread(void) LeaveCriticalSection(&event_thread_cs); } -static BOOL uia_clientside_event_start_event_thread(struct uia_event *event) +BOOL uia_clientside_event_start_event_thread(struct uia_event *event) { if (!event->u.clientside.event_thread_started) event->u.clientside.event_thread_started = uia_start_event_thread(); diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 8a750bf3ae1..358a0c95217 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -223,10 +223,13 @@ HRESULT uia_condition_check(HUIANODE node, struct UiaCondition *condition) DECLS BOOL uia_condition_matched(HRESULT hr) DECLSPEC_HIDDEN; /* uia_com_client.c */ +HRESULT uia_com_win_event_callback(DWORD event_id, HWND hwnd, LONG obj_id, LONG child_id, DWORD thread_id, + DWORD event_time) DECLSPEC_HIDDEN; HRESULT create_uia_iface(IUnknown **iface, BOOL is_cui8) DECLSPEC_HIDDEN; /* uia_event.c */ HRESULT uia_event_add_win_event_hwnd(struct uia_event *event, HWND hwnd) DECLSPEC_HIDDEN; +BOOL uia_clientside_event_start_event_thread(struct uia_event *event) DECLSPEC_HIDDEN; HRESULT create_serverside_uia_event(struct uia_event **out_event, LONG process_id, LONG event_cookie) DECLSPEC_HIDDEN; HRESULT uia_event_add_provider_event_adviser(IRawElementProviderAdviseEvents *advise_events, struct uia_event *event) DECLSPEC_HIDDEN;

1 0