kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bindexplib: Fix treatment of some symbols

This commit is contained in:
Bill Hoffman 2015-06-19 16:12:43 -04:00 committed by Brad King
parent de70c922d9
commit 61bbbdcf9c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/bindexplib.cxx
View File

@ -198,7 +198,16 @@ DumpExternalsObjects(PIMAGE_SYMBOL pSymbolTable,
symbol = stringTable + pSymbolTable->N.Name.Long; symbol = stringTable + pSymbolTable->N.Name.Long;
} }
// clear out any leading spaces
while (isspace(symbol[0])) symbol.erase(0,1); while (isspace(symbol[0])) symbol.erase(0,1);
// if it starts with _ and has an @ then it is a __cdecl
// so remove the @ stuff for the export
if(symbol[0] == '_') {
std::string::size_type posAt = symbol.find('@');
if (posAt != std::string::npos) {
symbol.erase(posAt);
}
}
if (symbol[0] == '_') symbol.erase(0,1); if (symbol[0] == '_') symbol.erase(0,1);
if (fImportFlag) { if (fImportFlag) {
fImportFlag = 0; fImportFlag = 0;
@ -210,9 +219,13 @@ DumpExternalsObjects(PIMAGE_SYMBOL pSymbolTable,
*/ */
const char *scalarPrefix = "??_G"; const char *scalarPrefix = "??_G";
const char *vectorPrefix = "??_E"; const char *vectorPrefix = "??_E";
// original code had a check for
// symbol.find("real@") == std::string::npos)
// but if this disallows memmber functions with the name real
// if scalarPrefix and vectorPrefix are not found then print
// the symbol
if (symbol.compare(0, 4, scalarPrefix) && if (symbol.compare(0, 4, scalarPrefix) &&
symbol.compare(0, 4, vectorPrefix) && symbol.compare(0, 4, vectorPrefix) )
symbol.find("real@") == std::string::npos)
{ {
SectChar = SectChar =
pSectionHeaders[pSymbolTable->SectionNumber-1].Characteristics; pSectionHeaders[pSymbolTable->SectionNumber-1].Characteristics;
@ -224,7 +237,7 @@ DumpExternalsObjects(PIMAGE_SYMBOL pSymbolTable,
!(SectChar & IMAGE_SCN_MEM_READ)) { !(SectChar & IMAGE_SCN_MEM_READ)) {
fprintf(fout, "\t%s\n", symbol.c_str()); fprintf(fout, "\t%s\n", symbol.c_str());
} else { } else {
// printf(" strange symbol: %s \n",s); // printf(" strange symbol: %s \n",symbol.c_str());
} }
} }
} }