From e74b0dc880a49985a912d54073cf4cf093c5c595 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 24 Mar 2022 16:52:42 +0100 Subject: [PATCH] kernelbase: Reimplement LocaleNameToLCID() using the locale.nls data. Signed-off-by: Alexandre Julliard --- dlls/kernelbase/locale.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index db9466fdd58..faa7b657adc 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5596,10 +5596,15 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringW( LCID lcid, DWORD flags, const WCHAR * LCID WINAPI DECLSPEC_HOTPATCH LocaleNameToLCID( const WCHAR *name, DWORD flags ) { LCID lcid; + const NLS_LOCALE_DATA *locale = get_locale_by_name( name, &lcid ); - if (!name) return GetUserDefaultLCID(); - if (!set_ntstatus( RtlLocaleNameToLcid( name, &lcid, 2 ))) return 0; - if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES)) lcid = ConvertDefaultLocale( lcid ); + if (!locale) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES) && !locale->inotneutral) + lcid = locale->idefaultlanguage; return lcid; } -- 2.11.4.GIT