March 2022 - Wine-commits - list.winehq.org

Jinoh Kang : server: Ensure datagram sockets are bound in send_socket.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 0ac256eacc9cd67d689bdc0956315670cd60dfbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac256eacc9cd67d689bdc09… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Mar 24 02:25:20 2022 +0900 server: Ensure datagram sockets are bound in send_socket. If the type of the socket is SOCK_DGRAM, it shall always be bound to an address if we ever attempt to send datagrams through the socket, whether the attempt succeeds or not. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1beff85cbe0..e3779940174 100644 --- a/server/sock.c +++ b/server/sock.c @@ -471,6 +471,32 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl } } +static socklen_t get_unix_sockaddr_any( union unix_sockaddr *uaddr, int ws_family ) +{ + memset( uaddr, 0, sizeof(*uaddr) ); + switch (ws_family) + { + case WS_AF_INET: + uaddr->in.sin_family = AF_INET; + return sizeof(uaddr->in); + case WS_AF_INET6: + uaddr->in6.sin6_family = AF_INET6; + return sizeof(uaddr->in6); +#ifdef HAS_IPX + case WS_AF_IPX: + uaddr->ipx.sipx_family = AF_IPX; + return sizeof(uaddr->ipx); +#endif +#ifdef HAS_IRDA + case WS_AF_IRDA: + uaddr->irda.sir_family = AF_IRDA; + return sizeof(uaddr->irda); +#endif + default: + return 0; + } +} + /* some events are generated at the same time but must be sent in a particular * order (e.g. CONNECT must be sent before READ) */ static const enum afd_poll_bit event_bitorder[] = @@ -3490,15 +3516,24 @@ DECL_HANDLER(send_socket) if (!sock) return; fd = sock->fd; - if (sock->type == WS_SOCK_DGRAM) + if (sock->type == WS_SOCK_DGRAM && !sock->bound) { - /* sendto() and sendmsg() implicitly binds a socket */ union unix_sockaddr unix_addr; - socklen_t unix_len = sizeof(unix_addr); + socklen_t unix_len; + int bind_errno = 0; + int unix_fd = get_unix_fd( fd ); - if (!sock->bound && !getsockname( get_unix_fd( fd ), &unix_addr.addr, &unix_len )) + unix_len = get_unix_sockaddr_any( &unix_addr, sock->family ); + if (bind( unix_fd, &unix_addr.addr, unix_len ) < 0) + bind_errno = errno; + + if (getsockname( unix_fd, &unix_addr.addr, &unix_len ) >= 0) + { sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); - sock->bound = 1; + sock->bound = 1; + } + else if (status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) + status = sock_get_ntstatus( bind_errno ? bind_errno : errno ); } /* If we had a short write and the socket is nonblocking (and the client is

1 0

Jinoh Kang : ntdll: Don't call try_send before server call in sock_send.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 74059d12b83e9f6d6fd64556ba11d7b5331d5d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74059d12b83e9f6d6fd64556… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Mar 24 02:25:25 2022 +0900 ntdll: Don't call try_send before server call in sock_send. Otherwise, try_send() call from sock_send() may race against try_send() call from async_send_proc(), shuffling the packet order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52401 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 13 ++----------- dlls/ws2_32/tests/sock.c | 14 +++++++------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 62920a7e557..8e5a1825181 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -908,21 +908,12 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi async->iov_cursor = 0; async->sent_len = 0; - status = try_send( fd, async ); - - if (status != STATUS_SUCCESS && status != STATUS_DEVICE_NOT_READY) - { - release_fileio( &async->io ); - return status; - } - - if (status == STATUS_DEVICE_NOT_READY && force_async) - status = STATUS_PENDING; + status = force_async ? STATUS_PENDING : STATUS_DEVICE_NOT_READY; SERVER_START_REQ( send_socket ) { req->status = status; - req->total = async->sent_len; + req->total = 0; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cc74e301f60..d501930b32d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8010,7 +8010,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); ret = recv(server, buffer, sizeof(buffer), 0); ok(!ret, "got %d\n", ret); @@ -8057,7 +8057,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = send(server, "test", 5, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); addrlen = sizeof(addr); ret = getpeername(client, (struct sockaddr *)&addr, &addrlen); @@ -8107,7 +8107,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); ret = recv(server, buffer, sizeof(buffer), 0); ok(!ret, "got %d\n", ret); @@ -8125,7 +8125,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = send(server, "test", 5, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); addrlen = sizeof(addr); ret = getpeername(client, (struct sockaddr *)&addr, &addrlen); @@ -8256,7 +8256,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = sendto(client, "test", 5, 0, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); closesocket(client); closesocket(server); @@ -8337,7 +8337,7 @@ static void test_DisconnectEx(void) WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); ret = recv(server, buffer, sizeof(buffer), 0); ok(!ret, "got %d\n", ret); @@ -8391,7 +8391,7 @@ static void test_DisconnectEx(void) WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); ret = recv(server, buffer, sizeof(buffer), 0); ok(!ret, "got %d\n", ret);

