check global records for linkage type

PDBParser.cpp

@@ -43,6 +43,7 @@ PDBParser::FunctionRecord& PDBParser::FunctionRecord::operator =(FunctionRecord&
 	std::swap(lineOffset, other.lineOffset);
 	std::swap(typeIndex, other.typeIndex);
 	std::swap(paramSize, other.paramSize);
+	std::swap(isExternC, other.isExternC);
 
 	return *this;
 }
@@ -835,6 +836,12 @@ PDBParser::printBreakpadSymbols(FILE* of, const char* platform, FileMod* fileMod
 				updateParamSize(func, globals);
 			}
 		}
+		// While here, see if this function uses C linkage
+		auto& g = globals.find(func.offset);
+		if (g != globals.end() && g->second.data[0] != '?')
+		{
+			func.isExternC = true;
+		}
 	}
 
 	// Wait for the type stream to be loaded, and all of the src files to be written
@@ -1050,10 +1057,13 @@ PDBParser::getGlobalFunctions(uint16_t symRecStream, const SectionHeaders& heade
 	{
 		auto len = *reader.read<uint16_t>().data;
 		auto rec = reader.read<GlobalRecord>();
-		auto name = reader.read<char>(len - sizeof(GlobalRecord));
+		if (rec->leafType == 0x1009)
+			throw std::exception("Global data_v2 records not handled!");
 
+		auto name = reader.read<char>(len - sizeof(GlobalRecord));
+		fprintf(stderr, "%x %s %d %d\n", rec->offset, name.data, rec->leafType, rec->segment);
 		// Is function?
-		if (rec->symType == 2)
+		if (rec->leafType == 0x110e && rec->symType == 2)
 		{
 			globals.insert(std::make_pair(rec->offset + headers[rec->segment - 1].VirtualAddress, std::move(name)));
 		}
@@ -1123,7 +1133,8 @@ PDBParser::printFunctions(Functions& funcs, const TypeMap& tm, FILE* of)
 
 		if (func.typeIndex)
 		{
-			stringizeType(func.typeIndex, str, tm, IsTopLevel);
+			if (!func.isExternC)
+				stringizeType(func.typeIndex, str, tm, IsTopLevel);
 
 			temp.assign(func.name.data);
 			std::string::size_type pos;

PDBParser.h

@@ -143,6 +143,7 @@ class PDBParser
 		uint32_t			lineOffset;
 		uint32_t			typeIndex;	// If this is non-zero, the function is a procedure, not a thunk (I don't know how to read thunk type info...)
 		uint32_t			paramSize;
+		bool				isExternC;
 
 		FunctionRecord(uint32_t offset, uint32_t segment)
 			: offset(offset)
@@ -158,6 +159,7 @@ class PDBParser
 			, lineOffset(0)
 			, fileIndex(0)
 			, paramSize(0)
+			, isExternC(false)
 		{}
 
 		bool operator <(const FunctionRecord& other) const