Replace SourceHook and CDetour with KHook

.github/workflows/mocktest.yml

@@ -22,6 +22,7 @@ jobs:
         name: Clone metamod-source
         with:
           repository: alliedmodders/metamod-source
+          ref: k/sourcehook_alternative
           submodules: recursive
           path: metamod-source
 

.github/workflows/pr-checks.yml

@@ -34,7 +34,7 @@ jobs:
       DEPENDENCIES_FOLDER: dependencies
       DEPENDENCIES_ROOT: ${{ github.workspace }}/dependencies
       MYSQL_VERSION: '5.7'
-      MMSOURCE_VERSION: '1.12'
+      MMSOURCE_VERSION: '2.0'
     steps:
       - uses: actions/checkout@v6
         with:
@@ -96,3 +96,9 @@ jobs:
           cd build
           python ../configure.py --enable-optimize --sdks=${{ join(fromJSON(env.SDKS)) }} --targets=${{ env.ARCH }} --mms-path=${{ env.DEPENDENCIES_ROOT }}/mmsource-${{ env.MMSOURCE_VERSION }} --hl2sdk-root=${{ env.DEPENDENCIES_ROOT }} --mysql-path=${{ env.DEPENDENCIES_ROOT }}/mysql-${{ env.MYSQL_VERSION }} --mysql64-path=${{ env.DEPENDENCIES_ROOT }}/mysql-${{ env.MYSQL_VERSION }}-x86_64
           ambuild
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v7
+        with:
+          path: sourcemod/build/package
+          name: ${{ matrix.os_short }}-${{ matrix.compiler_cc }}

.gitmodules

@@ -9,6 +9,6 @@
 [submodule "hl2sdk-manifests"]
 	path = hl2sdk-manifests
 	url = https://github.com/alliedmodders/hl2sdk-manifests.git
-[submodule "public/safetyhook"]
-	path = public/safetyhook
-	url = https://github.com/alliedmodders/safetyhook
+[submodule "core/logic/libaddrz"]
+	path = core/logic/libaddrz
+	url = https://github.com/dvander/libaddrz.git

AMBuildScript

@@ -55,7 +55,6 @@ class SMConfig(object):
     self.target_archs = set()
     self.enable_asan = getattr(builder.options, 'enable_asan', False)
     self.asan_libs = {}
-    self.libsafetyhook = {}
 
     if builder.options.targets:
       target_archs = builder.options.targets.split(',')
@@ -128,7 +127,7 @@ class SMConfig(object):
     if builder.options.mms_path:
       self.mms_root = builder.options.mms_path
     else:
-      self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
+      self.mms_root = ResolveEnvPath('MMSOURCE200', 'mmsource-2.0')
       if not self.mms_root:
         self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
       if not self.mms_root:
@@ -499,6 +498,11 @@ class SMConfig(object):
       os.path.join(builder.sourcePath, 'public', 'amtl', 'amtl'),
       os.path.join(builder.sourcePath, 'public', 'amtl'),
     ]
+
+    compiler.cxxincludes += [
+      os.path.join(self.mms_root, 'core'),
+      os.path.join(self.mms_root, 'third_party', 'khook', 'include'),
+    ]
     return compiler
 
   def ExtLibrary(self, context, compiler, name):
@@ -517,29 +521,13 @@ class SMConfig(object):
     compiler = binary.compiler
     SetArchFlags(compiler)
 
-    compiler.cxxincludes += [
-      os.path.join(self.mms_root, 'core'),
-      os.path.join(self.mms_root, 'core', 'sourcehook'),
-    ]
-
     for other_sdk in self.sdk_manifests:
       compiler.defines += ['SE_{}={}'.format(other_sdk['define'], other_sdk['code'])]
 
     SdkHelpers.configureCxx(context, binary, sdk)
 
     return binary
 
-  def AddCDetour(self, binary):
-    public_path = os.path.join(builder.sourcePath, 'public')
-    binary.sources += [ os.path.join(public_path, 'CDetour', 'detours.cpp') ]
-    binary.compiler.cxxincludes += [ os.path.join(public_path, 'safetyhook', 'include') ]
-
-    for task in self.libsafetyhook:
-      if task.target.arch == binary.compiler.target.arch:
-        binary.compiler.linkflags += [task.binary]
-        return
-    raise Exception('No suitable build of safetyhook was found.')
-
   def HL2Library(self, context, compiler, name, sdk):
     binary = self.Library(context, compiler, name)
     self.ConfigureForExtension(context, binary.compiler)
@@ -588,16 +576,6 @@ if SM.use_auto_versioning():
     { 'SM': SM }
   )
 
-class SafetyHookShim(object):
-  def __init__(self):
-    self.all_targets = {}
-    self.libsafetyhook = {}
-
-SafetyHook = SafetyHookShim()
-SafetyHook.all_targets = SM.all_targets
-builder.Build('public/safetyhook/AMBuilder', {'SafetyHook': SafetyHook })
-SM.libsafetyhook = SafetyHook.libsafetyhook
-
 class SPRoot(object):
   def __init__(self):
     self.generated_headers = SM.generated_headers
