December 2021 - Wine-commits

Giovanni Mascellani : vkd3d-shader/hlsl: Introduce a copy propagation pass.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 5c1c9cba7a3cccd4cbd21b4143e03d684b13518c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5c1c9cba7a3cccd4cbd21b4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:14:50 2021 +0100 vkd3d-shader/hlsl: Introduce a copy propagation pass. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 20 +++- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 217 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5c1c9cba7a3cccd4cbd…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 sample instructions.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: cbe69494a7031de4c5a98ba2013f63ae2575d5c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cbe69494a7031de4c5a98ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:54 2021 +0100 vkd3d-shader/hlsl: Write SM4 sample instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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_sm4.c | 59 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c0c26f8..1c0fea5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -753,7 +753,7 @@ struct sm4_instruction struct sm4_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; - } srcs[2]; + } srcs[3]; unsigned int src_count; uint32_t idx[2]; @@ -776,6 +776,16 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->idx_count = 1; *writemask = VKD3DSP_WRITEMASK_ALL; } + else if (data_type->type == HLSL_CLASS_OBJECT && data_type->base_type == HLSL_TYPE_SAMPLER) + { + reg->type = VKD3D_SM4_RT_SAMPLER; + reg->dim = VKD3D_SM4_DIMENSION_NONE; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + reg->idx[0] = var->reg.id; + reg->idx_count = 1; + *writemask = VKD3DSP_WRITEMASK_ALL; + } else { unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref) + var->buffer_offset; @@ -1238,6 +1248,34 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_instruction(buffer, &instr); } +static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_SAMPLE; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, + &instr.srcs[1].swizzle_type, resource, resource_type); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, + &instr.srcs[2].swizzle_type, sampler, sampler->var->data_type); + + instr.src_count = 3; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) { @@ -1516,6 +1554,21 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, const struct hlsl_type *resource_type = load->resource.var->data_type; const struct hlsl_ir_node *coords = load->coords.node; + if (load->sampler.var) + { + const struct hlsl_type *sampler_type = load->sampler.var->data_type; + + assert(sampler_type->type == HLSL_CLASS_OBJECT); + assert(sampler_type->base_type == HLSL_TYPE_SAMPLER); + assert(sampler_type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC); + + if (!load->sampler.var->is_uniform) + { + hlsl_fixme(ctx, load->node.loc, "Sample using non-uniform sampler variable."); + return; + } + } + if (!load->resource.var->is_uniform) { hlsl_fixme(ctx, load->node.loc, "Load from non-uniform resource variable."); @@ -1529,7 +1582,9 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: - hlsl_fixme(ctx, load->node.loc, "Resource sample instruction."); + if (!load->sampler.var) + hlsl_fixme(ctx, load->node.loc, "SM4 combined sample expression."); + write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords); break; } }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lower scalar-to-vector casts to swizzles.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 0a4e948453ff9beef0ee04b7fb22f52cccb57fb5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0a4e948453ff9beef0ee04b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:55 2021 +0100 vkd3d-shader/hlsl: Lower scalar-to-vector casts to swizzles. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index be3d8ec..4010533 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,7 +290,6 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ - tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d3957f8..4e1d043 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -237,6 +237,43 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_free_instr(old); } +/* Lower casts from vec1 to vecN to swizzles. */ +static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_type *src_type, *dst_type; + struct hlsl_type *dst_scalar_type; + struct hlsl_ir_expr *cast; + + if (instr->type != HLSL_IR_EXPR) + return false; + cast = hlsl_ir_expr(instr); + src_type = cast->operands[0].node->data_type; + dst_type = cast->node.data_type; + + if (cast->op == HLSL_OP1_CAST + && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR + && src_type->dimx == 1) + { + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_expr *new_cast; + + dst_scalar_type = hlsl_get_scalar_type(ctx, dst_type->base_type); + /* We need to preserve the cast since it might be doing more than just + * turning the scalar into a vector. */ + if (!(new_cast = hlsl_new_cast(ctx, cast->operands[0].node, dst_scalar_type, &cast->node.loc))) + return false; + list_add_after(&cast->node.entry, &new_cast->node.entry); + if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, X, X, X), dst_type->dimx, &new_cast->node, &cast->node.loc))) + return false; + list_add_after(&new_cast->node.entry, &swizzle->node.entry); + + replace_node(&cast->node, &swizzle->node); + return true; + } + + return false; +} + struct copy_propagation_value { struct hlsl_ir_node *node; @@ -1624,6 +1661,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun append_output_var_copy(ctx, &body->instrs, entry_func->return_var); } + transform_ir(ctx, lower_broadcasts, body, NULL); while (transform_ir(ctx, fold_redundant_casts, body, NULL)); do {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lower narrowing casts to swizzles.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: a33439f1a02a55a3d5f8a6b7411dca9f19b695a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a33439f1a02a55a3d5f8a6b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:56 2021 +0100 vkd3d-shader/hlsl: Lower narrowing casts to swizzles. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 37 +++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 15 ++++++--------- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4010533..88bdc0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,7 +290,6 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ - tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4e1d043..29ced37 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -616,6 +616,42 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_type *src_type, *dst_type; + struct hlsl_type *dst_vector_type; + struct hlsl_ir_expr *cast; + + if (instr->type != HLSL_IR_EXPR) + return false; + cast = hlsl_ir_expr(instr); + src_type = cast->operands[0].node->data_type; + dst_type = cast->node.data_type; + + if (cast->op == HLSL_OP1_CAST + && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR + && dst_type->dimx < src_type->dimx) + { + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_expr *new_cast; + + dst_vector_type = hlsl_get_vector_type(ctx, dst_type->base_type, src_type->dimx); + /* We need to preserve the cast since it might be doing more than just + * narrowing the vector. */ + if (!(new_cast = hlsl_new_cast(ctx, cast->operands[0].node, dst_vector_type, &cast->node.loc))) + return false; + list_add_after(&cast->node.entry, &new_cast->node.entry); + if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), dst_type->dimx, &new_cast->node, &cast->node.loc))) + return false; + list_add_after(&new_cast->node.entry, &swizzle->node.entry); + + replace_node(&cast->node, &swizzle->node); + return true; + } + + return false; +} + static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -1669,6 +1705,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun progress |= transform_ir(ctx, split_struct_copies, body, NULL); } while (progress); + transform_ir(ctx, lower_narrowing_casts, body, NULL); do { progress = transform_ir(ctx, fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1c0fea5..a75abbc 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1298,9 +1298,8 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { const struct hlsl_type *src_type = arg1->data_type; - /* Narrowing casts need to be lowered. */ - if (src_type->dimx != expr->node.data_type->dimx) - hlsl_fixme(ctx, expr->node.loc, "Narrowing cast.\n"); + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == expr->node.data_type->dimx); switch (src_type->base_type) { @@ -1388,9 +1387,8 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { const struct hlsl_type *src_type = arg1->data_type; - /* Narrowing casts need to be lowered. */ - if (src_type->dimx != expr->node.data_type->dimx) - hlsl_fixme(ctx, expr->node.loc, "Narrowing cast."); + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == expr->node.data_type->dimx); switch (src_type->base_type) { @@ -1433,9 +1431,8 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { const struct hlsl_type *src_type = arg1->data_type; - /* Narrowing casts need to be lowered. */ - if (src_type->dimx != expr->node.data_type->dimx) - hlsl_fixme(ctx, expr->node.loc, "SM4 narrowing cast.\n"); + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == expr->node.data_type->dimx); switch (src_type->base_type) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to message reporting functions.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 943bd2fedeea431fa4d7bea0aaa506ead721ab69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=943bd2fedeea431fa4d7bea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:57 2021 +0100 vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to message reporting functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 18 ++-- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.l | 2 +- libs/vkd3d-shader/hlsl.y | 194 +++++++++++++++++++-------------------- libs/vkd3d-shader/hlsl_codegen.c | 26 +++--- libs/vkd3d-shader/hlsl_sm1.c | 8 +- libs/vkd3d-shader/hlsl_sm4.c | 32 +++---- 7 files changed, 144 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=943bd2fedeea431fa4d…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to the intrinsic handler callback.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 3ad860924746471d01563a6395e4312da9602e14 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ad860924746471d01563a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:58 2021 +0100 vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to the intrinsic handler callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 2 +- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 68 +++++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3ad860924746471d015…

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 integer negation.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: c64627313fe9288bec24dc2de3e5063c922a1f4c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c64627313fe9288bec24dc2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:14:59 2021 +0100 vkd3d-shader/hlsl: Write SM4 integer negation. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> 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_sm4.c | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 88bdc0e..934d7e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,8 +309,7 @@ XFAIL_TESTS = \ tests/sampler.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ - tests/trigonometry.shader_test \ - tests/writemask-assignop-1.shader_test + tests/trigonometry.shader_test endif if BUILD_DEMOS diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ef4a432..7f2f960 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1416,6 +1416,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Alexandre Julliard : ntdll/tests: Fix some exception test failures on Windows.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: c372d155ece56073138d4f1d9e5694433a114a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c372d155ece56073138d4f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 15:31:42 2021 +0100 ntdll/tests: Fix some exception test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1a7993c75de..2bceca204be 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4367,7 +4367,8 @@ static void test_wow64_context(void) ok( ctx.Esp == context.Rsp, "cs32: esp %08x / %p\n", ctx.Esp, (void *)context.Rsp ); ok( ctx.Eax == context.Rax, "cs32: eax %08x / %p\n", ctx.Eax, (void *)context.Rax ); ok( ctx.Ebx == context.Rbx, "cs32: ebx %08x / %p\n", ctx.Ebx, (void *)context.Rbx ); - ok( ctx.Ecx == context.Rcx, "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); + ok( ctx.Ecx == context.Rcx || broken(ctx.Ecx == (ULONG)context.Rcx), + "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); ok( ctx.Edx == context.Rdx, "cs32: edx %08x / %p\n", ctx.Edx, (void *)context.Rdx ); ok( ctx.Esi == context.Rsi, "cs32: esi %08x / %p\n", ctx.Esi, (void *)context.Rsi ); ok( ctx.Edi == context.Rdi, "cs32: edi %08x / %p\n", ctx.Edi, (void *)context.Rdi ); @@ -4402,7 +4403,6 @@ static void test_wow64_context(void) ok( res == cpu_size, "wrong len %lx\n", res ); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "cs32: got context flags %#x\n", ctx_ptr->ContextFlags); - ok(ctx_ptr->Eip != ctx.Eip, "cs32: got eip %08x / %08x\n", ctx_ptr->Eip, ctx.Eip); /* changing either context changes the actual cpu context */ rcx = context.Rcx; @@ -4447,9 +4447,11 @@ static void test_wow64_context(void) ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase, "cs64: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp, teb32.DeallocationStack, teb32.Tib.StackBase ); - ok( (void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase, - "cs64: rsp not inside 64-bit stack %p / %p-%p\n", (void *)context.Rsp, - teb.DeallocationStack, teb.Tib.StackBase ); + ok( ((void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase) || + (context.Rsp >= teb32.DeallocationStack && context.Rsp <= teb32.Tib.StackBase), + "cs64: rsp not inside stack %p / 64-bit %p-%p 32-bit %p-%p\n", (void *)context.Rsp, + teb.DeallocationStack, teb.Tib.StackBase, + ULongToPtr(teb32.DeallocationStack), ULongToPtr(teb32.Tib.StackBase) ); if (pRtlWow64GetCpuAreaInfo) { @@ -4669,7 +4671,6 @@ static void test_kiuserexceptiondispatcher(void) *(ULONG_PTR *)(hook_trampoline + 34) = (ULONG_PTR)pKiUserExceptionDispatcher; trampoline_ptr = (char *)code_mem + 1024; memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); - ok(((ULONG64)trampoline_ptr & 0xffffffff) == (ULONG64)trampoline_ptr, "Address is too long.\n"); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), PAGE_EXECUTE_READWRITE, &old_protect); @@ -8907,7 +8908,7 @@ static void test_suspend_process(void) ok(!status, "Failed to resume a process, status %#x.\n", status); ResetEvent(event2); - ret = WaitForSingleObject(event2, 200); + ret = WaitForSingleObject(event2, 1000); ok(ret == WAIT_OBJECT_0, "Wait failed.\n"); SetEvent(event);

1 0

Alexandre Julliard : ntdll/tests: Fix some directory test failures on Windows.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 1887df5cd8e86afeb21077b93b81031f75466bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1887df5cd8e86afeb21077b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:19:08 2021 +0100 ntdll/tests: Fix some directory test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 6a423174664..8a8047c6392 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -381,8 +381,9 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma if (status == STATUS_BUFFER_OVERFLOW) { ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, U(io).Status ); - ok( U(io).Information == data_size, "%u: wrong info %lx\n", class, U(io).Information ); - ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); + ok( U(io).Information == data_size || broken(!U(io).Information), /* win10 1709 */ + "%u: wrong info %lx\n", class, U(io).Information ); + if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); } else { @@ -653,11 +654,12 @@ static void test_NtQueryDirectoryFile(void) memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; - status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, + status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, (data_size + 7) & ~7, FileBothDirectoryInformation, FALSE, NULL, TRUE ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); - ok( U(io).Information == data_size, "wrong info %lx / %x\n", U(io).Information, data_size ); + ok( U(io).Information == data_size || U(io).Information == ((data_size + 7) & ~7), + "wrong info %lx / %x\n", U(io).Information, data_size ); ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "wrong offset %x\n", fbdi->NextEntryOffset ); ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength );

