March 2020 - Wine-commits - list.winehq.org

Piotr Caban : msvcp140: Don't load __processing_throw dynamically.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: e91be162836d2e6b54f6a16653d1c41047e78a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91be162836d2e6b54f6a166… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 20 14:32:36 2020 +0100 msvcp140: Don't load __processing_throw dynamically. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 3 ++- dlls/msvcp90/msvcp90.h | 4 ---- dlls/msvcp90/msvcp_main.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 74529e9019..e75b8cc729 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); +int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; @@ -947,7 +948,7 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void) #if _MSVCP_VER >= 140 int __cdecl __uncaught_exceptions(void) { - return *UCRTBASE___processing_throw(); + return *__processing_throw(); } typedef struct diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 497ca126e4..9a9390d699 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -49,10 +49,6 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); -#if _MSVCP_VER >= 140 -extern int* (__cdecl *UCRTBASE___processing_throw)(void); -#endif - #if _MSVCP_VER >= 110 /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 82bbf84c25..816a95c29e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -58,10 +58,6 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); -#if _MSVCP_VER >= 140 -int* (__cdecl *UCRTBASE___processing_throw)(void); -#endif - #if _MSVCP_VER >= 110 critical_section* (__thiscall *critical_section_ctor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*); @@ -129,7 +125,6 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); - UCRTBASE___processing_throw = (void*)GetProcAddress(hmod, "__processing_throw"); hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) );

1 0

Jacek Caban : jscript: Simplify Object.prototype.toString implementation.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 2be65404d2607de718d71271f6f77fb21aebc25d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be65404d2607de718d71271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:35:27 2020 +0100 jscript: Simplify Object.prototype.toString implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bfc1a892df..580e11833e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -56,27 +56,31 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u jsdisp_t *jsdisp; const WCHAR *str; - static const WCHAR formatW[] = {'[','o','b','j','e','c','t',' ','%','s',']',0}; - - static const WCHAR arrayW[] = {'A','r','r','a','y',0}; - static const WCHAR booleanW[] = {'B','o','o','l','e','a','n',0}; - static const WCHAR dateW[] = {'D','a','t','e',0}; - static const WCHAR errorW[] = {'E','r','r','o','r',0}; - static const WCHAR functionW[] = {'F','u','n','c','t','i','o','n',0}; - static const WCHAR mathW[] = {'M','a','t','h',0}; - static const WCHAR numberW[] = {'N','u','m','b','e','r',0}; - static const WCHAR objectW[] = {'O','b','j','e','c','t',0}; - static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; - static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW, - functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; + static const WCHAR *names[] = { + NULL, + L"[object Array]", + L"[object Boolean]", + L"[object Date]", + L"[object Object]", + L"[object Error]", + L"[object Function]", + NULL, + L"[object Math]", + L"[object Number]", + L"[object Object]", + L"[object RegExp]", + L"[object String]", + L"[object Object]", + L"[object Object]", + L"[object Object]" + }; TRACE("\n"); jsdisp = get_jsdisp(jsthis); if(!jsdisp) { - str = objectW; + str = L"[object Object]"; }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { @@ -87,13 +91,9 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u if(r) { jsstr_t *ret; - WCHAR *ptr; - - ret = jsstr_alloc_buf(9+lstrlenW(str), &ptr); + ret = jsstr_alloc(str); if(!ret) return E_OUTOFMEMORY; - - swprintf(ptr, 9 + lstrlenW(str), formatW, str); *r = jsval_string(ret); }

1 0

Jacek Caban : wininet: Use _ltow instead of sprintf for port number in InternetCreateUrl.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 9fe900532eb310d114c04d15a8d0b986ec831552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe900532eb310d114c04d15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:35:43 2020 +0100 wininet: Use _ltow instead of sprintf for port number in InternetCreateUrl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cdafbfa139..4b7cdad66e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4263,9 +4263,10 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - char szPort[MAX_WORD_DIGITS+1]; + WCHAR port[MAX_WORD_DIGITS + 1]; - *lpdwUrlLength += sprintf(szPort, "%d", lpUrlComponents->nPort); + _ltow(lpUrlComponents->nPort, port, 10); + *lpdwUrlLength += lstrlenW(port); *lpdwUrlLength += strlen(":"); } @@ -4421,10 +4422,8 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, { DWORD dwLen; INTERNET_SCHEME nScheme; - WCHAR *start = lpszUrl; static const WCHAR slashSlashW[] = {'/','/'}; - static const WCHAR fmtW[] = {'%','u',0}; TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -4509,9 +4508,9 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - *lpszUrl = ':'; - lpszUrl++; - lpszUrl += swprintf(lpszUrl, *lpdwUrlLength - (lpszUrl - start), fmtW, lpUrlComponents->nPort); + *lpszUrl++ = ':'; + _ltow(lpUrlComponents->nPort, lpszUrl, 10); + lpszUrl += lstrlenW(lpszUrl); } /* add slash between hostname and path if necessary */

