September 2020 - Wine-commits

Matteo Bruni : d3d11: Report D3D11_FORMAT_SUPPORT_BLENDABLE in CheckFormatSupport().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 2d218e3ead70711ffa0b50c0b8bbb70396f50e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d218e3ead70711ffa0b50c0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:41 2020 +0200 d3d11: Report D3D11_FORMAT_SUPPORT_BLENDABLE in CheckFormatSupport(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cfcd4acace..29fa8b3752 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3345,6 +3345,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_GENMIPMAP, D3D11_FORMAT_SUPPORT_MIP_AUTOGEN}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE}, }; HRESULT hr;

1 0

Matteo Bruni : d3d11: Report multisample flags in CheckFormatSupport().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 0b56461f35417ea56fbbe32116c49bf22decce9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b56461f35417ea56fbbe321… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:42 2020 +0200 d3d11: Report multisample flags in CheckFormatSupport(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49614 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 29fa8b3752..0508fa3f7b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3402,6 +3402,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } } + /* d3d11 requires 4 and 8 sample counts support for formats reported to + * support multisample. */ + if (wined3d_check_device_multisample_type(wined3d_adapter, params.device_type, wined3d_format, + TRUE, WINED3D_MULTISAMPLE_4_SAMPLES, NULL) == WINED3D_OK && + wined3d_check_device_multisample_type(wined3d_adapter, params.device_type, wined3d_format, + TRUE, WINED3D_MULTISAMPLE_8_SAMPLES, NULL) == WINED3D_OK) + { + *format_support |= D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE + | D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET + | D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD; + } + return S_OK; }

1 0

Rémi Bernon : user32: Return TRUE from ShowWindow(SW_SHOW) if already visible.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: d50c310da96565dec98977e96a2d887097a6c1cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d50c310da96565dec98977e9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 11 11:52:01 2020 +0200 user32: Return TRUE from ShowWindow(SW_SHOW) if already visible. Instead of calling SendMessage, similarly to the SW_HIDE case. Based on a patch by Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 22 ++++++++++++++++++++-- dlls/user32/winpos.c | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f84525a0bf..bf20c5c7f2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5085,7 +5085,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } } -static DWORD CALLBACK show_window_thread(LPVOID arg) +static DWORD CALLBACK hide_window_thread( LPVOID arg ) { HWND hwnd = arg; @@ -5095,6 +5095,16 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) return 0; } +static DWORD CALLBACK show_window_thread( LPVOID arg ) +{ + HWND hwnd = arg; + + /* function will not return if ShowWindow(SW_SHOW) calls SendMessage() */ + ok( ShowWindow( hwnd, SW_SHOW ), "ShowWindow(SW_SHOW) expected TRUE\n" ); /* actually it's 24... */ + + return 0; +} + /* Helper function to easier test SetWindowPos messages */ #define test_msg_setpos( expected_list, flags, todo ) \ test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) @@ -5156,7 +5166,7 @@ static void test_messages(void) ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ - hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); + hthread = CreateThread( NULL, 0, hide_window_thread, hwnd, 0, &tid ); ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hthread); @@ -5167,6 +5177,14 @@ static void test_messages(void) flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); + /* test ShowWindow(SW_SHOW) on a visible window - multi-threaded */ + hthread = CreateThread( NULL, 0, show_window_thread, hwnd, 0, &tid ); + ok( hthread != NULL, "CreateThread failed, error %d\n", GetLastError() ); + ok( WaitForSingleObject( hthread, INFINITE ) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + CloseHandle( hthread ); + flush_events(); + ok_sequence( WmEmptySeq, "ShowWindow(SW_SHOW):overlapped", FALSE ); + ShowWindow(hwnd, SW_HIDE); flush_events(); ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b45b74ce82..e3c3f5c5c6 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1231,6 +1231,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; + if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return TRUE; + return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); }

1 0

Jacek Caban : conhost: Introduce IOCTL_CONDRV_WRITE_CONSOLE ioctl.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 5ced4a705a544f9a91fd38669b3907559b3a575e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ced4a705a544f9a91fd3866… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 14:30:50 2020 +0200 conhost: Introduce IOCTL_CONDRV_WRITE_CONSOLE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 15 +++--- programs/conhost/conhost.c | 113 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 7bc5e7f15b..4f92e2e096 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -39,13 +39,14 @@ #define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console output ioctls */ -#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 84a1c8ac7d..94a150205e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -337,13 +337,19 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } -static void update_output( struct screen_buffer *screen_buffer, const RECT *rect ) +static void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) +{ + SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); +} + +static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) { int x, y, size, trailing_spaces; char_info_t *ch; char buf[8]; if (!is_active( screen_buffer ) || !screen_buffer->console->tty_output) return; + if (rect->top > rect->bottom || rect->right < rect->left) return; TRACE( "%s\n", wine_dbgstr_rect( rect )); hide_tty_cursor( screen_buffer->console ); @@ -374,6 +380,54 @@ static void update_output( struct screen_buffer *screen_buffer, const RECT *rect screen_buffer->console->tty_cursor_x++; } } + + empty_update_rect( screen_buffer, rect ); +} + +static void new_line( struct screen_buffer *screen_buffer, RECT *update_rect ) +{ + unsigned int i; + + assert( screen_buffer->cursor_y == screen_buffer->height ); + screen_buffer->cursor_y--; + + if (screen_buffer->console->tty_output) + update_output( screen_buffer, update_rect ); + else + SetRect( update_rect, 0, 0, screen_buffer->width - 1, screen_buffer->height - 1 ); + + memmove( screen_buffer->data, screen_buffer->data + screen_buffer->width, + screen_buffer->width * (screen_buffer->height - 1) * sizeof(*screen_buffer->data) ); + for (i = 0; i < screen_buffer->width; i++) + screen_buffer->data[screen_buffer->width * (screen_buffer->height - 1) + i] = empty_char_info; + if (is_active( screen_buffer )) + { + screen_buffer->console->tty_cursor_y--; + if (screen_buffer->console->tty_cursor_y != screen_buffer->height - 2) + set_tty_cursor( screen_buffer->console, 0, screen_buffer->height - 2 ); + set_tty_cursor( screen_buffer->console, 0, screen_buffer->height - 1 ); + } +} + +static void write_char( struct screen_buffer *screen_buffer, WCHAR ch, RECT *update_rect ) +{ + if (screen_buffer->cursor_x == screen_buffer->width) + { + screen_buffer->cursor_x = 0; + screen_buffer->cursor_y++; + } + if (screen_buffer->cursor_y == screen_buffer->height) + { + new_line( screen_buffer, update_rect ); + } + + screen_buffer->data[screen_buffer->cursor_y * screen_buffer->width + screen_buffer->cursor_x].ch = ch; + screen_buffer->data[screen_buffer->cursor_y * screen_buffer->width + screen_buffer->cursor_x].attr = screen_buffer->attr; + update_rect->left = min( update_rect->left, screen_buffer->cursor_x ); + update_rect->top = min( update_rect->top, screen_buffer->cursor_y ); + update_rect->right = max( update_rect->right, screen_buffer->cursor_x ); + update_rect->bottom = max( update_rect->bottom, screen_buffer->cursor_y ); + screen_buffer->cursor_x++; } static NTSTATUS read_console_input( struct console *console, size_t out_size ) @@ -923,6 +977,59 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, return STATUS_SUCCESS; } +static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR *buffer, size_t len ) +{ + RECT update_rect; + size_t i, j; + + TRACE( "%s\n", debugstr_wn(buffer, len) ); + + empty_update_rect( screen_buffer, &update_rect ); + + for (i = 0; i < len; i++) + { + if (screen_buffer->mode & ENABLE_PROCESSED_OUTPUT) + { + switch (buffer[i]) + { + case '\b': + if (screen_buffer->cursor_x) screen_buffer->cursor_x--; + continue; + case '\t': + j = min( screen_buffer->width - screen_buffer->cursor_x, 8 - (screen_buffer->cursor_x % 8) ); + while (j--) write_char( screen_buffer, ' ', &update_rect ); + continue; + case '\n': + screen_buffer->cursor_x = 0; + 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 ); + continue; + case '\a': + FIXME( "beep\n" ); + continue; + case '\r': + screen_buffer->cursor_x = 0; + continue; + } + } + if (screen_buffer->cursor_x == screen_buffer->width && !(screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT)) + screen_buffer->cursor_x = update_rect.left; + write_char( screen_buffer, buffer[i], &update_rect ); + } + + if (screen_buffer->cursor_x == screen_buffer->width) + { + if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) screen_buffer->cursor_x--; + else screen_buffer->cursor_x = update_rect.left; + } + + update_output( screen_buffer, &update_rect ); + tty_sync( screen_buffer->console ); + return STATUS_SUCCESS; +} + static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, size_t in_size, size_t *out_size ) { @@ -1328,6 +1435,10 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_WRITE_CONSOLE: + if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; + return write_console( screen_buffer, in_data, in_size / sizeof(WCHAR) ); + case IOCTL_CONDRV_WRITE_OUTPUT: if ((*out_size != sizeof(DWORD) && *out_size != sizeof(SMALL_RECT)) || in_size < sizeof(struct condrv_output_params))

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_WRITE_CONSOLE in WriteConsoleW when possible.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: ab6056d6774310162ef268ca6af5e3ad2e556a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6056d6774310162ef268ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 14:31:07 2020 +0200 kernel32: Use IOCTL_CONDRV_WRITE_CONSOLE in WriteConsoleW when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ server/console.c | 9 +++++++-- server/trace.c | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 5b5722847f..afac9be760 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -794,6 +794,13 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; + if (DeviceIoControl(hConsoleOutput, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, + nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0, NULL, NULL)) + { + if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; + return TRUE; + } + if ((fd = get_console_bare_fd(hConsoleOutput)) != -1) { char* ptr; diff --git a/server/console.c b/server/console.c index 6a4a0b60d5..c9db27935e 100644 --- a/server/console.c +++ b/server/console.c @@ -2106,8 +2106,13 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } default: - set_error( STATUS_INVALID_HANDLE ); - return 0; + if (!screen_buffer->input || !screen_buffer->input->server || code >> 16 != FILE_DEVICE_CONSOLE) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); } } diff --git a/server/trace.c b/server/trace.c index a0174a1bd6..c93e4fe3b4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -128,6 +128,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_CONDRV_READ_OUTPUT); CASE(IOCTL_CONDRV_SET_MODE); CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); + CASE(IOCTL_CONDRV_WRITE_CONSOLE); CASE(IOCTL_CONDRV_WRITE_INPUT); CASE(IOCTL_CONDRV_WRITE_OUTPUT); CASE(FSCTL_DISMOUNT_VOLUME);

