December 2021 - Wine-Commits

Zebediah Figura : include: Add some structure size assertions.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 3821e0391733170906cca236a437422ee6cf40e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3821e0391733170906cca236… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:30 2021 -0600 include: Add some structure size assertions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b8bdcb9e5d..1d24c679c75 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -76,6 +76,7 @@ struct afd_bind_params int unknown; struct WS(sockaddr) addr; /* variable size */ }; +C_ASSERT( sizeof(struct afd_bind_params) == 20 ); struct afd_listen_params { @@ -83,6 +84,7 @@ struct afd_listen_params int backlog; int unknown2; }; +C_ASSERT( sizeof(struct afd_listen_params) == 12 ); #define AFD_RECV_FORCE_ASYNC 0x2 @@ -138,6 +140,7 @@ struct afd_get_events_params int flags; NTSTATUS status[13]; }; +C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); #define WINE_AFD_IOC(x) CTL_CODE(FILE_DEVICE_NETWORK, x, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -244,12 +247,14 @@ struct afd_create_params int family, type, protocol; unsigned int flags; }; +C_ASSERT( sizeof(struct afd_create_params) == 16 ); struct afd_accept_into_params { ULONG accept_handle; unsigned int recv_len, local_len; }; +C_ASSERT( sizeof(struct afd_accept_into_params) == 12 ); struct afd_connect_params { @@ -258,6 +263,7 @@ struct afd_connect_params /* VARARG(addr, struct WS(sockaddr), addr_len); */ /* VARARG(data, bytes); */ }; +C_ASSERT( sizeof(struct afd_connect_params) == 8 ); struct afd_recvmsg_params { @@ -297,10 +303,12 @@ struct afd_message_select_params unsigned int message; int mask; }; +C_ASSERT( sizeof(struct afd_message_select_params) == 16 ); struct afd_get_info_params { int family, type, protocol; }; +C_ASSERT( sizeof(struct afd_get_info_params) == 12 ); #endif

1 0

Zebediah Figura : ntdll: Handle WoW64 WSABUF pointers in sock_recv().
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: e3e860e53608cb6a24e971201a07351f22debf3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e860e53608cb6a24e97120… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:32 2021 -0600 ntdll: Handle WoW64 WSABUF pointers in sock_recv(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 38 ++++++++++++++++++++++++++++---------- include/wine/afd.h | 6 ++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 59551aa51e8..221e1bf303b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -595,7 +595,7 @@ static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) } static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - int fd, const WSABUF *buffers, unsigned int count, WSABUF *control, + int fd, const void *buffers_ptr, unsigned int count, WSABUF *control, struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; @@ -614,22 +614,31 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi return STATUS_INVALID_PARAMETER; } - for (i = 0; i < count; ++i) - { - if (!virtual_check_buffer_for_write( buffers[i].buf, buffers[i].len )) - return STATUS_ACCESS_VIOLATION; - } - async_size = offsetof( struct async_recv_ioctl, iov[count] ); if (!(async = (struct async_recv_ioctl *)alloc_fileio( async_size, async_recv_proc, handle ))) return STATUS_NO_MEMORY; async->count = count; - for (i = 0; i < count; ++i) + if (in_wow64_call()) { - async->iov[i].iov_base = buffers[i].buf; - async->iov[i].iov_len = buffers[i].len; + const struct afd_wsabuf_32 *buffers = buffers_ptr; + + for (i = 0; i < count; ++i) + { + async->iov[i].iov_base = ULongToPtr( buffers[i].buf ); + async->iov[i].iov_len = buffers[i].len; + } + } + else + { + const WSABUF *buffers = buffers_ptr; + + for (i = 0; i < count; ++i) + { + async->iov[i].iov_base = buffers[i].buf; + async->iov[i].iov_len = buffers[i].len; + } } async->unix_flags = unix_flags; async->control = control; @@ -637,6 +646,15 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi async->addr_len = addr_len; async->ret_flags = ret_flags; + for (i = 0; i < count; ++i) + { + if (!virtual_check_buffer_for_write( async->iov[i].iov_base, async->iov[i].iov_len )) + { + release_fileio( &async->io ); + return STATUS_ACCESS_VIOLATION; + } + } + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) diff --git a/include/wine/afd.h b/include/wine/afd.h index 1d24c679c75..60dd2806d9d 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -25,6 +25,12 @@ #include <winioctl.h> #include <mswsock.h> +struct afd_wsabuf_32 +{ + ULONG len; + ULONG buf; +}; + #ifdef USE_WS_PREFIX # define WS(x) WS_##x #else

