mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[locale,keyboard] fix loading of keyboard locales 

if keyboard locales should be loaded from a file also load the layouts
This commit is contained in:
akallabeth 2024-09-18 20:07:36 +02:00
parent 37271d01fa
commit afde8e779b
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libfreerdp/locale/keyboard_layout.c
View File

@ -1132,6 +1132,27 @@ static BOOL parse_layout_entries(WINPR_JSON* json, const char* filename)
WLog_WARN(TAG, "Invalid top level JSON type in file %s, expected an array", filename);
return FALSE;
}
sRDP_KEYBOARD_LAYOUT_TABLE_len = WINPR_JSON_GetArraySize(json);
sRDP_KEYBOARD_LAYOUT_TABLE =
calloc(sRDP_KEYBOARD_LAYOUT_TABLE_len, sizeof(RDP_KEYBOARD_LAYOUT));
if (!sRDP_KEYBOARD_LAYOUT_TABLE)
{
clear_layout_tables();
return FALSE;
}
for (size_t x = 0; x < sRDP_KEYBOARD_LAYOUT_TABLE_len; x++)
{
WINPR_JSON* obj = WINPR_JSON_GetArrayItem(json, x);
if (!obj || !parse_json_layout_entry(obj, x, &sRDP_KEYBOARD_LAYOUT_TABLE[x]))
{
clear_layout_tables();
return FALSE;
}
}
return TRUE;
}
@ -1243,12 +1264,14 @@ static BOOL CALLBACK load_layouts(PINIT_ONCE once, PVOID param, PVOID* context)
json = load_layouts_from_file(filename);
if (!json)
goto end;
if (!WINPR_JSON_IsObject(json))
{
WLog_WARN(TAG, "Invalid top level JSON type in file %s, expected an array", filename);
goto end;
}
clear_layout_tables();
{
WINPR_JSON* obj = WINPR_JSON_GetObjectItem(json, "KeyboardLayouts");
if (!parse_layout_entries(obj, filename))