Navigating by line in Microsoft Edge is now up to 3x faster in the Windows 10 Creaters Update

source/NVDAObjects/UIA/wordDocument.py

@@ -14,6 +14,9 @@
 
 class WordDocumentTextInfo(UIATextInfo):
 
+	def _get_controlFieldNVDAObjectClass(self):
+		return WordDocumentNode
+
 	# UIA text range comparison for bookmarks works okay in this MS Word implementation
 	# Thus __ne__ is useful
 	def __ne__(self,other):
@@ -66,7 +69,7 @@ def _get_isCollapsed(self):
 		# Therefore class a range as collapsed if it has no text
 		return not bool(self.text)
 
-	def getTextWithFields(self,formatConfig=None):
+	def old_getTextWithFields(self,formatConfig=None):
 		fields=super(WordDocumentTextInfo,self).getTextWithFields(formatConfig=formatConfig)
 		# MS Word can sometimes return a higher ancestor in its textRange's children.
 		# E.g. a table inside a table header.

source/UIAHandler.py

@@ -1,5 +1,5 @@
 import winVersion
-import comtypes
+from comtypes import COMError
 import config
 from logHandler import log
 
@@ -13,6 +13,7 @@
 			from _UIAHandler import *
 			isUIAAvailable=True
 		except ImportError:
+			log.debugWarning("Unable to import _UIAHandler",exc_info=True)
 			pass
 
 def initialize():

source/UIAUtils.py

@@ -4,6 +4,7 @@
 #See the file COPYING for more details.
 
 from comtypes import COMError
+import ctypes
 import UIAHandler
 
 def createUIAMultiPropertyCondition(*dicts):
@@ -119,3 +120,71 @@ def iterUIARangeByUnit(rangeObj,unit):
 	if tempRange.CompareEndpoints(UIAHandler.TextPatternRangeEndpoint_End,rangeObj,UIAHandler.TextPatternRangeEndpoint_End)<0:
 		tempRange.MoveEndpointByRange(UIAHandler.TextPatternRangeEndpoint_End,rangeObj,UIAHandler.TextPatternRangeEndpoint_End)
 		yield tempRange.clone()
+
+def getEnclosingElementWithCacheFromUIATextRange(textRange,cacheRequest):
+	if not isinstance(textRange,UIAHandler.IUIAutomationTextRange):
+		raise ValueError("%s is not a text range"%textRange)
+	try:
+		textRange=textRange.QueryInterface(UIAHandler.IUIAutomationTextRange3)
+	except (COMError,AttributeError):
+		e=textRange.getEnclosingElement()
+		if e:
+			e=e.buildUpdatedCache(cacheRequest)
+		return e
+	return textRange.getEnclosingElementBuildCache(cacheRequest)
+
+class CacheableUIAElementArray(object):
+
+	def __init__(self,elementArray,cacheRequest=None):
+		self._elementArray=elementArray
+		self._cacheRequest=cacheRequest
+
+	@property
+	def length(self):
+		return self._elementArray.length if self._elementArray else 0
+
+	def getElement(self,index):
+		e=self._elementArray.getElement(index)
+		if e and self._cacheRequest:
+			e=e.buildUpdatedCache(self._cacheRequest)
+		return e
+
+def getChildrenWithCacheFromUIATextRange(textRange,cacheRequest):
+	if not isinstance(textRange,UIAHandler.IUIAutomationTextRange):
+		raise ValueError("%s is not a text range"%textRange)
+	try:
+		textRange=textRange.QueryInterface(UIAHandler.IUIAutomationTextRange3)
+	except (COMError,AttributeError):
+		c=textRange.getChildren()
+		c=CacheableUIAElementArray(c,cacheRequest)
+		return c
+	c=textRange.getChildrenBuildCache(cacheRequest)
+	c=CacheableUIAElementArray(c)
+	return c
+
+class UIATextRangeAttributeValueFetcher(object):
+
+	def __init__(self,textRange):
+		self.textRange=textRange
+
+	def getValue(self,ID,ignoreMixedValues=False):
+		val=self.textRange.getAttributeValue(ID)
+		if not ignoreMixedValues and val==UIAHandler.handler.ReservedMixedAttributeValue:
+			raise UIAMixedAttributeError
+		return val
+
+class BulkUIATextRangeAttributeValueFetcher(UIATextRangeAttributeValueFetcher):
+
+	def __init__(self,textRange,IDs):
+		IDs=list(IDs)
+		self.IDsToValues={}
+		super(BulkUIATextRangeAttributeValueFetcher,self).__init__(textRange)
+		IDsArray=(ctypes.c_long*len(IDs))(*IDs)
+		values=textRange.GetAttributeValues(IDsArray,len(IDsArray))
+		self.IDsToValues={IDs[x]:values[x] for x in xrange(len(IDs))}
+
+	def getValue(self,ID,ignoreMixedValues=False):
+		val=self.IDsToValues[ID]
+		if not ignoreMixedValues and val==UIAHandler.handler.ReservedMixedAttributeValue:
+			raise UIAMixedAttributeError
+		return val

source/_UIAHandler.py

@@ -18,6 +18,7 @@
 
 from comtypes.gen.UIAutomationClient import *
 
+
 #Some new win8 UIA constants that could be missing
 UIA_StyleIdAttributeId=40034
 UIA_AnnotationAnnotationTypeIdPropertyId=30113

source/comInterfaces/UIAutomationClient.py

@@ -0,0 +1,3 @@
+from comtypes.gen import _944DE083_8FB8_45CF_BCB7_C477ACB2F897_0_1_0
+globals().update(_944DE083_8FB8_45CF_BCB7_C477ACB2F897_0_1_0.__dict__)
+__name__ = 'comtypes.gen.UIAutomationClient'