wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Alexandre Julliard : Release 5.17.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 01bacebba418bf6f58a644b1aab41be215bd200a URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bacebba418bf6f58a644b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 21:49:16 2020 +0200 Release 5.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 700 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 382 insertions(+), 343 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01bacebba418bf6f58a6…

1 0

Zebediah Figura : server: Remove no longer used is_fd_signaled().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 820d703c3182de41a175f6dddf339b9f6147734f URL: https://source.winehq.org/git/wine.git/?a=commit;h=820d703c3182de41a175f6dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:17 2020 -0500 server: Remove no longer used is_fd_signaled(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 6 ------ server/file.h | 1 - 2 files changed, 7 deletions(-) diff --git a/server/fd.c b/server/fd.c index 7ea8ac273e..a88ba39ef0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2057,12 +2057,6 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* check if fd is signaled */ -int is_fd_signaled( struct fd *fd ) -{ - return fd->signaled; -} - /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/file.h b/server/file.h index e8ace7f49e..b02c9fe603 100644 --- a/server/file.h +++ b/server/file.h @@ -99,7 +99,6 @@ extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); -extern int is_fd_signaled( struct fd *fd ); extern char *dup_fd_name( struct fd *root, const char *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry );

1 0

Zebediah Figura : server: Remove no longer used enumerate_handles().
by Alexandre Julliard 11 Sep '20

11 Sep '20

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: Close all open sockets in WSACleanup().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 470b9d037988cf5e79b039370e2c6c55daf3459c URL: https://source.winehq.org/git/wine.git/?a=commit;h=470b9d037988cf5e79b03937… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:15 2020 -0500 ws2_32: Close all open sockets in WSACleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18670 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++--- dlls/ws2_32/tests/sock.c | 3 --- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4421463029..246a0e2819 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1770,9 +1770,17 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) */ INT WINAPI WSACleanup(void) { - if (num_startup) { - num_startup--; - TRACE("pending cleanups: %d\n", num_startup); + TRACE("decreasing startup count from %d\n", num_startup); + if (num_startup) + { + if (!--num_startup) + { + unsigned int i; + + for (i = 0; i < socket_list_size; ++i) + CloseHandle(SOCKET2HANDLE(socket_list[i])); + memset(socket_list, 0, socket_list_size * sizeof(*socket_list)); + } return 0; } SetLastError(WSANOTINITIALISED); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c7f88d6f3b..7835246397 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1221,7 +1221,6 @@ static void test_WithWSAStartup(void) ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); /* show that sockets are destroyed automatically after WSACleanup */ - todo_wine { SetLastError(0xdeadbeef); res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); @@ -1258,8 +1257,6 @@ static void test_WithWSAStartup(void) } } - } - /* While wine is not fixed, close all sockets manually */ for (i = 0; i < socks; i++) {

1 0

Zebediah Figura : ws2_32: Keep a list of open sockets.
by Alexandre Julliard 11 Sep '20

11 Sep '20

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

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

11 Sep '20

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

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 -@todo_wine@file move with overwrite succeeded@or_broken@file overwrite impossible! -@todo_wine@bar@or_broken@baz +file move with overwrite succeeded@or_broken@file overwrite impossible! +bar@or_broken@baz read-only files are moveable file moved in subdirectory moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op!

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@space@ 0@space@ 5@space@ +hi +hi +hi ------- Testing CMD /C qualifier treatment ------------ 0@space@ 1@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 : 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

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

← Newer
1
...
41
42
43
44
45
46
47
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020