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

Connor McAdams : uiautomationcore: Add stub IUIAutomationTreeWalker implementation.
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: wine Branch: master Commit: 68f6a73ad2b438229b00ac31e48a815face2dfc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/68f6a73ad2b438229b00ac31e48a81… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 9 12:13:01 2023 -0500 uiautomationcore: Add stub IUIAutomationTreeWalker implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 38 ++++++ dlls/uiautomationcore/uia_com_client.c | 203 ++++++++++++++++++++++++++++- 2 files changed, 239 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 2a4f87c7b59..4f4ce10d622 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -11701,6 +11701,43 @@ static void test_Element_Find(IUIAutomation *uia_iface) UnregisterClassA("test_Element_Find class", NULL); } +static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) +{ + IUIAutomationCondition *cond, *cond2; + IUIAutomationTreeWalker *walker; + HRESULT hr; + + cond = NULL; + hr = IUIAutomation_CreateTrueCondition(uia_iface, &cond); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cond, "cond == NULL\n"); + + /* NULL input argument tests. */ + walker = (void *)0xdeadbeef; + hr = IUIAutomation_CreateTreeWalker(uia_iface, NULL, &walker); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(!walker, "walker != NULL\n"); + + hr = IUIAutomation_CreateTreeWalker(uia_iface, cond, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + /* Actually create TreeWalker. */ + walker = NULL; + hr = IUIAutomation_CreateTreeWalker(uia_iface, cond, &walker); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!walker, "walker == NULL\n"); + + hr = IUIAutomationTreeWalker_get_Condition(walker, &cond2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cond2, "cond2 == NULL\n"); + + ok(iface_cmp((IUnknown *)cond, (IUnknown *)cond2), "cond != cond2\n"); + IUIAutomationCondition_Release(cond); + IUIAutomationCondition_Release(cond2); + + IUIAutomationTreeWalker_Release(walker); +} + struct uia_com_classes { const GUID *clsid; const GUID *iid; @@ -11802,6 +11839,7 @@ static void test_CUIAutomation(void) test_CUIAutomation_condition_ifaces(uia_iface); test_CUIAutomation_value_conversion(uia_iface); test_CUIAutomation_cache_request_iface(uia_iface); + test_CUIAutomation_TreeWalker_ifaces(uia_iface); test_ElementFromHandle(uia_iface, has_cui8); test_Element_GetPropertyValue(uia_iface); test_Element_cache_methods(uia_iface); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 4b2e5cba741..ec634be5e13 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -2442,6 +2442,204 @@ exit: return hr; } +/* + * IUIAutomationTreeWalker interface. + */ +struct uia_tree_walker { + IUIAutomationTreeWalker IUIAutomationTreeWalker_iface; + LONG ref; + + IUIAutomationCondition *nav_cond; + struct UiaCondition *cond_struct; +}; + +static inline struct uia_tree_walker *impl_from_IUIAutomationTreeWalker(IUIAutomationTreeWalker *iface) +{ + return CONTAINING_RECORD(iface, struct uia_tree_walker, IUIAutomationTreeWalker_iface); +} + +static HRESULT WINAPI uia_tree_walker_QueryInterface(IUIAutomationTreeWalker *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUIAutomationTreeWalker) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IUIAutomationTreeWalker_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI uia_tree_walker_AddRef(IUIAutomationTreeWalker *iface) +{ + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + ULONG ref = InterlockedIncrement(&tree_walker->ref); + + TRACE("%p, refcount %ld\n", tree_walker, ref); + return ref; +} + +static ULONG WINAPI uia_tree_walker_Release(IUIAutomationTreeWalker *iface) +{ + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + ULONG ref = InterlockedDecrement(&tree_walker->ref); + + TRACE("%p, refcount %ld\n", tree_walker, ref); + if (!ref) + { + IUIAutomationCondition_Release(tree_walker->nav_cond); + heap_free(tree_walker); + } + + return ref; +} + +static HRESULT WINAPI uia_tree_walker_GetParentElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **parent) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetFirstChildElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **first) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, first); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetLastChildElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **last) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, last); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetNextSiblingElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **next) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, next); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetPreviousSiblingElement(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationElement **prev) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, prev); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_NormalizeElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **normalized) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, normalized); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetParentElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **parent) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetFirstChildElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **first) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, first); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetLastChildElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **last) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, last); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetNextSiblingElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **next) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, next); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetPreviousSiblingElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **prev) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, prev); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_NormalizeElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **normalized) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, normalized); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_get_Condition(IUIAutomationTreeWalker *iface, + IUIAutomationCondition **condition) +{ + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + + TRACE("%p, %p\n", iface, condition); + + if (!condition) + return E_POINTER; + + IUIAutomationCondition_AddRef(tree_walker->nav_cond); + *condition = tree_walker->nav_cond; + + return S_OK; +} + +static const IUIAutomationTreeWalkerVtbl uia_tree_walker_vtbl = { + uia_tree_walker_QueryInterface, + uia_tree_walker_AddRef, + uia_tree_walker_Release, + uia_tree_walker_GetParentElement, + uia_tree_walker_GetFirstChildElement, + uia_tree_walker_GetLastChildElement, + uia_tree_walker_GetNextSiblingElement, + uia_tree_walker_GetPreviousSiblingElement, + uia_tree_walker_NormalizeElement, + uia_tree_walker_GetParentElementBuildCache, + uia_tree_walker_GetFirstChildElementBuildCache, + uia_tree_walker_GetLastChildElementBuildCache, + uia_tree_walker_GetNextSiblingElementBuildCache, + uia_tree_walker_GetPreviousSiblingElementBuildCache, + uia_tree_walker_NormalizeElementBuildCache, + uia_tree_walker_get_Condition, +}; + +static HRESULT create_uia_tree_walker(IUIAutomationTreeWalker **out_tree_walker, IUIAutomationCondition *nav_cond) +{ + struct uia_tree_walker *tree_walker; + struct UiaCondition *cond_struct; + HRESULT hr; + + if (!out_tree_walker) + return E_POINTER; + + *out_tree_walker = NULL; + hr = get_uia_condition_struct_from_iface(nav_cond, &cond_struct); + if (FAILED(hr)) + return hr; + + tree_walker = heap_alloc_zero(sizeof(*tree_walker)); + if (!tree_walker) + return E_OUTOFMEMORY; + + tree_walker->IUIAutomationTreeWalker_iface.lpVtbl = &uia_tree_walker_vtbl; + tree_walker->ref = 1; + tree_walker->nav_cond = nav_cond; + IUIAutomationCondition_AddRef(nav_cond); + tree_walker->cond_struct = cond_struct; + + *out_tree_walker = &tree_walker->IUIAutomationTreeWalker_iface; + return S_OK; +} + /* * IUIAutomation interface. */ @@ -2576,8 +2774,9 @@ static HRESULT WINAPI uia_iface_GetFocusedElementBuildCache(IUIAutomation6 *ifac static HRESULT WINAPI uia_iface_CreateTreeWalker(IUIAutomation6 *iface, IUIAutomationCondition *cond, IUIAutomationTreeWalker **out_walker) { - FIXME("%p, %p, %p: stub\n", iface, cond, out_walker); - return E_NOTIMPL; + TRACE("%p, %p, %p\n", iface, cond, out_walker); + + return create_uia_tree_walker(out_walker, cond); } static HRESULT WINAPI uia_iface_get_ControlViewWalker(IUIAutomation6 *iface, IUIAutomationTreeWalker **out_walker)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationTreeWalker::Get{First/Last}ChildElement{BuildCache}.
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: wine Branch: master Commit: 3978ff6538839280543ad4523d7ccdca79b86931 URL: https://gitlab.winehq.org/wine/wine/-/commit/3978ff6538839280543ad4523d7ccd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 9 13:22:43 2023 -0500 uiautomationcore: Implement IUIAutomationTreeWalker::Get{First/Last}ChildElement{BuildCache}. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 90 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 68 +++++++++++++++++++--- 2 files changed, 150 insertions(+), 8 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationTreeWalker::Get{Previous/Next}SiblingElement{BuildCache}.
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: wine Branch: master Commit: b9d10cee89e435858b9b10e610c96a5ef1e88675 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9d10cee89e435858b9b10e610c96a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 9 13:35:58 2023 -0500 uiautomationcore: Implement IUIAutomationTreeWalker::Get{Previous/Next}SiblingElement{BuildCache}. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 66 +++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_com_client.c | 24 +++++++---- 2 files changed, 81 insertions(+), 9 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index de60a0e5a1b..acfcc40bd3b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -11727,10 +11727,36 @@ static const struct prov_method_sequence treewalker_seq4[] = { { 0 } }; +static const struct prov_method_sequence treewalker_seq5[] = { + { &Provider_child, FRAG_NAVIGATE }, /* NavigateDirection_NextSibling */ + NODE_CREATE_SEQ(&Provider_child2), + { 0 } +}; + +static const struct prov_method_sequence treewalker_seq6[] = { + { &Provider_child, FRAG_NAVIGATE }, /* NavigateDirection_NextSibling */ + NODE_CREATE_SEQ(&Provider_child2), + { &Provider_child2, FRAG_GET_RUNTIME_ID }, + { 0 } +}; + +static const struct prov_method_sequence treewalker_seq7[] = { + { &Provider_child2, FRAG_NAVIGATE }, /* NavigateDirection_PreviousSibling */ + NODE_CREATE_SEQ(&Provider_child), + { 0 } +}; + +static const struct prov_method_sequence treewalker_seq8[] = { + { &Provider_child2, FRAG_NAVIGATE }, /* NavigateDirection_PreviousSibling */ + NODE_CREATE_SEQ(&Provider_child), + { &Provider_child, FRAG_GET_RUNTIME_ID }, + { 0 } +}; + static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) { HWND hwnd = create_test_hwnd("test_CUIAutomation_TreeWalker_ifaces class"); - IUIAutomationElement *element, *element2; + IUIAutomationElement *element, *element2, *element3; IUIAutomationCacheRequest *cache_req; IUIAutomationCondition *cond, *cond2; IUIAutomationTreeWalker *walker; @@ -11794,6 +11820,25 @@ static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) ok(!!element2, "element2 == NULL\n"); ok_method_sequence(treewalker_seq2, "treewalker_seq2"); + /* NavigateDirection_NextSibling. */ + element3 = NULL; + hr = IUIAutomationTreeWalker_GetNextSiblingElement(walker, element2, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child2.ref); + ok(!!element3, "element3 == NULL\n"); + ok_method_sequence(treewalker_seq5, "treewalker_seq5"); + IUIAutomationElement_Release(element3); + ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref); + + element3 = NULL; + hr = IUIAutomationTreeWalker_GetNextSiblingElementBuildCache(walker, element2, cache_req, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child2.ref); + ok(!!element3, "element3 == NULL\n"); + ok_method_sequence(treewalker_seq6, "treewalker_seq6"); + IUIAutomationElement_Release(element3); + ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref); + IUIAutomationElement_Release(element2); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); @@ -11815,6 +11860,25 @@ static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) ok(!!element2, "element2 == NULL\n"); ok_method_sequence(treewalker_seq4, "treewalker_seq4"); + /* NavigateDirection_PreviousSibling. */ + element3 = NULL; + hr = IUIAutomationTreeWalker_GetPreviousSiblingElement(walker, element2, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(!!element3, "element3 == NULL\n"); + ok_method_sequence(treewalker_seq7, "treewalker_seq7"); + IUIAutomationElement_Release(element3); + ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + + element3 = NULL; + hr = IUIAutomationTreeWalker_GetPreviousSiblingElementBuildCache(walker, element2, cache_req, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(!!element3, "element3 == NULL\n"); + ok_method_sequence(treewalker_seq8, "treewalker_seq8"); + IUIAutomationElement_Release(element3); + ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + IUIAutomationElement_Release(element2); ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 0af6b1f1310..fa70edb14bf 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -2526,15 +2526,21 @@ static HRESULT WINAPI uia_tree_walker_GetLastChildElement(IUIAutomationTreeWalke static HRESULT WINAPI uia_tree_walker_GetNextSiblingElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, IUIAutomationElement **next) { - FIXME("%p, %p, %p: stub\n", iface, elem, next); - return E_NOTIMPL; + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + + TRACE("%p, %p, %p\n", iface, elem, next); + + return IUIAutomationTreeWalker_GetNextSiblingElementBuildCache(iface, elem, tree_walker->default_cache_req, next); } static HRESULT WINAPI uia_tree_walker_GetPreviousSiblingElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, IUIAutomationElement **prev) { - FIXME("%p, %p, %p: stub\n", iface, elem, prev); - return E_NOTIMPL; + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + + TRACE("%p, %p, %p\n", iface, elem, prev); + + return IUIAutomationTreeWalker_GetPreviousSiblingElementBuildCache(iface, elem, tree_walker->default_cache_req, prev); } static HRESULT WINAPI uia_tree_walker_NormalizeElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, @@ -2604,15 +2610,17 @@ static HRESULT WINAPI uia_tree_walker_GetLastChildElementBuildCache(IUIAutomatio static HRESULT WINAPI uia_tree_walker_GetNextSiblingElementBuildCache(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **next) { - FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, next); - return E_NOTIMPL; + TRACE("%p, %p, %p, %p\n", iface, elem, cache_req, next); + + return uia_tree_walker_navigate(iface, cache_req, elem, NavigateDirection_NextSibling, next); } static HRESULT WINAPI uia_tree_walker_GetPreviousSiblingElementBuildCache(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **prev) { - FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, prev); - return E_NOTIMPL; + TRACE("%p, %p, %p, %p\n", iface, elem, cache_req, prev); + + return uia_tree_walker_navigate(iface, cache_req, elem, NavigateDirection_PreviousSibling, prev); } static HRESULT WINAPI uia_tree_walker_NormalizeElementBuildCache(IUIAutomationTreeWalker *iface,

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationTreeWalker::GetParentElement{BuildCache}.
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: wine Branch: master Commit: 6f3bd0bc825b7d9a7d284d0599235424ebb97f5d URL: https://gitlab.winehq.org/wine/wine/-/commit/6f3bd0bc825b7d9a7d284d05992354… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 9 13:45:21 2023 -0500 uiautomationcore: Implement IUIAutomationTreeWalker::GetParentElement{BuildCache}. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 33 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 12 +++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index acfcc40bd3b..f1d57336d37 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -11753,6 +11753,19 @@ static const struct prov_method_sequence treewalker_seq8[] = { { 0 } }; +static const struct prov_method_sequence treewalker_seq9[] = { + { &Provider_child2, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ + NODE_CREATE_SEQ(&Provider), + { 0 } +}; + +static const struct prov_method_sequence treewalker_seq10[] = { + { &Provider_child2, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ + NODE_CREATE_SEQ(&Provider), + { &Provider, FRAG_GET_RUNTIME_ID }, + { 0 } +}; + static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) { HWND hwnd = create_test_hwnd("test_CUIAutomation_TreeWalker_ifaces class"); @@ -11879,6 +11892,26 @@ static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) IUIAutomationElement_Release(element3); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + /* NavigateDirection_Parent. */ + element3 = NULL; + Provider.hwnd = NULL; + hr = IUIAutomationTreeWalker_GetParentElement(walker, element2, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 3, "Unexpected refcnt %ld\n", Provider.ref); + ok(!!element3, "element3 == NULL\n"); + ok_method_sequence(treewalker_seq9, "treewalker_seq9"); + IUIAutomationElement_Release(element3); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + + element3 = NULL; + hr = IUIAutomationTreeWalker_GetParentElementBuildCache(walker, element2, cache_req, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 3, "Unexpected refcnt %ld\n", Provider.ref); + ok(!!element3, "element3 == NULL\n"); + ok_method_sequence(treewalker_seq10, "treewalker_seq10"); + IUIAutomationElement_Release(element3); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + IUIAutomationElement_Release(element2); ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index fa70edb14bf..f1c28e81aa8 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -2499,8 +2499,11 @@ static ULONG WINAPI uia_tree_walker_Release(IUIAutomationTreeWalker *iface) static HRESULT WINAPI uia_tree_walker_GetParentElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, IUIAutomationElement **parent) { - FIXME("%p, %p, %p: stub\n", iface, elem, parent); - return E_NOTIMPL; + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + + TRACE("%p, %p, %p\n", iface, elem, parent); + + return IUIAutomationTreeWalker_GetParentElementBuildCache(iface, elem, tree_walker->default_cache_req, parent); } static HRESULT WINAPI uia_tree_walker_GetFirstChildElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, @@ -2587,8 +2590,9 @@ static HRESULT uia_tree_walker_navigate(IUIAutomationTreeWalker *walker, IUIAuto static HRESULT WINAPI uia_tree_walker_GetParentElementBuildCache(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **parent) { - FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, parent); - return E_NOTIMPL; + TRACE("%p, %p, %p, %p\n", iface, elem, cache_req, parent); + + return uia_tree_walker_navigate(iface, cache_req, elem, NavigateDirection_Parent, parent); } static HRESULT WINAPI uia_tree_walker_GetFirstChildElementBuildCache(IUIAutomationTreeWalker *iface,

1 0

Rémi Bernon : win32u/tests: Test NtUserCreateInputContext (et al.)
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: wine Branch: master Commit: a865ce8298721547af62ac53c6cecc179da65dc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a865ce8298721547af62ac53c6cecc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 11 08:53:29 2023 +0100 win32u/tests: Test NtUserCreateInputContext (et al.) --- dlls/win32u/tests/win32u.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 60ef2d38b5f..51a67a697f5 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -221,6 +221,103 @@ static void test_class(void) } +static void test_NtUserCreateInputContext(void) +{ + UINT_PTR value, attr3; + HIMC himc; + UINT ret; + + SetLastError( 0xdeadbeef ); + himc = NtUserCreateInputContext( 0 ); + todo_wine + ok( !himc, "NtUserCreateInputContext succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserDestroyInputContext( himc ); + todo_wine + ok( !ret, "NtUserDestroyInputContext succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + + + himc = NtUserCreateInputContext( 0xdeadbeef ); + ok( !!himc, "NtUserCreateInputContext failed, error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 0 ); + todo_wine + ok( value == GetCurrentProcessId(), "NtUserQueryInputContext 0 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 1 ); + ok( value == GetCurrentThreadId(), "NtUserQueryInputContext 1 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 2 ); + ok( value == 0, "NtUserQueryInputContext 2 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 3 ); + todo_wine + ok( !!value, "NtUserQueryInputContext 3 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + attr3 = value; + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 4 ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserUpdateInputContext( himc, 0, 0 ); + todo_wine + ok( !ret, "NtUserUpdateInputContext 0 succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_ALREADY_INITIALIZED, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserUpdateInputContext( himc, 1, 0xdeadbeef ); + todo_wine + ok( !!ret, "NtUserUpdateInputContext 1 failed\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserUpdateInputContext( himc, 2, 0xdeadbeef ); + ok( !ret, "NtUserUpdateInputContext 2 succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserUpdateInputContext( himc, 3, 0x0badf00d ); + ok( !ret, "NtUserUpdateInputContext 3 succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = NtUserUpdateInputContext( himc, 4, 0xdeadbeef ); + ok( !ret, "NtUserUpdateInputContext 4 succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 0 ); + todo_wine + ok( value == GetCurrentProcessId(), "NtUserQueryInputContext 0 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 1 ); + ok( value == GetCurrentThreadId(), "NtUserQueryInputContext 1 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 2 ); + ok( value == 0, "NtUserQueryInputContext 2 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 3 ); + ok( value == attr3, "NtUserQueryInputContext 3 returned %#Ix\n", value ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + value = NtUserQueryInputContext( himc, 4 ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + ret = NtUserDestroyInputContext( himc ); + ok( !!ret, "NtUserDestroyInputContext failed, error %lu\n", GetLastError() ); +} + static BOOL WINAPI count_win( HWND hwnd, LPARAM lparam ) { ULONG *cnt = (ULONG *)lparam; @@ -1148,6 +1245,7 @@ START_TEST(win32u) test_NtUserEnumDisplayDevices(); test_window_props(); test_class(); + test_NtUserCreateInputContext(); test_NtUserBuildHwndList(); test_cursoricon(); test_message_call();

1 0

Hans Leidekker : adsldp/tests: Fix test failures.
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: wine Branch: master Commit: 42fbc50b66d6d0b7e48840e9d30761ef98df8b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/42fbc50b66d6d0b7e48840e9d30761… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Mar 19 21:32:27 2023 +0100 adsldp/tests: Fix test failures. The server is back online now and apparently its contents changed, causing test failures. --- dlls/adsldp/tests/ldap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index a5bb4ee971f..7404b62a231 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -310,8 +310,6 @@ static void do_search(const struct search *s) "expected %s, got %s\n", wine_dbgstr_w(res->values[i]), wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); } - ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); - IDirectorySearch_FreeColumn(ds, &col); FreeADsMem(name); res++;

1 0

Henri Verbeet : vkd3d-shader: VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE was introduced in vkd3d 1.7.
by Alexandre Julliard 20 Mar '23

20 Mar '23

Module: vkd3d Branch: master Commit: 54b0165e328b7d042bcaa0261bd62ffe49d3396b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54b0165e328b7d042bcaa0261bd62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 16:37:22 2023 +0100 vkd3d-shader: VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE was introduced in vkd3d 1.7. --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index bf5e1387..c5baecb5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -159,7 +159,7 @@ enum vkd3d_shader_compile_option_name * This option is supported by vkd3d_shader_compile() for the SPIR-V target * type and Vulkan targets; it should not be enabled otherwise. * - * \since 1.6 + * \since 1.7 */ VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE = 0x00000006,

1 0

Alexandre Julliard : Wine release 8.4
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: website Branch: master Commit: 01e9ac1cf067eed718447654ef08d99ba15c371e URL: https://gitlab.winehq.org/winehq/winehq/-/commit/01e9ac1cf067eed718447654ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 22:28:08 2023 +0100 Wine release 8.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023031701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023031701.xml b/news/en/2023031701.xml new file mode 100644 index 00000000..08f011cc --- /dev/null +++ b/news/en/2023031701.xml @@ -0,0 +1,16 @@ +<news> +<date>March 17, 2023</date> +<title>Wine 8.4 Released</title> +<body> + The Wine development release 8.4 is now available. + <a href="{$root}/announce/8.4">What's new</a> in this release: +<ul> + <li>Initial step of the Wayland graphics driver.</li> + <li>Cleanups in IME support.</li> + <li>A number of test fixes.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.4.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.4 : Alexandre Julliard : Release 8.4
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: refs/tags/wine-8.4 Tag: 298744b0e585c353c3c2a6013fe3ff27cb25f61c URL: https://gitlab.winehq.org/wine/wine/-/tags/298744b0e585c353c3c2a6013fe3ff27… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 22:25:30 2023 +0100 Release 8.4

1 0

Alexandre Julliard : Release 8.4.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 15aec461174ae2f2568d63fa83f32576ede05a9c URL: https://gitlab.winehq.org/wine/wine/-/commit/15aec461174ae2f2568d63fa83f325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 22:20:03 2023 +0100 Release 8.4. --- ANNOUNCE | 798 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 478 insertions(+), 341 deletions(-)

1 0