September 2021 - Wine-commits

Eric Pouech : dbghelp/dwarf: Split dwarf2_virtual_unwind into two functions.
by Alexandre Julliard 27 Sep '21

27 Sep '21

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: Added support for OP_call_frame_cfa.
by Alexandre Julliard 27 Sep '21

27 Sep '21

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: Silence a couple of dwarf DIE's tag in load_one_debug_entry.
by Alexandre Julliard 27 Sep '21

27 Sep '21

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 27 Sep '21

27 Sep '21

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 27 Sep '21

27 Sep '21

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

Zebediah Figura : vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: vkd3d Branch: master Commit: 14e9a1ba1c6b8403e3df5522ae763aed5a8f1f45 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=14e9a1ba1c6b8403e3df552… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:02 2021 -0500 vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9efc3da..6f8bece 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1201,7 +1201,7 @@ unsigned int hlsl_offset_from_deref(const struct hlsl_deref *deref) if (offset_node->type != HLSL_IR_CONSTANT) { FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type)); - offset_node = NULL; + return 0; } return hlsl_ir_constant(offset_node)->value[0].u;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Factor out add_unary_expr().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: vkd3d Branch: master Commit: 9a627494a3a1612f63e5f876a289904fabe38602 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a627494a3a1612f63e5f87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:03 2021 -0500 vkd3d-shader/hlsl: Factor out add_unary_expr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e9eac55..b8d147a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1083,6 +1083,17 @@ static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) return list; } +static struct list *add_unary_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *expr; + + if (!(expr = hlsl_new_unary_expr(ctx, op, node_from_list(instrs), loc))) + return NULL; + list_add_tail(instrs, &expr->entry); + return instrs; +} + static struct list *add_binary_expr(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) { @@ -3033,7 +3044,7 @@ unary_expr: if ($1 == UNARY_OP_PLUS) $$ = $2; else - $$ = append_unop($2, hlsl_new_unary_expr(ctx, ops[$1], node_from_list($2), @1)); + $$ = add_unary_expr(ctx, $2, ops[$1], @1); } /* var_modifiers is necessary to avoid shift/reduce conflicts. */

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of the unary_op rule.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: vkd3d Branch: master Commit: 8930bb734f5c2ef85b70fcfa7f779d3cbc2b0237 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8930bb734f5c2ef85b70fcf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:04 2021 -0500 vkd3d-shader/hlsl: Get rid of the unary_op rule. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 51 +++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b8d147a..42a6768 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -80,14 +80,6 @@ struct parse_if_body struct list *else_instrs; }; -enum parse_unary_op -{ - UNARY_OP_PLUS, - UNARY_OP_MINUS, - UNARY_OP_LOGICNOT, - UNARY_OP_BITNOT, -}; - enum parse_assign_op { ASSIGN_OP_ASSIGN, @@ -1798,7 +1790,6 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type struct parse_array_sizes arrays; struct parse_variable_def *variable_def; struct parse_if_body if_body; - enum parse_unary_op unary_op; enum parse_assign_op assign_op; struct hlsl_reg_reservation reg_reservation; struct parse_colon_attribute colon_attribute; @@ -1987,8 +1978,6 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type %type <type> type %type <type> typedef_type -%type <unary_op> unary_op - %type <variable_def> type_spec %type <variable_def> variable_def @@ -3037,16 +3026,22 @@ unary_expr: } $$ = $2; } - | unary_op unary_expr + | '+' unary_expr { - static const enum hlsl_ir_expr_op ops[] = {0, HLSL_OP1_NEG, HLSL_OP1_LOGIC_NOT, HLSL_OP1_BIT_NOT}; - - if ($1 == UNARY_OP_PLUS) - $$ = $2; - else - $$ = add_unary_expr(ctx, $2, ops[$1], @1); + $$ = $2; + } + | '-' unary_expr + { + $$ = add_unary_expr(ctx, $2, HLSL_OP1_NEG, @1); + } + | '~' unary_expr + { + $$ = add_unary_expr(ctx, $2, HLSL_OP1_BIT_NOT, @1); + } + | '!' unary_expr + { + $$ = add_unary_expr(ctx, $2, HLSL_OP1_LOGIC_NOT, @1); } - /* var_modifiers is necessary to avoid shift/reduce conflicts. */ | '(' var_modifiers type arrays ')' unary_expr { @@ -3082,24 +3077,6 @@ unary_expr: $$ = append_unop($6, &hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3)->node); } -unary_op: - '+' - { - $$ = UNARY_OP_PLUS; - } - | '-' - { - $$ = UNARY_OP_MINUS; - } - | '!' - { - $$ = UNARY_OP_LOGICNOT; - } - | '~' - { - $$ = UNARY_OP_BITNOT; - } - mul_expr: unary_expr | mul_expr '*' unary_expr

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of append_unop().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: vkd3d Branch: master Commit: 19b21ed005efe4a1715a072b6b5a7da9a5ab9823 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=19b21ed005efe4a1715a072… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:05 2021 -0500 vkd3d-shader/hlsl: Get rid of append_unop(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 42a6768..941f49c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1069,12 +1069,6 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return expr; } -static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) -{ - list_add_tail(list, &node->entry); - return list; -} - static struct list *add_unary_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) { @@ -2934,7 +2928,8 @@ postfix_expr: hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid swizzle \"%s\".", $3); YYABORT; } - $$ = append_unop($1, &swizzle->node); + list_add_tail($1, &swizzle->node.entry); + $$ = $1; } else { @@ -3047,6 +3042,7 @@ unary_expr: { struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; + struct hlsl_ir_expr *cast; unsigned int i; if ($2) @@ -3074,7 +3070,13 @@ unary_expr: YYABORT; } - $$ = append_unop($6, &hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3)->node); + if (!(cast = hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3))) + { + hlsl_free_instr_list($6); + YYABORT; + } + list_add_tail($6, &cast->node.entry); + $$ = $6; } mul_expr:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Factor out a variable_decl rule.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: vkd3d Branch: master Commit: 58c80574d8f1d1cf3eaba745eb0bf6f34c7c63a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=58c80574d8f1d1cf3eaba74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:06 2021 -0500 vkd3d-shader/hlsl: Factor out a variable_decl rule. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 941f49c..19745e7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1973,6 +1973,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type %type <type> typedef_type %type <variable_def> type_spec +%type <variable_def> variable_decl %type <variable_def> variable_def %% @@ -2546,7 +2547,7 @@ variables_def: list_add_tail($$, &$3->entry); } -variable_def: +variable_decl: any_identifier arrays colon_attribute { $$ = hlsl_alloc(ctx, sizeof(*$$)); @@ -2556,15 +2557,13 @@ variable_def: $$->semantic = $3.semantic; $$->reg_reservation = $3.reg_reservation; } - | any_identifier arrays colon_attribute '=' complex_initializer + +variable_def: + variable_decl + | variable_decl '=' complex_initializer { - $$ = hlsl_alloc(ctx, sizeof(*$$)); - $$->loc = @1; - $$->name = $1; - $$->arrays = $2; - $$->semantic = $3.semantic; - $$->reg_reservation = $3.reg_reservation; - $$->initializer = $5; + $$ = $1; + $$->initializer = $3; } arrays:

1 0