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

Giovanni Mascellani : vkd3d-shader/hlsl: Fix typing rules for bitwise NOT.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: a83919c22875aeb1abecbb8a6181bf1ec9168a37 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a83919c22875aeb1abecbb8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:20 2022 -0600 vkd3d-shader/hlsl: Fix typing rules for bitwise NOT. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c1c229a..328f1bb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1043,6 +1043,14 @@ static struct hlsl_ir_expr *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, stru return add_expr(ctx, instrs, op, args, arg->data_type, loc); } +static struct hlsl_ir_expr *add_unary_bitwise_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + check_integer_type(ctx, arg); + + return add_unary_arithmetic_expr(ctx, instrs, op, arg, loc); +} + static struct hlsl_ir_expr *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) @@ -3595,7 +3603,7 @@ unary_expr: } | '~' unary_expr { - add_unary_arithmetic_expr(ctx, $2, HLSL_OP1_BIT_NOT, node_from_list($2), &@1); + add_unary_bitwise_expr(ctx, $2, HLSL_OP1_BIT_NOT, node_from_list($2), &@1); $$ = $2; } | '!' unary_expr

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse left shift.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: 6fa13816579c58f35e99fb83f6761f47e6f3e4df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6fa13816579c58f35e99fb8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:18 2022 -0600 vkd3d-shader/hlsl: Parse left shift. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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 | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4cdb471..7c7c89e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1171,6 +1171,49 @@ static struct list *add_binary_logical_expr_merge(struct hlsl_ctx *ctx, struct l return list1; } +static struct hlsl_ir_expr *add_binary_shift_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + const struct vkd3d_shader_location *loc) +{ + enum hlsl_base_type base = arg1->data_type->base_type; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *return_type, *integer_type; + enum hlsl_type_class type; + unsigned int dimx, dimy; + + check_integer_type(ctx, arg1); + check_integer_type(ctx, arg2); + + if (base == HLSL_TYPE_BOOL) + base = HLSL_TYPE_INT; + + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) + return NULL; + + return_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); + integer_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_INT, dimx, dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, return_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, integer_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, return_type, loc); +} + +static struct list *add_binary_shift_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_binary_shift_expr(ctx, list1, op, arg1, arg2, loc); + + return list1; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -3637,7 +3680,7 @@ shift_expr: add_expr | shift_expr OP_LEFTSHIFT add_expr { - hlsl_fixme(ctx, &@$, "Left shift."); + $$ = add_binary_shift_expr_merge(ctx, $1, $3, HLSL_OP2_LSHIFT, &@2); } | shift_expr OP_RIGHTSHIFT add_expr {

1 0

Henri Verbeet : vkd3d-shader: Add missing version information for some enum elements.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: 969dc1e899ae0728a0f28f5697882a0a60c98143 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=969dc1e899ae0728a0f28f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:22 2022 +0100 vkd3d-shader: Add missing version information for some enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 406f3af..05d235f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -566,11 +566,11 @@ enum vkd3d_shader_source_type * the format used for Direct3D shader model 4 and 5 shaders. */ VKD3D_SHADER_SOURCE_DXBC_TPF, - /** High-Level Shader Language source code. */ + /** High-Level Shader Language source code. \since 1.3 */ VKD3D_SHADER_SOURCE_HLSL, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader - * model 1, 2, and 3 shaders. + * model 1, 2, and 3 shaders. \since 1.3 */ VKD3D_SHADER_SOURCE_D3D_BYTECODE, @@ -597,16 +597,16 @@ enum vkd3d_shader_target_type VKD3D_SHADER_TARGET_D3D_ASM, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader - * model 1, 2, and 3 shaders. + * model 1, 2, and 3 shaders. \since 1.3 */ VKD3D_SHADER_TARGET_D3D_BYTECODE, /** * A 'Tokenized Program Format' shader embedded in a DXBC container. This is - * the format used for Direct3D shader model 4 and 5 shaders. + * the format used for Direct3D shader model 4 and 5 shaders. \since 1.3 */ VKD3D_SHADER_TARGET_DXBC_TPF, /** - * An 'OpenGL Shading Language' shader. + * An 'OpenGL Shading Language' shader. \since 1.3 */ VKD3D_SHADER_TARGET_GLSL, @@ -691,7 +691,9 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, + /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION),

