1.1 --- a/sourcehook/test/testhookmangen.hxx Fri Nov 09 21:14:37 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.hxx 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 @@ -262,9 +274,6 @@
1.20 SourceHook::PassInfo::V2Info paraminfos2_##id[$1+1]; \
1.21 SourceHook::ProtoInfo protoinfo_##id = { $1, {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_TEST$1(id, ret_type@[$2,1,$1:, param$2@]) \
1.29 @@ -363,8 +372,7 @@
1.30 SourceHook::ProtoInfo protoinfo_##id = { $1, {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_PI$1(id@[$2,1,$1:, p$2_type, p$2_passtype, p$2_flags@]) \
1.38 void setuppi_##id() \
1.39 @@ -407,9 +415,8 @@
1.40
1.41 #define THGM_DO_TEST_void(id, call_params) \
1.42 setuppi_##id(); \
1.43 - g_Genc##id = new SourceHook::Impl::GenContext(&protoinfo_##id, 0, 0, g_SHPtr); \
1.44 - g_Genc_ad##id.set(g_Genc##id); \
1.45 - SourceHook::HookManagerPubFunc myhookman##id = g_Genc##id->Generate(); \
1.46 + SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(&protoinfo_##id, 0, 0); \
1.47 + CAutoReleaseHookMan arhm_##id(myhookman##id); \
1.48 int hook1_##id, hook2_##id, hook3_##id, hook4_##id; \
1.49 \
1.50 TestClass##id::ms_DoRecall = false; \
1.51 @@ -526,9 +533,8 @@
1.52 #define THGM_DO_TEST(id, call_params) \
1.53 setuppi_##id(); \
1.54 setupri_##id(); \
1.55 - g_Genc##id = new SourceHook::Impl::GenContext(&protoinfo_##id, 0, 0, g_SHPtr); \
1.56 - g_Genc_ad##id.set(g_Genc##id); \
1.57 - SourceHook::HookManagerPubFunc myhookman##id = g_Genc##id->Generate(); \
1.58 + SourceHook::HookManagerPubFunc myhookman##id = g_HMAGPtr->MakeHookMan(&protoinfo_##id, 0, 0); \
1.59 + CAutoReleaseHookMan arhm_##id(myhookman##id); \
1.60 int hook1_##id, hook2_##id, hook3_##id, hook4_##id; \
1.61 \
1.62 TestClass##id::ms_DoRecall = false; \