September 2021 - Wine-Commits

Eric Pouech : dbghelp: Check correctness of type (esp. in case of unknown ones).
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: c8fede5efbbb2e64ad8c6581fecf47dc06c7916f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8fede5efbbb2e64ad8c6581… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:44 2021 +0200 dbghelp: Check correctness of type (esp. in case of unknown ones). Since with the unknown type entry, we can end up with types which don't match the expected symt->tag, we need to check before the conversions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 5 +++++ dlls/dbghelp/dwarf.c | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2b0365bc386..eb2b53e947a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -151,6 +151,11 @@ struct symt_ht struct hash_table_elt hash_elt; /* if global symbol or type */ }; +static inline BOOL symt_check_tag(const struct symt* s, enum SymTagEnum tag) +{ + return s && s->tag == tag; +} + /* lexical tree */ struct symt_block { diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1876f573cf9..ee73abdf378 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1439,7 +1439,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, break; case DW_TAG_member: /* FIXME: should I follow the sibling stuff ?? */ - dwarf2_parse_udt_member(ctx, child, (struct symt_udt*)di->symt); + if (symt_check_tag(di->symt, SymTagUDT)) + dwarf2_parse_udt_member(ctx, child, (struct symt_udt*)di->symt); break; case DW_TAG_enumeration_type: dwarf2_parse_enumeration_type(ctx, child); @@ -1527,7 +1528,8 @@ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, switch (child->abbrev->tag) { case DW_TAG_enumerator: - dwarf2_parse_enumerator(ctx, child, (struct symt_enum*)di->symt); + if (symt_check_tag(di->symt, SymTagEnum)) + dwarf2_parse_enumerator(ctx, child, (struct symt_enum*)di->symt); break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %s\n", @@ -1683,7 +1685,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, WARN("dropping global variable %s which has been optimized away\n", debugstr_a(name.u.string)); } } - if (is_pmt && subpgm->func && subpgm->func->type) + if (is_pmt && subpgm->func && symt_check_tag(subpgm->func->type, SymTagFunctionType)) symt_add_function_signature_parameter(subpgm->ctx->module, (struct symt_function_signature*)subpgm->func->type, param_type); @@ -2129,10 +2131,12 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, TRACE("%s %lx %s %u\n", debugstr_w(module->module.ModuleName), address, debugstr_a(source_get(module, *psrc)), line); - if (!(symt = symt_find_nearest(module, address)) || - symt->symt.tag != SymTagFunction) return; - func = (struct symt_function*)symt; - symt_add_func_line(module, func, *psrc, line, address - func->address); + symt = symt_find_nearest(module, address); + if (symt && symt_check_tag(&symt->symt, SymTagFunction)) + { + func = (struct symt_function*)symt; + symt_add_func_line(module, func, *psrc, line, address - func->address); + } } static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, @@ -2466,7 +2470,7 @@ static enum location_error loc_compute_frame(struct process* pcs, for (i=0; i<vector_length(&func->vchildren); i++) { psym = vector_at(&func->vchildren, i); - if ((*psym)->tag == SymTagCustom) + if (psym && symt_check_tag(*psym, SymTagCustom)) { pframe = &((struct symt_hierarchy_point*)*psym)->loc; @@ -3279,7 +3283,7 @@ static void dwarf2_location_compute(struct process* pcs, int err; dwarf2_traverse_context_t lctx; - if (!func->container || func->container->tag != SymTagCompiland) + if (!func || !symt_check_tag(func->container, SymTagCompiland)) { WARN("We'd expect function %s's container to exist and be a compiland\n", debugstr_a(func->hash_elt.name)); err = loc_err_internal;

1 0

