September 2021 - Wine-Commits

Eric Pouech : dbghelp/dwarf: Fix a couple of parent/child mismatch.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: e362ed8c286bf46c2e8525c5a64ad65350260033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e362ed8c286bf46c2e8525c5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:46:30 2021 +0200 dbghelp/dwarf: Fix a couple of parent/child mismatch. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 192dbf59814..731a7136601 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1688,7 +1688,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di, switch (child->abbrev->tag) { case DW_TAG_array_type: - dwarf2_parse_array_type(di); + dwarf2_parse_array_type(child); break; case DW_TAG_member: /* FIXME: should I follow the sibling stuff ?? */ @@ -1705,7 +1705,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di, dwarf2_parse_const_type(child); break; case DW_TAG_volatile_type: - dwarf2_parse_volatile_type(di); + dwarf2_parse_volatile_type(child); break; case DW_TAG_pointer_type: dwarf2_parse_pointer_type(child); @@ -2205,10 +2205,10 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) dwarf2_parse_inlined_subroutine(&subpgm, NULL, child); break; case DW_TAG_pointer_type: - dwarf2_parse_pointer_type(di); + dwarf2_parse_pointer_type(child); break; case DW_TAG_const_type: - dwarf2_parse_const_type(di); + dwarf2_parse_const_type(child); break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked)

1 0

