March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Allow static const variables to lack an initializer.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: vkd3d Branch: master Commit: 0c1c916ad7a64ecb97bab7645c841f4729f7feef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c1c916ad7a64ecb97bab76… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 18 00:22:23 2021 -0500 vkd3d-shader: Allow static const variables to lack an initializer. 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 | 3 ++- tests/hlsl-invalid.shader_test | 7 +++++++ tests/hlsl-static-initializer.shader_test | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c12b4e9..45767de 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1472,7 +1472,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t local = false; } - if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) + if ((type->modifiers & HLSL_MODIFIER_CONST) && !v->initializer.args_count + && !(var->modifiers & (HLSL_STORAGE_STATIC | HLSL_STORAGE_UNIFORM))) { hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 16e75d0..370d84d 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -115,3 +115,10 @@ float4 main() : sv_target { return 0; } + +[pixel shader fail] +float4 main() : sv_target +{ + const float4 x; + return x; +} diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test index 9b9d000..9c48651 100644 --- a/tests/hlsl-static-initializer.shader_test +++ b/tests/hlsl-static-initializer.shader_test @@ -5,9 +5,10 @@ float myfunc() } static float a = myfunc() + 0.2; static float b; +static const float c; float4 main() : sv_target { - return float4(a, b, 0, 0); + return float4(a, b, c, 0); } [test]

1 0

