November 2020 - Wine-commits

Kevin Puetz : widl: Allow adding the same custdata GUID multiple times in a typelib.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 997439967f5646dfd0004b164fbf67f8e685ac3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=997439967f5646dfd0004b16… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:16 2020 -0600 widl: Allow adding the same custdata GUID multiple times in a typelib. e.g. using the same kind of custdata in multiple interfaces Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 734bdeee695..5728f041f6f 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1263,18 +1263,25 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, int vt, const void *value, int *offset) { - MSFT_GuidEntry guidentry; int guidoffset; int custoffset; int *custdata; int data_out; + int hash_key; - guidentry.guid = *guid; + hash_key = ctl2_hash_guid(guid); + guidoffset = ctl2_find_guid(typelib, hash_key, guid); + if(guidoffset == -1) { + /* add GUID that was not already present */ + MSFT_GuidEntry guidentry; + guidentry.guid = *guid; - guidentry.hreftype = -1; - guidentry.next_hash = -1; + guidentry.hreftype = -1; + guidentry.next_hash = -1; + + guidoffset = ctl2_alloc_guid(typelib, &guidentry); + } - 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);

1 0

Kevin Puetz : oleaut32/tests: Cover Get*CustData in test_dump_typelib.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 8341b2550d7c9abe9d382edd2a7d065480c6de73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8341b2550d7c9abe9d382edd… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:17 2020 -0600 oleaut32/tests: Cover Get*CustData in test_dump_typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 275 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 267 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8341b2550d7c9abe9d38…

1 0

Kevin Puetz : oleaut32: Fix error handling/reporting in TLB_copy_all_custdata.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: cd38abc455d8312ec9e13c7af5049358523032dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd38abc455d8312ec9e13c7a… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:18 2020 -0600 oleaut32: Fix error handling/reporting in TLB_copy_all_custdata. VariantCopy clears existing contents of pvargDest and thus requires it contain a valid (possibly-empty) VARIANT, not uninitialized garbage. If a failure still occurs, propgate the HRESULT to GetAll*CustData. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 989340de9c2..d04e4d2cbe2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5288,6 +5288,7 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA TLBCustData *pCData; unsigned int ct; CUSTDATAITEM *cdi; + HRESULT hr = S_OK; ct = list_count(custdata_list); @@ -5300,11 +5301,13 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA cdi = pCustData->prgCustData; LIST_FOR_EACH_ENTRY(pCData, custdata_list, TLBCustData, entry){ cdi->guid = *TLB_get_guid_null(pCData->guid); - VariantCopy(&cdi->varValue, &pCData->data); + VariantInit(&cdi->varValue); + hr = VariantCopy(&cdi->varValue, &pCData->data); + if(FAILED(hr)) break; ++cdi; } - return S_OK; + return hr; }

1 0

Kevin Puetz : oleaut32: Load GetVarCustData from MSFT-format typelib.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 65d917402f43d6c061668cff811f5fd6729d5750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65d917402f43d6c061668cff… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:19 2020 -0600 oleaut32: Load GetVarCustData from MSFT-format typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 50 ++++++++++++- dlls/oleaut32/tests/typelib.c | 148 +++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 3 + 3 files changed, 200 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index b8fecc9a019..3315f151ebd 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -26,7 +26,15 @@ import "oaidl.idl"; /* needed by widl */ midl_pragma warning ( disable : 2368 ) -[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] +#define CUSTDATA_STRLIT c8768723-e6d2-4442-b039-92e9c82429c4 +#define CUSTDATA_NUM b481b478-a181-4eb6-b6e0-df63069e8c80 +#define CUSTDATA_HEXNUM a09d7c06-cf38-4db3-9450-10641651c35b + +[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784), +custom(CUSTDATA_STRLIT,"ITypeLib2::GetCustData"), +custom(CUSTDATA_NUM,42), +custom(CUSTDATA_HEXNUM,0x1337C0D3), +] library Test { importlib("stdole2.tlb"); @@ -170,4 +178,44 @@ library Test { interface ITestDispDual; } + + [uuid(786ee4ff-c5dd-4bf4-9578-0d22fb5369cc),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData interface")] + interface custdata_interface : IDispatch + { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData custdata_interface::test_method")] + HRESULT test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData custdata_interface::test_method(x)")] int x); + } + + [uuid(6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData enum")] + enum custdata_enum { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData enum")] + One, + Two + }; + + [uuid(62fabe17-f733-4b09-b859-3f455dcda450),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData struct")] + struct custdata_struct { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData struct")] + int test_field; + }; + + [/* uuid(...) not allowed on union */ custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData union")] + union custdata_union { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData union")] + int test_field; + }; + + [public,uuid(d58744d6-63f9-467c-87e5-c95158098b18),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData typedef")] + typedef custdata_interface * custdata_typedef; + + [uuid(bffc216e-2159-465a-80df-b85fd4f4f122),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData dispinterface")] + dispinterface custdata_dispatch + { +properties: + [id(0),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData dispinterface property")] + int test_property; +methods: + [id(1),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData dispinterface method")] + void test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData test_dispatch::test_method(x)")] int x); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3c7a3bd147d..ff709ddef62 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6130,6 +6130,154 @@ static const type_info info[] = { }, }, { /* vars */ }, +}, +{ + "custdata_interface", + "{786ee4ff-c5dd-4bf4-9578-0d22fb5369cc}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_interface*), /*size*/ sizeof(custdata_interface*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData interface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData custdata_interface::test_method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData custdata_interface::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ }, +}, +{ + "custdata_enum", + "{6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData enum" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "One", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData enum" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "Two", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_struct", + "{62fabe17-f733-4b09-b859-3f455dcda450}", + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct custdata_struct), /*size*/ sizeof(struct custdata_struct), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData struct" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData struct" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_union", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_UNION, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(union custdata_union), /*size*/ sizeof(union custdata_union), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData union" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData union" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_typedef", + "{d58744d6-63f9-467c-87e5-c95158098b18}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(custdata_typedef), /*size*/ sizeof(custdata_typedef), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData typedef" } } }, + }, + { /* funcs */ }, + { /* vars */ }, +}, +{ + "custdata_dispatch", + "{bffc216e-2159-465a-80df-b85fd4f4f122}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_dispatch*), /*size*/ sizeof(custdata_dispatch*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 1, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData dispinterface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData dispinterface method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData test_dispatch::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ + { + /*id*/ 0x0, /*name*/ "test_property", /*flags*/ 0, /*kind*/ VAR_DISPATCH, + { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData dispinterface property" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, } }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d04e4d2cbe2..bef4f93748b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2599,6 +2599,9 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpString)) ptvd->HelpString = MSFT_ReadString(pcx, pVarRec->HelpString); + if (reclength > FIELD_OFFSET(MSFT_VarRecord, oCustData)) + MSFT_CustData(pcx, pVarRec->oCustData, &ptvd->custdata_list); + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) ptvd->HelpStringContext = pVarRec->HelpStringContext;

