sourcehook/generate/sourcehook.hxx
changeset 443 8889b02fd07e
parent 441 b27d2b9167b0
child 444 29202588687b
     1.1 --- a/sourcehook/generate/sourcehook.hxx	Fri Nov 02 15:33:51 2007 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.hxx	Sun Nov 04 13:14:35 2007 +0000
     1.3 @@ -849,7 +849,7 @@
     1.4  	{ \
     1.5  		SH_MFHCls(hookname)::ECMFP mfp; \
     1.6  		void *vfnptr = reinterpret_cast<void*>( \
     1.7 -			*reinterpret_cast<void***>( (reinterpret_cast<char*>(ptr) + pthisptroffs + pvtbloffs) ) + pvtblidx); \
     1.8 +			*reinterpret_cast<void***>( (reinterpret_cast<char*>(ptr) + SH_MFHCls(hookname)::ms_MFI.thisptroffs + SH_MFHCls(hookname)::ms_MFI.vtbloffs) ) + SH_MFHCls(hookname)::ms_MFI.vtblindex); \
     1.9  		/* patch mfp */ \
    1.10  		*reinterpret_cast<void**>(&mfp) = *reinterpret_cast<void**>(vfnptr); \
    1.11  		return SH_MFHCls(hookname)::CallEC(reinterpret_cast< ::SourceHook::EmptyClass* >(ptr), mfp, vfnptr, SH_GLOB_SHPTR); \
    1.12 @@ -1115,7 +1115,7 @@
    1.13  		virtual rettype Func(@[$2,1,$1|, :param$2 p$2@]) \
    1.14  		{ SH_HANDLEFUNC((@[$2,1,$1|, :param$2@]), (@[$2,1,$1|, :p$2@]), rettype); } \
    1.15  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(@[$2,1,$1|, :param$2@]); \
    1.16 -		typedef SourceHook::ExecutableClass$1<SourceHook::EmptyClass, ECMFP, rettype@[$2,1,$1:, param$2@]> CallEC; \
    1.17 +		typedef SourceHook::ExecutableClass$1<::SourceHook::EmptyClass, ECMFP, rettype@[$2,1,$1:, param$2@]> CallEC; \
    1.18  		typedef rettype RetType; \
    1.19  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.20  	\
    1.21 @@ -1123,7 +1123,7 @@
    1.22  	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.23  	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { $1, __SH_GPI(rettype), \
    1.24  		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
    1.25 -	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, const rettype value) \
    1.26 +	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
    1.27  	{ \
    1.28  		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>(shptr, value); \
    1.29  	}
    1.30 @@ -1135,7 +1135,7 @@
    1.31  		fastdelegate::FastDelegate$1<@[$2,1,$1|, :param$2@]@[$1!=0:, @]rettype> handler); \
    1.32  	rettype(::SourceHook::EmptyClass::* __SoureceHook_FHM_GetRecallMFP##hookname(::SourceHook::EmptyClass *thisptr) )(@[$2,1,$1|, :param$2@]); \
    1.33  	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.34 -	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, const rettype res); \
    1.35 +	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype res); \
    1.36  	void __SourceHook_FHM_Reconfigure##hookname(int pvtblindex, int pvtbloffs, int pthisptroffs);
    1.37  
    1.38  #define SH_DECL_MANUALHOOK$1_void(hookname, vtblidx, vtbloffs, thisptroffs@[$2,1,$1:, param$2@]) \