[PATCH 0/6] MR2397: uiautomationcore: Property value caching support and COM API Find methods.

List overview All Threads

newer

older

[PATCH 0/1] MR2394: comctl32: Fix...

Re: [PATCH v2 0/3] MR2410: gitlab:...

Connor McAdams (＠cmcadams)

14 Mar 2023 14 Mar '23

12:49 p.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2397

Show replies by date

Connor McAdams

14 Mar 14 Mar

12:49 p.m.

New subject: [PATCH 1/6] uiautomationcore: Add support for caching property values in UiaGetUpdatedCache.

From: Connor McAdams cmcadams@codeweavers.com

Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/uiautomationcore/tests/uiautomation.c | 121 ++++++++++++++++++++- dlls/uiautomationcore/uia_client.c | 38 ++++++- 2 files changed, 156 insertions(+), 3 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 95e4de1b106..715629cd8df 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -1140,6 +1140,8 @@ static struct Provider } Provider, Provider2, Provider_child, Provider_child2; static struct Provider Provider_hwnd, Provider_nc, Provider_proxy, Provider_proxy2, Provider_override; static void initialize_provider(struct Provider *prov, int prov_opts, HWND hwnd, BOOL initialize_nav_links); +static void set_provider_prop_override(struct Provider *prov, struct Provider_prop_override *override, int count); +static void set_property_override(struct Provider_prop_override *override, int prop_id, VARIANT *val);

static const WCHAR *uia_bstr_prop_str = L"uia-string"; static const ULONG uia_i4_prop_val = 0xdeadbeef; @@ -7577,26 +7579,38 @@ static const struct prov_method_sequence cache_req_seq6[] = { { 0 } };

+static const struct prov_method_sequence cache_req_seq7[] = { + { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId. */ + { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId. */ + { 0 } +}; + static const struct UiaCondition UiaTrueCondition = { ConditionType_True }; static const struct UiaCondition UiaFalseCondition = { ConditionType_False }; static void test_UiaGetUpdatedCache(void) { + LONG exp_lbound[2], exp_elems[2], idx[2], i; struct Provider_prop_override prop_override; struct node_provider_desc exp_node_desc[2]; struct UiaPropertyCondition prop_cond; struct UiaAndOrCondition and_or_cond; - LONG exp_lbound[2], exp_elems[2], i; struct UiaCacheRequest cache_req; struct UiaCondition *cond_arr[2]; struct UiaNotCondition not_cond; + VARIANT v, v_arr[2]; SAFEARRAY *out_req; + IUnknown *unk_ns; BSTR tree_struct; + int prop_ids[2]; HUIANODE node; HRESULT hr; - VARIANT v;

CoInitializeEx(NULL, COINIT_MULTITHREADED);

+ hr = UiaGetReservedNotSupportedValue(&unk_ns); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(exp_node_desc); i++) init_node_provider_desc(&exp_node_desc[i], GetCurrentProcessId(), NULL);

@@ -8018,9 +8032,112 @@ static void test_UiaGetUpdatedCache(void) Provider.prop_override = NULL; Provider.prop_override_count = 0;

+ /* + * Tests for property value caching. + */ + prop_ids[0] = UIA_RuntimeIdPropertyId; + /* Invalid property ID, no work will be done. */ + prop_ids[1] = 1; + tree_struct = NULL; out_req = NULL; + set_cache_request(&cache_req, NULL, TreeScope_Element, prop_ids, ARRAY_SIZE(prop_ids), NULL, 0, AutomationElementMode_Full); + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!out_req, "out_req != NULL\n"); + ok(!tree_struct, "tree_struct != NULL\n"); + + /* + * Retrieve values for UIA_RuntimeIdPropertyId and + * UIA_IsControlElementPropertyId in the returned cache. + */ + prop_ids[0] = UIA_RuntimeIdPropertyId; + prop_ids[1] = UIA_IsControlElementPropertyId; + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); + init_node_provider_desc(&exp_node_desc[0], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + + tree_struct = NULL; out_req = NULL; + set_cache_request(&cache_req, NULL, TreeScope_Element, prop_ids, ARRAY_SIZE(prop_ids), NULL, 0, AutomationElementMode_Full); + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = 1; + exp_elems[1] = 3; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + + idx[0] = 0; + for (i = 0; i < ARRAY_SIZE(prop_ids); i++) + { + idx[1] = 1 + i; + VariantInit(&v_arr[i]); + hr = SafeArrayGetElement(out_req, idx, &v_arr[i]); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + } + + ok(V_VT(&v_arr[0]) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + ok(V_UNKNOWN(&v_arr[0]) == unk_ns, "unexpected IUnknown %p\n", V_UNKNOWN(&v_arr[0])); + VariantClear(&v_arr[0]); + + ok(check_variant_bool(&v_arr[1], TRUE), "V_BOOL(&v) = %#x\n", V_BOOL(&v_arr[1])); + VariantClear(&v_arr[1]); + + ok_method_sequence(cache_req_seq7, "cache_req_seq7"); + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + /* + * Again, but return a valid runtime ID and a different value for + * UIA_IsControlElementPropertyId. + */ + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = VARIANT_FALSE; + set_property_override(&prop_override, UIA_IsControlElementPropertyId, &v); + set_provider_prop_override(&Provider, &prop_override, 1); + Provider.runtime_id[0] = Provider.runtime_id[1] = 0xdeadbeef; + init_node_provider_desc(&exp_node_desc[0], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + + tree_struct = NULL; out_req = NULL; + set_cache_request(&cache_req, NULL, TreeScope_Element, prop_ids, ARRAY_SIZE(prop_ids), NULL, 0, AutomationElementMode_Full); + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = 1; + exp_elems[1] = 3; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + + idx[0] = 0; + for (i = 0; i < ARRAY_SIZE(prop_ids); i++) + { + idx[1] = 1 + i; + VariantInit(&v_arr[i]); + hr = SafeArrayGetElement(out_req, idx, &v_arr[i]); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + } + + ok(V_VT(&v_arr[0]) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v_arr[0])); + check_runtime_id(Provider.runtime_id, ARRAY_SIZE(Provider.runtime_id), V_ARRAY(&v_arr[0])); + VariantClear(&v_arr[0]); + + ok(check_variant_bool(&v_arr[1], FALSE), "V_BOOL(&v) = %#x\n", V_BOOL(&v_arr[1])); + VariantClear(&v_arr[1]); + + ok_method_sequence(cache_req_seq7, "cache_req_seq7"); + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE);

+ IUnknown_Release(unk_ns); CoUninitialize(); }

diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 8d543bd4dc7..4de9dc1919e 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -2787,6 +2787,7 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac LONG idx[2]; HRESULT hr; VARIANT v; + int i;

TRACE("(%p, %p, %u, %p, %p, %p)\n", huianode, cache_req, normalize_state, normalize_cond, out_req, tree_struct);

@@ -2802,6 +2803,18 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac return E_NOTIMPL; }

+ if (cache_req->cPatterns && cache_req->pPatterns) + FIXME("Pattern caching currently unimplemented\n"); + + if (cache_req->cProperties && cache_req->pProperties) + { + for (i = 0; i < cache_req->cProperties; i++) + { + if (!uia_prop_info_from_id(cache_req->pProperties[i])) + return E_INVALIDARG; + } + } + switch (normalize_state) { case NormalizeState_None: @@ -2834,7 +2847,8 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac } }

- sabound[0].cElements = sabound[1].cElements = 1; + sabound[0].cElements = 1; + sabound[1].cElements = 1 + cache_req->cProperties; sabound[0].lLbound = sabound[1].lLbound = 0; if (!(sa = SafeArrayCreate(VT_VARIANT, 2, sabound))) { @@ -2852,6 +2866,28 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac return hr; }

+ idx[0] = 0; + VariantClear(&v); + for (i = 0; i < cache_req->cProperties; i++) + { + hr = UiaGetPropertyValue(huianode, cache_req->pProperties[i], &v); + /* Don't fail on unimplemented properties. */ + if (FAILED(hr) && hr != E_NOTIMPL) + { + SafeArrayDestroy(sa); + return hr; + } + + idx[1] = 1 + i; + hr = SafeArrayPutElement(sa, idx, &v); + VariantClear(&v); + if (FAILED(hr)) + { + SafeArrayDestroy(sa); + return hr; + } + } + /* * AddRef huianode since we're returning a reference to the same node we * passed in, rather than creating a new one.

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2397

Connor McAdams

12:49 p.m.

New subject: [PATCH 2/6] uiautomationcore: Implement IUIAutomationCacheRequest::AddProperty.

From: Connor McAdams cmcadams@codeweavers.com

Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/uiautomationcore/tests/uiautomation.c | 18 +++++++-- dlls/uiautomationcore/uia_client.c | 31 ---------------- dlls/uiautomationcore/uia_com_client.c | 43 ++++++++++++++++++++-- dlls/uiautomationcore/uia_main.c | 1 - dlls/uiautomationcore/uia_private.h | 31 ++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 1 - 6 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 715629cd8df..41bd168e3c6 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10839,6 +10839,16 @@ static void test_CUIAutomation_cache_request_iface(IUIAutomation *uia_iface) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine ok(elem_mode == AutomationElementMode_None, "Unexpected element mode %#x\n", elem_mode);

+ /* + * AddProperty tests. + */ + hr = IUIAutomationCacheRequest_AddProperty(cache_req, UIA_IsContentElementPropertyId); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Invalid property ID. */ + hr = IUIAutomationCacheRequest_AddProperty(cache_req, 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + IUIAutomationCacheRequest_Release(cache_req); }

@@ -10849,13 +10859,13 @@ static const struct prov_method_sequence get_elem_cache_seq[] = { };

static const struct prov_method_sequence get_cached_prop_val_seq[] = { - { &Provider_child, FRAG_GET_RUNTIME_ID, METHOD_TODO }, + { &Provider_child, FRAG_GET_RUNTIME_ID }, { 0 }, };

