April 2022 - Wine-Commits - list.winehq.org

Matteo Bruni : vkd3d-shader/hlsl: Handle HLSL_TYPE_DOUBLE in sm4_base_type().
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: 8fa196cf51f29fc205369ecbe2189d53802938fd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8fa196cf51f29fc205369ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 6 10:53:30 2022 +0200 vkd3d-shader/hlsl: Handle HLSL_TYPE_DOUBLE in sm4_base_type(). 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_sm4.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1d745f6d..400c3a62 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -290,6 +290,8 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) { case HLSL_TYPE_BOOL: return D3D_SVT_BOOL; + case HLSL_TYPE_DOUBLE: + return D3D_SVT_DOUBLE; case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: return D3D_SVT_FLOAT;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower casts to bool to comparisons.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: 8c086b5c9172798f669c0d36a16ad801a86bb622 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8c086b5c9172798f669c0d3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:42 2022 +0200 vkd3d-shader/hlsl: Lower casts to bool to comparisons. 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/hlsl_codegen.c | 32 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++------- libs/vkd3d-shader/hlsl_sm4.c | 3 ++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b05264c..72c00430 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -750,6 +750,37 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type, *arg_type; + struct hlsl_ir_constant *zero; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_CAST) + return false; + arg_type = expr->operands[0].node->data_type; + if (type->type > HLSL_CLASS_VECTOR || arg_type->type > HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_BOOL) + return false; + + /* Narrowing casts should have already been lowered. */ + assert(type->dimx == arg_type->dimx); + + zero = hlsl_new_constant(ctx, arg_type, &instr->loc); + if (!zero) + return false; + list_add_before(&instr->entry, &zero->node.entry); + + expr->op = HLSL_OP2_NEQUAL; + hlsl_src_from_node(&expr->operands[1], &zero->node); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -1655,6 +1686,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, lower_narrowing_casts, body, NULL); + transform_ir(ctx, lower_casts_to_bool, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e282dbd4..5cac4bde 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -27,7 +27,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct int32_t i; double d; float f; - bool b; if (dst->node.data_type->dimx != src->node.data_type->dimx || dst->node.data_type->dimy != src->node.data_type->dimy) @@ -47,7 +46,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].f; f = src->value[k].f; d = src->value[k].f; - b = !!src->value[k].f; break; case HLSL_TYPE_DOUBLE: @@ -55,7 +53,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].d; f = src->value[k].d; d = src->value[k].d; - b = !!src->value[k].d; break; case HLSL_TYPE_INT: @@ -63,7 +60,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].i; f = src->value[k].i; d = src->value[k].i; - b = !!src->value[k].i; break; case HLSL_TYPE_UINT: @@ -71,7 +67,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].u; f = src->value[k].u; d = src->value[k].u; - b = !!src->value[k].u; break; case HLSL_TYPE_BOOL: @@ -79,7 +74,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = !!src->value[k].u; f = !!src->value[k].u; d = !!src->value[k].u; - b = !!src->value[k].u; break; default: @@ -107,7 +101,8 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; case HLSL_TYPE_BOOL: - dst->value[k].u = b ? ~0u : 0; + /* Casts to bool should have already been lowered. */ + assert(0); break; default: diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 400c3a62..9de8654c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1542,7 +1542,8 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); + /* Casts to bool should have already been lowered. */ + assert(0); break; default:

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 uint negation instructions.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: f3e81645be521bb71fbe7efa47390a297af9a6aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f3e81645be521bb71fbe7ef… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:44 2022 +0200 vkd3d-shader/hlsl: Write SM4 uint negation instructions. 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/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fd0ab321..21997312 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1610,6 +1610,7 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 uint division instructions.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: e37f1ed26d1aa32056972618fc1fc10994620a2b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e37f1ed26d1aa3205697261… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:45 2022 +0200 vkd3d-shader/hlsl: Write SM4 uint division instructions. 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/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 21997312..58529672 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1670,6 +1670,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_DIV, &expr->node, arg1, arg2); break; + case HLSL_TYPE_UINT: + write_sm4_binary_op_with_two_destinations(buffer, VKD3D_SM4_OP_UDIV, &expr->node, 0, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 %s division expression.", dst_type_string->buffer); }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 int multiplication instructions.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: c92897ffd299bce1e7ea2b042a5699728c87917e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c92897ffd299bce1e7ea2b0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:43 2022 +0200 vkd3d-shader/hlsl: Write SM4 int multiplication instructions. 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/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9de8654c..fd0ab321 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1810,6 +1810,7 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); break; + case HLSL_TYPE_INT: case HLSL_TYPE_UINT: /* Using IMUL instead of UMUL because we're taking the low * bits, and the native compiler generates IMUL. */

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 uint modulus instructions.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: ed921151b0cfc818f67615ee37648139fd22bce2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ed921151b0cfc818f67615e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:46 2022 +0200 vkd3d-shader/hlsl: Write SM4 uint modulus instructions. 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> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f49f9642..2c049cb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -318,7 +318,6 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/arithmetic-float.shader_test \ tests/arithmetic-int.shader_test \ - tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 58529672..f5e48173 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1808,6 +1808,18 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP2_MOD: + switch (dst_type->base_type) + { + case HLSL_TYPE_UINT: + write_sm4_binary_op_with_two_destinations(buffer, VKD3D_SM4_OP_UDIV, &expr->node, 1, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 %s modulus expression.", dst_type_string->buffer); + } + break; + case HLSL_OP2_MUL: switch (dst_type->base_type) {

1 0

Matteo Bruni : vkd3d-shader/hlsl: Drop extra '\n' from hlsl_error() messages.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: 233157649c432c3241be1f32cafcee21b84f36d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=233157649c432c3241be1f3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 6 10:53:29 2022 +0200 vkd3d-shader/hlsl: Drop extra '\n' from hlsl_error() messages. 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 | 8 ++++---- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9918be72..1eb7d2ee 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1920,7 +1920,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if (intrinsic->param_count >= 0 && params->args_count != intrinsic->param_count) { hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of arguments to function '%s': expected %u, but got %u.\n", + "Wrong number of arguments to function '%s': expected %u, but got %u.", name, intrinsic->param_count, params->args_count); free_parse_initializer(params); return NULL; @@ -1938,7 +1938,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if ((string = hlsl_type_to_string(ctx, params->args[i]->data_type))) hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.\n", + "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.", i + 1, name, string->buffer); hlsl_release_string_buffer(ctx, string); free_parse_initializer(params); @@ -2969,7 +2969,7 @@ type: string = hlsl_type_to_string(ctx, $3); if (string) hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Texture data type %s is not scalar or vector.\n", string->buffer); + "Texture data type %s is not scalar or vector.", string->buffer); hlsl_release_string_buffer(ctx, string); } $$ = hlsl_new_texture_type(ctx, $1, $3); @@ -3489,7 +3489,7 @@ primary_expr: } else { - hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Identifier \"%s\" is not declared.\n", $1); + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Identifier \"%s\" is not declared.", $1); YYABORT; } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index afc4d26b..1d745f6d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1417,7 +1417,7 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer if (!encode_texel_offset_as_aoffimmi(&instr, texel_offset)) { hlsl_error(ctx, &texel_offset->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET, - "Offset must resolve to integer literal in the range -8 to 7.\n"); + "Offset must resolve to integer literal in the range -8 to 7."); return; } }