Henri Verbeet : vkd3d-shader: Properly handle coalesced outputs in vkd3d_dxbc_compiler_emit_store_shader_output().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: vkd3d Branch: master Commit: b584668a81806c4b51953f621b36a3d023fb70ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b584668a81806c4b51953f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:02 2021 +0100 vkd3d-shader: Properly handle coalesced outputs in vkd3d_dxbc_compiler_emit_store_shader_output(). Multiple patch constant or output signature elements may be coalesced into a single output register by needs_private_io_variable() in vkd3d_dxbc_compiler_emit_output(). When this happens, only the original element will have a corresponding variable ID assigned in output_info[]. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a7361aa..4598ffa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4852,19 +4852,33 @@ static uint32_t vkd3d_dxbc_compiler_get_output_array_index(struct vkd3d_dxbc_com } static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_signature_element *output, + const struct vkd3d_shader_signature *signature, const struct vkd3d_shader_signature_element *output, const struct vkd3d_shader_output_info *output_info, uint32_t output_index_id, uint32_t val_id, unsigned int write_mask) { unsigned int dst_write_mask, use_mask, uninit_mask, swizzle, mask; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; + const struct vkd3d_shader_signature_element *element; unsigned int i, index, array_idx; uint32_t output_id; dst_write_mask = output->mask; - write_mask &= dst_write_mask; use_mask = output->used_mask; + if (!output->sysval_semantic) + { + for (i = 0; i < signature->element_count; ++i) + { + element = &signature->elements[i]; + if (element->register_index != output->register_index) + continue; + if (element->sysval_semantic) + continue; + dst_write_mask |= element->mask; + use_mask |= element->used_mask; + } + } + write_mask &= dst_write_mask; if (!write_mask) return; @@ -4985,13 +4999,15 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ for (i = 0; i < signature->element_count; ++i) { + if (!compiler->output_info[i].id) + continue; + variable_idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, signature->elements[i].register_index); - if (!param_id[variable_idx]) continue; - vkd3d_dxbc_compiler_emit_store_shader_output(compiler, + vkd3d_dxbc_compiler_emit_store_shader_output(compiler, signature, &signature->elements[i], &compiler->output_info[i], output_index_id, param_id[variable_idx], compiler->private_output_variable_write_mask[variable_idx]); }

1 0

Henri Verbeet : vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_output().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: vkd3d Branch: master Commit: 3b4b898cc5501d081510ec241088ccb41ddb21d8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b4b898cc5501d081510ec2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:03 2021 +0100 vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_output(). When outputs are coalesced, the write mask is modified by needs_private_io_variable(). We want the "dcl_mask" field to reflect that as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4598ffa..d9bfa09 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4702,20 +4702,14 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; - if ((use_private_variable = builtin && builtin->spirv_array_size)) - write_mask = VKD3DSP_WRITEMASK_ALL; - else if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + if (!(use_private_variable = builtin && builtin->spirv_array_size) + && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE || needs_private_io_variable(shader_signature, signature_element->register_index, builtin, &output_component_count, &write_mask) - || is_patch_constant) - { + || is_patch_constant)) use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - } else - { component_idx = vkd3d_write_mask_get_component_idx(write_mask); - } vkd3d_symbol_make_register(&reg_symbol, reg); @@ -4725,16 +4719,13 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler id = symbol->id; } - if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) + if (!symbol || ~symbol->info.reg.dcl_mask & write_mask) { if (compiler->output_info[signature_idx].id) { id = compiler->output_info[signature_idx].id; if (compiler->output_info[signature_idx].array_element_mask) - { use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - } } else if (builtin) { @@ -4795,7 +4786,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); + use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, + use_private_variable ? VKD3DSP_WRITEMASK_ALL : write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size; if (!use_private_variable && is_control_point_phase(phase)) { @@ -4806,7 +4798,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { reg_symbol.info.reg.member_idx = reg->idx[0].offset; } - reg_symbol.info.reg.dcl_mask = signature_element->mask; + reg_symbol.info.reg.dcl_mask = write_mask; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -4815,7 +4807,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - symbol->info.reg.dcl_mask |= signature_element->mask; + symbol->info.reg.dcl_mask |= write_mask; var_id = symbol->id; }

1 0

Henri Verbeet : vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_input().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: vkd3d Branch: master Commit: cad26f7f2cdb03813c815b4556512bc68db82c53 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cad26f7f2cdb03813c815b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:04 2021 +0100 vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_input(). Like outputs, when inputs are coalesced, the write mask is modified by needs_private_io_variable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d9bfa09..a639f7e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4187,11 +4187,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval, enum vkd3d_shader_interpolation_mode interpolation_mode) { - unsigned int component_idx, component_count, input_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_signature_element *signature_element; const struct vkd3d_shader_signature *shader_signature; const struct vkd3d_shader_register *reg = &dst->reg; + unsigned int component_idx, input_component_count; enum vkd3d_shader_component_type component_type; uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; @@ -4238,7 +4238,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi write_mask = signature_element->mask; - component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) { component_type = builtin->component_type; @@ -4252,21 +4251,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } - if ((use_private_var = builtin && builtin->fixup_pfn)) - { - component_count = VKD3D_VEC4_SIZE; - write_mask = VKD3DSP_WRITEMASK_ALL; - } - else if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) - { + if (!(use_private_var = builtin && builtin->fixup_pfn) + && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) use_private_var = true; - component_count = VKD3D_VEC4_SIZE; - write_mask = VKD3DSP_WRITEMASK_ALL; - } else - { component_idx = vkd3d_write_mask_get_component_idx(write_mask); - } storage_class = SpvStorageClassInput; @@ -4293,7 +4282,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } } - if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) + if (!symbol || ~symbol->info.reg.dcl_mask & write_mask) { if (builtin) { @@ -4326,19 +4315,20 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { storage_class = SpvStorageClassPrivate; var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, component_count, array_size); + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, array_size); } vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_var ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); - reg_symbol.info.reg.dcl_mask |= signature_element->mask; + use_private_var ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, + use_private_var ? VKD3DSP_WRITEMASK_ALL : write_mask); + reg_symbol.info.reg.dcl_mask |= write_mask; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } else { - symbol->info.reg.dcl_mask |= signature_element->mask; + symbol->info.reg.dcl_mask |= write_mask; } if (use_private_var)

1 0

Henri Verbeet : tests: Add a test for patch constant inputs in tessellation control shader join phases.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: vkd3d Branch: master Commit: 6f12553731fe6ce2509f19fbaae81c33f3964b61 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f12553731fe6ce2509f19f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:05 2021 +0100 tests: Add a test for patch constant inputs in tessellation control shader join phases. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6f12553731fe6ce2509…

