Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
096377be
Commit
096377be
authored
Aug 27, 2023
by
Biswapriyo Nath
Committed by
Alexandre Julliard
Aug 28, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uiautomationcore: Fix typo with TreeScope_Subtree name.
parent
7d72397a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
uiautomation.c
dlls/uiautomationcore/tests/uiautomation.c
+10
-10
uia_com_client.c
dlls/uiautomationcore/uia_com_client.c
+3
-3
uiautomationclient.idl
include/uiautomationclient.idl
+1
-1
uiautomationcoreapi.h
include/uiautomationcoreapi.h
+1
-1
No files found.
dlls/uiautomationcore/tests/uiautomation.c
View file @
096377be
...
...
@@ -11544,7 +11544,7 @@ static void test_CUIAutomation_cache_request_iface(IUIAutomation *uia_iface)
hr
=
IUIAutomationCacheRequest_put_TreeScope
(
cache_req
,
TreeScope_Ancestors
|
TreeScope_Element
);
ok
(
hr
==
E_INVALIDARG
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IUIAutomationCacheRequest_put_TreeScope
(
cache_req
,
~
(
TreeScope_Sub
T
ree
|
TreeScope_Parent
|
TreeScope_Ancestors
));
hr
=
IUIAutomationCacheRequest_put_TreeScope
(
cache_req
,
~
(
TreeScope_Sub
t
ree
|
TreeScope_Parent
|
TreeScope_Ancestors
));
ok
(
hr
==
E_INVALIDARG
,
"Unexpected hr %#lx.
\n
"
,
hr
);
/* Invalid values don't change anything. */
...
...
@@ -12133,7 +12133,7 @@ static void test_Element_Find(IUIAutomation *uia_iface)
* Equivalent to: Maximum find depth of -1, find first is FALSE, exclude
* root is FALSE.
*/
hr
=
IUIAutomationElement_FindAllBuildCache
(
element
,
TreeScope_Sub
T
ree
,
condition
,
cache_req
,
&
element_arr
);
hr
=
IUIAutomationElement_FindAllBuildCache
(
element
,
TreeScope_Sub
t
ree
,
condition
,
cache_req
,
&
element_arr
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
set_elem_desc
(
&
exp_elems
[
0
],
&
Provider
,
NULL
,
GetCurrentProcessId
(),
2
,
2
);
...
...
@@ -12378,7 +12378,7 @@ static void test_Element_Find(IUIAutomation *uia_iface)
* root is FALSE. Provider_child_child2 is the only element in the tree
* to match our condition.
*/
hr
=
IUIAutomationElement_FindFirstBuildCache
(
element
,
TreeScope_Sub
T
ree
,
condition
,
cache_req
,
&
element2
);
hr
=
IUIAutomationElement_FindFirstBuildCache
(
element
,
TreeScope_Sub
t
ree
,
condition
,
cache_req
,
&
element2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
Provider_child_child2
.
ref
==
2
,
"Unexpected refcnt %ld
\n
"
,
Provider_child_child2
.
ref
);
...
...
@@ -12443,7 +12443,7 @@ static void test_Element_Find(IUIAutomation *uia_iface)
set_provider_prop_override
(
&
Provider_child
,
&
prop_override
,
1
);
set_provider_prop_override
(
&
Provider_child_child
,
&
prop_override
,
1
);
hr
=
IUIAutomationElement_FindFirst
(
element
,
TreeScope_Sub
T
ree
,
condition
,
&
element2
);
hr
=
IUIAutomationElement_FindFirst
(
element
,
TreeScope_Sub
t
ree
,
condition
,
&
element2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
Provider_child_child2
.
ref
==
2
,
"Unexpected refcnt %ld
\n
"
,
Provider_child_child2
.
ref
);
...
...
@@ -13231,11 +13231,11 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati
/*
* Invalid input argument tests.
*/
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
NULL
,
TreeScope_Sub
T
ree
,
NULL
,
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
NULL
,
TreeScope_Sub
t
ree
,
NULL
,
&
AutomationEventHandler
.
IUIAutomationEventHandler_iface
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
elem
,
TreeScope_Sub
T
ree
,
NULL
,
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
elem
,
TreeScope_Sub
t
ree
,
NULL
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#lx.
\n
"
,
hr
);
...
...
@@ -13260,14 +13260,14 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati
* AddFocusChangedEventHandler. Trying to register it on a regular event
* handler returns E_INVALIDARG.
*/
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_AutomationFocusChangedEventId
,
elem
,
TreeScope_Sub
T
ree
,
NULL
,
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_AutomationFocusChangedEventId
,
elem
,
TreeScope_Sub
t
ree
,
NULL
,
&
AutomationEventHandler
.
IUIAutomationEventHandler_iface
);
ok
(
hr
==
E_INVALIDARG
,
"Unexpected hr %#lx.
\n
"
,
hr
);
/* Windows 11 queries the HWND for the element when adding a new handler. */
set_uia_hwnd_expects
(
3
,
2
,
2
,
3
,
0
);
/* All other event IDs are fine, only focus events are blocked. */
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
1
,
elem
,
TreeScope_Sub
T
ree
,
NULL
,
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
1
,
elem
,
TreeScope_Sub
t
ree
,
NULL
,
&
AutomationEventHandler
.
IUIAutomationEventHandler_iface
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
AutomationEventHandler
.
ref
>
1
,
"Unexpected refcnt %ld
\n
"
,
AutomationEventHandler
.
ref
);
...
...
@@ -13282,7 +13282,7 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati
* Test event raising behavior.
*/
set_uia_hwnd_expects
(
3
,
2
,
2
,
3
,
0
);
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
elem
,
TreeScope_Sub
T
ree
,
NULL
,
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
elem
,
TreeScope_Sub
t
ree
,
NULL
,
&
AutomationEventHandler
.
IUIAutomationEventHandler_iface
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
AutomationEventHandler
.
ref
>
1
,
"Unexpected refcnt %ld
\n
"
,
AutomationEventHandler
.
ref
);
...
...
@@ -13349,7 +13349,7 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati
* runtime-id, the only way to unregister the event handler is to call
* RemoveAllEventHandlers().
*/
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
elem2
,
TreeScope_Sub
T
ree
,
NULL
,
hr
=
IUIAutomation_AddAutomationEventHandler
(
uia_iface
,
UIA_LiveRegionChangedEventId
,
elem2
,
TreeScope_Sub
t
ree
,
NULL
,
&
AutomationEventHandler
.
IUIAutomationEventHandler_iface
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
AutomationEventHandler
.
ref
>
1
,
"Unexpected refcnt %ld
\n
"
,
AutomationEventHandler
.
ref
);
...
...
dlls/uiautomationcore/uia_com_client.c
View file @
096377be
...
...
@@ -743,7 +743,7 @@ static HRESULT WINAPI uia_cache_request_put_TreeScope(IUIAutomationCacheRequest
TRACE
(
"%p, %#x
\n
"
,
iface
,
scope
);
if
(
!
scope
||
(
scope
&
~
TreeScope_Sub
T
ree
))
if
(
!
scope
||
(
scope
&
~
TreeScope_Sub
t
ree
))
return
E_INVALIDARG
;
if
((
scope
&
TreeScope_Children
)
||
(
scope
&
TreeScope_Descendants
))
...
...
@@ -1366,7 +1366,7 @@ static HRESULT set_find_params_struct(struct UiaFindParams *params, IUIAutomatio
if
(
FAILED
(
hr
))
return
hr
;
if
(
!
scope
||
(
scope
&
(
~
TreeScope_Sub
T
ree
)))
if
(
!
scope
||
(
scope
&
(
~
TreeScope_Sub
t
ree
)))
return
E_INVALIDARG
;
params
->
FindFirst
=
find_first
;
...
...
@@ -3447,7 +3447,7 @@ static HRESULT WINAPI uia_iface_AddFocusChangedEventHandler(IUIAutomation6 *ifac
return
hr
;
}
hr
=
uia_add_com_event_handler
(
iface
,
UIA_AutomationFocusChangedEventId
,
elem
,
TreeScope_Sub
T
ree
,
cache_req
,
hr
=
uia_add_com_event_handler
(
iface
,
UIA_AutomationFocusChangedEventId
,
elem
,
TreeScope_Sub
t
ree
,
cache_req
,
&
IID_IUIAutomationFocusChangedEventHandler
,
handler_unk
);
IUIAutomationElement_Release
(
elem
);
IUnknown_Release
(
handler_unk
);
...
...
include/uiautomationclient.idl
View file @
096377be
...
...
@@ -27,7 +27,7 @@ enum TreeScope {
TreeScope_Descendants
=
0
x04
,
TreeScope_Parent
=
0
x08
,
TreeScope_Ancestors
=
0
x10
,
TreeScope_Sub
T
ree
=
TreeScope_Element
|
TreeScope_Children
|
TreeScope_Descendants
,
TreeScope_Sub
t
ree
=
TreeScope_Element
|
TreeScope_Children
|
TreeScope_Descendants
,
}
;
enum
PropertyConditionFlags
{
...
...
include/uiautomationcoreapi.h
View file @
096377be
...
...
@@ -371,7 +371,7 @@ enum TreeScope {
TreeScope_Descendants
=
0x04
,
TreeScope_Parent
=
0x08
,
TreeScope_Ancestors
=
0x10
,
TreeScope_Sub
T
ree
=
TreeScope_Element
|
TreeScope_Children
|
TreeScope_Descendants
,
TreeScope_Sub
t
ree
=
TreeScope_Element
|
TreeScope_Children
|
TreeScope_Descendants
,
};
enum
PropertyConditionFlags
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment