Ensure there is valid context for DrawRectangle

[wxWidgets.git] / src / msw / stackwalk.cpp

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index 54802e4c247772b7dff71fc8cd075eb3a5470672..9ff630ac763e07eec1ed71793be102634aafeaa7 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/stackwalk.cpp
+// Name:        src/msw/stackwalk.cpp

 // Purpose:     wxStackWalker implementation for Win32
 // Author:      Vadim Zeitlin
 // Purpose:     wxStackWalker implementation for Win32
 // Author:      Vadim Zeitlin

-// Modified by:
+// Modified by: Artur Bac 2010-10-01 AMD64 Port

 // Created:     2005-01-08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     2005-01-08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>


@@ -253,7 +253,16 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
     STACKFRAME sf;
     wxZeroMemory(sf);
 
     STACKFRAME sf;
     wxZeroMemory(sf);
 

-#ifdef _M_IX86
+#if defined(_M_AMD64)
+    sf.AddrPC.Offset       = ctx.Rip;
+    sf.AddrPC.Mode         = AddrModeFlat;
+    sf.AddrStack.Offset    = ctx.Rsp;
+    sf.AddrStack.Mode      = AddrModeFlat;
+    sf.AddrFrame.Offset    = ctx.Rbp;
+    sf.AddrFrame.Mode      = AddrModeFlat;
+
+    dwMachineType = IMAGE_FILE_MACHINE_AMD64;
+#elif  defined(_M_IX86)

     sf.AddrPC.Offset       = ctx.Eip;
     sf.AddrPC.Mode         = AddrModeFlat;
     sf.AddrStack.Offset    = ctx.Esp;
     sf.AddrPC.Offset       = ctx.Eip;
     sf.AddrPC.Mode         = AddrModeFlat;
     sf.AddrStack.Offset    = ctx.Esp;


@@ -300,14 +309,10 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
         }
     }
 
         }
     }
 

-    // this results in crashes inside ntdll.dll when called from
-    // exception handler ...
-#if 0

     if ( !wxDbgHelpDLL::SymCleanup(hProcess) )
     {
         wxDbgHelpDLL::LogError(wxT("SymCleanup"));
     }
     if ( !wxDbgHelpDLL::SymCleanup(hProcess) )
     {
         wxDbgHelpDLL::LogError(wxT("SymCleanup"));
     }

-#endif

 }
 
 void wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip, size_t maxDepth)
 }
 
 void wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip, size_t maxDepth)