@@ -666,10 +644,10 @@ else:
     'extensions/bintools/AMBuilder',
     'extensions/clientprefs/AMBuilder',
     'extensions/curl/AMBuilder',
-    'extensions/cstrike/AMBuilder',
+    #'extensions/cstrike/AMBuilder',
     'extensions/dhooks/AMBuilder',
     'extensions/geoip/AMBuilder',
-    'extensions/mysql/AMBuilder',
+    #'extensions/mysql/AMBuilder',
     'extensions/pgsql/AMBuilder',
     'extensions/regex/AMBuilder',
     'extensions/sdkhooks/AMBuilder',

bridge/include/IExtensionBridge.h

@@ -29,13 +29,12 @@
 
 #include <sp_vm_api.h>
 #include <IExtensionSys.h>
-#include <sh_vector.h>
+#include <vector>
 
 struct edict_t;
 
 namespace SourceMod {
 
-using namespace SourceHook;
 using namespace SourcePawn;
 class SMPlugin;
 
@@ -51,8 +50,8 @@ class IExtensionSys : public IExtensionManager
 	virtual IExtension *GetExtensionFromIdent(IdentityToken_t *token) = 0;
 	virtual void BindChildPlugin(IExtension *ext, SMPlugin *plugin) = 0;
 	virtual void AddRawDependency(IExtension *myself, IdentityToken_t *token, void *iface) = 0;
-	virtual const CVector<IExtension *> *ListExtensions() = 0;
-	virtual void FreeExtensionList(const CVector<IExtension *> *list) = 0;
+	virtual const std::vector<IExtension *> *ListExtensions() = 0;
+	virtual void FreeExtensionList(const std::vector<IExtension *> *list) = 0;
 	virtual void CallOnCoreMapEnd() = 0;
 };
 
@@ -67,13 +66,13 @@ class AutoExtensionList
 	{
 		extensions_->FreeExtensionList(list_);
 	}
-	const CVector<IExtension *> *operator ->()
+	const std::vector<IExtension *> *operator ->()
 	{
 		return list_;
 	}
 private:
 	IExtensionSys *extensions_;
-	const CVector<IExtension *> *list_;
+	const std::vector<IExtension *> *list_;
 };
 
 } // namespace SourceMod

bridge/include/IScriptManager.h

@@ -29,12 +29,11 @@
 
 #include <sp_vm_api.h>
 #include <IPluginSys.h>
-#include <sh_vector.h>
-#include <sh_string.h>
+#include <vector>
+#include <string>
 
 namespace SourceMod {
 
-using namespace SourceHook;
 using namespace SourcePawn;
 
 class IChangeableForward;
@@ -47,8 +46,8 @@ enum LibraryAction
 
 struct AutoConfig
 {
-	SourceHook::String autocfg;
-	SourceHook::String folder;
+	std::string autocfg;
+	std::string folder;
 	bool create;
 };
 
@@ -82,8 +81,8 @@ class IScriptManager
 	virtual SMPlugin *FindPluginByConsoleArg(const char *text) = 0;
 	virtual SMPlugin *FindPluginByHandle(Handle_t hndl, HandleError *errp) = 0;
 	virtual bool UnloadPlugin(IPlugin *plugin) = 0;
-	virtual const CVector<SMPlugin *> *ListPlugins() = 0;
-	virtual void FreePluginList(const CVector<SMPlugin *> *list) = 0;
+	virtual const std::vector<SMPlugin *> *ListPlugins() = 0;
+	virtual void FreePluginList(const std::vector<SMPlugin *> *list) = 0;
 	virtual void AddFunctionsToForward(const char *name, IChangeableForward *fwd) = 0;
 };
 
@@ -98,13 +97,13 @@ class AutoPluginList
 	{
 		scripts_->FreePluginList(list_);
 	}
-	const CVector<SMPlugin *> *operator ->()
+	const std::vector<SMPlugin *> *operator ->()
 	{
 		return list_;
 	}
 private:
 	IScriptManager *scripts_;
-	const CVector<SMPlugin *> *list_;
+	const std::vector<SMPlugin *> *list_;
 };
 
 } // namespace SourceMod

core/ConCmdManager.cpp

@@ -415,7 +415,7 @@ void RegisterInPlugin(CmdHook *hook)
 
 void ConCmdManager::AddToCmdList(ConCmdInfo *info)
 {
-	List<ConCmdInfo *>::iterator iter = m_CmdList.begin();
+	auto iter = m_CmdList.begin();
 	ConCmdInfo *pInfo;
 	bool inserted = false;
 	const char *orig = NULL;

core/ConCmdManager.h

@@ -43,16 +43,14 @@
 #include "sm_globals.h"
 #include "sourcemm_api.h"
 #include <IForwardSys.h>
-#include <sh_list.h>
-#include <sh_string.h>
+#include <list>
+#include <string>
 #include <IRootConsoleMenu.h>
 #include <IAdminSystem.h>
 #include "concmd_cleaner.h"
 #include "GameHooks.h"
 #include <sm_namehashset.h>
 
-using namespace SourceHook;
-
 struct CmdHook;
 struct ConCmdInfo;
 
@@ -137,7 +135,7 @@ struct ConCmdInfo
 	};
 };
 
