July 2023 - Wine-commits - list.winehq.org

Zebediah Figura : server: Move the implementation of IOCTL_AFD_GET_EVENTS to a dedicated server call.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 0a33ac4a53acf46cd5a709177bf998330f6cca90 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a33ac4a53acf46cd5a709177bf998… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 01:40:55 2023 -0500 server: Move the implementation of IOCTL_AFD_GET_EVENTS to a dedicated server call. --- dlls/ntdll/unix/socket.c | 26 +++++++++++++++++++++-- include/wine/server_protocol.h | 22 ++++++++++++++++++- server/protocol.def | 10 +++++++++ server/request.h | 7 ++++++ server/sock.c | 48 +++++++++++++++++++++++------------------- server/trace.c | 15 +++++++++++++ 6 files changed, 103 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 80105eda0c9..6969f411955 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1552,10 +1552,32 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } case IOCTL_AFD_GET_EVENTS: + { + struct afd_get_events_params *params = out_buffer; + HANDLE reset_event = in_buffer; /* sic */ + + TRACE( "reset_event %p\n", reset_event ); if (in_size) FIXME( "unexpected input size %u\n", in_size ); - status = STATUS_BAD_DEVICE_TYPE; - break; + if (out_size < sizeof(*params)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + SERVER_START_REQ( socket_get_events ) + { + req->handle = wine_server_obj_handle( handle ); + req->event = wine_server_obj_handle( reset_event ); + wine_server_set_reply( req, params->status, sizeof(params->status) ); + if (!(status = wine_server_call( req ))) + params->flags = reply->flags; + } + SERVER_END_REQ; + + complete_async( handle, event, apc, apc_user, io, status, 0 ); + return status; + } case IOCTL_AFD_POLL: status = STATUS_BAD_DEVICE_TYPE; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 51ac86b935e..e610a8941d7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1841,6 +1841,23 @@ struct send_socket_reply +struct socket_get_events_request +{ + struct request_header __header; + obj_handle_t handle; + obj_handle_t event; + char __pad_20[4]; +}; +struct socket_get_events_reply +{ + struct reply_header __header; + unsigned int flags; + /* VARARG(status,uints); */ + char __pad_12[4]; +}; + + + struct socket_send_icmp_id_request { struct request_header __header; @@ -5633,6 +5650,7 @@ enum request REQ_unlock_file, REQ_recv_socket, REQ_send_socket, + REQ_socket_get_events, REQ_socket_send_icmp_id, REQ_socket_get_icmp_id, REQ_get_next_console_request, @@ -5921,6 +5939,7 @@ union generic_request struct unlock_file_request unlock_file_request; struct recv_socket_request recv_socket_request; struct send_socket_request send_socket_request; + struct socket_get_events_request socket_get_events_request; struct socket_send_icmp_id_request socket_send_icmp_id_request; struct socket_get_icmp_id_request socket_get_icmp_id_request; struct get_next_console_request_request get_next_console_request_request; @@ -6207,6 +6226,7 @@ union generic_reply struct unlock_file_reply unlock_file_reply; struct recv_socket_reply recv_socket_reply; struct send_socket_reply send_socket_reply; + struct socket_get_events_reply socket_get_events_reply; struct socket_send_icmp_id_reply socket_send_icmp_id_reply; struct socket_get_icmp_id_reply socket_get_icmp_id_reply; struct get_next_console_request_reply get_next_console_request_reply; @@ -6436,7 +6456,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 779 +#define SERVER_PROTOCOL_VERSION 780 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 41c857f5cb9..919297c818c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1514,6 +1514,16 @@ enum server_fd_type @END +/* Get socket event flags */ +(a)REQ(socket_get_events) + obj_handle_t handle; /* socket handle */ + obj_handle_t event; /* event to reset */ +(a)REPLY + unsigned int flags; /* event mask */ + VARARG(status,uints); /* array of status codes */ +(a)END + + /* Store ICMP id for ICMP over datagram fixup */ @REQ(socket_send_icmp_id) obj_handle_t handle; /* socket handle */ diff --git a/server/request.h b/server/request.h index efc4eede9a2..de0931ab763 100644 --- a/server/request.h +++ b/server/request.h @@ -175,6 +175,7 @@ DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); DECL_HANDLER(recv_socket); DECL_HANDLER(send_socket); +DECL_HANDLER(socket_get_events); DECL_HANDLER(socket_send_icmp_id); DECL_HANDLER(socket_get_icmp_id); DECL_HANDLER(get_next_console_request); @@ -462,6 +463,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_unlock_file, (req_handler)req_recv_socket, (req_handler)req_send_socket, + (req_handler)req_socket_get_events, (req_handler)req_socket_send_icmp_id, (req_handler)req_socket_get_icmp_id, (req_handler)req_get_next_console_request, @@ -1085,6 +1087,11 @@ C_ASSERT( FIELD_OFFSET(struct send_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct send_socket_reply, options) == 12 ); C_ASSERT( FIELD_OFFSET(struct send_socket_reply, nonblocking) == 16 ); C_ASSERT( sizeof(struct send_socket_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct socket_get_events_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct socket_get_events_request, event) == 16 ); +C_ASSERT( sizeof(struct socket_get_events_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct socket_get_events_reply, flags) == 8 ); +C_ASSERT( sizeof(struct socket_get_events_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct socket_send_icmp_id_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct socket_send_icmp_id_request, icmp_id) == 16 ); C_ASSERT( FIELD_OFFSET(struct socket_send_icmp_id_request, icmp_seq) == 18 ); diff --git a/server/sock.c b/server/sock.c index 2aae9aefbf0..f24abd2ab6f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2762,28 +2762,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return; - case IOCTL_AFD_GET_EVENTS: - { - struct afd_get_events_params params = {0}; - unsigned int i; - - if (get_reply_max_size() < sizeof(params)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - params.flags = sock->pending_events & sock->mask; - for (i = 0; i < ARRAY_SIZE( params.status ); ++i) - params.status[i] = sock_get_ntstatus( sock->errors[i] ); - - sock->pending_events &= ~sock->mask; - sock_reselect( sock ); - - set_reply_data( &params, sizeof(params) ); - return; - } - case IOCTL_AFD_EVENT_SELECT: { struct event *event = NULL; @@ -3937,6 +3915,32 @@ DECL_HANDLER(send_socket) release_object( sock ); } +DECL_HANDLER(socket_get_events) +{ + struct sock *sock = (struct sock *)get_handle_obj( current->process, req->handle, 0, &sock_ops ); + unsigned int status[13]; + unsigned int i; + + if (get_reply_max_size() < sizeof(status)) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!sock) return; + + reply->flags = sock->pending_events & sock->mask; + for (i = 0; i < ARRAY_SIZE( status ); ++i) + status[i] = sock_get_ntstatus( sock->errors[i] ); + + sock->pending_events &= ~sock->mask; + sock_reselect( sock ); + + set_reply_data( status, sizeof(status) ); + + release_object( sock ); +} + DECL_HANDLER(socket_send_icmp_id) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->handle, 0, &sock_ops ); diff --git a/server/trace.c b/server/trace.c index bb26608ad66..58a31670ea3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2089,6 +2089,18 @@ static void dump_send_socket_reply( const struct send_socket_reply *req ) fprintf( stderr, ", nonblocking=%d", req->nonblocking ); } +static void dump_socket_get_events_request( const struct socket_get_events_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", event=%04x", req->event ); +} + +static void dump_socket_get_events_reply( const struct socket_get_events_reply *req ) +{ + fprintf( stderr, " flags=%08x", req->flags ); + dump_varargs_uints( ", status=", cur_size ); +} + static void dump_socket_send_icmp_id_request( const struct socket_send_icmp_id_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4623,6 +4635,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_unlock_file_request, (dump_func)dump_recv_socket_request, (dump_func)dump_send_socket_request, + (dump_func)dump_socket_get_events_request, (dump_func)dump_socket_send_icmp_id_request, (dump_func)dump_socket_get_icmp_id_request, (dump_func)dump_get_next_console_request_request, @@ -4907,6 +4920,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_recv_socket_reply, (dump_func)dump_send_socket_reply, + (dump_func)dump_socket_get_events_reply, NULL, (dump_func)dump_socket_get_icmp_id_reply, (dump_func)dump_get_next_console_request_reply, @@ -5191,6 +5205,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "unlock_file", "recv_socket", "send_socket", + "socket_get_events", "socket_send_icmp_id", "socket_get_icmp_id", "get_next_console_request",

1 0

Zebediah Figura : ws2_32: Move the event reset in WSAEnumNetworkEvents() to the server.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 01afb21bf2b3a9c6b03847b03a1ac4a572ed49a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/01afb21bf2b3a9c6b03847b03a1ac4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 01:44:06 2023 -0500 ws2_32: Move the event reset in WSAEnumNetworkEvents() to the server. So that it is done atomically with retrieving events. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52474 --- dlls/ws2_32/socket.c | 4 +--- dlls/ws2_32/tests/afd.c | 14 ++++++++++++++ server/sock.c | 16 ++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5d647d12699..8ef7920e0fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3604,10 +3604,8 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret TRACE( "socket %#Ix, event %p, events %p\n", s, event, ret_events ); - ResetEvent( event ); - status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, - NULL, 0, &params, sizeof(params) ); + event, 0, &params, sizeof(params) ); if (!status) { ret_events->lNetworkEvents = afd_poll_flag_to_win32( params.flags ); diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 97139605bf1..b856caee853 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1969,6 +1969,20 @@ static void test_get_events(void) for (i = 0; i < ARRAY_SIZE(params.status); ++i) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + SetEvent(event); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, event, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(!params.flags, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + + ret = WaitForSingleObject(event, 0); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + closesocket(client); closesocket(server); diff --git a/server/sock.c b/server/sock.c index f24abd2ab6f..550fe61e477 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3919,6 +3919,7 @@ DECL_HANDLER(socket_get_events) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->handle, 0, &sock_ops ); unsigned int status[13]; + struct event *event = NULL; unsigned int i; if (get_reply_max_size() < sizeof(status)) @@ -3929,6 +3930,15 @@ DECL_HANDLER(socket_get_events) if (!sock) return; + if (req->event) + { + if (!(event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ))) + { + release_object( sock ); + return; + } + } + reply->flags = sock->pending_events & sock->mask; for (i = 0; i < ARRAY_SIZE( status ); ++i) status[i] = sock_get_ntstatus( sock->errors[i] ); @@ -3936,6 +3946,12 @@ DECL_HANDLER(socket_get_events) sock->pending_events &= ~sock->mask; sock_reselect( sock ); + if (event) + { + reset_event( event ); + release_object( event ); + } + set_reply_data( status, sizeof(status) ); release_object( sock );

