November 2020 - Wine-Commits

Kevin Puetz : widl: Write ATTR_CUSTOM into typelib.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 02b6df007adfb2454f6d19a724d3bd834233b003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02b6df007adfb2454f6d19a7… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:15 2020 -0600 widl: Write ATTR_CUSTOM into typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 440bb23f79b..734bdeee695 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1276,6 +1276,7 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, guidoffset = ctl2_alloc_guid(typelib, &guidentry); if(vt == VT_BSTR) + /* TODO midl appears to share a single reference if the same string is used as custdata in multiple places */ write_string_value(typelib, &data_out, value); else write_int_value(typelib, &data_out, vt, *(int*)value); @@ -1291,6 +1292,25 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } +static HRESULT set_custdata_attr(msft_typelib_t *typelib, attr_custdata_t *custdata, int *offset) +{ + switch(custdata->pval->type) { + case EXPR_STRLIT: + case EXPR_WSTRLIT: + set_custdata(typelib, &custdata->id, VT_BSTR, custdata->pval->u.sval, offset); + break; + case EXPR_HEXNUM: + case EXPR_NUM: + set_custdata(typelib, &custdata->id, VT_I4, &custdata->pval->u.lval, offset); + break; + default: + error("custom() attribute with unknown type\n"); + break; + } + + return S_OK; +} + static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int offset, name_offset; @@ -1298,12 +1318,14 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) int i, id, next_idx; int decoded_size, extra_attr = 0; int num_params = 0, num_optional = 0, num_defaults = 0; + int has_arg_custdata = 0; var_t *arg; unsigned char *namedata; const attr_t *attr; unsigned int funcflags = 0, callconv = 4 /* CC_STDCALL */; unsigned int funckind, invokekind = 1 /* INVOKE_FUNC */; int help_context = 0, help_string_context = 0, help_string_offset = -1; + int func_custdata_offset = -1; int entry = -1, entry_is_ord = 0; int lcid_retval_count = 0; @@ -1337,6 +1359,8 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) num_defaults++; else if(attr->type == ATTR_OPTIONAL) num_optional++; + else if(attr->type == ATTR_CUSTOM) + has_arg_custdata = 1; } } @@ -1350,6 +1374,9 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case ATTR_BINDABLE: funcflags |= 0x4; /* FUNCFLAG_FBINDABLE */ break; + case ATTR_CUSTOM: + set_custdata_attr(typeinfo->typelib, attr->u.pval, &func_custdata_offset); + break; case ATTR_DEFAULTBIND: funcflags |= 0x20; /* FUNCFLAG_FDEFAULTBIND */ break; @@ -1430,6 +1457,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) } } + if(has_arg_custdata || func_custdata_offset != -1) { + extra_attr = max(extra_attr, 7 + num_params); + } + /* allocate type data space for us */ typedata_size = 0x18 + extra_attr * sizeof(int) + (num_params * (num_defaults ? 16 : 12)); @@ -1476,6 +1507,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) typedata[2] = funcflags; typedata[3] = ((52 /*sizeof(FUNCDESC)*/ + decoded_size) << 16) | typeinfo->typeinfo->cbSizeVft; typedata[4] = (next_idx << 16) | (callconv << 8) | (invokekind << 3) | funckind; + if(has_arg_custdata || func_custdata_offset != -1) typedata[4] |= 0x0080; if(num_defaults) typedata[4] |= 0x1000; if(entry_is_ord) typedata[4] |= 0x2000; typedata[5] = (num_optional << 16) | num_params; @@ -1486,6 +1518,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) typedata[3] += (24 /*sizeof(PARAMDESCEX)*/ * num_defaults) << 16; switch(extra_attr) { + default: + if(extra_attr > 7 + num_params) warning("unknown number of optional attrs\n"); + /* typedata[13..+num_params] = arg_custdata_offset handled in below loop */ + case 7: typedata[12] = func_custdata_offset; case 6: typedata[11] = help_string_context; case 5: typedata[10] = -1; case 4: typedata[9] = -1; @@ -1494,8 +1530,6 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case 1: typedata[6] = help_context; case 0: break; - default: - warning("unknown number of optional attrs\n"); } if (type_function_get_args(func->declspec.type)) @@ -1506,12 +1540,16 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) int paramflags = 0; int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; int *defaultdata = num_defaults ? typedata + 6 + extra_attr + i : NULL; + int arg_custdata_offset = -1; if(defaultdata) *defaultdata = -1; encode_var(typeinfo->typelib, arg->declspec.type, arg, paramdata, &decoded_size); if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { switch(attr->type) { + case ATTR_CUSTOM: + set_custdata_attr(typeinfo->typelib, attr->u.pval, &arg_custdata_offset); + break; case ATTR_DEFAULTVALUE: { paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ @@ -1539,6 +1577,9 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) chat("unhandled param attr %d\n", attr->type); break; } + if(extra_attr > 7 + i) { + typedata[13+i] = arg_custdata_offset; + } } paramdata[1] = -1; paramdata[2] = paramflags; @@ -1621,6 +1662,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) { int offset, id; unsigned int typedata_size; + int extra_attr = 0; INT *typedata; unsigned int var_datawidth, var_alignment = 0; int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; @@ -1629,6 +1671,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) const attr_t *attr; unsigned char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; + int var_custdata_offset = -1; if (!var->name) var->name = gen_name(); @@ -1643,6 +1686,10 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) case ATTR_BINDABLE: varflags |= 0x04; /* VARFLAG_FBINDABLE */ break; + case ATTR_CUSTOM: + extra_attr = max(extra_attr,4); + set_custdata_attr(typeinfo->typelib, attr->u.pval, &var_custdata_offset); + break; case ATTR_DEFAULTBIND: varflags |= 0x20; /* VARFLAG_FDEFAULTBIND */ break; @@ -1686,7 +1733,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) } /* allocate type data space for us */ - typedata_size = 0x14; + typedata_size = 0x14 + extra_attr * sizeof(int); if (!typeinfo->var_data) { typeinfo->var_data = xmalloc(0x100); @@ -1762,6 +1809,18 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) /* add type description size to total required allocation */ typedata[3] += var_type_size << 16 | var_kind; + switch(extra_attr) { + case 5: typedata[9] = -1 /*help_string_context*/; + case 4: typedata[8] = var_custdata_offset; + case 3: typedata[7] = -1; + case 2: typedata[6] = -1 /*help_string_offset*/; + case 1: typedata[5] = -1 /*help_context*/; + case 0: + break; + default: + warning("unknown number of optional attrs\n"); + } + /* fix type alignment */ alignment = (typeinfo->typeinfo->typekind >> 11) & 0x1f; if (alignment < var_alignment) { @@ -1871,7 +1930,9 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ if (kind == TKIND_COCLASS) typeinfo->flags |= 0x20; /* TYPEFLAG_FCONTROL */ break; - + case ATTR_CUSTOM: + set_custdata_attr(typelib, attr->u.pval, &typeinfo->oCustData); + break; case ATTR_DLLNAME: { int offset = ctl2_alloc_string(typelib, attr->u.pval); @@ -2700,6 +2761,7 @@ int create_msft_typelib(typelib_t *typelib) msft_typelib_t *msft; int failed = 0; const statement_t *stmt; + const attr_t *attr; time_t cur_time; char *time_override; unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ @@ -2747,6 +2809,16 @@ int create_msft_typelib(typelib_t *typelib) set_help_string_dll(msft); set_help_string_context(msft); + if (typelib->attrs) LIST_FOR_EACH_ENTRY( attr, typelib->attrs, const attr_t, entry ) { + switch(attr->type) { + case ATTR_CUSTOM: + set_custdata_attr(msft, attr->u.pval, &msft->typelib_header.CustomDataOffset); + break; + default: + break; + } + } + /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE");

1 0

Kevin Puetz : widl: Parse attribute custom(guid,expr).
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 7afd550f34d87bed1e3f94c28a4fd10587a66de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7afd550f34d87bed1e3f94c2… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:14 2020 -0600 widl: Parse attribute custom(guid,expr). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 2 +- tools/widl/parser.y | 15 +++++++++++++++ tools/widl/widltypes.h | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b715342ad59..d7d96702322 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -339,6 +339,7 @@ static const struct keyword attr_keywords[] = {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE, 0}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE, 0}, {"control", tCONTROL, 0}, + {"custom", tCUSTOM, 0}, {"decode", tDECODE, 0}, {"defaultbind", tDEFAULTBIND, 0}, {"defaultcollelem", tDEFAULTCOLLELEM, 0}, @@ -431,7 +432,6 @@ static const struct keyword attr_keywords[] = }; /* attributes TODO: - custom first_is last_is max_is diff --git a/tools/widl/parser.y b/tools/widl/parser.y index caf4569179b..160e4029a6e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -58,6 +58,7 @@ static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); static attr_t *make_attrp(enum attr_type type, void *val); +static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); @@ -177,6 +178,7 @@ static typelib_t *current_typelib; %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE %token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE +%token tCUSTOM %token tDECODE tDEFAULT tDEFAULTBIND %token tDEFAULTCOLLELEM %token tDEFAULTVALUE @@ -506,6 +508,7 @@ attribute: { $$ = NULL; } | tCONTEXTHANDLENOSERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } | tCONTEXTHANDLESERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } + | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tDEFAULT { $$ = make_attr(ATTR_DEFAULT); } | tDEFAULTBIND { $$ = make_attr(ATTR_DEFAULTBIND); } @@ -1366,6 +1369,17 @@ static attr_t *make_attrp(enum attr_type type, void *val) return a; } +static attr_t *make_custom_attr(UUID *id, expr_t *pval) +{ + attr_t *a = xmalloc(sizeof(attr_t)); + attr_custdata_t *cstdata = xmalloc(sizeof(attr_custdata_t)); + a->type = ATTR_CUSTOM; + cstdata->id = *id; + cstdata->pval = pval; + a->u.pval = cstdata; + return a; +} + static expr_list_t *append_expr(expr_list_t *list, expr_t *expr) { if (!expr) return list; @@ -2142,6 +2156,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, + /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, "custom" }, /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, "default" }, /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 2e2ee7a206b..b02b80e122c 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -37,6 +37,7 @@ typedef GUID UUID; typedef struct _loc_info_t loc_info_t; typedef struct _attr_t attr_t; +typedef struct _attr_custdata_t attr_custdata_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; typedef struct _var_t var_t; @@ -84,6 +85,7 @@ enum attr_type ATTR_COMMSTATUS, ATTR_CONTEXTHANDLE, ATTR_CONTROL, + ATTR_CUSTOM, ATTR_DECODE, ATTR_DEFAULT, ATTR_DEFAULTBIND, @@ -338,6 +340,11 @@ struct _expr_t { struct list entry; }; +struct _attr_custdata_t { + GUID id; + expr_t *pval; +}; + struct struct_details { var_list_t *fields;

1 0

Piotr Caban : msvcrt: Simplify category checks in create_locinfo.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 16598c2af6ddf0e32c5c72b9067cd2f40a470591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16598c2af6ddf0e32c5c72b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 17:26:29 2020 +0100 msvcrt: Simplify category checks in create_locinfo. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a71172bff00..35285a0f240 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1166,11 +1166,10 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) MSVCRT_free(locale); } -static inline BOOL category_needs_update(int cat, int user_cat, +static inline BOOL category_needs_update(int cat, const MSVCRT_threadlocinfo *locinfo, LCID lcid, unsigned short cp) { if(!locinfo) return TRUE; - if(user_cat!=cat && user_cat!=MSVCRT_LC_ALL) return FALSE; return lcid!=locinfo->lc_handle[cat] || cp!=locinfo->lc_id[cat].wCodePage; } @@ -1336,6 +1335,18 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } } + for(i=1; i<6; i++) { + if(category!=MSVCRT_LC_ALL && category!=i) { + if(old_locinfo) { + lcid[i] = old_locinfo->lc_handle[i]; + cp[i] = old_locinfo->lc_id[i].wCodePage; + } else { + lcid[i] = 0; + cp[i] = 0; + } + } + } + locinfo = MSVCRT_malloc(sizeof(MSVCRT_threadlocinfo)); if(!locinfo) return NULL; @@ -1350,11 +1361,11 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(!category_needs_update(MSVCRT_LC_COLLATE, category, old_locinfo, + if(!category_needs_update(MSVCRT_LC_COLLATE, old_locinfo, lcid[MSVCRT_LC_COLLATE], cp[MSVCRT_LC_COLLATE])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_COLLATE); locinfo->lc_collate_cp = old_locinfo->lc_collate_cp; - } else if(lcid[MSVCRT_LC_COLLATE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_COLLATE)) { + } else if(lcid[MSVCRT_LC_COLLATE]) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_COLLATE], cp[MSVCRT_LC_COLLATE], locinfo, MSVCRT_LC_COLLATE)) { free_locinfo(locinfo); @@ -1376,7 +1387,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(!category_needs_update(MSVCRT_LC_CTYPE, category, old_locinfo, + if(!category_needs_update(MSVCRT_LC_CTYPE, 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; @@ -1389,7 +1400,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, 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)) { + } else if(lcid[MSVCRT_LC_CTYPE]) { CPINFO cp_info; int j; @@ -1463,22 +1474,15 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } } - if(!category_needs_update(MSVCRT_LC_MONETARY, category, old_locinfo, + if(!category_needs_update(MSVCRT_LC_MONETARY, old_locinfo, lcid[MSVCRT_LC_MONETARY], cp[MSVCRT_LC_MONETARY]) && - !category_needs_update(MSVCRT_LC_NUMERIC, category, old_locinfo, + !category_needs_update(MSVCRT_LC_NUMERIC, old_locinfo, lcid[MSVCRT_LC_NUMERIC], cp[MSVCRT_LC_NUMERIC])) { locinfo->lconv = old_locinfo->lconv; locinfo->lconv_intl_refcount = old_locinfo->lconv_intl_refcount; if(locinfo->lconv_intl_refcount) InterlockedIncrement(locinfo->lconv_intl_refcount); - } else if((lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) || - (lcid[MSVCRT_LC_NUMERIC] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) - || (!category_needs_update(MSVCRT_LC_MONETARY, category, old_locinfo, - lcid[MSVCRT_LC_MONETARY], cp[MSVCRT_LC_MONETARY]) - && old_locinfo->lc_handle[MSVCRT_LC_MONETARY]) - || (!category_needs_update(MSVCRT_LC_NUMERIC, category, old_locinfo, - lcid[MSVCRT_LC_NUMERIC], cp[MSVCRT_LC_NUMERIC]) - && old_locinfo->lc_handle[MSVCRT_LC_NUMERIC])) { + } else if(lcid[MSVCRT_LC_MONETARY] || lcid[MSVCRT_LC_NUMERIC]) { locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); locinfo->lconv_intl_refcount = MSVCRT_malloc(sizeof(int)); if(!locinfo->lconv || !locinfo->lconv_intl_refcount) { @@ -1502,7 +1506,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(!category_needs_update(MSVCRT_LC_MONETARY, category, old_locinfo, + if(!category_needs_update(MSVCRT_LC_MONETARY, old_locinfo, lcid[MSVCRT_LC_MONETARY], cp[MSVCRT_LC_MONETARY])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_MONETARY); locinfo->lconv_mon_refcount = old_locinfo->lconv_mon_refcount; @@ -1533,7 +1537,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->_W_negative_sign = old_locinfo->lconv->_W_negative_sign; #endif } - } else if(lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) { + } else if(lcid[MSVCRT_LC_MONETARY]) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_MONETARY], cp[MSVCRT_LC_MONETARY], locinfo, MSVCRT_LC_MONETARY)) { free_locinfo(locinfo); @@ -1777,7 +1781,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(!category_needs_update(MSVCRT_LC_NUMERIC, category, old_locinfo, + if(!category_needs_update(MSVCRT_LC_NUMERIC, old_locinfo, lcid[MSVCRT_LC_NUMERIC], cp[MSVCRT_LC_NUMERIC])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_NUMERIC); locinfo->lconv_num_refcount = old_locinfo->lconv_num_refcount; @@ -1792,7 +1796,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->_W_thousands_sep = old_locinfo->lconv->_W_thousands_sep; #endif } - } else if(lcid[MSVCRT_LC_NUMERIC] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) { + } else if(lcid[MSVCRT_LC_NUMERIC]) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_NUMERIC], cp[MSVCRT_LC_NUMERIC], locinfo, MSVCRT_LC_NUMERIC)) { free_locinfo(locinfo); @@ -1884,13 +1888,13 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(!category_needs_update(MSVCRT_LC_TIME, category, old_locinfo, + if(!category_needs_update(MSVCRT_LC_TIME, old_locinfo, lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_TIME); locinfo->lc_time_curr = old_locinfo->lc_time_curr; if(locinfo->lc_time_curr != &cloc_time_data) InterlockedIncrement(&locinfo->lc_time_curr->refcount); - } else if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { + } else if(lcid[MSVCRT_LC_TIME]) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) { free_locinfo(locinfo);

1 0

Piotr Caban : msvcrt: Lock global locale in _get_current_locale.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 216b9cb080b00c5f477c0ced58c354e5714d5720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216b9cb080b00c5f477c0ced… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 17:26:50 2020 +0100 msvcrt: Lock global locale in _get_current_locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8afac8aba87..dd9a7ce0930 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1117,6 +1117,22 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo 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) { 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) { + _lock_locales(); *locale = *MSVCRT_locale; } else @@ -1144,6 +1161,8 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) if(locale->locinfo->ctype1_refcount) InterlockedIncrement(locale->locinfo->ctype1_refcount); InterlockedIncrement(&locale->locinfo->lc_time_curr->refcount); + if(locale->locinfo == MSVCRT_locale->locinfo) + _unlock_locales(); InterlockedIncrement(&locale->mbcinfo->refcount); return locale; @@ -1930,22 +1949,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, 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.@) */

