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

Zebediah Figura : httpapi/tests: Do not test that a local TCP port is closed.
by Alexandre Julliard July 24, 2023

July 24, 2023

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 July 24, 2023

July 24, 2023

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

Zebediah Figura : ws2_32: Move the event reset in WSAEnumNetworkEvents() to the server.
by Alexandre Julliard July 24, 2023

July 24, 2023

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

Georg Lehmann : winevulkan: Update to VK spec version 1.3.259.
by Alexandre Julliard July 24, 2023

July 24, 2023

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

Zebediah Figura : server: Move the implementation of IOCTL_AFD_GET_EVENTS to a dedicated server call.
by Alexandre Julliard July 24, 2023

July 24, 2023

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/tests: Execute test_iocp() near the end.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 8ab7120badb68519eb3a76ad6768c3109454e2b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ab7120badb68519eb3a76ad6768c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 13:46:55 2023 -0500 ws2_32/tests: Execute test_iocp() near the end. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54413 --- dlls/ws2_32/tests/sock.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ac104400104..e53d9991e56 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13877,7 +13877,6 @@ START_TEST( sock ) test_WSARecv(); test_WSAPoll(); test_write_watch(); - test_iocp(); test_events(); @@ -13903,6 +13902,31 @@ START_TEST( sock ) test_connect_udp(); test_tcp_sendto_recvfrom(); + /* There is apparently an obscure interaction between this test and + * test_WSAGetOverlappedResult(). + * + * One thing this test does is to close socket handles through CloseHandle() + * and NtClose(), to prove that that is sufficient to cancel I/O on the + * socket. This has the obscure side effect that ws2_32.dll's internal + * per-process list of sockets never has that socket removed. + * + * test_WSAGetOverlappedResult() effectively proves that the per-process + * list of sockets exists, by calling DuplicateHandle() on a socket and then + * passing it to a function which cares about socket handle validity, which + * checks that handle against the internal list, finds it invalid, and + * returns WSAENOTSOCK. + * + * The problem is that if we close an NT handle without removing it from the + * ws2_32 list, then duplicate another handle, it *may* end up allocated to + * the same handle value, and thus re-validate that handle right under the + * nose of ws2_32. This causes the test_WSAGetOverlappedResult() test to + * sometimes succeed where it's expected to fail with ENOTSOCK. + * + * In order to avoid this, make sure that this test—which is evidently + * destructive to ws2_32 internal state in obscure ways—is executed last. + */ + test_iocp(); + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Zebediah Figura : ws2_32/tests: Use closesocket(), not close().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: ca02b8e4bc1ec224f0000bc6d4a66be38c1719a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca02b8e4bc1ec224f0000bc6d4a66b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 13:45:51 2023 -0500 ws2_32/tests: Use closesocket(), not close(). --- dlls/ws2_32/tests/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3b115672acb..ac104400104 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4904,9 +4904,9 @@ static void test_accept_inheritance(void) ok(linger.l_onoff == 1, "got on/off %u\n", linger.l_onoff); ok(linger.l_linger == 555, "got linger %u\n", linger.l_onoff); - close(server); - close(client); - close(listener); + closesocket(server); + closesocket(client); + closesocket(listener); } static void test_extendedSocketOptions(void)

1 0

