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
567f00c8
Commit
567f00c8
authored
Oct 27, 2022
by
Connor McAdams
Committed by
Alexandre Julliard
Nov 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uiautomationcore: Add parent link check to prepare_uia_node().
Signed-off-by:
Connor McAdams
<
cmcadams@codeweavers.com
>
parent
4ed9f4c2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
91 additions
and
1 deletion
+91
-1
uiautomation.c
dlls/uiautomationcore/tests/uiautomation.c
+0
-0
uia_classes.idl
dlls/uiautomationcore/uia_classes.idl
+1
-0
uia_client.c
dlls/uiautomationcore/uia_client.c
+87
-1
uia_private.h
dlls/uiautomationcore/uia_private.h
+3
-0
No files found.
dlls/uiautomationcore/tests/uiautomation.c
View file @
567f00c8
This diff is collapsed.
Click to expand it.
dlls/uiautomationcore/uia_classes.idl
View file @
567f00c8
...
@@ -45,6 +45,7 @@ library UIA_wine_private
...
@@ -45,6 +45,7 @@ library UIA_wine_private
{
{
HRESULT
get_prop_val
(
[
in
]
const
struct
uia_prop_info
*
prop_info
,
[
out
,
retval
]
VARIANT
*
ret_val
)
;
HRESULT
get_prop_val
(
[
in
]
const
struct
uia_prop_info
*
prop_info
,
[
out
,
retval
]
VARIANT
*
ret_val
)
;
HRESULT
get_prov_opts
(
[
out
,
retval
]
int
*
out_opts
)
;
HRESULT
get_prov_opts
(
[
out
,
retval
]
int
*
out_opts
)
;
HRESULT
has_parent
(
[
out
,
retval
]
BOOL
*
out_val
)
;
}
}
[
[
...
...
dlls/uiautomationcore/uia_client.c
View file @
567f00c8
...
@@ -355,6 +355,22 @@ static HRESULT get_prov_opts_from_node_provider(IWineUiaNode *node, int idx, int
...
@@ -355,6 +355,22 @@ static HRESULT get_prov_opts_from_node_provider(IWineUiaNode *node, int idx, int
return
hr
;
return
hr
;
}
}
static
HRESULT
get_has_parent_from_node_provider
(
IWineUiaNode
*
node
,
int
idx
,
BOOL
*
out_val
)
{
IWineUiaProvider
*
prov
;
HRESULT
hr
;
*
out_val
=
FALSE
;
hr
=
IWineUiaNode_get_provider
(
node
,
idx
,
&
prov
);
if
(
FAILED
(
hr
))
return
hr
;
hr
=
IWineUiaProvider_has_parent
(
prov
,
out_val
);
IWineUiaProvider_Release
(
prov
);
return
hr
;
}
/*
/*
* IWineUiaNode interface.
* IWineUiaNode interface.
*/
*/
...
@@ -561,7 +577,33 @@ static struct uia_node *unsafe_impl_from_IWineUiaNode(IWineUiaNode *iface)
...
@@ -561,7 +577,33 @@ static struct uia_node *unsafe_impl_from_IWineUiaNode(IWineUiaNode *iface)
static
BOOL
is_nested_node_provider
(
IWineUiaProvider
*
iface
);
static
BOOL
is_nested_node_provider
(
IWineUiaProvider
*
iface
);
static
HRESULT
prepare_uia_node
(
struct
uia_node
*
node
)
static
HRESULT
prepare_uia_node
(
struct
uia_node
*
node
)
{
{
int
i
;
int
i
,
prov_idx
;
HRESULT
hr
;
/*
* HUIANODEs can only have one 'parent link' provider, which handles
* parent and sibling navigation for the entire HUIANODE. Each provider is
* queried for a parent in descending order, starting with the override
* provider. The first provider to have a valid parent is made parent
* link. If no providers return a valid parent, the provider at index 0
* is made parent link by default.
*/
for
(
i
=
prov_idx
=
0
;
i
<
PROV_TYPE_COUNT
;
i
++
)
{
BOOL
has_parent
;
if
(
!
node
->
prov
[
i
])
continue
;
hr
=
get_has_parent_from_node_provider
(
&
node
->
IWineUiaNode_iface
,
prov_idx
,
&
has_parent
);
if
(
SUCCEEDED
(
hr
)
&&
has_parent
)
{
node
->
parent_link_idx
=
prov_idx
;
break
;
}
prov_idx
++
;
}
for
(
i
=
0
;
i
<
PROV_TYPE_COUNT
;
i
++
)
for
(
i
=
0
;
i
<
PROV_TYPE_COUNT
;
i
++
)
{
{
...
@@ -889,12 +931,45 @@ static HRESULT WINAPI uia_provider_get_prov_opts(IWineUiaProvider *iface, int *o
...
@@ -889,12 +931,45 @@ static HRESULT WINAPI uia_provider_get_prov_opts(IWineUiaProvider *iface, int *o
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
uia_provider_has_parent
(
IWineUiaProvider
*
iface
,
BOOL
*
out_val
)
{
struct
uia_provider
*
prov
=
impl_from_IWineUiaProvider
(
iface
);
TRACE
(
"%p, %p
\n
"
,
iface
,
out_val
);
if
(
!
prov
->
parent_check_ran
)
{
IRawElementProviderFragment
*
elfrag
,
*
elfrag2
;
HRESULT
hr
;
prov
->
has_parent
=
FALSE
;
hr
=
IRawElementProviderSimple_QueryInterface
(
prov
->
elprov
,
&
IID_IRawElementProviderFragment
,
(
void
**
)
&
elfrag
);
if
(
SUCCEEDED
(
hr
)
&&
elfrag
)
{
hr
=
IRawElementProviderFragment_Navigate
(
elfrag
,
NavigateDirection_Parent
,
&
elfrag2
);
IRawElementProviderFragment_Release
(
elfrag
);
if
(
SUCCEEDED
(
hr
)
&&
elfrag2
)
{
prov
->
has_parent
=
TRUE
;
IRawElementProviderFragment_Release
(
elfrag2
);
}
}
prov
->
parent_check_ran
=
TRUE
;
}
*
out_val
=
prov
->
has_parent
;
return
S_OK
;
}
static
const
IWineUiaProviderVtbl
uia_provider_vtbl
=
{
static
const
IWineUiaProviderVtbl
uia_provider_vtbl
=
{
uia_provider_QueryInterface
,
uia_provider_QueryInterface
,
uia_provider_AddRef
,
uia_provider_AddRef
,
uia_provider_Release
,
uia_provider_Release
,
uia_provider_get_prop_val
,
uia_provider_get_prop_val
,
uia_provider_get_prov_opts
,
uia_provider_get_prov_opts
,
uia_provider_has_parent
,
};
};
static
HRESULT
create_wine_uia_provider
(
struct
uia_node
*
node
,
IRawElementProviderSimple
*
elprov
,
static
HRESULT
create_wine_uia_provider
(
struct
uia_node
*
node
,
IRawElementProviderSimple
*
elprov
,
...
@@ -1260,12 +1335,22 @@ static HRESULT WINAPI uia_nested_node_provider_get_prov_opts(IWineUiaProvider *i
...
@@ -1260,12 +1335,22 @@ static HRESULT WINAPI uia_nested_node_provider_get_prov_opts(IWineUiaProvider *i
return
get_prov_opts_from_node_provider
(
prov
->
nested_node
,
0
,
out_opts
);
return
get_prov_opts_from_node_provider
(
prov
->
nested_node
,
0
,
out_opts
);
}
}
static
HRESULT
WINAPI
uia_nested_node_provider_has_parent
(
IWineUiaProvider
*
iface
,
BOOL
*
out_val
)
{
struct
uia_nested_node_provider
*
prov
=
impl_from_nested_node_IWineUiaProvider
(
iface
);
TRACE
(
"%p, %p
\n
"
,
iface
,
out_val
);
return
get_has_parent_from_node_provider
(
prov
->
nested_node
,
0
,
out_val
);
}
static
const
IWineUiaProviderVtbl
uia_nested_node_provider_vtbl
=
{
static
const
IWineUiaProviderVtbl
uia_nested_node_provider_vtbl
=
{
uia_nested_node_provider_QueryInterface
,
uia_nested_node_provider_QueryInterface
,
uia_nested_node_provider_AddRef
,
uia_nested_node_provider_AddRef
,
uia_nested_node_provider_Release
,
uia_nested_node_provider_Release
,
uia_nested_node_provider_get_prop_val
,
uia_nested_node_provider_get_prop_val
,
uia_nested_node_provider_get_prov_opts
,
uia_nested_node_provider_get_prov_opts
,
uia_nested_node_provider_has_parent
,
};
};
static
BOOL
is_nested_node_provider
(
IWineUiaProvider
*
iface
)
static
BOOL
is_nested_node_provider
(
IWineUiaProvider
*
iface
)
...
@@ -1340,6 +1425,7 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU
...
@@ -1340,6 +1425,7 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU
IWineUiaProvider_AddRef
(
provider_iface
);
IWineUiaProvider_AddRef
(
provider_iface
);
prov_data
=
impl_from_IWineUiaProvider
(
provider_iface
);
prov_data
=
impl_from_IWineUiaProvider
(
provider_iface
);
prov_data
->
return_nested_node
=
FALSE
;
prov_data
->
return_nested_node
=
FALSE
;
prov_data
->
parent_check_ran
=
FALSE
;
IWineUiaNode_Release
(
nested_node
);
IWineUiaNode_Release
(
nested_node
);
uia_stop_client_thread
();
uia_stop_client_thread
();
...
...
dlls/uiautomationcore/uia_private.h
View file @
567f00c8
...
@@ -59,6 +59,7 @@ struct uia_node {
...
@@ -59,6 +59,7 @@ struct uia_node {
IWineUiaProvider
*
prov
[
PROV_TYPE_COUNT
];
IWineUiaProvider
*
prov
[
PROV_TYPE_COUNT
];
DWORD
git_cookie
[
PROV_TYPE_COUNT
];
DWORD
git_cookie
[
PROV_TYPE_COUNT
];
int
prov_count
;
int
prov_count
;
int
parent_link_idx
;
HWND
hwnd
;
HWND
hwnd
;
BOOL
nested_node
;
BOOL
nested_node
;
...
@@ -79,6 +80,8 @@ struct uia_provider {
...
@@ -79,6 +80,8 @@ struct uia_provider {
IRawElementProviderSimple
*
elprov
;
IRawElementProviderSimple
*
elprov
;
BOOL
return_nested_node
;
BOOL
return_nested_node
;
BOOL
parent_check_ran
;
BOOL
has_parent
;
};
};
static
inline
struct
uia_provider
*
impl_from_IWineUiaProvider
(
IWineUiaProvider
*
iface
)
static
inline
struct
uia_provider
*
impl_from_IWineUiaProvider
(
IWineUiaProvider
*
iface
)
...
...
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