Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/dbghelp/type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 23752cfed9f..29d8a5350a5 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -487,13 +487,13 @@ struct enum_types_AtoW PSYM_ENUMERATESYMBOLS_CALLBACKW callback; };
-static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG size, PVOID _et) { struct enum_types_AtoW* et = _et; SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer;
copy_symbolW(siW, si); - return et->callback(siW, addr, et->user); + return et->callback(siW, size, et->user); }
/******************************************************************
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/pe_module.c | 6 +++--- dlls/dbghelp/symbol.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index 515294fe95c..2c767e78de4 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -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 } diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 38829d6e6de..278f3c71c98 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -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; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 28c906c10a3..3b44315eebd 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -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;
-
Eric Pouech