CDetour safetyhook (#2162)

* Add safetyhook, remove libudis86

Co-authored-by: bottiger1 <[email protected]>

* Add modified CDetour

Co-authored-by: bottiger1 <[email protected]>

* Add CDetour [Safetyhook] to build script

* Re-enable loader/core/corelogic, and fix new C++20 error

* Reenable all extensions (except dhooks)

* Make cstrike compile against new CDetour

* Remove unused variable in sdktools output?

* Make sdktools compile against new cdetour

* Downgrade to C++17

* remove auto

* fix compilation on linux

* Re-enable dhooks

* Re-authorise old compilers

* Fix invalid downgrade of std::optional

* readd libudis86 for dhooks only

---------

Co-authored-by: Kenzzer <[email protected]>
Co-authored-by: bottiger1 <[email protected]>

AMBuildScript

@@ -520,6 +520,16 @@ class SMConfig(object):
 
     return binary
 
+  def AddCDetour(self, binary):
+    public_path = os.path.join(builder.sourcePath, 'public')
+    binary.sources += [
+      os.path.join(public_path, 'CDetour', 'detours.cpp'),
+      os.path.join(public_path, 'safetyhook', 'safetyhook.cpp'),
+      os.path.join(public_path, 'safetyhook', 'Zydis.c')
+    ]
+    binary.compiler.cxxincludes += [ os.path.join(public_path, 'safetyhook') ]
+    binary.compiler.includes += [ os.path.join(public_path, 'safetyhook') ]
+
   def HL2Library(self, context, compiler, name, sdk):
     binary = self.Library(context, compiler, name)
     self.ConfigureForExtension(context, binary.compiler)

core/logic/ExtensionSys.cpp

@@ -395,11 +395,6 @@ void CExtension::AddDependency(const IfaceInfo *pInfo)
 	}
 }
 
