Fix VTable hooks

Vauff · Vauff · commit 7db7c33d5e49 · 2025-05-10T20:31:00.000-04:00
diff --git a/src/cs2fixes.cpp b/src/cs2fixes.cpp
@@ -113,15 +113,15 @@ KHook::Virtual postEventAbstractHook(&IGameEventSystem::PostEventAbstract, &g_CS
 KHook::Virtual startupServerHook(&INetworkServerService::StartupServer, &g_CS2Fixes, nullptr, &CS2Fixes::Hook_StartupServer_Post);
 KHook::Virtual checkTransmitHook(&ISource2GameEntities::CheckTransmit, &g_CS2Fixes, nullptr, &CS2Fixes::Hook_CheckTransmit_Post);
 KHook::Virtual dispatchConCommandHook(&ICvar::DispatchConCommand, &g_CS2Fixes, &CS2Fixes::Hook_DispatchConCommand, nullptr);
-KHook::Virtual loadEventsFromFileHook(&IGameEventManager2::LoadEventsFromFile, &g_CS2Fixes, &CS2Fixes::Hook_LoadEventsFromFile, nullptr);
-KHook::Virtual playerEquipUseHook(&g_CS2Fixes, &CS2Fixes::Hook_PlayerEquipUse, nullptr);
-KHook::Virtual playerEquipPrecacheHook(&g_CS2Fixes, nullptr, &CS2Fixes::Hook_PlayerEquipPrecache_Post);
 KHook::Virtual createWorkshopMapGroupHook(&g_CS2Fixes, &CS2Fixes::Hook_CreateWorkshopMapGroup, nullptr);
-KHook::Virtual onTakeDamageAliveHook(&g_CS2Fixes, &CS2Fixes::Hook_OnTakeDamage_Alive, nullptr);
-KHook::Virtual checkMovingGroundHook(&g_CS2Fixes, &CS2Fixes::Hook_CheckMovingGround, nullptr);
-KHook::Virtual goToIntermissionHook(&g_CS2Fixes, &CS2Fixes::Hook_GoToIntermission, nullptr);
-KHook::Virtual physicsTouchShuffleHook(&g_CS2Fixes, nullptr, &CS2Fixes::Hook_PhysicsTouchShuffle_Post);
-KHook::Virtual dropWeaponHook(&g_CS2Fixes, nullptr, &CS2Fixes::Hook_DropWeapon_Post);
+KHook::Member loadEventsFromFileHook(&g_CS2Fixes, &CS2Fixes::Hook_LoadEventsFromFile, nullptr);
+KHook::Member playerEquipUseHook(&g_CS2Fixes, &CS2Fixes::Hook_PlayerEquipUse, nullptr);
+KHook::Member playerEquipPrecacheHook(&g_CS2Fixes, nullptr, &CS2Fixes::Hook_PlayerEquipPrecache_Post);
+KHook::Member onTakeDamageAliveHook(&g_CS2Fixes, &CS2Fixes::Hook_OnTakeDamage_Alive, nullptr);
+KHook::Member checkMovingGroundHook(&g_CS2Fixes, &CS2Fixes::Hook_CheckMovingGround, nullptr);
+KHook::Member goToIntermissionHook(&g_CS2Fixes, &CS2Fixes::Hook_GoToIntermission, nullptr);
+KHook::Member physicsTouchShuffleHook(&g_CS2Fixes, nullptr, &CS2Fixes::Hook_PhysicsTouchShuffle_Post);
+KHook::Member dropWeaponHook(&g_CS2Fixes, nullptr, &CS2Fixes::Hook_DropWeapon_Post);
 
 CS2Fixes g_CS2Fixes;
 
@@ -135,13 +135,6 @@ CGameConfig* g_GameConfig = nullptr;
 ISteamHTTP* g_http = nullptr;
 CSteamGameServerAPIContext g_steamAPI;
 CCSGameRules* g_pGameRules = nullptr; // Will be null between map end & new map startup, null check if necessary!
-IGameEventManager2* g_pCGameEventManagerVTable = nullptr;
-CGamePlayerEquip* g_pCGamePlayerEquipVTable = nullptr;
-CCSPlayerPawn* g_pCCSPlayerPawnVTable = nullptr;
-CCSPlayer_MovementServices* g_pCCSPlayer_MovementServicesVTable = nullptr;
-CCSGameRules* g_pCCSGameRulesVTable = nullptr;
-CVPhys2World* g_pCVPhys2WorldVTable = nullptr;
-CCSPlayer_WeaponServices* g_pCCSPlayer_WeaponServicesVTable = nullptr;
 
 CGameEntitySystem* GameEntitySystem()
 {
@@ -233,58 +226,64 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 	if (!InitGameSystems())
 		bRequiredInitLoaded = false;
 
-	g_pCGameEventManagerVTable = (IGameEventManager2*)modules::server->FindVirtualTable("CGameEventManager");
+	int offset = g_GameConfig->GetOffset("IGameTypes_CreateWorkshopMapGroup");
 
-	if (!g_pCGameEventManagerVTable)
+	if (offset == -1)
 	{
-		Panic("Failed to find CGameEventManager vtable\n");
+		Panic("Failed to find IGameTypes_CreateWorkshopMapGroup\n");
 		bRequiredInitLoaded = false;
 	}
 
-	loadEventsFromFileHook.Add(g_pCGameEventManagerVTable);
+	createWorkshopMapGroupHook.SetIndex(offset);
+	createWorkshopMapGroupHook.Add(g_pGameTypes);
+
+	void** pCGameEventManagerVTable = modules::server->FindVirtualTable("CGameEventManager");
 
-	g_pCGamePlayerEquipVTable = (CGamePlayerEquip*)modules::server->FindVirtualTable("CGamePlayerEquip");
-	if (!g_pCGamePlayerEquipVTable)
+	if (!pCGameEventManagerVTable)
 	{
-		Panic("Failed to find CGamePlayerEquip vtable\n");
+		Panic("Failed to find CGameEventManager vtable\n");
 		bRequiredInitLoaded = false;
 	}
 
-	int offset = g_GameConfig->GetOffset("CBaseEntity::Use");
+	offset = KHook::GetVtableIndex(&IGameEventManager2::LoadEventsFromFile);
 
 	if (offset == -1)
 	{
-		Panic("Failed to find CBaseEntity::Use\n");
+		Panic("Failed to find offset for IGameEventManager2::LoadEventsFromFile\n");
 		bRequiredInitLoaded = false;
 	}
 
-	playerEquipUseHook.SetIndex(offset);
-	playerEquipUseHook.Add(g_pCGamePlayerEquipVTable);
+	loadEventsFromFileHook.Configure(pCGameEventManagerVTable[offset]);
 
-	offset = g_GameConfig->GetOffset("CBaseEntity::Precache");
-	if (offset == -1)
+	void** pCGamePlayerEquipVTable = modules::server->FindVirtualTable("CGamePlayerEquip");
+	if (!pCGamePlayerEquipVTable)
 	{
-		Panic("Failed to find CBaseEntity::Precache\n");
+		Panic("Failed to find CGamePlayerEquip vtable\n");
 		bRequiredInitLoaded = false;
 	}
 
-	playerEquipPrecacheHook.SetIndex(offset);
-	playerEquipPrecacheHook.Add(g_pCGamePlayerEquipVTable);
+	offset = g_GameConfig->GetOffset("CBaseEntity::Use");
+
+	if (offset == -1)
+	{
+		Panic("Failed to find CBaseEntity::Use\n");
+		bRequiredInitLoaded = false;
+	}
 
-	offset = g_GameConfig->GetOffset("IGameTypes_CreateWorkshopMapGroup");
+	playerEquipUseHook.Configure(pCGamePlayerEquipVTable[offset]);
 
+	offset = g_GameConfig->GetOffset("CBaseEntity::Precache");
 	if (offset == -1)
 	{
-		Panic("Failed to find IGameTypes_CreateWorkshopMapGroup\n");
+		Panic("Failed to find CBaseEntity::Precache\n");
 		bRequiredInitLoaded = false;
 	}
 
-	createWorkshopMapGroupHook.SetIndex(offset);
-	createWorkshopMapGroupHook.Add(g_pGameTypes);
+	playerEquipPrecacheHook.Configure(pCGamePlayerEquipVTable[offset]);
 
-	g_pCCSPlayerPawnVTable = (CCSPlayerPawn*)modules::server->FindVirtualTable("CCSPlayerPawn");
+	void** pCCSPlayerPawnVTable = modules::server->FindVirtualTable("CCSPlayerPawn");
 
-	if (!g_pCCSPlayerPawnVTable)
+	if (!pCCSPlayerPawnVTable)
 	{
 		Panic("Failed to find CCSPlayerPawn vtable\n");
 		bRequiredInitLoaded = false;
@@ -297,12 +296,11 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 		bRequiredInitLoaded = false;
 	}
 
-	onTakeDamageAliveHook.SetIndex(offset);
-	onTakeDamageAliveHook.Add(g_pCCSPlayerPawnVTable);
+	onTakeDamageAliveHook.Configure(pCCSPlayerPawnVTable[offset]);
 
-	g_pCCSPlayer_MovementServicesVTable = (CCSPlayer_MovementServices*)modules::server->FindVirtualTable("CCSPlayer_MovementServices");
+	void** pCCSPlayer_MovementServicesVTable = modules::server->FindVirtualTable("CCSPlayer_MovementServices");
 
-	if (!g_pCCSPlayer_MovementServicesVTable)
+	if (!pCCSPlayer_MovementServicesVTable)
 	{
 		Panic("Failed to find CCSPlayer_MovementServices vtable\n");
 		bRequiredInitLoaded = false;
@@ -315,12 +313,11 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 		bRequiredInitLoaded = false;
 	}
 
-	checkMovingGroundHook.SetIndex(offset);
-	checkMovingGroundHook.Add(g_pCCSPlayer_MovementServicesVTable);
+	checkMovingGroundHook.Configure(pCCSPlayer_MovementServicesVTable[offset]);
 
-	g_pCCSGameRulesVTable = (CCSGameRules*)modules::server->FindVirtualTable("CCSGameRules");
+	void** pCCSGameRulesVTable = modules::server->FindVirtualTable("CCSGameRules");
 
-	if (!g_pCCSGameRulesVTable)
+	if (!pCCSGameRulesVTable)
 	{
 		Panic("Failed to find CCSGameRules vtable\n");
 		bRequiredInitLoaded = false;
@@ -333,12 +330,11 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 		bRequiredInitLoaded = false;
 	}
 
-	goToIntermissionHook.SetIndex(offset);
-	goToIntermissionHook.Add(g_pCCSGameRulesVTable);
+	goToIntermissionHook.Configure(pCCSGameRulesVTable[offset]);
 
-	g_pCVPhys2WorldVTable = (CVPhys2World*)modules::vphysics2->FindVirtualTable("CVPhys2World");
+	void** pCVPhys2WorldVTable = modules::vphysics2->FindVirtualTable("CVPhys2World");
 
-	if (!g_pCVPhys2WorldVTable)
+	if (!pCVPhys2WorldVTable)
 	{
 		Panic("Failed to find CVPhys2World vtable\n");
 		bRequiredInitLoaded = false;
@@ -351,12 +347,11 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 		bRequiredInitLoaded = false;
 	}
 
-	physicsTouchShuffleHook.SetIndex(offset);
-	physicsTouchShuffleHook.Add(g_pCVPhys2WorldVTable);
+	physicsTouchShuffleHook.Configure(pCVPhys2WorldVTable[offset]);
 
-	g_pCCSPlayer_WeaponServicesVTable = (CCSPlayer_WeaponServices*)modules::server->FindVirtualTable("CCSPlayer_WeaponServices");
+	void** pCCSPlayer_WeaponServicesVTable = modules::server->FindVirtualTable("CCSPlayer_WeaponServices");
 
-	if (!g_pCCSPlayer_WeaponServicesVTable)
+	if (!pCCSPlayer_WeaponServicesVTable)
 	{
 		Panic("Failed to find CCSPlayer_WeaponServices vtable\n");
 		bRequiredInitLoaded = false;
@@ -369,8 +364,7 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 		bRequiredInitLoaded = false;
 	}
 
-	dropWeaponHook.SetIndex(offset);
-	dropWeaponHook.Add(g_pCCSPlayer_WeaponServicesVTable);
+	dropWeaponHook.Configure(pCCSPlayer_WeaponServicesVTable[offset]);
 
 	if (!bRequiredInitLoaded)
 	{
@@ -470,15 +464,15 @@ bool CS2Fixes::Unload(char* error, size_t maxlen)
 	startupServerHook.Remove(g_pNetworkServerService);
 	checkTransmitHook.Remove(g_pSource2GameEntities);
 	dispatchConCommandHook.Remove(g_pCVar);
-	loadEventsFromFileHook.Remove(g_pCGameEventManagerVTable);
-	playerEquipUseHook.Remove(g_pCGamePlayerEquipVTable);
-	playerEquipPrecacheHook.Remove(g_pCGamePlayerEquipVTable);
 	createWorkshopMapGroupHook.Remove(g_pGameTypes);
-	onTakeDamageAliveHook.Remove(g_pCCSPlayerPawnVTable);
-	checkMovingGroundHook.Remove(g_pCCSPlayer_MovementServicesVTable);
-	goToIntermissionHook.Remove(g_pCCSGameRulesVTable);
-	physicsTouchShuffleHook.Remove(g_pCVPhys2WorldVTable);
-	dropWeaponHook.Remove(g_pCCSPlayer_WeaponServicesVTable);
+	loadEventsFromFileHook.~Member();
+	playerEquipUseHook.~Member();
+	playerEquipPrecacheHook.~Member();
+	onTakeDamageAliveHook.~Member();
+	checkMovingGroundHook.~Member();
+	goToIntermissionHook.~Member();
+	physicsTouchShuffleHook.~Member();
+	dropWeaponHook.~Member();
 
 	ConVar_Unregister();
 
diff --git a/src/utils/module.h b/src/utils/module.h
@@ -170,7 +170,7 @@ class CModule
 #ifdef _WIN32
 	void InitializeSections();
 #endif
-	void* FindVirtualTable(const std::string& name);
+	void** FindVirtualTable(const std::string& name);
 
 public:
 	const char* m_pszModule;
diff --git a/src/utils/plat_unix.cpp b/src/utils/plat_unix.cpp
@@ -205,7 +205,7 @@ void Plat_WriteMemory(void* pPatchAddress, uint8_t* pPatch, int iPatchSize)
 	result = mprotect(align_addr, align_size, old_prot);
 }
 
-void* CModule::FindVirtualTable(const std::string& name)
+void** CModule::FindVirtualTable(const std::string& name)
 {
 	auto readOnlyData = GetSection(".rodata");
 	auto readOnlyRelocations = GetSection(".data.rel.ro");
@@ -248,7 +248,7 @@ void* CModule::FindVirtualTable(const std::string& name)
 
 		while (void* vtable = sigIt3.FindNext(false))
 			if (*(int64_t*)((uintptr_t)vtable - 0x8) == 0)
-				return (void*)((uintptr_t)vtable + 0x8);
+				return (void**)((uintptr_t)vtable + 0x8);
 	}
 
 	Warning("Failed to find vtable for %s\n", name.c_str());
diff --git a/src/utils/plat_win.cpp b/src/utils/plat_win.cpp
@@ -48,7 +48,7 @@ void CModule::InitializeSections()
 	}
 }
 