1 0

Jacek Caban : conhost/tests: Add WriteConsole tests.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 5d96c5aac883b343ddcfbe6f6b1b96ad6827a46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d96c5aac883b343ddcfbe6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 14:31:24 2020 +0200 conhost/tests: Add WriteConsole tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 +- programs/conhost/tests/tty.c | 239 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d96c5aac883b343ddcf…

1 0

Jacek Caban : kernel32/tests: Allow ENABLE_VIRTUAL_TERMINAL_PROCESSING in default mode.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 129149d212e607ff2df8619085d57cb7d7fb09da URL: https://source.winehq.org/git/wine.git/?a=commit;h=129149d212e607ff2df86190… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 14:31:32 2020 +0200 kernel32/tests: Allow ENABLE_VIRTUAL_TERMINAL_PROCESSING in default mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b42594a73f..18dbbb1ff6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3972,6 +3972,7 @@ static void test_pseudo_console_child(HANDLE input, HANDLE output) ret = GetConsoleMode(output, &mode); ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + mode &= ~ENABLE_VIRTUAL_TERMINAL_PROCESSING; ok(mode == (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT), "mode = %x\n", mode); ret = SetConsoleMode(output, mode & ~ENABLE_WRAP_AT_EOL_OUTPUT);

1 0

Jacek Caban : conhost/tests: Wait for child process in test_pseudoconsole.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: a26bb7b2ef50cf0d1360b35b093b7e4ef11aa6d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a26bb7b2ef50cf0d1360b35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 15:42:09 2020 +0200 conhost/tests: Wait for child process in test_pseudoconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index e0e29d5c4d..f536ad03af 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1277,6 +1277,11 @@ static void test_pseudoconsole(void) } else win_skip("Skipping tty output tests on broken Windows version\n"); + CloseHandle(child_pipe); + wait_child_process(child_process); + CloseHandle(child_process); + expect_empty_output(); + pClosePseudoConsole(console); CloseHandle(console_pipe_end); CloseHandle(console_pipe);

