March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Assert that we don't read out of bounds of the base_types array.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: vkd3d Branch: master Commit: 8d444ebbfc37b6f4f6f843e9a4798acb2d82a7a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d444ebbfc37b6f4f6f843e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:11 2021 -0600 vkd3d-shader: Assert that we don't read out of bounds of the base_types array. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fbbe001..1d76777 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -675,14 +675,17 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache switch (type->type) { case HLSL_CLASS_SCALAR: + assert(type->base_type < ARRAY_SIZE(base_types)); vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); return string; case HLSL_CLASS_VECTOR: + assert(type->base_type < ARRAY_SIZE(base_types)); vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: + assert(type->base_type < ARRAY_SIZE(base_types)); vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string;

1 0

Zebediah Figura : vkd3d-shader: Factor out make_empty_list().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: vkd3d Branch: master Commit: 774609e1e283900ff1fd40cde2c4df7e1cd95df5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=774609e1e283900ff1fd40c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:12 2021 -0600 vkd3d-shader: Factor out make_empty_list(). 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.y | 55 +++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dd15f62..5ad50b0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -121,6 +121,15 @@ static struct hlsl_ir_node *node_from_list(struct list *list) return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); } +static struct list *make_empty_list(void) +{ + struct list *list; + + if ((list = vkd3d_malloc(sizeof(*list)))) + list_init(list); + return list; +} + static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) { if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) @@ -390,9 +399,8 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l struct hlsl_ir_loop *loop = NULL; struct hlsl_ir_if *cond_jump = NULL; - if (!(list = vkd3d_malloc(sizeof(*list)))) + if (!(list = make_empty_list())) goto oom; - list_init(list); if (init) list_move_head(list, init); @@ -724,9 +732,8 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (type->type == HLSL_CLASS_MATRIX) assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); - if (!(list = vkd3d_malloc(sizeof(*list)))) + if (!(list = make_empty_list())) return NULL; - list_init(list); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) { if (!(field = vkd3d_calloc(1, sizeof(*field)))) @@ -892,12 +899,11 @@ static struct list *make_list(struct hlsl_ir_node *node) { struct list *list; - if (!(list = vkd3d_malloc(sizeof(*list)))) + if (!(list = make_empty_list())) { hlsl_free_instr(node); return NULL; } - list_init(list); list_add_tail(list, &node->entry); return list; } @@ -1377,14 +1383,13 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (basic_type->type == HLSL_CLASS_MATRIX) assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); - if (!(statements_list = vkd3d_malloc(sizeof(*statements_list)))) + if (!(statements_list = make_empty_list())) { LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) free_parse_variable_def(v); vkd3d_free(var_list); return NULL; } - list_init(statements_list); if (!var_list) return statements_list; @@ -1836,8 +1841,8 @@ any_identifier: fields_list: /* empty */ { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; } | fields_list field { @@ -1921,8 +1926,8 @@ func_prototype: compound_statement: '{' '}' { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; } | '{' scope_start statement_list '}' { @@ -1982,8 +1987,8 @@ register_opt: parameters: scope_start { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; } | scope_start param_list { @@ -1993,8 +1998,8 @@ parameters: param_list: parameter { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; if (!add_func_parameter(ctx, $$, &$1, @1)) { ERR("Error adding function parameter %s.\n", $1.name); @@ -2148,9 +2153,8 @@ declaration_statement: | struct_declaration | typedef { - if (!($$ = vkd3d_malloc(sizeof(*$$)))) + if (!($$ = make_empty_list())) YYABORT; - list_init($$); } typedef_type: @@ -2177,8 +2181,8 @@ typedef: type_specs: type_spec { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; list_add_head($$, &$1->entry); } | type_specs ',' type_spec @@ -2217,8 +2221,8 @@ variables_def_optional: variables_def: variable_def { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; list_add_head($$, &$1->entry); } | variables_def ',' variable_def @@ -2401,9 +2405,8 @@ jump_statement: } | KW_RETURN ';' { - if (!($$ = vkd3d_malloc(sizeof(*$$)))) + if (!($$ = make_empty_list())) YYABORT; - list_init($$); if (!add_return(ctx, $$, NULL, @1)) YYABORT; } @@ -2462,8 +2465,8 @@ loop_statement: expr_statement: ';' { - $$ = vkd3d_malloc(sizeof(*$$)); - list_init($$); + if (!($$ = make_empty_list())) + YYABORT; } | expr ';' {

1 0

Zebediah Figura : vkd3d-shader: Factor out hlsl_new_jump().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: vkd3d Branch: master Commit: ccd67dcf37ba6415240541c39a9a2bc2576f5529 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccd67dcf37ba6415240541c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:13 2021 -0600 vkd3d-shader: Factor out hlsl_new_jump(). 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 | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1d76777..1b388d5 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -499,6 +499,17 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned return swizzle; } +struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_jump *jump; + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return NULL; + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + jump->type = type; + return jump; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 8107b26..c3b5d56 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -529,6 +529,7 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5ad50b0..45b9742 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -377,10 +377,8 @@ static bool append_conditional_break(struct list *cond_list) return false; list_add_tail(cond_list, &iff->node.entry); - if (!(jump = vkd3d_malloc(sizeof(*jump)))) + if (!(jump = hlsl_new_jump(HLSL_IR_JUMP_BREAK, condition->loc))) return false; - init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); - jump->type = HLSL_IR_JUMP_BREAK; list_add_head(&iff->then_instrs, &jump->node.entry); return true; } @@ -563,10 +561,8 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs return NULL; } - if (!(jump = vkd3d_malloc(sizeof(*jump)))) + if (!(jump = hlsl_new_jump(HLSL_IR_JUMP_RETURN, loc))) return NULL; - init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); - jump->type = HLSL_IR_JUMP_RETURN; list_add_tail(instrs, &jump->node.entry); return jump;

