Merge c1ef191 into d304ed0

Author: mltony

source/core.py

@@ -651,8 +651,9 @@ def handlePowerStatusChange(self):
 	import inputCore
 	inputCore.initialize()
 	import keyboardHandler
+	import watchdog
 	log.debug("Initializing keyboard handler")
-	keyboardHandler.initialize()
+	keyboardHandler.initialize(watchdog.WatchdogObserver())
 	import mouseHandler
 	log.debug("initializing mouse handler")
 	mouseHandler.initialize()
@@ -692,7 +693,6 @@ def handlePowerStatusChange(self):
 	# Queue the handling of initial focus,
 	# as API handlers might need to be pumped to get the first focus event.
 	queueHandler.queueFunction(queueHandler.eventQueue, _setInitialFocus)
-	import watchdog
 	import baseObject
 
 	# Doing this here is a bit ugly, but we don't want these modules imported

source/keyboardHandler.py

@@ -29,7 +29,7 @@
 import core
 from contextlib import contextmanager
 import threading
-
+_watchdogObserver = None
 ignoreInjected=False
 
 # Fake vk codes.
@@ -195,6 +195,10 @@ def internal_keyDownEvent(vkCode,scanCode,extended,injected):
 			currentModifiers.discard(stickyNVDAModifier)
 			stickyNVDAModifier = None
 
+		if _watchdogObserver._get_isAttemptingRecovery():
+			# When attempting recovery only process modifiers, but do not execute gesture.
+			return True
+
 		try:
 			inputCore.manager.executeGesture(gesture)
 			gestureExecuted=True
@@ -208,6 +212,8 @@ def internal_keyDownEvent(vkCode,scanCode,extended,injected):
 	except:
 		log.error("internal_keyDownEvent", exc_info=True)
 	finally:
+		if _watchdogObserver._get_isAttemptingRecovery():
+			return True
 		# #6017: handle typed characters in Win10 RS2 and above where we can't detect typed characters in-process 
 		# This code must be in the 'finally' block as code above returns in several places yet we still want to execute this particular code.
 		focus=api.getFocusObject()
@@ -275,8 +281,10 @@ def internal_keyUpEvent(vkCode,scanCode,extended,injected):
 
 #Register internal key press event with  operating system
 
-def initialize():
+def initialize(watchdogObserver=None):
 	"""Initialises keyboard support."""
+	global _watchdogObserver
+	_watchdogObserver = watchdogObserver
 	winInputHook.initialize()
 	winInputHook.setCallbacks(keyDown=internal_keyDownEvent,keyUp=internal_keyUpEvent)
 

source/watchdog.py

@@ -370,3 +370,8 @@ def cancellableSendMessage(hwnd, msg, wParam, lParam, flags=0, timeout=60000):
 	result = ctypes.wintypes.DWORD()
 	NVDAHelper.localLib.cancellableSendMessageTimeout(hwnd, msg, wParam, lParam, flags, timeout, ctypes.byref(result))
 	return result.value
+
+class WatchdogObserver:
+	def _get_isAttemptingRecovery(self):
+		global isAttemptingRecovery
+		return isAttemptingRecovery

source/winInputHook.py

@@ -44,7 +44,7 @@ class MSLLHOOKSTRUCT(Structure):
 
 @WINFUNCTYPE(c_long,c_int,WPARAM,LPARAM)
 def keyboardHook(code,wParam,lParam):
-	if watchdog.isAttemptingRecovery or code!=HC_ACTION:
+	if code != HC_ACTION:
 		return windll.user32.CallNextHookEx(0,code,wParam,lParam)
 	kbd=KBDLLHOOKSTRUCT.from_address(lParam)
 	if keyUpCallback and kbd.flags&LLKHF_UP: