core/sourcehook/sourcehook.h
changeset 739 968e67c7780c
parent 733 2365240861a2
child 780 35f2a207badf
     1.1 --- a/core/sourcehook/sourcehook.h	Fri Dec 17 22:20:10 2010 -0500
     1.2 +++ b/core/sourcehook/sourcehook.h	Fri Dec 17 22:22:44 2010 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  /* ======== SourceHook ========
     1.5 -* Copyright (C) 2004-2008 Metamod:Source Development Team
     1.6 +* Copyright (C) 2004-2010 Metamod:Source Development Team
     1.7  * No warranties of any kind
     1.8  *
     1.9  * License: zlib/libpng
    1.10 @@ -307,6 +307,20 @@
    1.11  		};
    1.12  	};
    1.13  
    1.14 +	template <class T> struct ReferenceUtil
    1.15 +	{
    1.16 +		typedef T plain_type;
    1.17 +		typedef T* pointer_type;
    1.18 +		typedef T& reference_type;
    1.19 +	};
    1.20 +
    1.21 +	template <class T> struct ReferenceUtil<T&>
    1.22 +	{
    1.23 +		typedef T plain_type;
    1.24 +		typedef T* pointer_type;
    1.25 +		typedef T& reference_type;
    1.26 +	};
    1.27 +
    1.28  	struct IHookContext
    1.29  	{
    1.30  		virtual ISHDelegate *GetNext() = 0;
    1.31 @@ -480,7 +494,7 @@
    1.32  		*	@return Override Return Pointer the hookfunc should use (may differ from overrideRetPtr
    1.33  		*		when the hook func is being called as part of a recall
    1.34  		*/
    1.35 -		virtual IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origentry,
    1.36 +		virtual IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origCallAddr,
    1.37  			META_RES *statusPtr, META_RES *prevResPtr, META_RES *curResPtr,
    1.38  			const void *origRetPtr, void *overrideRetPtr) = 0;
    1.39  
    1.40 @@ -579,10 +593,14 @@
    1.41  
    1.42  // only call these from the hook handlers directly!
    1.43  
    1.44 +#define MAKE_NOREF_VALUE(rettype) \
    1.45 +	*reinterpret_cast< ::SourceHook::ReferenceUtil<rettype>::pointer_type >(0)
    1.46 +
    1.47  // If a hook on a function which returns a reference does not want to specify a return value,
    1.48  // it can use this macro.
    1.49  //   ONLY USE THIS WITH MRES_IGNORED AND MRES_HANDLED !!!
    1.50 -#define RETURN_META_NOREF(result, rettype)	do { SET_META_RESULT(result); return reinterpret_cast<rettype>(*SH_GLOB_SHPTR); } while(0)
    1.51 +#define RETURN_META_NOREF(result, rettype) \
    1.52 +	RETURN_META_VALUE(result, MAKE_NOREF_VALUE(rettype))
    1.53  
    1.54  // Why take a memfuncptr instead of iface and func when we have to deduce the iface anyway now?
    1.55  // Well, without it, there'd be no way to specify which overloaded version we want in _VALUE
    1.56 @@ -1163,7 +1181,7 @@
    1.57  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.58  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
    1.59  	{ \
    1.60 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.61 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
    1.62  	}
    1.63  
    1.64  #define SH_DECL_MANUALEXTERN0(hookname, rettype) \
    1.65 @@ -1196,7 +1214,7 @@
    1.66  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.67  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
    1.68  	{ \
    1.69 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.70 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
    1.71  	}
    1.72  
    1.73  #define SH_DECL_MANUALEXTERN0_vafmt(hookname, rettype) \
    1.74 @@ -1368,7 +1386,7 @@
    1.75  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.76  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
    1.77  	{ \
    1.78 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.79 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
    1.80  	}
    1.81  
    1.82  #define SH_DECL_MANUALEXTERN1(hookname, rettype, param1) \
    1.83 @@ -1401,7 +1419,7 @@
    1.84  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.85  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
    1.86  	{ \
    1.87 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.88 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
    1.89  	}
    1.90  
    1.91  #define SH_DECL_MANUALEXTERN1_vafmt(hookname, rettype, param1) \
    1.92 @@ -1573,7 +1591,7 @@
    1.93  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.94  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
    1.95  	{ \
    1.96 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.97 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
    1.98  	}
    1.99  
   1.100  #define SH_DECL_MANUALEXTERN2(hookname, rettype, param1, param2) \
   1.101 @@ -1606,7 +1624,7 @@
   1.102  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.103  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.104  	{ \
   1.105 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.106 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.107  	}
   1.108  
   1.109  #define SH_DECL_MANUALEXTERN2_vafmt(hookname, rettype, param1, param2) \
   1.110 @@ -1778,7 +1796,7 @@
   1.111  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.112  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.113  	{ \
   1.114 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.115 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.116  	}
   1.117  
   1.118  #define SH_DECL_MANUALEXTERN3(hookname, rettype, param1, param2, param3) \
   1.119 @@ -1811,7 +1829,7 @@
   1.120  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.121  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.122  	{ \
   1.123 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.124 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.125  	}
   1.126  
   1.127  #define SH_DECL_MANUALEXTERN3_vafmt(hookname, rettype, param1, param2, param3) \
   1.128 @@ -1983,7 +2001,7 @@
   1.129  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.130  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.131  	{ \
   1.132 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.133 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.134  	}
   1.135  
   1.136  #define SH_DECL_MANUALEXTERN4(hookname, rettype, param1, param2, param3, param4) \
   1.137 @@ -2016,7 +2034,7 @@
   1.138  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.139  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.140  	{ \
   1.141 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.142 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.143  	}
   1.144  
   1.145  #define SH_DECL_MANUALEXTERN4_vafmt(hookname, rettype, param1, param2, param3, param4) \
   1.146 @@ -2188,7 +2206,7 @@
   1.147  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.148  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.149  	{ \
   1.150 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.151 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.152  	}
   1.153  
   1.154  #define SH_DECL_MANUALEXTERN5(hookname, rettype, param1, param2, param3, param4, param5) \
   1.155 @@ -2221,7 +2239,7 @@
   1.156  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.157  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.158  	{ \
   1.159 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.160 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.161  	}
   1.162  
   1.163  #define SH_DECL_MANUALEXTERN5_vafmt(hookname, rettype, param1, param2, param3, param4, param5) \
   1.164 @@ -2393,7 +2411,7 @@
   1.165  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.166  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.167  	{ \
   1.168 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.169 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.170  	}
   1.171  
   1.172  #define SH_DECL_MANUALEXTERN6(hookname, rettype, param1, param2, param3, param4, param5, param6) \
   1.173 @@ -2426,7 +2444,7 @@
   1.174  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.175  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.176  	{ \
   1.177 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.178 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.179  	}
   1.180  
   1.181  #define SH_DECL_MANUALEXTERN6_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6) \
   1.182 @@ -2598,7 +2616,7 @@
   1.183  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.184  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.185  	{ \
   1.186 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.187 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.188  	}
   1.189  
   1.190  #define SH_DECL_MANUALEXTERN7(hookname, rettype, param1, param2, param3, param4, param5, param6, param7) \
   1.191 @@ -2631,7 +2649,7 @@
   1.192  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.193  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.194  	{ \
   1.195 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.196 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.197  	}
   1.198  
   1.199  #define SH_DECL_MANUALEXTERN7_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7) \
   1.200 @@ -2803,7 +2821,7 @@
   1.201  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.202  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.203  	{ \
   1.204 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.205 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.206  	}
   1.207  
   1.208  #define SH_DECL_MANUALEXTERN8(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   1.209 @@ -2836,7 +2854,7 @@
   1.210  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.211  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.212  	{ \
   1.213 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.214 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.215  	}
   1.216  
   1.217  #define SH_DECL_MANUALEXTERN8_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
   1.218 @@ -3008,7 +3026,7 @@
   1.219  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.220  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.221  	{ \
   1.222 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.223 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.224  	}
   1.225  
   1.226  #define SH_DECL_MANUALEXTERN9(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   1.227 @@ -3041,7 +3059,7 @@
   1.228  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.229  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.230  	{ \
   1.231 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.232 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.233  	}
   1.234  
   1.235  #define SH_DECL_MANUALEXTERN9_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
   1.236 @@ -3213,7 +3231,7 @@
   1.237  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.238  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.239  	{ \
   1.240 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.241 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.242  	}
   1.243  
   1.244  #define SH_DECL_MANUALEXTERN10(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
   1.245 @@ -3246,7 +3264,7 @@
   1.246  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.247  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.248  	{ \
   1.249 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.250 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.251  	}
   1.252  
   1.253  #define SH_DECL_MANUALEXTERN10_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
   1.254 @@ -3418,7 +3436,7 @@
   1.255  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.256  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.257  	{ \
   1.258 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.259 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.260  	}
   1.261  
   1.262  #define SH_DECL_MANUALEXTERN11(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
   1.263 @@ -3451,7 +3469,7 @@
   1.264  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.265  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.266  	{ \
   1.267 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.268 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.269  	}
   1.270  
   1.271  #define SH_DECL_MANUALEXTERN11_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
   1.272 @@ -3623,7 +3641,7 @@
   1.273  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.274  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.275  	{ \
   1.276 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.277 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.278  	}
   1.279  
   1.280  #define SH_DECL_MANUALEXTERN12(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
   1.281 @@ -3656,7 +3674,7 @@
   1.282  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.283  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.284  	{ \
   1.285 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.286 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.287  	}
   1.288  
   1.289  #define SH_DECL_MANUALEXTERN12_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
   1.290 @@ -3828,7 +3846,7 @@
   1.291  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.292  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.293  	{ \
   1.294 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.295 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.296  	}
   1.297  
   1.298  #define SH_DECL_MANUALEXTERN13(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
   1.299 @@ -3861,7 +3879,7 @@
   1.300  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.301  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.302  	{ \
   1.303 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.304 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.305  	}
   1.306  
   1.307  #define SH_DECL_MANUALEXTERN13_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
   1.308 @@ -4033,7 +4051,7 @@
   1.309  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.310  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.311  	{ \
   1.312 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.313 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.314  	}
   1.315  
   1.316  #define SH_DECL_MANUALEXTERN14(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
   1.317 @@ -4066,7 +4084,7 @@
   1.318  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.319  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.320  	{ \
   1.321 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.322 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.323  	}
   1.324  
   1.325  #define SH_DECL_MANUALEXTERN14_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
   1.326 @@ -4238,7 +4256,7 @@
   1.327  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.328  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.329  	{ \
   1.330 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.331 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.332  	}
   1.333  
   1.334  #define SH_DECL_MANUALEXTERN15(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
   1.335 @@ -4271,7 +4289,7 @@
   1.336  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.337  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.338  	{ \
   1.339 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.340 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.341  	}
   1.342  
   1.343  #define SH_DECL_MANUALEXTERN15_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
   1.344 @@ -4443,7 +4461,7 @@
   1.345  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.346  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.347  	{ \
   1.348 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.349 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.350  	}
   1.351  
   1.352  #define SH_DECL_MANUALEXTERN16(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
   1.353 @@ -4476,7 +4494,7 @@
   1.354  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.355  	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   1.356  	{ \
   1.357 -		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
   1.358 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   1.359  	}
   1.360  
   1.361  #define SH_DECL_MANUALEXTERN16_vafmt(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
   1.362 @@ -6737,12 +6755,6 @@
   1.363  
   1.364  namespace SourceHook
   1.365  {
   1.366 -	template <class RetType>
   1.367 -	void SetOverrideResult(ISourceHook *shptr, const RetType res)
   1.368 -	{
   1.369 -		*reinterpret_cast<RetType*>(shptr->GetOverrideRetPtr()) = res;
   1.370 -	}
   1.371 -
   1.372  	// SetOverrideResult used to be implemented like this:
   1.373  	//  SetOverrideResult(shptr, memfuncptr, return);
   1.374  	//  normally the compiler can deduce the return type from memfuncptr, but (at least msvc8) failed when it was a reference
   1.375 @@ -6767,6 +6779,14 @@
   1.376  		}
   1.377  	};
   1.378  
   1.379 +	// For manual hooks:
   1.380 +	// The rettype is passed in manually
   1.381 +	template <class RetType>
   1.382 +	OverrideFunctor<RetType> SetOverrideResult()
   1.383 +	{
   1.384 +		return OverrideFunctor<RetType>();
   1.385 +	}
   1.386 +
   1.387  	template <class Iface, class RetType>
   1.388  	OverrideFunctor<RetType> SetOverrideResult(RetType (Iface::*mfp)())
   1.389  	{