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

Louis Lenders : wbemprox: Add ProductType to win32_operatingsystem class.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 733dc15bae32ce88d324ee221860f2a0e3e5d347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=733dc15bae32ce88d324ee22… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 14 21:22:51 2021 +0100 wbemprox: Add ProductType to win32_operatingsystem class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50805 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index dbf9173d21d..3922331f650 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -247,6 +247,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, + { L"ProductType", CIM_UINT32 }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -659,6 +660,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; int primary; + UINT32 producttype; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3574,6 +3576,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; + rec->producttype = 1; rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f650418e51f..a79bc759bea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1299,6 +1299,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); + check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 );

1 0

Zebediah Figura : vkd3d-shader: Lower preincrement and predecrement to assignment operations at parse time.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: vkd3d Branch: master Commit: 1cd208fb32ccf928873db8a3517f131fb49ec583 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1cd208fb32ccf928873db8a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 9 19:42:47 2021 -0600 vkd3d-shader: Lower preincrement and predecrement to assignment operations at parse time. 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 | 2 -- libs/vkd3d-shader/hlsl.h | 2 -- libs/vkd3d-shader/hlsl.y | 28 ++++++++++++++++++++++------ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e78f05c..2312b9d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -983,8 +983,6 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) "sat", - "pre++", - "pre--", "post++", "post--", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7673440..b64ce2d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -276,8 +276,6 @@ enum hlsl_ir_expr_op HLSL_IR_UNOP_SAT, - HLSL_IR_UNOP_PREINC, - HLSL_IR_UNOP_PREDEC, HLSL_IR_UNOP_POSTINC, HLSL_IR_UNOP_POSTDEC, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a9c9dd0..95a2ed6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1348,6 +1348,22 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in return &copy->node; } +static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrement, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *lhs = node_from_list(instrs); + struct hlsl_ir_constant *one; + + if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, + "Argument to pre%screment operator is const.", decrement ? "de" : "in"); + + if (!(one = hlsl_new_uint_constant(ctx, 1, loc))) + return false; + list_add_tail(instrs, &one->node.entry); + + return !!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node); +} + static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -2785,21 +2801,21 @@ unary_expr: postfix_expr | OP_INC unary_expr { - if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) + if (!add_increment(ctx, $2, false, @1)) { - hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); + hlsl_free_instr_list($2); YYABORT; } - $$ = append_unop($2, hlsl_new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), @1)); + $$ = $2; } | OP_DEC unary_expr { - if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) + if (!add_increment(ctx, $2, true, @1)) { - hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); + hlsl_free_instr_list($2); YYABORT; } - $$ = append_unop($2, hlsl_new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), @1)); + $$ = $2; } | unary_op unary_expr {

1 0

Zebediah Figura : vkd3d-shader: Lower postincrement and postdecrement to assignment operations at parse time.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: vkd3d Branch: master Commit: 363a4334e922352f00212f48e8be6c7bcc7bde68 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=363a4334e922352f00212f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 9 19:42:48 2021 -0600 vkd3d-shader: Lower postincrement and postdecrement to assignment operations at parse time. 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 --- libs/vkd3d-shader/hlsl.h | 3 --- libs/vkd3d-shader/hlsl.y | 53 +++++++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 2312b9d..19c0e2e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -983,9 +983,6 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) "sat", - "post++", - "post--", - "+", "-", "*", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b64ce2d..5a2f6af 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -276,9 +276,6 @@ enum hlsl_ir_expr_op HLSL_IR_UNOP_SAT, - HLSL_IR_UNOP_POSTINC, - HLSL_IR_UNOP_POSTDEC, - HLSL_IR_BINOP_ADD, HLSL_IR_BINOP_SUB, HLSL_IR_BINOP_MUL, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 95a2ed6..815aac9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1348,20 +1348,39 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in return &copy->node; } -static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrement, struct vkd3d_shader_location loc) +static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrement, bool post, + struct vkd3d_shader_location loc) { struct hlsl_ir_node *lhs = node_from_list(instrs); struct hlsl_ir_constant *one; if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, - "Argument to pre%screment operator is const.", decrement ? "de" : "in"); + "Argument to %s%screment operator is const.", post ? "post" : "pre", decrement ? "de" : "in"); if (!(one = hlsl_new_uint_constant(ctx, 1, loc))) return false; list_add_tail(instrs, &one->node.entry); - return !!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node); + if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node)) + return false; + + if (post) + { + struct hlsl_ir_expr *copy; + + /* Use a cast to the same type as a makeshift identity expression. */ + if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc))) + return false; + list_add_tail(instrs, &copy->node.entry); + + /* Post increment/decrement expressions are considered const. */ + if (!(copy->node.data_type = hlsl_type_clone(ctx, copy->node.data_type, 0))) + return false; + copy->node.data_type->modifiers |= HLSL_MODIFIER_CONST; + } + + return true; } static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, @@ -2624,33 +2643,21 @@ postfix_expr: primary_expr | postfix_expr OP_INC { - struct hlsl_ir_node *inc; - - if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) + if (!add_increment(ctx, $1, false, true, @2)) { - hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); + hlsl_free_instr_list($1); YYABORT; } - inc = hlsl_new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), @2); - /* Post increment/decrement expressions are considered const */ - inc->data_type = hlsl_type_clone(ctx, inc->data_type, 0); - inc->data_type->modifiers |= HLSL_MODIFIER_CONST; - $$ = append_unop($1, inc); + $$ = $1; } | postfix_expr OP_DEC { - struct hlsl_ir_node *inc; - - if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) + if (!add_increment(ctx, $1, true, true, @2)) { - hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); + hlsl_free_instr_list($1); YYABORT; } - inc = hlsl_new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), @2); - /* Post increment/decrement expressions are considered const */ - inc->data_type = hlsl_type_clone(ctx, inc->data_type, 0); - inc->data_type->modifiers |= HLSL_MODIFIER_CONST; - $$ = append_unop($1, inc); + $$ = $1; } | postfix_expr '.' any_identifier { @@ -2801,7 +2808,7 @@ unary_expr: postfix_expr | OP_INC unary_expr { - if (!add_increment(ctx, $2, false, @1)) + if (!add_increment(ctx, $2, false, false, @1)) { hlsl_free_instr_list($2); YYABORT; @@ -2810,7 +2817,7 @@ unary_expr: } | OP_DEC unary_expr { - if (!add_increment(ctx, $2, true, @1)) + if (!add_increment(ctx, $2, true, false, @1)) { hlsl_free_instr_list($2); YYABORT;

1 0

Zebediah Figura : tests: Add some tests for fused assignment operations with writemasks.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: vkd3d Branch: master Commit: 80cac66b6ff958c5875ccf0a435ea53d61e5a66f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=80cac66b6ff958c5875ccf0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 19:42:50 2021 -0600 tests: Add some tests for fused assignment operations with writemasks. 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 | 12 ++++++++++-- tests/writemask-assignop-0.shader_test | 15 +++++++++++++++ tests/writemask-assignop-1.shader_test | 16 ++++++++++++++++ tests/writemask-assignop-2.shader_test | 13 +++++++++++++ tests/writemask-assignop-3.shader_test | 11 +++++++++++ 5 files changed, 65 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a412194..a79ad02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,11 @@ vkd3d_shader_tests = \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ tests/swizzle-7.shader_test \ - tests/trigonometry.shader_test + tests/trigonometry.shader_test \ + tests/writemask-assignop-0.shader_test \ + tests/writemask-assignop-1.shader_test \ + tests/writemask-assignop-2.shader_test \ + tests/writemask-assignop-3.shader_test vkd3d_test_headers = \ tests/d3d12_crosstest.h \ @@ -267,7 +271,11 @@ XFAIL_TESTS = \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ tests/swizzle-7.shader_test \ - tests/trigonometry.shader_test + tests/trigonometry.shader_test \ + tests/writemask-assignop-0.shader_test \ + tests/writemask-assignop-1.shader_test \ + tests/writemask-assignop-2.shader_test \ + tests/writemask-assignop-3.shader_test endif if BUILD_DEMOS diff --git a/tests/writemask-assignop-0.shader_test b/tests/writemask-assignop-0.shader_test new file mode 100644 index 0000000..374a38b --- /dev/null +++ b/tests/writemask-assignop-0.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +uniform float4 color; + +float4 main() : SV_target +{ + float4 ret = color; + ret.zw += float2(0.5, 0.3); + ret.yx -= float2(0.1, 0.5); + return ret; +} + +[test] +uniform 0 float4 0.0303 0.08 0.07 0.0202 +draw quad +probe all rgba (-0.4697, -0.02, 0.57, 0.3202) 2 diff --git a/tests/writemask-assignop-1.shader_test b/tests/writemask-assignop-1.shader_test new file mode 100644 index 0000000..6199325 --- /dev/null +++ b/tests/writemask-assignop-1.shader_test @@ -0,0 +1,16 @@ +[pixel shader] +uniform float4 color; + +float4 main() : SV_target +{ + float4 ret = color; + ret.zwx.yzx.xz += float2(0.4, 0.2); + ret.xzyw.wzx.xz.y.x -= 0.6; + ret.yxwz.yxwz *= -1; + return ret; +} + +[test] +uniform 0 float4 0.0303 0.08 0.07 0.0202 +draw quad +probe all rgba (0.5697, -0.08, -0.27, -0.4202) diff --git a/tests/writemask-assignop-2.shader_test b/tests/writemask-assignop-2.shader_test new file mode 100644 index 0000000..4e905e6 --- /dev/null +++ b/tests/writemask-assignop-2.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(2, 2, 2, 2); + ret.yxz.yx += float2(0.1, 0.2); + ret.w.x -= 0.3; + ret.wzyx.zyx.yx.x *= 0.4; + return ret; +} + +[test] +draw quad +probe all rgba (2.1, 2.2, 0.8, 1.7) diff --git a/tests/writemask-assignop-3.shader_test b/tests/writemask-assignop-3.shader_test new file mode 100644 index 0000000..90957cb --- /dev/null +++ b/tests/writemask-assignop-3.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(2, 2, 2, 2); + ret.xyzw.xyzw -= float4(0.1, 0.2, 0.3, 0.4); + return ret; +} + +[test] +draw quad +probe all rgba (1.9, 1.8, 1.7, 1.6)

1 0

Zebediah Figura : vkd3d-shader: Build fused assignment operations before unwrapping swizzles from the LHS.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: vkd3d Branch: master Commit: 1aca2016510526fcaf9b248de7f07d93a8971686 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1aca2016510526fcaf9b248… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 19:42:49 2021 -0600 vkd3d-shader: Build fused assignment operations before unwrapping swizzles from the LHS. 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 | 54 ++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 815aac9..6fceafb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1259,12 +1259,22 @@ static bool invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsig static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { + struct hlsl_type *lhs_type = lhs->data_type; struct hlsl_ir_assignment *assign; - struct hlsl_type *lhs_type; struct hlsl_ir_expr *copy; DWORD writemask = 0; - lhs_type = lhs->data_type; + if (assign_op != ASSIGN_OP_ASSIGN) + { + enum hlsl_ir_expr_op op = op_from_assignment(assign_op); + struct hlsl_ir_node *args[3] = {lhs, rhs}; + struct hlsl_ir_expr *expr; + + if (!(expr = add_expr(ctx, instrs, op, args, &rhs->loc))) + return NULL; + rhs = &expr->node; + } + if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) { writemask = (1 << lhs_type->dimx) - 1; @@ -1278,8 +1288,6 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in while (lhs->type != HLSL_IR_LOAD) { - struct hlsl_ir_node *lhs_inner; - if (lhs->type == HLSL_IR_EXPR && hlsl_ir_expr(lhs)->op == HLSL_IR_UNOP_CAST) { FIXME("Cast on the lhs.\n"); @@ -1288,29 +1296,28 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } else if (lhs->type == HLSL_IR_SWIZZLE) { - struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(lhs); - const struct hlsl_type *swizzle_type = swizzle->node.data_type; - unsigned int width; + struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(lhs), *new_swizzle; + unsigned int width, s = swizzle->swizzle; if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); - lhs_inner = swizzle->val.node; - hlsl_src_remove(&swizzle->val); - list_remove(&lhs->entry); - - list_add_after(&rhs->entry, &lhs->entry); - hlsl_src_from_node(&swizzle->val, rhs); - if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) + if (!invert_swizzle(&s, &writemask, &width)) { hlsl_error(ctx, lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK, "Invalid writemask."); vkd3d_free(assign); return NULL; } - assert(swizzle_type->type == HLSL_CLASS_VECTOR); - if (swizzle_type->dimx != width) - swizzle->node.data_type = ctx->builtin_types.vector[swizzle_type->base_type][width - 1]; - rhs = &swizzle->node; + + if (!(new_swizzle = hlsl_new_swizzle(ctx, s, width, rhs, &swizzle->node.loc))) + { + vkd3d_free(assign); + return NULL; + } + list_add_tail(instrs, &new_swizzle->node.entry); + + lhs = swizzle->val.node; + rhs = &new_swizzle->node; } else { @@ -1318,23 +1325,12 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in vkd3d_free(assign); return NULL; } - - lhs = lhs_inner; } init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, lhs->loc); assign->writemask = writemask; assign->lhs.var = hlsl_ir_load(lhs)->src.var; hlsl_src_from_node(&assign->lhs.offset, hlsl_ir_load(lhs)->src.offset.node); - if (assign_op != ASSIGN_OP_ASSIGN) - { - enum hlsl_ir_expr_op op = op_from_assignment(assign_op); - struct hlsl_ir_node *expr; - - expr = hlsl_new_binary_expr(op, lhs, rhs); - list_add_after(&rhs->entry, &expr->entry); - rhs = expr; - } hlsl_src_from_node(&assign->rhs, rhs); list_add_tail(instrs, &assign->node.entry);

