July 2023 - Wine-Commits - list.winehq.org

Hans Leidekker : include: Add windows.storage.idl.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 3181c5a0dfdc811d45e0363e3d29cf8e936487f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3181c5a0dfdc811d45e0363e3d29cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 19 10:10:57 2023 +0200 include: Add windows.storage.idl. --- include/Makefile.in | 1 + include/windows.storage.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 5fd20858aee..94b5e77e849 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -842,6 +842,7 @@ SOURCES = \ windows.perception.spatial.surfaces.idl \ windows.security.credentials.idl \ windows.security.cryptography.idl \ + windows.storage.idl \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ diff --git a/include/windows.storage.idl b/include/windows.storage.idl new file mode 100644 index 00000000000..de918ddc104 --- /dev/null +++ b/include/windows.storage.idl @@ -0,0 +1,39 @@ +/* + * Copyright 2023 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.foundation.idl"; + +namespace Windows.Storage { + interface IStorageFolder; + interface IStorageFolderStatics; + + runtimeclass StorageFolder; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IStorageFolderStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass StorageFolder + { + [default] interface Windows.Storage.IStorageFolder; + } +}

1 0

Hans Leidekker : include: Add Uri runtime class and related definitions.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: ac55e6eb9f0475be63fbd4c1a72158d6c3b541ec URL: https://gitlab.winehq.org/wine/wine/-/commit/ac55e6eb9f0475be63fbd4c1a72158… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 17 13:55:59 2023 +0200 include: Add Uri runtime class and related definitions. --- include/windows.foundation.idl | 144 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 9be302515a4..11679367eca 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -68,16 +68,32 @@ namespace Windows.Foundation { interface IMemoryBufferFactory; interface IMemoryBufferReference; interface IStringable; + interface IUriEscapeStatics; + interface IUriRuntimeClass; + interface IUriRuntimeClassFactory; + interface IUriRuntimeClassWithAbsoluteCanonicalUri; + interface IWwwFormUrlDecoderEntry; + interface IWwwFormUrlDecoderRuntimeClass; + interface IWwwFormUrlDecoderRuntimeClassFactory; + runtimeclass Deferral; runtimeclass MemoryBuffer; + runtimeclass Uri; + runtimeclass WwwFormUrlDecoder; + runtimeclass WwwFormUrlDecoderEntry; declare { interface Windows.Foundation.Collections.IIterable<HSTRING>; interface Windows.Foundation.Collections.IIterable<IInspectable *>; + interface Windows.Foundation.Collections.IIterable<IWwwFormUrlDecoderEntry *>; + interface Windows.Foundation.Collections.IIterable<Uri *>; interface Windows.Foundation.Collections.IIterator<HSTRING>; interface Windows.Foundation.Collections.IIterator<IInspectable *>; + interface Windows.Foundation.Collections.IIterator<IWwwFormUrlDecoderEntry *>; + interface Windows.Foundation.Collections.IIterator<Uri *>; interface Windows.Foundation.Collections.IVectorView<HSTRING>; interface Windows.Foundation.Collections.IVectorView<IInspectable *>; + interface Windows.Foundation.Collections.IVectorView<IWwwFormUrlDecoderEntry *>; interface Windows.Foundation.Collections.IVector<HSTRING>; interface Windows.Foundation.Collections.IVector<IInspectable *>; interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING> *>; @@ -271,6 +287,97 @@ namespace Windows.Foundation { [eventremove] HRESULT Closed([in] EventRegistrationToken cookie); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.Uri), + uuid(c1d432ba-c824-4452-a7fd-512bc3bbe9a1) + ] + interface IUriEscapeStatics : IInspectable + { + HRESULT UnescapeComponent([in] HSTRING to_unescape, [out, retval] HSTRING *value); + HRESULT EscapeComponent([in] HSTRING to_escape, [out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.Uri), + uuid(9e365e57-48b2-4160-956f-c7385120bbfc) + ] + interface IUriRuntimeClass : IInspectable + { + [propget] HRESULT AbsoluteUri([out, retval] HSTRING *value); + [propget] HRESULT DisplayUri([out, retval] HSTRING *value); + [propget] HRESULT Domain([out, retval] HSTRING *value); + [propget] HRESULT Extension([out, retval] HSTRING *value); + [propget] HRESULT Fragment([out, retval] HSTRING *value); + [propget] HRESULT Host([out, retval] HSTRING *value); + [propget] HRESULT Password([out, retval] HSTRING *value); + [propget] HRESULT Path([out, retval] HSTRING *value); + [propget] HRESULT Query([out, retval] HSTRING *value); + [propget] HRESULT QueryParsed([out, retval] Windows.Foundation.WwwFormUrlDecoder **decoder); + [propget] HRESULT RawUri([out, retval] HSTRING *value); + [propget] HRESULT SchemeName([out, retval] HSTRING *value); + [propget] HRESULT UserName([out, retval] HSTRING *value); + [propget] HRESULT Port([out, retval] INT32 *value); + [propget] HRESULT Suspicious([out, retval] boolean *value); + HRESULT Equals([in] Windows.Foundation.Uri *uri, [out, retval] boolean *value); + HRESULT CombineUri([in] HSTRING relative_uri, [out, retval] Windows.Foundation.Uri **instance); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.Uri), + uuid(44a9796f-723e-4fdf-a218-033e75b0c084) + ] + interface IUriRuntimeClassFactory : IInspectable + { + HRESULT CreateUri([in] HSTRING uri, [out, retval] Windows.Foundation.Uri **instance); + HRESULT CreateWithRelativeUri([in] HSTRING base_uri, [in] HSTRING relative_uri, [out, retval] Windows.Foundation.Uri **instance); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.Uri), + uuid(758d9661-221c-480f-a339-50656673f46f) + ] + interface IUriRuntimeClassWithAbsoluteCanonicalUri : IInspectable + { + [propget] HRESULT AbsoluteCanonicalUri([out, retval] HSTRING *value); + [propget] HRESULT DisplayIri([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(125e7431-f678-4e8e-b670-20a9b06c512d) + ] + interface IWwwFormUrlDecoderEntry : IInspectable + { + [propget] HRESULT Name([out, retval] HSTRING *value); + [propget] HRESULT Value([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.WwwFormUrlDecoder), + uuid(d45a0451-f225-4542-9296-0e1df5d254df) + ] + interface IWwwFormUrlDecoderRuntimeClass : IInspectable + requires Windows.Foundation.Collections.IIterable<Windows.Foundation.IWwwFormUrlDecoderEntry *>, + Windows.Foundation.Collections.IVectorView<Windows.Foundation.IWwwFormUrlDecoderEntry *> + { + HRESULT GetFirstValueByName([in] HSTRING name, [out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.WwwFormUrlDecoder), + uuid(5b8c6b3d-24ae-41b5-a1bf-f0c3d544845b) + ] + interface IWwwFormUrlDecoderRuntimeClassFactory : IInspectable + { + HRESULT CreateWwwFormUrlDecoder([in] HSTRING query, [out, retval] Windows.Foundation.WwwFormUrlDecoder **instance); + } + [ activatable(Windows.Foundation.IDeferralFactory, Windows.Foundation.FoundationContract, 1.0), contract(Windows.Foundation.FoundationContract, 1.0), @@ -293,4 +400,41 @@ namespace Windows.Foundation { [default] interface Windows.Foundation.IMemoryBuffer; interface Windows.Foundation.IClosable; } + + [ + activatable(Windows.Foundation.IUriRuntimeClassFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Foundation.IUriEscapeStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass Uri + { + [default] interface Windows.Foundation.IUriRuntimeClass; + interface Windows.Foundation.IUriRuntimeClassWithAbsoluteCanonicalUri; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; + } + + [ + activatable(Windows.Foundation.IWwwFormUrlDecoderRuntimeClassFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass WwwFormUrlDecoder + { + [default] interface Windows.Foundation.IWwwFormUrlDecoderRuntimeClass; + interface Windows.Foundation.Collections.IVectorView<Windows.Foundation.IWwwFormUrlDecoderEntry *>; + interface Windows.Foundation.Collections.IIterable<Windows.Foundation.IWwwFormUrlDecoderEntry *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass WwwFormUrlDecoderEntry + { + [default] interface Windows.Foundation.IWwwFormUrlDecoderEntry; + } }

1 0

Zhiyi Zhang : user32/tests: Add Korean IME specific test sequences.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: b9feebf7f3c5fce68a34eeaccce73c4e83cac802 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9feebf7f3c5fce68a34eeaccce73c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 5 17:28:04 2023 +0800 user32/tests: Add Korean IME specific test sequences. Windows with Korean locale has a different IME message sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53890 --- dlls/user32/tests/msg.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0ee1eaa393e..23957a7adf8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12821,6 +12821,21 @@ static const struct message edit_wm_ime_composition_seq[] = {0} }; +static const struct message edit_wm_ime_composition_korean_seq[] = +{ + {WM_IME_ENDCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'i'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, + {WM_CHAR, sent | wparam, 'W'}, + {WM_CHAR, sent | wparam, 'i'}, + {WM_CHAR, sent | wparam, 'n'}, + {WM_CHAR, sent | wparam, 'e'}, + {0} +}; + static const struct message edit_wm_ime_char_seq[] = { {WM_IME_CHAR, sent | wparam, '0'}, @@ -12836,6 +12851,13 @@ static const struct message edit_eimes_getcompstratonce_seq[] = {0} }; +static const struct message edit_eimes_getcompstratonce_korean_seq[] = +{ + {WM_IME_ENDCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {0} +}; + static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); @@ -12881,13 +12903,17 @@ static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM w static DWORD WINAPI test_edit_ime_messages(void *unused_arg) { + static const HKL korean_hkl = (HKL)0x04120412; WNDPROC old_proc; LRESULT lr; HIMC himc; HWND hwnd; BOOL ret; + HKL hkl; MSG msg; + hkl = GetKeyboardLayout(0); + hwnd = CreateWindowA(WC_EDITA, "Test", WS_POPUP | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowA failed.\n"); @@ -12965,7 +12991,11 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) /* Note that the following message loop is necessary to get the WM_CHAR messages because they * are posted. Same for the later message loops in this function. */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); + if (hkl == korean_hkl) + ok_sequence(edit_wm_ime_composition_korean_seq, + "korean WM_IME_COMPOSITION", TRUE); + else + ok_sequence(edit_wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR */ flush_sequence(); @@ -12985,8 +13015,12 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ok(ret, "ImmNotifyIME failed.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_eimes_getcompstratonce_seq, - "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + if (hkl == korean_hkl) + ok_sequence(edit_eimes_getcompstratonce_korean_seq, + "korean WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + else + ok_sequence(edit_eimes_getcompstratonce_seq, + "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR with EIMES_GETCOMPSTRATONCE */ flush_sequence();

1 0

Hans Leidekker : include: Add ProcessorArchitecture winrt enum.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 6ca6fa15dc8cf5314fe4734c359d61ae37e95ff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ca6fa15dc8cf5314fe4734c359d61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 19 09:56:56 2023 +0200 include: Add ProcessorArchitecture winrt enum. --- include/windows.system.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/windows.system.idl b/include/windows.system.idl index 5ba5c3f86b3..84e7e2baeae 100644 --- a/include/windows.system.idl +++ b/include/windows.system.idl @@ -29,6 +29,7 @@ import "windows.foundation.idl"; namespace Windows.System { typedef enum DispatcherQueuePriority DispatcherQueuePriority; + typedef enum ProcessorArchitecture ProcessorArchitecture; interface IDispatcherQueue; interface IDispatcherQueue2; @@ -66,6 +67,22 @@ namespace Windows.System High = 10, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ProcessorArchitecture + { + X86 = 0, + Arm = 5, + X64 = 9, + Neutral = 11, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + Arm64 = 12, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + X86OnArm64 = 14, + Unknown = 65535 + }; + [ contract(Windows.Foundation.UniversalApiContract, 5.0), uuid(dfa2dc9c-1a2d-4917-98f2-939af1d6e0c8)

1 0

Zhiyi Zhang : comctl32/tests: Add Korean IME specific test sequences.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 6596f85ee13182de8db40654e12991c21e74155d URL: https://gitlab.winehq.org/wine/wine/-/commit/6596f85ee13182de8db40654e12991… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 5 17:15:31 2023 +0800 comctl32/tests: Add Korean IME specific test sequences. Windows with Korean locale has a different IME message sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53890 --- dlls/comctl32/tests/edit.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index f45b898dc12..bce0215ef19 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3588,6 +3588,21 @@ static const struct message wm_ime_composition_seq[] = {0} }; +static const struct message wm_ime_composition_korean_seq[] = +{ + {WM_IME_ENDCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'i'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, + {WM_CHAR, sent | wparam, 'W'}, + {WM_CHAR, sent | wparam, 'i'}, + {WM_CHAR, sent | wparam, 'n'}, + {WM_CHAR, sent | wparam, 'e'}, + {0} +}; + static const struct message wm_ime_char_seq[] = { {WM_IME_CHAR, sent | wparam, '0'}, @@ -3648,13 +3663,17 @@ static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM w static void test_ime(void) { + static const HKL korean_hkl = (HKL)0x04120412; WNDPROC old_proc; LRESULT lr; HIMC himc; HWND hwnd; BOOL ret; + HKL hkl; MSG msg; + hkl = GetKeyboardLayout(0); + hwnd = create_editcontrol(WS_POPUP | WS_VISIBLE, 0); /* Test EM_{GET|SET}IMESTATUS */ @@ -3731,7 +3750,11 @@ static void test_ime(void) /* Note that the following message loop is necessary to get the WM_CHAR messages because they * are posted. Same for the later message loops in this function. */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); + if (hkl == korean_hkl) + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_korean_seq, + "korean WM_IME_COMPOSITION", TRUE); + else + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3751,8 +3774,12 @@ static void test_ime(void) ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ok(ret, "ImmNotifyIME failed.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, eimes_getcompstratonce_seq, - "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + if (hkl == korean_hkl) + ok_sequence(sequences, COMBINED_SEQ_INDEX, wm_ime_composition_korean_seq, + "Korean WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + else + ok_sequence(sequences, COMBINED_SEQ_INDEX, eimes_getcompstratonce_seq, + "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR with EIMES_GETCOMPSTRATONCE */ flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomation::RemoveAutomationEventHandler.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: fd6b0422cc5a8c0142f64ad41d32b1226ad5d7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/fd6b0422cc5a8c0142f64ad41d32b1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 17 08:54:47 2023 -0400 uiautomationcore: Implement IUIAutomation::RemoveAutomationEventHandler. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 14 +++--- dlls/uiautomationcore/uia_com_client.c | 75 +++++++++++++++++++++++------- 2 files changed, 66 insertions(+), 23 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 545fc7d0bfc..0dd75ce862f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13105,11 +13105,11 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati } hr = IUIAutomation_RemoveAutomationEventHandler(uia_iface, 1, elem, NULL); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUIAutomation_RemoveAutomationEventHandler(uia_iface, UIA_AutomationFocusChangedEventId, elem, &AutomationEventHandler.IUIAutomationEventHandler_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* * UIA_AutomationFocusChangedEventId can only be listened for with @@ -13131,8 +13131,8 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati hr = IUIAutomation_RemoveAutomationEventHandler(uia_iface, 1, elem, &AutomationEventHandler.IUIAutomationEventHandler_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(AutomationEventHandler.ref == 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(AutomationEventHandler.ref == 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); /* * Test event raising behavior. @@ -13183,8 +13183,8 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati hr = IUIAutomation_RemoveAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem, &AutomationEventHandler.IUIAutomationEventHandler_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(AutomationEventHandler.ref == 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(AutomationEventHandler.ref == 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); VariantInit(&v); initialize_provider(&Provider_child, ProviderOptions_ServerSideProvider, NULL, TRUE); @@ -13213,7 +13213,7 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati /* No removal will occur due to a lack of a runtime ID to match. */ hr = IUIAutomation_RemoveAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem2, &AutomationEventHandler.IUIAutomationEventHandler_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(AutomationEventHandler.ref > 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); hr = IUIAutomation_RemoveAllEventHandlers(uia_iface); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index cba1f7f68a4..75c722771c3 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1015,6 +1015,37 @@ exit: return hr; } +static void uia_event_handler_map_entry_destroy(struct uia_event_handler_map_entry *entry) +{ + struct uia_com_event *event, *event2; + + LIST_FOR_EACH_ENTRY_SAFE(event, event2, &entry->handlers_list, struct uia_com_event, event_handler_map_list_entry) + { + list_remove(&event->event_handler_map_list_entry); + IUnknown_Release(event->handler_iface); + com_event_handlers.handler_count--; + heap_free(event); + } + + rb_remove(&com_event_handlers.handler_map, &entry->entry); + IUnknown_Release(entry->handler_iface); + SafeArrayDestroy(entry->runtime_id); + heap_free(entry); +} + +static void uia_event_handlers_remove_handlers(IUnknown *handler_iface, SAFEARRAY *runtime_id, int event_id) +{ + struct uia_event_handler_identifier event_ident = { handler_iface, runtime_id, event_id }; + struct rb_entry *rb_entry; + + EnterCriticalSection(&com_event_handlers_cs); + + if (com_event_handlers.handler_count && (rb_entry = rb_get(&com_event_handlers.handler_map, &event_ident))) + uia_event_handler_map_entry_destroy(RB_ENTRY_VALUE(rb_entry, struct uia_event_handler_map_entry, entry)); + + LeaveCriticalSection(&com_event_handlers_cs); +} + /* * IUIAutomationElementArray interface. */ @@ -3203,8 +3234,33 @@ exit: static HRESULT WINAPI uia_iface_RemoveAutomationEventHandler(IUIAutomation6 *iface, EVENTID event_id, IUIAutomationElement *elem, IUIAutomationEventHandler *handler) { - FIXME("%p, %d, %p, %p: stub\n", iface, event_id, elem, handler); - return E_NOTIMPL; + struct uia_element *element; + IUnknown *handler_iface; + SAFEARRAY *runtime_id; + HRESULT hr; + + TRACE("%p, %d, %p, %p\n", iface, event_id, elem, handler); + + if (!elem || !handler) + return S_OK; + + element = impl_from_IUIAutomationElement9((IUIAutomationElement9 *)elem); + hr = UiaGetRuntimeId(element->node, &runtime_id); + if (FAILED(hr) || !runtime_id) + return hr; + + hr = IUIAutomationEventHandler_QueryInterface(handler, &IID_IUnknown, (void **)&handler_iface); + if (FAILED(hr)) + { + SafeArrayDestroy(runtime_id); + return hr; + } + + uia_event_handlers_remove_handlers(handler_iface, runtime_id, event_id); + IUnknown_Release(handler_iface); + SafeArrayDestroy(runtime_id); + + return S_OK; } static HRESULT WINAPI uia_iface_AddPropertyChangedEventHandlerNativeArray(IUIAutomation6 *iface, @@ -3271,20 +3327,7 @@ static HRESULT WINAPI uia_iface_RemoveAllEventHandlers(IUIAutomation6 *iface) RB_FOR_EACH_ENTRY_DESTRUCTOR(entry, cursor, &com_event_handlers.handler_map, struct uia_event_handler_map_entry, entry) { - struct uia_com_event *event, *event2; - - LIST_FOR_EACH_ENTRY_SAFE(event, event2, &entry->handlers_list, struct uia_com_event, event_handler_map_list_entry) - { - list_remove(&event->event_handler_map_list_entry); - IUnknown_Release(event->handler_iface); - com_event_handlers.handler_count--; - heap_free(event); - } - - rb_remove(&com_event_handlers.handler_map, &entry->entry); - IUnknown_Release(entry->handler_iface); - SafeArrayDestroy(entry->runtime_id); - heap_free(entry); + uia_event_handler_map_entry_destroy(entry); } exit:

1 0

Connor McAdams : uiautomationcore/tests: Add IUIAutomationEventHandler tests.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 79313d01175ff693924ed7109fe2df1c1f5e90bd URL: https://gitlab.winehq.org/wine/wine/-/commit/79313d01175ff693924ed7109fe2df… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 22 14:30:33 2023 -0400 uiautomationcore/tests: Add IUIAutomationEventHandler tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 368 +++++++++++++++++++++++++++++ 1 file changed, 368 insertions(+)

1 0

Connor McAdams : uiautomationcore: Partially implement IUIAutomation::AddAutomationEventHandler.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 4cc7525ad5ce6da09d5492c348da2d370585a3a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc7525ad5ce6da09d5492c348da2d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 26 10:04:19 2023 -0400 uiautomationcore: Partially implement IUIAutomation::AddAutomationEventHandler. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 26 ++--- dlls/uiautomationcore/uia_com_client.c | 148 ++++++++++++++++++++++++++++- 2 files changed, 159 insertions(+), 15 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomation::RemoveAllEventHandlers.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 15d352c587d5319e45e404a62c78e4639269a71b URL: https://gitlab.winehq.org/wine/wine/-/commit/15d352c587d5319e45e404a62c78e4… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 17 08:37:45 2023 -0400 uiautomationcore: Implement IUIAutomation::RemoveAllEventHandlers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 4 ++-- dlls/uiautomationcore/uia_com_client.c | 32 ++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index b71d89bba45..545fc7d0bfc 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13217,8 +13217,8 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati ok(AutomationEventHandler.ref > 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); hr = IUIAutomation_RemoveAllEventHandlers(uia_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(AutomationEventHandler.ref == 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(AutomationEventHandler.ref == 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); IUIAutomationElement_Release(elem2); } diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 6616568d535..cba1f7f68a4 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -3261,8 +3261,36 @@ static HRESULT WINAPI uia_iface_RemoveFocusChangedEventHandler(IUIAutomation6 *i static HRESULT WINAPI uia_iface_RemoveAllEventHandlers(IUIAutomation6 *iface) { - FIXME("%p: stub\n", iface); - return E_NOTIMPL; + struct uia_event_handler_map_entry *entry, *cursor; + + TRACE("%p\n", iface); + + EnterCriticalSection(&com_event_handlers_cs); + if (!com_event_handlers.handler_count) + goto exit; + + RB_FOR_EACH_ENTRY_DESTRUCTOR(entry, cursor, &com_event_handlers.handler_map, struct uia_event_handler_map_entry, entry) + { + struct uia_com_event *event, *event2; + + LIST_FOR_EACH_ENTRY_SAFE(event, event2, &entry->handlers_list, struct uia_com_event, event_handler_map_list_entry) + { + list_remove(&event->event_handler_map_list_entry); + IUnknown_Release(event->handler_iface); + com_event_handlers.handler_count--; + heap_free(event); + } + + rb_remove(&com_event_handlers.handler_map, &entry->entry); + IUnknown_Release(entry->handler_iface); + SafeArrayDestroy(entry->runtime_id); + heap_free(entry); + } + +exit: + LeaveCriticalSection(&com_event_handlers_cs); + + return S_OK; } static HRESULT WINAPI uia_iface_IntNativeArrayToSafeArray(IUIAutomation6 *iface, int *arr, int arr_count,

1 0

Petrichor Park : notepad: Use GetDpiForWindow().
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 100504d2f589aff7c19b8a4dd449c9ccea8941b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/100504d2f589aff7c19b8a4dd449c9… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Tue Jul 18 12:02:41 2023 -0500 notepad: Use GetDpiForWindow(). Instead of querying the registry, just calls `GetDpiForWindow`. Winecfg's DPI slider sets `Control Panel\\Desktop\\LogPixels`. See `programs/winecfg/x11drvdlg.c` Notepad queries `Software\\Fonts\\LogPixels`, and so doesn't pick up on the change. --- programs/notepad/dialog.c | 2 +- programs/notepad/main.c | 31 ++----------------------------- programs/notepad/main.h | 1 - 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index d9269b31b93..3865bc55426 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -958,7 +958,7 @@ VOID DIALOG_FilePrint(VOID) /* Create a font for the printer resolution */ lfFont = Globals.lfFont; - lfFont.lfHeight = MulDiv(lfFont.lfHeight, GetDeviceCaps(printer.hDC, LOGPIXELSY), get_dpi()); + lfFont.lfHeight = MulDiv(lfFont.lfHeight, GetDeviceCaps(printer.hDC, LOGPIXELSY), GetDpiForWindow(Globals.hMainWnd)); /* Make the font a bit lighter */ lfFont.lfWeight -= 100; hTextFont = CreateFontIndirectW(&lfFont); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 829cd7af33b..7d961086821 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -81,33 +81,6 @@ VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc) Globals.encFile = enc; } -/****************************************************************************** - * get_dpi - * - * Get the dpi from registry HKCC\Software\Fonts\LogPixels. - */ -DWORD get_dpi(void) -{ - static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; - static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - DWORD dpi = 96; - HKEY hkey; - - if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) - { - DWORD type, size, new_dpi; - - size = sizeof(new_dpi); - if(RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (LPBYTE)&new_dpi, &size) == ERROR_SUCCESS) - { - if(type == REG_DWORD && new_dpi != 0) - dpi = new_dpi; - } - RegCloseKey(hkey); - } - return dpi; -} - void UpdateStatusBar(void) { int currentLine; @@ -210,7 +183,7 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) #undef SET_NOTEPAD_REG /* Store the current value as 10 * twips */ - data = MulDiv(abs(Globals.lfFont.lfHeight), 720 , get_dpi()); + data = MulDiv(abs(Globals.lfFont.lfHeight), 720, GetDpiForWindow(Globals.hMainWnd)); RegSetValueExW(hkey, value_iPointSize, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); RegSetValueExW(hkey, value_lfFaceName, 0, REG_SZ, (LPBYTE)&Globals.lfFont.lfFaceName, @@ -309,7 +282,7 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) if(RegQueryValueExW(hkey, value_iPointSize, 0, &type, (LPBYTE)&point_size, &size) == ERROR_SUCCESS) if(type == REG_DWORD) /* The value is stored as 10 * twips */ - Globals.lfFont.lfHeight = -MulDiv(abs(point_size), get_dpi(), 720); + Globals.lfFont.lfHeight = -MulDiv(abs(point_size), GetDpiForWindow(Globals.hMainWnd), 720); size = sizeof(Globals.lfFont.lfFaceName); if(RegQueryValueExW(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS) diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 906b0925077..f197ac1752c 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -76,7 +76,6 @@ extern NOTEPAD_GLOBALS Globals; VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc); void NOTEPAD_DoFind(FINDREPLACEW *fr); -DWORD get_dpi(void); void UpdateStatusBar(void); void updateWindowSize(int width, int height); LRESULT CALLBACK EDIT_CallBackProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData);

1 0