1 0

Paul Gofman : msvcrt: Save and restore rounding mode in fegetenv() / fesetenv().
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 3acd68b24171e7c4b9fd82b4449dbe879df29884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acd68b24171e7c4b9fd82b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 17 23:07:49 2020 +0300 msvcrt: Save and restore rounding mode in fegetenv() / fesetenv(). Fixes Serious Sam 4 flickering in Vulkan mode. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++--- dlls/msvcrt/math.c | 19 +++++++++++++++---- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 52531ddad72..8663fc81ee8 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <float.h> #include <math.h> +#include <fenv.h> #include <limits.h> #include <wctype.h> @@ -183,6 +184,9 @@ static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); static int (CDECL *p_fegetenv)(fenv_t*); +static int (CDECL *p_fesetenv)(const fenv_t*); +static int (CDECL *p_fegetround)(void); +static int (CDECL *p_fesetround)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -254,6 +258,10 @@ static BOOL init(void) p_free_locale = (void*)GetProcAddress(module, "_free_locale"); SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); + SET(p_fesetenv, "fesetenv"); + SET(p_fegetround, "fegetround"); + SET(p_fesetround, "fesetround"); + SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); @@ -780,18 +788,27 @@ static void test_critical_section(void) call_func1(p_critical_section_dtor, &cs); } -static void test_fegetenv(void) +static void test_feenv(void) { + fenv_t env, env2; int ret; - fenv_t env; p__clearfp(); ret = p_fegetenv(&env); ok(!ret, "fegetenv returned %x\n", ret); + p_fesetround(FE_UPWARD); ok(env.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), "env.control = %x\n", env.control); ok(!env.status, "env.status = %x\n", env.status); + ret = p_fegetenv(&env2); + ok(!ret, "fegetenv returned %x\n", ret); + ok(env2.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID | FE_UPWARD), + "env2.control = %x\n", env2.control); + ret = p_fesetenv(&env); + ok(!ret, "fesetenv returned %x\n", ret); + ret = p_fegetround(); + ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); } static void test__wcreate_locale(void) @@ -1110,7 +1127,7 @@ START_TEST(msvcr120) test__strtof(); test_remainder(); test_critical_section(); - test_fegetenv(); + test_feenv(); test__wcreate_locale(); test__Condition_variable(); test_wctype(); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index af6216e0ea8..25a9b5e096d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2074,7 +2074,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) { env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | - MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID | MSVCRT__RC_CHOP); env->status = _statusfp(); return 0; } @@ -2193,12 +2193,18 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); - fenv.control_word &= ~0x3d; + fenv.control_word &= ~0xc3d; if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; + switch (env->control & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fenv.control_word |= 0xc00; break; + case MSVCRT__RC_UP: fenv.control_word |= 0x800; break; + case MSVCRT__RC_DOWN: fenv.control_word |= 0x400; break; + } fenv.status_word &= ~0x3d; if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; @@ -2213,14 +2219,19 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) if (sse2_supported) { DWORD fpword; - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - fpword &= ~0x1e80; + fpword &= ~0x7e80; if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + switch (env->control & MSVCRT__MCW_RC) + { + case MSVCRT__RC_CHOP: fpword |= 0x6000; break; + case MSVCRT__RC_UP: fpword |= 0x4000; break; + case MSVCRT__RC_DOWN: fpword |= 0x2000; break; + } __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); }