1 0

Zebediah Figura : vkd3d-shader: Don't use assignment instructions as sources.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: vkd3d Branch: master Commit: 5f66257b8b79da142489495f65e9d1b57e0e54a4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f66257b8b79da142489495… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 9 19:42:46 2021 -0600 vkd3d-shader: Don't use assignment instructions as sources. 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ce4bd62..a9c9dd0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1261,6 +1261,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in { struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; + struct hlsl_ir_expr *copy; DWORD writemask = 0; lhs_type = lhs->data_type; @@ -1321,7 +1322,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in lhs = lhs_inner; } - init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, lhs->loc); assign->writemask = writemask; assign->lhs.var = hlsl_ir_load(lhs)->src.var; hlsl_src_from_node(&assign->lhs.offset, hlsl_ir_load(lhs)->src.offset.node); @@ -1337,7 +1338,14 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in hlsl_src_from_node(&assign->rhs, rhs); list_add_tail(instrs, &assign->node.entry); - return &assign->node; + /* Don't use the instruction itself as a source, as this makes structure + * splitting easier. Instead copy it here. Since we retrieve sources from + * the last instruction in the list, we do need to copy. Use a cast + * instruction to the same type as a makeshift identity expression. */ + if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + return NULL; + list_add_tail(instrs, &copy->node.entry); + return &copy->node; } static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var,

1 0

Francois Gouget : testbot/TestLauncher: Simplify waiting for the test process.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: tools Branch: master Commit: e549044d4e5de6bc7368b6b81f2017a05aa535a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e549044d4e5de6bc7368b6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:15:33 2021 +0100 testbot/TestLauncher: Simplify waiting for the test process. There is no point waiting again after terminating the process. Make sure to report the WaitForSingleObject() status if the process exit code is not available. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 48 +++++++++------------------------ 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 02acde0..bfc9f0f 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -3,6 +3,7 @@ * Verifies that the dlls needed for the test are present. * * Copyright 2009 Ge van Geldorp + * Copyright 2012-2021 Francois Gouget * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -295,9 +296,8 @@ int main(int argc, char *argv[]) int CommandLen; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; - DWORD WaitStatus; DWORD ExitCode; - + TimeOut = INFINITE; CommandLine = NULL; Arg = 1; @@ -401,54 +401,32 @@ int main(int argc, char *argv[]) fprintf(stderr, "CreateProcess failed with error %lu\n", GetLastError()); exit(1); } - CloseHandle(ProcessInformation.hThread); - WaitStatus = WaitForSingleObject(ProcessInformation.hProcess, TimeOut); - if (WaitStatus != WAIT_OBJECT_0) + + ExitCode = WaitForSingleObject(ProcessInformation.hProcess, TimeOut); + if (ExitCode != WAIT_OBJECT_0) { - switch(WaitStatus) + switch (ExitCode) { case WAIT_FAILED: fprintf(stderr, "Wait for child failed, error %lu\n", GetLastError()); break; case WAIT_TIMEOUT: + /* The 'exit code' on the done line identifies timeouts */ break; default: - fprintf(stderr, "Unexpected return value %lu from wait for child\n", WaitStatus); - break; - } - - ExitCode = WaitStatus; - if (! TerminateProcess(ProcessInformation.hProcess, 257)) - fprintf(stderr, "TerminateProcess failed with error %lu\n", GetLastError()); - - switch (WaitForSingleObject(ProcessInformation.hProcess, 5000)) - { - case WAIT_OBJECT_0: - break; - - case WAIT_FAILED: - fprintf(stderr, "Wait for terminate failed, error %lu\n", GetLastError()); - break; - - case WAIT_TIMEOUT: - fprintf(stderr, "Can't kill child\n"); - break; - - default: - fprintf(stderr, "Unexpected return value %lu from wait for terminate\n", WaitStatus); + fprintf(stderr, "Unexpected return value %lu from wait for child\n", ExitCode); break; } + if (!TerminateProcess(ProcessInformation.hProcess, 257)) + fprintf(stderr, "TerminateProcess failed, error %lu\n", GetLastError()); } - else + else if (!GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { - if (! GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) - { - ExitCode = 259; - fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); - } + fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); + ExitCode = 259; } CloseHandle(ProcessInformation.hProcess);

