Alexandre Julliard : kernelbase: Reimplement IsValidLocaleName() using the locale.nls data.
Alexandre Julliard
julliard at winehq.org
Thu Mar 24 17:46:43 CDT 2022
Module: wine
Branch: master
Commit: da125003e6cf5522c1f97246c96c3a754b5b4f66
URL: https://source.winehq.org/git/wine.git/?a=commit;h=da125003e6cf5522c1f97246c96c3a754b5b4f66
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Mar 24 16:45:24 2022 +0100
kernelbase: Reimplement IsValidLocaleName() using the locale.nls data.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernelbase/locale.c | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index cb5441f755e..318fe24d10a 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -729,6 +729,38 @@ done:
}
+static int compare_locale_names( const WCHAR *n1, const WCHAR *n2 )
+{
+ for (;;)
+ {
+ WCHAR ch1 = *n1++;
+ WCHAR ch2 = *n2++;
+ if (ch1 >= 'a' && ch1 <= 'z') ch1 -= 'a' - 'A';
+ else if (ch1 == '_') ch1 = '-';
+ if (ch2 >= 'a' && ch2 <= 'z') ch2 -= 'a' - 'A';
+ else if (ch2 == '_') ch2 = '-';
+ if (!ch1 || ch1 != ch2) return ch1 - ch2;
+ }
+}
+
+
+static const NLS_LOCALE_LCNAME_INDEX *find_lcname_entry( const WCHAR *name )
+{
+ int min = 0, max = locale_table->nb_lcnames - 1;
+
+ while (min <= max)
+ {
+ int res, pos = (min + max) / 2;
+ const WCHAR *str = locale_strings + lcnames_index[pos].name;
+ res = compare_locale_names( name, str + 1 );
+ if (res < 0) max = pos - 1;
+ else if (res > 0) min = pos + 1;
+ else return &lcnames_index[pos];
+ }
+ return NULL;
+}
+
+
/***********************************************************************
* init_locale
*/
@@ -5190,9 +5222,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocale( LCID lcid, DWORD flags )
*/
BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocaleName( const WCHAR *locale )
{
- LCID lcid;
-
- return !RtlLocaleNameToLcid( locale, &lcid, 2 );
+ if (locale == LOCALE_NAME_USER_DEFAULT) return FALSE;
+ return !!find_lcname_entry( locale );
}
More information about the wine-cvs
mailing list