1 0

Jinoh Kang : server: Replace redundant send_socket status fields with force_async boolean field.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 731a96800308ff9f4a1616c948bb58f6d5ecef9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=731a96800308ff9f4a1616c9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Mar 24 02:25:28 2022 +0900 server: Replace redundant send_socket status fields with force_async boolean field. The 'status' field of send_socket_request is always either STATUS_PENDING or STATUS_DEVICE_NOT_READY, and the 'total' field is always zero. Replace the 'status' field with 'force_async' boolean field, and get rid of the 'total' field entirely. Also, clean up the send_socket handler code a bit. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 8 ++------ include/wine/server_protocol.h | 6 +++--- server/protocol.def | 3 +-- server/request.h | 3 +-- server/sock.c | 41 +++++++++++------------------------------ server/trace.c | 3 +-- 6 files changed, 19 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8e5a1825181..351028d4983 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -908,12 +908,9 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi async->iov_cursor = 0; async->sent_len = 0; - status = force_async ? STATUS_PENDING : STATUS_DEVICE_NOT_READY; - SERVER_START_REQ( send_socket ) { - req->status = status; - req->total = 0; + req->force_async = force_async; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); @@ -1116,8 +1113,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, SERVER_START_REQ( send_socket ) { - req->status = STATUS_PENDING; - req->total = 0; + req->force_async = 1; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b3a5d3ef3d5..6cd901f1e56 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1783,8 +1783,8 @@ struct send_socket_request struct request_header __header; char __pad_12[4]; async_data_t async; - unsigned int status; - unsigned int total; + int force_async; + char __pad_60[4]; }; struct send_socket_reply { @@ -6286,7 +6286,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 748 +#define SERVER_PROTOCOL_VERSION 749 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 81b44aefd7c..d9bed6855e9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1462,8 +1462,7 @@ enum server_fd_type /* Perform a send on a socket */ @REQ(send_socket) async_data_t async; /* async I/O parameters */ - unsigned int status; /* status of initial call */ - unsigned int total; /* number of bytes already sent */ + int force_async; /* Force asynchronous mode? */ @REPLY obj_handle_t wait; /* handle to wait on for blocking send */ unsigned int options; /* device open options */ diff --git a/server/request.h b/server/request.h index 32929c146a0..ca99acbdbf6 100644 --- a/server/request.h +++ b/server/request.h @@ -1051,8 +1051,7 @@ C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, nonblocking) == 16 ); C_ASSERT( sizeof(struct recv_socket_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, async) == 16 ); -C_ASSERT( FIELD_OFFSET(struct send_socket_request, status) == 56 ); -C_ASSERT( FIELD_OFFSET(struct send_socket_request, total) == 60 ); +C_ASSERT( FIELD_OFFSET(struct send_socket_request, force_async) == 56 ); C_ASSERT( sizeof(struct send_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct send_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct send_socket_reply, options) == 12 ); diff --git a/server/sock.c b/server/sock.c index e3779940174..b403541fcbf 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3508,10 +3508,11 @@ static void send_socket_completion_callback( void *private ) DECL_HANDLER(send_socket) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); - unsigned int status = req->status; + unsigned int status = STATUS_PENDING; timeout_t timeout = 0; struct async *async; struct fd *fd; + int bind_errno = 0; if (!sock) return; fd = sock->fd; @@ -3520,7 +3521,6 @@ DECL_HANDLER(send_socket) { union unix_sockaddr unix_addr; socklen_t unix_len; - int bind_errno = 0; int unix_fd = get_unix_fd( fd ); unix_len = get_unix_sockaddr_any( &unix_addr, sock->family ); @@ -3532,36 +3532,15 @@ DECL_HANDLER(send_socket) sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); sock->bound = 1; } - else if (status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) - status = sock_get_ntstatus( bind_errno ? bind_errno : errno ); + else if (!bind_errno) bind_errno = errno; } - /* If we had a short write and the socket is nonblocking (and the client is - * not trying to force the operation to be asynchronous), return success. - * Windows actually refuses to send any data in this case, and returns - * EWOULDBLOCK, but we have no way of doing that. */ - if (status == STATUS_DEVICE_NOT_READY && req->total && sock->nonblocking) - status = STATUS_SUCCESS; - - /* send() returned EWOULDBLOCK or a short write, i.e. cannot send all data yet */ - if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) - { - /* Set a timeout on the async if necessary. - * - * We want to do this *only* if the client gave us STATUS_DEVICE_NOT_READY. - * If the client gave us STATUS_PENDING, it expects the async to always - * block (it was triggered by WSASend*() with a valid OVERLAPPED - * structure) and for the timeout not to be respected. */ - if (is_fd_overlapped( fd )) - timeout = (timeout_t)sock->sndtimeo * -10000; - - status = STATUS_PENDING; - } - - if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && sock->wr_shutdown) - status = STATUS_PIPE_DISCONNECTED; + if (!req->force_async && !sock->nonblocking && is_fd_overlapped( fd )) + timeout = (timeout_t)sock->sndtimeo * -10000; - if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && !async_queued( &sock->write_q )) + if (bind_errno) status = sock_get_ntstatus( bind_errno ); + else if (sock->wr_shutdown) status = STATUS_PIPE_DISCONNECTED; + else if (!async_queued( &sock->write_q )) { /* If write_q is not empty, we cannot really tell if the already queued * asyncs will not consume all available space; if there's no space @@ -3580,6 +3559,9 @@ DECL_HANDLER(send_socket) } } + if (status == STATUS_PENDING && !req->force_async && sock->nonblocking) + status = STATUS_DEVICE_NOT_READY; + if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) { struct send_req *send_req; @@ -3594,7 +3576,6 @@ DECL_HANDLER(send_socket) else if (status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) status = STATUS_NO_MEMORY; - if (status == STATUS_SUCCESS) iosb->result = req->total; release_object( iosb ); set_error( status ); diff --git a/server/trace.c b/server/trace.c index 8653755e8a6..a792b74dc05 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2045,8 +2045,7 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) static void dump_send_socket_request( const struct send_socket_request *req ) { dump_async_data( " async=", &req->async ); - fprintf( stderr, ", status=%08x", req->status ); - fprintf( stderr, ", total=%08x", req->total ); + fprintf( stderr, ", force_async=%d", req->force_async ); } static void dump_send_socket_reply( const struct send_socket_reply *req )

1 0

Eric Pouech : conhost: Correctly recompute start of edit line on ReadConsole.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 9198ca27d09c68c4e1f2bac4e0b9867632ee5ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9198ca27d09c68c4e1f2bac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 14:46:40 2022 +0100 conhost: Correctly recompute start of edit line on ReadConsole. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 11e97993fd8..461adc05bcc 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1426,8 +1426,8 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ if (offset > ctx->home_x) { int deltay; - offset -= ctx->home_x; - deltay = offset / console->active->width; + offset -= ctx->home_x + 1; + deltay = offset / console->active->width + 1; if (ctx->home_y >= deltay) ctx->home_y -= deltay; else

1 0

Eric Pouech : conhost: Support relative cursor positioning.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: bb05f13fd85543394c5b33011d69b8993a1d67b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb05f13fd85543394c5b3301… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 14:46:46 2022 +0100 conhost: Support relative cursor positioning. Also add fallback method when legacy console APIs where used. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 18 ++++++++++++++++++ programs/conhost/conhost.h | 1 + 2 files changed, 19 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 461adc05bcc..d494e3f53a5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -328,6 +328,12 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } +/* no longer use relative cursor positionning (legacy API have been used) */ +static void enter_absolute_mode( struct console *console ) +{ + console->use_relative_cursor = 0; +} + static void scroll_to_cursor( struct screen_buffer *screen_buffer ) { unsigned int cursor_x = get_bounded_cursor_x( screen_buffer ); @@ -1920,13 +1926,17 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, if (screen_buffer->cursor_x != info->cursor_x || screen_buffer->cursor_y != info->cursor_y) { + struct console *console = screen_buffer->console; screen_buffer->cursor_x = info->cursor_x; screen_buffer->cursor_y = info->cursor_y; + if (console->use_relative_cursor) + set_tty_cursor_relative( console, screen_buffer->cursor_x, screen_buffer->cursor_y ); scroll_to_cursor( screen_buffer ); } } if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) { + enter_absolute_mode( screen_buffer->console ); /* new screen-buffer cannot be smaller than actual window */ if (info->width < screen_buffer->win.right - screen_buffer->win.left + 1 || info->height < screen_buffer->win.bottom - screen_buffer->win.top + 1) @@ -1962,6 +1972,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, } if (params->mask & SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW) { + enter_absolute_mode( screen_buffer->console ); if (info->win_left < 0 || info->win_left > info->win_right || info->win_right >= screen_buffer->width || info->win_top < 0 || info->win_top > info->win_bottom || @@ -1980,6 +1991,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, } if (params->mask & SET_CONSOLE_OUTPUT_INFO_MAX_SIZE) { + enter_absolute_mode( screen_buffer->console ); screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } @@ -2085,6 +2097,7 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct char_info_t *dest; char *src; + enter_absolute_mode( screen_buffer->console ); if (*out_size == sizeof(SMALL_RECT) && !params->width) return STATUS_INVALID_PARAMETER; entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); @@ -2187,6 +2200,7 @@ static NTSTATUS read_output( struct screen_buffer *screen_buffer, const struct c unsigned int x, y, width; unsigned int i, count; + enter_absolute_mode( screen_buffer->console ); x = params->x; y = params->y; mode = params->mode; @@ -2265,6 +2279,7 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c TRACE( "(%u %u) mode %u\n", params->x, params->y, params->mode ); + enter_absolute_mode( screen_buffer->console ); if (params->y >= screen_buffer->height) return STATUS_SUCCESS; dest = screen_buffer->data + min( params->y * screen_buffer->width + params->x, screen_buffer->height * screen_buffer->width ); @@ -2318,6 +2333,7 @@ static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct RECT update_rect; SMALL_RECT clip; + enter_absolute_mode( screen_buffer->console ); xsrc = params->scroll.Left; ysrc = params->scroll.Top; w = params->scroll.Right - params->scroll.Left + 1; @@ -2736,6 +2752,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) if (code == IOCTL_CONDRV_INIT_OUTPUT) { TRACE( "initializing output %x\n", output ); + enter_absolute_mode( console ); if (console->active) create_screen_buffer( console, output, console->active->width, console->active->height ); else @@ -2862,6 +2879,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!wcscmp( argv[i], L"--unix")) { console.is_unix = 1; + console.use_relative_cursor = 1; headless = 1; continue; } diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 35876689419..8ca09bb80d0 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -78,6 +78,7 @@ struct console unsigned int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ int is_unix; /* UNIX terminal mode */ + int use_relative_cursor; /* use relative cursor positionning */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */

