September 2020 - Wine-commits

Jacek Caban : server: Introduce console_connection object.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 7364a4b07536c10331e6049bc098ca9dba9554e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7364a4b07536c10331e6049b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:38:37 2020 +0200 server: Introduce console_connection object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index c2328f9da9..108371080e 100644 --- a/server/console.c +++ b/server/console.c @@ -80,6 +80,7 @@ struct console_input static void console_input_dump( struct object *obj, int verbose ); static void console_input_destroy( struct object *obj ); static struct fd *console_input_get_fd( struct object *obj ); +static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -97,7 +98,7 @@ static const struct object_ops console_input_ops = default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + console_input_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ console_input_open_file, /* open_file */ @@ -358,6 +359,39 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; +struct console_connection +{ + struct object obj; /* object header */ +}; + +static void console_connection_dump( struct object *obj, int verbose ); +static struct object *console_connection_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); +static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); + +static const struct object_ops console_connection_ops = +{ + sizeof(struct console_connection),/* size */ + console_connection_dump, /* dump */ + console_device_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + console_connection_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + console_connection_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); static const char_info_t empty_char_info = { ' ', 0x000f }; /* white on black space */ @@ -1286,6 +1320,39 @@ static void console_input_destroy( struct object *obj ) free( console_in->history ); } +static struct object *create_console_connection( struct console_input *console ) +{ + struct console_connection *connection; + + if (current->process->console) + { + set_error( STATUS_ACCESS_DENIED ); + return NULL; + } + + if (!(connection = alloc_object( &console_connection_ops ))) return NULL; + + current->process->console = (struct console_input *)grab_object( console ); + console->num_proc++; + + return &connection->obj; +} + +static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + struct console_input *console = (struct console_input *)obj; + static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n'}; + assert( obj->ops == &console_input_ops ); + + if (name->len == sizeof(connectionW) && !memcmp( name->str, connectionW, name->len )) + { + name->len = 0; + return create_console_connection( console ); + } + + return NULL; +} + static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { @@ -2209,6 +2276,23 @@ static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async } } +static void console_connection_dump( struct object *obj, int verbose ) +{ + fputs( "console connection\n", stderr ); +} + +static struct object *console_connection_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + +static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + free_console( process ); + return 1; +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Jacek Caban : kernelbase: Create console connection in init_console.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 74192f7a56c319c1a9cadb67a3dd3305c965292d URL: https://source.winehq.org/git/wine.git/?a=commit;h=74192f7a56c319c1a9cadb67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:01 2020 +0200 kernelbase: Create console connection in init_console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 20 ++++++++++++++++++++ server/console.c | 6 ++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f4dd06ae2d..eff63a29a1 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -54,6 +54,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static HANDLE console_connection; static HANDLE console_wait_event; static unsigned int console_flags; @@ -208,6 +209,21 @@ static HANDLE create_console_reference( HANDLE root ) return set_ntstatus( status ) ? handle : NULL; } +static BOOL create_console_connection( HANDLE root ) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + RtlInitUnicodeString( &string, root ? L"Connection" : L"\\Device\\ConDrv\\Connection" ); + attr.RootDirectory = root; + attr.ObjectName = &string; + status = NtCreateFile( &console_connection, FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, + &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0 ); + return set_ntstatus( status ); +} + static BOOL init_console_std_handles(void) { HANDLE std_out = NULL, std_err = NULL, handle; @@ -568,6 +584,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) RtlEnterCriticalSection( &console_section ); + NtClose( console_connection ); + console_connection = NULL; + NtClose( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle ); RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; @@ -1734,6 +1753,7 @@ void init_console( void ) if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) AllocConsole(); } + else if (params->ConsoleHandle) create_console_connection( params->ConsoleHandle ); RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); } diff --git a/server/console.c b/server/console.c index 108371080e..50698a727f 100644 --- a/server/console.c +++ b/server/console.c @@ -799,14 +799,12 @@ obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, { struct console_input *console = NULL; - if (handle && !(console = (struct console_input *)get_handle_obj( current->process, handle, 0, - &console_input_ops ))) - return 0; + if (handle) return duplicate_handle( current->process, handle, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); /* if parent is a renderer, then attach current process to its console * a bit hacky.... */ - if (!console && hconin && parent_thread) + if (hconin && parent_thread) { /* FIXME: should we check some access rights ? */ if (!(console = (struct console_input *)get_handle_obj( parent_thread->process, hconin,

