Commit 229d753b authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

dbghelp: Some more 64bit base address fixes.

parent 1e141eee
...@@ -509,7 +509,7 @@ typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); ...@@ -509,7 +509,7 @@ typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user);
/* elf_module.c */ /* elf_module.c */
extern BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb, void*); 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; struct image_file_map;
extern BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap); extern BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap);
extern struct module* extern struct module*
...@@ -522,7 +522,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th ...@@ -522,7 +522,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th
/* macho_module.c */ /* macho_module.c */
#define MACHO_NO_MAP ((const void*)-1) #define MACHO_NO_MAP ((const void*)-1)
extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*); 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; struct macho_file_map;
extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap); extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap);
extern struct module* extern struct module*
......
...@@ -989,7 +989,7 @@ BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap) ...@@ -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 * 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) DWORD* size, DWORD* checksum)
{ {
struct image_file_map fmap; struct image_file_map fmap;
...@@ -1502,7 +1502,7 @@ BOOL elf_synchronize_module_list(struct process* pcs) ...@@ -1502,7 +1502,7 @@ BOOL elf_synchronize_module_list(struct process* pcs)
return FALSE; 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) DWORD* size, DWORD* checksum)
{ {
return FALSE; return FALSE;
......
...@@ -903,7 +903,7 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) ...@@ -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 * 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) DWORD* size, DWORD* checksum)
{ {
struct macho_file_map fmap; struct macho_file_map fmap;
...@@ -1416,7 +1416,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) ...@@ -1416,7 +1416,7 @@ BOOL macho_synchronize_module_list(struct process* pcs)
return FALSE; 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) DWORD* size, DWORD* checksum)
{ {
return FALSE; return FALSE;
......
...@@ -283,7 +283,8 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, ...@@ -283,7 +283,8 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base,
void* user) void* user)
{ {
struct dump_context* dc = 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 */ /* FIXME: there's no relevant timestamp on ELF modules */
/* NB: if we have a non-null base from the live-target use it (whenever /* 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, ...@@ -305,7 +306,8 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base,
void* user) void* user)
{ {
struct dump_context* dc = (struct dump_context*)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 */ /* 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 /* NB: if we have a non-null base from the live-target use it. If we have
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment