July 2023 - Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Support fine derivates.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: e4d94d955c6d78f659444eb700ea9b26b910bdb3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4d94d955c6d78f659444eb700ea9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 19 16:05:36 2023 -0400 vkd3d-shader/hlsl: Support fine derivates. --- libs/vkd3d-shader/hlsl.c | 2 ++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ libs/vkd3d-shader/tpf.c | 10 ++++++++++ tests/hlsl/ddxddy.shader_test | 4 ++-- 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e959435a..4e9af15c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2340,8 +2340,10 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_COS_REDUCED] = "cos_reduced", [HLSL_OP1_DSX] = "dsx", [HLSL_OP1_DSX_COARSE] = "dsx_coarse", + [HLSL_OP1_DSX_FINE] = "dsx_fine", [HLSL_OP1_DSY] = "dsy", [HLSL_OP1_DSY_COARSE] = "dsy_coarse", + [HLSL_OP1_DSY_FINE] = "dsy_fine", [HLSL_OP1_EXP2] = "exp2", [HLSL_OP1_FRACT] = "fract", [HLSL_OP1_LOG2] = "log2", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3caf15ab..f102657d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -503,8 +503,10 @@ enum hlsl_ir_expr_op HLSL_OP1_COS_REDUCED, /* Reduced range [-pi, pi] */ HLSL_OP1_DSX, HLSL_OP1_DSX_COARSE, + HLSL_OP1_DSX_FINE, HLSL_OP1_DSY, HLSL_OP1_DSY_COARSE, + HLSL_OP1_DSY_FINE, HLSL_OP1_EXP2, HLSL_OP1_FLOOR, HLSL_OP1_FRACT, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bf0522cc..a8157d3a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2681,6 +2681,17 @@ static bool intrinsic_ddx_coarse(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSX_COARSE, arg, loc); } +static bool intrinsic_ddx_fine(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSX_FINE, arg, loc); +} + static bool intrinsic_ddy(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2703,6 +2714,17 @@ static bool intrinsic_ddy_coarse(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSY_COARSE, arg, loc); } +static bool intrinsic_ddy_fine(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSY_FINE, arg, loc); +} + static bool intrinsic_distance(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3564,8 +3586,10 @@ intrinsic_functions[] = {"cross", 2, true, intrinsic_cross}, {"ddx", 1, true, intrinsic_ddx}, {"ddx_coarse", 1, true, intrinsic_ddx_coarse}, + {"ddx_fine", 1, true, intrinsic_ddx_fine}, {"ddy", 1, true, intrinsic_ddy}, {"ddy_coarse", 1, true, intrinsic_ddy_coarse}, + {"ddy_fine", 1, true, intrinsic_ddy_fine}, {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 665fd1aa..a465e0b7 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4375,6 +4375,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM5_OP_DERIV_RTX_COARSE, &expr->node, arg1, 0); break; + case HLSL_OP1_DSX_FINE: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM5_OP_DERIV_RTX_FINE, &expr->node, arg1, 0); + break; + case HLSL_OP1_DSY: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_DERIV_RTY, &expr->node, arg1, 0); @@ -4385,6 +4390,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM5_OP_DERIV_RTY_COARSE, &expr->node, arg1, 0); break; + case HLSL_OP1_DSY_FINE: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM5_OP_DERIV_RTY_FINE, &expr->node, arg1, 0); + break; + case HLSL_OP1_EXP2: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0); diff --git a/tests/hlsl/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test index 53a4f6b7..4986c233 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -65,7 +65,7 @@ probe (16, 16) rgba (-25.0, -7.0, 5.0, 0.0) probe (150, 150) rgba (-226.0, -47.0, 45.0, 0.0) -[pixel shader todo] +[pixel shader] float4 main(float4 pos : sv_position) : sv_target { pos /= 10.0; @@ -74,7 +74,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16 probe (11, 10) rgba (-0.689999819, -0.164999843, 0.114999890, 0.0) 32 probe (10, 11) rgba (-0.420000076, -0.154999852, 0.104999900, 0.0) 32

1 0

Francisco Casas : tests: Make ddx() and ddy() test behave correctly for shader models < 4.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: f0584cad6279e7183d039ce31963c7025014591a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f0584cad6279e7183d039ce31963c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 19 10:40:57 2023 -0400 tests: Make ddx() and ddy() test behave correctly for shader models < 4. --- tests/hlsl/ddxddy.shader_test | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/hlsl/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test index 8becf524..da1414b1 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 3.0 + [pixel shader] float4 main(float4 pos : sv_position) : sv_target { @@ -8,9 +11,15 @@ float4 main(float4 pos : sv_position) : sv_target draw quad probe all rgba (1.0, 1.0, 0.0, 0.0) + [pixel shader] float4 main(float4 pos : sv_position) : sv_target { + // Shader models < 4 don't add 0.5 to sv_position, so this adjustment is required to get the + // same outputs. + pos.x = floor(pos.x) + 0.5; + pos.y = floor(pos.y) + 0.5; + pos /= 10.0; float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5); return float4(nonlinear, ddx(nonlinear), ddy(nonlinear), 0.0);

1 0

Francisco Casas : vkd3d-shader/hlsl: Support coarse derivates.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: ff31284f8d60060f135dbd2cc033f1579ae6a63e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ff31284f8d60060f135dbd2cc033f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 19 15:29:58 2023 -0400 vkd3d-shader/hlsl: Support coarse derivates. --- libs/vkd3d-shader/hlsl.c | 2 ++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ libs/vkd3d-shader/tpf.c | 10 ++++++++++ tests/hlsl/ddxddy.shader_test | 4 ++-- 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3a1e1779..e959435a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2339,7 +2339,9 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_COS] = "cos", [HLSL_OP1_COS_REDUCED] = "cos_reduced", [HLSL_OP1_DSX] = "dsx", + [HLSL_OP1_DSX_COARSE] = "dsx_coarse", [HLSL_OP1_DSY] = "dsy", + [HLSL_OP1_DSY_COARSE] = "dsy_coarse", [HLSL_OP1_EXP2] = "exp2", [HLSL_OP1_FRACT] = "fract", [HLSL_OP1_LOG2] = "log2", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 28c7c691..3caf15ab 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -502,7 +502,9 @@ enum hlsl_ir_expr_op HLSL_OP1_COS, HLSL_OP1_COS_REDUCED, /* Reduced range [-pi, pi] */ HLSL_OP1_DSX, + HLSL_OP1_DSX_COARSE, HLSL_OP1_DSY, + HLSL_OP1_DSY_COARSE, HLSL_OP1_EXP2, HLSL_OP1_FLOOR, HLSL_OP1_FRACT, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 60d6514c..bf0522cc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2670,6 +2670,17 @@ static bool intrinsic_ddx(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSX, arg, loc); } +static bool intrinsic_ddx_coarse(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSX_COARSE, arg, loc); +} + static bool intrinsic_ddy(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2681,6 +2692,17 @@ static bool intrinsic_ddy(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSY, arg, loc); } +static bool intrinsic_ddy_coarse(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSY_COARSE, arg, loc); +} + static bool intrinsic_distance(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3541,7 +3563,9 @@ intrinsic_functions[] = {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, {"ddx", 1, true, intrinsic_ddx}, + {"ddx_coarse", 1, true, intrinsic_ddx_coarse}, {"ddy", 1, true, intrinsic_ddy}, + {"ddy_coarse", 1, true, intrinsic_ddy_coarse}, {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 677243e1..665fd1aa 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4370,11 +4370,21 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_DERIV_RTX, &expr->node, arg1, 0); break; + case HLSL_OP1_DSX_COARSE: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM5_OP_DERIV_RTX_COARSE, &expr->node, arg1, 0); + break; + case HLSL_OP1_DSY: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_DERIV_RTY, &expr->node, arg1, 0); break; + case HLSL_OP1_DSY_COARSE: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM5_OP_DERIV_RTY_COARSE, &expr->node, arg1, 0); + break; + case HLSL_OP1_EXP2: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0); diff --git a/tests/hlsl/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test index 674e8d06..53a4f6b7 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -43,7 +43,7 @@ probe (150, 150) rgba (-226.0, -47.0, 45.0, 0.0) shader model >= 5.0 -[pixel shader todo] +[pixel shader] float4 main(float4 pos : sv_position) : sv_target { pos /= 10.0; @@ -55,7 +55,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0) probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0) probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0)