1 0

Alexandre Julliard : Release 7.5.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 4bbb43d6c7ee824ff533628020c6309c4ff86c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbb43d6c7ee824ff5336280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 21:26:21 2022 +0100 Release 7.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1044 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 467 insertions(+), 598 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4bbb43d6c7ee824ff533…

1 0

Alexandre Julliard : configure: Try to detect a C99 flag for the cross compiler.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 0aa31b735cc18dbc643cb9ab2849223ae0e89ad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa31b735cc18dbc643cb9ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 11:18:37 2022 +0100 configure: Try to detect a C99 flag for the cross compiler. Similar to what AC_PROC_CC does for the host compiler. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52723 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 35 +++++++++++++++++++++++++++++++++++ configure.ac | 17 +++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/configure b/configure index 6a3a43a9e97..b2bec4e5b6d 100755 --- a/configure +++ b/configure @@ -10707,6 +10707,41 @@ then : CFLAGS="$CFLAGS $llvm_cflags" fi fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CROSSCC option to enable C99 features" >&5 +printf %s "checking for $CROSSCC option to enable C99 features... " >&6; } + if test ${wine_cv_crosscc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + wine_cv_crosscc_c99=no + for arg in '' '-std=gnu99' + do + CC="$CROSSCC $arg" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + wine_cv_crosscc_c99=$arg +else $as_nop + wine_cv_crosscc_c99=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test "x$wine_cv_crosscc_c99" != xno && break + done +fi + + case "x$wine_cv_crosscc_c99" in + x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } ;; + xno) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } ;; + x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_crosscc_c99" >&5 +printf "%s\n" "$wine_cv_crosscc_c99" >&6; } + CROSSCC="$CROSSCC $wine_cv_crosscc_c99" ;; + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 printf %s "checking whether the cross-compiler supports -fno-strict-aliasing... " >&6; } if test ${ac_cv_crosscflags__fno_strict_aliasing+y} diff --git a/configure.ac b/configure.ac index 5a85fce12a4..e509b232d11 100644 --- a/configure.ac +++ b/configure.ac @@ -913,6 +913,23 @@ then AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"]) CFLAGS="$CFLAGS $llvm_cflags"]) fi + AC_MSG_CHECKING([for $CROSSCC option to enable C99 features]) + AC_CACHE_VAL([wine_cv_crosscc_c99], + [wine_cv_crosscc_c99=no + for arg in '' '-std=gnu99' + do + CC="$CROSSCC $arg" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([$ac_c_conftest_c99_program])], + [wine_cv_crosscc_c99=$arg],[wine_cv_crosscc_c99=no]) + test "x$wine_cv_crosscc_c99" != xno && break + done]) + case "x$wine_cv_crosscc_c99" in + x) AC_MSG_RESULT([none needed]) ;; + xno) AC_MSG_RESULT([unsupported]) ;; + x*) AC_MSG_RESULT([$wine_cv_crosscc_c99]) + CROSSCC="$CROSSCC $wine_cv_crosscc_c99" ;; + esac + WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])

