November 2023 - Wine-Commits

Giovanni Mascellani : vkd3d-shader/ir: Expect two sources for LOOP in SM1-3.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 849a8f3addcdda4c9cf59e5898ad1e7ead321ad6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/849a8f3addcdda4c9cf59e5898ad1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 22:30:12 2023 +0100 vkd3d-shader/ir: Expect two sources for LOOP in SM1-3. --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 2a334399..b8cb6a41 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1716,7 +1716,7 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_LOOP: vsir_validate_dst_count(ctx, instruction, 0); - vsir_validate_src_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, ctx->parser->shader_version.major <= 3 ? 2 : 0); if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) return; ctx->blocks[ctx->depth++] = instruction->handler_idx;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: e55b6a7fa1cc93e4e53bf758d231c477e9c766c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e55b6a7fa1cc93e4e53bf758d231c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 16 01:14:09 2023 +0100 vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. --- libs/vkd3d-shader/hlsl.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 242e8307..c25b101a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3171,6 +3171,7 @@ static bool intrinsic_log(struct hlsl_ctx *ctx, /* ln(2) */ if (!(coeff = hlsl_new_float_constant(ctx, 0.69314718055f, loc))) return false; + hlsl_block_add_instr(params->instrs, coeff); return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc); } @@ -3189,6 +3190,7 @@ static bool intrinsic_log10(struct hlsl_ctx *ctx, /* 1 / log2(10) */ if (!(coeff = hlsl_new_float_constant(ctx, 0.301029996f, loc))) return false; + hlsl_block_add_instr(params->instrs, coeff); return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc); }

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Adjust the token count for DEF and DEFI instructions in shader_sm1_skip_opcode().
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 73c563ffb7f07d43f8fd768768558c3b280ce3dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73c563ffb7f07d43f8fd768768558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 17:57:58 2023 +0100 vkd3d-shader/d3dbc: Adjust the token count for DEF and DEFI instructions in shader_sm1_skip_opcode(). This was broken by commit e390bc35e2c9b0a2110370f916033eea2366317e; that commit fixed the source count for these instructions, but didn't adjust shader_sm1_skip_opcode(). Note that this only affects shader model 1; later versions have a token count embedded in the initial opcode token. --- libs/vkd3d-shader/d3dbc.c | 8 ++++++++ tests/vkd3d_shader_api.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 7e0eac6c..3d139416 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -855,6 +855,14 @@ static void shader_sm1_skip_opcode(const struct vkd3d_shader_sm1_parser *sm1, co { *ptr += 2; } + /* Somewhat similarly, DEF and DEFI have a single source, but need to read + * four tokens for that source. See shader_sm1_read_immconst(). + * Technically shader model 1 doesn't have integer registers or DEFI; we + * handle it here anyway because it's easy. */ + else if (opcode_info->vkd3d_opcode == VKD3DSIH_DEF || opcode_info->vkd3d_opcode == VKD3DSIH_DEFI) + { + *ptr += 3; + } *ptr += (opcode_info->dst_count + opcode_info->src_count); } diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 9fe5eec8..61c412c5 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -238,6 +238,13 @@ static void test_d3dbc(void) 0xfffe0100, /* vs_1_0 */ 0x0000ffff, /* end */ }; + static const uint32_t vs_dcl_def[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ + 0x0000ffff, /* end */ + }; static const uint32_t invalid_type[] = { 0x00010100, /* <invalid>_1_0 */ @@ -255,6 +262,10 @@ static void test_d3dbc(void) 0x0000ffff, /* end */ }; static const char expected[] = "vs_1_0\n"; + static const char expected_dcl_def[] = + "vs_1_1\n" + "dcl_position0 v0\n" + "def c0 = 1.00000000e+00, 0.00000000e+00, 0.00000000e+00, 1.00000000e+00\n"; info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; @@ -291,6 +302,15 @@ static void test_d3dbc(void) rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + info.source.code = vs_dcl_def; + info.source.size = sizeof(vs_dcl_def); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + ok(d3d_asm.size == strlen(expected_dcl_def), "Got unexpected size %zu.\n", d3d_asm.size); + ok(!memcmp(d3d_asm.code, expected_dcl_def, d3d_asm.size), "Got unexpected code \"%.*s\"\n", + (int)d3d_asm.size, (char *)d3d_asm.code); + vkd3d_shader_free_shader_code(&d3d_asm); + info.source.code = invalid_type; info.source.size = sizeof(invalid_type); rc = vkd3d_shader_compile(&info, &d3d_asm, NULL);

1 0

