Replace SourceHook and CDetour with KHook

.github/workflows/mocktest.yml

@@ -1,96 +1,97 @@
-name: hl2sdk-mock tests
-on: 
-  push:
-    branches:
-     - master
-     - '[0-9]+.[0-9]+-dev'
-  pull_request:
-    branches:
-     - master
-     - '[0-9]+.[0-9]+-dev'
-jobs:
-  mock:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/alliedmodders/build-containers/debian11-clang22:latest
-    steps:
-      - uses: actions/checkout@v7
-        name: Clone sourcemod
-        with:
-          submodules: recursive
-          path: sourcemod
-
-      - uses: actions/checkout@v7
-        name: Clone metamod-source
-        with:
-          repository: alliedmodders/metamod-source
-          submodules: recursive
-          path: metamod-source
-
-      - uses: actions/checkout@v7
-        name: Clone hl2sdk-mock
-        with:
-          repository: alliedmodders/hl2sdk-mock
-          submodules: recursive
-          path: hl2sdk-mock
-
-      - name: Build MetaMod:Source
-        working-directory: metamod-source
-        run: |
-          python3 configure.py --enable-optimize --sdks=mock --targets=x86_64
-          ambuild objdir
-
-      - name: Build SourceMod
-        working-directory: sourcemod
-        run: |
-          python3 configure.py --no-mysql --enable-optimize --sdks=mock --targets=x86_64
-          ambuild objdir
-
-      - name: Build hl2sdk-mock
-        working-directory: hl2sdk-mock
-        run: |
-          python3 configure.py --enable-optimize --targets=x86_64
-          ambuild objdir
-
-      - name: Setup gamedir
-        working-directory: hl2sdk-mock
-        shell: bash
-        run: |
-          mkdir ../gamedir
-          ./build_gamedir.sh ../gamedir ../metamod-source/objdir/package
-          ./build_gamedir.sh ../gamedir ../sourcemod/objdir/package
-
-      - name: Compile testsuite
-        working-directory: hl2sdk-mock
-        shell: bash
-        run: |
-          mkdir ../gamedir/addons/sourcemod/plugins/optional
-
-          for f in ../sourcemod/plugins/testsuite/mock/*.sp; do
-            echo "Compiling $(basename $f)"
-            ../gamedir/addons/sourcemod/scripting/spcomp64 -i ../gamedir/addons/sourcemod/scripting/include -o "../gamedir/addons/sourcemod/plugins/optional/$(basename $f .sp).smx" -E "$f"
-          done
-
-      - name: Test
-        working-directory: hl2sdk-mock
-        shell: bash
-        run: |
-          for f in ../gamedir/addons/sourcemod/plugins/optional/*.smx; do
-            echo "==================================="
-            echo "Running $(basename $f)..."
-            echo "==================================="
-            timeout 60 ./objdir/dist/x86_64/srcds -game_dir ../gamedir +map de_thunder -command "sm plugins load optional/$(basename $f)" -run -run-ticks 20 |
-            {
-              failed=0
-              while IFS= read -r line; do
-                echo "$line"
-                if [[ "$line" == *"FAIL"* ]]; then
-                  failed=1
-                fi
-              done
-              if [ "$failed" = "1" ]; then
-                echo "$(basename $f) failed."
-                exit 1
-              fi
-            }
-          done
+name: hl2sdk-mock tests
+on: 
+  push:
+    branches:
+     - master
+     - '[0-9]+.[0-9]+-dev'
+  pull_request:
+    branches:
+     - master
+     - '[0-9]+.[0-9]+-dev'
+jobs:
+  mock:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/alliedmodders/build-containers/debian11-clang22:latest
+    steps:
+      - uses: actions/checkout@v7
+        name: Clone sourcemod
+        with:
+          submodules: recursive
+          path: sourcemod
+
+      - uses: actions/checkout@v7
+        name: Clone metamod-source
+        with:
+          repository: alliedmodders/metamod-source
+          ref: k/sourcehook_alternative
+          submodules: recursive
+          path: metamod-source
+
+      - uses: actions/checkout@v7
+        name: Clone hl2sdk-mock
+        with:
+          repository: alliedmodders/hl2sdk-mock
+          submodules: recursive
+          path: hl2sdk-mock
+
+      - name: Build MetaMod:Source
+        working-directory: metamod-source
+        run: |
+          python3 configure.py --enable-optimize --sdks=mock --targets=x86_64
+          ambuild objdir
+
+      - name: Build SourceMod
+        working-directory: sourcemod
+        run: |
+          python3 configure.py --no-mysql --enable-optimize --sdks=mock --targets=x86_64
+          ambuild objdir
+
+      - name: Build hl2sdk-mock
+        working-directory: hl2sdk-mock
+        run: |
+          python3 configure.py --enable-optimize --targets=x86_64
+          ambuild objdir
+
+      - name: Setup gamedir
+        working-directory: hl2sdk-mock
+        shell: bash
+        run: |
+          mkdir ../gamedir
+          ./build_gamedir.sh ../gamedir ../metamod-source/objdir/package
+          ./build_gamedir.sh ../gamedir ../sourcemod/objdir/package
+
+      - name: Compile testsuite
+        working-directory: hl2sdk-mock
+        shell: bash
+        run: |
+          mkdir ../gamedir/addons/sourcemod/plugins/optional
+
+          for f in ../sourcemod/plugins/testsuite/mock/*.sp; do
+            echo "Compiling $(basename $f)"
+            ../gamedir/addons/sourcemod/scripting/spcomp64 -i ../gamedir/addons/sourcemod/scripting/include -o "../gamedir/addons/sourcemod/plugins/optional/$(basename $f .sp).smx" -E "$f"
+          done
+
+      - name: Test
+        working-directory: hl2sdk-mock
+        shell: bash
+        run: |
+          for f in ../gamedir/addons/sourcemod/plugins/optional/*.smx; do
+            echo "==================================="
+            echo "Running $(basename $f)..."
+            echo "==================================="
+            timeout 60 ./objdir/dist/x86_64/srcds -game_dir ../gamedir +map de_thunder -command "sm plugins load optional/$(basename $f)" -run -run-ticks 20 |
+            {
+              failed=0
+              while IFS= read -r line; do
+                echo "$line"
+                if [[ "$line" == *"FAIL"* ]]; then
+                  failed=1
+                fi
+              done
+              if [ "$failed" = "1" ]; then
+                echo "$(basename $f) failed."
+                exit 1
+              fi
+            }
+          done

.github/workflows/pr-checks.yml

@@ -30,7 +30,7 @@ jobs:
       SDKS: '["episode1","css","tf2","l4d2","csgo","dods"]'
       ARCH: x86,x86_64
       MYSQL_VERSION: '5.7'
-      MMSOURCE_VERSION: '1.12'
+      MMSOURCE_VERSION: '2.0'
     steps:
       - uses: actions/checkout@v7
         with:
@@ -81,3 +81,9 @@ jobs:
             '--mysql-path=${{ steps.path_helper.outputs.dependencies }}/mysql-${{ env.MYSQL_VERSION }}' \
             '--mysql64-path=${{ steps.path_helper.outputs.dependencies }}/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

@@ -54,7 +54,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(',')
@@ -127,7 +126,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:
@@ -516,6 +515,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):
@@ -534,29 +538,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)
@@ -609,16 +597,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
@@ -681,10 +659,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