Eric Pouech : dbghelp: Fix erroneous string manipulation when said string is empty.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: e05bac0fd56ea8cec0ba8f952197bdfbbbfb2e1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e05bac0fd56ea8cec0ba8f95… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:23:02 2021 +0200 dbghelp: Fix erroneous string manipulation when said string is empty. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0479f7c7401..6b4eb90c05a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2198,7 +2198,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, traverse.data += rellen + 1; p = vector_add(&dirs, &ctx->pool); - if (*rel == '/' || !compile_dir) + if (*rel == '/' || !compile_dir || !*compile_dir) *p = rel; else {

1 0

Eric Pouech : dbghelp: Handle the case where loader isn't what WINELOADER reports.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: a4b206b384c9367d0add95d5a0c0bd84374f6cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b206b384c9367d0add95d5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 3 08:57:12 2021 +0200 dbghelp: Handle the case where loader isn't what WINELOADER reports. use case, in a WoW setup: wine programs/winedbg/winedbg.exe.so notepad.exe where both winedbg and notepad are 64bit exec:s in this case, dbghelp (loaded from winedbg) reads '<...>/wine' from WINELOADER windows env block inside notepad (but the unix env block is correctly set to wine64 by the tweak in ntdll/unix/loader.c) as a consequence dbghelp doesn't get the ELF information (it tries to read 32bit ELF entities, and fails); hence misses all the loaded ELF libraries winedbg's command 'info share' only reports the PE modules note: the 'dual' case wine64 programs/winedbg/winedbg.exe.so c:\\windows\\syswow64\\notepad.exe where winedbg is a 64bit exec and notepad a 32bit shows the same failures workaround this in dbghelp by tweaking the value of WINELOADER whether the debuggee is 32 or 64bit Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 10 ++++++++-- dlls/dbghelp/macho_module.c | 10 +++++++++- dlls/dbghelp/module.c | 30 ++++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index eb2b53e947a..d6280a5189b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -644,7 +644,7 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern const WCHAR *get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; +extern WCHAR* get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index d1a4454e043..7be7e8efce6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1752,10 +1752,16 @@ static const struct loader_ops elf_loader_ops = BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) { struct elf_info elf_info; - BOOL ret; + BOOL ret = FALSE; + WCHAR* loader; elf_info.flags = ELF_INFO_DEBUG_HEADER | ELF_INFO_MODULE; - ret = elf_search_and_load_file(pcs, get_wine_loader_name(pcs), addr, 0, &elf_info); + loader = get_wine_loader_name(pcs); + if (loader) + { + ret = elf_search_and_load_file(pcs, loader, addr, 0, &elf_info); + HeapFree(GetProcessHeap(), 0, loader); + } if (!ret || !elf_info.dbg_hdr_addr) return FALSE; TRACE("Found ELF debug header %#lx\n", elf_info.dbg_hdr_addr); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 602f7e45c14..7b0b80c4900 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1885,7 +1885,15 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } } - if (!ret) ret = macho_search_and_load_file(pcs, get_wine_loader_name(pcs), 0, macho_info); + if (!ret) + { + WCHAR* loader = get_wine_loader_name(pcs); + if (loader) + { + ret = macho_search_and_load_file(pcs, loader, 0, macho_info); + HeapFree(GetProcessHeap(), 0, loader); + } + } return ret; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c278a627d37..3bc2a9e143a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -138,12 +138,34 @@ void module_set_module(struct module* module, const WCHAR* name) } /* Returned string must be freed by caller */ -const WCHAR *get_wine_loader_name(struct process *pcs) +WCHAR *get_wine_loader_name(struct process *pcs) { - const WCHAR *name = process_getenv(pcs, L"WINELOADER"); + const WCHAR *name; + WCHAR* altname; + unsigned len; + + name = process_getenv(pcs, L"WINELOADER"); if (!name) name = pcs->is_64bit ? L"wine64" : L"wine"; - TRACE("returning %s\n", debugstr_w(name)); - return name; + len = lstrlenW(name); + + /* WINELOADER isn't properly updated in Wow64 process calling inside Windows env block + * (it's updated in ELF env block though) + * So do the adaptation ourselves. + */ + altname = HeapAlloc(GetProcessHeap(), 0, (len + 2 + 1) * sizeof(WCHAR)); + if (altname) + { + memcpy(altname, name, len * sizeof(WCHAR)); + if (pcs->is_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) + lstrcpyW(altname + len, L"64"); + else if (!pcs->is_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) + altname[len - 2] = '\0'; + else + altname[len] = '\0'; + } + + TRACE("returning %s\n", debugstr_w(altname)); + return altname; } static const char* get_module_type(enum module_type type, BOOL virtual)

