DBG: added stuff label from string, sym from string

x64_dbg_dbg/addrinfo.cpp

@@ -6,6 +6,7 @@
 #include "breakpoint.h"
 
 sqlite3* userdb;
+static std::vector<MODINFO> modinfo;
 
 ///basic database functions
 void dbinit()
@@ -56,9 +57,6 @@ void dbclose()
 }
 
 ///module functions
-
-static std::vector<MODINFO> modinfo;
-
 bool modload(uint base, uint size, const char* fullpath)
 {
     if(!base or !size or !fullpath)
@@ -359,6 +357,41 @@ bool labelset(uint addr, const char* text)
     return true;
 }
 
+bool labelfromstring(const char* text, uint* addr)
+{
+    if(!text or !strlen(text) or !addr)
+        return 0;
+    char labeltext[MAX_LABEL_SIZE]="";
+    sqlstringescape(text, labeltext);
+    char sql[deflen]="";
+    sprintf(sql, "SELECT addr,mod FROM labels WHERE text='%s'", labeltext);
+    puts(sql);
+    sqlite3_stmt* stmt;
+    if(sqlite3_prepare_v2(userdb, sql, -1, &stmt, 0)!=SQLITE_OK)
+    {
+        sqlite3_finalize(stmt);
+        return false;
+    }
+    if(sqlite3_step(stmt)!=SQLITE_ROW)
+    {
+        sqlite3_finalize(stmt);
+        return false;
+    }
+#ifdef _WIN64
+    *addr=sqlite3_column_int64(stmt, 0); //addr
+#else
+    *addr=sqlite3_column_int(stmt, 0); //addr
+#endif // _WIN64
+    const char* modname=(const char*)sqlite3_column_text(stmt, 1); //mod
+    sqlite3_finalize(stmt);
+    if(!modname)
+        return true;
+    puts(modname);
+    //TODO: fix this
+    *addr+=modbasefromname(modname);
+    return true;
+}
+
 bool labelget(uint addr, char* text)
 {
     if(!IsFileBeingDebugged() or !memisvalidreadptr(fdProcessInfo->hProcess, addr) or !text)
@@ -475,3 +508,18 @@ bool bookmarkdel(uint addr)
     GuiUpdateAllViews();
     return true;
 }
+
+///symbol functions
+bool symfromname(const char* name, uint* addr)
+{
+    if(!name or !strlen(name) or !addr)
+        return false;
+    char buffer[sizeof(SYMBOL_INFO) + MAX_LABEL_SIZE * sizeof(char)];
+    PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
+    pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
+    pSymbol->MaxNameLen = MAX_LABEL_SIZE;
+    if(!SymFromName(fdProcessInfo->hProcess, name, pSymbol))
+        return false;
+    *addr=(uint)pSymbol->Address;
+    return true;
+}

x64_dbg_dbg/addrinfo.h

@@ -33,10 +33,12 @@ bool commentset(uint addr, const char* text);
 bool commentget(uint addr, char* text);
 bool commentdel(uint addr);
 bool labelset(uint addr, const char* text);
+bool labelfromstring(const char* text, uint* addr);
 bool labelget(uint addr, char* text);
 bool labeldel(uint addr);
 bool bookmarkset(uint addr);
 bool bookmarkget(uint addr);
 bool bookmarkdel(uint addr);
+bool symfromname(const char* name, uint* addr);
 
 #endif // _ADDRINFO_H

x64_dbg_dbg/value.cpp

@@ -4,6 +4,7 @@
 #include "console.h"
 #include "math.h"
 #include "memory.h"
+#include "addrinfo.h"
 #include <psapi.h>
 
 static bool dosignedcalc=false;
@@ -1220,6 +1221,10 @@ bool valfromstring(const char* string, uint* value, int* value_size, bool* isvar
         sscanf(string+inc, "%"fext"x", value);
         return true;
     }
+    else if(labelfromstring(string, value)) //then come labels
+        return true;
+    else if(symfromname(string, value)) //then come symbols
+        return true;
     else if(valapifromstring(string, value, value_size, true, silent, hexonly)) //then come APIs
         return true;
     else if(varget(string, value, value_size, 0)) //finally variables