1 0

Alexandre Julliard : msvcrt: Move math functions to a new Unix library.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: c72e1b096d16a1e9a36b86fbc8c403ec3653a504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c72e1b096d16a1e9a36b86fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:14:50 2020 +0100 msvcrt: Move math functions to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 1 + dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/main.c | 2 +- dlls/msvcrt/math.c | 443 +++++------------- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/unixlib.c | 1096 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/unixlib.h | 121 +++++ dlls/msvcrtd/Makefile.in | 1 + dlls/ucrtbase/Makefile.in | 1 + 16 files changed, 1342 insertions(+), 333 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c72e1b096d16a1e9a36b…

1 0

Piotr Caban : msvcrt: locinfo->lc_name should be guarded by lc_category->wrefcount.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 84559266626938582b065cbb52e1b2a221116f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84559266626938582b065cbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 17:25:47 2020 +0100 msvcrt: locinfo->lc_name should be guarded by lc_category->wrefcount. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ca50fc7e390..a305f88e808 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -407,6 +407,11 @@ static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) WCHAR buf[100]; int len; + locinfo->lc_category[cat].wrefcount = MSVCRT_malloc(sizeof(int)); + if(!locinfo->lc_category[cat].wrefcount) + return FALSE; + *locinfo->lc_category[cat].wrefcount = 1; + len = GetLocaleInfoW(lcid, LOCALE_SISO639LANGNAME |LOCALE_NOUSEROVERRIDE, buf, 100); if(!len) return FALSE; @@ -931,6 +936,7 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { MSVCRT_free(locinfo->lc_category[i].locale); MSVCRT_free(locinfo->lc_category[i].refcount); + MSVCRT_free(locinfo->lc_category[i].wrefcount); #if _MSVCR_VER >= 110 MSVCRT_free(locinfo->lc_name[i]); #endif

1 0

Alexandre Julliard : msvcrt: Use the msvcrt string functions internally.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 2fb08bed46fec302954578038566593bb108b57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb08bed46fec30295457803… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:04:34 2020 +0100 msvcrt: Use the msvcrt string functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++-- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 4 ++++ dlls/msvcrt/time.c | 6 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e68c16d7a57..e5b0e67c4be 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2455,7 +2455,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign ) /* take the exponential "e" out */ data->efcvt_buffer[ prec] = '\0'; /* read the exponent */ - sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); + MSVCRT_sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); (*decpt)++; /* adjust for some border cases */ if( data->efcvt_buffer[0] == '0')/* value is zero */ @@ -2515,7 +2515,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, MSVCRT_size_t length, double number, int /* take the exponential "e" out */ result[ prec] = '\0'; /* read the exponent */ - sscanf( result + prec + 1, "%d", decpt); + MSVCRT_sscanf( result + prec + 1, "%d", decpt); (*decpt)++; /* adjust for some border cases */ if( result[0] == '0')/* value is zero */ diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 13fffc5734a..dae3cb5cee2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -124,7 +124,7 @@ static inline MSVCRT_size_t u_strlen( const unsigned char *str ) static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char* src, MSVCRT_size_t len ) { - return (unsigned char*)strncat( (char*)dst, (const char*)src, len); + return (unsigned char*)MSVCRT_strncat( (char*)dst, (const char*)src, len); } static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 ) @@ -154,7 +154,7 @@ static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x ) { - return (unsigned char*) strrchr( (const char*)s, x ); + return (unsigned char*) MSVCRT_strrchr( (const char*)s, x ); } static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7c9e3137e14..229d8a07a9b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1170,6 +1170,7 @@ int __cdecl _ungetch(int); int __cdecl _cputs(const char*); int WINAPIV _cprintf(const char*,...); int WINAPIV _cwprintf(const MSVCRT_wchar_t*,...); +int WINAPIV MSVCRT_sscanf(const char *, const char *, ...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); int* __cdecl MSVCRT___p__fmode(void); @@ -1200,9 +1201,12 @@ int __cdecl MSVCRT__stricmp(const char*, const char*); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +char* __cdecl MSVCRT_strncat(char*,const char *,MSVCRT_size_t); int __cdecl MSVCRT_strncmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT_strcmp(const char*, const char*); +char* __cdecl MSVCRT_strrchr(const char *, int); char* __cdecl MSVCRT_strstr(const char*, const char*); +MSVCRT_long __cdecl MSVCRT_strtol(const char*, char**, int); unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); char* __cdecl MSVCRT__itoa(int, char*, int); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b71f5ac1224..702aaa8166f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -127,11 +127,11 @@ void CDECL MSVCRT__tzset(void) }else if(*tz == '+') { tz++; } - MSVCRT___timezone = strtol(tz, &tz, 10)*3600; + MSVCRT___timezone = MSVCRT_strtol(tz, &tz, 10)*3600; if(*tz == ':') { - MSVCRT___timezone += strtol(tz+1, &tz, 10)*60; + MSVCRT___timezone += MSVCRT_strtol(tz+1, &tz, 10)*60; if(*tz == ':') - MSVCRT___timezone += strtol(tz+1, &tz, 10); + MSVCRT___timezone += MSVCRT_strtol(tz+1, &tz, 10); } if(neg_zone) MSVCRT___timezone = -MSVCRT___timezone;