1 0

Henri Verbeet : vkd3d-shader: Support patch constant inputs in tessellation control shader join phases.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: vkd3d Branch: master Commit: 851afc6229ab4e2eeb5e0257dd430eb9912aa401 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=851afc6229ab4e2eeb5e025… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:06 2021 +0100 vkd3d-shader: Support patch constant inputs in tessellation control shader join phases. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 38 +++++++++++++++++++++++++++++++++----- tests/d3d12.c | 2 +- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a639f7e..a6e5e22 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4252,7 +4252,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } if (!(use_private_var = builtin && builtin->fixup_pfn) - && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) + && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) + && (compiler->shader_type != VKD3D_SHADER_TYPE_HULL + || (reg->type != VKD3DSPR_INCONTROLPOINT && reg->type != VKD3DSPR_PATCHCONST))) use_private_var = true; else component_idx = vkd3d_write_mask_get_component_idx(write_mask); @@ -4266,20 +4268,45 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); input_id = symbol->id; } - else if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && reg->type == VKD3DSPR_INCONTROLPOINT) - { + else if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL + && (reg->type == VKD3DSPR_INCONTROLPOINT || reg->type == VKD3DSPR_PATCHCONST)) + { + /* Input/output registers from one phase can be used as inputs in + * subsequent phases. Specifically: + * + * - Control phase inputs are available as "vicp" in fork and join + * phases. + * - Control phase outputs are available as "vocp" in fork and join + * phases. + * - Fork phase patch constants are available as "vpc" in join + * phases. + * + * We handle "vicp" and "vpc" here by creating aliases to the shader's + * global inputs and outputs. We handle "vocp" in + * vkd3d_dxbc_compiler_leave_shader_phase(). */ + tmp_symbol = reg_symbol; - tmp_symbol.key.reg.type = VKD3DSPR_INPUT; + if (reg->type == VKD3DSPR_PATCHCONST) + tmp_symbol.key.reg.type = VKD3DSPR_OUTPUT; + else + tmp_symbol.key.reg.type = VKD3DSPR_INPUT; if ((entry = rb_get(&compiler->symbol_table, &tmp_symbol))) { symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); tmp_symbol = *symbol; - tmp_symbol.key.reg.type = VKD3DSPR_INCONTROLPOINT; + tmp_symbol.key.reg.type = reg->type; vkd3d_dxbc_compiler_put_symbol(compiler, &tmp_symbol); input_id = symbol->id; } + else + { + if (reg->type == VKD3DSPR_PATCHCONST) + ERR("Patch constant register %u was not declared in a previous phase.\n", reg_idx); + else + ERR("Input control point register %u was not declared in a previous phase.\n", reg_idx); + } } if (!symbol || ~symbol->info.reg.dcl_mask & write_mask) @@ -4418,6 +4445,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil { case VKD3DSPR_INPUT: case VKD3DSPR_INCONTROLPOINT: + case VKD3DSPR_PATCHCONST: vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; case VKD3DSPR_PRIMID: diff --git a/tests/d3d12.c b/tests/d3d12.c index dfdbefa..f289a10 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33809,7 +33809,7 @@ static void test_hull_shader_patch_constant_inputs(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - todo check_triangles(&rb, &expected_triangle, 1); + check_triangles(&rb, &expected_triangle, 1); release_resource_readback(&rb); ID3D12Resource_Release(so_buffer);

1 0

Francois Gouget : testbot/LogUtils: Don't expect CVS revisions on the test report start lines.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: tools Branch: master Commit: e03d3be14e58852231f5bead99f9ba2b7794aec4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e03d3be14e58852231f5bea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 21 19:15:53 2021 +0100 testbot/LogUtils: Don't expect CVS revisions on the test report start lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 840a552..7670f59 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -543,7 +543,7 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) { my ($Dll, $Unit, $Type) = ($1, $2, $3);

1 0

Francois Gouget : testbot/LogUtils: Don't include garbage in the .errors file.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: tools Branch: master Commit: 4ddd1988c59548839c1c19e146ea213ecd0e74d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4ddd1988c59548839c1c19e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 22 11:12:15 2021 +0100 testbot/LogUtils: Don't include garbage in the .errors file. When failure lines are garbled because of a race condition or a missing '\n' they often contain unwanted characters at the start of the line. If included in the .errors file these prevent the line from matching past instances of the failure (if only because of line numbers), thus causing it to be incorrectly reported as new. So only include the parts of the line matched by the error matching regular expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50491 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 ++++---- testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7670f59..5f7046c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -573,7 +573,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -625,7 +625,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } } @@ -636,7 +636,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } } @@ -654,7 +654,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, $&); $Cur->{LineFailures}++; } } diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index e198827..104c8ea 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -50,11 +50,11 @@ n 0 comboex.c:40: Test failed: A failure in the main process n 0 comboex.c:41: Test succeeded inside todo block: Success in the main process n 0 header.c:1: Test failed: Something wrong n 0 1234:rebar: unhandled exception c0000005 at 0040167C -n 0 garbled0123:status: unhandled exception c0000005 at 0040167C -n 0 status.c:33: unhandled exception c0000005 in child process 0123dead +n 0 0123:status: unhandled exception c0000005 at 0040167C +n 0 status.c:33: unhandled exception c0000005 in child process 0123 n 0 1234:subclass: unhandled exception c0000005 at 0040167C -n 0 Do not cut syslink.c:40: Test failed: Something wrong -n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 syslink.c:40: Test failed: Something wrong +n 0 syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234

