February 2022 - Wine-Commits

Zebediah Figura : vkd3d-shader/preproc: Allow capital U and L after integer constants as well.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: vkd3d Branch: master Commit: 13a1ba4263287b04727c659b1c735b2b44a6de9f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=13a1ba4263287b04727c659… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 13:46:16 2022 +0100 vkd3d-shader/preproc: Allow capital U and L after integer constants as well. Technically we shouldn't allow "uu" or "ll" either, but we also don't really handle preprocessor parsing errors the way we should. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 7 ++++--- tests/preproc-if-expr.shader_test | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index bf4d669..5454233 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -57,6 +57,7 @@ static void update_location(struct preproc_ctx *ctx); NEWLINE \r?\n WS [ \t] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* +INT_SUFFIX [uUlL]{0,2} %% @@ -92,9 +93,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL,LINE>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} -<INITIAL,LINE>0[0-7]*[ul]{0,2} {return T_INTEGER;} -<INITIAL,LINE>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[xX][0-9a-fA-f]+{INT_SUFFIX} {return T_INTEGER;} +<INITIAL,LINE>0[0-7]*{INT_SUFFIX} {return T_INTEGER;} +<INITIAL,LINE>[1-9][0-9]*{INT_SUFFIX} {return T_INTEGER;} <INITIAL>## {return T_CONCAT;} diff --git a/tests/preproc-if-expr.shader_test b/tests/preproc-if-expr.shader_test index 61c5a39..823b9b0 100644 --- a/tests/preproc-if-expr.shader_test +++ b/tests/preproc-if-expr.shader_test @@ -99,6 +99,39 @@ pass pass #endif +[preproc] +#if 2u == 2 +pass +#else +fail +#endif + +[preproc] +#if 2l == 2 +pass +#else +fail +#endif + +[preproc] +#if 2Ul == 2 +pass +#else +fail +#endif + +[preproc] +#if 2uL == 2 +pass +#else +fail +#endif + +[preproc] +#if 012lu == 10 +pass +#endif + [preproc] /* All math is done using unsigned 32-bit integers. */ #if 8 / -3 == 2

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Cast round() input to float.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: vkd3d Branch: master Commit: 22d8b0a03307659c46c1d3a801566b0305f6da7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22d8b0a03307659c46c1d3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 2 13:46:13 2022 +0100 vkd3d-shader/hlsl: Cast round() input to float. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 19 ++++++++++++++++++- tests/round.shader_test | 13 +++++++++++++ tests/shader_runner.c | 8 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index be24a74..8d7b124 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1570,6 +1570,18 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = arg->data_type; + + if (type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF) + return arg; + + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + return add_implicit_conversion(ctx, params->instrs, arg, type, loc); +} + static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1675,7 +1687,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], 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_ROUND, arg, loc); } static bool intrinsic_saturate(struct hlsl_ctx *ctx, diff --git a/tests/round.shader_test b/tests/round.shader_test index d8eb11b..cc5a697 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -24,3 +24,16 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (6.0, 8.0, 0.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 int4 -1 0 2 10 +draw quad +probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 5af4628..558d074 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -368,6 +368,14 @@ static void parse_test_directive(struct shader_context *context, const char *lin fatal_error("Malformed float constant '%s'.\n", line); set_uniforms(context, offset, 1, &f); } + else if (match_string(line, "int4", &line)) + { + int v[4]; + + if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed int4 constant '%s'.\n", line); + set_uniforms(context, offset, 4, v); + } else if (match_string(line, "int", &line)) { int i;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement floor().
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: vkd3d Branch: master Commit: 4e36c1825d25654b330f0a8bd12a5d2b2645a93f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4e36c1825d25654b330f0a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 2 13:46:15 2022 +0100 vkd3d-shader/hlsl: Implement floor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/floor.shader_test | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+) diff --git a/Makefile.am b/Makefile.am index 82807a4..5bcee67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/floor.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2319895..5b69186 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -293,6 +293,7 @@ enum hlsl_ir_expr_op HLSL_OP1_DSX, HLSL_OP1_DSY, HLSL_OP1_EXP2, + HLSL_OP1_FLOOR, HLSL_OP1_FRACT, HLSL_OP1_LOG2, HLSL_OP1_LOGIC_NOT, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dd2a93e..5b98b56 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1653,6 +1653,17 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, loc); } +static bool intrinsic_floor(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_FLOOR, arg, loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1720,6 +1731,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"cross", 2, true, intrinsic_cross}, + {"floor", 1, true, intrinsic_floor}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"pow", 2, true, intrinsic_pow}, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 4eebd58..b66a225 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1432,6 +1432,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0); break; + case HLSL_OP1_FLOOR: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NI, &expr->node, arg1, 0); + break; + case HLSL_OP1_LOG2: write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); break; diff --git a/tests/floor.shader_test b/tests/floor.shader_test new file mode 100644 index 0000000..033d759 --- /dev/null +++ b/tests/floor.shader_test @@ -0,0 +1,38 @@ +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return floor(u); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (-1.0, 6.0, 7.0, 3.0) 4 + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float a = floor(u.r); + int2 b = floor(u.gb); + float4 res = float4(b, a, u.a); + return floor(res); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (6.0, 7.0, -1.0, 3.0) 4 + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + float a = floor(u.r); + int2 b = floor(u.gb); + float4 res = float4(b, a, u.a); + return floor(res); +} + +[test] +uniform 0 int4 -1 6 7 3 +draw quad +probe all rgba (6.0, 7.0, -1.0, 3.0) 4

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Cast saturate() input to float.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: vkd3d Branch: master Commit: 11d962ddbf9bbda1987b2ecc4510237b897aa289 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11d962ddbf9bbda1987b2ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 2 13:46:14 2022 +0100 vkd3d-shader/hlsl: Cast saturate() input to float. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 7 ++++++- tests/saturate.shader_test | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8d7b124..dd2a93e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1698,7 +1698,12 @@ static bool intrinsic_round(struct hlsl_ctx *ctx, static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SAT, params->args[0], 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_SAT, arg, loc); } static const struct intrinsic_function diff --git a/tests/saturate.shader_test b/tests/saturate.shader_test index 0a954e7..e99df5b 100644 --- a/tests/saturate.shader_test +++ b/tests/saturate.shader_test @@ -8,3 +8,14 @@ float4 main(uniform float2 u) : sv_target uniform 0 float4 0.7 -0.1 0.0 0.0 draw quad probe all rgba (0.7, 0.0, 1.0, 0.0) + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + return saturate(u); +} + +[test] +uniform 0 int4 -2 0 2 -1 +draw quad +probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Alistair Leslie-Hughes : msdasql: Fix printf format warnings with long types.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 0b9776726952dc42633078b3e2adbf1efc553f52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9776726952dc42633078b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 1 20:06:35 2022 +1100 msdasql: Fix printf format warnings with long types. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/Makefile.in | 1 - dlls/msdasql/msdasql_main.c | 42 +++++++++++++++---------------- dlls/msdasql/session.c | 60 ++++++++++++++++++++++----------------------- 3 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b9776726952dc426330…

