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

Biswapriyo Nath : include/windows.system.idl: Update file to newer formatting.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 52b832c7e36a016fb8c1dc9badcb479961a9f803 URL: https://gitlab.winehq.org/wine/wine/-/commit/52b832c7e36a016fb8c1dc9badcb47… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Mar 24 10:28:02 2023 +0530 include/windows.system.idl: Update file to newer formatting. I.e. get rid of nested namespaces and forward declares, separate attributes with commas and right align pointer declarations. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/windows.system.idl | 76 ++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/include/windows.system.idl b/include/windows.system.idl index aaf5ecd69a1..f21080cc71f 100644 --- a/include/windows.system.idl +++ b/include/windows.system.idl @@ -26,48 +26,44 @@ import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -namespace Windows { - namespace System { - interface IUser; - interface IUserStatics; - interface IUserChangedEventArgs; - interface IUserChangedEventArgs2; - runtimeclass User; - runtimeclass UserChangedEventArgs; - } -} +namespace Windows.System +{ + interface IUser; + interface IUserStatics; + interface IUserChangedEventArgs; + interface IUserChangedEventArgs2; -namespace Windows { - namespace System { - [ - contract(Windows.Foundation.UniversalApiContract, 1.0), - exclusiveto(Windows.System.UserChangedEventArgs), - uuid(086459dc-18c6-48db-bc99-724fb9203ccc) - ] - interface IUserChangedEventArgs : IInspectable - { - [propget] HRESULT User([out, retval] Windows.System.User** value); - } + runtimeclass User; + runtimeclass UserChangedEventArgs; - [ - contract(Windows.Foundation.UniversalApiContract, 1.0), - marshaling_behavior(agile), - static(Windows.System.IUserStatics, Windows.Foundation.UniversalApiContract, 1.0), - threading(both), - ] - runtimeclass User - { - [default] interface Windows.System.IUser; - } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.UserChangedEventArgs), + uuid(086459dc-18c6-48db-bc99-724fb9203ccc) + ] + interface IUserChangedEventArgs : IInspectable + { + [propget] HRESULT User([out, retval] Windows.System.User **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.IUserStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both), + ] + runtimeclass User + { + [default] interface Windows.System.IUser; + } - [ - contract(Windows.Foundation.UniversalApiContract, 1.0), - marshaling_behavior(agile) - ] - runtimeclass UserChangedEventArgs - { - [default] interface Windows.System.IUserChangedEventArgs; - [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.System.IUserChangedEventArgs2; - } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UserChangedEventArgs + { + [default] interface Windows.System.IUserChangedEventArgs; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.System.IUserChangedEventArgs2; } }

1 0

Biswapriyo Nath : include: Add Windows.System.DispatcherQueue definition.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 8a07ffd965a1ae626d3aa1a74f65e84c3c269cda URL: https://gitlab.winehq.org/wine/wine/-/commit/8a07ffd965a1ae626d3aa1a74f65e8… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Mar 24 10:28:09 2023 +0530 include: Add Windows.System.DispatcherQueue definition. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/windows.system.idl | 164 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/include/windows.system.idl b/include/windows.system.idl index f21080cc71f..5ba5c3f86b3 100644 --- a/include/windows.system.idl +++ b/include/windows.system.idl @@ -28,14 +28,137 @@ import "windows.foundation.idl"; namespace Windows.System { + typedef enum DispatcherQueuePriority DispatcherQueuePriority; + + interface IDispatcherQueue; + interface IDispatcherQueue2; + interface IDispatcherQueueController; + interface IDispatcherQueueControllerStatics; + interface IDispatcherQueueShutdownStartingEventArgs; + interface IDispatcherQueueStatics; + interface IDispatcherQueueTimer; interface IUser; interface IUserStatics; interface IUserChangedEventArgs; interface IUserChangedEventArgs2; + runtimeclass DispatcherQueue; + runtimeclass DispatcherQueueController; + runtimeclass DispatcherQueueShutdownStartingEventArgs; + runtimeclass DispatcherQueueTimer; runtimeclass User; runtimeclass UserChangedEventArgs; + declare + { + interface Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueue *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueue *, Windows.System.DispatcherQueueShutdownStartingEventArgs *>; + interface Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueueTimer *, IInspectable *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0) + ] + enum DispatcherQueuePriority + { + Low = -10, + Normal = 0, + High = 10, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + uuid(dfa2dc9c-1a2d-4917-98f2-939af1d6e0c8) + ] + delegate HRESULT DispatcherQueueHandler(); + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.System.DispatcherQueue), + uuid(603e88e4-a338-4ffe-a457-a5cfb9ceb899) + ] + interface IDispatcherQueue : IInspectable + { + HRESULT CreateTimer([out, retval] Windows.System.DispatcherQueueTimer **result); + [overload("TryEnqueue")] HRESULT TryEnqueue([in] Windows.System.DispatcherQueueHandler *callback, [out, retval] boolean *result); + [overload("TryEnqueue")] HRESULT TryEnqueueWithPriority([in] Windows.System.DispatcherQueuePriority priority, [in] Windows.System.DispatcherQueueHandler *callback, + [out, retval] boolean *result); + [eventadd] HRESULT ShutdownStarting([in] Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueue *, Windows.System.DispatcherQueueShutdownStartingEventArgs *> *handler, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT ShutdownStarting([in] EventRegistrationToken token); + [eventadd] HRESULT ShutdownCompleted([in] Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueue *, IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT ShutdownCompleted([in] EventRegistrationToken token); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.System.DispatcherQueue), + uuid(c822c647-30ef-506e-bd1e-a647ae6675ff) + ] + interface IDispatcherQueue2 : IInspectable + { + [propget] HRESULT HasThreadAccess([out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.System.DispatcherQueueController), + uuid(22f34e66-50db-4e36-a98d-61c01b384d20) + ] + interface IDispatcherQueueController : IInspectable + { + [propget] HRESULT DispatcherQueue([out, retval] Windows.System.DispatcherQueue **value); + HRESULT ShutdownQueueAsync([out, retval] Windows.Foundation.IAsyncAction **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.System.DispatcherQueueController), + uuid(0a6c98e0-5198-49a2-a313-3f70d1f13c27) + ] + interface IDispatcherQueueControllerStatics : IInspectable + { + HRESULT CreateOnDedicatedThread([out, retval] Windows.System.DispatcherQueueController **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.System.DispatcherQueueShutdownStartingEventArgs), + uuid(c4724c4c-ff97-40c0-a226-cc0aaa545e89) + ] + interface IDispatcherQueueShutdownStartingEventArgs : IInspectable + { + HRESULT GetDeferral([out, retval] Windows.Foundation.Deferral **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.System.DispatcherQueue), + uuid(a96d83d7-9371-4517-9245-d0824ac12c74) + ] + interface IDispatcherQueueStatics : IInspectable + { + HRESULT GetForCurrentThread([out, retval] Windows.System.DispatcherQueue **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.System.DispatcherQueueTimer), + uuid(5feabb1d-a31c-4727-b1ac-37454649d56a) + ] + interface IDispatcherQueueTimer : IInspectable + { + [propget] HRESULT Interval([out, retval] Windows.Foundation.TimeSpan *value); + [propput] HRESULT Interval([in] Windows.Foundation.TimeSpan value); + [propget] HRESULT IsRunning([out, retval] boolean *value); + [propget] HRESULT IsRepeating([out, retval] boolean *value); + [propput] HRESULT IsRepeating([in] boolean value); + HRESULT Start(); + HRESULT Stop(); + [eventadd] HRESULT Tick([in] Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueueTimer *, IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Tick([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.System.UserChangedEventArgs), @@ -46,6 +169,47 @@ namespace Windows.System [propget] HRESULT User([out, retval] Windows.System.User **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + marshaling_behavior(agile), + static(Windows.System.IDispatcherQueueStatics, Windows.Foundation.UniversalApiContract, 5.0), + threading(both) + ] + runtimeclass DispatcherQueue + { + [default] interface Windows.System.IDispatcherQueue; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.System.IDispatcherQueue2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + marshaling_behavior(agile), + static(Windows.System.IDispatcherQueueControllerStatics, Windows.Foundation.UniversalApiContract, 5.0), + threading(both) + ] + runtimeclass DispatcherQueueController + { + [default] interface Windows.System.IDispatcherQueueController; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + marshaling_behavior(agile) + ] + runtimeclass DispatcherQueueShutdownStartingEventArgs + { + [default] interface Windows.System.IDispatcherQueueShutdownStartingEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + marshaling_behavior(agile) + ] + runtimeclass DispatcherQueueTimer + { + [default] interface Windows.System.IDispatcherQueueTimer; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Nikolay Sivov : d3d10/effect: Add support for 'movc' instruction.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: a54f1726c62651e9f2d9611b9fd1302886686ada URL: https://gitlab.winehq.org/wine/wine/-/commit/a54f1726c62651e9f2d9611b9fd130… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 23 10:22:42 2023 +0100 d3d10/effect: Add support for 'movc' instruction. --- dlls/d3d10/effect.c | 11 +++++ dlls/d3d10/tests/effect.c | 117 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 99 insertions(+), 29 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Handle division by zero in 'udiv'.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 8d00428e63c1e40780c18277da0fbaf141e778d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d00428e63c1e40780c18277da0fba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 23 10:40:03 2023 +0100 d3d10/effect: Handle division by zero in 'udiv'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- dlls/d3d10/tests/effect.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2ce503c323b..e44c798aede 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -361,7 +361,7 @@ static void pres_udiv(float **args, unsigned int n, const struct preshader_instr for (i = 0; i < instr->comp_count; ++i) { - unsigned int v = arg1[instr->scalar ? 0 : i] / arg2[i]; + unsigned int v = arg2[i] ? arg1[instr->scalar ? 0 : i] / arg2[i] : UINT_MAX; retval[i] = *(float *)&v; } } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a0066bbf99d..cd30e90490f 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8587,6 +8587,26 @@ static void test_effect_value_expression(void) ok(blend_factor[3] == 0.3f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* udiv */ + pass = t->lpVtbl->GetPassByName(t, "p9"); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); + + f[0] = 2.0f; + f[1] = 0.0f; + hr = g_var3->lpVtbl->SetFloatVector(g_var3, f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); + ok(!blend_state, "Unexpected blend state %p.\n", blend_state); + ok(blend_factor[0] == UINT_MAX, "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); + ok(blend_factor[1] == UINT_MAX, "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); + ok(blend_factor[2] == UINT_MAX, "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); + ok(blend_factor[3] == UINT_MAX, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); + ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* movc */ pass = t->lpVtbl->GetPassByName(t, "p10"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n");

