Also load static symbols from MAP files

Nukem9 · Aug 23, 2015 · 2a844b5 · 2a844b5
1 parent 152b542
commit 2a844b5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/idaldr/Ldr.cpp b/idaldr/Ldr.cpp
@@ -345,7 +345,7 @@ bool ApplyMapSymbols(char *Path, duint ModuleBase)
         {
             size_t sectionCount = GetPE32Data(modulePath, 0, UE_SECTIONNUMBER);
 
-            for (int i = 0; i < sectionCount; i++)
+            for (size_t i = 0; i < sectionCount; i++)
             {
                 MapFileSegment segdef;
                 memset(&segdef, 0, sizeof(segdef));

diff --git a/idaldr/Map/MapReader.cpp b/idaldr/Map/MapReader.cpp
@@ -246,10 +246,11 @@ bool MapFile::LoadSegment(char *Line)
 
 bool MapFile::LoadSymbols()
 {
-	/*
-	  Address         Publics by Value
-	  0001:00000000       _init_proc
-	*/
+	//
+	// Address         Publics by Value
+	// 0001:00000000       _init_proc
+	//
+	// Load regular symbols
 	char *startPos = strstr(m_FileData, "Address");
 
 	if (!startPos)
@@ -258,6 +259,22 @@ bool MapFile::LoadSymbols()
 		return false;
 	}
 
+	if (!EnumerateLines(startPos, 'SYMB'))
+		return false;
+
+	//
+	// Static symbols
+	// 0001:00000027       _pre_c_init                00401027 f   MSVCRT:wcrtexe.obj
+	//
+	// Now load static symbols (these are optional)
+	startPos = strstr(m_FileData, "Static symbols");
+
+	if (!startPos)
+	{
+		_plugin_logprintf("Couldn't find starting position for static symbols, skipping\n");
+		return true;
+	}
+
 	return EnumerateLines(startPos, 'SYMB');
 }
 

diff --git a/peid/peid.cpp b/peid/peid.cpp
@@ -123,8 +123,8 @@ duint PEiDPatternScan(const char *Pattern, bool EntryPoint, PBYTE ModuleCopy, du
 	//
 	if (EntryPoint)
 	{
-		//ModuleBase = 0;
-		//ModuleSize = 0;
+		//ModuleBase = ep_start;
+		//ModuleSize = ep_size;
 	}
 
 	//