1 0

Henri Verbeet : d2d1: Return numeric configuration settings as uint32_t.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 2c6fd7b6178e0cc5b187863312f12b2893776138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c6fd7b6178e0cc5b1878633… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 19:23:13 2022 +0100 d2d1: Return numeric configuration settings as uint32_t. To allow building without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/factory.c | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index de5e986f7f2..aaf6d045c73 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,8 @@ #include <assert.h> #include <limits.h> +#include <stdint.h> +#include <stdbool.h> #include <math.h> #define COBJMACROS #include "d2d1_2.h" diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7ddd6bbc87c..1f8b3f5848b 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -937,9 +937,10 @@ D2D1_COLOR_F WINAPI D2D1ConvertColorSpace(D2D1_COLOR_SPACE src_colour_space, return ret; } -static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +static bool get_config_key_u32(HKEY default_key, HKEY application_key, const char *name, uint32_t *value) { - DWORD type, data, size; + DWORD type, size; + uint32_t data; size = sizeof(data); if (application_key && !RegQueryValueExA(application_key, @@ -951,11 +952,11 @@ static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const c name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; - return FALSE; + return false; success: *value = data; - return TRUE; + return true; } static void d2d_settings_init(void) @@ -989,7 +990,7 @@ static void d2d_settings_init(void) if (!default_key && !application_key) return; - if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + if (get_config_key_u32(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); if (application_key)

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_arb_generate_pshader().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 576e44e040a08f1c11bb4f38f16188289948988b URL: https://source.winehq.org/git/wine.git/?a=commit;h=576e44e040a08f1c11bb4f38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 19:23:12 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_arb_generate_pshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fc53f78f95d..f040eea410e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3512,17 +3512,18 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; struct arb_pshader_private *shader_priv = shader->backend_data; - DWORD map; BOOL custom_linear_fog = FALSE; + uint32_t map; char srgbtmp[4][4]; char ftoa_tmp[17]; unsigned int i, found = 0; - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (!(map & 1) - || (shader->u.ps.color0_mov && i == shader->u.ps.color0_reg) + i = wined3d_bit_scan(&map); + if ((shader->u.ps.color0_mov && i == shader->u.ps.color0_reg) || (reg_maps->shader_version.major < 2 && !i)) continue; @@ -3681,12 +3682,12 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, /* Base Declarations */ shader_generate_arb_declarations(shader, reg_maps, buffer, gl_info, NULL, &priv_ctx); - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + map = reg_maps->bumpmat; + while (map) { unsigned char bump_const; - if (!(map & 1)) continue; - + i = wined3d_bit_scan(&map); bump_const = compiled->numbumpenvmatconsts; compiled->bumpenvmatconst[bump_const].const_num = WINED3D_CONST_NUM_UNUSED; compiled->bumpenvmatconst[bump_const].texunit = i;

