ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp/dwarf: Use the word size of the target process. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45490
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-07-31 11:17:37 -05:00 committed by Alexandre Julliard
parent 3507615f35
commit 42745c068f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/dbghelp/dwarf.c
View File

@ -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;