September 2020 - Wine-Commits

Henri Verbeet : build: Install vkd3d-compiler.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: vkd3d Branch: master Commit: a6c43294152a71a7ca631755548c03c72463841d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a6c43294152a71a7ca63175… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 22 02:23:46 2020 +0330 build: Install vkd3d-compiler. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd62485..ca0f616 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,7 +140,7 @@ EXTRA_DIST += \ libs/vkd3d-shader/libvkd3d-shader.pc.in \ libs/vkd3d-utils/libvkd3d-utils.pc.in -noinst_PROGRAMS = vkd3d-compiler +bin_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la @@ -158,7 +158,7 @@ endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ -noinst_PROGRAMS += $(vkd3d_demos) +noinst_PROGRAMS = $(vkd3d_demos) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm

1 0

Tag vkd3d-1.2 : Alexandre Julliard : Release 1.2
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

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 Sept. 21, 2020

Sept. 21, 2020

1 0

Haidong Yu : ws2_32: Add missing LeaveCriticalSection.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

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

Haidong Yu : conhost: Add missing LeaveCriticalSection.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

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

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

Sept. 21, 2020

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 Sept. 21, 2020

Sept. 21, 2020

1 0

Jacek Caban : ntdll: Pass RTL_USER_PROCESS_PARAMETERS to get_initial_console.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 6bcc1b9225efe028319bbc64ce6b42a03e4d7ec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcc1b9225efe028319bbc64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:07:00 2020 +0200 ntdll: Pass RTL_USER_PROCESS_PARAMETERS to get_initial_console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 3 +-- dlls/ntdll/unix/env.c | 12 ++++++------ dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 ++--- include/wine/condrv.h | 1 + 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 933792317d..bf3fedcac6 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1254,8 +1254,7 @@ void init_user_process_params(void) RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path ); - unix_funcs->get_initial_console( &params->ConsoleHandle, &params->hStdInput, - &params->hStdOutput, &params->hStdError ); + unix_funcs->get_initial_console( params ); params->wShowWindow = 1; /* SW_SHOWNORMAL */ run_wineboot( &params->Environment ); diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 350fe6e8e0..1684f5dcc9 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -55,6 +55,7 @@ #include "winternl.h" #include "winbase.h" #include "winnls.h" +#include "wine/condrv.h" #include "wine/debug.h" #include "unix_private.h" @@ -1151,13 +1152,12 @@ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) * * Return the initial console handles. */ -void CDECL get_initial_console( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err ) +void CDECL get_initial_console( RTL_USER_PROCESS_PARAMETERS *params ) { - *handle = *std_in = *std_out = *std_err = 0; - if (isatty(0) || isatty(1) || isatty(2)) *handle = (HANDLE)2; /* see kernel32/kernel_private.h */ - if (!isatty(0)) wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, std_in ); - if (!isatty(1)) wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, std_out ); - if (!isatty(2)) wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, std_err ); + if (isatty(0) || isatty(1) || isatty(2)) params->ConsoleHandle = CONSOLE_HANDLE_SHELL; + if (!isatty(0)) wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params->hStdInput ); + if (!isatty(1)) wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdOutput ); + if (!isatty(2)) wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 39edee09a0..37c1e2ac01 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -107,7 +107,7 @@ extern NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE extern NTSTATUS CDECL get_startup_info( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL get_initial_directory( UNICODE_STRING *dir ) DECLSPEC_HIDDEN; -extern void CDECL get_initial_console( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err ) DECLSPEC_HIDDEN; +extern void CDECL get_initial_console( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index f5c57dde4d..7ed3148e4c 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 105 +#define NTDLL_UNIXLIB_VERSION 106 struct unix_funcs { @@ -72,8 +72,7 @@ struct unix_funcs NTSTATUS (CDECL *get_initial_environment)( WCHAR **wargv[], WCHAR *env, SIZE_T *size ); NTSTATUS (CDECL *get_startup_info)( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ); NTSTATUS (CDECL *get_dynamic_environment)( WCHAR *env, SIZE_T *size ); - void (CDECL *get_initial_console)( HANDLE *handle, HANDLE *std_in, - HANDLE *std_out, HANDLE *std_err ); + void (CDECL *get_initial_console)( RTL_USER_PROCESS_PARAMETERS *params ); void (CDECL *get_initial_directory)( UNICODE_STRING *dir ); USHORT * (CDECL *get_unix_codepage_data)(void); void (CDECL *get_locales)( WCHAR *sys, WCHAR *user ); diff --git a/include/wine/condrv.h b/include/wine/condrv.h index b82531280b..a5633998db 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -244,5 +244,6 @@ struct condrv_ctrl_event /* Wine specific values for console inheritance (params->ConsoleHandle) */ #define CONSOLE_HANDLE_ALLOC ((HANDLE)1) +#define CONSOLE_HANDLE_SHELL ((HANDLE)2) #endif /* _INC_CONDRV */

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SETUP_INPUT ioctl.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 52f6a56a1aa450c893e19a0e63a90c60626d3dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f6a56a1aa450c893e19a0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:06:26 2020 +0200 server: Introduce IOCTL_CONDRV_SETUP_INPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 5 ++++- server/console.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/trace.c | 1 + 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index e5ba9c7444..b82531280b 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -50,7 +50,10 @@ #define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console connection ioctls */ -#define IOCTL_CONDRV_BIND_PID CTL_CODE(FILE_DEVICE_CONSOLE, 51, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_BIND_PID CTL_CODE(FILE_DEVICE_CONSOLE, 51, METHOD_BUFFERED, FILE_ANY_ACCESS) + +/* console server ioctls */ +#define IOCTL_CONDRV_SETUP_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 60, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/server/console.c b/server/console.c index a946abacbb..2a5d7733fe 100644 --- a/server/console.c +++ b/server/console.c @@ -28,6 +28,8 @@ #include <stdio.h> #include <unistd.h> #include <signal.h> +#include <sys/ioctl.h> +#include <termios.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -198,6 +200,8 @@ struct console_server struct list queue; /* ioctl queue */ struct list read_queue; /* blocking read queue */ int busy; /* flag if server processing an ioctl */ + int term_fd; /* UNIX terminal fd */ + struct termios termios; /* original termios */ }; static void console_server_dump( struct object *obj, int verbose ); @@ -665,6 +669,13 @@ static void disconnect_console_server( struct console_server *server ) console_host_ioctl_terminate( call, STATUS_CANCELLED ); } + if (server->term_fd != -1) + { + tcsetattr( server->term_fd, TCSANOW, &server->termios ); + close( server->term_fd ); + server->term_fd = -1; + } + if (server->console) { assert( server->console->server == server ); @@ -1772,6 +1783,7 @@ static struct object *create_console_server( void ) if (!(server = alloc_object( &console_server_ops ))) return NULL; server->console = NULL; server->busy = 0; + server->term_fd = -1; list_init( &server->queue ); list_init( &server->read_queue ); server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -2337,6 +2349,53 @@ static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async return !get_error(); } + case IOCTL_CONDRV_SETUP_INPUT: + { + struct termios term; + obj_handle_t handle; + struct file *file; + int unix_fd; + + if (get_req_data_size() != sizeof(unsigned int) || get_reply_max_size()) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (server->term_fd != -1) + { + tcsetattr( server->term_fd, TCSANOW, &server->termios ); + close( server->term_fd ); + server->term_fd = -1; + } + handle = *(unsigned int *)get_req_data(); + if (!handle) return 1; + if (!(file = get_file_obj( current->process, handle, FILE_READ_DATA ))) + { + return 0; + } + unix_fd = get_file_unix_fd( file ); + release_object( file ); + + if (tcgetattr( unix_fd, &server->termios )) + { + file_set_error(); + return 0; + } + term = server->termios; + term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN); + term.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); + term.c_cflag &= ~(CSIZE | PARENB); + term.c_cflag |= CS8; + term.c_cc[VMIN] = 1; + term.c_cc[VTIME] = 0; + if (tcsetattr( unix_fd, TCSANOW, &term ) || (server->term_fd = dup( unix_fd )) == -1) + { + file_set_error(); + return 0; + } + return 1; + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; diff --git a/server/trace.c b/server/trace.c index 91e3208c49..707a952357 100644 --- a/server/trace.c +++ b/server/trace.c @@ -129,6 +129,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_SETUP_INPUT); CASE(IOCTL_CONDRV_WRITE_CONSOLE); CASE(IOCTL_CONDRV_WRITE_INPUT); CASE(IOCTL_CONDRV_WRITE_OUTPUT);