1 0

Jacek Caban : mscoree: Use wcstok_s instead of wcstok.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 8f155eea7b3b7a8f480a0ae598b9ca45c30983b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f155eea7b3b7a8f480a0ae5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:36:08 2020 +0100 mscoree: Use wcstok_s instead of wcstok. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a8fc2674ac..7eb4385494 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1425,19 +1425,20 @@ __int32 WINAPI _CorExeMain(void) hr = parse_config_file(config_file, &parsed_config); if (SUCCEEDED(hr) && parsed_config.private_path && parsed_config.private_path[0]) { + WCHAR *save; for(i = 0; parsed_config.private_path[i] != 0; i++) if (parsed_config.private_path[i] == ';') number_of_private_paths++; if (parsed_config.private_path[wcslen(parsed_config.private_path) - 1] != ';') number_of_private_paths++; config_file_dir_size = (wcsrchr(config_file, '\\') - config_file) + 1; priv_path = HeapAlloc(GetProcessHeap(), 0, (number_of_private_paths + 1) * sizeof(WCHAR *)); /* wcstok ignores trailing semicolons */ - temp = wcstok(parsed_config.private_path, scW); + temp = wcstok_s(parsed_config.private_path, scW, &save); for (i = 0; i < number_of_private_paths; i++) { priv_path[i] = HeapAlloc(GetProcessHeap(), 0, (config_file_dir_size + wcslen(temp) + 1) * sizeof(WCHAR)); memcpy(priv_path[i], config_file, config_file_dir_size * sizeof(WCHAR)); wcscpy(priv_path[i] + config_file_dir_size, temp); - temp = wcstok(NULL, scW); + temp = wcstok_s(NULL, scW, &save); } priv_path[number_of_private_paths] = NULL; if (InterlockedCompareExchangePointer((void **)&private_path, priv_path, NULL))

1 0

Jacek Caban : makefiles: Explicitly import msvcrt in modules that need specific crt version.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 14df0183b0b43049d0f645f72f435309cb6836a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14df0183b0b43049d0f645f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:36:25 2020 +0100 makefiles: Explicitly import msvcrt in modules that need specific crt version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/Makefile.in | 1 + dlls/msvcp60/Makefile.in | 1 + dlls/msvcrt20/Makefile.in | 1 + dlls/ntoskrnl.exe/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 65be0729dc..619a3dd66d 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -1,6 +1,7 @@ MODULE = msvcirt.dll EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 +IMPORTS = msvcrt EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index bb73e7b74d..5271fc21e2 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -1,6 +1,7 @@ MODULE = msvcp60.dll EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 +IMPORTS = msvcrt EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index 0b80514363..0696bfccea 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt20.dll +IMPORTS = msvcrt EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index a75ca9768d..67afa8f9d8 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,6 +1,6 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl -IMPORTS = advapi32 hal +IMPORTS = advapi32 hal msvcrt DELAYIMPORTS = setupapi user32 EXTRADLLFLAGS = -mno-cygwin

1 0

Jacek Caban : makedep: Build builtin DLLs with ucrtbase.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 05b774fb48dac5f412e3490313c6e70199013568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b774fb48dac5f412e34903… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:36:37 2020 +0100 makedep: Build builtin DLLs with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c415c5e84f..4f19231e7c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4268,16 +4268,16 @@ static void load_sources( struct makefile *make ) if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); crt_dll = make->imports.str[i]; } - if (!crt_dll) + if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - if (make->use_msvcrt && make->is_exe) + if (make->use_msvcrt && !make->testdll && !make->staticlib) { strarray_add( &make->imports, "ucrtbase" ); crt_dll = "ucrtbase"; } else crt_dll = "msvcrt"; } - if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); + if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 );

