wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Rémi Bernon : ntoskrnl.exe/tests: Don't call CertFreeCertificateContext on cleanup.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 2191c0f4b5439f750dfe46e58f3e3cf38da1dde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2191c0f4b5439f750dfe46e5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 15 19:05:43 2021 +0200 ntoskrnl.exe/tests: Don't call CertFreeCertificateContext on cleanup. It seems to crash the test on w864. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ff73e8eae18..4b744d813d8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,15 +235,11 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertFreeCertificateContext(ctx->root_cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertFreeCertificateContext(ctx->publisher_cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError());

1 0

Zebediah Figura : server: Remove the no longer used set_socket_event request.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 43e67ebddc8312f1bd8d325abc106a7f9625ebb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e67ebddc8312f1bd8d325a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:49 2021 -0500 server: Remove the no longer used set_socket_event request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 21 +-------------- server/protocol.def | 10 ------- server/request.h | 8 ------ server/sock.c | 60 ------------------------------------------ server/trace.c | 12 --------- 5 files changed, 1 insertion(+), 110 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a97974027f1..1f0e25c31fa 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1730,22 +1730,6 @@ struct unlock_file_reply -struct set_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - unsigned int mask; - obj_handle_t event; - user_handle_t window; - unsigned int msg; -}; -struct set_socket_event_reply -{ - struct reply_header __header; -}; - - - struct get_socket_event_request { struct request_header __header; @@ -5501,7 +5485,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, REQ_set_socket_deferred, @@ -5784,7 +5767,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; struct get_socket_info_request get_socket_info_request; struct set_socket_deferred_request set_socket_deferred_request; @@ -6065,7 +6047,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; struct get_socket_info_reply get_socket_info_reply; struct set_socket_deferred_reply set_socket_deferred_reply; @@ -6292,7 +6273,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 712 +#define SERVER_PROTOCOL_VERSION 713 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 3609261b848..d3f44482c37 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1423,16 +1423,6 @@ enum server_fd_type @END -/* Set socket event parameters */ -@REQ(set_socket_event) - obj_handle_t handle; /* handle to the socket */ - unsigned int mask; /* event mask */ - obj_handle_t event; /* event object */ - user_handle_t window; /* window to send the message to */ - unsigned int msg; /* message to send */ -@END - - /* Get socket event parameters */ @REQ(get_socket_event) obj_handle_t handle; /* handle to the socket */ diff --git a/server/request.h b/server/request.h index 4f6adaa97c2..c3f77a233ab 100644 --- a/server/request.h +++ b/server/request.h @@ -172,7 +172,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); DECL_HANDLER(set_socket_deferred); @@ -454,7 +453,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, (req_handler)req_set_socket_deferred, @@ -1040,12 +1038,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, mask) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, event) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, window) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, msg) == 28 ); -C_ASSERT( sizeof(struct set_socket_event_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, service) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); diff --git a/server/sock.c b/server/sock.c index 6d2ac6af2b7..a3062cff8ab 100644 --- a/server/sock.c +++ b/server/sock.c @@ -444,28 +444,6 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) return ret; } -static unsigned int afd_poll_flag_from_win32( unsigned int flags ) -{ - static const unsigned int map[] = - { - AFD_POLL_READ, - AFD_POLL_WRITE, - AFD_POLL_OOB, - AFD_POLL_ACCEPT, - AFD_POLL_CONNECT | AFD_POLL_CONNECT_ERR, - AFD_POLL_RESET | AFD_POLL_HUP, - }; - - unsigned int i, ret = 0; - - for (i = 0; i < ARRAY_SIZE(map); ++i) - { - if (flags & (1 << i)) ret |= map[i]; - } - - return ret; -} - /* wake anybody waiting on the socket event or send the associated message */ static void sock_wake_up( struct sock *sock ) { @@ -2520,44 +2498,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* set socket event parameters */ -DECL_HANDLER(set_socket_event) -{ - struct sock *sock; - struct event *old_event; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, - FILE_WRITE_ATTRIBUTES, &sock_ops))) return; - if (get_unix_fd( sock->fd ) == -1) return; - old_event = sock->event; - sock->mask = afd_poll_flag_from_win32( req->mask ); - if (req->window) - { - sock->pending_events &= ~sock->mask; - sock->reported_events &= ~sock->mask; - } - sock->event = NULL; - sock->window = req->window; - sock->message = req->msg; - sock->wparam = req->handle; /* wparam is the socket handle */ - if (req->event) sock->event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ); - - if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); - - sock_reselect( sock ); - - sock->nonblocking = 1; - - /* if a network event is pending, signal the event object - it is possible that CONNECT or ACCEPT network events has happened - before a WSAEventSelect() was done on it. - (when dealing with Asynchronous socket) */ - sock_wake_up( sock ); - - if (old_event) release_object( old_event ); /* we're through with it */ - release_object( &sock->obj ); -} - /* get socket event parameters */ DECL_HANDLER(get_socket_event) { diff --git a/server/trace.c b/server/trace.c index 42952d3cdff..27500eae589 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2073,15 +2073,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_set_socket_event_request( const struct set_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mask=%08x", req->mask ); - fprintf( stderr, ", event=%04x", req->event ); - fprintf( stderr, ", window=%08x", req->window ); - fprintf( stderr, ", msg=%08x", req->msg ); -} - static void dump_get_socket_event_request( const struct get_socket_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4598,7 +4589,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, (dump_func)dump_set_socket_deferred_request, @@ -4877,7 +4867,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - NULL, (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, @@ -5156,7 +5145,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "set_socket_event", "get_socket_event", "get_socket_info", "set_socket_deferred",

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_MESSAGE_SELECT.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 0e2a998a33fd2a21295bbc29b6080a763ec5f859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e2a998a33fd2a21295bbc29… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:48 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_MESSAGE_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fc320ea0247..2fa1471ae3b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4508,29 +4508,28 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, /*********************************************************************** - * WSAAsyncSelect (WS2_32.101) + * WSAAsyncSelect (ws2_32.@) */ -INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent) +int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) { - int ret; + struct afd_message_select_params params; + IO_STATUS_BLOCK io; + NTSTATUS status; - TRACE("%04lx, hWnd %p, uMsg %08x, event %08x\n", s, hWnd, uMsg, lEvent); + TRACE( "socket %#lx, window %p, message %#x, mask %#x\n", s, window, message, mask ); - SERVER_START_REQ( set_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->mask = lEvent; - req->event = 0; - req->window = wine_server_user_handle( hWnd ); - req->msg = uMsg; - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (!ret) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; + params.handle = wine_server_obj_handle( (HANDLE)s ); + params.window = wine_server_user_handle( window ); + params.message = message; + params.mask = afd_poll_flag_from_win32( mask ); + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, + &params, sizeof(params), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; } + /*********************************************************************** * WSACreateEvent (WS2_32.31) *

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_MESSAGE_SELECT.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: ce31d1253db0601dc27e88aff426bfe3eb7306fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce31d1253db0601dc27e88af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:47 2021 -0500 server: Introduce IOCTL_AFD_WINE_MESSAGE_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 9 +++++++++ server/sock.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 46d242c7582..35d047c59d8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -147,6 +147,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { @@ -199,4 +200,12 @@ struct afd_transmit_params DWORD flags; }; +struct afd_message_select_params +{ + obj_handle_t handle; + user_handle_t window; + unsigned int message; + int mask; +}; + #endif diff --git a/server/sock.c b/server/sock.c index e1b30507514..6d2ac6af2b7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2095,6 +2095,35 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_MESSAGE_SELECT: + { + const struct afd_message_select_params *params = get_req_data(); + + if (get_req_data_size() < sizeof(params)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (sock->event) release_object( sock->event ); + + if (params->window) + { + sock->pending_events = 0; + sock->reported_events = 0; + } + sock->event = NULL; + sock->mask = params->mask; + sock->window = params->window; + sock->message = params->message; + sock->wparam = params->handle; + sock->nonblocking = 1; + + sock_reselect( sock ); + + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 0272f19049e9473a1fd7a5314ab0952eac96d887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0272f19049e9473a1fd7a531… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:46 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index e08fc977ad4..443b6e4e42f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1229,6 +1229,110 @@ static void test_event_select(void) CloseHandle(event); } +static void test_get_events(void) +{ + const struct sockaddr_in invalid_addr = + { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = 255, + }; + struct afd_get_events_params params; + WSANETWORKEVENTS events; + SOCKET client, server; + IO_STATUS_BLOCK io; + unsigned int i; + HANDLE event; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %u\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == (AFD_POLL_WRITE | AFD_POLL_CONNECT), "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 = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", GetLastError()); + ok(!events.lNetworkEvents, "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + tcp_socketpair(&client, &server); + + ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %u\n", GetLastError()); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", GetLastError()); + ok(events.lNetworkEvents == (FD_WRITE | FD_CONNECT), "got events %#x\n", events.lNetworkEvents); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 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]); + + closesocket(client); + closesocket(server); + + /* Test a failed connection. The following call can take over 2 seconds to + * complete, so make the test interactive-only. */ + + if (winetest_interactive) + { + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + ResetEvent(event); + ret = WSAEventSelect(client, event, FD_CONNECT); + ok(!ret, "got error %u\n", GetLastError()); + + ret = connect(client, (struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(event, 2000); + ok(!ret, "got %#x\n", ret); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + { + if (i == AFD_POLL_BIT_CONNECT_ERR) + ok(params.status[i] == STATUS_CONNECTION_REFUSED, "got status[%u] %#x\n", i, params.status[i]); + else + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + } + + closesocket(client); + } + + CloseHandle(event); +} + START_TEST(afd) { WSADATA data; @@ -1240,6 +1344,7 @@ START_TEST(afd) test_poll_completion_port(); test_recv(); test_event_select(); + test_get_events(); WSACleanup(); }

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_GET_EVENTS in WSAEnumNetworkEvents().
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: a916887b94579e94abe35ffa7f56d1bb9996711b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a916887b94579e94abe35ffa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:45 2021 -0500 ws2_32: Use IOCTL_AFD_GET_EVENTS in WSAEnumNetworkEvents(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 82 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69dec158e5a..fc320ea0247 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3826,6 +3826,33 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return ret; } + +static unsigned int afd_poll_flag_to_win32( unsigned int flags ) +{ + static const unsigned int map[] = + { + FD_READ, /* READ */ + FD_OOB, /* OOB */ + FD_WRITE, /* WRITE */ + FD_CLOSE, /* HUP */ + FD_CLOSE, /* RESET */ + 0, /* CLOSE */ + FD_CONNECT, /* CONNECT */ + FD_ACCEPT, /* ACCEPT */ + FD_CONNECT, /* CONNECT_ERR */ + }; + + unsigned int i, ret = 0; + + for (i = 0; i < ARRAY_SIZE(map); ++i) + { + if (flags & (1 << i)) ret |= map[i]; + } + + return ret; +} + + /*********************************************************************** * WSAPoll */ @@ -4347,36 +4374,47 @@ SOCKET WINAPI WS_socket(int af, int type, int protocol) /*********************************************************************** - * WSAEnumNetworkEvents (WS2_32.36) + * WSAEnumNetworkEvents (ws2_32.@) */ -int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent) +int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret_events ) { - int ret; - int i; - int errors[FD_MAX_EVENTS]; + struct afd_get_events_params params; + IO_STATUS_BLOCK io; + NTSTATUS status; - TRACE("%04lx, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent ); + TRACE( "socket %#lx, event %p, events %p\n", s, event, ret_events ); - SERVER_START_REQ( get_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->service = TRUE; - req->c_event = wine_server_obj_handle( hEvent ); - wine_server_set_reply( req, errors, sizeof(errors) ); - if (!(ret = wine_server_call(req))) lpEvent->lNetworkEvents = reply->pmask & reply->mask; - } - SERVER_END_REQ; - if (!ret) + ResetEvent( event ); + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, + NULL, 0, &params, sizeof(params) ); + if (!status) { - for (i = 0; i < FD_MAX_EVENTS; i++) + ret_events->lNetworkEvents = afd_poll_flag_to_win32( params.flags ); + + if (ret_events->lNetworkEvents & FD_READ) + ret_events->iErrorCode[FD_READ_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_READ] ); + + if (ret_events->lNetworkEvents & FD_WRITE) + ret_events->iErrorCode[FD_WRITE_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_WRITE] ); + + if (ret_events->lNetworkEvents & FD_OOB) + ret_events->iErrorCode[FD_OOB_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_OOB] ); + + if (ret_events->lNetworkEvents & FD_ACCEPT) + ret_events->iErrorCode[FD_ACCEPT_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_ACCEPT] ); + + if (ret_events->lNetworkEvents & FD_CONNECT) + ret_events->iErrorCode[FD_CONNECT_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_CONNECT_ERR] ); + + if (ret_events->lNetworkEvents & FD_CLOSE) { - if (lpEvent->lNetworkEvents & (1 << i)) - lpEvent->iErrorCode[i] = errors[i]; + if (!(ret_events->iErrorCode[FD_CLOSE_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_HUP] ))) + ret_events->iErrorCode[FD_CLOSE_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_RESET] ); } - return 0; } - SetLastError(WSAEINVAL); - return SOCKET_ERROR; + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; }

1 0

Zebediah Figura : server: Do not poll sockets for POLLPRI unless we are selecting for AFD_POLL_OOB.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 2daf76432e3d993972cbb4257883d2e1139496fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2daf76432e3d993972cbb425… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:44 2021 -0500 server: Do not poll sockets for POLLPRI unless we are selecting for AFD_POLL_OOB. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1d992d8f9e4..e1b30507514 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1063,11 +1063,20 @@ static int sock_get_poll_events( struct fd *fd ) { if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI; } - else if (!sock->rd_shutdown && (mask & AFD_POLL_READ)) - ev |= POLLIN | POLLPRI; - /* We use POLLIN with 0 bytes recv() as hangup indication for stream sockets. */ - else if (sock->state == SOCK_CONNECTED && (mask & AFD_POLL_HUP) && !(sock->reported_events & AFD_POLL_READ)) - ev |= POLLIN; + else + { + if (!sock->rd_shutdown) + { + if (mask & AFD_POLL_READ) + ev |= POLLIN; + if (mask & AFD_POLL_OOB) + ev |= POLLPRI; + } + + /* We use POLLIN with 0 bytes recv() as hangup indication for stream sockets. */ + if (sock->state == SOCK_CONNECTED && (mask & AFD_POLL_HUP) && !(sock->reported_events & AFD_POLL_READ)) + ev |= POLLIN; + } if (async_queued( &sock->write_q )) {

1 0

Zebediah Figura : server: Implement IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 69549fc0c7b513868da367326ac5e1b19d63cab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69549fc0c7b513868da36732… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:43 2021 -0500 server: Implement IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 ++++++ include/wine/afd.h | 7 +++++++ server/sock.c | 22 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 088f29f85ff..3b8206474f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1181,6 +1181,12 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_GET_EVENTS: + if (in_size) FIXME( "unexpected input size %u\n", in_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + case IOCTL_AFD_RECV: { const struct afd_recv_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index 2eb3e6f12a9..46d242c7582 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -36,6 +36,7 @@ #define IOCTL_AFD_RECV CTL_CODE(FILE_DEVICE_BEEP, 0x805, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_POLL CTL_CODE(FILE_DEVICE_BEEP, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_EVENT_SELECT CTL_CODE(FILE_DEVICE_BEEP, 0x821, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_AFD_GET_EVENTS CTL_CODE(FILE_DEVICE_BEEP, 0x822, METHOD_NEITHER, FILE_ANY_ACCESS) enum afd_poll_bit { @@ -125,6 +126,12 @@ struct afd_event_select_params_32 int mask; }; +struct afd_get_events_params +{ + int flags; + NTSTATUS status[13]; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 3556ee21aa3..1d992d8f9e4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2011,6 +2011,28 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return 1; + 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 0; + } + + 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 = 0; + sock_reselect( sock ); + + set_reply_data( &params, sizeof(params) ); + return 0; + } + case IOCTL_AFD_EVENT_SELECT: { struct event *event = NULL;

1 0

Jacek Caban : win32u: Add stub DLL.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 1e84cc0fa78c2213aa1531ff0b19b4aee0bc272c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e84cc0fa78c2213aa1531ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 15 14:38:23 2021 +0200 win32u: Add stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/win32u/Makefile.in | 1 + dlls/win32u/win32u.spec | 1317 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1321 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e84cc0fa78c2213aa15…

1 0

Alexandre Julliard : ntdll: Copy the implementation of __wine_dbg_strdup and __wine_dbg_header to the PE side.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: c2d84da8134cc9d07a114561c10c75bf91078370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d84da8134cc9d07a114561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 17:16:30 2021 +0200 ntdll: Copy the implementation of __wine_dbg_strdup and __wine_dbg_header to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/debug.c | 10 +++++----- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unixlib.h | 5 +---- 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index bcf010724c4..d86d20448bf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -34,12 +34,33 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(thread); +WINE_DECLARE_DEBUG_CHANNEL(pid); +WINE_DECLARE_DEBUG_CHANNEL(timestamp); struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1020]; /* buffer for temporary strings */ + char output[1020]; /* current output line */ +}; + +C_ASSERT( sizeof(struct debug_info) == 0x800 ); + static int nb_debug_options; static struct __wine_debug_channel *debug_options; +static inline struct debug_info *get_info(void) +{ +#ifdef _WIN64 + return (struct debug_info *)((TEB32 *)((char *)NtCurrentTeb() + 0x2000) + 1); +#else + return (struct debug_info *)(NtCurrentTeb() + 1); +#endif +} + static void init_options(void) { unsigned int offset = page_size * (sizeof(void *) / 4); @@ -81,7 +102,14 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel */ const char * __cdecl __wine_dbg_strdup( const char *str ) { - return unix_funcs->dbg_strdup( str ); + struct debug_info *info = get_info(); + unsigned int pos = info->str_pos; + size_t n = strlen( str ) + 1; + + assert( n <= sizeof(info->strings) ); + if (pos + n > sizeof(info->strings)) pos = 0; + info->str_pos = pos + n; + return memcpy( info->strings + pos, str, n ); } /*********************************************************************** @@ -90,7 +118,27 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *function ) { - return unix_funcs->dbg_header( cls, channel, function ); + static const char * const classes[] = { "fixme", "err", "warn", "trace" }; + struct debug_info *info = get_info(); + char *pos = info->output; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + /* only print header if we are at the beginning of the line */ + if (info->out_pos) return 0; + + if (TRACE_ON(timestamp)) + { + ULONG ticks = NtGetTickCount(); + pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); + } + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + if (function && cls < ARRAY_SIZE( classes )) + pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ", + classes[cls], channel->name, function ); + info->out_pos = pos - info->output; + return info->out_pos; } /*********************************************************************** diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 753bc36e469..0272e68bea6 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -277,7 +277,7 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ { static const char * const classes[] = { "fixme", "err", "warn", "trace" }; struct debug_info *info = get_info(); - char buffer[200], *pos = buffer; + char *pos = info->output; if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; @@ -295,10 +295,10 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); } if (function && cls < ARRAY_SIZE( classes )) - snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", - classes[cls], channel->name, function ); - - return append_output( info, buffer, strlen( buffer )); + pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ", + classes[cls], channel->name, function ); + info->out_pos = pos - info->output; + return info->out_pos; } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0b2a7f3721c..fca63141ba3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1850,9 +1850,7 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_strdup, __wine_dbg_output, - __wine_dbg_header, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d0f2f4ed508..cbe5c9d3ccd 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 121 +#define NTDLL_UNIXLIB_VERSION 122 struct unix_funcs { @@ -80,10 +80,7 @@ struct unix_funcs CONTEXT *context ); /* debugging functions */ - const char * (CDECL *dbg_strdup)( const char *str ); int (CDECL *dbg_output)( const char *str ); - int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function ); }; #endif /* __NTDLL_UNIXLIB_H */

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
82
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 June 2021