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

winedbg: Use I width modifier for DWORD_PTR printf's args. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2021-11-26 17:30:16 +01:00 committed by Alexandre Julliard
parent 14781c7183
commit d65edd04cc
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/winedbg/break.c
View File

@ -319,7 +319,7 @@ void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp)
il.SizeOfStruct = sizeof(il);
if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il))
{
dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear);
dbg_printf("Unable to add breakpoint (unknown address %Ix)\n", linear);
return;
}
filename = il.FileName;

4
programs/winedbg/expr.c
View File

@ -687,10 +687,10 @@ BOOL expr_print(const struct expr* exp)
dbg_printf("$%s", exp->un.intvar.name);
break;
case EXPR_TYPE_U_CONST:
dbg_printf("%lu", exp->un.u_const.value);
dbg_printf("%Iu", exp->un.u_const.value);
break;
case EXPR_TYPE_S_CONST:
dbg_printf("%ld", exp->un.s_const.value);
dbg_printf("%Id", exp->un.s_const.value);
break;
case EXPR_TYPE_STRING:
dbg_printf("\"%s\"", exp->un.string.str);

8
programs/winedbg/gdbproxy.c
View File

@ -1486,7 +1486,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn
packet_reply_open(gdbctx);
packet_reply_add(gdbctx, "O");
snprintf(buffer, sizeof(buffer),
"%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n",
"%*s%04Ix%*s%-17.17s %08x %0*Ix %.14s\n",
indent, "", (ULONG_PTR)hWnd, 13 - indent, "",
clsName, GetWindowLongW(hWnd, GWL_STYLE),
addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
@ -1613,7 +1613,7 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const
prot[0] = '\0';
}
packet_reply_open(gdbctx);
snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n",
snprintf(buffer, sizeof(buffer), "%0*Ix %0*Ix %s %s %s\n",
addr_width(gdbctx), (DWORD_PTR)addr,
addr_width(gdbctx), mbi.RegionSize, state, type, prot);
packet_reply_add(gdbctx, "O");
@ -2042,7 +2042,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx)
char buf[64];
snprintf(buf, sizeof(buf),
"Text=%08lx;Data=%08lx;Bss=%08lx",
"Text=%08Ix;Data=%08Ix;Bss=%08Ix",
gdbctx->wine_segs[0], gdbctx->wine_segs[1],
gdbctx->wine_segs[2]);
return packet_reply(gdbctx, buf);
@ -2439,7 +2439,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por
if (gdbctx->sock != INVALID_SOCKET)
{
ret = TRUE;
TRACE("connected on %lu\n", gdbctx->sock);
TRACE("connected on %Iu\n", gdbctx->sock);
/* don't keep our small packets too long: send them ASAP back to GDB
* without this, GDB really crawls
*/

14
programs/winedbg/info.c
View File

@ -392,7 +392,7 @@ 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 %0*lx %08x %.14s\n",
dbg_printf("%*s%08Ix%*s %-17.17s %08x %0*Ix %08x %.14s\n",
indent, "", (DWORD_PTR)hWnd, 12 - indent, "",
clsName, GetWindowLongW(hWnd, GWL_STYLE),
ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC),
@ -434,7 +434,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"
"inst=%p active=%p idmenu=%08Ix\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),
@ -791,7 +791,7 @@ void info_win32_virtual(DWORD pid)
type = "";
prot[0] = '\0';
}
dbg_printf("%0*lx %0*lx %s %s %s\n",
dbg_printf("%0*Ix %0*Ix %s %s %s\n",
ADDRWIDTH, (DWORD_PTR)addr, ADDRWIDTH, (DWORD_PTR)addr + mbi.RegionSize - 1, state, type, prot);
if (addr + mbi.RegionSize < addr) /* wrap around ? */
break;
@ -893,7 +893,7 @@ void info_win32_exception(void)
break;
case EXCEPTION_ACCESS_VIOLATION:
if (rec->NumberParameters == 2)
dbg_printf("page fault on %s access to 0x%0*lx",
dbg_printf("page fault on %s access to 0x%0*Ix",
rec->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT ? "write" :
rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT ? "execute" : "read",
ADDRWIDTH, rec->ExceptionInformation[1]);
@ -931,7 +931,7 @@ void info_win32_exception(void)
(void*)rec->ExceptionInformation[1], TRUE, FALSE,
name, sizeof(name));
else
sprintf( name, "%ld", rec->ExceptionInformation[1] );
sprintf( name, "%Id", rec->ExceptionInformation[1] );
dbg_printf("unimplemented function %s.%s called", dll, name);
}
break;
@ -961,14 +961,14 @@ void info_win32_exception(void)
break;
case EXCEPTION_WINE_CXX_EXCEPTION:
if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC)
dbg_printf("C++ exception(object = 0x%0*lx, type = 0x%0*lx)",
dbg_printf("C++ exception(object = 0x%0*Ix, type = 0x%0*Ix)",
ADDRWIDTH, rec->ExceptionInformation[1], ADDRWIDTH, rec->ExceptionInformation[2]);
else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC)
dbg_printf("C++ exception(object = %p, type = %p, base = %p)",
(void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2],
(void*)rec->ExceptionInformation[3]);
else
dbg_printf("C++ exception with strange parameter count %d or magic 0x%0*lx",
dbg_printf("C++ exception with strange parameter count %d or magic 0x%0*Ix",
rec->NumberParameters, ADDRWIDTH, rec->ExceptionInformation[0]);
break;
default:

4
programs/winedbg/memory.c
View File

@ -219,11 +219,11 @@ void memory_examine(const struct dbg_lvalue *lvalue, int count, char format)
case 'a':
if (sizeof(DWORD_PTR) == 4)
{
DO_DUMP(DWORD_PTR, 4, " %8.8lx");
DO_DUMP(DWORD_PTR, 4, " %8.8Ix");
}
else
{
DO_DUMP(DWORD_PTR, 2, " %16.16lx");
DO_DUMP(DWORD_PTR, 2, " %16.16Ix");
}
break;
case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); break;

