Add GetVTableIndex method

untrustedmodders · Dec 23, 2024 · e820d73 · e820d73
1 parent 8fcff2d
commit e820d73
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/polyhook.pplugin.in b/polyhook.pplugin.in
@@ -342,6 +342,23 @@
         "description": "Address of original function"
       }
     },
+    {
+      "name": "GetVTableIndex",
+      "group": "Lookup",
+      "description": "Attempts to find virtual table index of virtual function",
+      "funcName": "GetVTableIndex",
+      "paramTypes": [
+        {
+          "type": "ptr64",
+          "name": "pFunc",
+          "description": "Function address"
+        }
+      ],
+      "retType": {
+        "type": "int32",
+        "description": "Virtual table index"
+      }
+    },
     {
       "name": "UnhookAll",
       "group": "Core",

diff --git a/src/plugin.cpp b/src/plugin.cpp
@@ -38,6 +38,7 @@ void PolyHookPlugin::OnPluginStart() {
 }
 
 void PolyHookPlugin::OnPluginEnd() {
+	unhookAll();
 }
 
 Callback* PolyHookPlugin::hookDetour(void* pFunc, DataType returnType, std::span<const DataType> arguments) {
@@ -348,17 +349,17 @@ int PolyHookPlugin::getVTableIndex(void* pFunc) const {
 
 extern "C"
 PLUGIN_API Callback* HookDetour(void* pFunc, DataType returnType, const plg::vector<DataType>& arguments) {
-	return g_polyHookPlugin.hookDetour(pFunc, returnType, std::span(arguments.data(), arguments.size()));
+	return g_polyHookPlugin.hookDetour(pFunc, returnType, arguments.const_span());
 }
 
 extern "C"
 PLUGIN_API Callback* HookVirtual(void* pClass, int index, DataType returnType, const plg::vector<DataType>& arguments) {
-	return g_polyHookPlugin.hookVirtual(pClass, index, returnType, std::span(arguments.data(), arguments.size()));
+	return g_polyHookPlugin.hookVirtual(pClass, index, returnType, arguments.const_span());
 }
 
 extern "C"
 PLUGIN_API Callback* HookVirtualByFunc(void* pClass, void* pFunc, DataType returnType, const plg::vector<DataType>&  arguments) {
-	return g_polyHookPlugin.hookVirtual(pClass, pFunc, returnType, std::span(arguments.data(), arguments.size()));
+	return g_polyHookPlugin.hookVirtual(pClass, pFunc, returnType, arguments.const_span());
 }
 
 extern "C"
@@ -396,6 +397,11 @@ PLUGIN_API void* FindOriginalAddr(void* pClass, void* pAddr) {
 	return g_polyHookPlugin.findOriginalAddr(pClass, pAddr);
 }
 
+extern "C"
+PLUGIN_API int GetVTableIndex(void* pFunc) {
+	return g_polyHookPlugin.getVTableIndex(pFunc);
+}
+
 extern "C"
 PLUGIN_API void UnhookAll() {
 	return g_polyHookPlugin.unhookAll();

diff --git a/sym/exported_symbols.lds b/sym/exported_symbols.lds
@@ -11,6 +11,7 @@ FindDetour
 FindVirtual
 FindVirtualByFunc
 FindOriginalAddr
+GetVTableIndex
 UnhookAll
 UnhookAllVirtual
 AddCallback

diff --git a/sym/version_script.lds b/sym/version_script.lds
@@ -13,6 +13,7 @@
         FindVirtual;
         FindVirtualByFunc;
         FindOriginalAddr;
+        GetVTableIndex;
         UnhookAll;
         UnhookAllVirtual;
         AddCallback;