erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix(windows): use Thai Kedmanee instead of Arabic 101 in RightAltEmulationCheck.tests.cpp

Browse source 
Fixes: #15345
Test-bot: skip
This commit is contained in:
Marc Durdin 2025-12-12 06:11:33 +11:00
parent 3048705c9b
commit b26a2f1ad4
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
windows/src/engine/keyman32/RightAltEmulationCheck.cpp
View file

@ -65,7 +65,7 @@ typedef PKBDTABLES_WOW64 (WINAPI *PKBDLAYERDESCRIPTORWOW64FUNC)(VOID);
#endif
HMODULE LoadKbdLibrary(const char* keyboardLayoutName);
BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName);
BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName, BOOL& result);
typedef PKBDTABLES (WINAPI *PKBDLAYERDESCRIPTORFUNC)(VOID);
@ -92,14 +92,15 @@ BOOL KeyboardGivesCtrlRAltForRAlt() {
char keyboardLayoutName[KL_NAMELENGTH+1];
GetKeyboardLayoutName(keyboardLayoutName);
altGrFlag = ReadAltGrFlagFromKbdDll(keyboardLayoutName);
ReadAltGrFlagFromKbdDll(keyboardLayoutName, altGrFlag);
}
return altGrFlag;
}
BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName) {
BOOL result = FALSE;
BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName, BOOL& result) {
BOOL success = FALSE;
result = FALSE;
HMODULE hKbdLibrary = LoadKbdLibrary(keyboardLayoutName);
if(!hKbdLibrary) {
@ -118,6 +119,7 @@ BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName) {
PKBDTABLES_WOW64 KbdTables = (*KbdLayerDescriptorFunc)();
if(KbdTables) {
result = (KbdTables->fLocaleFlags & KLLF_ALTGR) ? TRUE : FALSE;
success = TRUE;
}
}
} else {
@ -130,13 +132,14 @@ BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName) {
PKBDTABLES KbdTables = (*KbdLayerDescriptorFunc)();
if(KbdTables) {
result = (KbdTables->fLocaleFlags & KLLF_ALTGR) ? TRUE : FALSE;
success = TRUE;
}
}
}
FreeLibrary(hKbdLibrary);
return result;
return success;
}
HMODULE LoadKbdLibrary(const char* keyboardLayoutName) {

21
windows/src/engine/keyman32/tests/RightAltEmulationCheck.tests.cpp
View file

@ -1,6 +1,6 @@
#include "pch.h"
extern BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName);
extern BOOL ReadAltGrFlagFromKbdDll(const char *keyboardLayoutName, BOOL& result);
TEST(RightAltEmulationCheck, ReadAltGrFlagFromKbdDll) {
@ -9,12 +9,23 @@ TEST(RightAltEmulationCheck, ReadAltGrFlagFromKbdDll) {
// a known keyboard layout
// These keyboards do not use AltGr
BOOL result = FALSE;
EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000409"), FALSE); // kbdus.dll - English (US)
EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000401"), FALSE); // kbda1.dll - Arabic 101
// kbdus.dll - English (US)
EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000409", result), TRUE);
EXPECT_EQ(result, FALSE);
// kbda1.dll - Thai Kedmanee
EXPECT_EQ(ReadAltGrFlagFromKbdDll("0000041e", result), TRUE);
EXPECT_EQ(result, FALSE);
// These keyboards use AltGr
EXPECT_EQ(ReadAltGrFlagFromKbdDll("0000040C"), TRUE); // kbdfr.dll - French AZERTY (Legacy)
EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000405"), TRUE); // kbdcz.dll - Czech
// kbdfr.dll - French AZERTY (Legacy)
EXPECT_EQ(ReadAltGrFlagFromKbdDll("0000040C", result), TRUE);
EXPECT_EQ(result, TRUE);
// kbdcz.dll - Czech
EXPECT_EQ(ReadAltGrFlagFromKbdDll("00000405", result), TRUE);
EXPECT_EQ(result, TRUE);
}