1 0

Isabella Bosia : vkd3d-shader: Add shader_ver_ge version comparison function.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: 56382c21bf55de18e5da2a54bac820fa6b9db8a3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56382c21bf55de18e5da2a5… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:09 2020 +0100 vkd3d-shader: Add shader_ver_ge version comparison function. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fa35bc7..3d29d71 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -300,6 +300,11 @@ shader_input_sysval_semantic_names[] = {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; +static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) +{ + return v->major > major || (v->major == major && v->minor >= minor); +} + static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) { va_list args; @@ -579,7 +584,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, else { /* Pixel shaders 3.0 don't have usage semantics. */ - if (shader_version->major < 3 && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) + if (!shader_ver_ge(shader_version, 3, 0) && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) return; else shader_addline(buffer, "_"); @@ -711,7 +716,7 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, case VKD3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (VKD3DSPR_OUTPUT), which can include an address token. */ - if (shader_version->major >= 3) + if (shader_ver_ge(shader_version, 3, 0)) shader_addline(buffer, "o"); else shader_addline(buffer, "oT"); @@ -1239,7 +1244,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_TEX: - if (shader_version->major >= 2 && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + if (shader_ver_ge(shader_version, 2, 0) && (ins->flags & VKD3DSI_TEXLD_PROJECT)) shader_addline(buffer, "p"); break; @@ -1252,7 +1257,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, static void shader_dump_register_space(struct vkd3d_string_buffer *buffer, unsigned int register_space, const struct vkd3d_shader_version *shader_version) { - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, ", space=%u", register_space); } @@ -1275,7 +1280,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed");

1 0

Isabella Bosia : vkd3d-shader: Fix out of bound array accesses.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: cf3388dad7bcf98c01b606f1ceb594894c902dd6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf3388dad7bcf98c01b606f… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:10 2020 +0100 vkd3d-shader: Fix out of bound array accesses. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 973a80d..a62974a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1787,7 +1787,13 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh if ((components & 0xfff0) != (components & 0xf) * 0x1110) FIXME("Components (%#x) have different data types.\n", components); - ins->resource_data_type = data_type_table[data_type]; + if (data_type < ARRAY_SIZE(data_type_table)) + ins->resource_data_type = data_type_table[data_type]; + else + { + FIXME("Unhandled data type %#x.\n", data_type); + ins->resource_data_type = VKD3D_DATA_FLOAT; + } break; } @@ -1796,7 +1802,13 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh enum vkd3d_sm4_resource_type resource_type = (modifier & VKD3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> VKD3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; - ins->resource_type = resource_type_table[resource_type]; + if (resource_type < ARRAY_SIZE(resource_type_table)) + ins->resource_type = resource_type_table[resource_type]; + else + { + FIXME("Unhandled resource type %#x.\n", resource_type); + ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; + } break; }

1 0

Isabella Bosia : vkd3d-shader: Recognize skipOptimization global flag.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: 058aec3ad91b02464669ff63cca0978ad7293319 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=058aec3ad91b02464669ff6… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:11 2020 +0100 vkd3d-shader: Recognize skipOptimization global flag. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3d29d71..001c347 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -348,6 +348,7 @@ static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD g {VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL, "forceEarlyDepthStencil"}, {VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS, "enableRawAndStructuredBuffers"}, {VKD3DSGF_ENABLE_MINIMUM_PRECISION, "enableMinimumPrecision"}, + {VKD3DSGF_SKIP_OPTIMIZATION, "skipOptimization"}, }; for (i = 0; i < ARRAY_SIZE(global_flag_info); ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1acb01f..00b2441 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -451,6 +451,7 @@ enum vkd3d_shader_global_flags VKD3DSGF_REFACTORING_ALLOWED = 0x01, VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x04, VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x08, + VKD3DSGF_SKIP_OPTIMIZATION = 0x10, VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20 };

1 0

