Ge van Geldorp : dbghelp: Fix compilation for x86_64.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jun 19 14:28:51 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 5f299d6fe53fc11e8c56d21ba571d36ec16eb4f1
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=5f299d6fe53fc11e8c56d21ba571d36ec16eb4f1

Author: Ge van Geldorp <ge at gse.nl>
Date:   Mon Jun 19 20:03:37 2006 +0200

dbghelp: Fix compilation for x86_64.

---

 dlls/dbghelp/minidump.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index 6572248..e8c0c39 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -166,18 +166,21 @@ #ifdef __i386__
                     mdThd->Stack.StartOfMemoryRange = (ctx->Esp - 4);
                 else
                     mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit;
-                mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase - 
-                    mdThd->Stack.StartOfMemoryRange;
 #elif defined(__powerpc__)
                 if (ctx->Iar)
                     mdThd->Stack.StartOfMemoryRange = ctx->Iar - 4;
                 else
                     mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit;
-                mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase - 
-                    mdThd->Stack.StartOfMemoryRange;
+#elif defined(__x86_64__)
+                if (ctx->Rsp)
+                    mdThd->Stack.StartOfMemoryRange = (ctx->Rsp - 8);
+                else
+                    mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit;
 #else
-#error unsupported CPU                            
+#error unsupported CPU
 #endif
+                mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase -
+                    mdThd->Stack.StartOfMemoryRange;
             }
             ResumeThread(hThread);
         }




More information about the wine-cvs mailing list