alliedmodders · rtldg · Mar 1, 2025 · Mar 2, 2025 · Mar 2, 2025 · Mar 2, 2025
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,6 @@ build/
 build-*/
 obj-*/
 .gdb_history
+
+.vs/*
+.vscode/*
diff --git a/core/AMBuilder b/core/AMBuilder
@@ -41,7 +41,7 @@ for sdk_target in MMS.sdk_targets:
 
   if cxx.target.arch == 'x86':
     binary.sources += ['sourcehook/sourcehook_hookmangen_x86.cpp']
-  elif binary.compiler.target.arch == 'x86_64' and binary.compiler.target.platform != 'linux':
+  elif binary.compiler.target.arch == 'x86_64':
     binary.sources += ['sourcehook/sourcehook_hookmangen_x86_64.cpp']
   nodes = builder.Add(binary)
   MMS.binaries += [nodes]
diff --git a/core/metamod.cpp b/core/metamod.cpp
@@ -84,9 +84,7 @@ static MetamodSourceConVar *mm_basedir = NULL;
 static CreateInterfaceFn engine_factory = NULL;
 static CreateInterfaceFn physics_factory = NULL;
 static CreateInterfaceFn filesystem_factory = NULL;
-#if !defined( __amd64__ )
 static CHookManagerAutoGen g_SH_HookManagerAutoGen(&g_SourceHook);
-#endif
 static META_RES last_meta_res;
 static IServerPluginCallbacks *vsp_callbacks = NULL;
 static bool were_plugins_loaded = false;
@@ -846,7 +844,6 @@ void *MetamodSource::MetaFactory(const char *iface, int *ret, PluginId *id)
 		}
 		return static_cast<void *>(static_cast<ISmmPluginManager *>(&g_PluginMngr));
 	}
-#if !defined( __amd64__ )
 	else if (strcmp(iface, MMIFACE_SH_HOOKMANAUTOGEN) == 0)
 	{
 		if (ret)
@@ -855,7 +852,7 @@ void *MetamodSource::MetaFactory(const char *iface, int *ret, PluginId *id)
 		}
 		return static_cast<void *>(static_cast<SourceHook::IHookManagerAutoGen *>(&g_SH_HookManagerAutoGen));
 	}
-#endif
+
 	CPluginManager::CPlugin *pl;
 	List<IMetamodListener *>::iterator event;
 	IMetamodListener *api;

diff --git a/core/sourcehook/generate/sourcehook.hxx b/core/sourcehook/generate/sourcehook.hxx
@@ -199,7 +199,7 @@ namespace SourceHook
 			// SH tries to auto-detect these
 			// If you want to override SH's auto-detection, pass them in yourself
 			PassFlag_RetMem		= (1<<6),		/**< Object is returned in memory (through hidden first param */
-			PassFlag_RetReg		= (1<<7)		/**< Object is returned in EAX(:EDX)/RAX(x86_64) */
+			PassFlag_RetReg		= (1<<7)		/**< Object is returned in EAX(:EDX) (x86) / RAX(:RDX)/XMM0(:XMM1) (x86_64) */
 		};
 
 		size_t size;			//!< Size of the data being passed

diff --git a/core/sourcehook/sh_asm_x86_64.h b/core/sourcehook/sh_asm_x86_64.h
@@ -464,7 +464,8 @@ namespace SourceHook
 				this->write_int32(imm);
 			}
 
-			void xor(x86_64_Reg dst, x86_64_Reg src) {
+			// can't name it `xor` because that's a C++ keyword (it works in VS tho but not clang)
+			void xor_reg(x86_64_Reg dst, x86_64_Reg src) {
 				this->write_ubyte(w_rex(src, dst));
 				this->write_ubyte(0x31);
 				this->write_ubyte(modrm(src, dst));
@@ -581,6 +582,10 @@ namespace SourceHook
 			void retn() {
 				this->write_ubyte(0xC3);
 			}
+
+			void leave() {
+				this->write_ubyte(0xC9);
+			}
 		};
 	}
 }
diff --git a/core/sourcehook/sourcehook.h b/core/sourcehook/sourcehook.h
@@ -198,8 +198,8 @@ namespace SourceHook
 			// The following two flags are only relevant for byval return types.
 			// SH tries to auto-detect these
 			// If you want to override SH's auto-detection, pass them in yourself
-			PassFlag_RetMem		= (1<<6),		/**< Object is returned in memory (through hidden first param */
-			PassFlag_RetReg		= (1<<7)		/**< Object is returned in EAX(:EDX)/RAX(x86_64) */
+			PassFlag_RetMem		= (1<<6),		/**< Object is returned in memory (through hidden first param) */
+			PassFlag_RetReg		= (1<<7)		/**< Object is returned in EAX(:EDX) (x86) / RAX(:RDX)/XMM0(:XMM1) (x86_64) */
 		};
 
 		size_t size;			//!< Size of the data being passed

diff --git a/core/sourcehook/sourcehook_hookmangen.cpp b/core/sourcehook/sourcehook_hookmangen.cpp
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include "sourcehook_impl.h"
 #include "sourcehook_hookmangen.h"
-#if defined( PLATFORM_64BITS ) && !defined( _LINUX )
+#if defined( PLATFORM_64BITS )
 #include "sourcehook_hookmangen_x86_64.h"
 typedef SourceHook::Impl::x64GenContext SHGenContext;
 #else
@@ -61,9 +61,6 @@ namespace SourceHook
 
 		HookManagerPubFunc CHookManagerAutoGen::MakeHookMan(const ProtoInfo *proto, int vtbl_offs, int vtbl_idx)
 		{
-#if defined( PLATFORM_64BITS ) && defined( _LINUX )
-			return nullptr;
-#else
 			CProto mproto(proto);
 			for (auto iter = m_Contexts.begin(); iter != m_Contexts.end(); ++iter)
 			{
@@ -85,7 +82,6 @@ namespace SourceHook
 				m_Contexts.emplace_back(std::move(sctx));
 			}
 			return pubFunc;
-#endif
 		}
 
 		void CHookManagerAutoGen::ReleaseHookMan(HookManagerPubFunc pubFunc)