Fabian Maurer : gdiplus: Make flatten_bezier_add iterative.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 7da5dff88ce6d1cb77e855bf91697252f703c12f URL: https://gitlab.winehq.org/wine/wine/-/commit/7da5dff88ce6d1cb77e855bf916972… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 24 16:47:55 2023 +0200 gdiplus: Make flatten_bezier_add iterative. --- dlls/gdiplus/graphicspath.c | 139 ++++++++++++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 45 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 6cdc2a58059..06e17d4b98a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -103,6 +103,28 @@ static INT path_list_count(path_list_node_t *node) return count; } +struct flatten_bezier_job +{ + path_list_node_t *start; + REAL x2; + REAL y2; + REAL x3; + REAL y3; + path_list_node_t *end; + struct list entry; +}; + +static BOOL flatten_bezier_add(struct list *jobs, path_list_node_t *start, REAL x2, REAL y2, REAL x3, REAL y3, path_list_node_t *end) +{ + struct flatten_bezier_job *job = malloc(sizeof(struct flatten_bezier_job)); + struct flatten_bezier_job temp = { start, x2, y2, x3, y3, end }; + if (!job) + return FALSE; + *job = temp; + list_add_after(jobs, &job->entry); + return TRUE; +} + /* GdipFlattenPath helper */ /* * Used to recursively flatten single Bezier curve @@ -128,55 +150,82 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R GpPointF pt, pt_st; path_list_node_t *node; REAL area_triangle, distance_start_end; + BOOL ret = TRUE; + struct list jobs; + struct flatten_bezier_job *current, *next; + + list_init( &jobs ); + flatten_bezier_add(&jobs, start, x2, y2, x3, y3, end); + LIST_FOR_EACH_ENTRY( current, &jobs, struct flatten_bezier_job, entry ) + { + start = current->start; + x2 = current->x2; + y2 = current->y2; + x3 = current->x3; + y3 = current->y3; + end = current->end; + + /* middle point between control points */ + pt.X = (x2 + x3) / 2.0; + pt.Y = (y2 + y3) / 2.0; + + /* calculate bezier curve middle points == new control points */ + mp[0].X = (start->pt.X + x2) / 2.0; + mp[0].Y = (start->pt.Y + y2) / 2.0; + mp[1].X = (mp[0].X + pt.X) / 2.0; + mp[1].Y = (mp[0].Y + pt.Y) / 2.0; + mp[4].X = (end->pt.X + x3) / 2.0; + mp[4].Y = (end->pt.Y + y3) / 2.0; + mp[3].X = (mp[4].X + pt.X) / 2.0; + mp[3].Y = (mp[4].Y + pt.Y) / 2.0; + + /* middle point between new control points */ + mp[2].X = (mp[1].X + mp[3].X) / 2.0; + mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + + /* Is one pair of the new control points equal to the old control points? */ + if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || + (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) + continue; + + pt = end->pt; + pt_st = start->pt; + + /* check flatness as a half of distance between middle point and a linearized path + * formula for distance point from line for point (x0, y0) and line (x1, y1) (x2, y2) + * is defined as (area_triangle / distance_start_end): + * | (x2 - x1) * (y1 - y0) - (x1 - x0) * (y2 - y1) / sqrt( (x2 - x1)^2 + (y2 - y1)^2 ) | + * Here rearranged to avoid division and simplified: + * x0(y2 - y1) + y0(x1 - x2) + (x2*y1 - x1*y2) + */ + area_triangle = (pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y); + distance_start_end = sqrtf(powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0)); + if(fabs(area_triangle) <= (0.5 * flatness * distance_start_end)){ + continue; + } + else + /* add a middle point */ + if(!(node = add_path_list_node(start, mp[2].X, mp[2].Y, PathPointTypeLine))) + { + ret = FALSE; + break; + }; - /* middle point between control points */ - pt.X = (x2 + x3) / 2.0; - pt.Y = (y2 + y3) / 2.0; - - /* calculate bezier curve middle points == new control points */ - mp[0].X = (start->pt.X + x2) / 2.0; - mp[0].Y = (start->pt.Y + y2) / 2.0; - mp[1].X = (mp[0].X + pt.X) / 2.0; - mp[1].Y = (mp[0].Y + pt.Y) / 2.0; - mp[4].X = (end->pt.X + x3) / 2.0; - mp[4].Y = (end->pt.Y + y3) / 2.0; - mp[3].X = (mp[4].X + pt.X) / 2.0; - mp[3].Y = (mp[4].Y + pt.Y) / 2.0; - - /* middle point between new control points */ - mp[2].X = (mp[1].X + mp[3].X) / 2.0; - mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; - - /* Is one pair of the new control points equal to the old control points? */ - if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || - (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) - return TRUE; - - pt = end->pt; - pt_st = start->pt; - - /* check flatness as a half of distance between middle point and a linearized path - * formula for distance point from line for point (x0, y0) and line (x1, y1) (x2, y2) - * is defined as (area_triangle / distance_start_end): - * | (x2 - x1) * (y1 - y0) - (x1 - x0) * (y2 - y1) / sqrt( (x2 - x1)^2 + (y2 - y1)^2 ) | - * Here rearranged to avoid division and simplified: - * x0(y2 - y1) + y0(x1 - x2) + (x2*y1 - x1*y2) - */ - area_triangle = (pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y); - distance_start_end = sqrtf(powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0)); - if(fabs(area_triangle) <= (0.5 * flatness * distance_start_end)){ - return TRUE; + /* do the same with halves */ + if (!flatten_bezier_add(&current->entry, node, mp[3].X, mp[3].Y, mp[4].X, mp[4].Y, end)) + break; + if (!flatten_bezier_add(&current->entry, start, mp[0].X, mp[0].Y, mp[1].X, mp[1].Y, node)) + break; } - else - /* add a middle point */ - if(!(node = add_path_list_node(start, mp[2].X, mp[2].Y, PathPointTypeLine))) - return FALSE; - /* do the same with halves */ - flatten_bezier(start, mp[0].X, mp[0].Y, mp[1].X, mp[1].Y, node, flatness); - flatten_bezier(node, mp[3].X, mp[3].Y, mp[4].X, mp[4].Y, end, flatness); + /* Cleanup */ + LIST_FOR_EACH_ENTRY_SAFE( current, next, &jobs, struct flatten_bezier_job, entry ) + { + list_remove(&current->entry); + free(current); + } - return TRUE; + return ret; } /* GdipAddPath* helper

1 0

Connor McAdams : uiautomationcore/tests: Add IUIAutomationFocusChangedEventHandler tests.
by Alexandre Julliard July 24, 2023

July 24, 2023

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

Zebediah Figura : ws2_32/tests: Update test_write_watch() for Windows 11.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 5dc0b0ef88216062a9e9fdb44a6205199475d750 URL: https://gitlab.winehq.org/wine/wine/-/commit/5dc0b0ef88216062a9e9fdb44a6205… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 13:05:54 2023 -0500 ws2_32/tests: Update test_write_watch() for Windows 11. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54546 --- dlls/ws2_32/tests/sock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9881540319b..3b115672acb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7700,6 +7700,8 @@ static void test_write_watch(void) return; } + /* Windows 11 no longer triggers write watches anymore. */ + tcp_socketpair(&src, &dest); memset(&ov, 0, sizeof(ov)); @@ -7730,7 +7732,7 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() ); - ok( count == 9, "wrong count %Iu\n", count ); + ok( count == 9 || !count /* Win 11 */, "wrong count %Iu\n", count ); ok( !base[0], "data set\n" ); send(src, "test message", sizeof("test message"), 0); @@ -7761,7 +7763,7 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() ); - ok( count == 5, "wrong count %Iu\n", count ); + ok( count == 5 || !count /* Win 11 */, "wrong count %Iu\n", count ); ok( !base[0], "data set\n" ); send(src, "test message", sizeof("test message"), 0); @@ -7795,7 +7797,7 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() ); - ok( count == 8, "wrong count %Iu\n", count ); + ok( count == 8 || !count /* Win 11 */, "wrong count %Iu\n", count ); send(src, "test message", sizeof("test message"), 0); WaitForSingleObject( thread, 10000 );

1 0