wine-devel

wine-devel@winehq.org

2 participants
84479 discussions

[PATCH 0/3] Implementing filename completion in cmd
by Eric Pouech 25 Mar '22

25 Mar '22

The following series implements filename completion in cmd, à la Windows (tab (resp. shift-tab) rotates in alphabetical order (resp. backwards alpha order) the available filenames starting with a given prefix). It requires two fixes in programs/conhost. Notes to Jacek - for the second patch, I tried to pick most of the APIs requiring cursor positionning. I wonder if SetConsoleCursorPosition (when y is outside a given interval) shouldn't be part of it (no concrete example at sight, just wild thinking) (something like deltay < -5 || deltay > 0) (This can be done later on anyway) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (3): programs/conhost: correctly recompute start of edit line on ReadConsole programs/conhost: support relative cursor positionning programs/cmd: implement filename completion programs/cmd/batch.c | 279 ++++++++++++++++++++++++++++++++++++- programs/conhost/conhost.c | 22 ++- programs/conhost/conhost.h | 1 + 3 files changed, 294 insertions(+), 8 deletions(-)

3 7

[PATCH vkd3d v7 6/6] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1b47187e..9e09054b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1603,61 +1603,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

1 0

[PATCH vkd3d v7 5/6] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas 25 Mar '22

25 Mar '22

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 98602f71..1b47187e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1606,19 +1606,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

1 0

[PATCH vkd3d v7 4/6] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v6. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c84003fd..98602f71 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); - return list; + free_parse_variable_def(v); + continue; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,18 +729,29 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) - return false; + { + free_parse_variable_def(v); + continue; + } } else { type = orig_type; } + ret = true; for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) - return false; + { + free_parse_variable_def(v); + ret = false; + break; + } } + if (!ret) + continue; + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +768,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1470,15 +1492,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1510,6 +1523,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1569,6 +1583,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1581,6 +1596,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v7 3/6] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

1 0

[PATCH vkd3d v7 2/6] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

1 0

[PATCH vkd3d v7 1/6] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

1 0

[PATCH] kernel32/tests: Add a test to show that services.exe is supposed to run in the session 0.
by Dmitry Timoshkov 25 Mar '22

25 Mar '22

IsWindowsService() from Microsoft.Extensions.Hosting.WindowsServices (.Net 4.6, 4.8, 5.0) depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/process.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e9e8555c32e..8f18a0d37a7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4959,6 +4959,40 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %lu\n", GetLastError()); } +static void test_services_exe(void) +{ + NTSTATUS status; + ULONG size, offset; + char *buf; + SYSTEM_PROCESS_INFORMATION *spi; + ULONG services_pid = 0, services_session_id = ~0; + + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + spi = (SYSTEM_PROCESS_INFORMATION *)buf; + offset = 0; + + do + { + spi = (SYSTEM_PROCESS_INFORMATION *)(buf + offset); + if (!wcsnicmp(spi->ProcessName.Buffer, L"services.exe", spi->ProcessName.Length/sizeof(WCHAR))) + { + services_pid = HandleToUlong(spi->UniqueProcessId); + services_session_id = spi->SessionId; + } + offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(services_pid != 0, "services.exe not found\n"); + todo_wine + ok(services_session_id == 0, "got services.exe SessionId %lu\n", services_session_id); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5088,6 +5122,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_services_exe(); /* things that can be tested: * lookup: check the way program to be executed is searched -- 2.35.1

1 0

[PATCH] bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.
by Huw Davies 25 Mar '22

25 Mar '22

Mainly to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ba251c72fa1..b38bf4ba8ff 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1552,7 +1552,7 @@ static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; - return -1; + return GNUTLS_DIG_UNKNOWN; } static NTSTATUS key_asymmetric_verify( void *args ) @@ -1596,7 +1596,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1751,7 +1751,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_INVALID_PARAMETER; } - if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); return STATUS_NOT_SUPPORTED; -- 2.23.0

2 1

[PATCH vkd3d v6 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v6: - Declaration of "unsigned int i" moved out of the 'for' initialization clause. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aca246f6..c40957c2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2411,6 +2411,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3218,15 +3219,36 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + unsigned int i; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 1

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-devel