November 2021 - Wine-Devel - list.winehq.org

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification

by Andrew Eikum

On Fri, Nov 05, 2021 at 08:22:40PM +0100, Piotr Caban wrote: > Hi Andrew, > > On 11/5/21 19:49, Andrew Eikum wrote: > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > > --- > > > > For example, > > > > "%*0d", 1, ... > > > > becomes > > > > "%10d", ... > > > > i.e. prints ten digits. > It looks like a bug in native implementation. It also got fixed in newer > versions of C runtime (I have only checked ucrtbase). Is there an > application that depends on that? > Yeah, newly released Age of Empires IV uses a format string like "%0*02d" and crashes when Wine invokes the error handler. Andrew

Nov. 5, 2021

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification

by Piotr Caban

Hi Andrew, On 11/5/21 19:49, Andrew Eikum wrote: > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > For example, > > "%*0d", 1, ... > > becomes > > "%10d", ... > > i.e. prints ten digits. It looks like a bug in native implementation. It also got fixed in newer versions of C runtime (I have only checked ucrtbase). Is there an application that depends on that? Thanks, Piotr

Nov. 5, 2021

[PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- For example, "%*0d", 1, ... becomes "%10d", ... i.e. prints ten digits. dlls/msvcrt/printf.h | 4 +++- dlls/msvcrt/tests/printf.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..40a8a13d861 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..0dd25c3ba8b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -395,6 +395,18 @@ static void test_sprintf( void ) ok(r==14, "r = %d\n", r); ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==11, "r = %d\n", r); + ok(!strcmp(buffer, " 3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000000002"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); + setlocale(LC_ALL, "C"); } -- 2.33.1

Nov. 5, 2021

Re: [PATCH v3 2/4] wined3d: Protect wined3d_chunk_vk map fields with a mutex.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Nov. 5, 2021

Re: [PATCH v3 3/4] wined3d: Allocate all Vulkan buffer BOs from heap.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Nov. 5, 2021

Re: [PATCH v3 1/4] wined3d: Avoid accessing the "bo" member of struct wined3d_buffer_vk.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Nov. 5, 2021

Re: [PATCH vkd3d 3/5] vkd3d-shader/hlsl: Write SM4 conditionals.

by Matteo Bruni

On Tue, Nov 2, 2021 at 11:49 AM Giovanni Mascellani <gmascellani(a)codeweavers.com> wrote: > > Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm4.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index c022b5dd..3919725d 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -1358,6 +1358,33 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, > } > } > > +static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_if *iff) > +{ > + struct sm4_instruction instr = > + { > + .opcode = VKD3D_SM4_OP_IF | VKD3D_SM4_CONDITIONAL_NZ, > + .src_count = 1, > + }; > + unsigned int writemask; > + > + assert(iff->condition.node->data_type->dimx == 1); > + > + sm4_register_from_node(&instr.srcs[0].reg, &writemask, iff->condition.node); > + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); > + write_sm4_instruction(buffer, &instr); > + > + write_sm4_block(ctx, buffer, &iff->then_instrs); > + > + instr.opcode = VKD3D_SM4_OP_ELSE; > + instr.src_count = 0; > + write_sm4_instruction(buffer, &instr); > + > + write_sm4_block(ctx, buffer, &iff->else_instrs); It would probably be nicer not to emit the else at all when there are no instructions in the block. > + > + instr.opcode = VKD3D_SM4_OP_ENDIF; > + write_sm4_instruction(buffer, &instr); > +} > + > static void write_sm4_load(struct hlsl_ctx *ctx, > struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) > {

Nov. 5, 2021

[PATCH vkd3d v3 14/14] vkd3d-shader/hlsl: Fix an array dimension declaration order.

by Matteo Bruni

From: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> 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> --- All the signoffs :D libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c71eac3f..42ea7b38 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -915,7 +915,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_OBJECT: { - static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = + static const char dimensions[HLSL_SAMPLER_DIM_MAX + 1][5] = { [HLSL_SAMPLER_DIM_1D] = "1D", [HLSL_SAMPLER_DIM_2D] = "2D", -- 2.26.3

Nov. 5, 2021

[PATCH vkd3d v3 13/14] vkd3d-shader/hlsl: Fix a typo in an error message.

by Matteo Bruni

From: Giovanni Mascellani <gmascellani(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> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3d0a9ced..2120b26f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2190,7 +2190,7 @@ struct_declaration: "Anonymous struct type must declare a variable."); if (modifiers) hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers are not allowed on struct type declataions."); + "Modifiers are not allowed on struct type declarations."); } if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) -- 2.26.3

Nov. 5, 2021

[PATCH vkd3d v3 12/14] vkd3d-shader/hlsl: Align conditionals and loops in the IR dump.

by Matteo Bruni

From: Giovanni Mascellani <gmascellani(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> --- libs/vkd3d-shader/hlsl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index da4f10a9..c71eac3f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1208,11 +1208,11 @@ static void dump_ir_if(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, { vkd3d_string_buffer_printf(buffer, "if ("); dump_src(buffer, &if_node->condition); - vkd3d_string_buffer_printf(buffer, ")\n{\n"); + vkd3d_string_buffer_printf(buffer, ") {\n"); dump_instr_list(ctx, buffer, &if_node->then_instrs.instrs); - vkd3d_string_buffer_printf(buffer, "}\nelse\n{\n"); + vkd3d_string_buffer_printf(buffer, " %10s } else {\n", ""); dump_instr_list(ctx, buffer, &if_node->else_instrs.instrs); - vkd3d_string_buffer_printf(buffer, "}\n"); + vkd3d_string_buffer_printf(buffer, " %10s }", ""); } static void dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) @@ -1239,9 +1239,9 @@ static void dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_i static void dump_ir_loop(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) { - vkd3d_string_buffer_printf(buffer, "for (;;)\n{\n"); + vkd3d_string_buffer_printf(buffer, "for (;;) {\n"); dump_instr_list(ctx, buffer, &loop->body.instrs); - vkd3d_string_buffer_printf(buffer, "}\n"); + vkd3d_string_buffer_printf(buffer, " %10s }", ""); } static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_resource_load *load) -- 2.26.3

Nov. 5, 2021