set correct properties

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

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index d1ee80996768848f9c830361da8b30b38a297991..1b96e364d2864ee611b3e9b2fa51d5c9a4d8b5bd 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -56,7 +56,7 @@ void wxStackFrame::OnGetName()
     wxZeroMemory(symbolBuffer);
 
     PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)symbolBuffer;
     wxZeroMemory(symbolBuffer);
 
     PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)symbolBuffer;

-    pSymbol->SizeOfStruct = sizeof(symbolBuffer);
+    pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);

     pSymbol->MaxNameLen = MAX_NAME_LEN;
 
     DWORD64 symDisplacement = 0;
     pSymbol->MaxNameLen = MAX_NAME_LEN;
 
     DWORD64 symDisplacement = 0;


@@ -128,15 +128,15 @@ wxStackFrame::GetParam(size_t n,
 
 void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 {
 
 void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 {

-    m_paramTypes.Add(_T(""));
+    m_paramTypes.Add(wxEmptyString);

 
     m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
 
     // if symbol information is corrupted and we crash, the exception is going
     // to be ignored when we're called from WalkFromException() because of the
 
     m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
 
     // if symbol information is corrupted and we crash, the exception is going
     // to be ignored when we're called from WalkFromException() because of the

-    // except handler there returning EXCEPTION_CONTINUE_EXECUTION, but we'd be
-    // left in an inconsistent state, so deal with it explicitely here (even if
-    // normally we should never crash, of course...)
+    // exception handler there returning EXCEPTION_CONTINUE_EXECUTION, but we'd
+    // be left in an inconsistent state, so deal with it explicitly here (even
+    // if normally we should never crash, of course...)

 #ifdef _CPPUNWIND
     try
 #else
 #ifdef _CPPUNWIND
     try
 #else


@@ -154,14 +154,14 @@ void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
     __except ( EXCEPTION_EXECUTE_HANDLER )
 #endif
     {
     __except ( EXCEPTION_EXECUTE_HANDLER )
 #endif
     {

-        m_paramValues.Add(_T(""));
+        m_paramValues.Add(wxEmptyString);

     }
 }
 
 BOOL CALLBACK
 EnumSymbolsProc(PSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
 {
     }
 }
 
 BOOL CALLBACK
 EnumSymbolsProc(PSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
 {

-    wxStackFrame *frame = wx_static_cast(wxStackFrame *, data);
+    wxStackFrame *frame = static_cast<wxStackFrame *>(data);

 
     // we're only interested in parameters
     if ( pSymInfo->Flags & IMAGEHLP_SYMBOL_INFO_PARAMETER )
 
     // we're only interested in parameters
     if ( pSymInfo->Flags & IMAGEHLP_SYMBOL_INFO_PARAMETER )


@@ -214,12 +214,16 @@ 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() )
     {

-        wxLogError(_("Failed to get stack backtrace:\n%s"),
+        // don't log a user-visible error message here because the stack trace
+        // is only needed for debugging/diagnostics anyhow and we shouldn't
+        // confuse the user by complaining that we couldn't generate it
+        wxLogDebug(_T("Failed to get stack backtrace: %s"),

                    wxDbgHelpDLL::GetErrorMessage().c_str());
                    wxDbgHelpDLL::GetErrorMessage().c_str());

+        return;

     }
 
     // according to MSDN, the first parameter should be just a unique value and
     }
 
     // according to MSDN, the first parameter should be just a unique value and


@@ -263,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


@@ -289,7 +293,7 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
         if ( nLevel >= skip )
         {
             wxStackFrame frame(nLevel - skip,
         if ( nLevel >= skip )
         {
             wxStackFrame frame(nLevel - skip,

-                               (void *)sf.AddrPC.Offset,
+                               wxUIntToPtr(sf.AddrPC.Offset),

                                sf.AddrFrame.Offset);
 
             OnStackFrame(frame);
                                sf.AddrFrame.Offset);
 
             OnStackFrame(frame);


@@ -306,12 +310,14 @@ 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()
+#if wxUSE_ON_FATAL_EXCEPTION
+
+void wxStackWalker::WalkFromException(size_t maxDepth)

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


@@ -319,16 +325,18 @@ 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)
+#endif // wxUSE_ON_FATAL_EXCEPTION
+
+void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))

 {
     // to get a CONTEXT for the current location, simply force an exception and
     // get EXCEPTION_POINTERS from it
     //
     // note:
 {
     // to get a CONTEXT for the current location, simply force an exception and
     // get EXCEPTION_POINTERS from it
     //
     // note:

-    //  1. we additionally skip RaiseException() and WalkFromException() frames
+    //  1. we additionally skip RaiseException() and WalkFrom() frames

     //  2. explicit cast to EXCEPTION_POINTERS is needed with VC7.1 even if it
     //     shouldn't have been according to the docs
     __try
     //  2. explicit cast to EXCEPTION_POINTERS is needed with VC7.1 even if it
     //     shouldn't have been according to the docs
     __try


@@ -338,13 +346,73 @@ void wxStackWalker::Walk(size_t skip)
     __except( WalkFrom((EXCEPTION_POINTERS *)GetExceptionInformation(),
                        skip + 2), EXCEPTION_CONTINUE_EXECUTION )
     {
     __except( WalkFrom((EXCEPTION_POINTERS *)GetExceptionInformation(),
                        skip + 2), EXCEPTION_CONTINUE_EXECUTION )
     {

-        // never executed because of WalkFromException() return value
+        // never executed because the above expression always evaluates to
+        // EXCEPTION_CONTINUE_EXECUTION

     }
 }
 
 #else // !wxUSE_DBGHELP
 
     }
 }
 
 #else // !wxUSE_DBGHELP
 

-// TODO: implement stubs
+// ============================================================================
+// stubs
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStackFrame
+// ----------------------------------------------------------------------------
+
+void wxStackFrame::OnGetName()
+{
+}
+
+void wxStackFrame::OnGetLocation()
+{
+}
+
+bool
+wxStackFrame::GetParam(size_t WXUNUSED(n),
+                       wxString * WXUNUSED(type),
+                       wxString * WXUNUSED(name),
+                       wxString * WXUNUSED(value)) const
+{
+    return false;
+}
+
+void wxStackFrame::OnParam(_SYMBOL_INFO * WXUNUSED(pSymInfo))
+{
+}
+
+void wxStackFrame::OnGetParam()
+{
+}
+
+// ----------------------------------------------------------------------------
+// wxStackWalker
+// ----------------------------------------------------------------------------
+
+void
+wxStackWalker::WalkFrom(const CONTEXT * WXUNUSED(pCtx),
+                        size_t WXUNUSED(skip),
+                        size_t WXUNUSED(maxDepth))
+{
+}
+
+void
+wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS * WXUNUSED(ep),
+                        size_t WXUNUSED(skip),
+                        size_t WXUNUSED(maxDepth))
+{
+}
+
+#if wxUSE_ON_FATAL_EXCEPTION
+void wxStackWalker::WalkFromException(size_t WXUNUSED(maxDepth))
+{
+}
+#endif // wxUSE_ON_FATAL_EXCEPTION
+
+void wxStackWalker::Walk(size_t WXUNUSED(skip), size_t WXUNUSED(maxDepth))
+{
+}

 
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
 
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP