1.1 --- a/sourcehook/test/testrecall.cpp Sat Feb 04 21:45:10 2006 +0000
1.2 +++ b/sourcehook/test/testrecall.cpp Sun Feb 05 20:24:58 2006 +0000
1.3 @@ -19,8 +19,14 @@
1.4
1.5 MAKE_STATE_1(State_Func2, int);
1.6 MAKE_STATE_1(State_H1_Func2, int);
1.7 + MAKE_STATE_1(State_H2_Func2, int);
1.8 MAKE_STATE_2(State_HP_Func2, int, int);
1.9
1.10 + MAKE_STATE_2(State_Func22, int, int);
1.11 + MAKE_STATE_2(State_H1_Func22, int, int);
1.12 + MAKE_STATE_2(State_HP1_Func22, int, int);
1.13 + MAKE_STATE_2(State_HP2_Func22, int, int);
1.14 +
1.15 struct Test
1.16 {
1.17 virtual void Func1(int a)
1.18 @@ -37,6 +43,7 @@
1.19 // Overloaded version
1.20 virtual int Func2(int a, int b)
1.21 {
1.22 + ADD_STATE(State_Func22(a, b));
1.23 return 0xDEADFC;
1.24 }
1.25 };
1.26 @@ -65,14 +72,46 @@
1.27 static_cast<int (Test::*)(int)>(&Test::Func2), (a - 10));
1.28 }
1.29
1.30 + int Handler2_Func2(int a)
1.31 + {
1.32 + ADD_STATE(State_H2_Func2(a));
1.33 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, 0,
1.34 + static_cast<int (Test::*)(int)>(&Test::Func2), (a - 10));
1.35 + }
1.36 +
1.37 int HandlerPost_Func2(int a)
1.38 {
1.39 ADD_STATE(State_HP_Func2(a, META_RESULT_ORIG_RET(int)));
1.40 RETURN_META_VALUE(MRES_IGNORED, 0);
1.41 }
1.42
1.43 + int Handler1_Func22(int a, int b)
1.44 + {
1.45 + ADD_STATE(State_H1_Func22(a, b));
1.46 + RETURN_META_VALUE(MRES_IGNORED, 0);
1.47 + }
1.48 +
1.49 + int HandlerPost1_Func22(int a, int b)
1.50 + {
1.51 + ADD_STATE(State_HP1_Func22(a, b));
1.52 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, 0, static_cast<int (Test::*)(int, int)>(&Test::Func2), (1, 2));
1.53 + }
1.54 +
1.55 + int HandlerPost1A_Func22(int a, int b)
1.56 + {
1.57 + ADD_STATE(State_HP1_Func22(a, b));
1.58 + RETURN_META_VALUE_NEWPARAMS(MRES_OVERRIDE, 0, static_cast<int (Test::*)(int, int)>(&Test::Func2), (1, 2));
1.59 + }
1.60 +
1.61 + int HandlerPost2_Func22(int a, int b)
1.62 + {
1.63 + ADD_STATE(State_HP2_Func22(a, b));
1.64 + RETURN_META_VALUE(MRES_IGNORED, 0);
1.65 + }
1.66 +
1.67 SH_DECL_HOOK1_void(Test, Func1, SH_NOATTRIB, 0, int);
1.68 SH_DECL_HOOK1(Test, Func2, SH_NOATTRIB, 0, int, int);
1.69 + SH_DECL_HOOK2(Test, Func2, SH_NOATTRIB, 1, int, int, int);
1.70 }
1.71
1.72 bool TestRecall(std::string &error)
1.73 @@ -135,5 +174,53 @@
1.74
1.75 CHECK_COND(a == 500, "Part 4.1");
1.76
1.77 + // Func2, with other handler
1.78 + SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func2, false);
1.79 + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler2_Func2, false);
1.80 +
1.81 + a = ptr->Func2(77);
1.82 + CHECK_STATES((&g_States,
1.83 + new State_H2_Func2(77),
1.84 + new State_Func2(67),
1.85 + new State_HP_Func2(67, 1000), // 1000 because it's the ORIG_RET
1.86 + NULL), "Part 4.2");
1.87 +
1.88 + CHECK_COND(a == 1000, "Part 4.2.1"); // Should return 1000 as well.
1.89 +
1.90 + // Func22 -> post recalls
1.91 +
1.92 + // 1) WITH OVERRIDE
1.93 +
1.94 + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func22, false);
1.95 + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1A_Func22, true);
1.96 + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true);
1.97 +
1.98 + a = ptr->Func2(10, 11);
1.99 + CHECK_STATES((&g_States,
1.100 + new State_H1_Func22(10, 11),
1.101 + new State_Func22(10, 11),
1.102 + new State_HP1_Func22(10, 11),
1.103 + new State_HP2_Func22(1, 2),
1.104 + NULL), "Part 5");
1.105 +
1.106 + CHECK_COND(a == 0, "Part 5.1");
1.107 +
1.108 + // 2) WITH IGNORE
1.109 + SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1A_Func22, true);
1.110 + SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true);
1.111 +
1.112 + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1_Func22, true);
1.113 + SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true);
1.114 +
1.115 + a = ptr->Func2(10, 11);
1.116 + CHECK_STATES((&g_States,
1.117 + new State_H1_Func22(10, 11),
1.118 + new State_Func22(10, 11),
1.119 + new State_HP1_Func22(10, 11),
1.120 + new State_HP2_Func22(1, 2),
1.121 + NULL), "Part 5");
1.122 +
1.123 + CHECK_COND(a == 0xDEADFC, "Part 5.1");
1.124 +
1.125 return true;
1.126 }