sourcehook/test/testhookmangen.hxx
branchhookman_autogen
changeset 458 4a0c5136f5e1
parent 456 9f19985c76aa
child 463 7a413a63426f
     1.1 --- a/sourcehook/test/testhookmangen.hxx	Sat Nov 10 16:42:28 2007 +0000
     1.2 +++ b/sourcehook/test/testhookmangen.hxx	Sun Nov 11 17:35:24 2007 +0000
     1.3 @@ -269,11 +269,7 @@
     1.4  	}; \
     1.5  	\
     1.6  	bool TestClass##id::ms_DoRecall = false; \
     1.7 -	\
     1.8 -	SourceHook::PassInfo paraminfos_##id[$1+1]; \
     1.9 -	SourceHook::PassInfo::V2Info paraminfos2_##id[$1+1]; \
    1.10 -	SourceHook::ProtoInfo protoinfo_##id = { $1, {0, 0, 0}, paraminfos_##id, \
    1.11 -		SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
    1.12 +	SourceHook::CProtoInfoBuilder protoinfo_##id(SourceHook::ProtoInfo::CallConv_ThisCall);
    1.13  
    1.14  
    1.15  #define THGM_MAKE_TEST$1(id, ret_type@[$2,1,$1:, param$2@]) \
    1.16 @@ -366,23 +362,19 @@
    1.17  	}; \
    1.18  	\
    1.19  	bool TestClass##id::ms_DoRecall = false; \
    1.20 -	\
    1.21 -	SourceHook::PassInfo paraminfos_##id[$1+1]; \
    1.22 -	SourceHook::PassInfo::V2Info paraminfos2_##id[$1+1]; \
    1.23 -	SourceHook::ProtoInfo protoinfo_##id = { $1, {0, 0, 0}, paraminfos_##id, \
    1.24 -		SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
    1.25 +	SourceHook::CProtoInfoBuilder protoinfo_##id(SourceHook::ProtoInfo::CallConv_ThisCall);
    1.26  	
    1.27  #define THGM_SETUP_PI$1(id@[$2,1,$1:, p$2_type, p$2_passtype, p$2_flags@]) \
    1.28  	void setuppi_##id() \
    1.29  	{ \
    1.30 -		paraminfos_##id[0].size = 1; paraminfos_##id[0].type = 0; paraminfos_##id[0].flags = 0; \
    1.31 -		\
    1.32 -		@[$2,1,$1: paraminfos_##id[$2].size = sizeof(p$2_type); paraminfos_##id[$2].type = p$2_passtype; paraminfos_##id[$2].flags = p$2_flags; @] \
    1.33 -		\
    1.34 -		@[$2,1,$1: paraminfos2_##id[$2].pNormalCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::NormalConstructor) : NULL; @] \
    1.35 -		@[$2,1,$1: paraminfos2_##id[$2].pCopyCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::CopyConstructor) : NULL; @] \
    1.36 -		@[$2,1,$1: paraminfos2_##id[$2].pDtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::Destructor) : NULL; @] \
    1.37 -		@[$2,1,$1: paraminfos2_##id[$2].pAssignOperator = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::AssignOp) : NULL; @] \
    1.38 +		@[$2,1,$1: \
    1.39 +		protoinfo_##id.AddParam(sizeof(p$2_type), p$2_passtype, p$2_flags, \
    1.40 +			(p$2_flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::NormalConstructor) : NULL, \
    1.41 +			(p$2_flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::CopyConstructor) : NULL, \
    1.42 +			(p$2_flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::Destructor) : NULL, \
    1.43 +			(p$2_flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::AssignOp) : NULL \
    1.44 +			); \
    1.45 +		@] \
    1.46  	}
    1.47  	
    1.48  @]
    1.49 @@ -390,14 +382,12 @@
    1.50  #define THGM_SETUP_RI(id, ret_type, ret_passtype, ret_flags) \
    1.51  	void setupri_##id() \
    1.52  	{ \
    1.53 -		protoinfo_##id.retPassInfo.size = sizeof(ret_type); \
    1.54 -		protoinfo_##id.retPassInfo.type = ret_passtype; \
    1.55 -		protoinfo_##id.retPassInfo.flags = ret_flags; \
    1.56 -		\
    1.57 -		protoinfo_##id.retPassInfo2.pNormalCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::NormalConstructor) : NULL; \
    1.58 -		protoinfo_##id.retPassInfo2.pCopyCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::CopyConstructor) : NULL; \
    1.59 -		protoinfo_##id.retPassInfo2.pDtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::Destructor) : NULL; \
    1.60 -		protoinfo_##id.retPassInfo2.pAssignOperator = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::AssignOp) : NULL; \
    1.61 +		protoinfo_##id.SetReturnType(sizeof(ret_type), ret_passtype, ret_flags, \
    1.62 +			(ret_flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::NormalConstructor) : NULL, \
    1.63 +			(ret_flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::CopyConstructor) : NULL, \
    1.64 +			(ret_flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::Destructor) : NULL, \
    1.65 +			(ret_flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::AssignOp) : NULL \
    1.66 +			); \
    1.67  	}
    1.68  	
    1.69  #define THGM_ADD_HOOK(id, num) \
    1.70 @@ -413,7 +403,7 @@
    1.71  
    1.72  #define THGM_DO_TEST_void(id, call_params) \
    1.73  	setuppi_##id(); \
    1.74 -	SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(&protoinfo_##id, 0, 0); \
    1.75 +	SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(protoinfo_##id, 0, 0); \
    1.76  	CAutoReleaseHookMan arhm_##id(myhookman##id); \
    1.77  	int hook1_##id, hook2_##id, hook3_##id, hook4_##id; \
    1.78  	\
    1.79 @@ -531,7 +521,7 @@
    1.80  #define THGM_DO_TEST(id, call_params) \
    1.81  	setuppi_##id(); \
    1.82  	setupri_##id(); \
    1.83 -	SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(&protoinfo_##id, 0, 0); \
    1.84 +	SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(protoinfo_##id, 0, 0); \
    1.85  	CAutoReleaseHookMan arhm_##id(myhookman##id); \
    1.86  	int hook1_##id, hook2_##id, hook3_##id, hook4_##id; \
    1.87  	\