1 0

Zebediah Figura : httpapi/tests: Do not test that a local TCP port is closed.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 3d02e9870a3cae7b0cbb339d37dbed0749c8441a URL: https://gitlab.winehq.org/wine/wine/-/commit/3d02e9870a3cae7b0cbb339d37dbed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 20:02:16 2023 -0500 httpapi/tests: Do not test that a local TCP port is closed. I suspect the intent of this test was to verify that httpapi really doesn't bind to that port. That HttpAddUrlToUrlGroup() fails implies this, but paranoia in a case like this is rarely unwarranted. However, this test cannot reliably succeed; some other operating system component may open a TCP port in the meantime, and it appears that on Windows 10 this does in fact happen. Since the goal of the test is just extra paranoia, I don't think it's worth keeping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55127 --- dlls/httpapi/tests/httpapi.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fa412b1093a..9db21635d3a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1384,7 +1384,7 @@ static void test_v2_bound_port(void) WCHAR url[50]; HANDLE queue, dummy_queue; int ret; - SOCKET s, s2; + SOCKET s2; ret = pHttpCreateServerSession(version, &session, 0); ok(!ret, "Failed to create session, error %u.\n", ret); @@ -1421,12 +1421,6 @@ static void test_v2_bound_port(void) ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); ok(!ret, "Failed to rebind request queue, error %u.\n", ret); - s = socket(AF_INET, SOCK_STREAM, 0); - ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); - ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); - ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); - - closesocket(s); ret = pHttpCloseRequestQueue(dummy_queue); ok(!ret, "Failed to close queue handle, error %u.\n", ret); ret = pHttpCloseRequestQueue(queue);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 330ef7a10bc8073e582d96e5685809254b20a5a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/330ef7a10bc8073e582d96e5685809… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jul 22 00:48:28 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/po/lt.po b/po/lt.po index 334e48f53c9..eeef3ee9105 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-07-21 00:09+0300\n" +"PO-Revision-Date: 2023-07-22 00:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14853,51 +14853,40 @@ msgstr "Pirminis DNS sufiksas" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" msgstr "" +"Naudojimas: klist <tickets | tgt | purge | get [tarnybos pagrindinis " +"pavadinimas]>\n" #: programs/klist/klist.rc:29 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown error\n" -msgstr "Nežinoma klaida" +msgstr "Nežinoma klaida\n" #: programs/klist/klist.rc:30 -#, fuzzy -#| msgid "Start Menu" msgid "Start Time" -msgstr "Pradžios meniu" +msgstr "Pradžios laikas" #: programs/klist/klist.rc:31 -#, fuzzy -#| msgctxt "maximum 31 characters" -#| msgid "FLE Standard Time" msgid "End Time" -msgstr "SLE juostinis laikas" +msgstr "Pabaigos laikas" #: programs/klist/klist.rc:32 -#, fuzzy -#| msgid "Enter new time: " msgid "Renew Time" -msgstr "Įveskite naują laiką: " +msgstr "Atnaujinimo laikas" #: programs/klist/klist.rc:33 msgid "Ticket Flags" -msgstr "" +msgstr "Leidimo žymos" #: programs/klist/klist.rc:34 msgid "Cached Tickets" -msgstr "" +msgstr "Leidimai podėlyje" #: programs/klist/klist.rc:36 -#, fuzzy -#| msgid "Encryption Type" msgid "KerbTicket Encryption Type" -msgstr "Šifravimo tipas" +msgstr "Kerberos leidimo šifravimo tipas" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "Dabartiniai ryšiai" +msgstr "Dabartinis prisijungimo ID yra" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.259.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: b5e19a33c9360784961918a364175ab2ad93870d URL: https://gitlab.winehq.org/wine/wine/-/commit/b5e19a33c9360784961918a364175a… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Jul 22 16:46:06 2023 +0200 winevulkan: Update to VK spec version 1.3.259. --- dlls/winevulkan/loader_thunks.c | 34 ++++++++ dlls/winevulkan/loader_thunks.h | 24 ++++++ dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 179 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 6 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 47 ++++++++++- 7 files changed, 291 insertions(+), 6 deletions(-)