1 0

Zebediah Figura : vkd3d-shader: Factor out hlsl_new_loop().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: vkd3d Branch: master Commit: 0f4d62b09d424f9233ec58c6e2fd078611fcaa30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f4d62b09d424f9233ec58c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:14 2021 -0600 vkd3d-shader: Factor out hlsl_new_loop(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 4 +--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1b388d5..4e73060 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -510,6 +510,17 @@ struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_sha return jump; } +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) +{ + struct hlsl_ir_loop *loop; + + if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + return NULL; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + list_init(&loop->body); + return loop; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c3b5d56..36e7dd0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -530,6 +530,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45b9742..1341de1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -403,11 +403,9 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l if (init) list_move_head(list, init); - if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + if (!(loop = hlsl_new_loop(loc))) goto oom; - init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); list_add_tail(list, &loop->node.entry); - list_init(&loop->body); if (!append_conditional_break(cond)) goto oom;

1 0

Francois Gouget : testbot/web: Use .errors files to highlight errors in full logs.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: tools Branch: master Commit: ced67f30c6e39dd3ec3e5452064889adeb68e9bd URL: https://source.winehq.org/git/tools.git/?a=commit;h=ced67f30c6e39dd3ec3e545… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 2 15:41:22 2021 +0100 testbot/web: Use .errors files to highlight errors in full logs. Instead of relying on Get*LineCategory() to identify error lines and only using the .errors information to single out new errors; JobDetails now uses the .errors file for both and only uses Get*LineCategory() to highlight warnings, informational messages, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7a4f4fc..8d4270a 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -368,20 +368,16 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %NewLineNos; - if ($LogInfo->{ErrCount}) + my %ErrLineNos; + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + my $ErrCount = @{$Group->{Errors}}; + next if (!$ErrCount); + for my $ErrIndex (0..$ErrCount-1) { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - next if (!$Group->{NewCount}); - for my $ErrIndex (0..@{$Group->{Errors}} - 1) - { - if ($Group->{IsNew}->[$ErrIndex]) - { - $NewLineNos{$Group->{LineNos}->[$ErrIndex]} = 1; - } - } + $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ + $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -404,7 +400,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $NewLineNos{$LineNo} ? "fullnew" : $GetCategory->($Line); + my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~;