1 0

Huw Davies : winealsa: Introduce a helper to retrieve the time.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: be6004f895ef82e5bf7fb3bef6da212c4552cf81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6004f895ef82e5bf7fb3be… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 08:42:14 2022 +0000 winealsa: Introduce a helper to retrieve the time. The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 30c46eee64d..1633268b533 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include <stdio.h> #include <pthread.h> +#include <time.h> #include <alsa/asoundlib.h> #include "ntstatus.h" @@ -104,6 +105,18 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } +static uint64_t get_time_msec(void) +{ + struct timespec now = {0, 0}; + +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime(CLOCK_MONOTONIC_RAW, &now)) + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +#endif + clock_gettime(CLOCK_MONOTONIC, &now); + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -924,7 +937,7 @@ static UINT midi_out_reset(WORD dev_id) static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) { - UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + UINT pos = 0, copy_len, current_time = get_time_msec() - src->startTime; struct notify_context notify; MIDIHDR *hdr; @@ -957,7 +970,7 @@ static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) { - UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + UINT data = 0, value, current_time = get_time_msec() - src->startTime; struct notify_context notify; switch (ev->type) @@ -1127,7 +1140,7 @@ static UINT midi_in_start(WORD dev_id) if (src->state == -1) return MIDIERR_NODEVICE; src->state = 1; - src->startTime = NtGetTickCount(); + src->startTime = get_time_msec(); return MMSYSERR_NOERROR; } @@ -1147,7 +1160,7 @@ static UINT midi_in_stop(WORD dev_id) static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { - UINT cur_time = NtGetTickCount(); + UINT cur_time = get_time_msec(); UINT err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr;

