wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Eric Pouech : dbghelp/dwarf: Fold printing info about unit context when printing debug_info's.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 87b70fb272a8b0e1059ccc083e27a09e970af217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87b70fb272a8b0e1059ccc08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:28 2021 +0200 dbghelp/dwarf: Fold printing info about unit context when printing debug_info's. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 81 ++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=87b70fb272a8b0e1059c…

1 0

Eric Pouech : dbghelp/dwarf: No longer pass a unit context to dwarf2_get_cpp_name.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: e804b0754f02acb555df57112b3c5c616b316476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e804b0754f02acb555df5711… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:22 2021 +0200 dbghelp/dwarf: No longer pass a unit context to dwarf2_get_cpp_name. Use debug_info's unit context instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0bbbe0907e2..122e9b71d7e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1105,16 +1105,16 @@ static struct symt* dwarf2_lookup_type(const dwarf2_debug_info_t* di) return type->symt; } -static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name) +static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name) { char* last; struct attribute diname; struct attribute spec; if (di->abbrev->tag == DW_TAG_compile_unit) return name; - if (!ctx->cpp_name) - ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); - last = ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; + if (!di->unit_ctx->cpp_name) + di->unit_ctx->cpp_name = pool_alloc(&di->unit_ctx->pool, MAX_SYM_NAME); + last = di->unit_ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; strcpy(last, name); /* if the di is a definition, but has also a (previous) declaration, then scope must @@ -1122,7 +1122,7 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug */ if (dwarf2_find_attribute(di, DW_AT_specification, &spec) && spec.gotten_from == attr_direct) { - di = sparse_array_find(&ctx->debug_info_table, spec.u.uvalue); + di = sparse_array_find(&di->unit_ctx->debug_info_table, spec.u.uvalue); if (!di) { FIXME("Should have found the debug info entry\n"); @@ -1143,7 +1143,7 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug { size_t len = strlen(diname.u.string); last -= 2 + len; - if (last < ctx->cpp_name) return NULL; + if (last < di->unit_ctx->cpp_name) return NULL; memcpy(last, diname.u.string, len); last[len] = last[len + 1] = ':'; } @@ -1568,7 +1568,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, name.u.string = "zz_anon_zz"; if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = 0; - di->symt = &symt_new_udt(ctx->module_ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string), + di->symt = &symt_new_udt(ctx->module_ctx->module, dwarf2_get_cpp_name(di, name.u.string), size.u.uvalue, udt)->symt; children = dwarf2_get_di_children(di); @@ -1735,7 +1735,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, ext.u.uvalue = 0; loc.offset += subpgm->ctx->module_ctx->load_offset; symt_new_global_variable(subpgm->ctx->module_ctx->module, subpgm->ctx->compiland, - dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, + dwarf2_get_cpp_name(di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; default: @@ -2057,7 +2057,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module_ctx->module, ret_type, CV_CALL_FAR_C); subpgm.func = symt_new_function(ctx->module_ctx->module, ctx->compiland, - dwarf2_get_cpp_name(ctx, di, name.u.string), + dwarf2_get_cpp_name(di, name.u.string), ctx->module_ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); di->symt = &subpgm.func->symt;

1 0

Eric Pouech : dbghelp/dwarf: No longer pass a parse context to dwarf2_find_attribute.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 61af17e6cf5ef5e9ec076569fbb13e58332d9573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61af17e6cf5ef5e9ec076569… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:16 2021 +0200 dbghelp/dwarf: No longer pass a parse context to dwarf2_find_attribute. Use debug_info's unit context instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 89 ++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61af17e6cf5ef5e9ec07…

1 0