1 0

Francois Gouget : testbot/TestWTBS: Allow ignoring inherited error lists.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: tools Branch: master Commit: 640b17c676f9497a7ce0ed660740e47fa312c230 URL: https://source.winehq.org/git/tools.git/?a=commit;h=640b17c676f9497a7ce0ed6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 2 15:41:36 2021 +0100 testbot/TestWTBS: Allow ignoring inherited error lists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e9fa98e..81b56c4 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -678,6 +678,17 @@ Finally, note that while the error directives are inherited by subcategories, they are not merged. So if if both win and win32 have error-matching directives, win32 will not inherit anything from the win category. +=item <tasks.(report|log|testbot).Errors> + +Inheritance of the reference error lists cannot be prevented but can be ignored +by setting this property to 'ignore'. + +For instance: +g 0 build.log. +n 0 Task: The exe32 Wine build failed +p wine:build.log.Errors ignore +a wine:build.log.Grep ^Task: The (win32|wow64) Wine build failed + =cut sub CheckLogErrors($$$$) @@ -957,9 +968,11 @@ sub CheckTask($$$$) $LogType = "testbot"; } - if ($MissionInfo->{"$LogType.errors"} or $CheckTimeouts) + my $RefErrors = SkipCheck($MissionInfo->{"$LogType.Errors"}) ? undef : + $MissionInfo->{"$LogType.errors"}; + if ($RefErrors or $CheckTimeouts) { - my $HasTimeout = CheckLogErrors($LogInfo, $MissionInfo->{"$LogType.errors"}, + my $HasTimeout = CheckLogErrors($LogInfo, $RefErrors, TaskKeyStr($Task) ."/$LogName", $MissionInfo->{HasTimeout}); $TimeoutCount++ if ($HasTimeout);

1 0

Zebediah Figura : wow64cpu: Add stub dll.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: b4fddcabdb0328cd21aa87af45bc6504b9687ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4fddcabdb0328cd21aa87af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 25 21:38:30 2021 -0600 wow64cpu: Add stub dll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++++ configure.ac | 3 +++ dlls/wow64cpu/Makefile.in | 1 + dlls/wow64cpu/wow64cpu.spec | 9 +++++++++ 4 files changed, 17 insertions(+) diff --git a/configure b/configure index d21dccbcce7..2b20133cd65 100755 --- a/configure +++ b/configure @@ -1700,6 +1700,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wow64cpu enable_wpc enable_wpcap enable_ws2_32 @@ -5724,6 +5725,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" + enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; arm*) @@ -5846,6 +5848,7 @@ esac enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64cpu=${enable_wow64cpu:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -21123,6 +21126,7 @@ wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 +wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests wine_fn_config_makefile dlls/wpcap enable_wpcap diff --git a/configure.ac b/configure.ac index caff5d1fe52..24f5c8847d6 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" + enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; arm*) @@ -224,6 +225,7 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64cpu=${enable_wow64cpu:-no} dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} @@ -3857,6 +3859,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/wow64cpu) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) WINE_CONFIG_MAKEFILE(dlls/wpcap) diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in new file mode 100644 index 00000000000..261363fa72a --- /dev/null +++ b/dlls/wow64cpu/Makefile.in @@ -0,0 +1 @@ +MODULE = wow64cpu.dll diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec new file mode 100644 index 00000000000..768b6627a1d --- /dev/null +++ b/dlls/wow64cpu/wow64cpu.spec @@ -0,0 +1,9 @@ +@ stub BTCpuGetBopCode +@ stub BTCpuGetContext +@ stub BTCpuProcessInit +@ stub BTCpuResetToConsistentState +@ stub BTCpuSetContext +@ stub BTCpuSimulate +@ stub BTCpuTurboThunkControl +@ stub TurboDispatchJumpAddressEnd +@ stub TurboDispatchJumpAddressStart

1 0

