June 2021 - Wine-commits - list.winehq.org

Zebediah Figura : server: Partially implement IOCTL_AFD_BIND.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: f98ea26c67e49587330ba1d65b3dc331a3b04e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98ea26c67e49587330ba1d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:27 2021 -0500 server: Partially implement IOCTL_AFD_BIND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 10 ++ include/wine/afd.h | 7 ++ server/sock.c | 302 ++++++++++++++++++++++++++++++++++++++++++++++- server/trace.c | 1 + 4 files changed, 319 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f98ea26c67e49587330b…

1 0

Zebediah Figura : server: Implement IOCTL_AFD_GETSOCKNAME.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 02309b72f72a35f214505359b212df3ec15c37c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02309b72f72a35f214505359… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:28 2021 -0500 server: Implement IOCTL_AFD_GETSOCKNAME. 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 | 1 + server/sock.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0d77e417148..02700d37d6a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1167,6 +1167,12 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_GETSOCKNAME: + if (in_size) FIXME( "unexpected input size %u\n", in_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + case IOCTL_AFD_LISTEN: { const struct afd_listen_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index 87da44ecca7..04468363673 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -36,6 +36,7 @@ #define IOCTL_AFD_LISTEN CTL_CODE(FILE_DEVICE_BEEP, 0x802, METHOD_NEITHER, FILE_ANY_ACCESS) #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_GETSOCKNAME CTL_CODE(FILE_DEVICE_BEEP, 0x80b, METHOD_NEITHER, 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) diff --git a/server/sock.c b/server/sock.c index 425c07566ac..e5acf585dcc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -109,6 +109,15 @@ #define IP_UNICAST_IF 50 #endif +union win_sockaddr +{ + struct WS_sockaddr addr; + struct WS_sockaddr_in in; + struct WS_sockaddr_in6 in6; + struct WS_sockaddr_ipx ipx; + SOCKADDR_IRDA irda; +}; + static struct list poll_list = LIST_INIT( poll_list ); struct poll_req @@ -194,10 +203,13 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + union win_sockaddr addr; /* socket name */ + int addr_len; /* socket name length */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ unsigned int nonblocking : 1; /* is the socket nonblocking? */ + unsigned int bound : 1; /* is the socket bound? */ }; static void sock_dump( struct object *obj, int verbose ); @@ -1365,10 +1377,13 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + memset( &sock->addr, 0, sizeof(sock->addr) ); + sock->addr_len = 0; sock->rd_shutdown = 0; sock->wr_shutdown = 0; sock->wr_shutdown_pending = 0; sock->nonblocking = 0; + sock->bound = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -1583,6 +1598,9 @@ static struct sock *accept_socket( struct sock *sock ) } else { + union unix_sockaddr unix_addr; + socklen_t unix_len; + if ((acceptfd = accept_new_fd( sock )) == -1) return NULL; if (!(acceptsock = create_socket())) { @@ -1592,6 +1610,7 @@ static struct sock *accept_socket( struct sock *sock ) /* newly created socket gets the same properties of the listening socket */ acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; acceptsock->nonblocking = sock->nonblocking; acceptsock->mask = sock->mask; acceptsock->proto = sock->proto; @@ -1608,6 +1627,9 @@ static struct sock *accept_socket( struct sock *sock ) release_object( acceptsock ); return NULL; } + unix_len = sizeof(unix_addr); + if (!getsockname( acceptfd, &unix_addr.addr, &unix_len )) + acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) ); } clear_error(); sock->pending_events &= ~AFD_POLL_ACCEPT; @@ -1618,6 +1640,8 @@ static struct sock *accept_socket( struct sock *sock ) static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) { + union unix_sockaddr unix_addr; + socklen_t unix_len; int acceptfd; struct fd *newfd; @@ -1658,6 +1682,10 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) release_object( acceptsock->fd ); acceptsock->fd = newfd; + unix_len = sizeof(unix_addr); + if (!getsockname( get_unix_fd( newfd ), &unix_addr.addr, &unix_len )) + acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) ); + clear_error(); sock->pending_events &= ~AFD_POLL_ACCEPT; sock->reported_events &= ~AFD_POLL_ACCEPT; @@ -2075,8 +2103,10 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_WINE_CONNECT: { const struct afd_connect_params *params = get_req_data(); + union unix_sockaddr unix_addr; const struct sockaddr *addr; struct connect_req *req; + socklen_t unix_len; int send_len, ret; if (get_req_data_size() < sizeof(*params) || @@ -2118,6 +2148,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) /* a connected or connecting socket can no longer be accepted into */ allow_fd_caching( sock->fd ); + unix_len = sizeof(unix_addr); + if (!sock->bound && !getsockname( unix_fd, &unix_addr.addr, &unix_len )) + sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); + sock->bound = 1; + if (!ret) { sock->state = SOCK_CONNECTED; @@ -2351,7 +2386,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_BIND: { const struct afd_bind_params *params = get_req_data(); - union unix_sockaddr unix_addr; + union unix_sockaddr unix_addr, bind_addr; data_size_t in_size; socklen_t unix_len; @@ -2376,6 +2411,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_INVALID_ADDRESS ); return 0; } + bind_addr = unix_addr; if (unix_addr.addr.sa_family == WS_AF_INET) { @@ -2383,10 +2419,10 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ) || bind_to_interface( sock, &unix_addr.in )) - unix_addr.in.sin_addr.s_addr = htonl( INADDR_ANY ); + bind_addr.in.sin_addr.s_addr = htonl( INADDR_ANY ); } - if (bind( unix_fd, &unix_addr.addr, unix_len ) < 0) + if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) { if (errno == EADDRINUSE) { @@ -2398,10 +2434,40 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } set_error( sock_get_ntstatus( errno ) ); + return 1; } + + sock->bound = 1; + + unix_len = sizeof(bind_addr); + if (!getsockname( unix_fd, &bind_addr.addr, &unix_len )) + { + /* store the interface or magic loopback address instead of the + * actual unix address */ + if (bind_addr.addr.sa_family == AF_INET) + bind_addr.in.sin_addr = unix_addr.in.sin_addr; + sock->addr_len = sockaddr_from_unix( &bind_addr, &sock->addr.addr, sizeof(sock->addr) ); + } + return 1; } + case IOCTL_AFD_GETSOCKNAME: + if (!sock->bound) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (get_reply_max_size() < sock->addr_len) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &sock->addr, sock->addr_len ); + return 1; + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -2972,6 +3038,17 @@ DECL_HANDLER(send_socket) if (!sock) return; fd = sock->fd; + if (sock->type == WS_SOCK_DGRAM) + { + /* sendto() and sendmsg() implicitly binds a socket */ + union unix_sockaddr unix_addr; + socklen_t unix_len = sizeof(unix_addr); + + if (!sock->bound && !getsockname( get_unix_fd( fd ), &unix_addr.addr, &unix_len )) + sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); + sock->bound = 1; + } + if (status != STATUS_SUCCESS) { /* send() calls only clear and reselect events if unsuccessful. */

1 0

Zebediah Figura : server: Return the socket address from IOCTL_AFD_BIND.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: dd147ed65a70fd6fc125ddc0526e42d364434b99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd147ed65a70fd6fc125ddc0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:29 2021 -0500 server: Return the socket address from IOCTL_AFD_BIND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index e5acf585dcc..8cd3475d7b2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2449,6 +2449,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->addr_len = sockaddr_from_unix( &bind_addr, &sock->addr.addr, sizeof(sock->addr) ); } + if (get_reply_max_size() >= sock->addr_len) + set_reply_data( &sock->addr, sock->addr_len ); return 1; }

