January 2022 - Wine-commits

Alexandre Julliard : widl: Avoid using Windows types where possible.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: a7f0e61e6c5ed90299f7731906341cce2b415634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f0e61e6c5ed90299f77319… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 12:17:22 2022 +0100 widl: Avoid using Windows types where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 2 +- tools/widl/hash.c | 10 +- tools/widl/hash.h | 12 +- tools/widl/header.c | 14 +- tools/widl/parser.l | 4 +- tools/widl/parser.y | 6 +- tools/widl/proxy.c | 6 +- tools/widl/register.c | 18 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 2 +- tools/widl/typelib.c | 2 +- tools/widl/typelib_struct.h | 538 ++++++++++++++++++++++---------------------- tools/widl/typetree.c | 18 +- tools/widl/utils.h | 2 +- tools/widl/widl.c | 8 +- tools/widl/widltypes.h | 18 +- tools/widl/write_msft.c | 93 +++----- 17 files changed, 368 insertions(+), 387 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7f0e61e6c5ed90299f7…

1 0

Matteo Bruni : vkd3d-shader/hlsl: Use hlsl_alloc() in hlsl_new_texture_type().
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: vkd3d Branch: master Commit: 5e14b843eae465a628ea3d439e39f09d15da6b32 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e14b843eae465a628ea3d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 21 22:22:25 2022 +0100 vkd3d-shader/hlsl: Use hlsl_alloc() in hlsl_new_texture_type(). Spotted by Giovanni Mascellani. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8ae3130..a287974 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -265,7 +265,7 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ { struct hlsl_type *type; - if (!(type = vkd3d_calloc(1, sizeof(*type)))) + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; type->type = HLSL_CLASS_OBJECT; type->base_type = HLSL_TYPE_TEXTURE;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle objects in copy propagation.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: vkd3d Branch: master Commit: 62bcdcda762d87a63f23a29da281637c71608460 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62bcdcda762d87a63f23a29… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 21 22:22:26 2022 +0100 vkd3d-shader/hlsl: Handle objects in copy propagation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl_codegen.c | 49 ++++++++++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a287974..d891385 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -196,6 +196,8 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } case HLSL_CLASS_OBJECT: + /* For convenience when performing copy propagation. */ + type->reg_size = 1; break; } } @@ -273,6 +275,7 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ type->dimy = 1; type->sampler_dim = dim; type->e.resource_format = format; + hlsl_type_calculate_reg_size(ctx, type); list_add_tail(&ctx->types, &type->entry); return type; } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e43e637..e426101 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -394,9 +394,26 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l struct hlsl_deref *src = &load->src; struct hlsl_ir_var *var = src->var; unsigned int offset, swizzle; + unsigned int dimx = 0; - if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) - return false; + switch (type->type) + { + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_VECTOR: + dimx = type->dimx; + break; + + case HLSL_CLASS_OBJECT: + dimx = 1; + break; + + case HLSL_CLASS_MATRIX: + case HLSL_CLASS_ARRAY: + case HLSL_CLASS_STRUCT: + /* FIXME: Actually we shouldn't even get here, but we don't split + * matrices yet. */ + return false; + } if (!hlsl_offset_from_deref(src, &offset)) return false; @@ -404,18 +421,22 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l if (!(var_def = copy_propagation_get_var_def(state, var))) return false; - if (!(new_node = copy_propagation_compute_replacement(var_def, offset, type->dimx, &swizzle))) + if (!(new_node = copy_propagation_compute_replacement(var_def, offset, dimx, &swizzle))) { - TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, offset, offset + type->dimx); + TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, offset, offset + dimx); return false; } TRACE("Load from %s[%u-%u] propagated as instruction %p%s.\n", - var->name, offset, offset + type->dimx, new_node, debug_hlsl_swizzle(swizzle, 4)); - if (!(swizzle_node = hlsl_new_swizzle(ctx, swizzle, type->dimx, new_node, &node->loc))) - return false; - list_add_before(&node->entry, &swizzle_node->node.entry); - replace_node(node, &swizzle_node->node); + var->name, offset, offset + dimx, new_node, debug_hlsl_swizzle(swizzle, 4)); + if (type->type != HLSL_CLASS_OBJECT) + { + if (!(swizzle_node = hlsl_new_swizzle(ctx, swizzle, dimx, new_node, &node->loc))) + return false; + list_add_before(&node->entry, &swizzle_node->node.entry); + new_node = &swizzle_node->node; + } + replace_node(node, new_node); return true; } @@ -431,9 +452,17 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s return; if (hlsl_offset_from_deref(lhs, &offset)) - copy_propagation_set_value(var_def, offset, store->writemask, store->rhs.node); + { + unsigned int writemask = store->writemask; + + if (store->rhs.node->data_type->type == HLSL_CLASS_OBJECT) + writemask = VKD3DSP_WRITEMASK_0; + copy_propagation_set_value(var_def, offset, writemask, store->rhs.node); + } else + { copy_propagation_invalidate_whole_variable(var_def); + } } static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass copy_propagation_state and hlsl_deref pointers to copy_propagation_compute_replacement().
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: vkd3d Branch: master Commit: 387ec06b6fc300c2ce74d04efb3b927daf06126e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=387ec06b6fc300c2ce74d04… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 21 22:22:27 2022 +0100 vkd3d-shader/hlsl: Pass copy_propagation_state and hlsl_deref pointers to copy_propagation_compute_replacement(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- libs/vkd3d-shader/hlsl_codegen.c | 43 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e426101..17d5800 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -307,8 +307,8 @@ static void copy_propagation_var_def_destroy(struct rb_entry *entry, void *conte vkd3d_free(var_def); } -static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy_propagation_state *state, - struct hlsl_ir_var *var) +static struct copy_propagation_var_def *copy_propagation_get_var_def(const struct copy_propagation_state *state, + const struct hlsl_ir_var *var) { struct rb_entry *entry = rb_get(&state->var_defs, var); @@ -362,11 +362,19 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, } } -static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_var_def *var_def, - unsigned int offset, unsigned int count, unsigned int *swizzle) +static struct hlsl_ir_node *copy_propagation_compute_replacement(const struct copy_propagation_state *state, + const struct hlsl_deref *deref, unsigned int count, unsigned int *swizzle) { + const struct hlsl_ir_var *var = deref->var; + struct copy_propagation_var_def *var_def; struct hlsl_ir_node *node = NULL; - unsigned int i; + unsigned int offset, i; + + if (!hlsl_offset_from_deref(deref, &offset)) + return NULL; + + if (!(var_def = copy_propagation_get_var_def(state, var))) + return NULL; assert(offset + count <= var_def->var->data_type->reg_size); @@ -375,12 +383,19 @@ static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_pro for (i = 0; i < count; ++i) { if (!node) + { node = var_def->values[offset + i].node; + } else if (node != var_def->values[offset + i].node) + { + TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, offset, offset + count); return NULL; + } *swizzle |= var_def->values[offset + i].component << i * 2; } + TRACE("Load from %s[%u-%u] propagated as instruction %p%s.\n", + var->name, offset, offset + count, node, debug_hlsl_swizzle(*swizzle, count)); return node; } @@ -388,13 +403,10 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l struct copy_propagation_state *state) { struct hlsl_ir_node *node = &load->node, *new_node; - struct copy_propagation_var_def *var_def; struct hlsl_type *type = node->data_type; struct hlsl_ir_swizzle *swizzle_node; - struct hlsl_deref *src = &load->src; - struct hlsl_ir_var *var = src->var; - unsigned int offset, swizzle; unsigned int dimx = 0; + unsigned int swizzle; switch (type->type) { @@ -415,20 +427,9 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l return false; } - if (!hlsl_offset_from_deref(src, &offset)) - return false; - - if (!(var_def = copy_propagation_get_var_def(state, var))) + if (!(new_node = copy_propagation_compute_replacement(state, &load->src, dimx, &swizzle))) return false; - if (!(new_node = copy_propagation_compute_replacement(var_def, offset, dimx, &swizzle))) - { - TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, offset, offset + dimx); - return false; - } - - TRACE("Load from %s[%u-%u] propagated as instruction %p%s.\n", - var->name, offset, offset + dimx, new_node, debug_hlsl_swizzle(swizzle, 4)); if (type->type != HLSL_CLASS_OBJECT) { if (!(swizzle_node = hlsl_new_swizzle(ctx, swizzle, dimx, new_node, &node->loc)))

1 0

Zebediah Figura : vkd3d-shader/hlsl: Do not calculate a buffer offset for object variables.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: vkd3d Branch: master Commit: 4529fbe57f883e88d6185d8d27ebe46fd86977c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4529fbe57f883e88d6185d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 21 22:22:28 2022 +0100 vkd3d-shader/hlsl: Do not calculate a buffer offset for object variables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 17d5800..e19b204 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1506,7 +1506,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform) + if (var->is_uniform && var->data_type->type != HLSL_CLASS_OBJECT) { if (var->is_param) var->buffer = ctx->params_buffer;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Propagate copies for resource load instructions.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: vkd3d Branch: master Commit: 8cb3ec4640ece8c1a093bf333c88ed105dc8a211 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cb3ec4640ece8c1a093bf3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 21 22:22:29 2022 +0100 vkd3d-shader/hlsl: Propagate copies for resource load instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 3 --- libs/vkd3d-shader/hlsl_codegen.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index a3ec685..1c14f95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -306,9 +306,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/max.shader_test \ - tests/sampler.shader_test \ - tests/texture-load.shader_test \ - tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test endif diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e19b204..98afd0e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -399,8 +399,8 @@ static struct hlsl_ir_node *copy_propagation_compute_replacement(const struct co return node; } -static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_load *load, - struct copy_propagation_state *state) +static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, + struct hlsl_ir_load *load, struct copy_propagation_state *state) { struct hlsl_ir_node *node = &load->node, *new_node; struct hlsl_type *type = node->data_type; @@ -441,6 +441,35 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l return true; } +static bool copy_propagation_transform_object_load(struct hlsl_ctx *ctx, + struct hlsl_deref *deref, struct copy_propagation_state *state) +{ + struct hlsl_ir_load *load; + struct hlsl_ir_node *node; + unsigned int swizzle; + + if (!(node = copy_propagation_compute_replacement(state, deref, 1, &swizzle))) + return false; + + /* Only HLSL_IR_LOAD can produce an object. */ + load = hlsl_ir_load(node); + deref->var = load->src.var; + hlsl_src_remove(&deref->offset); + hlsl_src_from_node(&deref->offset, load->src.offset.node); + return true; +} + +static bool copy_propagation_transform_resource_load(struct hlsl_ctx *ctx, + struct hlsl_ir_resource_load *load, struct copy_propagation_state *state) +{ + bool progress = false; + + progress |= copy_propagation_transform_object_load(ctx, &load->resource, state); + if (load->sampler.var) + progress |= copy_propagation_transform_object_load(ctx, &load->sampler, state); + return progress; +} + static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, struct copy_propagation_state *state) { @@ -477,7 +506,11 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b switch (instr->type) { case HLSL_IR_LOAD: - progress |= copy_propagation_analyze_load(ctx, hlsl_ir_load(instr), state); + progress |= copy_propagation_transform_load(ctx, hlsl_ir_load(instr), state); + break; + + case HLSL_IR_RESOURCE_LOAD: + progress |= copy_propagation_transform_resource_load(ctx, hlsl_ir_resource_load(instr), state); break; case HLSL_IR_STORE:

1 0

Giovanni Mascellani : makefile: Explicitly avoid ANSI stdio modifiers when cross compiling.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: vkd3d Branch: master Commit: a06d54d24e914f7e8e1a8911dd988647f0669049 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a06d54d24e914f7e8e1a891… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 24 12:02:26 2022 +0100 makefile: Explicitly avoid ANSI stdio modifiers when cross compiling. Crosstests are compiled with MinGW and linked against msvcrt, which doesn't necessarily support ANSI stdio format modifiers like "ll". Still, MinGW headers default to emit "ll" for format macros like PRIu64, which is wrong and triggers a lot of warnings in recent enough versions of GCC. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1c14f95..3b2e7d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -383,7 +383,7 @@ dummy-vkd3d-version: ## Cross-compile tests cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include -CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} +CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) if HAVE_CROSSTARGET32

1 0

Francois Gouget : testbot/SetWinLocale: Fix the usage, GetThreadLocale() is set by --system.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: tools Branch: master Commit: abdb6b72f779ea787646139128e190170cce99f0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=abdb6b72f779ea787646139… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 24 20:55:37 2022 +0100 testbot/SetWinLocale: Fix the usage, GetThreadLocale() is set by --system. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0f624e8..fcc816d 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -459,13 +459,13 @@ if (defined $Usage) print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; - print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; - print " . APIs: GetSystemDefaultLCID().\n"; + print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n";

1 0

Francois Gouget : testbot/SetWinlocale: Run() is not used so remove it.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: tools Branch: master Commit: 71e93b895a7d317570df8c793082c246ae8aabd6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=71e93b895a7d317570df8c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 24 20:57:07 2022 +0100 testbot/SetWinlocale: Run() is not used so remove it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index fcc816d..55722e1 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -75,16 +75,6 @@ sub Debug(@) print STDERR @_ if ($Debug or $DryRun); } -sub Run(@) -{ - Debug("Running '", join("' '", @_), "'\n"); - return 0 if ($DryRun); - - my $Rc = system(@_); - Debug("-> exit code $Rc\n"); - return $Rc; -} - my $Start = Time(); sub FatalError(@) {

1 0

Francois Gouget : testbot/SetWinLocale: Remove the --dry-run option.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: tools Branch: master Commit: 243a8835efd1cd3ee79529fc9830dbcc79184c02 URL: https://source.winehq.org/git/tools.git/?a=commit;h=243a8835efd1cd3ee79529f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 24 20:57:10 2022 +0100 testbot/SetWinLocale: Remove the --dry-run option. It is not really useful for debugging or otherwise and supporting it makes parts of the code significantly more complex. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 75 +++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 49 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 55722e1..f806498 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -68,11 +68,10 @@ sub Error(@) print STDERR "$name0:error: ", @_; } -my $DryRun; my $Debug; sub Debug(@) { - print STDERR @_ if ($Debug or $DryRun); + print STDERR @_ if ($Debug); } my $Start = Time(); @@ -356,10 +355,6 @@ while (@ARGV) { $Debug = 1; } - elsif ($Arg eq "--dry-run") - { - $DryRun = 1; - } elsif ($Arg =~ /^-/) { Error("unknown option '$Arg'\n"); @@ -483,7 +478,6 @@ if (defined $Usage) print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; - print " --dry-run Show what would happen but do nothing.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -769,11 +763,9 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -Debug(Elapsed($Start), " Sending the configuration file\n"); -print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); +Debug(Elapsed($Start), join("\n", " Sending the configuration file\nlocales.xml:", @Config, "")); -if (!$DryRun and - !$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +if (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); } @@ -781,41 +773,33 @@ if (!$DryRun and # For some reason this only works when run from a batch script! Debug(Elapsed($Start), " Sending the batch file\n"); my $Cmd = 'control.exe intl.cpl,,/f:"locales.xml"'; -if ($DryRun) -{ - print STDERR "script.bat: $Cmd\n"; -} -elsif (!$TA->SendFileFromString($Cmd, "script.bat", $TestAgent::SENDFILE_EXE)) +if (!$TA->SendFileFromString($Cmd, "script.bat", $TestAgent::SENDFILE_EXE)) { FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); } Debug(Elapsed($Start), " Running intl.cpl\n"); -if (!$DryRun) +my $Pid = $TA->Run(["./script.bat"], 0); +if (!$Pid) { - my $Pid = $TA->Run(["./script.bat"], 0); - if (!$Pid) - { - FatalError("failed to run intl.cpl\n"); - } + FatalError("failed to run intl.cpl\n"); +} - # Unfortunately the control.exe and/or intl.cpl exit code is unusable so - # there is no way to check for errors - Debug(Elapsed($Start), " Waiting for intl.cpl\n"); - if (!defined $TA->Wait($Pid, 120)) - { - FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); - } +# Unfortunately the control.exe and/or intl.cpl exit code is unusable so +# there is no way to check for errors +Debug(Elapsed($Start), " Waiting for intl.cpl\n"); +if (!defined $TA->Wait($Pid, 120)) +{ + FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); +} - if ($Debug) - { - print STDERR "Not deleting script.bat and locales.xml\n"; - } - else - { - $TA->Rm("script.bat"); - $TA->Rm("locales.xml"); - } +if ($Debug) +{ + print STDERR "Not deleting script.bat and locales.xml\n"; +} +else +{ + $TA->Rm("script.bat", "locales.xml"); } @@ -841,22 +825,15 @@ if ($OptReboot) { Debug(Elapsed($Start), " Rebooting Windows\n"); $Cmd = ["shutdown.exe", "/r", "/t", "0"]; - if ($DryRun) - { - print STDERR "Running ", join(" ", @$Cmd), "\n"; - } - else - { - $TA->Run($Cmd, 0); - # Note that we cannot wait for this command since it reboots Windows - } + $TA->Run($Cmd, 0); + # Note that we cannot wait for this command since it reboots Windows # Wait a bit to make sure we don't reconnect before Windows has rebooted. - sleep(30) if (!$DryRun); + sleep(30); Debug(Elapsed($Start), " Waiting for Windows to boot\n"); $TA->SetConnectTimeout(undef, undef, $WaitForBoot); - if (!$DryRun and !$TA->Ping()) + if (!$TA->Ping()) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); }

1 0