1.1 --- a/sourcehook/test/test3.cpp Fri Sep 28 21:32:02 2007 +0000
1.2 +++ b/sourcehook/test/test3.cpp Fri Sep 28 21:40:58 2007 +0000
1.3 @@ -47,6 +47,8 @@
1.4 }
1.5 };
1.6
1.7 + class DerivedDerived : public Derived { };
1.8 +
1.9 SH_DECL_HOOK0_void(Derived, Func1, SH_NOATTRIB, 0);
1.10 SH_DECL_HOOK0_void(Derived, Func2, SH_NOATTRIB, 0);
1.11 SH_DECL_HOOK0_void(Derived, Func3, SH_NOATTRIB, 0);
1.12 @@ -72,7 +74,7 @@
1.13 GET_SHPTR(g_SHPtr);
1.14 g_PLID = 1337;
1.15
1.16 - Derived inst;
1.17 + DerivedDerived inst;
1.18 Derived *pD = &inst;
1.19 Base1 *pB1 = pD;
1.20 Base2 *pB2 = pD;
1.21 @@ -85,11 +87,10 @@
1.22 // Get a callclass for pD
1.23 // Verify whether the this pointers are correct
1.24 // Also call them normally to make sure that we aren't messing it up ;)
1.25 - SourceHook::CallClass<Derived> *pD_CC = SH_GET_CALLCLASS(pD);
1.26
1.27 - SH_CALL(pD_CC, &Derived::Func1)();
1.28 - SH_CALL(pD_CC, &Derived::Func2)();
1.29 - SH_CALL(pD_CC, &Derived::Func3)();
1.30 + SH_CALL(pD, &Derived::Func1)();
1.31 + SH_CALL(pD, &Derived::Func2)();
1.32 + SH_CALL(pD, &Derived::Func3)();
1.33 pD->Func1();
1.34 pD->Func2();
1.35 pD->Func3();
1.36 @@ -103,8 +104,8 @@
1.37 new State_Func3_Called(pD),
1.38 NULL), "Part 1");
1.39
1.40 - SH_CALL(pD_CC, &Base1::Func1)();
1.41 - SH_CALL(pD_CC, &Base2::Func2)();
1.42 + SH_CALL(pD, &Base1::Func1)();
1.43 + SH_CALL(pD, &Base2::Func2)();
1.44
1.45 CHECK_STATES((&g_States,
1.46 new State_Func1_Called(pB1),
1.47 @@ -114,11 +115,8 @@
1.48 // 2)
1.49 // Get callclasses for the other ones and verify it as well
1.50
1.51 - SourceHook::CallClass<Base1> *pB1_CC = SH_GET_CALLCLASS(pB1);
1.52 - SourceHook::CallClass<Base2> *pB2_CC = SH_GET_CALLCLASS(pB2);
1.53 -
1.54 - SH_CALL(pB1_CC, &Base1::Func1)();
1.55 - SH_CALL(pB2_CC, &Base2::Func2)();
1.56 + SH_CALL(pB1, &Base1::Func1)();
1.57 + SH_CALL(pB2, &Base2::Func2)();
1.58
1.59 CHECK_STATES((&g_States,
1.60 new State_Func1_Called(pB1),
1.61 @@ -129,9 +127,9 @@
1.62 // 3) Add hooks on them (referring to them through pD1 / Derived)
1.63 // Check whether the hooks are called with the correct this pointer
1.64
1.65 - SH_ADD_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.66 - SH_ADD_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.67 - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.68 + SH_ADD_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.69 + SH_ADD_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.70 + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.71
1.72 pD->Func1();
1.73 pD->Func2();
1.74 @@ -153,17 +151,17 @@
1.75 new State_Func2_Called(pB2),
1.76 NULL), "Part 3");
1.77
1.78 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.79 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.80 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.81 + SH_REMOVE_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.82 + SH_REMOVE_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.83 + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.84
1.85 // 4)
1.86 // Now add the hooks on Base1 and Base2 and check again
1.87
1.88 // Note that the new implicit_cast should convert the pD to Base1*/Base2* :)
1.89 - SH_ADD_HOOK_STATICFUNC(Base1, Func1, pD, Handler_Func1, false);
1.90 - SH_ADD_HOOK_STATICFUNC(Base2, Func2, pD, Handler_Func2, false);
1.91 - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.92 + SH_ADD_HOOK(Base1, Func1, pD, SH_STATIC(Handler_Func1), false);
1.93 + SH_ADD_HOOK(Base2, Func2, pD, SH_STATIC(Handler_Func2), false);
1.94 + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.95
1.96 pD->Func1();
1.97 pD->Func2();
1.98 @@ -186,18 +184,18 @@
1.99 new State_Func2_Called(pB2),
1.100 NULL), "Part 4");
1.101
1.102 - SH_REMOVE_HOOK_STATICFUNC(Base1, Func1, pD, Handler_Func1, false);
1.103 - SH_REMOVE_HOOK_STATICFUNC(Base2, Func2, pD, Handler_Func2, false);
1.104 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.105 + SH_REMOVE_HOOK(Base1, Func1, pD, SH_STATIC(Handler_Func1), false);
1.106 + SH_REMOVE_HOOK(Base2, Func2, pD, SH_STATIC(Handler_Func2), false);
1.107 + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.108
1.109
1.110 // 5)
1.111 // Add some hooks, and use callclasses
1.112
1.113 // 5.1) First off, add all of them on pD
1.114 - SH_ADD_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.115 - SH_ADD_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.116 - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.117 + SH_ADD_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.118 + SH_ADD_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.119 + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.120
1.121 pD->Func1();
1.122 pD->Func2();
1.123 @@ -212,11 +210,11 @@
1.124 new State_Func3_Called(pD),
1.125 NULL), "Part 5.1");
1.126
1.127 - SH_CALL(pD_CC, &Derived::Func1)();
1.128 - SH_CALL(pD_CC, &Derived::Func2)();
1.129 - SH_CALL(pD_CC, &Derived::Func3)();
1.130 - SH_CALL(pB1_CC, &Base1::Func1)();
1.131 - SH_CALL(pB2_CC, &Base2::Func2)();
1.132 + SH_CALL(pD, &Derived::Func1)();
1.133 + SH_CALL(pD, &Derived::Func2)();
1.134 + SH_CALL(pD, &Derived::Func3)();
1.135 + SH_CALL(pB1, &Base1::Func1)();
1.136 + SH_CALL(pB2, &Base2::Func2)();
1.137
1.138 CHECK_STATES((&g_States,
1.139 new State_Func1_Called(pB1),
1.140 @@ -226,13 +224,9 @@
1.141 new State_Func2_Called(pB2),
1.142 NULL), "Part 5.2");
1.143
1.144 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.145 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.146 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.147 -
1.148 - SH_RELEASE_CALLCLASS(pB1_CC);
1.149 - SH_RELEASE_CALLCLASS(pB2_CC);
1.150 - SH_RELEASE_CALLCLASS(pD_CC);
1.151 + SH_REMOVE_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.152 + SH_REMOVE_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.153 + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.154
1.155 return true;
1.156 }