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

Alexandre Julliard : Wine release 8.5
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: website Branch: master Commit: 9f645f5c874fb4a644a7d5f44cfbe683d3672275 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/9f645f5c874fb4a644a7d5f44c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 23:26:40 2023 +0200 Wine release 8.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023033101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2023033101.xml b/news/en/2023033101.xml new file mode 100644 index 00000000..aa3fba25 --- /dev/null +++ b/news/en/2023033101.xml @@ -0,0 +1,18 @@ +<news> +<date>March 31, 2023</date> +<title>Wine 8.5 Released</title> +<body> + The Wine development release 8.5 is now available. + <a href="{$root}/announce/8.5">What's new</a> in this release: +<ul> + <li>Bundled vkd3d upgraded to version 1.7.</li> + <li>Better error reporting in the IDL compiler.</li> + <li>Support for shared Wow64 Classes registry key.</li> + <li>More cleanups in IME support.</li> + <li>Support for configuring a WinRT dark theme.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.5 : Alexandre Julliard : Release 8.5
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: refs/tags/wine-8.5 Tag: b3a876eaa52edcfd8997697ddaf7859fc7b6c108 URL: https://gitlab.winehq.org/wine/wine/-/tags/b3a876eaa52edcfd8997697ddaf7859f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 23:24:02 2023 +0200 Release 8.5

1 0

Connor McAdams : uiautomationcore: Add support for UIA_IsOffscreenPropertyId to MSAA providers.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 77fa740398a54eb243a50db1969052aac2dadde8 URL: https://gitlab.winehq.org/wine/wine/-/commit/77fa740398a54eb243a50db1969052… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Feb 14 15:10:40 2023 -0500 uiautomationcore: Add support for UIA_IsOffscreenPropertyId to MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 83 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 39 ++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 3d2a61af8f0..b789e4f88be 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3383,6 +3383,7 @@ static void test_uia_prov_from_acc_navigation(void) static void test_uia_prov_from_acc_properties(void) { IRawElementProviderSimple *elprov; + RECT rect[2] = { 0 }; HRESULT hr; VARIANT v; int i, x; @@ -3476,6 +3477,88 @@ static void test_uia_prov_from_acc_properties(void) } Accessible.state = 0; + /* + * UIA_IsOffscreenPropertyId relies upon either STATE_SYSTEM_OFFSCREEN + * being set, or accLocation returning a location that is within the + * client area bounding box of the HWND it is contained within. + */ + set_accessible_props(&Accessible, 0, STATE_SYSTEM_OFFSCREEN, 0, L"Accessible", 0, 0, 0, 0); + SET_EXPECT(Accessible_get_accState); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_IsOffscreenPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BOOL, "V_VT(&v) = %d\n", V_VT(&v)); + ok(check_variant_bool(&v, TRUE), "Unexpected BOOL %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + + /* accLocation fails, will return FALSE. */ + set_accessible_props(&Accessible, 0, ~STATE_SYSTEM_OFFSCREEN, 0, L"Accessible", 0, 0, 0, 0); + SET_EXPECT(Accessible_get_accState); + SET_EXPECT(Accessible_accLocation); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_IsOffscreenPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BOOL, "V_VT(&v) = %d\n", V_VT(&v)); + ok(check_variant_bool(&v, FALSE), "Unexpected BOOL %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_accLocation); + + /* Window is visible, Accessible is within its bounds. */ + ShowWindow(Accessible.ow_hwnd, SW_SHOW); + ok(GetClientRect(Accessible.ow_hwnd, &rect[0]), "GetClientRect returned FALSE\n"); + MapWindowPoints(Accessible.ow_hwnd, NULL, (POINT *)&rect[0], 2); + + set_accessible_props(&Accessible, 0, ~STATE_SYSTEM_OFFSCREEN, 0, L"Accessible", rect[0].left, rect[0].top, + (rect[0].right - rect[0].left), (rect[0].bottom - rect[0].top)); + SET_EXPECT(Accessible_get_accState); + SET_EXPECT(Accessible_accLocation); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_IsOffscreenPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BOOL, "Unexpected VT %d\n", V_VT(&v)); + ok(check_variant_bool(&v, FALSE), "Unexpected BOOL %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_accLocation); + + /* + * Window is invisible, Accessible is within its bounds. Window visibility + * doesn't effect whether or not an IAccessible is considered offscreen. + */ + ShowWindow(Accessible.ow_hwnd, SW_HIDE); + set_accessible_props(&Accessible, 0, ~STATE_SYSTEM_OFFSCREEN, 0, L"Accessible", rect[0].left, rect[0].top, + (rect[0].right - rect[0].left), (rect[0].bottom - rect[0].top)); + SET_EXPECT(Accessible_get_accState); + SET_EXPECT(Accessible_accLocation); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_IsOffscreenPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BOOL, "Unexpected VT %d\n", V_VT(&v)); + ok(check_variant_bool(&v, FALSE), "Unexpected BOOL %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_accLocation); + + /* Accessible now outside of its window's bounds. */ + set_accessible_props(&Accessible, 0, ~STATE_SYSTEM_OFFSCREEN, 0, L"Accessible", rect[0].right, rect[0].bottom, + 10, 10); + SET_EXPECT(Accessible_get_accState); + SET_EXPECT(Accessible_accLocation); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_IsOffscreenPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BOOL, "V_VT(&v) = %d\n", V_VT(&v)); + ok(check_variant_bool(&v, TRUE), "Unexpected BOOL %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_accLocation); + + /* Accessible within window bounds, but not client area bounds. */ + ok(GetWindowRect(Accessible.ow_hwnd, &rect[1]), "GetWindowRect returned FALSE\n"); + set_accessible_props(&Accessible, 0, ~STATE_SYSTEM_OFFSCREEN, 0, L"Accessible", rect[1].left, rect[1].top, + (rect[0].left - rect[1].left) - 1, (rect[0].top - rect[1].top) - 1); + + SET_EXPECT(Accessible_get_accState); + SET_EXPECT(Accessible_accLocation); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_IsOffscreenPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BOOL, "V_VT(&v) = %d\n", V_VT(&v)); + ok(check_variant_bool(&v, TRUE), "Unexpected BOOL %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_accLocation); + IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index a7d41248abc..119a7e69abc 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -676,6 +676,45 @@ HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, break; } + case UIA_IsOffscreenPropertyId: + { + RECT rect[2] = { 0 }; + RECT intersect_rect; + LONG width, height; + + variant_init_bool(ret_val, FALSE); + if (msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_OFFSCREEN)) + { + variant_init_bool(ret_val, TRUE); + break; + } + + hr = IAccessible_accLocation(msaa_prov->acc, &rect[0].left, &rect[0].top, &width, &height, msaa_prov->cid); + if (FAILED(hr)) + break; + + rect[0].right = rect[0].left + width; + rect[0].bottom = rect[0].top + height; + SetLastError(NOERROR); + if (!GetClientRect(msaa_prov->hwnd, &rect[1])) + { + if (GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + variant_init_bool(ret_val, TRUE); + break; + } + + SetLastError(NOERROR); + if (!MapWindowPoints(msaa_prov->hwnd, NULL, (POINT *)&rect[1], 2) && GetLastError()) + { + if (GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + variant_init_bool(ret_val, TRUE); + break; + } + + variant_init_bool(ret_val, !IntersectRect(&intersect_rect, &rect[0], &rect[1])); + break; + } + default: FIXME("Unimplemented propertyId %d\n", prop_id); break;

1 0