Eric Pouech : dbghelp/dwarf: Add support for partial compilation units.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: e5a1b8b3348031cba52769162f063a197c64d19f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5a1b8b3348031cba5276916… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:46:37 2021 +0200 dbghelp/dwarf: Add support for partial compilation units. 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 731a7136601..13423c93515 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1147,7 +1147,7 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name struct attribute diname; struct attribute spec; - if (di->abbrev->tag == DW_TAG_compile_unit) return name; + if (di->abbrev->tag == DW_TAG_compile_unit || di->abbrev->tag == DW_TAG_partial_unit) return name; /* if the di is a definition, but has also a (previous) declaration, then scope must * be gotten from declaration not definition @@ -2718,7 +2718,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) ctx->status = UNIT_BEINGLOADED; if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { - if (di->abbrev->tag == DW_TAG_compile_unit) + if (di->abbrev->tag == DW_TAG_compile_unit || di->abbrev->tag == DW_TAG_partial_unit) { struct attribute name; struct vector* children; @@ -2754,7 +2754,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) ctx->status = UNIT_LOADED; ret = TRUE; } - else FIXME("Should have a compilation unit here\n"); + else FIXME("Should have a compilation unit here %lu\n", di->abbrev->tag); } if (ctx->status == UNIT_BEINGLOADED) ctx->status = UNIT_LOADED_FAIL; return ret;

1 0

Eric Pouech : dbghelp/dwarf: Split dwarf2_virtual_unwind into two functions.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 1ecd66200df5aa155f39a80e5b7b19842efafe0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ecd66200df5aa155f39a80e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:46:55 2021 +0200 dbghelp/dwarf: Split dwarf2_virtual_unwind into two functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 73 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5f4ff8ad5d3..4edba930698 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3568,41 +3568,30 @@ static void apply_frame_state(const struct module* module, struct cpu_stack_walk *context = new_context; } -/*********************************************************************** - * dwarf2_virtual_unwind - * - */ -BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, - union ctx *context, DWORD64 *cfa) +static BOOL dwarf2_fetch_frame_info(struct module* module, struct cpu* cpu, LONG_PTR ip, struct frame_info* info) { - struct module_pair pair; - struct frame_info info; dwarf2_traverse_context_t cie_ctx, fde_ctx; struct module_format* modfmt; const unsigned char* end; DWORD_PTR delta; - if (!(pair.pcs = process_find_by_handle(csw->hProcess)) || - !(pair.requested = module_find_by_addr(pair.pcs, ip, DMT_UNKNOWN)) || - !module_get_debug(&pair)) - return FALSE; - modfmt = pair.effective->format_info[DFI_DWARF]; + modfmt = module->format_info[DFI_DWARF]; if (!modfmt) return FALSE; - memset(&info, 0, sizeof(info)); + memset(info, 0, sizeof(*info)); fde_ctx.data = modfmt->u.dwarf2_info->eh_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->eh_frame.size; /* let offsets relative to the eh_frame sections be correctly computed, as we'll map * in this process the IMAGE section at a different address as the one expected by * the image */ - delta = pair.effective->module.BaseOfImage + modfmt->u.dwarf2_info->eh_frame.rva - + delta = module->module.BaseOfImage + modfmt->u.dwarf2_info->eh_frame.rva - (DWORD_PTR)modfmt->u.dwarf2_info->eh_frame.address; - if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info, TRUE)) + if (!dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, TRUE)) { fde_ctx.data = modfmt->u.dwarf2_info->debug_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->debug_frame.size; - delta = pair.effective->reloc_delta; - if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info, FALSE)) + delta = module->reloc_delta; + if (!dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, FALSE)) { TRACE("Couldn't find information for %lx\n", ip); return FALSE; @@ -3610,23 +3599,45 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, } TRACE("function %lx/%lx code_align %lu data_align %ld retaddr %s\n", - ip, info.ip, info.code_align, info.data_align, - csw->cpu->fetch_regname(csw->cpu->map_dwarf_register(info.retaddr_reg, pair.effective, TRUE))); - - /* if at very beginning of function, return and use default unwinder */ - if (ip == info.ip) return FALSE; - execute_cfa_instructions(pair.effective, &cie_ctx, ip, &info); + ip, info->ip, info->code_align, info->data_align, + cpu->fetch_regname(cpu->map_dwarf_register(info->retaddr_reg, module, TRUE))); - if (info.aug_z_format) /* get length of augmentation data */ + if (ip != info->ip) { - ULONG_PTR len = dwarf2_leb128_as_unsigned(&fde_ctx); - end = fde_ctx.data + len; + execute_cfa_instructions(module, &cie_ctx, ip, info); + + if (info->aug_z_format) /* get length of augmentation data */ + { + ULONG_PTR len = dwarf2_leb128_as_unsigned(&fde_ctx); + end = fde_ctx.data + len; + } + else end = NULL; + dwarf2_parse_augmentation_ptr(&fde_ctx, info->lsda_encoding, modfmt->u.dwarf2_info->word_size); /* handler_data */ + if (end) fde_ctx.data = end; + + execute_cfa_instructions(module, &fde_ctx, ip, info); } - else end = NULL; - dwarf2_parse_augmentation_ptr(&fde_ctx, info.lsda_encoding, modfmt->u.dwarf2_info->word_size); /* handler_data */ - if (end) fde_ctx.data = end; + return TRUE; +} - execute_cfa_instructions(pair.effective, &fde_ctx, ip, &info); +/*********************************************************************** + * dwarf2_virtual_unwind + * + */ +BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, + union ctx *context, DWORD64 *cfa) +{ + struct module_pair pair; + struct frame_info info; + + if (!(pair.pcs = process_find_by_handle(csw->hProcess)) || + !(pair.requested = module_find_by_addr(pair.pcs, ip, DMT_UNKNOWN)) || + !module_get_debug(&pair)) + return FALSE; + if (!dwarf2_fetch_frame_info(pair.effective, csw->cpu, ip, &info)) return FALSE; + + /* if at very beginning of function, return and use default unwinder */ + if (ip == info.ip) return FALSE; /* if there is no information about retaddr, use default unwinder */ if (info.state.rules[info.retaddr_reg] == RULE_UNSET) return FALSE;

1 0

Eric Pouech : dbghelp/dwarf: Silence a couple of dwarf DIE's tag in load_one_debug_entry.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: e039a28e3bfcf8d225ebccb58c81951e1c6b6af5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e039a28e3bfcf8d225ebccb5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:47:07 2021 +0200 dbghelp/dwarf: Silence a couple of dwarf DIE's tag in load_one_debug_entry. 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, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9e0df966b3c..0397ffe90b2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2400,9 +2400,13 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) case DW_TAG_imported_unit: dwarf2_parse_imported_unit(di); break; - /* silence a couple of C++ defines */ + /* keep it silent until we need DW_OP_call_xxx support */ + case DW_TAG_dwarf_procedure: + /* silence a couple of non-C language defines (mainly C++ but others too) */ case DW_TAG_imported_module: case DW_TAG_imported_declaration: + case DW_TAG_interface_type: + case DW_TAG_module: case DW_TAG_ptr_to_member_type: break; default:

1 0

Connor McAdams : include: Define EVENT_OBJECT_INVOKED.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 04965f6e47132fc03b5672bbf63e57d520bf2eaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=04965f6e47132fc03b5672bb… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:19 2021 -0400 include: Define EVENT_OBJECT_INVOKED. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 260024d7e91..898c9034e33 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3256,6 +3256,7 @@ typedef struct #define EVENT_OBJECT_HELPCHANGE 0x8010 #define EVENT_OBJECT_DEFACTIONCHANGE 0x8011 #define EVENT_OBJECT_ACCELERATORCHANGE 0x8012 +#define EVENT_OBJECT_INVOKED 0x8013 /* Sound events */ #define SOUND_SYSTEM_STARTUP 1

