Incubates #8422

source/UIAHandler.py

@@ -1,10 +1,9 @@
 #UIAHandler.py
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2008-2016 NV Access Limited
+#Copyright (C) 2008-2018 NV Access Limited, Joseph Lee
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
-import winVersion
 from comtypes import COMError
 import config
 from logHandler import log
@@ -13,14 +12,13 @@
 isUIAAvailable=False
 
 if config.conf and config.conf["UIA"]["enabled"]:
-	winver=winVersion.winVersion.major+(winVersion.winVersion.minor/10.0)
-	if winver>=config.conf["UIA"]["minWindowsVersion"]:
-		try:
-			from _UIAHandler import *
-			isUIAAvailable=True
-		except ImportError:
-			log.debugWarning("Unable to import _UIAHandler",exc_info=True)
-			pass
+	# Because Windows 7 SP1 (NT 6.1) or later is supported, just assume UIA can be used unless told otherwise.
+	try:
+		from _UIAHandler import *
+		isUIAAvailable=True
+	except ImportError:
+		log.debugWarning("Unable to import _UIAHandler",exc_info=True)
+		pass
 
 def initialize():
 	global handler

source/_UIAHandler.py

@@ -26,22 +26,9 @@
 
 from comtypes.gen.UIAutomationClient import *
 
-#Some new win8 UIA constants that could be missing
-UIA_StyleIdAttributeId=40034
-UIA_AnnotationAnnotationTypeIdPropertyId=30113
-UIA_AnnotationTypesAttributeId=40031
-AnnotationType_SpellingError=60001
-UIA_AnnotationObjectsAttributeId=40032
-StyleId_Heading1=70001
-StyleId_Heading9=70009
+#Some newer UIA constants that could be missing
 ItemIndex_Property_GUID=GUID("{92A053DA-2969-4021-BF27-514CFC2E4A69}")
 ItemCount_Property_GUID=GUID("{ABBF5C45-5CCC-47b7-BB4E-87CB87BBD162}")
-UIA_FullDescriptionPropertyId=30159
-UIA_LevelPropertyId=30154
-UIA_PositionInSetPropertyId=30152
-UIA_SizeOfSetPropertyId=30153
-UIA_LocalizedLandmarkTypePropertyId=30158
-UIA_LandmarkTypePropertyId=30157
 
 HorizontalTextAlignment_Left=0
 HorizontalTextAlignment_Centered=1

source/config/configSpec.py

@@ -181,7 +181,6 @@
 	followMouse = boolean(default=False)
 
 [UIA]
-	minWindowsVersion = float(default=6.1)
 	enabled = boolean(default=true)
 	useInMSWordWhenAvailable = boolean(default=false)