Upload progress

Author: NicksWorld

library/CMakeLists.txt

@@ -330,7 +330,7 @@ elseif(UNIX)
     set(PROJECT_LIBS rt dl dfhack-md5 ${DFHACK_TINYXML})
 else(WIN32)
     # FIXME: do we really need psapi?
-    set(PROJECT_LIBS psapi dfhack-md5 ${DFHACK_TINYXML})
+    set(PROJECT_LIBS psapi dbghelp dfhack-md5 ${DFHACK_TINYXML})
 endif()
 
 set(VERSION_SRCS DFHackVersion.cpp)

library/LuaApi.cpp

@@ -3778,7 +3778,7 @@ static int internal_cxxDemangle(lua_State *L)
 {
     string mangled = luaL_checkstring(L, 1);
     string status;
-    string demangled = cxx_demangle(mangled, &status);
+    string demangled = Core::getInstance().p->cxxDemangle(mangled, &status);
     if (demangled.length())
     {
         lua_pushstring(L, demangled.c_str());

library/Process-windows.cpp

@@ -29,6 +29,7 @@ distribution.
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <dbghelp.h>
 #include <psapi.h>
 
 #include <cstring>
@@ -429,3 +430,22 @@ int Process::memProtect(void *ptr, const int length, const int prot)
 
     return !VirtualProtect(ptr, length, prot_native, &old_prot);
 }
+
+std::string Process::cxxDemangle(const std::string &mangled_name, std::string *status_out) {
+    const char* mangled_cstr = mangled_name.c_str();
+
+    char demangled[MAX_SYM_NAME];
+    DWORD flags = UNDNAME_NO_FUNCTION_RETURNS | UNDNAME_NO_ACCESS_SPECIFIERS | UNDNAME_NAME_ONLY | UNDNAME_NO_ALLOCATION_MODEL;
+
+    if (*mangled_cstr == '.') {
+        // Symbol is a type, demangle as such
+        flags |= UNDNAME_NO_ARGUMENTS;
+        mangled_cstr++;
+    }
+
+    DWORD res = UnDecorateSymbolName(mangled_cstr, (char*)&demangled, MAX_SYM_NAME, flags);
+    if (res == 0) {
+        return "dummy";
+    }
+    return std::string((char*)&demangled);
+}

library/include/MemAccess.h

@@ -295,6 +295,9 @@ namespace DFHack
                 EXEC = 4
             };
 
+            /// demangle symbol native to the platform
+            std::string cxxDemangle(const std::string &mangled_name, std::string *status_out);
+
             uint32_t getPE() { return my_pe; }
             std::string getMD5() { return my_md5; }