Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxMSW stack walking methods work with Unicode identifiers.

Browse Source 
This allows to show the stack properly for e.g. Japanese programs.

Closes #15138.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-09-15 00:16:34 +00:00
parent 39c0d6d6b6
commit bf9ce7b55e
6 changed files with 520 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/msw/stackwalk.cpp
View File

@@ -2,7 +2,8 @@
// Name: src/msw/stackwalk.cpp
// Purpose: wxStackWalker implementation for Win32
// Author: Vadim Zeitlin
// Modified by: Artur Bac 2010-10-01 AMD64 Port
// Modified by: Artur Bac 2010-10-01 AMD64 Port,
// Suzumizaki-kimitaka 2013-04-09
// Created: 2005-01-08
// Copyright: (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
@@ -51,15 +52,15 @@ void wxStackFrame::OnGetName()
// get the name of the function for this stack frame entry
static const size_t MAX_NAME_LEN = 1024;
BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_NAME_LEN];
BYTE symbolBuffer[sizeof(wxSYMBOL_INFO) + MAX_NAME_LEN*sizeof(TCHAR)];
wxZeroMemory(symbolBuffer);
PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)symbolBuffer;
pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
wxPSYMBOL_INFO pSymbol = (wxPSYMBOL_INFO)symbolBuffer;
pSymbol->SizeOfStruct = sizeof(wxSYMBOL_INFO);
pSymbol->MaxNameLen = MAX_NAME_LEN;
DWORD64 symDisplacement = 0;
if ( !wxDbgHelpDLL::SymFromAddr
if ( !wxDbgHelpDLL::SymFromAddrT
(
::GetCurrentProcess(),
GetSymAddr(),
@@ -67,11 +68,14 @@ void wxStackFrame::OnGetName()
pSymbol
) )
{
wxDbgHelpDLL::LogError(wxT("SymFromAddr"));
wxDbgHelpDLL::LogError(wxT("SymFromAddrT"));
return;
}
m_name = wxString::FromAscii(pSymbol->Name);
#ifdef UNICODE
m_name = pSymbol->Name;
#else
m_name = wxString(pSymbol->Name, wxConvLocal);
#endif
m_offset = symDisplacement;
}
@@ -83,9 +87,9 @@ void wxStackFrame::OnGetLocation()
m_hasLocation = true;
// get the source line for this stack frame entry
IMAGEHLP_LINE lineInfo = { sizeof(IMAGEHLP_LINE) };
wxIMAGEHLP_LINE lineInfo = { sizeof(wxIMAGEHLP_LINE) };
DWORD dwLineDisplacement;
if ( !wxDbgHelpDLL::SymGetLineFromAddr
if ( !wxDbgHelpDLL::SymGetLineFromAddrT
(
::GetCurrentProcess(),
GetSymAddr(),
@@ -95,11 +99,14 @@ void wxStackFrame::OnGetLocation()
{
// it is normal that we don't have source info for some symbols,
// notably all the ones from the system DLLs...
//wxDbgHelpDLL::LogError(wxT("SymGetLineFromAddr"));
//wxDbgHelpDLL::LogError(wxT("SymGetLineFromAddr64"));
return;
}
m_filename = wxString::FromAscii(lineInfo.FileName);
#ifdef UNICODE
m_filename = lineInfo.FileName;
#else
m_filename = wxString(lineInfo.FileName, wxConvLocal);
#endif
m_line = lineInfo.LineNumber;
}
@@ -125,11 +132,15 @@ wxStackFrame::GetParam(size_t n,
return true;
}
void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
void wxStackFrame::OnParam(wxPSYMBOL_INFO pSymInfo)
{
m_paramTypes.Add(wxEmptyString);
m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
#ifdef UNICODE
m_paramNames.Add(pSymInfo->Name);
#else
m_paramNames.Add(wxString(pSymInfo->Name, wxConvLocal));
#endif
// if symbol information is corrupted and we crash, the exception is going
// to be ignored when we're called from WalkFromException() because of the
@@ -158,7 +169,7 @@ void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
}
BOOL CALLBACK
EnumSymbolsProc(PSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
EnumSymbolsProc(wxPSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
{
wxStackFrame *frame = static_cast<wxStackFrame *>(data);
@@ -195,7 +206,7 @@ void wxStackFrame::OnGetParam()
return;
}
if ( !wxDbgHelpDLL::SymEnumSymbols
if ( !wxDbgHelpDLL::SymEnumSymbolsT
(
::GetCurrentProcess(),
NULL, // DLL base: use current context
@@ -204,7 +215,7 @@ void wxStackFrame::OnGetParam()
this // data to pass to it
) )
{
wxDbgHelpDLL::LogError(wxT("SymEnumSymbols"));
wxDbgHelpDLL::LogError(wxT("SymEnumSymbolsT"));
}
}
@@ -232,14 +243,14 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
// below which should be a real handle... so this is what we use
const HANDLE hProcess = ::GetCurrentProcess();
if ( !wxDbgHelpDLL::SymInitialize
if ( !wxDbgHelpDLL::SymInitializeT
(
hProcess,
NULL, // use default symbol search path
TRUE // load symbols for all loaded modules
) )
{
wxDbgHelpDLL::LogError(wxT("SymInitialize"));
wxDbgHelpDLL::LogError(wxT("SymInitializeT"));
return;
}
@@ -382,7 +393,7 @@ wxStackFrame::GetParam(size_t WXUNUSED(n),
return false;
}
void wxStackFrame::OnParam(_SYMBOL_INFO * WXUNUSED(pSymInfo))
void wxStackFrame::OnParam(wxPSYMBOL_INFO WXUNUSED(pSymInfo))
{
}