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

Francisco Casas : vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: a7e6d6b9d26fd0fcc0f1be9ae6c8419abdf0df84 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a7e6d6b9d26fd0fcc0f1be9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 10 12:14:11 2022 -0300 vkd3d-shader/hlsl: Remove redundant type check in declare_vars(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 521ca0a7..dc9b1439 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1612,23 +1612,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Cast pow() input to float.
by Alexandre Julliard 18 Mar '22

18 Mar '22

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

Zebediah Figura : vkd3d-shader/hlsl: Reverse the switch order in write_sm4_expr().
by Alexandre Julliard 18 Mar '22

18 Mar '22

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: Parse the sv_vertexid semantic.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 5251ecff892d212b1953a31b4e1cf0b4bcb58a79 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5251ecff892d212b1953a31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:15 2022 -0600 vkd3d-shader/hlsl: Parse the sv_vertexid semantic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f3650c1d..38220b18 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -100,6 +100,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_DEPTH}, {"sv_position", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_UNDEFINED}, + {"sv_vertexid", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_VERTEX_ID}, {"position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION},

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 bitwise AND instructions.
by Alexandre Julliard 18 Mar '22

18 Mar '22

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: Write SM4 left shift instructions.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 41d75fde22dea510def18153619674669b9bf15f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41d75fde22dea510def1815… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:17 2022 -0600 vkd3d-shader/hlsl: Write SM4 left shift instructions. 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: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 41ea4c7f..fa845dc4 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1728,6 +1728,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_LSHIFT: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_ISHL, &expr->node, arg1, arg2); + break; + case HLSL_OP2_MAX: switch (dst_type->base_type) {

1 0

Zebediah Figura : tests: Use SV_VertexID to draw a triangle in d3d11_runner_draw_quad().
by Alexandre Julliard 18 Mar '22

18 Mar '22

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

Cressida Silver : wn20220318_414
by Jeremy Newman 18 Mar '22

18 Mar '22

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

Huw Davies : winealsa: Move MODM_RESET to the unixlib.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: bf3954531522ecdfd99d1e95f6ea9d71f56ded85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3954531522ecdfd99d1e95… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 17 08:14:08 2022 +0000 winealsa: Move MODM_RESET to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/winealsa.drv/midi.c | 36 ------------------------------------ dlls/winealsa.drv/unixlib.h | 15 ++------------- 3 files changed, 41 insertions(+), 51 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index f3de2a5ce07..b99c3aedd33 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -48,6 +48,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIOUTCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_out; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; @@ -353,9 +364,7 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_dests = num_dests; params->num_srcs = num_srcs; - params->dests = dests; params->srcs = srcs; TRACE("End\n"); @@ -800,6 +809,31 @@ static UINT midi_out_get_volume(WORD dev_id, UINT* volume) return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +static UINT midi_out_reset(WORD dev_id) +{ + unsigned chn; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!dests[dev_id].bEnabled) return MIDIERR_NODEVICE; + + /* stop all notes */ + /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that + * it's channel dependent... + */ + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + midi_out_data(dev_id, 0x7800 | MIDI_CMD_CONTROL | chn); + /* remove sustain on all channels */ + midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); + } + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -844,6 +878,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = 0; break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 0ed2feb41eb..53b683f59c8 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -48,10 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static WINE_MIDIIN *MidiInDev; -static WINE_MIDIOUT *MidiOutDev; -/* this is the total number of MIDI out devices found (synth and port) */ -static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; @@ -605,35 +602,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modReset [internal] - */ -static DWORD modReset(WORD wDevID) -{ - DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - unsigned chn; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0); - /* remove sustain on all channels */ - ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0); - } - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -653,9 +621,7 @@ static BOOL ALSA_MidiInit(void) if (!err) { - MODM_NumDevs = params.num_dests; MIDM_NumDevs = params.num_srcs; - MidiOutDev = params.dests; MidiInDev = params.srcs; } return TRUE; @@ -721,8 +687,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_RESET: - return modReset(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e3cd7123101..c1dbd83b84e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -223,22 +223,11 @@ typedef struct midi_src int port_in; } WINE_MIDIIN; -typedef struct midi_dest -{ - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIOUTCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_out; -} WINE_MIDIOUT; - struct midi_init_params { UINT *err; - unsigned int num_dests, num_srcs; - void *dests, *srcs; + unsigned int num_srcs; + void *srcs; }; struct notify_context

1 0

Jacek Caban : win32u: Move destroy_thread_windows implementation from user32.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 7a7d999d4a464847c83d102993ba242471038303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a7d999d4a464847c83d1029… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:29 2022 +0000 win32u: Move destroy_thread_windows 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/user_main.c | 11 +++++++-- dlls/user32/win.c | 56 -------------------------------------------- dlls/user32/win.h | 1 - dlls/win32u/menu.c | 8 +++++++ dlls/win32u/ntuser_private.h | 5 ++-- dlls/win32u/sysparams.c | 5 ++-- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++++++++- include/ntuser.h | 2 +- 9 files changed, 72 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a7d999d4a464847c83d…

1 0