Akihiro Sagawa : vkd3d-shader/hlsl: Add degrees() function.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: aed2d142cf345305bdf1b37679ce97a123f9b89f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aed2d142cf345305bdf1b37679ce9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 16 20:22:37 2023 +0900 vkd3d-shader/hlsl: Add degrees() function. --- libs/vkd3d-shader/hlsl.y | 17 +++++++++++++++++ tests/hlsl/angle-unit.shader_test | 14 ++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a9ff41aa..242e8307 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2878,6 +2878,22 @@ 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_degrees(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *deg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1 rad = 180/pi degree = 57.2957795 degree */ + if (!(deg = hlsl_new_float_constant(ctx, 57.2957795f, loc))) + return false; + hlsl_block_add_instr(params->instrs, deg); + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, deg, loc); +} + static bool intrinsic_ddy_fine(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3865,6 +3881,7 @@ intrinsic_functions[] = {"ddy", 1, true, intrinsic_ddy}, {"ddy_coarse", 1, true, intrinsic_ddy_coarse}, {"ddy_fine", 1, true, intrinsic_ddy_fine}, + {"degrees", 1, true, intrinsic_degrees}, {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test index 6e0538f9..407d2413 100644 --- a/tests/hlsl/angle-unit.shader_test +++ b/tests/hlsl/angle-unit.shader_test @@ -10,3 +10,17 @@ float4 main() : sv_target uniform 0 float4 0.0 30.0 150.0 180.0 draw quad probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265) + + +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return degrees(a); +} + +[test] +uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 +draw quad +probe all rgba (0.0, 45.0, 90.0, 135.0)

1 0

Akihiro Sagawa : vkd3d-shader/hlsl: Add radians() function.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: e49362713042c458c520359094a1b774c56760d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e49362713042c458c520359094a1b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 16 19:54:19 2023 +0900 vkd3d-shader/hlsl: Add radians() function. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 17 +++++++++++++++++ tests/hlsl/angle-unit.shader_test | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2666194a..7d589819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,6 +46,7 @@ vkd3d_cross_tests = \ vkd3d_shader_tests = \ tests/hlsl/abs.shader_test \ tests/hlsl/all.shader_test \ + tests/hlsl/angle-unit.shader_test \ tests/hlsl/any.shader_test \ tests/hlsl/arithmetic-float-uniform.shader_test \ tests/hlsl/arithmetic-float.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5e0d48d3..a9ff41aa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3341,6 +3341,22 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return !!add_pow_expr(ctx, params->instrs, params->args[0], params->args[1], loc); } +static bool intrinsic_radians(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *rad; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1 degree = pi/180 rad = 0.0174532925f rad */ + if (!(rad = hlsl_new_float_constant(ctx, 0.0174532925f, loc))) + return false; + hlsl_block_add_instr(params->instrs, rad); + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, rad, loc); +} + static bool intrinsic_reflect(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3869,6 +3885,7 @@ intrinsic_functions[] = {"mul", 2, true, intrinsic_mul}, {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, + {"radians", 1, true, intrinsic_radians}, {"reflect", 2, true, intrinsic_reflect}, {"round", 1, true, intrinsic_round}, {"rsqrt", 1, true, intrinsic_rsqrt}, diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test new file mode 100644 index 00000000..6e0538f9 --- /dev/null +++ b/tests/hlsl/angle-unit.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return radians(a); +} + +[test] +uniform 0 float4 0.0 30.0 150.0 180.0 +draw quad +probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265)

1 0

Bartosz Kosiorek : msvcrt: Fix _mbsspn_l implementation.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: c94671324ea2a3c9185da0850a2be213d13fdcfb URL: https://gitlab.winehq.org/wine/wine/-/commit/c94671324ea2a3c9185da0850a2be2… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 11 23:23:44 2023 +0100 msvcrt: Fix _mbsspn_l implementation. --- dlls/msvcrt/mbcs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 385274a44a4..1a595a44ced 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2791,6 +2791,9 @@ size_t CDECL _mbsspn_l(const unsigned char* string, { const unsigned char *p, *q; + if (!MSVCRT_CHECK_PMT(string && set)) + return 0; + for (p = string; *p; p++) { for (q = set; *q; q++)

1 0