static const struct prov_method_sequence get_cached_prop_val_seq2[] = { - { &Provider_child, FRAG_GET_RUNTIME_ID, METHOD_TODO }, - { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_IsControlElementPropertyId */ + { &Provider_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ { 0 }, };

@@ -10963,7 +10973,7 @@ static void test_Element_cache_methods(IUIAutomation *uia_iface) * values. */ hr = IUIAutomationCacheRequest_AddProperty(cache_req, UIA_IsControlElementPropertyId); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

Provider_child.runtime_id[0] = Provider_child.runtime_id[1] = 0xdeadb33f; element2 = NULL; diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 4de9dc1919e..195974c25f6 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -19,42 +19,11 @@ #include "uia_private.h"

#include "wine/debug.h" -#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);

static const struct UiaCondition UiaFalseCondition = { ConditionType_False };

-static BOOL uia_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) -{ - SIZE_T max_capacity, new_capacity; - void *new_elements; - - if (count <= *capacity) - return TRUE; - - max_capacity = ~(SIZE_T)0 / size; - if (count > max_capacity) - return FALSE; - - new_capacity = max(1, *capacity); - while (new_capacity < count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - if (new_capacity < count) - new_capacity = count; - - if (!*elements) - new_elements = heap_alloc_zero(new_capacity * size); - else - new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); - if (!new_elements) - return FALSE; - - *elements = new_elements; - *capacity = new_capacity; - return TRUE; -} - struct uia_node_array { HUIANODE *nodes; int node_count; diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 44d715684c1..2b499fa8bc5 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -19,7 +19,6 @@ #include "uia_private.h"

#include "wine/debug.h" -#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);

@@ -632,6 +631,10 @@ struct uia_cache_request {

IUIAutomationCondition *view_condition; struct UiaCacheRequest cache_req; + + int *prop_ids; + int prop_ids_count; + SIZE_T prop_ids_arr_size; };

static inline struct uia_cache_request *impl_from_IUIAutomationCacheRequest(IUIAutomationCacheRequest *iface) @@ -670,6 +673,7 @@ static ULONG WINAPI uia_cache_request_Release(IUIAutomationCacheRequest *iface) if (!ref) { IUIAutomationCondition_Release(uia_cache_request->view_condition); + heap_free(uia_cache_request->prop_ids); heap_free(uia_cache_request); }

@@ -678,8 +682,33 @@ static ULONG WINAPI uia_cache_request_Release(IUIAutomationCacheRequest *iface)

static HRESULT WINAPI uia_cache_request_AddProperty(IUIAutomationCacheRequest *iface, PROPERTYID prop_id) { - FIXME("%p, %d: stub\n", iface, prop_id); - return E_NOTIMPL; + struct uia_cache_request *uia_cache_request = impl_from_IUIAutomationCacheRequest(iface); + const struct uia_prop_info *prop_info = uia_prop_info_from_id(prop_id); + int i; + + TRACE("%p, %d\n", iface, prop_id); + + if (!prop_info) + return E_INVALIDARG; + + /* Don't add a duplicate property to the cache request. */ + for (i = 0; i < uia_cache_request->prop_ids_count; i++) + { + if (uia_cache_request->prop_ids[i] == prop_id) + return S_OK; + } + + if (!uia_array_reserve((void **)&uia_cache_request->prop_ids, &uia_cache_request->prop_ids_arr_size, + uia_cache_request->prop_ids_count + 1, sizeof(*uia_cache_request->prop_ids))) + return E_OUTOFMEMORY; + + uia_cache_request->prop_ids[uia_cache_request->prop_ids_count] = prop_id; + uia_cache_request->prop_ids_count++; + + uia_cache_request->cache_req.pProperties = uia_cache_request->prop_ids; + uia_cache_request->cache_req.cProperties = uia_cache_request->prop_ids_count; + + return S_OK; }

static HRESULT WINAPI uia_cache_request_AddPattern(IUIAutomationCacheRequest *iface, PATTERNID pattern_id) @@ -847,6 +876,14 @@ static HRESULT create_uia_cache_request_iface(IUIAutomationCacheRequest **out_ca uia_cache_request->cache_req.Scope = TreeScope_Element; uia_cache_request->cache_req.automationElementMode = AutomationElementMode_Full;

+ hr = IUIAutomationCacheRequest_AddProperty(&uia_cache_request->IUIAutomationCacheRequest_iface, + UIA_RuntimeIdPropertyId); + if (FAILED(hr)) + { + IUIAutomationCacheRequest_Release(&uia_cache_request->IUIAutomationCacheRequest_iface); + return hr; + } + *out_cache_req = &uia_cache_request->IUIAutomationCacheRequest_iface; return S_OK; } diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index aa297983867..d0ab909f102 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -23,7 +23,6 @@ #include "uia_private.h"

#include "wine/debug.h" -#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);

diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 2c6e41eac6d..f7e991ee4fd 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -21,6 +21,7 @@ #include "uiautomation.h" #include "uia_classes.h" #include "wine/list.h" +#include "wine/heap.h"

extern HMODULE huia_module DECLSPEC_HIDDEN;

@@ -98,6 +99,36 @@ static inline void variant_init_bool(VARIANT *v, BOOL val) V_BOOL(v) = val ? VARIANT_TRUE : VARIANT_FALSE; }

+static inline BOOL uia_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!*elements) + new_elements = heap_alloc_zero(new_capacity * size); + else + new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + /* uia_client.c */ HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) DECLSPEC_HIDDEN; int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 58d1db9bae8..a7d41248abc 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -20,7 +20,6 @@ #include "ocidl.h"

