kernel32: Improve locale detection on Android.

setlocale is coded to just return 'C' for all inquiries ignoring locale that may be set in the environment. Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Improve locale detection on Android.
9dc5d299 · Aric Stewart · Alexandre Julliard · 19d8fcc4 · 9dc5d299
Commit 9dc5d299 authored Mar 30, 2017 by Aric Stewart Committed by Alexandre Julliard Apr 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

locale.c dlls/kernel32/locale.c +9 -0

No files found.
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -985,6 +985,15 @@ static const char* get_locale(int category, const char* category_name)
 {
    const char* ret = setlocale(category, NULL);

+#ifdef __ANDROID__
+    if (!strcmp(ret, "C"))
+    {
+        ret = getenv( category_name );
+        if (!ret || !ret[0]) ret = getenv( "LC_ALL" );
+        if (!ret || !ret[0]) ret = "C";
+    }
+#endif
+
 #ifdef __APPLE__
    /* If LC_ALL is set, respect it as a user override.
       If LC_* is set, respect it as a user override, except if it's LC_CTYPE