ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Lock global locale in _get_current_locale. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-11-18 17:26:50 +01:00 committed by Alexandre Julliard
parent df2b13fa77
commit 216b9cb080
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/msvcrt/locale.c
View File

@ -1117,6 +1117,22 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo)
MSVCRT_free(mbcinfo); MSVCRT_free(mbcinfo);
} }
/*********************************************************************
* _lock_locales (UCRTBASE.@)
*/
void CDECL _lock_locales(void)
{
_mlock(_SETLOCALE_LOCK);
}
/*********************************************************************
* _unlock_locales (UCRTBASE.@)
*/
void CDECL _unlock_locales(void)
{
_munlock(_SETLOCALE_LOCK);
}
MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale)
{ {
thread_data_t *data = msvcrt_get_thread_data(); thread_data_t *data = msvcrt_get_thread_data();
@ -1124,6 +1140,7 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale)
if(!data || !data->have_locale) if(!data || !data->have_locale)
{ {
_lock_locales();
*locale = *MSVCRT_locale; *locale = *MSVCRT_locale;
} }
else else
@ -1144,6 +1161,8 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale)
if(locale->locinfo->ctype1_refcount) if(locale->locinfo->ctype1_refcount)
InterlockedIncrement(locale->locinfo->ctype1_refcount); InterlockedIncrement(locale->locinfo->ctype1_refcount);
InterlockedIncrement(&locale->locinfo->lc_time_curr->refcount); InterlockedIncrement(&locale->locinfo->lc_time_curr->refcount);
if(locale->locinfo == MSVCRT_locale->locinfo)
_unlock_locales();
InterlockedIncrement(&locale->mbcinfo->refcount); InterlockedIncrement(&locale->mbcinfo->refcount);
return locale; return locale;
@ -1930,22 +1949,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
return locinfo; return locinfo;
} }
/*********************************************************************
* _lock_locales (UCRTBASE.@)
*/
void CDECL _lock_locales(void)
{
_mlock(_SETLOCALE_LOCK);
}
/*********************************************************************
* _unlock_locales (UCRTBASE.@)
*/
void CDECL _unlock_locales(void)
{
_munlock(_SETLOCALE_LOCK);
}
/********************************************************************* /*********************************************************************
* _create_locale (MSVCRT.@) * _create_locale (MSVCRT.@)
*/ */