1 0

Nikolay Sivov : d3d10/effect: Add support for asin/acos/atan instructions.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 4700c17c611b8b79a701fd40a0735083c19b6f8f URL: https://gitlab.winehq.org/wine/wine/-/commit/4700c17c611b8b79a701fd40a07350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 23 10:42:54 2023 +0100 d3d10/effect: Add support for asin/acos/atan instructions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e44c798aede..991e03529f3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -252,6 +252,33 @@ static void pres_cos(float **args, unsigned int n, const struct preshader_instr retval[i] = cos(args[0][i]); } +static void pres_asin(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = asinf(args[0][i]); +} + +static void pres_acos(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = acosf(args[0][i]); +} + +static void pres_atan(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = atanf(args[0][i]); +} + static void pres_ineg(float **args, unsigned int n, const struct preshader_instr *instr) { int *arg1 = (int *)args[0]; @@ -343,6 +370,15 @@ static void pres_mul(float **args, unsigned int n, const struct preshader_instr retval[i] = args[0][instr->scalar ? 0 : i] * args[1][i]; } +static void pres_atan2(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[2]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = atan2f(args[0][instr->scalar ? 0 : i], args[1][i]); +} + static void pres_div(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[2]; @@ -403,6 +439,9 @@ static const struct preshader_op_info preshader_ops[] = { 0x104, "frc", pres_frc }, { 0x108, "sin", pres_sin }, { 0x109, "cos", pres_cos }, + { 0x10a, "asin", pres_asin }, + { 0x10b, "acos", pres_acos }, + { 0x10c, "atan", pres_atan }, { 0x120, "ineg", pres_ineg }, { 0x130, "itof", pres_itof }, { 0x131, "utof", pres_utof }, @@ -412,6 +451,7 @@ static const struct preshader_op_info preshader_ops[] = { 0x201, "max", pres_max }, { 0x204, "add", pres_add }, { 0x205, "mul", pres_mul }, + { 0x206, "atan2",pres_atan2}, { 0x208, "div", pres_div }, { 0x21a, "udiv", pres_udiv }, { 0x21e, "imax", pres_imax },