Isabella Bosia : vkd3d-shader: Add "typed" when handling VKD3DSIH_DCL_UAV_TYPED.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: cc9d08eb38289edfc655cf3f111d3b4e4e44c5d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc9d08eb38289edfc655cf3… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:05:12 2020 +0100 vkd3d-shader: Add "typed" when handling VKD3DSIH_DCL_UAV_TYPED. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 001c347..9e2fb65 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -576,7 +576,9 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, if (semantic->resource.reg.reg.type == VKD3DSPR_RESOURCE) shader_addline(buffer, "_resource_"); else - shader_addline(buffer, "_uav_"); + /* non typed UAVs don't go through this code path */ + shader_addline(buffer, "_uav_typed_"); + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->resource.reg.reg.type == VKD3DSPR_UAV) shader_dump_uav_flags(buffer, flags);

1 0

Isabella Bosia : vkd3d-shader: Print dcl_cb registers with dump_register directly.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: 5fa7d5d3564bef01ab97f3fe47bda67132ede20c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fa7d5d3564bef01ab97f3f… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:06:36 2020 +0100 vkd3d-shader: Print dcl_cb registers with dump_register directly. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9e2fb65..e4bad38 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1282,7 +1282,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); + shader_dump_register(buffer, &ins->declaration.cb.src.reg, shader_version); if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s",

1 0

Isabella Bosia : vkd3d-shader: Print uav with dump_register directly.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: d1360ad3aabd57a5bc5df4dddf4b4675ce76b3ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1360ad3aabd57a5bc5df4d… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:06:37 2020 +0100 vkd3d-shader: Print uav with dump_register directly. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e4bad38..b184d86 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1276,7 +1276,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_dump_decl_usage(buffer, &ins->declaration.semantic, ins->flags, shader_version); shader_dump_ins_modifiers(buffer, &ins->declaration.semantic.resource.reg); shader_addline(buffer, " "); - shader_dump_dst_param(buffer, &ins->declaration.semantic.resource.reg, shader_version); + shader_dump_register(buffer, &ins->declaration.semantic.resource.reg.reg, shader_version); shader_dump_register_space(buffer, ins->declaration.semantic.resource.register_space, shader_version); break;

1 0

Isabella Bosia : vkd3d-shader: Print samplers with dump_register directly.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: vkd3d Branch: master Commit: ef7c28eb935a4d51196ef593e53cd79bd6ee09c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ef7c28eb935a4d51196ef59… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 15 18:06:38 2020 +0100 vkd3d-shader: Print samplers with dump_register directly. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b184d86..3571de8 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1396,7 +1396,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_SAMPLER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_src_param(buffer, &ins->declaration.sampler.src, shader_version); + shader_dump_register(buffer, &ins->declaration.sampler.src.reg, shader_version); if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) shader_addline(buffer, ", comparisonMode"); shader_dump_register_space(buffer, ins->declaration.sampler.register_space, shader_version);

1 0

