diff -r 90056ffa9784 -r 71016f952503 sourcehook/sourcehook.h --- a/sourcehook/sourcehook.h Wed May 04 13:59:57 2005 +0000 +++ b/sourcehook/sourcehook.h Thu May 05 10:40:47 2005 +0000 @@ -1,6 +1,10 @@ /* ======== SourceHook ======== -* By PM +* Copyright (C) 2004-2005 Metamod:Source Development Team * No warranties of any kind +* +* License: zlib/libpng +* +* Author(s): Pavol "PM OnoTo" Marko * ============================ */ @@ -12,6 +16,9 @@ #ifndef __SOURCEHOOK_H__ #define __SOURCEHOOK_H__ +#define SH_IFACE_VERSION 1 +#define SH_IMPL_VERSION 1 + #ifndef SH_GLOB_SHPTR #define SH_GLOB_SHPTR g_SHPtr #endif @@ -89,6 +96,15 @@ }; /** + * @brief Implicit cast. + */ + template + inline Out implicit_cast(In input) + { + return input; + } + + /** * @brief A plugin typedef * * SourceHook doesn't really care what this is. As long as the ==, != and = operators work on it @@ -164,6 +180,7 @@ ISHDelegate *handler; //!< Pointer to the handler bool paused; //!< If true, the hook should not be executed Plugin plug; //!< The owner plugin + int thisptr_offs; //!< This pointer offset }; void *ptr; //!< Pointer to the interface instance std::list hooks_pre; //!< A list of pre-hooks @@ -205,8 +222,9 @@ template struct CallClass { - B *ptr; - OrigVTables vt; + B *ptr; //!< Pointer to the actual object + size_t objsize; //!< Size of the instance + OrigVTables vt; //!< Info about vtables & functions }; typedef CallClass GenericCallClass; @@ -218,6 +236,16 @@ { public: /** + * @brief Return interface version + */ + virtual int GetIfaceVersion() = 0; + + /** + * @brief Return implementation version + */ + virtual int GetImplVersion() = 0; + + /** * @brief Add a hook. * * @return True if the function succeeded, false otherwise @@ -255,9 +283,9 @@ * @brief Return a pointer to a callclass. Generate a new one if required. * * @param iface The interface pointer - * @param size Size of the class + * @param size Size of the class instance */ - virtual GenericCallClass *GetCallClass(void *iface) = 0; + virtual GenericCallClass *GetCallClass(void *iface, size_t size) = 0; /** * @brief Release a callclass @@ -274,12 +302,12 @@ virtual void *GetIfacePtr() = 0; //!< Gets the interface pointer ////////////////////////////////////////////////////////////////////////// // For hook managers - virtual META_RES &GetCurResRef() = 0; //!< Gets the pointer to the current meta result - virtual META_RES &GetPrevResRef() = 0; //!< Gets the pointer to the previous meta result - virtual META_RES &GetStatusRef() = 0; //!< Gets the pointer to the status variable + virtual META_RES &GetCurResRef() = 0; //!< Gets the reference to the current meta result + virtual META_RES &GetPrevResRef() = 0; //!< Gets the reference to the previous meta result + virtual META_RES &GetStatusRef() = 0; //!< Gets the reference to the status variable + virtual void* &GetIfacePtrRef() = 0; //!< Gets the reference to the interface this pointer virtual void SetOrigRet(const void *ptr) = 0; //!< Sets the original return pointer virtual void SetOverrideRet(const void *ptr) = 0; //!< Sets the override result pointer - virtual void SetIfacePtr(void *ptr) = 0; //!< Sets the interface this pointer }; } @@ -306,7 +334,7 @@ inline SourceHook::CallClass *SH_GET_CALLCLASS_R(SourceHook::ISourceHook *shptr, ifacetype *ptr) { return reinterpret_cast*>( - shptr->GetCallClass(reinterpret_cast(ptr))); + shptr->GetCallClass(reinterpret_cast(ptr), sizeof(ifacetype))); } template @@ -319,14 +347,16 @@ #define SH_RELEASE_CALLCLASS(ptr) SH_RELEASE_CALLCLASS_R(SH_GLOB_SHPTR, ptr) #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \ - __SourceHook_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler) + __SourceHook_FHAdd##ifacetype##ifacefunc((void*)SourceHook::implicit_cast(ifaceptr), \ + post, handler) #define SH_ADD_HOOK_STATICFUNC(ifacetype, ifacefunc, ifaceptr, handler, post) \ SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler), post) #define SH_ADD_HOOK_MEMFUNC(ifacetype, ifacefunc, ifaceptr, handler_inst, handler_func, post) \ SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler_inst, handler_func), post) #define SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \ - __SourceHook_FHRemove##ifacetype##ifacefunc((void*)ifaceptr, post, handler) + __SourceHook_FHRemove##ifacetype##ifacefunc((void*)SourceHook::implicit_cast(ifaceptr), \ + post, handler) #define SH_REMOVE_HOOK_STATICFUNC(ifacetype, ifacefunc, ifaceptr, handler, post) \ SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler), post) #define SH_REMOVE_HOOK_MEMFUNC(ifacetype, ifacefunc, ifaceptr, handler_inst, handler_func, post) \ @@ -355,6 +385,10 @@ static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::HookManagerInfo *param) \ { \ using namespace ::SourceHook; \ + /* Verify interface version */ \ + if (SH_GLOB_SHPTR->GetIfaceVersion() != SH_IFACE_VERSION) \ + return 1; \ + \ if (action == ::SourceHook::HA_GetInfo) \ { \ param->proto = ms_Proto; \ @@ -458,8 +492,8 @@ META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \ META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \ META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \ + void* &ifptr = SH_GLOB_SHPTR->GetIfacePtrRef(); \ status = MRES_IGNORED; \ - SH_GLOB_SHPTR->SetIfacePtr(this); \ SH_GLOB_SHPTR->SetOrigRet(reinterpret_cast(&orig_ret)); \ SH_GLOB_SHPTR->SetOverrideRet(NULL); @@ -469,6 +503,7 @@ { \ if (hiter->paused) continue; \ cur_res = MRES_IGNORED; \ + ifptr = reinterpret_cast(reinterpret_cast(this) - hiter->thisptr_offs); \ plugin_ret = reinterpret_cast*>(hiter->handler)->GetDeleg() params; \ prev_res = cur_res; \ if (cur_res > status) \ @@ -532,8 +567,8 @@ META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \ META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \ META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \ + void* &ifptr = SH_GLOB_SHPTR->GetIfacePtrRef(); \ status = MRES_IGNORED; \ - SH_GLOB_SHPTR->SetIfacePtr(this); \ SH_GLOB_SHPTR->SetOverrideRet(NULL); #define SH_CALL_HOOKS_void(post, params) \ @@ -542,6 +577,7 @@ { \ if (hiter->paused) continue; \ cur_res = MRES_IGNORED; \ + ifptr = reinterpret_cast(reinterpret_cast(this) - hiter->thisptr_offs); \ reinterpret_cast*>(hiter->handler)->GetDeleg() params; \ prev_res = cur_res; \ if (cur_res > status) \ @@ -1460,8 +1496,8 @@ { \ using namespace ::SourceHook; \ MemFuncInfo mfi; \ - MFI_Impl::GetFuncInfo(m_MFP, mfi); \ - OrigVTables::const_iterator iter = m_CC->vt.find(mfi.vtbloffs); \ + GetFuncInfo(m_CC->ptr, m_MFP, mfi); \ + OrigVTables::const_iterator iter = m_CC->vt.find(mfi.thisptroffs + mfi.vtbloffs); \ if (iter == m_CC->vt.end() || mfi.vtblindex >= (int)iter->second.size() || iter->second[mfi.vtblindex] == NULL) \ return (m_CC->ptr->*m_MFP)call; \ \ @@ -1473,7 +1509,8 @@ } u; \ u.addr = iter->second[mfi.vtblindex]; \ \ - return (reinterpret_cast(m_CC->ptr)->*u.mfpnew)call; \ + void *adjustedthisptr = reinterpret_cast(reinterpret_cast(m_CC->ptr) + mfi.thisptroffs); \ + return (reinterpret_cast(adjustedthisptr)->*u.mfpnew)call; \ } @@ -1559,499 +1596,529 @@ }; } +// SH_CALL needs to deduce the return type -> it uses templates and function overloading +// That's why SH_CALL takes two parameters: "mfp2" of type RetType(X::*mfp)(params), and "mfp" of type MFP +// The only purpose of the mfp2 parameter is to extract the return type + // Support for 0 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)()> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)()) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)()) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)()>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)() const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)()const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)()const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)() const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 1 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 2 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 3 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 4 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 5 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 6 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 7 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 8 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 9 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 10 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 11 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 12 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 13 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 14 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 15 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) const>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)>(ptr, mfp); -} - -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)const) -{ - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } // Support for 16 arguments -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + + +#if SH_COMP != SH_COMP_MSVC + +// **** MSVC doesn't like these, GCC needs them **** + +// Support for 0 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(...)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 1 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 2 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)const) +// Support for 3 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 4 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 5 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 6 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 7 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)) +// Support for 8 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 9 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...)const) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 10 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 11 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 12 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } -template -SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...) const> -SH_CALL(SourceHook::CallClass *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)const) +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 13 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)) { - return SourceHook::ExecutableClass, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...) const>(ptr, mfp); + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 14 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); } +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 15 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +// Support for 16 arguments +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + +template +SourceHook::ExecutableClass, RetType, MFP> +SH_CALL2(SourceHook::CallClass *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...)const) +{ + return SourceHook::ExecutableClass, RetType, MFP>(ptr, mfp); +} + + +#endif + +#define SH_CALL(ptr, mfp) SH_CALL2((ptr), (mfp), (mfp)) #undef SH_MAKE_EXECUTABLECLASS_BODY