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

Merge pull request #3799 from keymanapp/fix/windows/3798-profile-disable-enable-incorrect-langid

Browse source 
fix(windows): disabling/enabling a profile could have wrong association
This commit is contained in:
Marc Durdin 2020-10-30 17:23:01 +11:00 • committed by GitHub
commit 1fac72cceb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
windows/src/engine/kmcomapi/com/keyboardlanguages/keymankeyboardlanguage.pas
View file

@ -26,6 +26,7 @@ type
override;
function GetLangName: string; virtual;
procedure SetLangID(Value: Integer);
{ IKeymanKeyboardLanguage }
function Get_BCP47Code: WideString; safecall;
@ -146,4 +147,9 @@ begin
'langname', GetLangName]);
end;
procedure TKeymanKeyboardLanguage.SetLangID(Value: Integer);
begin
FLangID := Value;
end;
end.

12
windows/src/engine/kmcomapi/com/keyboardlanguages/keymankeyboardlanguageinstalled.pas
View file

@ -133,6 +133,8 @@ begin
with TKPUninstallKeyboardLanguage.Create(Context) do
try
UninstallTip(FOwner.ID, Get_LangID, Get_ProfileGUID, False);
if IsTransientLanguageID(Get_LangID) then
SetLangID(0);
finally
Free;
end;
@ -189,12 +191,15 @@ procedure TKeymanKeyboardLanguageInstalled.InstallTip(LangID: Integer;
const TemporaryKeyboardToRemove: WideString);
var
kp: TKPInstallKeyboardLanguage;
guid: TGUID;
begin
kp := TKPInstallKeyboardLanguage.Create(Context);
try
kp.InstallTip(FOwner.ID, Get_BCP47Code, LangID);
kp.InstallTip(FOwner.ID, Get_BCP47Code, LangID, guid);
if TemporaryKeyboardToRemove <> '' then
kp.UninstallTemporaryLayout(TemporaryKeyboardToRemove);
Self.SetLangID(LangID);
Self.FProfileGUID := guid;
finally
kp.Free;
end;
@ -226,11 +231,14 @@ begin
end;
procedure TKeymanKeyboardLanguageInstalled.Install;
var
guid: TGUID;
begin
if not Get_IsInstalled then
with TKPInstallKeyboardLanguage.Create(Context) do
try
InstallTip(FOwner.ID, Get_BCP47Code, Get_LangID);
InstallTip(FOwner.ID, Get_BCP47Code, Get_LangID, guid);
Self.FProfileGUID := guid;
finally
Free;
end;

10
windows/src/engine/kmcomapi/processes/keyboard/Keyman.System.Process.KPInstallKeyboardLanguage.pas
View file

@ -49,7 +49,8 @@ type
/// <param name="KeyboardID">Keyman keyboard to associate with TIP</param>
/// <param name="BCP47Tag">BCP47 tag associated with the TIP</param>
/// <param name="LangID">Language ID found with FindInstallationLangID</param>
procedure InstallTip(const KeyboardID, BCP47Tag: string; LangID: Integer);
/// <param name="guidProfile">Profile GUID that is assigned on exit</param>
procedure InstallTip(const KeyboardID, BCP47Tag: string; LangID: Integer; var guidProfile: TGUID);
/// <summary>Removes a temporary keyboard layout that was installed by
/// FindInstallationLangID. Current User.</summary>
@ -425,10 +426,9 @@ begin
Context.Control.AutoApplyKeyman;
end;
procedure TKPInstallKeyboardLanguage.InstallTip(const KeyboardID, BCP47Tag: string; LangID: Integer);
procedure TKPInstallKeyboardLanguage.InstallTip(const KeyboardID, BCP47Tag: string; LangID: Integer; var guidProfile: TGUID);
var
FIsAdmin: Boolean;
guid: TGUID;
reg: TRegistry;
RootPath, FLayoutInstallString: string;
begin
@ -455,7 +455,7 @@ begin
if not reg.ValueExists(SRegValue_KeymanProfileGUID) then
ErrorFmt(KMN_E_ProfileInstall_RegistryCorrupt, VarArrayOf([KeyboardID]));
guid := StringToGuid(reg.ReadString(SRegValue_KeymanProfileGUID));
guidProfile := StringToGuid(reg.ReadString(SRegValue_KeymanProfileGUID));
finally
reg.Free;
end;
@ -464,7 +464,7 @@ begin
// Install the TIP into Windows
//
FLayoutInstallString := GetLayoutInstallString(LangID, guid);
FLayoutInstallString := GetLayoutInstallString(LangID, guidProfile);
if not InstallLayoutOrTip(PChar(FLayoutInstallString), 0) then // I4302
ErrorFmt(KMN_E_ProfileInstall_InstallLayoutOrTipFailed, VarArrayOf([KeyboardID]));

6
windows/src/engine/kmcomapi/processes/keyboard/kpinstallkeyboard.pas
View file

@ -275,12 +275,13 @@ procedure TKPInstallKeyboard.LegacyRegisterAndInstallLanguageProfile(Langs: arra
var
kpil: TKPInstallKeyboardLanguage;
BCP47Tag: string;
guid: TGUID;
begin
BCP47Tag := TLanguageCodeUtils.TranslateWindowsLanguagesToBCP47(Langs[0]);
kpil := TKPInstallKeyboardLanguage.Create(Context);
try
kpil.RegisterTip(KeyboardID, BCP47Tag, KeyboardName, Langs[0], IconFileName, '');
kpil.InstallTip(KeyboardID, BCP47Tag, Langs[0]);
kpil.InstallTip(KeyboardID, BCP47Tag, Langs[0], guid);
finally
Free;
end;
@ -291,6 +292,7 @@ var
kpil: TKPInstallKeyboardLanguage;
TemporaryKeyboardID: string;
LangID: Integer;
guid: TGUID;
begin
Result := False;
kpil := TKPInstallKeyboardLanguage.Create(Context);
@ -298,7 +300,7 @@ begin
if kpil.FindInstallationLangID(BCP47Tag, LangID, TemporaryKeyboardID, []) then
begin
kpil.RegisterTip(KeyboardID, BCP47Tag, KeyboardID, LangID, IconFileName, '');
kpil.InstallTip(KeyboardID, BCP47Tag, LangID);
kpil.InstallTip(KeyboardID, BCP47Tag, LangID, guid);
Result := True;
end;
finally