1 0

Matteo Bruni : vkd3d-shader/hlsl: Remove trivial swizzles after each copy prop pass.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: e1865cf98add49fe4572b69db47878cc8b37c365 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1865cf98add49fe4572b69… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 13:21:21 2022 +0100 vkd3d-shader/hlsl: Remove trivial swizzles after each copy prop pass. 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> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e4f92bb..f3db6d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -315,7 +315,6 @@ XFAIL_TESTS = \ tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ - tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 837d39e..62dbce5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1666,9 +1666,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); progress |= copy_propagation_execute(ctx, body); + progress |= transform_ir(ctx, remove_trivial_swizzles, body, NULL); } while (progress); - transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a helper to validate that an instruction has integer type.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: 5548d5fe6daeeb208f519ddead795b6149c40628 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5548d5fe6daeeb208f519dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 24 12:45:15 2022 -0600 vkd3d-shader/hlsl: Introduce a helper to validate that an instruction has integer type. Signed-off-by: Zebediah Figura <zfigura(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: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03..01e6b3d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1014,6 +1014,27 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return expr; } +static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr) +{ + const struct hlsl_type *type = instr->data_type; + struct vkd3d_string_buffer *string; + + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + break; + + default: + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Expression type '%s' is not integer.", string->buffer); + hlsl_release_string_buffer(ctx, string); + break; + } +} + static struct hlsl_ir_expr *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) { @@ -1061,29 +1082,8 @@ static struct hlsl_ir_expr *add_binary_bitwise_expr(struct hlsl_ctx *ctx, struct enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) { - if (arg1->data_type->base_type != HLSL_TYPE_INT && arg1->data_type->base_type != HLSL_TYPE_UINT - && arg1->data_type->base_type != HLSL_TYPE_BOOL) - { - struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg1->data_type); - - if (type_str) - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "The first argument has type '%s', which is not integer.", type_str->buffer); - hlsl_release_string_buffer(ctx, type_str); - return NULL; - } - - if (arg2->data_type->base_type != HLSL_TYPE_INT && arg2->data_type->base_type != HLSL_TYPE_UINT - && arg2->data_type->base_type != HLSL_TYPE_BOOL) - { - struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg2->data_type); - - if (type_str) - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "The second argument has type '%s', which is not integer.", type_str->buffer); - hlsl_release_string_buffer(ctx, type_str); - return NULL; - } + check_integer_type(ctx, arg1); + check_integer_type(ctx, arg2); return add_binary_arithmetic_expr(ctx, instrs, op, arg1, arg2, loc); }

1 0

Jacek Caban : mshtml: Post messages asynchronously in IE9+ modes.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 24c10e700c14f51073af52435a22aa7f69a604cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c10e700c14f51073af5243… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 20:10:54 2022 +0100 mshtml: Post messages asynchronously in IE9+ modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 33 +++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 11 +++++++++++ dlls/mshtml/tests/events.js | 1 - dlls/mshtml/tests/jstest.html | 15 --------------- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 28862c4ad40..ecd530db7e2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2194,6 +2194,25 @@ static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *ifac return E_NOTIMPL; } +struct post_message_task { + task_t header; + HTMLInnerWindow *window; + DOMEvent *event; +} ; + +static void post_message_proc(task_t *_task) +{ + struct post_message_task *task = (struct post_message_task *)_task; + dispatch_event(&task->window->event_target, task->event); +} + +static void post_message_destr(task_t *_task) +{ + struct post_message_task *task = (struct post_message_task *)_task; + IDOMEvent_Release(&task->event->IDOMEvent_iface); + IHTMLWindow2_Release(&task->window->base.IHTMLWindow2_iface); +} + static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); @@ -2211,6 +2230,20 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR if(FAILED(hres)) return hres; + if(dispex_compat_mode(&This->inner_window->event_target.dispex) >= COMPAT_MODE_IE9) { + struct post_message_task *task; + if(!(task = heap_alloc(sizeof(*task)))) { + IDOMEvent_Release(&event->IDOMEvent_iface); + return E_OUTOFMEMORY; + } + + task->event = event; + task->window = This->inner_window; + IHTMLWindow2_AddRef(&task->window->base.IHTMLWindow2_iface); + return push_task(&task->header, post_message_proc, post_message_destr, + This->inner_window->task_magic); + } + dispatch_event(&This->inner_window->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 6dcda4a8be0..ddcb738ab26 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1331,3 +1331,14 @@ sync_test("__proto__", function() { r = Object.getPrototypeOf(x); ok(r === ctor.prototype, "x.__proto__ after delete = " + r); }); + +async_test("postMessage", function() { + var v = document.documentMode; + var onmessage_called = false; + window.onmessage = function() { + onmessage_called = true; + next_test(); + } + window.postMessage("test", "*"); + ok(onmessage_called == (v < 9 ? true : false), "onmessage not called"); +}); diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index d66b44a8ef2..75893cac204 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -809,6 +809,5 @@ async_test("message event", function() { }); window.postMessage("test", "http://winetest.example.org"); - todo_wine. ok(listener_called == false, "listener already called"); }); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 164593ee0d3..3bf9f316e7a 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -365,20 +365,6 @@ function test_xhr() { ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); } -function test_postMessage() { - if(!("postMessage" in window)) { - win_skip("postMessage not available"); - return; - } - - var onmessage_called = false; - window.onmessage = function() { - onmessage_called = true; - } - window.postMessage("test", "*"); - ok(onmessage_called, "onmessage not called"); -} - var globalVar = false; function runTests() { @@ -405,7 +391,6 @@ function runTests() { test_language_attribute(); test_text_node(); test_xhr(); - test_postMessage(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Eric Pouech : conhost/tests: Add tests for ReadConsoleW with control.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 89a8b32d7a976504ee98ba1a7d08574bc9bc00e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a8b32d7a976504ee98ba1a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 09:26:08 2022 +0100 conhost/tests: Add tests for ReadConsoleW with control. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 179 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 175 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89a8b32d7a976504ee98…

1 0

Eric Pouech : kernelbase: Return key state in ReadConsoleW with control.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 68b4ffebfbca59b62ba861fcf8140a0b42ffb9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b4ffebfbca59b62ba861fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 09:26:02 2022 +0100 kernelbase: Return key state in ReadConsoleW with control. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 12 ++++++++---- programs/conhost/conhost.c | 10 ++++++++-- programs/conhost/conhost.h | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1f23292d467..b2bb6c53fd9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -2031,7 +2031,7 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (!(tmp = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD) + crc->nInitialChars * sizeof(WCHAR) ))) + if (!(tmp = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD) + length * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; @@ -2041,9 +2041,13 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun memcpy( tmp + sizeof(DWORD), buffer, crc->nInitialChars * sizeof(WCHAR) ); ret = console_ioctl( handle, IOCTL_CONDRV_READ_CONSOLE_CONTROL, tmp, sizeof(DWORD) + crc->nInitialChars * sizeof(WCHAR), - buffer, length * sizeof(WCHAR), - count ); - crc->dwConsoleKeyState = 0; + tmp, sizeof(DWORD) + length * sizeof(WCHAR), count ); + if (ret) + { + memcpy( &crc->dwConsoleKeyState, tmp, sizeof(DWORD) ); + *count -= sizeof(DWORD); + memcpy( buffer, tmp + sizeof(DWORD), *count ); + } HeapFree( GetProcessHeap(), 0, tmp ); } else diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index b08d26c2641..11e97993fd8 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -457,6 +457,8 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v req->signal = signal; req->read = 1; req->status = status; + if (console->read_ioctl == IOCTL_CONDRV_READ_CONSOLE_CONTROL) + wine_server_add_data( req, &console->key_state, sizeof(console->key_state) ); wine_server_add_data( req, buf, size ); status = wine_server_call( req ); } @@ -1250,6 +1252,7 @@ static NTSTATUS process_console_input( struct console *console ) struct edit_line *ctx = &console->edit_line; unsigned int i; WCHAR ctrl_value = FIRST_NON_CONTROL_CHAR; + unsigned int ctrl_keyvalue = 0; switch (console->read_ioctl) { @@ -1297,6 +1300,7 @@ static NTSTATUS process_console_input( struct console *console ) if (ctx->ctrl_mask & (1u << ir.Event.KeyEvent.uChar.UnicodeChar)) { ctrl_value = ir.Event.KeyEvent.uChar.UnicodeChar; + ctrl_keyvalue = ir.Event.KeyEvent.dwControlKeyState; ctx->status = STATUS_SUCCESS; TRACE("Found ctrl char in mask: ^%lc %x\n", ir.Event.KeyEvent.uChar.UnicodeChar + '@', ctx->ctrl_mask); continue; @@ -1363,6 +1367,7 @@ static NTSTATUS process_console_input( struct console *console ) if (ctrl_value < FIRST_NON_CONTROL_CHAR) { edit_line_insert( console, &ctrl_value, 1 ); + console->key_state = ctrl_keyvalue; } else { @@ -1404,6 +1409,7 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ } console->read_ioctl = ioctl; + console->key_state = 0; if (!out_size || console->read_buffer_count) { read_from_buffer( console, out_size ); @@ -2562,10 +2568,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_CONSOLE_CONTROL: if ((in_size < sizeof(DWORD)) || ((in_size - sizeof(DWORD)) % sizeof(WCHAR)) || - (*out_size % sizeof(WCHAR))) + (*out_size < sizeof(DWORD)) || ((*out_size - sizeof(DWORD)) % sizeof(WCHAR))) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - status = read_console( console, code, *out_size, + status = read_console( console, code, *out_size - sizeof(DWORD), (const WCHAR*)((const char*)in_data + sizeof(DWORD)), (in_size - sizeof(DWORD)) / sizeof(WCHAR), *(DWORD*)in_data ); diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index e5f70aa3ca4..35876689419 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -88,6 +88,7 @@ struct console unsigned int read_ioctl; /* current read ioctl */ size_t pending_read; /* size of pending read buffer */ struct edit_line edit_line; /* edit line context */ + unsigned int key_state; struct console_window *window; WCHAR *title; /* console title */ struct history_line **history; /* lines history */

1 0

Eric Pouech : kernelbase: Support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: ef8d44e58e71019fdacbc866806f61128893cdc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8d44e58e71019fdacbc866… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 09:25:56 2022 +0100 kernelbase: Support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 32 +++++++++++++- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 104 ++++++++++++++++++++++++++++++++++++--------- programs/conhost/conhost.h | 1 + server/console.c | 1 + 5 files changed, 118 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef8d44e58e71019fdacb…

1 0

Torge Matthies : powrprof: Add PowerSettingUnregisterNotification stub.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: ce6365551b663472d9ad3bfd40c2b5fdfbefa84c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6365551b663472d9ad3bfd… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sun Feb 27 02:02:35 2022 +0100 powrprof: Add PowerSettingUnregisterNotification stub. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 1 + 3 files changed, 8 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 3a5b93fed3c..ac1fa34bc05 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -350,6 +350,12 @@ DWORD WINAPI PowerSettingRegisterNotification(const GUID *setting, DWORD flags, return ERROR_SUCCESS; } +DWORD WINAPI PowerSettingUnregisterNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p) stub!\n", handle); + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 3524be251a6..7a65fd37fc2 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -20,6 +20,7 @@ @ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) @ stdcall PowerUnregisterSuspendResumeNotification(ptr) @ stdcall PowerSettingRegisterNotification(ptr long ptr ptr) +@ stdcall PowerSettingUnregisterNotification(ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 51fa158f239..4c6cee41d16 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -163,6 +163,7 @@ DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCES DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD, HANDLE, PHPOWERNOTIFY); DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY); DWORD WINAPI PowerSettingRegisterNotification(const GUID *, DWORD, HANDLE, PHPOWERNOTIFY); +DWORD WINAPI PowerSettingUnregisterNotification(HPOWERNOTIFY); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0