1 0

Hans Leidekker : webservices: Implement WS_ANY_ATTRIBUTES_FIELD_MAPPING for the writer.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 9616d2586c96f5cce100f45eca0bdc1cd1afdb02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9616d2586c96f5cce100f45e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 20 16:03:52 2020 +0100 webservices: Implement WS_ANY_ATTRIBUTES_FIELD_MAPPING for the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 3 +++ dlls/webservices/tests/writer.c | 11 +++++++++-- dlls/webservices/writer.c | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index bf29990923..f1ce93b7d7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6085,6 +6085,9 @@ ULONG get_type_size( WS_TYPE type, const void *desc ) const WS_UNION_DESCRIPTION *desc_union = desc; return desc_union->size; } + case WS_ANY_ATTRIBUTES_TYPE: + return 0; + default: ERR( "unhandled type %u\n", type ); return 0; diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d66c2e4319..e996e4972b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1586,10 +1586,11 @@ static void test_complex_struct_type(void) WS_XML_BUFFER *buffer; WS_XML_WRITER *writer; WS_STRUCT_DESCRIPTION s, s2; - WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_FIELD_DESCRIPTION f, f2, f3, *fields[1], *fields2[2]; struct services { const WCHAR *generationtime; + BYTE dummy[12]; }; struct officeconfig { @@ -1619,11 +1620,17 @@ static void test_complex_struct_type(void) f2.options = WS_FIELD_OPTIONAL; fields2[0] = &f2; + memset( &f3, 0, sizeof(f3) ); + f3.mapping = WS_ANY_ATTRIBUTES_FIELD_MAPPING; + f3.type = WS_ANY_ATTRIBUTES_TYPE; + f3.offset = FIELD_OFFSET(struct services, dummy); + fields2[1] = &f3; + memset( &s2, 0, sizeof(s2) ); s2.size = sizeof(*test->services); s2.alignment = 4; s2.fields = fields2; - s2.fieldCount = 1; + s2.fieldCount = 2; s2.typeLocalName = &str_services; s2.typeNs = &ns; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 53489786cd..989ea0986d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3831,6 +3831,9 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI } break; + case WS_ANY_ATTRIBUTES_FIELD_MAPPING: + return S_OK; + default: FIXME( "field mapping %u not supported\n", desc->mapping ); return E_NOTIMPL;

1 0