1 0

Alexandre Julliard : ntdll/tests: Fix some wow64 test failures on Windows.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 311c0e91c0a17504357301597acc7adcd5fc2b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=311c0e91c0a1750435730159… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 17:01:53 2021 +0100 ntdll/tests: Fix some wow64 test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index be2f2138933..9e09c60c32c 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -874,7 +874,7 @@ static void test_nt_wow64(void) ok( status == STATUS_PARTIAL_COPY || broken( status == STATUS_ACCESS_VIOLATION ), "NtWow64WriteVirtualMemory64 failed %x\n", status ); todo_wine - ok( !res, "wrong size %s\n", wine_dbgstr_longlong(res) ); + ok( !res || broken(res) /* win10 1709 */, "wrong size %s\n", wine_dbgstr_longlong(res) ); } ptr = 0x9876543210ull; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, @@ -882,7 +882,8 @@ static void test_nt_wow64(void) todo_wine ok( !status || broken( status == STATUS_CONFLICTING_ADDRESSES ), "NtWow64AllocateVirtualMemory64 failed %x\n", status ); - if (!status) ok( ptr == 0x9876540000ull, "wrong ptr %s\n", wine_dbgstr_longlong(ptr) ); + if (!status) ok( ptr == 0x9876540000ull || broken(ptr == 0x76540000), /* win 8.1 */ + "wrong ptr %s\n", wine_dbgstr_longlong(ptr) ); ptr = 0; status = pNtWow64AllocateVirtualMemory64( GetCurrentProcess(), &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); @@ -1027,15 +1028,27 @@ static void test_init_block(void) CHECK_FUNC( init_block[5], "KiUserExceptionDispatcher" ); CHECK_FUNC( init_block[6], "KiUserApcDispatcher" ); CHECK_FUNC( init_block[7], "KiUserCallbackDispatcher" ); - CHECK_FUNC( init_block[8], "ExpInterlockedPopEntrySListFault" ); - CHECK_FUNC( init_block[9], "ExpInterlockedPopEntrySListResume" ); - CHECK_FUNC( init_block[10], "ExpInterlockedPopEntrySListEnd" ); - CHECK_FUNC( init_block[11], "RtlUserThreadStart" ); - CHECK_FUNC( init_block[12], "RtlpQueryProcessDebugInformationRemote" ); - ok( init_block[13] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", - (void *)(ULONG_PTR)init_block[13], ntdll ); - CHECK_FUNC( init_block[14], "LdrSystemDllInitBlock" ); - size = 15 * sizeof(*init_block); + if (GetProcAddress( ntdll, "ExpInterlockedPopEntrySListFault" )) + { + CHECK_FUNC( init_block[8], "ExpInterlockedPopEntrySListFault" ); + CHECK_FUNC( init_block[9], "ExpInterlockedPopEntrySListResume" ); + CHECK_FUNC( init_block[10], "ExpInterlockedPopEntrySListEnd" ); + CHECK_FUNC( init_block[11], "RtlUserThreadStart" ); + CHECK_FUNC( init_block[12], "RtlpQueryProcessDebugInformationRemote" ); + ok( init_block[13] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", + (void *)(ULONG_PTR)init_block[13], ntdll ); + CHECK_FUNC( init_block[14], "LdrSystemDllInitBlock" ); + size = 15 * sizeof(*init_block); + } + else /* win10 1607 */ + { + CHECK_FUNC( init_block[8], "RtlUserThreadStart" ); + CHECK_FUNC( init_block[9], "RtlpQueryProcessDebugInformationRemote" ); + ok( init_block[10] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", + (void *)(ULONG_PTR)init_block[10], ntdll ); + CHECK_FUNC( init_block[11], "LdrSystemDllInitBlock" ); + size = 12 * sizeof(*init_block); + } break; case 0xe0: /* win10 1809 */ case 0xf0: /* win10 2004 */

1 0