Switch RakClient intf hooks to kthook

A plugin named as connd was setting up interface hook to the same location where RakLua it does.

To prevent crash, we have to add compatibility with 3rd party hooks too, but rtdhook can't do this

So, let's use kthook, yeah...

Author: Northn

RakLua.lua

@@ -11,15 +11,15 @@ local events = {
 
 local addEventHandler_orig = addEventHandler
 
-function hookAddEventHandler(event, func)
+local function hookAddEventHandler(event, func)
     if events[event] then
         RakLuaDll.registerHandler(events[event], func)
     else
         addEventHandler_orig(event, func)
     end
 end
 
-function defineSampLuaCompatibility()
+local function defineSampLuaCompatibility()
     RakLuaDll.defineGlobals()
 
     addEventHandler = hookAddEventHandler

src/RakLua.cpp

@@ -22,7 +22,8 @@ RakLua::eInitState RakLua::initialize()
 
 	mState = eInitState::INITIALIZING;
 
-	mRakClientIntfConstructor = new rtdhook(sampGetRakClientIntfConstructorPtr(), &hookRakClientIntfConstructor, 7);
+	mRakClientIntfConstructor = new kthook::kthook_simple<uintptr_t(*)()>(sampGetRakClientIntfConstructorPtr());
+	mRakClientIntfConstructor->set_cb(hookRakClientIntfConstructor);
 	mRakClientIntfConstructor->install();
 
 returnState:
@@ -229,9 +230,9 @@ bool __fastcall handleIncomingRpc(void* ptr, void*, unsigned char* data, int len
 		(gRakLua.getRpcHook()->getTrampoline())(ptr, bs.GetData(), bs.GetNumberOfBytesUsed(), playerId);
 }
 
-uintptr_t hookRakClientIntfConstructor()
+uintptr_t hookRakClientIntfConstructor(const kthook::kthook_simple<uintptr_t(*)()> &hook)
 {
-	uintptr_t rakClientInterface = reinterpret_cast<uintptr_t(*)()>(gRakLua.getIntfConstructorHook()->getTrampoline())();
+	uintptr_t rakClientInterface = gRakLua.getIntfConstructorHook()->call_trampoline();
 	if (rakClientInterface)
 	{
 		gRakPeer = reinterpret_cast<void*>(rakClientInterface - 0xDDE);

src/RakLua.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "RakLuaBitStream.h"
+#include "kthook/kthook.hpp"
 #include "samp.hpp"
 
 class RakLua
@@ -12,9 +13,9 @@ class RakLua
 private:
 	eInitState		mState = eInitState::NOT_INITIALIZED;
 
-	rtdhook_vmt*	mVmtHook = nullptr;
-	rtdhook*		mIncomingRpcHandlerHook = nullptr;
-	rtdhook*		mRakClientIntfConstructor = nullptr;
+	rtdhook_vmt*								mVmtHook = nullptr;
+	rtdhook*									mIncomingRpcHandlerHook = nullptr;
+	kthook::kthook_simple<uintptr_t(*)()>*		mRakClientIntfConstructor = nullptr;
 
 	struct handlers {
 		std::vector<event_handler_t> incomingRpc;
@@ -37,7 +38,7 @@ class RakLua
 	inline rtdhook_vmt* getVmtHook()	{ return mVmtHook; };
 	inline handlers&	getHandlers()	{ return mHandlers; };
 	inline rtdhook*		getRpcHook()	{ return mIncomingRpcHandlerHook; };
-	inline rtdhook*		getIntfConstructorHook() { return mRakClientIntfConstructor; }
+	inline auto			getIntfConstructorHook() { return mRakClientIntfConstructor; }
 
 	template <typename... Args>
 	static bool safeCall(sol::function handler, Args&&... args);
@@ -66,4 +67,4 @@ bool __fastcall handleOutgoingPacket(void* ptr, void*, BitStream* bitStream, Pac
 Packet* __fastcall handleIncomingPacket(void* ptr, void*);
 bool __fastcall handleOutgoingRpc(void* ptr, void*, int* id, BitStream* bitStream, PacketPriority priority, PacketReliability reliability, char orderingChannel, bool shiftTimestamp);
 bool __fastcall handleIncomingRpc(void* ptr, void*, unsigned char* data, int length, PlayerID playerId);
-uintptr_t hookRakClientIntfConstructor();
+uintptr_t hookRakClientIntfConstructor(const kthook::kthook_simple<uintptr_t(*)()>& hook);

src/libs/kthook

@@ -0,0 +1 @@
+Subproject commit bdba30e12a15ffce733428789dcc6b3e014df4a3

src/main.cpp

@@ -234,7 +234,7 @@ sol::table open(sol::this_state ts)
 		gRakLua.initialize();
 
 	sol::table module = lua.create_table();
-	module["VERSION"] = 2.1;
+	module["VERSION"] = 2.11;
 	module.set_function("getState", &getState);
 
 	module.set_function("registerHandler", &registerHandler);
@@ -261,3 +261,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 	}
 	return TRUE;
 }
+
+// the dumbest linker error hack
+#include "hde/hde32.h"
+#include "hde/hde32.c"

src/moonloader-module.vcxproj

@@ -21,14 +21,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -61,7 +61,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_BUILD_AS_DLL;MODULE_NAME=$(ProjectName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>.\libs\lua;.\libs\sol2;.\libs\samp;.\libs\rtdhook;.\libs\raknet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\libs\lua;.\libs\sol2;.\libs\samp;.\libs\rtdhook;.\libs\raknet;.\libs\kthook\xbyak;.\libs\kthook\include;.\libs\kthook;.\libs\kthook\ktsignal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
@@ -85,11 +85,11 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUA_BUILD_AS_DLL;MODULE_NAME=$(ProjectName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>.\libs\lua;.\libs\sol2;.\libs\samp;.\libs\rtdhook;.\libs\raknet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\libs\lua;.\libs\sol2;.\libs\samp;.\libs\rtdhook;.\libs\raknet;.\libs\kthook\xbyak;.\libs\kthook\include;.\libs\kthook;.\libs\kthook\ktsignal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <LanguageStandard_C>Default</LanguageStandard_C>
       <DisableSpecificWarnings>26812</DisableSpecificWarnings>
     </ClCompile>
     <Link>