1 0

Nikolay Sivov : d3d10/effect: Add support for umin/umax instructions.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 956541c9c823fb6048047893545dcee4c108730e URL: https://gitlab.winehq.org/wine/wine/-/commit/956541c9c823fb6048047893545dce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 24 23:32:10 2023 +0100 d3d10/effect: Add support for umin/umax instructions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 28 +++++++++ dlls/d3d10/tests/effect.c | 144 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 140 insertions(+), 32 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'imin' instruction.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: a8c78c0e2d7d456949b19cc0c4de8e2ad3afd27a URL: https://gitlab.winehq.org/wine/wine/-/commit/a8c78c0e2d7d456949b19cc0c4de8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 23 10:54:38 2023 +0100 d3d10/effect: Add support for 'imin' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 14 ++++++ dlls/d3d10/tests/effect.c | 107 +++++++++++++++++++++++++++++++--------------- 2 files changed, 87 insertions(+), 34 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'iadd' instruction.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: ec47f9855ea9c3a3a094529c416d17a07eaf9896 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec47f9855ea9c3a3a094529c416d17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 23 11:01:50 2023 +0100 d3d10/effect: Add support for 'iadd' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 +++++++ dlls/d3d10/tests/effect.c | 110 +++++++++++++++++++++++++++++++--------------- 2 files changed, 89 insertions(+), 36 deletions(-)

1 0

Nikolay Sivov : d3d10/tests: Add some tests for trigonometric functions.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: a98d9dd9e996fa3b8754d7c41edb4c4061abd8d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a98d9dd9e996fa3b8754d7c41edb4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 29 17:04:30 2023 +0200 d3d10/tests: Add some tests for trigonometric functions. --- dlls/d3d10/tests/effect.c | 138 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 5 deletions(-)

1 0

