marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winedbg: Added a couple of tweaks to properly support 32bit vs 64bit wide addresses.

oldstable
Eric Pouech 2009-12-12 12:19:29 +01:00 committed by Alexandre Julliard
parent 97d44dd399
commit ab2e0bdef6
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/winedbg/debugger.h
View File

@ -38,6 +38,9 @@
#include "objbase.h"
#include "oaidl.h"
#define ADDRSIZE ((unsigned)sizeof(void*))
#define ADDRWIDTH (ADDRSIZE * 2)
/* the debugger uses these exceptions for it's internal use */
#define DEBUG_STATUS_OFFSET 0x80003000
#define DEBUG_STATUS_INTERNAL_ERROR (DEBUG_STATUS_OFFSET+0) /* something went wrong */

5
programs/winedbg/gdbproxy.c
View File

@ -1510,10 +1510,11 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn
packet_reply_open(gdbctx);
packet_reply_catc(gdbctx, 'O');
snprintf(buffer, sizeof(buffer),
"%*s%04lx%*s%-17.17s %08x %08lx %.14s\n",
"%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n",
indent, "", (ULONG_PTR)hWnd, 13 - indent, "",
clsName, GetWindowLongW(hWnd, GWL_STYLE),
(ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName);
ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
wndName);
packet_reply_hex_to_str(gdbctx, buffer);
packet_reply_close(gdbctx);

22
programs/winedbg/info.c
View File

@ -152,9 +152,9 @@ struct info_module
static void module_print_info(const IMAGEHLP_MODULE64* mi, BOOL is_embedded)
{
dbg_printf("%8s-%8s\t%-16s%s\n",
wine_dbgstr_longlong(mi->BaseOfImage),
wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize),
dbg_printf("%*.*s-%*.*s\t%-16s%s\n",
ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage),
ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize),
is_embedded ? "\\" : get_symtype_str(mi), mi->ModuleName);
}
@ -221,7 +221,8 @@ void info_win32_module(DWORD64 base)
qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare);
dbg_printf("Module\tAddress\t\t\tDebug info\tName (%d modules)\n", im.num_used);
dbg_printf("Module\tAddress\t\t\t%sDebug info\tName (%d modules)\n",
ADDRWIDTH == 16 ? "\t\t" : "", im.num_used);
for (i = 0; i < im.num_used; i++)
{
@ -370,10 +371,10 @@ static void info_window(HWND hWnd, int indent)
if (!GetWindowTextA(hWnd, wndName, sizeof(wndName)))
strcpy(wndName, "-- Empty --");
dbg_printf("%*s%08lx%*s %-17.17s %08x %08lx %08x %.14s\n",
dbg_printf("%*s%08lx%*s %-17.17s %08x %0*lx %08x %.14s\n",
indent, "", (DWORD_PTR)hWnd, 12 - indent, "",
clsName, GetWindowLongW(hWnd, GWL_STYLE),
(ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
GetWindowThreadProcessId(hWnd, NULL), wndName);
if ((child = GetWindow(hWnd, GW_CHILD)) != 0)
@ -393,8 +394,9 @@ void info_win32_window(HWND hWnd, BOOL detailed)
if (!detailed)
{
dbg_printf("%-20.20s %-17.17s %-8.8s %-8.8s %-8.8s %s\n",
"Window handle", "Class Name", "Style", "WndProc", "Thread", "Text");
dbg_printf("%-20.20s %-17.17s %-8.8s %-*.*s %-8.8s %s\n",
"Window handle", "Class Name", "Style",
ADDRWIDTH, ADDRWIDTH, "WndProc", "Thread", "Text");
info_window(hWnd, 0);
return;
}
@ -412,7 +414,7 @@ void info_win32_window(HWND hWnd, BOOL detailed)
/* FIXME missing fields: hmemTaskQ, hrgnUpdate, dce, flags, pProp, scroll */
dbg_printf("next=%p child=%p parent=%p owner=%p class='%s'\n"
"inst=%p active=%p idmenu=%08lx\n"
"style=0x%08x exstyle=0x%08x wndproc=0x%08lx text='%s'\n"
"style=0x%08x exstyle=0x%08x wndproc=%p text='%s'\n"
"client=%d,%d-%d,%d window=%d,%d-%d,%d sysmenu=%p\n",
GetWindow(hWnd, GW_HWNDNEXT),
GetWindow(hWnd, GW_CHILD),
@ -424,7 +426,7 @@ void info_win32_window(HWND hWnd, BOOL detailed)
(ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_ID),
GetWindowLongW(hWnd, GWL_STYLE),
GetWindowLongW(hWnd, GWL_EXSTYLE),
(ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
(void*)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
wndName,
clientRect.left, clientRect.top, clientRect.right, clientRect.bottom,
windowRect.left, windowRect.top, windowRect.right, windowRect.bottom,