win7 fixes

pywinauto · Jun 9, 2019 · 62f3117 · 62f3117
1 parent 54a7f80
commit 62f3117
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/pywinauto/recorder/uia/uia_recorder_defines.py b/pywinauto/recorder/uia/uia_recorder_defines.py
@@ -47,9 +47,7 @@
     IUIA().UIA_dll.UIA_AnnotationAnnotationTypeNamePropertyId: PROPERTY.ANNOTATION_TYPE_NAME,
     IUIA().UIA_dll.UIA_AnnotationAuthorPropertyId: PROPERTY.ANNOTATION_AUTHOR,
     IUIA().UIA_dll.UIA_AnnotationDateTimePropertyId: PROPERTY.ANNOTATION_DATE_TIME,
-    IUIA().UIA_dll.UIA_AnnotationObjectsPropertyId: PROPERTY.ANNOTATION_OBJECTS,
     IUIA().UIA_dll.UIA_AnnotationTargetPropertyId: PROPERTY.ANNOTATION_TARGET,
-    IUIA().UIA_dll.UIA_AnnotationTypesPropertyId: PROPERTY.ANNOTATION_TYPES,
     IUIA().UIA_dll.UIA_AriaPropertiesPropertyId: PROPERTY.ARIA_PROPERTIES,
     IUIA().UIA_dll.UIA_AriaRolePropertyId: PROPERTY.ARIA_ROLE,
     IUIA().UIA_dll.UIA_AutomationIdPropertyId: PROPERTY.AUTOMATION_ID,
@@ -83,7 +81,6 @@
     IUIA().UIA_dll.UIA_IsAnnotationPatternAvailablePropertyId: PROPERTY.IS_ANNOTATION_PATTERN_AVAILABLE,
     IUIA().UIA_dll.UIA_IsContentElementPropertyId: PROPERTY.IS_CONTENT_ELEMENT,
     IUIA().UIA_dll.UIA_IsControlElementPropertyId: PROPERTY.IS_CONTROL_ELEMENT,
-    IUIA().UIA_dll.UIA_IsCustomNavigationPatternAvailablePropertyId: PROPERTY.IS_CUSTOM_NAVIGATION_PATTERN_AVAILABLE,
     IUIA().UIA_dll.UIA_IsDataValidForFormPropertyId: PROPERTY.IS_DATA_VALID_FOR_FORM,
     IUIA().UIA_dll.UIA_IsDockPatternAvailablePropertyId: PROPERTY.IS_DOCK_PATTERN_AVAILABLE,
     IUIA().UIA_dll.UIA_IsDragPatternAvailablePropertyId: PROPERTY.IS_DRAG_PATTERN_AVAILABLE,
@@ -126,7 +123,6 @@
     IUIA().UIA_dll.UIA_ItemStatusPropertyId: PROPERTY.ITEM_STATUS,
     IUIA().UIA_dll.UIA_ItemTypePropertyId: PROPERTY.ITEM_TYPE,
     IUIA().UIA_dll.UIA_LabeledByPropertyId: PROPERTY.LABELED_BY,
-    IUIA().UIA_dll.UIA_LandmarkTypePropertyId: PROPERTY.LANDMARK_TYPE,
     IUIA().UIA_dll.UIA_LegacyIAccessibleChildIdPropertyId: PROPERTY.LEGACY_I_ACCESSIBLE_CHILD_ID,
     IUIA().UIA_dll.UIA_LegacyIAccessibleDefaultActionPropertyId: PROPERTY.LEGACY_I_ACCESSIBLE_DEFAULT_ACTION,
     IUIA().UIA_dll.UIA_LegacyIAccessibleDescriptionPropertyId: PROPERTY.LEGACY_I_ACCESSIBLE_DESCRIPTION,