1 0

Huw Davies : winealsa: Allocate the pollfd array at the start.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 048a8c3346d19076bcfd5b5ccb0e944d137e48a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048a8c3346d19076bcfd5b5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 08:42:15 2022 +0000 winealsa: Allocate the pollfd array at the start. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 8009b23ce3d..4cc906b03ca 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -158,33 +158,21 @@ static int midiCloseSeq(void) static DWORD WINAPI midRecThread(void *arg) { snd_seq_t *midi_seq = arg; - int npfd; - struct pollfd *pfd; + int num_fds; + struct pollfd *pollfd; int ret; - TRACE("Thread startup\n"); + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + pollfd = malloc(num_fds * sizeof(struct pollfd)); while(!end_thread) { - TRACE("Thread loop\n"); seq_lock(); - npfd = snd_seq_poll_descriptors_count(midi_seq, POLLIN); - pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd)); - snd_seq_poll_descriptors(midi_seq, pfd, npfd, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pfd, npfd, 250) <= 0) { - HeapFree(GetProcessHeap(), 0, pfd); - continue; - } - - /* Note: This definitely does not work. - * while(snd_seq_event_input_pending(midi_seq, 0) > 0) { - snd_seq_event_t* ev; - snd_seq_event_input(midi_seq, &ev); - .................... - snd_seq_free_event(ev); - }*/ + if (poll(pollfd, num_fds, 250) <= 0) + continue; do { snd_seq_event_t *ev; @@ -202,9 +190,9 @@ static DWORD WINAPI midRecThread(void *arg) ret = snd_seq_event_input_pending(midi_seq, 0); seq_unlock(); } while(ret > 0); - - HeapFree(GetProcessHeap(), 0, pfd); } + + free(pollfd); return 0; }

