erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-18 11:57:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chore: address review comments

Browse source
This commit is contained in:
Marc Durdin 2021-05-07 17:17:48 +10:00
parent c9248ca7ec
commit de34944b0e
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
windows/src/engine/keymanx64/keymanx64.cpp
View file

@ -55,6 +55,8 @@ HANDLE hParentProcessHandle = NULL; // Keyman x86 process handle
HANDLE hWatcherThread = NULL;
HANDLE hWatcherThreadTerminateEvent = NULL;
BOOL KeymanStarted = FALSE;
// Global strings
const PWSTR
@ -310,6 +312,8 @@ BOOL StartKeyman(HWND hWnd)
if(!Keyman_Initialise(hWnd, FALSE))
return Fail(hWnd, szError_FailedToInitialise);
KeymanStarted = TRUE;
return TRUE;
}
@ -352,8 +356,11 @@ BOOL CreateWatcherThread(HWND hWnd) {
return FALSE;
hWatcherThread = CreateThread(NULL, 0, WatcherThreadProc, hWnd, 0, NULL);
if (hWatcherThread == NULL)
if (hWatcherThread == NULL) {
CloseHandle(hWatcherThreadTerminateEvent);
hWatcherThreadTerminateEvent = NULL;
return FALSE;
}
return TRUE;
}
@ -366,18 +373,20 @@ BOOL CreateWatcherThread(HWND hWnd) {
//
void Shutdown()
{
int wm_keyman = RegisterWindowMessage(L"wm_keyman");
DWORD_PTR dwResult;
if (KeymanStarted) {
int wm_keyman = RegisterWindowMessage(L"wm_keyman");
DWORD_PTR dwResult;
Keyman_StartExit(); // I3092
Keyman_StartExit(); // I3092
/* Tell all threads that it is time to exit. This is important to do before we shutdown
because we want to try and detach from as many processes as possible so we don't
remain locked in memory. */
/* Tell all threads that it is time to exit. This is important to do before we shutdown
because we want to try and detach from as many processes as possible so we don't
remain locked in memory. */
SendMessageTimeout(HWND_BROADCAST, wm_keyman, KM_EXIT, 0, SMTO_NORMAL, 1000, &dwResult); // I3092
SendMessageTimeout(HWND_BROADCAST, wm_keyman, KM_EXIT, 0, SMTO_NORMAL, 1000, &dwResult); // I3092
Keyman_Exit();
Keyman_Exit();
}
/* Unregister those windows that we registered earlier - don't fail on error though */
@ -388,11 +397,16 @@ void Shutdown()
/* Cleanup */
SetEvent(hWatcherThreadTerminateEvent);
WaitForSingleObject(hWatcherThread, INFINITE);
CloseHandle(hWatcherThread);
CloseHandle(hWatcherThreadTerminateEvent);
CloseHandle(hParentProcessHandle);
if (hWatcherThreadTerminateEvent != NULL) {
// Both of these handles will be valid if one of them is, per CreateWatcherThread
SetEvent(hWatcherThreadTerminateEvent);
WaitForSingleObject(hWatcherThread, INFINITE);
CloseHandle(hWatcherThread);
CloseHandle(hWatcherThreadTerminateEvent);
}
if (hParentProcessHandle != NULL) {
CloseHandle(hParentProcessHandle);
}
}
//