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
fc3b0d33
Commit
fc3b0d33
authored
Feb 14, 2023
by
Connor McAdams
Committed by
Alexandre Julliard
Mar 31, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uiautomationcore: Add support for UIA_LegacyIAccessibleChildIdPropertyId.
Signed-off-by:
Connor McAdams
<
cmcadams@codeweavers.com
>
parent
77fa7403
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
208 additions
and
7 deletions
+208
-7
uiautomation.c
dlls/uiautomationcore/tests/uiautomation.c
+189
-0
uia_client.c
dlls/uiautomationcore/uia_client.c
+10
-0
uia_ids.c
dlls/uiautomationcore/uia_ids.c
+3
-1
uia_private.h
dlls/uiautomationcore/uia_private.h
+6
-0
uia_provider.c
dlls/uiautomationcore/uia_provider.c
+0
-6
No files found.
dlls/uiautomationcore/tests/uiautomation.c
View file @
fc3b0d33
...
@@ -1115,6 +1115,12 @@ struct Provider_value_pattern_data
...
@@ -1115,6 +1115,12 @@ struct Provider_value_pattern_data
BOOL
is_read_only
;
BOOL
is_read_only
;
};
};
struct
Provider_legacy_accessible_pattern_data
{
BOOL
is_supported
;
int
child_id
;
};
static
struct
Provider
static
struct
Provider
{
{
IRawElementProviderSimple
IRawElementProviderSimple_iface
;
IRawElementProviderSimple
IRawElementProviderSimple_iface
;
...
@@ -1122,6 +1128,7 @@ static struct Provider
...
@@ -1122,6 +1128,7 @@ static struct Provider
IRawElementProviderFragmentRoot
IRawElementProviderFragmentRoot_iface
;
IRawElementProviderFragmentRoot
IRawElementProviderFragmentRoot_iface
;
IRawElementProviderHwndOverride
IRawElementProviderHwndOverride_iface
;
IRawElementProviderHwndOverride
IRawElementProviderHwndOverride_iface
;
IValueProvider
IValueProvider_iface
;
IValueProvider
IValueProvider_iface
;
ILegacyIAccessibleProvider
ILegacyIAccessibleProvider_iface
;
LONG
ref
;
LONG
ref
;
const
char
*
prov_name
;
const
char
*
prov_name
;
...
@@ -1143,6 +1150,7 @@ static struct Provider
...
@@ -1143,6 +1150,7 @@ static struct Provider
int
prop_override_count
;
int
prop_override_count
;
struct
UiaRect
bounds_rect
;
struct
UiaRect
bounds_rect
;
struct
Provider_value_pattern_data
value_pattern_data
;
struct
Provider_value_pattern_data
value_pattern_data
;
struct
Provider_legacy_accessible_pattern_data
legacy_acc_pattern_data
;
}
Provider
,
Provider2
,
Provider_child
,
Provider_child2
;
}
Provider
,
Provider2
,
Provider_child
,
Provider_child2
;
static
struct
Provider
Provider_hwnd
,
Provider_nc
,
Provider_proxy
,
Provider_proxy2
,
Provider_override
;
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
initialize_provider
(
struct
Provider
*
prov
,
int
prov_opts
,
HWND
hwnd
,
BOOL
initialize_nav_links
);
...
@@ -1571,6 +1579,8 @@ HRESULT WINAPI ProviderSimple_QueryInterface(IRawElementProviderSimple *iface, R
...
@@ -1571,6 +1579,8 @@ HRESULT WINAPI ProviderSimple_QueryInterface(IRawElementProviderSimple *iface, R
*
ppv
=
&
This
->
IRawElementProviderHwndOverride_iface
;
*
ppv
=
&
This
->
IRawElementProviderHwndOverride_iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IValueProvider
))
else
if
(
IsEqualIID
(
riid
,
&
IID_IValueProvider
))
*
ppv
=
&
This
->
IValueProvider_iface
;
*
ppv
=
&
This
->
IValueProvider_iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_ILegacyIAccessibleProvider
))
*
ppv
=
&
This
->
ILegacyIAccessibleProvider_iface
;
else
else
return
E_NOINTERFACE
;
return
E_NOINTERFACE
;
...
@@ -1628,6 +1638,11 @@ HRESULT WINAPI ProviderSimple_GetPatternProvider(IRawElementProviderSimple *ifac
...
@@ -1628,6 +1638,11 @@ HRESULT WINAPI ProviderSimple_GetPatternProvider(IRawElementProviderSimple *ifac
*
ret_val
=
(
IUnknown
*
)
iface
;
*
ret_val
=
(
IUnknown
*
)
iface
;
break
;
break
;
case
UIA_LegacyIAccessiblePatternId
:
if
(
This
->
legacy_acc_pattern_data
.
is_supported
)
*
ret_val
=
(
IUnknown
*
)
iface
;
break
;
default:
default:
break
;
break
;
}
}
...
@@ -2176,6 +2191,141 @@ static const IValueProviderVtbl ProviderValuePatternVtbl = {
...
@@ -2176,6 +2191,141 @@ static const IValueProviderVtbl ProviderValuePatternVtbl = {
ProviderValuePattern_get_IsReadOnly
,
ProviderValuePattern_get_IsReadOnly
,
};
};
static
inline
struct
Provider
*
impl_from_ProviderLegacyIAccessiblePattern
(
ILegacyIAccessibleProvider
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
struct
Provider
,
ILegacyIAccessibleProvider_iface
);
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_QueryInterface
(
ILegacyIAccessibleProvider
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
struct
Provider
*
Provider
=
impl_from_ProviderLegacyIAccessiblePattern
(
iface
);
return
IRawElementProviderSimple_QueryInterface
(
&
Provider
->
IRawElementProviderSimple_iface
,
riid
,
ppv
);
}
static
ULONG
WINAPI
ProviderLegacyIAccessiblePattern_AddRef
(
ILegacyIAccessibleProvider
*
iface
)
{
struct
Provider
*
Provider
=
impl_from_ProviderLegacyIAccessiblePattern
(
iface
);
return
IRawElementProviderSimple_AddRef
(
&
Provider
->
IRawElementProviderSimple_iface
);
}
static
ULONG
WINAPI
ProviderLegacyIAccessiblePattern_Release
(
ILegacyIAccessibleProvider
*
iface
)
{
struct
Provider
*
Provider
=
impl_from_ProviderLegacyIAccessiblePattern
(
iface
);
return
IRawElementProviderSimple_Release
(
&
Provider
->
IRawElementProviderSimple_iface
);
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_Select
(
ILegacyIAccessibleProvider
*
iface
,
LONG
select_flags
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_DoDefaultAction
(
ILegacyIAccessibleProvider
*
iface
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_SetValue
(
ILegacyIAccessibleProvider
*
iface
,
LPCWSTR
val
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_GetIAccessible
(
ILegacyIAccessibleProvider
*
iface
,
IAccessible
**
out_acc
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_ChildId
(
ILegacyIAccessibleProvider
*
iface
,
int
*
out_cid
)
{
struct
Provider
*
Provider
=
impl_from_ProviderLegacyIAccessiblePattern
(
iface
);
*
out_cid
=
Provider
->
legacy_acc_pattern_data
.
child_id
;
return
S_OK
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_Name
(
ILegacyIAccessibleProvider
*
iface
,
BSTR
*
out_name
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_Value
(
ILegacyIAccessibleProvider
*
iface
,
BSTR
*
out_value
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_Description
(
ILegacyIAccessibleProvider
*
iface
,
BSTR
*
out_description
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_Role
(
ILegacyIAccessibleProvider
*
iface
,
DWORD
*
out_role
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_State
(
ILegacyIAccessibleProvider
*
iface
,
DWORD
*
out_state
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_Help
(
ILegacyIAccessibleProvider
*
iface
,
BSTR
*
out_help
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_KeyboardShortcut
(
ILegacyIAccessibleProvider
*
iface
,
BSTR
*
out_kbd_shortcut
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_GetSelection
(
ILegacyIAccessibleProvider
*
iface
,
SAFEARRAY
**
out_selected
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
ProviderLegacyIAccessiblePattern_get_DefaultAction
(
ILegacyIAccessibleProvider
*
iface
,
BSTR
*
out_default_action
)
{
ok
(
0
,
"unexpected call
\n
"
);
return
E_NOTIMPL
;
}
static
const
ILegacyIAccessibleProviderVtbl
ProviderLegacyIAccessiblePatternVtbl
=
{
ProviderLegacyIAccessiblePattern_QueryInterface
,
ProviderLegacyIAccessiblePattern_AddRef
,
ProviderLegacyIAccessiblePattern_Release
,
ProviderLegacyIAccessiblePattern_Select
,
ProviderLegacyIAccessiblePattern_DoDefaultAction
,
ProviderLegacyIAccessiblePattern_SetValue
,
ProviderLegacyIAccessiblePattern_GetIAccessible
,
ProviderLegacyIAccessiblePattern_get_ChildId
,
ProviderLegacyIAccessiblePattern_get_Name
,
ProviderLegacyIAccessiblePattern_get_Value
,
ProviderLegacyIAccessiblePattern_get_Description
,
ProviderLegacyIAccessiblePattern_get_Role
,
ProviderLegacyIAccessiblePattern_get_State
,
ProviderLegacyIAccessiblePattern_get_Help
,
ProviderLegacyIAccessiblePattern_get_KeyboardShortcut
,
ProviderLegacyIAccessiblePattern_GetSelection
,
ProviderLegacyIAccessiblePattern_get_DefaultAction
,
};
static
struct
Provider
Provider
=
static
struct
Provider
Provider
=
{
{
{
&
ProviderSimpleVtbl
},
{
&
ProviderSimpleVtbl
},
...
@@ -2183,6 +2333,7 @@ static struct Provider Provider =
...
@@ -2183,6 +2333,7 @@ static struct Provider Provider =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider"
,
"Provider"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2198,6 +2349,7 @@ static struct Provider Provider2 =
...
@@ -2198,6 +2349,7 @@ static struct Provider Provider2 =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider2"
,
"Provider2"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2213,6 +2365,7 @@ static struct Provider Provider_child =
...
@@ -2213,6 +2365,7 @@ static struct Provider Provider_child =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_child"
,
"Provider_child"
,
&
Provider
.
IRawElementProviderFragment_iface
,
&
Provider
.
IRawElementProviderFragmentRoot_iface
,
&
Provider
.
IRawElementProviderFragment_iface
,
&
Provider
.
IRawElementProviderFragmentRoot_iface
,
...
@@ -2228,6 +2381,7 @@ static struct Provider Provider_child2 =
...
@@ -2228,6 +2381,7 @@ static struct Provider Provider_child2 =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_child2"
,
"Provider_child2"
,
&
Provider
.
IRawElementProviderFragment_iface
,
&
Provider
.
IRawElementProviderFragmentRoot_iface
,
&
Provider
.
IRawElementProviderFragment_iface
,
&
Provider
.
IRawElementProviderFragmentRoot_iface
,
...
@@ -2243,6 +2397,7 @@ static struct Provider Provider_hwnd =
...
@@ -2243,6 +2397,7 @@ static struct Provider Provider_hwnd =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_hwnd"
,
"Provider_hwnd"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2258,6 +2413,7 @@ static struct Provider Provider_nc =
...
@@ -2258,6 +2413,7 @@ static struct Provider Provider_nc =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_nc"
,
"Provider_nc"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2274,6 +2430,7 @@ static struct Provider Provider_proxy =
...
@@ -2274,6 +2430,7 @@ static struct Provider Provider_proxy =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_proxy"
,
"Provider_proxy"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2290,6 +2447,7 @@ static struct Provider Provider_proxy2 =
...
@@ -2290,6 +2447,7 @@ static struct Provider Provider_proxy2 =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_proxy2"
,
"Provider_proxy2"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2306,6 +2464,7 @@ static struct Provider Provider_override =
...
@@ -2306,6 +2464,7 @@ static struct Provider Provider_override =
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderFragmentRootVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderHwndOverrideVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderValuePatternVtbl
},
{
&
ProviderLegacyIAccessiblePatternVtbl
},
1
,
1
,
"Provider_override"
,
"Provider_override"
,
NULL
,
NULL
,
NULL
,
NULL
,
...
@@ -2323,6 +2482,7 @@ static struct Provider Provider_override =
...
@@ -2323,6 +2482,7 @@ static struct Provider Provider_override =
{ &ProviderFragmentRootVtbl }, \
{ &ProviderFragmentRootVtbl }, \
{ &ProviderHwndOverrideVtbl }, \
{ &ProviderHwndOverrideVtbl }, \
{ &ProviderValuePatternVtbl }, \
{ &ProviderValuePatternVtbl }, \
{ &ProviderLegacyIAccessiblePatternVtbl }, \
1, \
1, \
"Provider_" # name "", \
"Provider_" # name "", \
NULL, NULL, \
NULL, NULL, \
...
@@ -5065,6 +5225,12 @@ static const struct prov_method_sequence get_pattern_prop_seq[] = {
...
@@ -5065,6 +5225,12 @@ static const struct prov_method_sequence get_pattern_prop_seq[] = {
{
0
}
{
0
}
};
};
static
const
struct
prov_method_sequence
get_pattern_prop_seq2
[]
=
{
{
&
Provider
,
PROV_GET_PATTERN_PROV
},
{
&
Provider
,
FRAG_GET_FRAGMENT_ROOT
,
METHOD_TODO
},
{
0
}
};
static
const
struct
prov_method_sequence
get_bounding_rect_seq
[]
=
{
static
const
struct
prov_method_sequence
get_bounding_rect_seq
[]
=
{
NODE_CREATE_SEQ
(
&
Provider_child
),
NODE_CREATE_SEQ
(
&
Provider_child
),
{
&
Provider_child
,
FRAG_GET_BOUNDING_RECT
},
{
&
Provider_child
,
FRAG_GET_BOUNDING_RECT
},
...
@@ -5520,6 +5686,28 @@ static void test_UiaGetPropertyValue(void)
...
@@ -5520,6 +5686,28 @@ static void test_UiaGetPropertyValue(void)
VariantClear
(
&
v
);
VariantClear
(
&
v
);
}
}
/* ILegacyIAccessibleProvider pattern property IDs. */
Provider
.
legacy_acc_pattern_data
.
is_supported
=
FALSE
;
hr
=
UiaGetPropertyValue
(
node
,
UIA_LegacyIAccessibleChildIdPropertyId
,
&
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
));
ok_method_sequence
(
get_pattern_prop_seq2
,
NULL
);
VariantClear
(
&
v
);
Provider
.
legacy_acc_pattern_data
.
is_supported
=
TRUE
;
for
(
i
=
0
;
i
<
2
;
i
++
)
{
Provider
.
legacy_acc_pattern_data
.
child_id
=
i
;
hr
=
UiaGetPropertyValue
(
node
,
UIA_LegacyIAccessibleChildIdPropertyId
,
&
v
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
V_VT
(
&
v
)
==
VT_I4
,
"Unexpected VT %d
\n
"
,
V_VT
(
&
v
));
ok
(
V_I4
(
&
v
)
==
i
,
"Unexpected I4 %#lx
\n
"
,
V_I4
(
&
v
));
ok_method_sequence
(
get_pattern_prop_seq
,
NULL
);
VariantClear
(
&
v
);
}
ok
(
UiaNodeRelease
(
node
),
"UiaNodeRelease returned FALSE
\n
"
);
ok
(
UiaNodeRelease
(
node
),
"UiaNodeRelease returned FALSE
\n
"
);
ok
(
Provider
.
ref
==
1
,
"Unexpected refcnt %ld
\n
"
,
Provider
.
ref
);
ok
(
Provider
.
ref
==
1
,
"Unexpected refcnt %ld
\n
"
,
Provider
.
ref
);
initialize_provider
(
&
Provider
,
ProviderOptions_ServerSideProvider
,
NULL
,
FALSE
);
initialize_provider
(
&
Provider
,
ProviderOptions_ServerSideProvider
,
NULL
,
FALSE
);
...
@@ -9013,6 +9201,7 @@ static void initialize_provider(struct Provider *prov, int prov_opts, HWND hwnd,
...
@@ -9013,6 +9201,7 @@ static void initialize_provider(struct Provider *prov, int prov_opts, HWND hwnd,
prov
->
prop_override_count
=
0
;
prov
->
prop_override_count
=
0
;
memset
(
&
prov
->
bounds_rect
,
0
,
sizeof
(
prov
->
bounds_rect
));
memset
(
&
prov
->
bounds_rect
,
0
,
sizeof
(
prov
->
bounds_rect
));
memset
(
&
prov
->
value_pattern_data
,
0
,
sizeof
(
prov
->
value_pattern_data
));
memset
(
&
prov
->
value_pattern_data
,
0
,
sizeof
(
prov
->
value_pattern_data
));
memset
(
&
prov
->
legacy_acc_pattern_data
,
0
,
sizeof
(
prov
->
legacy_acc_pattern_data
));
if
(
initialize_nav_links
)
if
(
initialize_nav_links
)
{
{
prov
->
frag_root
=
NULL
;
prov
->
frag_root
=
NULL
;
...
...
dlls/uiautomationcore/uia_client.c
View file @
fc3b0d33
...
@@ -1571,6 +1571,16 @@ static HRESULT uia_provider_get_pattern_prop_val(struct uia_provider *prov,
...
@@ -1571,6 +1571,16 @@ static HRESULT uia_provider_get_pattern_prop_val(struct uia_provider *prov,
break
;
break
;
}
}
case
UIA_LegacyIAccessibleChildIdPropertyId
:
{
int
val
;
hr
=
ILegacyIAccessibleProvider_get_ChildId
((
ILegacyIAccessibleProvider
*
)
pattern_prov
,
&
val
);
if
(
SUCCEEDED
(
hr
))
variant_init_i4
(
ret_val
,
val
);
break
;
}
default:
default:
break
;
break
;
}
}
...
...
dlls/uiautomationcore/uia_ids.c
View file @
fc3b0d33
...
@@ -152,7 +152,9 @@ static const struct uia_prop_info default_uia_properties[] = {
...
@@ -152,7 +152,9 @@ static const struct uia_prop_info default_uia_properties[] = {
{
&
RangeValue_SmallChange_Property_GUID
,
UIA_RangeValueSmallChangePropertyId
,
},
{
&
RangeValue_SmallChange_Property_GUID
,
UIA_RangeValueSmallChangePropertyId
,
},
{
&
IsTextEditPatternAvailable_Property_GUID
,
UIA_IsTextEditPatternAvailablePropertyId
,
},
{
&
IsTextEditPatternAvailable_Property_GUID
,
UIA_IsTextEditPatternAvailablePropertyId
,
},
{
&
GridItem_Column_Property_GUID
,
UIA_GridItemColumnPropertyId
,
},
{
&
GridItem_Column_Property_GUID
,
UIA_GridItemColumnPropertyId
,
},
{
&
LegacyIAccessible_ChildId_Property_GUID
,
UIA_LegacyIAccessibleChildIdPropertyId
,
},
{
&
LegacyIAccessible_ChildId_Property_GUID
,
UIA_LegacyIAccessibleChildIdPropertyId
,
PROP_TYPE_PATTERN_PROP
,
UIAutomationType_Int
,
UIA_LegacyIAccessiblePatternId
,
},
{
&
Annotation_DateTime_Property_GUID
,
UIA_AnnotationDateTimePropertyId
,
},
{
&
Annotation_DateTime_Property_GUID
,
UIA_AnnotationDateTimePropertyId
,
},
{
&
IsTablePatternAvailable_Property_GUID
,
UIA_IsTablePatternAvailablePropertyId
,
},
{
&
IsTablePatternAvailable_Property_GUID
,
UIA_IsTablePatternAvailablePropertyId
,
},
{
&
SelectionItem_IsSelected_Property_GUID
,
UIA_SelectionItemIsSelectedPropertyId
,
},
{
&
SelectionItem_IsSelected_Property_GUID
,
UIA_SelectionItemIsSelectedPropertyId
,
},
...
...
dlls/uiautomationcore/uia_private.h
View file @
fc3b0d33
...
@@ -99,6 +99,12 @@ static inline void variant_init_bool(VARIANT *v, BOOL val)
...
@@ -99,6 +99,12 @@ static inline void variant_init_bool(VARIANT *v, BOOL val)
V_BOOL
(
v
)
=
val
?
VARIANT_TRUE
:
VARIANT_FALSE
;
V_BOOL
(
v
)
=
val
?
VARIANT_TRUE
:
VARIANT_FALSE
;
}
}
static
inline
void
variant_init_i4
(
VARIANT
*
v
,
int
val
)
{
V_VT
(
v
)
=
VT_I4
;
V_I4
(
v
)
=
val
;
}
static
inline
BOOL
uia_array_reserve
(
void
**
elements
,
SIZE_T
*
capacity
,
SIZE_T
count
,
SIZE_T
size
)
static
inline
BOOL
uia_array_reserve
(
void
**
elements
,
SIZE_T
*
capacity
,
SIZE_T
count
,
SIZE_T
size
)
{
{
SIZE_T
max_capacity
,
new_capacity
;
SIZE_T
max_capacity
,
new_capacity
;
...
...
dlls/uiautomationcore/uia_provider.c
View file @
fc3b0d33
...
@@ -28,12 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
...
@@ -28,12 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
DEFINE_GUID
(
SID_AccFromDAWrapper
,
0x33f139ee
,
0xe509
,
0x47f7
,
0xbf
,
0x39
,
0x83
,
0x76
,
0x44
,
0xf7
,
0x45
,
0x76
);
DEFINE_GUID
(
SID_AccFromDAWrapper
,
0x33f139ee
,
0xe509
,
0x47f7
,
0xbf
,
0x39
,
0x83
,
0x76
,
0x44
,
0xf7
,
0x45
,
0x76
);
static
void
variant_init_i4
(
VARIANT
*
v
,
int
val
)
{
V_VT
(
v
)
=
VT_I4
;
V_I4
(
v
)
=
val
;
}
static
BOOL
msaa_check_acc_state
(
IAccessible
*
acc
,
VARIANT
cid
,
ULONG
flag
)
static
BOOL
msaa_check_acc_state
(
IAccessible
*
acc
,
VARIANT
cid
,
ULONG
flag
)
{
{
HRESULT
hr
;
HRESULT
hr
;
...
...
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