1.1 --- a/sourcehook/test/test1.cpp Mon May 07 18:33:34 2007 +0000
1.2 +++ b/sourcehook/test/test1.cpp Mon May 07 18:35:59 2007 +0000
1.3 @@ -338,6 +338,11 @@
1.4 }
1.5 };
1.6
1.7 + // GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup!
1.8 + class Whatever : public Test
1.9 + {
1.10 + };
1.11 +
1.12 SH_DECL_HOOK1(Test, F299, SH_NOATTRIB, 0, bool, const char *);
1.13 SH_DECL_HOOK0_void(Test, F1, SH_NOATTRIB, 0);
1.14 SH_DECL_HOOK0_void(Test, F2, SH_NOATTRIB, 0);
1.15 @@ -416,7 +421,7 @@
1.16 g_PLID = 1337;
1.17
1.18 HandlersF1 f1_handlers;
1.19 - Test test;
1.20 + Whatever test;
1.21 Test *pTest = &test;
1.22
1.23 // 1) Get a call class and call the member through it and normally
1.24 @@ -458,8 +463,9 @@
1.25 NULL), "Part 2");
1.26
1.27 // 3) Add a pre hook
1.28 + // (one add memfunc in old format)
1.29 g_F1Pre_WhatToDo = MRES_SUPERCEDE;
1.30 - ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false)));
1.31 + ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false) ? true : false));
1.32
1.33 SH_CALL(cc, &Test::F1)();
1.34 pTest->F1();
1.35 @@ -505,6 +511,7 @@
1.36 NULL), "Part 5");
1.37
1.38 // 6) remove the hook again
1.39 + // (one remove memfunc in old format)
1.40 SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.41 ADD_STATE(State_F1_HookRemoved);
1.42
1.43 @@ -519,7 +526,7 @@
1.44
1.45 // 7) add a post hook now
1.46 g_F1Post_WhatToDo = MRES_IGNORED;
1.47 - ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Post, true)));
1.48 + ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true) ? true : false));
1.49
1.50 SH_CALL(cc, &Test::F1)();
1.51 pTest->F1();
1.52 @@ -533,7 +540,7 @@
1.53
1.54 // 8) And a pre hook again
1.55 g_F1Pre_WhatToDo = MRES_IGNORED;
1.56 - ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false)));
1.57 + ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false) ? true : false));
1.58
1.59 SH_CALL(cc, &Test::F1)();
1.60 pTest->F1();
1.61 @@ -554,9 +561,9 @@
1.62 NULL), "Part 8");
1.63
1.64 // 9) Remove all hooks
1.65 - SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.66 + SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.67 ADD_STATE(State_F1_HookRemoved);
1.68 - SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Post, true);
1.69 + SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true);
1.70 ADD_STATE(State_F1_HookRemoved);
1.71
1.72 SH_CALL(cc, &Test::F1)();
1.73 @@ -583,6 +590,7 @@
1.74 new State_F299Ret(true),
1.75 NULL), "Part 10.1");
1.76
1.77 + // (one add staticfunc in old format)
1.78 SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
1.79 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.80 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.81 @@ -595,7 +603,7 @@
1.82 new State_F299Ret(true),
1.83 NULL), "Part 10.2");
1.84
1.85 - SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Post, true);
1.86 + SH_ADD_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
1.87 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.88 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.89
1.90 @@ -633,6 +641,7 @@
1.91 new State_F299Ret(true),
1.92 NULL), "Part 10.5");
1.93
1.94 + // (one remove staticfunc in old format)
1.95 SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
1.96 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.97 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.98 @@ -645,7 +654,7 @@
1.99 new State_F299Ret(true),
1.100 NULL), "Part 10.6");
1.101
1.102 - SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Post, true);
1.103 + SH_REMOVE_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
1.104 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.105 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.106
1.107 @@ -665,30 +674,58 @@
1.108 new State_F1_CallClassReleased,
1.109 NULL), "Part 11");
1.110
1.111 - // 12) Test? Test.
1.112 - SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.113 - SH_ADD_HOOK_MEMFUNC(Test, F2, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.114 - SH_ADD_HOOK_MEMFUNC(Test, F3, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.115 - SH_ADD_HOOK_MEMFUNC(Test, F4, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.116 - SH_ADD_HOOK_MEMFUNC(Test, F5, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.117 - SH_ADD_HOOK_MEMFUNC(Test, F6, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.118 - SH_ADD_HOOK_MEMFUNC(Test, F7, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.119 - SH_ADD_HOOK_MEMFUNC(Test, F8, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.120 - SH_ADD_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.121 - SH_ADD_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.122 + // 11 1/2) Test removing hook by id
1.123 +
1.124 + g_F1Pre_WhatToDo = MRES_IGNORED;
1.125 +
1.126 + pTest->F1();
1.127 + int hookPre = SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.128 + int hookPost = SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true);
1.129 +
1.130 + pTest->F1();
1.131 + SH_REMOVE_HOOK_ID(hookPost);
1.132 + pTest->F1();
1.133 + SH_REMOVE_HOOK_ID(hookPre);
1.134 + pTest->F1();
1.135 +
1.136 + CHECK_STATES((&g_States,
1.137 + new State_F1_Called,
1.138 +
1.139 + new State_F1_PreHandler_Called(&f1_handlers),
1.140 + new State_F1_Called,
1.141 + new State_F1_PostHandler_Called(&f1_handlers),
1.142 +
1.143 + new State_F1_PreHandler_Called(&f1_handlers),
1.144 + new State_F1_Called,
1.145 +
1.146 + new State_F1_Called,
1.147
1.148 - SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.149 - SH_REMOVE_HOOK_MEMFUNC(Test, F2, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.150 - SH_REMOVE_HOOK_MEMFUNC(Test, F3, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.151 - SH_REMOVE_HOOK_MEMFUNC(Test, F4, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.152 - SH_REMOVE_HOOK_MEMFUNC(Test, F5, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.153 - SH_REMOVE_HOOK_MEMFUNC(Test, F6, pTest, &f1_handlers, &HandlersF1::Pre, true);
1.154 - SH_REMOVE_HOOK_MEMFUNC(Test, F7, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.155 - SH_REMOVE_HOOK_MEMFUNC(Test, F8, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.156 - SH_REMOVE_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.157 - SH_REMOVE_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.158 + NULL), "Part 11 1/2");
1.159
1.160 - SH_ADD_HOOK_STATICFUNC(Test, F60, pTest, F60_Pre, false);
1.161 + // 12) Test? Test.
1.162 + SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.163 + SH_ADD_HOOK(Test, F2, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.164 + SH_ADD_HOOK(Test, F3, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.165 + SH_ADD_HOOK(Test, F4, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.166 + SH_ADD_HOOK(Test, F5, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.167 + SH_ADD_HOOK(Test, F6, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.168 + SH_ADD_HOOK(Test, F7, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.169 + SH_ADD_HOOK(Test, F8, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.170 + SH_ADD_HOOK(Test, F9, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.171 + SH_ADD_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.172 +
1.173 + SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.174 + SH_REMOVE_HOOK(Test, F2, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.175 + SH_REMOVE_HOOK(Test, F3, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.176 + SH_REMOVE_HOOK(Test, F4, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.177 + SH_REMOVE_HOOK(Test, F5, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.178 + SH_REMOVE_HOOK(Test, F6, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
1.179 + SH_REMOVE_HOOK(Test, F7, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.180 + SH_REMOVE_HOOK(Test, F8, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.181 + SH_REMOVE_HOOK(Test, F9, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.182 + SH_REMOVE_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
1.183 +
1.184 + SH_ADD_HOOK(Test, F60, pTest, SH_STATIC(F60_Pre), false);
1.185
1.186 int a = 0;
1.187 pTest->F60(a);