-bool operator ==(const IfaceInfo &i1, const IfaceInfo &i2)
-{
-	return (i1.iface == i2.iface) && (i1.owner == i2.owner);
-}
-
 void CExtension::AddChildDependent(CExtension *pOther, SMInterface *iface)
 {
 	IfaceInfo info;

core/logic/ShareSys.h

@@ -59,7 +59,7 @@ namespace SourceMod
 
 struct IfaceInfo
 {
-	bool operator ==(const IfaceInfo &info)
+	bool operator ==(const IfaceInfo &info) const
 	{
 		return (info.iface == iface && info.owner == owner);
 	}

extensions/cstrike/AMBuilder

@@ -9,15 +9,7 @@ project.sources += [
   'timeleft.cpp',
   'forwards.cpp',
   'util_cstrike.cpp',
-  '../../public/smsdk_ext.cpp',
-  '../../public/CDetour/detours.cpp',
-  '../../public/asm/asm.c',
-  '../../public/libudis86/decode.c',
-  '../../public/libudis86/itab.c',
-  '../../public/libudis86/syn-att.c',
-  '../../public/libudis86/syn-intel.c',
-  '../../public/libudis86/syn.c',
-  '../../public/libudis86/udis86.c',
+  '../../public/smsdk_ext.cpp'
 ]
 
 for sdk_name in ['css', 'csgo']:
@@ -34,6 +26,8 @@ for sdk_name in ['css', 'csgo']:
 
     cxx.defines += ['HAVE_STRING_H']
     binary = SM.HL2ExtConfig(project, builder, cxx, 'game.cstrike.ext.' + sdk['extension'], sdk)
+    SM.AddCDetour(binary)
+
     if sdk_name == 'csgo':
       compiler = binary.compiler
       compiler.cxxincludes += [os.path.join(sdk['path'], 'public', 'steam')]

extensions/dhooks/AMBuilder

@@ -19,6 +19,7 @@ for cxx in builder.targets:
   binary.compiler.cxxincludes += [
     os.path.join(SM.mms_root, 'core'),
     os.path.join(SM.mms_root, 'core', 'sourcehook'),
+    os.path.join(builder.sourcePath, 'extensions', 'dhooks'),
     os.path.join(builder.sourcePath, 'public', 'jit'),
     os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
     os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
@@ -27,6 +28,10 @@ for cxx in builder.targets:
     os.path.join(builder.sourcePath, 'extensions', 'dhooks', 'DynamicHooks'),
   ]
 
+  binary.compiler.includes += [
+    os.path.join(builder.sourcePath, 'extensions', 'dhooks')
+  ]
+
   binary.sources += [
     'extension.cpp',
     'listeners.cpp',
@@ -36,13 +41,13 @@ for cxx in builder.targets:
     'util.cpp',
     'dynhooks_sourcepawn.cpp',
     '../../public/smsdk_ext.cpp',
-    '../../public/asm/asm.c',
-    '../../public/libudis86/decode.c',
-    '../../public/libudis86/itab.c',
-    '../../public/libudis86/syn-att.c',
-    '../../public/libudis86/syn-intel.c',
-    '../../public/libudis86/syn.c',
-    '../../public/libudis86/udis86.c',
+    'asm/asm.c',
+    'libudis86/decode.c',
+    'libudis86/itab.c',
+    'libudis86/syn-att.c',
+    'libudis86/syn-intel.c',
+    'libudis86/syn.c',
+    'libudis86/udis86.c',
     '../../sourcepawn/vm/x86/assembler-x86.cpp',
   ]
 

extensions/sdktools/AMBuilder

@@ -24,15 +24,7 @@ project.sources += [
   'hooks.cpp',
   'gamerulesnatives.cpp',
   'vstringtable.cpp',
-  '../../public/smsdk_ext.cpp',
-  '../../public/CDetour/detours.cpp',
-  '../../public/asm/asm.c',
-  '../../public/libudis86/decode.c',
-  '../../public/libudis86/itab.c',
-  '../../public/libudis86/syn-att.c',
-  '../../public/libudis86/syn-intel.c',
-  '../../public/libudis86/syn.c',
-  '../../public/libudis86/udis86.c',
+  '../../public/smsdk_ext.cpp'
 ]
 
 for sdk_name in SM.sdks:
@@ -45,18 +37,20 @@ for sdk_name in SM.sdks:
       continue
 
     binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk['extension'], sdk)
+    SM.AddCDetour(binary)
+
     binary.compiler.cxxincludes += [
       os.path.join(builder.sourcePath, 'public', 'jit'),
       os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
     ]
 
     if sdk['name'] in ('episode1', 'darkm'):
-      binary.compiler.cxxincludes += [os.path.join(builder.options.hl2sdk_root, sdk['path'], 'game_shared')]
-      binary.compiler.cxxincludes += [os.path.join(builder.options.hl2sdk_root, sdk['path'], 'dlls')]
+      binary.compiler.cxxincludes += [os.path.join(sdk['path'], 'game_shared')]
+      binary.compiler.cxxincludes += [os.path.join(sdk['path'], 'dlls')]
     else:
       binary.compiler.cxxincludes += [
-        os.path.join(builder.options.hl2sdk_root, sdk['path'], 'game', 'shared'),
-        os.path.join(builder.options.hl2sdk_root, sdk['path'], 'game', 'server'),
+        os.path.join(sdk['path'], 'game', 'shared'),
+        os.path.join(sdk['path'], 'game', 'server'),
       ]
 
     #binary.sources += [os.path.join(builder.options.hl2sdk_root, sdk['path'], 'game', 'server', 'variant_t.cpp')]

extensions/sdktools/output.h

@@ -128,7 +128,6 @@ class EntityOutputManager : public IPluginsListener
 
 	int HookCount;
 
-	patch_t info_restore;
 	void *info_address;
 	void *info_callback;
 };

extensions/tf2/AMBuilder

@@ -8,6 +8,7 @@ if 'tf2' in SM.sdks:
     if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
       continue
     binary = SM.HL2Library(builder, cxx, 'game.tf2.ext.' + sdk['extension'], sdk)
+    SM.AddCDetour(binary)
     binary.sources += [
       'extension.cpp',
       'natives.cpp',
@@ -18,15 +19,7 @@ if 'tf2' in SM.sdks:
       'teleporter.cpp',
       'gameplayrules.cpp',
       'conditions.cpp',
-      '../../public/smsdk_ext.cpp',
-      '../../public/CDetour/detours.cpp',
-      '../../public/asm/asm.c',
-      '../../public/libudis86/decode.c',
-      '../../public/libudis86/itab.c',
-      '../../public/libudis86/syn-att.c',
-      '../../public/libudis86/syn-intel.c',
-      '../../public/libudis86/syn.c',
-      '../../public/libudis86/udis86.c',
+      '../../public/smsdk_ext.cpp'
     ]
     binary.compiler.defines += ['HAVE_STRING_H']
     SM.extensions += [builder.Add(binary)]