dbghelp: Ensure all adresses are stored at least in DWORD_PTR.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2021-09-10 15:52:09 +02:00 committed by Alexandre Julliard
parent c031d5aa8c
commit f4afcb3f5a
3 changed files with 5 additions and 5 deletions

View file

@ -264,7 +264,7 @@ static BOOL arm64_fetch_minidump_thread(struct dump_context* dc, unsigned index,
{
/* FIXME: crop values across module boundaries, */
#ifdef __aarch64__
ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80;
ULONG64 base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80;
minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0);
#endif
}

View file

@ -652,7 +652,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module*
struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
unsigned int i;
const IMAGE_EXPORT_DIRECTORY* exports;
DWORD base = module->module.BaseOfImage;
DWORD_PTR base = module->module.BaseOfImage;
DWORD size;
IMAGE_NT_HEADERS* nth;
void* mapping;
@ -716,7 +716,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module*
if ((ordinals[j] == i) && names[j]) break;
if (j < exports->NumberOfNames) continue;
snprintf(buffer, sizeof(buffer), "%d", i + exports->Base);
symt_new_public(module, NULL, buffer, FALSE, base + (DWORD)functions[i], 1);
symt_new_public(module, NULL, buffer, FALSE, base + functions[i], 1);
}
}
}
@ -906,7 +906,7 @@ struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name,
PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, PULONG size, PIMAGE_SECTION_HEADER *section )
{
const IMAGE_NT_HEADERS *nt;
DWORD addr;
DWORD_PTR addr;
*size = 0;
if (section) *section = NULL;

View file

@ -929,7 +929,7 @@ static BOOL symt_enum_locals_helper(struct module_pair* pair,
struct symt_function* func, const struct vector* v)
{
struct symt* lsym = NULL;
DWORD pc = pair->pcs->ctx_frame.InstructionOffset;
DWORD_PTR pc = pair->pcs->ctx_frame.InstructionOffset;
unsigned int i;
WCHAR* nameW;
BOOL ret;