July 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 1/5] kernel32: Don't clear WINEDEBUG in the debugger process.

by Zebediah Figura

On 31/07/18 18:38, Ken Thomases wrote: > On Jul 30, 2018, at 2:47 PM, Zebediah Figura <z.figura12(a)gmail.com> wrote: >> >> While this does avoid usually undesired debug output, it also makes >> debugging winedbg.exe practically impossible. > > Not that I feel strongly one way or the other, but perhaps you could clear WINEDEBUG unless +dgbhelp or +winedbg are enabled (or, if it's easier or more complete, if the value of WINEDEBUG contains either of those channel names; that would get dbghelp_stabs and the like, too). > > -Ken > > > Sure, I'd be happy with either solution.

July 31, 2018

Re: [PATCH 1/5] kernel32: Don't clear WINEDEBUG in the debugger process.

by Ken Thomases

On Jul 30, 2018, at 2:47 PM, Zebediah Figura <z.figura12(a)gmail.com> wrote: > > While this does avoid usually undesired debug output, it also makes > debugging winedbg.exe practically impossible. Not that I feel strongly one way or the other, but perhaps you could clear WINEDEBUG unless +dgbhelp or +winedbg are enabled (or, if it's easier or more complete, if the value of WINEDEBUG contains either of those channel names; that would get dbghelp_stabs and the like, too). -Ken

July 31, 2018

Re: [PATCH] kernel32: Set environment variable %PUBLIC% on the process start-up.

by Alistair Leslie-Hughes

Hi Dmitry, On windows, these are set to different values. ALLUSERSPROFILE=C:\ProgramData PUBLIC=C:\Users\Public Why have you made them the same? Regards Alistair. On 31/07/18 20:57, Dmitry Timoshkov wrote: > This patch fixes an installer that has "[%PUBLIC]\Documents" entry > for some of the targets being copied from a cabinet file. Under > Windows %PUBLIC% environment variable is set to C:\Users\Public. > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/kernel32/process.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c > index 4e6ba1118e..280f406627 100644 > --- a/dlls/kernel32/process.c > +++ b/dlls/kernel32/process.c > @@ -520,6 +520,7 @@ static void set_additional_environment(void) > static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; > static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; > static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; > + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; > OBJECT_ATTRIBUTES attr; > UNICODE_STRING nameW; > WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL; > @@ -560,6 +561,7 @@ static void set_additional_environment(void) > if (p > value && p[-1] != '\\') *p++ = '\\'; > strcpyW( p, all_users_dir ); > SetEnvironmentVariableW( allusersW, value ); > + SetEnvironmentVariableW( publicW, value ); > HeapFree( GetProcessHeap(), 0, value ); > } >

July 31, 2018

Re: [PATCH] libwine: Use getsegmentdata(3) on Mac OS to find the __DATA segment.

by Ken Thomases

Signed-off-by: Ken Thomases <ken(a)codeweavers.com>

July 31, 2018

[PATCH] libwine: Use getsegmentdata(3) on Mac OS to find the __DATA segment.

by Chip Davis

Don't assume it starts with the fake PE header. This assumption doesn't hold on Mac OS: the __data section where it was placed is located after several other sections. Unfortunately, this causes Wine, when DEP/NX is turned off, to override the page protections for the start of the __DATA segment, removing write permission from them, leading to a crash when winemac.drv attempted to use an Objective-C class for the first time. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- libs/wine/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c07042a583e6..e757a59cd682 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -49,6 +49,7 @@ #undef LoadResource #undef GetCurrentThread #include <pthread.h> +#include <mach-o/getsect.h> #else extern char **environ; #endif @@ -392,6 +393,10 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) const size_t page_mask = page_size - 1; int delta, nb_sections = 2; /* code + data */ unsigned int i; +#ifdef __APPLE__ + Dl_info dli; + unsigned long data_size; +#endif size_t size = (sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS) @@ -424,8 +429,15 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) delta = (const BYTE *)nt_descr - addr; code_start = page_size; +#ifdef __APPLE__ + /* Need the mach_header, not the PE header, to give to getsegmentdata(3) */ + dladdr(addr, &dli); + data_start = getsegmentdata(dli.dli_fbase, "__DATA", &data_size) - addr; + data_end = (data_start + data_size + page_mask) & ~page_mask; +#else data_start = delta & ~page_mask; data_end = (nt->OptionalHeader.SizeOfImage + delta + page_mask) & ~page_mask; +#endif fixup_rva_ptrs( &nt->OptionalHeader.AddressOfEntryPoint, addr, 1 ); -- 2.18.0

July 31, 2018

[PATCH 6/6] dbghelp/msc: Use the word size of the target process.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 20c716e..0508e12 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3089,10 +3089,10 @@ static BOOL pev_binop(struct pevaluator* pev, char op) static BOOL pev_deref(struct pevaluator* pev) { char res[PEV_MAX_LEN]; - DWORD_PTR v1, v2; + DWORD_PTR v1, v2 = 0; if (!pev_pop_val(pev, &v1)) return FALSE; - if (!sw_read_mem(pev->csw, v1, &v2, sizeof(v2))) + if (!sw_read_mem(pev->csw, v1, &v2, pev->csw->cpu->word_size)) return PEV_ERROR1(pev, "deref: cannot read mem at %lx\n", v1); snprintf(res, sizeof(res), "%ld", v2); pev_push(pev, res); -- 2.7.4

July 31, 2018

[PATCH 5/6] dbghelp: Correctly determine the dyld image info address.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/macho_module.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9401dfb..3f28137 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1359,18 +1359,28 @@ static ULONG_PTR get_dyld_image_info_address(struct process* pcs) NTSTATUS status; PROCESS_BASIC_INFORMATION pbi; ULONG_PTR dyld_image_info_address = 0; + BOOL ret; /* Get address of PEB */ status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); if (status == STATUS_SUCCESS) { /* Read dyld image info address from PEB */ - if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], - &dyld_image_info_address, sizeof(dyld_image_info_address), NULL)) + if (!pcs->is_64bit) + ret = ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], + &dyld_image_info_address, sizeof(dyld_image_info_address), NULL); + else { - TRACE("got dyld_image_info_address 0x%08lx from PEB %p MacDyldImageInfo %p\n", - (unsigned long)dyld_image_info_address, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); + PEB32 *peb32 = (PEB32 *)pbi.PebBaseAddress; + ULONG addr32; + ret = ReadProcessMemory(pcs->handle, &peb32->Reserved[0], &addr32, + sizeof(addr32), NULL); + dyld_image_info_address = addr32; } + + if (ret) + TRACE("got dyld_image_info_address %#lx from PEB %p\n", + dyld_image_info_address, pbi.PebBaseAddress); } #ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ -- 2.7.4

