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

Zebediah Figura : vkd3d-shader/hlsl: Cast pow() input to float.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 8fe4d7d37eb03bfd2c35245affa3b367f4f60856 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8fe4d7d37eb03bfd2c35245… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:13 2022 -0600 vkd3d-shader/hlsl: Cast pow() input to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dc9b1439..1ab56fba 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1800,10 +1800,13 @@ static bool intrinsic_min(struct hlsl_ctx *ctx, static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *log, *exp; + struct hlsl_ir_node *log, *exp, *arg; struct hlsl_ir_expr *mul; - if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc))) + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, arg, *loc))) return false; list_add_tail(params->instrs, &log->entry);

1 0

Conor McCarthy : vkd3d: Optimise descriptor copying for Vulkan-backed heaps.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 5e4f1e1eadf2a9c5810dcae054bd5b170a6e5b46 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e4f1e1eadf2a9c5810dcae… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:19:00 2022 +1000 vkd3d: Optimise descriptor copying for Vulkan-backed heaps. Source descriptors are copied to separate arrays to facilitate use of pre-initialised Vulkan structures, and allow arrayed writes where possible. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 144 ++++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 190 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 24 +++++- 3 files changed, 329 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5e4f1e1eadf2a9c5810…

1 0

Zebediah Figura : tests: Use SV_VertexID to draw a triangle in d3d11_runner_draw_quad().
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: ead5cc31139190d4b46d8164d7851624a305d385 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ead5cc31139190d4b46d816… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:18 2022 -0600 tests: Use SV_VertexID to draw a triangle in d3d11_runner_draw_quad(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d11.c | 55 ++++++++------------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 79f98640..6290ac29 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -62,9 +62,7 @@ struct d3d11_shader_context ID3D11RenderTargetView *rtv; ID3D11DeviceContext *immediate_context; - ID3D11InputLayout *input_layout; ID3D11VertexShader *vs; - ID3D11Buffer *vb; }; static struct d3d11_shader_context *d3d11_shader_context(struct shader_context *c) @@ -325,12 +323,8 @@ static void destroy_test_context(struct d3d11_shader_context *context) { ULONG ref; - if (context->input_layout) - ID3D11InputLayout_Release(context->input_layout); if (context->vs) ID3D11VertexShader_Release(context->vs); - if (context->vb) - ID3D11Buffer_Release(context->vb); ID3D11DeviceContext_Release(context->immediate_context); ID3D11RenderTargetView_Release(context->rtv); @@ -411,28 +405,15 @@ static void d3d11_runner_destroy_texture(struct shader_context *c, struct textur static void d3d11_runner_draw_quad(struct shader_context *c) { - static const D3D11_INPUT_ELEMENT_DESC default_layout_desc[] = - { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, - }; - static const char vs_source[] = - "float4 main(float4 position : POSITION) : sv_position\n" + "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" "{\n" - " return position;\n" + " float2 coords = float2((id << 1) & 2, id & 2);\n" + " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; - static const struct vec2 quad[] = - { - {-1.0f, -1.0f}, - {-1.0f, 1.0f}, - { 1.0f, -1.0f}, - { 1.0f, 1.0f}, - }; - struct d3d11_shader_context *context = d3d11_shader_context(c); ID3D11Device *device = context->device; - unsigned int stride, offset; ID3D11Buffer *cb = NULL; ID3D11PixelShader *ps; ID3D10Blob *ps_code; @@ -451,30 +432,16 @@ static void d3d11_runner_draw_quad(struct shader_context *c) if (!(ps_code = compile_shader(context->c.ps_source, ps_profiles[context->c.minimum_shader_model]))) return; - if (!context->input_layout || !context->vs) + if (!context->vs) { ID3D10Blob *vs_code = compile_shader(vs_source, "vs_4_0"); - if (!context->input_layout) - { - hr = ID3D11Device_CreateInputLayout(device, default_layout_desc, ARRAY_SIZE(default_layout_desc), - ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), &context->input_layout); - ok(hr == S_OK, "Failed to create input layout, hr %#lx.\n", hr); - } - - if (!context->vs) - { - hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), - ID3D10Blob_GetBufferSize(vs_code), NULL, &context->vs); - ok(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); - } - + hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), + ID3D10Blob_GetBufferSize(vs_code), NULL, &context->vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); ID3D10Blob_Release(vs_code); } - if (!context->vb) - context->vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); - hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), ID3D10Blob_GetBufferSize(ps_code), NULL, &ps); ok(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); @@ -514,15 +481,11 @@ static void d3d11_runner_draw_quad(struct shader_context *c) ID3D11SamplerState_Release(d3d11_sampler); } - ID3D11DeviceContext_IASetInputLayout(context->immediate_context, context->input_layout); - ID3D11DeviceContext_IASetPrimitiveTopology(context->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); - stride = sizeof(*quad); - offset = 0; - ID3D11DeviceContext_IASetVertexBuffers(context->immediate_context, 0, 1, &context->vb, &stride, &offset); + ID3D11DeviceContext_IASetPrimitiveTopology(context->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D11DeviceContext_VSSetShader(context->immediate_context, context->vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context->immediate_context, ps, NULL, 0); - ID3D11DeviceContext_Draw(context->immediate_context, 4, 0); + ID3D11DeviceContext_Draw(context->immediate_context, 3, 0); ID3D11PixelShader_Release(ps); if (cb)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 bitwise AND instructions.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: ccb3326516867659ac28b3ccb45072b15ecb91d0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccb3326516867659ac28b3c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:16 2022 -0600 vkd3d-shader/hlsl: Write SM4 bitwise AND instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 38220b18..41ea4c7f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1412,6 +1412,20 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer write_sm4_instruction(buffer, &instr); } +static bool type_is_integer(const struct hlsl_type *type) +{ + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + return true; + + default: + return false; + } +} + static bool type_is_float(const struct hlsl_type *type) { return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF; @@ -1613,6 +1627,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP2_BIT_AND: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); + break; + case HLSL_OP2_DIV: switch (dst_type->base_type) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Reverse the switch order in write_sm4_expr().
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 6569b37e97dd7a4a1f8cdf164e96b6e6f32874ca URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6569b37e97dd7a4a1f8cdf1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:14 2022 -0600 vkd3d-shader/hlsl: Reverse the switch order in write_sm4_expr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 536 +++++++++++++++++++++++-------------------- 1 file changed, 289 insertions(+), 247 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6569b37e97dd7a4a1f8…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Correctly calculate offsets for array elements.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: ee764359d0fb2b9febb202de661a19234b8e293a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee764359d0fb2b9febb202d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 17 21:58:35 2022 +0100 vkd3d-shader/hlsl: Correctly calculate offsets for array elements. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- libs/vkd3d-shader/hlsl.c | 7 +++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl-struct-array.shader_test | 19 +++++++++++++++++++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79aacfcd..f2c8440c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ vkd3d_shader_tests = \ tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ + tests/hlsl-struct-array.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -339,7 +340,6 @@ XFAIL_TESTS = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ - tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ea5e35d2..d88b0b6d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -202,6 +202,13 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } } +/* Returns the size of a type, considered as part of an array of that type. + * As such it includes padding after the type. */ +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type) +{ + return align(type->reg_size, 4); +} + static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..2e8ba4af 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -783,6 +783,7 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type); struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority, unsigned int modifiers); unsigned int hlsl_type_component_count(struct hlsl_type *type); +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type); unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..521ca0a7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -607,7 +607,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..ca3acba0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -621,7 +621,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (type->type != HLSL_CLASS_ARRAY) return false; element_type = type->e.array.type; - element_size = element_type->reg_size; + element_size = hlsl_type_get_array_element_reg_size(element_type); for (i = 0; i < type->e.array.elements_count; ++i) { diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl-struct-array.shader_test new file mode 100644 index 00000000..a5df9cdb --- /dev/null +++ b/tests/hlsl-struct-array.shader_test @@ -0,0 +1,19 @@ +% In SM4, array elements are always aligned to the next vec4, although structs are not. + +[pixel shader] +uniform struct +{ + float p, q; +} colours[3]; + +float4 main() : sv_target +{ + return float4(colours[0].q, colours[1].p, colours[2].q, colours[2].p); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.5 0.6 0.0 0.0 +draw quad +probe all rgba (0.2, 0.3, 0.6, 0.5)

1 0

Conor McCarthy : vkd3d: Do not copy descriptors having identical views.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 2b0fd2a055a4ad4a865a3314963cabd4a48f7249 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b0fd2a055a4ad4a865a331… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:19:01 2022 +1000 vkd3d: Do not copy descriptors having identical views. Improves performance in Control, which copies large numbers of descriptors per frame where often only ~10% are not identical. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 8 +++--- libs/vkd3d/device.c | 11 ++++++-- libs/vkd3d/resource.c | 63 +++++++++++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 11 +++++++- 4 files changed, 60 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b0fd2a055a4ad4a865…

1 0

Cressida Silver : wn20220318_414
by Jeremy Newman March 18, 2022

March 18, 2022

Module: website Branch: master Commit: 6b279abb889099e70c8bbc3f21269e9feec98d3c URL: https://source.winehq.org/git/website.git/?a=commit;h=6b279abb889099e70c8bb… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Mar 18 13:21:15 2022 -0500 wn20220318_414 --- news/en/2022031802.xml | 13 +++ wwn/en/wn20220318_414.xml | 208 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) diff --git a/news/en/2022031802.xml b/news/en/2022031802.xml new file mode 100644 index 00000000..355c9bfb --- /dev/null +++ b/news/en/2022031802.xml @@ -0,0 +1,13 @@ +<news> + <date>March 18, 2022</date> + <title>World Wine News Issue 414</title> + <body> + <a href="{$root}/wwn/414">WWN Issue 414</a> was released today. + + <ul> + <li><a href="{$root}/wwn/414#The Curious Case of Phasmophobia">The Curious Case of Phasmophobia</a></li> + <li><a href="{$root}/wwn/414#Bugs: In Memoriam">Bugs: In Memoriam</a></li> + </ul> + + </body> +</news> diff --git a/wwn/en/wn20220318_414.xml b/wwn/en/wn20220318_414.xml new file mode 100644 index 00000000..1805bc76 --- /dev/null +++ b/wwn/en/wn20220318_414.xml @@ -0,0 +1,208 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="414" date="03/17/2022"/> + <intro> + + This is the 414th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + + </intro> + + <section title="The Curious Case of Phasmophobia"> + + + Phasmophobia is an online co-op psychological horror game available on Steam. In Phasmophobia investigators are tasked with gathering evidence using various pieces of equipment in order to determine the type of spirit they are dealing with. One way players glean knowledge from the game is by speaking directly to the apparitions. No really, you (the player) speak with the phantom itself. To do this, Phasmophobia requires speech recognition software. + + + + Why all this talk about Phasmophobia? + + + + Wine 7.4 arrived last Friday, and it contains the beginnings of an implementation of the windows.media.speech libraries, which is the groundwork for speech recognition capabilities in Wine. The effort was spearheaded by Bernhard Kölbl, because it seemed if anyone was going to get the spirits in Phasmophobia to listen, it was going to be him. (Though he made it clear that this work wouldn't have been possible without the help of Rémi Bernon, Connor McAdams, Zeb Figura, et al.) + + + + Nothing worthwhile is ever easy though... sigh. Just getting started required fixing some parts of Wine that were broken, missing, or yet to be implemented (e.g., the HSTRING implementation, and WIDL compiler). Not only that, the work involves some (relatively) newer components of the Windows API, namely, the Universal Windows Platform (UWP) and Windows Runtime (WinRT). These components require a ton of boilerplate code to get even simple things going, and they function in new and (sometimes) weird ways. + + + + Once that was sorted, the next step was to select the speech recognition software. Ultimately, <a href="https://alphacephei.com/vosk/">Alpha Cephei's Vosk</a> was chosen. It is an open-source speech recognition toolkit that supports 20+ languages and dialects. Although Bernhard had never worked with Unixlibs before, he was able to get Vosk functioning with Wine. Hard work really does pay. 😀 + + + + This is just the beginning of speech recognition in Wine, and you can expect more patches soon! + + </section> + + <section title="Bugs: In Memoriam"> + + <center> + <table cellspacing="0" cellpadding="3" bordercolor="#222222" border="1"> + <tr> + <td width="100" align="center"> + Bug ID + </td> + <td width="100" align="center"> + Open Date + </td> + <td width="100" align="center"> + Days Open + </td> + <td width="100" align="center"> + Weeks Open + </td> + <td width="100" align="center"> + Months Open + </td> + <td width="100" align="center"> + Years Open + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=20296">20296</a> + </td> + <td align="center">10/9/09</td> + <td align="center">4536</td> + <td align="center">468</td> + <td align="center">149</td> + <td align="center">12</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=41053">41053</a> + </td> + <td align="center">8/3/16</td> + <td align="center">2046</td> + <td align="center">292</td> + <td align="center">67</td> + <td align="center">6</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=48508">48508</a> + </td> + <td align="center">1/24/20</td> + <td align="center">777</td> + <td align="center">111</td> + <td align="center">25</td> + <td align="center">2</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=50887">50887</a> + </td> + <td align="center">3/30/21</td> + <td align="center">346</td> + <td align="center">49</td> + <td align="center">11</td> + <td align="center">1</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52204">52204</a> + </td> + <td align="center">12/11/21</td> + <td align="center">90</td> + <td align="center">13</td> + <td align="center">3</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52476">52476</a> + </td> + <td align="center">1/28/22</td> + <td align="center">42</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52562">52562</a> + </td> + <td align="center">2/17/22</td> + <td align="center">22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52581">52581</a> + </td> + <td align="center">2/22/22</td> + <td align="center">17</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52596">52596</a> + </td> + <td align="center">2/26/22</td> + <td align="center">13</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52614">52614</a> + </td> + <td align="center">3/1/22</td> + <td align="center">10</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52618">52618</a> + </td> + <td align="center">3/2/22</td> + <td align="center">9</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52626">52626</a> + </td> + <td align="center">3/4/22</td> + <td align="center">7</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52637">52637</a> + </td> + <td align="center">3/8/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52639">52639</a> + </td> + <td align="center">3/8/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + </table> + </center> + + </section> +</kc>

1 0

Jacek Caban : win32u: Move NtUserShowWindow implementation from user32.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 3011f24f9321d95b6fa4ba29e233b1a6d64f671d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3011f24f9321d95b6fa4ba29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:32 2022 +0000 win32u: Move NtUserShowWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 4 +- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 6 +- dlls/user32/driver.c | 8 +- dlls/user32/mdi.c | 12 +- dlls/user32/message.c | 21 +- dlls/user32/nonclient.c | 6 +- dlls/user32/scroll.c | 2 +- dlls/user32/user32.spec | 4 +- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 10 +- dlls/user32/win.h | 6 - dlls/user32/winpos.c | 228 +------------------- dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 2 + dlls/win32u/input.c | 2 +- dlls/win32u/message.c | 3 + dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 487 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 12 ++ include/ntuser.h | 1 + 23 files changed, 542 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3011f24f9321d95b6fa4…

1 0

Daniel Lehman : propsys: Implement InitVariantFromFileTime.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: f2b8ccb7b0b22b7b5d661d908f8f8ee02f22647d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b8ccb7b0b22b7b5d661d90… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 07:30:59 2022 -0700 propsys: Implement InitVariantFromFileTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 15 +++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 35828057264..15749952e95 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -49,7 +49,7 @@ @ stub InitVariantFromBooleanArray @ stdcall InitVariantFromBuffer(ptr long ptr) @ stub InitVariantFromDoubleArray -@ stub InitVariantFromFileTime +@ stdcall InitVariantFromFileTime(ptr ptr) @ stub InitVariantFromFileTimeArray @ stdcall InitVariantFromGUIDAsString(ptr ptr) @ stub InitVariantFromInt16Array diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index be27c5cb641..8f6c52f7aa7 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -672,6 +672,21 @@ HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) return S_OK; } +HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var) +{ + SYSTEMTIME st; + + TRACE("%p, %p\n", ft, var); + + VariantInit(var); + if (!FileTimeToSystemTime(ft, &st)) + return E_INVALIDARG; + if (!SystemTimeToVariantTime(&st, &V_DATE(var))) + return E_INVALIDARG; + V_VT(var) = VT_DATE; + return S_OK; +} + static inline DWORD PROPVAR_HexToNum(const WCHAR *hex) { DWORD ret; diff --git a/include/propvarutil.h b/include/propvarutil.h index 55b64abbe4f..36a670f56e6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -71,6 +71,7 @@ typedef int PROPVAR_COMPARE_FLAGS; HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar);

1 0