1.1 --- a/sourcehook/sourcehook_hookmangen.cpp Sat Nov 10 16:10:55 2007 +0000
1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp Sat Nov 10 16:32:16 2007 +0000
1.3 @@ -48,8 +48,8 @@
1.4 }
1.5
1.6 GenContext::GenContext(const ProtoInfo *proto, int vtbl_offs, int vtbl_idx, ISourceHook *pSHPtr)
1.7 - : m_GeneratedPubFunc(NULL), m_Proto(proto), m_VtblOffs(vtbl_offs), m_VtblIdx(vtbl_idx), m_SHPtr(pSHPtr),
1.8 - m_pHI(NULL), m_HookfuncVfnptr(NULL), m_RegCounter(0)
1.9 + : m_GeneratedPubFunc(NULL), m_OrigProto(proto), m_Proto(proto), m_VtblOffs(vtbl_offs),
1.10 + m_VtblIdx(vtbl_idx), m_SHPtr(pSHPtr), m_pHI(NULL), m_HookfuncVfnptr(NULL), m_RegCounter(0)
1.11 {
1.12 m_pHI = new void*;
1.13 m_HookfuncVfnptr = new void*;
1.14 @@ -1664,7 +1664,7 @@
1.15
1.16 bool GenContext::Equal(const CProto &proto, int vtbl_offs, int vtbl_idx)
1.17 {
1.18 - return (m_Proto.ExactlyEqual(proto) && m_VtblOffs == vtbl_offs && m_VtblIdx == vtbl_idx);
1.19 + return (m_OrigProto.ExactlyEqual(proto) && m_VtblOffs == vtbl_offs && m_VtblIdx == vtbl_idx);
1.20 }
1.21
1.22 bool GenContext::Equal(HookManagerPubFunc other)
2.1 --- a/sourcehook/sourcehook_hookmangen.h Sat Nov 10 16:10:55 2007 +0000
2.2 +++ b/sourcehook/sourcehook_hookmangen.h Sat Nov 10 16:32:16 2007 +0000
2.3 @@ -159,6 +159,7 @@
2.4
2.5 HookManagerPubFunc m_GeneratedPubFunc;
2.6
2.7 + CProto m_OrigProto; // original passed-in prototype
2.8 CProto m_Proto;
2.9 int m_VtblOffs;
2.10 int m_VtblIdx;
3.1 --- a/sourcehook/test/testhookmangen.h Sat Nov 10 16:10:55 2007 +0000
3.2 +++ b/sourcehook/test/testhookmangen.h Sat Nov 10 16:32:16 2007 +0000
3.3 @@ -629,8 +629,6 @@
3.4 SourceHook::PassInfo::V2Info paraminfos2_##id[0+1]; \
3.5 SourceHook::ProtoInfo protoinfo_##id = { 0, {0, 0, 0}, paraminfos_##id, \
3.6 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.7 - \
3.8 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.9
3.10 #define THGM_SETUP_PI0(id) \
3.11 void setuppi_##id() \
3.12 @@ -836,8 +834,6 @@
3.13 SourceHook::PassInfo::V2Info paraminfos2_##id[1+1]; \
3.14 SourceHook::ProtoInfo protoinfo_##id = { 1, {0, 0, 0}, paraminfos_##id, \
3.15 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.16 - \
3.17 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.18
3.19 #define THGM_SETUP_PI1(id, p1_type, p1_passtype, p1_flags) \
3.20 void setuppi_##id() \
3.21 @@ -1043,8 +1039,6 @@
3.22 SourceHook::PassInfo::V2Info paraminfos2_##id[2+1]; \
3.23 SourceHook::ProtoInfo protoinfo_##id = { 2, {0, 0, 0}, paraminfos_##id, \
3.24 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.25 - \
3.26 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.27
3.28 #define THGM_SETUP_PI2(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags) \
3.29 void setuppi_##id() \
3.30 @@ -1250,8 +1244,6 @@
3.31 SourceHook::PassInfo::V2Info paraminfos2_##id[3+1]; \
3.32 SourceHook::ProtoInfo protoinfo_##id = { 3, {0, 0, 0}, paraminfos_##id, \
3.33 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.34 - \
3.35 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.36
3.37 #define THGM_SETUP_PI3(id, p1_type, p1_passtype, p1_flags, p2_type, p2_passtype, p2_flags, p3_type, p3_passtype, p3_flags) \
3.38 void setuppi_##id() \
3.39 @@ -1457,8 +1449,6 @@
3.40 SourceHook::PassInfo::V2Info paraminfos2_##id[4+1]; \
3.41 SourceHook::ProtoInfo protoinfo_##id = { 4, {0, 0, 0}, paraminfos_##id, \
3.42 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.43 - \
3.44 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.45
3.46 #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) \
3.47 void setuppi_##id() \
3.48 @@ -1664,8 +1654,6 @@
3.49 SourceHook::PassInfo::V2Info paraminfos2_##id[5+1]; \
3.50 SourceHook::ProtoInfo protoinfo_##id = { 5, {0, 0, 0}, paraminfos_##id, \
3.51 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.52 - \
3.53 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.54
3.55 #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) \
3.56 void setuppi_##id() \
3.57 @@ -1871,8 +1859,6 @@
3.58 SourceHook::PassInfo::V2Info paraminfos2_##id[6+1]; \
3.59 SourceHook::ProtoInfo protoinfo_##id = { 6, {0, 0, 0}, paraminfos_##id, \
3.60 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
3.61 - \
3.62 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
3.63
3.64 #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) \
3.65 void setuppi_##id() \
4.1 --- a/sourcehook/test/testhookmangen.hxx Sat Nov 10 16:10:55 2007 +0000
4.2 +++ b/sourcehook/test/testhookmangen.hxx Sat Nov 10 16:32:16 2007 +0000
4.3 @@ -371,8 +371,6 @@
4.4 SourceHook::PassInfo::V2Info paraminfos2_##id[$1+1]; \
4.5 SourceHook::ProtoInfo protoinfo_##id = { $1, {0, 0, 0}, paraminfos_##id, \
4.6 SourceHook::ProtoInfo::CallConv_ThisCall, __SH_EPI, paraminfos2_##id }; \
4.7 - \
4.8 - CAutoReleaseHookMan g_Genc_ad##id(NULL);
4.9
4.10 #define THGM_SETUP_PI$1(id@[$2,1,$1:, p$2_type, p$2_passtype, p$2_flags@]) \
4.11 void setuppi_##id() \