Module: wine Branch: master Commit: 229d753bc93699bb9b9b6a540e8295c65088cbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=229d753bc93699bb9b9b6a540e...
Author: Eric Pouech eric.pouech@orange.fr Date: Sat Oct 9 08:50:56 2010 +0200
dbghelp: Some more 64bit base address fixes.
---
dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/elf_module.c | 4 ++-- dlls/dbghelp/macho_module.c | 4 ++-- dlls/dbghelp/minidump.c | 6 ++++-- 4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index aec5bdd..44e62f3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -509,7 +509,7 @@ typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user);
/* elf_module.c */ extern BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb, void*); -extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum); +extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum); struct image_file_map; extern BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap); extern struct module* @@ -522,7 +522,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th /* macho_module.c */ #define MACHO_NO_MAP ((const void*)-1) extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*); -extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum); +extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum); struct macho_file_map; extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap); extern struct module* diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 9b1155e..395b564 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -989,7 +989,7 @@ BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap) * * Gathers some more information for an ELF module from a given file */ -BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { struct image_file_map fmap; @@ -1502,7 +1502,7 @@ BOOL elf_synchronize_module_list(struct process* pcs) return FALSE; }
-BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { return FALSE; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9aac3e7..ae67188 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -903,7 +903,7 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) * * Gathers some more information for a Mach-O module from a given file */ -BOOL macho_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { struct macho_file_map fmap; @@ -1416,7 +1416,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) return FALSE; }
-BOOL macho_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { return FALSE; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 3cddb72..fd7eb1a 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -283,7 +283,8 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, void* user) { struct dump_context* dc = user; - DWORD rbase, size, checksum; + DWORD_PTR rbase; + DWORD size, checksum;
/* FIXME: there's no relevant timestamp on ELF modules */ /* NB: if we have a non-null base from the live-target use it (whenever @@ -305,7 +306,8 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, void* user) { struct dump_context* dc = (struct dump_context*)user; - DWORD rbase, size, checksum; + DWORD_PTR rbase; + DWORD size, checksum;
/* FIXME: there's no relevant timestamp on Mach-O modules */ /* NB: if we have a non-null base from the live-target use it. If we have