Merge a41fe79 into bd5b338

seanbudd · web-flow · commit d3db45f4f377 · 2022-09-05T11:41:29.000+10:00
diff --git a/source/IAccessibleHandler/__init__.py b/source/IAccessibleHandler/__init__.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2021 NV Access Limited, Łukasz Golonka, Leonard de Ruijter
+# Copyright (C) 2006-2022 NV Access Limited, Łukasz Golonka, Leonard de Ruijter
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -797,6 +797,7 @@ def processDesktopSwitchWinEvent(window, objectID, childID):
 		)
 	hDesk = windll.user32.OpenInputDesktop(0, False, 0)
 	if hDesk != 0:
+		api.setDesktopObject(NVDAObjects.window.Desktop(windowHandle=hDesk))
 		windll.user32.CloseDesktop(hDesk)
 		core.callLater(200, _correctFocus)
 	else:
@@ -805,6 +806,7 @@ def processDesktopSwitchWinEvent(window, objectID, childID):
 		# so clear our recorded modifiers.
 		keyboardHandler.currentModifiers.clear()
 		obj = SecureDesktopNVDAObject(windowHandle=window)
+		api.setDesktopObject(obj)
 		eventHandler.executeEvent("gainFocus", obj)
 
 
diff --git a/source/NVDAObjects/__init__.py b/source/NVDAObjects/__init__.py
@@ -330,11 +330,10 @@ def objectWithFocus():
 		return obj
 
 	@staticmethod
-	def objectInForeground():
+	def objectInForeground() -> typing.Optional["NVDAObject"]:
 		"""Retrieves the object representing the current foreground control according to the
 		Operating System. This may differ from NVDA's cached foreground object.
 		@return: the foreground object
-		@rtype: L{NVDAObject}
 		"""
 		kwargs={}
 		APIClass=NVDAObject.findBestAPIClass(kwargs,relation="foreground")
diff --git a/source/eventHandler.py b/source/eventHandler.py
@@ -329,7 +329,7 @@ def doPreGainFocus(obj: "NVDAObjects.NVDAObject", sleepMode: bool = False) -> bo
 
 	if globalVars.focusDifferenceLevel<=1:
 		newForeground=api.getDesktopObject().objectInForeground()
-		if not newForeground:
+		if not newForeground or _isSecureObjectWhileLockScreenActivated(newForeground):
 			log.debugWarning("Can not get real foreground, resorting to focus ancestors")
 			ancestors=api.getFocusAncestors()
 			if len(ancestors)>1:
diff --git a/source/utils/security.py b/source/utils/security.py
@@ -105,6 +105,7 @@ def isObjectAboveLockScreen(obj: "NVDAObjects.NVDAObject") -> bool:
 	but other Windows can be focused (e.g. Windows Magnifier).
 	"""
 	import appModuleHandler
+	from IAccessibleHandler import SecureDesktopNVDAObject
 	from NVDAObjects.IAccessible import TaskListIcon
 
 	foregroundWindow = winUser.getForegroundWindow()
@@ -118,6 +119,10 @@ def isObjectAboveLockScreen(obj: "NVDAObjects.NVDAObject") -> bool:
 		# The task switcher window does not become the foreground process on the lock screen,
 		# so we must whitelist it explicitly.
 		isinstance(obj, TaskListIcon)
+		# Secure Desktop Object.
+		# Used to indicate to the user and to API consumers (including NVDA remote),
+		# that the user has switched to a secure desktop.
+		or isinstance(obj, SecureDesktopNVDAObject)
 	):
 		return True
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -3,6 +3,14 @@ What's New in NVDA
 
 %!includeconf: ../changes.t2tconf
 
+= 2022.2.3 =
+This is a patch release to fix an accidental API breakage introduced in 2022.2.1.
+
+== Bug Fixes ==
+- Fixed a bug where NVDA did not announce "Secure Desktop" when entering a secure desktop.
+This caused NVDA remote to not recognize secure desktops. (#14094)
+-
+
 = 2022.2.2 =
 This is a patch release to fix a bug introduced in 2022.2.1 with input gestures.
 