1 0

Zebediah Figura : ntdll: Handle WoW64 translation in IOCTL_AFD_RECV.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: a0b57b9baa50981872bd94530829dffe8f56efc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b57b9baa50981872bd9453… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:33 2021 -0600 ntdll: Handle WoW64 translation in IOCTL_AFD_RECV. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 50 +++++++++++++++++++++++++++++++++--------------- include/wine/afd.h | 8 ++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 221e1bf303b..9cc9352403d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1278,7 +1278,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_RECV: { - const struct afd_recv_params *params = in_buffer; + struct afd_recv_params params; int unix_flags = 0; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -1286,33 +1286,53 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (out_size) FIXME( "unexpected output size %u\n", out_size ); - if (in_size < sizeof(struct afd_recv_params)) + if (in_wow64_call()) { - status = STATUS_INVALID_PARAMETER; - break; + const struct afd_recv_params_32 *params32 = in_buffer; + + if (in_size < sizeof(struct afd_recv_params_32)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + params.recv_flags = params32->recv_flags; + params.msg_flags = params32->msg_flags; + params.buffers = ULongToPtr( params32->buffers ); + params.count = params32->count; + } + else + { + if (in_size < sizeof(struct afd_recv_params)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + memcpy( &params, in_buffer, sizeof(params) ); } - if ((params->msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == 0 || - (params->msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) + if ((params.msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == 0 || + (params.msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) { status = STATUS_INVALID_PARAMETER; break; } - if (params->msg_flags & ~(AFD_MSG_NOT_OOB | AFD_MSG_OOB | AFD_MSG_PEEK | AFD_MSG_WAITALL)) - FIXME( "unknown msg_flags %#x\n", params->msg_flags ); - if (params->recv_flags & ~AFD_RECV_FORCE_ASYNC) - FIXME( "unknown recv_flags %#x\n", params->recv_flags ); + if (params.msg_flags & ~(AFD_MSG_NOT_OOB | AFD_MSG_OOB | AFD_MSG_PEEK | AFD_MSG_WAITALL)) + FIXME( "unknown msg_flags %#x\n", params.msg_flags ); + if (params.recv_flags & ~AFD_RECV_FORCE_ASYNC) + FIXME( "unknown recv_flags %#x\n", params.recv_flags ); - if (params->msg_flags & AFD_MSG_OOB) + if (params.msg_flags & AFD_MSG_OOB) unix_flags |= MSG_OOB; - if (params->msg_flags & AFD_MSG_PEEK) + if (params.msg_flags & AFD_MSG_PEEK) unix_flags |= MSG_PEEK; - if (params->msg_flags & AFD_MSG_WAITALL) + if (params.msg_flags & AFD_MSG_WAITALL) FIXME( "MSG_WAITALL is not supported\n" ); - status = sock_recv( handle, event, apc, apc_user, io, fd, params->buffers, params->count, NULL, - NULL, NULL, NULL, unix_flags, !!(params->recv_flags & AFD_RECV_FORCE_ASYNC) ); + status = sock_recv( handle, event, apc, apc_user, io, fd, params.buffers, params.count, NULL, + NULL, NULL, NULL, unix_flags, !!(params.recv_flags & AFD_RECV_FORCE_ASYNC) ); break; } diff --git a/include/wine/afd.h b/include/wine/afd.h index 60dd2806d9d..9d1af44f117 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -107,6 +107,14 @@ struct afd_recv_params int msg_flags; }; +struct afd_recv_params_32 +{ + ULONG buffers; + unsigned int count; + int recv_flags; + int msg_flags; +}; + #include <pshpack4.h> struct afd_poll_params {

1 0

Zebediah Figura : server: Rename the "flags" field of struct poll_req to "mask".
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 06fdbd6edafa106e3ad09a309f1660534ec71021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fdbd6edafa106e3ad09a30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:38 2021 -0600 server: Rename the "flags" field of struct poll_req to "mask". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/sock.c b/server/sock.c index 8521e34ed7e..d674d2a8f84 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,7 +128,7 @@ struct poll_req struct { struct sock *sock; - int flags; + int mask; } sockets[1]; }; @@ -862,13 +862,13 @@ static void complete_async_polls( struct sock *sock, int event, int error ) for (i = 0; i < req->count; ++i) { if (req->sockets[i].sock != sock) continue; - if (!(req->sockets[i].flags & flags)) continue; + if (!(req->sockets[i].mask & flags)) continue; if (debug_level) fprintf( stderr, "completing poll for socket %p, wanted %#x got %#x\n", - sock, req->sockets[i].flags, flags ); + sock, req->sockets[i].mask, flags ); - req->output[i].flags = req->sockets[i].flags & flags; + req->output[i].flags = req->sockets[i].mask & flags; req->output[i].status = sock_get_ntstatus( error ); complete_async_poll( req, STATUS_SUCCESS ); @@ -1220,7 +1220,7 @@ static int sock_get_poll_events( struct fd *fd ) { if (req->sockets[i].sock != sock) continue; - ev |= poll_flags_from_afd( sock, req->sockets[i].flags ); + ev |= poll_flags_from_afd( sock, req->sockets[i].mask ); } } @@ -2936,7 +2936,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus free( output ); return; } - req->sockets[i].flags = input[i].flags; + req->sockets[i].mask = input[i].flags; } req->exclusive = exclusive; @@ -2954,7 +2954,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus for (i = 0; i < count; ++i) { struct sock *sock = req->sockets[i].sock; - int mask = req->sockets[i].flags; + int mask = req->sockets[i].mask; int flags = poll_single_socket( sock, mask ); if (flags)

1 0

Zebediah Figura : ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 6fe23ed8c35afc155ff88bbde2fb03376e13b5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fe23ed8c35afc155ff88bbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:29 2021 -0600 ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- dlls/ws2_32/tests/afd.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e459087af76..51c92df57e3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5735,7 +5735,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_PENDING) io->u.Status = status; + if (status != STATUS_PENDING && !NT_ERROR(status)) io->u.Status = status; return status; } diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9e888f1fcb9..55029bfd30d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -688,7 +688,7 @@ static void test_poll(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); - todo_wine ok(!io.Status, "got %#x\n", io.Status); + ok(!io.Status, "got %#x\n", io.Status); ok(!io.Information, "got %#Ix\n", io.Information); /* Test passing the same handle twice. */ @@ -1201,7 +1201,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); todo_wine ok(ret == STATUS_INVALID_CONNECTION, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -1213,7 +1213,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); wsabufs[0].len = sizeof(buffer); @@ -1301,7 +1301,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_DEVICE_NOT_READY, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); ret = send(server, "data", 5, 0); @@ -1368,7 +1368,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB | AFD_MSG_NOT_OOB; @@ -1376,7 +1376,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB;

