[PATCH 0/3] MR510: uiautomationcore: Add support for more UI Automation property types.
From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 ++-------- dlls/uiautomationcore/uia_client.c | 18 ++++++++++++++++++ dlls/uiautomationcore/uia_ids.c | 9 ++++++--- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7dd598822a4..7378e78d73d 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4237,19 +4237,13 @@ static void check_uia_prop_val(PROPERTYID prop_id, enum UIAutomationType type, V break; case UIAutomationType_Double: - todo_wine ok(V_VT(v) == VT_R8, "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != VT_R8) - break; - + ok(V_VT(v) == VT_R8, "Unexpected VT %d\n", V_VT(v)); ok(V_R8(v) == uia_r8_prop_val, "Unexpected R8 %lf\n", V_R8(v)); ok_method_sequence(get_prop_seq, NULL); break; case UIAutomationType_DoubleArray: - todo_wine ok(V_VT(v) == (VT_ARRAY | VT_R8), "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != (VT_ARRAY | VT_R8)) - break; - + ok(V_VT(v) == (VT_ARRAY | VT_R8), "Unexpected VT %d\n", V_VT(v)); for (idx = 0; idx < ARRAY_SIZE(uia_r8_arr_prop_val); idx++) { double val; diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index ba15ed0c1f1..d2f05648b11 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -369,6 +369,24 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, *ret_val = v; break; + case UIAutomationType_Double: + if (V_VT(&v) != VT_R8) + { + WARN("Invalid vt %d for UIAutomationType_Double\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + + case UIAutomationType_DoubleArray: + if (V_VT(&v) != (VT_R8 | VT_ARRAY)) + { + WARN("Invalid vt %d for UIAutomationType_DoubleArray\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + case UIAutomationType_Element: { IRawElementProviderSimple *elprov; diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index 72bc3ba6991..10eea31adc3 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -48,7 +48,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Transform2_ZoomLevel_Property_GUID, UIA_Transform2ZoomLevelPropertyId, }, { &Name_Property_GUID, UIA_NamePropertyId, }, { &GridItem_RowSpan_Property_GUID, UIA_GridItemRowSpanPropertyId, }, - { &Size_Property_GUID, UIA_SizePropertyId, }, + { &Size_Property_GUID, UIA_SizePropertyId, + UIAutomationType_DoubleArray, }, { &IsTextPattern2Available_Property_GUID, UIA_IsTextPattern2AvailablePropertyId, }, { &Styles_FillPatternStyle_Property_GUID, UIA_StylesFillPatternStylePropertyId, }, { &FlowsTo_Property_GUID, UIA_FlowsToPropertyId, @@ -143,7 +144,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Drag_DropEffect_Property_GUID, UIA_DragDropEffectPropertyId, }, { &MultipleView_CurrentView_Property_GUID, UIA_MultipleViewCurrentViewPropertyId, }, { &Styles_FillColor_Property_GUID, UIA_StylesFillColorPropertyId, }, - { &Rotation_Property_GUID, UIA_RotationPropertyId, }, + { &Rotation_Property_GUID, UIA_RotationPropertyId, + UIAutomationType_Double, }, { &SpreadsheetItem_Formula_Property_GUID, UIA_SpreadsheetItemFormulaPropertyId, }, { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, }, { &LocalizedLandmarkType_Property_GUID, UIA_LocalizedLandmarkTypePropertyId, }, @@ -198,7 +200,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Table_RowOrColumnMajor_Property_GUID, UIA_TableRowOrColumnMajorPropertyId, }, { &IsDockPatternAvailable_Property_GUID, UIA_IsDockPatternAvailablePropertyId, }, { &IsSynchronizedInputPatternAvailable_Property_GUID,UIA_IsSynchronizedInputPatternAvailablePropertyId, }, - { &OutlineThickness_Property_GUID, UIA_OutlineThicknessPropertyId, }, + { &OutlineThickness_Property_GUID, UIA_OutlineThicknessPropertyId, + UIAutomationType_DoubleArray, }, { &IsLegacyIAccessiblePatternAvailable_Property_GUID,UIA_IsLegacyIAccessiblePatternAvailablePropertyId, }, { &AnnotationObjects_Property_GUID, UIA_AnnotationObjectsPropertyId, UIAutomationType_ElementArray, }, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/510
From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 4 +-- dlls/uiautomationcore/uia_client.c | 9 ++++++ dlls/uiautomationcore/uia_ids.c | 36 ++++++++++++++-------- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7378e78d73d..669e6d58b87 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4200,9 +4200,7 @@ static void check_uia_prop_val(PROPERTYID prop_id, enum UIAutomationType type, V break; case UIAutomationType_Bool: - todo_wine ok(V_VT(v) == VT_BOOL, "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != VT_BOOL) - break; + ok(V_VT(v) == VT_BOOL, "Unexpected VT %d\n", V_VT(v)); /* UIA_IsKeyboardFocusablePropertyId is broken on Win8 and Win10v1507. */ if (prop_id == UIA_IsKeyboardFocusablePropertyId) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index d2f05648b11..c800645da0c 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -387,6 +387,15 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, *ret_val = v; break; + case UIAutomationType_Bool: + if (V_VT(&v) != VT_BOOL) + { + WARN("Invalid vt %d for UIAutomationType_Bool\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + case UIAutomationType_Element: { IRawElementProviderSimple *elprov; diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index 10eea31adc3..90de0e21ce9 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -66,7 +66,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &LegacyIAccessible_DefaultAction_Property_GUID, UIA_LegacyIAccessibleDefaultActionPropertyId, }, { &Level_Property_GUID, UIA_LevelPropertyId, UIAutomationType_Int, }, - { &IsKeyboardFocusable_Property_GUID, UIA_IsKeyboardFocusablePropertyId, }, + { &IsKeyboardFocusable_Property_GUID, UIA_IsKeyboardFocusablePropertyId, + UIAutomationType_Bool, }, { &GridItem_Row_Property_GUID, UIA_GridItemRowPropertyId, }, { &IsSpreadsheetItemPatternAvailable_Property_GUID, UIA_IsSpreadsheetItemPatternAvailablePropertyId, }, { &Table_ColumnHeaders_Property_GUID, UIA_TableColumnHeadersPropertyId, }, @@ -82,7 +83,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsAnnotationPatternAvailable_Property_GUID, UIA_IsAnnotationPatternAvailablePropertyId, }, { &SpreadsheetItem_AnnotationObjects_Property_GUID, UIA_SpreadsheetItemAnnotationObjectsPropertyId, }, { &IsInvokePatternAvailable_Property_GUID, UIA_IsInvokePatternAvailablePropertyId, }, - { &HasKeyboardFocus_Property_GUID, UIA_HasKeyboardFocusPropertyId, }, + { &HasKeyboardFocus_Property_GUID, UIA_HasKeyboardFocusPropertyId, + UIAutomationType_Bool, }, { &ClickablePoint_Property_GUID, UIA_ClickablePointPropertyId, }, { &NewNativeWindowHandle_Property_GUID, UIA_NativeWindowHandlePropertyId, UIAutomationType_Int, }, @@ -104,7 +106,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Annotation_AnnotationTypeId_Property_GUID, UIA_AnnotationAnnotationTypeIdPropertyId, }, { &FlowsFrom_Property_GUID, UIA_FlowsFromPropertyId, UIAutomationType_ElementArray, }, - { &OptimizeForVisualContent_Property_GUID, UIA_OptimizeForVisualContentPropertyId, }, + { &OptimizeForVisualContent_Property_GUID, UIA_OptimizeForVisualContentPropertyId, + UIAutomationType_Bool, }, { &IsVirtualizedItemPatternAvailable_Property_GUID, UIA_IsVirtualizedItemPatternAvailablePropertyId, }, { &GridItem_Parent_Property_GUID, UIA_GridItemContainingGridPropertyId, }, { &LegacyIAccessible_Help_Property_GUID, UIA_LegacyIAccessibleHelpPropertyId, }, @@ -123,7 +126,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsTablePatternAvailable_Property_GUID, UIA_IsTablePatternAvailablePropertyId, }, { &SelectionItem_IsSelected_Property_GUID, UIA_SelectionItemIsSelectedPropertyId, }, { &Window_WindowVisualState_Property_GUID, UIA_WindowWindowVisualStatePropertyId, }, - { &IsOffscreen_Property_GUID, UIA_IsOffscreenPropertyId, }, + { &IsOffscreen_Property_GUID, UIA_IsOffscreenPropertyId, + UIAutomationType_Bool, }, { &Annotation_Author_Property_GUID, UIA_AnnotationAuthorPropertyId, }, { &Orientation_Property_GUID, UIA_OrientationPropertyId, UIAutomationType_Int, }, @@ -139,7 +143,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Grid_ColumnCount_Property_GUID, UIA_GridColumnCountPropertyId, }, { &AnnotationTypes_Property_GUID, UIA_AnnotationTypesPropertyId, UIAutomationType_IntArray, }, - { &IsPeripheral_Property_GUID, UIA_IsPeripheralPropertyId, }, + { &IsPeripheral_Property_GUID, UIA_IsPeripheralPropertyId, + UIAutomationType_Bool, }, { &Transform2_ZoomMaximum_Property_GUID, UIA_Transform2ZoomMaximumPropertyId, }, { &Drag_DropEffect_Property_GUID, UIA_DragDropEffectPropertyId, }, { &MultipleView_CurrentView_Property_GUID, UIA_MultipleViewCurrentViewPropertyId, }, @@ -147,10 +152,13 @@ static const struct uia_prop_info default_uia_properties[] = { { &Rotation_Property_GUID, UIA_RotationPropertyId, UIAutomationType_Double, }, { &SpreadsheetItem_Formula_Property_GUID, UIA_SpreadsheetItemFormulaPropertyId, }, - { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, }, + { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, + UIAutomationType_Bool, }, { &LocalizedLandmarkType_Property_GUID, UIA_LocalizedLandmarkTypePropertyId, }, - { &IsDataValidForForm_Property_GUID, UIA_IsDataValidForFormPropertyId, }, - { &IsControlElement_Property_GUID, UIA_IsControlElementPropertyId, }, + { &IsDataValidForForm_Property_GUID, UIA_IsDataValidForFormPropertyId, + UIAutomationType_Bool, }, + { &IsControlElement_Property_GUID, UIA_IsControlElementPropertyId, + UIAutomationType_Bool, }, { &HelpText_Property_GUID, UIA_HelpTextPropertyId, }, { &Table_RowHeaders_Property_GUID, UIA_TableRowHeadersPropertyId, }, { &ControllerFor_Property_GUID, UIA_ControllerForPropertyId, @@ -170,7 +178,8 @@ static const struct uia_prop_info default_uia_properties[] = { UIAutomationType_Int, }, { &Scroll_VerticalScrollPercent_Property_GUID, UIA_ScrollVerticalScrollPercentPropertyId, }, { &IsObjectModelPatternAvailable_Property_GUID, UIA_IsObjectModelPatternAvailablePropertyId, }, - { &IsDialog_Property_GUID, UIA_IsDialogPropertyId, }, + { &IsDialog_Property_GUID, UIA_IsDialogPropertyId, + UIAutomationType_Bool, }, { &IsTextPatternAvailable_Property_GUID, UIA_IsTextPatternAvailablePropertyId, }, { &LegacyIAccessible_Role_Property_GUID, UIA_LegacyIAccessibleRolePropertyId, }, { &Selection2_ItemCount_Property_GUID, UIA_Selection2ItemCountPropertyId, }, @@ -183,9 +192,11 @@ static const struct uia_prop_info default_uia_properties[] = { { &Transform_CanResize_Property_GUID, UIA_TransformCanResizePropertyId, }, { &IsValuePatternAvailable_Property_GUID, UIA_IsValuePatternAvailablePropertyId, }, { &IsItemContainerPatternAvailable_Property_GUID, UIA_IsItemContainerPatternAvailablePropertyId, }, - { &IsContentElement_Property_GUID, UIA_IsContentElementPropertyId, }, + { &IsContentElement_Property_GUID, UIA_IsContentElementPropertyId, + UIAutomationType_Bool, }, { &LegacyIAccessible_KeyboardShortcut_Property_GUID, UIA_LegacyIAccessibleKeyboardShortcutPropertyId, }, - { &IsPassword_Property_GUID, UIA_IsPasswordPropertyId, }, + { &IsPassword_Property_GUID, UIA_IsPasswordPropertyId, + UIAutomationType_Bool, }, { &IsWindowPatternAvailable_Property_GUID, UIA_IsWindowPatternAvailablePropertyId, }, { &RangeValue_Minimum_Property_GUID, UIA_RangeValueMinimumPropertyId, }, { &BoundingRectangle_Property_GUID, UIA_BoundingRectanglePropertyId, }, @@ -205,7 +216,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsLegacyIAccessiblePatternAvailable_Property_GUID,UIA_IsLegacyIAccessiblePatternAvailablePropertyId, }, { &AnnotationObjects_Property_GUID, UIA_AnnotationObjectsPropertyId, UIAutomationType_ElementArray, }, - { &IsRequiredForForm_Property_GUID, UIA_IsRequiredForFormPropertyId, }, + { &IsRequiredForForm_Property_GUID, UIA_IsRequiredForFormPropertyId, + UIAutomationType_Bool, }, { &SpreadsheetItem_AnnotationTypes_Property_GUID, UIA_SpreadsheetItemAnnotationTypesPropertyId, }, { &FillColor_Property_GUID, UIA_FillColorPropertyId, UIAutomationType_Int, }, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/510
From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 ++---- dlls/uiautomationcore/uia_client.c | 9 +++++ dlls/uiautomationcore/uia_ids.c | 42 ++++++++++++++-------- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 669e6d58b87..4fd28f2ba8d 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4191,10 +4191,7 @@ static void check_uia_prop_val(PROPERTYID prop_id, enum UIAutomationType type, V switch (type) { case UIAutomationType_String: - todo_wine ok(V_VT(v) == VT_BSTR, "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != VT_BSTR) - break; - + ok(V_VT(v) == VT_BSTR, "Unexpected VT %d\n", V_VT(v)); ok(!lstrcmpW(V_BSTR(v), uia_bstr_prop_str), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(v))); ok_method_sequence(get_prop_seq, NULL); break; @@ -4417,10 +4414,7 @@ static void test_UiaGetPropertyValue(void) } winetest_push_context("prop_id %d", prop_id); hr = UiaGetPropertyValue(node, prop_id, &v); - if (hr == E_NOTIMPL) - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - else - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_uia_prop_val(prop_id, elem_prop->type, &v); /* diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index c800645da0c..405beb02b15 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -396,6 +396,15 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, *ret_val = v; break; + case UIAutomationType_String: + if (V_VT(&v) != VT_BSTR) + { + WARN("Invalid vt %d for UIAutomationType_String\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + case UIAutomationType_Element: { IRawElementProviderSimple *elprov; diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index 90de0e21ce9..7cfde7f4c29 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -32,21 +32,26 @@ static int __cdecl uia_property_guid_compare(const void *a, const void *b) /* Sorted by GUID. */ static const struct uia_prop_info default_uia_properties[] = { - { &AutomationId_Property_GUID, UIA_AutomationIdPropertyId, }, - { &FrameworkId_Property_GUID, UIA_FrameworkIdPropertyId, }, + { &AutomationId_Property_GUID, UIA_AutomationIdPropertyId, + UIAutomationType_String, }, + { &FrameworkId_Property_GUID, UIA_FrameworkIdPropertyId, + UIAutomationType_String, }, { &IsTransformPatternAvailable_Property_GUID, UIA_IsTransformPatternAvailablePropertyId, }, { &IsScrollItemPatternAvailable_Property_GUID, UIA_IsScrollItemPatternAvailablePropertyId, }, { &IsExpandCollapsePatternAvailable_Property_GUID, UIA_IsExpandCollapsePatternAvailablePropertyId, }, { &CenterPoint_Property_GUID, UIA_CenterPointPropertyId, }, { &IsTableItemPatternAvailable_Property_GUID, UIA_IsTableItemPatternAvailablePropertyId, }, { &Scroll_HorizontalScrollPercent_Property_GUID, UIA_ScrollHorizontalScrollPercentPropertyId, }, - { &AccessKey_Property_GUID, UIA_AccessKeyPropertyId, }, + { &AccessKey_Property_GUID, UIA_AccessKeyPropertyId, + UIAutomationType_String, }, { &RangeValue_Maximum_Property_GUID, UIA_RangeValueMaximumPropertyId, }, - { &ClassName_Property_GUID, UIA_ClassNamePropertyId, }, + { &ClassName_Property_GUID, UIA_ClassNamePropertyId, + UIAutomationType_String, }, { &Transform2_ZoomMinimum_Property_GUID, UIA_Transform2ZoomMinimumPropertyId, }, { &LegacyIAccessible_Description_Property_GUID, UIA_LegacyIAccessibleDescriptionPropertyId, }, { &Transform2_ZoomLevel_Property_GUID, UIA_Transform2ZoomLevelPropertyId, }, - { &Name_Property_GUID, UIA_NamePropertyId, }, + { &Name_Property_GUID, UIA_NamePropertyId, + UIAutomationType_String, }, { &GridItem_RowSpan_Property_GUID, UIA_GridItemRowSpanPropertyId, }, { &Size_Property_GUID, UIA_SizePropertyId, UIAutomationType_DoubleArray, }, @@ -54,7 +59,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Styles_FillPatternStyle_Property_GUID, UIA_StylesFillPatternStylePropertyId, }, { &FlowsTo_Property_GUID, UIA_FlowsToPropertyId, UIAutomationType_ElementArray, }, - { &ItemStatus_Property_GUID, UIA_ItemStatusPropertyId, }, + { &ItemStatus_Property_GUID, UIA_ItemStatusPropertyId, + UIAutomationType_String, }, { &Scroll_VerticalViewSize_Property_GUID, UIA_ScrollVerticalViewSizePropertyId, }, { &Selection_IsSelectionRequired_Property_GUID, UIA_SelectionIsSelectionRequiredPropertyId, }, { &IsGridItemPatternAvailable_Property_GUID, UIA_IsGridItemPatternAvailablePropertyId, }, @@ -100,9 +106,11 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsTransformPattern2Available_Property_GUID, UIA_IsTransformPattern2AvailablePropertyId, }, { &LabeledBy_Property_GUID, UIA_LabeledByPropertyId, UIAutomationType_Element, }, - { &ItemType_Property_GUID, UIA_ItemTypePropertyId, }, + { &ItemType_Property_GUID, UIA_ItemTypePropertyId, + UIAutomationType_String, }, { &Transform_CanMove_Property_GUID, UIA_TransformCanMovePropertyId, }, - { &LocalizedControlType_Property_GUID, UIA_LocalizedControlTypePropertyId, }, + { &LocalizedControlType_Property_GUID, UIA_LocalizedControlTypePropertyId, + UIAutomationType_String, }, { &Annotation_AnnotationTypeId_Property_GUID, UIA_AnnotationAnnotationTypeIdPropertyId, }, { &FlowsFrom_Property_GUID, UIA_FlowsFromPropertyId, UIAutomationType_ElementArray, }, @@ -154,24 +162,28 @@ static const struct uia_prop_info default_uia_properties[] = { { &SpreadsheetItem_Formula_Property_GUID, UIA_SpreadsheetItemFormulaPropertyId, }, { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, UIAutomationType_Bool, }, - { &LocalizedLandmarkType_Property_GUID, UIA_LocalizedLandmarkTypePropertyId, }, + { &LocalizedLandmarkType_Property_GUID, UIA_LocalizedLandmarkTypePropertyId, + UIAutomationType_String, }, { &IsDataValidForForm_Property_GUID, UIA_IsDataValidForFormPropertyId, UIAutomationType_Bool, }, { &IsControlElement_Property_GUID, UIA_IsControlElementPropertyId, UIAutomationType_Bool, }, - { &HelpText_Property_GUID, UIA_HelpTextPropertyId, }, + { &HelpText_Property_GUID, UIA_HelpTextPropertyId, + UIAutomationType_String, }, { &Table_RowHeaders_Property_GUID, UIA_TableRowHeadersPropertyId, }, { &ControllerFor_Property_GUID, UIA_ControllerForPropertyId, UIAutomationType_ElementArray, }, { &ProviderDescription_Property_GUID, UIA_ProviderDescriptionPropertyId, }, - { &AriaProperties_Property_GUID, UIA_AriaPropertiesPropertyId, }, + { &AriaProperties_Property_GUID, UIA_AriaPropertiesPropertyId, + UIAutomationType_String, }, { &LiveSetting_Property_GUID, UIA_LiveSettingPropertyId, UIAutomationType_Int, }, { &Selection2_LastSelectedItem_Property_GUID, UIA_Selection2LastSelectedItemPropertyId, }, { &Transform2_CanZoom_Property_GUID, UIA_Transform2CanZoomPropertyId, }, { &Window_IsModal_Property_GUID, UIA_WindowIsModalPropertyId, }, { &Annotation_AnnotationTypeName_Property_GUID, UIA_AnnotationAnnotationTypeNamePropertyId, }, - { &AriaRole_Property_GUID, UIA_AriaRolePropertyId, }, + { &AriaRole_Property_GUID, UIA_AriaRolePropertyId, + UIAutomationType_String, }, { &Scroll_VerticallyScrollable_Property_GUID, UIA_ScrollVerticallyScrollablePropertyId, }, { &RangeValue_Value_Property_GUID, UIA_RangeValueValuePropertyId, }, { &ProcessId_Property_GUID, UIA_ProcessIdPropertyId, @@ -225,7 +237,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Window_IsTopmost_Property_GUID, UIA_WindowIsTopmostPropertyId, }, { &IsCustomNavigationPatternAvailable_Property_GUID, UIA_IsCustomNavigationPatternAvailablePropertyId, }, { &Scroll_HorizontalViewSize_Property_GUID, UIA_ScrollHorizontalViewSizePropertyId, }, - { &AcceleratorKey_Property_GUID, UIA_AcceleratorKeyPropertyId, }, + { &AcceleratorKey_Property_GUID, UIA_AcceleratorKeyPropertyId, + UIAutomationType_String, }, { &IsTextChildPatternAvailable_Property_GUID, UIA_IsTextChildPatternAvailablePropertyId, }, { &LegacyIAccessible_Selection_Property_GUID, UIA_LegacyIAccessibleSelectionPropertyId, }, { &FillType_Property_GUID, UIA_FillTypePropertyId, @@ -243,7 +256,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsSelectionPattern2Available_Property_GUID, UIA_IsSelectionPattern2AvailablePropertyId, }, { &MultipleView_SupportedViews_Property_GUID, UIA_MultipleViewSupportedViewsPropertyId, }, { &Styles_FillPatternColor_Property_GUID, UIA_StylesFillPatternColorPropertyId, }, - { &FullDescription_Property_GUID, UIA_FullDescriptionPropertyId, }, + { &FullDescription_Property_GUID, UIA_FullDescriptionPropertyId, + UIAutomationType_String, }, }; static const int prop_id_idx[] = { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/510
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/510
participants (3)
-
Connor McAdams -
Connor McAdams (＠cmcadams)
-
Huw Davies (＠huw)