wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Nikolay Sivov : kernel32/tests: Fix sprintf() arguments (Coverity).
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: b68b08b5deb191859ea1f7052815b7f8340fc475 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68b08b5deb191859ea1f705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 22:33:26 2021 +0300 kernel32/tests: Fix sprintf() arguments (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3003ff63f5a..0bce88716d0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4444,7 +4444,7 @@ static void test_AllocConsole(void) if (skip_nt) return; winetest_get_mainargs(&argv); - sprintf(buf, "\"%s\" console alloc_console", argv[0], GetCurrentProcessId()); + sprintf(buf, "\"%s\" console alloc_console", argv[0]); res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); ok(res, "CreateProcess failed: %u\n", GetLastError()); CloseHandle(info.hThread);

1 0

Nikolay Sivov : widl: Remove arguments from writing calls that don't use them (Coverity).
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 23cbb01c0ece5ce66a2d6e3f7a9aec070865d2d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23cbb01c0ece5ce66a2d6e3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 22:25:01 2021 +0300 widl: Remove arguments from writing calls that don't use them (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 1a69b298e7d..bee7306f413 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,11 +192,11 @@ static void write_namespace_end(FILE *header, struct namespace *namespace) { if(is_global_namespace(namespace)) { if(use_abi_namespace) - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); return; } - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); write_namespace_end(header, namespace->parent); }

1 0