1 0

Paul Gofman : mmdevapi: Make spatial audio objects buffer update size constant.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 1d66a108b901ebfb11b134e9a6895b1d87333638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d66a108b901ebfb11b134e9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 17 19:41:52 2021 +0300 mmdevapi: Make spatial audio objects buffer update size constant. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/spatialaudio.c | 22 +++--------- dlls/mmdevapi/tests/Makefile.in | 2 +- dlls/mmdevapi/tests/spatialaudio.c | 73 ++++++++++++++++++++++++++++++++++---- 3 files changed, 72 insertions(+), 25 deletions(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index cbca57b4890..7ec09b663aa 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -#define MAX_PERIODS 3 - static UINT32 AudioObjectType_to_index(AudioObjectType type) { UINT32 o = 0; @@ -361,7 +359,6 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS static BOOL fixme_once = FALSE; SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); SpatialAudioObjectImpl *object; - UINT32 pad; HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, dyn_count, frames); @@ -373,18 +370,7 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS return SPTLAUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioClient_GetCurrentPadding(This->client, &pad); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad < This->period_frames * MAX_PERIODS){ - This->update_frames = This->period_frames * MAX_PERIODS - pad; - }else{ - This->update_frames = 0; - } + This->update_frames = This->period_frames; if(This->update_frames > 0){ hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); @@ -496,7 +482,7 @@ static HRESULT WINAPI SAORS_ActivateSpatialAudioObject(ISpatialAudioObjectRender obj->sa_stream = This; SAORS_AddRef(&This->ISpatialAudioObjectRenderStream_iface); - obj->buf = heap_alloc_zero(This->period_frames * MAX_PERIODS * This->sa_client->object_fmtex.Format.nBlockAlign); + obj->buf = heap_alloc_zero(This->period_frames * This->sa_client->object_fmtex.Format.nBlockAlign); EnterCriticalSection(&This->lock); @@ -616,7 +602,7 @@ static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, TRACE("(%p)->(%p, %p)\n", This, format, count); - *count = MulDiv(period, format->nSamplesPerSec, 10000000) * MAX_PERIODS; + *count = MulDiv(period, format->nSamplesPerSec, 10000000); return S_OK; } @@ -731,7 +717,7 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) hr = IAudioClient_Initialize(stream->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, - period * MAX_PERIODS, 0, &stream->stream_fmtex.Format, NULL); + period, 0, &stream->stream_fmtex.Format, NULL); if(FAILED(hr)){ WARN("Initialize failed: %08x\n", hr); IAudioClient_Release(stream->client); diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 062ad413922..dd180a253b9 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mmdevapi.dll -IMPORTS = ole32 version user32 advapi32 +IMPORTS = ole32 version user32 advapi32 winmm C_SRCS = \ capture.c \ diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index f2612499350..d9ccc429ce8 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -29,6 +29,7 @@ #include "mmdeviceapi.h" #include "spatialaudioclient.h" +#include "mmsystem.h" static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; @@ -269,15 +270,14 @@ static BOOL is_buffer_zeroed(const BYTE *buffer, UINT32 buffer_length) static void test_audio_object_buffers(void) { - HRESULT hr; + UINT32 dyn_object_count, frame_count, max_frame_count, buffer_length; + SpatialAudioObjectRenderStreamActivationParams activation_params; ISpatialAudioObjectRenderStream *sas = NULL; + PROPVARIANT activation_params_prop; ISpatialAudioObject *sao[4]; - UINT32 dyn_object_count, frame_count, buffer_length; BYTE *buffer; - INT i; - - SpatialAudioObjectRenderStreamActivationParams activation_params; - PROPVARIANT activation_params_prop; + INT i, j, k; + HRESULT hr; PropVariantInit(&activation_params_prop); activation_params_prop.vt = VT_BLOB; @@ -288,6 +288,17 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + hr = ISpatialAudioClient_GetMaxFrameCount(sac, &format, &max_frame_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + frame_count = format.nSamplesPerSec / 100; /* 10ms */ + /* Most of the time the frame count matches the 10ms interval exactly. + * However (seen on some Testbot machines) it might be a bit higher for some reason. */ + ok(max_frame_count <= frame_count + frame_count / 4, "Got unexpected frame count %u.\n", frame_count); + + /* The tests below which check frame count from _BeginUpdatingAudioObjects fail on some Testbot machines + * with max_frame_count from _GetMaxFrameCount(). */ + max_frame_count = frame_count + frame_count / 4; + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao[0]); ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); @@ -306,6 +317,7 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideRight, &sao[3]); ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); @@ -323,6 +335,55 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + /* Emulate underrun and test frame count approximate limit. */ + + /* Force 1ms Sleep() timer resolution. */ + timeBeginPeriod(1); + for (j = 0; j < 20; ++j) + { + hr = WaitForSingleObject(event, 200); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x, j %u.\n", hr, j); + + hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count); + + /* Audio starts crackling with delays 10ms and above. However, setting such delay (that is, the delay + * which skips the whole quantum) breaks SA on some Testbot machines: _BeginUpdatingAudioObjects fails + * with SPTLAUDCLNT_E_INTERNAL starting from some iteration or WaitForSingleObject timeouts. That seems + * to work on the real hardware though. */ + Sleep(5); + + for (i = 0; i < ARRAYSIZE(sao); i++) + { + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x, i %d\n", hr, i); + ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); + ok(buffer_length == frame_count * format.wBitsPerSample / 8, + "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", + frame_count * format.wBitsPerSample / 8, buffer_length); + + /* Enable to hear the test sound. */ + if (0) + { + if (format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + { + for (k = 0; k < frame_count; ++k) + { + float time_sec = 10.0f / 1000.0f * (j + (float)k / frame_count); + + /* 440Hz tone. */ + ((float *)buffer)[k] = sinf(2.0f * M_PI * time_sec * 440.0f); + } + } + } + } + hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + } + timeEndPeriod(1); + hr = WaitForSingleObject(event, 200); ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr);

1 0

Alexandre Julliard : ntdll: Add a global constant for the system directory.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 74390cead33b9394c004c83f008ca13ed14213a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74390cead33b9394c004c83f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 11:24:46 2021 +0100 ntdll: Add a global constant for the system directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 14 +++++++------- dlls/ntdll/unix/loadorder.c | 6 ++---- dlls/ntdll/unix/process.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 2051ad33888..e1fb4c99544 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -76,6 +76,10 @@ static LANGID user_ui_language, system_ui_language; static char system_locale[LOCALE_NAME_MAX_LENGTH]; static char user_locale[LOCALE_NAME_MAX_LENGTH]; +/* system directory with trailing backslash */ +const WCHAR system_dir[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\',0}; + static struct { USHORT *data; @@ -149,8 +153,6 @@ static void *read_nls_file( ULONG type, ULONG id ) static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) { - static const WCHAR systemdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\',0}; static const WCHAR sortdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', 's','o','r','t','i','n','g','\\',0}; @@ -165,7 +167,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) if (!path) return STATUS_OBJECT_NAME_NOT_FOUND; /* try to open file in system dir */ - wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : systemdirW ); + wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : system_dir ); p = strrchr( path, '/' ) + 1; ascii_to_unicode( buffer + wcslen(buffer), p, strlen(p) + 1 ); init_unicode_string( &valueW, buffer ); @@ -1609,8 +1611,6 @@ static void run_wineboot( WCHAR *env, SIZE_T size ) static const WCHAR cmdlineW[] = {'"','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\','w','i','n','e','b','o','o','t','.','e','x','e','"', ' ','-','-','i','n','i','t',0}; - static const WCHAR sysdirW[] = {'C',':','\\','w','i','n','d','o','w','s', - '\\','s','y','s','t','e','m','3','2',0}; RTL_USER_PROCESS_PARAMETERS params = { sizeof(params), sizeof(params) }; PS_ATTRIBUTE_LIST ps_attr; PS_CREATE_INFO create_info; @@ -1635,8 +1635,8 @@ static void run_wineboot( WCHAR *env, SIZE_T size ) params.Flags = PROCESS_PARAMS_FLAG_NORMALIZED; params.Environment = env; params.EnvironmentSize = size; - init_unicode_string( &params.CurrentDirectory.DosPath, sysdirW ); - init_unicode_string( &params.DllPath, sysdirW ); + init_unicode_string( &params.CurrentDirectory.DosPath, system_dir + 4 ); + init_unicode_string( &params.DllPath, system_dir + 4 ); init_unicode_string( &params.ImagePathName, appnameW + 4 ); init_unicode_string( &params.CommandLine, cmdlineW ); init_unicode_string( &params.WindowTitle, appnameW + 4 ); diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 0097fd73e80..f7360bdf7e1 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -381,8 +381,6 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; - static const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s', - '\\','s','y','s','t','e','m','3','2'}; enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; const WCHAR *path = nt_name->Buffer; @@ -398,9 +396,9 @@ enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING /* Strip path information if the module resides in the system directory */ - if (!wcsnicmp( system_dir, path, ARRAY_SIZE( system_dir ))) + if (!wcsnicmp( system_dir + 4, path, wcslen(system_dir) - 4 )) { - const WCHAR *p = path + ARRAY_SIZE( system_dir ); + const WCHAR *p = path + wcslen( system_dir ) - 4; while (*p == '\\' || *p == '/') p++; if (!wcschr( p, '\\' ) && !wcschr( p, '/' )) path = p; } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 441b34ee9c4..d6dc893fba5 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -281,13 +281,12 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p */ static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) { - static const WCHAR systemW[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\'}; static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; *is_64bit = is_win64; - if (path->Length > sizeof(systemW) && !wcsnicmp( path->Buffer, systemW, ARRAY_SIZE(systemW) )) + if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && + !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) )) { #ifndef _WIN64 if (NtCurrentTeb64() && NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR]) *is_64bit = TRUE; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7e31710af70..c00a6ee6aa8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -122,6 +122,7 @@ extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; extern WCHAR **main_wargv DECLSPEC_HIDDEN; +extern const WCHAR system_dir[] DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; extern BOOL process_exiting DECLSPEC_HIDDEN;

1 0