1 0

Alexandre Julliard : msvcrt: Use the msvcrt atoi() function internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: f48648aeec69f74899ba2f074b60aeb0de03615b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48648aeec69f74899ba2f07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:04:09 2020 +0100 msvcrt: Use the msvcrt atoi() function internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 52 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 2 +- dlls/msvcrt/undname.c | 4 ++-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 37c4afcf786..32f2c9b4624 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -357,7 +357,7 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s locale_cp = CP_UTF8; #endif } else { - locale_cp = atoi(cp + 1); + locale_cp = MSVCRT_atoi(cp + 1); } if (!IsValidCodePage(locale_cp)) return -1; @@ -1118,7 +1118,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, LCID lcid[6] = { 0 }; unsigned short cp[6] = { 0 }; const char *locale_name[6] = { 0 }; - int locale_len[6] = { 0 }; + int val, locale_len[6] = { 0 }; char buf[256]; BOOL sname; #if _MSVCR_VER >= 100 @@ -1437,65 +1437,65 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IINTLCURRDIGITS - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->int_frac_digits = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IINTLCURRDIGITS + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->int_frac_digits = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_ICURRDIGITS - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->frac_digits = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_ICURRDIGITS + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->frac_digits = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSYMPRECEDES - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->p_cs_precedes = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSYMPRECEDES + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->p_cs_precedes = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSEPBYSPACE - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->p_sep_by_space = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSEPBYSPACE + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->p_sep_by_space = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSYMPRECEDES - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->n_cs_precedes = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSYMPRECEDES + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->n_cs_precedes = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSEPBYSPACE - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->n_sep_by_space = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSEPBYSPACE + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->n_sep_by_space = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSIGNPOSN - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->p_sign_posn = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSIGNPOSN + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->p_sign_posn = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSIGNPOSN - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->n_sign_posn = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSIGNPOSN + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->n_sign_posn = val; else { free_locinfo(locinfo); return NULL; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ab5b4c13f85..7c9e3137e14 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1072,6 +1072,7 @@ void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); void* __cdecl MSVCRT_realloc(void*,MSVCRT_size_t); +int __cdecl MSVCRT_atoi(const char *str); int __cdecl MSVCRT_isalpha(int c); int __cdecl MSVCRT_isdigit(int c); int __cdecl MSVCRT_isspace(int c); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5a11eb1312b..d08687244b4 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2441,7 +2441,7 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 MSVCRT_sprintf(buf, format, d); buf[1] = buf[0]; - data->pos = atoi(buf+prec+3); + data->pos = MSVCRT_atoi(buf+prec+3); if(buf[1] != '0') data->pos++; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 23317f49605..8f8557dcea5 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -469,7 +469,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, sym->current++; if (!(n1 = get_number(sym))) return FALSE; - num = atoi(n1); + num = MSVCRT_atoi(n1); if (str_modif[0] == ' ' && !modifier) str_modif++; @@ -1007,7 +1007,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!(n1 = get_number(sym))) goto done; - num = atoi(n1); + num = MSVCRT_atoi(n1); while (num--) arr = str_printf(sym, "%s[%s]", arr, get_number(sym));

1 0

Alexandre Julliard : msvcrt: Use the msvcrt string functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

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

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

18 Nov '20

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

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

18 Nov '20

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

Robert Wilhelm : vbscript: Support properties with parameters.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: a839ac952a8d5673b0aff6307cc7ecc0eabb3d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a839ac952a8d5673b0aff630… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Nov 17 21:11:32 2020 +0100 vbscript: Support properties with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++++++ dlls/vbscript/vbdisp.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a9f4c540fcb..8f1c1307794 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -454,7 +454,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 53f36b6e710..ed89906c9cf 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1770,6 +1770,27 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public Property Let Key(oldKey,newKey) + oDict = oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict = uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict = a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f493d420bd..ee4875f4e01 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -197,28 +197,43 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT i; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for(i=1; i < dp.cArgs; i++) { + dp.rgvarg[i]=params->rgvarg[params->cNamedArgs+i-1]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default:

1 0

Alex Henrie : urlmon: Reimplement canonicalize_ipv6address on top of ntdll functions.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: dcdbe44d04906401049e406c7729b133e49c7946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcdbe44d04906401049e406c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 18 20:02:17 2020 +0100 urlmon: Reimplement canonicalize_ipv6address on top of ntdll functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 25 +++ dlls/urlmon/uri.c | 438 +++--------------------------------------------- 2 files changed, 45 insertions(+), 418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dcdbe44d04906401049e…

1 0