diff --git a/windows/src/engine/keyman32/K32_load.cpp b/windows/src/engine/keyman32/K32_load.cpp index ed2889b375..ed07f26fe7 100644 --- a/windows/src/engine/keyman32/K32_load.cpp +++ b/windows/src/engine/keyman32/K32_load.cpp @@ -45,12 +45,6 @@ BOOL GetKeyboardFileName(LPSTR kbname, LPSTR buf, int nbuf) { PKEYMAN64THREADDATA _td = ThreadGlobals(); if(!_td) return FALSE; - if(_td->ForceFileName[0]) - { - strncpy_s(buf, nbuf, _td->ForceFileName, nbuf - 1); - buf[nbuf-1] = 0; - return TRUE; - } int n = 0; RegistryReadOnly *reg = Reg_GetKeymanInstalledKeyboard(kbname); diff --git a/windows/src/engine/keyman32/appint/aiTIP.cpp b/windows/src/engine/keyman32/appint/aiTIP.cpp index 8b4fd9ed6b..dba603d6b2 100644 --- a/windows/src/engine/keyman32/appint/aiTIP.cpp +++ b/windows/src/engine/keyman32/appint/aiTIP.cpp @@ -595,7 +595,6 @@ BOOL AITIP::QueueDebugInformation(int ItemType, LPGROUP Group, LPKEY Rule, PWSTR { PKEYMAN64THREADDATA _td = ThreadGlobals(); if(!_td) return TRUE; - if(!_td->ForceFileName[0]) return TRUE; SendDebugMessageFormat(0, sdmAIDefault, 0, "AIDebugger::QueueDebugInformation ItemType=%d", ItemType); AIDEBUGINFO di; @@ -620,19 +619,3 @@ BOOL AITIP::QueueDebugInformation(int ItemType, LPGROUP Group, LPKEY Rule, PWSTR return TRUE; } - -typedef BOOL(WINAPI *PREFRESHPRESERVEDKEYSFUNC)(BOOL Activating); - -void RefreshPreservedKeys(BOOL Activating) { -#ifdef _WIN64 - HMODULE hModule = GetModuleHandle("kmtip64"); -#else - HMODULE hModule = GetModuleHandle("kmtip"); -#endif - if (hModule != NULL) { - PREFRESHPRESERVEDKEYSFUNC pRefreshPreservedKeys = (PREFRESHPRESERVEDKEYSFUNC)GetProcAddress(hModule, "RefreshPreservedKeys"); - if (pRefreshPreservedKeys) { - pRefreshPreservedKeys(Activating); - } - } -} diff --git a/windows/src/engine/keyman32/globals.h b/windows/src/engine/keyman32/globals.h index 1465bab24d..320ef811de 100644 --- a/windows/src/engine/keyman32/globals.h +++ b/windows/src/engine/keyman32/globals.h @@ -215,8 +215,6 @@ typedef struct tagKEYMAN64THREADDATA FInitialised, FInitialising; - char ForceFileName[MAX_PATH]; - DWORD ActiveKeymanID; /* TIP Globals */ diff --git a/windows/src/engine/keyman32/keyman32.cpp b/windows/src/engine/keyman32/keyman32.cpp index 7444a696d4..7a2490f925 100644 --- a/windows/src/engine/keyman32/keyman32.cpp +++ b/windows/src/engine/keyman32/keyman32.cpp @@ -529,19 +529,6 @@ extern "C" BOOL _declspec(dllexport) WINAPI Keyman_RestartEngine() return TRUE; } -/*******************************************************************************************/ -/* */ -/* Keyman Keyboard Override Functions */ -/* */ -/*******************************************************************************************/ - - - -void RefreshPreservedKeys(BOOL Activating); - - - - //--------------------------------------------------------------------------------------------------------- // // Utility guff functions @@ -914,7 +901,11 @@ void ReleaseKeyboards(BOOL Lock) if(!_td || !_td->lpKeyboards) return; - if(Lock) if(_td->lpActiveKeyboard && !_td->ForceFileName[0]) DeactivateDLLs(_td->lpActiveKeyboard); + if(Lock) { + if(_td->lpActiveKeyboard) { + DeactivateDLLs(_td->lpActiveKeyboard); + } + } for(int i = 0; i < _td->nKeyboards; i++) { @@ -928,7 +919,6 @@ void ReleaseKeyboards(BOOL Lock) delete _td->lpKeyboards; _td->lpKeyboards = NULL; - if(!_td->ForceFileName[0]) _td->lpActiveKeyboard = NULL; } /** diff --git a/windows/src/engine/keyman32/selectkeyboard.cpp b/windows/src/engine/keyman32/selectkeyboard.cpp index d600262fd4..0ca9e2e65f 100644 --- a/windows/src/engine/keyman32/selectkeyboard.cpp +++ b/windows/src/engine/keyman32/selectkeyboard.cpp @@ -71,11 +71,6 @@ BOOL SelectKeyboard(DWORD KeymanID) __try { - if (_td->ForceFileName[0]) - { - SendDebugMessageFormat(hwnd, sdmGlobal, 0, "SelectKeyboard: Ignored due to ForceFile"); - return FALSE; // Keyboard file is force-loaded - } KMHideIM();