June 2022 - Wine-commits - list.winehq.org

Giovanni Mascellani : tests: Test how matrix types interact with semantics.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: 41df40b4ed791f14d6157ab62251363077faa029 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41df40b4ed791f14d6157ab… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:40 2022 -0500 tests: Test how matrix types interact with semantics. 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 + tests/matrix-semantics.shader_test | 102 +++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/Makefile.am b/Makefile.am index 6e827175..bdbf8e40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/matrix-semantics.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/pow.shader_test \ diff --git a/tests/matrix-semantics.shader_test b/tests/matrix-semantics.shader_test new file mode 100644 index 00000000..1be50406 --- /dev/null +++ b/tests/matrix-semantics.shader_test @@ -0,0 +1,102 @@ +[pixel shader] +float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader] +row_major float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[require] +shader model >= 4.0 + +[render target 0] +format r32 float +size (640, 480) + +[render target 1] +format r32 float +size (640, 480) + +[render target 2] +format r32 float +size (640, 480) + +[render target 3] +format r32 float +size (640, 480) + +[pixel shader] +row_major float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe render target 0 all r (1.0) +probe render target 1 all r (2.0) +probe render target 2 all r (3.0) +probe render target 3 all r (4.0) + +[pixel shader] +float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe render target 0 all r (1.0) +probe render target 1 all r (2.0) +probe render target 2 all r (3.0) +probe render target 3 all r (4.0) + +[pixel shader fail todo] +void main(out float1x2 x : sv_target0, out float1x2 y : sv_target1) +{ + x = float2(1.0, 2.0); + y = float2(5.0, 6.0); +} + +[pixel shader] +void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) +{ + x = float2(1.0, 2.0); + y = float2(5.0, 6.0); +} + +[test] +todo draw quad +probe render target 0 all r (1.0) +probe render target 1 all r (2.0) +probe render target 2 all r (5.0) +probe render target 3 all r (6.0) + +[render target 0] +format r32g32b32a32 float +size (640, 480) + +[pixel shader] +void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float2(5.0, 6.0); +} + +[test] +todo draw quad +probe render target 0 all rgba (1.0, 2.0, 3.0, 4.0) +probe render target 1 all r (5.0) +probe render target 2 all r (6.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower matrix casts.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: 3a755cb0e2a48b2a2fd82e195dfe4ba079c7ff92 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a755cb0e2a48b2a2fd82e1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:41 2022 -0500 vkd3d-shader/hlsl: Lower matrix casts. 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> --- libs/vkd3d-shader/hlsl.y | 93 ++++++++++++++++++++++- tests/hlsl-duplicate-modifiers.shader_test | 2 +- tests/hlsl-initializer-matrix.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 8 +- tests/hlsl-shape.shader_test | 10 +-- tests/matrix-semantics.shader_test | 12 +-- 6 files changed, 106 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cf0f51f2..687569e8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -266,6 +266,9 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ return false; } +static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_node, + struct hlsl_ir_node *offset, struct hlsl_type *data_type, const struct vkd3d_shader_location loc); + static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) { @@ -275,10 +278,92 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, if (hlsl_types_are_equal(src_type, dst_type)) return node; - if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) - return NULL; - list_add_tail(instrs, &cast->node.entry); - return &cast->node; + if ((src_type->type == HLSL_CLASS_MATRIX || dst_type->type == HLSL_CLASS_MATRIX) + && src_type->type <= HLSL_CLASS_LAST_NUMERIC && dst_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + unsigned int dst_idx; + bool broadcast; + + broadcast = src_type->dimx == 1 && src_type->dimy == 1; + assert(dst_type->dimx * dst_type->dimy <= src_type->dimx * src_type->dimy || broadcast); + if (src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX && !broadcast) + { + assert(dst_type->dimx <= src_type->dimx); + assert(dst_type->dimy <= src_type->dimy); + } + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<cast-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, dst_type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return NULL; + + for (dst_idx = 0; dst_idx < dst_type->dimx * dst_type->dimy; ++dst_idx) + { + struct hlsl_type *src_scalar_type, *dst_scalar_type; + unsigned int src_idx, src_offset, dst_offset; + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + + if (broadcast) + { + src_idx = 0; + } + else + { + if (src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX) + { + unsigned int x = dst_idx % dst_type->dimx, y = dst_idx / dst_type->dimx; + + src_idx = y * src_type->dimx + x; + } + else + { + src_idx = dst_idx; + } + } + + dst_offset = hlsl_compute_component_offset(ctx, dst_type, dst_idx, &dst_scalar_type); + src_offset = hlsl_compute_component_offset(ctx, src_type, src_idx, &src_scalar_type); + + if (!(c = hlsl_new_uint_constant(ctx, src_offset, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + if (!(load = add_load(ctx, instrs, node, &c->node, src_scalar_type, *loc))) + return NULL; + + if (!(cast = hlsl_new_cast(ctx, &load->node, dst_scalar_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + + if (!(c = hlsl_new_uint_constant(ctx, dst_offset, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, &cast->node, 0, *loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + } + + if (!(load = hlsl_new_load(ctx, var, NULL, dst_type, *loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return &load->node; + } + else + { + if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + return &cast->node; + } } static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct list *instrs, diff --git a/tests/hlsl-duplicate-modifiers.shader_test b/tests/hlsl-duplicate-modifiers.shader_test index fcae12da..6491701a 100644 --- a/tests/hlsl-duplicate-modifiers.shader_test +++ b/tests/hlsl-duplicate-modifiers.shader_test @@ -7,5 +7,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl-initializer-matrix.shader_test index ea9de9c0..7e12b0a0 100644 --- a/tests/hlsl-initializer-matrix.shader_test +++ b/tests/hlsl-initializer-matrix.shader_test @@ -55,7 +55,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (21, 22, 31, 32) diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test index bf99d9cb..545340eb 100644 --- a/tests/hlsl-return-implicit-conversion.shader_test +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -15,7 +15,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -35,7 +35,7 @@ float4x1 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test index 57d59534..65cc322c 100644 --- a/tests/hlsl-shape.shader_test +++ b/tests/hlsl-shape.shader_test @@ -211,7 +211,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -235,7 +235,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -260,7 +260,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -309,7 +309,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] @@ -321,7 +321,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] diff --git a/tests/matrix-semantics.shader_test b/tests/matrix-semantics.shader_test index 1be50406..43f467ec 100644 --- a/tests/matrix-semantics.shader_test +++ b/tests/matrix-semantics.shader_test @@ -5,7 +5,7 @@ float4x1 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -15,7 +15,7 @@ row_major float1x4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) [require] @@ -44,7 +44,7 @@ row_major float4x1 main() : sv_target } [test] -todo draw quad +draw quad probe render target 0 all r (1.0) probe render target 1 all r (2.0) probe render target 2 all r (3.0) @@ -57,7 +57,7 @@ float1x4 main() : sv_target } [test] -todo draw quad +draw quad probe render target 0 all r (1.0) probe render target 1 all r (2.0) probe render target 2 all r (3.0) @@ -78,7 +78,7 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) } [test] -todo draw quad +draw quad probe render target 0 all r (1.0) probe render target 1 all r (2.0) probe render target 2 all r (5.0) @@ -96,7 +96,7 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) } [test] -todo draw quad +draw quad probe render target 0 all rgba (1.0, 2.0, 3.0, 4.0) probe render target 1 all r (5.0) probe render target 2 all r (6.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Split matrix operations.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: 62fa53f9b65486c90ca434c51a608e77ae154835 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62fa53f9b65486c90ca434c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:42 2022 -0500 vkd3d-shader/hlsl: Split matrix operations. 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> --- libs/vkd3d-shader/hlsl.y | 74 ++++++++++++++++++++++++++++++++++++++++++++ tests/hlsl-shape.shader_test | 30 +++++++++--------- 2 files changed, 89 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 687569e8..2aee5153 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1201,6 +1201,22 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct return true; } +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimx; + else + return type->dimy; +} + +static unsigned int major_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct hlsl_type *type, const struct vkd3d_shader_location *loc) @@ -1208,6 +1224,64 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_expr *expr; unsigned int i; + if (type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_type *vector_type; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<split_op-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return NULL; + + for (i = 0; i < major_size(type); i++) + { + struct hlsl_ir_node *value, *vector_operands[HLSL_MAX_OPERANDS] = { NULL }; + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + unsigned int j; + + if (!(c = hlsl_new_uint_constant(ctx, 4 * i, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + for (j = 0; j < HLSL_MAX_OPERANDS; j++) + { + if (operands[j]) + { + struct hlsl_type *vector_arg_type; + struct hlsl_ir_load *load; + + vector_arg_type = hlsl_get_vector_type(ctx, operands[j]->data_type->base_type, minor_size(type)); + + if (!(load = add_load(ctx, instrs, operands[j], &c->node, vector_arg_type, *loc))) + return NULL; + vector_operands[j] = &load->node; + } + } + + if (!(value = add_expr(ctx, instrs, op, vector_operands, vector_type, loc))) + return NULL; + + if (!(store = hlsl_new_store(ctx, var, &c->node, value, 0, *loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + } + + if (!(load = hlsl_new_load(ctx, var, NULL, type, *loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return &load->node; + } + if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) return NULL; init_node(&expr->node, HLSL_IR_EXPR, type, *loc); diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test index 65cc322c..b96f0fd2 100644 --- a/tests/hlsl-shape.shader_test +++ b/tests/hlsl-shape.shader_test @@ -93,7 +93,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] @@ -107,7 +107,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] @@ -122,7 +122,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -137,7 +137,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -152,7 +152,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] @@ -167,7 +167,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] @@ -183,7 +183,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 0.0) [pixel shader] @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (9.0, 11.0, 13.0, 0.0) [pixel shader] @@ -223,7 +223,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -247,7 +247,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -273,7 +273,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -285,7 +285,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -297,7 +297,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -336,7 +336,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -351,5 +351,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (6.0, 7.0, 8.0, 9.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse the mul() intrinsic.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: 10917a7f479b02a1313bc2e94ee904ea15ad3106 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=10917a7f479b02a1313bc2e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:43 2022 -0500 vkd3d-shader/hlsl: Parse the mul() intrinsic. 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> --- libs/vkd3d-shader/hlsl.y | 118 ++++++++++++++++++++++++++++++++ tests/hlsl-majority-pragma.shader_test | 2 +- tests/hlsl-majority-typedef.shader_test | 2 +- tests/hlsl-mul.shader_test | 36 +++++----- 4 files changed, 138 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2aee5153..df5fda47 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2046,6 +2046,123 @@ static bool intrinsic_min(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MIN, params->args[0], params->args[1], loc); } +static bool intrinsic_mul(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = params->args[0], *arg2 = params->args[1], *cast1, *cast2; + enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); + struct hlsl_type *cast_type1 = arg1->data_type, *cast_type2 = arg2->data_type, *matrix_type, *ret_type; + unsigned int i, j, k, vect_count = 0; + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (arg1->data_type->type == HLSL_CLASS_SCALAR || arg2->data_type->type == HLSL_CLASS_SCALAR) + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg1, arg2, loc); + + if (arg1->data_type->type == HLSL_CLASS_VECTOR) + { + vect_count++; + cast_type1 = hlsl_get_matrix_type(ctx, base, arg1->data_type->dimx, 1); + } + if (arg2->data_type->type == HLSL_CLASS_VECTOR) + { + vect_count++; + cast_type2 = hlsl_get_matrix_type(ctx, base, 1, arg2->data_type->dimx); + } + + matrix_type = hlsl_get_matrix_type(ctx, base, cast_type2->dimx, cast_type1->dimy); + + if (vect_count == 0) + { + ret_type = matrix_type; + } + else if (vect_count == 1) + { + assert(matrix_type->dimx == 1 || matrix_type->dimy == 1); + ret_type = hlsl_get_vector_type(ctx, base, matrix_type->dimx * matrix_type->dimy); + } + else + { + assert(matrix_type->dimx == 1 && matrix_type->dimy == 1); + ret_type = hlsl_get_scalar_type(ctx, base); + } + + if (!(cast1 = add_implicit_conversion(ctx, params->instrs, arg1, cast_type1, loc))) + return false; + + if (!(cast2 = add_implicit_conversion(ctx, params->instrs, arg2, cast_type2, loc))) + return false; + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<mul-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, matrix_type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return false; + + for (i = 0; i < matrix_type->dimx; ++i) + for (j = 0; j < matrix_type->dimy; ++j) + { + struct hlsl_ir_node *node = NULL; + struct hlsl_type *scalar_type; + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + unsigned int offset; + + for (k = 0; k < cast_type1->dimx && k < cast_type2->dimy; ++k) + { + struct hlsl_ir_load *value1, *value2; + struct hlsl_ir_node *mul; + + offset = hlsl_compute_component_offset(ctx, cast_type1, j * cast_type1->dimx + k, &scalar_type); + if (!(c = hlsl_new_uint_constant(ctx, offset, loc))) + return false; + list_add_tail(params->instrs, &c->node.entry); + + if (!(value1 = add_load(ctx, params->instrs, cast1, &c->node, scalar_type, *loc))) + return false; + + offset = hlsl_compute_component_offset(ctx, cast_type2, k * cast_type2->dimx + i, &scalar_type); + if (!(c = hlsl_new_uint_constant(ctx, offset, loc))) + return false; + list_add_tail(params->instrs, &c->node.entry); + + if (!(value2 = add_load(ctx, params->instrs, cast2, &c->node, scalar_type, *loc))) + return false; + + if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &value1->node, &value2->node, loc))) + return false; + + if (node) + { + if (!(node = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, node, mul, loc))) + return false; + } + else + { + node = mul; + } + } + + offset = hlsl_compute_component_offset(ctx, matrix_type, j * matrix_type->dimx + i, &scalar_type); + if (!(c = hlsl_new_uint_constant(ctx, offset, loc))) + return false; + list_add_tail(params->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, *loc))) + return false; + list_add_tail(params->instrs, &store->node.entry); + } + + if (!(load = hlsl_new_load(ctx, var, NULL, matrix_type, *loc))) + return false; + list_add_tail(params->instrs, &load->node.entry); + + return !!add_implicit_conversion(ctx, params->instrs, &load->node, ret_type, loc); +} + static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2106,6 +2223,7 @@ intrinsic_functions[] = {"floor", 1, true, intrinsic_floor}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, + {"mul", 2, true, intrinsic_mul}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index a9f917ff..e7fc75cd 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -17,5 +17,5 @@ uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 uniform 8 float4 0.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-majority-typedef.shader_test b/tests/hlsl-majority-typedef.shader_test index 192c96db..1460e9a0 100644 --- a/tests/hlsl-majority-typedef.shader_test +++ b/tests/hlsl-majority-typedef.shader_test @@ -18,5 +18,5 @@ uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 uniform 8 float4 0.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test index 1d137e69..7b453187 100644 --- a/tests/hlsl-mul.shader_test +++ b/tests/hlsl-mul.shader_test @@ -12,7 +12,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] @@ -28,7 +28,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] @@ -44,7 +44,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (14.0, 38.0, 62.0, 86.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (38.0, 44.0, 50.0, 56.0) [pixel shader] @@ -75,7 +75,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (14.0, 32.0, 50.0, 0.0) [pixel shader] @@ -90,7 +90,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (30.0, 36.0, 42.0, 0.0) [pixel shader] @@ -106,7 +106,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] @@ -122,7 +122,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] @@ -138,7 +138,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] @@ -154,7 +154,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] @@ -170,7 +170,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] @@ -186,7 +186,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] @@ -202,7 +202,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] @@ -218,7 +218,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (5.0, 10.0, 15.0, 20.0) [pixel shader] @@ -234,7 +234,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -250,7 +250,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] @@ -268,7 +268,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (83.0, 98.0, 113.0, 128.0) [pixel shader] @@ -286,5 +286,5 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (78.0, 96.0, 114.0, 0.0)

