Fix wrong windows offsets

Author: Masterkatze

src/formatter.cpp

@@ -2,7 +2,7 @@
 
 bool shouldSkipWindowsFunction(const ClassInfo &classInfo, std::size_t vtableIndex, std::size_t functionIndex, const FunctionInfo &functionInfo)
 {
-    if (functionInfo.name.contains("::~"))
+    if (functionInfo.name.starts_with('~'))
     {
         return functionIndex > 0 && functionInfo.name == classInfo.vtables.at(vtableIndex).functions.at(functionIndex - 1)->name;
     }
@@ -41,6 +41,7 @@ std::vector<Out2> formatVTable(const ClassInfo &classInfo)
 
         Out2 function;
         function.id = functionInfo->id;
+        function.symbol = functionInfo->demangledSymbol;
         function.name = functionInfo->name;
         function.shortName = functionInfo->shortName;
         function.nameSpace = functionInfo->nameSpace;

src/formatter.hpp

@@ -10,9 +10,10 @@ bool shouldSkipWindowsFunction(const ClassInfo &classInfo, std::size_t vtableInd
 struct Out2
 {
     LargeNumber id;
-    std::string name;
-    std::string shortName;
-    std::string nameSpace;
+    std::string symbol; // CNEO_Player::CBaseEntity::EndTouch(CBaseEntity*)
+    std::string name; // EndTouch(CBaseEntity*)
+    std::string shortName; // EndTouch
+    std::string nameSpace; // CBaseEntity
     bool isMulti;
     std::optional<int> linuxIndex;
     std::optional<int> windowsIndex;

src/parser.cpp

@@ -225,34 +225,43 @@ Out parse(ProgramInfo &programInfo)
             }
             else
             {
-                auto functionDemangledName = demangleSymbol(functionSymbolName.c_str());
-                auto functionName = std::string(functionDemangledName.get());
-                auto functionShortName = functionName;
+                auto demangledSymbolPtr = demangleSymbol(functionSymbolName.c_str());
+                auto demangledSymbol = std::string(demangledSymbolPtr.get());
+                std::string name = demangledSymbol;
+                std::string shortName = demangledSymbol;
+                std::string nameSpace = demangledSymbol;
 
-                auto functionNameSpace = functionShortName;
-
-                auto startOfName = functionShortName.rfind("::");
+                auto startOfName = demangledSymbol.rfind("::");
                 if (startOfName != std::string::npos)
                 {
-                    functionShortName = functionShortName.substr(startOfName + 2);
-                    functionNameSpace = functionNameSpace.substr(0, startOfName);
+                    name = name.substr(startOfName + 2);
+                }
+
+                auto startOfArgs = demangledSymbol.rfind('(');
+                if (startOfArgs != std::string::npos)
+                {
+                    shortName = shortName.substr(startOfName + 2, startOfArgs - startOfName - 2);
                 }
 
+
+                nameSpace = nameSpace.substr(0, startOfName);
+
                 FunctionInfo functionInfo;
 
                 functionInfo.id = functionAddress;
-                functionInfo.name = functionName;
                 functionInfo.symbol = functionSymbol;
-                functionInfo.shortName = functionShortName;
-                functionInfo.nameSpace = functionNameSpace;
+                functionInfo.demangledSymbol = demangledSymbol;
+                functionInfo.name = name;
+                functionInfo.shortName = shortName;
+                functionInfo.nameSpace = nameSpace;
                 functionInfo.isThunk = false;
                 functionInfo.isMulti = functionSymbols.size() > 1;
                 functionInfo.classes.push_back(&classInfo);
 
                 if (functionSymbol.name.starts_with("_ZTh"))
                 {
                     functionInfo.isThunk = true;
-                    functionInfo.name = functionName.substr(21); // remove "non-virtual thunk to" substring
+                    functionInfo.name = demangledSymbol.substr(21); // remove "non-virtual thunk to" substring
                 }
 
                 out.functions.push_back(functionInfo);

src/parser.hpp

@@ -19,10 +19,11 @@ struct ClassInfo;
 struct FunctionInfo
 {
     LargeNumber id;
-    std::string name;
-    std::string shortName;
-    std::string nameSpace;
     SymbolInfo symbol;
+    std::string demangledSymbol; // CNEO_Player::CBaseEntity::EndTouch(CBaseEntity*)
+    std::string name; // EndTouch(CBaseEntity*)
+    std::string shortName; // EndTouch
+    std::string nameSpace; // CBaseEntity
     bool isThunk;
     bool isMulti;
     std::vector<ClassInfo*> classes;

src/writer.cpp

@@ -41,7 +41,7 @@ Offsets prepareOffsets(std::list<ClassInfo>& classes)
                 continue;
             }
 
-            vtables[function.nameSpace].emplace(function.shortName, FunctionOffsets{function.linuxIndex.value(), function.windowsIndex.value()});
+            vtables[function.nameSpace].emplace(function.name, FunctionOffsets{function.linuxIndex.value(), function.windowsIndex.value()});
         }
 
         offsets.emplace(class_.name, vtables);
@@ -97,7 +97,7 @@ std::optional<int> getOffset(Offsets offsets, const std::string& symbol)
     auto functionIterator = classNamespace.find(functionName);
     if (functionIterator == classNamespace.end())
     {
-        std::cerr << std::format("Error: failed to find function by its name \'{}\')", functionName) << std::endl;
+        std::cerr << std::format("Error: failed to find function by its name \'{}\'", functionName) << std::endl;
         return std::nullopt;
     }
     const auto& function = functionIterator->second;