1 0

David Kahurani : gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: cfc50b28870ca026c002cbd41780530c9af15753 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfc50b28870ca026c002cbd4178053… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sun Jul 23 10:11:48 2023 +0300 gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/font.c | 2 ++ dlls/gdiplus/tests/font.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 8b85f567aab..024d27c1ce7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -485,6 +485,8 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + + GdipMultiplyMatrix(&matrix, &graphics->gdi_transform, MatrixOrderAppend); GdipTransformMatrixPoints(&matrix, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); rel_height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y)+ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index a2aea904bb1..30cf159e140 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1239,6 +1239,20 @@ static void test_font_transform(void) todo_wine expectf_(1532.984985, bounds.Height, 0.05); + GdipDeleteGraphics(graphics); + + SetMapMode( hdc, MM_ISOTROPIC); + SetWindowExtEx(hdc, 200, 200, NULL); + SetViewportExtEx(hdc, 100, 100, NULL); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); + expect(-50, lf.lfHeight); + expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); + GdipDeleteMatrix(matrix); GdipDeleteFont(font); GdipDeleteGraphics(graphics);

1 0

Connor McAdams : uiautomationcore: Use the free threaded marshaler to marshal IUIAutomationElement interfaces.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 7844a544afc349bc53416b43a301baa564ddc638 URL: https://gitlab.winehq.org/wine/wine/-/commit/7844a544afc349bc53416b43a301ba… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed May 24 10:57:02 2023 -0400 uiautomationcore: Use the free threaded marshaler to marshal IUIAutomationElement interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 79 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 13 +++++ 2 files changed, 92 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 0dd75ce862f..5bd8e52fddb 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10620,6 +10620,79 @@ static void test_UiaFind(void) CoUninitialize(); } +struct marshal_thread_data { + IUnknown *iface; + const GUID *iface_iid; + BOOL expect_proxy; + const char *file; + int line; + + IStream *marshal_stream; +}; + +static DWORD WINAPI interface_marshal_proxy_thread(LPVOID param) +{ + struct marshal_thread_data *data = (struct marshal_thread_data *)param; + IUnknown *proxy_iface, *unk, *unk2; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + proxy_iface = unk = unk2 = NULL; + hr = CoGetInterfaceAndReleaseStream(data->marshal_stream, data->iface_iid, (void **)&proxy_iface); + ok_(data->file, data->line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IUnknown_QueryInterface(data->iface, &IID_IUnknown, (void **)&unk); + ok_(data->file, data->line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(data->file, data->line)(!!unk, "unk == NULL\n"); + + hr = IUnknown_QueryInterface(proxy_iface, &IID_IUnknown, (void **)&unk2); + ok_(data->file, data->line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(data->file, data->line)(!!unk2, "unk2 == NULL\n"); + + if (data->expect_proxy) + ok_(data->file, data->line)(unk != unk2, "unk == unk2\n"); + else + ok_(data->file, data->line)(unk == unk2, "unk != unk2\n"); + + IUnknown_Release(proxy_iface); + IUnknown_Release(unk); + IUnknown_Release(unk2); + + CoUninitialize(); + return 0; +} + +#define check_interface_marshal_proxy_creation( iface, iid, expect_proxy ) \ + check_interface_marshal_proxy_creation_( (iface), (iid), (expect_proxy), __FILE__, __LINE__) +static void check_interface_marshal_proxy_creation_(IUnknown *iface, REFIID iid, BOOL expect_proxy, const char *file, + int line) +{ + struct marshal_thread_data data = { NULL, iid, expect_proxy, file, line }; + HANDLE thread; + HRESULT hr; + + hr = IUnknown_QueryInterface(iface, data.iface_iid, (void **)&data.iface); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = CoMarshalInterThreadInterfaceInStream(data.iface_iid, data.iface, &data.marshal_stream); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + thread = CreateThread(NULL, 0, interface_marshal_proxy_thread, (void *)&data, 0, NULL); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + { + MSG msg; + while(PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + CloseHandle(thread); + + IUnknown_Release(data.iface); +} + static HWND create_test_hwnd(const char *class_name) { WNDCLASSA cls = { 0 }; @@ -10717,6 +10790,12 @@ static void test_ElementFromHandle(IUIAutomation *uia_iface, BOOL is_cui8) else ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); + /* + * The IUIAutomationElement interface uses the free threaded marshaler, so + * no actual proxy interface will be created. + */ + check_interface_marshal_proxy_creation((IUnknown *)element, &IID_IUIAutomationElement, FALSE); + IUIAutomationElement_Release(element); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 75c722771c3..66326ad9574 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1186,6 +1186,8 @@ struct uia_element { struct uia_cache_property *cached_props; int cached_props_count; + + IUnknown *marshal; }; static inline struct uia_element *impl_from_IUIAutomationElement9(IUIAutomationElement9 *iface) @@ -1203,6 +1205,8 @@ static HRESULT WINAPI uia_element_QueryInterface(IUIAutomationElement9 *iface, R IsEqualIID(riid, &IID_IUIAutomationElement6) || IsEqualIID(riid, &IID_IUIAutomationElement7) || IsEqualIID(riid, &IID_IUIAutomationElement8) || IsEqualIID(riid, &IID_IUIAutomationElement9)))) *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(element->marshal, riid, ppv); else return E_NOINTERFACE; @@ -1235,6 +1239,7 @@ static ULONG WINAPI uia_element_Release(IUIAutomationElement9 *iface) VariantClear(&element->cached_props[i].prop_val); } + IUnknown_Release(element->marshal); heap_free(element->cached_props); UiaNodeRelease(element->node); heap_free(element); @@ -2484,6 +2489,7 @@ static const IUIAutomationElement9Vtbl uia_element_vtbl = { static HRESULT create_uia_element(IUIAutomationElement **iface, BOOL from_cui8, HUIANODE node) { struct uia_element *element = heap_alloc_zero(sizeof(*element)); + HRESULT hr; *iface = NULL; if (!element) @@ -2494,6 +2500,13 @@ static HRESULT create_uia_element(IUIAutomationElement **iface, BOOL from_cui8, element->from_cui8 = from_cui8; element->node = node; + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&element->IUIAutomationElement9_iface, &element->marshal); + if (FAILED(hr)) + { + heap_free(element); + return hr; + } + *iface = (IUIAutomationElement *)&element->IUIAutomationElement9_iface; return S_OK; }