1 0

Francisco Casas : tests: Quantize regular and coarse derivate test results.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: dc84afe73ab9bca7d0c01a1b3cb630726c3c229f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dc84afe73ab9bca7d0c01a1b3cb63… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 5 16:51:52 2023 -0400 tests: Quantize regular and coarse derivate test results. Co-authored-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/hlsl/ddxddy.shader_test | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/tests/hlsl/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test index da1414b1..674e8d06 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -22,17 +22,21 @@ float4 main(float4 pos : sv_position) : sv_target pos /= 10.0; float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5); - return float4(nonlinear, ddx(nonlinear), ddy(nonlinear), 0.0); + float4 res = float4(nonlinear, ddx(nonlinear), ddy(nonlinear), 0.0); + + // Each device may use either the coarse or the fine derivate, so use quantization. + return round(30 * res); } [test] draw quad -probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 8 -probe (11, 10) rgba (-0.689999819, -0.164999843, 0.104999900, 0.0) 8 -probe (10, 11) rgba (-0.420000076, -0.164999843, 0.104999900, 0.0) 8 -probe (11, 11) rgba (-0.574999928, -0.164999843, 0.104999900, 0.0) 8 -probe (12, 10) rgba (-0.874999881, -0.205000162, 0.124999881, 0.0) 8 -probe (150, 150) rgba (-7.52500916, -1.56500244, 1.50500488, 0.0) 40 +probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0) +probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0) +probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0) +probe (11, 11) rgba (-17.0, -5.0, 3.0, 0.0) +probe (12, 10) rgba (-26.0, -6.0, 4.0, 0.0) +probe (16, 16) rgba (-25.0, -7.0, 5.0, 0.0) +probe (150, 150) rgba (-226.0, -47.0, 45.0, 0.0) [require] @@ -44,17 +48,21 @@ float4 main(float4 pos : sv_position) : sv_target { pos /= 10.0; float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5); - return float4(nonlinear, ddx_coarse(nonlinear), ddy_coarse(nonlinear), 0.0); + float4 res = float4(nonlinear, ddx_coarse(nonlinear), ddy_coarse(nonlinear), 0.0); + + // Each device may use either the coarse or the fine derivate, so use quantization. + return round(30 * res); } [test] todo draw quad -probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16 -probe (11, 10) rgba (-0.689999819, -0.164999843, 0.104999900, 0.0) 16 -probe (10, 11) rgba (-0.420000076, -0.164999843, 0.104999900, 0.0) 16 -probe (11, 11) rgba (-0.574999928, -0.164999843, 0.104999900, 0.0) 16 -probe (12, 10) rgba (-0.874999881, -0.205000162, 0.124999881, 0.0) 24 -probe (150, 150) rgba (-7.52500916, -1.56500244, 1.50500488, 0.0) 40 +probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0) +probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0) +probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0) +probe (11, 11) rgba (-17.0, -5.0, 3.0, 0.0) +probe (12, 10) rgba (-26.0, -6.0, 4.0, 0.0) +probe (16, 16) rgba (-25.0, -7.0, 5.0, 0.0) +probe (150, 150) rgba (-226.0, -47.0, 45.0, 0.0) [pixel shader todo]