@@ -137,10 +133,8 @@
     IUIA().UIA_dll.UIA_LegacyIAccessibleSelectionPropertyId: PROPERTY.LEGACY_I_ACCESSIBLE_SELECTION,
     IUIA().UIA_dll.UIA_LegacyIAccessibleStatePropertyId: PROPERTY.LEGACY_I_ACCESSIBLE_STATE,
     IUIA().UIA_dll.UIA_LegacyIAccessibleValuePropertyId: PROPERTY.LEGACY_I_ACCESSIBLE_VALUE,
-    IUIA().UIA_dll.UIA_LevelPropertyId: PROPERTY.LEVEL,
     IUIA().UIA_dll.UIA_LiveSettingPropertyId: PROPERTY.LIVE_SETTING,
     IUIA().UIA_dll.UIA_LocalizedControlTypePropertyId: PROPERTY.LOCALIZED_CONTROL_TYPE,
-    IUIA().UIA_dll.UIA_LocalizedLandmarkTypePropertyId: PROPERTY.LOCALIZED_LANDMARK_TYPE,
     IUIA().UIA_dll.UIA_MultipleViewCurrentViewPropertyId: PROPERTY.MULTIPLE_VIEW_CURRENT_VIEW,
     IUIA().UIA_dll.UIA_MultipleViewSupportedViewsPropertyId: PROPERTY.MULTIPLE_VIEW_SUPPORTED_VIEWS,
     IUIA().UIA_dll.UIA_NamePropertyId: PROPERTY.NAME,
@@ -202,6 +196,22 @@
     IUIA().UIA_dll.UIA_WindowWindowVisualStatePropertyId: PROPERTY.WINDOW_WINDOW_VISUAL_STATE
 }
 
+if hasattr(IUIA().UIA_dll, "UIA_AnnotationObjectsPropertyId"):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_AnnotationObjectsPropertyId] = PROPERTY.ANNOTATION_OBJECTS
+if hasattr(IUIA().UIA_dll, "UIA_AnnotationTypesPropertyId"):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_AnnotationTypesPropertyId] = PROPERTY.ANNOTATION_TYPES
+if hasattr(IUIA().UIA_dll, 'UIA_FullDescriptionPropertyId'):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_FullDescriptionPropertyId] = PROPERTY.FULL_DESCRIPTION
+if hasattr(IUIA().UIA_dll, "UIA_IsCustomNavigationPatternAvailablePropertyId"):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_IsCustomNavigationPatternAvailablePropertyId] = \
+        PROPERTY.IS_CUSTOM_NAVIGATION_PATTERN_AVAILABLE
+if hasattr(IUIA().UIA_dll, "UIA_LandmarkTypePropertyId"):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_LandmarkTypePropertyId] = PROPERTY.LANDMARK_TYPE
+if hasattr(IUIA().UIA_dll, "UIA_LevelPropertyId"):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_LevelPropertyId] = PROPERTY.LEVEL
+if hasattr(IUIA().UIA_dll, "UIA_LocalizedLandmarkTypePropertyId"):
+    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_LocalizedLandmarkTypePropertyId] = PROPERTY.LOCALIZED_LANDMARK_TYPE
+
 STRUCTURE_CHANGE_TYPE_TO_NAME_MAP = {
     IUIA().UIA_dll.StructureChangeType_ChildAdded: STRUCTURE_EVENT.CHILD_ADDED,
     IUIA().UIA_dll.StructureChangeType_ChildRemoved: STRUCTURE_EVENT.CHILD_REMOVED,
@@ -211,9 +221,6 @@
     IUIA().UIA_dll.StructureChangeType_ChildrenReordered: STRUCTURE_EVENT.CHILDREN_REORDERED
 }
 
-if hasattr(IUIA().UIA_dll, 'UIA_FullDescriptionPropertyId'):
-    PROPERTY_ID_TO_NAME_MAP[IUIA().UIA_dll.UIA_FullDescriptionPropertyId] = PROPERTY.FULL_DESCRIPTION
-
 
 class StructureEvent(ApplicationEvent):
     def __init__(self, sender, change_type, runtime_id):