1 0

Francois Gouget : winetest/dissect: Match additional and new dll 'version' errors.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: tools Branch: master Commit: 173d975b768fa0d7935741eba8a8714d9edbc22f URL: https://source.winehq.org/git/tools.git/?a=commit;h=173d975b768fa0d7935741e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:28:31 2021 +0100 winetest/dissect: Match additional and new dll 'version' errors. WineTest.exe now issues more specific errors when it cannot determine a dll's version. Also match the old version error messages that were ignored. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 919b17a..dbbbe6b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -426,8 +426,10 @@ while ($line = <IN> || "") last if ($line !~ /^\s+([^ =]+)=(.*?)\r?$/); my ($dll, $info) = ($1, $2); $dllinfo{$dll} = { version => $info }; - if ($info eq "dll is missing" or $info eq "dll is a stub" or - $info =~ /^load error/) + if ($info =~ /^dll is (?:missing|native|a stub)/ or + $info =~ /^(?:load error|version error \d+|version not (?:found|present))$/ or + # For compatibility with old WineTest versions + $info =~ /^(?:failed|unknown|version not available)$/) { print SUM "- $dll - missing - - - - -\n"; }

1 0

Francois Gouget : testbot/TestLauncher: Rename countof() to ARRAY_SIZE().
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: tools Branch: master Commit: 94c311cd482c7dac5bd961ad7e2c3ef0282dd856 URL: https://source.winehq.org/git/tools.git/?a=commit;h=94c311cd482c7dac5bd961a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:15:26 2021 +0100 testbot/TestLauncher: Rename countof() to ARRAY_SIZE(). This matches the Wine code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 783dbab..02acde0 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -23,7 +23,7 @@ #include <errno.h> #include <windows.h> -#define countof(Array) (sizeof(Array) / sizeof(Array[0])) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) static unsigned Failures = 0; static unsigned Skips = 0; @@ -324,7 +324,7 @@ int main(int argc, char *argv[]) } else { - if (GetFullPathNameA(argv[Arg], countof(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) + if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { fprintf(stderr, "Can't determine full path of test executable %s, error %lu\n", argv[Arg], GetLastError());

1 0

Francois Gouget : testbot/TestLauncher: Fix the detection of test executable dependencies.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: tools Branch: master Commit: feeea5ba4825a98aac577bf24b176697a22bd8cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=feeea5ba4825a98aac577bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:15:39 2021 +0100 testbot/TestLauncher: Fix the detection of test executable dependencies. Detect the critical error dialog that pops up when the test executable depends on a missing dll or entry point. This improves the diagnostic messages and avoids long timeouts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31609 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32216 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 341 +++++++++----------------------- 1 file changed, 92 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=feeea5ba4825a98aac5…

1 0