March 2024 - Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/d3dbc: Implement bool to float cast as MOV.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 58c456ff2bec9c413b23d898f15808316f25c69f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58c456ff2bec9c413b23d898f1580… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 20 22:06:45 2024 -0300 vkd3d-shader/d3dbc: Implement bool to float cast as MOV. In SM1, bools are always represented as either 0.0f or 1.0f at runtime. --- libs/vkd3d-shader/d3dbc.c | 7 ++----- tests/hlsl/cast-to-float.shader_test | 4 ++-- tests/hlsl/cast-to-half.shader_test | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 0f5d34ee..a8cca17f 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1977,16 +1977,13 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - /* Integers are internally represented as floats, so no change is necessary.*/ + case HLSL_TYPE_BOOL: + /* Integrals are internally represented as floats, so no change is necessary.*/ case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); break; - case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to float."); - break; - case HLSL_TYPE_DOUBLE: hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to float."); break; diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index bcb546e2..d80d4290 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform int i; uniform uint u; uniform bool b; @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -todo(sm<4) draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-half.shader_test b/tests/hlsl/cast-to-half.shader_test index 0580fe25..8094a10a 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform int i; uniform uint u; uniform bool b; @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -todo(sm<4) draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add keyword tokens for fx_5_0 shader object types.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 5edbccd33bff303898516c53fe4ccb8fd6602813 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5edbccd33bff303898516c53fe4cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 00:51:20 2024 +0100 vkd3d-shader/hlsl: Add keyword tokens for fx_5_0 shader object types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 3 +++ libs/vkd3d-shader/hlsl.y | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 558506db..decc26df 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -76,6 +76,7 @@ case {return KW_CASE; } cbuffer {return KW_CBUFFER; } centroid {return KW_CENTROID; } column_major {return KW_COLUMN_MAJOR; } +ComputeShader {return KW_COMPUTESHADER; } compile {return KW_COMPILE; } const {return KW_CONST; } continue {return KW_CONTINUE; } @@ -83,6 +84,7 @@ DepthStencilState {return KW_DEPTHSTENCILSTATE; } DepthStencilView {return KW_DEPTHSTENCILVIEW; } default {return KW_DEFAULT; } discard {return KW_DISCARD; } +DomainShader {return KW_DOMAINSHADER; } do {return KW_DO; } double {return KW_DOUBLE; } else {return KW_ELSE; } @@ -92,6 +94,7 @@ for {return KW_FOR; } fxgroup {return KW_FXGROUP; } GeometryShader {return KW_GEOMETRYSHADER; } groupshared {return KW_GROUPSHARED; } +HullShader {return KW_HULLSHADER; } if {return KW_IF; } in {return KW_IN; } inline {return KW_INLINE; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cd05fd00..9475a3c8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5243,6 +5243,7 @@ static void validate_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, %token KW_CENTROID %token KW_COLUMN_MAJOR %token KW_COMPILE +%token KW_COMPUTESHADER %token KW_CONST %token KW_CONTINUE %token KW_DEFAULT @@ -5250,6 +5251,7 @@ static void validate_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, %token KW_DEPTHSTENCILVIEW %token KW_DISCARD %token KW_DO +%token KW_DOMAINSHADER %token KW_DOUBLE %token KW_ELSE %token KW_EXTERN @@ -5258,6 +5260,7 @@ static void validate_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, %token KW_FXGROUP %token KW_GEOMETRYSHADER %token KW_GROUPSHARED +%token KW_HULLSHADER %token KW_IF %token KW_IN %token KW_INLINE

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Allow technique10 {} blocks for fx_2_0.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: dd5e42d3479133bc57c47bac8dd3a5c043beb0e8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd5e42d3479133bc57c47bac8dd3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 01:11:40 2024 +0100 vkd3d-shader/hlsl: Allow technique10 {} blocks for fx_2_0. Such techniques are ignored later, but do not cause compilation errors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 4 ---- tests/hlsl/technique-fx_2.shader_test | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9475a3c8..8cdc8226 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5538,10 +5538,6 @@ technique10: struct hlsl_scope *scope = ctx->cur_scope; hlsl_pop_scope(ctx); - if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) - hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, - "The 'technique10' keyword is invalid for this profile."); - if (!add_technique(ctx, $2, scope, $3, "technique10", &@1)) YYABORT; } diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index b84bbc16..3b71d0a3 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -76,7 +76,7 @@ float4 main() : sv_target return fxGroup; } -[effect todo] +[effect] technique { }