1 0

Zebediah Figura : server: Handle the entire IOCTL_AFD_POLL ioctl on the server side.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 4b00dd097de79be0a548f7d80b4c98ce8d9dbd20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b00dd097de79be0a548f7d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:39 2021 -0600 server: Handle the entire IOCTL_AFD_POLL ioctl on the server side. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 153 +--------------------------------- include/wine/afd.h | 30 ++++++- include/wine/server_protocol.h | 35 +------- server/protocol.def | 25 ------ server/request.h | 9 -- server/sock.c | 182 ++++++++++++++++++++++++++++++----------- server/trace.c | 50 ----------- 7 files changed, 167 insertions(+), 317 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b00dd097de79be0a548…

1 0

Zebediah Figura : ntdll: Make the afd_transmit_params structure WoW64-compatible.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 7747bf9551b753916054b6a01941a8fe58778ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7747bf9551b753916054b6a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:37 2021 -0600 ntdll: Make the afd_transmit_params structure WoW64-compatible. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 30 ++++++++++++++++++------------ dlls/ws2_32/socket.c | 12 +++++++++--- include/wine/afd.h | 10 +++++++--- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9b40dd30f25..20368ad6415 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -143,7 +143,10 @@ struct async_transmit_ioctl unsigned int tail_cursor; /* amount of tail data already sent */ unsigned int file_len; /* total file length to send */ DWORD flags; - TRANSMIT_FILE_BUFFERS buffers; + const char *head; + const char *tail; + unsigned int head_len; + unsigned int tail_len; LARGE_INTEGER offset; }; @@ -1090,11 +1093,11 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io { ssize_t ret; - while (async->head_cursor < async->buffers.HeadLength) + while (async->head_cursor < async->head_len) { - TRACE( "sending %u bytes of header data\n", async->buffers.HeadLength - async->head_cursor ); - ret = do_send( sock_fd, (char *)async->buffers.Head + async->head_cursor, - async->buffers.HeadLength - async->head_cursor, 0 ); + TRACE( "sending %u bytes of header data\n", async->head_len - async->head_cursor ); + ret = do_send( sock_fd, async->head + async->head_cursor, + async->head_len - async->head_cursor, 0 ); if (ret < 0) return sock_errno_to_status( errno ); TRACE( "send returned %zd\n", ret ); async->head_cursor += ret; @@ -1139,11 +1142,11 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io return STATUS_DEVICE_NOT_READY; /* still more data to send */ } - while (async->tail_cursor < async->buffers.TailLength) + while (async->tail_cursor < async->tail_len) { - TRACE( "sending %u bytes of tail data\n", async->buffers.TailLength - async->tail_cursor ); - ret = do_send( sock_fd, (char *)async->buffers.Tail + async->tail_cursor, - async->buffers.TailLength - async->tail_cursor, 0 ); + TRACE( "sending %u bytes of tail data\n", async->tail_len - async->tail_cursor ); + ret = do_send( sock_fd, async->tail + async->tail_cursor, + async->tail_len - async->tail_cursor, 0 ); if (ret < 0) return sock_errno_to_status( errno ); TRACE( "send returned %zd\n", ret ); async->tail_cursor += ret; @@ -1202,7 +1205,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, if (params->file) { - if ((status = server_get_unix_fd( params->file, 0, &file_fd, &file_needs_close, &file_type, NULL ))) + if ((status = server_get_unix_fd( ULongToHandle( params->file ), 0, &file_fd, &file_needs_close, &file_type, NULL ))) return status; if (file_needs_close) close( file_fd ); @@ -1216,7 +1219,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, if (!(async = (struct async_transmit_ioctl *)alloc_fileio( sizeof(*async), async_transmit_proc, handle ))) return STATUS_NO_MEMORY; - async->file = params->file; + async->file = ULongToHandle( params->file ); async->buffer_size = params->buffer_size ? params->buffer_size : 65536; if (!(async->buffer = malloc( async->buffer_size ))) { @@ -1230,7 +1233,10 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, async->tail_cursor = 0; async->file_len = params->file_len; async->flags = params->flags; - async->buffers = params->buffers; + async->head = u64_to_user_ptr(params->head_ptr); + async->head_len = params->head_len; + async->tail = u64_to_user_ptr(params->tail_ptr); + async->tail_len = params->tail_len; async->offset = params->offset; SERVER_START_REQ( send_socket ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e95a9669656..648284c10a3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -819,7 +819,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWORD buffer_size, OVERLAPPED *overlapped, TRANSMIT_FILE_BUFFERS *buffers, DWORD flags ) { - struct afd_transmit_params params = {0}; + struct afd_transmit_params params = {{{0}}}; IO_STATUS_BLOCK iosb, *piosb = &iosb; HANDLE event = NULL; void *cvalue = NULL; @@ -844,10 +844,16 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR params.offset.QuadPart = FILE_USE_FILE_POINTER_POSITION; } - params.file = file; + params.file = HandleToULong( file ); params.file_len = file_len; params.buffer_size = buffer_size; - if (buffers) params.buffers = *buffers; + if (buffers) + { + params.head_ptr = u64_from_user_ptr(buffers->Head); + params.head_len = buffers->HeadLength; + params.tail_ptr = u64_from_user_ptr(buffers->Tail); + params.tail_len = buffers->TailLength; + } params.flags = flags; status = NtDeviceIoControlFile( (HANDLE)s, event, NULL, cvalue, piosb, diff --git a/include/wine/afd.h b/include/wine/afd.h index ee67e255dd0..97128c67ca6 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -310,13 +310,17 @@ C_ASSERT( sizeof(struct afd_sendmsg_params) == 32 ); struct afd_transmit_params { - HANDLE file; + LARGE_INTEGER offset; + ULONGLONG head_ptr; + ULONGLONG tail_ptr; + DWORD head_len; + DWORD tail_len; + ULONG file; DWORD file_len; DWORD buffer_size; - LARGE_INTEGER offset; - TRANSMIT_FILE_BUFFERS buffers; DWORD flags; }; +C_ASSERT( sizeof(struct afd_transmit_params) == 48 ); struct afd_message_select_params {

1 0

Zebediah Figura : ntdll: Handle WoW64 translation in IOCTL_AFD_WINE_SENDMSG.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: b3fd1ca20e85dffdf3ffb60e96e012428e40aee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3fd1ca20e85dffdf3ffb60e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:36 2021 -0600 ntdll: Handle WoW64 translation in IOCTL_AFD_WINE_SENDMSG. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 27 +++++++++++++++++++++------ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 11 +++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 6b4b4a9b3f8..9b40dd30f25 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1003,7 +1003,7 @@ static BOOL async_send_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) } static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, int fd, const WSABUF *buffers, unsigned int count, + IO_STATUS_BLOCK *io, int fd, const void *buffers_ptr, unsigned int count, const struct WS_sockaddr *addr, unsigned int addr_len, int unix_flags, int force_async ) { struct async_send_ioctl *async; @@ -1019,10 +1019,25 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi return STATUS_NO_MEMORY; async->count = count; - for (i = 0; i < count; ++i) + if (in_wow64_call()) { - async->iov[i].iov_base = buffers[i].buf; - async->iov[i].iov_len = buffers[i].len; + const struct afd_wsabuf_32 *buffers = buffers_ptr; + + for (i = 0; i < count; ++i) + { + async->iov[i].iov_base = ULongToPtr( buffers[i].buf ); + async->iov[i].iov_len = buffers[i].len; + } + } + else + { + const WSABUF *buffers = buffers_ptr; + + for (i = 0; i < count; ++i) + { + async->iov[i].iov_base = buffers[i].buf; + async->iov[i].iov_len = buffers[i].len; + } } async->unix_flags = unix_flags; async->addr = addr; @@ -1463,8 +1478,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (params->ws_flags & ~(WS_MSG_OOB | WS_MSG_PARTIAL)) FIXME( "unknown flags %#x\n", params->ws_flags ); - status = sock_send( handle, event, apc, apc_user, io, fd, params->buffers, params->count, - params->addr, params->addr_len, unix_flags, params->force_async ); + status = sock_send( handle, event, apc, apc_user, io, fd, u64_to_user_ptr( params->buffers_ptr ), params->count, + u64_to_user_ptr( params->addr_ptr ), params->addr_len, unix_flags, params->force_async ); break; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 33df823b213..e95a9669656 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -992,12 +992,12 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret apc = socket_apc; } - params.addr = addr; + params.addr_ptr = u64_from_user_ptr( addr ); params.addr_len = addr_len; params.ws_flags = flags; params.force_async = !!overlapped; params.count = buffer_count; - params.buffers = buffers; + params.buffers_ptr = u64_from_user_ptr( buffers ); status = NtDeviceIoControlFile( (HANDLE)s, event, apc, cvalue, piosb, IOCTL_AFD_WINE_SENDMSG, &params, sizeof(params), NULL, 0 ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 7db429c2b79..ee67e255dd0 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -256,6 +256,12 @@ C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +struct afd_iovec +{ + ULONGLONG ptr; + ULONG len; +}; + struct afd_create_params { int family, type, protocol; @@ -293,13 +299,14 @@ C_ASSERT( sizeof(struct afd_recvmsg_params) == 48 ); struct afd_sendmsg_params { - const struct WS(sockaddr) *addr; + ULONGLONG addr_ptr; /* const struct WS(sockaddr) */ unsigned int addr_len; unsigned int ws_flags; int force_async; unsigned int count; - const WSABUF *buffers; + ULONGLONG buffers_ptr; /* const WSABUF[] */ }; +C_ASSERT( sizeof(struct afd_sendmsg_params) == 32 ); struct afd_transmit_params {

1 0

Zebediah Figura : ntdll: Make the afd_recvmsg_params structure WoW64-compatible.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 6697759b991bdf5b08099c4414133e38aad06e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6697759b991bdf5b08099c44… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:35 2021 -0600 ntdll: Make the afd_recvmsg_params structure WoW64-compatible. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 15 ++++++++++----- dlls/ws2_32/socket.c | 12 +++++++----- include/wine/afd.h | 11 ++++++----- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index b988253c67a..6b4b4a9b3f8 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -91,6 +91,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); +#define u64_to_user_ptr(u) ((void *)(uintptr_t)(u)) + union unix_sockaddr { struct sockaddr addr; @@ -1414,6 +1416,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_RECVMSG: { struct afd_recvmsg_params *params = in_buffer; + unsigned int *ws_flags = u64_to_user_ptr(params->ws_flags_ptr); int unix_flags = 0; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -1425,15 +1428,17 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } - if (*params->ws_flags & WS_MSG_OOB) + if (*ws_flags & WS_MSG_OOB) unix_flags |= MSG_OOB; - if (*params->ws_flags & WS_MSG_PEEK) + if (*ws_flags & WS_MSG_PEEK) unix_flags |= MSG_PEEK; - if (*params->ws_flags & WS_MSG_WAITALL) + if (*ws_flags & WS_MSG_WAITALL) FIXME( "MSG_WAITALL is not supported\n" ); - status = sock_recv( handle, event, apc, apc_user, io, fd, params->buffers, params->count, params->control, - params->addr, params->addr_len, params->ws_flags, unix_flags, params->force_async ); + status = sock_recv( handle, event, apc, apc_user, io, fd, u64_to_user_ptr(params->buffers_ptr), + params->count, u64_to_user_ptr(params->control_ptr), + u64_to_user_ptr(params->addr_ptr), u64_to_user_ptr(params->addr_len_ptr), + ws_flags, unix_flags, params->force_async ); break; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..33df823b213 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -35,6 +35,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define TIMEOUT_INFINITE _I64_MAX +#define u64_from_user_ptr(ptr) ((ULONGLONG)(uintptr_t)(ptr)) + static const WSAPROTOCOL_INFOW supported_protocols[] = { { @@ -923,13 +925,13 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * apc = socket_apc; } - params.control = control; - params.addr = addr; - params.addr_len = addr_len; - params.ws_flags = flags; + params.control_ptr = u64_from_user_ptr(control); + params.addr_ptr = u64_from_user_ptr(addr); + params.addr_len_ptr = u64_from_user_ptr(addr_len); + params.ws_flags_ptr = u64_from_user_ptr(flags); params.force_async = !!overlapped; params.count = buffer_count; - params.buffers = buffers; + params.buffers_ptr = u64_from_user_ptr(buffers); status = NtDeviceIoControlFile( (HANDLE)s, event, apc, cvalue, piosb, IOCTL_AFD_WINE_RECVMSG, &params, sizeof(params), NULL, 0 ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 9d1af44f117..7db429c2b79 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -281,14 +281,15 @@ C_ASSERT( sizeof(struct afd_connect_params) == 8 ); struct afd_recvmsg_params { - WSABUF *control; - struct WS(sockaddr) *addr; - int *addr_len; - unsigned int *ws_flags; + ULONGLONG control_ptr; /* WSABUF */ + ULONGLONG addr_ptr; /* WS(sockaddr) */ + ULONGLONG addr_len_ptr; /* int */ + ULONGLONG ws_flags_ptr; /* unsigned int */ int force_async; unsigned int count; - WSABUF *buffers; + ULONGLONG buffers_ptr; /* WSABUF[] */ }; +C_ASSERT( sizeof(struct afd_recvmsg_params) == 48 ); struct afd_sendmsg_params {

1 0

Zebediah Figura : ntdll: Handle WoW64 control message translation.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 737f6952da43320e6470f6e99e9338146c5c8129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737f6952da43320e6470f6e9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:34 2021 -0600 ntdll: Handle WoW64 control message translation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 99 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 87 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9cc9352403d..b988253c67a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -107,7 +107,7 @@ union unix_sockaddr struct async_recv_ioctl { struct async_fileio io; - WSABUF *control; + void *control; struct WS_sockaddr *addr; int *addr_len; DWORD *ret_flags; @@ -504,8 +504,62 @@ error: control->len = 0; return 0; } +#else +static int convert_control_headers(struct msghdr *hdr, WSABUF *control) +{ + ERR( "Message control headers cannot be properly supported on this system.\n" ); + control->len = 0; + return 0; +} #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ +struct cmsghdr_32 +{ + ULONG cmsg_len; + INT cmsg_level; + INT cmsg_type; + /* UCHAR cmsg_data[]; */ +}; + +static size_t cmsg_align_32( size_t len ) +{ + return (len + sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1); +} + +/* we assume that cmsg_data does not require translation, which is currently + * true for all messages */ +static int wow64_translate_control( const WSABUF *control64, struct afd_wsabuf_32 *control32 ) +{ + char *const buf32 = ULongToPtr(control32->buf); + const ULONG max_len = control32->len; + const char *ptr64 = control64->buf; + char *ptr32 = buf32; + + while (ptr64 < control64->buf + control64->len) + { + struct cmsghdr_32 *cmsg32 = (struct cmsghdr_32 *)ptr32; + const WSACMSGHDR *cmsg64 = (const WSACMSGHDR *)ptr64; + + if (ptr32 + sizeof(*cmsg32) + cmsg_align_32( cmsg64->cmsg_len ) > buf32 + max_len) + { + control32->len = 0; + return 0; + } + + cmsg32->cmsg_len = cmsg64->cmsg_len - sizeof(*cmsg64) + sizeof(*cmsg32); + cmsg32->cmsg_level = cmsg64->cmsg_level; + cmsg32->cmsg_type = cmsg64->cmsg_type; + memcpy( cmsg32 + 1, cmsg64 + 1, cmsg64->cmsg_len ); + + ptr64 += WSA_CMSG_ALIGN( cmsg64->cmsg_len ); + ptr32 += cmsg_align_32( cmsg32->cmsg_len ); + } + + control32->len = ptr32 - buf32; + FIXME("-> %d\n", control32->len); + return 1; +} + static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *size ) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -543,20 +597,41 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz status = (hdr.msg_flags & MSG_TRUNC) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS if (async->control) { - ERR( "Message control headers cannot be properly supported on this system.\n" ); - async->control->len = 0; - } -#else - if (async->control && !convert_control_headers( &hdr, async->control )) - { - WARN( "Application passed insufficient room for control headers.\n" ); - *async->ret_flags |= WS_MSG_CTRUNC; - status = STATUS_BUFFER_OVERFLOW; + if (in_wow64_call()) + { + char control_buffer64[512]; + WSABUF wsabuf; + + wsabuf.len = sizeof(control_buffer64); + wsabuf.buf = control_buffer64; + if (convert_control_headers( &hdr, &wsabuf )) + { + if (!wow64_translate_control( &wsabuf, async->control )) + { + WARN( "Application passed insufficient room for control headers.\n" ); + *async->ret_flags |= WS_MSG_CTRUNC; + status = STATUS_BUFFER_OVERFLOW; + } + } + else + { + FIXME( "control buffer is too small\n" ); + *async->ret_flags |= WS_MSG_CTRUNC; + status = STATUS_BUFFER_OVERFLOW; + } + } + else + { + if (!convert_control_headers( &hdr, async->control )) + { + WARN( "Application passed insufficient room for control headers.\n" ); + *async->ret_flags |= WS_MSG_CTRUNC; + status = STATUS_BUFFER_OVERFLOW; + } + } } -#endif /* If this socket is connected, Linux doesn't give us msg_name and * msg_namelen from recvmsg, but it does set msg_namelen to zero.

1 0