diff -r 4c2e6bd4d2e8 -r 2365240861a2 core/sourcehook/sourcehook.h --- a/core/sourcehook/sourcehook.h Thu Oct 14 18:14:45 2010 -0500 +++ b/core/sourcehook/sourcehook.h Sat Oct 16 23:21:58 2010 -0700 @@ -1,5 +1,5 @@ /* ======== SourceHook ======== -* Copyright (C) 2004-2008 Metamod:Source Development Team +* Copyright (C) 2004-2010 Metamod:Source Development Team * No warranties of any kind * * License: zlib/libpng @@ -307,6 +307,20 @@ }; }; + template struct ReferenceUtil + { + typedef T plain_type; + typedef T* pointer_type; + typedef T& reference_type; + }; + + template struct ReferenceUtil + { + typedef T plain_type; + typedef T* pointer_type; + typedef T& reference_type; + }; + struct IHookContext { virtual ISHDelegate *GetNext() = 0; @@ -480,7 +494,7 @@ * @return Override Return Pointer the hookfunc should use (may differ from overrideRetPtr * when the hook func is being called as part of a recall */ - virtual IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origentry, + virtual IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origCallAddr, META_RES *statusPtr, META_RES *prevResPtr, META_RES *curResPtr, const void *origRetPtr, void *overrideRetPtr) = 0; @@ -579,10 +593,14 @@ // only call these from the hook handlers directly! +#define MAKE_NOREF_VALUE(rettype) \ + *reinterpret_cast< ::SourceHook::ReferenceUtil::pointer_type >(0) + // If a hook on a function which returns a reference does not want to specify a return value, // it can use this macro. // ONLY USE THIS WITH MRES_IGNORED AND MRES_HANDLED !!! -#define RETURN_META_NOREF(result, rettype) do { SET_META_RESULT(result); return reinterpret_cast(*SH_GLOB_SHPTR); } while(0) +#define RETURN_META_NOREF(result, rettype) \ + RETURN_META_VALUE(result, MAKE_NOREF_VALUE(rettype)) // Why take a memfuncptr instead of iface and func when we have to deduce the iface anyway now? // Well, without it, there'd be no way to specify which overloaded version we want in _VALUE @@ -1163,7 +1181,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN0(hookname, rettype) \ @@ -1196,7 +1214,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN0_vafmt(hookname, rettype) \ @@ -1368,7 +1386,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN1(hookname, rettype, param1) \ @@ -1401,7 +1419,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN1_vafmt(hookname, rettype, param1) \ @@ -1573,7 +1591,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN2(hookname, rettype, param1, param2) \ @@ -1606,7 +1624,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN2_vafmt(hookname, rettype, param1, param2) \ @@ -1778,7 +1796,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN3(hookname, rettype, param1, param2, param3) \ @@ -1811,7 +1829,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN3_vafmt(hookname, rettype, param1, param2, param3) \ @@ -1983,7 +2001,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN4(hookname, rettype, param1, param2, param3, param4) \ @@ -2016,7 +2034,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN4_vafmt(hookname, rettype, param1, param2, param3, param4) \ @@ -2188,7 +2206,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN5(hookname, rettype, param1, param2, param3, param4, param5) \ @@ -2221,7 +2239,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN5_vafmt(hookname, rettype, param1, param2, param3, param4, param5) \ @@ -2393,7 +2411,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN6(hookname, rettype, param1, param2, param3, param4, param5, param6) \ @@ -2426,7 +2444,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN6_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6) \ @@ -2598,7 +2616,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN7(hookname, rettype, param1, param2, param3, param4, param5, param6, param7) \ @@ -2631,7 +2649,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN7_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7) \ @@ -2803,7 +2821,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN8(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \ @@ -2836,7 +2854,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN8_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \ @@ -3008,7 +3026,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN9(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \ @@ -3041,7 +3059,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN9_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \ @@ -3213,7 +3231,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN10(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \ @@ -3246,7 +3264,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN10_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \ @@ -3418,7 +3436,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN11(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \ @@ -3451,7 +3469,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN11_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \ @@ -3623,7 +3641,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN12(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \ @@ -3656,7 +3674,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN12_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \ @@ -3828,7 +3846,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN13(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \ @@ -3861,7 +3879,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN13_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \ @@ -4033,7 +4051,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN14(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \ @@ -4066,7 +4084,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN14_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \ @@ -4238,7 +4256,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN15(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \ @@ -4271,7 +4289,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN15_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \ @@ -4443,7 +4461,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN16(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \ @@ -4476,7 +4494,7 @@ __SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \ void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \ { \ - ::SourceHook::SetOverrideResult(shptr, value); \ + ::SourceHook::SetOverrideResult()(shptr, value); \ } #define SH_DECL_MANUALEXTERN16_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \ @@ -6737,12 +6755,6 @@ namespace SourceHook { - template - void SetOverrideResult(ISourceHook *shptr, const RetType res) - { - *reinterpret_cast(shptr->GetOverrideRetPtr()) = res; - } - // SetOverrideResult used to be implemented like this: // SetOverrideResult(shptr, memfuncptr, return); // normally the compiler can deduce the return type from memfuncptr, but (at least msvc8) failed when it was a reference @@ -6767,6 +6779,14 @@ } }; + // For manual hooks: + // The rettype is passed in manually + template + OverrideFunctor SetOverrideResult() + { + return OverrideFunctor(); + } + template OverrideFunctor SetOverrideResult(RetType (Iface::*mfp)()) {