From: Matteo Bruni <mbruni@codeweavers.com> To avoid confusion with "Layout Id" which is related to layout variants. --- dlls/winex11.drv/keyboard.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 65de84678ec..4b7cb07feb1 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1475,11 +1475,11 @@ static BOOL find_xkb_layout_variant( const char *name, const char **layout, cons return FALSE; } -static const struct layout_id_map_entry +static const struct langid_map_entry { const char *name; LANGID langid; -} layout_ids[] = +} langid_map[] = { { "af", MAKELANGID(LANG_DARI, SUBLANG_DEFAULT) }, { "al", MAKELANGID(LANG_ALBANIAN, SUBLANG_DEFAULT) }, @@ -1580,17 +1580,17 @@ static const struct layout_id_map_entry { "za", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA) }, }; -static int layout_id_map_cmp( const void *key, const void *element ) +static int langid_map_cmp( const void *key, const void *element ) { - const struct layout_id_map_entry *entry = element; + const struct langid_map_entry *entry = element; return strcmp( key, entry->name ); } static LANGID langid_from_xkb_layout( const char *layout ) { - struct layout_id_map_entry *entry; + struct langid_map_entry *entry; - entry = bsearch( layout, layout_ids, ARRAY_SIZE(layout_ids), sizeof(*layout_ids), layout_id_map_cmp ); + entry = bsearch( layout, langid_map, ARRAY_SIZE(langid_map), sizeof(*langid_map), langid_map_cmp ); if (entry) return entry->langid; FIXME( "Unknown layout %s\n", debugstr_a(layout) ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10779