September 2020 - Wine-Commits

Myah Caron : cmd.exe: Don't prompt for move when non-interactive.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: d1790c984bebb55e4d08644e84cfabd85abeefe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1790c984bebb55e4d08644e… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 10 19:17:36 2020 +0000 cmd.exe: Don't prompt for move when non-interactive. Based on a patch by Francesco Noferi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48396 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d2f2ea517a..934e55ac58 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3033,15 +3033,28 @@ void WCMD_move (void) WCHAR copycmd[MAXSTRING]; DWORD len; - /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + /* Default whether automatic overwriting is on. If we are interactive then + we prompt by default, otherwise we overwrite by default + /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ if (wcsstr (quals, parmNoY)) force = FALSE; else if (wcsstr (quals, parmY)) force = TRUE; else { static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + /* By default, we will force the overwrite in batch mode and ask for + * confirmation in interactive mode. */ + force = !interactive; + /* If COPYCMD is set, then we force the overwrite with /Y and ask for + * confirmation with /-Y. If COPYCMD is neither of those, then we use the + * default behavior. */ len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); - force = (len && len < ARRAY_SIZE(copycmd) && !lstrcmpiW(copycmd, parmY)); + if (len && len < ARRAY_SIZE(copycmd)) { + if (!lstrcmpiW (copycmd, parmY)) + force = TRUE; + else if (!lstrcmpiW (copycmd, parmNoY)) + force = FALSE; + } } /* Prompt if overwriting */

1 0

Francesco Noferi : cmd.exe: Fix parsing of && between quotes.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

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

Jacek Caban : kernel32/tests: Allow ENABLE_VIRTUAL_TERMINAL_PROCESSING in default mode.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

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

Matteo Bruni : d3d11: Report D3D11_FORMAT_SUPPORT_BLENDABLE in CheckFormatSupport().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

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

Tag wine-5.17 : Alexandre Julliard : Release 5.17
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: refs/tags/wine-5.17 Tag: b825ffeb07eff01f8d4ef8aa04291a070975ef6a URL: https://source.winehq.org/git/wine.git/?a=tag;h=b825ffeb07eff01f8d4ef8aa042… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 21:49:16 2020 +0200 Release 5.17

1 0

Zebediah Figura : server: Remove no longer used enumerate_handles().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 24021931a88ed917bc2b52c0914c059c2d8d2f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24021931a88ed917bc2b52c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:16 2020 -0500 server: Remove no longer used enumerate_handles(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 21 --------------------- server/handle.h | 2 -- 2 files changed, 23 deletions(-) diff --git a/server/handle.c b/server/handle.c index 9ae99cd0c6..10e6a52e57 100644 --- a/server/handle.c +++ b/server/handle.c @@ -486,27 +486,6 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object return 0; } -/* enumerate handles of a given type */ -/* this is needed for window stations and desktops */ -obj_handle_t enumerate_handles( struct process *process, const struct object_ops *ops, - unsigned int *index ) -{ - struct handle_table *table = process->handles; - unsigned int i; - struct handle_entry *entry; - - if (!table) return 0; - - for (i = *index, entry = &table->entries[i]; i <= table->last; i++, entry++) - { - if (!entry->ptr) continue; - if (entry->ptr->ops != ops) continue; - *index = i + 1; - return index_to_handle(i); - } - return 0; -} - /* get/set the handle reserved flags */ /* return the old flags (or -1 on error) */ static int set_handle_flags( struct process *process, obj_handle_t handle, int mask, int flags ) diff --git a/server/handle.h b/server/handle.h index f1deb79fb5..40b3b427c2 100644 --- a/server/handle.h +++ b/server/handle.h @@ -48,8 +48,6 @@ extern obj_handle_t open_object( struct process *process, obj_handle_t parent, u const struct object_ops *ops, const struct unicode_str *name, unsigned int attr ); extern obj_handle_t find_inherited_handle( struct process *process, const struct object_ops *ops ); -extern obj_handle_t enumerate_handles( struct process *process, const struct object_ops *ops, - unsigned int *index ); extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); extern struct handle_table *copy_handle_table( struct process *process, struct process *parent );

1 0