1 0

Chip Davis : msvcrt: Copy LC_COLLATE codepage between threadlocinfo instances.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 3e3f6396d2e2f6acc0fd101efe2ef40e5f8f73ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3f6396d2e2f6acc0fd101e… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 18 17:25:54 2020 +0100 msvcrt: Copy LC_COLLATE codepage between threadlocinfo instances. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b6c36ac4cf1..8202a8e536a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1265,6 +1265,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, if(!category_needs_update(MSVCRT_LC_COLLATE, category, old_locinfo, lcid[MSVCRT_LC_COLLATE], cp[MSVCRT_LC_COLLATE])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_COLLATE); + locinfo->lc_collate_cp = old_locinfo->lc_collate_cp; } else if(lcid[MSVCRT_LC_COLLATE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_COLLATE)) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_COLLATE], cp[MSVCRT_LC_COLLATE], locinfo, MSVCRT_LC_COLLATE)) {

1 0

Piotr Caban : msvcrt: Call set_lc_locale_name in update_threadlocinfo_category.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 3ecede0c613feb1573061e1cbd518d9a5b13735a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ecede0c613feb1573061e1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 17:25:44 2020 +0100 msvcrt: Call set_lc_locale_name in update_threadlocinfo_category. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 81 +++++++++++++++++++--------------------------------- 1 file changed, 29 insertions(+), 52 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4b20f097758..ca50fc7e390 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -400,6 +400,33 @@ static BOOL init_category_name(const char *name, int len, return TRUE; } +#if _MSVCR_VER >= 110 +static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) +{ + LCID lcid = locinfo->lc_handle[cat]; + WCHAR buf[100]; + int len; + + len = GetLocaleInfoW(lcid, LOCALE_SISO639LANGNAME + |LOCALE_NOUSEROVERRIDE, buf, 100); + if(!len) return FALSE; + + if(LocaleNameToLCID(buf, 0) != lcid) + len = LCIDToLocaleName(lcid, buf, 100, 0); + + if(!len || !(locinfo->lc_name[cat] = MSVCRT_malloc(len*sizeof(MSVCRT_wchar_t)))) + return FALSE; + + memcpy(locinfo->lc_name[cat], buf, len*sizeof(MSVCRT_wchar_t)); + return TRUE; +} +#else +static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) +{ + return TRUE; +} +#endif + /* INTERNAL: Set lc_handle, lc_id and lc_category in threadlocinfo struct */ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, MSVCRT_pthreadlocinfo locinfo, int category) @@ -429,6 +456,8 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, locinfo->lc_handle[category] = lcid; + set_lc_locale_name(locinfo, category); + if(!locinfo->lc_category[category].locale) { int len = 0; @@ -1007,33 +1036,6 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) MSVCRT_free(locale); } -#if _MSVCR_VER >= 110 -static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) -{ - LCID lcid = locinfo->lc_handle[cat]; - WCHAR buf[100]; - int len; - - len = GetLocaleInfoW(lcid, LOCALE_SISO639LANGNAME - |LOCALE_NOUSEROVERRIDE, buf, 100); - if(!len) return FALSE; - - if(LocaleNameToLCID(buf, 0) != lcid) - len = LCIDToLocaleName(lcid, buf, 100, 0); - - if(!len || !(locinfo->lc_name[cat] = MSVCRT_malloc(len*sizeof(MSVCRT_wchar_t)))) - return FALSE; - - memcpy(locinfo->lc_name[cat], buf, len*sizeof(MSVCRT_wchar_t)); - return TRUE; -} -#else -static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) -{ - return TRUE; -} -#endif - static inline BOOL category_needs_update(int cat, int user_cat, const MSVCRT_threadlocinfo *locinfo, LCID lcid, unsigned short cp) { @@ -1242,11 +1244,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } locinfo->lc_collate_cp = locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage; - - if(!set_lc_locale_name(locinfo, MSVCRT_LC_COLLATE)) { - free_locinfo(locinfo); - return NULL; - } } else { if(!init_category_name("C", 1, locinfo, MSVCRT_LC_COLLATE)) { free_locinfo(locinfo); @@ -1309,11 +1306,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, for(j=cp_info.LeadByte[i]; j<=cp_info.LeadByte[i+1]; j++) locinfo->ctype1[j+1] |= MSVCRT__LEADBYTE; - if(!set_lc_locale_name(locinfo, MSVCRT_LC_CTYPE)) { - free_locinfo(locinfo); - return NULL; - } - for(i=0; i<256; i++) { if(locinfo->pctype[i] & MSVCRT__LEADBYTE) buf[i] = ' '; @@ -1563,11 +1555,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } #endif - - if(!set_lc_locale_name(locinfo, MSVCRT_LC_MONETARY)) { - free_locinfo(locinfo); - return NULL; - } } else { locinfo->lconv->int_curr_symbol = MSVCRT_malloc(sizeof(char)); locinfo->lconv->currency_symbol = MSVCRT_malloc(sizeof(char)); @@ -1711,11 +1698,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } #endif - - if(!set_lc_locale_name(locinfo, MSVCRT_LC_NUMERIC)) { - free_locinfo(locinfo); - return NULL; - } } else { locinfo->lconv->decimal_point = MSVCRT_malloc(sizeof(char[2])); locinfo->lconv->thousands_sep = MSVCRT_malloc(sizeof(char)); @@ -1769,11 +1751,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(!set_lc_locale_name(locinfo, MSVCRT_LC_TIME)) { - free_locinfo(locinfo); - return NULL; - } - locinfo->lc_time_curr = create_time_data(lcid[MSVCRT_LC_TIME]); if(!locinfo->lc_time_curr) { free_locinfo(locinfo);

1 0