1 0

Francesco Noferi : cmd.exe: Fix parsing of && between quotes.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: fc1bb9aff5c5af22819879e98ffab25bc833fb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1bb9aff5c5af22819879e9… Author: Francesco Noferi <lolisamurai(a)tfwno.gf> Date: Fri Sep 11 09:25:48 2020 +0000 cmd.exe: Fix parsing of && between quotes. Signed-off-by: Francesco Noferi <lolisamurai(a)tfwno.gf> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_cmdline.cmd | 4 ++++ programs/cmd/tests/test_cmdline.cmd.exp | 3 +++ programs/cmd/wcmdmain.c | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 7a7f8d7b63..8712f05f87 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -178,6 +178,10 @@ rem cond 5 - string between quotes must be name of executable cmd /c "say five" echo @echo 5 >"say five.bat" cmd /c "say five" +rem cond 6 - && between quotes +cd .&&"cmd.exe" /c "echo hi" +cd "."&&cmd.exe /c "echo hi" +cd "."&&"cmd.exe" /c "echo hi" echo ------- Testing CMD /C qualifier treatment ------------ rem no need for space after /c diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 7978a249c9..946e353fcf 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -87,6 +87,9 @@ Passed 2(a)space@ 0(a)space@ 5(a)space@ +hi +hi +hi ------- Testing CMD /C qualifier treatment ------------ 0(a)space@ 1(a)space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 97cc607a64..47e43fcd67 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1792,7 +1792,8 @@ static BOOL WCMD_IsEndQuote(const WCHAR *quote, int quoteIndex) /* Quote counting ends at EOL, redirection, space or pipe if current quote is complete */ else if(((quoteCount % 2) == 0) - && ((quote[i] == '<') || (quote[i] == '>') || (quote[i] == '|') || (quote[i] == ' '))) + && ((quote[i] == '<') || (quote[i] == '>') || (quote[i] == '|') || (quote[i] == ' ') || + (quote[i] == '&'))) { break; }

1 0

Myah Caron : cmd.exe: Fix /Y flag for move builtin.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 81fe7a2165ed244cc0ac24b133e49ce596e77710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81fe7a2165ed244cc0ac24b1… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 10 19:10:55 2020 +0000 cmd.exe: Fix /Y flag for move builtin. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48397 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 15 +++++---------- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 70ccddebc1..d2f2ea517a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3003,6 +3003,7 @@ void WCMD_move (void) WCHAR src[MAX_PATH]; DWORD attribs; BOOL ok = TRUE; + DWORD flags = 0; WINE_TRACE("Processing file '%s'\n", wine_dbgstr_w(fd.cFileName)); @@ -3051,20 +3052,14 @@ void WCMD_move (void) question = WCMD_format_string(WCMD_LoadMessage(WCMD_OVERWRITE), dest); ok = WCMD_ask_confirm(question, FALSE, NULL); LocalFree(question); - - /* So delete the destination prior to the move */ - if (ok) { - if (!DeleteFileW(dest)) { - WCMD_print_error (); - errorlevel = 1; - ok = FALSE; - } - } } + + if (ok) + flags |= MOVEFILE_REPLACE_EXISTING; } if (ok) { - status = MoveFileW(src, dest); + status = MoveFileExW(src, dest, flags); } else { status = TRUE; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fb84de2f5d..f75839fdbe 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1343,8 +1343,8 @@ original file still present ------------ Testing move ------------ --- file move file move succeeded -(a)todo_wine@file move with overwrite succeeded(a)or_broken@file overwrite impossible! -(a)todo_wine@bar(a)or_broken@baz +file move with overwrite succeeded(a)or_broken@file overwrite impossible! +bar(a)or_broken@baz read-only files are moveable file moved in subdirectory moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op!

1 0