2
programs/winedbg/stack.c
View File

@ -409,7 +409,7 @@ static void backtrace_all(void)
dbg_active_wait_for_first_exception();
}
dbg_printf("\nBacktracing for thread %04x in process %04lx (%s):\n",
dbg_printf("\nBacktracing for thread %04x in process %04Ix (%s):\n",
entry.th32ThreadID, dbg_curr_pid,
dbg_W2A(dbg_curr_process->imageName, -1));
backtrace_tid(dbg_curr_process, entry.th32ThreadID);

8
programs/winedbg/symbol.c
View File

@ -87,10 +87,10 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base,
buffer += l;
lvalue->cookie = DLV_TARGET;
lvalue->addr.Offset = (ULONG64)*pval + sym->Address;
if ((LONG_PTR)sym->Address >= 0)
snprintf(buffer, sz, "+%ld]", (ULONG_PTR)sym->Address);
if ((LONG64)sym->Address >= 0)
snprintf(buffer, sz, "+%I64d]", sym->Address);
else
snprintf(buffer, sz, "-%ld]", -(LONG_PTR)sym->Address);
snprintf(buffer, sz, "-%I64d]", -(LONG64)sym->Address);
}
else if (sym->Flags & SYMFLAG_VALUEPRESENT)
{
@ -779,7 +779,7 @@ static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx)
mi.ModuleName[len - 5] = '\0';
}
dbg_printf("%0*lx: %s!%s", ADDRWIDTH, (ULONG_PTR)sym->Address, mi.ModuleName, sym->Name);
dbg_printf("%0*I64x: %s!%s", ADDRWIDTH, sym->Address, mi.ModuleName, sym->Name);
type.id = sym->TypeIndex;
type.module = sym->ModBase;

4
programs/winedbg/tgt_active.c
View File

@ -536,12 +536,12 @@ static void dbg_resume_debuggee(DWORD cont)
if (dbg_curr_thread)
{
if (!dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context))
dbg_printf("Cannot set ctx on %04lx\n", dbg_curr_tid);
dbg_printf("Cannot set ctx on %04Ix\n", dbg_curr_tid);
}
}
dbg_interactiveP = FALSE;
if (!ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, cont))
dbg_printf("Cannot continue on %04lx (%08x)\n", dbg_curr_tid, cont);
dbg_printf("Cannot continue on %04Ix (%08x)\n", dbg_curr_tid, cont);
}
static void wait_exception(void)

2
programs/winedbg/types.c
View File

@ -571,7 +571,7 @@ static BOOL CALLBACK print_types_cb(PSYMBOL_INFO sym, ULONG size, void* ctx)
struct dbg_type type;
type.module = sym->ModBase;
type.id = sym->TypeIndex;
dbg_printf("Mod: %0*lx ID: %08x\n", ADDRWIDTH, type.module, type.id);
dbg_printf("Mod: %0*Ix ID: %08x\n", ADDRWIDTH, type.module, type.id);
types_print_type(&type, TRUE);
dbg_printf("\n");
return TRUE;

2
programs/winedbg/winedbg.c
View File

@ -571,7 +571,7 @@ void dbg_start_interactive(HANDLE hFile)
if (dbg_curr_process)
{
dbg_printf("WineDbg starting on pid %04lx\n", dbg_curr_pid);
dbg_printf("WineDbg starting on pid %04Ix\n", dbg_curr_pid);
if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception();
}