msvcrt: Simplify get_current_locale_noalloc implementation.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Simplify get_current_locale_noalloc implementation.
40d4fbe4 · Piotr Caban · Alexandre Julliard · a7f124eb · 40d4fbe4
Commit 40d4fbe4 authored Nov 25, 2020 by Piotr Caban Committed by Alexandre Julliard Nov 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 12 deletions

locale.c dlls/msvcrt/locale.c +3 -12

No files found.
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -1174,20 +1174,11 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale)
 {
    thread_data_t *data = msvcrt_get_thread_data();

-    if(!data || !(data->locale_flags & LOCALE_THREAD))
-    {
-        _lock_locales();
-        *locale = *MSVCRT_locale;
-    }
-    else
-    {
-        locale->locinfo = data->locinfo;
-        locale->mbcinfo = data->mbcinfo;
-    }
+    update_thread_locale(data);
+    locale->locinfo = data->locinfo;
+    locale->mbcinfo = data->mbcinfo;

    grab_locinfo(locale->locinfo);
-    if(locale->locinfo == MSVCRT_locale->locinfo)
-        _unlock_locales();
    InterlockedIncrement(&locale->mbcinfo->refcount);
    return locale;
 }