1 0

Connor McAdams : user32/tests: Add missing winevents to test_menu_messages() message sequences.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 21e3bb1bfbd9dc3f09397ae1233b01c4b0d6ab02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e3bb1bfbd9dc3f09397ae1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:20 2021 -0400 user32/tests: Add missing winevents to test_menu_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19a8ff41a2c..0f683e333a8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15571,11 +15571,21 @@ static const struct message wm_popup_menu_1[] = { WM_MENUSELECT, sent|wparam, MAKEWPARAM(1,MF_HILITE|MF_POPUP) }, { WM_INITMENUPOPUP, sent|lparam, 0, 1 }, { HCBT_CREATEWND, hook|optional }, /* Win9x doesn't create a window */ + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_MENUSELECT, sent|wparam, MAKEWPARAM(200,MF_HILITE) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'E', 0xf0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001, 0, 0x40000000 }, + { EVENT_OBJECT_INVOKED, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_MENU, 0 }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't create a window */ + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, @@ -15599,19 +15609,38 @@ static const struct message wm_popup_menu_2[] = { WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(0,MF_HILITE|MF_POPUP) }, /* Win9x */ { WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x */ { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_MENUSELECT, sent }, /*|wparam, MAKEWPARAM(0,MF_HILITE|MF_POPUP) - XP |wparam, MAKEWPARAM(100,MF_HILITE) - Win9x */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'F', 0xf0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0x10000001 }, { WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x doesn't send it */ { HCBT_CREATEWND, hook|optional }, /* Win9x doesn't send it */ + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(100,MF_HILITE) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0xd0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 }, + { EVENT_OBJECT_INVOKED, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_MENU, 0 }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't send it */ + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, @@ -15635,19 +15664,38 @@ static const struct message wm_popup_menu_3[] = { WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(0,MF_HILITE|MF_POPUP) }, /* Win9x */ { WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x */ { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_MENUSELECT, sent }, /*|wparam, MAKEWPARAM(0,MF_HILITE|MF_POPUP) - XP |wparam, MAKEWPARAM(100,MF_HILITE) - Win9x */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'F', 0xf0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0x10000001 }, { WM_INITMENUPOPUP, sent|lparam|optional, 0, 0 }, /* Win9x doesn't send it */ { HCBT_CREATEWND, hook|optional }, /* Win9x doesn't send it */ + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(100,MF_HILITE) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RIGHT, 0xd0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 }, + { EVENT_OBJECT_INVOKED, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_MENU, 100 }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't send it */ + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, @@ -18595,6 +18643,8 @@ START_TEST(msg) test_SetActiveWindow(); test_restore_messages(); test_invalid_window(); + test_menu_messages(); + test_paintingloop(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); @@ -18618,8 +18668,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_menu_messages(); - test_paintingloop(); test_defwinproc(); test_desktop_winproc(); test_clipboard_viewers();

1 0

