system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 04:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Introduce noalloc current locale lookup helpers.

Browse source 
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2020-11-10 16:58:49 +01:00 committed by Alexandre Julliard
parent a24ad51e3f
commit faf92fdedb
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/msvcrt/locale.c
View file

@ -953,6 +953,31 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo)
MSVCRT_free(mbcinfo);
}
MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale)
{
thread_data_t *data = msvcrt_get_thread_data();
if(!data || !data->have_locale)
{
*locale = *MSVCRT_locale;
}
else
{
locale->locinfo = data->locinfo;
locale->mbcinfo = data->mbcinfo;
}
InterlockedIncrement(&locale->locinfo->refcount);
InterlockedIncrement(&locale->mbcinfo->refcount);
return locale;
}
void CDECL free_locale_noalloc(MSVCRT__locale_t locale)
{
free_locinfo(locale->locinfo);
free_mbcinfo(locale->mbcinfo);
}
/*********************************************************************
* _get_current_locale (MSVCRT.@)
*/
@ -962,11 +987,7 @@ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void)
if(!loc)
return NULL;
loc->locinfo = get_locinfo();
loc->mbcinfo = get_mbcinfo();
InterlockedIncrement(&loc->locinfo->refcount);
InterlockedIncrement(&loc->mbcinfo->refcount);
return loc;
return get_current_locale_noalloc(loc);
}
/*********************************************************************
@ -977,8 +998,7 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale)
if (!locale)
return;
free_locinfo(locale->locinfo);
free_mbcinfo(locale->mbcinfo);
free_locale_noalloc(locale);
MSVCRT_free(locale);
}

2
dlls/msvcrt/msvcrt.h
View file

@ -1128,6 +1128,8 @@ int __cdecl MSVCRT__set_printf_count_output(int);
#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2
extern MSVCRT__locale_t MSVCRT_locale;
MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN;
void CDECL free_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN;
MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN;
MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN;
void __cdecl MSVCRT__free_locale(MSVCRT__locale_t);