1 0

Eric Pouech : msvcrt*: Use correct integral type.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: b7b841eb69d64715ef1aaab6ca69f1c6e3df7816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b841eb69d64715ef1aaab6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:09 2022 +0100 msvcrt*: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/details.c | 2 +- dlls/msvcp90/details.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 13a2fbbca96..59345c52871 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -434,7 +434,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { - unsigned int index; + ULONG index; BitScanReverse(&index, x|1); return index; } diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d2969516af4..6b54ea9597f 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -448,7 +448,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { - unsigned int index; + ULONG index; BitScanReverse(&index, x|1); return index; }

1 0

Nikolay Sivov : d3d11: Always initialize out view pointer in CreateUnorderedAccessView().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: f467ebadd6140a360dd191ea496dbd978d94b00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f467ebadd6140a360dd191ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:08:09 2022 +0300 d3d11: Always initialize out view pointer in CreateUnorderedAccessView(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 858cd9f6d4a..7e5acc11824 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3399,6 +3399,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (FAILED(hr = d3d11_unordered_access_view_create(device, resource, desc, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1db367f39fa..ec385a92f50 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19433,8 +19433,10 @@ static void test_create_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 64; U(uav_desc).Buffer.Flags = 0; + uav = (void *)0xdeadbeef; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!uav, "Unexpected pointer %p.\n", uav); expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); @@ -19483,8 +19485,10 @@ static void test_create_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 64; U(uav_desc).Buffer.Flags = 0; + uav = (void *)0xdeadbeef; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!uav, "Unexpected pointer %p.\n", uav); ID3D11Buffer_Release(buffer); @@ -19579,9 +19583,11 @@ static void test_create_unordered_access_view(void) texture = (ID3D11Resource *)texture3d; } + uav = (void *)0xdeadbeef; get_uav_desc(&uav_desc, &invalid_desc_tests[i].uav_desc); hr = ID3D11Device_CreateUnorderedAccessView(device, texture, &uav_desc, &uav); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!uav, "Unexpected pointer %p.\n", uav); ID3D11Resource_Release(texture); }

1 0

Jactry Zeng : dwmapi: Correct parameter types of DwmGetColorizationColor().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 5a6c1753a037699a8621b650e82923880008aee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6c1753a037699a8621b650… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 1 10:30:20 2022 -0600 dwmapi: Correct parameter types of DwmGetColorizationColor(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 4 ++-- include/dwmapi.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 23380a9ecd7..d899a7ab01c 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -67,7 +67,7 @@ @ stdcall DwmEnableMMCSS(long) @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() -@ stdcall DwmGetColorizationColor(ptr long) +@ stdcall DwmGetColorizationColor(ptr ptr) @ stdcall DwmGetCompositionTimingInfo(long ptr) @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index b6c89f3a7f8..6a66aa51dad 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -77,9 +77,9 @@ HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) /********************************************************************** * DwmGetColorizationColor (DWMAPI.@) */ -HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) +HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL *opaque_blend) { - FIXME("(%p, %d) stub\n", colorization, opaque_blend); + FIXME("(%p, %p) stub\n", colorization, opaque_blend); return E_NOTIMPL; } diff --git a/include/dwmapi.h b/include/dwmapi.h index 99e7caef92d..1b19426ce2d 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -198,7 +198,7 @@ DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmFlush(void); -DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmGetColorizationColor(DWORD *, BOOL *); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmGetGraphicsStreamClient(UINT, UUID *); DWMAPI DwmGetGraphicsStreamTransformHint(UINT, MilMatrix3x2D *);

1 0