1 0

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 10bfe80ad5378756aa236219c20dbb1180019116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bfe80ad5378756aa236219… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:30 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME. 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 | 231 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10bfe80ad5378756aa23…

1 0

Zebediah Figura : server: Return STATUS_ADDRESS_ALREADY_ASSOCIATED from IOCTL_AFD_BIND if the socket is already bound.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: a997c3980f053159cac5a57e26a1df1a97a1f8c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a997c3980f053159cac5a57e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:31 2021 -0500 server: Return STATUS_ADDRESS_ALREADY_ASSOCIATED from IOCTL_AFD_BIND if the socket is already bound. 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 | 2 +- server/sock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d4633f7a8bb..eb4f0a42f8d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1407,7 +1407,7 @@ static void test_bind(void) ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, &params, sizeof(params), &addr, sizeof(addr)); - todo_wine ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); + ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); diff --git a/server/sock.c b/server/sock.c index 8cd3475d7b2..6b0c4af6b11 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2405,6 +2405,12 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + if (sock->bound) + { + set_error( STATUS_ADDRESS_ALREADY_ASSOCIATED ); + return 0; + } + unix_len = sockaddr_to_unix( &params->addr, in_size - sizeof(int), &unix_addr ); if (!unix_len) {

1 0

Zebediah Figura : ws2_32: Reimplement bind() and getsockname() on top of IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME respectively.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 5c009c17b3a212c3f5b0034c465077c0c593daae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c009c17b3a212c3f5b0034c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:32 2021 -0500 ws2_32: Reimplement bind() and getsockname() on top of IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME respectively. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 344 ++++++------------------------------------- dlls/ws2_32/tests/afd.c | 8 +- dlls/ws2_32/tests/sock.c | 2 +- dlls/ws2_32/ws2_32_private.h | 4 - 4 files changed, 54 insertions(+), 304 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c009c17b3a212c3f5b0…

1 0

Alexandre Julliard : ntdll: Don't allow single-stepping through syscalls.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 0702d6b8862b6817a994facb62ad7a00bf1d53ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0702d6b8862b6817a994facb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 14:56:36 2021 +0200 ntdll: Don't allow single-stepping through syscalls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51273 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 31 +++++++++++++++++++++++++++++++ tools/winebuild/import.c | 12 +++++++----- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 89f4fb4151c..d04935bb1b2 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1753,6 +1753,34 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, } +/*********************************************************************** + * handle_syscall_trap + * + * Handle a trap exception during a system call. + */ +static BOOL handle_syscall_trap( ucontext_t *sigcontext ) +{ + extern void __wine_syscall_dispatcher_prolog_end(void); + struct syscall_frame *frame = x86_thread_data()->syscall_frame; + + /* disallow single-stepping through a syscall */ + + if ((void *)EIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; + + TRACE( "ignoring trap in syscall eip=%08x eflags=%08x\n", EIP_sig(sigcontext), EFL_sig(sigcontext) ); + + frame->eip = *(ULONG *)ESP_sig( sigcontext ); + frame->eflags = EFL_sig(sigcontext); + frame->restore_flags = CONTEXT_CONTROL; + + EIP_sig( sigcontext ) = (ULONG)__wine_syscall_dispatcher_prolog_end; + ECX_sig( sigcontext ) = (ULONG)frame; + ESP_sig( sigcontext ) += sizeof(ULONG); + EFL_sig( sigcontext ) &= ~0x100; /* clear single-step flag */ + return TRUE; +} + + /********************************************************************** * segv_handler * @@ -1855,6 +1883,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *ucontext = sigcontext; void *stack = setup_exception_record( sigcontext, &rec, &xcontext ); + if (handle_syscall_trap( ucontext )) return; + switch (TRAP_sig(ucontext)) { case TRAP_x86_TRCTRAP: /* Single-step exception */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 10aa2a516b0..c36699589d9 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2202,6 +2202,35 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, } +/*********************************************************************** + * handle_syscall_trap + * + * Handle a trap exception during a system call. + */ +static BOOL handle_syscall_trap( ucontext_t *sigcontext ) +{ + extern void __wine_syscall_dispatcher_prolog_end(void); + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + + /* disallow single-stepping through a syscall */ + + if ((void *)RIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; + + TRACE( "ignoring trap in syscall rip=%p eflags=%08x\n", + (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); + + frame->rip = *(ULONG64 *)RSP_sig( sigcontext ); + frame->eflags = EFL_sig(sigcontext); + frame->restore_flags = CONTEXT_CONTROL; + + RIP_sig( sigcontext ) = (ULONG64)__wine_syscall_dispatcher_prolog_end; + RCX_sig( sigcontext ) = (ULONG64)frame; + RSP_sig( sigcontext ) += sizeof(ULONG64); + EFL_sig( sigcontext ) &= ~0x100; /* clear single-step flag */ + return TRUE; +} + + /********************************************************************** * segv_handler * @@ -2281,6 +2310,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct xcontext context; ucontext_t *ucontext = sigcontext; + if (handle_syscall_trap( sigcontext )) return; + rec.ExceptionAddress = (void *)RIP_sig(ucontext); save_context( &context, sigcontext ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f92c1b89c9c..a194ae50104 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1436,9 +1436,10 @@ static void output_syscall_dispatcher(void) output( "\tmovl %%fs:0x1f8,%%ecx\n" ); /* x86_thread_data()->syscall_frame */ output( "\tmovl $0,0x00(%%ecx)\n" ); /* frame->restore_flags */ output( "\tpopl 0x08(%%ecx)\n" ); /* frame->eip */ - output( "\tmovl %%esp,0x0c(%%ecx)\n" ); /* frame->esp */ output( "\tpushfl\n" ); output( "\tpopl 0x04(%%ecx)\n" ); /* frame->eflags */ + output( "%s\n", asm_globl("__wine_syscall_dispatcher_prolog_end") ); + output( "\tmovl %%esp,0x0c(%%ecx)\n" ); /* frame->esp */ output( "\tmovw %%cs,0x10(%%ecx)\n" ); output( "\tmovw %%ss,0x12(%%ecx)\n" ); output( "\tmovw %%ds,0x14(%%ecx)\n" ); @@ -1553,6 +1554,11 @@ static void output_syscall_dispatcher(void) case CPU_x86_64: output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq 0x328(%%rcx),%%rcx\n" ); /* amd64_thread_data()->syscall_frame */ + output( "\tpopq 0x70(%%rcx)\n" ); /* frame->rip */ + output( "\tpushfq\n" ); + output( "\tpopq 0x80(%%rcx)\n" ); + output( "\tmovl $0,0x94(%%rcx)\n" ); /* frame->restore_flags */ + output( "%s\n", asm_globl("__wine_syscall_dispatcher_prolog_end") ); output( "\tmovq %%rax,0x00(%%rcx)\n" ); output( "\tmovq %%rbx,0x08(%%rcx)\n" ); output( "\tmovq %%rdx,0x18(%%rcx)\n" ); @@ -1562,7 +1568,6 @@ static void output_syscall_dispatcher(void) output( "\tmovq %%r13,0x58(%%rcx)\n" ); output( "\tmovq %%r14,0x60(%%rcx)\n" ); output( "\tmovq %%r15,0x68(%%rcx)\n" ); - output( "\tpopq 0x70(%%rcx)\n" ); /* frame->rip */ output( "\tmovw %%cs,0x78(%%rcx)\n" ); output( "\tmovw %%ds,0x7a(%%rcx)\n" ); output( "\tmovw %%es,0x7c(%%rcx)\n" ); @@ -1570,10 +1575,7 @@ static void output_syscall_dispatcher(void) output( "\tmovq %%rsp,0x88(%%rcx)\n" ); output( "\tmovw %%ss,0x90(%%rcx)\n" ); output( "\tmovw %%gs,0x92(%%rcx)\n" ); - output( "\tmovl $0,0x94(%%rcx)\n" ); /* frame->restore_flags */ output( "\tmovq %%rbp,0x98(%%rcx)\n" ); - output( "\tpushfq\n" ); - output( "\tpopq 0x80(%%rcx)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x70(%%rcx)\n" );

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

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 : 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