1.1 --- a/sourcehook/test/testhookmangen.h Fri Nov 09 21:14:37 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.h Sat Nov 10 16:10:55 2007 +0000
1.3 @@ -1,3 +1,15 @@
1.4 +struct CAutoReleaseHookMan
1.5 +{
1.6 + SourceHook::HookManagerPubFunc m_Ptr;
1.7 + CAutoReleaseHookMan(SourceHook::HookManagerPubFunc ptr) : m_Ptr(ptr)
1.8 + {
1.9 + }
1.10 + ~CAutoReleaseHookMan()
1.11 + {
1.12 + g_HMAGPtr->ReleaseHookMan(m_Ptr);
1.13 + }
1.14 +};
1.15 +
1.16 // Strip &
1.17 template <class T> struct StripRef
1.18 {
1.19 @@ -520,9 +532,6 @@
1.20 SourceHook::PassInfo::V2Info paraminfos2_##id[0+1]; \
1.21 SourceHook::ProtoInfo protoinfo_##id = { 0, {0, 0, 0}, paraminfos_##id, \
1.22 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.23 - \
1.24 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.25 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.26
1.27
1.28 #define THGM_MAKE_TEST0(id, ret_type) \
1.29 @@ -621,8 +630,7 @@
1.30 SourceHook::ProtoInfo protoinfo_##id = { 0, {0, 0, 0}, paraminfos_##id, \
1.31 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.32 \
1.33 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.34 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.35 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.36
1.37 #define THGM_SETUP_PI0(id) \
1.38 void setuppi_##id() \
1.39 @@ -731,9 +739,6 @@
1.40 SourceHook::PassInfo::V2Info paraminfos2_##id[1+1]; \
1.41 SourceHook::ProtoInfo protoinfo_##id = { 1, {0, 0, 0}, paraminfos_##id, \
1.42 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.43 - \
1.44 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.45 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.46
1.47
1.48 #define THGM_MAKE_TEST1(id, ret_type, param1) \
1.49 @@ -832,8 +837,7 @@
1.50 SourceHook::ProtoInfo protoinfo_##id = { 1, {0, 0, 0}, paraminfos_##id, \
1.51 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.52 \
1.53 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.54 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.55 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.56
1.57 #define THGM_SETUP_PI1(id, p1_type, p1_passtype, p1_flags) \
1.58 void setuppi_##id() \
1.59 @@ -942,9 +946,6 @@
1.60 SourceHook::PassInfo::V2Info paraminfos2_##id[2+1]; \
1.61 SourceHook::ProtoInfo protoinfo_##id = { 2, {0, 0, 0}, paraminfos_##id, \
1.62 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.63 - \
1.64 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.65 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.66
1.67
1.68 #define THGM_MAKE_TEST2(id, ret_type, param1, param2) \
1.69 @@ -1043,8 +1044,7 @@
1.70 SourceHook::ProtoInfo protoinfo_##id = { 2, {0, 0, 0}, paraminfos_##id, \
1.71 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.72 \
1.73 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.74 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.75 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.76
1.77 #define THGM_SETUP_PI2(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags) \
1.78 void setuppi_##id() \
1.79 @@ -1153,9 +1153,6 @@
1.80 SourceHook::PassInfo::V2Info paraminfos2_##id[3+1]; \
1.81 SourceHook::ProtoInfo protoinfo_##id = { 3, {0, 0, 0}, paraminfos_##id, \
1.82 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.83 - \
1.84 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.85 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.86
1.87
1.88 #define THGM_MAKE_TEST3(id, ret_type, param1, param2, param3) \
1.89 @@ -1254,8 +1251,7 @@
1.90 SourceHook::ProtoInfo protoinfo_##id = { 3, {0, 0, 0}, paraminfos_##id, \
1.91 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.92 \
1.93 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.94 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.95 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.96
1.97 #define THGM_SETUP_PI3(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags, p3_type, p3_passtype, p3_flags) \
1.98 void setuppi_##id() \
1.99 @@ -1364,9 +1360,6 @@
1.100 SourceHook::PassInfo::V2Info paraminfos2_##id[4+1]; \
1.101 SourceHook::ProtoInfo protoinfo_##id = { 4, {0, 0, 0}, paraminfos_##id, \
1.102 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.103 - \
1.104 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.105 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.106
1.107
1.108 #define THGM_MAKE_TEST4(id, ret_type, param1, param2, param3, param4) \
1.109 @@ -1465,8 +1458,7 @@
1.110 SourceHook::ProtoInfo protoinfo_##id = { 4, {0, 0, 0}, paraminfos_##id, \
1.111 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.112 \
1.113 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.114 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.115 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.116
1.117 #define THGM_SETUP_PI4(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags, p3_type, p3_passtype, p3_flags, p4_type, p4_passtype, p4_flags) \
1.118 void setuppi_##id() \
1.119 @@ -1575,9 +1567,6 @@
1.120 SourceHook::PassInfo::V2Info paraminfos2_##id[5+1]; \
1.121 SourceHook::ProtoInfo protoinfo_##id = { 5, {0, 0, 0}, paraminfos_##id, \
1.122 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.123 - \
1.124 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.125 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.126
1.127
1.128 #define THGM_MAKE_TEST5(id, ret_type, param1, param2, param3, param4, param5) \
1.129 @@ -1676,8 +1665,7 @@
1.130 SourceHook::ProtoInfo protoinfo_##id = { 5, {0, 0, 0}, paraminfos_##id, \
1.131 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.132 \
1.133 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.134 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.135 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.136
1.137 #define THGM_SETUP_PI5(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags, p3_type, p3_passtype, p3_flags, p4_type, p4_passtype, p4_flags, p5_type, p5_passtype, p5_flags) \
1.138 void setuppi_##id() \
1.139 @@ -1786,9 +1774,6 @@
1.140 SourceHook::PassInfo::V2Info paraminfos2_##id[6+1]; \
1.141 SourceHook::ProtoInfo protoinfo_##id = { 6, {0, 0, 0}, paraminfos_##id, \
1.142 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.143 - \
1.144 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.145 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.146
1.147
1.148 #define THGM_MAKE_TEST6(id, ret_type, param1, param2, param3, param4, param5, param6) \
1.149 @@ -1887,8 +1872,7 @@
1.150 SourceHook::ProtoInfo protoinfo_##id = { 6, {0, 0, 0}, paraminfos_##id, \
1.151 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
1.152 \
1.153 - SourceHook::Impl::GenContext *g_Genc##id = NULL; \
1.154 - CAutoPtrDestruction<SourceHook::Impl::GenContext> g_Genc_ad##id(NULL);
1.155 + CAutoReleaseHookMan g_Genc_ad##id(NULL);
1.156
1.157 #define THGM_SETUP_PI6(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags, p3_type, p3_passtype, p3_flags, p4_type, p4_passtype, p4_flags, p5_type, p5_passtype, p5_flags, p6_type, p6_passtype, p6_flags) \
1.158 void setuppi_##id() \
1.159 @@ -1931,9 +1915,8 @@
1.160
1.161 #define THGM_DO_TEST_void(id, call_params) \
1.162 setuppi_##id(); \
1.163 - g_Genc##id = new SourceHook::Impl::GenContext(&protoinfo_##id, 0, 0, g_SHPtr); \
1.164 - g_Genc_ad##id.set(g_Genc##id); \
1.165 - SourceHook::HookManagerPubFunc myhookman##id = g_Genc##id->Generate(); \
1.166 + SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(&protoinfo_##id, 0, 0); \
1.167 + CAutoReleaseHookMan arhm_##id(myhookman##id); \
1.168 int hook1_##id, hook2_##id, hook3_##id, hook4_##id; \
1.169 \
1.170 TestClass##id::ms_DoRecall = false; \
1.171 @@ -2050,9 +2033,8 @@
1.172 #define THGM_DO_TEST(id, call_params) \
1.173 setuppi_##id(); \
1.174 setupri_##id(); \
1.175 - g_Genc##id = new SourceHook::Impl::GenContext(&protoinfo_##id, 0, 0, g_SHPtr); \
1.176 - g_Genc_ad##id.set(g_Genc##id); \
1.177 - SourceHook::HookManagerPubFunc myhookman##id = g_Genc##id->Generate(); \
1.178 + SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(&protoinfo_##id, 0, 0); \
1.179 + CAutoReleaseHookMan arhm_##id(myhookman##id); \
1.180 int hook1_##id, hook2_##id, hook3_##id, hook4_##id; \
1.181 \
1.182 TestClass##id::ms_DoRecall = false; \