Merge remote-tracking branch 'quietust/develop' into develop

Fixes #1061
develop
lethosor 2017-02-04 15:14:01 -05:00
commit b5c7771b71
1 changed files with 4 additions and 2 deletions

@ -342,12 +342,14 @@ int Process::adjustOffset(int offset, bool to_file)
return -1;
}
string Process::doReadClassName (void * vptr)
{
char * rtti = readPtr((char *)vptr - sizeof(void*));
#ifdef DFHACK64
char * typeinfo = d->base + readDWord(rtti + 0xC);
void *base;
if (!RtlPcToFileHeader(rtti, &base))
return "dummy";
char * typeinfo = (char *)base + readDWord(rtti + 0xC);
string raw = readCString(typeinfo + 0x10+4); // skips the .?AV
#else
char * typeinfo = readPtr(rtti + 0xC);