summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2015-11-17 16:26:24 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2015-11-24 13:40:33 +0100
commit90b751c28233856ba6749d2cc12381cdb288942c (patch)
treeb5d9306ddee0dcc821d05a0921f9e6bf01ef5ff0
parent8a29ea406db9b5060cf1b5cc245f8b9a4a694691 (diff)
Add x86_64 support to backtrace generator on windows.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--dbus/dbus-sysdeps-win.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 40a8a8c1..83ab5f9e 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2493,17 +2493,18 @@ static void dump_backtrace_for_thread (HANDLE hThread)
{
char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(char)];
PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
- DWORD dwDisplacement;
+ DWORD64 displacement;
IMAGEHLP_LINE line;
+ DWORD dwDisplacement;
IMAGEHLP_MODULE moduleInfo;
pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
pSymbol->MaxNameLen = MAX_SYM_NAME;
- if (SymFromAddr (GetCurrentProcess (), sf.AddrPC.Offset, &dwDisplacement, pSymbol))
+ if (SymFromAddr (GetCurrentProcess (), sf.AddrPC.Offset, &displacement, pSymbol))
{
- if (dwDisplacement)
- DPRINTF ("%3d %s+0x%lx", i++, pSymbol->Name, dwDisplacement);
+ if (displacement)
+ DPRINTF ("%3d %s+0x%I64x", i++, pSymbol->Name, displacement);
else
DPRINTF ("%3d %s", i++, pSymbol->Name);
}