added maxDepth parameter to WalkFromException() (patch 1759239)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/stackwalker.tex b/docs/latex/wx/stackwalker.tex
index 562e80eb760a9996c729fa8dc4b182e1a8eac54b..efce907157394f2e35bf9b2e2f1a5d1f9fe1df6a 100644 (file)
--- a/docs/latex/wx/stackwalker.tex
+++ b/docs/latex/wx/stackwalker.tex
@@ -94,9 +94,11 @@ Up to \arg{maxDepth} frames are walked from the innermost to the outermost one.
 
 \membersection{wxStackWalker::WalkFromException}\label{wxstackwalkerwalkfromexception}
 
 
 \membersection{wxStackWalker::WalkFromException}\label{wxstackwalkerwalkfromexception}
 

-\func{void}{WalkFromException}{\void}
+\func{void}{WalkFromException}{\param{size\_t }{maxDepth = 200}}

 
 Enumerate stack frames from the location of uncaught exception.
 This method can only be called from
 \helpref{wxApp::OnFatalException()}{wxapponfatalexception}.
 
 
 Enumerate stack frames from the location of uncaught exception.
 This method can only be called from
 \helpref{wxApp::OnFatalException()}{wxapponfatalexception}.
 

+Up to \arg{maxDepth} frames are walked from the innermost to the outermost one.
+

diff --git a/include/wx/msw/stackwalk.h b/include/wx/msw/stackwalk.h
index 2d99a132b6df98d6c995388b011c7e3e3242dd59..a5f7e322acd5f165984ad3dc689a2fa0dfed0472 100644 (file)
--- a/include/wx/msw/stackwalk.h
+++ b/include/wx/msw/stackwalk.h
@@ -91,12 +91,12 @@ public:
     wxStackWalker(const char * WXUNUSED(argv0) = NULL) { }
 
     virtual void Walk(size_t skip = 1, size_t maxDepth = 200);
     wxStackWalker(const char * WXUNUSED(argv0) = NULL) { }
 
     virtual void Walk(size_t skip = 1, size_t maxDepth = 200);

-    virtual void WalkFromException();
+    virtual void WalkFromException(size_t maxDepth = 200);

 
 
     // enumerate stack frames from the given context
 
 
     // enumerate stack frames from the given context

-    void WalkFrom(const _CONTEXT *ctx, size_t skip = 1);
-    void WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip = 1);
+    void WalkFrom(const _CONTEXT *ctx, size_t skip = 1, size_t maxDepth = 200);
+    void WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip = 1, size_t maxDepth = 200);

 };
 
 #endif // _WX_MSW_STACKWALK_H_
 };
 
 #endif // _WX_MSW_STACKWALK_H_

diff --git a/include/wx/stackwalk.h b/include/wx/stackwalk.h
index 144dbd8e6d2288fa6c47d511cdf3196b90f9fb74..8bb237149834bad5a35f44ca1f612c55dc7f6b8b 100644 (file)
--- a/include/wx/stackwalk.h
+++ b/include/wx/stackwalk.h
@@ -135,7 +135,7 @@ public:
     // enumerate stack frames from the location of uncaught exception
     //
     // this version can only be called from wxApp::OnFatalException()
     // enumerate stack frames from the location of uncaught exception
     //
     // this version can only be called from wxApp::OnFatalException()

-    virtual void WalkFromException() = 0;
+    virtual void WalkFromException(size_t maxDepth = 200) = 0;

 
 protected:
     // this function must be overrided to process the given frame
 
 protected:
     // this function must be overrided to process the given frame

diff --git a/include/wx/unix/stackwalk.h b/include/wx/unix/stackwalk.h
index f58e17db981dba3428ed2493ac803be9b5b2ef80..96dc1ed7021b9fe0c5cccc01a38abf6292da4629 100644 (file)
--- a/include/wx/unix/stackwalk.h
+++ b/include/wx/unix/stackwalk.h
@@ -74,7 +74,7 @@ public:
     }
 
     virtual void Walk(size_t skip = 1, size_t maxDepth = 200);
     }
 
     virtual void Walk(size_t skip = 1, size_t maxDepth = 200);

-    virtual void WalkFromException() { Walk(2); }
+    virtual void WalkFromException(size_t maxDepth = 200) { Walk(2, maxDepth); }

 
     static const wxString& GetExePath() { return ms_exepath; }
 
 
     static const wxString& GetExePath() { return ms_exepath; }
 

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index d0f9e597499cea648d929b0d3305aee10d883656..669e7888172874d5f702a3c58e26e02e51d215cc 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -214,7 +214,7 @@ void wxStackFrame::OnGetParam()
 // wxStackWalker
 // ----------------------------------------------------------------------------
 
 // wxStackWalker
 // ----------------------------------------------------------------------------
 

-void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
+void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)

 {
     if ( !wxDbgHelpDLL::Init() )
     {
 {
     if ( !wxDbgHelpDLL::Init() )
     {


@@ -267,7 +267,7 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
 #endif // _M_IX86
 
     // iterate over all stack frames
 #endif // _M_IX86
 
     // iterate over all stack frames

-    for ( size_t nLevel = 0; ; nLevel++ )
+    for ( size_t nLevel = 0; nLevel < maxDepth; nLevel++ )

     {
         // get the next stack frame
         if ( !wxDbgHelpDLL::StackWalk
     {
         // get the next stack frame
         if ( !wxDbgHelpDLL::StackWalk


@@ -310,12 +310,12 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
 #endif
 }
 
 #endif
 }
 

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

 {
 {

-    WalkFrom(ep->ContextRecord, skip);
+    WalkFrom(ep->ContextRecord, skip, maxDepth);

 }
 
 }
 

-void wxStackWalker::WalkFromException()
+void wxStackWalker::WalkFromException(size_t maxDepth)

 {
     extern EXCEPTION_POINTERS *wxGlobalSEInformation;
 
 {
     extern EXCEPTION_POINTERS *wxGlobalSEInformation;
 


@@ -323,7 +323,7 @@ void wxStackWalker::WalkFromException()
                  _T("wxStackWalker::WalkFromException() can only be called from wxApp::OnFatalException()") );
 
     // don't skip any frames, the first one is where we crashed
                  _T("wxStackWalker::WalkFromException() can only be called from wxApp::OnFatalException()") );
 
     // don't skip any frames, the first one is where we crashed

-    WalkFrom(wxGlobalSEInformation, 0);
+    WalkFrom(wxGlobalSEInformation, 0, maxDepth);

 }
 
 void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))
 }
 
 void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))


@@ -396,7 +396,7 @@ wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS * WXUNUSED(ep),
 {
 }
 
 {
 }
 

-void wxStackWalker::WalkFromException()
+void wxStackWalker::WalkFromException(size_t WXUNUSED(maxDepth))

 {
 }
 
 {
 }