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

fix(windows): Some registry keys could have incorrect permissions

Browse source 
Fixes #3665.

On some systems, subkeys of HKCU\Software\Keyman could have incorrect
permissions and these would not be corrected with earlier fixes such as
in #2316. This fix resolves the problem by recursively correcting
permissions on all subkeys, rather than just the top two levels.

This issue caused Metro-style applications (Windows Store apps) to fail
to accept Keyman keyboard input.
This commit is contained in:
Marc Durdin 2020-10-07 11:43:13 +11:00
parent 12ad5914c3
commit 258e4b4eff
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
windows/src/engine/keyman/main.pas
View file

@ -1,18 +1,18 @@
(*
Name: main
Copyright: Copyright (C) SIL International.
Documentation:
Description:
Documentation:
Description:
Create Date: 1 Aug 2006
Modified Date: 25 Oct 2016
Authors: mcdurdin
Related Files:
Dependencies:
Related Files:
Dependencies:
Bugs:
Todo:
Notes:
Bugs:
Todo:
Notes:
History: 01 Aug 2006 - mcdurdin - Initial version
02 Aug 2006 - mcdurdin - Timeout when Beta expires
04 Dec 2006 - mcdurdin - Block Keyman loading if KM5/6 running
@ -35,8 +35,9 @@ uses
Vcl.Dialogs,
Vcl.Forms,
Winapi.Windows,
System.Win.Registry,
System.Classes,
System.SysUtils,
System.Win.Registry,
GetOsVersion,
Keyman.System.Security,
@ -189,17 +190,30 @@ end;
procedure InitialiseRegistrySecurity;
var
r: TRegistry;
procedure ProcessKey(const root: string);
var
s: string;
str: TStringList;
begin
if r.OpenKey('\' + root, True) then
begin
str := TStringList.Create;
try
r.GetKeyNames(str);
GrantPermissionToAllApplicationPackages(r.CurrentKey, KEY_READ);
for s in str do
ProcessKey(root + '\' + s);
finally
str.Free;
end;
end;
end;
begin
r := TRegistry.Create;
try
if r.OpenKey(SRegKey_KeymanRoot_CU, True) then
begin
GrantPermissionToAllApplicationPackages(r.CurrentKey, KEY_READ);
// #1680 - on some systems, HKCU\Software\Keyman\Keyman Engine is not
// inheriting permissions from HKCU\Software\Keyman
if r.OpenKey('\' + SRegKey_KeymanEngineRoot_CU, True) then
GrantPermissionToAllApplicationPackages(r.CurrentKey, KEY_READ);
end;
ProcessKey(SRegKey_KeymanRoot_CU);
finally
r.Free;
end;