Hans Leidekker : webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the writer.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 234115c8cc81d43e4e43f67e3a100e9d8b431f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=234115c8cc81d43e4e43f67e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 20 16:03:53 2020 +0100 webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 56 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 22 ++++++++++++++-- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index e996e4972b..1d76918901 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4793,6 +4793,61 @@ static void test_stream_output(void) WsFreeWriter( writer ); } +static void test_description_type(void) +{ + static WS_XML_STRING ns = {0, NULL}, localname = {1, (BYTE *)"t"}, val = {3, (BYTE *)"val"}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_STRUCT_DESCRIPTION s; + struct test + { + const WS_STRUCT_DESCRIPTION *desc; + INT32 val; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TYPE_ATTRIBUTE_FIELD_MAPPING; + f.type = WS_DESCRIPTION_TYPE; + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f2.localName = &val; + f2.ns = &ns; + f2.offset = FIELD_OFFSET(struct test, val); + f2.type = WS_INT32_TYPE; + fields[1] = &f2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 2; + s.typeLocalName = &localname; + s.typeNs = &ns; + + test.desc = &s; + test.val = -1; + + hr = set_output( writer ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t val=\"-1\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4837,4 +4892,5 @@ START_TEST(writer) test_text_types_binary(); test_repeating_element_choice(); test_stream_output(); + test_description_type(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 989ea0986d..28df4a3c4e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3760,8 +3760,8 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI return E_NOTIMPL; } - /* zero-terminated strings are always pointers */ - if (desc->type == WS_WSZ_TYPE) field_options |= WS_FIELD_POINTER; + /* zero-terminated strings and descriptions are always pointers */ + if (desc->type == WS_WSZ_TYPE || desc->type == WS_DESCRIPTION_TYPE) field_options |= WS_FIELD_POINTER; if (field_options & WS_FIELD_POINTER) size = sizeof(const void *); @@ -3790,6 +3790,10 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI switch (desc->mapping) { + case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: + mapping = WS_ATTRIBUTE_TYPE_MAPPING; + break; + case WS_ATTRIBUTE_FIELD_MAPPING: if (!desc->localName || !desc->ns) return E_INVALIDARG; if ((hr = write_add_attribute( writer, NULL, desc->localName, desc->ns, FALSE )) != S_OK) @@ -3910,6 +3914,17 @@ static HRESULT write_type_enum( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_description( struct writer *writer, WS_TYPE_MAPPING mapping, + WS_WRITE_OPTION option, const void *value, ULONG size ) +{ + const WS_STRUCT_DESCRIPTION *ptr; + HRESULT hr; + + if ((hr = get_value_ptr( option, value, size, sizeof(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (ptr) FIXME( "ignoring type description %p\n", ptr ); + return S_OK; +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -3970,6 +3985,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_XML_QNAME_TYPE: return write_type_qname( writer, mapping, desc, option, value, size ); + case WS_DESCRIPTION_TYPE: + return write_type_description( writer, mapping, option, value, size ); + case WS_STRUCT_TYPE: return write_type_struct( writer, mapping, desc, option, value, size );

1 0

Jacek Caban : dbghelp: Call GetSystemInfo in DllMain.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 7544b9f6fb0bf39c714452968e20e478efaa104a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7544b9f6fb0bf39c71445296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 18:09:12 2020 +0100 dbghelp: Call GetSystemInfo in DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 13 +++++++++++++ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 2 -- dlls/dbghelp/macho_module.c | 2 -- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 03e721f0c9..a8e04c7303 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -68,9 +68,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); unsigned dbghelp_options = SYMOPT_UNDNAME; BOOL dbghelp_opt_native = FALSE; +SYSTEM_INFO sysinfo; static struct process* process_first /* = NULL */; +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + GetSystemInfo(&sysinfo); + DisableThreadLibraryCalls(instance); + break; + } + return TRUE; +} + /****************************************************************** * process_find_by_handle * diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d55b018fa7..8fa9e799c0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -115,6 +115,7 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; +extern SYSTEM_INFO sysinfo DECLSPEC_HIDDEN; enum location_kind {loc_error, /* reg is the error code */ loc_unavailable, /* location is not available */ diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 142f2f036a..5a6bef947a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -137,7 +137,6 @@ struct elf_module_info static const char* elf_map_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - SYSTEM_INFO sysinfo; SIZE_T ofst, size; HANDLE mapping; @@ -152,7 +151,6 @@ static const char* elf_map_section(struct image_section_map* ism) } /* align required information on allocation granularity */ - GetSystemInfo(&sysinfo); ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(sysinfo.dwAllocationGranularity - 1); size = fmap->sect[ism->sidx].shdr.sh_offset + fmap->sect[ism->sidx].shdr.sh_size - ofst; if (!(mapping = CreateFileMappingW(fmap->handle, NULL, PAGE_READONLY, 0, ofst + size, NULL))) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 725363b316..f10dc78eec 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -164,11 +164,9 @@ static void macho_calc_range(const struct macho_file_map* fmap, unsigned long of unsigned long len, unsigned long* out_aligned_offset, unsigned long* out_aligned_end, unsigned long* out_misalign) { - SYSTEM_INFO sysinfo; unsigned long pagemask; unsigned long file_offset, misalign; - GetSystemInfo(&sysinfo); pagemask = sysinfo.dwAllocationGranularity - 1; file_offset = fmap->arch_offset + offset; misalign = file_offset & pagemask;

1 0

Jacek Caban : dbghelp: Use page size from sysinfo.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 1ece841d9354296f374228b9e16246a076f57196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ece841d9354296f374228b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 18:09:25 2020 +0100 dbghelp: Use page size from sysinfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 5a6bef947a..a11e73a0e1 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -403,7 +403,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; unsigned int i; - size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; + size_t tmp, page_mask = sysinfo.dwPageSize - 1; WCHAR *dos_path; unsigned char e_ident[EI_NIDENT]; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f10dc78eec..8fa05d312a 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -569,7 +569,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load struct section_info* info = user; BOOL ignore; int i; - unsigned long tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; + unsigned long tmp, page_mask = sysinfo.dwPageSize - 1; uint64_t vmaddr, vmsize; char segname[16]; uint32_t nsects;

1 0