1 0

Huw Davies : winealsa: Use a pipe to signal the end of the record thread.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 32746a292d6c20c749ffbc877b1fc8185abce251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32746a292d6c20c749ffbc87… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 08:42:16 2022 +0000 winealsa: Use a pipe to signal the end of the record thread. This means the thread doesn't have to wake every 250ms to test "end_thread". Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4cc906b03ca..327d4b7b200 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,7 +54,7 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static int end_thread; +static int rec_cancel_pipe[2]; static HANDLE hThread; static void seq_lock(void) @@ -162,18 +162,25 @@ static DWORD WINAPI midRecThread(void *arg) struct pollfd *pollfd; int ret; - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; pollfd = malloc(num_fds * sizeof(struct pollfd)); - while(!end_thread) { + while(1) { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pollfd, num_fds, 250) <= 0) + if (poll(pollfd, num_fds, -1) <= 0) continue; + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + do { snd_seq_event_t *ev; @@ -259,9 +266,11 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { - end_thread = 0; + pipe(rec_cancel_pipe); hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); if (!hThread) { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); midiCloseSeq(); @@ -302,11 +311,13 @@ static DWORD midClose(WORD wDevID) } if (--numStartedMidiIn == 0) { TRACE("Stopping thread for midi-in\n"); - end_thread = 1; + write(rec_cancel_pipe[1], "x", 1); if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { WARN("Thread end not signaled, force termination\n"); TerminateThread(hThread, 0); } + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); TRACE("Stopped thread for midi-in\n"); }

1 0