1.1 --- a/sourcehook/test/testmanual.cpp Fri May 11 19:21:14 2007 +0000
1.2 +++ b/sourcehook/test/testmanual.cpp Sat May 12 08:08:01 2007 +0000
1.3 @@ -114,8 +114,6 @@
1.4 Whatever inst;
1.5 TheWall *p = &inst;
1.6
1.7 - SourceHook::ManualCallClass *cc = SH_GET_MCALLCLASS(p, sizeof(void*));
1.8 -
1.9 // 1)
1.10 // Call each function
1.11 p->Func1();
1.12 @@ -134,14 +132,14 @@
1.13
1.14 // 1.1)
1.15 // Now call each function through the manual call class, using the hook decl and manually
1.16 - SH_MCALL(cc, TheWall_Func1)();
1.17 - SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
1.18 - SH_MCALL(cc, TheWall_Func2)(200);
1.19 - SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
1.20 - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
1.21 - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
1.22 - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
1.23 - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
1.24 + SH_MCALL(p, TheWall_Func1)();
1.25 + SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
1.26 + SH_MCALL(p, TheWall_Func2)(200);
1.27 + SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
1.28 + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
1.29 + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
1.30 + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
1.31 + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
1.32
1.33 CHECK_STATES((&g_States,
1.34 new State_Func1_Called(p),
1.35 @@ -158,6 +156,17 @@
1.36 new State_Return(4),
1.37 NULL), "Part 1.1");
1.38
1.39 + // Compat: really get a manual call class!
1.40 + SourceHook::ManualCallClass *pCC = SH_GET_MCALLCLASS(p, sizeof(void*));
1.41 + SH_MCALL(pCC, TheWall_Func1)();
1.42 + SH_MCALL2(pCC, MFP_Func1(), 0, 0, 0)();
1.43 + CHECK_STATES((&g_States,
1.44 + new State_Func1_Called(p),
1.45 + new State_Func1_Called(p),
1.46 + NULL), "Part 1.2");
1.47 +
1.48 + SH_RELEASE_CALLCLASS(pCC);
1.49 +
1.50 // 2)
1.51 // Hook each function normally, call them
1.52 SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
1.53 @@ -186,14 +195,14 @@
1.54 // Call them through the mcallclass
1.55 // 2.1)
1.56 // Now call each function through the manual call class, using the hook decl and manually
1.57 - SH_MCALL(cc, TheWall_Func1)();
1.58 - SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
1.59 - SH_MCALL(cc, TheWall_Func2)(200);
1.60 - SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
1.61 - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
1.62 - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
1.63 - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
1.64 - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
1.65 + SH_MCALL(p, TheWall_Func1)();
1.66 + SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
1.67 + SH_MCALL(p, TheWall_Func2)(200);
1.68 + SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
1.69 + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
1.70 + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
1.71 + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
1.72 + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
1.73
1.74 CHECK_STATES((&g_States,
1.75 new State_Func1_Called(p),
1.76 @@ -247,14 +256,14 @@
1.77 // Call them through the mcallclass
1.78 // 3.1)
1.79 // Now call each function through the manual call class, using the hook decl and manually
1.80 - SH_MCALL(cc, TheWall_Func1)();
1.81 - SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
1.82 - SH_MCALL(cc, TheWall_Func2)(200);
1.83 - SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
1.84 - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
1.85 - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
1.86 - ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
1.87 - ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
1.88 + SH_MCALL(p, TheWall_Func1)();
1.89 + SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
1.90 + SH_MCALL(p, TheWall_Func2)(200);
1.91 + SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
1.92 + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
1.93 + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
1.94 + ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
1.95 + ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
1.96
1.97 CHECK_STATES((&g_States,
1.98 new State_Func1_Called(p),