Merge 395462e into 12803e9

michaelDCurran · web-flow · commit 518f51063860 · 2022-10-23T17:22:39.000+10:00
diff --git a/source/appModules/outlook.py b/source/appModules/outlook.py
@@ -9,6 +9,7 @@
 import comtypes.client
 import comtypes.automation
 import ctypes
+import winVersion
 from hwPortUtils import SYSTEMTIME
 import scriptHandler
 from scriptHandler import script
@@ -99,6 +100,21 @@ def getSentMessageString(obj):
 
 class AppModule(appModuleHandler.AppModule):
 
+	def isGoodUIAWindow(self, hwnd: int) -> bool:
+		windowClass = winUser.getClassName(hwnd)
+		versionMajor = int(self.productVersion.split('.')[0])
+		if (
+			versionMajor >= 16
+			and windowClass == "RICHEDIT60W"
+			and winVersion.getWinVer() >= winVersion.WIN10
+		):
+			# #12726: RICHEDIT60W In Outlook 2016+ on Windows 10+
+			# has a very good UI Automation implementation,
+			# Though oddly IsServerSideProvider returns false for these windows.
+			# Examples: date picker in the Outlook Advanced search dialog
+			return True
+		return False
+
 	def __init__(self,*args,**kwargs):
 		super(AppModule,self).__init__(*args,**kwargs)
 		# Explicitly allow gainFocus events for the window class that hosts the active Outlook DatePicker cell
