Merge d385881 into b94415e

josephsl · web-flow · commit 6d0b0972806e · 2024-07-16T22:33:20.000-06:00
diff --git a/source/UIAHandler/__init__.py b/source/UIAHandler/__init__.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2008-2023 NV Access Limited, Joseph Lee, Babbage B.V., Leonard de Ruijter, Bill Dengler
+# Copyright (C) 2008-2024 NV Access Limited, Joseph Lee, Babbage B.V., Leonard de Ruijter, Bill Dengler
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -1015,12 +1015,12 @@ def IUIAutomationPropertyChangedEventHandler_HandlePropertyChangedEvent(
 
 	def IUIAutomationNotificationEventHandler_HandleNotificationEvent(
 		self,
-		sender,
-		NotificationKind,
-		NotificationProcessing,
-		displayString,
-		activityId,
-	):
+		sender: UIA.IUIAutomationElement,
+		NotificationKind: int,
+		NotificationProcessing: int,
+		displayString: str,
+		activityId: str
+	) -> None:
 		if _isDebug():
 			log.debug(
 				"handleNotificationEvent called "
@@ -1037,8 +1037,39 @@ def IUIAutomationNotificationEventHandler_HandleNotificationEvent(
 			return
 		import NVDAObjects.UIA
 
+		# #16871: some elements do not report native window handle when in fact
+		# native window handle is shown via runtime ID.
+		# This is seen when handling Windows 11 Voice Access notifications.
+		if not (window := self.getNearestWindowHandle(sender)):
+			if _isDebug():
+				log.debugWarning(
+					"HandleNotificationEvent: native window handle not found, consulting runtime ID: "
+					f"NotificationProcessing={NotificationProcessing} "
+					f"displayString={displayString} "
+					f"activityId={activityId}"
+				)
+			if any(runtimeID := sender.getRuntimeID()):
+				# Second item in runtime ID array is native window handle.
+				window = runtimeID[1]
+				if _isDebug():
+					log.debugWarning(
+						f"HandleNotificationEvent: native window handle is {window}: "
+						f"NotificationProcessing={NotificationProcessing} "
+						f"displayString={displayString} "
+						f"activityId={activityId}"
+					)
+			else:
+				# No runtime ID (tuple is empty).
+				if _isDebug():
+					log.debugWarning(
+						"HandleNotificationEvent: native window handle not found in runtime ID: "
+						f"NotificationProcessing={NotificationProcessing} "
+						f"displayString={displayString} "
+						f"activityId={activityId}"
+					)
+					return
 		try:
-			obj = NVDAObjects.UIA.UIA(UIAElement=sender)
+			obj = NVDAObjects.UIA.UIA(windowHandle=window, UIAElement=sender)
 		except Exception:
 			if _isDebug():
 				log.debugWarning(
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -18,6 +18,7 @@
 * NVDA once again relies on events for caret movement in several cases, rather than only on manual querying of the caret position.
   * UIA for XAML and WPF text controls. (#16817, @LeonarddeR)
   * IAccessible2 for browsers such as Firefox and Chromium based browsers. (#11545, #16815, @LeonarddeR)
+* NVDA can announce more UIA notifications in apps such as Windows 11 Voice Access. (#16871, @josephsl)
 
 
 ### Changes for Developers
