sourcehook/generate/sourcehook.hxx
changeset 418 109309ff6350
parent 413 59bbed37595c
child 421 573b9a092a5f
     1.1 --- a/sourcehook/generate/sourcehook.hxx	Sat Oct 13 20:15:58 2007 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.hxx	Sun Oct 14 11:59:13 2007 +0000
     1.3 @@ -185,9 +185,9 @@
     1.4  
     1.5  		struct V2Info
     1.6  		{
     1.7 -			void *pDefCtor;
     1.8 +			void *pNormalCtor;
     1.9  			void *pCopyCtor;
    1.10 -			void *pNormalCtor;
    1.11 +			void *pDtor;
    1.12  			void *pAssignOperator;
    1.13  		};
    1.14  	};
    1.15 @@ -212,8 +212,8 @@
    1.16  		int convention;
    1.17  
    1.18  		// Version2:
    1.19 -		//  PassInfo::V2Info retPassInfo2;
    1.20 -		//  const PassInfo::V2Info *paramsPassInfo2;
    1.21 +		PassInfo::V2Info retPassInfo2;
    1.22 +		const PassInfo::V2Info *paramsPassInfo2;
    1.23  	};
    1.24  
    1.25  	struct IHookManagerInfo;
    1.26 @@ -991,6 +991,8 @@
    1.27  
    1.28  // GetPassInfo -> easier access. __SH_GPI generates a SourceHook::PassInfo instance.
    1.29  #define __SH_GPI(tt) { sizeof(tt), ::SourceHook::GetPassInfo< tt >::type, ::SourceHook::GetPassInfo< tt >::flags }
    1.30 +// Extra pass info V2
    1.31 +#define __SH_EPI { 0, 0, 0, 0 }
    1.32  
    1.33  @[$1,0,$a:
    1.34  // ********* Support for $1 arguments *********
    1.35 @@ -1004,9 +1006,10 @@
    1.36  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
    1.37  		(static_cast<rettype (ifacetype::*)(@[$2,1,$1|, :param$2@]) attr>(&ifacetype::ifacefunc))) \
    1.38  	\
    1.39 -	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.40 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.41 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.42  	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { $1, __SH_GPI(rettype), \
    1.43 -		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
    1.44 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0, __SH_EPI, __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload };
    1.45  
    1.46  
    1.47  #define SH_DECL_HOOK$1_void(ifacetype, ifacefunc, attr, overload@[$2,1,$1:, param$2@]) \
    1.48 @@ -1019,9 +1022,10 @@
    1.49  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
    1.50  		(static_cast<void (ifacetype::*)(@[$2,1,$1|, :param$2@]) attr>(&ifacetype::ifacefunc))) \
    1.51  	\
    1.52 -	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}@[$2,1,$1:,__SH_GPI(param$2)@] }; \
    1.53 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0}@[$2,1,$1:,__SH_GPI(param$2)@] }; \
    1.54 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.55  	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { $1, { 0, 0, 0 }, \
    1.56 -		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
    1.57 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0, __SH_EPI, __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload };
    1.58  
    1.59  #define SH_DECL_HOOK$1_vafmt(ifacetype, ifacefunc, attr, overload, rettype@[$2,1,$1:, param$2@]) \
    1.60  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@[$2,1,$1|, :param$2@]@[$1!=0:, @]const char *, ...) attr> \
    1.61 @@ -1040,9 +1044,10 @@
    1.62  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
    1.63  		(static_cast<rettype (ifacetype::*)(@[$2,1,$1|, :param$2@]@[$1!=0:, @]const char *, ...) attr>(&ifacetype::ifacefunc))) \
    1.64  	\
    1.65 -	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.66 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.67 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.68  	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { $1, __SH_GPI(rettype), \
    1.69 -		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
    1.70 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0, __SH_EPI, __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload };
    1.71  
    1.72  #define SH_DECL_HOOK$1_void_vafmt(ifacetype, ifacefunc, attr, overload@[$2,1,$1:, param$2@]) \
    1.73  	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@[$2,1,$1|, :param$2@]@[$1!=0:, @]const char *, ...) attr> \
    1.74 @@ -1061,9 +1066,10 @@
    1.75  	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
    1.76  		(static_cast<void (ifacetype::*)(@[$2,1,$1|, :param$2@]@[$1!=0:, @]const char *, ...) attr>(&ifacetype::ifacefunc))) \
    1.77  	\
    1.78 -	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {0, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.79 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.80 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.81  	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { $1, { 0, 0, 0 }, \
    1.82 -		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0 };
    1.83 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0, __SH_EPI, __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload };
    1.84  
    1.85  #define SH_DECL_MANUALHOOK$1(hookname, vtblidx, vtbloffs, thisptroffs, rettype@[$2,1,$1:, param$2@]) \
    1.86  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.87 @@ -1075,9 +1081,10 @@
    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[] = { {0, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.92 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
    1.93 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
    1.94  	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { $1, __SH_GPI(rettype), \
    1.95 -		__SourceHook_ParamInfosM_##hookname, 0 };
    1.96 +		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname };
    1.97  
    1.98  #define SH_DECL_MANUALHOOK$1_void(hookname, vtblidx, vtbloffs, thisptroffs@[$2,1,$1:, param$2@]) \
    1.99  	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.100 @@ -1088,9 +1095,10 @@
   1.101  		typedef void(::SourceHook::EmptyClass::*ECMFP)(@[$2,1,$1|, :param$2@]); \
   1.102  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.103  	\
   1.104 -	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {0, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
   1.105 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {1, 0, 0}@[$2,1,$1:, __SH_GPI(param$2)@] }; \
   1.106 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI@[$2,1,$1:, __SH_EPI@] }; \
   1.107  	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { $1, { 0, 0, 0 }, \
   1.108 -		__SourceHook_ParamInfosM_##hookname	, 0 };
   1.109 +		__SourceHook_ParamInfosM_##hookname	, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname };
   1.110  
   1.111  @]
   1.112