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

[Windows] Elevate Keyman start if debugging is enabled. Partial fix for #2152.

Browse source
This commit is contained in:
Marc Durdin 2019-10-01 19:40:30 +10:00
parent c7ec3c6354
commit bd9d6c5e4e
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
windows/src/engine/kmcomapi/util/utilkeymancontrol.pas
View file

@ -48,10 +48,17 @@ type
implementation
uses
ErrorControlledRegistry, RegistryKeys, shellapi, SysUtils, keymanerrorcodes, Variants, GetOsVersion,
utilkeymanoption,
System.SysUtils,
System.Variants,
ErrorControlledRegistry,
RegistryKeys,
keymanerrorcodes,
GetOsVersion,
KeymanOptionNames,
keymanpaths,
utilexecute, keyman_implementation;
utilexecute,
keyman_implementation;
{ TKeymanController }
@ -73,7 +80,7 @@ end;
procedure TKeymanController.ControlKeyman(const code: string);
var
path: string;
verb, path: string;
hwnd: THandle;
begin
path := TKeymanPaths.KeymanEngineInstallPath(TKeymanPaths.S_KeymanExe);
@ -88,7 +95,19 @@ begin
if hwnd = 0 then
hwnd := GetDesktopWindow;
if not TUtilExecute.Shell(hwnd, path, ExtractFileDir(path), '-kmc '+code) then // I3349
if ((FKeyman as TKeyman).Options as IKeymanOptions).Items[koDebugging].Value = True then
begin
// We run Keyman elevated when Debugging mode is switched on. This is because starting a
// trace requires certain permissions which a normal user doesn't have (refer StartTrace
// documentation). This is also a good visual reminder to the user that Debugging is
// active and as it is slightly annoying to be prompted to elevate, will over time encourage
// them to switch it off again, which is good ;-)
verb := 'runas';
end
else
verb := 'open';
if not TUtilExecute.Shell(hwnd, path, ExtractFileDir(path), '-kmc '+code, SW_SHOWNORMAL, verb) then // I3349
(FKeyman as TKeyman).Errors.AddFmt(KMN_E_KeymanControl_CannotStartProduct, VarArrayOf([path + ' (error='+IntToStr(GetLastError)+','+SysErrorMessage(GetLastError)+')', 'Keyman']), kesFatal);
end;