[PATCH] [DbgHelp]: get rid of long int issues in 64bit platforms
Eric Pouech
eric.pouech at wanadoo.fr
Wed Nov 29 15:04:27 CST 2006
A+
---
dlls/dbghelp/Makefile.in | 1 -
dlls/dbghelp/coff.c | 6 +++---
dlls/dbghelp/dbghelp.c | 6 +++---
dlls/dbghelp/dwarf.c | 2 +-
dlls/dbghelp/elf_module.c | 4 ++--
dlls/dbghelp/image.c | 2 +-
dlls/dbghelp/memory.c | 2 +-
dlls/dbghelp/minidump.c | 8 ++++----
dlls/dbghelp/module.c | 6 +++---
dlls/dbghelp/msc.c | 20 ++++++++++----------
dlls/dbghelp/path.c | 8 ++++----
dlls/dbghelp/pe_module.c | 2 +-
dlls/dbghelp/stack.c | 46 +++++++++++++++++++++++++--------------------
dlls/dbghelp/symbol.c | 16 ++++++++--------
14 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index 24bf8b3..280e199 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = dbghelp.dll
IMPORTLIB = libdbghelp.$(IMPLIBEXT)
IMPORTS = psapi kernel32 ntdll
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
coff.c \
diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c
index 9bdf0bf..720c5e6 100644
--- a/dlls/dbghelp/coff.c
+++ b/dlls/dbghelp/coff.c
@@ -223,12 +223,12 @@ BOOL coff_process_info(const struct msc_
fn = source_get(msc_dbg->module,
coff_files.files[curr_file_idx].compiland->source);
- TRACE("Duplicating sect from %s: %lx %x %x %d %d\n",
+ TRACE("Duplicating sect from %s: %x %x %x %d %d\n",
fn, aux->Section.Length,
aux->Section.NumberOfRelocations,
aux->Section.NumberOfLinenumbers,
aux->Section.Number, aux->Section.Selection);
- TRACE("More sect %d %s %08lx %d %d %d\n",
+ TRACE("More sect %d %s %08x %d %d %d\n",
coff_sym->SectionNumber,
coff_get_name(coff_sym, coff_strtab),
coff_sym->Value, coff_sym->Type,
@@ -242,7 +242,7 @@ BOOL coff_process_info(const struct msc_
}
else
{
- TRACE("New text sect from %s: %lx %x %x %d %d\n",
+ TRACE("New text sect from %s: %x %x %x %d %d\n",
source_get(msc_dbg->module, coff_files.files[curr_file_idx].compiland->source),
aux->Section.Length,
aux->Section.NumberOfRelocations,
diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c
index 6c5cd60..c95a7e1 100644
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -485,7 +485,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE
case CBA_EVENT:
case CBA_READ_MEMORY:
default:
- FIXME("No mapping for action %lu\n", action);
+ FIXME("No mapping for action %u\n", action);
return FALSE;
}
return cb32(hProcess, action, (PVOID)data32, (PVOID)user32);
@@ -496,7 +496,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE
*/
BOOL pcs_callback(const struct process* pcs, ULONG action, void* data)
{
- TRACE("%p %lu %p\n", pcs, action, data);
+ TRACE("%p %u %p\n", pcs, action, data);
if (!pcs->reg_cb) return FALSE;
if (pcs->reg_is_unicode)
@@ -529,7 +529,7 @@ BOOL pcs_callback(const struct process*
case CBA_EVENT:
case CBA_READ_MEMORY:
default:
- FIXME("No mapping for action %lu\n", action);
+ FIXME("No mapping for action %u\n", action);
return FALSE;
}
}
diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index cd66c0e..876d310 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -749,7 +749,7 @@ compute_location(dwarf2_traverse_context
if (!ReadProcessMemory(hproc, (void*)addr, &deref, sizeof(deref), NULL))
{
- WARN("Couldn't read memory at %lx\n", addr);
+ WARN("Couldn't read memory at %x\n", addr);
return loc_err_cant_read;
}
stack[++stk] = deref;
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index f67ee44..75abc8a 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -612,7 +612,7 @@ static int elf_new_wine_thunks(struct mo
*/
if ((xsize || ste->symp->st_size) &&
(kind == (ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal))
- FIXME("Duplicate in %s: %s<%08lx-%08x> %s<%s-%s>\n",
+ FIXME("Duplicate in %s: %s<%08x-%08x> %s<%s-%s>\n",
module->module.ModuleName,
ste->ht_elt.name, addr, ste->symp->st_size,
module->addr_sorttab[idx]->hash_elt.name,
@@ -810,7 +810,7 @@ static BOOL elf_load_debug_info_from_map
if (fmap->with_crc && (fmap->crc != calc_crc32(fmap)))
{
- ERR("Bad CRC for module %s (got %08lx while expecting %08lx)\n",
+ ERR("Bad CRC for module %s (got %08x while expecting %08lx)\n",
module->module.ImageName, calc_crc32(fmap), fmap->crc);
/* we don't tolerate mis-matched files */
return FALSE;
diff --git a/dlls/dbghelp/image.c b/dlls/dbghelp/image.c
index 7184004..f35bb7e 100644
--- a/dlls/dbghelp/image.c
+++ b/dlls/dbghelp/image.c
@@ -45,7 +45,7 @@ DWORD WINAPI GetTimestampForLoadedLibrar
PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE FileHandle, LPSTR FileName,
LPSTR SymbolPath, DWORD ImageBase)
{
- FIXME("(%p, %s, %s, 0x%08lx): stub\n", FileHandle, FileName, SymbolPath, ImageBase);
+ FIXME("(%p, %s, %s, 0x%08x): stub\n", FileHandle, FileName, SymbolPath, ImageBase);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
diff --git a/dlls/dbghelp/memory.c b/dlls/dbghelp/memory.c
index cce7405..6f64016 100644
--- a/dlls/dbghelp/memory.c
+++ b/dlls/dbghelp/memory.c
@@ -55,7 +55,7 @@ DWORD WINAPI addr_to_linear(HANDLE hProc
FIXME("Unsupported (yet) mode (%x)\n", addr->Mode);
return 0;
}
- FIXME("Failed to linearize address %04x:%08lx (mode %x)\n",
+ FIXME("Failed to linearize address %04x:%08x (mode %x)\n",
addr->Segment, addr->Offset, addr->Mode);
return 0;
}
diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index e8c0c39..d8dcce8 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -140,7 +140,7 @@ static BOOL fetch_thread_info(struct dum
if ((hThread = OpenThread(THREAD_ALL_ACCESS, FALSE, tid)) == NULL)
{
- FIXME("Couldn't open thread %lu (%lu)\n",
+ FIXME("Couldn't open thread %u (%u)\n",
dc->spi->ti[thd_idx].dwThreadID, GetLastError());
return FALSE;
}
@@ -247,16 +247,16 @@ static BOOL fetch_elf_module_info_cb(con
void* user)
{
struct dump_context* dc = (struct dump_context*)user;
- DWORD size, checksum;
+ DWORD rbase, size, checksum;
/* FIXME: there's no relevant timestamp on ELF modules */
/* NB: if we have a non-null base from the live-target use it (whenever
* the ELF module is relocatable or not). If we have a null base (ELF
* module isn't relocatable) then grab its base address from ELF file
*/
- if (!elf_fetch_file_info(name, base ? NULL : &base, &size, &checksum))
+ if (!elf_fetch_file_info(name, &rbase, &size, &checksum))
size = checksum = 0;
- add_module(dc, name, base, size, 0 /* FIXME */, checksum, TRUE);
+ add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE);
return TRUE;
}
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 25baec1..059c047 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -393,7 +393,7 @@ DWORD WINAPI SymLoadModule(HANDLE hProce
struct process* pcs;
struct module* module = NULL;
- TRACE("(%p %p %s %s %08lx %08lx)\n",
+ TRACE("(%p %p %s %s %08x %08x)\n",
hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName),
BaseOfDll, SizeOfDll);
@@ -448,7 +448,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h
PCSTR ModuleName, DWORD64 BaseOfDll, DWORD DllSize,
PMODLOAD_DATA Data, DWORD Flags)
{
- TRACE("(%p %p %s %s %s %08lx %p %08lx)\n",
+ TRACE("(%p %p %s %s %s %08x %p %08x)\n",
hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName),
wine_dbgstr_longlong(BaseOfDll), DllSize, Data, Flags);
@@ -471,7 +471,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h
return TRUE;
}
if (Flags & ~(SLMFLAG_VIRTUAL))
- FIXME("Unsupported Flags %08lx for %s\n", Flags, ImageName);
+ FIXME("Unsupported Flags %08x for %s\n", Flags, ImageName);
return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, DllSize);
}
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 8ec270e..0859fae 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -1734,7 +1734,7 @@ static void* pdb_read_ds_file(const stru
if (toc->file_size[file_nr] == 0 || toc->file_size[file_nr] == 0xFFFFFFFF)
{
- FIXME(">>> requesting NULL stream (%lu)\n", file_nr);
+ FIXME(">>> requesting NULL stream (%u)\n", file_nr);
return NULL;
}
block_list = &toc->file_size[toc->num_files];
@@ -1931,7 +1931,7 @@ static void pdb_process_types(const stru
case 19990903:
break;
default:
- ERR("-Unknown type info version %ld\n", types.version);
+ ERR("-Unknown type info version %d\n", types.version);
}
ctp.module = msc_dbg->module;
@@ -1995,7 +1995,7 @@ static BOOL pdb_init(struct pdb_lookup*
case 19970604: /* VC 6.0 */
break;
default:
- ERR("-Unknown root block version %ld\n", root->Version);
+ ERR("-Unknown root block version %d\n", root->Version);
}
if (do_fill)
{
@@ -2007,7 +2007,7 @@ static BOOL pdb_init(struct pdb_lookup*
pdb_lookup->u.jg.timestamp != root->TimeDateStamp ||
pdb_lookup->age != root->Age)
ret = FALSE;
- TRACE("found JG/%c for %s: age=%lx timestamp=%lx\n",
+ TRACE("found JG/%c for %s: age=%x timestamp=%x\n",
do_fill ? 'f' : '-', pdb_lookup->filename, root->Age,
root->TimeDateStamp);
pdb_free(root);
@@ -2032,7 +2032,7 @@ static BOOL pdb_init(struct pdb_lookup*
case 20000404:
break;
default:
- ERR("-Unknown root block version %ld\n", root->Version);
+ ERR("-Unknown root block version %d\n", root->Version);
}
if (do_fill)
{
@@ -2044,7 +2044,7 @@ static BOOL pdb_init(struct pdb_lookup*
memcmp(&pdb_lookup->u.ds.guid, &root->guid, sizeof(GUID)) ||
pdb_lookup->age != root->Age)
ret = FALSE;
- TRACE("found DS/%c for %s: age=%lx guid=%s\n",
+ TRACE("found DS/%c for %s: age=%x guid=%s\n",
do_fill ? 'f' : '-', pdb_lookup->filename, root->Age,
debugstr_guid(&root->guid));
pdb_free(root);
@@ -2117,7 +2117,7 @@ static void pdb_process_symbol_imports(c
imp_pdb_lookup.kind = PDB_JG;
imp_pdb_lookup.u.jg.timestamp = imp->TimeDateStamp;
imp_pdb_lookup.age = imp->Age;
- TRACE("got for %s: age=%lu ts=%lx\n",
+ TRACE("got for %s: age=%u ts=%x\n",
imp->filename, imp->Age, imp->TimeDateStamp);
pdb_process_internal(pcs, msc_dbg, &imp_pdb_lookup, i);
}
@@ -2170,7 +2170,7 @@ static BOOL pdb_process_internal(const s
case 19990903:
break;
default:
- ERR("-Unknown symbol info version %ld %08lx\n",
+ ERR("-Unknown symbol info version %d %08x\n",
symbols.version, symbols.version);
}
@@ -2410,7 +2410,7 @@ static BOOL codeview_process_info(const
{
const CODEVIEW_HEADER_RSDS* rsds = (const CODEVIEW_HEADER_RSDS*)msc_dbg->root;
- TRACE("Got RSDS type of PDB file: guid=%s unk=%08lx name=%s\n",
+ TRACE("Got RSDS type of PDB file: guid=%s unk=%08x name=%s\n",
wine_dbgstr_guid(&rsds->guid), rsds->unknown, rsds->name);
pdb_lookup.filename = rsds->name;
pdb_lookup.kind = PDB_DS;
@@ -2421,7 +2421,7 @@ static BOOL codeview_process_info(const
break;
}
default:
- ERR("Unknown CODEVIEW signature %08lX in module %s\n",
+ ERR("Unknown CODEVIEW signature %08X in module %s\n",
cv->dwSignature, msc_dbg->module->module.ModuleName);
break;
}
diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c
index 59e87de..fc080e9 100644
--- a/dlls/dbghelp/path.c
+++ b/dlls/dbghelp/path.c
@@ -270,7 +270,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf
{
if (checksum != (DWORD_PTR)s->id)
{
- WARN("Found %s, but wrong checksums: %08lx %08lx\n",
+ WARN("Found %s, but wrong checksums: %08x %08lx\n",
buffer, checksum, (DWORD_PTR)s->id);
return FALSE;
}
@@ -298,7 +298,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf
}
if (pdb_lookup.u.jg.timestamp != (DWORD_PTR)s->id)
{
- WARN("Found %s, but wrong signature: %08lx %08lx\n",
+ WARN("Found %s, but wrong signature: %08x %08lx\n",
buffer, pdb_lookup.u.jg.timestamp, (DWORD_PTR)s->id);
return FALSE;
}
@@ -320,7 +320,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf
}
if (pdb_lookup.age != s->two)
{
- WARN("Found %s, but wrong age: %08lx %08lx\n",
+ WARN("Found %s, but wrong age: %08x %08x\n",
buffer, pdb_lookup.age, s->two);
return FALSE;
}
@@ -353,7 +353,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr
const char* filename;
const char* searchPath = inSearchPath;
- TRACE("(%p %s %s %p %08lx %08lx %08lx %p %p %p)\n",
+ TRACE("(%p %s %s %p %08x %08x %08x %p %p %p)\n",
hProcess, searchPath, full_path, id, two, three, flags,
buffer, cb, user);
diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index 13857b8..684001e 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -266,7 +266,7 @@ #endif
for (j = 0; j < exports->NumberOfNames; j++)
if ((ordinals[j] == i) && names[j]) break;
if (j < exports->NumberOfNames) continue;
- snprintf(buffer, sizeof(buffer), "%ld", i + exports->Base);
+ snprintf(buffer, sizeof(buffer), "%d", i + exports->Base);
symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1,
TRUE /* FIXME */, TRUE /* FIXME */);
}
diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c
index 6405d66..31a01ec 100644
--- a/dlls/dbghelp/stack.c
+++ b/dlls/dbghelp/stack.c
@@ -45,13 +45,13 @@ static const char* wine_dbgstr_addr(cons
switch (addr->Mode)
{
case AddrModeFlat:
- return wine_dbg_sprintf("flat<%08lx>", addr->Offset);
+ return wine_dbg_sprintf("flat<%08x>", addr->Offset);
case AddrMode1616:
- return wine_dbg_sprintf("1616<%04x:%04lx>", addr->Segment, addr->Offset);
+ return wine_dbg_sprintf("1616<%04x:%04x>", addr->Segment, addr->Offset);
case AddrMode1632:
- return wine_dbg_sprintf("1632<%04x:%08lx>", addr->Segment, addr->Offset);
+ return wine_dbg_sprintf("1632<%04x:%08x>", addr->Segment, addr->Offset);
case AddrModeReal:
- return wine_dbg_sprintf("real<%04x:%04lx>", addr->Segment, addr->Offset);
+ return wine_dbg_sprintf("real<%04x:%04x>", addr->Segment, addr->Offset);
default:
return "unknown";
}
@@ -60,13 +60,19 @@ static const char* wine_dbgstr_addr(cons
static BOOL CALLBACK read_mem(HANDLE hProcess, DWORD addr, void* buffer,
DWORD size, LPDWORD nread)
{
- return ReadProcessMemory(hProcess, (void*)addr, buffer, size, nread);
+ SIZE_T r;
+ if (!ReadProcessMemory(hProcess, (void*)addr, buffer, size, &r)) return FALSE;
+ *nread = r;
+ return TRUE;
}
static BOOL CALLBACK read_mem64(HANDLE hProcess, DWORD64 addr, void* buffer,
DWORD size, LPDWORD nread)
{
- return ReadProcessMemory(hProcess, (void*)(DWORD_PTR)addr, buffer, size, nread);
+ SIZE_T r;
+ return ReadProcessMemory(hProcess, (void*)(DWORD_PTR)addr, buffer, size, &r);
+ *nread = r;
+ return TRUE;
}
/* indexes in Reserved array */
@@ -167,7 +173,7 @@ static BOOL stack_walk(struct stack_walk
/* sanity check */
if (curr_mode >= stm_done) return FALSE;
- TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%08lx nSwitch=%08lx\n",
+ TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%08x nSwitch=%08x\n",
wine_dbgstr_addr(&frame->AddrPC),
wine_dbgstr_addr(&frame->AddrFrame),
wine_dbgstr_addr(&frame->AddrReturn),
@@ -206,7 +212,7 @@ static BOOL stack_walk(struct stack_walk
{
if (!sw_read_mem(cb, next_switch, &frame32, sizeof(frame32)))
{
- WARN("Bad stack frame 0x%08lx\n", next_switch);
+ WARN("Bad stack frame 0x%08x\n", next_switch);
goto done_err;
}
curr_switch = (DWORD)frame32.frame16;
@@ -224,7 +230,7 @@ static BOOL stack_walk(struct stack_walk
p = sw_xlat_addr(cb, &tmp);
if (!sw_read_mem(cb, p, &frame16, sizeof(frame16)))
{
- WARN("Bad stack frame 0x%08lx\n", p);
+ WARN("Bad stack frame 0x%08x\n", p);
goto done_err;
}
curr_switch = (DWORD)frame16.frame32;
@@ -266,7 +272,7 @@ static BOOL stack_walk(struct stack_walk
{
if (!sw_read_mem(cb, next_switch, &frame32, sizeof(frame32)))
{
- WARN("Bad stack frame 0x%08lx\n", next_switch);
+ WARN("Bad stack frame 0x%08x\n", next_switch);
goto done_err;
}
@@ -290,7 +296,7 @@ static BOOL stack_walk(struct stack_walk
if (!sw_read_mem(cb, p, &frame16, sizeof(frame16)))
{
- WARN("Bad stack frame 0x%08lx\n", p);
+ WARN("Bad stack frame 0x%08x\n", p);
goto done_err;
}
curr_switch = (DWORD)frame16.frame32;
@@ -307,16 +313,16 @@ static BOOL stack_walk(struct stack_walk
if (!sw_read_mem(cb, p, &frame16, sizeof(frame16)))
{
- WARN("Bad stack frame 0x%08lx\n", p);
+ WARN("Bad stack frame 0x%08x\n", p);
goto done_err;
}
TRACE("Got a 16 bit stack switch:"
"\n\tframe32: %08lx"
- "\n\tedx:%08lx ecx:%08lx ebp:%08lx"
+ "\n\tedx:%08x ecx:%08x ebp:%08x"
"\n\tds:%04x es:%04x fs:%04x gs:%04x"
- "\n\tcall_from_ip:%08lx module_cs:%04lx relay=%08lx"
- "\n\tentry_ip:%04x entry_point:%08lx"
+ "\n\tcall_from_ip:%08x module_cs:%04x relay=%08x"
+ "\n\tentry_ip:%04x entry_point:%08x"
"\n\tbp:%04x ip:%04x cs:%04x\n",
(unsigned long)frame16.frame32,
frame16.edx, frame16.ecx, frame16.ebp,
@@ -343,7 +349,7 @@ static BOOL stack_walk(struct stack_walk
next_switch = curr_switch;
if (!sw_read_mem(cb, next_switch, &frame32, sizeof(frame32)))
{
- WARN("Bad stack frame 0x%08lx\n", next_switch);
+ WARN("Bad stack frame 0x%08x\n", next_switch);
goto done_err;
}
curr_switch = (DWORD)frame32.frame16;
@@ -427,7 +433,7 @@ static BOOL stack_walk(struct stack_walk
if (!sw_read_mem(cb, frame->AddrFrame.Offset + sizeof(DWORD),
&frame->AddrReturn.Offset, sizeof(DWORD)))
{
- WARN("Cannot read new frame offset %08lx\n", frame->AddrFrame.Offset + sizeof(DWORD));
+ WARN("Cannot read new frame offset %08x\n", frame->AddrFrame.Offset + sizeof(DWORD));
goto done_err;
}
sw_read_mem(cb, frame->AddrFrame.Offset + 2 * sizeof(DWORD),
@@ -442,7 +448,7 @@ static BOOL stack_walk(struct stack_walk
else
frame->FuncTableEntry = NULL;
- TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%08lx nSwitch=%08lx FuncTable=%p\n",
+ TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%08x nSwitch=%08x FuncTable=%p\n",
wine_dbgstr_addr(&frame->AddrPC),
wine_dbgstr_addr(&frame->AddrFrame),
wine_dbgstr_addr(&frame->AddrReturn),
@@ -468,7 +474,7 @@ BOOL WINAPI StackWalk(DWORD MachineType,
{
struct stack_walk_callback swcb;
- TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p)\n",
+ TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p)\n",
MachineType, hProcess, hThread, frame, ctx,
f_read_mem, FunctionTableAccessRoutine,
GetModuleBaseRoutine, f_xlat_adr);
@@ -506,7 +512,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp
STACKFRAME frame32;
BOOL ret;
- TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p)\n",
+ TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p)\n",
MachineType, hProcess, hThread, frame64, ctx,
f_read_mem, FunctionTableAccessRoutine,
GetModuleBaseRoutine, f_xlat_adr);
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 0f62889..2eacc60 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -563,7 +563,7 @@ static void symt_fill_sym_info(const str
sym_info->Name[sym_info->NameLen] = '\0';
}
}
- TRACE_(dbghelp_symt)("%p => %s %lu %s\n",
+ TRACE_(dbghelp_symt)("%p => %s %u %s\n",
sym, sym_info->Name, sym_info->Size,
wine_dbgstr_longlong(sym_info->Address));
}
@@ -1254,7 +1254,7 @@ BOOL WINAPI SymGetLineFromAddr(HANDLE hP
struct module_pair pair;
int idx;
- TRACE("%p %08lx %p %p\n", hProcess, dwAddr, pdwDisplacement, Line);
+ TRACE("%p %08x %p %p\n", hProcess, dwAddr, pdwDisplacement, Line);
if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
@@ -1479,7 +1479,7 @@ BOOL WINAPI SymGetLineNext64(HANDLE hPro
*/
PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase)
{
- WARN("(%p, 0x%08lx): stub\n", hProcess, AddrBase);
+ WARN("(%p, 0x%08x): stub\n", hProcess, AddrBase);
return NULL;
}
@@ -1497,7 +1497,7 @@ PVOID WINAPI SymFunctionTableAccess64(HA
*/
BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength)
{
- TRACE("(%p %s %lu)\n", sym, UnDecName, UnDecNameLength);
+ TRACE("(%p %s %u)\n", sym, UnDecName, UnDecNameLength);
return UnDecorateSymbolName(sym->Name, UnDecName, UnDecNameLength,
UNDNAME_COMPLETE) != 0;
}
@@ -1515,7 +1515,7 @@ DWORD WINAPI UnDecorateSymbolName(LPCSTR
static char* (*p_undname)(char*, const char*, int, void* (*)(size_t), void (*)(void*), unsigned short);
static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0};
- TRACE("(%s, %p, %ld, 0x%08lx)\n",
+ TRACE("(%s, %p, %d, 0x%08x)\n",
debugstr_a(DecoratedName), UnDecoratedName, UndecoratedLength, Flags);
if (!p_undname)
@@ -1559,14 +1559,14 @@ BOOL WINAPI SymSearch(HANDLE hProcess, U
{
struct sym_enum se;
- TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n",
+ TRACE("(%p %s %u %u %s %s %p %p %x)\n",
hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, Mask,
wine_dbgstr_longlong(Address), EnumSymbolsCallback,
UserContext, Options);
if (Options != SYMSEARCH_GLOBALSONLY)
{
- FIXME("Unsupported searching with options (%lx)\n", Options);
+ FIXME("Unsupported searching with options (%x)\n", Options);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
@@ -1593,7 +1593,7 @@ BOOL WINAPI SymSearchW(HANDLE hProcess,
BOOL ret = FALSE;
char* maskA = NULL;
- TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n",
+ TRACE("(%p %s %u %u %s %s %p %p %x)\n",
hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, debugstr_w(Mask),
wine_dbgstr_longlong(Address), EnumSymbolsCallback,
UserContext, Options);
More information about the wine-patches
mailing list