Nikolay Sivov : services/tests: Fix printf-style helper format (Coverity).
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 2de886dd7b36bc4819a9518c0ffc54ef3b76bd53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de886dd7b36bc4819a9518c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 22:24:50 2021 +0300 services/tests: Fix printf-style helper format (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 4eebbc432df..93eff0e36f0 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -26,6 +26,12 @@ #include "wine/test.h" +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE; @@ -56,6 +62,7 @@ static inline void service_event(const char *event) send_msg("EVENT", event); } +static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3); static void WINAPIV service_ok(int cnd, const char *msg, ...) { __ms_va_list valist; @@ -135,7 +142,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR BOOL r; MONITORINFOEXA mi; - service_ok(hmon != NULL, "Unexpected hmon=%#x\n", hmon); + service_ok(hmon != NULL, "Unexpected hmon %p\n", hmon); monitor_count++;

1 0

Rémi Bernon : msvcrt: Improve memset performance using overlapping stores.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 7b17d7081512db52ef852705445762ac4016c29f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b17d7081512db52ef852705… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 16:28:14 2021 +0200 msvcrt: Improve memset performance using overlapping stores. For n larger than 16 we store 16 bytes on each end of the buffer, eventually overlapping, and then 16 additional bytes for n > 32. Then we can find a 32-byte aligned range overlapping the remaining part of the destination buffer, which is filled 32 bytes at a time in a loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..f2b1b4a5b11 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2855,13 +2855,67 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) return memmove(dst, src, n); } +static inline void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) +{ + while (n >= 32) + { + *(uint64_t *)(d + n - 32) = v; + *(uint64_t *)(d + n - 24) = v; + *(uint64_t *)(d + n - 16) = v; + *(uint64_t *)(d + n - 8) = v; + n -= 32; + } +} + /********************************************************************* * memset (MSVCRT.@) */ -void* __cdecl memset(void *dst, int c, size_t n) +void *__cdecl memset(void *dst, int c, size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + if (n >= 16) + { + *(uint64_t *)(d + 0) = v; + *(uint64_t *)(d + 8) = v; + *(uint64_t *)(d + n - 16) = v; + *(uint64_t *)(d + n - 8) = v; + if (n <= 32) return dst; + *(uint64_t *)(d + 16) = v; + *(uint64_t *)(d + 24) = v; + *(uint64_t *)(d + n - 32) = v; + *(uint64_t *)(d + n - 24) = v; + if (n <= 64) return dst; + + n = (n - a) & ~0x1f; + memset_aligned_32(d + a, v, n); + return dst; + } + if (n >= 8) + { + *(uint64_t *)d = v; + *(uint64_t *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(uint32_t *)d = v; + *(uint32_t *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(uint16_t *)d = v; + *(uint16_t *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; }

1 0

Eric Pouech : dbghelp/dwarf: Properly parse line number header for DWARF4 debug info.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: e87f3dd5b8dc6276289863cdbe4a4498fc64fa4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87f3dd5b8dc6276289863cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:42 2021 +0200 dbghelp/dwarf: Properly parse line number header for DWARF4 debug info. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 00fa0f6fb60..098576d620f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2222,7 +2222,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { dwarf2_traverse_context_t traverse; ULONG_PTR length; - unsigned insn_size, default_stmt; + unsigned insn_size, version, default_stmt; unsigned line_range, opcode_base; int line_base; unsigned char offset_size; @@ -2256,9 +2256,11 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, WARN("out of bounds header\n"); return FALSE; } - dwarf2_parse_u2(&traverse); /* version */ + version = dwarf2_parse_u2(&traverse); dwarf2_parse_offset(&traverse, offset_size); /* header_len */ insn_size = dwarf2_parse_byte(&traverse); + if (version >= 4) + dwarf2_parse_byte(&traverse); /* max_operations_per_instructions */ default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse); line_range = dwarf2_parse_byte(&traverse);

1 0

Eric Pouech : dbghelp/dwarf: Detect auto reference between a dwarf's DIE and its type.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: e28ec5a0fb6fbbca7ed69d445881dfc60974ea4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e28ec5a0fb6fbbca7ed69d44… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:36 2021 +0200 dbghelp/dwarf: Detect auto reference between a dwarf's DIE and its type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a59999c9e70..00fa0f6fb60 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1025,6 +1025,11 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); return ctx->symt_cache[sc_unknown]; } + if (type == di) + { + FIXME("Reference to itself\n"); + return ctx->symt_cache[sc_unknown]; + } if (!type->symt) { /* load the debug info entity */

1 0

Eric Pouech : dbghelp/dwarf: Validate that a string is in the section boundary before using it.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 3111daa2228850aeab14b1eaf26d0ec26b810572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3111daa2228850aeab14b1ea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:30 2021 +0200 dbghelp/dwarf: Validate that a string is in the section boundary before using it. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7a9efe56312..a59999c9e70 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -601,9 +601,19 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_strp: - attr->u.string = (const char*)ctx->sections[section_string].address + - dwarf2_get_addr(data, ctx->head.offset_size); - TRACE("strp<%s>\n", debugstr_a(attr->u.string)); + { + ULONG_PTR ofs = dwarf2_get_addr(data, ctx->head.offset_size); + if (ofs >= ctx->sections[section_string].size) + { + ERR("Out of bounds string offset (%08lx)\n", ofs); + attr->u.string = "<<outofbounds-strp>>"; + } + else + { + attr->u.string = (const char*)ctx->sections[section_string].address + ofs; + TRACE("strp<%s>\n", debugstr_a(attr->u.string)); + } + } break; case DW_FORM_block:

1 0

Eric Pouech : dbghelp/dwarf: Add definitions of some GNU extensions for FORMs.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 23f0ebbca6b199126a4a4b8af82c92c2fde562d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23f0ebbca6b199126a4a4b8a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:24 2021 +0200 dbghelp/dwarf: Add definitions of some GNU extensions for FORMs. And return failure when encoutering them, as they are not supported yet. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 10 ++++++++++ dlls/dbghelp/dwarf.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5433f12d794..7a9efe56312 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -501,6 +501,8 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, case DW_FORM_block2: step = dwarf2_parse_u2(ctx); break; case DW_FORM_block4: step = dwarf2_parse_u4(ctx); break; case DW_FORM_sec_offset: + case DW_FORM_GNU_ref_alt: + case DW_FORM_GNU_strp_alt: case DW_FORM_strp: step = head->offset_size; break; default: FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); @@ -633,6 +635,14 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, TRACE("sec_offset<%s>\n", wine_dbgstr_longlong(attr->u.lluvalue)); break; + case DW_FORM_GNU_ref_alt: + FIXME("Unhandled FORM_GNU_ref_alt\n"); + attr->u.uvalue = 0; + return FALSE; + case DW_FORM_GNU_strp_alt: + FIXME("Unhandled FORM_GNU_strp_alt\n"); + attr->u.string = NULL; + return FALSE; default: FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); break; diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 603c302d136..a50a7251876 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -266,6 +266,10 @@ typedef enum dwarf_form_e DW_FORM_exprloc = 0x18, DW_FORM_flag_present = 0x19, DW_FORM_ref_sig8 = 0x20, + + /** GNU extensions */ + DW_FORM_GNU_ref_alt = 0x1f20, + DW_FORM_GNU_strp_alt = 0x1f21, } dwarf_form_t; /** type encoding */

