ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Force 64bit module enumeration on all platforms.

This commit is contained in:
Eric Pouech 2009-12-12 12:19:23 +01:00 committed by Alexandre Julliard
parent 7daa50c041
commit 97d44dd399
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/winedbg/debugger.h
View File

@ -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 void dbg_del_thread(struct dbg_thread* t);
extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); 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_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_set_option(const char*, const char*);
extern void dbg_start_interactive(HANDLE hFile); extern void dbg_start_interactive(HANDLE hFile);
extern void dbg_init_console(void); extern void dbg_init_console(void);

2
programs/winedbg/gdbproxy.c
View File

@ -2186,7 +2186,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl
struct sockaddr_in s_addrs; struct sockaddr_in s_addrs;
unsigned int s_len = sizeof(s_addrs); unsigned int s_len = sizeof(s_addrs);
struct pollfd pollfd; struct pollfd pollfd;
IMAGEHLP_MODULE imh_mod; IMAGEHLP_MODULE64 imh_mod;
/* step 1: create socket for gdb connection request */ /* step 1: create socket for gdb connection request */
if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)

1
programs/winedbg/info.c
View File

@ -146,7 +146,6 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi)
struct info_module struct info_module
{ {
IMAGEHLP_MODULE64* mi; IMAGEHLP_MODULE64* mi;
DWORD_PTR _base;
unsigned num_alloc; unsigned num_alloc;
unsigned num_used; unsigned num_used;
}; };

6
programs/winedbg/winedbg.c
View File

@ -399,7 +399,7 @@ BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade)
struct mod_loader_info struct mod_loader_info
{ {
HANDLE handle; HANDLE handle;
IMAGEHLP_MODULE* imh_mod; IMAGEHLP_MODULE64* imh_mod;
}; };
static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) 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 (!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 FALSE; /* stop enum */
} }
return TRUE; 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; struct mod_loader_info mli;
DWORD opt; DWORD opt;