Connor McAdams : uiautomationcore: Add support for UIA_LegacyIAccessibleChildIdPropertyId.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: fc3b0d33926a0d76c208c58abd79f420df0d8a1b URL: https://gitlab.winehq.org/wine/wine/-/commit/fc3b0d33926a0d76c208c58abd79f4… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Feb 14 15:43:57 2023 -0500 uiautomationcore: Add support for UIA_LegacyIAccessibleChildIdPropertyId. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 189 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 10 ++ dlls/uiautomationcore/uia_ids.c | 4 +- dlls/uiautomationcore/uia_private.h | 6 + dlls/uiautomationcore/uia_provider.c | 6 - 5 files changed, 208 insertions(+), 7 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for UIA_LegacyIAccessibleRolePropertyId.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 74f06be6769e1a0c3e6f8ba65b4cda2a27e25933 URL: https://gitlab.winehq.org/wine/wine/-/commit/74f06be6769e1a0c3e6f8ba65b4cda… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Feb 14 15:57:46 2023 -0500 uiautomationcore: Add support for UIA_LegacyIAccessibleRolePropertyId. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 19 +++++++++++++++++-- dlls/uiautomationcore/uia_client.c | 10 ++++++++++ dlls/uiautomationcore/uia_ids.c | 4 +++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 525b54ebc86..14195fff8b5 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -1119,6 +1119,7 @@ struct Provider_legacy_accessible_pattern_data { BOOL is_supported; int child_id; + DWORD role; }; static struct Provider @@ -2269,8 +2270,10 @@ static HRESULT WINAPI ProviderLegacyIAccessiblePattern_get_Description(ILegacyIA static HRESULT WINAPI ProviderLegacyIAccessiblePattern_get_Role(ILegacyIAccessibleProvider *iface, DWORD *out_role) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + struct Provider *Provider = impl_from_ProviderLegacyIAccessiblePattern(iface); + + *out_role = Provider->legacy_acc_pattern_data.role; + return S_OK; } static HRESULT WINAPI ProviderLegacyIAccessiblePattern_get_State(ILegacyIAccessibleProvider *iface, DWORD *out_state) @@ -5708,6 +5711,18 @@ static void test_UiaGetPropertyValue(void) VariantClear(&v); } + for (i = 0; i < 2; i++) + { + Provider.legacy_acc_pattern_data.role = i; + + hr = UiaGetPropertyValue(node, UIA_LegacyIAccessibleRolePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + ok(V_I4(&v) == i, "Unexpected I4 %#lx\n", V_I4(&v)); + ok_method_sequence(get_pattern_prop_seq, NULL); + VariantClear(&v); + } + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 95287179f92..92ff41e2c71 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1581,6 +1581,16 @@ static HRESULT uia_provider_get_pattern_prop_val(struct uia_provider *prov, break; } + case UIA_LegacyIAccessibleRolePropertyId: + { + DWORD val; + + hr = ILegacyIAccessibleProvider_get_Role((ILegacyIAccessibleProvider *)pattern_prov, &val); + if (SUCCEEDED(hr)) + variant_init_i4(ret_val, val); + break; + } + default: break; } diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index 62f26de0982..d23ba14c333 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -219,7 +219,9 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsDialog_Property_GUID, UIA_IsDialogPropertyId, PROP_TYPE_ELEM_PROP, UIAutomationType_Bool, }, { &IsTextPatternAvailable_Property_GUID, UIA_IsTextPatternAvailablePropertyId, }, - { &LegacyIAccessible_Role_Property_GUID, UIA_LegacyIAccessibleRolePropertyId, }, + { &LegacyIAccessible_Role_Property_GUID, UIA_LegacyIAccessibleRolePropertyId, + PROP_TYPE_PATTERN_PROP, UIAutomationType_Int, + UIA_LegacyIAccessiblePatternId, }, { &Selection2_ItemCount_Property_GUID, UIA_Selection2ItemCountPropertyId, }, { &TableItem_RowHeaderItems_Property_GUID, UIA_TableItemRowHeaderItemsPropertyId, }, { &Styles_ExtendedProperties_Property_GUID, UIA_StylesExtendedPropertiesPropertyId, },

1 0