#include "wine/debug.h" -#include "wine/heap.h" #include "wine/rbtree.h" #include "initguid.h" #include "wine/iaccessible2.h"

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2397

Connor McAdams

12:49 p.m.

New subject: [PATCH 3/6] uiautomationcore: Implement IUIAutomationElement::GetCachedPropertyValueEx.

From: Connor McAdams cmcadams@codeweavers.com

Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/uiautomationcore/tests/uiautomation.c | 138 +++++++++-- dlls/uiautomationcore/uia_com_client.c | 254 ++++++++++++++------- 2 files changed, 295 insertions(+), 97 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 41bd168e3c6..6b988504531 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10869,11 +10869,25 @@ static const struct prov_method_sequence get_cached_prop_val_seq2[] = { { 0 }, };

+static const struct prov_method_sequence get_cached_prop_val_seq3[] = { + { &Provider, PROV_GET_PROPERTY_VALUE }, + NODE_CREATE_SEQ(&Provider_child), + { &Provider, PROV_GET_PROPERTY_VALUE }, + NODE_CREATE_SEQ(&Provider_child), + NODE_CREATE_SEQ(&Provider_child2), + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_ControlTypePropertyId */ + { &Provider_child2, PROV_GET_PROPERTY_VALUE }, /* UIA_ControlTypePropertyId */ + { 0 }, +}; + static void test_Element_cache_methods(IUIAutomation *uia_iface) { HWND hwnd = create_test_hwnd("test_Element_cache_methods class"); - IUIAutomationElement *element, *element2; + IUIAutomationElement *element, *element2, *element3; IUIAutomationCacheRequest *cache_req; + IUIAutomationElementArray *elem_arr; + int tmp_rt_id[2], i, len; IUnknown *unk_ns; HRESULT hr; VARIANT v; @@ -10938,15 +10952,14 @@ static void test_Element_cache_methods(IUIAutomation *uia_iface)

/* RuntimeId is currently unset, so we'll get the NotSupported value. */ hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_RuntimeIdPropertyId, TRUE, &v); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(V_VT(&v) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); - if (SUCCEEDED(hr)) - ok(V_UNKNOWN(&v) == unk_ns, "unexpected IUnknown %p\n", V_UNKNOWN(&v)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + ok(V_UNKNOWN(&v) == unk_ns, "unexpected IUnknown %p\n", V_UNKNOWN(&v)); VariantClear(&v);

/* Attempting to get a cached value for a non-cached property. */ hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_IsControlElementPropertyId, TRUE, &v); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(V_VT(&v) == VT_EMPTY, "Unexpected vt %d\n", V_VT(&v)); VariantClear(&v);

@@ -10961,10 +10974,9 @@ static void test_Element_cache_methods(IUIAutomation *uia_iface) ok_method_sequence(get_cached_prop_val_seq, "get_cached_prop_val_seq");

hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_RuntimeIdPropertyId, TRUE, &v); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(V_VT(&v) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v)); - if (SUCCEEDED(hr)) - check_runtime_id(Provider_child.runtime_id, ARRAY_SIZE(Provider_child.runtime_id), V_ARRAY(&v)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v)); + check_runtime_id(Provider_child.runtime_id, ARRAY_SIZE(Provider_child.runtime_id), V_ARRAY(&v)); VariantClear(&v); IUIAutomationElement_Release(element2);

@@ -10983,22 +10995,116 @@ static void test_Element_cache_methods(IUIAutomation *uia_iface) ok_method_sequence(get_cached_prop_val_seq2, "get_cached_prop_val_seq2");

hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_IsControlElementPropertyId, TRUE, &v); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(check_variant_bool(&v, TRUE), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(check_variant_bool(&v, TRUE), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); VariantClear(&v);

IUIAutomationElement_Release(element2); + IUIAutomationCacheRequest_Release(cache_req);

IUIAutomationElement_Release(element); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + + /* Test cached UIAutomationType_Element properties. */ + element = create_test_element_from_hwnd(uia_iface, hwnd, TRUE); + + cache_req = NULL; + hr = IUIAutomation_CreateCacheRequest(uia_iface, &cache_req); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cache_req, "cache_req == NULL\n"); + + /* UIAutomationType_Element property. */ + hr = IUIAutomationCacheRequest_AddProperty(cache_req, UIA_LabeledByPropertyId); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* UIAutomationType_ElementArray property. */ + hr = IUIAutomationCacheRequest_AddProperty(cache_req, UIA_ControllerForPropertyId); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + element2 = NULL; + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, &element2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!element2, "element2 == NULL\n"); + ok(Provider_child.ref == 3, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(Provider_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child2.ref); + + tmp_rt_id[0] = UIA_RUNTIME_ID_PREFIX; + tmp_rt_id[1] = HandleToULong(hwnd); + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_RuntimeIdPropertyId, TRUE, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v)); + check_runtime_id(tmp_rt_id, ARRAY_SIZE(tmp_rt_id), V_ARRAY(&v)); + VariantClear(&v); + + /* Cached IUIAutomationElement. */ + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_LabeledByPropertyId, TRUE, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + + element3 = NULL; + hr = IUnknown_QueryInterface(V_UNKNOWN(&v), &IID_IUIAutomationElement, (void **)&element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!element3, "element3 == NULL\n"); + VariantClear(&v); + + hr = IUIAutomationElement_GetCurrentPropertyValueEx(element3, UIA_IsControlElementPropertyId, TRUE, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(check_variant_bool(&v, TRUE), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); + IUIAutomationElement_Release(element3); + VariantClear(&v); + + /* Cached IUIAutomationElementArray. */ + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_ControllerForPropertyId, TRUE, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + + hr = IUnknown_QueryInterface(V_UNKNOWN(&v), &IID_IUIAutomationElementArray, (void **)&elem_arr); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(!!elem_arr, "elem_arr == NULL\n"); + VariantClear(&v); + + hr = IUIAutomationElementArray_get_Length(elem_arr, &len); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(len == ARRAY_SIZE(uia_unk_arr_prop_val), "Unexpected length %d\n", len); + + for (i = 0; i < ARRAY_SIZE(uia_unk_arr_prop_val); i++) + { + hr = IUIAutomationElementArray_GetElement(elem_arr, i, &element3); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(!!element3, "element3 == NULL\n"); + + hr = IUIAutomationElement_GetCurrentPropertyValueEx(element3, UIA_ControlTypePropertyId, TRUE, &v); + ok(hr == S_OK, "elem[%d] Unexpected hr %#lx\n", i, hr); + ok(V_VT(&v) == VT_I4, "elem[%d] Unexpected VT %d\n", i, V_VT(&v)); + ok(V_I4(&v) == uia_i4_prop_val, "elem[%d] Unexpected I4 %#lx\n", i, V_I4(&v)); + + IUIAutomationElement_Release(element3); + VariantClear(&v); + } + + IUIAutomationElementArray_Release(elem_arr); IUIAutomationCacheRequest_Release(cache_req); + + /* + * Reference isn't released until the element holding the cache is + * destroyed. + */ + ok(Provider_child.ref == 3, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(Provider_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child2.ref); + + IUIAutomationElement_Release(element2); + ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref); + ok_method_sequence(get_cached_prop_val_seq3, "get_cached_prop_val_seq3"); + + IUIAutomationElement_Release(element); + ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); IUnknown_Release(unk_ns);

DestroyWindow(hwnd); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 2b499fa8bc5..6309d5a952c 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1029,6 +1029,11 @@ static HRESULT create_uia_element_array_iface(IUIAutomationElementArray **iface, return S_OK; }

+struct uia_cache_property { + int prop_id; + VARIANT prop_val; +}; + /* * IUIAutomationElement interface. */ @@ -1038,6 +1043,9 @@ struct uia_element {

BOOL from_cui8; HUIANODE node; + + struct uia_cache_property *cached_props; + int cached_props_count; };

static inline struct uia_element *impl_from_IUIAutomationElement9(IUIAutomationElement9 *iface) @@ -1079,6 +1087,15 @@ static ULONG WINAPI uia_element_Release(IUIAutomationElement9 *iface) TRACE("%p, refcount %ld\n", element, ref); if (!ref) { + if (element->cached_props_count) + { + int i; + + for (i = 0; i < element->cached_props_count; i++) + VariantClear(&element->cached_props[i].prop_val); + } + + heap_free(element->cached_props); UiaNodeRelease(element->node); heap_free(element); } @@ -1126,8 +1143,8 @@ static HRESULT WINAPI uia_element_FindAllBuildCache(IUIAutomationElement9 *iface return E_NOTIMPL; }

-static HRESULT create_uia_element_from_cache_req(IUIAutomationElement **iface, BOOL from_cui8, SAFEARRAY *req_data, - BSTR tree_struct); +static HRESULT create_uia_element_from_cache_req(IUIAutomationElement **iface, BOOL from_cui8, + struct UiaCacheRequest *cache_req, SAFEARRAY *req_data, BSTR tree_struct); static HRESULT WINAPI uia_element_BuildUpdatedCache(IUIAutomationElement9 *iface, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **updated_elem) { @@ -1152,7 +1169,7 @@ static HRESULT WINAPI uia_element_BuildUpdatedCache(IUIAutomationElement9 *iface if (FAILED(hr)) return hr;

- hr = create_uia_element_from_cache_req(&cache_elem, element->from_cui8, sa, tree_struct); + hr = create_uia_element_from_cache_req(&cache_elem, element->from_cui8, cache_req_struct, sa, tree_struct); if (SUCCEEDED(hr)) *updated_elem = cache_elem;

@@ -1168,45 +1185,78 @@ static HRESULT WINAPI uia_element_GetCurrentPropertyValue(IUIAutomationElement9 }

static HRESULT create_uia_element(IUIAutomationElement **iface, BOOL from_cui8, HUIANODE node); -static HRESULT create_element_array_from_node_array(SAFEARRAY *sa, BOOL from_cui8, - IUIAutomationElementArray **out_elem_arr) +static HRESULT get_element_variant_from_node_variant(VARIANT *var, BOOL from_cui8, int prop_type) { - struct uia_element_array *elem_arr_data; - IUIAutomationElementArray *elem_arr; - LONG idx, lbound, elems, i; + HUIANODE node; HRESULT hr;

- *out_elem_arr = NULL; - hr = get_safearray_bounds(sa, &lbound, &elems); - if (FAILED(hr)) - return hr; - - hr = create_uia_element_array_iface(&elem_arr, elems); - if (FAILED(hr)) - return hr; + /* ReservedNotSupported interface, just return it. */ + if (V_VT(var) == VT_UNKNOWN) + return S_OK;

- elem_arr_data = impl_from_IUIAutomationElementArray(elem_arr); - for (i = 0; i < elems; i++) + if (prop_type & UIAutomationType_Array) { - HUIANODE node; + struct uia_element_array *elem_arr_data; + IUIAutomationElementArray *elem_arr; + LONG idx, lbound, elems, i;

- idx = lbound + i; - hr = SafeArrayGetElement(sa, &idx, &node); + hr = get_safearray_bounds(V_ARRAY(var), &lbound, &elems); if (FAILED(hr)) - break; + { + VariantClear(var); + return hr; + }

- hr = create_uia_element(&elem_arr_data->elements[i], from_cui8, node); + hr = create_uia_element_array_iface(&elem_arr, elems); if (FAILED(hr)) { - UiaNodeRelease(node); - break; + VariantClear(var); + return hr; } - }

- if (SUCCEEDED(hr)) - *out_elem_arr = elem_arr; + elem_arr_data = impl_from_IUIAutomationElementArray(elem_arr); + for (i = 0; i < elems; i++) + { + idx = lbound + i; + hr = SafeArrayGetElement(V_ARRAY(var), &idx, &node); + if (FAILED(hr)) + break; + + hr = create_uia_element(&elem_arr_data->elements[i], from_cui8, node); + if (FAILED(hr)) + { + UiaNodeRelease(node); + break; + } + } + + VariantClear(var); + if (SUCCEEDED(hr)) + { + V_VT(var) = VT_UNKNOWN; + V_UNKNOWN(var) = (IUnknown *)elem_arr; + } + else + IUIAutomationElementArray_Release(elem_arr); + } else - IUIAutomationElementArray_Release(elem_arr); + { + IUIAutomationElement *out_elem; + + hr = UiaHUiaNodeFromVariant(var, &node); + VariantClear(var); + if (FAILED(hr)) + return hr; + + hr = create_uia_element(&out_elem, from_cui8, node); + if (SUCCEEDED(hr)) + { + V_VT(var) = VT_UNKNOWN; + V_UNKNOWN(var) = (IUnknown *)out_elem; + } + else + UiaNodeRelease(node); + }

return hr; } @@ -1234,53 +1284,8 @@ static HRESULT WINAPI uia_element_GetCurrentPropertyValueEx(IUIAutomationElement if (FAILED(hr)) return hr;

- switch (prop_info->type) - { - case UIAutomationType_Element: - { - IUIAutomationElement *out_elem; - HUIANODE node; - - if (V_VT(ret_val) == VT_UNKNOWN) - break; - - hr = UiaHUiaNodeFromVariant(ret_val, &node); - VariantClear(ret_val); - if (FAILED(hr)) - return hr; - - hr = create_uia_element(&out_elem, element->from_cui8, node); - if (SUCCEEDED(hr)) - { - V_VT(ret_val) = VT_UNKNOWN; - V_UNKNOWN(ret_val) = (IUnknown *)out_elem; - } - else - UiaNodeRelease(node); - - break; - } - - case UIAutomationType_ElementArray: - { - IUIAutomationElementArray *out_elem_arr; - - if (V_VT(ret_val) == VT_UNKNOWN) - break; - - hr = create_element_array_from_node_array(V_ARRAY(ret_val), element->from_cui8, &out_elem_arr); - VariantClear(ret_val); - if (SUCCEEDED(hr)) - { - V_VT(ret_val) = VT_UNKNOWN; - V_UNKNOWN(ret_val) = (IUnknown *)out_elem_arr; - } - break; - } - - default: - break; - } + if ((prop_info->type == UIAutomationType_Element) || (prop_info->type == UIAutomationType_ElementArray)) + hr = get_element_variant_from_node_variant(ret_val, element->from_cui8, prop_info->type);

return hr; } @@ -1292,11 +1297,38 @@ static HRESULT WINAPI uia_element_GetCachedPropertyValue(IUIAutomationElement9 * return E_NOTIMPL; }

+static int __cdecl uia_cached_property_id_compare(const void *a, const void *b) +{ + const PROPERTYID *prop_id = a; + const struct uia_cache_property *cache_prop = b; + + return ((*prop_id) > cache_prop->prop_id) - ((*prop_id) < cache_prop->prop_id); +} + static HRESULT WINAPI uia_element_GetCachedPropertyValueEx(IUIAutomationElement9 *iface, PROPERTYID prop_id, BOOL ignore_default, VARIANT *ret_val) { - FIXME("%p: stub\n", iface); - return E_NOTIMPL; + struct uia_element *element = impl_from_IUIAutomationElement9(iface); + struct uia_cache_property *cache_prop = NULL; + + TRACE("%p, %d, %d, %p\n", iface, prop_id, ignore_default, ret_val); + + if (!ret_val) + return E_POINTER; + + VariantInit(ret_val); + if (!uia_prop_info_from_id(prop_id) || !element->cached_props) + return E_INVALIDARG; + + if (!ignore_default) + FIXME("Default values currently unimplemented\n"); + + if (!(cache_prop = bsearch(&prop_id, element->cached_props, element->cached_props_count, sizeof(*cache_prop), + uia_cached_property_id_compare))) + return E_INVALIDARG; + + VariantCopy(ret_val, &cache_prop->prop_val); + return S_OK; }

static HRESULT WINAPI uia_element_GetCurrentPatternAs(IUIAutomationElement9 *iface, PATTERNID pattern_id, @@ -2144,9 +2176,19 @@ static HRESULT create_uia_element(IUIAutomationElement **iface, BOOL from_cui8, return S_OK; }

-static HRESULT create_uia_element_from_cache_req(IUIAutomationElement **iface, BOOL from_cui8, SAFEARRAY *req_data, - BSTR tree_struct) +static int __cdecl uia_compare_cache_props(const void *a, const void *b) { + struct uia_cache_property *prop1 = (struct uia_cache_property *)a; + struct uia_cache_property *prop2 = (struct uia_cache_property *)b; + + return (prop1->prop_id > prop2->prop_id) - (prop1->prop_id < prop2->prop_id); +} + +static HRESULT create_uia_element_from_cache_req(IUIAutomationElement **iface, BOOL from_cui8, + struct UiaCacheRequest *cache_req, SAFEARRAY *req_data, BSTR tree_struct) +{ + IUIAutomationElement *element = NULL; + struct uia_element *elem_data; HUIANODE node; LONG idx[2]; HRESULT hr; @@ -2165,11 +2207,61 @@ static HRESULT create_uia_element_from_cache_req(IUIAutomationElement **iface, B goto exit; VariantClear(&v);

- hr = create_uia_element(iface, from_cui8, node); + hr = create_uia_element(&element, from_cui8, node); + if (FAILED(hr)) + goto exit; + + elem_data = impl_from_IUIAutomationElement9((IUIAutomationElement9 *)element); + if (cache_req->cProperties) + { + LONG i; + + elem_data->cached_props = heap_alloc_zero(sizeof(*elem_data->cached_props) * cache_req->cProperties); + if (!elem_data->cached_props) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + elem_data->cached_props_count = cache_req->cProperties; + for (i = 0; i < cache_req->cProperties; i++) + { + const struct uia_prop_info *prop_info = uia_prop_info_from_id(cache_req->pProperties[i]); + + elem_data->cached_props[i].prop_id = prop_info->prop_id; + + idx[0] = 0; + idx[1] = 1 + i; + hr = SafeArrayGetElement(req_data, idx, &elem_data->cached_props[i].prop_val); + if (FAILED(hr)) + goto exit; + + if ((prop_info->type == UIAutomationType_Element) || (prop_info->type == UIAutomationType_ElementArray)) + { + hr = get_element_variant_from_node_variant(&elem_data->cached_props[i].prop_val, from_cui8, + prop_info->type); + if (FAILED(hr)) + goto exit; + } + } + + /* + * Sort the array of cached properties by property ID so that we can + * access the values with bsearch. + */ + qsort(elem_data->cached_props, elem_data->cached_props_count, sizeof(*elem_data->cached_props), + uia_compare_cache_props); + } + + *iface = element;

exit: if (FAILED(hr)) + { WARN("Failed to create element from cache request, hr %#lx\n", hr); + if (element) + IUIAutomationElement_Release(element); + }

SysFreeString(tree_struct); return hr;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2397

Connor McAdams

12:49 p.m.

New subject: [PATCH 4/6] uiautomationcore/tests: Add tests for IUIAutomationElement find methods.

From: Connor McAdams cmcadams@codeweavers.com

Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/uiautomationcore/tests/uiautomation.c | 667 ++++++++++++++++++++- 1 file changed, 644 insertions(+), 23 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 6b988504531..82458bba6c6 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -122,6 +122,12 @@ static BOOL check_variant_bool(VARIANT *v, BOOL val) return FALSE; }

+static void variant_init_bool(VARIANT *v, BOOL val) +{ + V_VT(v) = VT_BOOL; + V_BOOL(v) = val ? VARIANT_TRUE : VARIANT_FALSE; +} + static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) { IUnknown *unk1, *unk2; @@ -1650,6 +1656,9 @@ HRESULT WINAPI ProviderSimple_GetPropertyValue(IRawElementProviderSimple *iface, if (This->prop_override[i].prop_id == prop_id) { *ret_val = This->prop_override[i].val; + if (V_VT(ret_val) == VT_UNKNOWN) + IUnknown_AddRef(V_UNKNOWN(ret_val)); + return S_OK; } } @@ -9093,6 +9102,13 @@ static const struct prov_method_sequence find_seq1[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ /* Only done on Win10v1507 and below. */ { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child_child2, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, + { &Provider_child2_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child2_child_child, FRAG_GET_RUNTIME_ID }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ @@ -9116,6 +9132,9 @@ static const struct prov_method_sequence find_seq2[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ /* Only done on Win10v1507 and below. */ { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ @@ -9135,6 +9154,8 @@ static const struct prov_method_sequence find_seq3[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ /* Only done on Win10v1507 and below. */ { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { &Provider_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 }, @@ -9144,6 +9165,7 @@ static const struct prov_method_sequence find_seq4[] = { { &Provider, FRAG_GET_RUNTIME_ID }, { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_FirstChild */ NODE_CREATE_SEQ(&Provider_child), + { &Provider_child, FRAG_GET_RUNTIME_ID }, { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 }, }; @@ -9157,12 +9179,15 @@ static const struct prov_method_sequence find_seq5[] = { NODE_CREATE_SEQ(&Provider), { &Provider_child2, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ NODE_CREATE_SEQ(&Provider), + { &Provider_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 }, };

static const struct prov_method_sequence find_seq6[] = { + { &Provider_child, FRAG_GET_RUNTIME_ID }, { &Provider_child, FRAG_GET_RUNTIME_ID }, { &Provider_child, FRAG_GET_RUNTIME_ID }, { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ @@ -9198,6 +9223,10 @@ static const struct prov_method_sequence find_seq7[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ /* Only done on Win10v1507 and below. */ { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider_child_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child_child2, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ @@ -9235,6 +9264,10 @@ static const struct prov_method_sequence find_seq8[] = { { &Provider_child2, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ NODE_CREATE_SEQ(&Provider), { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider_child_child, FRAG_GET_RUNTIME_ID }, + { &Provider_child_child2, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ @@ -9274,6 +9307,9 @@ static const struct prov_method_sequence find_seq9[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ /* Only done on Win10v1507 and below. */ { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { &Provider_child_child2, FRAG_GET_RUNTIME_ID }, + { &Provider_child2, FRAG_GET_RUNTIME_ID }, + { &Provider_child2_child, FRAG_GET_RUNTIME_ID }, { &Provider_child_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { &Provider_child2_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ @@ -9321,6 +9357,7 @@ static const struct prov_method_sequence find_seq10[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ /* Only done on Win10v1507 and below. */ { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { &Provider_child2, FRAG_GET_RUNTIME_ID }, { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 }, }; @@ -9339,6 +9376,7 @@ static const struct prov_method_sequence find_seq11[] = { NODE_CREATE_SEQ(&Provider_child_child2), { &Provider_child_child2, PROV_GET_PROPERTY_VALUE }, /* UIA_IsContentElementPropertyId */ { &Provider_child_child2, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ + { &Provider_child_child2, FRAG_GET_RUNTIME_ID }, { &Provider_child_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 }, }; @@ -9353,8 +9391,8 @@ static void test_UiaFind(void) struct UiaCacheRequest cache_req; struct UiaFindParams find_params; const WCHAR *exp_tree_struct[7]; + int exp_offset[7], cache_prop; HUIANODE node, node2; - int exp_offset[7]; HRESULT hr; VARIANT v;

@@ -9392,7 +9430,8 @@ static void test_UiaFind(void) * maximum depth of -1 will search the entire tree. */ out_req = offsets = tree_structs = NULL; - set_cache_request(&cache_req, (struct UiaCondition *)&UiaTrueCondition, TreeScope_Element, NULL, 0, NULL, 0, + cache_prop = UIA_RuntimeIdPropertyId; + set_cache_request(&cache_req, (struct UiaCondition *)&UiaTrueCondition, TreeScope_Element, &cache_prop, 1, NULL, 0, AutomationElementMode_Full); set_find_params(&find_params, -1, FALSE, FALSE, (struct UiaCondition *)&UiaTrueCondition); hr = UiaFind(node, &find_params, &cache_req, &out_req, &offsets, &tree_structs); @@ -9413,7 +9452,7 @@ static void test_UiaFind(void) add_provider_desc(&exp_node_desc[6], L"Main", L"Provider_child2_child_child", TRUE); exp_lbound[0] = exp_lbound[1] = 0; exp_elems[0] = 7; - exp_elems[1] = 1; + exp_elems[1] = 2;