wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

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

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

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

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 : 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 */ +@REQ(socket_get_events) + obj_handle_t handle; /* socket handle */ + obj_handle_t event; /* event to reset */ +@REPLY + unsigned int flags; /* event mask */ + VARARG(status,uints); /* array of status codes */ +@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 24 Jul '23

24 Jul '23

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 24 Jul '23

24 Jul '23

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

Zebediah Figura : ws2_32/tests: Update test_write_watch() for Windows 11.
by Alexandre Julliard 24 Jul '23

24 Jul '23

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

Zebediah Figura : ws2_32/tests: Give an event test marked todo a bit more time to fail on Wine.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 9a43d51e06b9f52a4c4feefe8c8ab5aa31d8873f URL: https://gitlab.winehq.org/wine/wine/-/commit/9a43d51e06b9f52a4c4feefe8c8ab5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 21:48:16 2023 -0500 ws2_32/tests: Give an event test marked todo a bit more time to fail on Wine. We are testing that FD_CLOSE isn't generated, but Wine currently generates FD_CLOSE anyway. However, sometimes Wine does not generate FD_CLOSE immediately, causing the test to intermittently succeed inside the todo block. This test is difficult to fix properly—it would involve either (arbitrary?) buffering in the server, or support from the host OS. However, we also don't want to make the Windows tests take longer, so add the 200 ms of leeway only on Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54073 --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9d0f8e0e820..9881540319b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6920,7 +6920,7 @@ static void test_close_events(struct event_test_ctx *ctx) ret = recv(server, buffer, 5, 0); ok(ret == 2, "got %d\n", ret); - check_events_todo(ctx, 0, 0, 0); + check_events_todo(ctx, 0, 0, !strcmp(winetest_platform, "wine") ? 200 : 0); closesocket(server);

1 0

Zebediah Figura : ws2_32/tests: Increase the timeout on some FD_CLOSE tests.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: f523609219e8d6e2a543d769e1704302b62a0d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/f523609219e8d6e2a543d769e17043… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 21:43:04 2023 -0500 ws2_32/tests: Increase the timeout on some FD_CLOSE tests. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54073 --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e6ab5065cfe..9d0f8e0e820 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6842,7 +6842,7 @@ static void test_close_events(struct event_test_ctx *ctx) closesocket(client); - check_events(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 1000); check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) @@ -6869,7 +6869,7 @@ static void test_close_events(struct event_test_ctx *ctx) shutdown(client, SD_SEND); - check_events(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 1000); check_events(ctx, 0, 0, 0); closesocket(client);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2023