sourcehook/generate/sourcehook.hxx
changeset 440 75e1217111eb
parent 421 573b9a092a5f
child 441 b27d2b9167b0
     1.1 --- a/sourcehook/generate/sourcehook.hxx	Tue Oct 30 18:22:12 2007 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.hxx	Fri Nov 02 14:36:47 2007 +0000
     1.3 @@ -584,7 +584,6 @@
     1.4  		SH_MFHCls(hookname)::ECMFP mfp; \
     1.5  		void *addr; \
     1.6  	} u; \
     1.7 -	SourceHook::EmptyClass *thisptr = reinterpret_cast<SourceHook::EmptyClass*>(SH_GLOB_SHPTR->GetIfacePtr()); \
     1.8  	u.addr = (*reinterpret_cast<void***>(reinterpret_cast<char*>(thisptr) + SH_MFHCls(hookname)::ms_MFI.vtbloffs))[ \
     1.9  		SH_MFHCls(hookname)::ms_MFI.vtblindex];
    1.10  
    1.11 @@ -600,7 +599,6 @@
    1.12  			intptr_t adjustor; \
    1.13  		} s; \
    1.14  	} u; \
    1.15 -	SourceHook::EmptyClass *thisptr = reinterpret_cast<SourceHook::EmptyClass*>(SH_GLOB_SHPTR->GetIfacePtr()); \
    1.16  	u.s.addr = (*reinterpret_cast<void***>(reinterpret_cast<char*>(thisptr) + SH_MFHCls(hookname)::ms_MFI.vtbloffs))[ \
    1.17  		SH_MFHCls(hookname)::ms_MFI.vtblindex]; \
    1.18  	u.s.adjustor = 0;
    1.19 @@ -611,8 +609,8 @@
    1.20  	do { \
    1.21  		SET_META_RESULT(result); \
    1.22  		SH_GLOB_SHPTR->DoRecall(); \
    1.23 -		SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname); \
    1.24 -		(thisptr->*(u.mfp)) newparams; \
    1.25 +		SourceHook::EmptyClass *thisptr = reinterpret_cast<SourceHook::EmptyClass*>(SH_GLOB_SHPTR->GetIfacePtr()); \
    1.26 +		(thisptr->*(__SoureceHook_FHM_GetRecallMFP##hookname(thisptr))) newparams; \
    1.27  		RETURN_META(MRES_SUPERCEDE); \
    1.28  	} while (0)
    1.29  
    1.30 @@ -623,20 +621,15 @@
    1.31  		if ((result) >= MRES_OVERRIDE) \
    1.32  		{ \
    1.33  			/* see RETURN_META_VALUE_NEWPARAMS */ \
    1.34 -			SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(SH_GLOB_SHPTR, value); \
    1.35 +			__SoureceHook_FHM_SetOverrideResult##hookname(SH_GLOB_SHPTR, value); \
    1.36  		} \
    1.37 -		SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname); \
    1.38 -		RETURN_META_VALUE(MRES_SUPERCEDE, (thisptr->*(u.mfp)) newparams); \
    1.39 +		SourceHook::EmptyClass *thisptr = reinterpret_cast<SourceHook::EmptyClass*>(SH_GLOB_SHPTR->GetIfacePtr()); \
    1.40 +		RETURN_META_VALUE(MRES_SUPERCEDE, (thisptr->*(__SoureceHook_FHM_GetRecallMFP##hookname(thisptr))) newparams); \
    1.41  	} while (0)
    1.42  
    1.43  
    1.44  #define SH_MANUALHOOK_RECONFIGURE(hookname, pvtblindex, pvtbloffs, pthisptroffs) \
    1.45 -	do { \
    1.46 -		SH_GLOB_SHPTR->RemoveHookManager(SH_GLOB_PLUGPTR, SH_MFHCls(hookname)::HookManPubFunc); \
    1.47 -		SH_MFHCls(hookname)::ms_MFI.thisptroffs = pthisptroffs; \
    1.48 -		SH_MFHCls(hookname)::ms_MFI.vtblindex = pvtblindex; \
    1.49 -		SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \
    1.50 -	} while (0)
    1.51 +	__SourceHook_FHM_Reconfigure##hookname(pvtblindex, pvtbloffs, pthisptroffs)
    1.52  
    1.53  #define SH_GET_ORIG_VFNPTR_ENTRY(inst, mfp) (SourceHook::GetOrigVfnPtrEntry(inst, mfp, SH_GLOB_SHPTR))
    1.54  
    1.55 @@ -847,6 +840,27 @@
    1.56  		return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, pthisptroffs, \
    1.57  			SH_MFHCls(hookname)::HookManPubFunc, &tmp, post); \
    1.58  	} \
    1.59 +	SH_MFHCls(hookname)::ECMFP __SoureceHook_FHM_GetRecallMFP##hookname(::SourceHook::EmptyClass *thisptr) \
    1.60 +	{ \
    1.61 +		SOUREHOOK__MNEWPARAMS_PREPAREMFP(hookname); \
    1.62 +		return u.mfp; \
    1.63 +	} \
    1.64 +	SH_MFHCls(hookname)::CallEC __SoureceHook_FHM_SHCall##hookname(void *ptr) \
    1.65 +	{ \
    1.66 +		SH_MFHCls(hookname)::ECMFP mfp; \
    1.67 +		void *vfnptr = reinterpret_cast<void*>( \
    1.68 +			*reinterpret_cast<void***>( (reinterpret_cast<char*>(ptr) + pthisptroffs + pvtbloffs) ) + pvtblidx); \
    1.69 +		/* patch mfp */ \
    1.70 +		*reinterpret_cast<void**>(&mfp) = *reinterpret_cast<void**>(vfnptr); \
    1.71 +		return SH_MFHCls(hookname)::CallEC(reinterpret_cast<::SourceHook::EmptyClass*>(ptr), mfp, vfnptr, SH_GLOB_SHPTR); \
    1.72 +	} \
    1.73 +	void __SourceHook_FHM_Reconfigure##hookname(int p_vtblindex, int p_vtbloffs, int p_thisptroffs) \
    1.74 +	{ \
    1.75 +		SH_GLOB_SHPTR->RemoveHookManager(SH_GLOB_PLUGPTR, SH_MFHCls(hookname)::HookManPubFunc); \
    1.76 +		SH_MFHCls(hookname)::ms_MFI.thisptroffs = p_thisptroffs; \
    1.77 +		SH_MFHCls(hookname)::ms_MFI.vtblindex = p_vtblindex; \
    1.78 +		SH_MFHCls(hookname)::ms_MFI.vtbloffs = p_vtbloffs; \
    1.79 +	}
    1.80  
    1.81  #define SH_SETUPCALLS(rettype, paramtypes, params) \
    1.82  	/* 1) Set up */ \
    1.83 @@ -1101,19 +1115,28 @@
    1.84  		virtual rettype Func(@[$2,1,$1|, :param$2 p$2@]) \
    1.85  		{ SH_HANDLEFUNC((@[$2,1,$1|, :param$2@]), (@[$2,1,$1|, :p$2@]), rettype); } \
    1.86  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(@[$2,1,$1|, :param$2@]); \
    1.87 +		typedef SourceHook::ExecutableClass$1<SourceHook::EmptyClass, ECMFP, rettype@[$2,1,$1:, param$2@]> CallEC; \
    1.88  		typedef rettype RetType; \
    1.89  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.90  	\
    1.91  	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.92  	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.93  	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { $1, __SH_GPI(rettype), \
    1.94 -		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname };
    1.95 +		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.96 +	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, const rettype value) \
    1.97 +	{ \
    1.98 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.99 +	}
   1.100  
   1.101  #define SH_DECL_MANUALEXTERN$1(hookname, rettype@[$2,1,$1:, param$2@]) \
   1.102  	int __SourceHook_FHMAdd##hookname(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   1.103  		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]@[$1!=0:, @]rettype> handler); \
   1.104  	bool __SourceHook_FHMRemove##hookname(void *iface, bool post, \
   1.105 -		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]@[$1!=0:, @]rettype> handler);
   1.106 +		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]@[$1!=0:, @]rettype> handler); \
   1.107 +	rettype(::SourceHook::EmptyClass::* __SoureceHook_FHM_GetRecallMFP##hookname(::SourceHook::EmptyClass *thisptr) )(@[$2,1,$1|, :param$2@]); \
   1.108 +	SourceHook::ExecutableClass$1<SourceHook::EmptyClass, rettype(::SourceHook::EmptyClass::*)(@[$2,1,$1|, :param$2@]), rettype@[$2,1,$1:, param$2@]> __SoureceHook_FHM_SHCall##hookname(void *ptr); \
   1.109 +	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, const rettype res); \
   1.110 +	void __SourceHook_FHM_Reconfigure##hookname(int pvtblindex, int pvtbloffs, int pthisptroffs);
   1.111  
   1.112  #define SH_DECL_MANUALHOOK$1_void(hookname, vtblidx, vtbloffs, thisptroffs@[$2,1,$1:, param$2@]) \
   1.113  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.114 @@ -1122,18 +1145,23 @@
   1.115  		virtual void Func(@[$2,1,$1|, :param$2 p$2@]) \
   1.116  		{ SH_HANDLEFUNC_void((@[$2,1,$1|, :param$2@]), (@[$2,1,$1|, :p$2@])); } \
   1.117  		typedef void(::SourceHook::EmptyClass::*ECMFP)(@[$2,1,$1|, :param$2@]); \
   1.118 +		typedef SourceHook::ExecutableClass$1<SourceHook::EmptyClass, ECMFP, void@[$2,1,$1:, param$2@]> CallEC; \
   1.119  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.120  	\
   1.121  	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
   1.122  	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
   1.123  	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { $1, { 0, 0, 0 }, \
   1.124 -		__SourceHook_ParamInfosM_##hookname	, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname };
   1.125 +		__SourceHook_ParamInfosM_##hookname	, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   1.126  
   1.127  #define SH_DECL_MANUALEXTERN$1_void(hookname@[$2,1,$1:, param$2@]) \
   1.128  	int __SourceHook_FHMAdd##hookname(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   1.129  		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]> handler); \
   1.130  	bool __SourceHook_FHMRemove##hookname(void *iface, bool post, \
   1.131 -		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]> handler);
   1.132 +		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]> handler); \
   1.133 +	void(::SourceHook::EmptyClass::* __SoureceHook_FHM_GetRecallMFP##hookname(::SourceHook::EmptyClass *thisptr) )(@[$2,1,$1|, :param$2@]); \
   1.134 +	SourceHook::ExecutableClass$1<SourceHook::EmptyClass, void(::SourceHook::EmptyClass::*)(@[$2,1,$1|, :param$2@]), void@[$2,1,$1:, param$2@]> __SoureceHook_FHM_SHCall##hookname(void *ptr); \
   1.135 +	void __SourceHook_FHM_Reconfigure##hookname(int pvtblindex, int pvtbloffs, int pthisptroffs);
   1.136 +
   1.137  @]
   1.138  
   1.139  
   1.140 @@ -1277,8 +1305,9 @@
   1.141  
   1.142  #define SH_CALL(ptr, mfp) SH_CALL2((ptr), (mfp), (mfp), SH_GLOB_SHPTR)
   1.143  #define SH_MCALL2(ptr, mfp, vtblidx, vtbloffs, thisptroffs) SH_MCALL3((ptr), (mfp), (mfp), (vtblidx), (vtbloffs), (thisptroffs), SH_GLOB_SHPTR)
   1.144 -#define SH_MCALL(ptr, mhookname) SH_MCALL2((ptr), SH_MFHCls(mhookname)::ECMFP(), SH_MFHCls(mhookname)::ms_MFI.vtblindex, \
   1.145 -	SH_MFHCls(mhookname)::ms_MFI.vtbloffs, SH_MFHCls(mhookname)::ms_MFI.thisptroffs)
   1.146 +//#define SH_MCALL(ptr, mhookname) SH_MCALL2((ptr), SH_MFHCls(mhookname)::ECMFP(), SH_MFHCls(mhookname)::ms_MFI.vtblindex, \
   1.147 +//	SH_MFHCls(mhookname)::ms_MFI.vtbloffs, SH_MFHCls(mhookname)::ms_MFI.thisptroffs)
   1.148 +#define SH_MCALL(ptr, mhookname) __SoureceHook_FHM_SHCall##mhookname(ptr)
   1.149  
   1.150  #undef SH_MAKE_EXECUTABLECLASS_OB
   1.151  #undef SH_MAKE_EXECUTABLECLASS_OB_void