1 0

Conor McCarthy : vkd3d-shader/spirv: Always use a 64-bit write mask for IMMCONST64 src params.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 5082893e5d06760a4fa3187d8db6091638604107 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5082893e5d06760a4fa3187d8db60… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 27 17:48:36 2024 +1000 vkd3d-shader/spirv: Always use a 64-bit write mask for IMMCONST64 src params. There is no way to tell in spirv_compiler_emit_load_reg() if the write mask is 64-bit. All loads are 32-bit except for IMMCONST64 and SSA, and the latter ignores the mask, so the only issue lies with IMMCONST64. --- libs/vkd3d-shader/spirv.c | 6 ++++-- tests/hlsl/uav-rwbyteaddressbuffer.shader_test | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6b5f54fe..c0cbdccf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7093,8 +7093,8 @@ static void spirv_compiler_emit_mov(struct spirv_compiler *compiler, struct vkd3d_shader_register_info dst_reg_info, src_reg_info; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + unsigned int i, component_count, write_mask; uint32_t components[VKD3D_VEC4_SIZE]; - unsigned int i, component_count; if (register_is_constant_or_undef(&src->reg) || src->reg.type == VKD3DSPR_SSA || dst->reg.type == VKD3DSPR_SSA || dst->modifiers || src->modifiers) @@ -7145,7 +7145,9 @@ static void spirv_compiler_emit_mov(struct spirv_compiler *compiler, } general_implementation: - val_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + write_mask = (src->reg.type == VKD3DSPR_IMMCONST64 && !data_type_is_64_bit(dst->reg.data_type)) + ? vsir_write_mask_64_from_32(dst->write_mask) : dst->write_mask; + val_id = spirv_compiler_emit_load_src(compiler, src, write_mask); if (dst->reg.data_type != src->reg.data_type) { val_id = vkd3d_spirv_build_op_bitcast(builder, vkd3d_spirv_get_type_id_for_data_type(builder, diff --git a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test index 056f94f6..556d0fb3 100644 --- a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test +++ b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test @@ -34,7 +34,7 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm<6) draw quad if(sm<6) probe uav 1 (0) ri (12) if(sm>=6) probe uav 1 (0) rd (12.2) @@ -54,6 +54,6 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe uav 1 (0) ri64 (-12) probe uav 1 (1) rd (13.3)

1 0

Francisco Casas : vkd3d-shader/hlsl: Lower non-float operators for SM1.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 747511131de3cce5d223641143b5b0b3a1b697ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/747511131de3cce5d223641143b5b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 21 16:17:45 2024 -0300 vkd3d-shader/hlsl: Lower non-float operators for SM1. --- libs/vkd3d-shader/hlsl_codegen.c | 62 +++++++++++++++++++++++++++ tests/hlsl/arithmetic-int-uniform.shader_test | 4 +- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 413888d8..8434a921 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3343,6 +3343,61 @@ static bool lower_float_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_nonfloat_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op == HLSL_OP1_CAST || instr->data_type->base_type == HLSL_TYPE_FLOAT) + return false; + + switch (expr->op) + { + case HLSL_OP1_ABS: + case HLSL_OP1_NEG: + case HLSL_OP2_ADD: + case HLSL_OP2_DIV: + case HLSL_OP2_MAX: + case HLSL_OP2_MIN: + case HLSL_OP2_MUL: + { + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_ir_node *arg, *arg_cast, *float_expr, *ret; + struct hlsl_type *float_type; + unsigned int i; + + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) + { + arg = expr->operands[i].node; + if (!arg) + continue; + + float_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, arg->data_type->dimx); + if (!(arg_cast = hlsl_new_cast(ctx, arg, float_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, arg_cast); + + operands[i] = arg_cast; + } + + float_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, instr->data_type->dimx); + if (!(float_expr = hlsl_new_expr(ctx, expr->op, operands, float_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, float_expr); + + if (!(ret = hlsl_new_cast(ctx, float_expr, instr->data_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, ret); + + return true; + } + default: + return false; + } +} + static bool lower_discard_neg(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_node *zero, *bool_false, *or, *cmp, *load; @@ -5122,6 +5177,13 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry remove_unreachable_code(ctx, body); hlsl_transform_ir(ctx, normalize_switch_cases, body, NULL); + if (profile-> major_version < 4) + { + lower_ir(ctx, lower_nonfloat_exprs, body); + /* Constants casted to float must be folded. */ + hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); + } + lower_ir(ctx, lower_nonconstant_vector_derefs, body); lower_ir(ctx, lower_casts_to_bool, body); lower_ir(ctx, lower_int_dot, body); diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index e176d4b8..48e1ae1a 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -88,7 +88,7 @@ uniform 0 float4 45.0 5.0 0.0 0.0 todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 a; float4 main() : SV_TARGET @@ -98,7 +98,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -todo(sm<4) draw quad +draw quad probe all rgba (5.0, 7.0, 0.0, 10.0) [pixel shader todo(sm<4)]

1 0

Francisco Casas : vkd3d-shader/hlsl: Lower casts to int using REINTERPRET instead.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: a3319339e467beb2f03836842801e9c59eb3f988 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a3319339e467beb2f03836842801e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 21 16:36:43 2024 -0300 vkd3d-shader/hlsl: Lower casts to int using REINTERPRET instead. I realized that it is better to lower casts to int to FLOOR+REINTERPET instead of appending a FLOOR to all casts to int and assuming that this is the case for all of them in d3dbc.c. This in case we introduce new passes in the future that add casts that we forget to lower, after the lower_casts_to_bool pass. --- libs/vkd3d-shader/d3dbc.c | 11 ++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 15 +++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index a697a2a8..0f5d34ee 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2002,7 +2002,10 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b { case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: - /* A compilation pass applies a FLOOR operation to casts to int, so no change is necessary. */ + /* A compilation pass turns these into FLOOR+REINTERPRET, so we should not + * reach this case unless we are missing something. */ + hlsl_fixme(ctx, &instr->loc, "Unlowered SM1 cast from float to integer."); + break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); @@ -2242,6 +2245,12 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b assert(instr->reg.allocated); + if (expr->op == HLSL_OP1_REINTERPRET) + { + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); + return; + } + if (expr->op == HLSL_OP1_CAST) { write_sm1_cast(ctx, buffer, instr); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e7fc02d0..413888d8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2647,10 +2647,11 @@ static bool sort_synthetic_separated_samplers_first(struct hlsl_ctx *ctx) return false; } -/* Append a FLOOR before a CAST to int or uint (which is written as a mere MOV). */ +/* Turn CAST to int or uint into FLOOR + REINTERPRET (which is written as a mere MOV). */ static bool lower_casts_to_int(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { - struct hlsl_ir_node *arg, *floor, *cast2; + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 }; + struct hlsl_ir_node *arg, *floor, *res; struct hlsl_ir_expr *expr; if (instr->type != HLSL_IR_EXPR) @@ -2665,17 +2666,15 @@ static bool lower_casts_to_int(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (arg->data_type->base_type != HLSL_TYPE_FLOAT && arg->data_type->base_type != HLSL_TYPE_HALF) return false; - /* Check that the argument is not already a FLOOR */ - if (arg->type == HLSL_IR_EXPR && hlsl_ir_expr(arg)->op == HLSL_OP1_FLOOR) - return false; - if (!(floor = hlsl_new_unary_expr(ctx, HLSL_OP1_FLOOR, arg, &instr->loc))) return false; hlsl_block_add_instr(block, floor); - if (!(cast2 = hlsl_new_cast(ctx, floor, instr->data_type, &instr->loc))) + memset(operands, 0, sizeof(operands)); + operands[0] = floor; + if (!(res = hlsl_new_expr(ctx, HLSL_OP1_REINTERPRET, operands, instr->data_type, &instr->loc))) return false; - hlsl_block_add_instr(block, cast2); + hlsl_block_add_instr(block, res); return true; }

1 0

Yuxuan Shui : dmime: Handle MIDI control events in MIDI files.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 28b94c4d4267230572d8df95d4020ed09d36ebad URL: https://gitlab.winehq.org/wine/wine/-/commit/28b94c4d4267230572d8df95d4020e… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 22 18:08:17 2024 +0000 dmime: Handle MIDI control events in MIDI files. Adding them to the seqtrack, and also implementing playing them from the seqtrack. --- dlls/dmime/midi.c | 48 ++++++++++++++++++++++++++++++++---------------- dlls/dmime/seqtrack.c | 42 +++++++++++++++++++++++++++++++----------- dlls/dmime/tests/dmime.c | 29 ++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 30 deletions(-) diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c index e4aa165815d..57b6a3adf90 100644 --- a/dlls/dmime/midi.c +++ b/dlls/dmime/midi.c @@ -187,22 +187,12 @@ static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE * status_type = event->status & 0xf0; event->data[0] = byte; - if (status_type == MIDI_PROGRAM_CHANGE) - { - TRACE("MIDI program change event status %#02x, data: %#02x, time +%lu\n", event->status, - event->data[0], delta_time); - } - else - { - if (status_type != MIDI_CHANNEL_PRESSURE && (hr = stream_read_at_most(stream, &byte, 1, bytes_left)) != S_OK) - return hr; - event->data[1] = byte; - if (status_type == MIDI_NOTE_ON || status_type == MIDI_NOTE_OFF) - TRACE("MIDI note event status %#02x, data: %#02x, %#02x, time +%lu\n", event->status, - event->data[0], event->data[1], delta_time); - else - FIXME("MIDI event status %#02x, time +%lu, not supported\n", event->status, delta_time); - } + if (status_type != MIDI_PROGRAM_CHANGE && status_type != MIDI_CHANNEL_PRESSURE && + (hr = stream_read_at_most(stream, &byte, 1, bytes_left)) != S_OK) + return hr; + event->data[1] = byte; + TRACE("MIDI event status %#02x, data: %#02x, %#02x, time +%lu\n", event->status, event->data[0], + event->data[1], delta_time); return S_OK; } @@ -303,6 +293,27 @@ static HRESULT midi_parser_handle_note_on_off(struct midi_parser *parser, struct return S_OK; } +static HRESULT midi_parser_handle_control(struct midi_parser *parser, struct midi_event *event) +{ + struct midi_seqtrack_item *item; + DMUS_IO_SEQ_ITEM *seq_item; + MUSIC_TIME dmusic_time = (ULONGLONG)parser->time * DMUS_PPQ / parser->division; + + if ((item = calloc(1, sizeof(struct midi_seqtrack_item))) == NULL) return E_OUTOFMEMORY; + + seq_item = &item->item; + seq_item->mtTime = dmusic_time; + seq_item->mtDuration = 0; + seq_item->dwPChannel = event->status & 0xf; + seq_item->bStatus = event->status & 0xf0; + seq_item->bByte1 = event->data[0]; + seq_item->bByte2 = event->data[1]; + list_add_tail(&parser->seqtrack_items, &item->entry); + parser->seqtrack_items_count++; + + return S_OK; +} + static int midi_seqtrack_item_compare(const void *a, const void *b) { const DMUS_IO_SEQ_ITEM *item_a = a, *item_b = b; @@ -351,6 +362,11 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment case MIDI_NOTE_OFF: hr = midi_parser_handle_note_on_off(parser, &event); break; + case MIDI_CHANNEL_PRESSURE: + case MIDI_PITCH_BEND_CHANGE: + case MIDI_CONTROL_CHANGE: + hr = midi_parser_handle_control(parser, &event); + break; case MIDI_PROGRAM_CHANGE: hr = midi_parser_handle_program_change(parser, &event); break; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index fc50009402a..1b0e99bd77c 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dmusic_midi.h" #include "dmime_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -130,27 +131,46 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state for (i = 0; SUCCEEDED(hr) &&i < This->count; i++) { DMUS_IO_SEQ_ITEM *item = This->items + i; - DMUS_NOTE_PMSG *msg; + DMUS_PMSG *msg; if (item->mtTime < start_time) continue; if (item->mtTime >= end_time) continue; - if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), - (DMUS_PMSG **)&msg))) - break; + if (item->bStatus == MIDI_NOTE_ON) + { + DMUS_NOTE_PMSG *note; + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*note), + (DMUS_PMSG **)&note))) + break; + + note->dwType = DMUS_PMSGT_NOTE; + note->mtDuration = item->mtDuration; + note->wMusicValue = item->bByte1; + note->nOffset = item->nOffset; + note->bVelocity = item->bByte2; + note->bFlags = 1; + note->bMidiValue = item->bByte1; + msg = (DMUS_PMSG *)note; + } + else + { + DMUS_MIDI_PMSG *midi; + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*midi), + (DMUS_PMSG **)&midi))) + break; + + midi->dwType = DMUS_PMSGT_MIDI; + midi->bStatus = item->bStatus; + midi->bByte1 = item->bByte1; + midi->bByte2 = item->bByte2; + msg = (DMUS_PMSG *)midi; + } msg->mtTime = item->mtTime + time_offset; msg->dwFlags = DMUS_PMSGF_MUSICTIME; msg->dwPChannel = item->dwPChannel; msg->dwVirtualTrackID = track_id; - msg->dwType = DMUS_PMSGT_NOTE; msg->dwGroupID = 1; - msg->mtDuration = item->mtDuration; - msg->wMusicValue = item->bByte1; - msg->nOffset = item->nOffset; - msg->bVelocity = item->bByte2; - msg->bFlags = 1; - msg->bMidiValue = item->bByte1; if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3086dcaf978..9a2cd9d803c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1633,6 +1633,13 @@ static void test_midi(void) 0xc1, /* event type, program change, channel 1 */ 0x30, /* event data, patch 48 */ }; + static const char midi_control_change[] = + { + 0x04, /* delta time = 4 */ + 0xb1, /* event type, control change, channel 1 */ + 0x07, /* event data, channel volume */ + 0x40, /* event data, 64 */ + }; static const char midi_note_on[] = { 0x04, /* delta time = 4 */ @@ -1667,10 +1674,11 @@ static void test_midi(void) WCHAR test_mid[MAX_PATH], bogus_mid[MAX_PATH]; HRESULT hr; ULONG ret; - DWORD track_length; + DWORD track_length, trace2_length; MUSIC_TIME next; DMUS_PMSG *msg; DMUS_NOTE_PMSG *note; + DMUS_MIDI_PMSG *midi; DMUS_PATCH_PMSG *patch; DMUS_TEMPO_PARAM tempo_param; #include <pshpack1.h> @@ -1873,13 +1881,16 @@ static void test_midi(void) ok(hr == S_OK, "got %#lx\n", hr); /* Add a second track, to test the duration of the trailing note. */ - track_header.length = RtlUlongByteSwap(sizeof(track_header) - 8 + sizeof(midi_note_on) + sizeof(midi_note_off)); + trace2_length = sizeof(midi_note_on) + sizeof(midi_note_off2) + sizeof(midi_control_change); + track_header.length = RtlUlongByteSwap(sizeof(track_header) - 8 + trace2_length); hr = IStream_Write(stream, &track_header, sizeof(track_header), NULL); ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Write(stream, midi_note_on, sizeof(midi_note_on), NULL); ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Write(stream, midi_note_off2, sizeof(midi_note_off2), NULL); ok(hr == S_OK, "got %#lx\n", hr); + hr = IStream_Write(stream, midi_control_change, sizeof(midi_control_change), NULL); + ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Seek(stream, zero, 0, NULL); ok(hr == S_OK, "got %#lx\n", hr); @@ -1887,7 +1898,7 @@ static void test_midi(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Seek(stream, zero, STREAM_SEEK_CUR, &position); ok(hr == S_OK, "got %#lx\n", hr); - ok(position.QuadPart == sizeof(header) + sizeof(track_header) * 2 + track_length + sizeof(midi_note_on) + sizeof(midi_note_off), + ok(position.QuadPart == sizeof(header) + sizeof(track_header) * 2 + track_length + trace2_length, "got %lld\n", position.QuadPart); IPersistStream_Release(persist); IStream_Release(stream); @@ -1981,6 +1992,18 @@ static void test_midi(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&msg); + ok(!ret, "got %#lx\n", ret); + ok(msg->dwType == DMUS_PMSGT_MIDI, "got msg type %#lx, expected MIDI\n", msg->dwType); + ok(msg->mtTime == 649, "got mtTime %lu, expected 649\n", msg->mtTime); + ok(msg->dwPChannel == 1, "got pchannel %lu, expected 1\n", msg->dwPChannel); + midi = (DMUS_MIDI_PMSG *)msg; + ok(midi->bStatus == 0xb0, "got status %#x, expected 0xb1\n", midi->bStatus); + ok(midi->bByte1 == 0x07, "got byte1 %#x, expected 0x07\n", midi->bByte1); + ok(midi->bByte2 == 0x40, "got byte2 %#x, expected 0x40\n", midi->bByte2); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + /* wine generates an extra DIRTY event. */ ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&msg); todo_wine ok(ret == WAIT_TIMEOUT, "unexpected message\n");

1 0

Eric Pouech : dbghelp: Change order when trying to load modules.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: d6d22677da3f60c6769a7a85897493772477207f URL: https://gitlab.winehq.org/wine/wine/-/commit/d6d22677da3f60c6769a7a85897493… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 18 12:59:22 2023 +0100 dbghelp: Change order when trying to load modules. Change from: dll.so > PE image > ELF/Mach-O images into PE image > dll.so > ELF/Mach-O images Main goal is in SymLoadModule*(), to not resynchronize the system modules list when requesting loading of a PE image. This can gain quite some time in some situations. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/module.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index f21733c7be9..2507e65e169 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -956,10 +956,12 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam } } - pcs->loader->synchronize_module_list(pcs); - /* this is a Wine extension to the API just to redo the synchronisation */ - if (!wImageName && !hFile) return 0; + if (!wImageName && !hFile) + { + pcs->loader->synchronize_module_list(pcs); + return 0; + } if (Flags & SLMFLAG_VIRTUAL) { @@ -968,28 +970,31 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!module) return 0; module->module.SymType = SymVirtual; } - /* check if it's a builtin PE module with a containing ELF module */ - else if (wImageName && module_is_container_loaded(pcs, wImageName, BaseOfDll)) - { - /* force the loading of DLL as builtin */ - module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); - } - if (!module) + else { - /* otherwise, try a regular PE module */ - if (!(module = pe_load_native_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll)) && - wImageName) + /* try PE image */ + module = pe_load_native_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll); + if (!module && wImageName) { - /* and finally an ELF or Mach-O module */ - module = pcs->loader->load_module(pcs, wImageName, BaseOfDll); + /* It could be either a dll.so file (for which we need the corresponding + * system module) or a system module. + * In both cases, ensure system module list is up-to-date. + */ + pcs->loader->synchronize_module_list(pcs); + if (module_is_container_loaded(pcs, wImageName, BaseOfDll)) + module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); + /* at last, try ELF or Mach-O module */ + if (!module) + module = pcs->loader->load_module(pcs, wImageName, BaseOfDll); + } + if (!module) + { + WARN("Couldn't locate %s\n", debugstr_w(wImageName)); + SetLastError(ERROR_NO_MORE_FILES); + return 0; } } - if (!module) - { - WARN("Couldn't locate %s\n", debugstr_w(wImageName)); - SetLastError(ERROR_NO_MORE_FILES); - return 0; - } + /* by default module_new fills module.ModuleName from a derivation * of LoadedImageName. Overwrite it, if we have better information */

1 0

Eric Pouech : dbghelp: Relax failure conditions.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 0e3dba2a7ae7de844908647907eeefa0ca64b67c URL: https://gitlab.winehq.org/wine/wine/-/commit/0e3dba2a7ae7de844908647907eeef… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Feb 24 09:19:38 2024 +0100 dbghelp: Relax failure conditions. dbghelp tests build PDB files, without hash table in TPI stream, but also no types. Native is able to load these PDB files. So, don't fail when loading a PDB without a TPI hash table and without any types. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4d310cd0f21..aeaa55cc713 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3351,12 +3351,14 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, ERR("-Unsupported hash of size %u\n", ctp->header.hash_value_size); return FALSE; } - ctp->hash_stream = pdb_read_stream(pdb_file, ctp->header.hash_stream); - /* FIXME always present? if not reconstruct ?*/ - if (!ctp->hash_stream) + if (!(ctp->hash_stream = pdb_read_stream(pdb_file, ctp->header.hash_stream))) { - ERR("-Missing hash table in PDB file\n"); - return FALSE; + if (ctp->header.last_index > ctp->header.first_index) + { + /* may be reconstruct hash table ? */ + FIXME("-No hash table, while types exist\n"); + return FALSE; + } } ctp->module = msc_dbg->module; @@ -3388,7 +3390,7 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, /* parse the remap table * => move listed type_id at first position of their hash buckets so that we force remap to them */ - if (ctp->header.type_remap_size) + if (ctp->hash_stream && ctp->header.type_remap_size) { const unsigned* remap = (const unsigned*)((const BYTE*)ctp->hash_stream + ctp->header.type_remap_offset); unsigned i, capa, count_present;

1 0

Eric Pouech : dbghelp: Fix some corner case of virtual module loading.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 83476e3d4ab0a0c7b1eca392e363591ba550440c URL: https://gitlab.winehq.org/wine/wine/-/commit/83476e3d4ab0a0c7b1eca392e36359… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 8 15:29:02 2024 +0100 dbghelp: Fix some corner case of virtual module loading. Seen when debugging some game, one can load a virtual module with a NULL image name. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/module.c | 4 ++-- dlls/dbghelp/tests/path.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a0de4f65056..5021d54c93e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -959,7 +959,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam } /* this is a Wine extension to the API just to redo the synchronisation */ - if (!wImageName && !hFile) + if (!wImageName && !hFile && !Flags) { pcs->loader->synchronize_module_list(pcs); return 0; @@ -967,7 +967,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { - if (!wImageName) return 0; + if (!wImageName) wImageName = L""; module = module_new(pcs, wImageName, DMT_PE, FALSE, TRUE, BaseOfDll, SizeOfDll, 0, 0, IMAGE_FILE_MACHINE_UNKNOWN); if (!module) return 0; module->module.SymType = SymVirtual; diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index fc9a2e13bf9..9afefd2d12a 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -1774,12 +1774,9 @@ static void test_load_modules_details(void) base = SymLoadModuleExW(dummy, NULL, test->in_image_name, test->in_module_name, 0x4000, 0x6666, NULL, test->flags); - todo_wine_if(i == 0 || i == 1) ok(base == 0x4000, "SymLoadModuleExW failed: %lu\n", GetLastError()); ret = SymGetModuleInfoW64(dummy, base, &im); - todo_wine_if(i == 0 || i == 1) ok(ret, "SymGetModuleInfow64 failed: %lu\n", GetLastError()); - if (!ret) goto temp_bail_out; if (test->in_image_name) { WCHAR *dot; @@ -1892,7 +1889,6 @@ static void test_load_modules_details(void) } else ok(0, "Unrecognized file reference %c\n", *ptr); } - temp_bail_out: if (test->in_image_name && !wcscmp(test->in_image_name, L"bar.dll")) { make_path(filename, topdir, NULL, test->in_image_name);

1 0