diff -r 723c1470431a -r f34718303c8f sourcehook/test/testmanual.cpp --- a/sourcehook/test/testmanual.cpp Fri Sep 28 21:32:02 2007 +0000 +++ b/sourcehook/test/testmanual.cpp Fri Sep 28 21:40:58 2007 +0000 @@ -52,6 +52,11 @@ { ADD_STATE(State_Func5_Called(reinterpret_cast(this))); } + + }; + // GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup! + class Whatever : public TheWall + { }; SH_DECL_HOOK0_void(TheWall, Func1, SH_NOATTRIB, 0); @@ -106,11 +111,9 @@ GET_SHPTR(g_SHPtr); g_PLID = 1337; - TheWall inst; + Whatever inst; TheWall *p = &inst; - SourceHook::ManualCallClass *cc = SH_GET_MCALLCLASS(p, sizeof(void*)); - // 1) // Call each function p->Func1(); @@ -129,14 +132,14 @@ // 1.1) // Now call each function through the manual call class, using the hook decl and manually - SH_MCALL(cc, TheWall_Func1)(); - SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)(); - SH_MCALL(cc, TheWall_Func2)(200); - SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200); - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)())); - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)())); - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400))); - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400))); + SH_MCALL(p, TheWall_Func1)(); + SH_MCALL2(p, MFP_Func1(), 0, 0, 0)(); + SH_MCALL(p, TheWall_Func2)(200); + SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200); + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)())); + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)())); + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400))); + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400))); CHECK_STATES((&g_States, new State_Func1_Called(p), @@ -153,12 +156,23 @@ new State_Return(4), NULL), "Part 1.1"); + // Compat: really get a manual call class! + SourceHook::ManualCallClass *pCC = SH_GET_MCALLCLASS(p, sizeof(void*)); + SH_MCALL(pCC, TheWall_Func1)(); + SH_MCALL2(pCC, MFP_Func1(), 0, 0, 0)(); + CHECK_STATES((&g_States, + new State_Func1_Called(p), + new State_Func1_Called(p), + NULL), "Part 1.2"); + + SH_RELEASE_CALLCLASS(pCC); + // 2) // Hook each function normally, call them - SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false); + SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false); + SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false); + SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false); + SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false); p->Func1(); p->Func2(200); @@ -181,14 +195,14 @@ // Call them through the mcallclass // 2.1) // Now call each function through the manual call class, using the hook decl and manually - SH_MCALL(cc, TheWall_Func1)(); - SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)(); - SH_MCALL(cc, TheWall_Func2)(200); - SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200); - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)())); - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)())); - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400))); - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400))); + SH_MCALL(p, TheWall_Func1)(); + SH_MCALL2(p, MFP_Func1(), 0, 0, 0)(); + SH_MCALL(p, TheWall_Func2)(200); + SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200); + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)())); + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)())); + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400))); + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400))); CHECK_STATES((&g_States, new State_Func1_Called(p), @@ -206,18 +220,18 @@ NULL), "Part 2.1"); // Unhook them - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false); + SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false); + SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false); + SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false); + SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false); // 3) // Hook each function manually, call them - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false); + SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false); + SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false); + SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false); + SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false); p->Func1(); p->Func2(200); @@ -242,14 +256,14 @@ // Call them through the mcallclass // 3.1) // Now call each function through the manual call class, using the hook decl and manually - SH_MCALL(cc, TheWall_Func1)(); - SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)(); - SH_MCALL(cc, TheWall_Func2)(200); - SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200); - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)())); - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)())); - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400))); - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400))); + SH_MCALL(p, TheWall_Func1)(); + SH_MCALL2(p, MFP_Func1(), 0, 0, 0)(); + SH_MCALL(p, TheWall_Func2)(200); + SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200); + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)())); + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)())); + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400))); + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400))); CHECK_STATES((&g_States, new State_Func1_Called(p), @@ -267,10 +281,10 @@ NULL), "Part 3.1"); // Unhook them - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false); - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false); - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false); - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false); + SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false); + SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false); + SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false); + SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false); // 4) // Hook each function manually, then normally, call, unhook @@ -278,7 +292,7 @@ AnotherBrick handler_inst; // Why this? - // 1) tests sh_add_manualhook_memfunc + // 1) tests sh_add_manualhook // 2) in my tests, the proto of the manual hook was not equal to the proto of the auto hook // (because there are no attribs for manual hooks). // sourcehook.cpp did a !strcmp(..), so it assigned a new hook manager even though there @@ -287,15 +301,15 @@ // The problem with this is that returning MRES_SUPERCEDE (as AnotherBrick::Handler_Func1 // does) will supercede the second hook func from being called - thus bypassing the call // of the auto hook here. - SH_ADD_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false); + SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false); + SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false); + SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false); + SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false); - SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false); + SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false); + SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false); + SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false); + SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false); p->Func1(); p->Func2(200); @@ -319,19 +333,19 @@ new State_Return(4), NULL), "Part 4"); - SH_REMOVE_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false); - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false); - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false); - SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false); + SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false); + SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false); + SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false); + SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false); - SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false); + SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false); + SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false); + SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false); + SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false); // 5) Reconfigure TheWall_Func1 to actually hook Func5: SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 4, 0, 0); - SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false); + SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false); p->Func5();