Completly redone templates, added "vfnptrs"
authorPavol Marko <pavolmarko@gmail.com>
Fri Apr 29 20:29:46 2005 +0000 (2005-04-29)
changeset 41534eac4c53ef
parent 40 dc68364fda90
child 42 390a2aec00e4
Completly redone templates, added "vfnptrs"
sourcehook/generate/sourcehook.hxx
sourcehook/sourcehook.cpp
sourcehook/sourcehook.h
sourcehook/sourcehook_impl.h
sourcehook/test/main.cpp
     1.1 --- a/sourcehook/generate/sourcehook.hxx	Thu Apr 28 17:24:39 2005 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.hxx	Fri Apr 29 20:29:46 2005 +0000
     1.3 @@ -20,7 +20,7 @@
     1.4  #define SH_GLOB_PLUGPTR g_PLID
     1.5  #endif
     1.6  
     1.7 -#define SH_ASSERT(x) if (!(x)) __asm { int 3 }
     1.8 +#define SH_ASSERT(x, info) if (!(x)) __asm { int 3 }
     1.9  
    1.10  // System
    1.11  #define SH_SYS_WIN32 1
    1.12 @@ -54,6 +54,8 @@
    1.13  #include "sh_memfuncinfo.h"
    1.14  #include "sh_memory.h"
    1.15  #include <list>
    1.16 +#include <vector>
    1.17 +#include <map>
    1.18  #include <algorithm>
    1.19  
    1.20  // Good old metamod!
    1.21 @@ -74,6 +76,13 @@
    1.22  	const int STRBUF_LEN=8192;		// In bytes, for "vafmt" functions
    1.23  
    1.24  	/**
    1.25 +	*	@brief An empty class. No inheritance used. Used for original-function-call hacks
    1.26 +	*/
    1.27 +	class EmptyClass
    1.28 +	{
    1.29 +	};
    1.30 +
    1.31 +	/**
    1.32  	*	@brief A plugin typedef
    1.33  	*
    1.34  	*	SourceHook doesn't really care what this is. As long as the ==, != and = operators work on it
    1.35 @@ -136,65 +145,60 @@
    1.36  	*/
    1.37  	struct HookManagerInfo
    1.38  	{
    1.39 -		struct Iface
    1.40 +		struct VfnPtr
    1.41  		{
    1.42 -			struct Hook
    1.43 +			struct Iface
    1.44  			{
    1.45 -				ISHDelegate *handler;			//!< Pointer to the handler
    1.46 -				bool paused;					//!< If true, the hook should not be executed
    1.47 -				Plugin plug;					//!< The owner plugin
    1.48 +				struct Hook
    1.49 +				{
    1.50 +					ISHDelegate *handler;			//!< Pointer to the handler
    1.51 +					bool paused;					//!< If true, the hook should not be executed
    1.52 +					Plugin plug;					//!< The owner plugin
    1.53 +				};
    1.54 +				void *ptr;							//!< Pointer to the interface instance
    1.55 +				std::list<Hook> hooks_pre;			//!< A list of pre-hooks
    1.56 +				std::list<Hook> hooks_post;			//!< A list of post-hooks
    1.57 +				bool operator ==(void *other) const
    1.58 +				{
    1.59 +					return ptr == other;
    1.60 +				}
    1.61  			};
    1.62 -			void *callclass;					//!< Stores a call class for this interface
    1.63 -			void *ptr;							//!< Pointer to the interface instance
    1.64 +
    1.65 +			void *vfnptr;							//!< Pointer to the function
    1.66  			void *orig_entry;					//!< The original vtable entry
    1.67 -			std::list<Hook> hooks_pre;			//!< A list of pre-hooks
    1.68 -			std::list<Hook> hooks_post;			//!< A list of post-hooks
    1.69 -			bool operator ==(void *other) const
    1.70 +
    1.71 +			typedef std::list<Iface> IfaceList;
    1.72 +			typedef IfaceList::iterator IfaceListIter;
    1.73 +			IfaceList ifaces;
    1.74 +
    1.75 +			bool operator ==(void *other)
    1.76  			{
    1.77 -				return ptr == other;
    1.78 +				return vfnptr == other;
    1.79  			}
    1.80  		};
    1.81  		Plugin plug;							//!< The owner plugin
    1.82  		const char *proto;						//!< The prototype of the function the hook manager is responsible for
    1.83  		int vtbl_idx;							//!< The vtable index
    1.84  		int vtbl_offs;							//!< The vtable offset
    1.85 -		int thisptr_offs;						//!< The this-pointer-adjuster
    1.86  		HookManagerPubFunc func;				//!< The interface to the hook manager
    1.87  
    1.88 -		int hookfunc_vtbl_idx;					//!< the vtable index of the hookfunc
    1.89 -		int hookfunc_vtbl_offs;					//!< the vtable offset of the hookfunc
    1.90 -		void *hookfunc_inst;					//!< Instance of the class the hookfunc is in
    1.91 +		void *hookfunc_vfnptr;					//!< Pointer to the hookfunc impl
    1.92  		
    1.93 -		std::list<Iface> ifaces;				//!< List of hooked interfaces
    1.94 +		typedef std::list<VfnPtr> VfnPtrList;
    1.95 +		typedef VfnPtrList::iterator VfnPtrListIter;
    1.96 +		VfnPtrList vfnptrs;				//!< List of hooked interfaces
    1.97  	};
    1.98  
    1.99 -	/**
   1.100 -	*	@brief Structure describing a callclass
   1.101 -	*/
   1.102 -	struct CallClass
   1.103 +	typedef std::vector<void*> OrigFuncs;
   1.104 +	typedef std::map<int, OrigFuncs> OrigVTables;
   1.105 +
   1.106 +	template<class B> struct CallClass
   1.107  	{
   1.108 -		struct VTable
   1.109 -		{
   1.110 -			void *ptr;
   1.111 -			int actsize;
   1.112 -			std::list<int> patches;	//!< Already patched entries
   1.113 -			bool operator ==(void *other) const
   1.114 -			{
   1.115 -				return ptr == other;
   1.116 -			}
   1.117 -		};
   1.118 -		void *iface;				//!< The iface pointer this callclass belongs to
   1.119 -		size_t size;				//!< The size of the callclass
   1.120 -		void *ptr;					//!< The actual "object"
   1.121 -		typedef std::list<VTable> VTableList;
   1.122 -		VTableList vtables;			//!< Already known vtables
   1.123 -		int refcounter;				//!< How many times it was requested
   1.124 +		B *ptr;
   1.125 +		OrigVTables vt;
   1.126 +	};
   1.127  
   1.128 -		bool operator ==(void *other) const
   1.129 -		{
   1.130 -			return ptr == other;
   1.131 -		}
   1.132 -	};
   1.133 +	typedef CallClass<void> GenericCallClass;
   1.134  
   1.135  	/**
   1.136  	*	@brief The main SourceHook interface
   1.137 @@ -214,7 +218,7 @@
   1.138  		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.139  		*	@param post Set to true if you want a post handler
   1.140  		*/
   1.141 -		virtual bool AddHook(Plugin plug, void *iface, int ifacesize, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.142 +		virtual bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.143  
   1.144  		/**
   1.145  		*	@brief Removes a hook.
   1.146 @@ -227,7 +231,7 @@
   1.147  		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.148  		*	@param post Set to true if you want a post handler
   1.149  		*/
   1.150 -		virtual bool RemoveHook(Plugin plug, void *iface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.151 +		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.152  
   1.153  		/**
   1.154  		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   1.155 @@ -242,14 +246,14 @@
   1.156  		*	@param iface The interface pointer
   1.157  		*	@param size Size of the class
   1.158  		*/
   1.159 -		virtual void *GetCallClass(void *iface, size_t size) = 0;
   1.160 +		virtual GenericCallClass *GetCallClass(void *iface) = 0;
   1.161  
   1.162  		/**
   1.163  		*	@brief Release a callclass
   1.164  		*
   1.165  		*	@param ptr Pointer to the callclass
   1.166  		*/
   1.167 -		virtual void ReleaseCallClass(void *ptr) = 0;
   1.168 +		virtual void ReleaseCallClass(GenericCallClass *ptr) = 0;
   1.169  
   1.170  		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
   1.171  		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the previously called handler
   1.172 @@ -284,11 +288,16 @@
   1.173  /**
   1.174  *	@brief Get/generate callclass for an interface pointer
   1.175  *
   1.176 -*	@param ifacetype The type of the interface
   1.177  *	@param ifaceptr The interface pointer
   1.178  */
   1.179 -#define SH_GET_CALLCLASS(ifacetype, ifaceptr) reinterpret_cast<ifacetype*>(SH_GLOB_SHPTR->GetCallClass(ifaceptr, sizeof(ifacetype)))
   1.180 -#define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<void*>(ptr))
   1.181 +template<class ifacetype>
   1.182 +inline SourceHook::CallClass<ifacetype> *SH_GET_CALLCLASS(ifacetype *ptr)
   1.183 +{
   1.184 +	return reinterpret_cast<SourceHook::CallClass<ifacetype>*>(
   1.185 +		SH_GLOB_SHPTR->GetCallClass(reinterpret_cast<void*>(ptr)));
   1.186 +}
   1.187 +
   1.188 +#define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<SourceHook::GenericCallClass*>(ptr))
   1.189  
   1.190  #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   1.191  	SourceHook::SH_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
   1.192 @@ -307,6 +316,18 @@
   1.193  #define SH_NOATTRIB
   1.194  
   1.195  
   1.196 +
   1.197 +#if SH_COMP == SH_COMP_MSVC
   1.198 +# define SH_SETUP_MFP(mfp) \
   1.199 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry;
   1.200 +#elif SH_COMP == SH_COMP_GCC
   1.201 +# define SH_SETUP_MFP(mfp) \
   1.202 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry; \
   1.203 +	reinterpret_cast<void**>(&mfp)[1] = 0;
   1.204 +#else
   1.205 +# error Not supported yet.
   1.206 +#endif
   1.207 +
   1.208  //////////////////////////////////////////////////////////////////////////
   1.209  #define SH_FHCls(ift, iff, ov) FHCls_##ift##iff##ov
   1.210  
   1.211 @@ -320,13 +341,10 @@
   1.212  			GetFuncInfo(funcptr, mfi); \
   1.213  			param->vtbl_idx = mfi.vtblindex; \
   1.214  			param->vtbl_offs = mfi.vtbloffs; \
   1.215 -			param->thisptr_offs = mfi.thisptroffs; \
   1.216 -			if (param->thisptr_offs < 0) \
   1.217 -				return 2; /*No virtual inheritance supported*/ \
   1.218 +			\
   1.219  			GetFuncInfo(&SH_FHCls(ifacetype,ifacefunc,overload)::Func, mfi); \
   1.220 -			param->hookfunc_vtbl_idx = mfi.vtblindex; \
   1.221 -			param->hookfunc_vtbl_offs = mfi.vtbloffs; \
   1.222 -			param->hookfunc_inst = (void*)&ms_Inst; \
   1.223 +			param->hookfunc_vfnptr = \
   1.224 +			reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]; \
   1.225  			return 0; \
   1.226  		} \
   1.227  		else if (action == HA_Register) \
   1.228 @@ -353,7 +371,7 @@
   1.229  			static const char *ms_Proto; \
   1.230  			SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
   1.231  
   1.232 -#define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto) \
   1.233 +#define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto, funcptr) \
   1.234  		}; \
   1.235  		const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
   1.236  		SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
   1.237 @@ -361,42 +379,67 @@
   1.238  		bool SH_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
   1.239  			SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.240  		{ \
   1.241 -			return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, sizeof(ifacetype), \
   1.242 +			MemFuncInfo mfi; \
   1.243 +			GetFuncInfo(funcptr, mfi); \
   1.244 +			if (mfi.thisptroffs < 0) \
   1.245 +				return false; /* No virtual inheritance supported */ \
   1.246 +			\
   1.247 +			return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   1.248  				SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
   1.249  				new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
   1.250  		} \
   1.251  		bool SH_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
   1.252  			SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.253  		{ \
   1.254 +			MemFuncInfo mfi; \
   1.255 +			GetFuncInfo(funcptr, mfi); \
   1.256 +			if (mfi.thisptroffs < 0) \
   1.257 +				return false; /* No virtual inheritance supported */ \
   1.258 +			\
   1.259  			CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
   1.260 -			return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, \
   1.261 +			return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   1.262  				SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
   1.263  		} \
   1.264  	}
   1.265  
   1.266 -#define SH_SETUPCALLS(rettype) \
   1.267 -	/* 1) Find the iface ptr */ \
   1.268 -	/* 1.1) Adjust to original this pointer */ \
   1.269 -	void *origthis = this - ms_HI->thisptr_offs; \
   1.270 -	std::list<HookManagerInfo::Iface>::iterator ifaceiter = std::find(ms_HI->ifaces.begin(), \
   1.271 -		ms_HI->ifaces.end(), origthis); \
   1.272 -	SH_ASSERT(ifaceiter != ms_HI->ifaces.end()); \
   1.273 -	HookManagerInfo::Iface &ci = *ifaceiter; \
   1.274 +#define SH_SETUPCALLS(rettype, paramtypes, params) \
   1.275 +	/* 1) Find the vfnptr */ \
   1.276 +	void *ourvfnptr = reinterpret_cast<void*>( \
   1.277 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   1.278 +	\
   1.279 +	HookManagerInfo::VfnPtrListIter vfptriter = std::find(ms_HI->vfnptrs.begin(), \
   1.280 +		ms_HI->vfnptrs.end(), ourvfnptr); \
   1.281 +	if (vfptriter == ms_HI->vfnptrs.end()) \
   1.282 +	{ \
   1.283 +		/* Bleh? Should be impossible! */ \
   1.284 +		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   1.285 +	} \
   1.286 +	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   1.287 +	/* 2) Find the iface */ \
   1.288 +	HookManagerInfo::VfnPtr::IfaceListIter ifiter = std::find(vfnptr.ifaces.begin(), vfnptr.ifaces.end(), this); \
   1.289 +	if (ifiter == vfnptr.ifaces.end()) \
   1.290 +	{ \
   1.291 +		/* The iface info was not found. Redirect the call to the original function. */ \
   1.292 +		rettype (EmptyClass::*mfp)paramtypes; \
   1.293 +		SH_SETUP_MFP(mfp); \
   1.294 +		return (reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.295 +	} \
   1.296 +	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   1.297  	/* 2) Declare some vars and set it up */ \
   1.298 -	std::list<HookManagerInfo::Iface::Hook> &prelist = ci.hooks_pre; \
   1.299 -	std::list<HookManagerInfo::Iface::Hook> &postlist = ci.hooks_post; \
   1.300 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   1.301 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   1.302  	rettype orig_ret, override_ret, plugin_ret; \
   1.303  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   1.304  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   1.305  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   1.306  	status = MRES_IGNORED; \
   1.307 -	SH_GLOB_SHPTR->SetIfacePtr(ci.ptr); \
   1.308 +	SH_GLOB_SHPTR->SetIfacePtr(this); \
   1.309  	SH_GLOB_SHPTR->SetOrigRet(reinterpret_cast<void*>(&orig_ret)); \
   1.310  	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   1.311  
   1.312  #define SH_CALL_HOOKS(post, params) \
   1.313  	prev_res = MRES_IGNORED; \
   1.314 -	for (std::list<HookManagerInfo::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.315 +	for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.316  	{ \
   1.317  		if (hiter->paused) continue; \
   1.318  		cur_res = MRES_IGNORED; \
   1.319 @@ -411,44 +454,64 @@
   1.320  		} \
   1.321  	}
   1.322  
   1.323 -#define SH_CALL_ORIG(ifacetype, ifacefunc, params) \
   1.324 +#define SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params) \
   1.325  	if (status != MRES_SUPERCEDE) \
   1.326 -		orig_ret = reinterpret_cast<ifacetype*>(ci.callclass)->ifacefunc params; \
   1.327 +	{ \
   1.328 +		rettype (EmptyClass::*mfp)paramtypes; \
   1.329 +		SH_SETUP_MFP(mfp); \
   1.330 +		orig_ret = (reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   1.331 +	} \
   1.332  	else \
   1.333  		orig_ret = override_ret;
   1.334  
   1.335  #define SH_RETURN() \
   1.336  	return status >= MRES_OVERRIDE ? override_ret : orig_ret;
   1.337  
   1.338 -#define SH_HANDLEFUNC(ifacetype, ifacefunc, params, rettype) \
   1.339 -	SH_SETUPCALLS(rettype) \
   1.340 +#define SH_HANDLEFUNC(ifacetype, ifacefunc, paramtypes, params, rettype) \
   1.341 +	SH_SETUPCALLS(rettype, paramtypes, params) \
   1.342  	SH_CALL_HOOKS(pre, params) \
   1.343 -	SH_CALL_ORIG(ifacetype, ifacefunc, params) \
   1.344 +	SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params) \
   1.345  	SH_CALL_HOOKS(post, params) \
   1.346  	SH_RETURN()
   1.347  
   1.348  //////////////////////////////////////////////////////////////////////////
   1.349 -#define SH_SETUPCALLS_void() \
   1.350 -	/* 1) Find the iface ptr */ \
   1.351 -	/* 1.1) Adjust to original this pointer */ \
   1.352 -	void *origthis = this - ms_HI->thisptr_offs; \
   1.353 -	std::list<HookManagerInfo::Iface>::iterator ifaceiter = std::find(ms_HI->ifaces.begin(), \
   1.354 -		ms_HI->ifaces.end(), origthis); \
   1.355 -	SH_ASSERT(ifaceiter != ms_HI->ifaces.end()); \
   1.356 -	HookManagerInfo::Iface &ci = *ifaceiter; \
   1.357 +#define SH_SETUPCALLS_void(paramtypes, params) \
   1.358 +	/* 1) Find the vfnptr */ \
   1.359 +	void *ourvfnptr = reinterpret_cast<void*>( \
   1.360 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   1.361 +	\
   1.362 +	HookManagerInfo::VfnPtrListIter vfptriter = std::find(ms_HI->vfnptrs.begin(), \
   1.363 +		ms_HI->vfnptrs.end(), ourvfnptr); \
   1.364 +	if (vfptriter == ms_HI->vfnptrs.end()) \
   1.365 +	{ \
   1.366 +		/* Bleh? Should be impossible! */ \
   1.367 +		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   1.368 +	} \
   1.369 +	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   1.370 +	/* 2) Find the iface */ \
   1.371 +	HookManagerInfo::VfnPtr::IfaceListIter ifiter = std::find(vfnptr.ifaces.begin(), vfnptr.ifaces.end(), this); \
   1.372 +	if (ifiter == vfnptr.ifaces.end()) \
   1.373 +	{ \
   1.374 +		/* The iface info was not found. Redirect the call to the original function. */ \
   1.375 +		void (EmptyClass::*mfp)paramtypes; \
   1.376 +		SH_SETUP_MFP(mfp); \
   1.377 +		(reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.378 +		return; \
   1.379 +	} \
   1.380 +	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   1.381  	/* 2) Declare some vars and set it up */ \
   1.382 -	std::list<HookManagerInfo::Iface::Hook> &prelist = ci.hooks_pre; \
   1.383 -	std::list<HookManagerInfo::Iface::Hook> &postlist = ci.hooks_post; \
   1.384 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   1.385 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   1.386  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   1.387  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   1.388  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   1.389  	status = MRES_IGNORED; \
   1.390 -	SH_GLOB_SHPTR->SetIfacePtr(ci.ptr); \
   1.391 +	SH_GLOB_SHPTR->SetIfacePtr(this); \
   1.392  	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   1.393  
   1.394  #define SH_CALL_HOOKS_void(post, params) \
   1.395  	prev_res = MRES_IGNORED; \
   1.396 -	for (std::list<HookManagerInfo::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.397 +	for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.398  	{ \
   1.399  		if (hiter->paused) continue; \
   1.400  		cur_res = MRES_IGNORED; \
   1.401 @@ -458,54 +521,60 @@
   1.402  			status = cur_res; \
   1.403  	}
   1.404  
   1.405 -#define SH_CALL_ORIG_void(ifacetype, ifacefunc, params) \
   1.406 +#define SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params) \
   1.407  	if (status != MRES_SUPERCEDE) \
   1.408 -		reinterpret_cast<ifacetype*>(ci.callclass)->ifacefunc params;
   1.409 +	{ \
   1.410 +		void (EmptyClass::*mfp)paramtypes; \
   1.411 +		SH_SETUP_MFP(mfp); \
   1.412 +		(reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   1.413 +	}
   1.414  
   1.415  #define SH_RETURN_void()
   1.416  
   1.417 -#define SH_HANDLEFUNC_void(ifacetype, ifacefunc, params) \
   1.418 -	SH_SETUPCALLS_void() \
   1.419 +#define SH_HANDLEFUNC_void(ifacetype, ifacefunc, paramtypes, params) \
   1.420 +	SH_SETUPCALLS_void(paramtypes, params) \
   1.421  	SH_CALL_HOOKS_void(pre, params) \
   1.422 -	SH_CALL_ORIG_void(ifacetype, ifacefunc, params) \
   1.423 +	SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params) \
   1.424  	SH_CALL_HOOKS_void(post, params) \
   1.425  	SH_RETURN_void()
   1.426  
   1.427  
   1.428  // Special vafmt handlers
   1.429 -#define SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, params_orig, params_plug, rettype) \
   1.430 -	SH_SETUPCALLS(rettype) \
   1.431 +#define SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, paramtypes, params_orig, params_plug, rettype) \
   1.432 +	SH_SETUPCALLS(rettype, paramtypes, params_orig) \
   1.433  	SH_CALL_HOOKS(pre, params_plug) \
   1.434 -	SH_CALL_ORIG(ifacetype, ifacefunc, params_orig) \
   1.435 +	SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params_orig) \
   1.436  	SH_CALL_HOOKS(post, params_plug) \
   1.437  	SH_RETURN()
   1.438  
   1.439 -#define SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, params_orig, params_plug) \
   1.440 -	SH_SETUPCALLS_void() \
   1.441 +#define SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, paramtypes, params_orig, params_plug) \
   1.442 +	SH_SETUPCALLS_void(paramtypes, params_orig) \
   1.443  	SH_CALL_HOOKS_void(pre, params_plug) \
   1.444 -	SH_CALL_ORIG_void(ifacetype, ifacefunc, params_orig) \
   1.445 +	SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params_orig) \
   1.446  	SH_CALL_HOOKS_void(post, params_plug) \
   1.447  	SH_RETURN_void()
   1.448  
   1.449  //////////////////////////////////////////////////////////////////////////
   1.450  
   1.451  @VARARGS@
   1.452 -// *********
   1.453 +// ********* Support for @$@ arguments *********
   1.454  #define SH_DECL_HOOK@$@(ifacetype, ifacefunc, attr, overload, rettype@, param%%@) \
   1.455  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@param%%|, @)> \
   1.456  		(&ifacetype::ifacefunc))) \
   1.457  		typedef fastdelegate::FastDelegate@$@<@param%%|, @@, @rettype> FD; \
   1.458  		virtual rettype Func(@param%% p%%|, @) attr \
   1.459 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (@p%%|, @), rettype); } \
   1.460 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype @"|" #param%%| @)
   1.461 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (@param%%|, @), (@p%%|, @), rettype); } \
   1.462 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype @"|" #param%%| @, \
   1.463 +	(static_cast<rettype (ifacetype::*)(@param%%|, @)>(&ifacetype::ifacefunc)))
   1.464  
   1.465  #define SH_DECL_HOOK@$@_void(ifacetype, ifacefunc, attr, overload@, param%%@) \
   1.466  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@param%%|, @)> \
   1.467  		(&ifacetype::ifacefunc))) \
   1.468  		typedef fastdelegate::FastDelegate@$@<@param%%|, @> FD; \
   1.469  		virtual void Func(@param%% p%%|, @) attr \
   1.470 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (@p%%|, @)); } \
   1.471 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr @"|" #param%%| @)
   1.472 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (@param%%|, @), (@p%%|, @)); } \
   1.473 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr @"|" #param%%| @, \
   1.474 +	(static_cast<void (ifacetype::*)(@param%%|, @)>(&ifacetype::ifacefunc)))
   1.475  
   1.476  #define SH_DECL_HOOK@$@_vafmt(ifacetype, ifacefunc, attr, overload, rettype@, param%%@) \
   1.477  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@param%%|, @@, @const char *, ...)> \
   1.478 @@ -518,9 +587,10 @@
   1.479  			va_start(ap, fmt); \
   1.480  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.481  			va_end(ap); \
   1.482 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (@p%%|, @@, @"%s", buf), (@p%%|, @@, @buf), rettype); \
   1.483 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (@param%%|, @@, @...), (@p%%|, @@, @"%s", buf), (@p%%|, @@, @buf), rettype); \
   1.484  		} \
   1.485 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype @"|" #param%%| @ "|const char*|...")
   1.486 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype @"|" #param%%| @ "|const char*|...", \
   1.487 +	(static_cast<rettype (ifacetype::*)(@param%%|, @@, @const char *, ...)>(&ifacetype::ifacefunc)))
   1.488  
   1.489  #define SH_DECL_HOOK@$@_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype@, param%%@) \
   1.490  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@param%%|, @@, @const char *, ...)> \
   1.491 @@ -533,22 +603,70 @@
   1.492  			va_start(ap, fmt); \
   1.493  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.494  			va_end(ap); \
   1.495 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (@p%%|, @@, @"%s", buf), (@p%%|, @@, @buf)); \
   1.496 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (@param%%|, @@, @...), (@p%%|, @@, @"%s", buf), (@p%%|, @@, @buf)); \
   1.497  		} \
   1.498 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr @"|" #param%%| @ "|const char*|...")
   1.499 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr @"|" #param%%| @ "|const char*|...", \
   1.500 +	(static_cast<void (ifacetype::*)(@param%%|, @@, @const char *, ...)>(&ifacetype::ifacefunc)))
   1.501  
   1.502  @ENDARGS@
   1.503  
   1.504 -/*
   1.505 -#define SH_DECL_HOOK1(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   1.506 -	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload) \
   1.507 -		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
   1.508 -		virtual rettype Func(param1 p1) \
   1.509 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1), rettype); } \
   1.510 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1)
   1.511 -		
   1.512 +
   1.513 +//////////////////////////////////////////////////////////////////////////
   1.514 +// SH_CALL
   1.515 +
   1.516 +
   1.517 +#define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
   1.518 +{ \
   1.519 +	MemFuncInfo mfi; \
   1.520 +	MFI_Impl<sizeof(m_MFP)>::GetFuncInfo(m_MFP, mfi); \
   1.521 +	OrigVTables::const_iterator iter = m_CC->vt.find(mfi.vtbloffs); \
   1.522 +	if (iter == m_CC->vt.end() || mfi.vtblindex >= (int)iter->second.size() || iter->second[mfi.vtblindex] == NULL) \
   1.523 +		return (m_CC->ptr->*m_MFP)call; \
   1.524 +	\
   1.525 +	/* It's hooked. Call the original function. */ \
   1.526 +	union \
   1.527 +	{ \
   1.528 +		RetType(EmptyClass::*mfpnew)prms; \
   1.529 +		void *addr; \
   1.530 +	} u; \
   1.531 +	u.addr = iter->second[mfi.vtblindex]; \
   1.532 +	\
   1.533 +	return (reinterpret_cast<EmptyClass*>(m_CC->ptr)->*u.mfpnew)call; \
   1.534 +}
   1.535 +
   1.536  
   1.537 -*/
   1.538 +namespace SourceHook
   1.539 +{
   1.540 +	template<class CCType, class RetType, class MFPType> class ExecutableClass
   1.541 +	{
   1.542 +		CCType *m_CC;
   1.543 +		MFPType m_MFP;
   1.544 +	public:
   1.545 +		ExecutableClass(CCType *cc, MFPType mfp) : m_CC(cc), m_MFP(mfp)
   1.546 +		{
   1.547 +		}
   1.548 +
   1.549 +@VARARGS@
   1.550 +		// Support for @$@ arguments
   1.551 +		template<@class Param%%|, @> RetType operator()(@Param%% p%%|, @) const 
   1.552 +			SH_MAKE_EXECUTABLECLASS_OB((@p%%@), (@Param%%@))
   1.553 +
   1.554 +@ENDARGS@
   1.555 +	};
   1.556 +}
   1.557 +
   1.558 +@VARARGS@
   1.559 +// Support for @$@ arguments
   1.560 +template <class X, class Y, class RetType@, @@class Param%%|, @>
   1.561 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(@Param%%|, @)>
   1.562 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(@Param%%|, @))
   1.563 +{
   1.564 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(@Param%%|, @)>(ptr, mfp);
   1.565 +}
   1.566 +
   1.567 +@ENDARGS@
   1.568 +
   1.569 +#undef SH_MAKE_EXECUTABLECLASS_BODY
   1.570  
   1.571  #endif
   1.572  	// The pope is dead. -> :(
   1.573 \ No newline at end of file
     2.1 --- a/sourcehook/sourcehook.cpp	Thu Apr 28 17:24:39 2005 +0000
     2.2 +++ b/sourcehook/sourcehook.cpp	Fri Apr 29 20:29:46 2005 +0000
     2.3 @@ -16,93 +16,38 @@
     2.4  #include <algorithm>
     2.5  #include "sourcehook_impl.h"
     2.6  
     2.7 -#if SH_SYS == SH_SYS_WIN32
     2.8 -# include <windows.h>
     2.9 -#elif SH_SYS == SH_SYS_LINUX
    2.10 -# include <sys/mman.h>
    2.11 -# include <limits.h>
    2.12 -# include <unistd.h>
    2.13 -# ifndef PAGESIZE
    2.14 -#  define PAGESIZE 4096
    2.15 -# endif
    2.16 -#endif
    2.17 -
    2.18 -#if SH_RUNTIME_CODEGEN == 1
    2.19 -# if SH_COMP == SH_COMP_GCC
    2.20 -#  define SH_CCC_CODESIZE 15
    2.21 -	//	 :TODO:
    2.22 -	//void SH_CCC_MakeGate(void *origthisptr, unsigned char* &ptr, void *origvtable, int i)
    2.23 -	//{
    2.24 -	//}
    2.25 -# elif SH_COMP == SH_COMP_MSVC
    2.26 -#  define SH_CCC_CODESIZE 19
    2.27 -	void SH_CCC_MakeGate(void *origthisptr, void *ccthisptr, unsigned char* ptr, void *origfunc)
    2.28 -	{
    2.29 -		// --Subtract old this pointer to get the offset
    2.30 -		// 00417EDF 81 E9 A1 7B 33 01 sub         ecx,1337BA1h 
    2.31 -		*ptr++ = 0x81;
    2.32 -		*ptr++ = 0xE9;
    2.33 -		*reinterpret_cast<void**>(ptr) = ccthisptr;
    2.34 -		ptr += sizeof(void*);
    2.35 -		// --Add it to the new this pointer
    2.36 -		// 00417EE5 81 C1 37 13 37 13 add         ecx,13371337h 
    2.37 -		*ptr++ = 0x81;
    2.38 -		*ptr++ = 0xC1;
    2.39 -		*reinterpret_cast<void**>(ptr) = origthisptr;
    2.40 -		ptr += sizeof(void*);
    2.41 -		// --Prepare address
    2.42 -		// 00417EEB B8 EF BE AD DE   mov         eax,0DEADBEEFh 
    2.43 -		*ptr++ = 0xB8;
    2.44 -		*reinterpret_cast<void**>(ptr) = origfunc;
    2.45 -		ptr += sizeof(void*);
    2.46 -		// -- Do actual jump
    2.47 -		// 00417EF0 FF E0            jmp         eax  
    2.48 -		*ptr++ = 0xFF;
    2.49 -		*ptr++ = 0xE0;
    2.50 -	}
    2.51 -# endif
    2.52 -#endif
    2.53 -
    2.54 -
    2.55  namespace SourceHook
    2.56  {
    2.57  	CSourceHookImpl::CSourceHookImpl()
    2.58  	{
    2.59 -		// Get page size
    2.60 -#if SH_SYS == SH_SYS_WIN32
    2.61 -		SYSTEM_INFO sysinfo;
    2.62 -		GetSystemInfo(&sysinfo);
    2.63 -		m_PageSize = sysinfo.dwPageSize;
    2.64 -#elif SH_SYS == SH_SYS_LINUX
    2.65 -		m_PageSize = PAGESIZE;
    2.66 -#else
    2.67 -# error Unsupported system
    2.68 -#endif
    2.69  	}
    2.70  
    2.71  	CSourceHookImpl::~CSourceHookImpl()
    2.72  	{
    2.73 -
    2.74  	}
    2.75  
    2.76  	bool CSourceHookImpl::IsPluginInUse(Plugin plug)
    2.77  	{
    2.78  		// Iterate through all hook managers which are in this plugin
    2.79 -		// Iterate through their hooks
    2.80 +		// Iterate through their vfnptrs, ifaces, hooks
    2.81  		// If a hook from an other plugin is found, return true
    2.82  		// Return false otherwise
    2.83  #define TMP_CHECK_LIST(name) \
    2.84 -	for (iter3 = iter2->name.begin(); iter3 != iter2->name.end(); ++iter3) \
    2.85 -		if (iter3->plug == plug) \
    2.86 +	for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
    2.87 +		if (hook_iter->plug == plug) \
    2.88  			return true;
    2.89  
    2.90 -		for (HookManInfoList::iterator iter = m_HookMans.begin(); iter != m_HookMans.end(); ++iter)
    2.91 +		for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
    2.92  		{
    2.93 -			if (iter->plug == plug && !iter->ifaces.empty())
    2.94 +			if (hmil_iter->plug != plug)
    2.95 +				continue;
    2.96 +			for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
    2.97 +				vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
    2.98  			{
    2.99 -				for (std::list<HookManagerInfo::Iface>::iterator iter2 = iter->ifaces.begin(); iter2 != iter->ifaces.end(); ++iter2)
   2.100 +				for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
   2.101 +					iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
   2.102  				{
   2.103 -					std::list<HookManagerInfo::Iface::Hook>::iterator iter3;
   2.104 +					std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
   2.105  					TMP_CHECK_LIST(hooks_pre);
   2.106  					TMP_CHECK_LIST(hooks_post);
   2.107  				}
   2.108 @@ -116,24 +61,29 @@
   2.109  	{
   2.110  		// 1) Manually remove all hooks by this plugin
   2.111  		std::list<RemoveHookInfo> hookstoremove;
   2.112 -
   2.113 -		for (HookManInfoList::iterator iter = m_HookMans.begin(); iter != m_HookMans.end(); ++iter)
   2.114 +#define TMP_CHECK_LIST(name, ispost) \
   2.115 +	for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
   2.116 +		if (hook_iter->plug == plug) \
   2.117 +			hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
   2.118 +			hmil_iter->func, hook_iter->handler, ispost))
   2.119 +		for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
   2.120  		{
   2.121 -			for (std::list<HookManagerInfo::Iface>::iterator iter2 = iter->ifaces.begin(); iter2 != iter->ifaces.end();
   2.122 -				++iter2)
   2.123 +			for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
   2.124 +				vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
   2.125  			{
   2.126 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator iter3 = iter2->hooks_pre.begin(); iter3 != iter2->hooks_pre.end(); ++iter3)
   2.127 -					if (iter3->plug == plug)
   2.128 -						hookstoremove.push_back(RemoveHookInfo(iter3->plug, iter2->ptr, iter->func, iter3->handler, false));
   2.129 -
   2.130 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator iter3 = iter2->hooks_post.begin(); iter3 != iter2->hooks_post.end(); ++iter3)
   2.131 -					if (iter3->plug == plug)
   2.132 -						hookstoremove.push_back(RemoveHookInfo(iter3->plug, iter2->ptr, iter->func, iter3->handler, true));
   2.133 +				for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
   2.134 +					iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
   2.135 +				{
   2.136 +					std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
   2.137 +					TMP_CHECK_LIST(hooks_pre, false);
   2.138 +					TMP_CHECK_LIST(hooks_post, true);
   2.139 +				}
   2.140  			}
   2.141  		}
   2.142 +#undef TMP_CHECK_LIST
   2.143  
   2.144  		for (std::list<RemoveHookInfo>::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter)
   2.145 -			RemoveHook(rmiter->plug, rmiter->iface, rmiter->hpf, rmiter->handler, rmiter->post);
   2.146 +			RemoveHook(*rmiter);
   2.147  
   2.148  		// 2) Other plugins may use hook managers in this plugin.
   2.149  		// Get a list of hook managers that are in this plugin and are used by other plugins
   2.150 @@ -141,16 +91,16 @@
   2.151  
   2.152  		HookManInfoList tmphookmans;
   2.153  		bool erase = false;
   2.154 -		for (HookManInfoList::iterator iter = m_HookMans.begin(); iter != m_HookMans.end();
   2.155 -			erase ? iter=m_HookMans.erase(iter) : ++iter)
   2.156 +		for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end();
   2.157 +			erase ? hmil_iter=m_HookMans.erase(hmil_iter) : ++hmil_iter)
   2.158  		{
   2.159 -			if (iter->plug == plug)
   2.160 +			if (hmil_iter->plug == plug)
   2.161  			{
   2.162 -				if (!iter->ifaces.empty())
   2.163 +				if (!hmil_iter->vfnptrs.empty())
   2.164  				{
   2.165  					// All hooks by this plugin are already removed
   2.166 -					// So if there is an iface, it has to be used by an other plugin
   2.167 -					tmphookmans.push_back(*iter);
   2.168 +					// So if there is a vfnptr, it has to be used by an other plugin
   2.169 +					tmphookmans.push_back(*hmil_iter);
   2.170  				}
   2.171  				erase = true;
   2.172  			}
   2.173 @@ -159,29 +109,28 @@
   2.174  		}
   2.175  		
   2.176  		// For each hook manager:
   2.177 -		for (HookManInfoList::iterator iter = tmphookmans.begin(); iter != tmphookmans.end(); ++iter)
   2.178 +		for (HookManInfoList::iterator hmil_iter = tmphookmans.begin(); hmil_iter != tmphookmans.end(); ++hmil_iter)
   2.179  		{
   2.180  			// Find a suitable hook manager in an other plugin
   2.181  			HookManInfoList::iterator newHookMan = FindHookMan(m_HookMans.begin(), m_HookMans.end(),
   2.182 -				iter->proto, iter->vtbl_offs, iter->vtbl_idx, iter->thisptr_offs);
   2.183 -			if (newHookMan == m_HookMans.end())
   2.184 -			{
   2.185 -				// This should _never_ happen.
   2.186 -				// If there is a hook from an other plugin, the plugin must have provided a hook manager as well.
   2.187 -				SH_ASSERT(0);
   2.188 -			}
   2.189 +				hmil_iter->proto, hmil_iter->vtbl_offs, hmil_iter->vtbl_idx);
   2.190 +
   2.191 +			// This should _never_ happen.
   2.192 +			// If there is a hook from an other plugin, the plugin must have provided a hook manager as well.
   2.193 +			SH_ASSERT(newHookMan != m_HookMans.end(),
   2.194 +				"Could not find a suitable hook manager in an other plugin!");
   2.195  
   2.196 -			// AddHook should make sure that every plugin only has _one_ hook manager for _one_ proto/vi/vo/thisptroffs
   2.197 -			SH_ASSERT(newHookMan->plug != plug);
   2.198 +			// AddHook should make sure that every plugin only has _one_ hook manager for _one_ proto/vi/vo
   2.199 +			SH_ASSERT(newHookMan->plug != plug, "New hook manager from same plugin!");
   2.200  
   2.201 -			// The first hooker should be always used - so the new hook manager has to be empty
   2.202 -			SH_ASSERT(newHookMan->ifaces.empty());
   2.203 +			// The first hook manager should be always used - so the new hook manager has to be empty
   2.204 +			SH_ASSERT(newHookMan->vfnptrs.empty(), "New hook manager not empty!");
   2.205  
   2.206 -			// Move the ifaces from the old hook manager to the new one
   2.207 -			newHookMan->ifaces = iter->ifaces;
   2.208 +			// Move the vfnptrs from the old hook manager to the new one
   2.209 +			newHookMan->vfnptrs = hmil_iter->vfnptrs;
   2.210  
   2.211  			// Unregister the old one, register the new one
   2.212 -			iter->func(HA_Unregister, NULL);
   2.213 +			hmil_iter->func(HA_Unregister, NULL);
   2.214  			newHookMan->func(HA_Register, &(*newHookMan));
   2.215  		}
   2.216  	}
   2.217 @@ -189,43 +138,49 @@
   2.218  	void CSourceHookImpl::CompleteShutdown()
   2.219  	{
   2.220  		std::list<RemoveHookInfo> hookstoremove;
   2.221 -
   2.222 -		for (HookManInfoList::iterator iter = m_HookMans.begin(); iter != m_HookMans.end(); ++iter)
   2.223 +#define TMP_CHECK_LIST(name, ispost) \
   2.224 +	for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
   2.225 +		hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
   2.226 +		hmil_iter->func, hook_iter->handler, ispost))
   2.227 +		for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
   2.228  		{
   2.229 -			for (std::list<HookManagerInfo::Iface>::iterator iter2 = iter->ifaces.begin(); iter2 != iter->ifaces.end();
   2.230 -				++iter2)
   2.231 +			for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
   2.232 +				vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
   2.233  			{
   2.234 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator iter3 = iter2->hooks_pre.begin(); iter3 != iter2->hooks_pre.end(); ++iter3)
   2.235 -					hookstoremove.push_back(RemoveHookInfo(iter3->plug, iter2->ptr, iter->func, iter3->handler, false));
   2.236 -				
   2.237 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator iter3 = iter2->hooks_post.begin(); iter3 != iter2->hooks_post.end(); ++iter3)
   2.238 -					hookstoremove.push_back(RemoveHookInfo(iter3->plug, iter2->ptr, iter->func, iter3->handler, true));
   2.239 +				for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
   2.240 +					iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
   2.241 +				{
   2.242 +					std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
   2.243 +					TMP_CHECK_LIST(hooks_pre, false);
   2.244 +					TMP_CHECK_LIST(hooks_post, true);
   2.245 +				}
   2.246  			}
   2.247  		}
   2.248 +#undef TMP_CHECK_LIST
   2.249  
   2.250  		for (std::list<RemoveHookInfo>::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter)
   2.251 -			RemoveHook(rmiter->plug, rmiter->iface, rmiter->hpf, rmiter->handler, rmiter->post);
   2.252 +			RemoveHook(*rmiter);
   2.253  
   2.254  		m_HookMans.clear();
   2.255  	}
   2.256  
   2.257 -	bool CSourceHookImpl::AddHook(Plugin plug, void *iface, int ifacesize, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
   2.258 +	bool CSourceHookImpl::AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
   2.259  	{
   2.260 +		void *adjustediface = reinterpret_cast<void*>(reinterpret_cast<char*>(iface) + thisptr_offs);
   2.261  		// 1) Get info about the hook manager
   2.262  		HookManagerInfo tmp;
   2.263  		if (myHookMan(HA_GetInfo, &tmp) != 0)
   2.264  			return false;
   2.265  
   2.266  		// Add the proposed hook manager to the _end_ of the list if the plugin doesn't have a hook manager with this proto/vo/vi registered
   2.267 -		HookManInfoList::iterator hookmaniter;
   2.268 -		for (hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
   2.269 +		HookManInfoList::iterator hkmi_iter;
   2.270 +		for (hkmi_iter = m_HookMans.begin(); hkmi_iter != m_HookMans.end(); ++hkmi_iter)
   2.271  		{
   2.272 -			if (hookmaniter->plug == plug && strcmp(hookmaniter->proto, tmp.proto) == 0 &&
   2.273 -				hookmaniter->vtbl_offs == tmp.vtbl_offs && hookmaniter->vtbl_idx == tmp.vtbl_idx &&
   2.274 -				hookmaniter->thisptr_offs == tmp.thisptr_offs)
   2.275 +			if (hkmi_iter->plug == plug && strcmp(hkmi_iter->proto, tmp.proto) == 0 &&
   2.276 +				hkmi_iter->vtbl_offs == tmp.vtbl_offs && hkmi_iter->vtbl_idx == tmp.vtbl_idx)
   2.277  				break;
   2.278  		}
   2.279 -		if (hookmaniter == m_HookMans.end())
   2.280 +		if (hkmi_iter == m_HookMans.end())
   2.281  		{
   2.282  			// No such hook manager from this plugin yet, add it!
   2.283  			tmp.func = myHookMan;
   2.284 @@ -234,47 +189,70 @@
   2.285  		}
   2.286  
   2.287  		// Then, search for a suitable hook manager (from the beginning)
   2.288 -		HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(), tmp.proto, tmp.vtbl_offs, tmp.vtbl_idx, tmp.thisptr_offs);
   2.289 -		SH_ASSERT(hookman != m_HookMans.end());
   2.290 +		HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(), tmp.proto, tmp.vtbl_offs, tmp.vtbl_idx);
   2.291 +		SH_ASSERT(hookman != m_HookMans.end(), "No hookman found - but if there was none, we've just added one!");
   2.292  
   2.293  		// Tell it to store the pointer if it's not already active
   2.294 -		if (hookman->ifaces.empty())
   2.295 +		if (hookman->vfnptrs.empty())
   2.296  			hookman->func(HA_Register, &(*hookman));
   2.297  
   2.298 -		std::list<HookManagerInfo::Iface>::iterator ifsiter = std::find(hookman->ifaces.begin(), hookman->ifaces.end(), iface);
   2.299 +		void **cur_vtptr = *reinterpret_cast<void***>(
   2.300 +			reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
   2.301 +		void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
   2.302  
   2.303 -		if (ifsiter == hookman->ifaces.end())
   2.304 +		HookManagerInfo::VfnPtrListIter vfnptr_iter = std::find(
   2.305 +			hookman->vfnptrs.begin(), hookman->vfnptrs.end(), cur_vfnptr);
   2.306 +
   2.307 +		if (vfnptr_iter == hookman->vfnptrs.end())
   2.308  		{
   2.309 -			HookManagerInfo::Iface ifs;
   2.310 -			ifs.ptr = iface;
   2.311 -			ifs.callclass = GetCallClass(iface, ifacesize);
   2.312 -			void *vtableptr = *reinterpret_cast<void**>(reinterpret_cast<char*>(iface) + hookman->vtbl_offs);
   2.313 -			SetMemAccess(vtableptr, sizeof(void*) * hookman->vtbl_idx, SH_MEM_READ | SH_MEM_WRITE);
   2.314 -			ifs.orig_entry = (*reinterpret_cast<void***>(reinterpret_cast<char*>(iface) + hookman->vtbl_offs))[hookman->vtbl_idx];
   2.315 -			(*reinterpret_cast<void***>(reinterpret_cast<char*>(iface) + hookman->vtbl_offs))[hookman->vtbl_idx] =
   2.316 -				(*reinterpret_cast<void***>(reinterpret_cast<char*>(hookman->hookfunc_inst) + hookman->hookfunc_vtbl_offs))[hookman->hookfunc_vtbl_idx];
   2.317 -			hookman->ifaces.push_back(ifs);
   2.318 -			ifsiter = hookman->ifaces.end();
   2.319 -			--ifsiter;
   2.320 +			// Add a new one
   2.321 +			HookManagerInfo::VfnPtr vfp;
   2.322 +			vfp.vfnptr = cur_vfnptr;
   2.323 +			vfp.orig_entry = *reinterpret_cast<void**>(cur_vfnptr);
   2.324 +			hookman->vfnptrs.push_back(vfp);
   2.325 +
   2.326 +			// Alter vtable entry
   2.327 +			SetMemAccess(cur_vtptr, sizeof(void*) * tmp.vtbl_idx, SH_MEM_READ | SH_MEM_WRITE);
   2.328 +			*reinterpret_cast<void**>(cur_vfnptr) = *reinterpret_cast<void**>(hookman->hookfunc_vfnptr);
   2.329 +
   2.330 +			// Make vfnptr_iter point to the new element
   2.331 +			vfnptr_iter = hookman->vfnptrs.end();
   2.332 +			--vfnptr_iter;
   2.333  		}
   2.334 -		HookManagerInfo::Iface::Hook hookinfo;
   2.335 +
   2.336 +		HookManagerInfo::VfnPtr::IfaceListIter iface_iter = std::find(
   2.337 +			vfnptr_iter->ifaces.begin(), vfnptr_iter->ifaces.end(), adjustediface);
   2.338 +		if (iface_iter == vfnptr_iter->ifaces.end())
   2.339 +		{
   2.340 +			// Add a new one
   2.341 +			HookManagerInfo::VfnPtr::Iface ifs;
   2.342 +			ifs.ptr = adjustediface;
   2.343 +			vfnptr_iter->ifaces.push_back(ifs);
   2.344 +
   2.345 +			// Make iface_iter point to the new element
   2.346 +			iface_iter = vfnptr_iter->ifaces.end();
   2.347 +			--iface_iter;
   2.348 +		}
   2.349 +
   2.350 +		// Add the hook
   2.351 +		HookManagerInfo::VfnPtr::Iface::Hook hookinfo;
   2.352  		hookinfo.handler = handler;
   2.353  		hookinfo.plug = plug;
   2.354  		hookinfo.paused = false;
   2.355  		if (post)
   2.356 -   			ifsiter->hooks_post.push_back(hookinfo);
   2.357 +   			iface_iter->hooks_post.push_back(hookinfo);
   2.358  		else
   2.359 -			ifsiter->hooks_pre.push_back(hookinfo);
   2.360 +			iface_iter->hooks_pre.push_back(hookinfo);
   2.361  
   2.362  
   2.363  		// Now that it is done, check whether we have to update any callclasses
   2.364  		for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
   2.365  		{
   2.366 -			if (cciter->iface == iface)
   2.367 +			if (cciter->cc.ptr == iface)
   2.368  			{
   2.369 -				ApplyCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx, ifsiter->orig_entry);
   2.370 +				ApplyCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx, vfnptr_iter->orig_entry);
   2.371  
   2.372 -				// We can assume that there is no more callclass with the same iface
   2.373 +				// We can assume that there is no more callclass for the same iface
   2.374  				break;
   2.375  			}
   2.376  		}
   2.377 @@ -282,7 +260,18 @@
   2.378  		return true;
   2.379  	}
   2.380  
   2.381 -	bool CSourceHookImpl::RemoveHook(Plugin plug, void *iface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
   2.382 +	bool CSourceHookImpl::RemoveHook(RemoveHookInfo info)
   2.383 +	{
   2.384 +		return RemoveHook(info.plug, info.iface, info.hookman, info.handler, info.post);
   2.385 +	}
   2.386 +
   2.387 +	bool CSourceHookImpl::RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
   2.388 +	{
   2.389 +		return RemoveHook(plug, reinterpret_cast<void*>(reinterpret_cast<char*>(iface)+thisptr_offs),
   2.390 +			myHookMan, handler, post);
   2.391 +	}
   2.392 +
   2.393 +	bool CSourceHookImpl::RemoveHook(Plugin plug, void *adjustediface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
   2.394  	{
   2.395  		HookManagerInfo tmp;
   2.396  		if (myHookMan(HA_GetInfo, &tmp) != 0)
   2.397 @@ -290,196 +279,110 @@
   2.398  
   2.399  		// Find the hook manager and the hook
   2.400  		HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(), 
   2.401 -			tmp.proto, tmp.vtbl_offs, tmp.vtbl_idx, tmp.thisptr_offs);
   2.402 +			tmp.proto, tmp.vtbl_offs, tmp.vtbl_idx);
   2.403  		if (hookman == m_HookMans.end())
   2.404  			return false;
   2.405  
   2.406 -		for (std::list<HookManagerInfo::Iface>::iterator ifaceiter = hookman->ifaces.begin(); ifaceiter != hookman->ifaces.end(); ++ifaceiter)
   2.407 +		void **cur_vtptr = *reinterpret_cast<void***>(
   2.408 +			reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
   2.409 +		void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
   2.410 +
   2.411 +		for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.begin();
   2.412 +			vfnptr_iter != hookman->vfnptrs.end(); ++vfnptr_iter)
   2.413  		{
   2.414 -			if (ifaceiter->ptr == iface)
   2.415 +			if (vfnptr_iter->vfnptr == cur_vfnptr)
   2.416  			{
   2.417 -				std::list<HookManagerInfo::Iface::Hook> &hooks = post ? ifaceiter->hooks_post : ifaceiter->hooks_pre;
   2.418 -				bool erase;
   2.419 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator hookiter = hooks.begin();
   2.420 -					hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
   2.421 -				{
   2.422 -					erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler);
   2.423 -					if (erase)
   2.424 -						hookiter->handler->DeleteThis();			// Make the _plugin_ delete the handler object
   2.425 -				}
   2.426 -				if (ifaceiter->hooks_post.empty() && ifaceiter->hooks_pre.empty())
   2.427 +				for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
   2.428 +					iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
   2.429  				{
   2.430 -					// Deactivate the hook
   2.431 -					(*reinterpret_cast<void***>(reinterpret_cast<char*>(ifaceiter->ptr) +
   2.432 -						hookman->vtbl_offs))[hookman->vtbl_idx]= ifaceiter->orig_entry;
   2.433 -
   2.434 -					// Release the callclass
   2.435 -					ReleaseCallClass(ifaceiter->callclass);
   2.436 +					std::list<HookManagerInfo::VfnPtr::Iface::Hook> &hooks =
   2.437 +						post ? iface_iter->hooks_post : iface_iter->hooks_pre;
   2.438  
   2.439 -					// Remove the iface info
   2.440 -					hookman->ifaces.erase(ifaceiter);
   2.441 +					bool erase;
   2.442 +					for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
   2.443 +						hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
   2.444 +					{
   2.445 +						erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler);
   2.446 +						if (erase)
   2.447 +							hookiter->handler->DeleteThis();			// Make the _plugin_ delete the handler object
   2.448 +					}
   2.449 +					if (iface_iter->hooks_post.empty() && iface_iter->hooks_pre.empty())
   2.450 +					{
   2.451 +						vfnptr_iter->ifaces.erase(iface_iter);
   2.452 +						if (vfnptr_iter->ifaces.empty())
   2.453 +						{
   2.454 +							// Deactivate the hook
   2.455 +							*reinterpret_cast<void**>(vfnptr_iter->vfnptr) = vfnptr_iter->orig_entry;
   2.456 +							
   2.457 +							hookman->vfnptrs.erase(vfnptr_iter);
   2.458  
   2.459 -					if (hookman->ifaces.empty())
   2.460 -						hookman->func(HA_Unregister, NULL);
   2.461 +							if (hookman->vfnptrs.empty())
   2.462 +							{
   2.463 +								// Unregister the hook manager
   2.464 +								hookman->func(HA_Unregister, NULL);
   2.465 +							}
   2.466 +						}
   2.467 +					}
   2.468  				}
   2.469 -				// :TODO: Better return value? Or none?
   2.470  				return true;
   2.471  			}
   2.472  		}
   2.473  		return false;
   2.474  	}
   2.475  
   2.476 -	void *CSourceHookImpl::GetCallClass(void *iface, size_t size)
   2.477 +	GenericCallClass *CSourceHookImpl::GetCallClass(void *iface)
   2.478  	{
   2.479  		for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
   2.480  		{
   2.481 -			if (cciter->iface == iface)
   2.482 +			if (cciter->cc.ptr == iface)
   2.483  			{
   2.484  				++cciter->refcounter;
   2.485 -				return cciter->ptr;
   2.486 +				return &cciter->cc;
   2.487  			}
   2.488  		}
   2.489  
   2.490 -		// The layout of callclasses is:
   2.491 -		//  Copy of the class; vtable entries pointing to gates
   2.492 -		//  Pointer to the corresponding CallClass object
   2.493 -		//  Copy of the class; vtable entries pointing to original functions
   2.494 +		CallClassInfo tmp;
   2.495 +		tmp.refcounter = 1;
   2.496 +		tmp.cc.ptr = iface;
   2.497  
   2.498 -		CallClass tmp;
   2.499 -		char *ptr = new char[size * 2 + sizeof(void*)];
   2.500 -		tmp.ptr = reinterpret_cast<void*>(ptr);
   2.501 -		memcpy(reinterpret_cast<void*>(ptr), iface, size);
   2.502 -		memcpy(reinterpret_cast<void*>(ptr + size + sizeof(void*)), iface, size);
   2.503 -		tmp.iface = iface;
   2.504 -		tmp.size = size;
   2.505 -		tmp.refcounter = 1;
   2.506 -
   2.507 -		// Go through _all_ hooks and apply any needed patches
   2.508  		for (HookManInfoList::iterator hookman = m_HookMans.begin(); hookman != m_HookMans.end(); ++hookman)
   2.509 -		{
   2.510 -			for (std::list<HookManagerInfo::Iface>::iterator ifaceiter = hookman->ifaces.begin(); ifaceiter != hookman->ifaces.end(); ++ifaceiter)
   2.511 -			{
   2.512 -				if (ifaceiter->ptr == iface)
   2.513 -				{
   2.514 -					if (!ApplyCallClassPatch(tmp, hookman->vtbl_offs, hookman->vtbl_idx, ifaceiter->orig_entry))
   2.515 -					{
   2.516 -						FreeCallClass(tmp);
   2.517 -						return NULL;
   2.518 -					}
   2.519 -				}
   2.520 -			}
   2.521 -		}
   2.522 +			for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.begin();
   2.523 +				vfnptr_iter != hookman->vfnptrs.end(); ++vfnptr_iter)
   2.524 +				for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
   2.525 +					iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
   2.526 +					if (iface_iter->ptr == iface)
   2.527 +						ApplyCallClassPatch(tmp, hookman->vtbl_offs, hookman->vtbl_idx,
   2.528 +						vfnptr_iter->orig_entry);
   2.529 +
   2.530  		m_CallClasses.push_back(tmp);
   2.531 -		// The object has to be followed by the pointer to the vtable info object
   2.532 -		*reinterpret_cast<void**>(ptr + size) = &m_CallClasses.back();
   2.533 -		return tmp.ptr;
   2.534 +		return &m_CallClasses.back().cc;
   2.535  	}
   2.536  
   2.537 -	void CSourceHookImpl::ReleaseCallClass(void *ptr)
   2.538 +	void CSourceHookImpl::ReleaseCallClass(GenericCallClass *ptr)
   2.539  	{
   2.540  		Impl_CallClassList::iterator iter = std::find(m_CallClasses.begin(), m_CallClasses.end(), ptr);
   2.541  		if (iter == m_CallClasses.end())
   2.542  			return;
   2.543  		--iter->refcounter;
   2.544  		if (iter->refcounter < 1)
   2.545 -		{
   2.546 -			FreeCallClass(*iter);
   2.547  			m_CallClasses.erase(iter);
   2.548 -		}
   2.549 -	}
   2.550 -
   2.551 -	void CSourceHookImpl::FreeCallClass(CallClass &cc)
   2.552 -	{
   2.553 -		for (CallClass::VTableList::iterator vtbliter = cc.vtables.begin(); vtbliter != cc.vtables.end(); ++vtbliter)
   2.554 -		{
   2.555 -#if SH_RUNTIME_CODEGEN == 1
   2.556 -			// Delete generated callgates
   2.557 -			for (std::list<int>::iterator cgiter = vtbliter->patches.begin(); cgiter != vtbliter->patches.end(); ++cgiter)
   2.558 -			{
   2.559 -				char *cgptr = reinterpret_cast<char**>(vtbliter->ptr)[*cgiter];
   2.560 -				delete [] cgptr;
   2.561 -			}
   2.562 -#endif
   2.563 -			delete [] reinterpret_cast<char*>(vtbliter->ptr);
   2.564 -		}
   2.565 -		delete [] reinterpret_cast<char*>(cc.ptr);
   2.566  	}
   2.567  
   2.568 -	bool CSourceHookImpl::ApplyCallClassPatch(CallClass &cc, int vtbl_offs, int vtbl_idx, void *orig_entry)
   2.569 +	void CSourceHookImpl::ApplyCallClassPatch(CallClassInfo &cc, int vtbl_offs, int vtbl_idx, void *orig_entry)
   2.570  	{
   2.571 -		char *ptr = reinterpret_cast<char*>(cc.ptr);
   2.572 -		void *vtable = *reinterpret_cast<void**>(ptr + vtbl_offs);
   2.573 -
   2.574 -		// Check whether we already know that vtable
   2.575 -		CallClass::VTableList::iterator vtbliter = std::find(cc.vtables.begin(),
   2.576 -			cc.vtables.end(), reinterpret_cast<void*>(vtable));
   2.577 -		int actvtablesize=MAX_VTABLE_LEN;
   2.578 -		if (vtbliter == cc.vtables.end())
   2.579 -		{
   2.580 -			CallClass::VTable newvtableinfo;
   2.581 -			int pagesnum = (MAX_VTABLE_LEN % m_PageSize == 0) ? MAX_VTABLE_LEN / m_PageSize : MAX_VTABLE_LEN / m_PageSize + 1;
   2.582 -			// Set all pages in the range to readwrite
   2.583 -			// :TODO: Fix this!
   2.584 -			char *pagebegin = reinterpret_cast<char*>(vtable) - (reinterpret_cast<int>(vtable) % m_PageSize);
   2.585 -			for (int ipage = 0; ipage < pagesnum; ++ipage)
   2.586 -			{
   2.587 -				if (!SetMemAccess(reinterpret_cast<void*>(pagebegin + ipage * m_PageSize), 1,
   2.588 -					SH_MEM_READ | SH_MEM_WRITE))
   2.589 -				{
   2.590 -					// We can't go here anymore
   2.591 -					actvtablesize = static_cast<int>((pagebegin + ipage * m_PageSize) - reinterpret_cast<char*>(vtable));
   2.592 -					break;
   2.593 -				}
   2.594 -			}
   2.595 -			if (actvtablesize < 1)
   2.596 -			{
   2.597 -				// We can't access the vtable -> Quit
   2.598 -				return false;
   2.599 -			}
   2.600 -			// Create a new vtable
   2.601 -			newvtableinfo.ptr = reinterpret_cast<void*>(new char[actvtablesize]);
   2.602 -			// Fill it with the information from the old vtable
   2.603 -			memcpy(newvtableinfo.ptr, vtable, actvtablesize);
   2.604 -			newvtableinfo.actsize = actvtablesize;
   2.605 -			// Set the pointer in the object and add it to the list of already known vtables
   2.606 -			*reinterpret_cast<void**>(ptr + vtbl_offs) = newvtableinfo.ptr;
   2.607 -			cc.vtables.push_back(newvtableinfo);
   2.608 -
   2.609 -			vtbliter = cc.vtables.end();
   2.610 -			--vtbliter;
   2.611 -			// :TODO: When not codegen, patch the other vtable?
   2.612 -		}
   2.613 -
   2.614 -		// Check whether we already have this patch
   2.615 -		if (std::find(vtbliter->patches.begin(), vtbliter->patches.end(), vtbl_idx) == vtbliter->patches.end())
   2.616 -		{
   2.617 -			// No -> apply it
   2.618 -
   2.619 -			// Get a call gate
   2.620 -			void *callgate = NULL;
   2.621 -#if SH_RUNTIME_CODEGEN == 1
   2.622 -			unsigned char *cggen = new unsigned char[SH_CCC_CODESIZE];
   2.623 -			//SH_CCC_MakeGate(cc.iface, cc.ptr, cggen, orig_entry);
   2.624 -			callgate = (void*)cggen;
   2.625 -			SetMemAccess(callgate, SH_CCC_CODESIZE, SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC);
   2.626 -#else
   2.627 -			// :TODO:
   2.628 -#error Not supported yet!
   2.629 -#endif
   2.630 -			vtbliter->patches.push_back(vtbl_idx);
   2.631 -			reinterpret_cast<void**>(vtbliter->ptr)[vtbl_idx] = callgate;
   2.632 -		}
   2.633 -		return true;
   2.634 +		OrigFuncs &tmpvec = cc.cc.vt[vtbl_offs];
   2.635 +		if (tmpvec.size() <= (size_t)vtbl_idx)
   2.636 +			tmpvec.resize(vtbl_idx+1);
   2.637 +		tmpvec[vtbl_idx] = orig_entry;
   2.638  	}
   2.639  
   2.640 -
   2.641  	CSourceHookImpl::HookManInfoList::iterator CSourceHookImpl::FindHookMan(HookManInfoList::iterator begin,
   2.642 -		HookManInfoList::iterator end, const char *proto, int vtblofs, int vtblidx, int thisptrofs)
   2.643 +		HookManInfoList::iterator end, const char *proto, int vtblofs, int vtblidx)
   2.644  	{
   2.645  		for (HookManInfoList::iterator hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
   2.646  		{
   2.647 -			if (strcmp(hookmaniter->proto, proto) == 0 && hookmaniter->vtbl_offs == vtblofs && hookmaniter->vtbl_idx == vtblidx &&
   2.648 -				hookmaniter->thisptr_offs == thisptrofs)
   2.649 +			if (strcmp(hookmaniter->proto, proto) == 0 && hookmaniter->vtbl_offs == vtblofs &&
   2.650 +				hookmaniter->vtbl_idx == vtblidx)
   2.651  				break;
   2.652  		}
   2.653  		return hookmaniter;
   2.654 @@ -489,38 +392,42 @@
   2.655  	{
   2.656  		// Go through all hook managers, all interfaces, and set the status of all hooks of this plugin to paused
   2.657  		for (HookManInfoList::iterator hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
   2.658 -			for (std::list<HookManagerInfo::Iface>::iterator ifaceiter = hookmaniter->ifaces.begin();
   2.659 -				ifaceiter != hookmaniter->ifaces.end(); ++ifaceiter)
   2.660 -			{
   2.661 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
   2.662 -					hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
   2.663 -					if (plug == hookiter->plug)
   2.664 -						hookiter->paused = true;
   2.665 +			for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookmaniter->vfnptrs.begin();
   2.666 +				vfnptr_iter != hookmaniter->vfnptrs.end(); ++vfnptr_iter)
   2.667 +				for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin();
   2.668 +					ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter)
   2.669 +				{
   2.670 +					for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
   2.671 +						hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
   2.672 +						if (plug == hookiter->plug)
   2.673 +							hookiter->paused = true;
   2.674  
   2.675 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
   2.676 -					hookiter != ifaceiter->hooks_post.end(); ++hookiter)
   2.677 -					if (plug == hookiter->plug)
   2.678 -						hookiter->paused = true;
   2.679 -			}
   2.680 +					for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
   2.681 +						hookiter != ifaceiter->hooks_post.end(); ++hookiter)
   2.682 +						if (plug == hookiter->plug)
   2.683 +							hookiter->paused = true;
   2.684 +				}
   2.685  	}
   2.686  
   2.687  	void CSourceHookImpl::UnpausePlugin(Plugin plug)
   2.688  	{
   2.689 -		// Go through all hook managers, all interfaces, and set the status of all hooks of this plugin to normal
   2.690 +		// Go through all hook managers, all interfaces, and set the status of all hooks of this plugin to paused
   2.691  		for (HookManInfoList::iterator hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
   2.692 -			for (std::list<HookManagerInfo::Iface>::iterator ifaceiter = hookmaniter->ifaces.begin();
   2.693 -				ifaceiter != hookmaniter->ifaces.end(); ++ifaceiter)
   2.694 -			{
   2.695 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
   2.696 -					hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
   2.697 -					if (plug == hookiter->plug)
   2.698 -						hookiter->paused = false;
   2.699 +			for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookmaniter->vfnptrs.begin();
   2.700 +				vfnptr_iter != hookmaniter->vfnptrs.end(); ++vfnptr_iter)
   2.701 +				for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin();
   2.702 +					ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter)
   2.703 +				{
   2.704 +					for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
   2.705 +						hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
   2.706 +						if (plug == hookiter->plug)
   2.707 +							hookiter->paused = false;
   2.708  
   2.709 -				for (std::list<HookManagerInfo::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
   2.710 -					hookiter != ifaceiter->hooks_post.end(); ++hookiter)
   2.711 -					if (plug == hookiter->plug)
   2.712 -						hookiter->paused = false;
   2.713 -			}
   2.714 +					for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
   2.715 +						hookiter != ifaceiter->hooks_post.end(); ++hookiter)
   2.716 +						if (plug == hookiter->plug)
   2.717 +							hookiter->paused = false;
   2.718 +				}
   2.719  	}
   2.720  
   2.721  	void CSourceHookImpl::SetRes(META_RES res)
     3.1 --- a/sourcehook/sourcehook.h	Thu Apr 28 17:24:39 2005 +0000
     3.2 +++ b/sourcehook/sourcehook.h	Fri Apr 29 20:29:46 2005 +0000
     3.3 @@ -1,16 +1,12 @@
     3.4  /* ======== SourceHook ========
     3.5 -* Copyright (C) 2004-2005 Metamod:Source Development Team
     3.6 +* By PM
     3.7  * No warranties of any kind
     3.8 -*
     3.9 -* License: zlib/libpng
    3.10 -*
    3.11 -* Author(s): Pavol "PM OnoTo" Marko
    3.12  * ============================
    3.13  */
    3.14  
    3.15  /**
    3.16 - * @file sourcehook.h
    3.17 - * @brief Contains the public SourceHook API
    3.18 +*	@file sourcehook.h
    3.19 +*	@brief Contains the public SourceHook API
    3.20  */
    3.21  
    3.22  #ifndef __SOURCEHOOK_H__
    3.23 @@ -24,16 +20,16 @@
    3.24  #define SH_GLOB_PLUGPTR g_PLID
    3.25  #endif
    3.26  
    3.27 +#define SH_ASSERT(x, info) if (!(x)) __asm { int 3 }
    3.28 +
    3.29  // System
    3.30  #define SH_SYS_WIN32 1
    3.31  #define SH_SYS_LINUX 2
    3.32  
    3.33  #ifdef _WIN32
    3.34  # define SH_SYS SH_SYS_WIN32
    3.35 -# define SH_ASSERT(x) if (!(x)) __asm { int 3 }
    3.36  #elif defined __linux__
    3.37  # define SH_SYS SH_SYS_LINUX
    3.38 -# define SH_ASSERT(x) if (!(x)) asm("int $3");
    3.39  #else
    3.40  # error Unsupported system
    3.41  #endif
    3.42 @@ -58,6 +54,8 @@
    3.43  #include "sh_memfuncinfo.h"
    3.44  #include "sh_memory.h"
    3.45  #include <list>
    3.46 +#include <vector>
    3.47 +#include <map>
    3.48  #include <algorithm>
    3.49  
    3.50  // Good old metamod!
    3.51 @@ -78,6 +76,13 @@
    3.52  	const int STRBUF_LEN=8192;		// In bytes, for "vafmt" functions
    3.53  
    3.54  	/**
    3.55 +	*	@brief An empty class. No inheritance used. Used for original-function-call hacks
    3.56 +	*/
    3.57 +	class EmptyClass
    3.58 +	{
    3.59 +	};
    3.60 +
    3.61 +	/**
    3.62  	*	@brief A plugin typedef
    3.63  	*
    3.64  	*	SourceHook doesn't really care what this is. As long as the ==, != and = operators work on it
    3.65 @@ -140,65 +145,60 @@
    3.66  	*/
    3.67  	struct HookManagerInfo
    3.68  	{
    3.69 -		struct Iface
    3.70 +		struct VfnPtr
    3.71  		{
    3.72 -			struct Hook
    3.73 +			struct Iface
    3.74  			{
    3.75 -				ISHDelegate *handler;			//!< Pointer to the handler
    3.76 -				bool paused;					//!< If true, the hook should not be executed
    3.77 -				Plugin plug;					//!< The owner plugin
    3.78 +				struct Hook
    3.79 +				{
    3.80 +					ISHDelegate *handler;			//!< Pointer to the handler
    3.81 +					bool paused;					//!< If true, the hook should not be executed
    3.82 +					Plugin plug;					//!< The owner plugin
    3.83 +				};
    3.84 +				void *ptr;							//!< Pointer to the interface instance
    3.85 +				std::list<Hook> hooks_pre;			//!< A list of pre-hooks
    3.86 +				std::list<Hook> hooks_post;			//!< A list of post-hooks
    3.87 +				bool operator ==(void *other) const
    3.88 +				{
    3.89 +					return ptr == other;
    3.90 +				}
    3.91  			};
    3.92 -			void *callclass;					//!< Stores a call class for this interface
    3.93 -			void *ptr;							//!< Pointer to the interface instance
    3.94 +
    3.95 +			void *vfnptr;							//!< Pointer to the function
    3.96  			void *orig_entry;					//!< The original vtable entry
    3.97 -			std::list<Hook> hooks_pre;			//!< A list of pre-hooks
    3.98 -			std::list<Hook> hooks_post;			//!< A list of post-hooks
    3.99 -			bool operator ==(void *other) const
   3.100 +
   3.101 +			typedef std::list<Iface> IfaceList;
   3.102 +			typedef IfaceList::iterator IfaceListIter;
   3.103 +			IfaceList ifaces;
   3.104 +
   3.105 +			bool operator ==(void *other)
   3.106  			{
   3.107 -				return ptr == other;
   3.108 +				return vfnptr == other;
   3.109  			}
   3.110  		};
   3.111  		Plugin plug;							//!< The owner plugin
   3.112  		const char *proto;						//!< The prototype of the function the hook manager is responsible for
   3.113  		int vtbl_idx;							//!< The vtable index
   3.114  		int vtbl_offs;							//!< The vtable offset
   3.115 -		int thisptr_offs;						//!< The this-pointer-adjuster
   3.116  		HookManagerPubFunc func;				//!< The interface to the hook manager
   3.117  
   3.118 -		int hookfunc_vtbl_idx;					//!< the vtable index of the hookfunc
   3.119 -		int hookfunc_vtbl_offs;					//!< the vtable offset of the hookfunc
   3.120 -		void *hookfunc_inst;					//!< Instance of the class the hookfunc is in
   3.121 +		void *hookfunc_vfnptr;					//!< Pointer to the hookfunc impl
   3.122  		
   3.123 -		std::list<Iface> ifaces;				//!< List of hooked interfaces
   3.124 +		typedef std::list<VfnPtr> VfnPtrList;
   3.125 +		typedef VfnPtrList::iterator VfnPtrListIter;
   3.126 +		VfnPtrList vfnptrs;				//!< List of hooked interfaces
   3.127  	};
   3.128  
   3.129 -	/**
   3.130 -	*	@brief Structure describing a callclass
   3.131 -	*/
   3.132 -	struct CallClass
   3.133 +	typedef std::vector<void*> OrigFuncs;
   3.134 +	typedef std::map<int, OrigFuncs> OrigVTables;
   3.135 +
   3.136 +	template<class B> struct CallClass
   3.137  	{
   3.138 -		struct VTable
   3.139 -		{
   3.140 -			void *ptr;
   3.141 -			int actsize;
   3.142 -			std::list<int> patches;	//!< Already patched entries
   3.143 -			bool operator ==(void *other) const
   3.144 -			{
   3.145 -				return ptr == other;
   3.146 -			}
   3.147 -		};
   3.148 -		void *iface;				//!< The iface pointer this callclass belongs to
   3.149 -		size_t size;				//!< The size of the callclass
   3.150 -		void *ptr;					//!< The actual "object"
   3.151 -		typedef std::list<VTable> VTableList;
   3.152 -		VTableList vtables;			//!< Already known vtables
   3.153 -		int refcounter;				//!< How many times it was requested
   3.154 +		B *ptr;
   3.155 +		OrigVTables vt;
   3.156 +	};
   3.157  
   3.158 -		bool operator ==(void *other) const
   3.159 -		{
   3.160 -			return ptr == other;
   3.161 -		}
   3.162 -	};
   3.163 +	typedef CallClass<void> GenericCallClass;
   3.164  
   3.165  	/**
   3.166  	*	@brief The main SourceHook interface
   3.167 @@ -218,7 +218,7 @@
   3.168  		*	@param handler A pointer to a FastDelegate containing the hook handler
   3.169  		*	@param post Set to true if you want a post handler
   3.170  		*/
   3.171 -		virtual bool AddHook(Plugin plug, void *iface, int ifacesize, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   3.172 +		virtual bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   3.173  
   3.174  		/**
   3.175  		*	@brief Removes a hook.
   3.176 @@ -231,7 +231,7 @@
   3.177  		*	@param handler A pointer to a FastDelegate containing the hook handler
   3.178  		*	@param post Set to true if you want a post handler
   3.179  		*/
   3.180 -		virtual bool RemoveHook(Plugin plug, void *iface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   3.181 +		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   3.182  
   3.183  		/**
   3.184  		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   3.185 @@ -246,14 +246,14 @@
   3.186  		*	@param iface The interface pointer
   3.187  		*	@param size Size of the class
   3.188  		*/
   3.189 -		virtual void *GetCallClass(void *iface, size_t size) = 0;
   3.190 +		virtual GenericCallClass *GetCallClass(void *iface) = 0;
   3.191  
   3.192  		/**
   3.193  		*	@brief Release a callclass
   3.194  		*
   3.195  		*	@param ptr Pointer to the callclass
   3.196  		*/
   3.197 -		virtual void ReleaseCallClass(void *ptr) = 0;
   3.198 +		virtual void ReleaseCallClass(GenericCallClass *ptr) = 0;
   3.199  
   3.200  		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
   3.201  		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the previously called handler
   3.202 @@ -288,11 +288,16 @@
   3.203  /**
   3.204  *	@brief Get/generate callclass for an interface pointer
   3.205  *
   3.206 -*	@param ifacetype The type of the interface
   3.207  *	@param ifaceptr The interface pointer
   3.208  */
   3.209 -#define SH_GET_CALLCLASS(ifacetype, ifaceptr) reinterpret_cast<ifacetype*>(SH_GLOB_SHPTR->GetCallClass(ifaceptr, sizeof(ifacetype)))
   3.210 -#define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<void*>(ptr))
   3.211 +template<class ifacetype>
   3.212 +inline SourceHook::CallClass<ifacetype> *SH_GET_CALLCLASS(ifacetype *ptr)
   3.213 +{
   3.214 +	return reinterpret_cast<SourceHook::CallClass<ifacetype>*>(
   3.215 +		SH_GLOB_SHPTR->GetCallClass(reinterpret_cast<void*>(ptr)));
   3.216 +}
   3.217 +
   3.218 +#define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<SourceHook::GenericCallClass*>(ptr))
   3.219  
   3.220  #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   3.221  	SourceHook::SH_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
   3.222 @@ -311,6 +316,18 @@
   3.223  #define SH_NOATTRIB
   3.224  
   3.225  
   3.226 +
   3.227 +#if SH_COMP == SH_COMP_MSVC
   3.228 +# define SH_SETUP_MFP(mfp) \
   3.229 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry;
   3.230 +#elif SH_COMP == SH_COMP_GCC
   3.231 +# define SH_SETUP_MFP(mfp) \
   3.232 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry; \
   3.233 +	reinterpret_cast<void**>(&mfp)[1] = 0;
   3.234 +#else
   3.235 +# error Not supported yet.
   3.236 +#endif
   3.237 +
   3.238  //////////////////////////////////////////////////////////////////////////
   3.239  #define SH_FHCls(ift, iff, ov) FHCls_##ift##iff##ov
   3.240  
   3.241 @@ -324,13 +341,10 @@
   3.242  			GetFuncInfo(funcptr, mfi); \
   3.243  			param->vtbl_idx = mfi.vtblindex; \
   3.244  			param->vtbl_offs = mfi.vtbloffs; \
   3.245 -			param->thisptr_offs = mfi.thisptroffs; \
   3.246 -			if (param->thisptr_offs < 0) \
   3.247 -				return 2; /*No virtual inheritance supported*/ \
   3.248 +			\
   3.249  			GetFuncInfo(&SH_FHCls(ifacetype,ifacefunc,overload)::Func, mfi); \
   3.250 -			param->hookfunc_vtbl_idx = mfi.vtblindex; \
   3.251 -			param->hookfunc_vtbl_offs = mfi.vtbloffs; \
   3.252 -			param->hookfunc_inst = (void*)&ms_Inst; \
   3.253 +			param->hookfunc_vfnptr = \
   3.254 +			reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]; \
   3.255  			return 0; \
   3.256  		} \
   3.257  		else if (action == HA_Register) \
   3.258 @@ -357,7 +371,7 @@
   3.259  			static const char *ms_Proto; \
   3.260  			SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
   3.261  
   3.262 -#define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto) \
   3.263 +#define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto, funcptr) \
   3.264  		}; \
   3.265  		const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
   3.266  		SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
   3.267 @@ -365,44 +379,67 @@
   3.268  		bool SH_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
   3.269  			SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   3.270  		{ \
   3.271 -			return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, sizeof(ifacetype), \
   3.272 +			MemFuncInfo mfi; \
   3.273 +			GetFuncInfo(funcptr, mfi); \
   3.274 +			if (mfi.thisptroffs < 0) \
   3.275 +				return false; /* No virtual inheritance supported */ \
   3.276 +			\
   3.277 +			return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   3.278  				SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
   3.279  				new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
   3.280  		} \
   3.281  		bool SH_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
   3.282  			SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   3.283  		{ \
   3.284 +			MemFuncInfo mfi; \
   3.285 +			GetFuncInfo(funcptr, mfi); \
   3.286 +			if (mfi.thisptroffs < 0) \
   3.287 +				return false; /* No virtual inheritance supported */ \
   3.288 +			\
   3.289  			CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
   3.290 -			return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, \
   3.291 +			return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   3.292  				SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
   3.293  		} \
   3.294  	}
   3.295  
   3.296 -#define SH_SETUPCALLS(rettype) \
   3.297 -	/* 1) Find the iface ptr */ \
   3.298 -	/* 1.1) Adjust to original this pointer */ \
   3.299 -	void *origthis = this - ms_HI->thisptr_offs; \
   3.300 -	std::list<HookManagerInfo::Iface>::iterator ifaceiter = std::find(ms_HI->ifaces.begin(), \
   3.301 -		ms_HI->ifaces.end(), origthis); \
   3.302 -	SH_ASSERT(ifaceiter != ms_HI->ifaces.end()); \
   3.303 -	HookManagerInfo::Iface &ci = *ifaceiter; \
   3.304 +#define SH_SETUPCALLS(rettype, paramtypes, params) \
   3.305 +	/* 1) Find the vfnptr */ \
   3.306 +	void *ourvfnptr = reinterpret_cast<void*>( \
   3.307 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   3.308 +	\
   3.309 +	HookManagerInfo::VfnPtrListIter vfptriter = std::find(ms_HI->vfnptrs.begin(), \
   3.310 +		ms_HI->vfnptrs.end(), ourvfnptr); \
   3.311 +	if (vfptriter == ms_HI->vfnptrs.end()) \
   3.312 +	{ \
   3.313 +		/* Bleh? Should be impossible! */ \
   3.314 +		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   3.315 +	} \
   3.316 +	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   3.317 +	/* 2) Find the iface */ \
   3.318 +	HookManagerInfo::VfnPtr::IfaceListIter ifiter = std::find(vfnptr.ifaces.begin(), vfnptr.ifaces.end(), this); \
   3.319 +	if (ifiter == vfnptr.ifaces.end()) \
   3.320 +	{ \
   3.321 +		/* The iface info was not found. Redirect the call to the original function. */ \
   3.322 +		rettype (EmptyClass::*mfp)paramtypes; \
   3.323 +		SH_SETUP_MFP(mfp); \
   3.324 +		return (reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   3.325 +	} \
   3.326 +	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   3.327  	/* 2) Declare some vars and set it up */ \
   3.328 -	std::list<HookManagerInfo::Iface::Hook> &prelist = ci.hooks_pre; \
   3.329 -	std::list<HookManagerInfo::Iface::Hook> &postlist = ci.hooks_post; \
   3.330 -	rettype orig_ret; \
   3.331 -	rettype override_ret; \
   3.332 -	rettype plugin_ret; \
   3.333 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   3.334 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   3.335 +	rettype orig_ret, override_ret, plugin_ret; \
   3.336  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   3.337  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   3.338  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   3.339  	status = MRES_IGNORED; \
   3.340 -	SH_GLOB_SHPTR->SetIfacePtr(ci.ptr); \
   3.341 +	SH_GLOB_SHPTR->SetIfacePtr(this); \
   3.342  	SH_GLOB_SHPTR->SetOrigRet(reinterpret_cast<void*>(&orig_ret)); \
   3.343  	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   3.344  
   3.345  #define SH_CALL_HOOKS(post, params) \
   3.346  	prev_res = MRES_IGNORED; \
   3.347 -	for (std::list<HookManagerInfo::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   3.348 +	for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   3.349  	{ \
   3.350  		if (hiter->paused) continue; \
   3.351  		cur_res = MRES_IGNORED; \
   3.352 @@ -417,44 +454,64 @@
   3.353  		} \
   3.354  	}
   3.355  
   3.356 -#define SH_CALL_ORIG(ifacetype, ifacefunc, params) \
   3.357 +#define SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params) \
   3.358  	if (status != MRES_SUPERCEDE) \
   3.359 -		orig_ret = reinterpret_cast<ifacetype*>(ci.callclass)->ifacefunc params; \
   3.360 +	{ \
   3.361 +		rettype (EmptyClass::*mfp)paramtypes; \
   3.362 +		SH_SETUP_MFP(mfp); \
   3.363 +		orig_ret = (reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   3.364 +	} \
   3.365  	else \
   3.366  		orig_ret = override_ret;
   3.367  
   3.368  #define SH_RETURN() \
   3.369  	return status >= MRES_OVERRIDE ? override_ret : orig_ret;
   3.370  
   3.371 -#define SH_HANDLEFUNC(ifacetype, ifacefunc, params, rettype) \
   3.372 -	SH_SETUPCALLS(rettype) \
   3.373 +#define SH_HANDLEFUNC(ifacetype, ifacefunc, paramtypes, params, rettype) \
   3.374 +	SH_SETUPCALLS(rettype, paramtypes, params) \
   3.375  	SH_CALL_HOOKS(pre, params) \
   3.376 -	SH_CALL_ORIG(ifacetype, ifacefunc, params) \
   3.377 +	SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params) \
   3.378  	SH_CALL_HOOKS(post, params) \
   3.379  	SH_RETURN()
   3.380  
   3.381  //////////////////////////////////////////////////////////////////////////
   3.382 -#define SH_SETUPCALLS_void() \
   3.383 -	/* 1) Find the iface ptr */ \
   3.384 -	/* 1.1) Adjust to original this pointer */ \
   3.385 -	void *origthis = this - ms_HI->thisptr_offs; \
   3.386 -	std::list<HookManagerInfo::Iface>::iterator ifaceiter = std::find(ms_HI->ifaces.begin(), \
   3.387 -		ms_HI->ifaces.end(), origthis); \
   3.388 -	SH_ASSERT(ifaceiter != ms_HI->ifaces.end()); \
   3.389 -	HookManagerInfo::Iface &ci = *ifaceiter; \
   3.390 +#define SH_SETUPCALLS_void(paramtypes, params) \
   3.391 +	/* 1) Find the vfnptr */ \
   3.392 +	void *ourvfnptr = reinterpret_cast<void*>( \
   3.393 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   3.394 +	\
   3.395 +	HookManagerInfo::VfnPtrListIter vfptriter = std::find(ms_HI->vfnptrs.begin(), \
   3.396 +		ms_HI->vfnptrs.end(), ourvfnptr); \
   3.397 +	if (vfptriter == ms_HI->vfnptrs.end()) \
   3.398 +	{ \
   3.399 +		/* Bleh? Should be impossible! */ \
   3.400 +		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   3.401 +	} \
   3.402 +	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   3.403 +	/* 2) Find the iface */ \
   3.404 +	HookManagerInfo::VfnPtr::IfaceListIter ifiter = std::find(vfnptr.ifaces.begin(), vfnptr.ifaces.end(), this); \
   3.405 +	if (ifiter == vfnptr.ifaces.end()) \
   3.406 +	{ \
   3.407 +		/* The iface info was not found. Redirect the call to the original function. */ \
   3.408 +		void (EmptyClass::*mfp)paramtypes; \
   3.409 +		SH_SETUP_MFP(mfp); \
   3.410 +		(reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   3.411 +		return; \
   3.412 +	} \
   3.413 +	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   3.414  	/* 2) Declare some vars and set it up */ \
   3.415 -	std::list<HookManagerInfo::Iface::Hook> &prelist = ci.hooks_pre; \
   3.416 -	std::list<HookManagerInfo::Iface::Hook> &postlist = ci.hooks_post; \
   3.417 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   3.418 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   3.419  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   3.420  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   3.421  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   3.422  	status = MRES_IGNORED; \
   3.423 -	SH_GLOB_SHPTR->SetIfacePtr(ci.ptr); \
   3.424 +	SH_GLOB_SHPTR->SetIfacePtr(this); \
   3.425  	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   3.426  
   3.427  #define SH_CALL_HOOKS_void(post, params) \
   3.428  	prev_res = MRES_IGNORED; \
   3.429 -	for (std::list<HookManagerInfo::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   3.430 +	for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   3.431  	{ \
   3.432  		if (hiter->paused) continue; \
   3.433  		cur_res = MRES_IGNORED; \
   3.434 @@ -464,53 +521,59 @@
   3.435  			status = cur_res; \
   3.436  	}
   3.437  
   3.438 -#define SH_CALL_ORIG_void(ifacetype, ifacefunc, params) \
   3.439 +#define SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params) \
   3.440  	if (status != MRES_SUPERCEDE) \
   3.441 -		reinterpret_cast<ifacetype*>(ci.callclass)->ifacefunc params;
   3.442 +	{ \
   3.443 +		void (EmptyClass::*mfp)paramtypes; \
   3.444 +		SH_SETUP_MFP(mfp); \
   3.445 +		(reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   3.446 +	}
   3.447  
   3.448  #define SH_RETURN_void()
   3.449  
   3.450 -#define SH_HANDLEFUNC_void(ifacetype, ifacefunc, params) \
   3.451 -	SH_SETUPCALLS_void() \
   3.452 +#define SH_HANDLEFUNC_void(ifacetype, ifacefunc, paramtypes, params) \
   3.453 +	SH_SETUPCALLS_void(paramtypes, params) \
   3.454  	SH_CALL_HOOKS_void(pre, params) \
   3.455 -	SH_CALL_ORIG_void(ifacetype, ifacefunc, params) \
   3.456 +	SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params) \
   3.457  	SH_CALL_HOOKS_void(post, params) \
   3.458  	SH_RETURN_void()
   3.459  
   3.460  
   3.461  // Special vafmt handlers
   3.462 -#define SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, params_orig, params_plug, rettype) \
   3.463 -	SH_SETUPCALLS(rettype) \
   3.464 +#define SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, paramtypes, params_orig, params_plug, rettype) \
   3.465 +	SH_SETUPCALLS(rettype, paramtypes, params_orig) \
   3.466  	SH_CALL_HOOKS(pre, params_plug) \
   3.467 -	SH_CALL_ORIG(ifacetype, ifacefunc, params_orig) \
   3.468 +	SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params_orig) \
   3.469  	SH_CALL_HOOKS(post, params_plug) \
   3.470  	SH_RETURN()
   3.471  
   3.472 -#define SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, params_orig, params_plug) \
   3.473 -	SH_SETUPCALLS_void() \
   3.474 +#define SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, paramtypes, params_orig, params_plug) \
   3.475 +	SH_SETUPCALLS_void(paramtypes, params_orig) \
   3.476  	SH_CALL_HOOKS_void(pre, params_plug) \
   3.477 -	SH_CALL_ORIG_void(ifacetype, ifacefunc, params_orig) \
   3.478 +	SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params_orig) \
   3.479  	SH_CALL_HOOKS_void(post, params_plug) \
   3.480  	SH_RETURN_void()
   3.481  
   3.482  //////////////////////////////////////////////////////////////////////////
   3.483  
   3.484 -// *********
   3.485 +// ********* Support for 0 arguments *********
   3.486  #define SH_DECL_HOOK0(ifacetype, ifacefunc, attr, overload, rettype) \
   3.487  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)()> \
   3.488  		(&ifacetype::ifacefunc))) \
   3.489  		typedef fastdelegate::FastDelegate0<rettype> FD; \
   3.490  		virtual rettype Func() attr \
   3.491 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (), rettype); } \
   3.492 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype )
   3.493 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (), (), rettype); } \
   3.494 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype , \
   3.495 +	(static_cast<rettype (ifacetype::*)()>(&ifacetype::ifacefunc)))
   3.496  
   3.497  #define SH_DECL_HOOK0_void(ifacetype, ifacefunc, attr, overload) \
   3.498  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)()> \
   3.499  		(&ifacetype::ifacefunc))) \
   3.500  		typedef fastdelegate::FastDelegate0<> FD; \
   3.501  		virtual void Func() attr \
   3.502 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, ()); } \
   3.503 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr )
   3.504 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (), ()); } \
   3.505 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr , \
   3.506 +	(static_cast<void (ifacetype::*)()>(&ifacetype::ifacefunc)))
   3.507  
   3.508  #define SH_DECL_HOOK0_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
   3.509  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(const char *, ...)> \
   3.510 @@ -523,9 +586,10 @@
   3.511  			va_start(ap, fmt); \
   3.512  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.513  			va_end(ap); \
   3.514 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, ("%s", buf), (buf), rettype); \
   3.515 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (...), ("%s", buf), (buf), rettype); \
   3.516  		} \
   3.517 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype  "|const char*|...")
   3.518 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype  "|const char*|...", \
   3.519 +	(static_cast<rettype (ifacetype::*)(const char *, ...)>(&ifacetype::ifacefunc)))
   3.520  
   3.521  #define SH_DECL_HOOK0_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
   3.522  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(const char *, ...)> \
   3.523 @@ -538,26 +602,29 @@
   3.524  			va_start(ap, fmt); \
   3.525  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.526  			va_end(ap); \
   3.527 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, ("%s", buf), (buf)); \
   3.528 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (...), ("%s", buf), (buf)); \
   3.529  		} \
   3.530 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr  "|const char*|...")
   3.531 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr  "|const char*|...", \
   3.532 +	(static_cast<void (ifacetype::*)(const char *, ...)>(&ifacetype::ifacefunc)))
   3.533  
   3.534 -// *********
   3.535 +// ********* Support for 1 arguments *********
   3.536  #define SH_DECL_HOOK1(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   3.537  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1)> \
   3.538  		(&ifacetype::ifacefunc))) \
   3.539  		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
   3.540  		virtual rettype Func(param1 p1) attr \
   3.541 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1), rettype); } \
   3.542 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1)
   3.543 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1), (p1), rettype); } \
   3.544 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1, \
   3.545 +	(static_cast<rettype (ifacetype::*)(param1)>(&ifacetype::ifacefunc)))
   3.546  
   3.547  #define SH_DECL_HOOK1_void(ifacetype, ifacefunc, attr, overload, param1) \
   3.548  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1)> \
   3.549  		(&ifacetype::ifacefunc))) \
   3.550  		typedef fastdelegate::FastDelegate1<param1> FD; \
   3.551  		virtual void Func(param1 p1) attr \
   3.552 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1)); } \
   3.553 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1)
   3.554 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1), (p1)); } \
   3.555 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1, \
   3.556 +	(static_cast<void (ifacetype::*)(param1)>(&ifacetype::ifacefunc)))
   3.557  
   3.558  #define SH_DECL_HOOK1_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   3.559  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, const char *, ...)> \
   3.560 @@ -570,9 +637,10 @@
   3.561  			va_start(ap, fmt); \
   3.562  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.563  			va_end(ap); \
   3.564 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, "%s", buf), (p1, buf), rettype); \
   3.565 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, ...), (p1, "%s", buf), (p1, buf), rettype); \
   3.566  		} \
   3.567 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|const char*|...")
   3.568 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|const char*|...", \
   3.569 +	(static_cast<rettype (ifacetype::*)(param1, const char *, ...)>(&ifacetype::ifacefunc)))
   3.570  
   3.571  #define SH_DECL_HOOK1_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   3.572  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, const char *, ...)> \
   3.573 @@ -585,26 +653,29 @@
   3.574  			va_start(ap, fmt); \
   3.575  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.576  			va_end(ap); \
   3.577 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, "%s", buf), (p1, buf)); \
   3.578 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, ...), (p1, "%s", buf), (p1, buf)); \
   3.579  		} \
   3.580 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|const char*|...")
   3.581 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|const char*|...", \
   3.582 +	(static_cast<void (ifacetype::*)(param1, const char *, ...)>(&ifacetype::ifacefunc)))
   3.583  
   3.584 -// *********
   3.585 +// ********* Support for 2 arguments *********
   3.586  #define SH_DECL_HOOK2(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
   3.587  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2)> \
   3.588  		(&ifacetype::ifacefunc))) \
   3.589  		typedef fastdelegate::FastDelegate2<param1, param2, rettype> FD; \
   3.590  		virtual rettype Func(param1 p1, param2 p2) attr \
   3.591 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2), rettype); } \
   3.592 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2)
   3.593 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2), (p1, p2), rettype); } \
   3.594 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2, \
   3.595 +	(static_cast<rettype (ifacetype::*)(param1, param2)>(&ifacetype::ifacefunc)))
   3.596  
   3.597  #define SH_DECL_HOOK2_void(ifacetype, ifacefunc, attr, overload, param1, param2) \
   3.598  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2)> \
   3.599  		(&ifacetype::ifacefunc))) \
   3.600  		typedef fastdelegate::FastDelegate2<param1, param2> FD; \
   3.601  		virtual void Func(param1 p1, param2 p2) attr \
   3.602 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2)); } \
   3.603 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2)
   3.604 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2), (p1, p2)); } \
   3.605 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2, \
   3.606 +	(static_cast<void (ifacetype::*)(param1, param2)>(&ifacetype::ifacefunc)))
   3.607  
   3.608  #define SH_DECL_HOOK2_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
   3.609  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...)> \
   3.610 @@ -617,9 +688,10 @@
   3.611  			va_start(ap, fmt); \
   3.612  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.613  			va_end(ap); \
   3.614 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, "%s", buf), (p1, p2, buf), rettype); \
   3.615 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, ...), (p1, p2, "%s", buf), (p1, p2, buf), rettype); \
   3.616  		} \
   3.617 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|const char*|...")
   3.618 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|const char*|...", \
   3.619 +	(static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...)>(&ifacetype::ifacefunc)))
   3.620  
   3.621  #define SH_DECL_HOOK2_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
   3.622  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, const char *, ...)> \
   3.623 @@ -632,26 +704,29 @@
   3.624  			va_start(ap, fmt); \
   3.625  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.626  			va_end(ap); \
   3.627 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, "%s", buf), (p1, p2, buf)); \
   3.628 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, ...), (p1, p2, "%s", buf), (p1, p2, buf)); \
   3.629  		} \
   3.630 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|const char*|...")
   3.631 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|const char*|...", \
   3.632 +	(static_cast<void (ifacetype::*)(param1, param2, const char *, ...)>(&ifacetype::ifacefunc)))
   3.633  
   3.634 -// *********
   3.635 +// ********* Support for 3 arguments *********
   3.636  #define SH_DECL_HOOK3(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
   3.637  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3)> \
   3.638  		(&ifacetype::ifacefunc))) \
   3.639  		typedef fastdelegate::FastDelegate3<param1, param2, param3, rettype> FD; \
   3.640  		virtual rettype Func(param1 p1, param2 p2, param3 p3) attr \
   3.641 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3), rettype); } \
   3.642 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3)
   3.643 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3), (p1, p2, p3), rettype); } \
   3.644 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3, \
   3.645 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3)>(&ifacetype::ifacefunc)))
   3.646  
   3.647  #define SH_DECL_HOOK3_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3) \
   3.648  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3)> \
   3.649  		(&ifacetype::ifacefunc))) \
   3.650  		typedef fastdelegate::FastDelegate3<param1, param2, param3> FD; \
   3.651  		virtual void Func(param1 p1, param2 p2, param3 p3) attr \
   3.652 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3)); } \
   3.653 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3)
   3.654 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3), (p1, p2, p3)); } \
   3.655 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3, \
   3.656 +	(static_cast<void (ifacetype::*)(param1, param2, param3)>(&ifacetype::ifacefunc)))
   3.657  
   3.658  #define SH_DECL_HOOK3_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
   3.659  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...)> \
   3.660 @@ -664,9 +739,10 @@
   3.661  			va_start(ap, fmt); \
   3.662  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.663  			va_end(ap); \
   3.664 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, "%s", buf), (p1, p2, p3, buf), rettype); \
   3.665 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, ...), (p1, p2, p3, "%s", buf), (p1, p2, p3, buf), rettype); \
   3.666  		} \
   3.667 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|const char*|...")
   3.668 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|const char*|...", \
   3.669 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...)>(&ifacetype::ifacefunc)))
   3.670  
   3.671  #define SH_DECL_HOOK3_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
   3.672  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...)> \
   3.673 @@ -679,26 +755,29 @@
   3.674  			va_start(ap, fmt); \
   3.675  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.676  			va_end(ap); \
   3.677 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, "%s", buf), (p1, p2, p3, buf)); \
   3.678 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, ...), (p1, p2, p3, "%s", buf), (p1, p2, p3, buf)); \
   3.679  		} \
   3.680 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|const char*|...")
   3.681 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|const char*|...", \
   3.682 +	(static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...)>(&ifacetype::ifacefunc)))
   3.683  
   3.684 -// *********
   3.685 +// ********* Support for 4 arguments *********
   3.686  #define SH_DECL_HOOK4(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
   3.687  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4)> \
   3.688  		(&ifacetype::ifacefunc))) \
   3.689  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4, rettype> FD; \
   3.690  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) attr \
   3.691 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4), rettype); } \
   3.692 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4)
   3.693 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
   3.694 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4, \
   3.695 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4)>(&ifacetype::ifacefunc)))
   3.696  
   3.697  #define SH_DECL_HOOK4_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4) \
   3.698  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4)> \
   3.699  		(&ifacetype::ifacefunc))) \
   3.700  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4> FD; \
   3.701  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4) attr \
   3.702 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4)); } \
   3.703 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4)
   3.704 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4), (p1, p2, p3, p4)); } \
   3.705 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4, \
   3.706 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4)>(&ifacetype::ifacefunc)))
   3.707  
   3.708  #define SH_DECL_HOOK4_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
   3.709  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...)> \
   3.710 @@ -711,9 +790,10 @@
   3.711  			va_start(ap, fmt); \
   3.712  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.713  			va_end(ap); \
   3.714 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf), rettype); \
   3.715 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, ...), (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf), rettype); \
   3.716  		} \
   3.717 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...")
   3.718 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...", \
   3.719 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...)>(&ifacetype::ifacefunc)))
   3.720  
   3.721  #define SH_DECL_HOOK4_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
   3.722  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...)> \
   3.723 @@ -726,26 +806,29 @@
   3.724  			va_start(ap, fmt); \
   3.725  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.726  			va_end(ap); \
   3.727 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf)); \
   3.728 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, ...), (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf)); \
   3.729  		} \
   3.730 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...")
   3.731 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...", \
   3.732 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...)>(&ifacetype::ifacefunc)))
   3.733  
   3.734 -// *********
   3.735 +// ********* Support for 5 arguments *********
   3.736  #define SH_DECL_HOOK5(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
   3.737  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5)> \
   3.738  		(&ifacetype::ifacefunc))) \
   3.739  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5, rettype> FD; \
   3.740  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) attr \
   3.741 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5), rettype); } \
   3.742 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5)
   3.743 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
   3.744 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5, \
   3.745 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5)>(&ifacetype::ifacefunc)))
   3.746  
   3.747  #define SH_DECL_HOOK5_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5) \
   3.748  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5)> \
   3.749  		(&ifacetype::ifacefunc))) \
   3.750  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5> FD; \
   3.751  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) attr \
   3.752 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5)); } \
   3.753 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5)
   3.754 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5)); } \
   3.755 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5, \
   3.756 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5)>(&ifacetype::ifacefunc)))
   3.757  
   3.758  #define SH_DECL_HOOK5_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
   3.759  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)> \
   3.760 @@ -758,9 +841,10 @@
   3.761  			va_start(ap, fmt); \
   3.762  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.763  			va_end(ap); \
   3.764 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf), rettype); \
   3.765 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, ...), (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf), rettype); \
   3.766  		} \
   3.767 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...")
   3.768 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...", \
   3.769 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)>(&ifacetype::ifacefunc)))
   3.770  
   3.771  #define SH_DECL_HOOK5_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
   3.772  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)> \
   3.773 @@ -773,26 +857,29 @@
   3.774  			va_start(ap, fmt); \
   3.775  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.776  			va_end(ap); \
   3.777 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf)); \
   3.778 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, ...), (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf)); \
   3.779  		} \
   3.780 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...")
   3.781 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...", \
   3.782 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)>(&ifacetype::ifacefunc)))
   3.783  
   3.784 -// *********
   3.785 +// ********* Support for 6 arguments *********
   3.786  #define SH_DECL_HOOK6(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
   3.787  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6)> \
   3.788  		(&ifacetype::ifacefunc))) \
   3.789  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6, rettype> FD; \
   3.790  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) attr \
   3.791 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6), rettype); } \
   3.792 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6)
   3.793 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
   3.794 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6, \
   3.795 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6)>(&ifacetype::ifacefunc)))
   3.796  
   3.797  #define SH_DECL_HOOK6_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6) \
   3.798  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6)> \
   3.799  		(&ifacetype::ifacefunc))) \
   3.800  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6> FD; \
   3.801  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) attr \
   3.802 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6)); } \
   3.803 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6)
   3.804 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6)); } \
   3.805 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6, \
   3.806 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6)>(&ifacetype::ifacefunc)))
   3.807  
   3.808  #define SH_DECL_HOOK6_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
   3.809  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)> \
   3.810 @@ -805,9 +892,10 @@
   3.811  			va_start(ap, fmt); \
   3.812  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.813  			va_end(ap); \
   3.814 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf), rettype); \
   3.815 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, ...), (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf), rettype); \
   3.816  		} \
   3.817 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...")
   3.818 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...", \
   3.819 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)>(&ifacetype::ifacefunc)))
   3.820  
   3.821  #define SH_DECL_HOOK6_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
   3.822  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)> \
   3.823 @@ -820,26 +908,29 @@
   3.824  			va_start(ap, fmt); \
   3.825  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.826  			va_end(ap); \
   3.827 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf)); \
   3.828 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, ...), (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf)); \
   3.829  		} \
   3.830 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...")
   3.831 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...", \
   3.832 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)>(&ifacetype::ifacefunc)))
   3.833  
   3.834 -// *********
   3.835 +// ********* Support for 7 arguments *********
   3.836  #define SH_DECL_HOOK7(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
   3.837  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)> \
   3.838  		(&ifacetype::ifacefunc))) \
   3.839  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7, rettype> FD; \
   3.840  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) attr \
   3.841 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7), rettype); } \
   3.842 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7)
   3.843 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
   3.844 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7, \
   3.845 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)>(&ifacetype::ifacefunc)))
   3.846  
   3.847  #define SH_DECL_HOOK7_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7) \
   3.848  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)> \
   3.849  		(&ifacetype::ifacefunc))) \
   3.850  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7> FD; \
   3.851  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) attr \
   3.852 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7)); } \
   3.853 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7)
   3.854 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7)); } \
   3.855 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7, \
   3.856 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)>(&ifacetype::ifacefunc)))
   3.857  
   3.858  #define SH_DECL_HOOK7_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
   3.859  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)> \
   3.860 @@ -852,9 +943,10 @@
   3.861  			va_start(ap, fmt); \
   3.862  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.863  			va_end(ap); \
   3.864 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf), rettype); \
   3.865 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, ...), (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf), rettype); \
   3.866  		} \
   3.867 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...")
   3.868 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...", \
   3.869 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)>(&ifacetype::ifacefunc)))
   3.870  
   3.871  #define SH_DECL_HOOK7_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
   3.872  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)> \
   3.873 @@ -867,26 +959,29 @@
   3.874  			va_start(ap, fmt); \
   3.875  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.876  			va_end(ap); \
   3.877 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf)); \
   3.878 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, ...), (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf)); \
   3.879  		} \
   3.880 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...")
   3.881 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...", \
   3.882 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)>(&ifacetype::ifacefunc)))
   3.883  
   3.884 -// *********
   3.885 +// ********* Support for 8 arguments *********
   3.886  #define SH_DECL_HOOK8(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   3.887  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)> \
   3.888  		(&ifacetype::ifacefunc))) \
   3.889  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8, rettype> FD; \
   3.890  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) attr \
   3.891 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
   3.892 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8)
   3.893 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
   3.894 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8, \
   3.895 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)>(&ifacetype::ifacefunc)))
   3.896  
   3.897  #define SH_DECL_HOOK8_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8) \
   3.898  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)> \
   3.899  		(&ifacetype::ifacefunc))) \
   3.900  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8> FD; \
   3.901  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) attr \
   3.902 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8)); } \
   3.903 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8)
   3.904 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8)); } \
   3.905 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8, \
   3.906 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)>(&ifacetype::ifacefunc)))
   3.907  
   3.908  #define SH_DECL_HOOK8_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   3.909  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)> \
   3.910 @@ -899,9 +994,10 @@
   3.911  			va_start(ap, fmt); \
   3.912  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.913  			va_end(ap); \
   3.914 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, buf), rettype); \
   3.915 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, ...), (p1, p2, p3, p4, p5, p6, p7, p8, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, buf), rettype); \
   3.916  		} \
   3.917 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...")
   3.918 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...", \
   3.919 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)>(&ifacetype::ifacefunc)))
   3.920  
   3.921  #define SH_DECL_HOOK8_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   3.922  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)> \
   3.923 @@ -914,26 +1010,29 @@
   3.924  			va_start(ap, fmt); \
   3.925  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.926  			va_end(ap); \
   3.927 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, buf)); \
   3.928 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, ...), (p1, p2, p3, p4, p5, p6, p7, p8, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, buf)); \
   3.929  		} \
   3.930 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...")
   3.931 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...", \
   3.932 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)>(&ifacetype::ifacefunc)))
   3.933  
   3.934 -// *********
   3.935 +// ********* Support for 9 arguments *********
   3.936  #define SH_DECL_HOOK9(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   3.937  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)> \
   3.938  		(&ifacetype::ifacefunc))) \
   3.939  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9, rettype> FD; \
   3.940  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) attr \
   3.941 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
   3.942 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9)
   3.943 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
   3.944 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9, \
   3.945 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)>(&ifacetype::ifacefunc)))
   3.946  
   3.947  #define SH_DECL_HOOK9_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   3.948  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)> \
   3.949  		(&ifacetype::ifacefunc))) \
   3.950  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9> FD; \
   3.951  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) attr \
   3.952 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
   3.953 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9)
   3.954 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
   3.955 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9, \
   3.956 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)>(&ifacetype::ifacefunc)))
   3.957  
   3.958  #define SH_DECL_HOOK9_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   3.959  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)> \
   3.960 @@ -946,9 +1045,10 @@
   3.961  			va_start(ap, fmt); \
   3.962  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.963  			va_end(ap); \
   3.964 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, buf), rettype); \
   3.965 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, buf), rettype); \
   3.966  		} \
   3.967 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...")
   3.968 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...", \
   3.969 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)>(&ifacetype::ifacefunc)))
   3.970  
   3.971  #define SH_DECL_HOOK9_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   3.972  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)> \
   3.973 @@ -961,26 +1061,29 @@
   3.974  			va_start(ap, fmt); \
   3.975  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   3.976  			va_end(ap); \
   3.977 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, buf)); \
   3.978 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, buf)); \
   3.979  		} \
   3.980 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...")
   3.981 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...", \
   3.982 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)>(&ifacetype::ifacefunc)))
   3.983  
   3.984 -// *********
   3.985 +// ********* Support for 10 arguments *********
   3.986  #define SH_DECL_HOOK10(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
   3.987  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)> \
   3.988  		(&ifacetype::ifacefunc))) \
   3.989  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, rettype> FD; \
   3.990  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) attr \
   3.991 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
   3.992 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10)
   3.993 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
   3.994 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10, \
   3.995 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)>(&ifacetype::ifacefunc)))
   3.996  
   3.997  #define SH_DECL_HOOK10_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
   3.998  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)> \
   3.999  		(&ifacetype::ifacefunc))) \
  3.1000  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> FD; \
  3.1001  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) attr \
  3.1002 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); } \
  3.1003 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10)
  3.1004 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); } \
  3.1005 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10, \
  3.1006 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)>(&ifacetype::ifacefunc)))
  3.1007  
  3.1008  #define SH_DECL_HOOK10_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  3.1009  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)> \
  3.1010 @@ -993,9 +1096,10 @@
  3.1011  			va_start(ap, fmt); \
  3.1012  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1013  			va_end(ap); \
  3.1014 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, buf), rettype); \
  3.1015 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, buf), rettype); \
  3.1016  		} \
  3.1017 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...")
  3.1018 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...", \
  3.1019 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1020  
  3.1021  #define SH_DECL_HOOK10_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  3.1022  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)> \
  3.1023 @@ -1008,26 +1112,29 @@
  3.1024  			va_start(ap, fmt); \
  3.1025  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1026  			va_end(ap); \
  3.1027 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, buf)); \
  3.1028 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, buf)); \
  3.1029  		} \
  3.1030 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...")
  3.1031 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...", \
  3.1032 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1033  
  3.1034 -// *********
  3.1035 +// ********* Support for 11 arguments *********
  3.1036  #define SH_DECL_HOOK11(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  3.1037  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)> \
  3.1038  		(&ifacetype::ifacefunc))) \
  3.1039  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, rettype> FD; \
  3.1040  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) attr \
  3.1041 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
  3.1042 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11)
  3.1043 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
  3.1044 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11, \
  3.1045 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)>(&ifacetype::ifacefunc)))
  3.1046  
  3.1047  #define SH_DECL_HOOK11_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  3.1048  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)> \
  3.1049  		(&ifacetype::ifacefunc))) \
  3.1050  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> FD; \
  3.1051  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) attr \
  3.1052 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); } \
  3.1053 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11)
  3.1054 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); } \
  3.1055 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11, \
  3.1056 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)>(&ifacetype::ifacefunc)))
  3.1057  
  3.1058  #define SH_DECL_HOOK11_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  3.1059  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)> \
  3.1060 @@ -1040,9 +1147,10 @@
  3.1061  			va_start(ap, fmt); \
  3.1062  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1063  			va_end(ap); \
  3.1064 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, buf), rettype); \
  3.1065 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, buf), rettype); \
  3.1066  		} \
  3.1067 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...")
  3.1068 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...", \
  3.1069 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1070  
  3.1071  #define SH_DECL_HOOK11_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  3.1072  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)> \
  3.1073 @@ -1055,26 +1163,29 @@
  3.1074  			va_start(ap, fmt); \
  3.1075  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1076  			va_end(ap); \
  3.1077 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, buf)); \
  3.1078 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, buf)); \
  3.1079  		} \
  3.1080 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...")
  3.1081 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...", \
  3.1082 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1083  
  3.1084 -// *********
  3.1085 +// ********* Support for 12 arguments *********
  3.1086  #define SH_DECL_HOOK12(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  3.1087  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)> \
  3.1088  		(&ifacetype::ifacefunc))) \
  3.1089  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, rettype> FD; \
  3.1090  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) attr \
  3.1091 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), rettype); } \
  3.1092 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12)
  3.1093 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), rettype); } \
  3.1094 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12, \
  3.1095 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)>(&ifacetype::ifacefunc)))
  3.1096  
  3.1097  #define SH_DECL_HOOK12_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  3.1098  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)> \
  3.1099  		(&ifacetype::ifacefunc))) \
  3.1100  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> FD; \
  3.1101  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) attr \
  3.1102 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); } \
  3.1103 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12)
  3.1104 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); } \
  3.1105 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12, \
  3.1106 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)>(&ifacetype::ifacefunc)))
  3.1107  
  3.1108  #define SH_DECL_HOOK12_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  3.1109  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)> \
  3.1110 @@ -1087,9 +1198,10 @@
  3.1111  			va_start(ap, fmt); \
  3.1112  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1113  			va_end(ap); \
  3.1114 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, buf), rettype); \
  3.1115 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, buf), rettype); \
  3.1116  		} \
  3.1117 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...")
  3.1118 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...", \
  3.1119 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1120  
  3.1121  #define SH_DECL_HOOK12_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  3.1122  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)> \
  3.1123 @@ -1102,26 +1214,29 @@
  3.1124  			va_start(ap, fmt); \
  3.1125  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1126  			va_end(ap); \
  3.1127 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, buf)); \
  3.1128 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, buf)); \
  3.1129  		} \
  3.1130 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...")
  3.1131 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...", \
  3.1132 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1133  
  3.1134 -// *********
  3.1135 +// ********* Support for 13 arguments *********
  3.1136  #define SH_DECL_HOOK13(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  3.1137  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)> \
  3.1138  		(&ifacetype::ifacefunc))) \
  3.1139  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, rettype> FD; \
  3.1140  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) attr \
  3.1141 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), rettype); } \
  3.1142 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13)
  3.1143 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), rettype); } \
  3.1144 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13, \
  3.1145 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)>(&ifacetype::ifacefunc)))
  3.1146  
  3.1147  #define SH_DECL_HOOK13_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  3.1148  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)> \
  3.1149  		(&ifacetype::ifacefunc))) \
  3.1150  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> FD; \
  3.1151  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) attr \
  3.1152 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); } \
  3.1153 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13)
  3.1154 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); } \
  3.1155 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13, \
  3.1156 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)>(&ifacetype::ifacefunc)))
  3.1157  
  3.1158  #define SH_DECL_HOOK13_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  3.1159  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)> \
  3.1160 @@ -1134,9 +1249,10 @@
  3.1161  			va_start(ap, fmt); \
  3.1162  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1163  			va_end(ap); \
  3.1164 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, buf), rettype); \
  3.1165 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, buf), rettype); \
  3.1166  		} \
  3.1167 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...")
  3.1168 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...", \
  3.1169 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1170  
  3.1171  #define SH_DECL_HOOK13_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  3.1172  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)> \
  3.1173 @@ -1149,26 +1265,29 @@
  3.1174  			va_start(ap, fmt); \
  3.1175  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1176  			va_end(ap); \
  3.1177 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, buf)); \
  3.1178 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, buf)); \
  3.1179  		} \
  3.1180 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...")
  3.1181 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...", \
  3.1182 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1183  
  3.1184 -// *********
  3.1185 +// ********* Support for 14 arguments *********
  3.1186  #define SH_DECL_HOOK14(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  3.1187  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)> \
  3.1188  		(&ifacetype::ifacefunc))) \
  3.1189  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, rettype> FD; \
  3.1190  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) attr \
  3.1191 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), rettype); } \
  3.1192 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14)
  3.1193 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), rettype); } \
  3.1194 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14, \
  3.1195 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)>(&ifacetype::ifacefunc)))
  3.1196  
  3.1197  #define SH_DECL_HOOK14_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  3.1198  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)> \
  3.1199  		(&ifacetype::ifacefunc))) \
  3.1200  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> FD; \
  3.1201  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) attr \
  3.1202 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); } \
  3.1203 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14)
  3.1204 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); } \
  3.1205 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14, \
  3.1206 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)>(&ifacetype::ifacefunc)))
  3.1207  
  3.1208  #define SH_DECL_HOOK14_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  3.1209  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)> \
  3.1210 @@ -1181,9 +1300,10 @@
  3.1211  			va_start(ap, fmt); \
  3.1212  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1213  			va_end(ap); \
  3.1214 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, buf), rettype); \
  3.1215 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, buf), rettype); \
  3.1216  		} \
  3.1217 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|const char*|...")
  3.1218 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|const char*|...", \
  3.1219 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1220  
  3.1221  #define SH_DECL_HOOK14_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  3.1222  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)> \
  3.1223 @@ -1196,26 +1316,29 @@
  3.1224  			va_start(ap, fmt); \
  3.1225  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1226  			va_end(ap); \
  3.1227 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, buf)); \
  3.1228 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, buf)); \
  3.1229  		} \
  3.1230 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|const char*|...")
  3.1231 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|const char*|...", \
  3.1232 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1233  
  3.1234 -// *********
  3.1235 +// ********* Support for 15 arguments *********
  3.1236  #define SH_DECL_HOOK15(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  3.1237  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)> \
  3.1238  		(&ifacetype::ifacefunc))) \
  3.1239  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, rettype> FD; \
  3.1240  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) attr \
  3.1241 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), rettype); } \
  3.1242 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15)
  3.1243 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), rettype); } \
  3.1244 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15, \
  3.1245 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)>(&ifacetype::ifacefunc)))
  3.1246  
  3.1247  #define SH_DECL_HOOK15_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  3.1248  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)> \
  3.1249  		(&ifacetype::ifacefunc))) \
  3.1250  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> FD; \
  3.1251  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) attr \
  3.1252 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); } \
  3.1253 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15)
  3.1254 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); } \
  3.1255 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15, \
  3.1256 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)>(&ifacetype::ifacefunc)))
  3.1257  
  3.1258  #define SH_DECL_HOOK15_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  3.1259  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)> \
  3.1260 @@ -1228,9 +1351,10 @@
  3.1261  			va_start(ap, fmt); \
  3.1262  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1263  			va_end(ap); \
  3.1264 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, buf), rettype); \
  3.1265 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, buf), rettype); \
  3.1266  		} \
  3.1267 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|const char*|...")
  3.1268 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|const char*|...", \
  3.1269 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1270  
  3.1271  #define SH_DECL_HOOK15_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  3.1272  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)> \
  3.1273 @@ -1243,26 +1367,29 @@
  3.1274  			va_start(ap, fmt); \
  3.1275  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1276  			va_end(ap); \
  3.1277 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, buf)); \
  3.1278 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, buf)); \
  3.1279  		} \
  3.1280 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|const char*|...")
  3.1281 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|const char*|...", \
  3.1282 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1283  
  3.1284 -// *********
  3.1285 +// ********* Support for 16 arguments *********
  3.1286  #define SH_DECL_HOOK16(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  3.1287  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)> \
  3.1288  		(&ifacetype::ifacefunc))) \
  3.1289  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, rettype> FD; \
  3.1290  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) attr \
  3.1291 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), rettype); } \
  3.1292 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16)
  3.1293 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), rettype); } \
  3.1294 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16, \
  3.1295 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)>(&ifacetype::ifacefunc)))
  3.1296  
  3.1297  #define SH_DECL_HOOK16_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  3.1298  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)> \
  3.1299  		(&ifacetype::ifacefunc))) \
  3.1300  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> FD; \
  3.1301  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) attr \
  3.1302 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); } \
  3.1303 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16)
  3.1304 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); } \
  3.1305 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16, \
  3.1306 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)>(&ifacetype::ifacefunc)))
  3.1307  
  3.1308  #define SH_DECL_HOOK16_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  3.1309  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)> \
  3.1310 @@ -1275,9 +1402,10 @@
  3.1311  			va_start(ap, fmt); \
  3.1312  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1313  			va_end(ap); \
  3.1314 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, buf), rettype); \
  3.1315 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, buf), rettype); \
  3.1316  		} \
  3.1317 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...")
  3.1318 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...", \
  3.1319 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1320  
  3.1321  #define SH_DECL_HOOK16_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  3.1322  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)> \
  3.1323 @@ -1290,21 +1418,257 @@
  3.1324  			va_start(ap, fmt); \
  3.1325  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  3.1326  			va_end(ap); \
  3.1327 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, buf)); \
  3.1328 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, buf)); \
  3.1329  		} \
  3.1330 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...")
  3.1331 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...", \
  3.1332 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)>(&ifacetype::ifacefunc)))
  3.1333 +
  3.1334 +
  3.1335 +
  3.1336 +//////////////////////////////////////////////////////////////////////////
  3.1337 +// SH_CALL
  3.1338 +
  3.1339 +
  3.1340 +#define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
  3.1341 +{ \
  3.1342 +	MemFuncInfo mfi; \
  3.1343 +	MFI_Impl<sizeof(m_MFP)>::GetFuncInfo(m_MFP, mfi); \
  3.1344 +	OrigVTables::const_iterator iter = m_CC->vt.find(mfi.vtbloffs); \
  3.1345 +	if (iter == m_CC->vt.end() || mfi.vtblindex >= (int)iter->second.size() || iter->second[mfi.vtblindex] == NULL) \
  3.1346 +		return (m_CC->ptr->*m_MFP)call; \
  3.1347 +	\
  3.1348 +	/* It's hooked. Call the original function. */ \
  3.1349 +	union \
  3.1350 +	{ \
  3.1351 +		RetType(EmptyClass::*mfpnew)prms; \
  3.1352 +		void *addr; \
  3.1353 +	} u; \
  3.1354 +	u.addr = iter->second[mfi.vtblindex]; \
  3.1355 +	\
  3.1356 +	return (reinterpret_cast<EmptyClass*>(m_CC->ptr)->*u.mfpnew)call; \
  3.1357 +}
  3.1358  
  3.1359  
  3.1360 -/*
  3.1361 -#define SH_DECL_HOOK1(ifacetype, ifacefunc, attr, overload, rettype, param1) \
  3.1362 -	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload) \
  3.1363 -		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
  3.1364 -		virtual rettype Func(param1 p1) \
  3.1365 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1), rettype); } \
  3.1366 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1)
  3.1367 -		
  3.1368 +namespace SourceHook
  3.1369 +{
  3.1370 +	template<class CCType, class RetType, class MFPType> class ExecutableClass
  3.1371 +	{
  3.1372 +		CCType *m_CC;
  3.1373 +		MFPType m_MFP;
  3.1374 +	public:
  3.1375 +		ExecutableClass(CCType *cc, MFPType mfp) : m_CC(cc), m_MFP(mfp)
  3.1376 +		{
  3.1377 +		}
  3.1378 +
  3.1379 +		// Support for 0 arguments
  3.1380 +		template<> RetType operator()() const 
  3.1381 +			SH_MAKE_EXECUTABLECLASS_OB((), ())
  3.1382 +
  3.1383 +		// Support for 1 arguments
  3.1384 +		template<class Param1> RetType operator()(Param1 p1) const 
  3.1385 +			SH_MAKE_EXECUTABLECLASS_OB((p1), (Param1))
  3.1386 +
  3.1387 +		// Support for 2 arguments
  3.1388 +		template<class Param1, class Param2> RetType operator()(Param1 p1, Param2 p2) const 
  3.1389 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2), (Param1Param2))
  3.1390 +
  3.1391 +		// Support for 3 arguments
  3.1392 +		template<class Param1, class Param2, class Param3> RetType operator()(Param1 p1, Param2 p2, Param3 p3) const 
  3.1393 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3), (Param1Param2Param3))
  3.1394 +
  3.1395 +		// Support for 4 arguments
  3.1396 +		template<class Param1, class Param2, class Param3, class Param4> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const 
  3.1397 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4), (Param1Param2Param3Param4))
  3.1398 +
  3.1399 +		// Support for 5 arguments
  3.1400 +		template<class Param1, class Param2, class Param3, class Param4, class Param5> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5) const 
  3.1401 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5), (Param1Param2Param3Param4Param5))
  3.1402 +
  3.1403 +		// Support for 6 arguments
  3.1404 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6) const 
  3.1405 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6), (Param1Param2Param3Param4Param5Param6))
  3.1406 +
  3.1407 +		// Support for 7 arguments
  3.1408 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7) const 
  3.1409 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7), (Param1Param2Param3Param4Param5Param6Param7))
  3.1410 +
  3.1411 +		// Support for 8 arguments
  3.1412 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8) const 
  3.1413 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8), (Param1Param2Param3Param4Param5Param6Param7Param8))
  3.1414 +
  3.1415 +		// Support for 9 arguments
  3.1416 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9) const 
  3.1417 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9), (Param1Param2Param3Param4Param5Param6Param7Param8Param9))
  3.1418 +
  3.1419 +		// Support for 10 arguments
  3.1420 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10) const 
  3.1421 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10))
  3.1422 +
  3.1423 +		// Support for 11 arguments
  3.1424 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11) const 
  3.1425 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11))
  3.1426 +
  3.1427 +		// Support for 12 arguments
  3.1428 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12) const 
  3.1429 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12))
  3.1430 +
  3.1431 +		// Support for 13 arguments
  3.1432 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13) const 
  3.1433 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13))
  3.1434 +
  3.1435 +		// Support for 14 arguments
  3.1436 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14) const 
  3.1437 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14))
  3.1438 +
  3.1439 +		// Support for 15 arguments
  3.1440 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15) const 
  3.1441 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14p15), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14Param15))
  3.1442 +
  3.1443 +		// Support for 16 arguments
  3.1444 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const 
  3.1445 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14p15p16), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14Param15Param16))
  3.1446 +
  3.1447 +	};
  3.1448 +}
  3.1449 +
  3.1450 +// Support for 0 arguments
  3.1451 +template <class X, class Y, class RetType>
  3.1452 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)()>
  3.1453 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)())
  3.1454 +{
  3.1455 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)()>(ptr, mfp);
  3.1456 +}
  3.1457 +
  3.1458 +// Support for 1 arguments
  3.1459 +template <class X, class Y, class RetType, class Param1>
  3.1460 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1)>
  3.1461 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1))
  3.1462 +{
  3.1463 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1)>(ptr, mfp);
  3.1464 +}
  3.1465 +
  3.1466 +// Support for 2 arguments
  3.1467 +template <class X, class Y, class RetType, class Param1, class Param2>
  3.1468 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2)>
  3.1469 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2))
  3.1470 +{
  3.1471 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2)>(ptr, mfp);
  3.1472 +}
  3.1473  
  3.1474 -*/
  3.1475 +// Support for 3 arguments
  3.1476 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3>
  3.1477 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3)>
  3.1478 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3))
  3.1479 +{
  3.1480 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3)>(ptr, mfp);
  3.1481 +}
  3.1482 +
  3.1483 +// Support for 4 arguments
  3.1484 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4>
  3.1485 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>
  3.1486 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4))
  3.1487 +{
  3.1488 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>(ptr, mfp);
  3.1489 +}
  3.1490 +
  3.1491 +// Support for 5 arguments
  3.1492 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  3.1493 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>
  3.1494 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5))
  3.1495 +{
  3.1496 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>(ptr, mfp);
  3.1497 +}
  3.1498 +
  3.1499 +// Support for 6 arguments
  3.1500 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  3.1501 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>
  3.1502 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6))
  3.1503 +{
  3.1504 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>(ptr, mfp);
  3.1505 +}
  3.1506 +
  3.1507 +// Support for 7 arguments
  3.1508 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  3.1509 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>
  3.1510 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7))
  3.1511 +{
  3.1512 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>(ptr, mfp);
  3.1513 +}
  3.1514 +
  3.1515 +// Support for 8 arguments
  3.1516 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  3.1517 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>
  3.1518 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8))
  3.1519 +{
  3.1520 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>(ptr, mfp);
  3.1521 +}
  3.1522 +
  3.1523 +// Support for 9 arguments
  3.1524 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
  3.1525 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>
  3.1526 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9))
  3.1527 +{
  3.1528 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>(ptr, mfp);
  3.1529 +}
  3.1530 +
  3.1531 +// Support for 10 arguments
  3.1532 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
  3.1533 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>
  3.1534 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10))
  3.1535 +{
  3.1536 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>(ptr, mfp);
  3.1537 +}
  3.1538 +
  3.1539 +// Support for 11 arguments
  3.1540 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11>
  3.1541 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>
  3.1542 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11))
  3.1543 +{
  3.1544 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>(ptr, mfp);
  3.1545 +}
  3.1546 +
  3.1547 +// Support for 12 arguments
  3.1548 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12>
  3.1549 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>
  3.1550 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12))
  3.1551 +{
  3.1552 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>(ptr, mfp);
  3.1553 +}
  3.1554 +
  3.1555 +// Support for 13 arguments
  3.1556 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13>
  3.1557 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)>
  3.1558 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13))
  3.1559 +{
  3.1560 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)>(ptr, mfp);
  3.1561 +}
  3.1562 +
  3.1563 +// Support for 14 arguments
  3.1564 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14>
  3.1565 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)>
  3.1566 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14))
  3.1567 +{
  3.1568 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)>(ptr, mfp);
  3.1569 +}
  3.1570 +
  3.1571 +// Support for 15 arguments
  3.1572 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15>
  3.1573 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)>
  3.1574 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15))
  3.1575 +{
  3.1576 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)>(ptr, mfp);
  3.1577 +}
  3.1578 +
  3.1579 +// Support for 16 arguments
  3.1580 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16>
  3.1581 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)>
  3.1582 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  3.1583 +{
  3.1584 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)>(ptr, mfp);
  3.1585 +}
  3.1586 +
  3.1587 +
  3.1588 +#undef SH_MAKE_EXECUTABLECLASS_BODY
  3.1589  
  3.1590  #endif
  3.1591  	// The pope is dead. -> :(
     4.1 --- a/sourcehook/sourcehook_impl.h	Thu Apr 28 17:24:39 2005 +0000
     4.2 +++ b/sourcehook/sourcehook_impl.h	Fri Apr 29 20:29:46 2005 +0000
     4.3 @@ -28,14 +28,15 @@
     4.4  		*/
     4.5  		struct RemoveHookInfo
     4.6  		{
     4.7 -			RemoveHookInfo(Plugin p, void *i, HookManagerPubFunc h, ISHDelegate *hd, bool ps)
     4.8 -				: plug(p), iface(i), hpf(h), handler(hd), post(ps)
     4.9 +			RemoveHookInfo(Plugin pplug, void *piface, HookManagerPubFunc phookman,
    4.10 +				ISHDelegate *phandler, bool ppost)
    4.11 +				: plug(pplug), iface(piface), hookman(phookman), handler(phandler), post(ppost)
    4.12  			{
    4.13  			}
    4.14  
    4.15  			Plugin plug;
    4.16  			void *iface;
    4.17 -			HookManagerPubFunc hpf;
    4.18 +			HookManagerPubFunc hookman;
    4.19  			ISHDelegate *handler;
    4.20  			bool post;
    4.21  		};
    4.22 @@ -45,27 +46,30 @@
    4.23  		*/
    4.24  		typedef std::list<HookManagerInfo> HookManInfoList;
    4.25  
    4.26 -
    4.27 +		struct CallClassInfo
    4.28 +		{
    4.29 +			GenericCallClass cc;
    4.30 +			int refcounter;
    4.31 +			bool operator==(void *other)
    4.32 +			{
    4.33 +				return cc.ptr == other;
    4.34 +			}
    4.35 +		};
    4.36  		/**
    4.37 -		*	@brief A list of Impl_CallClass structures
    4.38 +		*	@brief A list of CallClass structures
    4.39  		*/
    4.40 -		typedef std::list<CallClass> Impl_CallClassList;
    4.41 +		typedef std::list<CallClassInfo> Impl_CallClassList;
    4.42  
    4.43  		Impl_CallClassList m_CallClasses;			//!< A list of already generated callclasses
    4.44  		HookManInfoList m_HookMans;					//!< A list of hook managers
    4.45  
    4.46 -		int m_PageSize;								//!< Stores the system's page size
    4.47 -
    4.48  		/**
    4.49  		*	@brief Finds a hook manager for a function based on a text-prototype, a vtable offset and a vtable index
    4.50  		*/
    4.51  		HookManInfoList::iterator FindHookMan(HookManInfoList::iterator begin, HookManInfoList::iterator end, 
    4.52 -			const char *proto, int vtblofs, int vtblidx, int thisptrofs);
    4.53 +			const char *proto, int vtblofs, int vtblidx);
    4.54  
    4.55 -		void FreeCallClass(CallClass &cc);
    4.56 -		bool ApplyCallClassPatch(CallClass &cc, int vtbl_offs, int vtbl_idx, void *orig_entry);
    4.57 -
    4.58 -		static const int MAX_VTABLE_LEN = 4096;		//!< Maximal vtable length in bytes
    4.59 +		void ApplyCallClassPatch(CallClassInfo &cc, int vtbl_offs, int vtbl_idx, void *orig_entry);
    4.60  
    4.61  		META_RES m_Status, m_PrevRes, m_CurRes;
    4.62  		const void *m_OrigRet;
    4.63 @@ -97,7 +101,7 @@
    4.64  		*	@param handler A pointer to a FastDelegate containing the hook handler
    4.65  		*	@param post Set to true if you want a post handler
    4.66  		*/
    4.67 -		bool AddHook(Plugin plug, void *iface, int ifacesize, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post);
    4.68 +		bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post);
    4.69  
    4.70  		/**
    4.71  		*	@brief Removes a hook.
    4.72 @@ -106,6 +110,20 @@
    4.73  		*
    4.74  		*	@param plug The unique identifier of the plugin that calls this function
    4.75  		*	@param iface The interface pointer
    4.76 +		*	@param thisptr_offs This pointer adjuster
    4.77 +		*	@param myHookMan A hook manager function that should be capable of handling the function
    4.78 +		*	@param handler A pointer to a FastDelegate containing the hook handler
    4.79 +		*	@param post Set to true if you want a post handler
    4.80 +		*/
    4.81 +		bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post);
    4.82 +
    4.83 +		/**
    4.84 +		*	@brief Removes a hook.
    4.85 +		*
    4.86 +		*	@return True if the function succeeded, false otherwise
    4.87 +		*
    4.88 +		*	@param plug The unique identifier of the plugin that calls this function
    4.89 +		*	@param iface Already adjusted interface pointer
    4.90  		*	@param myHookMan A hook manager function that should be capable of handling the function
    4.91  		*	@param handler A pointer to a FastDelegate containing the hook handler
    4.92  		*	@param post Set to true if you want a post handler
    4.93 @@ -113,6 +131,15 @@
    4.94  		bool RemoveHook(Plugin plug, void *iface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post);
    4.95  
    4.96  		/**
    4.97 +		*	@brief Removes a hook.
    4.98 +		*
    4.99 +		*	@ return True if the function succeeded, false otherwise
   4.100 +		*
   4.101 +		*	@param info A RemoveHookInfo structure, describing the hook
   4.102 +		*/
   4.103 +		bool RemoveHook(RemoveHookInfo info);
   4.104 +
   4.105 +		/**
   4.106  		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   4.107  		*
   4.108  		*	@param plug The unique identifier of the plugin in question
   4.109 @@ -138,14 +165,14 @@
   4.110  		*
   4.111  		*	@param iface The interface pointer
   4.112  		*/
   4.113 -		void *GetCallClass(void *iface, size_t size);
   4.114 +		GenericCallClass *GetCallClass(void *iface);
   4.115  
   4.116  		/**
   4.117  		*	@brief Release a callclass
   4.118  		*
   4.119  		*	@param ptr Pointer to the callclass
   4.120  		*/
   4.121 -		virtual void ReleaseCallClass(void *ptr);
   4.122 +		virtual void ReleaseCallClass(GenericCallClass *ptr);
   4.123  
   4.124  		virtual void SetRes(META_RES res);				//!< Sets the meta result
   4.125  		virtual META_RES GetPrevRes();					//!< Gets the meta result of the previously called handler
     5.1 --- a/sourcehook/test/main.cpp	Thu Apr 28 17:24:39 2005 +0000
     5.2 +++ b/sourcehook/test/main.cpp	Fri Apr 29 20:29:46 2005 +0000
     5.3 @@ -402,93 +402,93 @@
     5.4  	RETURN_META_VALUE(MRES_OVERRIDE, !META_RESULT_ORIG_RET(bool));
     5.5  }
     5.6  
     5.7 -// I haven't checked the second F16 function yet
     5.8 -
     5.9  int main(int argc, char *argv[])
    5.10  {
    5.11  	// Get an instance and call the functions using the pointer
    5.12  	// (otherwise the compiler optimizes away the vtable lookup)
    5.13  	Test zLOL;
    5.14 +	Test zLOL2;
    5.15  	Test *zLOL_Ptr = &zLOL;
    5.16 +	Test *zLOL2_Ptr = &zLOL2;
    5.17  	g_SHPtr = &g_SHImpl;
    5.18  
    5.19  	//////////////////////////////////////////////////////////////////////////
    5.20 -	Test *cc = SH_GET_CALLCLASS(Test, zLOL_Ptr);
    5.21 +	SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(zLOL_Ptr);
    5.22  
    5.23  	printf("TEST1.1: Calling F299\n");
    5.24  	zLOL_Ptr->F299();
    5.25  	printf("TEST1.2: Calling F299 through cc\n");
    5.26 -	cc->F299();
    5.27 +	SH_CALL(cc, &Test::F299)();
    5.28  	printf("TEST1.3: Hooking it\n");
    5.29  	SH_ADD_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler, false);
    5.30 +	zLOL2_Ptr->F299();
    5.31  	printf("TEST1.4: Calling F299\n");
    5.32  	zLOL_Ptr->F299();
    5.33  	printf("TEST1.5: Calling F299 through cc\n");
    5.34 -	cc->F299();
    5.35 +	SH_CALL(cc, &Test::F299)();
    5.36  	printf("TEST1.6: Adding one more pre and one post hook\n");
    5.37  	SH_ADD_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler2, false);
    5.38  	SH_ADD_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_post_handler, true);
    5.39  	printf("TEST1.7: Calling F299\n");
    5.40  	zLOL_Ptr->F299();
    5.41  	printf("TEST1.8: Calling F299 through cc\n");
    5.42 -	cc->F299();
    5.43 +	SH_CALL(cc, &Test::F299)();
    5.44  	printf("TEST1.9: Removing pre hooks\n");
    5.45  	SH_REMOVE_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler, false);
    5.46  	SH_REMOVE_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler2, false);
    5.47  	printf("TEST1.10: Calling F299\n");
    5.48  	zLOL_Ptr->F299();
    5.49  	printf("TEST1.11: Calling F299 through cc\n");
    5.50 -	cc->F299();
    5.51 +	SH_CALL(cc, &Test::F299)();
    5.52  	printf("TEST1.12: Removing post hook\n");
    5.53  	SH_REMOVE_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_post_handler, true);
    5.54  	printf("TEST1.13: Calling F299\n");
    5.55  	zLOL_Ptr->F299();
    5.56  	printf("TEST1.14: Calling F299 through cc\n");
    5.57 -	cc->F299();
    5.58 +	SH_CALL(cc, &Test::F299)();
    5.59  
    5.60  	//////////////////////////////////////////////////////////////////////////
    5.61  	printf("\n\n*************************************************\n\n");
    5.62  	printf("TEST2.1: Calling F16(155)\n");
    5.63  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
    5.64  	printf("TEST2.2: Calling F16(155) through CC\n");
    5.65 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
    5.66 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
    5.67  	printf("TEST2.3: Hooking it\n");
    5.68  	SH_ADD_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_pre_handler, false);
    5.69  	printf("TEST2.4: Calling F16(155)\n");
    5.70  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
    5.71  	printf("TEST2.5: Calling F16(155) through CC\n");
    5.72 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
    5.73 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
    5.74  	printf("TEST2.6: Adding post hook\n");
    5.75  	SH_ADD_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_post_handler, true);
    5.76  	printf("TEST2.7: Calling F16(155)\n");
    5.77  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
    5.78  	printf("TEST2.8: Calling F16(155) through CC\n");
    5.79 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
    5.80 -	printf("TEST2.9: Removing pre hook\n");
    5.81 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
    5.82  	printf("TEST2.XX.1: Pausing the plugin\n");
    5.83  	g_SHImpl.PausePlugin(g_PLID);
    5.84  	printf("TEST2.XX.2: Calling F16(155)\n");
    5.85  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
    5.86  	printf("TEST2.XX.3: Calling F16(155) through CC\n");
    5.87 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
    5.88 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
    5.89  	printf("TEST2.XX.4: Unpausing the plugin\n");
    5.90  	g_SHImpl.UnpausePlugin(g_PLID);
    5.91  	printf("TEST2.XX.5: Calling F16(155)\n");
    5.92  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
    5.93  	printf("TEST2.XX.6: Calling F16(155) through CC\n");
    5.94 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
    5.95 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
    5.96  	printf("TEST2.9: Removing pre hook\n");
    5.97  	SH_REMOVE_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_pre_handler, false);
    5.98  	printf("TEST2.10: Calling F16(155)\n");
    5.99  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
   5.100  	printf("TEST2.11: Calling F16(155) through CC\n");
   5.101 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
   5.102 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
   5.103  	printf("TEST2.12: Removing post hook\n");
   5.104  	SH_REMOVE_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_post_handler, true);
   5.105  	printf("TEST2.10: Calling F16(155)\n");
   5.106  	printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
   5.107  	printf("TEST2.11: Calling F16(155) through CC\n");
   5.108 -	printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
   5.109 +	printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
   5.110  
   5.111  	SH_RELEASE_CALLCLASS(cc);
   5.112