1.1 --- a/sourcehook/test/test3.cpp Mon May 07 18:33:34 2007 +0000
1.2 +++ b/sourcehook/test/test3.cpp Mon May 07 18:35:59 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 @@ -129,9 +131,9 @@
1.22 // 3) Add hooks on them (referring to them through pD1 / Derived)
1.23 // Check whether the hooks are called with the correct this pointer
1.24
1.25 - SH_ADD_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.26 - SH_ADD_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.27 - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.28 + SH_ADD_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.29 + SH_ADD_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.30 + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.31
1.32 pD->Func1();
1.33 pD->Func2();
1.34 @@ -153,17 +155,17 @@
1.35 new State_Func2_Called(pB2),
1.36 NULL), "Part 3");
1.37
1.38 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.39 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.40 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.41 + SH_REMOVE_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.42 + SH_REMOVE_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.43 + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.44
1.45 // 4)
1.46 // Now add the hooks on Base1 and Base2 and check again
1.47
1.48 // Note that the new implicit_cast should convert the pD to Base1*/Base2* :)
1.49 - SH_ADD_HOOK_STATICFUNC(Base1, Func1, pD, Handler_Func1, false);
1.50 - SH_ADD_HOOK_STATICFUNC(Base2, Func2, pD, Handler_Func2, false);
1.51 - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.52 + SH_ADD_HOOK(Base1, Func1, pD, SH_STATIC(Handler_Func1), false);
1.53 + SH_ADD_HOOK(Base2, Func2, pD, SH_STATIC(Handler_Func2), false);
1.54 + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.55
1.56 pD->Func1();
1.57 pD->Func2();
1.58 @@ -186,18 +188,18 @@
1.59 new State_Func2_Called(pB2),
1.60 NULL), "Part 4");
1.61
1.62 - SH_REMOVE_HOOK_STATICFUNC(Base1, Func1, pD, Handler_Func1, false);
1.63 - SH_REMOVE_HOOK_STATICFUNC(Base2, Func2, pD, Handler_Func2, false);
1.64 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.65 + SH_REMOVE_HOOK(Base1, Func1, pD, SH_STATIC(Handler_Func1), false);
1.66 + SH_REMOVE_HOOK(Base2, Func2, pD, SH_STATIC(Handler_Func2), false);
1.67 + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.68
1.69
1.70 // 5)
1.71 // Add some hooks, and use callclasses
1.72
1.73 // 5.1) First off, add all of them on pD
1.74 - SH_ADD_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.75 - SH_ADD_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.76 - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.77 + SH_ADD_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.78 + SH_ADD_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.79 + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.80
1.81 pD->Func1();
1.82 pD->Func2();
1.83 @@ -226,9 +228,9 @@
1.84 new State_Func2_Called(pB2),
1.85 NULL), "Part 5.2");
1.86
1.87 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false);
1.88 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false);
1.89 - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false);
1.90 + SH_REMOVE_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false);
1.91 + SH_REMOVE_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false);
1.92 + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false);
1.93
1.94 SH_RELEASE_CALLCLASS(pB1_CC);
1.95 SH_RELEASE_CALLCLASS(pB2_CC);