Merge 187b871 into c29b291

Author: mltony

source/winInputHook.py

@@ -41,12 +41,32 @@ class MSLLHOOKSTRUCT(Structure):
 keyDownCallback=None
 keyUpCallback=None
 mouseCallback=None
+keyboardModifiers = frozenset(
+	[
+		winUser.VK_LCONTROL,
+		winUser.VK_RCONTROL,
+		winUser.VK_CONTROL,
+		winUser.VK_LSHIFT,
+		winUser.VK_RSHIFT,
+		winUser.VK_SHIFT,
+		winUser.VK_LMENU,
+		winUser.VK_RMENU,
+		winUser.VK_MENU,
+		winUser.VK_LWIN,
+		winUser.VK_RWIN,
+		winUser.VK_INSERT,
+		winUser.VK_CAPITAL,
+	]
+)
 
 @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 watchdog is currently attempting recovery, then only handle events related to keyboard modifiers:
+	if watchdog.isAttemptingRecovery and kbd.vkCode not in keyboardModifiers:
+		return windll.user32.CallNextHookEx(0, code, wParam, lParam)
 	if keyUpCallback and kbd.flags&LLKHF_UP:
 		if not keyUpCallback(kbd.vkCode,kbd.scanCode,bool(kbd.flags&LLKHF_EXTENDED),bool(kbd.flags&LLKHF_INJECTED)):
 			return 1