diff -r 0e01c64820e1 -r 3a04ef79edf1 sourcehook/test/testmanual.cpp --- a/sourcehook/test/testmanual.cpp Fri May 11 19:21:14 2007 +0000 +++ b/sourcehook/test/testmanual.cpp Sat May 12 08:08:01 2007 +0000 @@ -114,8 +114,6 @@ Whatever inst; TheWall *p = &inst; - SourceHook::ManualCallClass *cc = SH_GET_MCALLCLASS(p, sizeof(void*)); - // 1) // Call each function p->Func1(); @@ -134,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), @@ -158,6 +156,17 @@ 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(TheWall, Func1, p, SH_STATIC(Handler_Func1), false); @@ -186,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), @@ -247,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),