Zebediah Figura : ntdll: Stub Wow64Transition.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 0421ea397571650c5c6217b95e39cbd098b6c5b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0421ea397571650c5c6217b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 25 21:38:31 2021 -0600 ntdll: Stub Wow64Transition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45567 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 38 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2a6b8467812..6c86e6b2e6c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3928,6 +3928,38 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params ) RtlInitUnicodeString( &params->CommandLine, cmdline ); } +#ifndef _WIN64 +void *Wow64Transition = NULL; + +static void map_wow64cpu(void) +{ + SIZE_T size = 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + HANDLE file, section; + IO_STATUS_BLOCK io; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\??\\C:\\windows\\sysnative\\wow64cpu.dll" ); + InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); + if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) + { + WARN("failed to open wow64cpu, status %#x\n", status); + return; + } + if (!NtCreateSection( &section, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, + NULL, NULL, PAGE_EXECUTE_READ, SEC_COMMIT, file )) + { + NtMapViewOfSection( section, NtCurrentProcess(), &Wow64Transition, 0, + 0, NULL, &size, ViewShare, 0, PAGE_EXECUTE_READ ); + NtClose( section ); + } + NtClose( file ); +} +#endif + /*********************************************************************** * process_init @@ -4037,6 +4069,11 @@ static NTSTATUS process_init(void) build_ntdll_module(); +#ifndef _WIN64 + if (is_wow64) + map_wow64cpu(); +#endif + if ((status = load_dll( params->DllPath.Buffer, L"C:\\windows\\system32\\kernel32.dll", NULL, 0, &wm )) != STATUS_SUCCESS) { diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 78f06881832..ac7365a84b6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1129,6 +1129,7 @@ @ stdcall WinSqmIsOptedIn() @ stdcall WinSqmSetDWORD(ptr long long) @ stdcall WinSqmStartSession(ptr long long) +@ extern -arch=win32 Wow64Transition @ stdcall -private -syscall ZwAcceptConnectPort(ptr long ptr long ptr ptr) NtAcceptConnectPort @ stdcall -private -syscall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall -private -syscall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm

1 0