1 0

Francisco Casas : tests: Test coarse and fine derivates.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: 62e9b86697525f95e56c735712625ce35e2eed0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62e9b86697525f95e56c735712625… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 5 15:44:45 2023 -0400 tests: Test coarse and fine derivates. Co-authored-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/hlsl/ddxddy.shader_test | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/hlsl/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test index 6efb5ab6..8becf524 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -24,3 +24,43 @@ probe (10, 11) rgba (-0.420000076, -0.164999843, 0.104999900, 0.0) 8 probe (11, 11) rgba (-0.574999928, -0.164999843, 0.104999900, 0.0) 8 probe (12, 10) rgba (-0.874999881, -0.205000162, 0.124999881, 0.0) 8 probe (150, 150) rgba (-7.52500916, -1.56500244, 1.50500488, 0.0) 40 + + +[require] +shader model >= 5.0 + + +[pixel shader todo] +float4 main(float4 pos : sv_position) : sv_target +{ + pos /= 10.0; + float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5); + return float4(nonlinear, ddx_coarse(nonlinear), ddy_coarse(nonlinear), 0.0); +} + +[test] +todo draw quad +probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16 +probe (11, 10) rgba (-0.689999819, -0.164999843, 0.104999900, 0.0) 16 +probe (10, 11) rgba (-0.420000076, -0.164999843, 0.104999900, 0.0) 16 +probe (11, 11) rgba (-0.574999928, -0.164999843, 0.104999900, 0.0) 16 +probe (12, 10) rgba (-0.874999881, -0.205000162, 0.124999881, 0.0) 24 +probe (150, 150) rgba (-7.52500916, -1.56500244, 1.50500488, 0.0) 40 + + +[pixel shader todo] +float4 main(float4 pos : sv_position) : sv_target +{ + pos /= 10.0; + float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5); + return float4(nonlinear, ddx_fine(nonlinear), ddy_fine(nonlinear), 0.0); +} + +[test] +todo draw quad +probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16 +probe (11, 10) rgba (-0.689999819, -0.164999843, 0.114999890, 0.0) 32 +probe (10, 11) rgba (-0.420000076, -0.154999852, 0.104999900, 0.0) 32 +probe (11, 11) rgba (-0.574999928, -0.154999852, 0.114999890, 0.0) 32 +probe (12, 10) rgba (-0.874999881, -0.205000162, 0.124999881, 0.0) 24 +probe (150, 150) rgba (-7.52500916, -1.56500244, 1.50500488, 0.0) 128