Eric Pouech : dbghelp/dwarf: Pass cuhead to loc_compute_frame.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: eabeb1da5c088dda065ebd3f0d0eae96b7ebe6a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabeb1da5c088dda065ebd3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:46:49 2021 +0200 dbghelp/dwarf: Pass cuhead to loc_compute_frame. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 785f6651f11..5f4ff8ad5d3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2821,20 +2821,15 @@ static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* f static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func, - DWORD_PTR ip, struct location* frame) + DWORD_PTR ip, const dwarf2_cuhead_t* head, + struct location* frame) { struct symt** psym = NULL; struct location* pframe; dwarf2_traverse_context_t lctx; enum location_error err; unsigned int i; - const dwarf2_cuhead_t* head = get_cuhead_from_func(func); - if (!head) - { - FIXME("Shouldn't happen\n"); - return loc_err_internal; - } for (i=0; i<vector_length(&func->vchildren); i++) { psym = vector_at(&func->vchildren, i); @@ -3663,7 +3658,7 @@ static void dwarf2_location_compute(struct process* pcs, /* instruction pointer relative to compiland's start */ ip = pcs->ctx_frame.InstructionOffset - ((struct symt_compiland*)func->container)->address; - if ((err = loc_compute_frame(pcs, modfmt, func, ip, &frame)) == 0) + if ((err = loc_compute_frame(pcs, modfmt, func, ip, head, &frame)) == 0) { switch (loc->kind) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 8a9ecefcac1f4289d68b94793b17444910bccfe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9ecefcac1f4289d68b9479… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Sep 25 10:48:31 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 55b3076df12..cf2a4a59040 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-11 13:26+0300\n" +"PO-Revision-Date: 2021-09-25 10:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3711,30 +3711,24 @@ msgid "&Disable" msgstr "&Išjungti" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Atkurti" +msgstr "&Atkurti" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "Įj&ungti" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Redaguoti nustelbimą" +msgstr "&Nustelbti" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Prijungta" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Balso įvedimo įtaisas:" +msgstr "Prijungta (xinput įrenginys)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled"

1 0

Eric Pouech : dbghelp/dwarf: Added support for OP_call_frame_cfa.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: d8c9171c78548897e2ffeee6d8c34216bd79f229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c9171c78548897e2ffeee6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:47:01 2021 +0200 dbghelp/dwarf: Added support for OP_call_frame_cfa. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4edba930698..9e0df966b3c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -234,6 +234,7 @@ struct dwarf2_module_info_s #define loc_dwarf2_location_list (loc_user + 0) #define loc_dwarf2_block (loc_user + 1) +#define loc_dwarf2_frame_cfa (loc_user + 2) /* forward declarations */ static struct symt* dwarf2_parse_enumeration_type(dwarf2_debug_info_t* entry); @@ -1085,8 +1086,13 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, } /* assume we have a block form */ - - if (xloc.u.block.size) + if (dw == DW_AT_frame_base && xloc.u.block.size == 1 && *xloc.u.block.ptr == DW_OP_call_frame_cfa) + { + loc->kind = loc_dwarf2_frame_cfa; + loc->reg = Wine_DW_no_register; + loc->offset = 0; + } + else if (xloc.u.block.size) { dwarf2_traverse_context_t lctx; enum location_error err; @@ -2818,6 +2824,8 @@ static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* f return NULL; } +static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); + static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func, @@ -2858,6 +2866,9 @@ static enum location_error loc_compute_frame(struct process* pcs, return loc_err_too_complex; } break; + case loc_dwarf2_frame_cfa: + if (!compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame)) return loc_err_internal; + break; default: WARN("Unsupported frame kind %d\n", pframe->kind); return loc_err_internal; @@ -3647,6 +3658,43 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, return TRUE; } +static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) +{ + struct frame_info info; + + if (!dwarf2_fetch_frame_info(module, dbghelp_current_cpu, ip, &info)) return FALSE; + + /* beginning of function, or no available dwarf information ? */ + if (ip == info.ip || info.state.rules[info.retaddr_reg] == RULE_UNSET) + { + /* fake the default unwinder */ + frame->kind = loc_regrel; + frame->reg = dbghelp_current_cpu->frame_regno; + frame->offset = dbghelp_current_cpu->word_size; /* FIXME stack direction */ + } + else + { + /* we expect to translate the call_frame_cfa into a regrel location... + * that should cover most of the cases + */ + switch (info.state.cfa_rule) + { + case RULE_EXPRESSION: + FIXME("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); + break; + case RULE_VAL_EXPRESSION: + FIXME("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); + break; + default: + frame->kind = loc_regrel; + frame->reg = dbghelp_current_cpu->map_dwarf_register(info.state.cfa_reg, module, TRUE); + frame->offset = info.state.cfa_offset; + break; + } + } + return TRUE; +} + static void dwarf2_location_compute(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func,

1 0

Eric Pouech : dbghelp/dwarf: Add support for DW_TAG_imported_unit.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: c2d1d7653170402f0d2f2e45d875b10113b7c958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d1d7653170402f0d2f2e45… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 26 14:46:43 2021 +0200 dbghelp/dwarf: Add support for DW_TAG_imported_unit. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 13423c93515..785f6651f11 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2305,6 +2305,24 @@ static void dwarf2_parse_namespace(dwarf2_debug_info_t* di) } } +static void dwarf2_parse_imported_unit(dwarf2_debug_info_t* di) +{ + struct attribute imp; + + if (di->symt) return; + + TRACE("%s\n", dwarf2_debug_di(di)); + + if (dwarf2_find_attribute(di, DW_AT_import, &imp)) + { + dwarf2_debug_info_t* jmp = dwarf2_jump_to_debug_info(&imp); + if (jmp) di->symt = jmp->symt; + else FIXME("Couldn't load imported CU\n"); + } + else + FIXME("Couldn't find import attribute\n"); +} + static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) { switch (di->abbrev->tag) @@ -2373,6 +2391,9 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) case DW_TAG_subrange_type: dwarf2_parse_subrange_type(di); break; + case DW_TAG_imported_unit: + dwarf2_parse_imported_unit(di); + break; /* silence a couple of C++ defines */ case DW_TAG_imported_module: case DW_TAG_imported_declaration:

1 0