diff -r db1b448191c0 -r 3ade923f508b sourcehook/test/testrecall.cpp --- a/sourcehook/test/testrecall.cpp Sat Feb 04 21:45:10 2006 +0000 +++ b/sourcehook/test/testrecall.cpp Sun Feb 05 20:24:58 2006 +0000 @@ -19,8 +19,14 @@ MAKE_STATE_1(State_Func2, int); MAKE_STATE_1(State_H1_Func2, int); + MAKE_STATE_1(State_H2_Func2, int); MAKE_STATE_2(State_HP_Func2, int, int); + MAKE_STATE_2(State_Func22, int, int); + MAKE_STATE_2(State_H1_Func22, int, int); + MAKE_STATE_2(State_HP1_Func22, int, int); + MAKE_STATE_2(State_HP2_Func22, int, int); + struct Test { virtual void Func1(int a) @@ -37,6 +43,7 @@ // Overloaded version virtual int Func2(int a, int b) { + ADD_STATE(State_Func22(a, b)); return 0xDEADFC; } }; @@ -65,14 +72,46 @@ static_cast(&Test::Func2), (a - 10)); } + int Handler2_Func2(int a) + { + ADD_STATE(State_H2_Func2(a)); + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, 0, + static_cast(&Test::Func2), (a - 10)); + } + int HandlerPost_Func2(int a) { ADD_STATE(State_HP_Func2(a, META_RESULT_ORIG_RET(int))); RETURN_META_VALUE(MRES_IGNORED, 0); } + int Handler1_Func22(int a, int b) + { + ADD_STATE(State_H1_Func22(a, b)); + RETURN_META_VALUE(MRES_IGNORED, 0); + } + + int HandlerPost1_Func22(int a, int b) + { + ADD_STATE(State_HP1_Func22(a, b)); + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, 0, static_cast(&Test::Func2), (1, 2)); + } + + int HandlerPost1A_Func22(int a, int b) + { + ADD_STATE(State_HP1_Func22(a, b)); + RETURN_META_VALUE_NEWPARAMS(MRES_OVERRIDE, 0, static_cast(&Test::Func2), (1, 2)); + } + + int HandlerPost2_Func22(int a, int b) + { + ADD_STATE(State_HP2_Func22(a, b)); + RETURN_META_VALUE(MRES_IGNORED, 0); + } + SH_DECL_HOOK1_void(Test, Func1, SH_NOATTRIB, 0, int); SH_DECL_HOOK1(Test, Func2, SH_NOATTRIB, 0, int, int); + SH_DECL_HOOK2(Test, Func2, SH_NOATTRIB, 1, int, int, int); } bool TestRecall(std::string &error) @@ -135,5 +174,53 @@ CHECK_COND(a == 500, "Part 4.1"); + // Func2, with other handler + SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func2, false); + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler2_Func2, false); + + a = ptr->Func2(77); + CHECK_STATES((&g_States, + new State_H2_Func2(77), + new State_Func2(67), + new State_HP_Func2(67, 1000), // 1000 because it's the ORIG_RET + NULL), "Part 4.2"); + + CHECK_COND(a == 1000, "Part 4.2.1"); // Should return 1000 as well. + + // Func22 -> post recalls + + // 1) WITH OVERRIDE + + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func22, false); + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1A_Func22, true); + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true); + + a = ptr->Func2(10, 11); + CHECK_STATES((&g_States, + new State_H1_Func22(10, 11), + new State_Func22(10, 11), + new State_HP1_Func22(10, 11), + new State_HP2_Func22(1, 2), + NULL), "Part 5"); + + CHECK_COND(a == 0, "Part 5.1"); + + // 2) WITH IGNORE + SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1A_Func22, true); + SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true); + + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1_Func22, true); + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true); + + a = ptr->Func2(10, 11); + CHECK_STATES((&g_States, + new State_H1_Func22(10, 11), + new State_Func22(10, 11), + new State_HP1_Func22(10, 11), + new State_HP2_Func22(1, 2), + NULL), "Part 5"); + + CHECK_COND(a == 0xDEADFC, "Part 5.1"); + return true; }