1 0

Eric Pouech : dbghelp: Always return a type in lookup_type, even in case of errors.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: c9b04836894935ab4eec01b9d82cbe2ebd19cf48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b04836894935ab4eec01b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:25 2021 +0200 dbghelp: Always return a type in lookup_type, even in case of errors. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6d2c843fb94..335c4a4e4ae 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -949,18 +949,21 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* type; if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) - return NULL; + return ctx->symt_cache[sc_void]; if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); - return NULL; + return ctx->symt_cache[sc_void]; } if (!type->symt) { /* load the debug info entity */ dwarf2_load_one_entry(ctx, type); if (!type->symt) + { FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); + return ctx->symt_cache[sc_void]; + } } return type->symt; } @@ -1240,11 +1243,7 @@ static struct symt* dwarf2_parse_pointer_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = sizeof(void *); - if (!(ref_type = dwarf2_lookup_type(ctx, di))) - { - ref_type = ctx->symt_cache[sc_void]; - assert(ref_type); - } + ref_type = dwarf2_lookup_type(ctx, di); di->symt = &symt_new_pointer(ctx->module, ref_type, size.u.uvalue)->symt; if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); return di->symt; @@ -1307,11 +1306,7 @@ static struct symt* dwarf2_parse_const_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!(ref_type = dwarf2_lookup_type(ctx, di))) - { - ref_type = ctx->symt_cache[sc_void]; - assert(ref_type); - } + ref_type = dwarf2_lookup_type(ctx, di); if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); di->symt = ref_type; @@ -1327,11 +1322,7 @@ static struct symt* dwarf2_parse_volatile_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!(ref_type = dwarf2_lookup_type(ctx, di))) - { - ref_type = ctx->symt_cache[sc_void]; - assert(ref_type); - } + ref_type = dwarf2_lookup_type(ctx, di); if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); di->symt = ref_type; @@ -1936,11 +1927,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, */ if (elf_is_in_thunk_area(ctx->load_offset + low_pc, ctx->thunks) >= 0) return NULL; - if (!(ret_type = dwarf2_lookup_type(ctx, di))) - { - ret_type = ctx->symt_cache[sc_void]; - assert(ret_type); - } + ret_type = dwarf2_lookup_type(ctx, di); + /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); subpgm.func = symt_new_function(ctx->module, ctx->compiland, @@ -2034,11 +2022,7 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!(ret_type = dwarf2_lookup_type(ctx, di))) - { - ret_type = ctx->symt_cache[sc_void]; - assert(ret_type); - } + ret_type = dwarf2_lookup_type(ctx, di); /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C);

1 0

Eric Pouech : dbghelp: Properly handle errors when reading first DIE in compilation unit.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: ca00b056b8cc3742694e289e69ffc44c8659e457 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca00b056b8cc3742694e289e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:23:08 2021 +0200 dbghelp: Properly handle errors when reading first DIE in compilation unit. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 70 +++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6b4eb90c05a..e514a4fde3b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2389,43 +2389,45 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); - dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di); - - if (di->abbrev->tag == DW_TAG_compile_unit) - { - struct attribute name; - struct vector* children; - dwarf2_debug_info_t* child = NULL; - unsigned int i; - struct attribute stmt_list, low_pc; - struct attribute comp_dir; - - if (!dwarf2_find_attribute(&ctx, di, DW_AT_name, &name)) - name.u.string = NULL; - - /* get working directory of current compilation unit */ - if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) - comp_dir.u.string = NULL; - - if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) - low_pc.u.uvalue = 0; - ctx.compiland = symt_new_compiland(module, ctx.load_offset + low_pc.u.uvalue, - source_new(module, comp_dir.u.string, name.u.string)); - di->symt = &ctx.compiland->symt; - children = dwarf2_get_di_children(&ctx, di); - if (children) for (i = 0; i < vector_length(children); i++) - { - child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(&ctx, child); - } - if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) + + if (dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di)) + { + if (di->abbrev->tag == DW_TAG_compile_unit) { - if (dwarf2_parse_line_numbers(sections, &ctx, comp_dir.u.string, stmt_list.u.uvalue)) - module->module.LineNumbers = TRUE; + struct attribute name; + struct vector* children; + dwarf2_debug_info_t* child = NULL; + unsigned int i; + struct attribute stmt_list, low_pc; + struct attribute comp_dir; + + if (!dwarf2_find_attribute(&ctx, di, DW_AT_name, &name)) + name.u.string = NULL; + + /* get working directory of current compilation unit */ + if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) + comp_dir.u.string = NULL; + + if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) + low_pc.u.uvalue = 0; + ctx.compiland = symt_new_compiland(module, ctx.load_offset + low_pc.u.uvalue, + source_new(module, comp_dir.u.string, name.u.string)); + di->symt = &ctx.compiland->symt; + children = dwarf2_get_di_children(&ctx, di); + if (children) for (i = 0; i < vector_length(children); i++) + { + child = *(dwarf2_debug_info_t**)vector_at(children, i); + dwarf2_load_one_entry(&ctx, child); + } + if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) + { + if (dwarf2_parse_line_numbers(sections, &ctx, comp_dir.u.string, stmt_list.u.uvalue)) + module->module.LineNumbers = TRUE; + } + ret = TRUE; } - ret = TRUE; + else FIXME("Should have a compilation unit here\n"); } - else FIXME("Should have a compilation unit here\n"); pool_destroy(&ctx.pool); return ret; }