Jacek Caban : ole32/tests: Remove unused variable.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 1bd4bcaa4a524d5bcfc2f768d150e417dc28b032 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bd4bcaa4a524d5bcfc2f768d150e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:35:19 2023 +0100 ole32/tests: Remove unused variable. --- dlls/ole32/tests/moniker.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9c583d27c47..75d24681ab5 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1144,13 +1144,12 @@ static IParseDisplayName ParseDisplayName = { &ParseDisplayName_Vtbl }; static int count_moniker_matches(IBindCtx * pbc, IEnumMoniker * spEM) { IMoniker * spMoniker; - int monCnt=0, matchCnt=0; + int matchCnt = 0; while ((IEnumMoniker_Next(spEM, 1, &spMoniker, NULL)==S_OK)) { HRESULT hr; WCHAR * szDisplayn; - monCnt++; hr=IMoniker_GetDisplayName(spMoniker, pbc, NULL, &szDisplayn); if (SUCCEEDED(hr)) {

1 0

Bartosz Kosiorek : msvcrt: Add _mbsspnp_l implementation.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 65f7d5ec484111c27abcec6811d5a92aa4bbd7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/65f7d5ec484111c27abcec6811d5a9… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 11 23:32:38 2023 +0100 msvcrt: Add _mbsspnp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 15 +++++++++++++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f4baf442b53..79a201f4c17 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1186,7 +1186,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e9bdf422024..6a6d38db187 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1543,7 +1543,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 13dacc15744..13d7e401133 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1554,7 +1554,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91781c9c9e4..5b253b88234 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -858,7 +858,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2af41f8aea2..df989581d5e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -836,7 +836,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1a595a44ced..e6c0e944255 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2828,13 +2828,24 @@ size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) return _mbsspn_l(string, set, NULL); } +/********************************************************************* + * _mbsspnp_l (MSVCRT.@) + */ +unsigned char* CDECL _mbsspnp_l(const unsigned char* string, const unsigned char* set, _locale_t locale) +{ + if (!MSVCRT_CHECK_PMT(string && set)) + return 0; + + string += _mbsspn_l(string, set, locale); + return *string ? (unsigned char*)string : NULL; +} + /********************************************************************* * _mbsspnp (MSVCRT.@) */ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { - string += _mbsspn( string, set ); - return *string ? (unsigned char*)string : NULL; + return _mbsspnp_l(string, set, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f54a437692f..72392a1847b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -807,7 +807,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -# stub _mbsspnp_l(str str ptr) +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) # stub _mbsstr_l(str str ptr) @ cdecl _mbstok(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7cf9b01aa4f..60ebe06ea82 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -702,7 +702,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) @@ -1271,7 +1271,7 @@ @ cdecl _o__mbsspn(str str) _mbsspn @ cdecl _o__mbsspn_l(str str ptr) _mbsspn_l @ cdecl _o__mbsspnp(str str) _mbsspnp -@ stub _o__mbsspnp_l +@ cdecl _o__mbsspnp_l(str str ptr) _mbsspnp_l @ cdecl _o__mbsstr(str str) _mbsstr @ stub _o__mbsstr_l @ cdecl _o__mbstok(str str) _mbstok

1 0

Tim Clem : msvcrt: Pass INT_MAX as the length in implementations of the _mbscoll family.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: adfb58f17d492c5451fdb5dfcf111303b9d1eaad URL: https://gitlab.winehq.org/wine/wine/-/commit/adfb58f17d492c5451fdb5dfcf1113… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Nov 16 12:01:59 2023 -0800 msvcrt: Pass INT_MAX as the length in implementations of the _mbscoll family. A length of -1 has no special meaning for the mbsn*coll functions, and since it is > INT_MAX, it will eventually trigger _invalid_parameter in _strnicmp_l in newer versions of msvcrt. --- dlls/msvcrt/mbcs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9b52170d4e9..385274a44a4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1118,7 +1118,7 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si */ int CDECL _mbsicoll_l(const unsigned char *str1, const unsigned char *str2, _locale_t locale) { - return _mbsnbicoll_l(str1, str2, -1, locale); + return _mbsnbicoll_l(str1, str2, INT_MAX, locale); } /********************************************************************* @@ -1138,7 +1138,7 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) return CompareStringA(get_mbcinfo()->mblcid, NORM_IGNORECASE, (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; #else - return _mbsnbicoll_l(str, cmp, -1, NULL); + return _mbsnbicoll_l(str, cmp, INT_MAX, NULL); #endif } @@ -1164,7 +1164,7 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz */ int CDECL _mbscoll_l(const unsigned char *str1, const unsigned char *str2, _locale_t locale) { - return _mbsnbcoll_l(str1, str2, -1, locale); + return _mbsnbcoll_l(str1, str2, INT_MAX, locale); } /********************************************************************* @@ -1184,7 +1184,7 @@ int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) return CompareStringA(get_mbcinfo()->mblcid, 0, (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; #else - return _mbsnbcoll_l(str, cmp, -1, NULL); + return _mbsnbcoll_l(str, cmp, INT_MAX, NULL); #endif }

1 0

Tim Clem : winemac.drv: Move surface-related logs to the bitblt channel.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 7c45c7c5ebb59237d568a4e5b38626422e670b63 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c45c7c5ebb59237d568a4e5b38626… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Nov 17 10:17:24 2023 -0800 winemac.drv: Move surface-related logs to the bitblt channel. The logs in this file are very noisy. x11drv uses the bitblt channel for its analogous messages. --- dlls/winemac.drv/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 5306e3b619f..8b238ff4853 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -29,7 +29,7 @@ #include "macdrv.h" #include "winuser.h" -WINE_DEFAULT_DEBUG_CHANNEL(macdrv); +WINE_DEFAULT_DEBUG_CHANNEL(bitblt); /* only for use on sanitized BITMAPINFO structures */

1 0