September 2020 - Wine-commits

Henri Verbeet : Release 1.2.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: vkd3d Branch: master Commit: 56cd4a94d541707959ce7677af6d1a34739e5579 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56cd4a94d541707959ce767… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 22 02:23:48 2020 +0330 Release 1.2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 179 ++++++++++++++++++++++++++++++++++++---------- AUTHORS | 11 +++ Makefile.am | 4 +- configure.ac | 2 +- libs/vkd3d-shader/spirv.c | 2 +- 5 files changed, 158 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=56cd4a94d541707959c…

1 0

Tag vkd3d-1.2 : Alexandre Julliard : Release 1.2
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: vkd3d Branch: refs/tags/vkd3d-1.2 Tag: d94016cc17c19a965f744e717930d6bd107e2db0 URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=d94016cc17c19a965f744e7179… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 11:56:18 2020 +0200 Release 1.2

1 0

Paul Gofman : kernel32: Add string for DXGI_ERROR_NOT_CURRENTLY_AVAILABLE error.
by Alexandre Julliard 21 Sep '20

21 Sep '20

1 0

Haidong Yu : conhost: Add missing LeaveCriticalSection.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 4eb3ab95c75eb4eb33c01d22affdfd303590d87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb3ab95c75eb4eb33c01d22… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Mon Sep 21 17:55:35 2020 +0800 conhost: Add missing LeaveCriticalSection. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c637b16379..c0a0e08e6d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1659,6 +1659,7 @@ static DWORD WINAPI tty_input( void *param ) switch (ch) { case 3: /* end of text */ + LeaveCriticalSection( &console_section ); return 0; case '\n': key_press( console, '\n', VK_RETURN, LEFT_CTRL_PRESSED );

1 0

Haidong Yu : ws2_32: Add missing LeaveCriticalSection.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 1e198e17de96d13caa8cf94780e27641364c3f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e198e17de96d13caa8cf947… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Mon Sep 21 17:57:36 2020 +0800 ws2_32: Add missing LeaveCriticalSection. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0ed1af3092..4162549d8b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -494,7 +494,10 @@ static BOOL socket_list_add(SOCKET socket) } new_size = max(socket_list_size * 2, 8); if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*socket_list)))) + { + LeaveCriticalSection(&cs_socket_list); return FALSE; + } socket_list = new_array; memset(socket_list + socket_list_size, 0, (new_size - socket_list_size) * sizeof(*socket_list)); socket_list[socket_list_size] = socket;

1 0

Zhipeng Zhao : winex11.drv: If the end of the sequence is '\r\n', there is no need to add extra '\r'.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 05d9df73d12d202d51b784f1d5eadc55f8448f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d9df73d12d202d51b784f1… Author: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Date: Sun Sep 20 21:42:09 2020 +0800 winex11.drv: If the end of the sequence is '\r\n', there is no need to add extra '\r'. Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8ced781f66..695c0406a8 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -673,7 +673,7 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t MultiByteToWideChar( codepage, 0, data, size, strW + count, count ); for (i = j = 0; i < count; i++) { - if (strW[i + count] == '\n') strW[j++] = '\r'; + if (strW[i + count] == '\n' && (!i || strW[i + count - 1] != '\r')) strW[j++] = '\r'; strW[j++] = strW[i + count]; } strW[j++] = 0;

1 0

Paul Gofman : kernel32: Add string for DXGI_INVALID_CALL error.
by Alexandre Julliard 21 Sep '20

21 Sep '20

1 0

Jacek Caban : conhost: Explicitly set tty cursor position after updating output in write_console.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: da3bd4cb4a1c9644717547e0453ccd3498a3ceb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3bd4cb4a1c9644717547e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:21 2020 +0200 conhost: Explicitly set tty cursor position after updating output in write_console. This avoids absolute cursor position jumps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 422a966eb2..5f6065eab5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1876,7 +1876,10 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR if (++screen_buffer->cursor_y == screen_buffer->height) new_line( screen_buffer, &update_rect ); else if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) + { update_output( screen_buffer, &update_rect ); + set_tty_cursor( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); + } continue; case '\a': FIXME( "beep\n" );

1 0

Jacek Caban : conhost: Signal console in tty_input if needed.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: a33594a0483be2fe30d6cff8e523a9bb208b7240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a33594a0483be2fe30d6cff8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:26 2020 +0200 conhost: Signal console in tty_input if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 5f6065eab5..a9ad38eb99 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -473,7 +473,7 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v status = wine_server_call( req ); } SERVER_END_REQ; - if (status) ERR( "failed: %#x\n", status ); + if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#x\n", status ); console->read_ioctl = 0; console->pending_read = 0; return status; @@ -1580,6 +1580,7 @@ static DWORD WINAPI tty_input( void *param ) char read_buf[4096]; WCHAR buf[4096]; DWORD count, i; + BOOL signaled; NTSTATUS status; event = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -1595,6 +1596,7 @@ static DWORD WINAPI tty_input( void *param ) if (status) break; EnterCriticalSection( &console_section ); + signaled = console->record_count != 0; /* FIXME: Handle partial char read */ count = MultiByteToWideChar(CP_UTF8, 0, read_buf, io.Information, buf, ARRAY_SIZE(buf)); @@ -1626,6 +1628,11 @@ static DWORD WINAPI tty_input( void *param ) } process_console_input( console ); + if (!signaled && console->record_count) + { + assert( !console->read_ioctl ); + read_complete( console, STATUS_SUCCESS, NULL, 0, TRUE ); /* signal console */ + } LeaveCriticalSection( &console_section ); }

1 0

Jacek Caban : conhost: Terminate current read request when input when reading tty input fails.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: c6909e52543b62dfcd5b183014e6eae27b69f3fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6909e52543b62dfcd5b1830… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:32 2020 +0200 conhost: Terminate current read request when input when reading tty input fails. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a9ad38eb99..1d48194206 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1637,6 +1637,11 @@ static DWORD WINAPI tty_input( void *param ) } TRACE( "NtReadFile failed: %#x\n", status ); + + EnterCriticalSection( &console_section ); + if (console->read_ioctl) read_complete( console, status, NULL, 0, FALSE ); + LeaveCriticalSection( &console_section ); + return 0; }

1 0