1 0

Gabriel Ivăncescu : mshtml: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 7aa6da98c82dbc4d5f81ed76a3032fd46a1abd65 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aa6da98c82dbc4d5f81ed76a3032f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 3 17:55:44 2023 +0300 mshtml: Remove DECLSPEC_HIDDEN usage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/binding.h | 62 ++--- dlls/mshtml/htmlevent.h | 56 ++--- dlls/mshtml/htmlscript.h | 22 +- dlls/mshtml/htmlstyle.h | 18 +- dlls/mshtml/mshtml_private.h | 580 +++++++++++++++++++++---------------------- dlls/mshtml/pluginhost.h | 18 +- dlls/mshtml/secmgr.c | 2 +- 7 files changed, 379 insertions(+), 379 deletions(-)

1 0

Jacek Caban : winedump: Add support for dumping IMPORT_OBJECT_NAME_EXPORTAS symbols.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 6892434b22baff054da67c0fac75fcd49a674074 URL: https://gitlab.winehq.org/wine/wine/-/commit/6892434b22baff054da67c0fac75fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 3 13:04:42 2023 +0200 winedump: Add support for dumping IMPORT_OBJECT_NAME_EXPORTAS symbols. This is used by ARM64EC importlibs. --- include/winnt.h | 3 ++- tools/winedump/lib.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 8d803eaceb1..26be0ccaec5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3541,7 +3541,8 @@ typedef enum IMPORT_OBJECT_NAME_TYPE IMPORT_OBJECT_ORDINAL = 0, IMPORT_OBJECT_NAME = 1, IMPORT_OBJECT_NAME_NO_PREFIX = 2, - IMPORT_OBJECT_NAME_UNDECORATE = 3 + IMPORT_OBJECT_NAME_UNDECORATE = 3, + IMPORT_OBJECT_NAME_EXPORTAS = 4 } IMPORT_OBJECT_NAME_TYPE; typedef struct _ANON_OBJECT_HEADER diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index ce2ccab184d..e2d25b04d24 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -46,18 +46,21 @@ static void dump_import_object(const IMPORT_OBJECT_HEADER *ioh) if (ioh->Version == 0) { static const char * const obj_type[] = { "code", "data", "const" }; - static const char * const name_type[] = { "ordinal", "name", "no prefix", "undecorate" }; - const char *name; + static const char * const name_type[] = { "ordinal", "name", "no prefix", "undecorate", "export as" }; + const char *name, *dll_name; printf(" Version : %X\n", ioh->Version); printf(" Machine : %X (%s)\n", ioh->Machine, get_machine_str(ioh->Machine)); printf(" TimeDateStamp: %08X %s\n", (UINT)ioh->TimeDateStamp, get_time_str(ioh->TimeDateStamp)); printf(" SizeOfData : %08X\n", (UINT)ioh->SizeOfData); name = (const char *)ioh + sizeof(*ioh); - printf(" DLL name : %s\n", name + strlen(name) + 1); + dll_name = name + strlen(name) + 1; + printf(" DLL name : %s\n", dll_name); printf(" Symbol name : %s\n", name); printf(" Type : %s\n", (ioh->Type < ARRAY_SIZE(obj_type)) ? obj_type[ioh->Type] : "unknown"); printf(" Name type : %s\n", (ioh->NameType < ARRAY_SIZE(name_type)) ? name_type[ioh->NameType] : "unknown"); + if (ioh->NameType == IMPORT_OBJECT_NAME_EXPORTAS) + printf(" Export name : %s\n", dll_name + strlen(dll_name) + 1); printf(" %-13s: %u\n", (ioh->NameType == IMPORT_OBJECT_ORDINAL) ? "Ordinal" : "Hint", ioh->Ordinal); printf("\n"); }

