Module: wine Branch: master Commit: 97d44dd39969adc741acd271350c7292c6344f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d44dd39969adc741acd27135...
Author: Eric Pouech eric.pouech@orange.fr Date: Sat Dec 12 12:19:23 2009 +0100
dbghelp: Force 64bit module enumeration on all platforms.
---
programs/winedbg/debugger.h | 2 +- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/info.c | 1 - programs/winedbg/winedbg.c | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 42f9b24..30846eb 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -458,7 +458,7 @@ extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size); -extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod); +extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod); extern void dbg_set_option(const char*, const char*); extern void dbg_start_interactive(HANDLE hFile); extern void dbg_init_console(void); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4a63232..65b1cc3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2186,7 +2186,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl struct sockaddr_in s_addrs; unsigned int s_len = sizeof(s_addrs); struct pollfd pollfd; - IMAGEHLP_MODULE imh_mod; + IMAGEHLP_MODULE64 imh_mod;
/* step 1: create socket for gdb connection request */ if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 87fbebd..1b7eeb3 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -146,7 +146,6 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) struct info_module { IMAGEHLP_MODULE64* mi; - DWORD_PTR _base; unsigned num_alloc; unsigned num_used; }; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 911cb6a..4aa0a3e 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -399,7 +399,7 @@ BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade) struct mod_loader_info { HANDLE handle; - IMAGEHLP_MODULE* imh_mod; + IMAGEHLP_MODULE64* imh_mod; };
static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) @@ -408,13 +408,13 @@ static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx)
if (!strcmp(mod_name, "<wine-loader>")) { - if (SymGetModuleInfo(mli->handle, base, mli->imh_mod)) + if (SymGetModuleInfo64(mli->handle, base, mli->imh_mod)) return FALSE; /* stop enum */ } return TRUE; }
-BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod) +BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) { struct mod_loader_info mli; DWORD opt;