Zebediah Figura : ws2_32: Keep a list of open sockets.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 23dbfaadbb93eea84601d763d303273ab9872f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23dbfaadbb93eea84601d763… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:14 2020 -0500 ws2_32: Keep a list of open sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 99 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 77 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b7a570043c..4421463029 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -267,26 +267,22 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, LPWSABUF lpControlBuffer ); -/* critical section to protect some non-reentrant net function */ -static CRITICAL_SECTION csWSgetXXXbyYYY; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &csWSgetXXXbyYYY, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": csWSgetXXXbyYYY") } -}; -static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 } + +DECLARE_CRITICAL_SECTION(csWSgetXXXbyYYY); +DECLARE_CRITICAL_SECTION(cs_if_addr_cache); +DECLARE_CRITICAL_SECTION(cs_socket_list); static in_addr_t *if_addr_cache; static unsigned int if_addr_cache_size; -static CRITICAL_SECTION cs_if_addr_cache; -static CRITICAL_SECTION_DEBUG cs_if_addr_cache_debug = -{ - 0, 0, &cs_if_addr_cache, - { &cs_if_addr_cache_debug.ProcessLocksList, &cs_if_addr_cache_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_if_addr_cache") } -}; -static CRITICAL_SECTION cs_if_addr_cache = { &cs_if_addr_cache_debug, -1, 0, 0, 0, 0 }; + +static SOCKET *socket_list; +static unsigned int socket_list_size; union generic_unix_sockaddr { @@ -481,6 +477,48 @@ static inline const char *debugstr_optval(const char *optval, int optlenval) #define SOCKET2HANDLE(s) ((HANDLE)(s)) #define HANDLE2SOCKET(h) ((SOCKET)(h)) +static BOOL socket_list_add(SOCKET socket) +{ + unsigned int i, new_size; + SOCKET *new_array; + + EnterCriticalSection(&cs_socket_list); + for (i = 0; i < socket_list_size; ++i) + { + if (!socket_list[i]) + { + socket_list[i] = socket; + LeaveCriticalSection(&cs_socket_list); + return TRUE; + } + } + new_size = max(socket_list_size * 2, 8); + if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*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; + socket_list_size = new_size; + LeaveCriticalSection(&cs_socket_list); + return TRUE; +} + +static void socket_list_remove(SOCKET socket) +{ + unsigned int i; + + EnterCriticalSection(&cs_socket_list); + for (i = 0; i < socket_list_size; ++i) + { + if (socket_list[i] == socket) + { + socket_list[i] = 0; + break; + } + } + LeaveCriticalSection(&cs_socket_list); +} + /**************************************************************** * Async IO declarations ****************************************************************/ @@ -2832,6 +2870,11 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) SERVER_END_REQ; if (!err) { + if (!socket_list_add(as)) + { + CloseHandle(SOCKET2HANDLE(as)); + return SOCKET_ERROR; + } if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32)) { WS_closesocket(as); @@ -3483,6 +3526,7 @@ int WINAPI WS_closesocket(SOCKET s) if (fd >= 0) { release_sock_fd(s, fd); + socket_list_remove(s); if (CloseHandle(SOCKET2HANDLE(s))) res = 0; } @@ -7558,10 +7602,16 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } /* hack for WSADuplicateSocket */ - if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) { - ret = lpProtocolInfo->dwServiceFlags3; - TRACE("\tgot duplicate %04lx\n", ret); - return ret; + if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) + { + ret = lpProtocolInfo->dwServiceFlags3; + TRACE("\tgot duplicate %04lx\n", ret); + if (!socket_list_add(ret)) + { + CloseHandle(SOCKET2HANDLE(ret)); + return INVALID_SOCKET; + } + return ret; } if (lpProtocolInfo) @@ -7685,7 +7735,12 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } #endif - return ret; + if (!socket_list_add(ret)) + { + CloseHandle(SOCKET2HANDLE(ret)); + return INVALID_SOCKET; + } + return ret; } if (err == WSAEACCES) /* raw socket denied */

1 0

Jacek Caban : conhost/tests: Wait for child process in test_pseudoconsole.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

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

Matteo Bruni : d3d11: Report D3D11_FORMAT_SUPPORT_MIP_AUTOGEN in CheckFormatSupport().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: e84eaa1bb8c135d6bf861511161f479bb5330427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84eaa1bb8c135d6bf861511… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:40 2020 +0200 d3d11: Report D3D11_FORMAT_SUPPORT_MIP_AUTOGEN 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 + dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0d38a2f194..cfcd4acace 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3344,6 +3344,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {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}, }; HRESULT hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b9bb50a89..3099d22d27 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18514,6 +18514,11 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), "Got unexpected result for format %#x: hr %#x, format_support %#x.\n", format, hr, format_support[format]); + if (format_support[format] & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN) + { + ok(format_support[format] & D3D11_FORMAT_SUPPORT_TEXTURE2D, + "Got unexpected format support %#x for format %#x", format_support[format], format); + } } for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format)

1 0

Jacek Caban : conhost: Introduce IOCTL_CONDRV_WRITE_CONSOLE ioctl.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

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