1 0

Alistair Leslie-Hughes : vbscript: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 3100fd59a9eb2dd643ff7a199d27ebb0e7853ac1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3100fd59a9eb2dd643ff7a199d27eb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 1 10:16:55 2023 +1000 vbscript: Remove DECLSPEC_HIDDEN usage. --- dlls/vbscript/parse.h | 8 ++--- dlls/vbscript/regexp.h | 8 ++--- dlls/vbscript/vbscript.h | 80 ++++++++++++++++++++++++------------------------ 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 7c13ad72bf6..64c3dee2a69 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -310,7 +310,7 @@ typedef struct { heap_pool_t heap; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; -void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; -int parser_lex(void*,unsigned*,parser_ctx_t*) DECLSPEC_HIDDEN; -void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*,DWORD); +void parser_release(parser_ctx_t*); +int parser_lex(void*,unsigned*,parser_ctx_t*); +void *parser_alloc(parser_ctx_t*,size_t); diff --git a/dlls/vbscript/regexp.h b/dlls/vbscript/regexp.h index e0faa80cc67..e33087bac60 100644 --- a/dlls/vbscript/regexp.h +++ b/dlls/vbscript/regexp.h @@ -61,11 +61,11 @@ typedef struct regexp_t { jsbytecode program[1]; /* regular expression bytecode */ } regexp_t; -regexp_t* regexp_new(void*, heap_pool_t*, const WCHAR*, DWORD, WORD, BOOL) DECLSPEC_HIDDEN; -void regexp_destroy(regexp_t*) DECLSPEC_HIDDEN; +regexp_t* regexp_new(void*, heap_pool_t*, const WCHAR*, DWORD, WORD, BOOL); +void regexp_destroy(regexp_t*); HRESULT regexp_execute(regexp_t*, void*, heap_pool_t*, const WCHAR*, - DWORD, match_state_t*) DECLSPEC_HIDDEN; -HRESULT regexp_set_flags(regexp_t**, void*, heap_pool_t*, WORD) DECLSPEC_HIDDEN; + DWORD, match_state_t*); +HRESULT regexp_set_flags(regexp_t**, void*, heap_pool_t*, WORD); static inline match_state_t* alloc_match_state(regexp_t *regexp, heap_pool_t *pool, const WCHAR *pos) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 13bcf704bf0..24915a5ca04 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -42,12 +42,12 @@ typedef struct { struct list custom_blocks; } heap_pool_t; -void heap_pool_init(heap_pool_t*) DECLSPEC_HIDDEN; -void *heap_pool_alloc(heap_pool_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; -void *heap_pool_grow(heap_pool_t*,void*,DWORD,DWORD) DECLSPEC_HIDDEN; -void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; -void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; -heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; +void heap_pool_init(heap_pool_t*); +void *heap_pool_alloc(heap_pool_t*,size_t) __WINE_ALLOC_SIZE(2); +void *heap_pool_grow(heap_pool_t*,void*,DWORD,DWORD); +void heap_pool_clear(heap_pool_t*); +void heap_pool_free(heap_pool_t*); +heap_pool_t *heap_pool_mark(heap_pool_t*); typedef struct _function_t function_t; typedef struct _vbscode_t vbscode_t; @@ -159,16 +159,16 @@ typedef struct named_item_t { struct list entry; } named_item_t; -HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; -HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; -HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; -HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; -HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*) DECLSPEC_HIDDEN; -void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN; +HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); +HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); +HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); +HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*); +HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*); +void collect_objects(script_ctx_t*); +HRESULT create_script_disp(script_ctx_t*,ScriptDisp**); -HRESULT to_int(VARIANT*,int*) DECLSPEC_HIDDEN; +HRESULT to_int(VARIANT*,int*); static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -213,10 +213,10 @@ struct _script_ctx_t { struct list named_items; }; -HRESULT init_global(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT init_err(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT init_global(script_ctx_t*); +HRESULT init_err(script_ctx_t*); -IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; +IUnknown *create_ax_site(script_ctx_t*); typedef enum { ARG_NONE = 0, @@ -384,21 +384,21 @@ static inline void grab_vbscode(vbscode_t *code) code->ref++; } -void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; -HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; -void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; -named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; -void release_named_item(named_item_t*) DECLSPEC_HIDDEN; -void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; -HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; -void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; -HRESULT array_access(SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) DECLSPEC_HIDDEN; - -void release_regexp_typelib(void) DECLSPEC_HIDDEN; -HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +void release_vbscode(vbscode_t*); +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**); +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**); +HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*); +void release_dynamic_var(dynamic_var_t*); +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned); +void release_named_item(named_item_t*); +void clear_ei(EXCEPINFO*); +HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned); +void detach_global_objects(script_ctx_t*); +HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*); +HRESULT array_access(SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret); + +void release_regexp_typelib(void); +HRESULT get_dispatch_typeinfo(ITypeInfo**); static inline BOOL is_int32(double d) { @@ -410,20 +410,20 @@ static inline BOOL is_digit(WCHAR c) return '0' <= c && c <= '9'; } -HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; -BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; +HRESULT create_regexp(IDispatch**); +BSTR string_replace(BSTR,BSTR,BSTR,int,int,int); -void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN; +void map_vbs_exception(EXCEPINFO *); -HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) DECLSPEC_HIDDEN; +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev); #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code) -HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); -BSTR get_vbscript_string(int) DECLSPEC_HIDDEN; +BSTR get_vbscript_string(int); #define VBSCRIPT_BUILD_VERSION 16978 #define VBSCRIPT_MAJOR_VERSION 5

