sourcehook/generate/sourcehook.h
changeset 117 e322da4af2d2
parent 111 aec58c99dafc
child 123 53e819ac032a
     1.1 --- a/sourcehook/generate/sourcehook.h	Thu Sep 29 23:05:01 2005 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.h	Mon Oct 03 17:20:22 2005 +0000
     1.3 @@ -16,8 +16,8 @@
     1.4  #ifndef __SOURCEHOOK_H__
     1.5  #define __SOURCEHOOK_H__
     1.6  
     1.7 -#define SH_IFACE_VERSION 1
     1.8 -#define SH_IMPL_VERSION 1
     1.9 +#define SH_IFACE_VERSION 2
    1.10 +#define SH_IMPL_VERSION 2
    1.11  
    1.12  #ifndef SH_GLOB_SHPTR
    1.13  #define SH_GLOB_SHPTR g_SHPtr
    1.14 @@ -27,13 +27,21 @@
    1.15  #define SH_GLOB_PLUGPTR g_PLID
    1.16  #endif
    1.17  
    1.18 -
    1.19  #ifdef SH_DEBUG
    1.20  # include <stdio.h>
    1.21  # include <stdlib.h>
    1.22 -# define SH_ASSERT__(x, info, file, line, func) \
    1.23 -	((printf("SOURCEHOOK DEBUG ASSERTION FAILED:\n  %s:%u(%s): %s\n", file, line, func, info), true) ? (abort(), 0) : 0)
    1.24 -# define SH_ASSERT(x, info) if (!(x)) SH_ASSERT__(x, info, __FILE__, __LINE__, __FUNCTION__)
    1.25 +
    1.26 +# define SH_ASSERT(x, info) \
    1.27 +	do { \
    1.28 +		if (!(x)) \
    1.29 +		{ \
    1.30 +			printf("SOURCEHOOK DEBUG ASSERTION FAILED: %s:%u(%s): %s: ", __FILE__, __LINE__, __FUNCTION__, #x); \
    1.31 +			printf info; \
    1.32 +			putchar('\n'); \
    1.33 +			abort(); \
    1.34 +		} \
    1.35 +	} while(0)
    1.36 +
    1.37  #else
    1.38  # define SH_ASSERT(x, info)
    1.39  #endif
    1.40 @@ -67,13 +75,9 @@
    1.41  #endif
    1.42  
    1.43  #define SH_PTRSIZE sizeof(void*)
    1.44 -										
    1.45 +
    1.46  #include "FastDelegate.h"
    1.47  #include "sh_memfuncinfo.h"
    1.48 -#include "sh_memory.h"
    1.49 -#include "sh_list.h"
    1.50 -#include "sh_vector.h"
    1.51 -#include "sh_tinyhash.h"
    1.52  
    1.53  // Good old metamod!
    1.54  
    1.55 @@ -90,10 +94,13 @@
    1.56  
    1.57  namespace SourceHook
    1.58  {
    1.59 -	const int STRBUF_LEN=4096;		// In bytes, for "vafmt" functions
    1.60 -	
    1.61  	/**
    1.62 -	*	@brief An empty class. No inheritance used. Used for original-function-call hacks
    1.63 +	*	@brief	Specifies the size (in bytes) for the internal buffer of vafmt(printf-like) function handlers
    1.64 +	*/
    1.65 +	const int STRBUF_LEN=4096;
    1.66 +
    1.67 +	/**
    1.68 +	*	@brief	An empty class. No inheritance used. Used for original-function-call hacks
    1.69  	*/
    1.70  	class EmptyClass
    1.71  	{
    1.72 @@ -111,29 +118,33 @@
    1.73  	/**
    1.74  	*	@brief A plugin typedef
    1.75  	*
    1.76 -	*	SourceHook doesn't really care what this is. As long as the ==, != and = operators work on it
    1.77 -	*	and every plugin has a unique identifier, everything is ok.
    1.78 +	*	SourceHook doesn't really care what this is. As long as the ==, != and = operators work on it and every
    1.79 +	*	plugin has a unique identifier, everything is ok.
    1.80 +	*	It should also be possible to set it to 0.
    1.81  	*/
    1.82  	typedef int Plugin;
    1.83  
    1.84 +	/**
    1.85 +	*	@brief Specifies the actions for hook managers
    1.86 +	*/
    1.87  	enum HookManagerAction
    1.88  	{
    1.89 -		HA_GetInfo = 0,			// -> Only store info
    1.90 -		HA_Register,			// -> Save the pointer for future reference
    1.91 -		HA_Unregister			// -> Clear the saved pointer
    1.92 +		HA_GetInfo = 0,			//!< Store info about the hook manager
    1.93 +		HA_Register,			//!< Save the IHookManagerInfo pointer for future reference
    1.94 +		HA_Unregister			//!< Clear the saved pointer
    1.95  	};
    1.96  
    1.97 -	struct HookManagerInfo;
    1.98 +	class IHookManagerInfo;
    1.99  
   1.100  	/**
   1.101 -	*	@brief Pointer to hook manager type
   1.102 +	*	@brief Pointer to hook manager interface function
   1.103  	*
   1.104  	*	A "hook manager" is a the only thing that knows the actual protoype of the function at compile time.
   1.105 -	*	
   1.106 -	*	@param hi A pointer to a HookManagerInfo structure. The hook manager should fill it and store it for
   1.107 -	*				future reference (mainly if something should get hooked to its hookfunc)
   1.108 +	*
   1.109 +	*   @param ha What the hook manager should do
   1.110 +	*	@param hi A pointer to IHookManagerInfo
   1.111  	*/
   1.112 -	typedef int (*HookManagerPubFunc)(HookManagerAction ha, HookManagerInfo *hi);
   1.113 +	typedef int (*HookManagerPubFunc)(HookManagerAction ha, IHookManagerInfo *hi);
   1.114  
   1.115  	class ISHDelegate
   1.116  	{
   1.117 @@ -161,7 +172,7 @@
   1.118  
   1.119  		bool IsEqual(ISHDelegate *other)
   1.120  		{
   1.121 -			return static_cast<CSHDelegate<T>* >(other)->GetDeleg() == GetDeleg();				
   1.122 +			return static_cast<CSHDelegate<T>* >(other)->GetDeleg() == GetDeleg();
   1.123  		}
   1.124  
   1.125  		T &GetDeleg()
   1.126 @@ -170,65 +181,83 @@
   1.127  		}
   1.128  	};
   1.129  
   1.130 -	/**
   1.131 -	*	@brief This structure contains information about a hook manager (hook manager)
   1.132 -	*/
   1.133 -	struct HookManagerInfo
   1.134 +	struct IHookList
   1.135  	{
   1.136 -		struct VfnPtr
   1.137 +		struct IIter
   1.138  		{
   1.139 -			struct Iface
   1.140 -			{
   1.141 -				struct Hook
   1.142 -				{
   1.143 -					ISHDelegate *handler;			//!< Pointer to the handler
   1.144 -					bool paused;					//!< If true, the hook should not be executed
   1.145 -					Plugin plug;					//!< The owner plugin
   1.146 -					int thisptr_offs;				//!< This pointer offset
   1.147 -				};
   1.148 -				void *ptr;							//!< Pointer to the interface instance
   1.149 -				List<Hook> hooks_pre;				//!< A list of pre-hooks
   1.150 -				List<Hook> hooks_post;				//!< A list of post-hooks
   1.151 -				bool operator ==(void *other) const
   1.152 -				{
   1.153 -					return ptr == other;
   1.154 -				}
   1.155 -			};
   1.156 +			virtual bool End() = 0;
   1.157 +			virtual void Next() = 0;
   1.158 +			virtual ISHDelegate *Handler() = 0;
   1.159 +			virtual int ThisPtrOffs() = 0;
   1.160 +		};
   1.161 +		virtual IIter *GetIter() = 0;
   1.162 +		virtual void ReleaseIter(IIter *pIter) = 0;
   1.163 +	};
   1.164  
   1.165 -			void *vfnptr;							//!< Pointer to the function
   1.166 -			void *orig_entry;						//!< The original vtable entry
   1.167 -
   1.168 -			typedef List<Iface> IfaceList;
   1.169 -			typedef IfaceList::iterator IfaceListIter;
   1.170 -			IfaceList ifaces;						//!< List of interface pointers
   1.171 +	struct IIface
   1.172 +	{
   1.173 +		virtual void *GetPtr() = 0;
   1.174 +		virtual IHookList *GetPreHooks() = 0;
   1.175 +		virtual IHookList *GetPostHooks() = 0;
   1.176 +	};
   1.177  
   1.178 -			bool operator ==(void *other)
   1.179 -			{
   1.180 -				return vfnptr == other;
   1.181 -			}
   1.182 -		};
   1.183 +	struct IVfnPtr
   1.184 +	{
   1.185 +		virtual void *GetVfnPtr() = 0;
   1.186 +		virtual void *GetOrigEntry() = 0;
   1.187  
   1.188 -		Plugin plug;							//!< The owner plugin
   1.189 -		const char *proto;						//!< The prototype of the function the hook manager is responsible for
   1.190 -		int vtbl_idx;							//!< The vtable index
   1.191 -		int vtbl_offs;							//!< The vtable offset
   1.192 -		HookManagerPubFunc func;				//!< The interface to the hook manager
   1.193 +		virtual IIface *FindIface(void *ptr) = 0;
   1.194 +	};
   1.195  
   1.196 -		void *hookfunc_vfnptr;					//!< Pointer to the hookfunc impl
   1.197 -		
   1.198 -		typedef List<VfnPtr> VfnPtrList;
   1.199 -		typedef VfnPtrList::iterator VfnPtrListIter;
   1.200 -		VfnPtrList vfnptrs;				//!< List of hooked interfaces
   1.201 +	struct IHookManagerInfo
   1.202 +	{
   1.203 +		virtual IVfnPtr *FindVfnPtr(void *vfnptr) = 0;
   1.204 +
   1.205 +		virtual void SetInfo(int vtbloffs, int vtblidx, const char *proto) = 0;
   1.206 +		virtual void SetHookfuncVfnptr(void *hookfunc_vfnptr) = 0;
   1.207  	};
   1.208  
   1.209 -	typedef SourceHook::CVector<void*> OrigFuncs;
   1.210 -	typedef SourceHook::THash<int, OrigFuncs> OrigVTables;
   1.211 +	class AutoHookIter
   1.212 +	{
   1.213 +		IHookList *m_pList;
   1.214 +		IHookList::IIter *m_pIter;
   1.215 +	public:
   1.216 +		AutoHookIter(IHookList *pList)
   1.217 +			: m_pList(pList), m_pIter(pList->GetIter())
   1.218 +		{
   1.219 +		}
   1.220 +
   1.221 +		~AutoHookIter()
   1.222 +		{
   1.223 +			m_pList->ReleaseIter(m_pIter);
   1.224 +		}
   1.225 +
   1.226 +		bool End()
   1.227 +		{
   1.228 +			return m_pIter->End();
   1.229 +		}
   1.230 +
   1.231 +		void Next()
   1.232 +		{
   1.233 +			m_pIter->Next();
   1.234 +		}
   1.235 +
   1.236 +		ISHDelegate *Handler()
   1.237 +		{
   1.238 +			return m_pIter->Handler();
   1.239 +		}
   1.240 +
   1.241 +		int ThisPtrOffs()
   1.242 +		{
   1.243 +			return m_pIter->ThisPtrOffs();
   1.244 +		}
   1.245 +
   1.246 +	};
   1.247  
   1.248  	template<class B> struct CallClass
   1.249  	{
   1.250 -		B *ptr;					//!< Pointer to the actual object
   1.251 -		size_t objsize;			//!< Size of the instance
   1.252 -		OrigVTables vt;			//!< Info about vtables & functions
   1.253 +		virtual B *GetThisPtr() = 0;
   1.254 +		virtual void *GetOrigFunc(int vtbloffs, int vtblidx) = 0;
   1.255  	};
   1.256  
   1.257  	typedef CallClass<void> GenericCallClass;
   1.258 @@ -239,8 +268,6 @@
   1.259  	class ISourceHook
   1.260  	{
   1.261  	public:
   1.262 -		virtual ~ISourceHook()
   1.263 -		{ }
   1.264  		/**
   1.265  		*	@brief Return interface version
   1.266  		*/
   1.267 @@ -263,7 +290,8 @@
   1.268  		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.269  		*	@param post Set to true if you want a post handler
   1.270  		*/
   1.271 -		virtual bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.272 +		virtual bool AddHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.273 +			ISHDelegate *handler, bool post) = 0;
   1.274  
   1.275  		/**
   1.276  		*	@brief Removes a hook.
   1.277 @@ -276,7 +304,8 @@
   1.278  		*	@param handler A pointer to a FastDelegate containing the hook handler
   1.279  		*	@param post Set to true if you want a post handler
   1.280  		*/
   1.281 -		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post) = 0;
   1.282 +		virtual bool RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan,
   1.283 +			ISHDelegate *handler, bool post) = 0;
   1.284  
   1.285  		/**
   1.286  		*	@brief Checks whether a plugin has (a) hook manager(s) that is/are currently used by other plugins
   1.287 @@ -301,10 +330,13 @@
   1.288  		virtual void ReleaseCallClass(GenericCallClass *ptr) = 0;
   1.289  
   1.290  		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
   1.291 -		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the previously called handler
   1.292 +		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the
   1.293 +															//!<  previously calledhandler
   1.294  		virtual META_RES GetStatus() = 0;					//!< Gets the highest meta result
   1.295 -		virtual const void *GetOrigRet() = 0;				//!< Gets the original result. If not in post function, undefined
   1.296 -		virtual const void *GetOverrideRet() = 0;			//!< Gets the override result. If none is specified, NULL
   1.297 +		virtual const void *GetOrigRet() = 0;				//!< Gets the original result.
   1.298 +															//!<  If not in post function, undefined
   1.299 +		virtual const void *GetOverrideRet() = 0;			//!< Gets the override result.
   1.300 +															//!<  If none is specified, NULL
   1.301  		virtual void *GetIfacePtr() = 0;					//!< Gets the interface pointer
   1.302  		//////////////////////////////////////////////////////////////////////////
   1.303  		// For hook managers
   1.304 @@ -375,10 +407,10 @@
   1.305  
   1.306  #if SH_COMP == SH_COMP_MSVC
   1.307  # define SH_SETUP_MFP(mfp) \
   1.308 -	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry;
   1.309 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr->GetOrigEntry();
   1.310  #elif SH_COMP == SH_COMP_GCC
   1.311  # define SH_SETUP_MFP(mfp) \
   1.312 -	reinterpret_cast<void**>(&mfp)[0] = vfnptr.orig_entry; \
   1.313 +	reinterpret_cast<void**>(&mfp)[0] = vfnptr->GetOrigEntry(); \
   1.314  	reinterpret_cast<void**>(&mfp)[1] = 0;
   1.315  #else
   1.316  # error Not supported yet.
   1.317 @@ -388,24 +420,27 @@
   1.318  #define SH_FHCls(ift, iff, ov) __SourceHook_FHCls_##ift##iff##ov
   1.319  
   1.320  #define SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr) \
   1.321 -	static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::HookManagerInfo *param) \
   1.322 +	SH_FHCls(ifacetype,ifacefunc,overload)() \
   1.323 +	{ \
   1.324 +		GetFuncInfo(funcptr, ms_MFI); \
   1.325 +	} \
   1.326 +	\
   1.327 +	static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::IHookManagerInfo *param) \
   1.328  	{ \
   1.329  		using namespace ::SourceHook; \
   1.330 +		GetFuncInfo(funcptr, ms_MFI); \
   1.331  		/* Verify interface version */ \
   1.332  		if (SH_GLOB_SHPTR->GetIfaceVersion() != SH_IFACE_VERSION) \
   1.333  			return 1; \
   1.334  		\
   1.335  		if (action == ::SourceHook::HA_GetInfo) \
   1.336  		{ \
   1.337 -			param->proto = ms_Proto; \
   1.338 +			param->SetInfo(ms_MFI.vtbloffs, ms_MFI.vtblindex, ms_Proto); \
   1.339 +			\
   1.340  			MemFuncInfo mfi; \
   1.341 -			GetFuncInfo(funcptr, mfi); \
   1.342 -			param->vtbl_idx = mfi.vtblindex; \
   1.343 -			param->vtbl_offs = mfi.vtbloffs; \
   1.344 -			\
   1.345  			GetFuncInfo(&SH_FHCls(ifacetype,ifacefunc,overload)::Func, mfi); \
   1.346 -			param->hookfunc_vfnptr = \
   1.347 -			reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]; \
   1.348 +			param->SetHookfuncVfnptr( \
   1.349 +				reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]); \
   1.350  			return 0; \
   1.351  		} \
   1.352  		else if (action == ::SourceHook::HA_Register) \
   1.353 @@ -429,15 +464,17 @@
   1.354  	struct SH_FHCls(ifacetype,ifacefunc,overload) \
   1.355  	{ \
   1.356  		static SH_FHCls(ifacetype,ifacefunc,overload) ms_Inst; \
   1.357 -		static ::SourceHook::HookManagerInfo *ms_HI; \
   1.358 +		static ::SourceHook::MemFuncInfo ms_MFI; \
   1.359 +		static ::SourceHook::IHookManagerInfo *ms_HI; \
   1.360  		static const char *ms_Proto; \
   1.361  		SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
   1.362  
   1.363  #define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto, funcptr) \
   1.364  	}; \
   1.365 +	SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
   1.366 +	::SourceHook::MemFuncInfo SH_FHCls(ifacetype,ifacefunc,overload)::ms_MFI; \
   1.367 +	::SourceHook::IHookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
   1.368  	const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
   1.369 -	SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
   1.370 -	::SourceHook::HookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
   1.371  	bool __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
   1.372  		SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
   1.373  	{ \
   1.374 @@ -469,28 +506,22 @@
   1.375  	/* 1) Find the vfnptr */ \
   1.376  	using namespace ::SourceHook; \
   1.377  	void *ourvfnptr = reinterpret_cast<void*>( \
   1.378 -		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   1.379 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_MFI.vtbloffs) + ms_MFI.vtblindex); \
   1.380 +	IVfnPtr *vfnptr = ms_HI->FindVfnPtr(ourvfnptr); \
   1.381 +	SH_ASSERT(vfnptr, ("Called with vfnptr 0x%p which couldn't be found in the list", ourvfnptr)); \
   1.382  	\
   1.383 -	HookManagerInfo::VfnPtrListIter vfptriter = ms_HI->vfnptrs.find(ourvfnptr); \
   1.384 -	if (vfptriter == ms_HI->vfnptrs.end()) \
   1.385 -	{ \
   1.386 -		/* Bleh? Should be impossible! */ \
   1.387 -		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   1.388 -	} \
   1.389 -	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   1.390 -	/* 2) Find the iface */ \
   1.391 -	HookManagerInfo::VfnPtr::IfaceListIter ifiter = vfnptr.ifaces.find(this); \
   1.392 -	if (ifiter == vfnptr.ifaces.end()) \
   1.393 +	/* ... and the iface */ \
   1.394 +	IIface *ifinfo = vfnptr->FindIface(reinterpret_cast<void*>(this)); \
   1.395 +	if (!ifinfo) \
   1.396  	{ \
   1.397  		/* The iface info was not found. Redirect the call to the original function. */ \
   1.398  		rettype (EmptyClass::*mfp)paramtypes; \
   1.399  		SH_SETUP_MFP(mfp); \
   1.400  		return (reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.401  	} \
   1.402 -	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   1.403  	/* 2) Declare some vars and set it up */ \
   1.404 -	List<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   1.405 -	List<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   1.406 +	IHookList *prelist = ifinfo->GetPreHooks(); \
   1.407 +	IHookList *postlist = ifinfo->GetPostHooks(); \
   1.408  	rettype orig_ret; \
   1.409  	rettype override_ret; \
   1.410  	rettype plugin_ret; \
   1.411 @@ -504,12 +535,11 @@
   1.412  
   1.413  #define SH_CALL_HOOKS(post, params) \
   1.414  	prev_res = MRES_IGNORED; \
   1.415 -	for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.416 +	for (AutoHookIter iter(post##list); !iter.End(); iter.Next()) \
   1.417  	{ \
   1.418 -		if (hiter->paused) continue; \
   1.419  		cur_res = MRES_IGNORED; \
   1.420 -		ifptr = reinterpret_cast<void*>(reinterpret_cast<char*>(this) - hiter->thisptr_offs); \
   1.421 -		plugin_ret = reinterpret_cast<CSHDelegate<FD>*>(hiter->handler)->GetDeleg() params; \
   1.422 +		ifptr = reinterpret_cast<void*>(reinterpret_cast<char*>(this) - iter.ThisPtrOffs()); \
   1.423 +		plugin_ret = reinterpret_cast<CSHDelegate<FD>*>(iter.Handler())->GetDeleg() params; \
   1.424  		prev_res = cur_res; \
   1.425  		if (cur_res > status) \
   1.426  			status = cur_res; \
   1.427 @@ -525,7 +555,7 @@
   1.428  	{ \
   1.429  		rettype (EmptyClass::*mfp)paramtypes; \
   1.430  		SH_SETUP_MFP(mfp); \
   1.431 -		orig_ret = (reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   1.432 +		orig_ret = (reinterpret_cast<EmptyClass*>(ifinfo->GetPtr())->*mfp)params; \
   1.433  	} \
   1.434  	else \
   1.435  		orig_ret = override_ret;
   1.436 @@ -542,21 +572,16 @@
   1.437  
   1.438  //////////////////////////////////////////////////////////////////////////
   1.439  #define SH_SETUPCALLS_void(paramtypes, params) \
   1.440 +	/* 1) Find the vfnptr */ \
   1.441  	using namespace ::SourceHook; \
   1.442 -	/* 1) Find the vfnptr */ \
   1.443  	void *ourvfnptr = reinterpret_cast<void*>( \
   1.444 -		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
   1.445 +		*reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_MFI.vtbloffs) + ms_MFI.vtblindex); \
   1.446 +	IVfnPtr *vfnptr = ms_HI->FindVfnPtr(ourvfnptr); \
   1.447 +	SH_ASSERT(vfnptr, ("Called with vfnptr 0x%p which couldn't be found in the list", ourvfnptr)); \
   1.448  	\
   1.449 -	HookManagerInfo::VfnPtrListIter vfptriter = ms_HI->vfnptrs.find(ourvfnptr); \
   1.450 -	if (vfptriter == ms_HI->vfnptrs.end()) \
   1.451 -	{ \
   1.452 -		/* Bleh? Should be impossible! */ \
   1.453 -		SH_ASSERT(0, "Called with vfnptr 0x%p which couldn't be found in the list"); \
   1.454 -	} \
   1.455 -	HookManagerInfo::VfnPtr &vfnptr = *vfptriter; \
   1.456 -	/* 2) Find the iface */ \
   1.457 -	HookManagerInfo::VfnPtr::IfaceListIter ifiter = vfnptr.ifaces.find(this); \
   1.458 -	if (ifiter == vfnptr.ifaces.end()) \
   1.459 +	/* ... and the iface */ \
   1.460 +	IIface *ifinfo = vfnptr->FindIface(reinterpret_cast<void*>(this)); \
   1.461 +	if (!ifinfo) \
   1.462  	{ \
   1.463  		/* The iface info was not found. Redirect the call to the original function. */ \
   1.464  		void (EmptyClass::*mfp)paramtypes; \
   1.465 @@ -564,25 +589,24 @@
   1.466  		(reinterpret_cast<EmptyClass*>(this)->*mfp)params; \
   1.467  		return; \
   1.468  	} \
   1.469 -	HookManagerInfo::VfnPtr::Iface &ci = *ifiter; \
   1.470  	/* 2) Declare some vars and set it up */ \
   1.471 -	List<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
   1.472 -	List<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
   1.473 +	IHookList *prelist = ifinfo->GetPreHooks(); \
   1.474 +	IHookList *postlist = ifinfo->GetPostHooks(); \
   1.475  	META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
   1.476  	META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
   1.477  	META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
   1.478  	void* &ifptr = SH_GLOB_SHPTR->GetIfacePtrRef(); \
   1.479  	status = MRES_IGNORED; \
   1.480 -	SH_GLOB_SHPTR->SetOverrideRet(NULL);
   1.481 +	SH_GLOB_SHPTR->SetOverrideRet(NULL); \
   1.482 +	SH_GLOB_SHPTR->SetOrigRet(NULL);
   1.483  
   1.484  #define SH_CALL_HOOKS_void(post, params) \
   1.485  	prev_res = MRES_IGNORED; \
   1.486 -	for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hiter = post##list.begin(); hiter != post##list.end(); ++hiter) \
   1.487 +	for (AutoHookIter iter(post##list); !iter.End(); iter.Next()) \
   1.488  	{ \
   1.489 -		if (hiter->paused) continue; \
   1.490  		cur_res = MRES_IGNORED; \
   1.491 -		ifptr = reinterpret_cast<void*>(reinterpret_cast<char*>(this) - hiter->thisptr_offs); \
   1.492 -		reinterpret_cast<CSHDelegate<FD>*>(hiter->handler)->GetDeleg() params; \
   1.493 +		ifptr = reinterpret_cast<void*>(reinterpret_cast<char*>(this) - iter.ThisPtrOffs()); \
   1.494 +		reinterpret_cast<CSHDelegate<FD>*>(iter.Handler())->GetDeleg() params; \
   1.495  		prev_res = cur_res; \
   1.496  		if (cur_res > status) \
   1.497  			status = cur_res; \
   1.498 @@ -593,7 +617,7 @@
   1.499  	{ \
   1.500  		void (EmptyClass::*mfp)paramtypes; \
   1.501  		SH_SETUP_MFP(mfp); \
   1.502 -		(reinterpret_cast<EmptyClass*>(ci.ptr)->*mfp)params; \
   1.503 +		(reinterpret_cast<EmptyClass*>(ifinfo->GetPtr())->*mfp)params; \
   1.504  	}
   1.505  
   1.506  #define SH_RETURN_void()
   1.507 @@ -1490,6 +1514,210 @@
   1.508  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...", \
   1.509  	(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.510  
   1.511 +// ********* Support for 17 arguments *********
   1.512 +#define SH_DECL_HOOK17(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   1.513 +	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.514 +		(&ifacetype::ifacefunc))) \
   1.515 +		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> FD; \
   1.516 +		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.517 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (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.518 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17, \
   1.519 +	(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.520 +
   1.521 +#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.522 +	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.523 +		(&ifacetype::ifacefunc))) \
   1.524 +		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> FD; \
   1.525 +		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.526 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (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.527 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17, \
   1.528 +	(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.529 +
   1.530 +#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.531 +	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.532 +		(&ifacetype::ifacefunc))) \
   1.533 +		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.534 +		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.535 +		{ \
   1.536 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.537 +			va_list ap; \
   1.538 +			va_start(ap, fmt); \
   1.539 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.540 +			va_end(ap); \
   1.541 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, buf), rettype); \
   1.542 +		} \
   1.543 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|const char*|...", \
   1.544 +	(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.545 +
   1.546 +#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.547 +	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.548 +		(&ifacetype::ifacefunc))) \
   1.549 +		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, const char *> FD; \
   1.550 +		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.551 +		{ \
   1.552 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.553 +			va_list ap; \
   1.554 +			va_start(ap, fmt); \
   1.555 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.556 +			va_end(ap); \
   1.557 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, buf)); \
   1.558 +		} \
   1.559 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|const char*|...", \
   1.560 +	(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.561 +
   1.562 +// ********* Support for 18 arguments *********
   1.563 +#define SH_DECL_HOOK18(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18) \
   1.564 +	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.565 +		(&ifacetype::ifacefunc))) \
   1.566 +		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, rettype> FD; \
   1.567 +		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.568 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (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.569 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18, \
   1.570 +	(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.571 +
   1.572 +#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.573 +	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.574 +		(&ifacetype::ifacefunc))) \
   1.575 +		typedef fastdelegate::FastDelegate18<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18> FD; \
   1.576 +		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.577 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (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.578 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18, \
   1.579 +	(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.580 +
   1.581 +#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.582 +	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.583 +		(&ifacetype::ifacefunc))) \
   1.584 +		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.585 +		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.586 +		{ \
   1.587 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.588 +			va_list ap; \
   1.589 +			va_start(ap, fmt); \
   1.590 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.591 +			va_end(ap); \
   1.592 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, buf), rettype); \
   1.593 +		} \
   1.594 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|const char*|...", \
   1.595 +	(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.596 +
   1.597 +#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.598 +	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.599 +		(&ifacetype::ifacefunc))) \
   1.600 +		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.601 +		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.602 +		{ \
   1.603 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.604 +			va_list ap; \
   1.605 +			va_start(ap, fmt); \
   1.606 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.607 +			va_end(ap); \
   1.608 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, buf)); \
   1.609 +		} \
   1.610 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|const char*|...", \
   1.611 +	(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.612 +
   1.613 +// ********* Support for 19 arguments *********
   1.614 +#define SH_DECL_HOOK19(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.615 +	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.616 +		(&ifacetype::ifacefunc))) \
   1.617 +		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.618 +		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.619 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (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.620 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19, \
   1.621 +	(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.622 +
   1.623 +#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.624 +	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.625 +		(&ifacetype::ifacefunc))) \
   1.626 +		typedef fastdelegate::FastDelegate19<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19> FD; \
   1.627 +		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.628 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (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.629 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19, \
   1.630 +	(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.631 +
   1.632 +#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.633 +	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.634 +		(&ifacetype::ifacefunc))) \
   1.635 +		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.636 +		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.637 +		{ \
   1.638 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.639 +			va_list ap; \
   1.640 +			va_start(ap, fmt); \
   1.641 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.642 +			va_end(ap); \
   1.643 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, buf), rettype); \
   1.644 +		} \
   1.645 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19 "|const char*|...", \
   1.646 +	(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.647 +
   1.648 +#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.649 +	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.650 +		(&ifacetype::ifacefunc))) \
   1.651 +		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.652 +		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.653 +		{ \
   1.654 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.655 +			va_list ap; \
   1.656 +			va_start(ap, fmt); \
   1.657 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.658 +			va_end(ap); \
   1.659 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, buf)); \
   1.660 +		} \
   1.661 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19 "|const char*|...", \
   1.662 +	(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.663 +
   1.664 +// ********* Support for 20 arguments *********
   1.665 +#define SH_DECL_HOOK20(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.666 +	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.667 +		(&ifacetype::ifacefunc))) \
   1.668 +		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.669 +		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.670 +		{ SH_HANDLEFUNC(ifacetype, ifacefunc, (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.671 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19 "|" #param20, \
   1.672 +	(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.673 +
   1.674 +#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.675 +	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.676 +		(&ifacetype::ifacefunc))) \
   1.677 +		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.678 +		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.679 +		{ SH_HANDLEFUNC_void(ifacetype, ifacefunc, (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.680 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19 "|" #param20, \
   1.681 +	(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.682 +
   1.683 +#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.684 +	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.685 +		(&ifacetype::ifacefunc))) \
   1.686 +		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.687 +		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.688 +		{ \
   1.689 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.690 +			va_list ap; \
   1.691 +			va_start(ap, fmt); \
   1.692 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.693 +			va_end(ap); \
   1.694 +			SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, buf), rettype); \
   1.695 +		} \
   1.696 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19 "|" #param20 "|const char*|...", \
   1.697 +	(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.698 +
   1.699 +#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.700 +	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.701 +		(&ifacetype::ifacefunc))) \
   1.702 +		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.703 +		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.704 +		{ \
   1.705 +			char buf[::SourceHook::STRBUF_LEN]; \
   1.706 +			va_list ap; \
   1.707 +			va_start(ap, fmt); \
   1.708 +			vsnprintf(buf, sizeof(buf), fmt, ap); \
   1.709 +			va_end(ap); \
   1.710 +			SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (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, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, buf)); \
   1.711 +		} \
   1.712 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|" #param17 "|" #param18 "|" #param19 "|" #param20 "|const char*|...", \
   1.713 +	(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.714 +
   1.715  
   1.716  
   1.717  //////////////////////////////////////////////////////////////////////////
   1.718 @@ -1497,14 +1725,16 @@
   1.719  
   1.720  #if SH_COMP == SH_COMP_MSVC
   1.721  
   1.722 +// :TODO: TEST THIS ON MSVC
   1.723 +
   1.724  # define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
   1.725  { \
   1.726  	using namespace ::SourceHook; \
   1.727  	MemFuncInfo mfi; \
   1.728 -	GetFuncInfo(m_CC->ptr, m_MFP, mfi); \
   1.729 -	OrigVTables::iterator iter = m_CC->vt.find(mfi.thisptroffs + mfi.vtbloffs); \
   1.730 -	if (iter == m_CC->vt.end() || mfi.vtblindex >= (int)iter->val.size() || iter->val[mfi.vtblindex] == NULL) \
   1.731 -		return (m_CC->ptr->*m_MFP)call; \
   1.732 +	GetFuncInfo(m_CC->GetThisPtr(), m_MFP, mfi); \
   1.733 +	void *origfunc = m_CC->GetOrigFunc(mfi.thisptroffs + mfi.vtbloffs, mfi.vtblindex); \
   1.734 +	if (!origfunc) \
   1.735 +		return (m_CC->GetThisPtr()->*m_MFP)call; \
   1.736  	\
   1.737  	/* It's hooked. Call the original function. */ \
   1.738  	union \
   1.739 @@ -1512,9 +1742,9 @@
   1.740  		RetType(EmptyClass::*mfpnew)prms; \
   1.741  		void *addr; \
   1.742  	} u; \
   1.743 -	u.addr = iter->val[mfi.vtblindex]; \
   1.744 +	u.addr = origfunc; \
   1.745  	\
   1.746 -	void *adjustedthisptr = reinterpret_cast<void*>(reinterpret_cast<char*>(m_CC->ptr) + mfi.thisptroffs); \
   1.747 +	void *adjustedthisptr = reinterpret_cast<void*>(reinterpret_cast<char*>(m_CC->GetThisPtr()) + mfi.thisptroffs); \
   1.748  	return (reinterpret_cast<EmptyClass*>(adjustedthisptr)->*u.mfpnew)call; \
   1.749  }
   1.750  
   1.751 @@ -1524,10 +1754,10 @@
   1.752  { \
   1.753  	using namespace ::SourceHook; \
   1.754  	MemFuncInfo mfi; \
   1.755 -	GetFuncInfo(m_CC->ptr, m_MFP, mfi); \
   1.756 -	OrigVTables::iterator iter = m_CC->vt.find(mfi.thisptroffs + mfi.vtbloffs); \
   1.757 -	if (iter == m_CC->vt.end() || mfi.vtblindex >= (int)iter->val.size() || iter->val[mfi.vtblindex] == NULL) \
   1.758 -		return (m_CC->ptr->*m_MFP)call; \
   1.759 +	GetFuncInfo(m_CC->GetThisPtr(), m_MFP, mfi); \
   1.760 +	void *origfunc = m_CC->GetOrigFunc(mfi.thisptroffs + mfi.vtbloffs, mfi.vtblindex); \
   1.761 +	if (!origfunc) \
   1.762 +		return (m_CC->GetThisPtr()->*m_MFP)call; \
   1.763  	\
   1.764  	/* It's hooked. Call the original function. */ \
   1.765  	union \
   1.766 @@ -1539,10 +1769,10 @@
   1.767  			intptr_t adjustor; \
   1.768  		} s; \
   1.769  	} u; \
   1.770 -	u.s.addr = iter->val[mfi.vtblindex]; \
   1.771 +	u.s.addr = origfunc; \
   1.772  	u.s.adjustor = mfi.thisptroffs; \
   1.773  	\
   1.774 -	return (reinterpret_cast<EmptyClass*>(m_CC->ptr)->*u.mfpnew)call; \
   1.775 +	return (reinterpret_cast<EmptyClass*>(m_CC->GetThisPtr())->*u.mfpnew)call; \
   1.776  }
   1.777  
   1.778  #endif
   1.779 @@ -1559,73 +1789,89 @@
   1.780  		}
   1.781  
   1.782  		// Support for 0 arguments
   1.783 -		RetType operator()() const 
   1.784 +		RetType operator()() const
   1.785  			SH_MAKE_EXECUTABLECLASS_OB((), ())
   1.786  
   1.787  		// Support for 1 arguments
   1.788 -		template<class Param1> RetType operator()(Param1 p1) const 
   1.789 +		template<class Param1> RetType operator()(Param1 p1) const
   1.790  			SH_MAKE_EXECUTABLECLASS_OB((p1), (Param1))
   1.791  
   1.792  		// Support for 2 arguments
   1.793 -		template<class Param1, class Param2> RetType operator()(Param1 p1, Param2 p2) const 
   1.794 +		template<class Param1, class Param2> RetType operator()(Param1 p1, Param2 p2) const
   1.795  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2), (Param1, Param2))
   1.796  
   1.797  		// Support for 3 arguments
   1.798 -		template<class Param1, class Param2, class Param3> RetType operator()(Param1 p1, Param2 p2, Param3 p3) const 
   1.799 +		template<class Param1, class Param2, class Param3> RetType operator()(Param1 p1, Param2 p2, Param3 p3) const
   1.800  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3), (Param1, Param2, Param3))
   1.801  
   1.802  		// Support for 4 arguments
   1.803 -		template<class Param1, class Param2, class Param3, class Param4> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const 
   1.804 +		template<class Param1, class Param2, class Param3, class Param4> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const
   1.805  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4), (Param1, Param2, Param3, Param4))
   1.806  
   1.807  		// Support for 5 arguments
   1.808 -		template<class Param1, class Param2, class Param3, class Param4, class Param5> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5) const 
   1.809 +		template<class Param1, class Param2, class Param3, class Param4, class Param5> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5) const
   1.810  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5), (Param1, Param2, Param3, Param4, Param5))
   1.811  
   1.812  		// Support for 6 arguments
   1.813 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6) const 
   1.814 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6) const
   1.815  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6), (Param1, Param2, Param3, Param4, Param5, Param6))
   1.816  
   1.817  		// Support for 7 arguments
   1.818 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7) const 
   1.819 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7) const
   1.820  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7), (Param1, Param2, Param3, Param4, Param5, Param6, Param7))
   1.821  
   1.822  		// Support for 8 arguments
   1.823 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8) const 
   1.824 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8) const
   1.825  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8))
   1.826  
   1.827  		// Support for 9 arguments
   1.828 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9) const 
   1.829 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9) const
   1.830  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9))
   1.831  
   1.832  		// Support for 10 arguments
   1.833 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10) const 
   1.834 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10) const
   1.835  			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.836  
   1.837  		// Support for 11 arguments
   1.838 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11) const 
   1.839 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11) const
   1.840  			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.841  
   1.842  		// Support for 12 arguments
   1.843 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12) const 
   1.844 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12) const
   1.845  			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.846  
   1.847  		// Support for 13 arguments
   1.848 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13) const 
   1.849 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13) const
   1.850  			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.851  
   1.852  		// Support for 14 arguments
   1.853 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14) const 
   1.854 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14) const
   1.855  			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.856  
   1.857  		// Support for 15 arguments
   1.858 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15) const 
   1.859 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15) const
   1.860  			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.861  
   1.862  		// Support for 16 arguments
   1.863 -		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const 
   1.864 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
   1.865  			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.866  
   1.867 +		// Support for 17 arguments
   1.868 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> 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.869 +			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.870 +
   1.871 +		// Support for 18 arguments
   1.872 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class Param18> 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.873 +			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.874 +
   1.875 +		// Support for 19 arguments
   1.876 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class Param18, class Param19> 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.877 +			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.878 +
   1.879 +		// Support for 20 arguments
   1.880 +		template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class Param18, class Param19, class Param20> 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.881 +			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.882 +
   1.883  	};
   1.884  }
   1.885  
   1.886 @@ -1888,6 +2134,66 @@
   1.887  	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.888  }
   1.889  
   1.890 +// Support for 17 arguments
   1.891 +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.892 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.893 +SH_CALL2(SourceHook::CallClass<Y> *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
   1.894 +{
   1.895 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.896 +}
   1.897 +
   1.898 +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.899 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.900 +SH_CALL2(SourceHook::CallClass<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)
   1.901 +{
   1.902 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.903 +}
   1.904 +
   1.905 +// Support for 18 arguments
   1.906 +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.907 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.908 +SH_CALL2(SourceHook::CallClass<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))
   1.909 +{
   1.910 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.911 +}
   1.912 +
   1.913 +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.914 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.915 +SH_CALL2(SourceHook::CallClass<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)
   1.916 +{
   1.917 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.918 +}
   1.919 +
   1.920 +// Support for 19 arguments
   1.921 +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.922 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.923 +SH_CALL2(SourceHook::CallClass<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))
   1.924 +{
   1.925 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.926 +}
   1.927 +
   1.928 +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.929 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.930 +SH_CALL2(SourceHook::CallClass<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)
   1.931 +{
   1.932 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.933 +}
   1.934 +
   1.935 +// Support for 20 arguments
   1.936 +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.937 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.938 +SH_CALL2(SourceHook::CallClass<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))
   1.939 +{
   1.940 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.941 +}
   1.942 +
   1.943 +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.944 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.945 +SH_CALL2(SourceHook::CallClass<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)
   1.946 +{
   1.947 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.948 +}
   1.949 +
   1.950  
   1.951  #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
   1.952  // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
   1.953 @@ -2147,12 +2453,72 @@
   1.954  	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.955  }
   1.956  
   1.957 +// Support for 17 arguments
   1.958 +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.959 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.960 +SH_CALL2(SourceHook::CallClass<Y> *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...))
   1.961 +{
   1.962 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.963 +}
   1.964 +
   1.965 +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.966 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.967 +SH_CALL2(SourceHook::CallClass<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)
   1.968 +{
   1.969 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.970 +}
   1.971 +
   1.972 +// Support for 18 arguments
   1.973 +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.974 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.975 +SH_CALL2(SourceHook::CallClass<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, ...))
   1.976 +{
   1.977 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.978 +}
   1.979 +
   1.980 +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.981 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.982 +SH_CALL2(SourceHook::CallClass<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)
   1.983 +{
   1.984 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.985 +}
   1.986 +
   1.987 +// Support for 19 arguments
   1.988 +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.989 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.990 +SH_CALL2(SourceHook::CallClass<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, ...))
   1.991 +{
   1.992 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
   1.993 +}
   1.994 +
   1.995 +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.996 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
   1.997 +SH_CALL2(SourceHook::CallClass<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)
   1.998 +{
   1.999 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
  1.1000 +}
  1.1001 +
  1.1002 +// Support for 20 arguments
  1.1003 +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.1004 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
  1.1005 +SH_CALL2(SourceHook::CallClass<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, ...))
  1.1006 +{
  1.1007 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
  1.1008 +}
  1.1009 +
  1.1010 +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.1011 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>
  1.1012 +SH_CALL2(SourceHook::CallClass<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)
  1.1013 +{
  1.1014 +	return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, MFP>(ptr, mfp);
  1.1015 +}
  1.1016 +
  1.1017  
  1.1018  #endif
  1.1019  
  1.1020  #define SH_CALL(ptr, mfp) SH_CALL2((ptr), (mfp), (mfp))
  1.1021  
  1.1022 -#undef SH_MAKE_EXECUTABLECLASS_BODY
  1.1023 +#undef SH_MAKE_EXECUTABLECLASS_OB
  1.1024  
  1.1025  #endif
  1.1026  	// The pope is dead. -> :(