1 0

Jacek Caban : conhost: Use CP_UNIXCP in Unix mode.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: aecf53d0f745a65c15e0f1abbaf27af0d7c0a486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aecf53d0f745a65c15e0f1ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:51 2020 +0200 conhost: Use CP_UNIXCP in Unix mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 5df6848ba5..97855e5e32 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -233,6 +233,11 @@ static BOOL is_active( struct screen_buffer *screen_buffer ) return screen_buffer == screen_buffer->console->active; } +static unsigned int get_tty_cp( struct console *console ) +{ + return console->is_unix ? CP_UNIXCP : CP_UTF8; +} + static void tty_flush( struct console *console ) { if (!console->tty_output || !console->tty_buffer_count) return; @@ -406,7 +411,8 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) break; } - size = WideCharToMultiByte( CP_UTF8, 0, &ch->ch, 1, buf, sizeof(buf), NULL, NULL ); + size = WideCharToMultiByte( get_tty_cp( screen_buffer->console ), 0, + &ch->ch, 1, buf, sizeof(buf), NULL, NULL ); tty_write( screen_buffer->console, buf, size ); screen_buffer->console->tty_cursor_x++; } @@ -1604,7 +1610,7 @@ static DWORD WINAPI tty_input( void *param ) signaled = console->record_count != 0; /* FIXME: Handle partial char read */ - count = MultiByteToWideChar(CP_UTF8, 0, read_buf, io.Information, buf, ARRAY_SIZE(buf)); + count = MultiByteToWideChar( get_tty_cp( console ), 0, read_buf, io.Information, buf, ARRAY_SIZE(buf) ); TRACE( "%s\n", debugstr_wn(buf, count) ); @@ -2288,9 +2294,9 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl char *vt; tty_write( console, "\x1b]0;", 4 ); - len = WideCharToMultiByte( CP_UTF8, 0, console->title, size / sizeof(WCHAR), NULL, 0, NULL, NULL); + len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), NULL, 0, NULL, NULL); if ((vt = tty_alloc_buffer( console, len ))) - WideCharToMultiByte( CP_UTF8, 0, console->title, size / sizeof(WCHAR), vt, len, NULL, NULL ); + WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), vt, len, NULL, NULL ); tty_write( console, "\x07", 1 ); tty_sync( console ); }

1 0