Skip to content

W
wine-winehq
Commit 5ec7cb5a authored by Chip Davis's avatar Chip Davis Committed by Alexandre Julliard
Browse files
Options

msvcrt: Share ctype tables between threadlocinfo instances.

Signed-off-by: 's avatarChip Davis <cdavis@codeweavers.com> Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3e3f6396
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 28 deletions
dlls/msvcrt/locale.c
View file @ 5ec7cb5a
......@@ -122,6 +122,78 @@ MSVCRT___lc_time_data cloc_time_data =
#endif
};
static const unsigned char cloc_clmap[256] =
{
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
static const unsigned char cloc_cumap[256] =
{
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
/* Friendly country strings & language names abbreviations. */
static const char * const _country_synonyms[] =
{
......@@ -993,11 +1065,13 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo)
MSVCRT_free(locinfo->lconv_mon_refcount);
MSVCRT_free(locinfo->lconv);
MSVCRT_free(locinfo->ctype1_refcount);
MSVCRT_free(locinfo->ctype1);
MSVCRT_free(locinfo->pclmap);
MSVCRT_free(locinfo->pcumap);
if(locinfo->ctype1_refcount
&& !InterlockedDecrement(locinfo->ctype1_refcount)) {
MSVCRT_free(locinfo->ctype1_refcount);
MSVCRT_free(locinfo->ctype1);
MSVCRT_free((void*)locinfo->pclmap);
MSVCRT_free((void*)locinfo->pcumap);
}
if(locinfo->lc_time_curr != &cloc_time_data)
MSVCRT_free(locinfo->lc_time_curr);
......@@ -1248,13 +1322,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
}
memset(locinfo->lconv, 0, sizeof(struct MSVCRT_lconv));
locinfo->pclmap = MSVCRT_malloc(sizeof(char[256]));
locinfo->pcumap = MSVCRT_malloc(sizeof(char[256]));
if(!locinfo->pclmap || !locinfo->pcumap) {
free_locinfo(locinfo);
return NULL;
}
if(locale_name[MSVCRT_LC_COLLATE] &&
!init_category_name(locale_name[MSVCRT_LC_COLLATE],
locale_len[MSVCRT_LC_COLLATE], locinfo, MSVCRT_LC_COLLATE)) {
......@@ -1291,6 +1358,16 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
if(!category_needs_update(MSVCRT_LC_CTYPE, category, old_locinfo,
lcid[MSVCRT_LC_CTYPE], cp[MSVCRT_LC_CTYPE])) {
copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_CTYPE);
locinfo->lc_codepage = old_locinfo->lc_codepage;
locinfo->lc_clike = old_locinfo->lc_clike;
locinfo->mb_cur_max = old_locinfo->mb_cur_max;
locinfo->ctype1 = old_locinfo->ctype1;
locinfo->ctype1_refcount = old_locinfo->ctype1_refcount;
locinfo->pctype = old_locinfo->pctype;
locinfo->pclmap = old_locinfo->pclmap;
locinfo->pcumap = old_locinfo->pcumap;
if(locinfo->ctype1_refcount)
InterlockedIncrement(locinfo->ctype1_refcount);
} else if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) {
CPINFO cp_info;
int j;
......@@ -1310,13 +1387,20 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
locinfo->mb_cur_max = cp_info.MaxCharSize;
locinfo->ctype1_refcount = MSVCRT_malloc(sizeof(int));
if(!locinfo->ctype1_refcount) {
free_locinfo(locinfo);
return NULL;
}
*locinfo->ctype1_refcount = 1;
locinfo->ctype1 = MSVCRT_malloc(sizeof(short[257]));
if(!locinfo->ctype1_refcount || !locinfo->ctype1) {
locinfo->pclmap = MSVCRT_malloc(sizeof(char[256]));
locinfo->pcumap = MSVCRT_malloc(sizeof(char[256]));
if(!locinfo->ctype1 || !locinfo->pclmap || !locinfo->pcumap) {
free_locinfo(locinfo);
return NULL;
}
*locinfo->ctype1_refcount = 1;
locinfo->ctype1[0] = 0;
locinfo->pctype = locinfo->ctype1+1;
......@@ -1350,22 +1434,12 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
locinfo->lc_clike = 1;
locinfo->mb_cur_max = 1;
locinfo->pctype = MSVCRT__ctype+1;
locinfo->pclmap = cloc_clmap;
locinfo->pcumap = cloc_cumap;
if(!init_category_name("C", 1, locinfo, MSVCRT_LC_CTYPE)) {
free_locinfo(locinfo);
return NULL;
}
for(i=0; i<256; i++) {
if(locinfo->pctype[i] & MSVCRT__LEADBYTE)
buf[i] = ' ';
else
buf[i] = i;
}
for(i=0; i<256; i++) {
locinfo->pclmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i);
locinfo->pcumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i);
}
}
if(locale_name[MSVCRT_LC_MONETARY] &&
......
dlls/msvcrt/msvcrt.h
View file @ 5ec7cb5a
......@@ -203,8 +203,8 @@ typedef struct MSVCRT_threadlocaleinfostruct {
#if _MSVCR_VER < 140
unsigned short *pctype;
#endif
unsigned char *pclmap;
unsigned char *pcumap;
const unsigned char *pclmap;
const unsigned char *pcumap;
MSVCRT___lc_time_data *lc_time_curr;
#if _MSVCR_VER >= 110
MSVCRT_wchar_t *lc_name[6];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment