erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-03 14:17:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

fix(windows): CompileForBaseKeyboard doesn't return
Some checks failed
Keyman Build Summary / Summarize build status checks (push) Has been cancelled
Details

Browse source 
a value
This commit is contained in:
rc-swag 2026-09-02 17:54:26 +10:00
parent 3c1b47eedc
commit 8e77a5779a
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
windows/src/desktop/kmshell/main/UfrmBaseKeyboard.pas
View file

@ -21,7 +21,7 @@ type
function ConfigureBaseKeyboard(out BaseKeyboardID: Integer): Boolean;
function SetBaseKeyboard(WindowHandle: THandle; BaseKeyboardID: Integer): Boolean;
function MCompileBaseKeyboard(const BaseKeyboardIDText: string): Boolean;
function CompileForBaseKeyboard(BaseKeyboardID: Integer): Boolean;
procedure CompileForBaseKeyboard(BaseKeyboardID: Integer);
implementation
@ -84,7 +84,9 @@ begin
if not TryStrToInt('$' + BaseKeyboardIDText, BaseKeyboardID) or
not kmcom.SystemInfo.IsAdministrator then
Exit;
Result := CompileForBaseKeyboard(BaseKeyboardID);
CompileForBaseKeyboard(BaseKeyboardID);
// TODO: sort out whether we need todo return a result
Result := True;
end;
function BaseKeyboardNeedsMCompile(BaseKeyboardID: Integer): Boolean;
@ -108,29 +110,24 @@ begin
end;
function SetBaseKeyboard(WindowHandle: THandle; BaseKeyboardID: Integer): Boolean;
var
MCompileResult: Boolean;
begin
MCompileResult := True;
Result := False;
if BaseKeyboardNeedsMCompile(BaseKeyboardID) then
begin
if not kmcom.SystemInfo.IsAdministrator then
begin
MCompileResult := WaitForElevatedConfiguration(WindowHandle, '-mcompilekbds ' + IntToHex(BaseKeyboardID, 8)) = 0;
WaitForElevatedConfiguration(WindowHandle, '-mcompilekbds ' + IntToHex(BaseKeyboardID, 8));
end
else
MCompileResult := CompileForBaseKeyboard(BaseKeyboardID);
CompileForBaseKeyboard(BaseKeyboardID);
end;
if not MCompileResult then
Exit;
kmcom.Options['koBaseLayout'].Value := BaseKeyboardID;
kmcom.Options.Apply;
Result := True;
end;
function CompileForBaseKeyboard(BaseKeyboardID: Integer): Boolean;
procedure CompileForBaseKeyboard(BaseKeyboardID: Integer);
var
i: Integer;
kbd: IKeymanKeyboardInstalled;