MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fixes #1061
develop
lethosor 2017-02-04 15:14:01 -05:00
parent 7823d78cd9 cc02ced0ac
commit b5c7771b71
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Process-windows.cpp
Unescape Escape View File

@ -342,12 +342,14 @@ int Process::adjustOffset(int offset, bool to_file)
return -1; return -1;
} }
string Process::doReadClassName (void * vptr) string Process::doReadClassName (void * vptr)
{ {
char * rtti = readPtr((char *)vptr - sizeof(void*)); char * rtti = readPtr((char *)vptr - sizeof(void*));
#ifdef DFHACK64 #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 string raw = readCString(typeinfo + 0x10+4); // skips the .?AV
#else #else
char * typeinfo = readPtr(rtti + 0xC); char * typeinfo = readPtr(rtti + 0xC);