1 0

Connor McAdams : uiautomationcore: Introduce custom clientside event callback function.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 9ab915a7fb60c0a6ac8a8d9f7ac22a99d8355f40 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ab915a7fb60c0a6ac8a8d9f7ac22a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Jun 27 09:12:17 2023 -0400 uiautomationcore: Introduce custom clientside event callback function. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_event.c | 93 +++++++++++++++++++++++-------------- dlls/uiautomationcore/uia_private.h | 11 ++++- 2 files changed, 69 insertions(+), 35 deletions(-) diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 801ccf4a705..84120ae90fc 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -217,12 +217,6 @@ static void uia_event_map_entry_release(struct uia_event_map_entry *entry) * as they're raised on a background thread after the event raising * function has returned. */ -struct uia_event_args -{ - struct UiaEventArgs simple_args; - LONG ref; -}; - static struct uia_event_args *create_uia_event_args(const struct uia_event_info *event_info) { struct uia_event_args *args = heap_alloc_zero(sizeof(*args)); @@ -733,8 +727,8 @@ static HRESULT create_uia_event(struct uia_event **out_event, LONG event_cookie, return S_OK; } -static HRESULT create_clientside_uia_event(struct uia_event **out_event, int event_id, int scope, UiaEventCallback *cback, - SAFEARRAY *runtime_id) +static HRESULT create_clientside_uia_event(struct uia_event **out_event, int event_id, int scope, + UiaWineEventCallback *cback, void *cback_data, SAFEARRAY *runtime_id) { struct uia_event *event = NULL; static LONG next_event_cookie; @@ -748,7 +742,8 @@ static HRESULT create_clientside_uia_event(struct uia_event **out_event, int eve event->runtime_id = runtime_id; event->event_id = event_id; event->scope = scope; - event->u.clientside.cback = cback; + event->u.clientside.event_callback = cback; + event->u.clientside.callback_data = cback_data; *out_event = event; return S_OK; @@ -1135,38 +1130,29 @@ exit: return hr; } -/*********************************************************************** - * UiaAddEvent (uiautomationcore.@) - */ -HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope, - PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent) +static HRESULT uia_clientside_event_callback(struct uia_event *event, struct uia_event_args *args, + SAFEARRAY *cache_req, BSTR tree_struct) { - const struct uia_event_info *event_info = uia_event_info_from_id(event_id); - struct uia_event *event; - SAFEARRAY *sa; - HRESULT hr; + UiaEventCallback *event_callback = (UiaEventCallback *)event->u.clientside.callback_data; - TRACE("(%p, %d, %p, %#x, %p, %d, %p, %p)\n", huianode, event_id, callback, scope, prop_ids, prop_ids_count, - cache_req, huiaevent); - - if (!huianode || !callback || !cache_req || !huiaevent) - return E_INVALIDARG; + event_callback(&args->simple_args, cache_req, tree_struct); - if (!event_info) - WARN("No event information for event ID %d\n", event_id); + return S_OK; +} - *huiaevent = NULL; - if (event_info && (event_info->event_arg_type == EventArgsType_PropertyChanged)) - { - FIXME("Property changed event registration currently unimplemented\n"); - return E_NOTIMPL; - } +static HRESULT uia_add_clientside_event(HUIANODE huianode, EVENTID event_id, enum TreeScope scope, PROPERTYID *prop_ids, + int prop_ids_count, struct UiaCacheRequest *cache_req, SAFEARRAY *rt_id, UiaWineEventCallback *cback, + void *cback_data, HUIAEVENT *huiaevent) +{ + struct uia_event *event; + SAFEARRAY *sa; + HRESULT hr; - hr = UiaGetRuntimeId(huianode, &sa); + hr = SafeArrayCopy(rt_id, &sa); if (FAILED(hr)) return hr; - hr = create_clientside_uia_event(&event, event_id, scope, callback, sa); + hr = create_clientside_uia_event(&event, event_id, scope, cback, cback_data, sa); if (FAILED(hr)) { SafeArrayDestroy(sa); @@ -1198,6 +1184,43 @@ exit: return hr; } +/*********************************************************************** + * UiaAddEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope, + PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent) +{ + const struct uia_event_info *event_info = uia_event_info_from_id(event_id); + SAFEARRAY *sa; + HRESULT hr; + + TRACE("(%p, %d, %p, %#x, %p, %d, %p, %p)\n", huianode, event_id, callback, scope, prop_ids, prop_ids_count, + cache_req, huiaevent); + + if (!huianode || !callback || !cache_req || !huiaevent) + return E_INVALIDARG; + + if (!event_info) + WARN("No event information for event ID %d\n", event_id); + + *huiaevent = NULL; + if (event_info && (event_info->event_arg_type == EventArgsType_PropertyChanged)) + { + FIXME("Property changed event registration currently unimplemented\n"); + return E_NOTIMPL; + } + + hr = UiaGetRuntimeId(huianode, &sa); + if (FAILED(hr)) + return hr; + + hr = uia_add_clientside_event(huianode, event_id, scope, prop_ids, prop_ids_count, cache_req, sa, + uia_clientside_event_callback, (void *)callback, huiaevent); + SafeArrayDestroy(sa); + + return hr; +} + /*********************************************************************** * UiaRemoveEvent (uiautomationcore.@) */ @@ -1245,7 +1268,9 @@ static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct u &tree_struct); if (SUCCEEDED(hr)) { - event->u.clientside.cback(&args->simple_args, out_req, tree_struct); + hr = event->u.clientside.event_callback(event, args, out_req, tree_struct); + if (FAILED(hr)) + WARN("Event callback failed with hr %#lx\n", hr); SafeArrayDestroy(out_req); SysFreeString(tree_struct); } diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 11cab86651c..928b36fbae6 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -95,6 +95,12 @@ static inline struct uia_provider *impl_from_IWineUiaProvider(IWineUiaProvider * return CONTAINING_RECORD(iface, struct uia_provider, IWineUiaProvider_iface); } +struct uia_event_args +{ + struct UiaEventArgs simple_args; + LONG ref; +}; + enum uia_event_type { EVENT_TYPE_CLIENTSIDE, EVENT_TYPE_SERVERSIDE, @@ -124,7 +130,8 @@ struct uia_event { struct { struct UiaCacheRequest cache_req; - UiaEventCallback *cback; + HRESULT (*event_callback)(struct uia_event *, struct uia_event_args *, SAFEARRAY *, BSTR); + void *callback_data; DWORD git_cookie; } clientside; @@ -137,6 +144,8 @@ struct uia_event } u; }; +typedef HRESULT UiaWineEventCallback(struct uia_event *, struct uia_event_args *, SAFEARRAY *, BSTR); + static inline void variant_init_bool(VARIANT *v, BOOL val) { V_VT(v) = VT_BOOL;