Eric Pouech : dbghelp/dwarf: Load the alternate dwarf file content as we do for a regular dwarf module.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 517f614bc8fedd2866114f83433fc23aefea1b52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=517f614bc8fedd2866114f83… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:10 2021 +0200 dbghelp/dwarf: Load the alternate dwarf file content as we do for a regular dwarf module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 90 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e3d1e35c179..34e59aa3a75 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -191,6 +191,7 @@ typedef struct dwarf2_dwz_alternate_s struct image_file_map* fmap; dwarf2_section_t sections[section_max]; struct image_section_map sectmap[section_max]; + dwarf2_parse_module_context_t module_ctx; } dwarf2_dwz_alternate_t; enum unit_status @@ -3689,6 +3690,41 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf HeapFree(GetProcessHeap(), 0, modfmt); } +static BOOL dwarf2_load_CU_module(dwarf2_parse_module_context_t* module_ctx, struct module* module, + dwarf2_section_t* sections, ULONG_PTR load_offset, + const struct elf_thunk_area* thunks) +{ + dwarf2_traverse_context_t mod_ctx; + unsigned i; + + module_ctx->sections = sections; + module_ctx->module = module; + module_ctx->thunks = thunks; + module_ctx->load_offset = load_offset; + memset(module_ctx->symt_cache, 0, sizeof(module_ctx->symt_cache)); + module_ctx->symt_cache[sc_void] = &symt_new_basic(module_ctx->module, btVoid, "void", 0)->symt; + module_ctx->symt_cache[sc_unknown] = &symt_new_basic(module_ctx->module, btNoType, "# unknown", 0)->symt; + vector_init(&module_ctx->unit_contexts, sizeof(dwarf2_parse_context_t), 16); + module_ctx->cu_versions = 0; + + /* phase I: parse all CU heads */ + mod_ctx.data = sections[section_debug].address; + mod_ctx.end_data = mod_ctx.data + sections[section_debug].size; + while (mod_ctx.data < mod_ctx.end_data) + { + dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx->unit_contexts, &module_ctx->module->pool); + + unit_ctx->module_ctx = module_ctx; + dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); + } + + /* phase2: load content of all CU */ + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx->unit_contexts, i)); + + return TRUE; +} + static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module) { struct image_file_map* fmap_dwz; @@ -3710,6 +3746,8 @@ static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, stru dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]); dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); + dwz->module_ctx.dwz = NULL; + dwarf2_load_CU_module(&dwz->module_ctx, module, dwz->sections, 0/*FIXME*/, NULL); return dwz; } @@ -3732,20 +3770,29 @@ static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) HeapFree(GetProcessHeap(), 0, dwz); } +static BOOL dwarf2_unload_CU_module(dwarf2_parse_module_context_t* module_ctx) +{ + unsigned i; + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + { + dwarf2_parse_context_t* unit = vector_at(&module_ctx->unit_contexts, i); + if (unit->status != UNIT_ERROR) + pool_destroy(&unit->pool); + } + dwarf2_unload_dwz(module_ctx->dwz); + return TRUE; +} + BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) { dwarf2_section_t eh_frame, section[section_max]; - dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect, debug_ranges_sect, eh_frame_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; dwarf2_parse_module_context_t module_ctx; - unsigned i; - - module_ctx.dwz = dwarf2_load_dwz(fmap, module); if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ @@ -3798,30 +3845,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->u.dwarf2_info->cuheads = NULL; dwarf2_modfmt->u.dwarf2_info->num_cuheads = 0; - module_ctx.sections = section; - module_ctx.module = dwarf2_modfmt->module; - module_ctx.thunks = thunks; - module_ctx.load_offset = load_offset; - memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); - module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; - module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; - vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); - module_ctx.cu_versions = 0; - - /* phase I: parse all CU heads */ - mod_ctx.data = section[section_debug].address; - mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - while (mod_ctx.data < mod_ctx.end_data) - { - dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); - - unit_ctx->module_ctx = &module_ctx; - dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); - } - - /* phase2: load content of all CU */ - for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) - dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); + module_ctx.dwz = dwarf2_load_dwz(fmap, module); + dwarf2_load_CU_module(&module_ctx, module, section, load_offset, thunks); dwarf2_modfmt->module->module.SymType = SymDia; /* hide dwarf versions in CVSig @@ -3835,15 +3860,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; - for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) - { - dwarf2_parse_context_t* unit = vector_at(&module_ctx.unit_contexts, i); - if (unit->status != UNIT_ERROR) - pool_destroy(&unit->pool); - } - + dwarf2_unload_CU_module(&module_ctx); leave: - dwarf2_unload_dwz(module_ctx.dwz); dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Eric Pouech : dbghelp/dwarf: Handle DW_FORM_GNU_strp_alt (string located in an alternate DWZ file).
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 9f74ac4b3b8d0e1496ddc0730c8e88291f41df1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f74ac4b3b8d0e1496ddc073… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:03 2021 +0200 dbghelp/dwarf: Handle DW_FORM_GNU_strp_alt (string located in an alternate DWZ file). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af0244c8311..e3d1e35c179 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -682,9 +682,27 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, 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; + if (ctx->module_ctx->dwz) + { + ULONG_PTR ofs = dwarf2_get_addr(data, ctx->head.offset_size); + if (ofs < ctx->module_ctx->dwz->sections[section_string].size) + { + attr->u.string = (const char*)ctx->module_ctx->dwz->sections[section_string].address + ofs; + TRACE("strp_alt<%s>\n", debugstr_a(attr->u.string)); + } + else + { + ERR("out of bounds strp_alt: 0x%lx 0x%x (%u)\n", ofs, ctx->module_ctx->dwz->sections[section_string].size, ctx->head.offset_size); + attr->u.string = "<<outofbounds-strpalt>>"; + } + } + else + { + ERR("No DWZ file present for GNU_strp_alt in %s\n", debugstr_w(ctx->module_ctx->module->modulename)); + attr->u.string = "<<noDWZ-strpalt>>"; + } + break; + default: FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); break;

1 0

Eric Pouech : dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 16d66561632261e64eb341248bb14cbf87253b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d66561632261e64eb34124… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:57 2021 +0200 dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 90addb9a6b7..af0244c8311 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -182,9 +182,17 @@ typedef struct dwarf2_parse_module_context_s const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ struct vector unit_contexts; + struct dwarf2_dwz_alternate_s* dwz; DWORD cu_versions; } dwarf2_parse_module_context_t; +typedef struct dwarf2_dwz_alternate_s +{ + struct image_file_map* fmap; + dwarf2_section_t sections[section_max]; + struct image_section_map sectmap[section_max]; +} dwarf2_dwz_alternate_t; + enum unit_status { UNIT_ERROR, @@ -3663,6 +3671,49 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf HeapFree(GetProcessHeap(), 0, modfmt); } +static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module) +{ + struct image_file_map* fmap_dwz; + dwarf2_dwz_alternate_t* dwz; + + fmap_dwz = image_load_debugaltlink(fmap, module); + if (!fmap_dwz) return NULL; + if (!(dwz = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwz)))) + { + image_unmap_file(fmap_dwz); + HeapFree(GetProcessHeap(), 0, fmap_dwz); + return NULL; + } + + dwz->fmap = fmap_dwz; + dwarf2_init_section(&dwz->sections[section_debug], fmap_dwz, ".debug_info", ".zdebug_info", &dwz->sectmap[section_debug]); + dwarf2_init_section(&dwz->sections[section_abbrev], fmap_dwz, ".debug_abbrev", ".zdebug_abbrev", &dwz->sectmap[section_abbrev]); + dwarf2_init_section(&dwz->sections[section_string], fmap_dwz, ".debug_str", ".zdebug_str", &dwz->sectmap[section_string]); + dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]); + dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); + + return dwz; +} + +static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) +{ + if (!dwz) return; + dwarf2_fini_section(&dwz->sections[section_debug]); + dwarf2_fini_section(&dwz->sections[section_abbrev]); + dwarf2_fini_section(&dwz->sections[section_string]); + dwarf2_fini_section(&dwz->sections[section_line]); + dwarf2_fini_section(&dwz->sections[section_ranges]); + + image_unmap_section(&dwz->sectmap[section_debug]); + image_unmap_section(&dwz->sectmap[section_abbrev]); + image_unmap_section(&dwz->sectmap[section_string]); + image_unmap_section(&dwz->sectmap[section_line]); + image_unmap_section(&dwz->sectmap[section_ranges]); + + image_unmap_file(dwz->fmap); + HeapFree(GetProcessHeap(), 0, dwz); +} + BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) @@ -3676,6 +3727,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_parse_module_context_t module_ctx; unsigned i; + module_ctx.dwz = dwarf2_load_dwz(fmap, module); + if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect); @@ -3772,6 +3825,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, } leave: + dwarf2_unload_dwz(module_ctx.dwz); + dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]); dwarf2_fini_section(&section[section_string]);

1 0

Eric Pouech : dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: e5dbf5f74e4ec6a3a61007afe09c34df42d7ecf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5dbf5f74e4ec6a3a61007af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:51 2021 +0200 dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file. A DWZ file contains additional Dwarf debug information, and can be shared across several debug info files. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 83442ffb9e1..964e974e49d 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -194,6 +194,7 @@ struct macho64_nlist }; BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN; +struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, struct module* module) DECLSPEC_HIDDEN; BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN; BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c71e016b824..826306cfb38 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -629,6 +629,106 @@ found: return TRUE; } +/****************************************************************** + * image_load_debugaltlink + * + * Handle a (potential) .gnu_debugaltlink section and the link to + * (another) alternate debug file. + * Return an heap-allocated image_file_map when the section .gnu_debugaltlink is present, + * and a matching debug file has been located. + */ +struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, struct module* module) +{ + struct image_section_map debugaltlink_sect; + const char* data; + struct image_file_map* fmap_link = NULL; + BOOL ret = FALSE; + + for (; fmap; fmap = fmap->alternate) + { + if (image_find_section(fmap, ".gnu_debugaltlink", &debugaltlink_sect)) break; + } + if (!fmap) + { + TRACE("No .gnu_debugaltlink section found for %s\n", debugstr_w(module->modulename)); + return NULL; + } + + data = image_map_section(&debugaltlink_sect); + if (data != IMAGE_NO_MAP) + { + unsigned sect_len; + const BYTE* id; + /* The content of the section is: + * + a \0 terminated string + * + followed by the build-id + * We try loading the dwz_alternate, either as absolute path, or relative to the embedded build-id + */ + sect_len = image_get_map_size(&debugaltlink_sect); + id = memchr(data, '\0', sect_len); + if (id) + { + id++; + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (fmap_link) + { + unsigned filename_len = MultiByteToWideChar(CP_UNIXCP, 0, data, -1, NULL, 0); + /* Trying absolute path */ + WCHAR* dst = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(WCHAR)); + if (dst) + { + MultiByteToWideChar(CP_UNIXCP, 0, data, -1, dst, filename_len); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + HeapFree(GetProcessHeap(), 0, dst); + } + /* Trying relative path to build-id directory */ + if (!ret) + { + static const WCHAR globalDebugDirW[] = + {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/','.','b','u','i','l','d','-','i','d','/'}; + dst = HeapAlloc(GetProcessHeap(), 0, sizeof(globalDebugDirW) + (3 + filename_len) * sizeof(WCHAR)); + if (dst) + { + WCHAR* p; + + /* SIGH.... + * some relative links are relative to /usr/lib/debug/.build-id, some others are from the directory + * where the alternate file is... + * so try both + */ + p = memcpy(dst, globalDebugDirW, sizeof(globalDebugDirW)); + p += ARRAY_SIZE(globalDebugDirW); + MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + if (!ret) + { + p = dst + ARRAY_SIZE(globalDebugDirW); + if ((const char*)id < data + sect_len) + { + *p++ = "0123456789abcdef"[*id >> 4 ]; + *p++ = "0123456789abcdef"[*id & 0x0F]; + } + *p++ = '/'; + MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + } + HeapFree(GetProcessHeap(), 0, dst); + } + } + if (!ret) + { + HeapFree(GetProcessHeap(), 0, fmap_link); + WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); + fmap_link = NULL; + } + } + } + } + image_unmap_section(&debugaltlink_sect); + if (fmap_link) TRACE("Found match .gnu_debugaltlink section for %s\n", debugstr_w(module->modulename)); + return fmap_link; +} + /****************************************************************** * image_locate_build_id_target *

1 0

Eric Pouech : dbghelp: Separate alternate debug file lookup functions.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: fc380e06914683a0d64d8c62c10c22433fc37b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc380e06914683a0d64d8c62… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:45 2021 +0200 dbghelp: Separate alternate debug file lookup functions. Split in two different (and disjoint) the functions for checking that an alternate debug file matches the expected one - the first based on crc - the second based on GNU build-id Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 99 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cda12f4c350..c71e016b824 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -467,12 +467,13 @@ static BOOL module_is_container_loaded(const struct process* pcs, return FALSE; } -static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) +static BOOL image_check_debug_link_crc(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { DWORD read_bytes; HANDLE handle; WCHAR *path; WORD magic; + DWORD crc; BOOL ret; path = get_dos_file_name(file); @@ -480,15 +481,12 @@ static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fma heap_free(path); if (handle == INVALID_HANDLE_VALUE) return FALSE; - if (link_crc) + crc = calc_crc32(handle); + if (crc != link_crc) { - DWORD crc = calc_crc32(handle); - if (crc != link_crc) - { - WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", debugstr_w(file), crc, link_crc); - CloseHandle(handle); - return FALSE; - } + WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", debugstr_w(file), crc, link_crc); + CloseHandle(handle); + return FALSE; } SetFilePointer(handle, 0, 0, FILE_BEGIN); @@ -500,6 +498,49 @@ static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fma return ret; } +static BOOL image_check_debug_link_gnu_id(const WCHAR* file, struct image_file_map* fmap, const BYTE* id, unsigned idlen) +{ + struct image_section_map buildid_sect; + DWORD read_bytes; + HANDLE handle; + WCHAR *path; + WORD magic; + BOOL ret; + + path = get_dos_file_name(file); + handle = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + heap_free(path); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + + TRACE("Located debug information file at %s\n", debugstr_w(file)); + + if (ReadFile(handle, &magic, sizeof(magic), &read_bytes, NULL) && magic == IMAGE_DOS_SIGNATURE) + ret = pe_map_file(handle, fmap, DMT_PE); + else + ret = elf_map_handle(handle, fmap); + CloseHandle(handle); + + if (ret && image_find_section(fmap, ".note.gnu.build-id", &buildid_sect)) + { + const UINT32* note; + + note = (const UINT32*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NOTE_GNU_BUILD_ID) + { + if (note[1] == idlen && !memcmp(note + 3 + ((note[0] + 3) >> 2), id, idlen)) + return TRUE; + WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(file)); + } + } + image_unmap_section(&buildid_sect); + image_unmap_file(fmap); + } + return FALSE; +} + /****************************************************************** * image_locate_debug_link * @@ -548,12 +589,12 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi /* testing execdir/filename */ MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; /* testing execdir/.debug/filename */ memcpy(slash, dotDebugW, sizeof(dotDebugW)); MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash + ARRAY_SIZE(dotDebugW), filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; if (module->real_path) { @@ -562,7 +603,7 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi if ((slash2 = wcsrchr(slash, '/'))) slash = slash2 + 1; if ((slash2 = wcsrchr(slash, '\\'))) slash = slash2 + 1; MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; } /* testing globaldebugdir/execdir/filename */ @@ -570,10 +611,10 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi memcpy(p, globalDebugDirW, globalDebugDirLen * sizeof(WCHAR)); slash += globalDebugDirLen; MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; /* finally testing filename */ - if (image_check_debug_link(slash, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(slash, fmap_link, crc)) goto found; WARN("Couldn't locate or map %s\n", filename); @@ -632,33 +673,11 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE memcpy(z, dotDebug0W, sizeof(dotDebug0W)); TRACE("checking %s\n", wine_dbgstr_w(p)); - if (image_check_debug_link(p, fmap_link, 0)) + if (image_check_debug_link_gnu_id(p, fmap_link, idend - idlen, idlen)) { - struct image_section_map buildid_sect; - if (image_find_section(fmap_link, ".note.gnu.build-id", &buildid_sect)) - { - const UINT32* note; - - note = (const UINT32*)image_map_section(&buildid_sect); - if (note != IMAGE_NO_MAP) - { - /* the usual ELF note structure: name-size desc-size type <name> <desc> */ - if (note[2] == NOTE_GNU_BUILD_ID) - { - if (note[1] == idlen && - !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen)) - { - TRACE("Located debug information file at %s\n", debugstr_w(p)); - HeapFree(GetProcessHeap(), 0, p); - fmap->alternate = fmap_link; - return TRUE; - } - WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(p)); - } - } - image_unmap_section(&buildid_sect); - } - image_unmap_file(fmap_link); + HeapFree(GetProcessHeap(), 0, p); + fmap->alternate = fmap_link; + return TRUE; } TRACE("not found\n");

1 0

Zhiyi Zhang : user32/tests: Fix some test failures on the w7u_2qxl TestBot.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: c58d9cf744f9c182576bd8de723e261e3e419a46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58d9cf744f9c182576bd8de… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:17:38 2021 +0800 user32/tests: Fix some test failures on the w7u_2qxl TestBot. The first adapter reported by EnumDisplayDevices() is not guaranteed to be primary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index cee7b629cd7..bd348576726 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -105,21 +105,6 @@ static int get_bitmap_stride(int width, int bpp) return ((width * bpp + 15) >> 3) & ~1; } -static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, - LPARAM lparam) -{ - MONITORINFOEXA mi; - char *primary = (char *)lparam; - - mi.cbSize = sizeof(mi); - - ok(GetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); - if (mi.dwFlags & MONITORINFOF_PRIMARY) - strcpy(primary, mi.szDevice); - - return TRUE; -} - static int adapter_count = 0; static int monitor_count = 0; @@ -150,11 +135,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ - if (index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "#%d: adapter should be primary\n", index); - else - ok(!(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "#%d: adapter should not be primary\n", index); - if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { /* Test creating DC */ @@ -180,7 +160,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de } } -static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, +static void test_enumdisplaydevices_monitor(int monitor_index, const char *adapter_name, DISPLAY_DEVICEA *device, DWORD flags) { static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" @@ -200,11 +180,8 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ - if (adapter_index == 0 && monitor_index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); - else - ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, - device->StateFlags); + ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), + "#%d wrong state %#x\n", monitor_index, device->StateFlags); /* DeviceID */ CharLowerA(device->DeviceID); @@ -236,8 +213,6 @@ static void test_enumdisplaydevices(void) { static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; DISPLAY_DEVICEA dd; - char primary_device_name[32]; - char primary_monitor_device_name[32]; char adapter_name[32]; int number; int flag_index; @@ -266,23 +241,12 @@ static void test_enumdisplaydevices(void) for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); monitor_index++) - test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); + test_enumdisplaydevices_monitor(monitor_index, adapter_name, &dd, flags[flag_index]); } ok(adapter_count > 0, "Expect at least one adapter found\n"); /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); - - ret = EnumDisplayDevicesA(NULL, 0, &dd, 0); - ok(ret, "Expect success\n"); - lstrcpyA(primary_device_name, dd.DeviceName); - - primary_monitor_device_name[0] = 0; - ret = EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); - ok(ret, "EnumDisplayMonitors failed\n"); - ok(!strcmp(primary_monitor_device_name, primary_device_name), - "monitor device name %s, device name %s\n", primary_monitor_device_name, - primary_device_name); } struct vid_mode

1 0

Zhiyi Zhang : winemac.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 0ed105fb002877932e077913518cadd17d90a266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed105fb002877932e077913… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:11:04 2021 +0800 winemac.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 484f658981f..277a19155d8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1715,6 +1715,13 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) goto done; + /* Register GUID_DEVINTERFACE_MONITOR */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_MONITOR, NULL, 0, NULL)) + goto done; + + if (!link_device(bufferW, &GUID_DEVINTERFACE_MONITOR)) + goto done; + /* Write HardwareID registry property */ if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW)))

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