sourcehook/sourcehook.h
changeset 41 534eac4c53ef
parent 34 11e62a912700
child 45 04770941f5a9
     1.1 --- a/sourcehook/sourcehook.h	Thu Apr 28 17:24:39 2005 +0000
     1.2 +++ b/sourcehook/sourcehook.h	Fri Apr 29 20:29:46 2005 +0000
     1.3 @@ -1,16 +1,12 @@
     1.4  /* ======== SourceHook ========
     1.5 -* Copyright (C) 2004-2005 Metamod:Source Development Team
     1.6 +* By PM
     1.7  * No warranties of any kind
     1.8 -*
     1.9 -* License: zlib/libpng
    1.10 -*
    1.11 -* Author(s): Pavol "PM OnoTo" Marko
    1.12  * ============================
    1.13  */
    1.14  
    1.15  /**
    1.16 - * @file sourcehook.h
    1.17 - * @brief Contains the public SourceHook API
    1.18 +*	@file sourcehook.h
    1.19 +*	@brief Contains the public SourceHook API
    1.20  */
    1.21  
    1.22  #ifndef __SOURCEHOOK_H__
    1.23 @@ -24,16 +20,16 @@
    1.24  #define SH_GLOB_PLUGPTR g_PLID
    1.25  #endif
    1.26  
    1.27 +#define SH_ASSERT(x, info) if (!(x)) __asm { int 3 }
    1.28 +
    1.29  // System
    1.30  #define SH_SYS_WIN32 1
    1.31  #define SH_SYS_LINUX 2
    1.32  
    1.33  #ifdef _WIN32
    1.34  # define SH_SYS SH_SYS_WIN32
    1.35 -# define SH_ASSERT(x) if (!(x)) __asm { int 3 }
    1.36  #elif defined __linux__
    1.37  # define SH_SYS SH_SYS_LINUX
    1.38 -# define SH_ASSERT(x) if (!(x)) asm("int $3");
    1.39  #else
    1.40  # error Unsupported system
    1.41  #endif
    1.42 @@ -58,6 +54,8 @@
    1.43  #include "sh_memfuncinfo.h"
    1.44  #include "sh_memory.h"
    1.45  #include <list>
    1.46 +#include <vector>
    1.47 +#include <map>
    1.48  #include <algorithm>
    1.49  
    1.50  // Good old metamod!
    1.51 @@ -78,6 +76,13 @@
    1.52  	const int STRBUF_LEN=8192;		// In bytes, for "vafmt" functions
    1.53  
    1.54  	/**
    1.55 +	*	@brief An empty class. No inheritance used. Used for original-function-call hacks
    1.56 +	*/
    1.57 +	class EmptyClass
    1.58 +	{
    1.59 +	};
    1.60 +
    1.61 +	/**
    1.62  	*	@brief A plugin typedef
    1.63  	*
    1.64  	*	SourceHook doesn't really care what this is. As long as the ==, != and = operators work on it
    1.65 @@ -140,65 +145,60 @@
    1.66  	*/
    1.67  	struct HookManagerInfo
    1.68  	{
    1.69 -		struct Iface
    1.70 +		struct VfnPtr
    1.71  		{
    1.72 -			struct Hook
    1.73 +			struct Iface
    1.74  			{
    1.75 -				ISHDelegate *handler;			//!< Pointer to the handler
    1.76 -				bool paused;					//!< If true, the hook should not be executed
    1.77 -				Plugin plug;					//!< The owner plugin
    1.78 +				struct Hook
    1.79 +				{
    1.80 +					ISHDelegate *handler;			//!< Pointer to the handler
    1.81 +					bool paused;					//!< If true, the hook should not be executed
    1.82 +					Plugin plug;					//!< The owner plugin
    1.83 +				};
    1.84 +				void *ptr;							//!< Pointer to the interface instance
    1.85 +				std::list<Hook> hooks_pre;			//!< A list of pre-hooks
    1.86 +				std::list<Hook> hooks_post;			//!< A list of post-hooks
    1.87 +				bool operator ==(void *other) const
    1.88 +				{
    1.89 +					return ptr == other;
    1.90 +				}
    1.91  			};
    1.92 -			void *callclass;					//!< Stores a call class for this interface
    1.93 -			void *ptr;							//!< Pointer to the interface instance
    1.94 +
    1.95 +			void *vfnptr;							//!< Pointer to the function
    1.96  			void *orig_entry;					//!< The original vtable entry
    1.97 -			std::list<Hook> hooks_pre;			//!< A list of pre-hooks
    1.98 -			std::list<Hook> hooks_post;			//!< A list of post-hooks
    1.99 -			bool operator ==(void *other) const
   1.100 +
   1.101 +			typedef std::list<Iface> IfaceList;
   1.102 +			typedef IfaceList::iterator IfaceListIter;
   1.103 +			IfaceList ifaces;
   1.104 +
   1.105 +			bool operator ==(void *other)
   1.106  			{
   1.107 -				return ptr == other;
   1.108 +				return vfnptr == other;
   1.109  			}
   1.110  		};
   1.111  		Plugin plug;							//!< The owner plugin
   1.112  		const char *proto;						//!< The prototype of the function the hook manager is responsible for
   1.113  		int vtbl_idx;							//!< The vtable index
   1.114  		int vtbl_offs;							//!< The vtable offset
   1.115 -		int thisptr_offs;						//!< The this-pointer-adjuster
   1.116  		HookManagerPubFunc func;				//!< The interface to the hook manager
   1.117  
   1.118 -		int hookfunc_vtbl_idx;					//!< the vtable index of the hookfunc
   1.119 -		int hookfunc_vtbl_offs;					//!< the vtable offset of the hookfunc
   1.120 -		void *hookfunc_inst;					//!< Instance of the class the hookfunc is in
   1.121 +		void *hookfunc_vfnptr;					//!< Pointer to the hookfunc impl
   1.122  		
   1.123 -		std::list<Iface> ifaces;				//!< List of hooked interfaces
   1.124 +		typedef std::list<VfnPtr> VfnPtrList;
   1.125 +		typedef VfnPtrList::iterator VfnPtrListIter;
   1.126 +		VfnPtrList vfnptrs;				//!< List of hooked interfaces
   1.127  	};
   1.128  
   1.129 -	/**
   1.130 -	*	@brief Structure describing a callclass
   1.131 -	*/
   1.132 -	struct CallClass
   1.133 +	typedef std::vector<void*> OrigFuncs;
   1.134 +	typedef std::map<int, OrigFuncs> OrigVTables;
   1.135 +
   1.136 +	template<class B> struct CallClass
   1.137  	{
   1.138 -		struct VTable
   1.139 -		{
   1.140 -			void *ptr;
   1.141 -			int actsize;
   1.142 -			std::list<int> patches;	//!< Already patched entries
   1.143 -			bool operator ==(void *other) const
   1.144 -			{
   1.145 -				return ptr == other;
   1.146 -			}
   1.147 -		};
   1.148 -		void *iface;				//!< The iface pointer this callclass belongs to
   1.149 -		size_t size;				//!< The size of the callclass
   1.150 -		void *ptr;					//!< The actual "object"
   1.151 -		typedef std::list<VTable> VTableList;
   1.152 -		VTableList vtables;			//!< Already known vtables
   1.153 -		int refcounter;				//!< How many times it was requested
   1.154 +		B *ptr;
   1.155 +		OrigVTables vt;
   1.156 +	};
   1.157  
   1.158 -		bool operator ==(void *other) const
   1.159 -		{
   1.160 -			return ptr == other;
   1.161 -		}
   1.162 -	};
   1.163 +	typedef CallClass<void> GenericCallClass;
   1.164  
   1.165  	/**
   1.166  	*	@brief The main SourceHook interface
   1.167 @@ -218,7 +218,7 @@
   1.168  		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.169  		*	@param post Set to true if you want a post handler
   1.170  		*/
   1.171 -		virtual bool AddHook(Plugin plug, void *iface, int ifacesize, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.172 +		virtual bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.173  
   1.174  		/**
   1.175  		*	@brief Removes a hook.
   1.176 @@ -231,7 +231,7 @@
   1.177  		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.178  		*	@param post Set to true if you want a post handler
   1.179  		*/
   1.180 -		virtual bool RemoveHook(Plugin plug, void *iface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.181 +		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.182  
   1.183  		/**
   1.184  		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   1.185 @@ -246,14 +246,14 @@
   1.186  		*	@param iface The interface pointer
   1.187  		*	@param size Size of the class
   1.188  		*/
   1.189 -		virtual void *GetCallClass(void *iface, size_t size) = 0;
   1.190 +		virtual GenericCallClass *GetCallClass(void *iface) = 0;
   1.191  
   1.192  		/**
   1.193  		*	@brief Release a callclass
   1.194  		*
   1.195  		*	@param ptr Pointer to the callclass
   1.196  		*/
   1.197 -		virtual void ReleaseCallClass(void *ptr) = 0;
   1.198 +		virtual void ReleaseCallClass(GenericCallClass *ptr) = 0;
   1.199  
   1.200  		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
   1.201  		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the previously called handler
   1.202 @@ -288,11 +288,16 @@
   1.203  /**
   1.204  *	@brief Get/generate callclass for an interface pointer
   1.205  *
   1.206 -*	@param ifacetype The type of the interface
   1.207  *	@param ifaceptr The interface pointer
   1.208  */
   1.209 -#define SH_GET_CALLCLASS(ifacetype, ifaceptr) reinterpret_cast<ifacetype*>(SH_GLOB_SHPTR->GetCallClass(ifaceptr, sizeof(ifacetype)))
   1.210 -#define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<void*>(ptr))
   1.211 +template<class ifacetype>
   1.212 +inline SourceHook::CallClass<ifacetype> *SH_GET_CALLCLASS(ifacetype *ptr)
   1.213 +{
   1.214 +	return reinterpret_cast<SourceHook::CallClass<ifacetype>*>(
   1.215 +		SH_GLOB_SHPTR->GetCallClass(reinterpret_cast<void*>(ptr)));
   1.216 +}
   1.217 +
   1.218 +#define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<SourceHook::GenericCallClass*>(ptr))
   1.219  
   1.220  #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   1.221  	SourceHook::SH_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
   1.222 @@ -311,6 +316,18 @@
   1.223  #define SH_NOATTRIB
   1.224  
   1.225  
   1.226 +
   1.227 +#if SH_COMP == SH_COMP_MSVC
   1.228 +# define SH_SETUP_MFP(mfp) \
   1.229 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry;
   1.230 +#elif SH_COMP == SH_COMP_GCC
   1.231 +# define SH_SETUP_MFP(mfp) \
   1.232 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry; \
   1.233 +	reinterpret_cast<void**>(&mfp)[1] = 0;
   1.234 +#else
   1.235 +# error Not supported yet.
   1.236 +#endif
   1.237 +
   1.238  //////////////////////////////////////////////////////////////////////////
   1.239  #define SH_FHCls(ift, iff, ov) FHCls_##ift##iff##ov
   1.240  
   1.241 @@ -324,13 +341,10 @@
   1.242  			GetFuncInfo(funcptr, mfi); \
   1.243  			param->vtbl_idx = mfi.vtblindex; \
   1.244  			param->vtbl_offs = mfi.vtbloffs; \
   1.245 -			param->thisptr_offs = mfi.thisptroffs; \
   1.246 -			if (param->thisptr_offs < 0) \
   1.247 -				return 2; /*No virtual inheritance supported*/ \
   1.248 +			\
   1.249  			GetFuncInfo(&SH_FHCls(ifacetype,ifacefunc,overload)::Func, mfi); \
   1.250 -			param->hookfunc_vtbl_idx = mfi.vtblindex; \
   1.251 -			param->hookfunc_vtbl_offs = mfi.vtbloffs; \
   1.252 -			param->hookfunc_inst = (void*)&ms_Inst; \
   1.253 +			param->hookfunc_vfnptr = \
   1.254 +			reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]; \
   1.255  			return 0; \
   1.256  		} \
   1.257  		else if (action == HA_Register) \
   1.258 @@ -357,7 +371,7 @@
   1.259  			static const char *ms_Proto; \
   1.260  			SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
   1.261  
   1.262 -#define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto) \
   1.263 +#define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto, funcptr) \
   1.264  		}; \
   1.265  		const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
   1.266  		SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
   1.267 @@ -365,44 +379,67 @@
   1.268  		bool SH_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
   1.269  			SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.270  		{ \
   1.271 -			return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, sizeof(ifacetype), \
   1.272 +			MemFuncInfo mfi; \
   1.273 +			GetFuncInfo(funcptr, mfi); \
   1.274 +			if (mfi.thisptroffs < 0) \
   1.275 +				return false; /* No virtual inheritance supported */ \
   1.276 +			\
   1.277 +			return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   1.278  				SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
   1.279  				new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
   1.280  		} \
   1.281  		bool SH_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
   1.282  			SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.283  		{ \
   1.284 +			MemFuncInfo mfi; \
   1.285 +			GetFuncInfo(funcptr, mfi); \
   1.286 +			if (mfi.thisptroffs < 0) \
   1.287 +				return false; /* No virtual inheritance supported */ \
   1.288 +			\
   1.289  			CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
   1.290 -			return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, \
   1.291 +			return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   1.292  				SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
   1.293  		} \
   1.294  	}
   1.295  
   1.296 -#define SH_SETUPCALLS(rettype) \
   1.297 -	/* 1) Find the iface ptr */ \
   1.298 -	/* 1.1) Adjust to original this pointer */ \
   1.299 -	void *origthis = this - ms_HI->thisptr_offs; \
   1.300 -	std::list<HookManagerInfo::Iface>::iterator ifaceiter = std::find(ms_HI->ifaces.begin(), \
   1.301 -		ms_HI->ifaces.end(), origthis); \
   1.302 -	SH_ASSERT(ifaceiter != ms_HI->ifaces.end()); \
   1.303 -	HookManagerInfo::Iface &ci = *ifaceiter; \
   1.304 +#define SH_SETUPCALLS(rettype, paramtypes, params) \
   1.305 +	/* 1) Find the vfnptr */ \
   1.306 +	void *ourvfnptr = reinterpret_cast<void*>( \
   1.307 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   1.308 +	\
   1.309 +	HookManagerInfo::VfnPtrListIter vfptriter = std::find(ms_HI->vfnptrs.begin(), \
   1.310 +		ms_HI->vfnptrs.end(), ourvfnptr); \
   1.311 +	if (vfptriter == ms_HI->vfnptrs.end()) \
   1.312 +	{ \
   1.313 +		/* Bleh? Should be impossible! */ \
   1.314 +		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   1.315 +	} \
   1.316 +	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   1.317 +	/* 2) Find the iface */ \
   1.318 +	HookManagerInfo::VfnPtr::IfaceListIter ifiter = std::find(vfnptr.ifaces.begin(), vfnptr.ifaces.end(), this); \
   1.319 +	if (ifiter == vfnptr.ifaces.end()) \
   1.320 +	{ \
   1.321 +		/* The iface info was not found. Redirect the call to the original function. */ \
   1.322 +		rettype (EmptyClass::*mfp)paramtypes; \
   1.323 +		SH_SETUP_MFP(mfp); \
   1.324 +		return (reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.325 +	} \
   1.326 +	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   1.327  	/* 2) Declare some vars and set it up */ \
   1.328 -	std::list<HookManagerInfo::Iface::Hook> &prelist = ci.hooks_pre; \
   1.329 -	std::list<HookManagerInfo::Iface::Hook> &postlist = ci.hooks_post; \
   1.330 -	rettype orig_ret; \
   1.331 -	rettype override_ret; \
   1.332 -	rettype plugin_ret; \
   1.333 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   1.334 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   1.335 +	rettype orig_ret, override_ret, plugin_ret; \
   1.336  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   1.337  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   1.338  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   1.339  	status = MRES_IGNORED; \
   1.340 -	SH_GLOB_SHPTR->SetIfacePtr(ci.ptr); \
   1.341 +	SH_GLOB_SHPTR->SetIfacePtr(this); \
   1.342  	SH_GLOB_SHPTR->SetOrigRet(reinterpret_cast<void*>(&orig_ret)); \
   1.343  	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   1.344  
   1.345  #define SH_CALL_HOOKS(post, params) \
   1.346  	prev_res = MRES_IGNORED; \
   1.347 -	for (std::list<HookManagerInfo::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.348 +	for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.349  	{ \
   1.350  		if (hiter->paused) continue; \
   1.351  		cur_res = MRES_IGNORED; \
   1.352 @@ -417,44 +454,64 @@
   1.353  		} \
   1.354  	}
   1.355  
   1.356 -#define SH_CALL_ORIG(ifacetype, ifacefunc, params) \
   1.357 +#define SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params) \
   1.358  	if (status != MRES_SUPERCEDE) \
   1.359 -		orig_ret = reinterpret_cast<ifacetype*>(ci.callclass)->ifacefunc params; \
   1.360 +	{ \
   1.361 +		rettype (EmptyClass::*mfp)paramtypes; \
   1.362 +		SH_SETUP_MFP(mfp); \
   1.363 +		orig_ret = (reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   1.364 +	} \
   1.365  	else \
   1.366  		orig_ret = override_ret;
   1.367  
   1.368  #define SH_RETURN() \
   1.369  	return status >= MRES_OVERRIDE ? override_ret : orig_ret;
   1.370  
   1.371 -#define SH_HANDLEFUNC(ifacetype, ifacefunc, params, rettype) \
   1.372 -	SH_SETUPCALLS(rettype) \
   1.373 +#define SH_HANDLEFUNC(ifacetype, ifacefunc, paramtypes, params, rettype) \
   1.374 +	SH_SETUPCALLS(rettype, paramtypes, params) \
   1.375  	SH_CALL_HOOKS(pre, params) \
   1.376 -	SH_CALL_ORIG(ifacetype, ifacefunc, params) \
   1.377 +	SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params) \
   1.378  	SH_CALL_HOOKS(post, params) \
   1.379  	SH_RETURN()
   1.380  
   1.381  //////////////////////////////////////////////////////////////////////////
   1.382 -#define SH_SETUPCALLS_void() \
   1.383 -	/* 1) Find the iface ptr */ \
   1.384 -	/* 1.1) Adjust to original this pointer */ \
   1.385 -	void *origthis = this - ms_HI->thisptr_offs; \
   1.386 -	std::list<HookManagerInfo::Iface>::iterator ifaceiter = std::find(ms_HI->ifaces.begin(), \
   1.387 -		ms_HI->ifaces.end(), origthis); \
   1.388 -	SH_ASSERT(ifaceiter != ms_HI->ifaces.end()); \
   1.389 -	HookManagerInfo::Iface &ci = *ifaceiter; \
   1.390 +#define SH_SETUPCALLS_void(paramtypes, params) \
   1.391 +	/* 1) Find the vfnptr */ \
   1.392 +	void *ourvfnptr = reinterpret_cast<void*>( \
   1.393 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   1.394 +	\
   1.395 +	HookManagerInfo::VfnPtrListIter vfptriter = std::find(ms_HI->vfnptrs.begin(), \
   1.396 +		ms_HI->vfnptrs.end(), ourvfnptr); \
   1.397 +	if (vfptriter == ms_HI->vfnptrs.end()) \
   1.398 +	{ \
   1.399 +		/* Bleh? Should be impossible! */ \
   1.400 +		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   1.401 +	} \
   1.402 +	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   1.403 +	/* 2) Find the iface */ \
   1.404 +	HookManagerInfo::VfnPtr::IfaceListIter ifiter = std::find(vfnptr.ifaces.begin(), vfnptr.ifaces.end(), this); \
   1.405 +	if (ifiter == vfnptr.ifaces.end()) \
   1.406 +	{ \
   1.407 +		/* The iface info was not found. Redirect the call to the original function. */ \
   1.408 +		void (EmptyClass::*mfp)paramtypes; \
   1.409 +		SH_SETUP_MFP(mfp); \
   1.410 +		(reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.411 +		return; \
   1.412 +	} \
   1.413 +	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   1.414  	/* 2) Declare some vars and set it up */ \
   1.415 -	std::list<HookManagerInfo::Iface::Hook> &prelist = ci.hooks_pre; \
   1.416 -	std::list<HookManagerInfo::Iface::Hook> &postlist = ci.hooks_post; \
   1.417 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   1.418 +	std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   1.419  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   1.420  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   1.421  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   1.422  	status = MRES_IGNORED; \
   1.423 -	SH_GLOB_SHPTR->SetIfacePtr(ci.ptr); \
   1.424 +	SH_GLOB_SHPTR->SetIfacePtr(this); \
   1.425  	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   1.426  
   1.427  #define SH_CALL_HOOKS_void(post, params) \
   1.428  	prev_res = MRES_IGNORED; \
   1.429 -	for (std::list<HookManagerInfo::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.430 +	for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.431  	{ \
   1.432  		if (hiter->paused) continue; \
   1.433  		cur_res = MRES_IGNORED; \
   1.434 @@ -464,53 +521,59 @@
   1.435  			status = cur_res; \
   1.436  	}
   1.437  
   1.438 -#define SH_CALL_ORIG_void(ifacetype, ifacefunc, params) \
   1.439 +#define SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params) \
   1.440  	if (status != MRES_SUPERCEDE) \
   1.441 -		reinterpret_cast<ifacetype*>(ci.callclass)->ifacefunc params;
   1.442 +	{ \
   1.443 +		void (EmptyClass::*mfp)paramtypes; \
   1.444 +		SH_SETUP_MFP(mfp); \
   1.445 +		(reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   1.446 +	}
   1.447  
   1.448  #define SH_RETURN_void()
   1.449  
   1.450 -#define SH_HANDLEFUNC_void(ifacetype, ifacefunc, params) \
   1.451 -	SH_SETUPCALLS_void() \
   1.452 +#define SH_HANDLEFUNC_void(ifacetype, ifacefunc, paramtypes, params) \
   1.453 +	SH_SETUPCALLS_void(paramtypes, params) \
   1.454  	SH_CALL_HOOKS_void(pre, params) \
   1.455 -	SH_CALL_ORIG_void(ifacetype, ifacefunc, params) \
   1.456 +	SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params) \
   1.457  	SH_CALL_HOOKS_void(post, params) \
   1.458  	SH_RETURN_void()
   1.459  
   1.460  
   1.461  // Special vafmt handlers
   1.462 -#define SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, params_orig, params_plug, rettype) \
   1.463 -	SH_SETUPCALLS(rettype) \
   1.464 +#define SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, paramtypes, params_orig, params_plug, rettype) \
   1.465 +	SH_SETUPCALLS(rettype, paramtypes, params_orig) \
   1.466  	SH_CALL_HOOKS(pre, params_plug) \
   1.467 -	SH_CALL_ORIG(ifacetype, ifacefunc, params_orig) \
   1.468 +	SH_CALL_ORIG(ifacetype, ifacefunc, rettype, paramtypes, params_orig) \
   1.469  	SH_CALL_HOOKS(post, params_plug) \
   1.470  	SH_RETURN()
   1.471  
   1.472 -#define SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, params_orig, params_plug) \
   1.473 -	SH_SETUPCALLS_void() \
   1.474 +#define SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, paramtypes, params_orig, params_plug) \
   1.475 +	SH_SETUPCALLS_void(paramtypes, params_orig) \
   1.476  	SH_CALL_HOOKS_void(pre, params_plug) \
   1.477 -	SH_CALL_ORIG_void(ifacetype, ifacefunc, params_orig) \
   1.478 +	SH_CALL_ORIG_void(ifacetype, ifacefunc, paramtypes, params_orig) \
   1.479  	SH_CALL_HOOKS_void(post, params_plug) \
   1.480  	SH_RETURN_void()
   1.481  
   1.482  //////////////////////////////////////////////////////////////////////////
   1.483  
   1.484 -// *********
   1.485 +// ********* Support for 0 arguments *********
   1.486  #define SH_DECL_HOOK0(ifacetype, ifacefunc, attr, overload, rettype) \
   1.487  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)()> \
   1.488  		(&ifacetype::ifacefunc))) \
   1.489  		typedef fastdelegate::FastDelegate0<rettype> FD; \
   1.490  		virtual rettype Func() attr \
   1.491 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (), rettype); } \
   1.492 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype )
   1.493 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (), (), rettype); } \
   1.494 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype , \
   1.495 +	(static_cast<rettype (ifacetype::*)()>(&ifacetype::ifacefunc)))
   1.496  
   1.497  #define SH_DECL_HOOK0_void(ifacetype, ifacefunc, attr, overload) \
   1.498  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)()> \
   1.499  		(&ifacetype::ifacefunc))) \
   1.500  		typedef fastdelegate::FastDelegate0<> FD; \
   1.501  		virtual void Func() attr \
   1.502 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, ()); } \
   1.503 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr )
   1.504 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (), ()); } \
   1.505 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr , \
   1.506 +	(static_cast<void (ifacetype::*)()>(&ifacetype::ifacefunc)))
   1.507  
   1.508  #define SH_DECL_HOOK0_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
   1.509  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(const char *, ...)> \
   1.510 @@ -523,9 +586,10 @@
   1.511  			va_start(ap, fmt); \
   1.512  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.513  			va_end(ap); \
   1.514 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, ("%s", buf), (buf), rettype); \
   1.515 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (...), ("%s", buf), (buf), rettype); \
   1.516  		} \
   1.517 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype  "|const char*|...")
   1.518 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype  "|const char*|...", \
   1.519 +	(static_cast<rettype (ifacetype::*)(const char *, ...)>(&ifacetype::ifacefunc)))
   1.520  
   1.521  #define SH_DECL_HOOK0_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
   1.522  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(const char *, ...)> \
   1.523 @@ -538,26 +602,29 @@
   1.524  			va_start(ap, fmt); \
   1.525  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.526  			va_end(ap); \
   1.527 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, ("%s", buf), (buf)); \
   1.528 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (...), ("%s", buf), (buf)); \
   1.529  		} \
   1.530 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr  "|const char*|...")
   1.531 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr  "|const char*|...", \
   1.532 +	(static_cast<void (ifacetype::*)(const char *, ...)>(&ifacetype::ifacefunc)))
   1.533  
   1.534 -// *********
   1.535 +// ********* Support for 1 arguments *********
   1.536  #define SH_DECL_HOOK1(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   1.537  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1)> \
   1.538  		(&ifacetype::ifacefunc))) \
   1.539  		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
   1.540  		virtual rettype Func(param1 p1) attr \
   1.541 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1), rettype); } \
   1.542 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1)
   1.543 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1), (p1), rettype); } \
   1.544 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1, \
   1.545 +	(static_cast<rettype (ifacetype::*)(param1)>(&ifacetype::ifacefunc)))
   1.546  
   1.547  #define SH_DECL_HOOK1_void(ifacetype, ifacefunc, attr, overload, param1) \
   1.548  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1)> \
   1.549  		(&ifacetype::ifacefunc))) \
   1.550  		typedef fastdelegate::FastDelegate1<param1> FD; \
   1.551  		virtual void Func(param1 p1) attr \
   1.552 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1)); } \
   1.553 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1)
   1.554 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1), (p1)); } \
   1.555 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1, \
   1.556 +	(static_cast<void (ifacetype::*)(param1)>(&ifacetype::ifacefunc)))
   1.557  
   1.558  #define SH_DECL_HOOK1_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   1.559  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, const char *, ...)> \
   1.560 @@ -570,9 +637,10 @@
   1.561  			va_start(ap, fmt); \
   1.562  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.563  			va_end(ap); \
   1.564 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, "%s", buf), (p1, buf), rettype); \
   1.565 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, ...), (p1, "%s", buf), (p1, buf), rettype); \
   1.566  		} \
   1.567 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|const char*|...")
   1.568 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|const char*|...", \
   1.569 +	(static_cast<rettype (ifacetype::*)(param1, const char *, ...)>(&ifacetype::ifacefunc)))
   1.570  
   1.571  #define SH_DECL_HOOK1_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
   1.572  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, const char *, ...)> \
   1.573 @@ -585,26 +653,29 @@
   1.574  			va_start(ap, fmt); \
   1.575  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.576  			va_end(ap); \
   1.577 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, "%s", buf), (p1, buf)); \
   1.578 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, ...), (p1, "%s", buf), (p1, buf)); \
   1.579  		} \
   1.580 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|const char*|...")
   1.581 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|const char*|...", \
   1.582 +	(static_cast<void (ifacetype::*)(param1, const char *, ...)>(&ifacetype::ifacefunc)))
   1.583  
   1.584 -// *********
   1.585 +// ********* Support for 2 arguments *********
   1.586  #define SH_DECL_HOOK2(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
   1.587  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2)> \
   1.588  		(&ifacetype::ifacefunc))) \
   1.589  		typedef fastdelegate::FastDelegate2<param1, param2, rettype> FD; \
   1.590  		virtual rettype Func(param1 p1, param2 p2) attr \
   1.591 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2), rettype); } \
   1.592 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2)
   1.593 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2), (p1, p2), rettype); } \
   1.594 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2, \
   1.595 +	(static_cast<rettype (ifacetype::*)(param1, param2)>(&ifacetype::ifacefunc)))
   1.596  
   1.597  #define SH_DECL_HOOK2_void(ifacetype, ifacefunc, attr, overload, param1, param2) \
   1.598  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2)> \
   1.599  		(&ifacetype::ifacefunc))) \
   1.600  		typedef fastdelegate::FastDelegate2<param1, param2> FD; \
   1.601  		virtual void Func(param1 p1, param2 p2) attr \
   1.602 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2)); } \
   1.603 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2)
   1.604 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2), (p1, p2)); } \
   1.605 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2, \
   1.606 +	(static_cast<void (ifacetype::*)(param1, param2)>(&ifacetype::ifacefunc)))
   1.607  
   1.608  #define SH_DECL_HOOK2_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
   1.609  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...)> \
   1.610 @@ -617,9 +688,10 @@
   1.611  			va_start(ap, fmt); \
   1.612  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.613  			va_end(ap); \
   1.614 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, "%s", buf), (p1, p2, buf), rettype); \
   1.615 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, ...), (p1, p2, "%s", buf), (p1, p2, buf), rettype); \
   1.616  		} \
   1.617 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|const char*|...")
   1.618 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|const char*|...", \
   1.619 +	(static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...)>(&ifacetype::ifacefunc)))
   1.620  
   1.621  #define SH_DECL_HOOK2_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
   1.622  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, const char *, ...)> \
   1.623 @@ -632,26 +704,29 @@
   1.624  			va_start(ap, fmt); \
   1.625  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.626  			va_end(ap); \
   1.627 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, "%s", buf), (p1, p2, buf)); \
   1.628 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, ...), (p1, p2, "%s", buf), (p1, p2, buf)); \
   1.629  		} \
   1.630 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|const char*|...")
   1.631 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|const char*|...", \
   1.632 +	(static_cast<void (ifacetype::*)(param1, param2, const char *, ...)>(&ifacetype::ifacefunc)))
   1.633  
   1.634 -// *********
   1.635 +// ********* Support for 3 arguments *********
   1.636  #define SH_DECL_HOOK3(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
   1.637  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3)> \
   1.638  		(&ifacetype::ifacefunc))) \
   1.639  		typedef fastdelegate::FastDelegate3<param1, param2, param3, rettype> FD; \
   1.640  		virtual rettype Func(param1 p1, param2 p2, param3 p3) attr \
   1.641 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3), rettype); } \
   1.642 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3)
   1.643 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3), (p1, p2, p3), rettype); } \
   1.644 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3, \
   1.645 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3)>(&ifacetype::ifacefunc)))
   1.646  
   1.647  #define SH_DECL_HOOK3_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3) \
   1.648  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3)> \
   1.649  		(&ifacetype::ifacefunc))) \
   1.650  		typedef fastdelegate::FastDelegate3<param1, param2, param3> FD; \
   1.651  		virtual void Func(param1 p1, param2 p2, param3 p3) attr \
   1.652 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3)); } \
   1.653 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3)
   1.654 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3), (p1, p2, p3)); } \
   1.655 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3, \
   1.656 +	(static_cast<void (ifacetype::*)(param1, param2, param3)>(&ifacetype::ifacefunc)))
   1.657  
   1.658  #define SH_DECL_HOOK3_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
   1.659  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...)> \
   1.660 @@ -664,9 +739,10 @@
   1.661  			va_start(ap, fmt); \
   1.662  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.663  			va_end(ap); \
   1.664 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, "%s", buf), (p1, p2, p3, buf), rettype); \
   1.665 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, ...), (p1, p2, p3, "%s", buf), (p1, p2, p3, buf), rettype); \
   1.666  		} \
   1.667 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|const char*|...")
   1.668 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|const char*|...", \
   1.669 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...)>(&ifacetype::ifacefunc)))
   1.670  
   1.671  #define SH_DECL_HOOK3_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
   1.672  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...)> \
   1.673 @@ -679,26 +755,29 @@
   1.674  			va_start(ap, fmt); \
   1.675  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.676  			va_end(ap); \
   1.677 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, "%s", buf), (p1, p2, p3, buf)); \
   1.678 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, ...), (p1, p2, p3, "%s", buf), (p1, p2, p3, buf)); \
   1.679  		} \
   1.680 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|const char*|...")
   1.681 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|const char*|...", \
   1.682 +	(static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...)>(&ifacetype::ifacefunc)))
   1.683  
   1.684 -// *********
   1.685 +// ********* Support for 4 arguments *********
   1.686  #define SH_DECL_HOOK4(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
   1.687  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4)> \
   1.688  		(&ifacetype::ifacefunc))) \
   1.689  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4, rettype> FD; \
   1.690  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) attr \
   1.691 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4), rettype); } \
   1.692 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4)
   1.693 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
   1.694 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4, \
   1.695 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4)>(&ifacetype::ifacefunc)))
   1.696  
   1.697  #define SH_DECL_HOOK4_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4) \
   1.698  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4)> \
   1.699  		(&ifacetype::ifacefunc))) \
   1.700  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4> FD; \
   1.701  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4) attr \
   1.702 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4)); } \
   1.703 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4)
   1.704 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4), (p1, p2, p3, p4)); } \
   1.705 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4, \
   1.706 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4)>(&ifacetype::ifacefunc)))
   1.707  
   1.708  #define SH_DECL_HOOK4_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
   1.709  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...)> \
   1.710 @@ -711,9 +790,10 @@
   1.711  			va_start(ap, fmt); \
   1.712  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.713  			va_end(ap); \
   1.714 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf), rettype); \
   1.715 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, ...), (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf), rettype); \
   1.716  		} \
   1.717 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...")
   1.718 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...", \
   1.719 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...)>(&ifacetype::ifacefunc)))
   1.720  
   1.721  #define SH_DECL_HOOK4_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
   1.722  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...)> \
   1.723 @@ -726,26 +806,29 @@
   1.724  			va_start(ap, fmt); \
   1.725  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.726  			va_end(ap); \
   1.727 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf)); \
   1.728 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, ...), (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf)); \
   1.729  		} \
   1.730 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...")
   1.731 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...", \
   1.732 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...)>(&ifacetype::ifacefunc)))
   1.733  
   1.734 -// *********
   1.735 +// ********* Support for 5 arguments *********
   1.736  #define SH_DECL_HOOK5(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
   1.737  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5)> \
   1.738  		(&ifacetype::ifacefunc))) \
   1.739  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5, rettype> FD; \
   1.740  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) attr \
   1.741 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5), rettype); } \
   1.742 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5)
   1.743 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
   1.744 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5, \
   1.745 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5)>(&ifacetype::ifacefunc)))
   1.746  
   1.747  #define SH_DECL_HOOK5_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5) \
   1.748  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5)> \
   1.749  		(&ifacetype::ifacefunc))) \
   1.750  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5> FD; \
   1.751  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) attr \
   1.752 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5)); } \
   1.753 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5)
   1.754 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5)); } \
   1.755 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5, \
   1.756 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5)>(&ifacetype::ifacefunc)))
   1.757  
   1.758  #define SH_DECL_HOOK5_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
   1.759  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)> \
   1.760 @@ -758,9 +841,10 @@
   1.761  			va_start(ap, fmt); \
   1.762  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.763  			va_end(ap); \
   1.764 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf), rettype); \
   1.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); \
   1.766  		} \
   1.767 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...")
   1.768 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...", \
   1.769 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)>(&ifacetype::ifacefunc)))
   1.770  
   1.771  #define SH_DECL_HOOK5_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
   1.772  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)> \
   1.773 @@ -773,26 +857,29 @@
   1.774  			va_start(ap, fmt); \
   1.775  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.776  			va_end(ap); \
   1.777 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf)); \
   1.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)); \
   1.779  		} \
   1.780 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...")
   1.781 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...", \
   1.782 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)>(&ifacetype::ifacefunc)))
   1.783  
   1.784 -// *********
   1.785 +// ********* Support for 6 arguments *********
   1.786  #define SH_DECL_HOOK6(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
   1.787  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6)> \
   1.788  		(&ifacetype::ifacefunc))) \
   1.789  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6, rettype> FD; \
   1.790  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) attr \
   1.791 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6), rettype); } \
   1.792 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6)
   1.793 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
   1.794 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6, \
   1.795 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6)>(&ifacetype::ifacefunc)))
   1.796  
   1.797  #define SH_DECL_HOOK6_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6) \
   1.798  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6)> \
   1.799  		(&ifacetype::ifacefunc))) \
   1.800  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6> FD; \
   1.801  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) attr \
   1.802 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6)); } \
   1.803 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6)
   1.804 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6)); } \
   1.805 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6, \
   1.806 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6)>(&ifacetype::ifacefunc)))
   1.807  
   1.808  #define SH_DECL_HOOK6_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
   1.809  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)> \
   1.810 @@ -805,9 +892,10 @@
   1.811  			va_start(ap, fmt); \
   1.812  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.813  			va_end(ap); \
   1.814 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf), rettype); \
   1.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); \
   1.816  		} \
   1.817 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...")
   1.818 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...", \
   1.819 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)>(&ifacetype::ifacefunc)))
   1.820  
   1.821  #define SH_DECL_HOOK6_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
   1.822  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)> \
   1.823 @@ -820,26 +908,29 @@
   1.824  			va_start(ap, fmt); \
   1.825  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.826  			va_end(ap); \
   1.827 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf)); \
   1.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)); \
   1.829  		} \
   1.830 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...")
   1.831 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...", \
   1.832 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)>(&ifacetype::ifacefunc)))
   1.833  
   1.834 -// *********
   1.835 +// ********* Support for 7 arguments *********
   1.836  #define SH_DECL_HOOK7(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
   1.837  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)> \
   1.838  		(&ifacetype::ifacefunc))) \
   1.839  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7, rettype> FD; \
   1.840  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) attr \
   1.841 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7), rettype); } \
   1.842 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7)
   1.843 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
   1.844 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7, \
   1.845 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)>(&ifacetype::ifacefunc)))
   1.846  
   1.847  #define SH_DECL_HOOK7_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7) \
   1.848  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)> \
   1.849  		(&ifacetype::ifacefunc))) \
   1.850  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7> FD; \
   1.851  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) attr \
   1.852 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7)); } \
   1.853 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7)
   1.854 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7)); } \
   1.855 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7, \
   1.856 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)>(&ifacetype::ifacefunc)))
   1.857  
   1.858  #define SH_DECL_HOOK7_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
   1.859  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)> \
   1.860 @@ -852,9 +943,10 @@
   1.861  			va_start(ap, fmt); \
   1.862  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.863  			va_end(ap); \
   1.864 -			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf), rettype); \
   1.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); \
   1.866  		} \
   1.867 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...")
   1.868 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...", \
   1.869 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)>(&ifacetype::ifacefunc)))
   1.870  
   1.871  #define SH_DECL_HOOK7_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
   1.872  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)> \
   1.873 @@ -867,26 +959,29 @@
   1.874  			va_start(ap, fmt); \
   1.875  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.876  			va_end(ap); \
   1.877 -			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf)); \
   1.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)); \
   1.879  		} \
   1.880 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...")
   1.881 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...", \
   1.882 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)>(&ifacetype::ifacefunc)))
   1.883  
   1.884 -// *********
   1.885 +// ********* Support for 8 arguments *********
   1.886  #define SH_DECL_HOOK8(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   1.887  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)> \
   1.888  		(&ifacetype::ifacefunc))) \
   1.889  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8, rettype> FD; \
   1.890  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) attr \
   1.891 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
   1.892 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8)
   1.893 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
   1.894 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8, \
   1.895 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)>(&ifacetype::ifacefunc)))
   1.896  
   1.897  #define SH_DECL_HOOK8_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8) \
   1.898  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)> \
   1.899  		(&ifacetype::ifacefunc))) \
   1.900  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8> FD; \
   1.901  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) attr \
   1.902 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8)); } \
   1.903 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8)
   1.904 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8)); } \
   1.905 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8, \
   1.906 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)>(&ifacetype::ifacefunc)))
   1.907  
   1.908  #define SH_DECL_HOOK8_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   1.909  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)> \
   1.910 @@ -899,9 +994,10 @@
   1.911  			va_start(ap, fmt); \
   1.912  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.913  			va_end(ap); \
   1.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); \
   1.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); \
   1.916  		} \
   1.917 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...")
   1.918 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...", \
   1.919 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)>(&ifacetype::ifacefunc)))
   1.920  
   1.921  #define SH_DECL_HOOK8_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   1.922  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)> \
   1.923 @@ -914,26 +1010,29 @@
   1.924  			va_start(ap, fmt); \
   1.925  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.926  			va_end(ap); \
   1.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)); \
   1.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)); \
   1.929  		} \
   1.930 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...")
   1.931 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...", \
   1.932 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)>(&ifacetype::ifacefunc)))
   1.933  
   1.934 -// *********
   1.935 +// ********* Support for 9 arguments *********
   1.936  #define SH_DECL_HOOK9(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   1.937  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)> \
   1.938  		(&ifacetype::ifacefunc))) \
   1.939  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9, rettype> FD; \
   1.940  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) attr \
   1.941 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
   1.942 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9)
   1.943 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
   1.944 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9, \
   1.945 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)>(&ifacetype::ifacefunc)))
   1.946  
   1.947  #define SH_DECL_HOOK9_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   1.948  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)> \
   1.949  		(&ifacetype::ifacefunc))) \
   1.950  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9> FD; \
   1.951  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) attr \
   1.952 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
   1.953 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9)
   1.954 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
   1.955 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9, \
   1.956 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)>(&ifacetype::ifacefunc)))
   1.957  
   1.958  #define SH_DECL_HOOK9_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   1.959  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)> \
   1.960 @@ -946,9 +1045,10 @@
   1.961  			va_start(ap, fmt); \
   1.962  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.963  			va_end(ap); \
   1.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); \
   1.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); \
   1.966  		} \
   1.967 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...")
   1.968 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...", \
   1.969 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)>(&ifacetype::ifacefunc)))
   1.970  
   1.971  #define SH_DECL_HOOK9_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   1.972  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)> \
   1.973 @@ -961,26 +1061,29 @@
   1.974  			va_start(ap, fmt); \
   1.975  			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.976  			va_end(ap); \
   1.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)); \
   1.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)); \
   1.979  		} \
   1.980 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...")
   1.981 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...", \
   1.982 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)>(&ifacetype::ifacefunc)))
   1.983  
   1.984 -// *********
   1.985 +// ********* Support for 10 arguments *********
   1.986  #define SH_DECL_HOOK10(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
   1.987  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)> \
   1.988  		(&ifacetype::ifacefunc))) \
   1.989  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, rettype> FD; \
   1.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 \
   1.991 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
   1.992 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10)
   1.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); } \
   1.994 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10, \
   1.995 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)>(&ifacetype::ifacefunc)))
   1.996  
   1.997  #define SH_DECL_HOOK10_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
   1.998  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)> \
   1.999  		(&ifacetype::ifacefunc))) \
  1.1000  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> FD; \
  1.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 \
  1.1002 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); } \
  1.1003 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10)
  1.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)); } \
  1.1005 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10, \
  1.1006 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)>(&ifacetype::ifacefunc)))
  1.1007  
  1.1008  #define SH_DECL_HOOK10_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.1009  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)> \
  1.1010 @@ -993,9 +1096,10 @@
  1.1011  			va_start(ap, fmt); \
  1.1012  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1013  			va_end(ap); \
  1.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); \
  1.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); \
  1.1016  		} \
  1.1017 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...")
  1.1018 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...", \
  1.1019 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1020  
  1.1021  #define SH_DECL_HOOK10_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.1022  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)> \
  1.1023 @@ -1008,26 +1112,29 @@
  1.1024  			va_start(ap, fmt); \
  1.1025  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1026  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1029  		} \
  1.1030 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...")
  1.1031 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...", \
  1.1032 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1033  
  1.1034 -// *********
  1.1035 +// ********* Support for 11 arguments *********
  1.1036  #define SH_DECL_HOOK11(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.1037  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)> \
  1.1038  		(&ifacetype::ifacefunc))) \
  1.1039  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, rettype> FD; \
  1.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 \
  1.1041 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
  1.1042 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11)
  1.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); } \
  1.1044 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11, \
  1.1045 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)>(&ifacetype::ifacefunc)))
  1.1046  
  1.1047  #define SH_DECL_HOOK11_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.1048  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)> \
  1.1049  		(&ifacetype::ifacefunc))) \
  1.1050  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> FD; \
  1.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 \
  1.1052 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); } \
  1.1053 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11)
  1.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)); } \
  1.1055 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11, \
  1.1056 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)>(&ifacetype::ifacefunc)))
  1.1057  
  1.1058  #define SH_DECL_HOOK11_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.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 *, ...)> \
  1.1060 @@ -1040,9 +1147,10 @@
  1.1061  			va_start(ap, fmt); \
  1.1062  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1063  			va_end(ap); \
  1.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); \
  1.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); \
  1.1066  		} \
  1.1067 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...")
  1.1068 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...", \
  1.1069 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1070  
  1.1071  #define SH_DECL_HOOK11_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.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 *, ...)> \
  1.1073 @@ -1055,26 +1163,29 @@
  1.1074  			va_start(ap, fmt); \
  1.1075  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1076  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1079  		} \
  1.1080 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...")
  1.1081 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...", \
  1.1082 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1083  
  1.1084 -// *********
  1.1085 +// ********* Support for 12 arguments *********
  1.1086  #define SH_DECL_HOOK12(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.1087  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)> \
  1.1088  		(&ifacetype::ifacefunc))) \
  1.1089  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, rettype> FD; \
  1.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 \
  1.1091 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), rettype); } \
  1.1092 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12)
  1.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); } \
  1.1094 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12, \
  1.1095 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)>(&ifacetype::ifacefunc)))
  1.1096  
  1.1097  #define SH_DECL_HOOK12_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.1098  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)> \
  1.1099  		(&ifacetype::ifacefunc))) \
  1.1100  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> FD; \
  1.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 \
  1.1102 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); } \
  1.1103 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12)
  1.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)); } \
  1.1105 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12, \
  1.1106 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)>(&ifacetype::ifacefunc)))
  1.1107  
  1.1108  #define SH_DECL_HOOK12_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.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 *, ...)> \
  1.1110 @@ -1087,9 +1198,10 @@
  1.1111  			va_start(ap, fmt); \
  1.1112  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1113  			va_end(ap); \
  1.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); \
  1.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); \
  1.1116  		} \
  1.1117 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...")
  1.1118 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...", \
  1.1119 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1120  
  1.1121  #define SH_DECL_HOOK12_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.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 *, ...)> \
  1.1123 @@ -1102,26 +1214,29 @@
  1.1124  			va_start(ap, fmt); \
  1.1125  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1126  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1129  		} \
  1.1130 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...")
  1.1131 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...", \
  1.1132 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1133  
  1.1134 -// *********
  1.1135 +// ********* Support for 13 arguments *********
  1.1136  #define SH_DECL_HOOK13(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.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)> \
  1.1138  		(&ifacetype::ifacefunc))) \
  1.1139  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, rettype> FD; \
  1.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 \
  1.1141 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), rettype); } \
  1.1142 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13)
  1.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); } \
  1.1144 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13, \
  1.1145 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)>(&ifacetype::ifacefunc)))
  1.1146  
  1.1147  #define SH_DECL_HOOK13_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.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)> \
  1.1149  		(&ifacetype::ifacefunc))) \
  1.1150  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> FD; \
  1.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 \
  1.1152 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); } \
  1.1153 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13)
  1.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)); } \
  1.1155 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13, \
  1.1156 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)>(&ifacetype::ifacefunc)))
  1.1157  
  1.1158  #define SH_DECL_HOOK13_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.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 *, ...)> \
  1.1160 @@ -1134,9 +1249,10 @@
  1.1161  			va_start(ap, fmt); \
  1.1162  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1163  			va_end(ap); \
  1.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); \
  1.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); \
  1.1166  		} \
  1.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*|...")
  1.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*|...", \
  1.1169 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1170  
  1.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) \
  1.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 *, ...)> \
  1.1173 @@ -1149,26 +1265,29 @@
  1.1174  			va_start(ap, fmt); \
  1.1175  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1176  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1179  		} \
  1.1180 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...")
  1.1181 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...", \
  1.1182 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1183  
  1.1184 -// *********
  1.1185 +// ********* Support for 14 arguments *********
  1.1186  #define SH_DECL_HOOK14(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  1.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)> \
  1.1188  		(&ifacetype::ifacefunc))) \
  1.1189  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, rettype> FD; \
  1.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 \
  1.1191 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), rettype); } \
  1.1192 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14)
  1.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); } \
  1.1194 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14, \
  1.1195 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)>(&ifacetype::ifacefunc)))
  1.1196  
  1.1197  #define SH_DECL_HOOK14_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  1.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)> \
  1.1199  		(&ifacetype::ifacefunc))) \
  1.1200  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> FD; \
  1.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 \
  1.1202 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); } \
  1.1203 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14)
  1.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)); } \
  1.1205 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14, \
  1.1206 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)>(&ifacetype::ifacefunc)))
  1.1207  
  1.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) \
  1.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 *, ...)> \
  1.1210 @@ -1181,9 +1300,10 @@
  1.1211  			va_start(ap, fmt); \
  1.1212  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1213  			va_end(ap); \
  1.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); \
  1.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); \
  1.1216  		} \
  1.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*|...")
  1.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*|...", \
  1.1219 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1220  
  1.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) \
  1.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 *, ...)> \
  1.1223 @@ -1196,26 +1316,29 @@
  1.1224  			va_start(ap, fmt); \
  1.1225  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1226  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1229  		} \
  1.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*|...")
  1.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*|...", \
  1.1232 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1233  
  1.1234 -// *********
  1.1235 +// ********* Support for 15 arguments *********
  1.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) \
  1.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)> \
  1.1238  		(&ifacetype::ifacefunc))) \
  1.1239  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, rettype> FD; \
  1.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 \
  1.1241 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), rettype); } \
  1.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)
  1.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); } \
  1.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, \
  1.1245 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)>(&ifacetype::ifacefunc)))
  1.1246  
  1.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) \
  1.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)> \
  1.1249  		(&ifacetype::ifacefunc))) \
  1.1250  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> FD; \
  1.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 \
  1.1252 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); } \
  1.1253 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15)
  1.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)); } \
  1.1255 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15, \
  1.1256 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)>(&ifacetype::ifacefunc)))
  1.1257  
  1.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) \
  1.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 *, ...)> \
  1.1260 @@ -1228,9 +1351,10 @@
  1.1261  			va_start(ap, fmt); \
  1.1262  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1263  			va_end(ap); \
  1.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); \
  1.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); \
  1.1266  		} \
  1.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*|...")
  1.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*|...", \
  1.1269 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1270  
  1.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) \
  1.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 *, ...)> \
  1.1273 @@ -1243,26 +1367,29 @@
  1.1274  			va_start(ap, fmt); \
  1.1275  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1276  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1279  		} \
  1.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*|...")
  1.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*|...", \
  1.1282 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)>(&ifacetype::ifacefunc)))
  1.1283  
  1.1284 -// *********
  1.1285 +// ********* Support for 16 arguments *********
  1.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) \
  1.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)> \
  1.1288  		(&ifacetype::ifacefunc))) \
  1.1289  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, rettype> FD; \
  1.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 \
  1.1291 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), rettype); } \
  1.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)
  1.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); } \
  1.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, \
  1.1295 +	(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)>(&ifacetype::ifacefunc)))
  1.1296  
  1.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) \
  1.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)> \
  1.1299  		(&ifacetype::ifacefunc))) \
  1.1300  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> FD; \
  1.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 \
  1.1302 -		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); } \
  1.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)
  1.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)); } \
  1.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, \
  1.1306 +	(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)>(&ifacetype::ifacefunc)))
  1.1307  
  1.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) \
  1.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 *, ...)> \
  1.1310 @@ -1275,9 +1402,10 @@
  1.1311  			va_start(ap, fmt); \
  1.1312  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1313  			va_end(ap); \
  1.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); \
  1.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); \
  1.1316  		} \
  1.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*|...")
  1.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*|...", \
  1.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)))
  1.1320  
  1.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) \
  1.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 *, ...)> \
  1.1323 @@ -1290,21 +1418,257 @@
  1.1324  			va_start(ap, fmt); \
  1.1325  			vsnprintf(buf, sizeof(buf), fmt, ap); \
  1.1326  			va_end(ap); \
  1.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)); \
  1.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)); \
  1.1329  		} \
  1.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*|...")
  1.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*|...", \
  1.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)))
  1.1333 +
  1.1334 +
  1.1335 +
  1.1336 +//////////////////////////////////////////////////////////////////////////
  1.1337 +// SH_CALL
  1.1338 +
  1.1339 +
  1.1340 +#define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
  1.1341 +{ \
  1.1342 +	MemFuncInfo mfi; \
  1.1343 +	MFI_Impl<sizeof(m_MFP)>::GetFuncInfo(m_MFP, mfi); \
  1.1344 +	OrigVTables::const_iterator iter = m_CC->vt.find(mfi.vtbloffs); \
  1.1345 +	if (iter == m_CC->vt.end() || mfi.vtblindex >= (int)iter->second.size() || iter->second[mfi.vtblindex] == NULL) \
  1.1346 +		return (m_CC->ptr->*m_MFP)call; \
  1.1347 +	\
  1.1348 +	/* It's hooked. Call the original function. */ \
  1.1349 +	union \
  1.1350 +	{ \
  1.1351 +		RetType(EmptyClass::*mfpnew)prms; \
  1.1352 +		void *addr; \
  1.1353 +	} u; \
  1.1354 +	u.addr = iter->second[mfi.vtblindex]; \
  1.1355 +	\
  1.1356 +	return (reinterpret_cast<EmptyClass*>(m_CC->ptr)->*u.mfpnew)call; \
  1.1357 +}
  1.1358  
  1.1359  
  1.1360 -/*
  1.1361 -#define SH_DECL_HOOK1(ifacetype, ifacefunc, attr, overload, rettype, param1) \
  1.1362 -	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload) \
  1.1363 -		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
  1.1364 -		virtual rettype Func(param1 p1) \
  1.1365 -		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (p1), rettype); } \
  1.1366 -	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1)
  1.1367 -		
  1.1368 +namespace SourceHook
  1.1369 +{
  1.1370 +	template<class CCType, class RetType, class MFPType> class ExecutableClass
  1.1371 +	{
  1.1372 +		CCType *m_CC;
  1.1373 +		MFPType m_MFP;
  1.1374 +	public:
  1.1375 +		ExecutableClass(CCType *cc, MFPType mfp) : m_CC(cc), m_MFP(mfp)
  1.1376 +		{
  1.1377 +		}
  1.1378 +
  1.1379 +		// Support for 0 arguments
  1.1380 +		template<> RetType operator()() const 
  1.1381 +			SH_MAKE_EXECUTABLECLASS_OB((), ())
  1.1382 +
  1.1383 +		// Support for 1 arguments
  1.1384 +		template<class Param1> RetType operator()(Param1 p1) const 
  1.1385 +			SH_MAKE_EXECUTABLECLASS_OB((p1), (Param1))
  1.1386 +
  1.1387 +		// Support for 2 arguments
  1.1388 +		template<class Param1, class Param2> RetType operator()(Param1 p1, Param2 p2) const 
  1.1389 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2), (Param1Param2))
  1.1390 +
  1.1391 +		// Support for 3 arguments
  1.1392 +		template<class Param1, class Param2, class Param3> RetType operator()(Param1 p1, Param2 p2, Param3 p3) const 
  1.1393 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3), (Param1Param2Param3))
  1.1394 +
  1.1395 +		// Support for 4 arguments
  1.1396 +		template<class Param1, class Param2, class Param3, class Param4> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const 
  1.1397 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4), (Param1Param2Param3Param4))
  1.1398 +
  1.1399 +		// Support for 5 arguments
  1.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 
  1.1401 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5), (Param1Param2Param3Param4Param5))
  1.1402 +
  1.1403 +		// Support for 6 arguments
  1.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 
  1.1405 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6), (Param1Param2Param3Param4Param5Param6))
  1.1406 +
  1.1407 +		// Support for 7 arguments
  1.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 
  1.1409 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7), (Param1Param2Param3Param4Param5Param6Param7))
  1.1410 +
  1.1411 +		// Support for 8 arguments
  1.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 
  1.1413 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8), (Param1Param2Param3Param4Param5Param6Param7Param8))
  1.1414 +
  1.1415 +		// Support for 9 arguments
  1.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 
  1.1417 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9), (Param1Param2Param3Param4Param5Param6Param7Param8Param9))
  1.1418 +
  1.1419 +		// Support for 10 arguments
  1.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 
  1.1421 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10))
  1.1422 +
  1.1423 +		// Support for 11 arguments
  1.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 
  1.1425 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11))
  1.1426 +
  1.1427 +		// Support for 12 arguments
  1.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 
  1.1429 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12))
  1.1430 +
  1.1431 +		// Support for 13 arguments
  1.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 
  1.1433 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13))
  1.1434 +
  1.1435 +		// Support for 14 arguments
  1.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 
  1.1437 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14))
  1.1438 +
  1.1439 +		// Support for 15 arguments
  1.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 
  1.1441 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14p15), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14Param15))
  1.1442 +
  1.1443 +		// Support for 16 arguments
  1.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 
  1.1445 +			SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14p15p16), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14Param15Param16))
  1.1446 +
  1.1447 +	};
  1.1448 +}
  1.1449 +
  1.1450 +// Support for 0 arguments
  1.1451 +template <class X, class Y, class RetType>
  1.1452 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)()>
  1.1453 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)())
  1.1454 +{
  1.1455 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)()>(ptr, mfp);
  1.1456 +}
  1.1457 +
  1.1458 +// Support for 1 arguments
  1.1459 +template <class X, class Y, class RetType, class Param1>
  1.1460 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1)>
  1.1461 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1))
  1.1462 +{
  1.1463 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1)>(ptr, mfp);
  1.1464 +}
  1.1465 +
  1.1466 +// Support for 2 arguments
  1.1467 +template <class X, class Y, class RetType, class Param1, class Param2>
  1.1468 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2)>
  1.1469 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2))
  1.1470 +{
  1.1471 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2)>(ptr, mfp);
  1.1472 +}
  1.1473  
  1.1474 -*/
  1.1475 +// Support for 3 arguments
  1.1476 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3>
  1.1477 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3)>
  1.1478 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3))
  1.1479 +{
  1.1480 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3)>(ptr, mfp);
  1.1481 +}
  1.1482 +
  1.1483 +// Support for 4 arguments
  1.1484 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4>
  1.1485 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>
  1.1486 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4))
  1.1487 +{
  1.1488 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>(ptr, mfp);
  1.1489 +}
  1.1490 +
  1.1491 +// Support for 5 arguments
  1.1492 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  1.1493 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>
  1.1494 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5))
  1.1495 +{
  1.1496 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>(ptr, mfp);
  1.1497 +}
  1.1498 +
  1.1499 +// Support for 6 arguments
  1.1500 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  1.1501 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>
  1.1502 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6))
  1.1503 +{
  1.1504 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>(ptr, mfp);
  1.1505 +}
  1.1506 +
  1.1507 +// Support for 7 arguments
  1.1508 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  1.1509 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>
  1.1510 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7))
  1.1511 +{
  1.1512 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>(ptr, mfp);
  1.1513 +}
  1.1514 +
  1.1515 +// Support for 8 arguments
  1.1516 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  1.1517 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>
  1.1518 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8))
  1.1519 +{
  1.1520 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>(ptr, mfp);
  1.1521 +}
  1.1522 +
  1.1523 +// Support for 9 arguments
  1.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>
  1.1525 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>
  1.1526 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9))
  1.1527 +{
  1.1528 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>(ptr, mfp);
  1.1529 +}
  1.1530 +
  1.1531 +// Support for 10 arguments
  1.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>
  1.1533 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>
  1.1534 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10))
  1.1535 +{
  1.1536 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>(ptr, mfp);
  1.1537 +}
  1.1538 +
  1.1539 +// Support for 11 arguments
  1.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>
  1.1541 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>
  1.1542 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11))
  1.1543 +{
  1.1544 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>(ptr, mfp);
  1.1545 +}
  1.1546 +
  1.1547 +// Support for 12 arguments
  1.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>
  1.1549 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>
  1.1550 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12))
  1.1551 +{
  1.1552 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>(ptr, mfp);
  1.1553 +}
  1.1554 +
  1.1555 +// Support for 13 arguments
  1.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>
  1.1557 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)>
  1.1558 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13))
  1.1559 +{
  1.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);
  1.1561 +}
  1.1562 +
  1.1563 +// Support for 14 arguments
  1.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>
  1.1565 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)>
  1.1566 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14))
  1.1567 +{
  1.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);
  1.1569 +}
  1.1570 +
  1.1571 +// Support for 15 arguments
  1.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>
  1.1573 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)>
  1.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))
  1.1575 +{
  1.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);
  1.1577 +}
  1.1578 +
  1.1579 +// Support for 16 arguments
  1.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>
  1.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)>
  1.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))
  1.1583 +{
  1.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);
  1.1585 +}
  1.1586 +
  1.1587 +
  1.1588 +#undef SH_MAKE_EXECUTABLECLASS_BODY
  1.1589  
  1.1590  #endif
  1.1591  	// The pope is dead. -> :(