1 0

Francois Gouget : mf: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: bc20705c296e97dd9ac790b6f3bf95f4693b2430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc20705c296e97dd9ac790b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:51:47 2021 +0200 mf: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 5730a6e769f..a5545c157de 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -638,7 +638,7 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) +static HRESULT video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) { HRESULT hr = S_OK;

1 0

Eric Pouech : dbghelp: Fix dwarf2 subprogram handling.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 7790b395ceccce5d0936d2e10411999b0cc1c6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7790b395ceccce5d0936d2e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:21:55 2021 +0200 dbghelp: Fix dwarf2 subprogram handling. Fix dwarf2_parse_subprogram_block when looking for inner information to use the child's debug_info (not the lexical_block one!) 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, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 93baf10ba44..9d8d2756258 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1833,13 +1833,13 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, dwarf2_parse_variable(subpgm, block, child); break; case DW_TAG_pointer_type: - dwarf2_parse_pointer_type(subpgm->ctx, di); + dwarf2_parse_pointer_type(subpgm->ctx, child); break; case DW_TAG_subroutine_type: - dwarf2_parse_subroutine_type(subpgm->ctx, di); + dwarf2_parse_subroutine_type(subpgm->ctx, child); break; case DW_TAG_const_type: - dwarf2_parse_const_type(subpgm->ctx, di); + dwarf2_parse_const_type(subpgm->ctx, child); break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child);

1 0

Eric Pouech : dbghelp: Add dwarf support of DW_FORM_ref_udata.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 0020265286beec7e1cb73b2e126cb878c7bf36d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0020265286beec7e1cb73b2e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:01 2021 +0200 dbghelp: Add dwarf support of DW_FORM_ref_udata. DW_FORM_ref_udata value is an offset from current unit (as the others DW_FORM_ref[1,2,3,4] are) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9d8d2756258..b62e1a2cce8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -544,7 +544,8 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_ref_udata: - attr->u.uvalue = dwarf2_get_leb128_as_unsigned(data, NULL); + attr->u.uvalue = ctx->ref_offset + dwarf2_get_leb128_as_unsigned(data, NULL); + TRACE("ref_udata<0x%lx>\n", attr->u.uvalue); break; case DW_FORM_udata:

1 0

Eric Pouech : dbghelp: Mostly get rid of symt_cache in dwarf debug information.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: e08b80a752591fad87127952858875831fd9d934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e08b80a752591fad87127952… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:32 2021 +0200 dbghelp: Mostly get rid of symt_cache in dwarf debug information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 335c4a4e4ae..4503e42a227 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -164,10 +164,7 @@ typedef struct dwarf2_traverse_context_s /* symt_cache indexes */ #define sc_void 0 -#define sc_int1 1 -#define sc_int2 2 -#define sc_int4 3 -#define sc_num 4 +#define sc_num 1 typedef struct dwarf2_parse_context_s { @@ -181,7 +178,7 @@ typedef struct dwarf2_parse_context_s struct sparse_array debug_info_table; ULONG_PTR load_offset; ULONG_PTR ref_offset; - struct symt* symt_cache[sc_num]; /* void, int1, int2, int4 */ + struct symt* symt_cache[sc_num]; /* void */ char* cpp_name; } dwarf2_parse_context_t; @@ -1166,7 +1163,6 @@ static struct symt* dwarf2_parse_base_type(dwarf2_parse_context_t* ctx, struct attribute size; struct attribute encoding; enum BasicType bt; - int cache_idx = -1; if (di->symt) return di->symt; TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); @@ -1190,24 +1186,6 @@ static struct symt* dwarf2_parse_base_type(dwarf2_parse_context_t* ctx, default: bt = btNoType; break; } di->symt = &symt_new_basic(ctx->module, bt, name.u.string, size.u.uvalue)->symt; - switch (bt) - { - case btVoid: - assert(size.u.uvalue == 0); - cache_idx = sc_void; - break; - case btInt: - switch (size.u.uvalue) - { - case 1: cache_idx = sc_int1; break; - case 2: cache_idx = sc_int2; break; - case 4: cache_idx = sc_int4; break; - } - break; - default: break; - } - if (cache_idx != -1 && !ctx->symt_cache[cache_idx]) - ctx->symt_cache[cache_idx] = di->symt; if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); return di->symt; @@ -1269,7 +1247,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, { /* fake an array with unknown size */ /* FIXME: int4 even on 64bit machines??? */ - idx_type = ctx->symt_cache[sc_int4]; + idx_type = &symt_new_basic(ctx->module, btInt, "int", 4)->symt; min.u.uvalue = 0; cnt.u.uvalue = 0; } @@ -1347,9 +1325,6 @@ static struct symt* dwarf2_parse_unspecified_type(dwarf2_parse_context_t* ctx, basic = symt_new_basic(ctx->module, btVoid, name.u.string, size.u.uvalue); di->symt = &basic->symt; - if (!ctx->symt_cache[sc_void]) - ctx->symt_cache[sc_void] = di->symt; - if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); return di->symt; }

1 0

Eric Pouech : dbghelp: Added an unknown type in symt_cache for handling bad references to types.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: ee3ea1e1632326bc59ba0c7be34b10734c20686f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee3ea1e1632326bc59ba0c7b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:38 2021 +0200 dbghelp: Added an unknown type in symt_cache for handling bad references to types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4503e42a227..1876f573cf9 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -163,8 +163,9 @@ typedef struct dwarf2_traverse_context_s } dwarf2_traverse_context_t; /* symt_cache indexes */ -#define sc_void 0 -#define sc_num 1 +#define sc_void 0 +#define sc_unknown 1 +#define sc_num 2 typedef struct dwarf2_parse_context_s { @@ -178,7 +179,7 @@ typedef struct dwarf2_parse_context_s struct sparse_array debug_info_table; ULONG_PTR load_offset; ULONG_PTR ref_offset; - struct symt* symt_cache[sc_num]; /* void */ + struct symt* symt_cache[sc_num]; /* void, unknown */ char* cpp_name; } dwarf2_parse_context_t; @@ -946,11 +947,12 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* type; if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) + /* this is only valid if current language of CU is C or C++ */ return ctx->symt_cache[sc_void]; if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); - return ctx->symt_cache[sc_void]; + return ctx->symt_cache[sc_unknown]; } if (!type->symt) { @@ -959,7 +961,7 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!type->symt) { FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); - return ctx->symt_cache[sc_void]; + return ctx->symt_cache[sc_unknown]; } } return type->symt; @@ -2373,6 +2375,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, ctx.ref_offset = comp_unit_start - sections[section_debug].address; memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; + ctx.symt_cache[sc_unknown] = &symt_new_basic(module, btNoType, "# unknown", 0)->symt; ctx.cpp_name = NULL; abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset;

1 0