Keyboard hook filter:

. Created a dedicated thread with message loop (#570)
HookFilter dll: Only call GetKeyState() if keycode is ESC (instead of every time)
DebuggerCursorUpdate(): reduce sleep from 10ms to 1ms

HookFilter/HookFilter.cpp

@@ -42,9 +42,12 @@ extern "C" __declspec(dllexport) LRESULT CALLBACK LowLevelKeyboardProc(
 		}
 
 		// Suppress ctrl-escape
-		bool ControlDown = (GetKeyState(VK_CONTROL) & 0x8000) != 0;
-		if (pKbdLlHookStruct->vkCode == VK_ESCAPE && ControlDown)
-			suppress = true;
+		if (pKbdLlHookStruct->vkCode == VK_ESCAPE)
+		{
+			bool ControlDown = (GetKeyState(VK_CONTROL) & 0x8000) != 0;
+			if (ControlDown)
+				suppress = true;
+		}
 
 		// Suppress keys by returning 1
 		if (suppress)

source/Applewin.cpp

@@ -872,8 +872,11 @@ static void RegisterHotKeys(void)
 static HINSTANCE g_hinstDLL = 0;
 static HHOOK g_hhook = 0;
 
+static HANDLE g_hHookThread = NULL;
+static DWORD g_HookThreadId = 0;
+
 // Pre: g_hFrameWindow must be valid
-bool HookFilterForKeyboard()
+static bool HookFilterForKeyboard()
 {
 	g_hinstDLL = LoadLibrary(TEXT("HookFilter.dll"));
 
@@ -905,12 +908,74 @@ bool HookFilterForKeyboard()
 	return false;
 }
 
-void UnhookFilterForKeyboard()
+static void UnhookFilterForKeyboard()
 {
 	UnhookWindowsHookEx(g_hhook);
 	FreeLibrary(g_hinstDLL);
 }
 
+static DWORD WINAPI HookThread(LPVOID lpParameter)
+{
+	if (!HookFilterForKeyboard())
+		return -1;
+
+	MSG msg;
+	while(GetMessage(&msg, NULL, 0, 0) > 0)
+	{
+		if (msg.message == WM_QUIT)
+			break;
+
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+
+	UnhookFilterForKeyboard();
+	return 0;
+}
+
+static bool InitHookThread()
+{
+	g_hHookThread = CreateThread(NULL,			// lpThreadAttributes
+								0,				// dwStackSize
+								(LPTHREAD_START_ROUTINE) HookThread,
+								0,				// lpParameter
+								0,				// dwCreationFlags : 0 = Run immediately
+								&g_HookThreadId);	// lpThreadId
+	if (g_hHookThread == NULL)
+		return false;
+
+	return true;
+}
+
+static void UninitHookThread()
+{
+	if (g_hHookThread)
+	{
+		if (!PostThreadMessage(g_HookThreadId, WM_QUIT, 0, 0))
+		{
+			_ASSERT(0);
+			return;
+		}
+
+		do
+		{
+			DWORD dwExitCode;
+			if (GetExitCodeThread(g_hHookThread, &dwExitCode))
+			{
+				if(dwExitCode == STILL_ACTIVE)
+					Sleep(10);
+				else
+					break;
+			}
+		}
+		while(1);
+
+		CloseHandle(g_hHookThread);
+		g_hHookThread = NULL;
+		g_HookThreadId = 0;
+	}
+}
+
 //===========================================================================
 
 LPSTR GetCurrArg(LPSTR lpCmdLine)
@@ -1423,7 +1488,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 
 		if (g_bHookSystemKey)
 		{
-			if (HookFilterForKeyboard())	// needs valid g_hFrameWindow (for message pump)
+			if (InitHookThread())	// needs valid g_hFrameWindow (for message pump)
 				LogFileOutput("Main: HookFilterForKeyboard()\n");
 		}
 
@@ -1535,7 +1600,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 
 		if (g_bHookSystemKey)
 		{
-			UnhookFilterForKeyboard();
+			UninitHookThread();
 			LogFileOutput("Main: UnhookFilterForKeyboard()\n");
 		}
 	}

source/Debugger/Debug.cpp

@@ -9680,7 +9680,7 @@ void DebuggerCursorUpdate()
 	}
 	else
 	{
-		Sleep(10);		// Stop process hogging CPU
+		Sleep(1);		// Stop process hogging CPU
 	}
 }