Connor McAdams : uiautomationcore: Implement ILegacyIAccessibleProvider::get_Role for MSAA providers.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 6f2aa68e9fc8d22a7c64a63f70f26237a951e1d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f2aa68e9fc8d22a7c64a63f70f262… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Feb 14 16:17:09 2023 -0500 uiautomationcore: Implement ILegacyIAccessibleProvider::get_Role for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 19 +++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 15 +++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 14195fff8b5..6d2e859a7f6 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3556,6 +3556,9 @@ static void test_uia_prov_from_acc_properties(void) for (i = 0; i < ARRAY_SIZE(msaa_role_uia_types); i++) { const struct msaa_role_uia_type *role = &msaa_role_uia_types[i]; + ILegacyIAccessibleProvider *accprov; + DWORD role_val; + IUnknown *unk; /* * Roles get cached once a valid one is mapped, so create a new @@ -3588,6 +3591,22 @@ static void test_uia_prov_from_acc_properties(void) if (!role->uia_control_type) CHECK_CALLED(Accessible_get_accRole); + hr = IRawElementProviderSimple_GetPatternProvider(elprov, UIA_LegacyIAccessiblePatternId, &unk); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!unk, "unk == NULL\n"); + + hr = IUnknown_QueryInterface(unk, &IID_ILegacyIAccessibleProvider, (void **)&accprov); + IUnknown_Release(unk); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!accprov, "accprov == NULL\n"); + + SET_EXPECT(Accessible_get_accRole); + hr = ILegacyIAccessibleProvider_get_Role(accprov, &role_val); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(role_val == Accessible.role, "role_val != Accessible.role\n"); + CHECK_CALLED(Accessible_get_accRole); + + ILegacyIAccessibleProvider_Release(accprov); IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); } diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index a950df599d8..59be5d3782a 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1066,8 +1066,19 @@ static HRESULT WINAPI msaa_acc_provider_get_Description(ILegacyIAccessibleProvid static HRESULT WINAPI msaa_acc_provider_get_Role(ILegacyIAccessibleProvider *iface, DWORD *out_role) { - FIXME("%p, %p: stub!\n", iface, out_role); - return E_NOTIMPL; + struct msaa_provider *msaa_prov = impl_from_msaa_acc_provider(iface); + HRESULT hr; + VARIANT v; + + TRACE("%p, %p\n", iface, out_role); + + *out_role = 0; + VariantInit(&v); + hr = IAccessible_get_accRole(msaa_prov->acc, msaa_prov->cid, &v); + if (SUCCEEDED(hr) && V_VT(&v) == VT_I4) + *out_role = V_I4(&v); + + return S_OK; } static HRESULT WINAPI msaa_acc_provider_get_State(ILegacyIAccessibleProvider *iface, DWORD *out_state)

1 0

Alexandre Julliard : Release 8.5.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 02876a4b1320a1ee03b04c264fe31ccf6ec06d1c URL: https://gitlab.winehq.org/wine/wine/-/commit/02876a4b1320a1ee03b04c264fe31c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 23:18:31 2023 +0200 Release 8.5. --- ANNOUNCE | 927 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 473 insertions(+), 477 deletions(-)

1 0

Rémi Bernon : imm32/tests: Add some ImmSetConversionStatus tests.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 13f0b5c9c6e9901ebf98a284219dd15790d620da URL: https://gitlab.winehq.org/wine/wine/-/commit/13f0b5c9c6e9901ebf98a284219dd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 31 08:55:57 2023 +0200 imm32/tests: Add some ImmSetConversionStatus tests. --- dlls/imm32/tests/imm32.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 175678b0650..5e493c998c9 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3898,6 +3898,168 @@ cleanup: winetest_pop_context(); } +static void test_ImmSetConversionStatus(void) +{ + const struct ime_call set_conversion_status_0_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCONVERSIONMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETSENTENCEMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETSENTENCEMODE}, + }, + {0}, + }; + const struct ime_call set_conversion_status_1_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0xdeadbeef, .value = IMC_SETCONVERSIONMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, + }, + {0}, + }; + const struct ime_call set_conversion_status_2_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCONVERSIONMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0xfeedcafe, .value = IMC_SETSENTENCEMODE}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETSENTENCEMODE}, + }, + {0}, + }; + DWORD old_conversion, old_sentence, conversion, sentence; + HKL hkl, old_hkl = GetKeyboardLayout( 0 ); + INPUTCONTEXT *ctx; + + ok_ret( 0, ImmGetConversionStatus( 0, &old_conversion, &old_sentence ) ); + ok_ret( 1, ImmGetConversionStatus( default_himc, &old_conversion, &old_sentence ) ); + + ctx = ImmLockIMC( default_himc ); + ok_ne( NULL, ctx, INPUTCONTEXT *, "%p" ); + ok_eq( old_conversion, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( old_sentence, ctx->fdwSentence, UINT, "%#x" ); + + hwnd = CreateWindowW( L"static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 100, 100, NULL, NULL, NULL, NULL ); + ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); + process_messages(); + + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( old_conversion, conversion, UINT, "%#x" ); + ok_eq( old_sentence, sentence, UINT, "%#x" ); + ok_eq( old_conversion, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( old_sentence, ctx->fdwSentence, UINT, "%#x" ); + + ok_ret( 1, ImmSetConversionStatus( default_himc, 0, 0 ) ); + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( 0, conversion, UINT, "%#x" ); + ok_eq( 0, sentence, UINT, "%#x" ); + ok_eq( 0, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( 0, ctx->fdwSentence, UINT, "%#x" ); + + ime_info.fdwProperty = IME_PROP_END_UNLOAD | IME_PROP_UNICODE; + + if (!(hkl = ime_install())) goto cleanup; + + ok_ret( 1, ImmActivateLayout( hkl ) ); + ok_ret( 1, ImmLoadIME( hkl ) ); + process_messages(); + /* initial values are dependent on both old and new IME */ + ok_ret( 1, ImmSetConversionStatus( default_himc, 0, 0 ) ); + memset( ime_calls, 0, sizeof(ime_calls) ); + ime_call_count = 0; + + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( 0, conversion, UINT, "%#x" ); + ok_eq( 0, sentence, UINT, "%#x" ); + ok_eq( 0, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( 0, ctx->fdwSentence, UINT, "%#x" ); + + ok_seq( empty_sequence ); + ok_ret( 1, ImmSetConversionStatus( default_himc, 0xdeadbeef, 0xfeedcafe ) ); + ok_seq( set_conversion_status_0_seq ); + + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( 0xdeadbeef, conversion, UINT, "%#x" ); + ok_eq( 0xfeedcafe, sentence, UINT, "%#x" ); + ok_eq( 0xdeadbeef, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( 0xfeedcafe, ctx->fdwSentence, UINT, "%#x" ); + + ok_seq( empty_sequence ); + ok_ret( 1, ImmSetConversionStatus( default_himc, 0, 0xfeedcafe ) ); + ok_seq( set_conversion_status_1_seq ); + + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( 0, conversion, UINT, "%#x" ); + ok_eq( 0xfeedcafe, sentence, UINT, "%#x" ); + ok_eq( 0, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( 0xfeedcafe, ctx->fdwSentence, UINT, "%#x" ); + + ok_seq( empty_sequence ); + ok_ret( 1, ImmSetConversionStatus( default_himc, ~0, ~0 ) ); + ok_seq( set_conversion_status_2_seq ); + + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( ~0, conversion, UINT, "%#x" ); + ok_eq( ~0, sentence, UINT, "%#x" ); + ok_eq( ~0, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( ~0, ctx->fdwSentence, UINT, "%#x" ); + + /* status is cached and some bits are kept from the previous active IME */ + ok_ret( 1, ImmActivateLayout( old_hkl ) ); + todo_wine ok_eq( 0x200, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( old_sentence, ctx->fdwSentence, UINT, "%#x" ); + ok_ret( 1, ImmActivateLayout( hkl ) ); + todo_wine ok_eq( ~0, ctx->fdwConversion, UINT, "%#x" ); + todo_wine ok_eq( ~0, ctx->fdwSentence, UINT, "%#x" ); + ok_ret( 1, ImmActivateLayout( old_hkl ) ); + todo_wine ok_eq( 0x200, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( old_sentence, ctx->fdwSentence, UINT, "%#x" ); + + ime_cleanup( hkl, TRUE ); + +cleanup: + /* sanitize conversion status to some sane default */ + ok_ret( 1, ImmSetConversionStatus( default_himc, 0, 0 ) ); + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); + ok_eq( 0, conversion, UINT, "%#x" ); + ok_eq( 0, sentence, UINT, "%#x" ); + ok_eq( 0, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( 0, ctx->fdwSentence, UINT, "%#x" ); + + ok_ret( 1, DestroyWindow( hwnd ) ); + process_messages(); + memset( ime_calls, 0, sizeof(ime_calls) ); + ime_call_count = 0; + + ok_ret( 1, ImmUnlockIMC( default_himc ) ); +} + static void test_ImmProcessKey(void) { const struct ime_call process_key_seq[] = @@ -4493,6 +4655,9 @@ START_TEST(imm32) test_ImmUnregisterWord( FALSE ); test_ImmUnregisterWord( TRUE ); + /* test these first to sanitize conversion / open statuses */ + test_ImmSetConversionStatus(); + test_ImmActivateLayout(); test_ImmCreateInputContext(); test_ImmProcessKey();

1 0

Rémi Bernon : imm32/tests: Add some ImmSetOpenStatus tests.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: feb427db1a59ed362797354eaabee4eb326de1b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/feb427db1a59ed362797354eaabee4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 31 10:12:59 2023 +0200 imm32/tests: Add some ImmSetOpenStatus tests. --- dlls/imm32/tests/imm32.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5e493c998c9..5a1ce4accb4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -4060,6 +4060,124 @@ cleanup: ok_ret( 1, ImmUnlockIMC( default_himc ) ); } +static void test_ImmSetOpenStatus(void) +{ + const struct ime_call set_open_status_0_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS}, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS}, + }, + {0}, + }; + const struct ime_call set_open_status_1_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS}, + .todo = TRUE, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS}, + .todo = TRUE, + }, + {0}, + }; + HKL hkl, old_hkl = GetKeyboardLayout( 0 ); + DWORD old_status, status; + INPUTCONTEXT *ctx; + + ok_ret( 0, ImmGetOpenStatus( 0 ) ); + old_status = ImmGetOpenStatus( default_himc ); + + ctx = ImmLockIMC( default_himc ); + ok_ne( NULL, ctx, INPUTCONTEXT *, "%p" ); + ok_eq( old_status, ctx->fOpen, UINT, "%#x" ); + + hwnd = CreateWindowW( L"static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 100, 100, NULL, NULL, NULL, NULL ); + ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); + process_messages(); + + status = ImmGetOpenStatus( default_himc ); + ok_eq( old_status, status, UINT, "%#x" ); + ok_eq( old_status, ctx->fOpen, UINT, "%#x" ); + + ok_ret( 1, ImmSetOpenStatus( default_himc, 0 ) ); + status = ImmGetOpenStatus( default_himc ); + ok_eq( 0, status, UINT, "%#x" ); + ok_eq( 0, ctx->fOpen, UINT, "%#x" ); + + ime_info.fdwProperty = IME_PROP_END_UNLOAD | IME_PROP_UNICODE; + + if (!(hkl = ime_install())) goto cleanup; + + ok_ret( 1, ImmActivateLayout( hkl ) ); + ok_ret( 1, ImmLoadIME( hkl ) ); + process_messages(); + /* initial values are dependent on both old and new IME */ + ok_ret( 1, ImmSetOpenStatus( default_himc, 0 ) ); + memset( ime_calls, 0, sizeof(ime_calls) ); + ime_call_count = 0; + + status = ImmGetOpenStatus( default_himc ); + ok_eq( 0, status, UINT, "%#x" ); + ok_eq( 0, ctx->fOpen, UINT, "%#x" ); + + ok_seq( empty_sequence ); + ok_ret( 1, ImmSetOpenStatus( default_himc, 0xdeadbeef ) ); + ok_seq( set_open_status_0_seq ); + + status = ImmGetOpenStatus( default_himc ); + ok_eq( 0xdeadbeef, status, UINT, "%#x" ); + ok_eq( 0xdeadbeef, ctx->fOpen, UINT, "%#x" ); + + ok_seq( empty_sequence ); + ok_ret( 1, ImmSetOpenStatus( default_himc, ~0 ) ); + ok_seq( set_open_status_1_seq ); + + status = ImmGetOpenStatus( default_himc ); + todo_wine ok_eq( ~0, status, UINT, "%#x" ); + todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" ); + + /* status is cached between IME activations */ + + ok_ret( 1, ImmActivateLayout( old_hkl ) ); + status = ImmGetOpenStatus( default_himc ); + todo_wine ok_eq( old_status, status, UINT, "%#x" ); + todo_wine ok_eq( old_status, ctx->fOpen, UINT, "%#x" ); + ok_ret( 1, ImmActivateLayout( hkl ) ); + status = ImmGetOpenStatus( default_himc ); + todo_wine ok_eq( 1, status, UINT, "%#x" ); + todo_wine ok_eq( 1, ctx->fOpen, UINT, "%#x" ); + ok_ret( 1, ImmSetOpenStatus( default_himc, 0 ) ); + ok_ret( 1, ImmActivateLayout( old_hkl ) ); + status = ImmGetOpenStatus( default_himc ); + ok_eq( old_status, status, UINT, "%#x" ); + ok_eq( old_status, ctx->fOpen, UINT, "%#x" ); + + ime_cleanup( hkl, TRUE ); + +cleanup: + /* sanitize open status to some sane default */ + ok_ret( 1, ImmSetOpenStatus( default_himc, 0 ) ); + status = ImmGetOpenStatus( default_himc ); + ok_eq( 0, status, UINT, "%#x" ); + ok_eq( 0, ctx->fOpen, UINT, "%#x" ); + + ok_ret( 1, DestroyWindow( hwnd ) ); + process_messages(); + memset( ime_calls, 0, sizeof(ime_calls) ); + ime_call_count = 0; + + ok_ret( 1, ImmUnlockIMC( default_himc ) ); +} + static void test_ImmProcessKey(void) { const struct ime_call process_key_seq[] = @@ -4657,6 +4775,7 @@ START_TEST(imm32) /* test these first to sanitize conversion / open statuses */ test_ImmSetConversionStatus(); + test_ImmSetOpenStatus(); test_ImmActivateLayout(); test_ImmCreateInputContext();

1 0

Rémi Bernon : imm32: Avoid recursing into ImeSelect calls.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: ddfbc66fcfe5e6639352ec09cfffb753f5b6c675 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddfbc66fcfe5e6639352ec09cfffb7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 31 11:32:16 2023 +0200 imm32: Avoid recursing into ImeSelect calls. --- dlls/imm32/imm.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5cdf14cc9d9..e165544ba5e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -568,24 +568,25 @@ static void ime_release( struct ime *ime ) LeaveCriticalSection( &ime_cs ); } -static void imc_release_ime( struct imc *imc ) +static void imc_release_ime( struct imc *imc, struct ime *ime ) { if (imc->ui_hwnd) DestroyWindow( imc->ui_hwnd ); imc->ui_hwnd = NULL; - imc->ime->pImeSelect( imc->handle, FALSE ); - ime_release( imc->ime ); - imc->ime = NULL; + ime->pImeSelect( imc->handle, FALSE ); + ime_release( ime ); ImmDestroyIMCC( imc->IMC.hPrivate ); } static struct ime *imc_select_ime( struct imc *imc ) { HKL hkl = GetKeyboardLayout( 0 ); + struct ime *ime; - if (imc->ime) + if ((ime = imc->ime)) { - if (imc->ime->hkl == hkl) return imc->ime; - imc_release_ime( imc ); + if (ime->hkl == hkl) return ime; + imc->ime = NULL; + imc_release_ime( imc, ime ); } if (!(imc->ime = ime_acquire( hkl ))) @@ -623,12 +624,13 @@ BOOL WINAPI ImmActivateLayout( HKL hkl ) static BOOL free_input_context_data( HIMC hIMC ) { struct imc *data = query_imc_data( hIMC ); + struct ime *ime; if (!data) return FALSE; TRACE( "Destroying %p\n", hIMC ); - if (data->ime) imc_release_ime( data ); + if ((ime = imc_select_ime( data ))) imc_release_ime( data, ime ); ImmDestroyIMCC( data->IMC.hCompStr ); ImmDestroyIMCC( data->IMC.hCandInfo );

1 0