Zebediah Figura : kernel32/tests: Add a test for Wow64Transition.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 4a384f458955ab33275d987d1a0713f3dc489230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a384f458955ab33275d987d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 25 21:38:32 2021 -0600 kernel32/tests: Add a test for Wow64Transition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 861fc321729..1db68a191a3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -4003,6 +4003,34 @@ static void test_LoadPackagedLibrary(void) h, GetLastError()); } +static void test_Wow64Transition(void) +{ + char buffer[400]; + MEMORY_SECTION_NAME *name = (MEMORY_SECTION_NAME *)buffer; + const WCHAR *filepart; + void **pWow64Transition; + NTSTATUS status; + + if (!(pWow64Transition = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "Wow64Transition"))) + { + skip("Wow64Transition is not present\n"); + return; + } + if (!is_wow64) + { + skip("Wow64Transition is not patched\n"); + return; + } + + status = NtQueryVirtualMemory(GetCurrentProcess(), *pWow64Transition, + MemorySectionName, name, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + filepart = name->SectionFileName.Buffer + name->SectionFileName.Length / sizeof(WCHAR); + while (*filepart != '\\') --filepart; + ok(!wcsnicmp(filepart, L"\\wow64cpu.dll", wcslen(L"\\wow64cpu.dll")), "got file name %s\n", + debugstr_wn(name->SectionFileName.Buffer, name->SectionFileName.Length / sizeof(WCHAR))); +} + START_TEST(loader) { int argc; @@ -4079,6 +4107,7 @@ START_TEST(loader) test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" ); test_dll_file( "user32.dll" ); + test_Wow64Transition(); /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); }

1 0

Jacek Caban : ntdll: Restore all non-volatile i386 registers in syscall dispatcher.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: e341d1f695311725752c287057f6c6ab60fdf2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e341d1f695311725752c2870… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 1 16:51:05 2021 +0100 ntdll: Restore all non-volatile i386 registers in syscall dispatcher. Based on set_full_cpu_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 63 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 720cf0589fd..c760903dbd1 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1458,7 +1458,7 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmovl %%ecx,-0x2c(%%ebp)\n" ); /* frame->eip */ output( "\tmovl %%esp,%%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ output( "\tcmpl $%u,%%eax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); if (UsePIC) { output( "\tmovl %%eax,%%edx\n" ); @@ -1479,19 +1479,54 @@ static void output_syscall_dispatcher( int count, const char *variant ) else output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); output( "2:\tmovl $0,%%fs:0x1f8\n" ); - output( "\tmovl -0x14(%%ebp),%%ebx\n" ); - output_cfi( ".cfi_same_value %%ebx\n" ); - output( "\tmovl -0x08(%%ebp),%%edi\n" ); - output_cfi( ".cfi_same_value %%edi\n" ); - output( "\tmovl -0x04(%%ebp),%%esi\n" ); - output_cfi( ".cfi_same_value %%esi\n" ); - output( "\tmovl %%ebp,%%esp\n" ); - output_cfi( ".cfi_def_cfa %%esp,8\n" ); - output( "\tpopl %%ebp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -4\n" ); - output_cfi( ".cfi_same_value %%ebp\n" ); - output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tleal -0x30(%%ebp),%%ebx\n" ); + output_cfi( ".cfi_def_cfa_register %%ebx" ); + output_cfi( ".cfi_adjust_cfa_offset 0x30\n" ); + output( "\tmovl %%eax,0x18(%%ebx)\n" ); + output( "\tmovw 0x16(%%ebx),%%gs\n" ); + output( "\tmovw 0x14(%%ebx),%%fs\n" ); + output( "\tmovw 0x12(%%ebx),%%es\n" ); + output( "\tmovl 0x28(%%ebx),%%edi\n" ); + output_cfi( ".cfi_same_value %%edi" ); + output( "\tmovl 0x2c(%%ebx),%%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); + output( "\tmovl (%%ebp),%%ebp\n" ); + output_cfi( ".cfi_same_value %%ebp" ); + output( "\tmovw %%ss,%%cx\n" ); + output( "\tcmpw 0x0e(%%ebx),%%cx\n" ); + output( "\tjne 3f\n" ); + /* As soon as we have switched stacks the context structure could + * be invalid (when signal handlers are executed for example). Copy + * values on the target stack before changing ESP. */ + output( "\tmovl 0x08(%%ebx),%%ecx\n" ); + output( "\tleal -3*4(%%ecx),%%ecx\n" ); + output( "\tmovl (%%ebx),%%edx\n" ); + output( "\tmovl %%edx,2*4(%%ecx)\n" ); + output( "\tmovl 0x0c(%%ebx),%%edx\n" ); + output( "\tmovl %%edx,1*4(%%ecx)\n" ); + output( "\tmovl 0x04(%%ebx),%%edx\n" ); + output( "\tmovl %%edx,0*4(%%ecx)\n" ); + output( "\tpushl 0x10(%%ebx)\n" ); + output( "\tmovl 0x1c(%%ebx),%%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx" ); + output( "\tpopl %%ds\n" ); + output( "\tmovl %%ecx,%%esp\n" ); + output( "\tiret\n" ); + /* Restore the context when the stack segment changes. We can't use + * the same code as above because we do not know if the stack segment + * is 16 or 32 bit, and 'movl' will throw an exception when we try to + * access memory above the limit. */ + output( "\t3:\tmovl 0x18(%%ebx),%%ecx\n" ); + output( "\tmovw 0x0e(%%ebx),%%ss\n" ); + output( "\tmovl 0x08(%%ebx),%%esp\n" ); + output( "\tpushl 0x00(%%ebx)\n" ); + output( "\tpushl 0x0c(%%ebx)\n" ); + output( "\tpushl 0x04(%%ebx)\n" ); + output( "\tpushl 0x10(%%ebx)\n" ); + output( "\tmovl 0x1c(%%ebx),%%ebx\n" ); + output( "\tpopl %%ds\n" ); + output( "\tiret\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); output( "\tjmp 2b\n" ); break; case CPU_x86_64:

1 0