DBG: added modentryfromaddr function

Author: mrexodia

x64_dbg_dbg/addrinfo.cpp

@@ -99,6 +99,7 @@ bool modload(uint base, uint size, const char* fullpath)
     while(name[len] != '.' and len)
         len--;
     MODINFO info;
+    memset(&info, 0, sizeof(MODINFO));
     info.sections.clear();
     info.hash = modhashfromname(name);
     if(len)
@@ -117,6 +118,7 @@ bool modload(uint base, uint size, const char* fullpath)
     ULONG_PTR FileMapVA;
     if(StaticFileLoad((char*)fullpath, UE_ACCESS_READ, false, &FileHandle, &LoadedSize, &FileMap, &FileMapVA))
     {
+        info.entry = GetPE32DataFromMappedFile(FileMapVA, 0, UE_OEP) + info.base; //get entry point
         int SectionCount = (int)GetPE32DataFromMappedFile(FileMapVA, 0, UE_SECTIONNUMBER);
         if(SectionCount > 0)
         {
@@ -268,6 +270,14 @@ bool modsectionsfromaddr(uint addr, std::vector<MODSECTIONINFO>* sections)
     return true;
 }
 
+uint modentryfromaddr(uint addr)
+{
+    const ModulesInfo::iterator found = modinfo.find(Range(addr, addr));
+    if(found == modinfo.end()) //not found
+        return 0;
+    return found->second.entry;
+}
+
 ///api functions
 bool apienumexports(uint base, EXPORTENUMCALLBACK cbEnum)
 {

x64_dbg_dbg/addrinfo.h

@@ -65,6 +65,7 @@ struct MODINFO
     uint base; //module base
     uint size; //module size
     uint hash; //full module name hash
+    uint entry; //entry point
     char name[MAX_MODULE_SIZE]; //module name (without extension)
     char extension[MAX_MODULE_SIZE]; //file extension
     std::vector<MODSECTIONINFO> sections;
@@ -134,6 +135,7 @@ uint modhashfromname(const char* mod);
 uint modbasefromname(const char* modname);
 uint modsizefromaddr(uint addr);
 bool modsectionsfromaddr(uint addr, std::vector<MODSECTIONINFO>* sections);
+uint modentryfromaddr(uint addr);
 
 bool apienumexports(uint base, EXPORTENUMCALLBACK cbEnum);