sourcehook/sourcehook.h
changeset 211 af7f4f2148f5
parent 199 7a5b326bb7f8
child 233 6d19421c552c
     1.1 --- a/sourcehook/sourcehook.h	Thu May 25 16:43:51 2006 +0000
     1.2 +++ b/sourcehook/sourcehook.h	Thu Jun 08 18:34:18 2006 +0000
     1.3 @@ -454,9 +454,8 @@
     1.4  #define RETURN_META_VALUE(result, value)	do { SET_META_RESULT(result); return (value); } while(0)
     1.5  
     1.6  
     1.7 -// NEVER-EVER call these from post hooks!
     1.8 -// also, only call it from the hook handlers directly!
     1.9 -// :TODO: enforce it
    1.10 +// only call these from the hook handlers directly!
    1.11 +// :TODO: enforce it ?
    1.12  
    1.13  // Why take a memfuncptr instead of iface and func when we have to deduce the iface anyway now?
    1.14  // Well, without it, there'd be no way to specify which overloaded version we want in _VALUE
    1.15 @@ -484,6 +483,61 @@
    1.16  			(SourceHook::RecallGetIface(SH_GLOB_SHPTR, memfuncptr)->*(memfuncptr)) newparams); \
    1.17  	} while (0)
    1.18  
    1.19 +// :TODO: thisptroffs in MNEWPARAMS ??
    1.20 +
    1.21 +#if SH_COMP == SH_COMP_MSVC
    1.22 +
    1.23 +#define SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname) \
    1.24 +	union \
    1.25 +	{ \
    1.26 +		SH_MFHCls(hookname)::ECMFP mfp; \
    1.27 +		void *addr; \
    1.28 +	} u; \
    1.29 +	SourceHook::EmptyClass *thisptr = reinterpret_cast<SourceHook::EmptyClass*>(SH_GLOB_SHPTR->GetIfacePtr()); \
    1.30 +	u.addr = (*reinterpret_cast<void***>(reinterpret_cast<char*>(thisptr) + SH_MFHCls(hookname)::ms_MFI.vtbloffs))[ \
    1.31 +		SH_MFHCls(hookname)::ms_MFI.vtblindex];
    1.32 +
    1.33 +#elif SH_COMP == SH_COMP_GCC
    1.34 +
    1.35 +#define SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname) \
    1.36 +	union \
    1.37 +	{ \
    1.38 +		SH_MFHCls(hookname)::ECMFP mfp; \
    1.39 +		struct \
    1.40 +		{ \
    1.41 +			void *addr; \
    1.42 +			intptr_t adjustor; \
    1.43 +		} s; \
    1.44 +	} u; \
    1.45 +	SourceHook::EmptyClass *thisptr = reinterpret_cast<SourceHook::EmptyClass*>(SH_GLOB_SHPTR->GetIfacePtr()); \
    1.46 +	u.s.addr = (*reinterpret_cast<void***>(reinterpret_cast<char*>(thisptr) + SH_MFHCls(hookname)::ms_MFI.vtbloffs))[ \
    1.47 +		SH_MFHCls(hookname)::ms_MFI.vtblindex]; \
    1.48 +	u.s.adjustor = 0;
    1.49 +
    1.50 +#endif
    1.51 +
    1.52 +#define RETURN_META_MNEWPARAMS(result, hookname, newparams) \
    1.53 +	do { \
    1.54 +		SET_META_RESULT(result); \
    1.55 +		SH_GLOB_SHPTR->DoRecall(); \
    1.56 +		SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname); \
    1.57 +		(thisptr->*(u.mfp)) newparams; \
    1.58 +		RETURN_META(MRES_SUPERCEDE); \
    1.59 +	} while (0)
    1.60 +
    1.61 +#define RETURN_META_VALUE_MNEWPARAMS(result, value, hookname, newparams) \
    1.62 +	do { \
    1.63 +		SET_META_RESULT(result); \
    1.64 +		SH_GLOB_SHPTR->DoRecall(); \
    1.65 +		if ((result) >= MRES_OVERRIDE) \
    1.66 +		{ \
    1.67 +			/* see RETURN_META_VALUE_NEWPARAMS */ \
    1.68 +			SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(SH_GLOB_SHPTR, value); \
    1.69 +		} \
    1.70 +		SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname); \
    1.71 +		RETURN_META_VALUE(MRES_SUPERCEDE, (thisptr->*(u.mfp)) newparams); \
    1.72 +	} while (0)
    1.73 +
    1.74  /**
    1.75  *	@brief Get/generate callclass for an interface pointer
    1.76  *
    1.77 @@ -966,6 +1020,7 @@
    1.78  		virtual rettype Func() \
    1.79  		{ SH_HANDLEFUNC((), (), rettype); } \
    1.80  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(); \
    1.81 +		typedef rettype RetType; \
    1.82  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.83  	\
    1.84  	const int __SourceHook_ParamSizesM_##hookname[] = { 0 }; \
    1.85 @@ -1059,6 +1114,7 @@
    1.86  		virtual rettype Func(param1 p1) \
    1.87  		{ SH_HANDLEFUNC((param1), (p1), rettype); } \
    1.88  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1); \
    1.89 +		typedef rettype RetType; \
    1.90  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.91  	\
    1.92  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1) }; \
    1.93 @@ -1152,6 +1208,7 @@
    1.94  		virtual rettype Func(param1 p1, param2 p2) \
    1.95  		{ SH_HANDLEFUNC((param1, param2), (p1, p2), rettype); } \
    1.96  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2); \
    1.97 +		typedef rettype RetType; \
    1.98  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.99  	\
   1.100  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2) }; \
   1.101 @@ -1245,6 +1302,7 @@
   1.102  		virtual rettype Func(param1 p1, param2 p2, param3 p3) \
   1.103  		{ SH_HANDLEFUNC((param1, param2, param3), (p1, p2, p3), rettype); } \
   1.104  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3); \
   1.105 +		typedef rettype RetType; \
   1.106  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.107  	\
   1.108  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3) }; \
   1.109 @@ -1338,6 +1396,7 @@
   1.110  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) \
   1.111  		{ SH_HANDLEFUNC((param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
   1.112  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4); \
   1.113 +		typedef rettype RetType; \
   1.114  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.115  	\
   1.116  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4) }; \
   1.117 @@ -1431,6 +1490,7 @@
   1.118  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
   1.119  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
   1.120  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5); \
   1.121 +		typedef rettype RetType; \
   1.122  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.123  	\
   1.124  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5) }; \
   1.125 @@ -1524,6 +1584,7 @@
   1.126  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
   1.127  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
   1.128  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6); \
   1.129 +		typedef rettype RetType; \
   1.130  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.131  	\
   1.132  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6) }; \
   1.133 @@ -1617,6 +1678,7 @@
   1.134  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
   1.135  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
   1.136  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7); \
   1.137 +		typedef rettype RetType; \
   1.138  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.139  	\
   1.140  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7) }; \
   1.141 @@ -1710,6 +1772,7 @@
   1.142  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
   1.143  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
   1.144  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8); \
   1.145 +		typedef rettype RetType; \
   1.146  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.147  	\
   1.148  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8) }; \
   1.149 @@ -1803,6 +1866,7 @@
   1.150  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
   1.151  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
   1.152  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9); \
   1.153 +		typedef rettype RetType; \
   1.154  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.155  	\
   1.156  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9) }; \
   1.157 @@ -1896,6 +1960,7 @@
   1.158  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
   1.159  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
   1.160  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); \
   1.161 +		typedef rettype RetType; \
   1.162  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.163  	\
   1.164  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10) }; \
   1.165 @@ -1989,6 +2054,7 @@
   1.166  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) \
   1.167  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
   1.168  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11); \
   1.169 +		typedef rettype RetType; \
   1.170  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.171  	\
   1.172  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11) }; \
   1.173 @@ -2082,6 +2148,7 @@
   1.174  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) \
   1.175  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), rettype); } \
   1.176  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12); \
   1.177 +		typedef rettype RetType; \
   1.178  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.179  	\
   1.180  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12) }; \
   1.181 @@ -2175,6 +2242,7 @@
   1.182  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) \
   1.183  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), rettype); } \
   1.184  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13); \
   1.185 +		typedef rettype RetType; \
   1.186  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.187  	\
   1.188  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13) }; \
   1.189 @@ -2268,6 +2336,7 @@
   1.190  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) \
   1.191  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), rettype); } \
   1.192  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14); \
   1.193 +		typedef rettype RetType; \
   1.194  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.195  	\
   1.196  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14) }; \
   1.197 @@ -2361,6 +2430,7 @@
   1.198  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) \
   1.199  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), rettype); } \
   1.200  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15); \
   1.201 +		typedef rettype RetType; \
   1.202  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.203  	\
   1.204  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15) }; \
   1.205 @@ -2454,6 +2524,7 @@
   1.206  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) \
   1.207  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), rettype); } \
   1.208  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16); \
   1.209 +		typedef rettype RetType; \
   1.210  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.211  	\
   1.212  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16) }; \
   1.213 @@ -2547,6 +2618,7 @@
   1.214  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17) \
   1.215  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), rettype); } \
   1.216  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
   1.217 +		typedef rettype RetType; \
   1.218  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.219  	\
   1.220  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17) }; \
   1.221 @@ -2640,6 +2712,7 @@
   1.222  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17, param18 p18) \
   1.223  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18), rettype); } \
   1.224  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18); \
   1.225 +		typedef rettype RetType; \
   1.226  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.227  	\
   1.228  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18) }; \
   1.229 @@ -2733,6 +2806,7 @@
   1.230  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17, param18 p18, param19 p19) \
   1.231  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19), rettype); } \
   1.232  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19); \
   1.233 +		typedef rettype RetType; \
   1.234  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.235  	\
   1.236  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19) }; \
   1.237 @@ -2826,6 +2900,7 @@
   1.238  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17, param18 p18, param19 p19, param20 p20) \
   1.239  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20), rettype); } \
   1.240  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20); \
   1.241 +		typedef rettype RetType; \
   1.242  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.243  	\
   1.244  	const int __SourceHook_ParamSizesM_##hookname[] = { 0, sizeof(param1), sizeof(param2), sizeof(param3), sizeof(param4), sizeof(param5), sizeof(param6), sizeof(param7), sizeof(param8), sizeof(param9), sizeof(param10), sizeof(param11), sizeof(param12), sizeof(param13), sizeof(param14), sizeof(param15), sizeof(param16), sizeof(param17), sizeof(param18), sizeof(param19), sizeof(param20) }; \
   1.245 @@ -5659,6 +5734,12 @@
   1.246  
   1.247  namespace SourceHook
   1.248  {
   1.249 +	template <class RetType>
   1.250 +	void SetOverrideResult(ISourceHook *shptr, const RetType res)
   1.251 +	{
   1.252 +		*reinterpret_cast<RetType*>(shptr->GetOverrideRetPtr()) = res;
   1.253 +	}
   1.254 +
   1.255  
   1.256  	template <class Iface, class RetType>
   1.257  	void SetOverrideResult(ISourceHook *shptr, RetType (Iface::*mfp)(), const RetType res)