Merge pull request x64dbg#667 from blaquee/mod_ref_modname

Add Module name to Intermodule call list in GUI. Addresses issue x64dbg#649

Author: mrexodia

src/bridge/bridgemain.cpp

@@ -316,7 +316,7 @@ BRIDGE_IMPEXP bool DbgGetLabelAt(duint addr, SEGMENTREG segment, char* text) //(
         return false;
     ADDRINFO info;
     memset(&info, 0, sizeof(info));
-    info.flags = flaglabel;
+    info.flags = flaglabel | flagmodule;
     if(!_dbg_addrinfoget(addr, segment, &info))
     {
         duint addr_ = 0;
@@ -326,7 +326,7 @@ BRIDGE_IMPEXP bool DbgGetLabelAt(duint addr, SEGMENTREG segment, char* text) //(
         ADDRINFO ptrinfo = info;
         if(!_dbg_addrinfoget(addr_, SEG_DEFAULT, &ptrinfo))
             return false;
-        sprintf_s(info.label, "&%s", ptrinfo.label);
+        sprintf_s(info.label, "%s.%s", ptrinfo.module, ptrinfo.label);
     }
     strcpy_s(text, MAX_LABEL_SIZE, info.label);
     return true;

src/dbg/instruction.cpp

@@ -1386,15 +1386,16 @@ static bool cbModCallFind(Capstone* disasm, BASIC_INSTRUCTION_INFO* basicinfo, R
     {
         GuiReferenceInitialize(refinfo->name);
         GuiReferenceAddColumn(2 * sizeof(duint), "Address");
-        GuiReferenceAddColumn(0, "Disassembly");
+        GuiReferenceAddColumn(20, "Disassembly");
+        GuiReferenceAddColumn(MAX_LABEL_SIZE, "Destination");
         GuiReferenceReloadData();
         return true;
     }
     bool found = false;
+    char label[MAX_LABEL_SIZE] = "";
     if(basicinfo->call)  //we are looking for calls
     {
         duint ptr = basicinfo->addr > 0 ? basicinfo->addr : basicinfo->memory.value;
-        char label[MAX_LABEL_SIZE] = "";
         found = DbgGetLabelAt(ptr, SEG_DEFAULT, label) && !LabelGet(ptr, label); //a non-user label
     }
     if(found)
@@ -1404,10 +1405,16 @@ static bool cbModCallFind(Capstone* disasm, BASIC_INSTRUCTION_INFO* basicinfo, R
         GuiReferenceSetRowCount(refinfo->refcount + 1);
         GuiReferenceSetCellContent(refinfo->refcount, 0, addrText);
         char disassembly[GUI_MAX_DISASSEMBLY_SIZE] = "";
-        if(GuiGetDisassembly((duint)disasm->Address(), disassembly))
+        if (GuiGetDisassembly((duint)disasm->Address(), disassembly))
+        {
             GuiReferenceSetCellContent(refinfo->refcount, 1, disassembly);
+            GuiReferenceSetCellContent(refinfo->refcount, 2, label);
+        }
         else
+        {
             GuiReferenceSetCellContent(refinfo->refcount, 1, disasm->InstructionText().c_str());
+            GuiReferenceSetCellContent(refinfo->refcount, 2, label);
+        }
     }
     return found;
 }