1 0

Eric Pouech : dbghelp/dwarf: Handle errors in dwarf2_fill_attr by returning a boolean.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 12a778426d9b4ee6fa030680ba2fb5a8a3012bf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a778426d9b4ee6fa030680… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:18 2021 +0200 dbghelp/dwarf: Handle errors in dwarf2_fill_attr by returning a boolean. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b7df7f108d9..5433f12d794 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -509,7 +509,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, ctx->data += step; } -static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, +static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, const dwarf2_abbrev_entry_attr_t* abbrev_attr, const unsigned char* data, struct attribute* attr) @@ -637,6 +637,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); break; } + return TRUE; } static BOOL dwarf2_find_attribute(const dwarf2_parse_context_t* ctx, @@ -655,8 +656,7 @@ static BOOL dwarf2_find_attribute(const dwarf2_parse_context_t* ctx, { if (abbrev_attr->attribute == at) { - dwarf2_fill_attr(ctx, abbrev_attr, di->data[i], attr); - return TRUE; + return dwarf2_fill_attr(ctx, abbrev_attr, di->data[i], attr); } if ((abbrev_attr->attribute == DW_AT_abstract_origin || abbrev_attr->attribute == DW_AT_specification) && @@ -671,8 +671,8 @@ static BOOL dwarf2_find_attribute(const dwarf2_parse_context_t* ctx, } } /* do we have either an abstract origin or a specification debug entry to look into ? */ - if (!ref_abbrev_attr) break; - dwarf2_fill_attr(ctx, ref_abbrev_attr, di->data[refidx], attr); + if (!ref_abbrev_attr || !dwarf2_fill_attr(ctx, ref_abbrev_attr, di->data[refidx], attr)) + break; if (!(di = sparse_array_find(&ctx->debug_info_table, attr->u.uvalue))) FIXME("Should have found the debug info entry\n"); }

1 0

Eric Pouech : dbghelp/dwarf: Add support for FORM_exprloc.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 40877456ea0c7a959acca92631d1f1b8c89786f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40877456ea0c7a959acca926… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:12 2021 +0200 dbghelp/dwarf: Add support for FORM_exprloc. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a9a72ee6566..b7df7f108d9 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -495,6 +495,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, case DW_FORM_ref_udata: case DW_FORM_udata: step = dwarf2_leb128_length(ctx); break; case DW_FORM_string: step = strlen((const char*)ctx->data) + 1; break; + case DW_FORM_exprloc: case DW_FORM_block: step = dwarf2_leb128_as_unsigned(ctx); break; case DW_FORM_block1: step = dwarf2_parse_byte(ctx); break; case DW_FORM_block2: step = dwarf2_parse_u2(ctx); break; @@ -604,6 +605,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_block: + case DW_FORM_exprloc: attr->u.block.size = dwarf2_get_leb128_as_unsigned(data, &attr->u.block.ptr); TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; @@ -955,6 +957,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, case DW_FORM_block1: case DW_FORM_block2: case DW_FORM_block4: + case DW_FORM_exprloc: break; default: FIXME("Unsupported yet form %lx\n", xloc.form); return FALSE; @@ -1696,6 +1699,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, case DW_FORM_block1: case DW_FORM_block2: case DW_FORM_block4: + case DW_FORM_exprloc: v.n1.n2.vt = VT_I4; switch (value.u.block.size) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021