x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

DBG: fixed some bugs with invalid ordinals returned from dbghelp + added ordinal api resolving + ignore 'OrdinalXXX' in symfromname

This commit is contained in:
Mr. eXoDia 2014-06-25 22:07:09 +02:00
parent 97abb21408
commit 52dda6c0ea
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x64_dbg_dbg/symbolinfo.cpp
View File

@ -17,6 +17,12 @@ static BOOL CALLBACK EnumSymbols(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID
curSymbol.decoratedSymbol=(char*)BridgeAlloc(len+1); curSymbol.decoratedSymbol=(char*)BridgeAlloc(len+1);
strcpy(curSymbol.decoratedSymbol, pSymInfo->Name); strcpy(curSymbol.decoratedSymbol, pSymInfo->Name);
curSymbol.undecoratedSymbol=(char*)BridgeAlloc(MAX_SYM_NAME); curSymbol.undecoratedSymbol=(char*)BridgeAlloc(MAX_SYM_NAME);
if(strstr(pSymInfo->Name, "Ordinal"))
{
//skip bad ordinals
if(pSymInfo->Address == pSymInfo->ModBase)
return TRUE;
}
if(!UnDecorateSymbolName(pSymInfo->Name, curSymbol.undecoratedSymbol, MAX_SYM_NAME, UNDNAME_COMPLETE)) if(!UnDecorateSymbolName(pSymInfo->Name, curSymbol.undecoratedSymbol, MAX_SYM_NAME, UNDNAME_COMPLETE))
{ {
BridgeFree(curSymbol.undecoratedSymbol); BridgeFree(curSymbol.undecoratedSymbol);
@ -69,7 +75,7 @@ void symupdatemodulelist()
bool symfromname(const char* name, uint* addr) bool symfromname(const char* name, uint* addr)
{ {
if(!name or !strlen(name) or !addr) if(!name or !strlen(name) or !addr or !_strnicmp(name, "ordinal", 7)) //skip 'OrdinalXXX'
return false; return false;
char buffer[sizeof(SYMBOL_INFO) + MAX_LABEL_SIZE * sizeof(char)]; char buffer[sizeof(SYMBOL_INFO) + MAX_LABEL_SIZE * sizeof(char)];
PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;

6
x64_dbg_dbg/value.cpp
View File

@ -1011,6 +1011,12 @@ bool valapifromstring(const char* name, uint* value, int* value_size, bool print
else else
{ {
uint addr=(uint)GetProcAddress(mod, apiname); uint addr=(uint)GetProcAddress(mod, apiname);
if(!addr) //not found
{
uint ordinal;
if(valfromstring(apiname, &ordinal))
addr=(uint)GetProcAddress(mod, (LPCSTR)(ordinal&0xFFFF));
}
FreeLibrary(mod); FreeLibrary(mod);
if(addr) //found! if(addr) //found!
{ {