1 0

Jacek Caban : user32: Remove no longer needed helpers.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: eae27293ba5153b8efd3d2e5c0d103c88c3b13b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae27293ba5153b8efd3d2e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 23:33:24 2022 +0200 user32: Remove no longer needed helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 18 ------------------ dlls/user32/win.c | 2 +- dlls/user32/win.h | 6 +----- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index eeef0d57f62..d0c1cc616a7 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -42,24 +42,6 @@ static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); -/*********************************************************************** - * USER_Lock - */ -void USER_Lock(void) -{ - NtUserCallOneParam( 0, NtUserLock ); -} - - -/*********************************************************************** - * USER_Unlock - */ -void USER_Unlock(void) -{ - NtUserCallOneParam( 1, NtUserLock ); -} - - /*********************************************************************** * USER_CheckNotLock * diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9b9dde82561..bac75063f7d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -54,7 +54,7 @@ void *get_user_handle_ptr( HANDLE handle, unsigned int type ) void release_user_handle_ptr( void *ptr ) { assert( ptr && ptr != OBJ_OTHER_PROCESS ); - USER_Unlock(); + NtUserCallOneParam( 1, NtUserLock ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index dfa5fdf3283..9d42aef6645 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -48,14 +48,10 @@ extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ) DECLSPEC_HIDDEN; extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK access ) DECLSPEC_HIDDEN; -/* user lock */ -extern void USER_Lock(void) DECLSPEC_HIDDEN; -extern void USER_Unlock(void) DECLSPEC_HIDDEN; - /* to release pointers retrieved by WIN_GetPtr */ static inline void WIN_ReleasePtr( WND *ptr ) { - USER_Unlock(); + release_user_handle_ptr( ptr ); } extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Cap the maximum reported VRAM, not the current reported VRAM.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 8c1c83dfdf73096312df7d8225d304dece057fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c1c83dfdf73096312df7d82… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 7 16:32:57 2022 -0500 wined3d: Cap the maximum reported VRAM, not the current reported VRAM. That is, subtract the currently used memory from the capped maximum, so that creating textures will report that available VRAM has decreased. Drivers on Windows seem to match this behaviour (at least NVidia and WARP), although they vary on where the cap is set. This fixes test failures in test_vidmem_accounting() for cards with over 4 GiB of VRAM. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c6a6de93123..f264494cb5f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1482,7 +1482,7 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device wine_dbgstr_longlong(device->adapter->vram_bytes_used), wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->vram_bytes_used)); - return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used); + return min(UINT_MAX, driver_info->vram_bytes) - device->adapter->vram_bytes_used; } struct wined3d_buffer * CDECL wined3d_device_context_get_stream_output(struct wined3d_device_context *context,

1 0

Alexandre Julliard : kernelbase: Add NORM_IGNORENONSPACE support in LCMapStringEx().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 5dee0ed75502e0295d09e39d8a80d02954702212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dee0ed75502e0295d09e39d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 14:57:20 2022 +0200 kernelbase: Add NORM_IGNORENONSPACE support in LCMapStringEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36720 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 17 ++++++++++++++ dlls/kernelbase/locale.c | 54 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9bd922dff98..9108942b8cc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2462,6 +2462,11 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f const static WCHAR cjk_compat_result[] = { 0x523b, 0x5246, 0x5272, 0x5277, 0x3515, 0x52c7, 0x52c9, 0x52e4, 0 }; + const static WCHAR accents_text[] = { + 0x00e0, 0x00e7, ' ', 0x00e9, ',', 0x00ee, 0x00f1, '/', 0x00f6, 0x00fb, 0x00fd, '!', 0 + }; + const static WCHAR accents_result[] = L"ac e,in/ouy!"; + const static WCHAR accents_result2[] = L"aceinouy"; int ret, ret2, i; WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; @@ -2703,6 +2708,12 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(lower_case) + 1, ret); ok(!lstrcmpW(buf, lower_case), "%s string comparison mismatch\n", func_name); + lstrcpyW(buf, fooW); + ret = func_ptr(NORM_IGNORENONSPACE, accents_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(buf) + 1, "%s func_ptr should return %d, ret = %d\n", func_name, + lstrlenW(buf) + 1, ret); + ok(!lstrcmpW(buf, accents_result), "%s string comparison mismatch %s\n", func_name, debugstr_w(buf)); + /* test NORM_IGNORESYMBOLS */ lstrcpyW(buf, fooW); ret = func_ptr(NORM_IGNORESYMBOLS, lower_case, -1, buf, ARRAY_SIZE(buf)); @@ -2717,6 +2728,12 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(symbols_stripped) + 1, ret); ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + lstrcpyW(buf, fooW); + ret = func_ptr(NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE, accents_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(buf) + 1, "%s func_ptr should return %d, ret = %d\n", func_name, + lstrlenW(buf) + 1, ret); + ok(!lstrcmpW(buf, accents_result2), "%s string comparison mismatch %s\n", func_name, debugstr_w(buf)); + /* test small buffer */ lstrcpyW(buf, fooW); ret = func_ptr(LCMAP_SORTKEY, lower_case, -1, buf, 2); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 6995209e30c..257d9f693ba 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4023,6 +4023,52 @@ static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, return pos; } + +static inline int nonspace_ignored( WCHAR ch ) +{ + if (get_char_type( CT_CTYPE2, ch ) != C2_OTHERNEUTRAL) return FALSE; + return (get_char_type( CT_CTYPE3, ch ) & (C3_NONSPACING | C3_DIACRITIC)); +} + +/* remove ignored chars for NORM_IGNORENONSPACE/NORM_IGNORESYMBOLS */ +static int map_remove_ignored( DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + int pos; + + for (pos = 0; srclen; src++, srclen--) + { + if (flags & NORM_IGNORESYMBOLS) + { + if (get_char_type( CT_CTYPE1, *src ) & C1_PUNCT) continue; + if (get_char_type( CT_CTYPE3, *src ) & C3_SYMBOL) continue; + } + if (flags & NORM_IGNORENONSPACE) + { + WCHAR buffer[8]; + const WCHAR *decomp; + unsigned int i, j, len; + + if ((decomp = get_decomposition( *src, &len )) && len > 1) + { + for (i = j = 0; i < len; i++) + if (!nonspace_ignored( decomp[i] )) buffer[j++] = decomp[i]; + + if (i > j) /* something was removed */ + { + if (pos + j <= dstlen) memcpy( dst + pos, buffer, j * sizeof(WCHAR) ); + pos += j; + continue; + } + } + else if (nonspace_ignored( *src )) continue; + } + if (pos < dstlen) dst[pos] = *src; + pos++; + } + return pos; +} + + /* map full-width characters to single or double half-width characters. */ static int map_to_halfwidth( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { @@ -4124,13 +4170,7 @@ static int lcmap_string( const struct sortguid *sortid, DWORD flags, SetLastError( ERROR_INVALID_FLAGS ); return 0; } - for (ret = 0; srclen; src++, srclen--) - { - if ((flags & NORM_IGNORESYMBOLS) && (get_char_type( CT_CTYPE1, *src ) & (C1_PUNCT | C1_SPACE))) - continue; - if (ret < dstlen) dst[ret] = *src; - ret++; - } + ret = map_remove_ignored( flags, src, srclen, dst, dstlen ); break; case 0: if (case_table)

1 0

Paul Gofman : winhttp: Keep task in queue until completion.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 5d2f2797e32f84993e898c18cd422e2a0514ba3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2f2797e32f84993e898c18… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 21:49:07 2022 -0500 winhttp: Keep task in queue until completion. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fe703c19109..9abe4f45598 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -135,15 +135,16 @@ void stop_queue( struct queue *queue ) TRACE("stopped %p\n", queue); } -static struct task_header *get_next_task( struct queue *queue ) +static struct task_header *get_next_task( struct queue *queue, struct task_header *prev_task ) { struct list *entry; AcquireSRWLockExclusive( &queue->lock ); assert( queue->callback_running ); - if ((entry = list_head( &queue->queued_tasks ))) - list_remove( entry ); - else + if (prev_task) + list_remove( &prev_task->entry ); + + if (!(entry = list_head( &queue->queued_tasks ))) queue->callback_running = FALSE; ReleaseSRWLockExclusive( &queue->lock ); if (!entry) return NULL; @@ -157,12 +158,12 @@ static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) TRACE( "instance %p.\n", instance ); - task = get_next_task( queue ); + task = get_next_task( queue, NULL ); while (task) { task->callback( task ); /* Queue object may be freed by release_object() unless there is another task referencing it. */ - next_task = get_next_task( queue ); + next_task = get_next_task( queue, task ); release_object( task->obj ); free( task ); task = next_task;

1 0

Paul Gofman : winhttp: Implement reference counting for tasks.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 3d199dd92ea8d74925371c9fc375b85436206972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d199dd92ea8d74925371c9f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 21:52:22 2022 -0500 winhttp: Implement reference counting for tasks. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 32 +++++++++++++++++++++++++++----- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9abe4f45598..70d727c7e2e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -135,20 +135,41 @@ void stop_queue( struct queue *queue ) TRACE("stopped %p\n", queue); } +static void addref_task( struct task_header *task ) +{ + InterlockedIncrement( &task->refs ); +} + +static void release_task( struct task_header *task ) +{ + if (!InterlockedDecrement( &task->refs )) + free( task ); +} + static struct task_header *get_next_task( struct queue *queue, struct task_header *prev_task ) { + struct task_header *task; struct list *entry; AcquireSRWLockExclusive( &queue->lock ); assert( queue->callback_running ); if (prev_task) + { list_remove( &prev_task->entry ); - - if (!(entry = list_head( &queue->queued_tasks ))) + release_task( prev_task ); + } + if ((entry = list_head( &queue->queued_tasks ))) + { + task = LIST_ENTRY( entry, struct task_header, entry ); + addref_task( task ); + } + else + { + task = NULL; queue->callback_running = FALSE; + } ReleaseSRWLockExclusive( &queue->lock ); - if (!entry) return NULL; - return LIST_ENTRY( entry, struct task_header, entry ); + return task; } static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) @@ -165,7 +186,7 @@ static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) /* Queue object may be freed by release_object() unless there is another task referencing it. */ next_task = get_next_task( queue, task ); release_object( task->obj ); - free( task ); + release_task( task ); task = next_task; } TRACE( "instance %p exiting.\n", instance ); @@ -178,6 +199,7 @@ static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_he TRACE("queueing %p in %p\n", task_hdr, queue); task_hdr->callback = task; + task_hdr->refs = 1; task_hdr->obj = obj; addref_object( obj ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 4754d9258d1..ee3cdb78157 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -281,6 +281,7 @@ struct task_header struct list entry; TASK_CALLBACK callback; struct object_header *obj; + volatile LONG refs; }; struct send_request

1 0

Paul Gofman : winhttp: Fix dwResult field in websocket receive error result.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 66ff3594c4f6d84b9437a247d411562e65c133c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ff3594c4f6d84b9437a247… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 22:01:45 2022 -0500 winhttp: Fix dwResult field in websocket receive error result. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 70d727c7e2e..29887c8d7d0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3839,6 +3839,25 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD return ret; } +static void socket_receive_complete( struct socket *socket, DWORD ret, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, DWORD len ) +{ + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = len; + status.eBufferType = type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = 0; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } +} + static void task_socket_receive( void *ctx ) { struct socket_receive *r = ctx; @@ -3850,23 +3869,7 @@ static void task_socket_receive( void *ctx ) ret = socket_receive( socket, r->buf, r->len, &count, &type ); if (receive_io_complete( socket )) - { - if (!ret) - { - WINHTTP_WEB_SOCKET_STATUS status; - status.dwBytesTransferred = count; - status.eBufferType = type; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); - } - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_READ_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } + socket_receive_complete( socket, ret, type, count ); } DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *ret_len,

1 0