-typedef List<ConCmdInfo *> ConCmdList;
+typedef std::list<ConCmdInfo *> ConCmdList;
 
 class ConCmdManager :
 	public SMGlobalClass,
@@ -180,7 +178,7 @@ class ConCmdManager :
 	bool CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin);
 	ConCmdInfo *FindInTrie(const char *name);
 public:
-	inline const List<ConCmdInfo *> & GetCommandList()
+	inline const std::list<ConCmdInfo *> & GetCommandList()
 	{
 		return m_CmdList;
 	}

core/ConVarManager.cpp

@@ -30,7 +30,7 @@
 #include "ConVarManager.h"
 #include "HalfLife2.h"
 #include "sm_stringutil.h"
-#include <sh_vector.h>
+#include <vector>
 #include <sm_namehashset.h>
 #include "logic_bridge.h"
 #include "sourcemod.h"
@@ -40,7 +40,7 @@
 ConVarManager g_ConVarManager;
 
 const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
-typedef List<const ConVar *> ConVarList;
+typedef std::list<const ConVar *> ConVarList;
 NameHashSet<ConVarInfo *, ConVarInfo::ConVarPolicy> convar_cache;
 
 enum {
@@ -114,7 +114,7 @@ void ConVarManager::OnSourceModAllInitialized()
 
 void ConVarManager::OnSourceModShutdown()
 {
-	List<ConVarInfo *>::iterator iter = m_ConVars.begin();
+	auto iter = m_ConVars.begin();
 	HandleSecurity sec(NULL, g_pCoreIdent);
 
 	/* Iterate list of ConVarInfo structures, remove every one of them */
@@ -217,7 +217,7 @@ void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 	}
 
 	/* Clear any references to this plugin as the convar creator */
-	for (List<ConVarInfo *>::iterator iter = m_ConVars.begin(); iter != m_ConVars.end(); ++iter)
+	for (auto iter = m_ConVars.begin(); iter != m_ConVars.end(); ++iter)
 	{
 		ConVarInfo *pInfo = (*iter);
 
@@ -230,7 +230,7 @@ void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 	const IPluginRuntime * pRuntime = plugin->GetRuntime();
 
 	/* Remove convar queries for this plugin that haven't returned results yet */
-	for (List<ConVarQuery>::iterator iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
+	for (auto iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
 	{
 		ConVarQuery &query = (*iter);
 		if (query.pCallback->GetParentRuntime() == pRuntime)
@@ -246,7 +246,7 @@ void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 void ConVarManager::OnClientDisconnected(int client)
 {
 	/* Remove convar queries for this client that haven't returned results yet */
-	for (List<ConVarQuery>::iterator iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
+	for (auto iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
 	{
 		ConVarQuery &query = (*iter);
 		if (query.client == client)
@@ -311,7 +311,6 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const ICommandArgs
 		const char *plname = IS_STR_FILLED(plinfo->name) ? plinfo->name : plugin->GetFilename();
 
 		ConVarList *pConVarList;
-		ConVarList::iterator iter;
 
 		/* If no convar list... */
 		if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
@@ -327,7 +326,7 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const ICommandArgs
 		}
 
 		/* Iterate convar list and display/reset each one */
-		for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
+		for (auto iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
 		{
 			/*const */ConVar *pConVar = const_cast<ConVar *>(*iter);
 			if (!wantReset)
@@ -599,10 +598,18 @@ void ConVarManager::AddConVarToPluginList(IPlugin *plugin, const ConVar *pConVar
 		pConVarList = new ConVarList();
 		plugin->SetProperty("ConVarList", pConVarList);
 	}
-	else if (pConVarList->find(pConVar) != pConVarList->end())
+	else
 	{
 		/* If convar is already in list, then don't add it */
-		return;
+		auto iterS = pConVarList->begin();
+		while (iterS != pConVarList->end() && (*iterS) != pConVar)
+		{
+			iterS++;
+		}
+		if (iterS != pConVarList->end())
+		{
+			return;
+		}
 	}
 
 	/* Insert convar into list which is sorted alphabetically */
@@ -678,9 +685,9 @@ void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
 {
 	IPluginFunction *pCallback = NULL;
 	cell_t value = 0;
-	List<ConVarQuery>::iterator iter;
 
-	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end(); iter++)
+	auto iter = m_ConVarQueries.begin();
+	for (; iter != m_ConVarQueries.end(); iter++)
 	{
 		ConVarQuery &query = (*iter);
 		if (query.cookie == cookie)
@@ -712,7 +719,8 @@ void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
 		pCallback->PushCell(value);
 		pCallback->Execute(&ret);
 
-		m_ConVarQueries.erase(iter);
+		if (iter != m_ConVarQueries.end())
+			m_ConVarQueries.erase(iter);
 	}
 }
 #endif