1 0

Alistair Leslie-Hughes : jscript: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 803834fddf839d33a91b4b4203e5d5404e703107 URL: https://gitlab.winehq.org/wine/wine/-/commit/803834fddf839d33a91b4b4203e5d5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 1 10:15:26 2023 +1000 jscript: Remove DECLSPEC_HIDDEN usage. --- dlls/jscript/engine.h | 26 ++--- dlls/jscript/jscript.h | 250 ++++++++++++++++++++++++------------------------- dlls/jscript/jsstr.h | 30 +++--- dlls/jscript/jsval.h | 8 +- dlls/jscript/parser.h | 22 ++--- dlls/jscript/regexp.h | 6 +- 6 files changed, 171 insertions(+), 171 deletions(-)

1 0

Ally Sommers : ws2_32/tests: Add test for sendto() and recvfrom() on TCP sockets.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 01d05baa9647eb2ed1d7c2776c0e699b9884d679 URL: https://gitlab.winehq.org/wine/wine/-/commit/01d05baa9647eb2ed1d7c2776c0e69… Author: Ally Sommers <dropbear.sh(a)gmail.com> Date: Wed Jun 28 07:44:26 2023 -0700 ws2_32/tests: Add test for sendto() and recvfrom() on TCP sockets. --- dlls/ws2_32/tests/sock.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cff4acb0b3c..e6ab5065cfe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13785,6 +13785,39 @@ static void test_connect_udp(void) closesocket(client); } +static void test_tcp_sendto_recvfrom(void) +{ + SOCKET client, server = 0; + SOCKADDR_IN addr = { AF_INET, SERVERPORT }; + SOCKADDR_IN bad_addr, bad_addr_copy; + const char serverMsg[] = "ws2_32/TCP socket test"; + char clientBuf[sizeof(serverMsg)] = { 0 }; + int to_len = 0xc0ffee11; + int ret; + + inet_pton(AF_INET, SERVERIP, &addr.sin_addr); + + tcp_socketpair(&client, &server); + + memset(&bad_addr, 0xfe, sizeof(bad_addr)); + memcpy(&bad_addr_copy, &bad_addr, sizeof(bad_addr_copy)); + + ret = sendto(server, serverMsg, sizeof(serverMsg), 0, (SOCKADDR *)&bad_addr, sizeof(bad_addr)); + ok(ret == sizeof(serverMsg), "Incorrect return value from sendto: %d (%d)\n", ret, WSAGetLastError()); + ok(!memcmp(&bad_addr, &bad_addr_copy, sizeof(bad_addr)), "Provided address modified by sendto\n"); + ok(to_len == 0xc0ffee11, "Provided size modified by sendto\n"); + + ret = recvfrom(client, clientBuf, sizeof(clientBuf), 0, (SOCKADDR *)&bad_addr, &to_len); + ok(ret == sizeof(serverMsg), "Incorrect return value from recvfrom: %d (%d)\n", ret, WSAGetLastError()); + ok(!memcmp(&bad_addr, &bad_addr_copy, sizeof(bad_addr)), "Provided address modified by recvfrom\n"); + ok(to_len == 0xc0ffee11, "Provided size modified by recvfrom\n"); + + ok(!memcmp(serverMsg, clientBuf, sizeof(serverMsg)), "Data mismatch over TCP socket\n"); + + closesocket(client); + closesocket(server); +} + START_TEST( sock ) { int i; @@ -13866,6 +13899,7 @@ START_TEST( sock ) test_tcp_reset(); test_icmp(); test_connect_udp(); + test_tcp_sendto_recvfrom(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0