From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 17 Nov 2015 15:26:24 +0000 (+0100)
Subject: Add x86_64 support to backtrace generator on windows.
X-Git-Tag: dbus-1.11.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90b751c28233856ba6749d2cc12381cdb288942c;p=thirdparty%2Fdbus.git

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>
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 40a8a8c1c..83ab5f9e2 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);
         }