diff -r 723c1470431a -r f34718303c8f sourcehook/test/test3.cpp --- a/sourcehook/test/test3.cpp Fri Sep 28 21:32:02 2007 +0000 +++ b/sourcehook/test/test3.cpp Fri Sep 28 21:40:58 2007 +0000 @@ -47,6 +47,8 @@ } }; + class DerivedDerived : public Derived { }; + SH_DECL_HOOK0_void(Derived, Func1, SH_NOATTRIB, 0); SH_DECL_HOOK0_void(Derived, Func2, SH_NOATTRIB, 0); SH_DECL_HOOK0_void(Derived, Func3, SH_NOATTRIB, 0); @@ -72,7 +74,7 @@ GET_SHPTR(g_SHPtr); g_PLID = 1337; - Derived inst; + DerivedDerived inst; Derived *pD = &inst; Base1 *pB1 = pD; Base2 *pB2 = pD; @@ -85,11 +87,10 @@ // Get a callclass for pD // Verify whether the this pointers are correct // Also call them normally to make sure that we aren't messing it up ;) - SourceHook::CallClass *pD_CC = SH_GET_CALLCLASS(pD); - SH_CALL(pD_CC, &Derived::Func1)(); - SH_CALL(pD_CC, &Derived::Func2)(); - SH_CALL(pD_CC, &Derived::Func3)(); + SH_CALL(pD, &Derived::Func1)(); + SH_CALL(pD, &Derived::Func2)(); + SH_CALL(pD, &Derived::Func3)(); pD->Func1(); pD->Func2(); pD->Func3(); @@ -103,8 +104,8 @@ new State_Func3_Called(pD), NULL), "Part 1"); - SH_CALL(pD_CC, &Base1::Func1)(); - SH_CALL(pD_CC, &Base2::Func2)(); + SH_CALL(pD, &Base1::Func1)(); + SH_CALL(pD, &Base2::Func2)(); CHECK_STATES((&g_States, new State_Func1_Called(pB1), @@ -114,11 +115,8 @@ // 2) // Get callclasses for the other ones and verify it as well - SourceHook::CallClass *pB1_CC = SH_GET_CALLCLASS(pB1); - SourceHook::CallClass *pB2_CC = SH_GET_CALLCLASS(pB2); - - SH_CALL(pB1_CC, &Base1::Func1)(); - SH_CALL(pB2_CC, &Base2::Func2)(); + SH_CALL(pB1, &Base1::Func1)(); + SH_CALL(pB2, &Base2::Func2)(); CHECK_STATES((&g_States, new State_Func1_Called(pB1), @@ -129,9 +127,9 @@ // 3) Add hooks on them (referring to them through pD1 / Derived) // Check whether the hooks are called with the correct this pointer - SH_ADD_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false); - SH_ADD_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false); - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false); + SH_ADD_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false); + SH_ADD_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false); + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false); pD->Func1(); pD->Func2(); @@ -153,17 +151,17 @@ new State_Func2_Called(pB2), NULL), "Part 3"); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false); + SH_REMOVE_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false); + SH_REMOVE_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false); + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false); // 4) // Now add the hooks on Base1 and Base2 and check again // Note that the new implicit_cast should convert the pD to Base1*/Base2* :) - SH_ADD_HOOK_STATICFUNC(Base1, Func1, pD, Handler_Func1, false); - SH_ADD_HOOK_STATICFUNC(Base2, Func2, pD, Handler_Func2, false); - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false); + SH_ADD_HOOK(Base1, Func1, pD, SH_STATIC(Handler_Func1), false); + SH_ADD_HOOK(Base2, Func2, pD, SH_STATIC(Handler_Func2), false); + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false); pD->Func1(); pD->Func2(); @@ -186,18 +184,18 @@ new State_Func2_Called(pB2), NULL), "Part 4"); - SH_REMOVE_HOOK_STATICFUNC(Base1, Func1, pD, Handler_Func1, false); - SH_REMOVE_HOOK_STATICFUNC(Base2, Func2, pD, Handler_Func2, false); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false); + SH_REMOVE_HOOK(Base1, Func1, pD, SH_STATIC(Handler_Func1), false); + SH_REMOVE_HOOK(Base2, Func2, pD, SH_STATIC(Handler_Func2), false); + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false); // 5) // Add some hooks, and use callclasses // 5.1) First off, add all of them on pD - SH_ADD_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false); - SH_ADD_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false); - SH_ADD_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false); + SH_ADD_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false); + SH_ADD_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false); + SH_ADD_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false); pD->Func1(); pD->Func2(); @@ -212,11 +210,11 @@ new State_Func3_Called(pD), NULL), "Part 5.1"); - SH_CALL(pD_CC, &Derived::Func1)(); - SH_CALL(pD_CC, &Derived::Func2)(); - SH_CALL(pD_CC, &Derived::Func3)(); - SH_CALL(pB1_CC, &Base1::Func1)(); - SH_CALL(pB2_CC, &Base2::Func2)(); + SH_CALL(pD, &Derived::Func1)(); + SH_CALL(pD, &Derived::Func2)(); + SH_CALL(pD, &Derived::Func3)(); + SH_CALL(pB1, &Base1::Func1)(); + SH_CALL(pB2, &Base2::Func2)(); CHECK_STATES((&g_States, new State_Func1_Called(pB1), @@ -226,13 +224,9 @@ new State_Func2_Called(pB2), NULL), "Part 5.2"); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func1, pD, Handler_Func1, false); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func2, pD, Handler_Func2, false); - SH_REMOVE_HOOK_STATICFUNC(Derived, Func3, pD, Handler_Func3, false); - - SH_RELEASE_CALLCLASS(pB1_CC); - SH_RELEASE_CALLCLASS(pB2_CC); - SH_RELEASE_CALLCLASS(pD_CC); + SH_REMOVE_HOOK(Derived, Func1, pD, SH_STATIC(Handler_Func1), false); + SH_REMOVE_HOOK(Derived, Func2, pD, SH_STATIC(Handler_Func2), false); + SH_REMOVE_HOOK(Derived, Func3, pD, SH_STATIC(Handler_Func3), false); return true; }