1 0

Matteo Bruni : vkd3d-shader/hlsl: Drop extra '\n' from hlsl_fixme() messages.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: vkd3d Branch: master Commit: 4ab4d424687e98d7c6a44e54dfb24e1e2e917686 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4ab4d424687e98d7c6a44e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 6 10:53:28 2022 +0200 vkd3d-shader/hlsl: Drop extra '\n' from hlsl_fixme() messages. 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_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index f661dbc2..0cdd3917 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -790,7 +790,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..afc4d26b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1519,11 +1519,11 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint."); break; default: @@ -1532,15 +1532,15 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_HALF: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double."); break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); break; default: @@ -2019,7 +2019,7 @@ static void write_sm4_store(struct hlsl_ctx *ctx, if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) { - hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable.\n"); + hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable."); return; } @@ -2072,7 +2072,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; }

1 0

Jinoh Kang : c2man: Recognize file extensions in forward specifications.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: tools Branch: master Commit: 0a9f1e2e899e98f34c162e4340f498736b61142b URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a9f1e2e899e98f34c162e4… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Apr 8 01:04:52 2022 +0900 c2man: Recognize file extensions in forward specifications. Today, c2man assumes that there is no file extension in the DLL name part of a forward specification. This causes forwarded exports to krnl386.exe16 from kernel32 to be recognized incorrectly. For example, the spec index file for kernel32 contains the following incorrect entry: VxDCall0() (forwarded to exe16.VxDCall0() in krnl386()) Fix this by correctly handling DLL names with file extensions in forward specifications. We omit the extension in the link destination, but not the link text itself. The line above is now changed into: VxDCall0() (forwarded to VxDCall0() in {{krnl386.exe16}}{{krnl386}}) We switch to the double-brace syntax for the DLL hyperlink, since the "<id>()" syntax cannot accept strings with dots in them. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c2man.pl b/c2man.pl index 0fe9e78..883a888 100755 --- a/c2man.pl +++ b/c2man.pl @@ -1229,9 +1229,9 @@ sub output_spec($) # @$_ => ordinal, call convention, exported name, implementation name, flags; if (@$_[$EXPORT_CALL] eq "forward") { - my $forward_dll = @$_[$EXPORT_IMPNAME]; - $forward_dll =~ s/\.(.*)//; - $line = @$_[$EXPORT_EXPNAME]." (forward to ".$1."() in ".$forward_dll."())"; + if (@$_[$EXPORT_IMPNAME] =~ /^(?:([^.]*)((?:\..*)?)\.)?([^.]*)$/) { + $line = @$_[$EXPORT_EXPNAME]." (forward to ".$3."() in {{".$1.$2."}}{{".$1."}})"; + } } elsif (@$_[$EXPORT_CALL] eq "extern") {

1 0

Jinoh Kang : c2man: Lowercase forwarded export module links.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: tools Branch: master Commit: d1ba1789796bccf3dd4f2c07a56bcdde85210e2f URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1ba1789796bccf3dd4f2c0… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Apr 8 01:05:54 2022 +0900 c2man: Lowercase forwarded export module links. Some forward specifications specify the module name in uppercase (e.g. NTDLL), whereas Wine DLL names are always in lowercase (e.g. ntdll). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c2man.pl b/c2man.pl index 883a888..b4226a0 100755 --- a/c2man.pl +++ b/c2man.pl @@ -1230,7 +1230,7 @@ sub output_spec($) if (@$_[$EXPORT_CALL] eq "forward") { if (@$_[$EXPORT_IMPNAME] =~ /^(?:([^.]*)((?:\..*)?)\.)?([^.]*)$/) { - $line = @$_[$EXPORT_EXPNAME]." (forward to ".$3."() in {{".$1.$2."}}{{".$1."}})"; + $line = @$_[$EXPORT_EXPNAME]." (forward to ".$3."() in {{".$1.$2."}}{{".lc($1)."}})"; } } elsif (@$_[$EXPORT_CALL] eq "extern")

1 0