zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-21 04:13:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[0.2.x] ~restored manual pure-c name undecaration

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@83486 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\EreTIk_cp 2013-04-26 10:33:12 +00:00 committed by Mikhail I. Izmestev
parent 3d7f299028
commit 7a6e212dd4
2 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pykd/dia/diasymbol.cpp
View File

@ -201,7 +201,8 @@ SymbolPtr DiaSymbol::getChildByName(const std::string &name )
return SymbolPtr( new DiaSymbol(publicSymbol, m_machineType) ); return SymbolPtr( new DiaSymbol(publicSymbol, m_machineType) );
} }
/* c++ c++ decoration is not supported // FIXME: c++ decoration is not supported
// _èìÿ // _èìÿ
std::string underscoreName; std::string underscoreName;
underscoreName += '_'; underscoreName += '_';
@ -261,7 +262,7 @@ SymbolPtr DiaSymbol::getChildByName(const std::string &name )
return SymbolPtr( new DiaSymbol(child, m_machineType) ); return SymbolPtr( new DiaSymbol(child, m_machineType) );
} }
*/
throw DiaException(name + " is not found"); throw DiaException(name + " is not found");
} }
@ -330,55 +331,43 @@ ULONG DiaSymbol::getLocType()
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
static const boost::regex stdcallMatch("^_(\\w+)(@\\d+)?$");
static const boost::regex fastcallMatch("^@(\\w+)(@\\d+)?$");
//////////////////////////////////////////////////////////////////////////////
std::string DiaSymbol::getName() std::string DiaSymbol::getName()
{ {
HRESULT hres; std::string name = autoBstr( callSymbol(get_name) ).asStr();
BSTR bstrName = NULL;
hres = m_symbol->get_undecoratedNameEx( UNDNAME_NAME_ONLY, &bstrName);
if (S_OK == hres)
{
std::string name = autoBstr( bstrName ).asStr();
if (!name.empty())
return name;
}
/* c++ decoration is not supported
static const boost::regex stdcallMatch("^_(\\w+)(@\\d+)?$");
static const boost::regex fastcallMatch("^@(\\w+)(@\\d+)?$");
ULONG symTag; ULONG symTag;
hres = m_symbol->get_symTag( &symTag ); HRESULT hres = m_symbol->get_symTag( &symTag );
if ( FAILED( hres ) ) if ( FAILED( hres ) )
throw DiaException("Call IDiaSymbol::get_symTag", hres); throw DiaException("Call IDiaSymbol::get_symTag", hres);
if( symTag == SymTagData || symTag == SymTagFunction || symTag == SymTagPublicSymbol ) if ( symTag != SymTagData && symTag != SymTagFunction && symTag != SymTagPublicSymbol )
return name;
std::string undecoratedName;
{ {
hres = m_symbol->get_undecoratedNameEx( UNDNAME_NAME_ONLY, &bstrName); BSTR bstrUndecoratedName = NULL;
if ( FAILED( hres ) ) hres = m_symbol->get_undecoratedNameEx( UNDNAME_NAME_ONLY, &bstrUndecoratedName);
throw DiaException("Call IDiaSymbol::get_undecoratedNameEx", hres); if (S_OK == hres)
undecoratedName = autoBstr( bstrUndecoratedName ).asStr();
std::string retStr = autoBstr( bstrName ).asStr();
if ( !retStr.empty() )
{
boost::cmatch matchResult;
if ( boost::regex_match( retStr.c_str(), matchResult, stdcallMatch ) )
return std::string( matchResult[1].first, matchResult[1].second );
if ( boost::regex_match( retStr.c_str(), matchResult, fastcallMatch ) )
return std::string( matchResult[1].first, matchResult[1].second );
return retStr;
}
} }
*/ if ( undecoratedName.empty() )
bstrName = callSymbol(get_name); return name;
return autoBstr( bstrName ).asStr(); // c++ decoration is not supported
boost::cmatch matchResult;
if ( boost::regex_match( undecoratedName.c_str(), matchResult, stdcallMatch ) )
return std::string( matchResult[1].first, matchResult[1].second );
if ( boost::regex_match( undecoratedName.c_str(), matchResult, fastcallMatch ) )
return std::string( matchResult[1].first, matchResult[1].second );
return name;
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
pykd/udtutils.cpp
View File

@ -59,7 +59,7 @@ UdtFieldPtr &FieldCollection::lookup(const std::string &name)
return *it; return *it;
} }
throw TypeException( "", "field not found" ); throw TypeException( name, "field not found" );
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////