Rémi Bernon : imm32: Update existing input contexts on layout change.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 0ddad3564f3260f53e5a50b615f6aa6ba27e032b URL: https://gitlab.winehq.org/wine/wine/-/commit/0ddad3564f3260f53e5a50b615f6aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 11:24:21 2023 +0200 imm32: Update existing input contexts on layout change. --- dlls/imm32/imm.c | 5 +++++ dlls/imm32/tests/imm32.c | 15 ++++++++++----- dlls/win32u/input.c | 8 +++++++- include/ntuser.h | 2 ++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 447fbded41d..62fc855826b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3152,6 +3152,11 @@ static LRESULT ime_internal_msg( WPARAM wparam, LPARAM lparam) ImmSetActiveContext(hwnd, himc, wparam == IME_INTERNAL_ACTIVATE); ImmReleaseContext(hwnd, himc); break; + case IME_INTERNAL_HKL_ACTIVATE: + ImmEnumInputContext( 0, enum_activate_layout, 0 ); + break; + case IME_INTERNAL_HKL_DEACTIVATE: + break; default: FIXME("wparam = %Ix\n", wparam); break; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index fdce26a7a5c..7da3da1e6c2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -4013,12 +4013,12 @@ static void test_ImmActivateLayout(void) { .hkl = expect_ime, .himc = default_himc, .func = IME_SELECT, .select = 1, - .todo = TRUE, .flaky_himc = TRUE, + .flaky_himc = TRUE, }, { .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_SELECT, .select = 1, - .todo = TRUE, .flaky_himc = TRUE, + .flaky_himc = TRUE, }, { .hkl = expect_ime, .himc = default_himc, @@ -4067,12 +4067,12 @@ static void test_ImmActivateLayout(void) { .hkl = default_hkl, .himc = default_himc, .func = IME_SELECT, .select = 0, - .todo = TRUE, .flaky_himc = TRUE, + .flaky_himc = TRUE, }, { .hkl = default_hkl, .himc = 0/*himc*/, .func = IME_SELECT, .select = 0, - .todo = TRUE, .flaky_himc = TRUE, + .flaky_himc = TRUE, }, {0}, }; @@ -4149,7 +4149,6 @@ static void test_ImmActivateLayout(void) SET_EXPECT( ImeInquire ); ok_eq( old_hkl, ActivateKeyboardLayout( hkl, 0 ), HKL, "%p" ); - todo_wine CHECK_CALLED( ImeInquire ); activate_with_window_seq[1].himc = himc; ok_seq( activate_with_window_seq ); @@ -4164,7 +4163,9 @@ static void test_ImmActivateLayout(void) memset( ime_calls, 0, sizeof(ime_calls) ); ime_call_count = 0; + todo_ImeDestroy = TRUE; /* Wine doesn't leak the IME */ ok_eq( hkl, ActivateKeyboardLayout( old_hkl, 0 ), HKL, "%p" ); + todo_ImeDestroy = FALSE; deactivate_with_window_seq[1].himc = himc; deactivate_with_window_seq[5].himc = himc; ok_seq( deactivate_with_window_seq ); @@ -4175,7 +4176,9 @@ static void test_ImmActivateLayout(void) ok_seq( empty_sequence ); + todo_ImeInquire = TRUE; ok_eq( old_hkl, ActivateKeyboardLayout( hkl, 0 ), HKL, "%p" ); + todo_ImeInquire = FALSE; ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); ok_ret( 1, EnumThreadWindows( GetCurrentThreadId(), enum_thread_ime_windows, (LPARAM)&ime_windows ) ); @@ -4183,7 +4186,9 @@ static void test_ImmActivateLayout(void) todo_wine ok( !!ime_windows.ime_ui_hwnd, "missing IME UI window\n" ); todo_wine ok_ret( (UINT_PTR)ime_windows.ime_hwnd, (UINT_PTR)GetParent( ime_windows.ime_ui_hwnd ) ); + todo_ImeDestroy = TRUE; /* Wine doesn't leak the IME */ ok_eq( hkl, ActivateKeyboardLayout( old_hkl, 0 ), HKL, "%p" ); + todo_ImeDestroy = FALSE; ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 34f6727d66e..f806294cb20 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1219,12 +1219,14 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return 0; old_layout = info->kbd_layout; - info->kbd_layout = layout; if (old_layout != layout) { + HWND ime_hwnd = get_default_ime_window( 0 ); const NLS_LOCALE_DATA *data; CHARSETINFO cs = {0}; + if (ime_hwnd) send_message( ime_hwnd, WM_IME_INTERNAL, IME_INTERNAL_HKL_DEACTIVATE, HandleToUlong(old_layout) ); + if (HIWORD(layout) & 0x8000) FIXME( "Aliased keyboard layout not yet implemented\n" ); else if (!(data = get_locale_data( HIWORD(layout) ))) @@ -1232,7 +1234,11 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) else translate_charset_info( ULongToPtr(data->idefaultansicodepage), &cs, TCI_SRCCODEPAGE ); + info->kbd_layout = layout; info->kbd_layout_id = 0; + + if (ime_hwnd) send_message( ime_hwnd, WM_IME_INTERNAL, IME_INTERNAL_HKL_ACTIVATE, HandleToUlong(layout) ); + if ((focus = get_focus()) && get_window_thread( focus, NULL ) == GetCurrentThreadId()) send_message( focus, WM_INPUTLANGCHANGE, cs.ciCharset, (LPARAM)layout ); } diff --git a/include/ntuser.h b/include/ntuser.h index 629f6353fa3..14e1f3757d4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -487,6 +487,8 @@ enum wine_internal_message #define WM_IME_INTERNAL 0x287 #define IME_INTERNAL_ACTIVATE 0x17 #define IME_INTERNAL_DEACTIVATE 0x18 +#define IME_INTERNAL_HKL_ACTIVATE 0x19 +#define IME_INTERNAL_HKL_DEACTIVATE 0x20 #define WM_SYSTIMER 0x0118

1 0