Jacek Caban : conhost/tests: Add ReadConsole tests.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: cc6c5f7823df717da2eeba4351348325ee91ba5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6c5f7823df717da2eeba43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:08:18 2020 +0200 conhost/tests: Add ReadConsole tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 0d02d2af8f..369199a127 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -148,9 +148,11 @@ enum req_type REQ_CREATE_SCREEN_BUFFER, REQ_FILL_CHAR, REQ_GET_INPUT, + REQ_READ_CONSOLE, REQ_SCROLL, REQ_SET_ACTIVE, REQ_SET_CURSOR, + REQ_SET_INPUT_MODE, REQ_SET_OUTPUT_MODE, REQ_SET_TITLE, REQ_WRITE_CHARACTERS, @@ -167,6 +169,7 @@ struct pseudoconsole_req COORD coord; HANDLE handle; DWORD mode; + size_t size; struct { COORD coord; @@ -334,6 +337,18 @@ static void child_fill_character(WCHAR ch, DWORD count, int x, int y) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static void child_set_input_mode(HANDLE pipe, DWORD mode) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_SET_INPUT_MODE; + req.u.mode = mode; + ret = WriteFile(pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + static void child_set_output_mode(DWORD mode) { struct pseudoconsole_req req; @@ -346,6 +361,34 @@ static void child_set_output_mode(DWORD mode) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static void child_read_console(HANDLE pipe, size_t size) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_READ_CONSOLE; + req.u.size = size; + ret = WriteFile(pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + +#define child_expect_read_result(a,b) child_expect_read_result_(__LINE__,a,b) +static void child_expect_read_result_(unsigned int line, HANDLE pipe, const WCHAR *expect) +{ + size_t exlen = wcslen(expect); + WCHAR buf[4096]; + DWORD count; + BOOL ret; + + ret = ReadFile(pipe, buf, sizeof(buf), &count, NULL); + ok_(__FILE__,line)(ret, "ReadFile failed: %u\n", GetLastError()); + ok_(__FILE__,line)(count == exlen * sizeof(WCHAR), "got %u, expected %u\n", + count, exlen * sizeof(WCHAR)); + buf[count / sizeof(WCHAR)] = 0; + ok_(__FILE__,line)(!memcmp(expect, buf, count), "unexpected data %s\n", wine_dbgstr_w(buf)); +} + static void expect_input(unsigned int event_type, INPUT_RECORD *record) { struct pseudoconsole_req req = { REQ_GET_INPUT }; @@ -954,6 +997,42 @@ static void write_console_pipe(const char *buf) ok(res, "WriteFile failed: %u\n", GetLastError()); } +static void test_read_console(void) +{ + child_set_input_mode(child_pipe, ENABLE_PROCESSED_INPUT); + + child_read_console(child_pipe, 100); + write_console_pipe("abc"); + expect_empty_output(); + child_expect_read_result(child_pipe, L"abc"); + expect_empty_output(); + + child_read_console(child_pipe, 1); + write_console_pipe("xyz"); + child_expect_read_result(child_pipe, L"x"); + child_read_console(child_pipe, 100); + child_expect_read_result(child_pipe, L"yz"); + expect_empty_output(); + + child_set_input_mode(child_pipe, ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | + ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | + ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION); + + child_read_console(child_pipe, 100); + write_console_pipe("xyz"); + skip_hide_cursor(); + expect_output_sequence("xyz"); + skip_sequence("\x1b[?25h"); /* show cursor */ + write_console_pipe("ab\r\n"); + child_expect_read_result(child_pipe, L"xyzab\r\n"); + skip_hide_cursor(); + expect_output_sequence("ab\r\n"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_key_input('\r', VK_RETURN, 0, FALSE); + expect_key_pressed('\n', VK_RETURN, LEFT_CTRL_PRESSED); + expect_empty_output(); +} + static void test_tty_input(void) { INPUT_RECORD ir; @@ -1101,7 +1180,6 @@ static void child_process(HANDLE pipe) case REQ_CREATE_SCREEN_BUFFER: { HANDLE handle; - DWORD count; SetLastError(0xdeadbeef); handle = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, @@ -1123,6 +1201,13 @@ static void child_process(HANDLE pipe) break; } + case REQ_READ_CONSOLE: + ret = ReadConsoleW(input, buf, req->u.size, &count, NULL ); + ok(ret, "ReadConsoleW failed: %u\n", GetLastError()); + ret = WriteFile(pipe, buf, count * sizeof(WCHAR), NULL, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + break; + case REQ_SCROLL: ret = ScrollConsoleScreenBufferW(output, &req->u.scroll.rect, NULL, req->u.scroll.dst, &req->u.scroll.fill); ok(ret, "ScrollConsoleScreenBuffer failed: %u\n", GetLastError()); @@ -1145,6 +1230,11 @@ static void child_process(HANDLE pipe) ok(ret, "SetConsoleCursorPosition failed: %u\n", GetLastError()); break; + case REQ_SET_INPUT_MODE: + ret = SetConsoleMode(input, req->u.mode); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + break; + case REQ_SET_OUTPUT_MODE: ret = SetConsoleMode(output, req->u.mode); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); @@ -1273,6 +1363,7 @@ static void test_pseudoconsole(void) if (!broken_version) { test_tty_output(); + test_read_console(); test_tty_input(); } else win_skip("Skipping tty output tests on broken Windows version\n");

1 0