July 31, 2018

[PATCH 4/6] dbghelp/dwarf: Use the word size of the target process.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45490 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/dwarf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1dc2dc1..31c008a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -820,9 +820,9 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, if (hproc) { DWORD_PTR addr = stack[stk--]; - DWORD_PTR deref; + DWORD_PTR deref = 0; - if (!ReadProcessMemory(hproc, (void*)addr, &deref, sizeof(deref), NULL)) + if (!ReadProcessMemory(hproc, (void*)addr, &deref, ctx->word_size, NULL)) { WARN("Couldn't read memory at %lx\n", addr); return loc_err_cant_read; @@ -3117,7 +3117,8 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case DW_OP_constu: stack[++sp] = dwarf2_leb128_as_unsigned(&ctx); break; case DW_OP_consts: stack[++sp] = dwarf2_leb128_as_signed(&ctx); break; case DW_OP_deref: - if (!sw_read_mem(csw, stack[sp], &tmp, sizeof(tmp))) + tmp = 0; + if (!sw_read_mem(csw, stack[sp], &tmp, ctx.word_size)) { ERR("Couldn't read memory at %s\n", wine_dbgstr_longlong(stack[sp])); tmp = 0; @@ -3200,7 +3201,7 @@ static void apply_frame_state(const struct module* module, struct cpu_stack_walk { case RULE_EXPRESSION: *cfa = eval_expression(module, csw, (const unsigned char*)state->cfa_offset, context); - if (!sw_read_mem(csw, *cfa, cfa, sizeof(*cfa))) + if (!sw_read_mem(csw, *cfa, cfa, csw->cpu->word_size)) { WARN("Couldn't read memory at %s\n", wine_dbgstr_longlong(*cfa)); return; -- 2.7.4

July 31, 2018

[PATCH 3/6] dbghelp/dwarf: Allow get_context_reg() to handle different register sizes.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/cpu_arm.c | 2 +- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 30 ++++++++++++++++-------------- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 15091d3..510da4a 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -66,7 +66,7 @@ enum st_mode {stm_start, stm_arm, stm_done}; static BOOL fetch_next_frame(struct cpu_stack_walk* csw, union ctx *pcontext, DWORD_PTR curr_pc) { - DWORD_PTR xframe; + DWORD64 xframe; DWORD oldReturn = context->Lr; CONTEXT *context = &pcontext->ctx; diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index 6cabc5b..7bfa318 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -68,7 +68,7 @@ enum st_mode {stm_start, stm_arm64, stm_done}; static BOOL fetch_next_frame(struct cpu_stack_walk* csw, union ctx *pcontext, DWORD_PTR curr_pc) { - DWORD_PTR xframe; + DWORD64 xframe; DWORD_PTR oldReturn = context->u.s.Lr; if (dwarf2_virtual_unwind(csw, curr_pc, pcontext, &xframe)) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 4880fd4..9704cfd 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -94,7 +94,7 @@ static BOOL i386_get_addr(HANDLE hThread, const CONTEXT* ctx, static BOOL fetch_next_frame32(struct cpu_stack_walk* csw, union ctx *pcontext, DWORD_PTR curr_pc) { - DWORD_PTR xframe; + DWORD64 xframe; struct pdb_cmd_pair cpair[4]; DWORD val32; WOW64_CONTEXT *context = &pcontext->x86; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index be6d3f4..3c0b1d8 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -579,7 +579,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, static BOOL fetch_next_frame(struct cpu_stack_walk *csw, union ctx *pcontext, DWORD_PTR curr_pc, void** prtf) { - DWORD_PTR cfa; + DWORD64 cfa; RUNTIME_FUNCTION* rtf; DWORD64 base; CONTEXT *context = &pcontext->ctx; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 57af60b..f689db8 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -693,7 +693,7 @@ extern BOOL dwarf2_parse(struct module* module, unsigned long load_offse const struct elf_thunk_area* thunks, struct image_file_map* fmap) DECLSPEC_HIDDEN; extern BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, - union ctx *ctx, ULONG_PTR *cfa) DECLSPEC_HIDDEN; + union ctx *ctx, DWORD64 *cfa) DECLSPEC_HIDDEN; /* stack.c */ extern BOOL sw_read_mem(struct cpu_stack_walk* csw, DWORD64 addr, void* ptr, DWORD sz) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4053e5e..1dc2dc1 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3008,18 +3008,19 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, } /* retrieve a context register from its dwarf number */ -static ULONG_PTR get_context_reg(struct cpu_stack_walk *csw, union ctx *context, +static DWORD64 get_context_reg(struct cpu_stack_walk *csw, union ctx *context, ULONG_PTR dw_reg) { unsigned regno = csw->cpu->map_dwarf_register(dw_reg, TRUE), sz; - ULONG_PTR* ptr = csw->cpu->fetch_context_reg(context, regno, &sz); + void* ptr = csw->cpu->fetch_context_reg(context, regno, &sz); - if (sz != sizeof(ULONG_PTR)) - { - FIXME("reading register %lu/%u of wrong size %u\n", dw_reg, regno, sz); - return 0; - } - return *ptr; + if (sz == 8) + return *(DWORD64 *)ptr; + else if (sz == 4) + return *(DWORD *)ptr; + + FIXME("unhandled size %d\n", sz); + return 0; } /* set a context register from its dwarf number */ @@ -3079,7 +3080,8 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w const unsigned char* zp, union ctx *context) { dwarf2_traverse_context_t ctx; - ULONG_PTR reg, sz, tmp, stack[64]; + ULONG_PTR reg, sz, tmp; + DWORD64 stack[64]; int sp = -1; ULONG_PTR len; @@ -3117,7 +3119,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case DW_OP_deref: if (!sw_read_mem(csw, stack[sp], &tmp, sizeof(tmp))) { - ERR("Couldn't read memory at %lx\n", stack[sp]); + ERR("Couldn't read memory at %s\n", wine_dbgstr_longlong(stack[sp])); tmp = 0; } stack[sp] = tmp; @@ -3167,7 +3169,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w sz = dwarf2_parse_byte(&ctx); if (!sw_read_mem(csw, stack[sp], &tmp, sz)) { - ERR("Couldn't read memory at %lx\n", stack[sp]); + ERR("Couldn't read memory at %s\n", wine_dbgstr_longlong(stack[sp])); tmp = 0; } /* do integral promotion */ @@ -3188,7 +3190,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w } static void apply_frame_state(const struct module* module, struct cpu_stack_walk* csw, - union ctx *context, struct frame_state *state, ULONG_PTR* cfa) + union ctx *context, struct frame_state *state, DWORD64 *cfa) { unsigned int i; ULONG_PTR value; @@ -3200,7 +3202,7 @@ static void apply_frame_state(const struct module* module, struct cpu_stack_walk *cfa = eval_expression(module, csw, (const unsigned char*)state->cfa_offset, context); if (!sw_read_mem(csw, *cfa, cfa, sizeof(*cfa))) { - WARN("Couldn't read memory at %p\n", (void*)*cfa); + WARN("Couldn't read memory at %s\n", wine_dbgstr_longlong(*cfa)); return; } break; @@ -3245,7 +3247,7 @@ static void apply_frame_state(const struct module* module, struct cpu_stack_walk * */ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, - union ctx *context, ULONG_PTR *cfa) + union ctx *context, DWORD64 *cfa) { struct module_pair pair; struct frame_info info; -- 2.7.4

July 31, 2018

[PATCH 2/6] dbghelp/dwarf: Use the correct backend CPU in dwarf2_virtual_unwind().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 39 +++++++++++++++++++++------------------ dlls/dbghelp/stack.c | 2 ++ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 871b81e..57af60b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -443,6 +443,7 @@ struct cpu_stack_walk HANDLE hProcess; HANDLE hThread; BOOL is32; + struct cpu * cpu; union { struct diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e07c9f0..4053e5e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3008,10 +3008,11 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, } /* retrieve a context register from its dwarf number */ -static ULONG_PTR get_context_reg(union ctx *context, ULONG_PTR dw_reg) +static ULONG_PTR get_context_reg(struct cpu_stack_walk *csw, union ctx *context, + ULONG_PTR dw_reg) { - unsigned regno = dbghelp_current_cpu->map_dwarf_register(dw_reg, TRUE), sz; - ULONG_PTR* ptr = dbghelp_current_cpu->fetch_context_reg(context, regno, &sz); + unsigned regno = csw->cpu->map_dwarf_register(dw_reg, TRUE), sz; + ULONG_PTR* ptr = csw->cpu->fetch_context_reg(context, regno, &sz); if (sz != sizeof(ULONG_PTR)) { @@ -3025,8 +3026,8 @@ static ULONG_PTR get_context_reg(union ctx *context, ULONG_PTR dw_reg) static void set_context_reg(struct cpu_stack_walk* csw, union ctx *context, ULONG_PTR dw_reg, ULONG_PTR val, BOOL isdebuggee) { - unsigned regno = dbghelp_current_cpu->map_dwarf_register(dw_reg, TRUE), sz; - ULONG_PTR* ptr = dbghelp_current_cpu->fetch_context_reg(context, regno, &sz); + unsigned regno = csw->cpu->map_dwarf_register(dw_reg, TRUE), sz; + ULONG_PTR* ptr = csw->cpu->fetch_context_reg(context, regno, &sz); if (isdebuggee) { @@ -3056,13 +3057,14 @@ static void set_context_reg(struct cpu_stack_walk* csw, union ctx *context, } /* copy a register from one context to another using dwarf number */ -static void copy_context_reg(union ctx *dstcontext, ULONG_PTR dwregdst, - union ctx *srccontext, ULONG_PTR dwregsrc) +static void copy_context_reg(struct cpu_stack_walk *csw, + union ctx *dstcontext, ULONG_PTR dwregdst, + union ctx *srccontext, ULONG_PTR dwregsrc) { - unsigned regdstno = dbghelp_current_cpu->map_dwarf_register(dwregdst, TRUE), szdst; - unsigned regsrcno = dbghelp_current_cpu->map_dwarf_register(dwregsrc, TRUE), szsrc; - ULONG_PTR* ptrdst = dbghelp_current_cpu->fetch_context_reg(dstcontext, regdstno, &szdst); - ULONG_PTR* ptrsrc = dbghelp_current_cpu->fetch_context_reg(srccontext, regsrcno, &szsrc); + unsigned regdstno = csw->cpu->map_dwarf_register(dwregdst, TRUE), szdst; + unsigned regsrcno = csw->cpu->map_dwarf_register(dwregsrc, TRUE), szsrc; + ULONG_PTR* ptrdst = csw->cpu->fetch_context_reg(dstcontext, regdstno, &szdst); + ULONG_PTR* ptrsrc = csw->cpu->fetch_context_reg(srccontext, regsrcno, &szsrc); if (szdst != szsrc) { @@ -3094,9 +3096,10 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w if (opcode >= DW_OP_lit0 && opcode <= DW_OP_lit31) stack[++sp] = opcode - DW_OP_lit0; else if (opcode >= DW_OP_reg0 && opcode <= DW_OP_reg31) - stack[++sp] = get_context_reg(context, opcode - DW_OP_reg0); + stack[++sp] = get_context_reg(csw, context, opcode - DW_OP_reg0); else if (opcode >= DW_OP_breg0 && opcode <= DW_OP_breg31) - stack[++sp] = get_context_reg(context, opcode - DW_OP_breg0) + dwarf2_leb128_as_signed(&ctx); + stack[++sp] = get_context_reg(csw, context, opcode - DW_OP_breg0) + + dwarf2_leb128_as_signed(&ctx); else switch (opcode) { case DW_OP_nop: break; @@ -3153,12 +3156,12 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w stack[++sp] = dwarf2_parse_augmentation_ptr(&ctx, tmp); break; case DW_OP_regx: - stack[++sp] = get_context_reg(context, dwarf2_leb128_as_unsigned(&ctx)); + stack[++sp] = get_context_reg(csw, context, dwarf2_leb128_as_unsigned(&ctx)); break; case DW_OP_bregx: reg = dwarf2_leb128_as_unsigned(&ctx); tmp = dwarf2_leb128_as_signed(&ctx); - stack[++sp] = get_context_reg(context, reg) + tmp; + stack[++sp] = get_context_reg(csw, context, reg) + tmp; break; case DW_OP_deref_size: sz = dwarf2_parse_byte(&ctx); @@ -3205,7 +3208,7 @@ static void apply_frame_state(const struct module* module, struct cpu_stack_walk *cfa = eval_expression(module, csw, (const unsigned char*)state->cfa_offset, context); break; default: - *cfa = get_context_reg(context, state->cfa_reg) + state->cfa_offset; + *cfa = get_context_reg(csw, context, state->cfa_reg) + state->cfa_offset; break; } if (!*cfa) return; @@ -3222,7 +3225,7 @@ static void apply_frame_state(const struct module* module, struct cpu_stack_walk set_context_reg(csw, &new_context, i, *cfa + state->regs[i], TRUE); break; case RULE_OTHER_REG: - copy_context_reg(&new_context, i, context, state->regs[i]); + copy_context_reg(csw, &new_context, i, context, state->regs[i]); break; case RULE_EXPRESSION: value = eval_expression(module, csw, (const unsigned char*)state->regs[i], context); @@ -3282,7 +3285,7 @@ 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, - dbghelp_current_cpu->fetch_regname(dbghelp_current_cpu->map_dwarf_register(info.retaddr_reg, TRUE))); + csw->cpu->fetch_regname(csw->cpu->map_dwarf_register(info.retaddr_reg, TRUE))); /* if at very beginning of function, return and use default unwinder */ if (ip == info.ip) return FALSE; diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 21412f6..b3845db 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -175,6 +175,7 @@ BOOL WINAPI StackWalk(DWORD MachineType, HANDLE hProcess, HANDLE hThread, csw.hProcess = hProcess; csw.hThread = hThread; csw.is32 = TRUE; + csw.cpu = cpu; /* sigh... MS isn't even consistent in the func prototypes */ csw.u.s32.f_read_mem = (f_read_mem) ? f_read_mem : read_mem; csw.u.s32.f_xlat_adr = f_xlat_adr; @@ -231,6 +232,7 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, csw.hProcess = hProcess; csw.hThread = hThread; csw.is32 = FALSE; + csw.cpu = cpu; /* sigh... MS isn't even consistent in the func prototypes */ csw.u.s64.f_read_mem = (f_read_mem) ? f_read_mem : read_mem64; csw.u.s64.f_xlat_adr = (f_xlat_adr) ? f_xlat_adr : addr_to_linear; -- 2.7.4

July 31, 2018