1 0

Connor McAdams : uiautomationcore: Add support for calling COM event handlers.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 53376c5568c49f738645fbb0e4705709ea1b899d URL: https://gitlab.winehq.org/wine/wine/-/commit/53376c5568c49f738645fbb0e47057… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 20 10:26:58 2023 -0400 uiautomationcore: Add support for calling COM event handlers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 +- dlls/uiautomationcore/uia_com_client.c | 113 +++++++++++++++++++++++------ dlls/uiautomationcore/uia_event.c | 2 +- dlls/uiautomationcore/uia_private.h | 3 + 4 files changed, 99 insertions(+), 27 deletions(-)

1 0

Connor McAdams : uiautomationcore/tests: Add IUIAutomationFocusChangedEventHandler tests.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 63330c61683d195c309144f690f253c51762385e URL: https://gitlab.winehq.org/wine/wine/-/commit/63330c61683d195c309144f690f253… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 29 10:52:34 2023 -0400 uiautomationcore/tests: Add IUIAutomationFocusChangedEventHandler tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 145 +++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 74bcd5c0e16..59ae9535892 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13116,6 +13116,71 @@ static struct AutomationEventHandler AutomationEventHandler = 1, }; +/* + * IUIAutomationFocusChangedEventHandler. + */ +static struct FocusChangedHandler +{ + IUIAutomationFocusChangedEventHandler IUIAutomationFocusChangedEventHandler_iface; + LONG ref; + + BOOL event_handler_added; +} FocusChangedHandler; + +static inline struct FocusChangedHandler *impl_from_FocusChangedHandler(IUIAutomationFocusChangedEventHandler *iface) +{ + return CONTAINING_RECORD(iface, struct FocusChangedHandler, IUIAutomationFocusChangedEventHandler_iface); +} + +static HRESULT WINAPI FocusChangedHandler_QueryInterface(IUIAutomationFocusChangedEventHandler *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUIAutomationFocusChangedEventHandler) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IUIAutomationFocusChangedEventHandler_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI FocusChangedHandler_AddRef(IUIAutomationFocusChangedEventHandler* iface) +{ + struct FocusChangedHandler *handler = impl_from_FocusChangedHandler(iface); + return InterlockedIncrement(&handler->ref); +} + +static ULONG WINAPI FocusChangedHandler_Release(IUIAutomationFocusChangedEventHandler* iface) +{ + struct FocusChangedHandler *handler = impl_from_FocusChangedHandler(iface); + return InterlockedDecrement(&handler->ref); +} + +static HRESULT WINAPI FocusChangedHandler_HandleFocusChangedEvent(IUIAutomationFocusChangedEventHandler *iface, + IUIAutomationElement *sender) +{ + struct FocusChangedHandler *handler = impl_from_FocusChangedHandler(iface); + + if (handler->event_handler_added) + test_com_event_data(sender); + + return S_OK; +} + +static const IUIAutomationFocusChangedEventHandlerVtbl FocusChangedHandlerVtbl = { + FocusChangedHandler_QueryInterface, + FocusChangedHandler_AddRef, + FocusChangedHandler_Release, + FocusChangedHandler_HandleFocusChangedEvent, +}; + +static struct FocusChangedHandler FocusChangedHandler = +{ + { &FocusChangedHandlerVtbl }, + 1, +}; + static DWORD WINAPI uia_com_event_handler_test_thread(LPVOID param) { struct node_provider_desc exp_node_desc; @@ -13302,6 +13367,85 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati IUIAutomationElement_Release(elem2); } +static void test_IUIAutomationFocusChangedEventHandler(IUIAutomation *uia_iface) +{ + struct node_provider_desc exp_node_desc; + IUIAutomationElement *elem; + HRESULT hr; + + SetFocus(ComEventData.event_hwnd); + + /* + * FocusChangedEventHandlers are always registered on the desktop node + * with a scope of the entire desktop. + * + * All versions of Windows query the currently focused HWND when adding a + * new focus changed event handler, but behavior differs between versions: + * + * Win7-Win10v1507 queries for the focused provider and raises an event + * while also advising of events. + * + * Win10v1809+ will query the focused HWND, but doesn't advise of events + * or raise a focus event. Windows 11 will advise the provider of the + * focused HWND of events, but not any clientside providers. + */ + set_uia_hwnd_expects(6, 6, 6, 3, 0); + hr = IUIAutomation_AddFocusChangedEventHandler(uia_iface, NULL, + &FocusChangedHandler.IUIAutomationFocusChangedEventHandler_iface); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(FocusChangedHandler.ref > 1, "Unexpected refcnt %ld\n", FocusChangedHandler.ref); + check_uia_hwnd_expects_at_most(6, 6, 6, 3, 0); + FocusChangedHandler.event_handler_added = TRUE; + + /* + * Focus changed event handlers are registered on the desktop with a scope + * of all elements, so all elements match regardless of runtime ID. + */ + initialize_provider(&Provider2, ProviderOptions_ServerSideProvider, NULL, TRUE); + init_node_provider_desc(&exp_node_desc, GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc, L"Main", L"Provider2", TRUE); + set_com_event_data(&exp_node_desc); + hr = UiaRaiseAutomationEvent(&Provider2.IRawElementProviderSimple_iface, UIA_AutomationFocusChangedEventId); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine CHECK_CALLED(uia_com_event_callback); + + /* + * Removing the focus changed event handler creates a desktop node - + * presumably to use to get a runtime ID for removal. + */ + set_uia_hwnd_expects(1, 1, 1, 0, 0); + hr = IUIAutomation_RemoveFocusChangedEventHandler(uia_iface, + &FocusChangedHandler.IUIAutomationFocusChangedEventHandler_iface); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(FocusChangedHandler.ref == 1, "Unexpected refcnt %ld\n", FocusChangedHandler.ref); + FocusChangedHandler.event_handler_added = FALSE; + check_uia_hwnd_expects(1, TRUE, 1, TRUE, 1, TRUE, 0, FALSE, 0, FALSE); + + /* + * The focus changed event handler can also be removed by called + * RemoveAutomationEventHandler, which isn't documented. + */ + set_uia_hwnd_expects(6, 6, 6, 3, 0); + hr = IUIAutomation_AddFocusChangedEventHandler(uia_iface, NULL, + &FocusChangedHandler.IUIAutomationFocusChangedEventHandler_iface); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(FocusChangedHandler.ref > 1, "Unexpected refcnt %ld\n", FocusChangedHandler.ref); + check_uia_hwnd_expects_at_most(6, 6, 6, 3, 0); + FocusChangedHandler.event_handler_added = TRUE; + + set_uia_hwnd_expects(1, 1, 1, 0, 0); + hr = IUIAutomation_GetRootElement(uia_iface, &elem); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + check_uia_hwnd_expects(1, FALSE, 1, FALSE, 1, FALSE, 0, FALSE, 0, FALSE); + + hr = IUIAutomation_RemoveAutomationEventHandler(uia_iface, UIA_AutomationFocusChangedEventId, elem, + (IUIAutomationEventHandler *)&FocusChangedHandler.IUIAutomationFocusChangedEventHandler_iface); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(FocusChangedHandler.ref == 1, "Unexpected refcnt %ld\n", FocusChangedHandler.ref); + + IUIAutomationElement_Release(elem); +} + static void test_CUIAutomation_event_handlers(IUIAutomation *uia_iface) { IUIAutomationElement *elem; @@ -13334,6 +13478,7 @@ static void test_CUIAutomation_event_handlers(IUIAutomation *uia_iface) check_uia_hwnd_expects(1, TRUE, 1, FALSE, 1, FALSE, 1, FALSE, 0, FALSE); test_IUIAutomationEventHandler(uia_iface, elem); + test_IUIAutomationFocusChangedEventHandler(uia_iface); IUIAutomationElement_Release(elem); UiaRegisterProviderCallback(NULL);

1 0