sourcehook/sourcehook.h
changeset 385 e3d55ad50ba6
parent 383 ff5f7a65fe65
child 386 08583103ba6f
     1.1 --- a/sourcehook/sourcehook.h	Sun Oct 07 22:45:22 2007 +0000
     1.2 +++ b/sourcehook/sourcehook.h	Sun Oct 07 22:45:51 2007 +0000
     1.3 @@ -6,7 +6,7 @@
     1.4  *
     1.5  * Author(s): Pavol "PM OnoTo" Marko
     1.6  * ============================
     1.7 -*/ 
     1.8 +*/
     1.9  
    1.10  /**
    1.11  *	@file sourcehook.h
    1.12 @@ -21,18 +21,18 @@
    1.13  //  2 - Changed to virtual functions for iterators and all queries
    1.14  //  3 - Added "hook loop status variable"
    1.15  //  4 - Reentrant
    1.16 -#define SH_IFACE_VERSION 4
    1.17 +//  5 - New "V2" interface
    1.18 +#define SH_IFACE_VERSION 5
    1.19  
    1.20  // Impl versions:
    1.21  // ???
    1.22  // 4 - addition of hook ids and vp hooks (with them, AddHookNew and RemoveHookNew)
    1.23  //     This is not a SH_IFACE_VERSION change so that old plugins continue working!
    1.24 -// 5 - addition of direct vp hooks (new hook mode; from now on AddHookNew checks for
    1.25 -//	   invalid hookmode -> impl version won't have to change because of things like this)
    1.26 +// 5 - implementation of the new "V2" interface
    1.27  #define SH_IMPL_VERSION 5
    1.28  
    1.29  // Hookman version:
    1.30 -//  1 - Support for recalls, performance optimisations
    1.31 +// 1 - standard
    1.32  #define SH_HOOKMAN_VERSION 1
    1.33  
    1.34  // The value of SH_GLOB_SHPTR has to be a pointer to SourceHook::ISourceHook
    1.35 @@ -99,8 +99,8 @@
    1.36  
    1.37  #define SH_PTRSIZE sizeof(void*)
    1.38  
    1.39 +#include "sh_memfuncinfo.h"
    1.40  #include "FastDelegate.h"
    1.41 -#include "sh_memfuncinfo.h"
    1.42  
    1.43  // Good old metamod!
    1.44  
    1.45 @@ -147,25 +147,57 @@
    1.46  	*/
    1.47  	typedef int Plugin;
    1.48  
    1.49 +
    1.50 +	template <class T> class CallClass : public T
    1.51 +	{
    1.52 +	};
    1.53 +	typedef void ManualCallClass;
    1.54 +
    1.55 +	/**
    1.56 +	*	@brief Describes the way a parameter/retval is passed.
    1.57 +	*/
    1.58 +	struct PassInfo
    1.59 +	{
    1.60 +		enum PassType
    1.61 +		{
    1.62 +			PassType_Unknown=0,		/**< Unknown -- no extra info available */
    1.63 +			PassType_Basic,			/**< Plain old register data (pointers, integers) */
    1.64 +			PassType_Float,			/**< Floating point data */
    1.65 +			PassType_Object,		/**< Object or structure */
    1.66 +		};
    1.67 +
    1.68 +		enum PassFlags
    1.69 +		{
    1.70 +			PassFlag_ByVal		= (1<<0),		/**< Passing by value */
    1.71 +			PassFlag_ByRef		= (1<<1),		/**< Passing by reference */
    1.72 +			PassFlag_ODtor		= (1<<2),		/**< Object has a destructor */
    1.73 +			PassFlag_OCtor		= (1<<3),		/**< Object has a constructor */
    1.74 +			PassFlag_AssignOp	= (1<<4)		/**< Object has an assignment operator */
    1.75 +		};
    1.76 +
    1.77 +		size_t size;			//!< Size of the data being passed
    1.78 +
    1.79 +		// Extra info:
    1.80 +		//  (might be used in future versions for automatic hookfunc generation)
    1.81 +		int type;				//!< PassType value
    1.82 +		unsigned int flags;		//!< Pass/return flags
    1.83 +	};
    1.84 +
    1.85  	struct ProtoInfo
    1.86  	{
    1.87 -		ProtoInfo(int rtsz, int nop, const int *p) : beginningNull(0), retTypeSize(rtsz), numOfParams(nop), params(p)
    1.88 +		enum CallConvention
    1.89  		{
    1.90 -		}
    1.91 -		int beginningNull;		//!< To distinguish from old protos (which never begin with 0)
    1.92 -		int retTypeSize;		//!< 0 if void
    1.93 -		int numOfParams;		//!< number of parameters
    1.94 -		const int *params;		//!< params[0]=0 (or -1 for vararg), params[1]=size of first param, ...
    1.95 -	};
    1.96 -
    1.97 -	/**
    1.98 -	*	@brief Specifies the actions for hook managers
    1.99 -	*/
   1.100 -	enum HookManagerAction
   1.101 -	{
   1.102 -		HA_GetInfo = 0,			//!< Store info about the hook manager
   1.103 -		HA_Register,			//!< Save the IHookManagerInfo pointer for future reference
   1.104 -		HA_Unregister			//!< Clear the saved pointer
   1.105 +			CallConv_Unknown,		/**< Unknown  -- no extra info available */
   1.106 +			CallConv_ThisCall,		/**< This call (object pointer required) */
   1.107 +			CallConv_Cdecl,			/**< Standard C call */
   1.108 +		};
   1.109 +
   1.110 +		int numOfParams;			//!< number of parameters
   1.111 +		PassInfo retPassInfo;		//!< PassInfo for the return value. size=0 -> no retval
   1.112 +		const PassInfo *paramsPassInfo;	//!< PassInfos for the parameters
   1.113 +
   1.114 +		// Extra info:
   1.115 +		int convention;
   1.116  	};
   1.117  
   1.118  	struct IHookManagerInfo;
   1.119 @@ -173,139 +205,26 @@
   1.120  	/**
   1.121  	*	@brief Pointer to hook manager interface function
   1.122  	*
   1.123 -	*	A "hook manager" is a the only thing that knows the actual protoype of the function at compile time.
   1.124 +	*	The hook manager should store hi for later use if store==true. It should then call hi->SetInfo(...) if hi
   1.125 +	*   is non-null. The hook manager can return 0 for success or a non-zero value if it doesn't want to be used.
   1.126  	*
   1.127 -	*   @param ha What the hook manager should do
   1.128  	*	@param hi A pointer to IHookManagerInfo
   1.129  	*/
   1.130 -	typedef int (*HookManagerPubFunc)(HookManagerAction ha, IHookManagerInfo *hi);
   1.131 +	typedef int (*HookManagerPubFunc)(bool store, IHookManagerInfo *hi);
   1.132  
   1.133  	class ISHDelegate
   1.134  	{
   1.135  	public:
   1.136 -		virtual void DeleteThis() = 0;				// Ugly, I know
   1.137 -		virtual bool IsEqual(ISHDelegate *other) = 0;
   1.138 -	};
   1.139 -
   1.140 -	template <class T> class CSHDelegate : public ISHDelegate
   1.141 -	{
   1.142 -		T m_Deleg;
   1.143 -	public:
   1.144 -		CSHDelegate(T deleg) : m_Deleg(deleg)
   1.145 -		{
   1.146 -		}
   1.147 -
   1.148 -		CSHDelegate(const CSHDelegate &other) : m_Deleg(other.m_Deleg)
   1.149 -		{
   1.150 -		}
   1.151 -
   1.152 -		void DeleteThis()
   1.153 -		{
   1.154 -			delete this;
   1.155 -		}
   1.156 -
   1.157 -		bool IsEqual(ISHDelegate *other)
   1.158 -		{
   1.159 -			return static_cast<CSHDelegate<T>* >(other)->GetDeleg() == GetDeleg();
   1.160 -		}
   1.161 -
   1.162 -		T &GetDeleg()
   1.163 -		{
   1.164 -			return m_Deleg;
   1.165 -		}
   1.166 -	};
   1.167 -
   1.168 -	struct IHookList
   1.169 -	{
   1.170 -		struct IIter
   1.171 -		{
   1.172 -			virtual bool End() = 0;
   1.173 -			virtual void Next() = 0;
   1.174 -			virtual ISHDelegate *Handler() = 0;
   1.175 -			virtual int ThisPtrOffs() = 0;
   1.176 -		};
   1.177 -		virtual IIter *GetIter() = 0;
   1.178 -		virtual void ReleaseIter(IIter *pIter) = 0;
   1.179 -	};
   1.180 -
   1.181 -	struct IIface
   1.182 -	{
   1.183 -		virtual void *GetPtr() = 0;
   1.184 -		virtual IHookList *GetPreHooks() = 0;
   1.185 -		virtual IHookList *GetPostHooks() = 0;
   1.186 -	};
   1.187 -
   1.188 -	struct IVfnPtr
   1.189 -	{
   1.190 -		virtual void *GetVfnPtr() = 0;
   1.191 -		virtual void *GetOrigEntry() = 0;
   1.192 -
   1.193 -		virtual IIface *FindIface(void *ptr) = 0;
   1.194 +		virtual bool IsEqual(ISHDelegate *pOtherDeleg) = 0;		// pOtherDeleg is from the same plugin and hookman
   1.195 +		virtual void DeleteThis() = 0;
   1.196  	};
   1.197  
   1.198  	struct IHookManagerInfo
   1.199  	{
   1.200 -		virtual IVfnPtr *FindVfnPtr(void *vfnptr) = 0;
   1.201 -
   1.202 -		virtual void SetInfo(int vtbloffs, int vtblidx, const char *proto) = 0;
   1.203 -		virtual void SetHookfuncVfnptr(void *hookfunc_vfnptr) = 0;
   1.204 -
   1.205 -		// Added 23.12.2005 (yup! I'm coding RIGHT BEFORE CHRISTMAS!)
   1.206 -		// If the hookman doesn't set this, it defaults 0
   1.207 -		// SourceHook prefers hookmans with higher version numbers
   1.208 -		virtual void SetVersion(int version) = 0;
   1.209 +		virtual void SetInfo(int hookman_version, int vtbloffs, int vtblidx,
   1.210 +			ProtoInfo *proto, void *hookfunc_vfnptr) = 0;
   1.211  	};
   1.212  
   1.213 -	class AutoHookIter
   1.214 -	{
   1.215 -		IHookList *m_pList;
   1.216 -		IHookList::IIter *m_pIter;
   1.217 -	public:
   1.218 -		AutoHookIter(IHookList *pList)
   1.219 -			: m_pList(pList), m_pIter(pList->GetIter())
   1.220 -		{
   1.221 -		}
   1.222 -
   1.223 -		~AutoHookIter()
   1.224 -		{
   1.225 -			if (m_pList)
   1.226 -				m_pList->ReleaseIter(m_pIter);
   1.227 -		}
   1.228 -
   1.229 -		bool End()
   1.230 -		{
   1.231 -			return m_pIter->End();
   1.232 -		}
   1.233 -
   1.234 -		void Next()
   1.235 -		{
   1.236 -			m_pIter->Next();
   1.237 -		}
   1.238 -
   1.239 -		ISHDelegate *Handler()
   1.240 -		{
   1.241 -			return m_pIter->Handler();
   1.242 -		}
   1.243 -
   1.244 -		int ThisPtrOffs()
   1.245 -		{
   1.246 -			return m_pIter->ThisPtrOffs();
   1.247 -		}
   1.248 -
   1.249 -		void SetToZero()
   1.250 -		{
   1.251 -			m_pList = 0;
   1.252 -		}
   1.253 -	};
   1.254 -
   1.255 -	template<class B> struct DeprecatedCallClass
   1.256 -	{
   1.257 -		virtual B *GetThisPtr() = 0;
   1.258 -		virtual void *GetOrigFunc(int vtbloffs, int vtblidx) = 0;
   1.259 -	};
   1.260 -
   1.261 -	// 09.08.2008 (6 AM, I just woke up, the others are still sleeping so i finally can use this notebook !!)
   1.262 -	// - Today is an important day.
   1.263  	// I'm adding support for functions which return references.
   1.264  
   1.265  	// How it works:
   1.266 @@ -347,6 +266,14 @@
   1.267  		};
   1.268  	};
   1.269  
   1.270 +	struct IHookContext
   1.271 +	{
   1.272 +		virtual ISHDelegate *GetNext() = 0;
   1.273 +		virtual void *GetOverrideRetPtr() = 0;
   1.274 +		virtual const void *GetOrigRetPtr() = 0;
   1.275 +		virtual bool ShouldCallOrig() = 0;
   1.276 +	};
   1.277 +
   1.278  	/**
   1.279  	*	@brief The main SourceHook interface
   1.280  	*/
   1.281 @@ -364,126 +291,6 @@
   1.282  		virtual int GetImplVersion() = 0;
   1.283  
   1.284  		/**
   1.285 -		*	@brief Add a hook.
   1.286 -		*
   1.287 -		*	@return True if the function succeeded, false otherwise
   1.288 -		*
   1.289 -		*	@param plug The unique identifier of the plugin that calls this function
   1.290 -		*	@param iface The interface pointer
   1.291 -		*	@param ifacesize The size of the class iface points to
   1.292 -		*	@param myHookMan A hook manager function that should be capable of handling the function
   1.293 -		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.294 -		*	@param post Set to true if you want a post handler
   1.295 -		*/
   1.296 -		virtual bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.297 -			ISHDelegate *handler, bool post) = 0;
   1.298 -
   1.299 -		/**
   1.300 -		*	@brief Removes a hook.
   1.301 -		*
   1.302 -		*	@return True if the function succeeded, false otherwise
   1.303 -		*
   1.304 -		*	@param plug The unique identifier of the plugin that calls this function
   1.305 -		*	@param iface The interface pointer
   1.306 -		*	@param myHookMan A hook manager function that should be capable of handling the function
   1.307 -		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.308 -		*	@param post Set to true if you want a post handler
   1.309 -		*/
   1.310 -		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.311 -			ISHDelegate *handler, bool post) = 0;
   1.312 -
   1.313 -		/**
   1.314 -		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   1.315 -		*
   1.316 -		*	@param plug The unique identifier of the plugin in question
   1.317 -		*/
   1.318 -		virtual bool IsPluginInUse(Plugin plug) = 0;
   1.319 -
   1.320 -		/**
   1.321 -		*	@brief Return a pointer to a callclass. Generate a new one if required.
   1.322 -		*
   1.323 -		*	@param iface The interface pointer
   1.324 -		*	@param size Size of the class instance
   1.325 -		*/
   1.326 -		virtual DeprecatedCallClass<void> *GetCallClass(void *iface, size_t size) = 0;
   1.327 -
   1.328 -		/**
   1.329 -		*	@brief Release a callclass
   1.330 -		*
   1.331 -		*	@param ptr Pointer to the callclass
   1.332 -		*/
   1.333 -		virtual void ReleaseCallClass(DeprecatedCallClass<void> *ptr) = 0;
   1.334 -
   1.335 -		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
   1.336 -		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the
   1.337 -															//!<  previously calledhandler
   1.338 -		virtual META_RES GetStatus() = 0;					//!< Gets the highest meta result
   1.339 -		virtual const void *GetOrigRet() = 0;				//!< Gets the original result.
   1.340 -															//!<  If not in post function, undefined
   1.341 -		virtual const void *GetOverrideRet() = 0;			//!< Gets the override result.
   1.342 -															//!<  If none is specified, NULL
   1.343 -		virtual void *GetIfacePtr() = 0;					//!< Gets the interface pointer
   1.344 -		//////////////////////////////////////////////////////////////////////////
   1.345 -		// For hook managers
   1.346 -		virtual void HookLoopBegin(IIface *pIface) = 0;			//!< Should be called when a hook loop begins
   1.347 -		virtual void HookLoopEnd() = 0;							//!< Should be called when a hook loop exits
   1.348 -		virtual void SetCurResPtr(META_RES *mres) = 0;			//!< Sets pointer to the current meta result
   1.349 -		virtual void SetPrevResPtr(META_RES *mres) = 0;			//!< Sets pointer to previous meta result
   1.350 -		virtual void SetStatusPtr(META_RES *mres) = 0;			//!< Sets pointer to the status variable
   1.351 -		virtual void SetIfacePtrPtr(void **pp) = 0;				//!< Sets pointer to the interface this pointer
   1.352 -		virtual void SetOrigRetPtr(const void *ptr) = 0;		//!< Sets the original return pointer
   1.353 -		virtual void SetOverrideRetPtr(void *ptr) = 0;			//!< Sets the override result pointer
   1.354 -		virtual bool ShouldContinue() = 0;						//!< Returns false if the hook loop should exit
   1.355 -
   1.356 -		/**
   1.357 -		*	@brief Remove a hook manager. Auto-removes all hooks attached to it from plugin plug.
   1.358 -		*
   1.359 -		*	@param plug The owner of the hook manager
   1.360 -		*   @param pubFunc The hook manager's info function
   1.361 -		*/
   1.362 -		virtual void RemoveHookManager(Plugin plug, HookManagerPubFunc pubFunc) = 0;
   1.363 -
   1.364 -		virtual void DoRecall() = 0;							//!< Initiates a recall sequence
   1.365 -		/*
   1.366 -			HOW RECALLS WORK:
   1.367 -			
   1.368 -			The problem:
   1.369 -				Users want the ability to change parameters of the called function
   1.370 -				from inside their handler.
   1.371 -			The solution:
   1.372 -				1) Mark as "recall"
   1.373 -				2) Recall the function
   1.374 -				3) => SH's hook func gets called:
   1.375 -				  4) The first iterator points at the first hook the last hookfunc didn't execute yet
   1.376 -				  5) does all iteration and returns normally
   1.377 -		        6) The user's handler returns immediately
   1.378 -				7) The hook func returns immediately as well
   1.379 -
   1.380 -				Also note that the recalled hookfunc starts with the status the recalling hookfunc
   1.381 -				ended with. The last handler (doing the recall) is also able to specify its own
   1.382 -				META_RES.
   1.383 -		*/
   1.384 -
   1.385 -		virtual void *GetOverrideRetPtr() = 0;		//!< Returns the pointer set by SetOverrideRetPtr
   1.386 -
   1.387 -		/**
   1.388 -		*	@brief Set up the hook loop. Equivalent to calling:
   1.389 -		*	SetStatusPtr, SetPrevResPtr, SetCurResPtr, SetIfacePtrPtr, SetOrigRetPtr, Get/SetOverrideRetPtr
   1.390 -		*
   1.391 -		*	@param statusPtr		pointer to status variable
   1.392 -		*	@param prevResPtr		pointer to previous result variable
   1.393 -		*	@param curResPtr		pointer to current result variable
   1.394 -		*	@param ifacePtrPtr		pointer to interface this pointer variable
   1.395 -		*	@param origRetPr		pointer to original return value variable. NULL for void funcs
   1.396 -		*	@param overrideRetPtr	pointer to override return value variable. NULL for void funcs
   1.397 -		*	
   1.398 -		*	@return Override Return Pointer the hookfunc should use (may differ from overrideRetPtr
   1.399 -		*		when the hook func is being called as part of a recall
   1.400 -		*/
   1.401 -		virtual void *SetupHookLoop(META_RES *statusPtr, META_RES *prevResPtr, META_RES *curResPtr,
   1.402 -			void **ifacePtrPtr, const void *origRetPtr, void *overrideRetPtr) = 0;
   1.403 -
   1.404 -		/**
   1.405  		*	@brief Modes for the new AddHook
   1.406  		*/
   1.407  		enum AddHookMode
   1.408 @@ -503,21 +310,70 @@
   1.409  		*	@param iface The interface pointer
   1.410  		*	@param ifacesize The size of the class iface points to
   1.411  		*	@param myHookMan A hook manager function that should be capable of handling the function
   1.412 -		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.413 +		*	@param handler A pointer to the hook handler something
   1.414  		*	@param post Set to true if you want a post handler
   1.415  		*/
   1.416 -		virtual int AddHookNew(Plugin plug, AddHookMode mode, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.417 +		virtual int AddHook(Plugin plug, AddHookMode mode, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.418 +			ISHDelegate *handler, bool post) = 0;
   1.419 +
   1.420 +		// Source backwarts compat (only for normal hooks)
   1.421 +		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.422  			ISHDelegate *handler, bool post) = 0;
   1.423  
   1.424  		/**
   1.425 -		*	@brief Remove a VP hook by ID.
   1.426 +		*	@brief Remove a hook by ID.
   1.427 +		*
   1.428 +		*	@return true on success, false otherwise
   1.429 +		*
   1.430 +		*	@param hookid The hook id (returned by AddHook)
   1.431 +		*/
   1.432 +		virtual bool RemoveHookByID(int hookid) = 0;
   1.433 +
   1.434 +		/**
   1.435 +		*	@brief Pause a hook by ID.
   1.436 +		*
   1.437 +		*	@return true on success, false otherwise
   1.438 +		*
   1.439 +		*	@param hookid The hook id (returned by AddHook)
   1.440 +		*/
   1.441 +		virtual bool PauseHookByID(int hookid) = 0;
   1.442 +
   1.443 +		/**
   1.444 +		*	@brief Unpause a hook by ID.
   1.445  		*
   1.446  		*	@return true on success, false otherwise
   1.447  		*
   1.448 -		*	@param plug The unique identifier of the plugin that calls this function
   1.449 -		*	@param hookid The hook id (returned by AddHookNew)
   1.450 +		*	@param hookid The hook id (returned by AddHook)
   1.451 +		*/
   1.452 +		virtual bool UnpauseHookByID(int hookid) = 0;
   1.453 +
   1.454 +		/**
   1.455 +		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   1.456 +		*
   1.457 +		*	@param plug The unique identifier of the plugin in question
   1.458  		*/
   1.459 -		virtual bool RemoveHookByID(Plugin plug, int hookid) = 0;
   1.460 +
   1.461 +		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
   1.462 +		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the
   1.463 +															//!<  previously calledhandler
   1.464 +		virtual META_RES GetStatus() = 0;					//!< Gets the highest meta result
   1.465 +		virtual const void *GetOrigRet() = 0;				//!< Gets the original result.
   1.466 +															//!<  If not in post function, undefined
   1.467 +		virtual const void *GetOverrideRet() = 0;			//!< Gets the override result.
   1.468 +															//!<  If none is specified, NULL
   1.469 +		virtual void *GetIfacePtr() = 0;					//!< Gets the interface pointer
   1.470 +
   1.471 +		virtual void *GetOverrideRetPtr() = 0;				//!< Used for setting the override return value
   1.472 +
   1.473 +		/**
   1.474 +		*	@brief Remove a hook manager. Auto-removes all hooks attached to it from plugin plug.
   1.475 +		*
   1.476 +		*	@param plug The owner of the hook manager
   1.477 +		*   @param pubFunc The hook manager's info function
   1.478 +		*/
   1.479 +		virtual void RemoveHookManager(Plugin plug, HookManagerPubFunc pubFunc) = 0;
   1.480 +
   1.481 +		// For SH_CALL:
   1.482  
   1.483  		/**
   1.484  		*	@brief Makes sure that hooks are going to be ignored on the next call of vfnptr
   1.485 @@ -525,7 +381,7 @@
   1.486  		*	@param plug The unique identifier of the plugin that calls this function
   1.487  		*	@param vfnptr The virtual function pointer of the function in question
   1.488  		*/
   1.489 -		virtual void SetIgnoreHooks(Plugin plug, void *vfnptr) = 0;
   1.490 +		virtual void SetIgnoreHooks(void *vfnptr) = 0;
   1.491  
   1.492  		/**
   1.493  		*	@brief Reverses SetIgnoreHooks' effect
   1.494 @@ -533,15 +389,53 @@
   1.495  		*	@param plug The unique identifier of the plugin that calls this function
   1.496  		*	@param vfnptr The virtual function pointer of the function in question
   1.497  		*/
   1.498 -		virtual void ResetIgnoreHooks(Plugin plug, void *vfnptr) = 0;
   1.499 +		virtual void ResetIgnoreHooks(void *vfnptr) = 0;
   1.500 +
   1.501 +		//////////////////////////////////////////////////////////////////////////
   1.502 +
   1.503 +		// For hook managers	
   1.504 +
   1.505 +		// Returns the current iface ptr
   1.506 +		virtual void DoRecall() = 0;							//!< Initiates a recall sequence
   1.507 +
   1.508 +		/*
   1.509 +			HOW RECALLS WORK:
   1.510 +			
   1.511 +			The problem:
   1.512 +				Users want the ability to change parameters of the called function
   1.513 +				from inside their handler.
   1.514 +			The solution:
   1.515 +				1) Mark as "recall"
   1.516 +				2) Recall the function
   1.517 +				3) => SH's hook func gets called:
   1.518 +				  4) The first iterator points at the first hook the last hookfunc didn't execute yet
   1.519 +				  5) does all iteration and returns normally
   1.520 +		        6) The user's handler returns immediately
   1.521 +				7) The hook func returns immediately as well
   1.522 +
   1.523 +				Also note that the recalled hookfunc starts with the status the recalling hookfunc
   1.524 +				ended with. The last handler (doing the recall) is also able to specify its own
   1.525 +				META_RES.
   1.526 +		*/
   1.527  
   1.528  		/**
   1.529 -		*	@brief Finds the original entry of a virtual function pointer
   1.530 +		*	@brief Set up the hook loop.
   1.531  		*
   1.532 -		*	@param vfnptr The virtual function pointer
   1.533 -		*	@return The original entry if the virtual function pointer has been patched; NULL otherwise.
   1.534 +		*	@param statusPtr		pointer to status variable
   1.535 +		*	@param prevResPtr		pointer to previous result variable
   1.536 +		*	@param curResPtr		pointer to current result variable
   1.537 +		*	@param ifacePtrPtr		pointer to interface this pointer variable
   1.538 +		*	@param origRetPr		pointer to original return value variable. NULL for void funcs
   1.539 +		*	@param overrideRetPtr	pointer to override return value variable. NULL for void funcs
   1.540 +		*	
   1.541 +		*	@return Override Return Pointer the hookfunc should use (may differ from overrideRetPtr
   1.542 +		*		when the hook func is being called as part of a recall
   1.543  		*/
   1.544 -		virtual void *GetOrigVfnPtrEntry(void *vfnptr) = 0;
   1.545 +		virtual IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origentry,
   1.546 +			META_RES *statusPtr, META_RES *prevResPtr, META_RES *curResPtr,
   1.547 +			const void *origRetPtr, void *overrideRetPtr) = 0;
   1.548 +
   1.549 +		virtual void EndContext(IHookContext *pCtx) = 0;
   1.550  	};
   1.551  
   1.552  	// For META_RESULT_ORIG_RET and META_RESULT_OVERRIDE_RET:
   1.553 @@ -572,50 +466,6 @@
   1.554  			return &ref;
   1.555  		}
   1.556  	};
   1.557 -
   1.558 -	// For source-level compatibility
   1.559 -	template <class T> struct CallClass
   1.560 -	{
   1.561 -		T *ptr;
   1.562 -
   1.563 -		CallClass(T *p) : ptr(p)
   1.564 -		{
   1.565 -		}
   1.566 -
   1.567 -		operator T*()
   1.568 -		{
   1.569 -			return ptr;
   1.570 -		}
   1.571 -	};
   1.572 -
   1.573 -	typedef CallClass<void> GenericCallClass;
   1.574 -	typedef CallClass<EmptyClass> ManualCallClass;
   1.575 -
   1.576 -	template <class T>
   1.577 -	CallClass<T> *GetCallClass(T *p)
   1.578 -	{
   1.579 -		return new CallClass<T>(p);
   1.580 -	}
   1.581 -
   1.582 -	template <class T>
   1.583 -	void ReleaseCallClass(CallClass<T> *p)
   1.584 -	{
   1.585 -		delete p;
   1.586 -	}
   1.587 -
   1.588 -	template <class X, class MFP>
   1.589 -	void *GetOrigVfnPtrEntry(X *pInstance, MFP mfp, ISourceHook *pSH)
   1.590 -	{
   1.591 -		SourceHook::MemFuncInfo info = {true, -1, 0, 0};
   1.592 -		SourceHook::GetFuncInfo(pInstance, mfp, info);
   1.593 -
   1.594 -		void *vfnptr = reinterpret_cast<void*>(
   1.595 -			*reinterpret_cast<void***>(reinterpret_cast<char*>(pInstance) + info.thisptroffs + info.vtbloffs) + info.vtblindex);
   1.596 -
   1.597 -		void *origentry = pSH->GetOrigVfnPtrEntry(vfnptr);
   1.598 -		
   1.599 -		return origentry ? origentry : *reinterpret_cast<void**>(vfnptr);
   1.600 -	}
   1.601  }
   1.602  
   1.603  /************************************************************************/
   1.604 @@ -631,14 +481,23 @@
   1.605  #define RETURN_META(result)					do { SET_META_RESULT(result); return; } while(0)
   1.606  #define RETURN_META_VALUE(result, value)	do { SET_META_RESULT(result); return (value); } while(0)
   1.607  
   1.608 +
   1.609 +template<class T>
   1.610 +SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
   1.611 +{
   1.612 +	return static_cast< SourceHook::CallClass<T> *>(p);
   1.613 +}
   1.614 +#define SH_RELEASE_CALLCLASS(p)
   1.615 +
   1.616 +#define SH_GET_MCALLCLASS(p, size) reinterpret_cast<void*>(p)
   1.617 +
   1.618 +// only call these from the hook handlers directly!
   1.619 +
   1.620  // If a hook on a function which returns a reference does not want to specify a return value,
   1.621  // it can use this macro.
   1.622  //   ONLY USE THIS WITH MRES_IGNORED AND MRES_HANDLED !!!
   1.623  #define RETURN_META_NOREF(result, rettype)	do { SET_META_RESULT(result); return reinterpret_cast<rettype>(*SH_GLOB_SHPTR); } while(0)
   1.624  
   1.625 -// only call these from the hook handlers directly!
   1.626 -// :TODO: enforce it ?
   1.627 -
   1.628  // Why take a memfuncptr instead of iface and func when we have to deduce the iface anyway now?
   1.629  // Well, without it, there'd be no way to specify which overloaded version we want in _VALUE
   1.630  
   1.631 @@ -720,6 +579,7 @@
   1.632  		RETURN_META_VALUE(MRES_SUPERCEDE, (thisptr->*(u.mfp)) newparams); \
   1.633  	} while (0)
   1.634  
   1.635 +
   1.636  #define SH_MANUALHOOK_RECONFIGURE(hookname, pvtblindex, pvtbloffs, pthisptroffs) \
   1.637  	do { \
   1.638  		SH_GLOB_SHPTR->RemoveHookManager(SH_GLOB_PLUGPTR, SH_MFHCls(hookname)::HookManPubFunc); \
   1.639 @@ -728,49 +588,41 @@
   1.640  		SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \
   1.641  	} while (0)
   1.642  
   1.643 -
   1.644 -#define SH_GET_ORIG_VFNPTR_ENTRY(inst, mfp) (SourceHook::GetOrigVfnPtrEntry(inst, mfp, SH_GLOB_SHPTR))
   1.645 -
   1.646 -// For source-level compatibility
   1.647 -
   1.648 -#define SH_GET_CALLCLASS(ptr) SourceHook::GetCallClass(ptr)
   1.649 -#define SH_GET_MCALLCLASS(ptr, size) SourceHook::GetCallClass(reinterpret_cast<SourceHook::EmptyClass*>(ptr))
   1.650 -#define SH_RELEASE_CALLCLASS(ptr) SourceHook::ReleaseCallClass(ptr)
   1.651 -
   1.652  // New ADD / REMOVE macros.
   1.653  #define SH_STATIC(func) fastdelegate::MakeDelegate(func)
   1.654  #define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func)
   1.655  
   1.656  #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   1.657  	__SourceHook_FHAdd##ifacetype##ifacefunc((void*)SourceHook::implicit_cast<ifacetype*>(ifaceptr), \
   1.658 -	post, handler)
   1.659 +	SourceHook::ISourceHook::Hook_Normal, post, handler)
   1.660  
   1.661  #define SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   1.662  	__SourceHook_FHRemove##ifacetype##ifacefunc((void*)SourceHook::implicit_cast<ifacetype*>(ifaceptr), \
   1.663  	post, handler) 
   1.664  
   1.665  #define SH_ADD_MANUALHOOK(hookname, ifaceptr, handler, post) \
   1.666 -	__SourceHook_FHMAdd##hookname(reinterpret_cast<void*>(ifaceptr), post, handler)
   1.667 +	__SourceHook_FHMAdd##hookname(reinterpret_cast<void*>(ifaceptr), \
   1.668 +	SourceHook::ISourceHook::Hook_Normal, post, handler)
   1.669  
   1.670  #define SH_REMOVE_MANUALHOOK(hookname, ifaceptr, handler, post) \
   1.671  	__SourceHook_FHMRemove##hookname(reinterpret_cast<void*>(ifaceptr), post, handler) 
   1.672  
   1.673  #define SH_ADD_VPHOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   1.674 -	__SourceHook_FHVPAdd##ifacetype##ifacefunc((void*)SourceHook::implicit_cast<ifacetype*>(ifaceptr), \
   1.675 -	post, handler, false)
   1.676 -
   1.677 -#define SH_ADD_DVPHOOK(ifacetype, ifacefunc, vtableptr, handler, post) \
   1.678 -	__SourceHook_FHVPAdd##ifacetype##ifacefunc(reinterpret_cast<void*>(vtableptr), \
   1.679 -	post, handler, true)
   1.680 +	__SourceHook_FHAdd##ifacetype##ifacefunc((void*)SourceHook::implicit_cast<ifacetype*>(ifaceptr), \
   1.681 +	SourceHook::ISourceHook::Hook_VP, post, handler)
   1.682 +
   1.683 +#define SH_ADD_DVPHOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
   1.684 +	__SourceHook_FHAdd##ifacetype##ifacefunc((void*)SourceHook::implicit_cast<ifacetype*>(ifaceptr), \
   1.685 +	SourceHook::ISourceHook::Hook_DVP, post, handler)
   1.686  
   1.687  #define SH_ADD_MANUALVPHOOK(hookname, ifaceptr, handler, post) \
   1.688 -	__SourceHook_FHMVPAdd##hookname(reinterpret_cast<void*>(ifaceptr), post, handler, false)
   1.689 -
   1.690 -#define SH_ADD_MANUALDVPHOOK(hookname, vtableptr, handler, post) \
   1.691 -	__SourceHook_FHMVPAdd##hookname(reinterpret_cast<void*>(vtableptr), post, handler, true)
   1.692 +	__SourceHook_FHMAdd##hookname(reinterpret_cast<void*>(ifaceptr), SourceHook::ISourceHook::Hook_VP, post, handler) 
   1.693 +
   1.694 +#define SH_ADD_MANUALDVPHOOK(hookname, ifaceptr, handler, post) \
   1.695 +	__SourceHook_FHMAdd##hookname(reinterpret_cast<void*>(ifaceptr), SourceHook::ISourceHook::Hook_DVP, post, handler) 
   1.696  
   1.697  #define SH_REMOVE_HOOK_ID(hookid) \
   1.698 -	(SH_GLOB_SHPTR->RemoveHookByID(SH_GLOB_PLUGPTR, hookid))
   1.699 +	(SH_GLOB_SHPTR->RemoveHookByID(hookid))
   1.700  
   1.701  // Old macros
   1.702  // !! These are now deprecated. Instead, use one of these:
   1.703 @@ -827,12 +679,7 @@
   1.704  #define SH_MFHCls(hookname) __SourceHook_MFHCls_##hookname
   1.705  
   1.706  #define SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr) \
   1.707 -	SH_FHCls(ifacetype,ifacefunc,overload)() \
   1.708 -	{ \
   1.709 -		GetFuncInfo(funcptr, ms_MFI); \
   1.710 -	} \
   1.711 -	\
   1.712 -	static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::IHookManagerInfo *param) \
   1.713 +	static int HookManPubFunc(bool store, ::SourceHook::IHookManagerInfo *hi) \
   1.714  	{ \
   1.715  		using namespace ::SourceHook; \
   1.716  		GetFuncInfo(funcptr, ms_MFI); \
   1.717 @@ -841,31 +688,16 @@
   1.718  			return 1; \
   1.719  		if (SH_GLOB_SHPTR->GetImplVersion() < SH_IMPL_VERSION) \
   1.720  			return 1; \
   1.721 -		\
   1.722 -		if (action == HA_GetInfo) \
   1.723 +		if (store) \
   1.724 +			ms_HI = hi; \
   1.725 +		if (hi) \
   1.726  		{ \
   1.727 -			param->SetVersion(SH_HOOKMAN_VERSION); \
   1.728 -			param->SetInfo(ms_MFI.vtbloffs, ms_MFI.vtblindex, \
   1.729 -				reinterpret_cast<const char*>(&ms_Proto)); \
   1.730 -			\
   1.731  			MemFuncInfo mfi = {true, -1, 0, 0}; \
   1.732  			GetFuncInfo(&SH_FHCls(ifacetype,ifacefunc,overload)::Func, mfi); \
   1.733 -			param->SetHookfuncVfnptr( \
   1.734 -				reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]); \
   1.735 -			return 0; \
   1.736 +			hi->SetInfo(SH_HOOKMAN_VERSION, ms_MFI.vtbloffs, ms_MFI.vtblindex, &ms_Proto, \
   1.737 +				reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex] ); \
   1.738  		} \
   1.739 -		else if (action == HA_Register) \
   1.740 -		{ \
   1.741 -			ms_HI = param; \
   1.742 -			return 0; \
   1.743 -		} \
   1.744 -		else if (action == HA_Unregister) \
   1.745 -		{ \
   1.746 -			ms_HI = NULL; \
   1.747 -			return 0; \
   1.748 -		} \
   1.749 -		else \
   1.750 -			return 1; \
   1.751 +		return 0; \
   1.752  	}
   1.753  
   1.754  // It has to be possible to use the macros in namespaces
   1.755 @@ -885,7 +717,7 @@
   1.756  	SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
   1.757  	::SourceHook::MemFuncInfo SH_FHCls(ifacetype,ifacefunc,overload)::ms_MFI; \
   1.758  	::SourceHook::IHookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
   1.759 -	int __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
   1.760 +	int __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   1.761  		SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.762  	{ \
   1.763  		using namespace ::SourceHook; \
   1.764 @@ -894,23 +726,9 @@
   1.765  		if (mfi.thisptroffs < 0 || !mfi.isVirtual) \
   1.766  			return false; /* No non-virtual functions / virtual inheritance supported */ \
   1.767  		\
   1.768 -		return SH_GLOB_SHPTR->AddHookNew(SH_GLOB_PLUGPTR, ::SourceHook::ISourceHook::Hook_Normal, iface, mfi.thisptroffs, \
   1.769 -			SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
   1.770 -			new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
   1.771 -	} \
   1.772 -	int __SourceHook_FHVPAdd##ifacetype##ifacefunc(void *iface, bool post, \
   1.773 -		SH_FHCls(ifacetype,ifacefunc,overload)::FD handler, bool direct) \
   1.774 -	{ \
   1.775 -		using namespace ::SourceHook; \
   1.776 -		MemFuncInfo mfi = {true, -1, 0, 0}; \
   1.777 -		GetFuncInfo(funcptr, mfi); \
   1.778 -		if (mfi.thisptroffs < 0 || !mfi.isVirtual) \
   1.779 -			return false; /* No non-virtual functions / virtual inheritance supported */ \
   1.780 -		\
   1.781 -		return SH_GLOB_SHPTR->AddHookNew(SH_GLOB_PLUGPTR, \
   1.782 -			direct ? ::SourceHook::ISourceHook::Hook_DVP : ::SourceHook::ISourceHook::Hook_VP, \
   1.783 +		return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, mode, \
   1.784  			iface, mfi.thisptroffs, SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
   1.785 -			new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
   1.786 +			new SH_FHCls(ifacetype,ifacefunc,overload)::CMyDelegateImpl(handler), post); \
   1.787  	} \
   1.788  	bool __SourceHook_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
   1.789  		SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.790 @@ -918,10 +736,7 @@
   1.791  		using namespace ::SourceHook; \
   1.792  		MemFuncInfo mfi = {true, -1, 0, 0}; \
   1.793  		GetFuncInfo(funcptr, mfi); \
   1.794 -		if (mfi.thisptroffs < 0) \
   1.795 -			return false; /* No virtual inheritance supported */ \
   1.796 -		\
   1.797 -		CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
   1.798 +		SH_FHCls(ifacetype,ifacefunc,overload)::CMyDelegateImpl tmp(handler); \
   1.799  		return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
   1.800  			SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
   1.801  	} \
   1.802 @@ -941,42 +756,24 @@
   1.803  			ms_MFI.vtblindex = pvtblidx; \
   1.804  			ms_MFI.vtbloffs = pvtbloffs; \
   1.805  		} \
   1.806 -		static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::IHookManagerInfo *param) \
   1.807 +		static int HookManPubFunc(bool store, ::SourceHook::IHookManagerInfo *hi) \
   1.808  		{ \
   1.809  			using namespace ::SourceHook; \
   1.810 -			/* we don't set ms_MFI here because manual hookmans can be reconfigured */ \
   1.811 -			/* :FIXME: possible problem: someone adding a hook from a constructor of a global entity */ \
   1.812 -			/* which is construced before SH_MFHCls(hookname)() gets called? */ \
   1.813  			/* Verify interface version */ \
   1.814  			if (SH_GLOB_SHPTR->GetIfaceVersion() != SH_IFACE_VERSION) \
   1.815  				return 1; \
   1.816  			if (SH_GLOB_SHPTR->GetImplVersion() < SH_IMPL_VERSION) \
   1.817  				return 1; \
   1.818 -			\
   1.819 -			if (action == HA_GetInfo) \
   1.820 +			if (store) \
   1.821 +				ms_HI = hi; \
   1.822 +			if (hi) \
   1.823  			{ \
   1.824 -				param->SetVersion(SH_HOOKMAN_VERSION); \
   1.825 -				param->SetInfo(ms_MFI.vtbloffs, ms_MFI.vtblindex, \
   1.826 -					reinterpret_cast<const char*>(&ms_Proto)); \
   1.827 -				\
   1.828  				MemFuncInfo mfi = {true, -1, 0, 0}; \
   1.829  				GetFuncInfo(&SH_MFHCls(hookname)::Func, mfi); \
   1.830 -				param->SetHookfuncVfnptr( \
   1.831 -					reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]); \
   1.832 -				return 0; \
   1.833 +				hi->SetInfo(SH_HOOKMAN_VERSION, ms_MFI.vtbloffs, ms_MFI.vtblindex, &ms_Proto, \
   1.834 +					reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex] ); \
   1.835  			} \
   1.836 -			else if (action == HA_Register) \
   1.837 -			{ \
   1.838 -				ms_HI = param; \
   1.839 -				return 0; \
   1.840 -			} \
   1.841 -			else if (action == HA_Unregister) \
   1.842 -			{ \
   1.843 -				ms_HI = NULL; \
   1.844 -				return 0; \
   1.845 -			} \
   1.846 -			else \
   1.847 -				return 1; \
   1.848 +			return 0; \
   1.849  		}
   1.850  
   1.851  #define SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, pvtbloffs, pvtblidx, pthisptroffs) \
   1.852 @@ -984,98 +781,68 @@
   1.853  	SH_MFHCls(hookname) SH_MFHCls(hookname)::ms_Inst; \
   1.854  	::SourceHook::MemFuncInfo SH_MFHCls(hookname)::ms_MFI; \
   1.855  	::SourceHook::IHookManagerInfo *SH_MFHCls(hookname)::ms_HI; \
   1.856 -	int __SourceHook_FHMAdd##hookname(void *iface, bool post, \
   1.857 +	int __SourceHook_FHMAdd##hookname(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   1.858  		SH_MFHCls(hookname)::FD handler) \
   1.859  	{ \
   1.860 -		return SH_GLOB_SHPTR->AddHookNew(SH_GLOB_PLUGPTR, ::SourceHook::ISourceHook::Hook_Normal, iface, pthisptroffs, \
   1.861 -			SH_MFHCls(hookname)::HookManPubFunc, \
   1.862 -			new ::SourceHook::CSHDelegate<SH_MFHCls(hookname)::FD>(handler), post); \
   1.863 -	} \
   1.864 -	int __SourceHook_FHMVPAdd##hookname(void *iface, bool post, \
   1.865 -		SH_MFHCls(hookname)::FD handler, bool direct) \
   1.866 -	{ \
   1.867 -		return SH_GLOB_SHPTR->AddHookNew(SH_GLOB_PLUGPTR, \
   1.868 -			direct ? ::SourceHook::ISourceHook::Hook_DVP : ::SourceHook::ISourceHook::Hook_VP, \
   1.869 +		return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, mode, \
   1.870  			iface, pthisptroffs, SH_MFHCls(hookname)::HookManPubFunc, \
   1.871 -			new ::SourceHook::CSHDelegate<SH_MFHCls(hookname)::FD>(handler), post); \
   1.872 +			new SH_MFHCls(hookname)::CMyDelegateImpl(handler), post); \
   1.873  	} \
   1.874  	bool __SourceHook_FHMRemove##hookname(void *iface, bool post, \
   1.875  		SH_MFHCls(hookname)::FD handler) \
   1.876  	{ \
   1.877 -		::SourceHook::CSHDelegate<SH_MFHCls(hookname)::FD> tmp(handler); \
   1.878 +		SH_MFHCls(hookname)::CMyDelegateImpl tmp(handler); \
   1.879  		return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, pthisptroffs, \
   1.880  			SH_MFHCls(hookname)::HookManPubFunc, &tmp, post); \
   1.881  	} \
   1.882  
   1.883 -
   1.884  #define SH_SETUPCALLS(rettype, paramtypes, params) \
   1.885 -	/* 1) Find the vfnptr */ \
   1.886 +	/* 1) Set up */ \
   1.887  	using namespace ::SourceHook; \
   1.888  	void *ourvfnptr = reinterpret_cast<void*>( \
   1.889  		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_MFI.vtbloffs) + ms_MFI.vtblindex); \
   1.890 -	IVfnPtr *vfnptr = ms_HI->FindVfnPtr(ourvfnptr); \
   1.891 -	SH_ASSERT(vfnptr, ("Called with vfnptr 0x%p which couldn't be found in the list", ourvfnptr)); \
   1.892 +	void *vfnptr_origentry; \
   1.893  	\
   1.894 -	void *vfnptr_origentry = vfnptr->GetOrigEntry(); \
   1.895 -	/* ... and the iface */ \
   1.896 -	IIface *ifinfo = vfnptr->FindIface(reinterpret_cast<void*>(this)); \
   1.897 -	if (!ifinfo) \
   1.898 -	{ \
   1.899 -		/* The iface info was not found. Redirect the call to the original function. */ \
   1.900 -		rettype (EmptyClass::*mfp)paramtypes; \
   1.901 -		SH_SETUP_MFP(mfp); \
   1.902 -		return (reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.903 -	} \
   1.904 -	/* 2) Declare some vars and set it up */ \
   1.905 -	SH_GLOB_SHPTR->HookLoopBegin(ifinfo); \
   1.906 -	IHookList *prelist = ifinfo->GetPreHooks(); \
   1.907 -	IHookList *postlist = ifinfo->GetPostHooks(); \
   1.908  	META_RES status = MRES_IGNORED; \
   1.909  	META_RES prev_res; \
   1.910  	META_RES cur_res; \
   1.911 +	\
   1.912  	typedef ReferenceCarrier<rettype>::type my_rettype; \
   1.913  	my_rettype orig_ret; \
   1.914  	my_rettype override_ret; \
   1.915  	my_rettype plugin_ret; \
   1.916 -	void* ifptr; \
   1.917 -	my_rettype *pOverrideRet = reinterpret_cast<my_rettype*>(SH_GLOB_SHPTR->SetupHookLoop( \
   1.918 -		&status, &prev_res, &cur_res, &ifptr, &orig_ret, &override_ret));
   1.919 +	IMyDelegate *iter; \
   1.920 +	IHookContext *pContext = SH_GLOB_SHPTR->SetupHookLoop(ms_HI, ourvfnptr, reinterpret_cast<void*>(this), \
   1.921 +		&vfnptr_origentry, &status, &prev_res, &cur_res, &orig_ret, &override_ret);
   1.922  
   1.923  #define SH_CALL_HOOKS(post, params) \
   1.924 -	if (SH_GLOB_SHPTR->ShouldContinue()) \
   1.925 +	prev_res = MRES_IGNORED; \
   1.926 +	while ( iter = static_cast<IMyDelegate*>(pContext->GetNext()) ) \
   1.927  	{ \
   1.928 -		prev_res = MRES_IGNORED; \
   1.929 -		for (AutoHookIter iter(post##list); !iter.End(); iter.Next()) \
   1.930 -		{ \
   1.931 -			cur_res = MRES_IGNORED; \
   1.932 -			ifptr = reinterpret_cast<void*>(reinterpret_cast<char*>(this) - iter.ThisPtrOffs()); \
   1.933 -			plugin_ret = reinterpret_cast<CSHDelegate<FD>*>(iter.Handler())->GetDeleg() params; \
   1.934 -			prev_res = cur_res; \
   1.935 -			if (cur_res > status) \
   1.936 -				status = cur_res; \
   1.937 -			if (cur_res >= MRES_OVERRIDE) \
   1.938 -				*pOverrideRet = plugin_ret; \
   1.939 -			if (!SH_GLOB_SHPTR->ShouldContinue()) \
   1.940 -			{ \
   1.941 -				iter.SetToZero(); \
   1.942 -				break; \
   1.943 -			} \
   1.944 -		} \
   1.945 +		cur_res = MRES_IGNORED; \
   1.946 +		plugin_ret = iter->Call params; \
   1.947 +		prev_res = cur_res; \
   1.948 +		if (cur_res > status) \
   1.949 +			status = cur_res; \
   1.950 +		if (cur_res >= MRES_OVERRIDE) \
   1.951 +			*reinterpret_cast<my_rettype*>(pContext->GetOverrideRetPtr()) = plugin_ret; \
   1.952  	}
   1.953  
   1.954  #define SH_CALL_ORIG(rettype, paramtypes, params) \
   1.955 -	if (status != MRES_SUPERCEDE) \
   1.956 +	if (status != MRES_SUPERCEDE && pContext->ShouldCallOrig()) \
   1.957  	{ \
   1.958  		rettype (EmptyClass::*mfp)paramtypes; \
   1.959  		SH_SETUP_MFP(mfp); \
   1.960  		orig_ret = (reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.961  	} \
   1.962  	else \
   1.963 -		orig_ret = override_ret; \
   1.964 +		orig_ret = override_ret; /* :TODO: ??? : use pContext->GetOverrideRetPtr() or not? */
   1.965  
   1.966  #define SH_RETURN() \
   1.967 -	SH_GLOB_SHPTR->HookLoopEnd(); \
   1.968 -	return status >= MRES_OVERRIDE ? *pOverrideRet : orig_ret;
   1.969 +	const my_rettype *retptr = reinterpret_cast<const my_rettype*>( \
   1.970 +		(status >= MRES_OVERRIDE) ? pContext->GetOverrideRetPtr() : pContext->GetOrigRetPtr()); \
   1.971 +	SH_GLOB_SHPTR->EndContext(pContext); \
   1.972 +	return *retptr;
   1.973  
   1.974  #define SH_HANDLEFUNC(paramtypes, params, rettype) \
   1.975  	SH_SETUPCALLS(rettype, paramtypes, params) \
   1.976 @@ -1086,56 +853,33 @@
   1.977  
   1.978  //////////////////////////////////////////////////////////////////////////
   1.979  #define SH_SETUPCALLS_void(paramtypes, params) \
   1.980 -	/* 1) Find the vfnptr */ \
   1.981 +	/* 1) Set up */ \
   1.982  	using namespace ::SourceHook; \
   1.983  	void *ourvfnptr = reinterpret_cast<void*>( \
   1.984  		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_MFI.vtbloffs) + ms_MFI.vtblindex); \
   1.985 -	IVfnPtr *vfnptr = ms_HI->FindVfnPtr(ourvfnptr); \
   1.986 -	SH_ASSERT(vfnptr, ("Called with vfnptr 0x%p which couldn't be found in the list", ourvfnptr)); \
   1.987 +	void *vfnptr_origentry; \
   1.988  	\
   1.989 -	void *vfnptr_origentry = vfnptr->GetOrigEntry(); \
   1.990 -	/* ... and the iface */ \
   1.991 -	IIface *ifinfo = vfnptr->FindIface(reinterpret_cast<void*>(this)); \
   1.992 -	if (!ifinfo) \
   1.993 -	{ \
   1.994 -		/* The iface info was not found. Redirect the call to the original function. */ \
   1.995 -		void (EmptyClass::*mfp)paramtypes; \
   1.996 -		SH_SETUP_MFP(mfp); \
   1.997 -		(reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.998 -		return; \
   1.999 -	} \
  1.1000 -	/* 2) Declare some vars and set it up */ \
  1.1001 -	SH_GLOB_SHPTR->HookLoopBegin(ifinfo); \
  1.1002 -	IHookList *prelist = ifinfo->GetPreHooks(); \
  1.1003 -	IHookList *postlist = ifinfo->GetPostHooks(); \
  1.1004  	META_RES status = MRES_IGNORED; \
  1.1005  	META_RES prev_res; \
  1.1006  	META_RES cur_res; \
  1.1007 -	void* ifptr; \
  1.1008 -	SH_GLOB_SHPTR->SetupHookLoop(&status, &prev_res, &cur_res, &ifptr, NULL, NULL); \
  1.1009 +	\
  1.1010 +	IMyDelegate *iter; \
  1.1011 +	IHookContext *pContext = SH_GLOB_SHPTR->SetupHookLoop(ms_HI, ourvfnptr, reinterpret_cast<void*>(this), \
  1.1012 +		&vfnptr_origentry, &status, &prev_res, &cur_res, NULL, NULL);
  1.1013  
  1.1014  #define SH_CALL_HOOKS_void(post, params) \
  1.1015 -	if (SH_GLOB_SHPTR->ShouldContinue()) \
  1.1016 +	prev_res = MRES_IGNORED; \
  1.1017 +	while ( iter = static_cast<IMyDelegate*>(pContext->GetNext()) ) \
  1.1018  	{ \
  1.1019 -		prev_res = MRES_IGNORED; \
  1.1020 -		for (AutoHookIter iter(post##list); !iter.End(); iter.Next()) \
  1.1021 -		{ \
  1.1022 -			cur_res = MRES_IGNORED; \
  1.1023 -			ifptr = reinterpret_cast<void*>(reinterpret_cast<char*>(this) - iter.ThisPtrOffs()); \
  1.1024 -			reinterpret_cast<CSHDelegate<FD>*>(iter.Handler())->GetDeleg() params; \
  1.1025 -			prev_res = cur_res; \
  1.1026 -			if (cur_res > status) \
  1.1027 -				status = cur_res; \
  1.1028 -			if (!SH_GLOB_SHPTR->ShouldContinue()) \
  1.1029 -			{ \
  1.1030 -				iter.SetToZero(); \
  1.1031 -				break; \
  1.1032 -			} \
  1.1033 -		} \
  1.1034 +		cur_res = MRES_IGNORED; \
  1.1035 +		iter->Call params; \
  1.1036 +		prev_res = cur_res; \
  1.1037 +		if (cur_res > status) \
  1.1038 +			status = cur_res; \
  1.1039  	}
  1.1040  
  1.1041  #define SH_CALL_ORIG_void(paramtypes, params) \
  1.1042 -	if (status != MRES_SUPERCEDE) \
  1.1043 +	if (status != MRES_SUPERCEDE && pContext->ShouldCallOrig()) \
  1.1044  	{ \
  1.1045  		void (EmptyClass::*mfp)paramtypes; \
  1.1046  		SH_SETUP_MFP(mfp); \
  1.1047 @@ -1143,7 +887,7 @@
  1.1048  	}
  1.1049  
  1.1050  #define SH_RETURN_void() \
  1.1051 -	SH_GLOB_SHPTR->HookLoopEnd();
  1.1052 +	SH_GLOB_SHPTR->EndContext(pContext);
  1.1053  
  1.1054  #define SH_HANDLEFUNC_void(paramtypes, params) \
  1.1055  	SH_SETUPCALLS_void(paramtypes, params) \
  1.1056 @@ -1171,6 +915,28 @@
  1.1057  
  1.1058  //////////////////////////////////////////////////////////////////////////
  1.1059  
  1.1060 +#define MAKE_DELEG(ret_type, params_decl, params_pass) \
  1.1061 +	struct IMyDelegate : ::SourceHook::ISHDelegate { virtual ret_type Call params_decl = 0; }; \
  1.1062 +	struct CMyDelegateImpl : IMyDelegate \
  1.1063 +	{ \
  1.1064 +		FD m_Deleg; \
  1.1065 +		CMyDelegateImpl(FD deleg) : m_Deleg(deleg) {} \
  1.1066 +		ret_type Call params_decl { return m_Deleg params_pass; } \
  1.1067 +		void DeleteThis() { delete this; } \
  1.1068 +		bool IsEqual(ISHDelegate *pOtherDeleg) { return m_Deleg == static_cast<CMyDelegateImpl*>(pOtherDeleg)->m_Deleg; } \
  1.1069 +	};
  1.1070 +
  1.1071 +#define MAKE_DELEG_void(params_decl, params_pass) \
  1.1072 +	struct IMyDelegate : ::SourceHook::ISHDelegate { virtual void  Call params_decl = 0; }; \
  1.1073 +	struct CMyDelegateImpl : IMyDelegate \
  1.1074 +	{ \
  1.1075 +		FD m_Deleg; \
  1.1076 +		CMyDelegateImpl(FD deleg) : m_Deleg(deleg) {} \
  1.1077 +		void Call params_decl { m_Deleg params_pass; } \
  1.1078 +		void DeleteThis() { delete this; } \
  1.1079 +		bool IsEqual(ISHDelegate *pOtherDeleg) { return m_Deleg == static_cast<CMyDelegateImpl*>(pOtherDeleg)->m_Deleg; } \
  1.1080 +	};
  1.1081 +
  1.1082  // :FIXME:
  1.1083  //  sizeof on references returns the size of the datatype, NOT the pointer size or something
  1.1084  //  -> one should probably flag references in __SourceHook_ParamSizes_* !
  1.1085 @@ -1182,34 +948,37 @@
  1.1086  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)() attr> \
  1.1087  		(&ifacetype::ifacefunc))) \
  1.1088  		typedef fastdelegate::FastDelegate0<rettype> FD; \
  1.1089 +		MAKE_DELEG(rettype, (), ()); \
  1.1090  		virtual rettype Func() \
  1.1091  		{ SH_HANDLEFUNC((), (), rettype); } \
  1.1092  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1093  		(static_cast<rettype (ifacetype::*)() attr>(&ifacetype::ifacefunc))) \
  1.1094  	\
  1.1095 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0 }; \
  1.1096 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1097 -		0, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1098 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0} }; \
  1.1099 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 0, { sizeof(rettype), 0, 0 }, \
  1.1100 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1101 +
  1.1102  
  1.1103  #define SH_DECL_HOOK0_void(ifacetype, ifacefunc, attr, overload) \
  1.1104  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)() attr> \
  1.1105  		(&ifacetype::ifacefunc))) \
  1.1106  		typedef fastdelegate::FastDelegate0<> FD; \
  1.1107 +		MAKE_DELEG_void((), ()); \
  1.1108  		virtual void Func() \
  1.1109  		{ SH_HANDLEFUNC_void((), ()); } \
  1.1110  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1111  		(static_cast<void (ifacetype::*)() attr>(&ifacetype::ifacefunc))) \
  1.1112  	\
  1.1113 -	\
  1.1114 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0 }; \
  1.1115 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1116 -		0, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1117 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0} }; \
  1.1118 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 0, { 0, 0, 0 }, \
  1.1119 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1120  
  1.1121  #define SH_DECL_HOOK0_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
  1.1122  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(const char *, ...) attr> \
  1.1123  		(&ifacetype::ifacefunc))) \
  1.1124  		typedef fastdelegate::FastDelegate1<const char *, rettype> FD; \
  1.1125 -		virtual rettype Func(const char *fmt, ...) \
  1.1126 +		MAKE_DELEG(rettype, (const char *px), (px)); \
  1.1127 +		virtual rettype Func( const char *fmt, ...) \
  1.1128  		{ \
  1.1129  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1130  			va_list ap; \
  1.1131 @@ -1221,14 +990,15 @@
  1.1132  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1133  		(static_cast<rettype (ifacetype::*)(const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1134  	\
  1.1135 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1 }; \
  1.1136 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1137 -		0, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1138 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0} }; \
  1.1139 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 0, { sizeof(rettype), 0, 0 }, \
  1.1140 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1141  
  1.1142  #define SH_DECL_HOOK0_void_vafmt(ifacetype, ifacefunc, attr, overload) \
  1.1143  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(const char *, ...) attr> \
  1.1144  		(&ifacetype::ifacefunc))) \
  1.1145  		typedef fastdelegate::FastDelegate1<const char *> FD; \
  1.1146 +		MAKE_DELEG_void((const char *px), (px)); \
  1.1147  		virtual void Func(const char *fmt, ...) \
  1.1148  		{ \
  1.1149  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1150 @@ -1241,34 +1011,36 @@
  1.1151  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1152  		(static_cast<void (ifacetype::*)(const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1153  	\
  1.1154 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1 }; \
  1.1155 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1156 -		0, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1157 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0} }; \
  1.1158 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 0, { 0, 0, 0 }, \
  1.1159 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1160  
  1.1161  #define SH_DECL_MANUALHOOK0(hookname, vtblidx, vtbloffs, thisptroffs, rettype) \
  1.1162  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1163  		typedef fastdelegate::FastDelegate0<rettype> FD; \
  1.1164 +		MAKE_DELEG(rettype, (), ()); \
  1.1165  		virtual rettype Func() \
  1.1166  		{ SH_HANDLEFUNC((), (), rettype); } \
  1.1167  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(); \
  1.1168  		typedef rettype RetType; \
  1.1169  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1170  	\
  1.1171 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0 }; \
  1.1172 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1173 -		0, __SourceHook_ParamSizesM_##hookname); \
  1.1174 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0} }; \
  1.1175 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 0, { sizeof(rettype), 0, 0 }, \
  1.1176 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1177  
  1.1178  #define SH_DECL_MANUALHOOK0_void(hookname, vtblidx, vtbloffs, thisptroffs) \
  1.1179  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1180  		typedef fastdelegate::FastDelegate0<> FD; \
  1.1181 +		MAKE_DELEG_void((), ()); \
  1.1182  		virtual void Func() \
  1.1183  		{ SH_HANDLEFUNC_void((), ()); } \
  1.1184  		typedef void(::SourceHook::EmptyClass::*ECMFP)(); \
  1.1185  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1186  	\
  1.1187 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0 }; \
  1.1188 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1189 -		0, __SourceHook_ParamSizesM_##hookname); \
  1.1190 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0} }; \
  1.1191 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 0, { 0, 0, 0 }, \
  1.1192 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1193  
  1.1194  
  1.1195  // ********* Support for 1 arguments *********
  1.1196 @@ -1276,34 +1048,37 @@
  1.1197  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1) attr> \
  1.1198  		(&ifacetype::ifacefunc))) \
  1.1199  		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
  1.1200 +		MAKE_DELEG(rettype, (param1 p1), (p1)); \
  1.1201  		virtual rettype Func(param1 p1) \
  1.1202  		{ SH_HANDLEFUNC((param1), (p1), rettype); } \
  1.1203  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1204  		(static_cast<rettype (ifacetype::*)(param1) attr>(&ifacetype::ifacefunc))) \
  1.1205  	\
  1.1206 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1) }; \
  1.1207 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1208 -		1, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1209 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0} }; \
  1.1210 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 1, { sizeof(rettype), 0, 0 }, \
  1.1211 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1212 +
  1.1213  
  1.1214  #define SH_DECL_HOOK1_void(ifacetype, ifacefunc, attr, overload, param1) \
  1.1215  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1) attr> \
  1.1216  		(&ifacetype::ifacefunc))) \
  1.1217  		typedef fastdelegate::FastDelegate1<param1> FD; \
  1.1218 +		MAKE_DELEG_void((param1 p1), (p1)); \
  1.1219  		virtual void Func(param1 p1) \
  1.1220  		{ SH_HANDLEFUNC_void((param1), (p1)); } \
  1.1221  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1222  		(static_cast<void (ifacetype::*)(param1) attr>(&ifacetype::ifacefunc))) \
  1.1223  	\
  1.1224 -	\
  1.1225 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1) }; \
  1.1226 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1227 -		1, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1228 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0} }; \
  1.1229 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 1, { 0, 0, 0 }, \
  1.1230 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1231  
  1.1232  #define SH_DECL_HOOK1_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
  1.1233  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, const char *, ...) attr> \
  1.1234  		(&ifacetype::ifacefunc))) \
  1.1235  		typedef fastdelegate::FastDelegate2<param1, const char *, rettype> FD; \
  1.1236 -		virtual rettype Func(param1 p1, const char *fmt, ...) \
  1.1237 +		MAKE_DELEG(rettype, (param1 p1, const char *px), (p1, px)); \
  1.1238 +		virtual rettype Func(param1 p1 , const char *fmt, ...) \
  1.1239  		{ \
  1.1240  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1241  			va_list ap; \
  1.1242 @@ -1315,14 +1090,15 @@
  1.1243  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1244  		(static_cast<rettype (ifacetype::*)(param1, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1245  	\
  1.1246 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1) }; \
  1.1247 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1248 -		1, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1249 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0} }; \
  1.1250 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 1, { sizeof(rettype), 0, 0 }, \
  1.1251 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1252  
  1.1253  #define SH_DECL_HOOK1_void_vafmt(ifacetype, ifacefunc, attr, overload, param1) \
  1.1254  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, const char *, ...) attr> \
  1.1255  		(&ifacetype::ifacefunc))) \
  1.1256  		typedef fastdelegate::FastDelegate2<param1, const char *> FD; \
  1.1257 +		MAKE_DELEG_void((param1 p1, const char *px), (p1, px)); \
  1.1258  		virtual void Func(param1 p1, const char *fmt, ...) \
  1.1259  		{ \
  1.1260  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1261 @@ -1335,34 +1111,36 @@
  1.1262  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1263  		(static_cast<void (ifacetype::*)(param1, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1264  	\
  1.1265 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1) }; \
  1.1266 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1267 -		1, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1268 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0} }; \
  1.1269 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 1, { 0, 0, 0 }, \
  1.1270 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1271  
  1.1272  #define SH_DECL_MANUALHOOK1(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1) \
  1.1273  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1274  		typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
  1.1275 +		MAKE_DELEG(rettype, (param1 p1), (p1)); \
  1.1276  		virtual rettype Func(param1 p1) \
  1.1277  		{ SH_HANDLEFUNC((param1), (p1), rettype); } \
  1.1278  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1); \
  1.1279  		typedef rettype RetType; \
  1.1280  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1281  	\
  1.1282 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1) }; \
  1.1283 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1284 -		1, __SourceHook_ParamSizesM_##hookname); \
  1.1285 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0} }; \
  1.1286 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 1, { sizeof(rettype), 0, 0 }, \
  1.1287 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1288  
  1.1289  #define SH_DECL_MANUALHOOK1_void(hookname, vtblidx, vtbloffs, thisptroffs, param1) \
  1.1290  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1291  		typedef fastdelegate::FastDelegate1<param1> FD; \
  1.1292 +		MAKE_DELEG_void((param1 p1), (p1)); \
  1.1293  		virtual void Func(param1 p1) \
  1.1294  		{ SH_HANDLEFUNC_void((param1), (p1)); } \
  1.1295  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1); \
  1.1296  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1297  	\
  1.1298 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1) }; \
  1.1299 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1300 -		1, __SourceHook_ParamSizesM_##hookname); \
  1.1301 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0} }; \
  1.1302 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 1, { 0, 0, 0 }, \
  1.1303 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1304  
  1.1305  
  1.1306  // ********* Support for 2 arguments *********
  1.1307 @@ -1370,34 +1148,37 @@
  1.1308  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2) attr> \
  1.1309  		(&ifacetype::ifacefunc))) \
  1.1310  		typedef fastdelegate::FastDelegate2<param1, param2, rettype> FD; \
  1.1311 +		MAKE_DELEG(rettype, (param1 p1, param2 p2), (p1, p2)); \
  1.1312  		virtual rettype Func(param1 p1, param2 p2) \
  1.1313  		{ SH_HANDLEFUNC((param1, param2), (p1, p2), rettype); } \
  1.1314  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1315  		(static_cast<rettype (ifacetype::*)(param1, param2) attr>(&ifacetype::ifacefunc))) \
  1.1316  	\
  1.1317 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2) }; \
  1.1318 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1319 -		2, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1320 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0} }; \
  1.1321 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 2, { sizeof(rettype), 0, 0 }, \
  1.1322 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1323 +
  1.1324  
  1.1325  #define SH_DECL_HOOK2_void(ifacetype, ifacefunc, attr, overload, param1, param2) \
  1.1326  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2) attr> \
  1.1327  		(&ifacetype::ifacefunc))) \
  1.1328  		typedef fastdelegate::FastDelegate2<param1, param2> FD; \
  1.1329 +		MAKE_DELEG_void((param1 p1, param2 p2), (p1, p2)); \
  1.1330  		virtual void Func(param1 p1, param2 p2) \
  1.1331  		{ SH_HANDLEFUNC_void((param1, param2), (p1, p2)); } \
  1.1332  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1333  		(static_cast<void (ifacetype::*)(param1, param2) attr>(&ifacetype::ifacefunc))) \
  1.1334  	\
  1.1335 -	\
  1.1336 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2) }; \
  1.1337 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1338 -		2, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1339 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0} }; \
  1.1340 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 2, { 0, 0, 0 }, \
  1.1341 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1342  
  1.1343  #define SH_DECL_HOOK2_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
  1.1344  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...) attr> \
  1.1345  		(&ifacetype::ifacefunc))) \
  1.1346  		typedef fastdelegate::FastDelegate3<param1, param2, const char *, rettype> FD; \
  1.1347 -		virtual rettype Func(param1 p1, param2 p2, const char *fmt, ...) \
  1.1348 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, const char *px), (p1, p2, px)); \
  1.1349 +		virtual rettype Func(param1 p1, param2 p2 , const char *fmt, ...) \
  1.1350  		{ \
  1.1351  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1352  			va_list ap; \
  1.1353 @@ -1409,14 +1190,15 @@
  1.1354  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1355  		(static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1356  	\
  1.1357 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2) }; \
  1.1358 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1359 -		2, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1360 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0} }; \
  1.1361 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 2, { sizeof(rettype), 0, 0 }, \
  1.1362 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1363  
  1.1364  #define SH_DECL_HOOK2_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2) \
  1.1365  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, const char *, ...) attr> \
  1.1366  		(&ifacetype::ifacefunc))) \
  1.1367  		typedef fastdelegate::FastDelegate3<param1, param2, const char *> FD; \
  1.1368 +		MAKE_DELEG_void((param1 p1, param2 p2, const char *px), (p1, p2, px)); \
  1.1369  		virtual void Func(param1 p1, param2 p2, const char *fmt, ...) \
  1.1370  		{ \
  1.1371  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1372 @@ -1429,34 +1211,36 @@
  1.1373  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1374  		(static_cast<void (ifacetype::*)(param1, param2, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1375  	\
  1.1376 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2) }; \
  1.1377 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1378 -		2, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1379 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0} }; \
  1.1380 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 2, { 0, 0, 0 }, \
  1.1381 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1382  
  1.1383  #define SH_DECL_MANUALHOOK2(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2) \
  1.1384  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1385  		typedef fastdelegate::FastDelegate2<param1, param2, rettype> FD; \
  1.1386 +		MAKE_DELEG(rettype, (param1 p1, param2 p2), (p1, p2)); \
  1.1387  		virtual rettype Func(param1 p1, param2 p2) \
  1.1388  		{ SH_HANDLEFUNC((param1, param2), (p1, p2), rettype); } \
  1.1389  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2); \
  1.1390  		typedef rettype RetType; \
  1.1391  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1392  	\
  1.1393 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2) }; \
  1.1394 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1395 -		2, __SourceHook_ParamSizesM_##hookname); \
  1.1396 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0} }; \
  1.1397 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 2, { sizeof(rettype), 0, 0 }, \
  1.1398 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1399  
  1.1400  #define SH_DECL_MANUALHOOK2_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2) \
  1.1401  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1402  		typedef fastdelegate::FastDelegate2<param1, param2> FD; \
  1.1403 +		MAKE_DELEG_void((param1 p1, param2 p2), (p1, p2)); \
  1.1404  		virtual void Func(param1 p1, param2 p2) \
  1.1405  		{ SH_HANDLEFUNC_void((param1, param2), (p1, p2)); } \
  1.1406  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2); \
  1.1407  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1408  	\
  1.1409 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2) }; \
  1.1410 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1411 -		2, __SourceHook_ParamSizesM_##hookname); \
  1.1412 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0} }; \
  1.1413 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 2, { 0, 0, 0 }, \
  1.1414 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1415  
  1.1416  
  1.1417  // ********* Support for 3 arguments *********
  1.1418 @@ -1464,34 +1248,37 @@
  1.1419  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3) attr> \
  1.1420  		(&ifacetype::ifacefunc))) \
  1.1421  		typedef fastdelegate::FastDelegate3<param1, param2, param3, rettype> FD; \
  1.1422 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3), (p1, p2, p3)); \
  1.1423  		virtual rettype Func(param1 p1, param2 p2, param3 p3) \
  1.1424  		{ SH_HANDLEFUNC((param1, param2, param3), (p1, p2, p3), rettype); } \
  1.1425  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1426  		(static_cast<rettype (ifacetype::*)(param1, param2, param3) attr>(&ifacetype::ifacefunc))) \
  1.1427  	\
  1.1428 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3) }; \
  1.1429 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1430 -		3, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1431 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0} }; \
  1.1432 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 3, { sizeof(rettype), 0, 0 }, \
  1.1433 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1434 +
  1.1435  
  1.1436  #define SH_DECL_HOOK3_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3) \
  1.1437  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3) attr> \
  1.1438  		(&ifacetype::ifacefunc))) \
  1.1439  		typedef fastdelegate::FastDelegate3<param1, param2, param3> FD; \
  1.1440 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3), (p1, p2, p3)); \
  1.1441  		virtual void Func(param1 p1, param2 p2, param3 p3) \
  1.1442  		{ SH_HANDLEFUNC_void((param1, param2, param3), (p1, p2, p3)); } \
  1.1443  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1444  		(static_cast<void (ifacetype::*)(param1, param2, param3) attr>(&ifacetype::ifacefunc))) \
  1.1445  	\
  1.1446 -	\
  1.1447 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3) }; \
  1.1448 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1449 -		3, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1450 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0} }; \
  1.1451 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 3, { 0, 0, 0 }, \
  1.1452 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1453  
  1.1454  #define SH_DECL_HOOK3_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
  1.1455  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...) attr> \
  1.1456  		(&ifacetype::ifacefunc))) \
  1.1457  		typedef fastdelegate::FastDelegate4<param1, param2, param3, const char *, rettype> FD; \
  1.1458 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, const char *fmt, ...) \
  1.1459 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, const char *px), (p1, p2, p3, px)); \
  1.1460 +		virtual rettype Func(param1 p1, param2 p2, param3 p3 , const char *fmt, ...) \
  1.1461  		{ \
  1.1462  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1463  			va_list ap; \
  1.1464 @@ -1503,14 +1290,15 @@
  1.1465  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1466  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1467  	\
  1.1468 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3) }; \
  1.1469 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1470 -		3, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1471 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0} }; \
  1.1472 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 3, { sizeof(rettype), 0, 0 }, \
  1.1473 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1474  
  1.1475  #define SH_DECL_HOOK3_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3) \
  1.1476  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...) attr> \
  1.1477  		(&ifacetype::ifacefunc))) \
  1.1478  		typedef fastdelegate::FastDelegate4<param1, param2, param3, const char *> FD; \
  1.1479 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, const char *px), (p1, p2, p3, px)); \
  1.1480  		virtual void Func(param1 p1, param2 p2, param3 p3, const char *fmt, ...) \
  1.1481  		{ \
  1.1482  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1483 @@ -1523,34 +1311,36 @@
  1.1484  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1485  		(static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1486  	\
  1.1487 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3) }; \
  1.1488 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1489 -		3, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1490 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0} }; \
  1.1491 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 3, { 0, 0, 0 }, \
  1.1492 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1493  
  1.1494  #define SH_DECL_MANUALHOOK3(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3) \
  1.1495  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1496  		typedef fastdelegate::FastDelegate3<param1, param2, param3, rettype> FD; \
  1.1497 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3), (p1, p2, p3)); \
  1.1498  		virtual rettype Func(param1 p1, param2 p2, param3 p3) \
  1.1499  		{ SH_HANDLEFUNC((param1, param2, param3), (p1, p2, p3), rettype); } \
  1.1500  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3); \
  1.1501  		typedef rettype RetType; \
  1.1502  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1503  	\
  1.1504 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3) }; \
  1.1505 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1506 -		3, __SourceHook_ParamSizesM_##hookname); \
  1.1507 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0} }; \
  1.1508 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 3, { sizeof(rettype), 0, 0 }, \
  1.1509 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1510  
  1.1511  #define SH_DECL_MANUALHOOK3_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3) \
  1.1512  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1513  		typedef fastdelegate::FastDelegate3<param1, param2, param3> FD; \
  1.1514 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3), (p1, p2, p3)); \
  1.1515  		virtual void Func(param1 p1, param2 p2, param3 p3) \
  1.1516  		{ SH_HANDLEFUNC_void((param1, param2, param3), (p1, p2, p3)); } \
  1.1517  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3); \
  1.1518  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1519  	\
  1.1520 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3) }; \
  1.1521 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1522 -		3, __SourceHook_ParamSizesM_##hookname); \
  1.1523 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0} }; \
  1.1524 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 3, { 0, 0, 0 }, \
  1.1525 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1526  
  1.1527  
  1.1528  // ********* Support for 4 arguments *********
  1.1529 @@ -1558,34 +1348,37 @@
  1.1530  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4) attr> \
  1.1531  		(&ifacetype::ifacefunc))) \
  1.1532  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4, rettype> FD; \
  1.1533 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4), (p1, p2, p3, p4)); \
  1.1534  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) \
  1.1535  		{ SH_HANDLEFUNC((param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
  1.1536  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1537  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4) attr>(&ifacetype::ifacefunc))) \
  1.1538  	\
  1.1539 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
  1.1540 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1541 -		4, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1542 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0} }; \
  1.1543 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 4, { sizeof(rettype), 0, 0 }, \
  1.1544 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1545 +
  1.1546  
  1.1547  #define SH_DECL_HOOK4_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4) \
  1.1548  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4) attr> \
  1.1549  		(&ifacetype::ifacefunc))) \
  1.1550  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4> FD; \
  1.1551 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4), (p1, p2, p3, p4)); \
  1.1552  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4) \
  1.1553  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4), (p1, p2, p3, p4)); } \
  1.1554  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1555  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4) attr>(&ifacetype::ifacefunc))) \
  1.1556  	\
  1.1557 -	\
  1.1558 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
  1.1559 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1560 -		4, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1561 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0} }; \
  1.1562 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 4, { 0, 0, 0 }, \
  1.1563 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1564  
  1.1565  #define SH_DECL_HOOK4_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
  1.1566  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr> \
  1.1567  		(&ifacetype::ifacefunc))) \
  1.1568  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, const char *, rettype> FD; \
  1.1569 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, const char *fmt, ...) \
  1.1570 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, const char *px), (p1, p2, p3, p4, px)); \
  1.1571 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4 , const char *fmt, ...) \
  1.1572  		{ \
  1.1573  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1574  			va_list ap; \
  1.1575 @@ -1597,14 +1390,15 @@
  1.1576  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1577  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1578  	\
  1.1579 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
  1.1580 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1581 -		4, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1582 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0} }; \
  1.1583 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 4, { sizeof(rettype), 0, 0 }, \
  1.1584 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1585  
  1.1586  #define SH_DECL_HOOK4_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4) \
  1.1587  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr> \
  1.1588  		(&ifacetype::ifacefunc))) \
  1.1589  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, const char *> FD; \
  1.1590 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, const char *px), (p1, p2, p3, p4, px)); \
  1.1591  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, const char *fmt, ...) \
  1.1592  		{ \
  1.1593  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1594 @@ -1617,34 +1411,36 @@
  1.1595  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1596  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1597  	\
  1.1598 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
  1.1599 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1600 -		4, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1601 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0} }; \
  1.1602 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 4, { 0, 0, 0 }, \
  1.1603 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1604  
  1.1605  #define SH_DECL_MANUALHOOK4(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4) \
  1.1606  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1607  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4, rettype> FD; \
  1.1608 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4), (p1, p2, p3, p4)); \
  1.1609  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) \
  1.1610  		{ SH_HANDLEFUNC((param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
  1.1611  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4); \
  1.1612  		typedef rettype RetType; \
  1.1613  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1614  	\
  1.1615 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
  1.1616 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1617 -		4, __SourceHook_ParamSizesM_##hookname); \
  1.1618 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0} }; \
  1.1619 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 4, { sizeof(rettype), 0, 0 }, \
  1.1620 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1621  
  1.1622  #define SH_DECL_MANUALHOOK4_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4) \
  1.1623  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1624  		typedef fastdelegate::FastDelegate4<param1, param2, param3, param4> FD; \
  1.1625 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4), (p1, p2, p3, p4)); \
  1.1626  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4) \
  1.1627  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4), (p1, p2, p3, p4)); } \
  1.1628  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4); \
  1.1629  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1630  	\
  1.1631 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
  1.1632 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1633 -		4, __SourceHook_ParamSizesM_##hookname); \
  1.1634 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0} }; \
  1.1635 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 4, { 0, 0, 0 }, \
  1.1636 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1637  
  1.1638  
  1.1639  // ********* Support for 5 arguments *********
  1.1640 @@ -1652,34 +1448,37 @@
  1.1641  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5) attr> \
  1.1642  		(&ifacetype::ifacefunc))) \
  1.1643  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5, rettype> FD; \
  1.1644 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5), (p1, p2, p3, p4, p5)); \
  1.1645  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
  1.1646  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
  1.1647  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1648  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5) attr>(&ifacetype::ifacefunc))) \
  1.1649  	\
  1.1650 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
  1.1651 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1652 -		5, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1653 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0} }; \
  1.1654 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 5, { sizeof(rettype), 0, 0 }, \
  1.1655 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1656 +
  1.1657  
  1.1658  #define SH_DECL_HOOK5_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5) \
  1.1659  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5) attr> \
  1.1660  		(&ifacetype::ifacefunc))) \
  1.1661  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5> FD; \
  1.1662 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5), (p1, p2, p3, p4, p5)); \
  1.1663  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
  1.1664  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5)); } \
  1.1665  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1666  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5) attr>(&ifacetype::ifacefunc))) \
  1.1667  	\
  1.1668 -	\
  1.1669 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
  1.1670 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1671 -		5, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1672 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0} }; \
  1.1673 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 5, { 0, 0, 0 }, \
  1.1674 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1675  
  1.1676  #define SH_DECL_HOOK5_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
  1.1677  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr> \
  1.1678  		(&ifacetype::ifacefunc))) \
  1.1679  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, const char *, rettype> FD; \
  1.1680 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *fmt, ...) \
  1.1681 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *px), (p1, p2, p3, p4, p5, px)); \
  1.1682 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5 , const char *fmt, ...) \
  1.1683  		{ \
  1.1684  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1685  			va_list ap; \
  1.1686 @@ -1691,14 +1490,15 @@
  1.1687  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1688  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1689  	\
  1.1690 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
  1.1691 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1692 -		5, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1693 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0} }; \
  1.1694 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 5, { sizeof(rettype), 0, 0 }, \
  1.1695 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1696  
  1.1697  #define SH_DECL_HOOK5_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5) \
  1.1698  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr> \
  1.1699  		(&ifacetype::ifacefunc))) \
  1.1700  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, const char *> FD; \
  1.1701 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *px), (p1, p2, p3, p4, p5, px)); \
  1.1702  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *fmt, ...) \
  1.1703  		{ \
  1.1704  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1705 @@ -1711,34 +1511,36 @@
  1.1706  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1707  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1708  	\
  1.1709 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
  1.1710 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1711 -		5, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1712 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0} }; \
  1.1713 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 5, { 0, 0, 0 }, \
  1.1714 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1715  
  1.1716  #define SH_DECL_MANUALHOOK5(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5) \
  1.1717  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1718  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5, rettype> FD; \
  1.1719 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5), (p1, p2, p3, p4, p5)); \
  1.1720  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
  1.1721  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
  1.1722  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5); \
  1.1723  		typedef rettype RetType; \
  1.1724  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1725  	\
  1.1726 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
  1.1727 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1728 -		5, __SourceHook_ParamSizesM_##hookname); \
  1.1729 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0} }; \
  1.1730 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 5, { sizeof(rettype), 0, 0 }, \
  1.1731 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1732  
  1.1733  #define SH_DECL_MANUALHOOK5_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5) \
  1.1734  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1735  		typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5> FD; \
  1.1736 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5), (p1, p2, p3, p4, p5)); \
  1.1737  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
  1.1738  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5)); } \
  1.1739  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5); \
  1.1740  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1741  	\
  1.1742 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
  1.1743 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1744 -		5, __SourceHook_ParamSizesM_##hookname); \
  1.1745 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0} }; \
  1.1746 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 5, { 0, 0, 0 }, \
  1.1747 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1748  
  1.1749  
  1.1750  // ********* Support for 6 arguments *********
  1.1751 @@ -1746,34 +1548,37 @@
  1.1752  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr> \
  1.1753  		(&ifacetype::ifacefunc))) \
  1.1754  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6, rettype> FD; \
  1.1755 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6), (p1, p2, p3, p4, p5, p6)); \
  1.1756  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
  1.1757  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
  1.1758  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1759  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr>(&ifacetype::ifacefunc))) \
  1.1760  	\
  1.1761 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
  1.1762 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1763 -		6, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1764 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0} }; \
  1.1765 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 6, { sizeof(rettype), 0, 0 }, \
  1.1766 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1767 +
  1.1768  
  1.1769  #define SH_DECL_HOOK6_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6) \
  1.1770  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr> \
  1.1771  		(&ifacetype::ifacefunc))) \
  1.1772  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6> FD; \
  1.1773 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6), (p1, p2, p3, p4, p5, p6)); \
  1.1774  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
  1.1775  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6)); } \
  1.1776  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1777  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr>(&ifacetype::ifacefunc))) \
  1.1778  	\
  1.1779 -	\
  1.1780 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
  1.1781 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1782 -		6, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1783 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0} }; \
  1.1784 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 6, { 0, 0, 0 }, \
  1.1785 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1786  
  1.1787  #define SH_DECL_HOOK6_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
  1.1788  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr> \
  1.1789  		(&ifacetype::ifacefunc))) \
  1.1790  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, const char *, rettype> FD; \
  1.1791 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *fmt, ...) \
  1.1792 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *px), (p1, p2, p3, p4, p5, p6, px)); \
  1.1793 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6 , const char *fmt, ...) \
  1.1794  		{ \
  1.1795  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1796  			va_list ap; \
  1.1797 @@ -1785,14 +1590,15 @@
  1.1798  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1799  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1800  	\
  1.1801 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
  1.1802 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1803 -		6, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1804 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0} }; \
  1.1805 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 6, { sizeof(rettype), 0, 0 }, \
  1.1806 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1807  
  1.1808  #define SH_DECL_HOOK6_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6) \
  1.1809  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr> \
  1.1810  		(&ifacetype::ifacefunc))) \
  1.1811  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, const char *> FD; \
  1.1812 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *px), (p1, p2, p3, p4, p5, p6, px)); \
  1.1813  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *fmt, ...) \
  1.1814  		{ \
  1.1815  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1816 @@ -1805,34 +1611,36 @@
  1.1817  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1818  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1819  	\
  1.1820 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
  1.1821 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1822 -		6, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1823 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0} }; \
  1.1824 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 6, { 0, 0, 0 }, \
  1.1825 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1826  
  1.1827  #define SH_DECL_MANUALHOOK6(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6) \
  1.1828  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1829  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6, rettype> FD; \
  1.1830 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6), (p1, p2, p3, p4, p5, p6)); \
  1.1831  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
  1.1832  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
  1.1833  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6); \
  1.1834  		typedef rettype RetType; \
  1.1835  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1836  	\
  1.1837 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
  1.1838 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1839 -		6, __SourceHook_ParamSizesM_##hookname); \
  1.1840 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0} }; \
  1.1841 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 6, { sizeof(rettype), 0, 0 }, \
  1.1842 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1843  
  1.1844  #define SH_DECL_MANUALHOOK6_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6) \
  1.1845  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1846  		typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6> FD; \
  1.1847 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6), (p1, p2, p3, p4, p5, p6)); \
  1.1848  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
  1.1849  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6)); } \
  1.1850  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6); \
  1.1851  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1852  	\
  1.1853 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
  1.1854 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1855 -		6, __SourceHook_ParamSizesM_##hookname); \
  1.1856 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0} }; \
  1.1857 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 6, { 0, 0, 0 }, \
  1.1858 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1859  
  1.1860  
  1.1861  // ********* Support for 7 arguments *********
  1.1862 @@ -1840,34 +1648,37 @@
  1.1863  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr> \
  1.1864  		(&ifacetype::ifacefunc))) \
  1.1865  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7, rettype> FD; \
  1.1866 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7), (p1, p2, p3, p4, p5, p6, p7)); \
  1.1867  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
  1.1868  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
  1.1869  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1870  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr>(&ifacetype::ifacefunc))) \
  1.1871  	\
  1.1872 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
  1.1873 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1874 -		7, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1875 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0} }; \
  1.1876 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 7, { sizeof(rettype), 0, 0 }, \
  1.1877 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1878 +
  1.1879  
  1.1880  #define SH_DECL_HOOK7_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7) \
  1.1881  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr> \
  1.1882  		(&ifacetype::ifacefunc))) \
  1.1883  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7> FD; \
  1.1884 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7), (p1, p2, p3, p4, p5, p6, p7)); \
  1.1885  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
  1.1886  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7)); } \
  1.1887  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1888  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr>(&ifacetype::ifacefunc))) \
  1.1889  	\
  1.1890 -	\
  1.1891 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
  1.1892 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1893 -		7, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1894 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0} }; \
  1.1895 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 7, { 0, 0, 0 }, \
  1.1896 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1897  
  1.1898  #define SH_DECL_HOOK7_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
  1.1899  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr> \
  1.1900  		(&ifacetype::ifacefunc))) \
  1.1901  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, const char *, rettype> FD; \
  1.1902 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *fmt, ...) \
  1.1903 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *px), (p1, p2, p3, p4, p5, p6, p7, px)); \
  1.1904 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7 , const char *fmt, ...) \
  1.1905  		{ \
  1.1906  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1907  			va_list ap; \
  1.1908 @@ -1879,14 +1690,15 @@
  1.1909  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1910  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1911  	\
  1.1912 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
  1.1913 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1914 -		7, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1915 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0} }; \
  1.1916 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 7, { sizeof(rettype), 0, 0 }, \
  1.1917 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1918  
  1.1919  #define SH_DECL_HOOK7_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7) \
  1.1920  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr> \
  1.1921  		(&ifacetype::ifacefunc))) \
  1.1922  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, const char *> FD; \
  1.1923 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *px), (p1, p2, p3, p4, p5, p6, p7, px)); \
  1.1924  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *fmt, ...) \
  1.1925  		{ \
  1.1926  			char buf[::SourceHook::STRBUF_LEN]; \
  1.1927 @@ -1899,34 +1711,36 @@
  1.1928  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1929  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.1930  	\
  1.1931 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
  1.1932 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.1933 -		7, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1934 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0} }; \
  1.1935 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 7, { 0, 0, 0 }, \
  1.1936 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1937  
  1.1938  #define SH_DECL_MANUALHOOK7(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7) \
  1.1939  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1940  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7, rettype> FD; \
  1.1941 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7), (p1, p2, p3, p4, p5, p6, p7)); \
  1.1942  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
  1.1943  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
  1.1944  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7); \
  1.1945  		typedef rettype RetType; \
  1.1946  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1947  	\
  1.1948 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
  1.1949 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.1950 -		7, __SourceHook_ParamSizesM_##hookname); \
  1.1951 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0} }; \
  1.1952 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 7, { sizeof(rettype), 0, 0 }, \
  1.1953 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.1954  
  1.1955  #define SH_DECL_MANUALHOOK7_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7) \
  1.1956  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1957  		typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7> FD; \
  1.1958 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7), (p1, p2, p3, p4, p5, p6, p7)); \
  1.1959  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
  1.1960  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7)); } \
  1.1961  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7); \
  1.1962  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.1963  	\
  1.1964 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
  1.1965 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.1966 -		7, __SourceHook_ParamSizesM_##hookname); \
  1.1967 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0} }; \
  1.1968 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 7, { 0, 0, 0 }, \
  1.1969 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.1970  
  1.1971  
  1.1972  // ********* Support for 8 arguments *********
  1.1973 @@ -1934,34 +1748,37 @@
  1.1974  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr> \
  1.1975  		(&ifacetype::ifacefunc))) \
  1.1976  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8, rettype> FD; \
  1.1977 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8), (p1, p2, p3, p4, p5, p6, p7, p8)); \
  1.1978  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
  1.1979  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
  1.1980  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1981  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr>(&ifacetype::ifacefunc))) \
  1.1982  	\
  1.1983 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
  1.1984 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.1985 -		8, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.1986 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0} }; \
  1.1987 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 8, { sizeof(rettype), 0, 0 }, \
  1.1988 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.1989 +
  1.1990  
  1.1991  #define SH_DECL_HOOK8_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8) \
  1.1992  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr> \
  1.1993  		(&ifacetype::ifacefunc))) \
  1.1994  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8> FD; \
  1.1995 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8), (p1, p2, p3, p4, p5, p6, p7, p8)); \
  1.1996  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
  1.1997  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8)); } \
  1.1998  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.1999  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr>(&ifacetype::ifacefunc))) \
  1.2000  	\
  1.2001 -	\
  1.2002 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
  1.2003 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2004 -		8, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2005 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0} }; \
  1.2006 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 8, { 0, 0, 0 }, \
  1.2007 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2008  
  1.2009  #define SH_DECL_HOOK8_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
  1.2010  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr> \
  1.2011  		(&ifacetype::ifacefunc))) \
  1.2012  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, const char *, rettype> FD; \
  1.2013 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *fmt, ...) \
  1.2014 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, px)); \
  1.2015 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8 , const char *fmt, ...) \
  1.2016  		{ \
  1.2017  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2018  			va_list ap; \
  1.2019 @@ -1973,14 +1790,15 @@
  1.2020  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2021  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2022  	\
  1.2023 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
  1.2024 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2025 -		8, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2026 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0} }; \
  1.2027 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 8, { sizeof(rettype), 0, 0 }, \
  1.2028 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2029  
  1.2030  #define SH_DECL_HOOK8_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8) \
  1.2031  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr> \
  1.2032  		(&ifacetype::ifacefunc))) \
  1.2033  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, const char *> FD; \
  1.2034 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, px)); \
  1.2035  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *fmt, ...) \
  1.2036  		{ \
  1.2037  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2038 @@ -1993,34 +1811,36 @@
  1.2039  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2040  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2041  	\
  1.2042 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
  1.2043 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2044 -		8, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2045 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0} }; \
  1.2046 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 8, { 0, 0, 0 }, \
  1.2047 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2048  
  1.2049  #define SH_DECL_MANUALHOOK8(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
  1.2050  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2051  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8, rettype> FD; \
  1.2052 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8), (p1, p2, p3, p4, p5, p6, p7, p8)); \
  1.2053  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
  1.2054  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
  1.2055  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8); \
  1.2056  		typedef rettype RetType; \
  1.2057  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2058  	\
  1.2059 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
  1.2060 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2061 -		8, __SourceHook_ParamSizesM_##hookname); \
  1.2062 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0} }; \
  1.2063 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 8, { sizeof(rettype), 0, 0 }, \
  1.2064 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2065  
  1.2066  #define SH_DECL_MANUALHOOK8_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8) \
  1.2067  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2068  		typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8> FD; \
  1.2069 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8), (p1, p2, p3, p4, p5, p6, p7, p8)); \
  1.2070  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
  1.2071  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8)); } \
  1.2072  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8); \
  1.2073  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2074  	\
  1.2075 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
  1.2076 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2077 -		8, __SourceHook_ParamSizesM_##hookname); \
  1.2078 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0} }; \
  1.2079 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 8, { 0, 0, 0 }, \
  1.2080 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2081  
  1.2082  
  1.2083  // ********* Support for 9 arguments *********
  1.2084 @@ -2028,34 +1848,37 @@
  1.2085  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr> \
  1.2086  		(&ifacetype::ifacefunc))) \
  1.2087  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9, rettype> FD; \
  1.2088 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); \
  1.2089  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
  1.2090  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
  1.2091  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2092  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr>(&ifacetype::ifacefunc))) \
  1.2093  	\
  1.2094 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
  1.2095 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2096 -		9, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2097 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0} }; \
  1.2098 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 9, { sizeof(rettype), 0, 0 }, \
  1.2099 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2100 +
  1.2101  
  1.2102  #define SH_DECL_HOOK9_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
  1.2103  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr> \
  1.2104  		(&ifacetype::ifacefunc))) \
  1.2105  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9> FD; \
  1.2106 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); \
  1.2107  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
  1.2108  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
  1.2109  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2110  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr>(&ifacetype::ifacefunc))) \
  1.2111  	\
  1.2112 -	\
  1.2113 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
  1.2114 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2115 -		9, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2116 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0} }; \
  1.2117 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 9, { 0, 0, 0 }, \
  1.2118 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2119  
  1.2120  #define SH_DECL_HOOK9_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
  1.2121  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr> \
  1.2122  		(&ifacetype::ifacefunc))) \
  1.2123  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, rettype> FD; \
  1.2124 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *fmt, ...) \
  1.2125 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, px)); \
  1.2126 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9 , const char *fmt, ...) \
  1.2127  		{ \
  1.2128  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2129  			va_list ap; \
  1.2130 @@ -2067,14 +1890,15 @@
  1.2131  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2132  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2133  	\
  1.2134 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
  1.2135 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2136 -		9, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2137 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0} }; \
  1.2138 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 9, { sizeof(rettype), 0, 0 }, \
  1.2139 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2140  
  1.2141  #define SH_DECL_HOOK9_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
  1.2142  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr> \
  1.2143  		(&ifacetype::ifacefunc))) \
  1.2144  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *> FD; \
  1.2145 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, px)); \
  1.2146  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *fmt, ...) \
  1.2147  		{ \
  1.2148  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2149 @@ -2087,34 +1911,36 @@
  1.2150  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2151  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2152  	\
  1.2153 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
  1.2154 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2155 -		9, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2156 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0} }; \
  1.2157 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 9, { 0, 0, 0 }, \
  1.2158 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2159  
  1.2160  #define SH_DECL_MANUALHOOK9(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
  1.2161  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2162  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9, rettype> FD; \
  1.2163 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); \
  1.2164  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
  1.2165  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
  1.2166  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9); \
  1.2167  		typedef rettype RetType; \
  1.2168  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2169  	\
  1.2170 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
  1.2171 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2172 -		9, __SourceHook_ParamSizesM_##hookname); \
  1.2173 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0} }; \
  1.2174 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 9, { sizeof(rettype), 0, 0 }, \
  1.2175 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2176  
  1.2177  #define SH_DECL_MANUALHOOK9_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
  1.2178  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2179  		typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9> FD; \
  1.2180 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); \
  1.2181  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
  1.2182  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
  1.2183  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9); \
  1.2184  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2185  	\
  1.2186 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
  1.2187 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2188 -		9, __SourceHook_ParamSizesM_##hookname); \
  1.2189 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0} }; \
  1.2190 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 9, { 0, 0, 0 }, \
  1.2191 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2192  
  1.2193  
  1.2194  // ********* Support for 10 arguments *********
  1.2195 @@ -2122,34 +1948,37 @@
  1.2196  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr> \
  1.2197  		(&ifacetype::ifacefunc))) \
  1.2198  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, rettype> FD; \
  1.2199 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); \
  1.2200  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
  1.2201  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
  1.2202  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2203  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr>(&ifacetype::ifacefunc))) \
  1.2204  	\
  1.2205 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
  1.2206 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2207 -		10, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2208 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0} }; \
  1.2209 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 10, { sizeof(rettype), 0, 0 }, \
  1.2210 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2211 +
  1.2212  
  1.2213  #define SH_DECL_HOOK10_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.2214  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr> \
  1.2215  		(&ifacetype::ifacefunc))) \
  1.2216  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> FD; \
  1.2217 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); \
  1.2218  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
  1.2219  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); } \
  1.2220  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2221  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr>(&ifacetype::ifacefunc))) \
  1.2222  	\
  1.2223 -	\
  1.2224 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
  1.2225 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2226 -		10, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2227 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0} }; \
  1.2228 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 10, { 0, 0, 0 }, \
  1.2229 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2230  
  1.2231  #define SH_DECL_HOOK10_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.2232  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr> \
  1.2233  		(&ifacetype::ifacefunc))) \
  1.2234  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, rettype> FD; \
  1.2235 -		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *fmt, ...) \
  1.2236 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, px)); \
  1.2237 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10 , const char *fmt, ...) \
  1.2238  		{ \
  1.2239  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2240  			va_list ap; \
  1.2241 @@ -2161,14 +1990,15 @@
  1.2242  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2243  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2244  	\
  1.2245 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
  1.2246 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2247 -		10, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2248 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0} }; \
  1.2249 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 10, { sizeof(rettype), 0, 0 }, \
  1.2250 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2251  
  1.2252  #define SH_DECL_HOOK10_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.2253  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr> \
  1.2254  		(&ifacetype::ifacefunc))) \
  1.2255  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *> FD; \
  1.2256 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, px)); \
  1.2257  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *fmt, ...) \
  1.2258  		{ \
  1.2259  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2260 @@ -2181,34 +2011,36 @@
  1.2261  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2262  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2263  	\
  1.2264 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
  1.2265 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2266 -		10, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2267 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0} }; \
  1.2268 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 10, { 0, 0, 0 }, \
  1.2269 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2270  
  1.2271  #define SH_DECL_MANUALHOOK10(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.2272  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2273  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, rettype> FD; \
  1.2274 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); \
  1.2275  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
  1.2276  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
  1.2277  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); \
  1.2278  		typedef rettype RetType; \
  1.2279  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2280  	\
  1.2281 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
  1.2282 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2283 -		10, __SourceHook_ParamSizesM_##hookname); \
  1.2284 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0} }; \
  1.2285 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 10, { sizeof(rettype), 0, 0 }, \
  1.2286 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2287  
  1.2288  #define SH_DECL_MANUALHOOK10_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
  1.2289  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2290  		typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> FD; \
  1.2291 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); \
  1.2292  		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
  1.2293  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); } \
  1.2294  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); \
  1.2295  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2296  	\
  1.2297 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
  1.2298 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2299 -		10, __SourceHook_ParamSizesM_##hookname); \
  1.2300 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0} }; \
  1.2301 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 10, { 0, 0, 0 }, \
  1.2302 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2303  
  1.2304  
  1.2305  // ********* Support for 11 arguments *********
  1.2306 @@ -2216,34 +2048,37 @@
  1.2307  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr> \
  1.2308  		(&ifacetype::ifacefunc))) \
  1.2309  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, rettype> FD; \
  1.2310 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); \
  1.2311  		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) \
  1.2312  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
  1.2313  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2314  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr>(&ifacetype::ifacefunc))) \
  1.2315  	\
  1.2316 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
  1.2317 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2318 -		11, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2319 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0} }; \
  1.2320 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 11, { sizeof(rettype), 0, 0 }, \
  1.2321 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2322 +
  1.2323  
  1.2324  #define SH_DECL_HOOK11_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.2325  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr> \
  1.2326  		(&ifacetype::ifacefunc))) \
  1.2327  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> FD; \
  1.2328 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); \
  1.2329  		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) \
  1.2330  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); } \
  1.2331  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2332  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr>(&ifacetype::ifacefunc))) \
  1.2333  	\
  1.2334 -	\
  1.2335 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
  1.2336 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2337 -		11, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2338 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0} }; \
  1.2339 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 11, { 0, 0, 0 }, \
  1.2340 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2341  
  1.2342  #define SH_DECL_HOOK11_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.2343  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr> \
  1.2344  		(&ifacetype::ifacefunc))) \
  1.2345  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, rettype> FD; \
  1.2346 -		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, const char *fmt, ...) \
  1.2347 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, px)); \
  1.2348 +		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 , const char *fmt, ...) \
  1.2349  		{ \
  1.2350  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2351  			va_list ap; \
  1.2352 @@ -2255,14 +2090,15 @@
  1.2353  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2354  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2355  	\
  1.2356 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
  1.2357 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2358 -		11, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2359 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0} }; \
  1.2360 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 11, { sizeof(rettype), 0, 0 }, \
  1.2361 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2362  
  1.2363  #define SH_DECL_HOOK11_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.2364  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr> \
  1.2365  		(&ifacetype::ifacefunc))) \
  1.2366  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *> FD; \
  1.2367 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, px)); \
  1.2368  		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, const char *fmt, ...) \
  1.2369  		{ \
  1.2370  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2371 @@ -2275,34 +2111,36 @@
  1.2372  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2373  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2374  	\
  1.2375 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
  1.2376 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2377 -		11, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2378 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0} }; \
  1.2379 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 11, { 0, 0, 0 }, \
  1.2380 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2381  
  1.2382  #define SH_DECL_MANUALHOOK11(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.2383  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2384  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, rettype> FD; \
  1.2385 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); \
  1.2386  		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) \
  1.2387  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
  1.2388  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11); \
  1.2389  		typedef rettype RetType; \
  1.2390  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2391  	\
  1.2392 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
  1.2393 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2394 -		11, __SourceHook_ParamSizesM_##hookname); \
  1.2395 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0} }; \
  1.2396 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 11, { sizeof(rettype), 0, 0 }, \
  1.2397 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2398  
  1.2399  #define SH_DECL_MANUALHOOK11_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
  1.2400  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2401  		typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> FD; \
  1.2402 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); \
  1.2403  		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) \
  1.2404  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); } \
  1.2405  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11); \
  1.2406  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2407  	\
  1.2408 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
  1.2409 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2410 -		11, __SourceHook_ParamSizesM_##hookname); \
  1.2411 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0} }; \
  1.2412 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 11, { 0, 0, 0 }, \
  1.2413 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2414  
  1.2415  
  1.2416  // ********* Support for 12 arguments *********
  1.2417 @@ -2310,34 +2148,37 @@
  1.2418  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr> \
  1.2419  		(&ifacetype::ifacefunc))) \
  1.2420  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, rettype> FD; \
  1.2421 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); \
  1.2422  		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) \
  1.2423  		{ SH_HANDLEFUNC((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.2424  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2425  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr>(&ifacetype::ifacefunc))) \
  1.2426  	\
  1.2427 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
  1.2428 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2429 -		12, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2430 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0} }; \
  1.2431 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 12, { sizeof(rettype), 0, 0 }, \
  1.2432 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2433 +
  1.2434  
  1.2435  #define SH_DECL_HOOK12_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.2436  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr> \
  1.2437  		(&ifacetype::ifacefunc))) \
  1.2438  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> FD; \
  1.2439 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); \
  1.2440  		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) \
  1.2441  		{ SH_HANDLEFUNC_void((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.2442  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2443  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr>(&ifacetype::ifacefunc))) \
  1.2444  	\
  1.2445 -	\
  1.2446 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
  1.2447 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2448 -		12, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2449 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0} }; \
  1.2450 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 12, { 0, 0, 0 }, \
  1.2451 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2452  
  1.2453  #define SH_DECL_HOOK12_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.2454  	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 *, ...) attr> \
  1.2455  		(&ifacetype::ifacefunc))) \
  1.2456  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, rettype> FD; \
  1.2457 -		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, const char *fmt, ...) \
  1.2458 +		MAKE_DELEG(rettype, (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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, px)); \
  1.2459 +		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 , const char *fmt, ...) \
  1.2460  		{ \
  1.2461  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2462  			va_list ap; \
  1.2463 @@ -2349,14 +2190,15 @@
  1.2464  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2465  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2466  	\
  1.2467 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
  1.2468 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2469 -		12, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2470 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0} }; \
  1.2471 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 12, { sizeof(rettype), 0, 0 }, \
  1.2472 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2473  
  1.2474  #define SH_DECL_HOOK12_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.2475  	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 *, ...) attr> \
  1.2476  		(&ifacetype::ifacefunc))) \
  1.2477  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *> FD; \
  1.2478 +		MAKE_DELEG_void((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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, px)); \
  1.2479  		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, const char *fmt, ...) \
  1.2480  		{ \
  1.2481  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2482 @@ -2369,34 +2211,36 @@
  1.2483  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2484  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2485  	\
  1.2486 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
  1.2487 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2488 -		12, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2489 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0} }; \
  1.2490 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 12, { 0, 0, 0 }, \
  1.2491 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2492  
  1.2493  #define SH_DECL_MANUALHOOK12(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.2494  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2495  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, rettype> FD; \
  1.2496 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); \
  1.2497  		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) \
  1.2498  		{ SH_HANDLEFUNC((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.2499  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12); \
  1.2500  		typedef rettype RetType; \
  1.2501  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2502  	\
  1.2503 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
  1.2504 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2505 -		12, __SourceHook_ParamSizesM_##hookname); \
  1.2506 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0} }; \
  1.2507 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 12, { sizeof(rettype), 0, 0 }, \
  1.2508 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2509  
  1.2510  #define SH_DECL_MANUALHOOK12_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
  1.2511  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2512  		typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> FD; \
  1.2513 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); \
  1.2514  		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) \
  1.2515  		{ SH_HANDLEFUNC_void((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.2516  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12); \
  1.2517  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2518  	\
  1.2519 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
  1.2520 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2521 -		12, __SourceHook_ParamSizesM_##hookname); \
  1.2522 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0} }; \
  1.2523 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 12, { 0, 0, 0 }, \
  1.2524 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2525  
  1.2526  
  1.2527  // ********* Support for 13 arguments *********
  1.2528 @@ -2404,34 +2248,37 @@
  1.2529  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr> \
  1.2530  		(&ifacetype::ifacefunc))) \
  1.2531  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, rettype> FD; \
  1.2532 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); \
  1.2533  		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) \
  1.2534  		{ SH_HANDLEFUNC((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.2535  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2536  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr>(&ifacetype::ifacefunc))) \
  1.2537  	\
  1.2538 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
  1.2539 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2540 -		13, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2541 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0} }; \
  1.2542 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 13, { sizeof(rettype), 0, 0 }, \
  1.2543 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2544 +
  1.2545  
  1.2546  #define SH_DECL_HOOK13_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.2547  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr> \
  1.2548  		(&ifacetype::ifacefunc))) \
  1.2549  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> FD; \
  1.2550 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); \
  1.2551  		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) \
  1.2552  		{ SH_HANDLEFUNC_void((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.2553  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2554  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr>(&ifacetype::ifacefunc))) \
  1.2555  	\
  1.2556 -	\
  1.2557 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
  1.2558 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2559 -		13, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2560 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0} }; \
  1.2561 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 13, { 0, 0, 0 }, \
  1.2562 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2563  
  1.2564  #define SH_DECL_HOOK13_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.2565  	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 *, ...) attr> \
  1.2566  		(&ifacetype::ifacefunc))) \
  1.2567  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, rettype> FD; \
  1.2568 -		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, const char *fmt, ...) \
  1.2569 +		MAKE_DELEG(rettype, (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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, px)); \
  1.2570 +		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 , const char *fmt, ...) \
  1.2571  		{ \
  1.2572  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2573  			va_list ap; \
  1.2574 @@ -2443,14 +2290,15 @@
  1.2575  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2576  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2577  	\
  1.2578 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
  1.2579 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2580 -		13, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2581 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0} }; \
  1.2582 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 13, { sizeof(rettype), 0, 0 }, \
  1.2583 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2584  
  1.2585  #define SH_DECL_HOOK13_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.2586  	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 *, ...) attr> \
  1.2587  		(&ifacetype::ifacefunc))) \
  1.2588  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *> FD; \
  1.2589 +		MAKE_DELEG_void((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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, px)); \
  1.2590  		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, const char *fmt, ...) \
  1.2591  		{ \
  1.2592  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2593 @@ -2463,34 +2311,36 @@
  1.2594  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2595  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2596  	\
  1.2597 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
  1.2598 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2599 -		13, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2600 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0} }; \
  1.2601 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 13, { 0, 0, 0 }, \
  1.2602 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2603  
  1.2604  #define SH_DECL_MANUALHOOK13(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.2605  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2606  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, rettype> FD; \
  1.2607 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); \
  1.2608  		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) \
  1.2609  		{ SH_HANDLEFUNC((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.2610  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13); \
  1.2611  		typedef rettype RetType; \
  1.2612  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2613  	\
  1.2614 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
  1.2615 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2616 -		13, __SourceHook_ParamSizesM_##hookname); \
  1.2617 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0} }; \
  1.2618 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 13, { sizeof(rettype), 0, 0 }, \
  1.2619 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2620  
  1.2621  #define SH_DECL_MANUALHOOK13_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
  1.2622  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2623  		typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> FD; \
  1.2624 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); \
  1.2625  		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) \
  1.2626  		{ SH_HANDLEFUNC_void((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.2627  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13); \
  1.2628  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2629  	\
  1.2630 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
  1.2631 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2632 -		13, __SourceHook_ParamSizesM_##hookname); \
  1.2633 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0} }; \
  1.2634 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 13, { 0, 0, 0 }, \
  1.2635 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2636  
  1.2637  
  1.2638  // ********* Support for 14 arguments *********
  1.2639 @@ -2498,34 +2348,37 @@
  1.2640  	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) attr> \
  1.2641  		(&ifacetype::ifacefunc))) \
  1.2642  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, rettype> FD; \
  1.2643 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); \
  1.2644  		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) \
  1.2645  		{ SH_HANDLEFUNC((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.2646  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2647  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) attr>(&ifacetype::ifacefunc))) \
  1.2648  	\
  1.2649 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
  1.2650 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2651 -		14, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2652 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0} }; \
  1.2653 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 14, { sizeof(rettype), 0, 0 }, \
  1.2654 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2655 +
  1.2656  
  1.2657  #define SH_DECL_HOOK14_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  1.2658  	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) attr> \
  1.2659  		(&ifacetype::ifacefunc))) \
  1.2660  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> FD; \
  1.2661 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); \
  1.2662  		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) \
  1.2663  		{ SH_HANDLEFUNC_void((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.2664  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2665  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) attr>(&ifacetype::ifacefunc))) \
  1.2666  	\
  1.2667 -	\
  1.2668 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
  1.2669 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2670 -		14, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2671 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0} }; \
  1.2672 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 14, { 0, 0, 0 }, \
  1.2673 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2674  
  1.2675  #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.2676  	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 *, ...) attr> \
  1.2677  		(&ifacetype::ifacefunc))) \
  1.2678  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, rettype> FD; \
  1.2679 -		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, const char *fmt, ...) \
  1.2680 +		MAKE_DELEG(rettype, (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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, px)); \
  1.2681 +		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 , const char *fmt, ...) \
  1.2682  		{ \
  1.2683  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2684  			va_list ap; \
  1.2685 @@ -2537,14 +2390,15 @@
  1.2686  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2687  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2688  	\
  1.2689 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
  1.2690 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2691 -		14, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2692 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0} }; \
  1.2693 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 14, { sizeof(rettype), 0, 0 }, \
  1.2694 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2695  
  1.2696  #define SH_DECL_HOOK14_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  1.2697  	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 *, ...) attr> \
  1.2698  		(&ifacetype::ifacefunc))) \
  1.2699  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *> FD; \
  1.2700 +		MAKE_DELEG_void((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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, px)); \
  1.2701  		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, const char *fmt, ...) \
  1.2702  		{ \
  1.2703  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2704 @@ -2557,34 +2411,36 @@
  1.2705  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2706  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2707  	\
  1.2708 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
  1.2709 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2710 -		14, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2711 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0} }; \
  1.2712 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 14, { 0, 0, 0 }, \
  1.2713 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2714  
  1.2715  #define SH_DECL_MANUALHOOK14(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  1.2716  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2717  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, rettype> FD; \
  1.2718 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); \
  1.2719  		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) \
  1.2720  		{ SH_HANDLEFUNC((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.2721  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14); \
  1.2722  		typedef rettype RetType; \
  1.2723  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2724  	\
  1.2725 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
  1.2726 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2727 -		14, __SourceHook_ParamSizesM_##hookname); \
  1.2728 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0} }; \
  1.2729 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 14, { sizeof(rettype), 0, 0 }, \
  1.2730 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2731  
  1.2732  #define SH_DECL_MANUALHOOK14_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
  1.2733  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2734  		typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> FD; \
  1.2735 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); \
  1.2736  		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) \
  1.2737  		{ SH_HANDLEFUNC_void((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.2738  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14); \
  1.2739  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2740  	\
  1.2741 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
  1.2742 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2743 -		14, __SourceHook_ParamSizesM_##hookname); \
  1.2744 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0} }; \
  1.2745 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 14, { 0, 0, 0 }, \
  1.2746 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2747  
  1.2748  
  1.2749  // ********* Support for 15 arguments *********
  1.2750 @@ -2592,34 +2448,37 @@
  1.2751  	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) attr> \
  1.2752  		(&ifacetype::ifacefunc))) \
  1.2753  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, rettype> FD; \
  1.2754 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); \
  1.2755  		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) \
  1.2756  		{ SH_HANDLEFUNC((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.2757  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2758  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) attr>(&ifacetype::ifacefunc))) \
  1.2759  	\
  1.2760 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
  1.2761 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2762 -		15, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2763 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0} }; \
  1.2764 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 15, { sizeof(rettype), 0, 0 }, \
  1.2765 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2766 +
  1.2767  
  1.2768  #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.2769  	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) attr> \
  1.2770  		(&ifacetype::ifacefunc))) \
  1.2771  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> FD; \
  1.2772 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); \
  1.2773  		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) \
  1.2774  		{ SH_HANDLEFUNC_void((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.2775  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2776  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) attr>(&ifacetype::ifacefunc))) \
  1.2777  	\
  1.2778 -	\
  1.2779 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
  1.2780 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2781 -		15, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2782 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0} }; \
  1.2783 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 15, { 0, 0, 0 }, \
  1.2784 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2785  
  1.2786  #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.2787  	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 *, ...) attr> \
  1.2788  		(&ifacetype::ifacefunc))) \
  1.2789  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, rettype> FD; \
  1.2790 -		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, const char *fmt, ...) \
  1.2791 +		MAKE_DELEG(rettype, (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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, px)); \
  1.2792 +		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 , const char *fmt, ...) \
  1.2793  		{ \
  1.2794  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2795  			va_list ap; \
  1.2796 @@ -2631,14 +2490,15 @@
  1.2797  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2798  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2799  	\
  1.2800 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
  1.2801 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2802 -		15, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2803 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0} }; \
  1.2804 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 15, { sizeof(rettype), 0, 0 }, \
  1.2805 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2806  
  1.2807  #define SH_DECL_HOOK15_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  1.2808  	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 *, ...) attr> \
  1.2809  		(&ifacetype::ifacefunc))) \
  1.2810  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *> FD; \
  1.2811 +		MAKE_DELEG_void((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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, px)); \
  1.2812  		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, const char *fmt, ...) \
  1.2813  		{ \
  1.2814  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2815 @@ -2651,34 +2511,36 @@
  1.2816  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2817  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2818  	\
  1.2819 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
  1.2820 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2821 -		15, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2822 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0} }; \
  1.2823 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 15, { 0, 0, 0 }, \
  1.2824 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2825  
  1.2826  #define SH_DECL_MANUALHOOK15(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  1.2827  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2828  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, rettype> FD; \
  1.2829 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); \
  1.2830  		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) \
  1.2831  		{ SH_HANDLEFUNC((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.2832  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15); \
  1.2833  		typedef rettype RetType; \
  1.2834  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2835  	\
  1.2836 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
  1.2837 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2838 -		15, __SourceHook_ParamSizesM_##hookname); \
  1.2839 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0} }; \
  1.2840 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 15, { sizeof(rettype), 0, 0 }, \
  1.2841 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2842  
  1.2843  #define SH_DECL_MANUALHOOK15_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
  1.2844  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2845  		typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> FD; \
  1.2846 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); \
  1.2847  		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) \
  1.2848  		{ SH_HANDLEFUNC_void((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.2849  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15); \
  1.2850  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2851  	\
  1.2852 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
  1.2853 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2854 -		15, __SourceHook_ParamSizesM_##hookname); \
  1.2855 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0} }; \
  1.2856 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 15, { 0, 0, 0 }, \
  1.2857 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2858  
  1.2859  
  1.2860  // ********* Support for 16 arguments *********
  1.2861 @@ -2686,34 +2548,37 @@
  1.2862  	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) attr> \
  1.2863  		(&ifacetype::ifacefunc))) \
  1.2864  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, rettype> FD; \
  1.2865 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); \
  1.2866  		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) \
  1.2867  		{ SH_HANDLEFUNC((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.2868  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2869  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) attr>(&ifacetype::ifacefunc))) \
  1.2870  	\
  1.2871 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
  1.2872 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2873 -		16, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2874 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0} }; \
  1.2875 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 16, { sizeof(rettype), 0, 0 }, \
  1.2876 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2877 +
  1.2878  
  1.2879  #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.2880  	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) attr> \
  1.2881  		(&ifacetype::ifacefunc))) \
  1.2882  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> FD; \
  1.2883 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); \
  1.2884  		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) \
  1.2885  		{ SH_HANDLEFUNC_void((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.2886  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2887  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) attr>(&ifacetype::ifacefunc))) \
  1.2888  	\
  1.2889 -	\
  1.2890 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
  1.2891 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2892 -		16, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2893 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0} }; \
  1.2894 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 16, { 0, 0, 0 }, \
  1.2895 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2896  
  1.2897  #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.2898  	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 *, ...) attr> \
  1.2899  		(&ifacetype::ifacefunc))) \
  1.2900  		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, rettype> FD; \
  1.2901 -		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, const char *fmt, ...) \
  1.2902 +		MAKE_DELEG(rettype, (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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, px)); \
  1.2903 +		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 , const char *fmt, ...) \
  1.2904  		{ \
  1.2905  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2906  			va_list ap; \
  1.2907 @@ -2725,14 +2590,15 @@
  1.2908  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2909  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2910  	\
  1.2911 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
  1.2912 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2913 -		16, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2914 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0} }; \
  1.2915 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 16, { sizeof(rettype), 0, 0 }, \
  1.2916 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2917  
  1.2918  #define SH_DECL_HOOK16_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  1.2919  	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 *, ...) attr> \
  1.2920  		(&ifacetype::ifacefunc))) \
  1.2921  		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *> FD; \
  1.2922 +		MAKE_DELEG_void((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 char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, px)); \
  1.2923  		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, const char *fmt, ...) \
  1.2924  		{ \
  1.2925  			char buf[::SourceHook::STRBUF_LEN]; \
  1.2926 @@ -2745,34 +2611,36 @@
  1.2927  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2928  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.2929  	\
  1.2930 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
  1.2931 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.2932 -		16, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2933 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0} }; \
  1.2934 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 16, { 0, 0, 0 }, \
  1.2935 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2936  
  1.2937  #define SH_DECL_MANUALHOOK16(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  1.2938  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2939  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, rettype> FD; \
  1.2940 +		MAKE_DELEG(rettype, (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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); \
  1.2941  		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) \
  1.2942  		{ SH_HANDLEFUNC((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.2943  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16); \
  1.2944  		typedef rettype RetType; \
  1.2945  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2946  	\
  1.2947 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
  1.2948 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.2949 -		16, __SourceHook_ParamSizesM_##hookname); \
  1.2950 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0} }; \
  1.2951 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 16, { sizeof(rettype), 0, 0 }, \
  1.2952 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.2953  
  1.2954  #define SH_DECL_MANUALHOOK16_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
  1.2955  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2956  		typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> FD; \
  1.2957 +		MAKE_DELEG_void((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), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); \
  1.2958  		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) \
  1.2959  		{ SH_HANDLEFUNC_void((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.2960  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16); \
  1.2961  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.2962  	\
  1.2963 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
  1.2964 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.2965 -		16, __SourceHook_ParamSizesM_##hookname); \
  1.2966 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0} }; \
  1.2967 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 16, { 0, 0, 0 }, \
  1.2968 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.2969  
  1.2970  
  1.2971  // ********* Support for 17 arguments *********
  1.2972 @@ -2780,34 +2648,37 @@
  1.2973  	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, param17) attr> \
  1.2974  		(&ifacetype::ifacefunc))) \
  1.2975  		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> FD; \
  1.2976 +		MAKE_DELEG(rettype, (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, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
  1.2977  		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, param17 p17) \
  1.2978  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), rettype); } \
  1.2979  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2980  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) attr>(&ifacetype::ifacefunc))) \
  1.2981  	\
  1.2982 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
  1.2983 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.2984 -		17, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.2985 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0} }; \
  1.2986 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 17, { sizeof(rettype), 0, 0 }, \
  1.2987 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.2988 +
  1.2989  
  1.2990  #define SH_DECL_HOOK17_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
  1.2991  	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, param17) attr> \
  1.2992  		(&ifacetype::ifacefunc))) \
  1.2993  		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> FD; \
  1.2994 +		MAKE_DELEG_void((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, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
  1.2995  		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, param17 p17) \
  1.2996  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); } \
  1.2997  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.2998  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) attr>(&ifacetype::ifacefunc))) \
  1.2999  	\
  1.3000 -	\
  1.3001 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
  1.3002 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3003 -		17, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3004 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0} }; \
  1.3005 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 17, { 0, 0, 0 }, \
  1.3006 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3007  
  1.3008  #define SH_DECL_HOOK17_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
  1.3009  	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, param17, const char *, ...) attr> \
  1.3010  		(&ifacetype::ifacefunc))) \
  1.3011  		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, const char *, rettype> FD; \
  1.3012 -		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, param17 p17, const char *fmt, ...) \
  1.3013 +		MAKE_DELEG(rettype, (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, param17 p17, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, px)); \
  1.3014 +		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, param17 p17 , const char *fmt, ...) \
  1.3015  		{ \
  1.3016  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3017  			va_list ap; \
  1.3018 @@ -2819,14 +2690,15 @@
  1.3019  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3020  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3021  	\
  1.3022 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
  1.3023 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3024 -		17, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3025 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0} }; \
  1.3026 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 17, { sizeof(rettype), 0, 0 }, \
  1.3027 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3028  
  1.3029  #define SH_DECL_HOOK17_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
  1.3030  	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, param17, const char *, ...) attr> \
  1.3031  		(&ifacetype::ifacefunc))) \
  1.3032  		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, const char *> FD; \
  1.3033 +		MAKE_DELEG_void((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, param17 p17, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, px)); \
  1.3034  		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, param17 p17, const char *fmt, ...) \
  1.3035  		{ \
  1.3036  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3037 @@ -2839,34 +2711,36 @@
  1.3038  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3039  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3040  	\
  1.3041 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
  1.3042 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3043 -		17, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3044 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0} }; \
  1.3045 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 17, { 0, 0, 0 }, \
  1.3046 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3047  
  1.3048  #define SH_DECL_MANUALHOOK17(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
  1.3049  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3050  		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> FD; \
  1.3051 +		MAKE_DELEG(rettype, (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, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
  1.3052  		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, param17 p17) \
  1.3053  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), rettype); } \
  1.3054  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
  1.3055  		typedef rettype RetType; \
  1.3056  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3057  	\
  1.3058 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
  1.3059 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.3060 -		17, __SourceHook_ParamSizesM_##hookname); \
  1.3061 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0} }; \
  1.3062 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 17, { sizeof(rettype), 0, 0 }, \
  1.3063 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.3064  
  1.3065  #define SH_DECL_MANUALHOOK17_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
  1.3066  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3067  		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> FD; \
  1.3068 +		MAKE_DELEG_void((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, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
  1.3069  		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, param17 p17) \
  1.3070  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); } \
  1.3071  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
  1.3072  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3073  	\
  1.3074 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
  1.3075 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.3076 -		17, __SourceHook_ParamSizesM_##hookname); \
  1.3077 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0} }; \
  1.3078 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 17, { 0, 0, 0 }, \
  1.3079 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.3080  
  1.3081  
  1.3082  // ********* Support for 18 arguments *********
  1.3083 @@ -2874,34 +2748,37 @@
  1.3084  	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, param17, param18) attr> \
  1.3085  		(&ifacetype::ifacefunc))) \
  1.3086  		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, rettype> FD; \
  1.3087 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18)); \
  1.3088  		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, param17 p17, param18 p18) \
  1.3089  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18), rettype); } \
  1.3090  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3091  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) attr>(&ifacetype::ifacefunc))) \
  1.3092  	\
  1.3093 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
  1.3094 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3095 -		18, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3096 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0} }; \
  1.3097 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 18, { sizeof(rettype), 0, 0 }, \
  1.3098 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3099 +
  1.3100  
  1.3101  #define SH_DECL_HOOK18_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) \
  1.3102  	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, param17, param18) attr> \
  1.3103  		(&ifacetype::ifacefunc))) \
  1.3104  		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18> FD; \
  1.3105 +		MAKE_DELEG_void((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, param17 p17, param18 p18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18)); \
  1.3106  		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, param17 p17, param18 p18) \
  1.3107  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18)); } \
  1.3108  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3109  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) attr>(&ifacetype::ifacefunc))) \
  1.3110  	\
  1.3111 -	\
  1.3112 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
  1.3113 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3114 -		18, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3115 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0} }; \
  1.3116 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 18, { 0, 0, 0 }, \
  1.3117 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3118  
  1.3119  #define SH_DECL_HOOK18_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) \
  1.3120  	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, param17, param18, const char *, ...) attr> \
  1.3121  		(&ifacetype::ifacefunc))) \
  1.3122  		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, const char *, rettype> FD; \
  1.3123 -		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, param17 p17, param18 p18, const char *fmt, ...) \
  1.3124 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, px)); \
  1.3125 +		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, param17 p17, param18 p18 , const char *fmt, ...) \
  1.3126  		{ \
  1.3127  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3128  			va_list ap; \
  1.3129 @@ -2913,14 +2790,15 @@
  1.3130  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3131  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3132  	\
  1.3133 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
  1.3134 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3135 -		18, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3136 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0} }; \
  1.3137 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 18, { sizeof(rettype), 0, 0 }, \
  1.3138 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3139  
  1.3140  #define SH_DECL_HOOK18_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) \
  1.3141  	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, param17, param18, const char *, ...) attr> \
  1.3142  		(&ifacetype::ifacefunc))) \
  1.3143  		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, const char *> FD; \
  1.3144 +		MAKE_DELEG_void((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, param17 p17, param18 p18, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, px)); \
  1.3145  		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, param17 p17, param18 p18, const char *fmt, ...) \
  1.3146  		{ \
  1.3147  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3148 @@ -2933,34 +2811,36 @@
  1.3149  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3150  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3151  	\
  1.3152 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
  1.3153 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3154 -		18, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3155 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0} }; \
  1.3156 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 18, { 0, 0, 0 }, \
  1.3157 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3158  
  1.3159  #define SH_DECL_MANUALHOOK18(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) \
  1.3160  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3161  		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, rettype> FD; \
  1.3162 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18)); \
  1.3163  		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, param17 p17, param18 p18) \
  1.3164  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18), rettype); } \
  1.3165  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18); \
  1.3166  		typedef rettype RetType; \
  1.3167  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3168  	\
  1.3169 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
  1.3170 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.3171 -		18, __SourceHook_ParamSizesM_##hookname); \
  1.3172 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0} }; \
  1.3173 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 18, { sizeof(rettype), 0, 0 }, \
  1.3174 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.3175  
  1.3176  #define SH_DECL_MANUALHOOK18_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) \
  1.3177  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3178  		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18> FD; \
  1.3179 +		MAKE_DELEG_void((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, param17 p17, param18 p18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18)); \
  1.3180  		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, param17 p17, param18 p18) \
  1.3181  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18)); } \
  1.3182  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18); \
  1.3183  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3184  	\
  1.3185 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
  1.3186 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.3187 -		18, __SourceHook_ParamSizesM_##hookname); \
  1.3188 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0} }; \
  1.3189 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 18, { 0, 0, 0 }, \
  1.3190 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.3191  
  1.3192  
  1.3193  // ********* Support for 19 arguments *********
  1.3194 @@ -2968,34 +2848,37 @@
  1.3195  	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, param17, param18, param19) attr> \
  1.3196  		(&ifacetype::ifacefunc))) \
  1.3197  		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, rettype> FD; \
  1.3198 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, param19 p19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19)); \
  1.3199  		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, param17 p17, param18 p18, param19 p19) \
  1.3200  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19), rettype); } \
  1.3201  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3202  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) attr>(&ifacetype::ifacefunc))) \
  1.3203  	\
  1.3204 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
  1.3205 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3206 -		19, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3207 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0} }; \
  1.3208 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 19, { sizeof(rettype), 0, 0 }, \
  1.3209 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3210 +
  1.3211  
  1.3212  #define SH_DECL_HOOK19_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) \
  1.3213  	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, param17, param18, param19) attr> \
  1.3214  		(&ifacetype::ifacefunc))) \
  1.3215  		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19> FD; \
  1.3216 +		MAKE_DELEG_void((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, param17 p17, param18 p18, param19 p19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19)); \
  1.3217  		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, param17 p17, param18 p18, param19 p19) \
  1.3218  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19)); } \
  1.3219  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3220  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) attr>(&ifacetype::ifacefunc))) \
  1.3221  	\
  1.3222 -	\
  1.3223 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
  1.3224 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3225 -		19, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3226 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0} }; \
  1.3227 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 19, { 0, 0, 0 }, \
  1.3228 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3229  
  1.3230  #define SH_DECL_HOOK19_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) \
  1.3231  	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, param17, param18, param19, const char *, ...) attr> \
  1.3232  		(&ifacetype::ifacefunc))) \
  1.3233  		typedef fastdelegate::FastDelegate20<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, const char *, rettype> FD; \
  1.3234 -		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, param17 p17, param18 p18, param19 p19, const char *fmt, ...) \
  1.3235 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, param19 p19, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, px)); \
  1.3236 +		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, param17 p17, param18 p18, param19 p19 , const char *fmt, ...) \
  1.3237  		{ \
  1.3238  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3239  			va_list ap; \
  1.3240 @@ -3007,14 +2890,15 @@
  1.3241  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3242  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3243  	\
  1.3244 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
  1.3245 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3246 -		19, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3247 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0} }; \
  1.3248 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 19, { sizeof(rettype), 0, 0 }, \
  1.3249 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3250  
  1.3251  #define SH_DECL_HOOK19_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) \
  1.3252  	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, param17, param18, param19, const char *, ...) attr> \
  1.3253  		(&ifacetype::ifacefunc))) \
  1.3254  		typedef fastdelegate::FastDelegate20<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, const char *> FD; \
  1.3255 +		MAKE_DELEG_void((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, param17 p17, param18 p18, param19 p19, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, px)); \
  1.3256  		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, param17 p17, param18 p18, param19 p19, const char *fmt, ...) \
  1.3257  		{ \
  1.3258  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3259 @@ -3027,34 +2911,36 @@
  1.3260  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3261  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3262  	\
  1.3263 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
  1.3264 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3265 -		19, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3266 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0} }; \
  1.3267 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 19, { 0, 0, 0 }, \
  1.3268 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3269  
  1.3270  #define SH_DECL_MANUALHOOK19(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) \
  1.3271  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3272  		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, rettype> FD; \
  1.3273 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, param19 p19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19)); \
  1.3274  		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, param17 p17, param18 p18, param19 p19) \
  1.3275  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19), rettype); } \
  1.3276  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19); \
  1.3277  		typedef rettype RetType; \
  1.3278  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3279  	\
  1.3280 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
  1.3281 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.3282 -		19, __SourceHook_ParamSizesM_##hookname); \
  1.3283 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0} }; \
  1.3284 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 19, { sizeof(rettype), 0, 0 }, \
  1.3285 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.3286  
  1.3287  #define SH_DECL_MANUALHOOK19_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19) \
  1.3288  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3289  		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19> FD; \
  1.3290 +		MAKE_DELEG_void((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, param17 p17, param18 p18, param19 p19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19)); \
  1.3291  		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, param17 p17, param18 p18, param19 p19) \
  1.3292  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19)); } \
  1.3293  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19); \
  1.3294  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3295  	\
  1.3296 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
  1.3297 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.3298 -		19, __SourceHook_ParamSizesM_##hookname); \
  1.3299 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0} }; \
  1.3300 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 19, { 0, 0, 0 }, \
  1.3301 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.3302  
  1.3303  
  1.3304  // ********* Support for 20 arguments *********
  1.3305 @@ -3062,34 +2948,37 @@
  1.3306  	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, param17, param18, param19, param20) attr> \
  1.3307  		(&ifacetype::ifacefunc))) \
  1.3308  		typedef fastdelegate::FastDelegate20<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20, rettype> FD; \
  1.3309 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, param19 p19, param20 p20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20)); \
  1.3310  		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, param17 p17, param18 p18, param19 p19, param20 p20) \
  1.3311  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20), rettype); } \
  1.3312  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3313  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) attr>(&ifacetype::ifacefunc))) \
  1.3314  	\
  1.3315 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
  1.3316 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3317 -		20, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3318 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0}, {sizeof(param20), 0, 0} }; \
  1.3319 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 20, { sizeof(rettype), 0, 0 }, \
  1.3320 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3321 +
  1.3322  
  1.3323  #define SH_DECL_HOOK20_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) \
  1.3324  	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, param17, param18, param19, param20) attr> \
  1.3325  		(&ifacetype::ifacefunc))) \
  1.3326  		typedef fastdelegate::FastDelegate20<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20> FD; \
  1.3327 +		MAKE_DELEG_void((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, param17 p17, param18 p18, param19 p19, param20 p20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20)); \
  1.3328  		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, param17 p17, param18 p18, param19 p19, param20 p20) \
  1.3329  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20)); } \
  1.3330  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3331  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) attr>(&ifacetype::ifacefunc))) \
  1.3332  	\
  1.3333 -	\
  1.3334 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
  1.3335 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3336 -		20, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3337 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0}, {sizeof(param20), 0, 0} }; \
  1.3338 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 20, { 0, 0, 0 }, \
  1.3339 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3340  
  1.3341  #define SH_DECL_HOOK20_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) \
  1.3342  	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, param17, param18, param19, param20, const char *, ...) attr> \
  1.3343  		(&ifacetype::ifacefunc))) \
  1.3344  		typedef fastdelegate::FastDelegate21<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20, const char *, rettype> FD; \
  1.3345 -		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, param17 p17, param18 p18, param19 p19, param20 p20, const char *fmt, ...) \
  1.3346 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, param19 p19, param20 p20, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, px)); \
  1.3347 +		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, param17 p17, param18 p18, param19 p19, param20 p20 , const char *fmt, ...) \
  1.3348  		{ \
  1.3349  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3350  			va_list ap; \
  1.3351 @@ -3101,14 +2990,15 @@
  1.3352  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3353  		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3354  	\
  1.3355 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
  1.3356 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(sizeof(rettype), \
  1.3357 -		20, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3358 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0}, {sizeof(param20), 0, 0} }; \
  1.3359 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 20, { sizeof(rettype), 0, 0 }, \
  1.3360 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3361  
  1.3362  #define SH_DECL_HOOK20_void_vafmt(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) \
  1.3363  	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, param17, param18, param19, param20, const char *, ...) attr> \
  1.3364  		(&ifacetype::ifacefunc))) \
  1.3365  		typedef fastdelegate::FastDelegate21<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20, const char *> FD; \
  1.3366 +		MAKE_DELEG_void((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, param17 p17, param18 p18, param19 p19, param20 p20, const char *px), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, px)); \
  1.3367  		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, param17 p17, param18 p18, param19 p19, param20 p20, const char *fmt, ...) \
  1.3368  		{ \
  1.3369  			char buf[::SourceHook::STRBUF_LEN]; \
  1.3370 @@ -3121,34 +3011,36 @@
  1.3371  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
  1.3372  		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20, const char *, ...) attr>(&ifacetype::ifacefunc))) \
  1.3373  	\
  1.3374 -	const int __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload[] = { -1, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
  1.3375 -	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto(0, \
  1.3376 -		20, __SourceHook_ParamSizes_##ifacetype##ifacefunc##overload);
  1.3377 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0}, {sizeof(param20), 0, 0} }; \
  1.3378 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 20, { 0, 0, 0 }, \
  1.3379 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
  1.3380  
  1.3381  #define SH_DECL_MANUALHOOK20(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) \
  1.3382  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3383  		typedef fastdelegate::FastDelegate20<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20, rettype> FD; \
  1.3384 +		MAKE_DELEG(rettype, (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, param17 p17, param18 p18, param19 p19, param20 p20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20)); \
  1.3385  		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, param17 p17, param18 p18, param19 p19, param20 p20) \
  1.3386  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20), rettype); } \
  1.3387  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20); \
  1.3388  		typedef rettype RetType; \
  1.3389  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3390  	\
  1.3391 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
  1.3392 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(sizeof(rettype), \
  1.3393 -		20, __SourceHook_ParamSizesM_##hookname); \
  1.3394 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0}, {sizeof(param20), 0, 0} }; \
  1.3395 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 20, { sizeof(rettype), 0, 0 }, \
  1.3396 +		__SourceHook_ParamInfosM_##hookname, 0 };
  1.3397  
  1.3398  #define SH_DECL_MANUALHOOK20_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) \
  1.3399  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3400  		typedef fastdelegate::FastDelegate20<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20> FD; \
  1.3401 +		MAKE_DELEG_void((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, param17 p17, param18 p18, param19 p19, param20 p20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20)); \
  1.3402  		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, param17 p17, param18 p18, param19 p19, param20 p20) \
  1.3403  		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20)); } \
  1.3404  		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20); \
  1.3405  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
  1.3406  	\
  1.3407 -	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
  1.3408 -	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto(0, \
  1.3409 -		20, __SourceHook_ParamSizesM_##hookname); \
  1.3410 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}, {sizeof(param1), 0, 0}, {sizeof(param2), 0, 0}, {sizeof(param3), 0, 0}, {sizeof(param4), 0, 0}, {sizeof(param5), 0, 0}, {sizeof(param6), 0, 0}, {sizeof(param7), 0, 0}, {sizeof(param8), 0, 0}, {sizeof(param9), 0, 0}, {sizeof(param10), 0, 0}, {sizeof(param11), 0, 0}, {sizeof(param12), 0, 0}, {sizeof(param13), 0, 0}, {sizeof(param14), 0, 0}, {sizeof(param15), 0, 0}, {sizeof(param16), 0, 0}, {sizeof(param17), 0, 0}, {sizeof(param18), 0, 0}, {sizeof(param19), 0, 0}, {sizeof(param20), 0, 0} }; \
  1.3411 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 20, { 0, 0, 0 }, \
  1.3412 +		__SourceHook_ParamInfosM_##hookname	, 0 };
  1.3413  
  1.3414  
  1.3415  
  1.3416 @@ -3160,9 +3052,9 @@
  1.3417  { \
  1.3418  	using namespace ::SourceHook; \
  1.3419  	\
  1.3420 -	m_pSH->SetIgnoreHooks(m_Plug, m_VfnPtr); \
  1.3421 +	m_pSH->SetIgnoreHooks(m_VfnPtr); \
  1.3422  	RetType tmpret = (m_ThisPtr->*m_MFP)call; \
  1.3423 -	m_pSH->ResetIgnoreHooks(m_Plug, m_VfnPtr); \
  1.3424 +	m_pSH->ResetIgnoreHooks(m_VfnPtr); \
  1.3425  	return tmpret; \
  1.3426  }
  1.3427  
  1.3428 @@ -3170,48 +3062,24 @@
  1.3429  { \
  1.3430  	using namespace ::SourceHook; \
  1.3431  	\
  1.3432 -	m_pSH->SetIgnoreHooks(m_Plug, m_VfnPtr); \
  1.3433 +	m_pSH->SetIgnoreHooks(m_VfnPtr); \
  1.3434  	(m_ThisPtr->*m_MFP)call; \
  1.3435 -	m_pSH->ResetIgnoreHooks(m_Plug, m_VfnPtr); \
  1.3436 +	m_pSH->ResetIgnoreHooks(m_VfnPtr); \
  1.3437  }
  1.3438  
  1.3439  namespace SourceHook
  1.3440  {
  1.3441 -	// Call Class Wrapper!
  1.3442 -	template <class T> struct CCW
  1.3443 -	{
  1.3444 -		typedef T type;
  1.3445 -
  1.3446 -		// Get Real Pointer!
  1.3447 -		static inline T *GRP(T *p)
  1.3448 -		{
  1.3449 -			return p;
  1.3450 -		}
  1.3451 -	};
  1.3452 -
  1.3453 -	template <class T> struct CCW< CallClass<T> >
  1.3454 -	{
  1.3455 -		typedef T type;
  1.3456 -
  1.3457 -		// Get Real Pointer!
  1.3458 -		static inline T *GRP(CallClass<T> *p)
  1.3459 -		{
  1.3460 -			return p->ptr;
  1.3461 -		}
  1.3462 -	};
  1.3463 -
  1.3464  
  1.3465  	// Support for 0 arguments
  1.3466 -	template<class ObjType, class MFP, class RetType> class ExecutableClass0
  1.3467 +	template<class ObjType, class MFPType, class RetType> class ExecutableClass0
  1.3468  	{
  1.3469  		ObjType *m_ThisPtr;
  1.3470  		void *m_VfnPtr;
  1.3471 -		MFP m_MFP;
  1.3472 +		MFPType m_MFP;
  1.3473  		ISourceHook *m_pSH;
  1.3474 -		Plugin m_Plug;
  1.3475  	public:
  1.3476 -		ExecutableClass0(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3477 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3478 +		ExecutableClass0(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3479 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3480  	
  1.3481  		RetType operator()() const
  1.3482  			SH_MAKE_EXECUTABLECLASS_OB((), ())
  1.3483 @@ -3279,16 +3147,15 @@
  1.3484  		
  1.3485  	};
  1.3486  
  1.3487 -	template<class ObjType, class MFP> class ExecutableClass0<ObjType, MFP, void>
  1.3488 +	template<class ObjType, class MFPType> class ExecutableClass0<ObjType, MFPType, void>
  1.3489  	{
  1.3490 -	   ObjType *m_ThisPtr;
  1.3491 -	   void *m_VfnPtr;
  1.3492 -	   MFP m_MFP;
  1.3493 -	   ISourceHook *m_pSH;
  1.3494 -	   Plugin m_Plug;
  1.3495 +		ObjType *m_ThisPtr;
  1.3496 +		void *m_VfnPtr;
  1.3497 +		MFPType m_MFP;
  1.3498 +		ISourceHook *m_pSH;
  1.3499  	public:
  1.3500 -	   ExecutableClass0(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3501 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3502 +		ExecutableClass0(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3503 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3504  	
  1.3505  	   void operator()() const
  1.3506  	      SH_MAKE_EXECUTABLECLASS_OB_void((), ())
  1.3507 @@ -3357,16 +3224,15 @@
  1.3508  	};
  1.3509  
  1.3510  	// Support for 1 arguments
  1.3511 -	template<class ObjType, class MFP, class RetType, class Param1> class ExecutableClass1
  1.3512 +	template<class ObjType, class MFPType, class RetType, class Param1> class ExecutableClass1
  1.3513  	{
  1.3514  		ObjType *m_ThisPtr;
  1.3515  		void *m_VfnPtr;
  1.3516 -		MFP m_MFP;
  1.3517 +		MFPType m_MFP;
  1.3518  		ISourceHook *m_pSH;
  1.3519 -		Plugin m_Plug;
  1.3520  	public:
  1.3521 -		ExecutableClass1(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3522 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3523 +		ExecutableClass1(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3524 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3525  	
  1.3526  		RetType operator()(Param1 p1) const
  1.3527  			SH_MAKE_EXECUTABLECLASS_OB((p1), (Param1))
  1.3528 @@ -3431,16 +3297,15 @@
  1.3529  		
  1.3530  	};
  1.3531  
  1.3532 -	template<class ObjType, class MFP, class Param1> class ExecutableClass1<ObjType, MFP, void, Param1>
  1.3533 +	template<class ObjType, class MFPType, class Param1> class ExecutableClass1<ObjType, MFPType, void, Param1>
  1.3534  	{
  1.3535 -	   ObjType *m_ThisPtr;
  1.3536 -	   void *m_VfnPtr;
  1.3537 -	   MFP m_MFP;
  1.3538 -	   ISourceHook *m_pSH;
  1.3539 -	   Plugin m_Plug;
  1.3540 +		ObjType *m_ThisPtr;
  1.3541 +		void *m_VfnPtr;
  1.3542 +		MFPType m_MFP;
  1.3543 +		ISourceHook *m_pSH;
  1.3544  	public:
  1.3545 -	   ExecutableClass1(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3546 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3547 +		ExecutableClass1(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3548 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3549  	
  1.3550  	   void operator()(Param1 p1) const
  1.3551  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1), (Param1))
  1.3552 @@ -3506,16 +3371,15 @@
  1.3553  	};
  1.3554  
  1.3555  	// Support for 2 arguments
  1.3556 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2> class ExecutableClass2
  1.3557 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2> class ExecutableClass2
  1.3558  	{
  1.3559  		ObjType *m_ThisPtr;
  1.3560  		void *m_VfnPtr;
  1.3561 -		MFP m_MFP;
  1.3562 +		MFPType m_MFP;
  1.3563  		ISourceHook *m_pSH;
  1.3564 -		Plugin m_Plug;
  1.3565  	public:
  1.3566 -		ExecutableClass2(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3567 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3568 +		ExecutableClass2(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3569 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3570  	
  1.3571  		RetType operator()(Param1 p1, Param2 p2) const
  1.3572  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2), (Param1, Param2))
  1.3573 @@ -3577,16 +3441,15 @@
  1.3574  		
  1.3575  	};
  1.3576  
  1.3577 -	template<class ObjType, class MFP, class Param1, class Param2> class ExecutableClass2<ObjType, MFP, void, Param1, Param2>
  1.3578 +	template<class ObjType, class MFPType, class Param1, class Param2> class ExecutableClass2<ObjType, MFPType, void, Param1, Param2>
  1.3579  	{
  1.3580 -	   ObjType *m_ThisPtr;
  1.3581 -	   void *m_VfnPtr;
  1.3582 -	   MFP m_MFP;
  1.3583 -	   ISourceHook *m_pSH;
  1.3584 -	   Plugin m_Plug;
  1.3585 +		ObjType *m_ThisPtr;
  1.3586 +		void *m_VfnPtr;
  1.3587 +		MFPType m_MFP;
  1.3588 +		ISourceHook *m_pSH;
  1.3589  	public:
  1.3590 -	   ExecutableClass2(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3591 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3592 +		ExecutableClass2(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3593 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3594  	
  1.3595  	   void operator()(Param1 p1, Param2 p2) const
  1.3596  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2), (Param1, Param2))
  1.3597 @@ -3649,16 +3512,15 @@
  1.3598  	};
  1.3599  
  1.3600  	// Support for 3 arguments
  1.3601 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3> class ExecutableClass3
  1.3602 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3> class ExecutableClass3
  1.3603  	{
  1.3604  		ObjType *m_ThisPtr;
  1.3605  		void *m_VfnPtr;
  1.3606 -		MFP m_MFP;
  1.3607 +		MFPType m_MFP;
  1.3608  		ISourceHook *m_pSH;
  1.3609 -		Plugin m_Plug;
  1.3610  	public:
  1.3611 -		ExecutableClass3(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3612 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3613 +		ExecutableClass3(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3614 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3615  	
  1.3616  		RetType operator()(Param1 p1, Param2 p2, Param3 p3) const
  1.3617  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3), (Param1, Param2, Param3))
  1.3618 @@ -3717,16 +3579,15 @@
  1.3619  		
  1.3620  	};
  1.3621  
  1.3622 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3> class ExecutableClass3<ObjType, MFP, void, Param1, Param2, Param3>
  1.3623 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3> class ExecutableClass3<ObjType, MFPType, void, Param1, Param2, Param3>
  1.3624  	{
  1.3625 -	   ObjType *m_ThisPtr;
  1.3626 -	   void *m_VfnPtr;
  1.3627 -	   MFP m_MFP;
  1.3628 -	   ISourceHook *m_pSH;
  1.3629 -	   Plugin m_Plug;
  1.3630 +		ObjType *m_ThisPtr;
  1.3631 +		void *m_VfnPtr;
  1.3632 +		MFPType m_MFP;
  1.3633 +		ISourceHook *m_pSH;
  1.3634  	public:
  1.3635 -	   ExecutableClass3(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3636 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3637 +		ExecutableClass3(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3638 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3639  	
  1.3640  	   void operator()(Param1 p1, Param2 p2, Param3 p3) const
  1.3641  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3), (Param1, Param2, Param3))
  1.3642 @@ -3786,16 +3647,15 @@
  1.3643  	};
  1.3644  
  1.3645  	// Support for 4 arguments
  1.3646 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4> class ExecutableClass4
  1.3647 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4> class ExecutableClass4
  1.3648  	{
  1.3649  		ObjType *m_ThisPtr;
  1.3650  		void *m_VfnPtr;
  1.3651 -		MFP m_MFP;
  1.3652 +		MFPType m_MFP;
  1.3653  		ISourceHook *m_pSH;
  1.3654 -		Plugin m_Plug;
  1.3655  	public:
  1.3656 -		ExecutableClass4(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3657 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3658 +		ExecutableClass4(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3659 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3660  	
  1.3661  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const
  1.3662  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4), (Param1, Param2, Param3, Param4))
  1.3663 @@ -3851,16 +3711,15 @@
  1.3664  		
  1.3665  	};
  1.3666  
  1.3667 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4> class ExecutableClass4<ObjType, MFP, void, Param1, Param2, Param3, Param4>
  1.3668 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4> class ExecutableClass4<ObjType, MFPType, void, Param1, Param2, Param3, Param4>
  1.3669  	{
  1.3670 -	   ObjType *m_ThisPtr;
  1.3671 -	   void *m_VfnPtr;
  1.3672 -	   MFP m_MFP;
  1.3673 -	   ISourceHook *m_pSH;
  1.3674 -	   Plugin m_Plug;
  1.3675 +		ObjType *m_ThisPtr;
  1.3676 +		void *m_VfnPtr;
  1.3677 +		MFPType m_MFP;
  1.3678 +		ISourceHook *m_pSH;
  1.3679  	public:
  1.3680 -	   ExecutableClass4(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3681 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3682 +		ExecutableClass4(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3683 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3684  	
  1.3685  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const
  1.3686  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4), (Param1, Param2, Param3, Param4))
  1.3687 @@ -3917,16 +3776,15 @@
  1.3688  	};
  1.3689  
  1.3690  	// Support for 5 arguments
  1.3691 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5> class ExecutableClass5
  1.3692 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5> class ExecutableClass5
  1.3693  	{
  1.3694  		ObjType *m_ThisPtr;
  1.3695  		void *m_VfnPtr;
  1.3696 -		MFP m_MFP;
  1.3697 +		MFPType m_MFP;
  1.3698  		ISourceHook *m_pSH;
  1.3699 -		Plugin m_Plug;
  1.3700  	public:
  1.3701 -		ExecutableClass5(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3702 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3703 +		ExecutableClass5(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3704 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3705  	
  1.3706  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5) const
  1.3707  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5), (Param1, Param2, Param3, Param4, Param5))
  1.3708 @@ -3979,16 +3837,15 @@
  1.3709  		
  1.3710  	};
  1.3711  
  1.3712 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5> class ExecutableClass5<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5>
  1.3713 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5> class ExecutableClass5<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5>
  1.3714  	{
  1.3715 -	   ObjType *m_ThisPtr;
  1.3716 -	   void *m_VfnPtr;
  1.3717 -	   MFP m_MFP;
  1.3718 -	   ISourceHook *m_pSH;
  1.3719 -	   Plugin m_Plug;
  1.3720 +		ObjType *m_ThisPtr;
  1.3721 +		void *m_VfnPtr;
  1.3722 +		MFPType m_MFP;
  1.3723 +		ISourceHook *m_pSH;
  1.3724  	public:
  1.3725 -	   ExecutableClass5(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3726 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3727 +		ExecutableClass5(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3728 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3729  	
  1.3730  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5) const
  1.3731  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5), (Param1, Param2, Param3, Param4, Param5))
  1.3732 @@ -4042,16 +3899,15 @@
  1.3733  	};
  1.3734  
  1.3735  	// Support for 6 arguments
  1.3736 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> class ExecutableClass6
  1.3737 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> class ExecutableClass6
  1.3738  	{
  1.3739  		ObjType *m_ThisPtr;
  1.3740  		void *m_VfnPtr;
  1.3741 -		MFP m_MFP;
  1.3742 +		MFPType m_MFP;
  1.3743  		ISourceHook *m_pSH;
  1.3744 -		Plugin m_Plug;
  1.3745  	public:
  1.3746 -		ExecutableClass6(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3747 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3748 +		ExecutableClass6(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3749 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3750  	
  1.3751  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6) const
  1.3752  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6), (Param1, Param2, Param3, Param4, Param5, Param6))
  1.3753 @@ -4101,16 +3957,15 @@
  1.3754  		
  1.3755  	};
  1.3756  
  1.3757 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> class ExecutableClass6<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6>
  1.3758 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> class ExecutableClass6<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6>
  1.3759  	{
  1.3760 -	   ObjType *m_ThisPtr;
  1.3761 -	   void *m_VfnPtr;
  1.3762 -	   MFP m_MFP;
  1.3763 -	   ISourceHook *m_pSH;
  1.3764 -	   Plugin m_Plug;
  1.3765 +		ObjType *m_ThisPtr;
  1.3766 +		void *m_VfnPtr;
  1.3767 +		MFPType m_MFP;
  1.3768 +		ISourceHook *m_pSH;
  1.3769  	public:
  1.3770 -	   ExecutableClass6(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3771 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3772 +		ExecutableClass6(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3773 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3774  	
  1.3775  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6) const
  1.3776  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6), (Param1, Param2, Param3, Param4, Param5, Param6))
  1.3777 @@ -4161,16 +4016,15 @@
  1.3778  	};
  1.3779  
  1.3780  	// Support for 7 arguments
  1.3781 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> class ExecutableClass7
  1.3782 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> class ExecutableClass7
  1.3783  	{
  1.3784  		ObjType *m_ThisPtr;
  1.3785  		void *m_VfnPtr;
  1.3786 -		MFP m_MFP;
  1.3787 +		MFPType m_MFP;
  1.3788  		ISourceHook *m_pSH;
  1.3789 -		Plugin m_Plug;
  1.3790  	public:
  1.3791 -		ExecutableClass7(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3792 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3793 +		ExecutableClass7(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3794 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3795  	
  1.3796  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7) const
  1.3797  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7), (Param1, Param2, Param3, Param4, Param5, Param6, Param7))
  1.3798 @@ -4217,16 +4071,15 @@
  1.3799  		
  1.3800  	};
  1.3801  
  1.3802 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> class ExecutableClass7<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.3803 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> class ExecutableClass7<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.3804  	{
  1.3805 -	   ObjType *m_ThisPtr;
  1.3806 -	   void *m_VfnPtr;
  1.3807 -	   MFP m_MFP;
  1.3808 -	   ISourceHook *m_pSH;
  1.3809 -	   Plugin m_Plug;
  1.3810 +		ObjType *m_ThisPtr;
  1.3811 +		void *m_VfnPtr;
  1.3812 +		MFPType m_MFP;
  1.3813 +		ISourceHook *m_pSH;
  1.3814  	public:
  1.3815 -	   ExecutableClass7(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3816 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3817 +		ExecutableClass7(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3818 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3819  	
  1.3820  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7) const
  1.3821  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7), (Param1, Param2, Param3, Param4, Param5, Param6, Param7))
  1.3822 @@ -4274,16 +4127,15 @@
  1.3823  	};
  1.3824  
  1.3825  	// Support for 8 arguments
  1.3826 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> class ExecutableClass8
  1.3827 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> class ExecutableClass8
  1.3828  	{
  1.3829  		ObjType *m_ThisPtr;
  1.3830  		void *m_VfnPtr;
  1.3831 -		MFP m_MFP;
  1.3832 +		MFPType m_MFP;
  1.3833  		ISourceHook *m_pSH;
  1.3834 -		Plugin m_Plug;
  1.3835  	public:
  1.3836 -		ExecutableClass8(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3837 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3838 +		ExecutableClass8(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3839 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3840  	
  1.3841  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8) const
  1.3842  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8))
  1.3843 @@ -4327,16 +4179,15 @@
  1.3844  		
  1.3845  	};
  1.3846  
  1.3847 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> class ExecutableClass8<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.3848 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> class ExecutableClass8<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.3849  	{
  1.3850 -	   ObjType *m_ThisPtr;
  1.3851 -	   void *m_VfnPtr;
  1.3852 -	   MFP m_MFP;
  1.3853 -	   ISourceHook *m_pSH;
  1.3854 -	   Plugin m_Plug;
  1.3855 +		ObjType *m_ThisPtr;
  1.3856 +		void *m_VfnPtr;
  1.3857 +		MFPType m_MFP;
  1.3858 +		ISourceHook *m_pSH;
  1.3859  	public:
  1.3860 -	   ExecutableClass8(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3861 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3862 +		ExecutableClass8(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3863 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3864  	
  1.3865  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8) const
  1.3866  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8))
  1.3867 @@ -4381,16 +4232,15 @@
  1.3868  	};
  1.3869  
  1.3870  	// Support for 9 arguments
  1.3871 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> class ExecutableClass9
  1.3872 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> class ExecutableClass9
  1.3873  	{
  1.3874  		ObjType *m_ThisPtr;
  1.3875  		void *m_VfnPtr;
  1.3876 -		MFP m_MFP;
  1.3877 +		MFPType m_MFP;
  1.3878  		ISourceHook *m_pSH;
  1.3879 -		Plugin m_Plug;
  1.3880  	public:
  1.3881 -		ExecutableClass9(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3882 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3883 +		ExecutableClass9(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3884 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3885  	
  1.3886  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9) const
  1.3887  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9))
  1.3888 @@ -4431,16 +4281,15 @@
  1.3889  		
  1.3890  	};
  1.3891  
  1.3892 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> class ExecutableClass9<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.3893 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> class ExecutableClass9<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.3894  	{
  1.3895 -	   ObjType *m_ThisPtr;
  1.3896 -	   void *m_VfnPtr;
  1.3897 -	   MFP m_MFP;
  1.3898 -	   ISourceHook *m_pSH;
  1.3899 -	   Plugin m_Plug;
  1.3900 +		ObjType *m_ThisPtr;
  1.3901 +		void *m_VfnPtr;
  1.3902 +		MFPType m_MFP;
  1.3903 +		ISourceHook *m_pSH;
  1.3904  	public:
  1.3905 -	   ExecutableClass9(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3906 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3907 +		ExecutableClass9(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3908 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3909  	
  1.3910  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9) const
  1.3911  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9))
  1.3912 @@ -4482,16 +4331,15 @@
  1.3913  	};
  1.3914  
  1.3915  	// Support for 10 arguments
  1.3916 -	template<class ObjType, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> class ExecutableClass10
  1.3917 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> class ExecutableClass10
  1.3918  	{
  1.3919  		ObjType *m_ThisPtr;
  1.3920  		void *m_VfnPtr;
  1.3921 -		MFP m_MFP;
  1.3922 +		MFPType m_MFP;
  1.3923  		ISourceHook *m_pSH;
  1.3924 -		Plugin m_Plug;
  1.3925  	public:
  1.3926 -		ExecutableClass10(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3927 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3928 +		ExecutableClass10(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3929 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3930  	
  1.3931  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10) const
  1.3932  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10))
  1.3933 @@ -4529,16 +4377,15 @@
  1.3934  		
  1.3935  	};
  1.3936  
  1.3937 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> class ExecutableClass10<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.3938 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> class ExecutableClass10<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.3939  	{
  1.3940 -	   ObjType *m_ThisPtr;
  1.3941 -	   void *m_VfnPtr;
  1.3942 -	   MFP m_MFP;
  1.3943 -	   ISourceHook *m_pSH;
  1.3944 -	   Plugin m_Plug;
  1.3945 +		ObjType *m_ThisPtr;
  1.3946 +		void *m_VfnPtr;
  1.3947 +		MFPType m_MFP;
  1.3948 +		ISourceHook *m_pSH;
  1.3949  	public:
  1.3950 -	   ExecutableClass10(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3951 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3952 +		ExecutableClass10(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3953 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3954  	
  1.3955  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10) const
  1.3956  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10))
  1.3957 @@ -4577,16 +4424,15 @@
  1.3958  	};
  1.3959  
  1.3960  	// Support for 11 arguments
  1.3961 -	template<class ObjType, class MFP, 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 ExecutableClass11
  1.3962 +	template<class ObjType, class MFPType, 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 ExecutableClass11
  1.3963  	{
  1.3964  		ObjType *m_ThisPtr;
  1.3965  		void *m_VfnPtr;
  1.3966 -		MFP m_MFP;
  1.3967 +		MFPType m_MFP;
  1.3968  		ISourceHook *m_pSH;
  1.3969 -		Plugin m_Plug;
  1.3970  	public:
  1.3971 -		ExecutableClass11(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3972 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3973 +		ExecutableClass11(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3974 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3975  	
  1.3976  		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.3977  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11))
  1.3978 @@ -4621,16 +4467,15 @@
  1.3979  		
  1.3980  	};
  1.3981  
  1.3982 -	template<class ObjType, class MFP, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11> class ExecutableClass11<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.3983 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11> class ExecutableClass11<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.3984  	{
  1.3985 -	   ObjType *m_ThisPtr;
  1.3986 -	   void *m_VfnPtr;
  1.3987 -	   MFP m_MFP;
  1.3988 -	   ISourceHook *m_pSH;
  1.3989 -	   Plugin m_Plug;
  1.3990 +		ObjType *m_ThisPtr;
  1.3991 +		void *m_VfnPtr;
  1.3992 +		MFPType m_MFP;
  1.3993 +		ISourceHook *m_pSH;
  1.3994  	public:
  1.3995 -	   ExecutableClass11(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.3996 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.3997 +		ExecutableClass11(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.3998 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.3999  	
  1.4000  	   void 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.4001  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11))
  1.4002 @@ -4666,16 +4511,15 @@
  1.4003  	};
  1.4004  
  1.4005  	// Support for 12 arguments
  1.4006 -	template<class ObjType, class MFP, 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 ExecutableClass12
  1.4007 +	template<class ObjType, class MFPType, 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 ExecutableClass12
  1.4008  	{
  1.4009  		ObjType *m_ThisPtr;
  1.4010  		void *m_VfnPtr;
  1.4011 -		MFP m_MFP;
  1.4012 +		MFPType m_MFP;
  1.4013  		ISourceHook *m_pSH;
  1.4014 -		Plugin m_Plug;
  1.4015  	public:
  1.4016 -		ExecutableClass12(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4017 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4018 +		ExecutableClass12(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4019 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4020  	
  1.4021  		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.4022  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12))
  1.4023 @@ -4707,16 +4551,15 @@
  1.4024  		
  1.4025  	};
  1.4026  
  1.4027 -	template<class ObjType, class MFP, 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 ExecutableClass12<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4028 +	template<class ObjType, class MFPType, 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 ExecutableClass12<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4029  	{
  1.4030 -	   ObjType *m_ThisPtr;
  1.4031 -	   void *m_VfnPtr;
  1.4032 -	   MFP m_MFP;
  1.4033 -	   ISourceHook *m_pSH;
  1.4034 -	   Plugin m_Plug;
  1.4035 +		ObjType *m_ThisPtr;
  1.4036 +		void *m_VfnPtr;
  1.4037 +		MFPType m_MFP;
  1.4038 +		ISourceHook *m_pSH;
  1.4039  	public:
  1.4040 -	   ExecutableClass12(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4041 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4042 +		ExecutableClass12(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4043 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4044  	
  1.4045  	   void 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.4046  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12))
  1.4047 @@ -4749,16 +4592,15 @@
  1.4048  	};
  1.4049  
  1.4050  	// Support for 13 arguments
  1.4051 -	template<class ObjType, class MFP, 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 ExecutableClass13
  1.4052 +	template<class ObjType, class MFPType, 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 ExecutableClass13
  1.4053  	{
  1.4054  		ObjType *m_ThisPtr;
  1.4055  		void *m_VfnPtr;
  1.4056 -		MFP m_MFP;
  1.4057 +		MFPType m_MFP;
  1.4058  		ISourceHook *m_pSH;
  1.4059 -		Plugin m_Plug;
  1.4060  	public:
  1.4061 -		ExecutableClass13(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4062 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4063 +		ExecutableClass13(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4064 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4065  	
  1.4066  		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.4067  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13))
  1.4068 @@ -4787,16 +4629,15 @@
  1.4069  		
  1.4070  	};
  1.4071  
  1.4072 -	template<class ObjType, class MFP, 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 ExecutableClass13<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4073 +	template<class ObjType, class MFPType, 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 ExecutableClass13<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4074  	{
  1.4075 -	   ObjType *m_ThisPtr;
  1.4076 -	   void *m_VfnPtr;
  1.4077 -	   MFP m_MFP;
  1.4078 -	   ISourceHook *m_pSH;
  1.4079 -	   Plugin m_Plug;
  1.4080 +		ObjType *m_ThisPtr;
  1.4081 +		void *m_VfnPtr;
  1.4082 +		MFPType m_MFP;
  1.4083 +		ISourceHook *m_pSH;
  1.4084  	public:
  1.4085 -	   ExecutableClass13(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4086 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4087 +		ExecutableClass13(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4088 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4089  	
  1.4090  	   void 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.4091  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13))
  1.4092 @@ -4826,16 +4667,15 @@
  1.4093  	};
  1.4094  
  1.4095  	// Support for 14 arguments
  1.4096 -	template<class ObjType, class MFP, 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 ExecutableClass14
  1.4097 +	template<class ObjType, class MFPType, 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 ExecutableClass14
  1.4098  	{
  1.4099  		ObjType *m_ThisPtr;
  1.4100  		void *m_VfnPtr;
  1.4101 -		MFP m_MFP;
  1.4102 +		MFPType m_MFP;
  1.4103  		ISourceHook *m_pSH;
  1.4104 -		Plugin m_Plug;
  1.4105  	public:
  1.4106 -		ExecutableClass14(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4107 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4108 +		ExecutableClass14(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4109 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4110  	
  1.4111  		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.4112  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14))
  1.4113 @@ -4861,16 +4701,15 @@
  1.4114  		
  1.4115  	};
  1.4116  
  1.4117 -	template<class ObjType, class MFP, 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 ExecutableClass14<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4118 +	template<class ObjType, class MFPType, 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 ExecutableClass14<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4119  	{
  1.4120 -	   ObjType *m_ThisPtr;
  1.4121 -	   void *m_VfnPtr;
  1.4122 -	   MFP m_MFP;
  1.4123 -	   ISourceHook *m_pSH;
  1.4124 -	   Plugin m_Plug;
  1.4125 +		ObjType *m_ThisPtr;
  1.4126 +		void *m_VfnPtr;
  1.4127 +		MFPType m_MFP;
  1.4128 +		ISourceHook *m_pSH;
  1.4129  	public:
  1.4130 -	   ExecutableClass14(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4131 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4132 +		ExecutableClass14(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4133 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4134  	
  1.4135  	   void 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.4136  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14))
  1.4137 @@ -4897,16 +4736,15 @@
  1.4138  	};
  1.4139  
  1.4140  	// Support for 15 arguments
  1.4141 -	template<class ObjType, class MFP, 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 ExecutableClass15
  1.4142 +	template<class ObjType, class MFPType, 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 ExecutableClass15
  1.4143  	{
  1.4144  		ObjType *m_ThisPtr;
  1.4145  		void *m_VfnPtr;
  1.4146 -		MFP m_MFP;
  1.4147 +		MFPType m_MFP;
  1.4148  		ISourceHook *m_pSH;
  1.4149 -		Plugin m_Plug;
  1.4150  	public:
  1.4151 -		ExecutableClass15(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4152 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4153 +		ExecutableClass15(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4154 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4155  	
  1.4156  		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.4157  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15))
  1.4158 @@ -4929,16 +4767,15 @@
  1.4159  		
  1.4160  	};
  1.4161  
  1.4162 -	template<class ObjType, class MFP, 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 ExecutableClass15<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4163 +	template<class ObjType, class MFPType, 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 ExecutableClass15<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4164  	{
  1.4165 -	   ObjType *m_ThisPtr;
  1.4166 -	   void *m_VfnPtr;
  1.4167 -	   MFP m_MFP;
  1.4168 -	   ISourceHook *m_pSH;
  1.4169 -	   Plugin m_Plug;
  1.4170 +		ObjType *m_ThisPtr;
  1.4171 +		void *m_VfnPtr;
  1.4172 +		MFPType m_MFP;
  1.4173 +		ISourceHook *m_pSH;
  1.4174  	public:
  1.4175 -	   ExecutableClass15(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4176 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4177 +		ExecutableClass15(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4178 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4179  	
  1.4180  	   void 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.4181  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15))
  1.4182 @@ -4962,16 +4799,15 @@
  1.4183  	};
  1.4184  
  1.4185  	// Support for 16 arguments
  1.4186 -	template<class ObjType, class MFP, 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> class ExecutableClass16
  1.4187 +	template<class ObjType, class MFPType, 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> class ExecutableClass16
  1.4188  	{
  1.4189  		ObjType *m_ThisPtr;
  1.4190  		void *m_VfnPtr;
  1.4191 -		MFP m_MFP;
  1.4192 +		MFPType m_MFP;
  1.4193  		ISourceHook *m_pSH;
  1.4194 -		Plugin m_Plug;
  1.4195  	public:
  1.4196 -		ExecutableClass16(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4197 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4198 +		ExecutableClass16(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4199 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4200  	
  1.4201  		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.4202  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  1.4203 @@ -4991,16 +4827,15 @@
  1.4204  		
  1.4205  	};
  1.4206  
  1.4207 -	template<class ObjType, class MFP, 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> class ExecutableClass16<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.4208 +	template<class ObjType, class MFPType, 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> class ExecutableClass16<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.4209  	{
  1.4210 -	   ObjType *m_ThisPtr;
  1.4211 -	   void *m_VfnPtr;
  1.4212 -	   MFP m_MFP;
  1.4213 -	   ISourceHook *m_pSH;
  1.4214 -	   Plugin m_Plug;
  1.4215 +		ObjType *m_ThisPtr;
  1.4216 +		void *m_VfnPtr;
  1.4217 +		MFPType m_MFP;
  1.4218 +		ISourceHook *m_pSH;
  1.4219  	public:
  1.4220 -	   ExecutableClass16(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4221 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4222 +		ExecutableClass16(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4223 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4224  	
  1.4225  	   void 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.4226  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  1.4227 @@ -5021,16 +4856,15 @@
  1.4228  	};
  1.4229  
  1.4230  	// Support for 17 arguments
  1.4231 -	template<class ObjType, class MFP, 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, class Param17> class ExecutableClass17
  1.4232 +	template<class ObjType, class MFPType, 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, class Param17> class ExecutableClass17
  1.4233  	{
  1.4234  		ObjType *m_ThisPtr;
  1.4235  		void *m_VfnPtr;
  1.4236 -		MFP m_MFP;
  1.4237 +		MFPType m_MFP;
  1.4238  		ISourceHook *m_pSH;
  1.4239 -		Plugin m_Plug;
  1.4240  	public:
  1.4241 -		ExecutableClass17(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4242 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4243 +		ExecutableClass17(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4244 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4245  	
  1.4246  		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, Param17 p17) const
  1.4247  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  1.4248 @@ -5047,16 +4881,15 @@
  1.4249  		
  1.4250  	};
  1.4251  
  1.4252 -	template<class ObjType, class MFP, 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, class Param17> class ExecutableClass17<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.4253 +	template<class ObjType, class MFPType, 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, class Param17> class ExecutableClass17<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.4254  	{
  1.4255 -	   ObjType *m_ThisPtr;
  1.4256 -	   void *m_VfnPtr;
  1.4257 -	   MFP m_MFP;
  1.4258 -	   ISourceHook *m_pSH;
  1.4259 -	   Plugin m_Plug;
  1.4260 +		ObjType *m_ThisPtr;
  1.4261 +		void *m_VfnPtr;
  1.4262 +		MFPType m_MFP;
  1.4263 +		ISourceHook *m_pSH;
  1.4264  	public:
  1.4265 -	   ExecutableClass17(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4266 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4267 +		ExecutableClass17(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4268 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4269  	
  1.4270  	   void 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, Param17 p17) const
  1.4271  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  1.4272 @@ -5074,16 +4907,15 @@
  1.4273  	};
  1.4274  
  1.4275  	// Support for 18 arguments
  1.4276 -	template<class ObjType, class MFP, 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, class Param17, class Param18> class ExecutableClass18
  1.4277 +	template<class ObjType, class MFPType, 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, class Param17, class Param18> class ExecutableClass18
  1.4278  	{
  1.4279  		ObjType *m_ThisPtr;
  1.4280  		void *m_VfnPtr;
  1.4281 -		MFP m_MFP;
  1.4282 +		MFPType m_MFP;
  1.4283  		ISourceHook *m_pSH;
  1.4284 -		Plugin m_Plug;
  1.4285  	public:
  1.4286 -		ExecutableClass18(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4287 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4288 +		ExecutableClass18(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4289 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4290  	
  1.4291  		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, Param17 p17, Param18 p18) const
  1.4292  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18))
  1.4293 @@ -5097,16 +4929,15 @@
  1.4294  		
  1.4295  	};
  1.4296  
  1.4297 -	template<class ObjType, class MFP, 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, class Param17, class Param18> class ExecutableClass18<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.4298 +	template<class ObjType, class MFPType, 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, class Param17, class Param18> class ExecutableClass18<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.4299  	{
  1.4300 -	   ObjType *m_ThisPtr;
  1.4301 -	   void *m_VfnPtr;
  1.4302 -	   MFP m_MFP;
  1.4303 -	   ISourceHook *m_pSH;
  1.4304 -	   Plugin m_Plug;
  1.4305 +		ObjType *m_ThisPtr;
  1.4306 +		void *m_VfnPtr;
  1.4307 +		MFPType m_MFP;
  1.4308 +		ISourceHook *m_pSH;
  1.4309  	public:
  1.4310 -	   ExecutableClass18(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4311 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4312 +		ExecutableClass18(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4313 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4314  	
  1.4315  	   void 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, Param17 p17, Param18 p18) const
  1.4316  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18))
  1.4317 @@ -5121,16 +4952,15 @@
  1.4318  	};
  1.4319  
  1.4320  	// Support for 19 arguments
  1.4321 -	template<class ObjType, class MFP, 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, class Param17, class Param18, class Param19> class ExecutableClass19
  1.4322 +	template<class ObjType, class MFPType, 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, class Param17, class Param18, class Param19> class ExecutableClass19
  1.4323  	{
  1.4324  		ObjType *m_ThisPtr;
  1.4325  		void *m_VfnPtr;
  1.4326 -		MFP m_MFP;
  1.4327 +		MFPType m_MFP;
  1.4328  		ISourceHook *m_pSH;
  1.4329 -		Plugin m_Plug;
  1.4330  	public:
  1.4331 -		ExecutableClass19(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4332 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4333 +		ExecutableClass19(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4334 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4335  	
  1.4336  		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, Param17 p17, Param18 p18, Param19 p19) const
  1.4337  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19))
  1.4338 @@ -5141,16 +4971,15 @@
  1.4339  		
  1.4340  	};
  1.4341  
  1.4342 -	template<class ObjType, class MFP, 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, class Param17, class Param18, class Param19> class ExecutableClass19<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.4343 +	template<class ObjType, class MFPType, 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, class Param17, class Param18, class Param19> class ExecutableClass19<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.4344  	{
  1.4345 -	   ObjType *m_ThisPtr;
  1.4346 -	   void *m_VfnPtr;
  1.4347 -	   MFP m_MFP;
  1.4348 -	   ISourceHook *m_pSH;
  1.4349 -	   Plugin m_Plug;
  1.4350 +		ObjType *m_ThisPtr;
  1.4351 +		void *m_VfnPtr;
  1.4352 +		MFPType m_MFP;
  1.4353 +		ISourceHook *m_pSH;
  1.4354  	public:
  1.4355 -	   ExecutableClass19(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4356 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4357 +		ExecutableClass19(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4358 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4359  	
  1.4360  	   void 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, Param17 p17, Param18 p18, Param19 p19) const
  1.4361  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19))
  1.4362 @@ -5162,16 +4991,15 @@
  1.4363  	};
  1.4364  
  1.4365  	// Support for 20 arguments
  1.4366 -	template<class ObjType, class MFP, 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, class Param17, class Param18, class Param19, class Param20> class ExecutableClass20
  1.4367 +	template<class ObjType, class MFPType, 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, class Param17, class Param18, class Param19, class Param20> class ExecutableClass20
  1.4368  	{
  1.4369  		ObjType *m_ThisPtr;
  1.4370  		void *m_VfnPtr;
  1.4371 -		MFP m_MFP;
  1.4372 +		MFPType m_MFP;
  1.4373  		ISourceHook *m_pSH;
  1.4374 -		Plugin m_Plug;
  1.4375  	public:
  1.4376 -		ExecutableClass20(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4377 -			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4378 +		ExecutableClass20(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4379 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4380  	
  1.4381  		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, Param17 p17, Param18 p18, Param19 p19, Param20 p20) const
  1.4382  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20))
  1.4383 @@ -5179,16 +5007,15 @@
  1.4384  		
  1.4385  	};
  1.4386  
  1.4387 -	template<class ObjType, class MFP, 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, class Param17, class Param18, class Param19, class Param20> class ExecutableClass20<ObjType, MFP, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.4388 +	template<class ObjType, class MFPType, 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, class Param17, class Param18, class Param19, class Param20> class ExecutableClass20<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.4389  	{
  1.4390 -	   ObjType *m_ThisPtr;
  1.4391 -	   void *m_VfnPtr;
  1.4392 -	   MFP m_MFP;
  1.4393 -	   ISourceHook *m_pSH;
  1.4394 -	   Plugin m_Plug;
  1.4395 +		ObjType *m_ThisPtr;
  1.4396 +		void *m_VfnPtr;
  1.4397 +		MFPType m_MFP;
  1.4398 +		ISourceHook *m_pSH;
  1.4399  	public:
  1.4400 -	   ExecutableClass20(ObjType *tp, MFP mfp, void *vp, ISourceHook *pSH, Plugin plug) : m_ThisPtr(tp),
  1.4401 -		   m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH), m_Plug(plug) { }
  1.4402 +		ExecutableClass20(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  1.4403 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  1.4404  	
  1.4405  	   void 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, Param17 p17, Param18 p18, Param19 p19, Param20 p20) const
  1.4406  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20))
  1.4407 @@ -5202,14 +5029,14 @@
  1.4408  #define SH__CALL_GET_VFNPTR_NORMAL \
  1.4409  	using namespace ::SourceHook; \
  1.4410  	MemFuncInfo mfi = {true, -1, 0, 0}; \
  1.4411 -	GetFuncInfo(CCW<Y>::GRP(ptr), mfp, mfi); \
  1.4412 +	GetFuncInfo(ptr, mfp, mfi); \
  1.4413  	void *vfnptr = reinterpret_cast<void*>( \
  1.4414  		*reinterpret_cast<void***>(reinterpret_cast<char*>(ptr) + mfi.thisptroffs + mfi.vtbloffs) + mfi.vtblindex);
  1.4415  
  1.4416  #define SH__CALL_GET_VFNPTR_MANUAL \
  1.4417  	using namespace ::SourceHook; \
  1.4418  	void *vfnptr = reinterpret_cast<void*>( \
  1.4419 -		*reinterpret_cast<void***>( (reinterpret_cast<char*>(CCW<Y>::GRP(ptr)) + thisptroffs + vtbloffs) ) + vtblidx); \
  1.4420 +		*reinterpret_cast<void***>( (reinterpret_cast<char*>(ptr) + thisptroffs + vtbloffs) ) + vtblidx); \
  1.4421  	/* patch mfp */ \
  1.4422  	*reinterpret_cast<void**>(&mfp) = *reinterpret_cast<void**>(vfnptr);
  1.4423  
  1.4424 @@ -5220,590 +5047,548 @@
  1.4425  
  1.4426  // Support for 0 arguments
  1.4427  template <class X, class Y, class MFP, class RetType>
  1.4428 -SourceHook::ExecutableClass0<typename SourceHook::CCW<Y>::type, MFP, RetType>
  1.4429 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4430 +SourceHook::ExecutableClass0<Y, MFP, RetType>
  1.4431 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(), SourceHook::ISourceHook *shptr)
  1.4432  {
  1.4433  	SH__CALL_GET_VFNPTR_NORMAL
  1.4434 -	return SourceHook::ExecutableClass0<typename CCW<Y>::type, MFP, RetType>(CCW<Y>::GRP(ptr),
  1.4435 -		mfp, vfnptr, shptr, plug);
  1.4436 +	return SourceHook::ExecutableClass0<Y, MFP, RetType>(ptr, mfp, vfnptr, shptr);
  1.4437  }
  1.4438  
  1.4439  template <class X, class Y, class MFP, class RetType>
  1.4440 -SourceHook::ExecutableClass0<typename SourceHook::CCW<Y>::type, MFP, RetType>
  1.4441 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)()const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4442 +SourceHook::ExecutableClass0<Y, MFP, RetType>
  1.4443 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)()const, SourceHook::ISourceHook *shptr)
  1.4444  {
  1.4445  	SH__CALL_GET_VFNPTR_NORMAL
  1.4446 -	return SourceHook::ExecutableClass0<typename CCW<Y>::type, MFP, RetType>(CCW<Y>::GRP(ptr),
  1.4447 -		mfp, vfnptr, shptr, plug);
  1.4448 +	return SourceHook::ExecutableClass0<Y, MFP, RetType>(ptr, mfp, vfnptr, shptr);
  1.4449  }
  1.4450  
  1.4451  template <class X, class Y, class MFP, class RetType>
  1.4452  SourceHook::ExecutableClass0<SourceHook::EmptyClass, MFP, RetType>
  1.4453 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4454 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4455  {
  1.4456  	SH__CALL_GET_VFNPTR_MANUAL
  1.4457  	return SourceHook::ExecutableClass0<EmptyClass, MFP, RetType>(
  1.4458 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4459 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4460  }
  1.4461  
  1.4462  // Support for 1 arguments
  1.4463  template <class X, class Y, class MFP, class RetType, class Param1>
  1.4464 -SourceHook::ExecutableClass1<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1>
  1.4465 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4466 +SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>
  1.4467 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1), SourceHook::ISourceHook *shptr)
  1.4468  {
  1.4469  	SH__CALL_GET_VFNPTR_NORMAL
  1.4470 -	return SourceHook::ExecutableClass1<typename CCW<Y>::type, MFP, RetType, Param1>(CCW<Y>::GRP(ptr),
  1.4471 -		mfp, vfnptr, shptr, plug);
  1.4472 +	return SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>(ptr, mfp, vfnptr, shptr);
  1.4473  }
  1.4474  
  1.4475  template <class X, class Y, class MFP, class RetType, class Param1>
  1.4476 -SourceHook::ExecutableClass1<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1>
  1.4477 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4478 +SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>
  1.4479 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1)const, SourceHook::ISourceHook *shptr)
  1.4480  {
  1.4481  	SH__CALL_GET_VFNPTR_NORMAL
  1.4482 -	return SourceHook::ExecutableClass1<typename CCW<Y>::type, MFP, RetType, Param1>(CCW<Y>::GRP(ptr),
  1.4483 -		mfp, vfnptr, shptr, plug);
  1.4484 +	return SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>(ptr, mfp, vfnptr, shptr);
  1.4485  }
  1.4486  
  1.4487  template <class X, class Y, class MFP, class RetType, class Param1>
  1.4488  SourceHook::ExecutableClass1<SourceHook::EmptyClass, MFP, RetType, Param1>
  1.4489 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4490 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4491  {
  1.4492  	SH__CALL_GET_VFNPTR_MANUAL
  1.4493  	return SourceHook::ExecutableClass1<EmptyClass, MFP, RetType, Param1>(
  1.4494 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4495 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4496  }
  1.4497  
  1.4498  // Support for 2 arguments
  1.4499  template <class X, class Y, class MFP, class RetType, class Param1, class Param2>
  1.4500 -SourceHook::ExecutableClass2<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2>
  1.4501 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4502 +SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>
  1.4503 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2), SourceHook::ISourceHook *shptr)
  1.4504  {
  1.4505  	SH__CALL_GET_VFNPTR_NORMAL
  1.4506 -	return SourceHook::ExecutableClass2<typename CCW<Y>::type, MFP, RetType, Param1, Param2>(CCW<Y>::GRP(ptr),
  1.4507 -		mfp, vfnptr, shptr, plug);
  1.4508 +	return SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>(ptr, mfp, vfnptr, shptr);
  1.4509  }
  1.4510  
  1.4511  template <class X, class Y, class MFP, class RetType, class Param1, class Param2>
  1.4512 -SourceHook::ExecutableClass2<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2>
  1.4513 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4514 +SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>
  1.4515 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2)const, SourceHook::ISourceHook *shptr)
  1.4516  {
  1.4517  	SH__CALL_GET_VFNPTR_NORMAL
  1.4518 -	return SourceHook::ExecutableClass2<typename CCW<Y>::type, MFP, RetType, Param1, Param2>(CCW<Y>::GRP(ptr),
  1.4519 -		mfp, vfnptr, shptr, plug);
  1.4520 +	return SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>(ptr, mfp, vfnptr, shptr);
  1.4521  }
  1.4522  
  1.4523  template <class X, class Y, class MFP, class RetType, class Param1, class Param2>
  1.4524  SourceHook::ExecutableClass2<SourceHook::EmptyClass, MFP, RetType, Param1, Param2>
  1.4525 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4526 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4527  {
  1.4528  	SH__CALL_GET_VFNPTR_MANUAL
  1.4529  	return SourceHook::ExecutableClass2<EmptyClass, MFP, RetType, Param1, Param2>(
  1.4530 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4531 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4532  }
  1.4533  
  1.4534  // Support for 3 arguments
  1.4535  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3>
  1.4536 -SourceHook::ExecutableClass3<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>
  1.4537 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4538 +SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>
  1.4539 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3), SourceHook::ISourceHook *shptr)
  1.4540  {
  1.4541  	SH__CALL_GET_VFNPTR_NORMAL
  1.4542 -	return SourceHook::ExecutableClass3<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>(CCW<Y>::GRP(ptr),
  1.4543 -		mfp, vfnptr, shptr, plug);
  1.4544 +	return SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>(ptr, mfp, vfnptr, shptr);
  1.4545  }
  1.4546  
  1.4547  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3>
  1.4548 -SourceHook::ExecutableClass3<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>
  1.4549 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4550 +SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>
  1.4551 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3)const, SourceHook::ISourceHook *shptr)
  1.4552  {
  1.4553  	SH__CALL_GET_VFNPTR_NORMAL
  1.4554 -	return SourceHook::ExecutableClass3<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>(CCW<Y>::GRP(ptr),
  1.4555 -		mfp, vfnptr, shptr, plug);
  1.4556 +	return SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>(ptr, mfp, vfnptr, shptr);
  1.4557  }
  1.4558  
  1.4559  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3>
  1.4560  SourceHook::ExecutableClass3<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3>
  1.4561 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4562 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4563  {
  1.4564  	SH__CALL_GET_VFNPTR_MANUAL
  1.4565  	return SourceHook::ExecutableClass3<EmptyClass, MFP, RetType, Param1, Param2, Param3>(
  1.4566 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4567 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4568  }
  1.4569  
  1.4570  // Support for 4 arguments
  1.4571  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4>
  1.4572 -SourceHook::ExecutableClass4<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>
  1.4573 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4574 +SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>
  1.4575 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4), SourceHook::ISourceHook *shptr)
  1.4576  {
  1.4577  	SH__CALL_GET_VFNPTR_NORMAL
  1.4578 -	return SourceHook::ExecutableClass4<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>(CCW<Y>::GRP(ptr),
  1.4579 -		mfp, vfnptr, shptr, plug);
  1.4580 +	return SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>(ptr, mfp, vfnptr, shptr);
  1.4581  }
  1.4582  
  1.4583  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4>
  1.4584 -SourceHook::ExecutableClass4<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>
  1.4585 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4586 +SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>
  1.4587 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4)const, SourceHook::ISourceHook *shptr)
  1.4588  {
  1.4589  	SH__CALL_GET_VFNPTR_NORMAL
  1.4590 -	return SourceHook::ExecutableClass4<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>(CCW<Y>::GRP(ptr),
  1.4591 -		mfp, vfnptr, shptr, plug);
  1.4592 +	return SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>(ptr, mfp, vfnptr, shptr);
  1.4593  }
  1.4594  
  1.4595  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4>
  1.4596  SourceHook::ExecutableClass4<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4>
  1.4597 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4598 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4599  {
  1.4600  	SH__CALL_GET_VFNPTR_MANUAL
  1.4601  	return SourceHook::ExecutableClass4<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4>(
  1.4602 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4603 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4604  }
  1.4605  
  1.4606  // Support for 5 arguments
  1.4607  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  1.4608 -SourceHook::ExecutableClass5<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.4609 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4610 +SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.4611 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5), SourceHook::ISourceHook *shptr)
  1.4612  {
  1.4613  	SH__CALL_GET_VFNPTR_NORMAL
  1.4614 -	return SourceHook::ExecutableClass5<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(CCW<Y>::GRP(ptr),
  1.4615 -		mfp, vfnptr, shptr, plug);
  1.4616 +	return SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(ptr, mfp, vfnptr, shptr);
  1.4617  }
  1.4618  
  1.4619  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  1.4620 -SourceHook::ExecutableClass5<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.4621 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4622 +SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.4623 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5)const, SourceHook::ISourceHook *shptr)
  1.4624  {
  1.4625  	SH__CALL_GET_VFNPTR_NORMAL
  1.4626 -	return SourceHook::ExecutableClass5<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(CCW<Y>::GRP(ptr),
  1.4627 -		mfp, vfnptr, shptr, plug);
  1.4628 +	return SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(ptr, mfp, vfnptr, shptr);
  1.4629  }
  1.4630  
  1.4631  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  1.4632  SourceHook::ExecutableClass5<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.4633 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4634 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4635  {
  1.4636  	SH__CALL_GET_VFNPTR_MANUAL
  1.4637  	return SourceHook::ExecutableClass5<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(
  1.4638 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4639 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4640  }
  1.4641  
  1.4642  // Support for 6 arguments
  1.4643  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  1.4644 -SourceHook::ExecutableClass6<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.4645 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4646 +SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.4647 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6), SourceHook::ISourceHook *shptr)
  1.4648  {
  1.4649  	SH__CALL_GET_VFNPTR_NORMAL
  1.4650 -	return SourceHook::ExecutableClass6<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(CCW<Y>::GRP(ptr),
  1.4651 -		mfp, vfnptr, shptr, plug);
  1.4652 +	return SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(ptr, mfp, vfnptr, shptr);
  1.4653  }
  1.4654  
  1.4655  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  1.4656 -SourceHook::ExecutableClass6<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.4657 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4658 +SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.4659 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6)const, SourceHook::ISourceHook *shptr)
  1.4660  {
  1.4661  	SH__CALL_GET_VFNPTR_NORMAL
  1.4662 -	return SourceHook::ExecutableClass6<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(CCW<Y>::GRP(ptr),
  1.4663 -		mfp, vfnptr, shptr, plug);
  1.4664 +	return SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(ptr, mfp, vfnptr, shptr);
  1.4665  }
  1.4666  
  1.4667  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  1.4668  SourceHook::ExecutableClass6<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.4669 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4670 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4671  {
  1.4672  	SH__CALL_GET_VFNPTR_MANUAL
  1.4673  	return SourceHook::ExecutableClass6<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(
  1.4674 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4675 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4676  }
  1.4677  
  1.4678  // Support for 7 arguments
  1.4679  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  1.4680 -SourceHook::ExecutableClass7<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.4681 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4682 +SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.4683 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7), SourceHook::ISourceHook *shptr)
  1.4684  {
  1.4685  	SH__CALL_GET_VFNPTR_NORMAL
  1.4686 -	return SourceHook::ExecutableClass7<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(CCW<Y>::GRP(ptr),
  1.4687 -		mfp, vfnptr, shptr, plug);
  1.4688 +	return SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(ptr, mfp, vfnptr, shptr);
  1.4689  }
  1.4690  
  1.4691  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  1.4692 -SourceHook::ExecutableClass7<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.4693 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4694 +SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.4695 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)const, SourceHook::ISourceHook *shptr)
  1.4696  {
  1.4697  	SH__CALL_GET_VFNPTR_NORMAL
  1.4698 -	return SourceHook::ExecutableClass7<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(CCW<Y>::GRP(ptr),
  1.4699 -		mfp, vfnptr, shptr, plug);
  1.4700 +	return SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(ptr, mfp, vfnptr, shptr);
  1.4701  }
  1.4702  
  1.4703  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  1.4704  SourceHook::ExecutableClass7<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.4705 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4706 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4707  {
  1.4708  	SH__CALL_GET_VFNPTR_MANUAL
  1.4709  	return SourceHook::ExecutableClass7<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(
  1.4710 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4711 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4712  }
  1.4713  
  1.4714  // Support for 8 arguments
  1.4715  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  1.4716 -SourceHook::ExecutableClass8<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.4717 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4718 +SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.4719 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8), SourceHook::ISourceHook *shptr)
  1.4720  {
  1.4721  	SH__CALL_GET_VFNPTR_NORMAL
  1.4722 -	return SourceHook::ExecutableClass8<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(CCW<Y>::GRP(ptr),
  1.4723 -		mfp, vfnptr, shptr, plug);
  1.4724 +	return SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(ptr, mfp, vfnptr, shptr);
  1.4725  }
  1.4726  
  1.4727  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  1.4728 -SourceHook::ExecutableClass8<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.4729 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4730 +SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.4731 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)const, SourceHook::ISourceHook *shptr)
  1.4732  {
  1.4733  	SH__CALL_GET_VFNPTR_NORMAL
  1.4734 -	return SourceHook::ExecutableClass8<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(CCW<Y>::GRP(ptr),
  1.4735 -		mfp, vfnptr, shptr, plug);
  1.4736 +	return SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(ptr, mfp, vfnptr, shptr);
  1.4737  }
  1.4738  
  1.4739  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  1.4740  SourceHook::ExecutableClass8<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.4741 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4742 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4743  {
  1.4744  	SH__CALL_GET_VFNPTR_MANUAL
  1.4745  	return SourceHook::ExecutableClass8<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(
  1.4746 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4747 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4748  }
  1.4749  
  1.4750  // Support for 9 arguments
  1.4751  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
  1.4752 -SourceHook::ExecutableClass9<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.4753 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4754 +SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.4755 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9), SourceHook::ISourceHook *shptr)
  1.4756  {
  1.4757  	SH__CALL_GET_VFNPTR_NORMAL
  1.4758 -	return SourceHook::ExecutableClass9<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(CCW<Y>::GRP(ptr),
  1.4759 -		mfp, vfnptr, shptr, plug);
  1.4760 +	return SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(ptr, mfp, vfnptr, shptr);
  1.4761  }
  1.4762  
  1.4763  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
  1.4764 -SourceHook::ExecutableClass9<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.4765 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4766 +SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.4767 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)const, SourceHook::ISourceHook *shptr)
  1.4768  {
  1.4769  	SH__CALL_GET_VFNPTR_NORMAL
  1.4770 -	return SourceHook::ExecutableClass9<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(CCW<Y>::GRP(ptr),
  1.4771 -		mfp, vfnptr, shptr, plug);
  1.4772 +	return SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(ptr, mfp, vfnptr, shptr);
  1.4773  }
  1.4774  
  1.4775  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
  1.4776  SourceHook::ExecutableClass9<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.4777 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4778 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4779  {
  1.4780  	SH__CALL_GET_VFNPTR_MANUAL
  1.4781  	return SourceHook::ExecutableClass9<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(
  1.4782 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4783 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4784  }
  1.4785  
  1.4786  // Support for 10 arguments
  1.4787  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
  1.4788 -SourceHook::ExecutableClass10<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.4789 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4790 +SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.4791 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10), SourceHook::ISourceHook *shptr)
  1.4792  {
  1.4793  	SH__CALL_GET_VFNPTR_NORMAL
  1.4794 -	return SourceHook::ExecutableClass10<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(CCW<Y>::GRP(ptr),
  1.4795 -		mfp, vfnptr, shptr, plug);
  1.4796 +	return SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(ptr, mfp, vfnptr, shptr);
  1.4797  }
  1.4798  
  1.4799  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
  1.4800 -SourceHook::ExecutableClass10<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.4801 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4802 +SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.4803 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)const, SourceHook::ISourceHook *shptr)
  1.4804  {
  1.4805  	SH__CALL_GET_VFNPTR_NORMAL
  1.4806 -	return SourceHook::ExecutableClass10<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(CCW<Y>::GRP(ptr),
  1.4807 -		mfp, vfnptr, shptr, plug);
  1.4808 +	return SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(ptr, mfp, vfnptr, shptr);
  1.4809  }
  1.4810  
  1.4811  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
  1.4812  SourceHook::ExecutableClass10<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.4813 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4814 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4815  {
  1.4816  	SH__CALL_GET_VFNPTR_MANUAL
  1.4817  	return SourceHook::ExecutableClass10<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(
  1.4818 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4819 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4820  }
  1.4821  
  1.4822  // Support for 11 arguments
  1.4823  template <class X, class Y, class MFP, 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.4824 -SourceHook::ExecutableClass11<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.4825 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4826 +SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.4827 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11), SourceHook::ISourceHook *shptr)
  1.4828  {
  1.4829  	SH__CALL_GET_VFNPTR_NORMAL
  1.4830 -	return SourceHook::ExecutableClass11<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(CCW<Y>::GRP(ptr),
  1.4831 -		mfp, vfnptr, shptr, plug);
  1.4832 +	return SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(ptr, mfp, vfnptr, shptr);
  1.4833  }
  1.4834  
  1.4835  template <class X, class Y, class MFP, 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.4836 -SourceHook::ExecutableClass11<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.4837 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4838 +SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.4839 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)const, SourceHook::ISourceHook *shptr)
  1.4840  {
  1.4841  	SH__CALL_GET_VFNPTR_NORMAL
  1.4842 -	return SourceHook::ExecutableClass11<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(CCW<Y>::GRP(ptr),
  1.4843 -		mfp, vfnptr, shptr, plug);
  1.4844 +	return SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(ptr, mfp, vfnptr, shptr);
  1.4845  }
  1.4846  
  1.4847  template <class X, class Y, class MFP, 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.4848  SourceHook::ExecutableClass11<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.4849 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4850 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4851  {
  1.4852  	SH__CALL_GET_VFNPTR_MANUAL
  1.4853  	return SourceHook::ExecutableClass11<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(
  1.4854 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4855 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4856  }
  1.4857  
  1.4858  // Support for 12 arguments
  1.4859  template <class X, class Y, class MFP, 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.4860 -SourceHook::ExecutableClass12<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4861 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4862 +SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4863 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12), SourceHook::ISourceHook *shptr)
  1.4864  {
  1.4865  	SH__CALL_GET_VFNPTR_NORMAL
  1.4866 -	return SourceHook::ExecutableClass12<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(CCW<Y>::GRP(ptr),
  1.4867 -		mfp, vfnptr, shptr, plug);
  1.4868 +	return SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(ptr, mfp, vfnptr, shptr);
  1.4869  }
  1.4870  
  1.4871  template <class X, class Y, class MFP, 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.4872 -SourceHook::ExecutableClass12<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4873 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4874 +SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4875 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)const, SourceHook::ISourceHook *shptr)
  1.4876  {
  1.4877  	SH__CALL_GET_VFNPTR_NORMAL
  1.4878 -	return SourceHook::ExecutableClass12<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(CCW<Y>::GRP(ptr),
  1.4879 -		mfp, vfnptr, shptr, plug);
  1.4880 +	return SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(ptr, mfp, vfnptr, shptr);
  1.4881  }
  1.4882  
  1.4883  template <class X, class Y, class MFP, 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.4884  SourceHook::ExecutableClass12<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.4885 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4886 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4887  {
  1.4888  	SH__CALL_GET_VFNPTR_MANUAL
  1.4889  	return SourceHook::ExecutableClass12<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(
  1.4890 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4891 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4892  }
  1.4893  
  1.4894  // Support for 13 arguments
  1.4895  template <class X, class Y, class MFP, 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.4896 -SourceHook::ExecutableClass13<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4897 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4898 +SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4899 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13), SourceHook::ISourceHook *shptr)
  1.4900  {
  1.4901  	SH__CALL_GET_VFNPTR_NORMAL
  1.4902 -	return SourceHook::ExecutableClass13<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(CCW<Y>::GRP(ptr),
  1.4903 -		mfp, vfnptr, shptr, plug);
  1.4904 +	return SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(ptr, mfp, vfnptr, shptr);
  1.4905  }
  1.4906  
  1.4907  template <class X, class Y, class MFP, 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.4908 -SourceHook::ExecutableClass13<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4909 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4910 +SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4911 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)const, SourceHook::ISourceHook *shptr)
  1.4912  {
  1.4913  	SH__CALL_GET_VFNPTR_NORMAL
  1.4914 -	return SourceHook::ExecutableClass13<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(CCW<Y>::GRP(ptr),
  1.4915 -		mfp, vfnptr, shptr, plug);
  1.4916 +	return SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(ptr, mfp, vfnptr, shptr);
  1.4917  }
  1.4918  
  1.4919  template <class X, class Y, class MFP, 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.4920  SourceHook::ExecutableClass13<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.4921 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4922 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4923  {
  1.4924  	SH__CALL_GET_VFNPTR_MANUAL
  1.4925  	return SourceHook::ExecutableClass13<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(
  1.4926 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4927 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4928  }
  1.4929  
  1.4930  // Support for 14 arguments
  1.4931  template <class X, class Y, class MFP, 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.4932 -SourceHook::ExecutableClass14<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4933 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4934 +SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4935 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14), SourceHook::ISourceHook *shptr)
  1.4936  {
  1.4937  	SH__CALL_GET_VFNPTR_NORMAL
  1.4938 -	return SourceHook::ExecutableClass14<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(CCW<Y>::GRP(ptr),
  1.4939 -		mfp, vfnptr, shptr, plug);
  1.4940 +	return SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(ptr, mfp, vfnptr, shptr);
  1.4941  }
  1.4942  
  1.4943  template <class X, class Y, class MFP, 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.4944 -SourceHook::ExecutableClass14<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4945 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4946 +SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4947 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)const, SourceHook::ISourceHook *shptr)
  1.4948  {
  1.4949  	SH__CALL_GET_VFNPTR_NORMAL
  1.4950 -	return SourceHook::ExecutableClass14<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(CCW<Y>::GRP(ptr),
  1.4951 -		mfp, vfnptr, shptr, plug);
  1.4952 +	return SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(ptr, mfp, vfnptr, shptr);
  1.4953  }
  1.4954  
  1.4955  template <class X, class Y, class MFP, 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.4956  SourceHook::ExecutableClass14<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.4957 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4958 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4959  {
  1.4960  	SH__CALL_GET_VFNPTR_MANUAL
  1.4961  	return SourceHook::ExecutableClass14<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(
  1.4962 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4963 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.4964  }
  1.4965  
  1.4966  // Support for 15 arguments
  1.4967  template <class X, class Y, class MFP, 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.4968 -SourceHook::ExecutableClass15<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4969 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4970 +SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4971 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15), SourceHook::ISourceHook *shptr)
  1.4972  {
  1.4973  	SH__CALL_GET_VFNPTR_NORMAL
  1.4974 -	return SourceHook::ExecutableClass15<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(CCW<Y>::GRP(ptr),
  1.4975 -		mfp, vfnptr, shptr, plug);
  1.4976 +	return SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(ptr, mfp, vfnptr, shptr);
  1.4977  }
  1.4978  
  1.4979  template <class X, class Y, class MFP, 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.4980 -SourceHook::ExecutableClass15<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4981 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4982 +SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4983 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)const, SourceHook::ISourceHook *shptr)
  1.4984  {
  1.4985  	SH__CALL_GET_VFNPTR_NORMAL
  1.4986 -	return SourceHook::ExecutableClass15<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(CCW<Y>::GRP(ptr),
  1.4987 -		mfp, vfnptr, shptr, plug);
  1.4988 +	return SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(ptr, mfp, vfnptr, shptr);
  1.4989  }
  1.4990  
  1.4991  template <class X, class Y, class MFP, 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.4992  SourceHook::ExecutableClass15<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.4993 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.4994 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.4995  {
  1.4996  	SH__CALL_GET_VFNPTR_MANUAL
  1.4997  	return SourceHook::ExecutableClass15<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(
  1.4998 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.4999 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.5000  }
  1.5001  
  1.5002  // Support for 16 arguments
  1.5003  template <class X, class Y, class MFP, 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.5004 -SourceHook::ExecutableClass16<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5005 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5006 +SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5007 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16), SourceHook::ISourceHook *shptr)
  1.5008  {
  1.5009  	SH__CALL_GET_VFNPTR_NORMAL
  1.5010 -	return SourceHook::ExecutableClass16<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(CCW<Y>::GRP(ptr),
  1.5011 -		mfp, vfnptr, shptr, plug);
  1.5012 +	return SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(ptr, mfp, vfnptr, shptr);
  1.5013  }
  1.5014  
  1.5015  template <class X, class Y, class MFP, 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.5016 -SourceHook::ExecutableClass16<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5017 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5018 +SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5019 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)const, SourceHook::ISourceHook *shptr)
  1.5020  {
  1.5021  	SH__CALL_GET_VFNPTR_NORMAL
  1.5022 -	return SourceHook::ExecutableClass16<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(CCW<Y>::GRP(ptr),
  1.5023 -		mfp, vfnptr, shptr, plug);
  1.5024 +	return SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(ptr, mfp, vfnptr, shptr);
  1.5025  }
  1.5026  
  1.5027  template <class X, class Y, class MFP, 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.5028  SourceHook::ExecutableClass16<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5029 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5030 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.5031  {
  1.5032  	SH__CALL_GET_VFNPTR_MANUAL
  1.5033  	return SourceHook::ExecutableClass16<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(
  1.5034 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.5035 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.5036  }
  1.5037  
  1.5038  // Support for 17 arguments
  1.5039  template <class X, class Y, class MFP, 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, class Param17>
  1.5040 -SourceHook::ExecutableClass17<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5041 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5042 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5043 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), SourceHook::ISourceHook *shptr)
  1.5044  {
  1.5045  	SH__CALL_GET_VFNPTR_NORMAL
  1.5046 -	return SourceHook::ExecutableClass17<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(CCW<Y>::GRP(ptr),
  1.5047 -		mfp, vfnptr, shptr, plug);
  1.5048 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  1.5049  }
  1.5050  
  1.5051  template <class X, class Y, class MFP, 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, class Param17>
  1.5052 -SourceHook::ExecutableClass17<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5053 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5054 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5055 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17)const, SourceHook::ISourceHook *shptr)
  1.5056  {
  1.5057  	SH__CALL_GET_VFNPTR_NORMAL
  1.5058 -	return SourceHook::ExecutableClass17<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(CCW<Y>::GRP(ptr),
  1.5059 -		mfp, vfnptr, shptr, plug);
  1.5060 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  1.5061  }
  1.5062  
  1.5063  template <class X, class Y, class MFP, 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, class Param17>
  1.5064  SourceHook::ExecutableClass17<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5065 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5066 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.5067  {
  1.5068  	SH__CALL_GET_VFNPTR_MANUAL
  1.5069  	return SourceHook::ExecutableClass17<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(
  1.5070 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.5071 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.5072  }
  1.5073  
  1.5074  // Support for 18 arguments
  1.5075  template <class X, class Y, class MFP, 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, class Param17, class Param18>
  1.5076 -SourceHook::ExecutableClass18<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5077 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5078 +SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5079 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18), SourceHook::ISourceHook *shptr)
  1.5080  {
  1.5081  	SH__CALL_GET_VFNPTR_NORMAL
  1.5082 -	return SourceHook::ExecutableClass18<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(CCW<Y>::GRP(ptr),
  1.5083 -		mfp, vfnptr, shptr, plug);
  1.5084 +	return SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(ptr, mfp, vfnptr, shptr);
  1.5085  }
  1.5086  
  1.5087  template <class X, class Y, class MFP, 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, class Param17, class Param18>
  1.5088 -SourceHook::ExecutableClass18<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5089 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5090 +SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5091 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18)const, SourceHook::ISourceHook *shptr)
  1.5092  {
  1.5093  	SH__CALL_GET_VFNPTR_NORMAL
  1.5094 -	return SourceHook::ExecutableClass18<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(CCW<Y>::GRP(ptr),
  1.5095 -		mfp, vfnptr, shptr, plug);
  1.5096 +	return SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(ptr, mfp, vfnptr, shptr);
  1.5097  }
  1.5098  
  1.5099  template <class X, class Y, class MFP, 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, class Param17, class Param18>
  1.5100  SourceHook::ExecutableClass18<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5101 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5102 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.5103  {
  1.5104  	SH__CALL_GET_VFNPTR_MANUAL
  1.5105  	return SourceHook::ExecutableClass18<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(
  1.5106 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.5107 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.5108  }
  1.5109  
  1.5110  // Support for 19 arguments
  1.5111  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19>
  1.5112 -SourceHook::ExecutableClass19<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5113 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5114 +SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5115 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19), SourceHook::ISourceHook *shptr)
  1.5116  {
  1.5117  	SH__CALL_GET_VFNPTR_NORMAL
  1.5118 -	return SourceHook::ExecutableClass19<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(CCW<Y>::GRP(ptr),
  1.5119 -		mfp, vfnptr, shptr, plug);
  1.5120 +	return SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(ptr, mfp, vfnptr, shptr);
  1.5121  }
  1.5122  
  1.5123  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19>
  1.5124 -SourceHook::ExecutableClass19<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5125 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5126 +SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5127 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19)const, SourceHook::ISourceHook *shptr)
  1.5128  {
  1.5129  	SH__CALL_GET_VFNPTR_NORMAL
  1.5130 -	return SourceHook::ExecutableClass19<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(CCW<Y>::GRP(ptr),
  1.5131 -		mfp, vfnptr, shptr, plug);
  1.5132 +	return SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(ptr, mfp, vfnptr, shptr);
  1.5133  }
  1.5134  
  1.5135  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19>
  1.5136  SourceHook::ExecutableClass19<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5137 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5138 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.5139  {
  1.5140  	SH__CALL_GET_VFNPTR_MANUAL
  1.5141  	return SourceHook::ExecutableClass19<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(
  1.5142 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.5143 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.5144  }
  1.5145  
  1.5146  // Support for 20 arguments
  1.5147  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19, class Param20>
  1.5148 -SourceHook::ExecutableClass20<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5149 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5150 +SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5151 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20), SourceHook::ISourceHook *shptr)
  1.5152  {
  1.5153  	SH__CALL_GET_VFNPTR_NORMAL
  1.5154 -	return SourceHook::ExecutableClass20<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(CCW<Y>::GRP(ptr),
  1.5155 -		mfp, vfnptr, shptr, plug);
  1.5156 +	return SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(ptr, mfp, vfnptr, shptr);
  1.5157  }
  1.5158  
  1.5159  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19, class Param20>
  1.5160 -SourceHook::ExecutableClass20<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5161 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5162 +SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5163 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20)const, SourceHook::ISourceHook *shptr)
  1.5164  {
  1.5165  	SH__CALL_GET_VFNPTR_NORMAL
  1.5166 -	return SourceHook::ExecutableClass20<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(CCW<Y>::GRP(ptr),
  1.5167 -		mfp, vfnptr, shptr, plug);
  1.5168 +	return SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(ptr, mfp, vfnptr, shptr);
  1.5169  }
  1.5170  
  1.5171  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19, class Param20>
  1.5172  SourceHook::ExecutableClass20<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5173 -SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5174 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  1.5175  {
  1.5176  	SH__CALL_GET_VFNPTR_MANUAL
  1.5177  	return SourceHook::ExecutableClass20<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(
  1.5178 -		reinterpret_cast<SourceHook::EmptyClass*>(CCW<Y>::GRP(ptr)), mfp, vfnptr, shptr, plug);
  1.5179 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  1.5180  }
  1.5181  
  1.5182  
  1.5183 @@ -5813,433 +5598,392 @@
  1.5184  
  1.5185  // Support for 0 arguments
  1.5186  template <class X, class Y, class MFP, class RetType>
  1.5187 -SourceHook::ExecutableClass0<typename SourceHook::CCW<Y>::type, MFP, RetType>
  1.5188 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5189 +SourceHook::ExecutableClass0<Y, MFP, RetType>
  1.5190 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(...), SourceHook::ISourceHook *shptr)
  1.5191  {
  1.5192  	SH__CALL_GET_VFNPTR_NORMAL
  1.5193 -	return SourceHook::ExecutableClass0<typename CCW<Y>::type, MFP, RetType>(CCW<Y>::GRP(ptr),
  1.5194 -		mfp, vfnptr, shptr, plug);
  1.5195 +	return SourceHook::ExecutableClass0<Y, MFP, RetType>(ptr, mfp, vfnptr, shptr);
  1.5196  }
  1.5197  
  1.5198  template <class X, class Y, class MFP, class RetType>
  1.5199 -SourceHook::ExecutableClass0<typename SourceHook::CCW<Y>::type, MFP, RetType>
  1.5200 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5201 +SourceHook::ExecutableClass0<Y, MFP, RetType>
  1.5202 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(...)const, SourceHook::ISourceHook *shptr)
  1.5203  {
  1.5204  	SH__CALL_GET_VFNPTR_NORMAL
  1.5205 -	return SourceHook::ExecutableClass0<typename CCW<Y>::type, MFP, RetType>(CCW<Y>::GRP(ptr),
  1.5206 -		mfp, vfnptr, shptr, plug);
  1.5207 +	return SourceHook::ExecutableClass0<Y, MFP, RetType>(ptr, mfp, vfnptr, shptr);
  1.5208  }
  1.5209  
  1.5210  
  1.5211  // Support for 1 arguments
  1.5212  template <class X, class Y, class MFP, class RetType, class Param1>
  1.5213 -SourceHook::ExecutableClass1<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1>
  1.5214 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5215 +SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>
  1.5216 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, ...), SourceHook::ISourceHook *shptr)
  1.5217  {
  1.5218  	SH__CALL_GET_VFNPTR_NORMAL
  1.5219 -	return SourceHook::ExecutableClass1<typename CCW<Y>::type, MFP, RetType, Param1>(CCW<Y>::GRP(ptr),
  1.5220 -		mfp, vfnptr, shptr, plug);
  1.5221 +	return SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>(ptr, mfp, vfnptr, shptr);
  1.5222  }
  1.5223  
  1.5224  template <class X, class Y, class MFP, class RetType, class Param1>
  1.5225 -SourceHook::ExecutableClass1<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1>
  1.5226 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5227 +SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>
  1.5228 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, ...)const, SourceHook::ISourceHook *shptr)
  1.5229  {
  1.5230  	SH__CALL_GET_VFNPTR_NORMAL
  1.5231 -	return SourceHook::ExecutableClass1<typename CCW<Y>::type, MFP, RetType, Param1>(CCW<Y>::GRP(ptr),
  1.5232 -		mfp, vfnptr, shptr, plug);
  1.5233 +	return SourceHook::ExecutableClass1<Y, MFP, RetType, Param1>(ptr, mfp, vfnptr, shptr);
  1.5234  }
  1.5235  
  1.5236  
  1.5237  // Support for 2 arguments
  1.5238  template <class X, class Y, class MFP, class RetType, class Param1, class Param2>
  1.5239 -SourceHook::ExecutableClass2<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2>
  1.5240 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5241 +SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>
  1.5242 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, ...), SourceHook::ISourceHook *shptr)
  1.5243  {
  1.5244  	SH__CALL_GET_VFNPTR_NORMAL
  1.5245 -	return SourceHook::ExecutableClass2<typename CCW<Y>::type, MFP, RetType, Param1, Param2>(CCW<Y>::GRP(ptr),
  1.5246 -		mfp, vfnptr, shptr, plug);
  1.5247 +	return SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>(ptr, mfp, vfnptr, shptr);
  1.5248  }
  1.5249  
  1.5250  template <class X, class Y, class MFP, class RetType, class Param1, class Param2>
  1.5251 -SourceHook::ExecutableClass2<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2>
  1.5252 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5253 +SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>
  1.5254 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, ...)const, SourceHook::ISourceHook *shptr)
  1.5255  {
  1.5256  	SH__CALL_GET_VFNPTR_NORMAL
  1.5257 -	return SourceHook::ExecutableClass2<typename CCW<Y>::type, MFP, RetType, Param1, Param2>(CCW<Y>::GRP(ptr),
  1.5258 -		mfp, vfnptr, shptr, plug);
  1.5259 +	return SourceHook::ExecutableClass2<Y, MFP, RetType, Param1, Param2>(ptr, mfp, vfnptr, shptr);
  1.5260  }
  1.5261  
  1.5262  
  1.5263  // Support for 3 arguments
  1.5264  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3>
  1.5265 -SourceHook::ExecutableClass3<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>
  1.5266 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5267 +SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>
  1.5268 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, ...), SourceHook::ISourceHook *shptr)
  1.5269  {
  1.5270  	SH__CALL_GET_VFNPTR_NORMAL
  1.5271 -	return SourceHook::ExecutableClass3<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>(CCW<Y>::GRP(ptr),
  1.5272 -		mfp, vfnptr, shptr, plug);
  1.5273 +	return SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>(ptr, mfp, vfnptr, shptr);
  1.5274  }
  1.5275  
  1.5276  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3>
  1.5277 -SourceHook::ExecutableClass3<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>
  1.5278 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5279 +SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>
  1.5280 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, ...)const, SourceHook::ISourceHook *shptr)
  1.5281  {
  1.5282  	SH__CALL_GET_VFNPTR_NORMAL
  1.5283 -	return SourceHook::ExecutableClass3<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3>(CCW<Y>::GRP(ptr),
  1.5284 -		mfp, vfnptr, shptr, plug);
  1.5285 +	return SourceHook::ExecutableClass3<Y, MFP, RetType, Param1, Param2, Param3>(ptr, mfp, vfnptr, shptr);
  1.5286  }
  1.5287  
  1.5288  
  1.5289  // Support for 4 arguments
  1.5290  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4>
  1.5291 -SourceHook::ExecutableClass4<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>
  1.5292 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5293 +SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>
  1.5294 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, ...), SourceHook::ISourceHook *shptr)
  1.5295  {
  1.5296  	SH__CALL_GET_VFNPTR_NORMAL
  1.5297 -	return SourceHook::ExecutableClass4<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>(CCW<Y>::GRP(ptr),
  1.5298 -		mfp, vfnptr, shptr, plug);
  1.5299 +	return SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>(ptr, mfp, vfnptr, shptr);
  1.5300  }
  1.5301  
  1.5302  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4>
  1.5303 -SourceHook::ExecutableClass4<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>
  1.5304 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5305 +SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>
  1.5306 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, ...)const, SourceHook::ISourceHook *shptr)
  1.5307  {
  1.5308  	SH__CALL_GET_VFNPTR_NORMAL
  1.5309 -	return SourceHook::ExecutableClass4<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4>(CCW<Y>::GRP(ptr),
  1.5310 -		mfp, vfnptr, shptr, plug);
  1.5311 +	return SourceHook::ExecutableClass4<Y, MFP, RetType, Param1, Param2, Param3, Param4>(ptr, mfp, vfnptr, shptr);
  1.5312  }
  1.5313  
  1.5314  
  1.5315  // Support for 5 arguments
  1.5316  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  1.5317 -SourceHook::ExecutableClass5<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.5318 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5319 +SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.5320 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...), SourceHook::ISourceHook *shptr)
  1.5321  {
  1.5322  	SH__CALL_GET_VFNPTR_NORMAL
  1.5323 -	return SourceHook::ExecutableClass5<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(CCW<Y>::GRP(ptr),
  1.5324 -		mfp, vfnptr, shptr, plug);
  1.5325 +	return SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(ptr, mfp, vfnptr, shptr);
  1.5326  }
  1.5327  
  1.5328  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
  1.5329 -SourceHook::ExecutableClass5<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.5330 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5331 +SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>
  1.5332 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...)const, SourceHook::ISourceHook *shptr)
  1.5333  {
  1.5334  	SH__CALL_GET_VFNPTR_NORMAL
  1.5335 -	return SourceHook::ExecutableClass5<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(CCW<Y>::GRP(ptr),
  1.5336 -		mfp, vfnptr, shptr, plug);
  1.5337 +	return SourceHook::ExecutableClass5<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5>(ptr, mfp, vfnptr, shptr);
  1.5338  }
  1.5339  
  1.5340  
  1.5341  // Support for 6 arguments
  1.5342  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  1.5343 -SourceHook::ExecutableClass6<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.5344 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5345 +SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.5346 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...), SourceHook::ISourceHook *shptr)
  1.5347  {
  1.5348  	SH__CALL_GET_VFNPTR_NORMAL
  1.5349 -	return SourceHook::ExecutableClass6<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(CCW<Y>::GRP(ptr),
  1.5350 -		mfp, vfnptr, shptr, plug);
  1.5351 +	return SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(ptr, mfp, vfnptr, shptr);
  1.5352  }
  1.5353  
  1.5354  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
  1.5355 -SourceHook::ExecutableClass6<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.5356 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5357 +SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>
  1.5358 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...)const, SourceHook::ISourceHook *shptr)
  1.5359  {
  1.5360  	SH__CALL_GET_VFNPTR_NORMAL
  1.5361 -	return SourceHook::ExecutableClass6<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(CCW<Y>::GRP(ptr),
  1.5362 -		mfp, vfnptr, shptr, plug);
  1.5363 +	return SourceHook::ExecutableClass6<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6>(ptr, mfp, vfnptr, shptr);
  1.5364  }
  1.5365  
  1.5366  
  1.5367  // Support for 7 arguments
  1.5368  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  1.5369 -SourceHook::ExecutableClass7<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.5370 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5371 +SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.5372 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...), SourceHook::ISourceHook *shptr)
  1.5373  {
  1.5374  	SH__CALL_GET_VFNPTR_NORMAL
  1.5375 -	return SourceHook::ExecutableClass7<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(CCW<Y>::GRP(ptr),
  1.5376 -		mfp, vfnptr, shptr, plug);
  1.5377 +	return SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(ptr, mfp, vfnptr, shptr);
  1.5378  }
  1.5379  
  1.5380  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
  1.5381 -SourceHook::ExecutableClass7<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.5382 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5383 +SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>
  1.5384 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)const, SourceHook::ISourceHook *shptr)
  1.5385  {
  1.5386  	SH__CALL_GET_VFNPTR_NORMAL
  1.5387 -	return SourceHook::ExecutableClass7<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(CCW<Y>::GRP(ptr),
  1.5388 -		mfp, vfnptr, shptr, plug);
  1.5389 +	return SourceHook::ExecutableClass7<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>(ptr, mfp, vfnptr, shptr);
  1.5390  }
  1.5391  
  1.5392  
  1.5393  // Support for 8 arguments
  1.5394  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  1.5395 -SourceHook::ExecutableClass8<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.5396 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5397 +SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.5398 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...), SourceHook::ISourceHook *shptr)
  1.5399  {
  1.5400  	SH__CALL_GET_VFNPTR_NORMAL
  1.5401 -	return SourceHook::ExecutableClass8<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(CCW<Y>::GRP(ptr),
  1.5402 -		mfp, vfnptr, shptr, plug);
  1.5403 +	return SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(ptr, mfp, vfnptr, shptr);
  1.5404  }
  1.5405  
  1.5406  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
  1.5407 -SourceHook::ExecutableClass8<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.5408 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5409 +SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>
  1.5410 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)const, SourceHook::ISourceHook *shptr)
  1.5411  {
  1.5412  	SH__CALL_GET_VFNPTR_NORMAL
  1.5413 -	return SourceHook::ExecutableClass8<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(CCW<Y>::GRP(ptr),
  1.5414 -		mfp, vfnptr, shptr, plug);
  1.5415 +	return SourceHook::ExecutableClass8<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>(ptr, mfp, vfnptr, shptr);
  1.5416  }
  1.5417  
  1.5418  
  1.5419  // Support for 9 arguments
  1.5420  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
  1.5421 -SourceHook::ExecutableClass9<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.5422 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5423 +SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.5424 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...), SourceHook::ISourceHook *shptr)
  1.5425  {
  1.5426  	SH__CALL_GET_VFNPTR_NORMAL
  1.5427 -	return SourceHook::ExecutableClass9<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(CCW<Y>::GRP(ptr),
  1.5428 -		mfp, vfnptr, shptr, plug);
  1.5429 +	return SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(ptr, mfp, vfnptr, shptr);
  1.5430  }
  1.5431  
  1.5432  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
  1.5433 -SourceHook::ExecutableClass9<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.5434 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5435 +SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>
  1.5436 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)const, SourceHook::ISourceHook *shptr)
  1.5437  {
  1.5438  	SH__CALL_GET_VFNPTR_NORMAL
  1.5439 -	return SourceHook::ExecutableClass9<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(CCW<Y>::GRP(ptr),
  1.5440 -		mfp, vfnptr, shptr, plug);
  1.5441 +	return SourceHook::ExecutableClass9<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9>(ptr, mfp, vfnptr, shptr);
  1.5442  }
  1.5443  
  1.5444  
  1.5445  // Support for 10 arguments
  1.5446  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
  1.5447 -SourceHook::ExecutableClass10<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.5448 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5449 +SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.5450 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...), SourceHook::ISourceHook *shptr)
  1.5451  {
  1.5452  	SH__CALL_GET_VFNPTR_NORMAL
  1.5453 -	return SourceHook::ExecutableClass10<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(CCW<Y>::GRP(ptr),
  1.5454 -		mfp, vfnptr, shptr, plug);
  1.5455 +	return SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(ptr, mfp, vfnptr, shptr);
  1.5456  }
  1.5457  
  1.5458  template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
  1.5459 -SourceHook::ExecutableClass10<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.5460 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5461 +SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>
  1.5462 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)const, SourceHook::ISourceHook *shptr)
  1.5463  {
  1.5464  	SH__CALL_GET_VFNPTR_NORMAL
  1.5465 -	return SourceHook::ExecutableClass10<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(CCW<Y>::GRP(ptr),
  1.5466 -		mfp, vfnptr, shptr, plug);
  1.5467 +	return SourceHook::ExecutableClass10<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10>(ptr, mfp, vfnptr, shptr);
  1.5468  }
  1.5469  
  1.5470  
  1.5471  // Support for 11 arguments
  1.5472  template <class X, class Y, class MFP, 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.5473 -SourceHook::ExecutableClass11<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.5474 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5475 +SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.5476 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...), SourceHook::ISourceHook *shptr)
  1.5477  {
  1.5478  	SH__CALL_GET_VFNPTR_NORMAL
  1.5479 -	return SourceHook::ExecutableClass11<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(CCW<Y>::GRP(ptr),
  1.5480 -		mfp, vfnptr, shptr, plug);
  1.5481 +	return SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(ptr, mfp, vfnptr, shptr);
  1.5482  }
  1.5483  
  1.5484  template <class X, class Y, class MFP, 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.5485 -SourceHook::ExecutableClass11<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.5486 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5487 +SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>
  1.5488 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)const, SourceHook::ISourceHook *shptr)
  1.5489  {
  1.5490  	SH__CALL_GET_VFNPTR_NORMAL
  1.5491 -	return SourceHook::ExecutableClass11<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(CCW<Y>::GRP(ptr),
  1.5492 -		mfp, vfnptr, shptr, plug);
  1.5493 +	return SourceHook::ExecutableClass11<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11>(ptr, mfp, vfnptr, shptr);
  1.5494  }
  1.5495  
  1.5496  
  1.5497  // Support for 12 arguments
  1.5498  template <class X, class Y, class MFP, 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.5499 -SourceHook::ExecutableClass12<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.5500 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5501 +SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.5502 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...), SourceHook::ISourceHook *shptr)
  1.5503  {
  1.5504  	SH__CALL_GET_VFNPTR_NORMAL
  1.5505 -	return SourceHook::ExecutableClass12<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(CCW<Y>::GRP(ptr),
  1.5506 -		mfp, vfnptr, shptr, plug);
  1.5507 +	return SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(ptr, mfp, vfnptr, shptr);
  1.5508  }
  1.5509  
  1.5510  template <class X, class Y, class MFP, 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.5511 -SourceHook::ExecutableClass12<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.5512 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5513 +SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>
  1.5514 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)const, SourceHook::ISourceHook *shptr)
  1.5515  {
  1.5516  	SH__CALL_GET_VFNPTR_NORMAL
  1.5517 -	return SourceHook::ExecutableClass12<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(CCW<Y>::GRP(ptr),
  1.5518 -		mfp, vfnptr, shptr, plug);
  1.5519 +	return SourceHook::ExecutableClass12<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12>(ptr, mfp, vfnptr, shptr);
  1.5520  }
  1.5521  
  1.5522  
  1.5523  // Support for 13 arguments
  1.5524  template <class X, class Y, class MFP, 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.5525 -SourceHook::ExecutableClass13<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.5526 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5527 +SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.5528 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...), SourceHook::ISourceHook *shptr)
  1.5529  {
  1.5530  	SH__CALL_GET_VFNPTR_NORMAL
  1.5531 -	return SourceHook::ExecutableClass13<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(CCW<Y>::GRP(ptr),
  1.5532 -		mfp, vfnptr, shptr, plug);
  1.5533 +	return SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(ptr, mfp, vfnptr, shptr);
  1.5534  }
  1.5535  
  1.5536  template <class X, class Y, class MFP, 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.5537 -SourceHook::ExecutableClass13<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.5538 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5539 +SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>
  1.5540 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)const, SourceHook::ISourceHook *shptr)
  1.5541  {
  1.5542  	SH__CALL_GET_VFNPTR_NORMAL
  1.5543 -	return SourceHook::ExecutableClass13<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(CCW<Y>::GRP(ptr),
  1.5544 -		mfp, vfnptr, shptr, plug);
  1.5545 +	return SourceHook::ExecutableClass13<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13>(ptr, mfp, vfnptr, shptr);
  1.5546  }
  1.5547  
  1.5548  
  1.5549  // Support for 14 arguments
  1.5550  template <class X, class Y, class MFP, 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.5551 -SourceHook::ExecutableClass14<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.5552 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5553 +SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.5554 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...), SourceHook::ISourceHook *shptr)
  1.5555  {
  1.5556  	SH__CALL_GET_VFNPTR_NORMAL
  1.5557 -	return SourceHook::ExecutableClass14<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(CCW<Y>::GRP(ptr),
  1.5558 -		mfp, vfnptr, shptr, plug);
  1.5559 +	return SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(ptr, mfp, vfnptr, shptr);
  1.5560  }
  1.5561  
  1.5562  template <class X, class Y, class MFP, 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.5563 -SourceHook::ExecutableClass14<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.5564 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5565 +SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>
  1.5566 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)const, SourceHook::ISourceHook *shptr)
  1.5567  {
  1.5568  	SH__CALL_GET_VFNPTR_NORMAL
  1.5569 -	return SourceHook::ExecutableClass14<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(CCW<Y>::GRP(ptr),
  1.5570 -		mfp, vfnptr, shptr, plug);
  1.5571 +	return SourceHook::ExecutableClass14<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14>(ptr, mfp, vfnptr, shptr);
  1.5572  }
  1.5573  
  1.5574  
  1.5575  // Support for 15 arguments
  1.5576  template <class X, class Y, class MFP, 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.5577 -SourceHook::ExecutableClass15<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.5578 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5579 +SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.5580 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...), SourceHook::ISourceHook *shptr)
  1.5581  {
  1.5582  	SH__CALL_GET_VFNPTR_NORMAL
  1.5583 -	return SourceHook::ExecutableClass15<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(CCW<Y>::GRP(ptr),
  1.5584 -		mfp, vfnptr, shptr, plug);
  1.5585 +	return SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(ptr, mfp, vfnptr, shptr);
  1.5586  }
  1.5587  
  1.5588  template <class X, class Y, class MFP, 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.5589 -SourceHook::ExecutableClass15<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.5590 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5591 +SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>
  1.5592 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)const, SourceHook::ISourceHook *shptr)
  1.5593  {
  1.5594  	SH__CALL_GET_VFNPTR_NORMAL
  1.5595 -	return SourceHook::ExecutableClass15<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(CCW<Y>::GRP(ptr),
  1.5596 -		mfp, vfnptr, shptr, plug);
  1.5597 +	return SourceHook::ExecutableClass15<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15>(ptr, mfp, vfnptr, shptr);
  1.5598  }
  1.5599  
  1.5600  
  1.5601  // Support for 16 arguments
  1.5602  template <class X, class Y, class MFP, 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.5603 -SourceHook::ExecutableClass16<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5604 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5605 +SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5606 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...), SourceHook::ISourceHook *shptr)
  1.5607  {
  1.5608  	SH__CALL_GET_VFNPTR_NORMAL
  1.5609 -	return SourceHook::ExecutableClass16<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(CCW<Y>::GRP(ptr),
  1.5610 -		mfp, vfnptr, shptr, plug);
  1.5611 +	return SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(ptr, mfp, vfnptr, shptr);
  1.5612  }
  1.5613  
  1.5614  template <class X, class Y, class MFP, 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.5615 -SourceHook::ExecutableClass16<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5616 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5617 +SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>
  1.5618 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)const, SourceHook::ISourceHook *shptr)
  1.5619  {
  1.5620  	SH__CALL_GET_VFNPTR_NORMAL
  1.5621 -	return SourceHook::ExecutableClass16<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(CCW<Y>::GRP(ptr),
  1.5622 -		mfp, vfnptr, shptr, plug);
  1.5623 +	return SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(ptr, mfp, vfnptr, shptr);
  1.5624  }
  1.5625  
  1.5626  
  1.5627  // Support for 17 arguments
  1.5628  template <class X, class Y, class MFP, 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, class Param17>
  1.5629 -SourceHook::ExecutableClass17<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5630 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5631 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5632 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...), SourceHook::ISourceHook *shptr)
  1.5633  {
  1.5634  	SH__CALL_GET_VFNPTR_NORMAL
  1.5635 -	return SourceHook::ExecutableClass17<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(CCW<Y>::GRP(ptr),
  1.5636 -		mfp, vfnptr, shptr, plug);
  1.5637 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  1.5638  }
  1.5639  
  1.5640  template <class X, class Y, class MFP, 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, class Param17>
  1.5641 -SourceHook::ExecutableClass17<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5642 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5643 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  1.5644 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...)const, SourceHook::ISourceHook *shptr)
  1.5645  {
  1.5646  	SH__CALL_GET_VFNPTR_NORMAL
  1.5647 -	return SourceHook::ExecutableClass17<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(CCW<Y>::GRP(ptr),
  1.5648 -		mfp, vfnptr, shptr, plug);
  1.5649 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  1.5650  }
  1.5651  
  1.5652  
  1.5653  // Support for 18 arguments
  1.5654  template <class X, class Y, class MFP, 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, class Param17, class Param18>
  1.5655 -SourceHook::ExecutableClass18<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5656 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5657 +SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5658 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, ...), SourceHook::ISourceHook *shptr)
  1.5659  {
  1.5660  	SH__CALL_GET_VFNPTR_NORMAL
  1.5661 -	return SourceHook::ExecutableClass18<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(CCW<Y>::GRP(ptr),
  1.5662 -		mfp, vfnptr, shptr, plug);
  1.5663 +	return SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(ptr, mfp, vfnptr, shptr);
  1.5664  }
  1.5665  
  1.5666  template <class X, class Y, class MFP, 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, class Param17, class Param18>
  1.5667 -SourceHook::ExecutableClass18<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5668 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5669 +SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>
  1.5670 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, ...)const, SourceHook::ISourceHook *shptr)
  1.5671  {
  1.5672  	SH__CALL_GET_VFNPTR_NORMAL
  1.5673 -	return SourceHook::ExecutableClass18<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(CCW<Y>::GRP(ptr),
  1.5674 -		mfp, vfnptr, shptr, plug);
  1.5675 +	return SourceHook::ExecutableClass18<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18>(ptr, mfp, vfnptr, shptr);
  1.5676  }
  1.5677  
  1.5678  
  1.5679  // Support for 19 arguments
  1.5680  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19>
  1.5681 -SourceHook::ExecutableClass19<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5682 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5683 +SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5684 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, ...), SourceHook::ISourceHook *shptr)
  1.5685  {
  1.5686  	SH__CALL_GET_VFNPTR_NORMAL
  1.5687 -	return SourceHook::ExecutableClass19<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(CCW<Y>::GRP(ptr),
  1.5688 -		mfp, vfnptr, shptr, plug);
  1.5689 +	return SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(ptr, mfp, vfnptr, shptr);
  1.5690  }
  1.5691  
  1.5692  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19>
  1.5693 -SourceHook::ExecutableClass19<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5694 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5695 +SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>
  1.5696 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, ...)const, SourceHook::ISourceHook *shptr)
  1.5697  {
  1.5698  	SH__CALL_GET_VFNPTR_NORMAL
  1.5699 -	return SourceHook::ExecutableClass19<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(CCW<Y>::GRP(ptr),
  1.5700 -		mfp, vfnptr, shptr, plug);
  1.5701 +	return SourceHook::ExecutableClass19<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19>(ptr, mfp, vfnptr, shptr);
  1.5702  }
  1.5703  
  1.5704  
  1.5705  // Support for 20 arguments
  1.5706  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19, class Param20>
  1.5707 -SourceHook::ExecutableClass20<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5708 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20, ...), SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5709 +SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5710 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20, ...), SourceHook::ISourceHook *shptr)
  1.5711  {
  1.5712  	SH__CALL_GET_VFNPTR_NORMAL
  1.5713 -	return SourceHook::ExecutableClass20<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(CCW<Y>::GRP(ptr),
  1.5714 -		mfp, vfnptr, shptr, plug);
  1.5715 +	return SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(ptr, mfp, vfnptr, shptr);
  1.5716  }
  1.5717  
  1.5718  template <class X, class Y, class MFP, 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, class Param17, class Param18, class Param19, class Param20>
  1.5719 -SourceHook::ExecutableClass20<typename SourceHook::CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5720 -SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20, ...)const, SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
  1.5721 +SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>
  1.5722 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20, ...)const, SourceHook::ISourceHook *shptr)
  1.5723  {
  1.5724  	SH__CALL_GET_VFNPTR_NORMAL
  1.5725 -	return SourceHook::ExecutableClass20<typename CCW<Y>::type, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(CCW<Y>::GRP(ptr),
  1.5726 -		mfp, vfnptr, shptr, plug);
  1.5727 +	return SourceHook::ExecutableClass20<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, Param18, Param19, Param20>(ptr, mfp, vfnptr, shptr);
  1.5728  }
  1.5729  
  1.5730  
  1.5731  
  1.5732  #endif
  1.5733  
  1.5734 -#define SH_CALL(ptr, mfp) SH_CALL2((ptr), (mfp), (mfp), SH_GLOB_SHPTR, SH_GLOB_PLUGPTR)
  1.5735 -#define SH_MCALL2(ptr, mfp, vtblidx, vtbloffs, thisptroffs) SH_MCALL3((ptr), (mfp), (mfp), (vtblidx), (vtbloffs), (thisptroffs), SH_GLOB_SHPTR, SH_GLOB_PLUGPTR)
  1.5736 +#define SH_CALL(ptr, mfp) SH_CALL2((ptr), (mfp), (mfp), SH_GLOB_SHPTR)
  1.5737 +#define SH_MCALL2(ptr, mfp, vtblidx, vtbloffs, thisptroffs) SH_MCALL3((ptr), (mfp), (mfp), (vtblidx), (vtbloffs), (thisptroffs), SH_GLOB_SHPTR)
  1.5738  #define SH_MCALL(ptr, mhookname) SH_MCALL2((ptr), SH_MFHCls(mhookname)::ECMFP(), SH_MFHCls(mhookname)::ms_MFI.vtblindex, \
  1.5739  	SH_MFHCls(mhookname)::ms_MFI.vtbloffs, SH_MFHCls(mhookname)::ms_MFI.thisptroffs)
  1.5740  
  1.5741  #undef SH_MAKE_EXECUTABLECLASS_OB
  1.5742 +#undef SH_MAKE_EXECUTABLECLASS_OB_void
  1.5743  
  1.5744  //////////////////////////////////////////////////////////////////////////
  1.5745  // SetOverrideRet and RecallGetIface for recalls