-void* CModule::FindVirtualTable(const std::string& name)
+void** CModule::FindVirtualTable(const std::string& name)
 {
 	auto runTimeData = GetSection(".data");
 	auto readOnlyData = GetSection(".rdata");
@@ -98,7 +98,7 @@ void* CModule::FindVirtualTable(const std::string& name)
 			return nullptr;
 		}
 
-		return (void*)((uintptr_t)vtable + 0x8);
+		return (void**)((uintptr_t)vtable + 0x8);
 	}
 
 	Warning("Failed to find RTTI Complete Object Locator for %s\n", name.c_str());

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ void Plat_WriteMemory(void* pPatchAddress, uint8_t* pPatch, int iPatchSize)`
`205`	`205`	`result = mprotect(align_addr, align_size, old_prot);`
`206`	`206`	`}`
`207`	`207`
`208`		`-void* CModule::FindVirtualTable(const std::string& name)`
	`208`	`+void** CModule::FindVirtualTable(const std::string& name)`
`209`	`209`	`{`
`210`	`210`	`auto readOnlyData = GetSection(".rodata");`
`211`	`211`	`auto readOnlyRelocations = GetSection(".data.rel.ro");`
`@@ -248,7 +248,7 @@ void* CModule::FindVirtualTable(const std::string& name)`
`248`	`248`
`249`	`249`	`while (void* vtable = sigIt3.FindNext(false))`
`250`	`250`	`if ((int64_t)((uintptr_t)vtable - 0x8) == 0)`
`251`		`- return (void*)((uintptr_t)vtable + 0x8);`
	`251`	`+ return (void**)((uintptr_t)vtable + 0x8);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`Warning("Failed to find vtable for %s\n", name.c_str());`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void CModule::InitializeSections()`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-void* CModule::FindVirtualTable(const std::string& name)`
	`51`	`+void** CModule::FindVirtualTable(const std::string& name)`
`52`	`52`	`{`
`53`	`53`	`auto runTimeData = GetSection(".data");`
`54`	`54`	`auto readOnlyData = GetSection(".rdata");`
`@@ -98,7 +98,7 @@ void* CModule::FindVirtualTable(const std::string& name)`
`98`	`98`	`return nullptr;`
`99`	`99`	`}`
`100`	`100`
`101`		`- return (void*)((uintptr_t)vtable + 0x8);`
	`101`	`+ return (void**)((uintptr_t)vtable + 0x8);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`Warning("Failed to find RTTI Complete Object Locator for %s\n", name.c_str());`