Fixed explicit qualification in sourcehook.cpp, updated Makefile for new shworker ( =P ), generated new sourcehook.h
2 #include "sourcehook.h"
3 #include "sourcehook_test.h"
4 #include "testevents.h"
8 // :TODO: test more extensively
13 SourceHook::ISourceHook *g_SHPtr;
14 SourceHook::Plugin g_PLID;
16 MAKE_STATE_1(State_Func1_Called, void*); // param1: This pointer
17 MAKE_STATE_2(State_Func2_Called, void*, int); // param1: This pointer; param2: parameter
18 MAKE_STATE_1(State_Func3_Called, void*); // param1: This pointer
19 MAKE_STATE_2(State_Func4_Called, void*, int); // param1: This pointer; param2: parameter
20 MAKE_STATE_1(State_Func5_Called, void*); // param1: This pointer
22 MAKE_STATE_1(State_Func1H_Called, void*);
23 MAKE_STATE_2(State_Func2H_Called, void*, int);
24 MAKE_STATE_1(State_Func3H_Called, void*);
25 MAKE_STATE_2(State_Func4H_Called, void*, int);
27 MAKE_STATE_1(State_Return, short);
34 ADD_STATE(State_Func1_Called(reinterpret_cast<void*>(this)));
36 virtual void Func2(int x)
38 ADD_STATE(State_Func2_Called(reinterpret_cast<void*>(this), x));
43 ADD_STATE(State_Func3_Called(reinterpret_cast<void*>(this)));
46 virtual short Func4(int x)
48 ADD_STATE(State_Func4_Called(reinterpret_cast<void*>(this), x));
53 ADD_STATE(State_Func5_Called(reinterpret_cast<void*>(this)));
57 SH_DECL_HOOK0_void(TheWall, Func1, SH_NOATTRIB, 0);
58 SH_DECL_HOOK1_void(TheWall, Func2, SH_NOATTRIB, 0, int);
59 SH_DECL_HOOK0(TheWall, Func3, SH_NOATTRIB, 0, short);
60 SH_DECL_HOOK1(TheWall, Func4, SH_NOATTRIB, 0, short, int);
62 SH_DECL_MANUALHOOK0_void(TheWall_Func1, 0, 0, 0);
63 SH_DECL_MANUALHOOK1_void(TheWall_Func2, 1, 0, 0, int);
64 SH_DECL_MANUALHOOK0(TheWall_Func3, 2, 0, 0, short);
65 SH_DECL_MANUALHOOK1(TheWall_Func4, 3, 0, 0, short, int);
67 typedef void (SourceHook::EmptyClass::*MFP_Func1)();
68 typedef void (SourceHook::EmptyClass::*MFP_Func2)(int);
69 typedef short (SourceHook::EmptyClass::*MFP_Func3)();
70 typedef short (SourceHook::EmptyClass::*MFP_Func4)(int);
74 ADD_STATE(State_Func1H_Called(META_IFACEPTR(void)));
76 void Handler_Func2(int x)
78 ADD_STATE(State_Func2H_Called(META_IFACEPTR(void), x));
79 RETURN_META_MNEWPARAMS(MRES_IGNORED, TheWall_Func2, (0x87654321));
83 ADD_STATE(State_Func3H_Called(META_IFACEPTR(void)));
86 short Handler_Func4(int x)
88 ADD_STATE(State_Func4H_Called(META_IFACEPTR(void), x));
90 // newparams (recall) using the manual hook declaration!
91 RETURN_META_VALUE_MNEWPARAMS(MRES_IGNORED, 0, TheWall_Func4, (0x12345678));
98 ADD_STATE(State_Func1H_Called(META_IFACEPTR(void)));
99 RETURN_META(MRES_SUPERCEDE);
104 bool TestManual(std::string &error)
112 SourceHook::ManualCallClass *cc = SH_GET_MCALLCLASS(p, sizeof(void*));
115 // Call each function
118 ADD_STATE(State_Return(p->Func3()));
119 ADD_STATE(State_Return(p->Func4(400)));
121 CHECK_STATES((&g_States,
122 new State_Func1_Called(p),
123 new State_Func2_Called(p, 200),
124 new State_Func3_Called(p),
126 new State_Func4_Called(p, 400),
131 // Now call each function through the manual call class, using the hook decl and manually
132 SH_MCALL(cc, TheWall_Func1)();
133 SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
134 SH_MCALL(cc, TheWall_Func2)(200);
135 SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
136 ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
137 ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
138 ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
139 ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
141 CHECK_STATES((&g_States,
142 new State_Func1_Called(p),
143 new State_Func1_Called(p),
144 new State_Func2_Called(p, 200),
145 new State_Func2_Called(p, 200),
146 new State_Func3_Called(p),
148 new State_Func3_Called(p),
150 new State_Func4_Called(p, 400),
152 new State_Func4_Called(p, 400),
157 // Hook each function normally, call them
158 SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
159 SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
160 SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
161 SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
165 ADD_STATE(State_Return(p->Func3()));
166 ADD_STATE(State_Return(p->Func4(400)));
168 CHECK_STATES((&g_States,
169 new State_Func1H_Called(p),
170 new State_Func1_Called(p),
171 new State_Func2H_Called(p, 200),
172 new State_Func2_Called(p, 0x87654321),
173 new State_Func3H_Called(p),
174 new State_Func3_Called(p),
176 new State_Func4H_Called(p, 400),
177 new State_Func4_Called(p, 0x12345678),
181 // Call them through the mcallclass
183 // Now call each function through the manual call class, using the hook decl and manually
184 SH_MCALL(cc, TheWall_Func1)();
185 SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
186 SH_MCALL(cc, TheWall_Func2)(200);
187 SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
188 ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
189 ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
190 ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
191 ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
193 CHECK_STATES((&g_States,
194 new State_Func1_Called(p),
195 new State_Func1_Called(p),
196 new State_Func2_Called(p, 200),
197 new State_Func2_Called(p, 200),
198 new State_Func3_Called(p),
200 new State_Func3_Called(p),
202 new State_Func4_Called(p, 400),
204 new State_Func4_Called(p, 400),
209 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
210 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
211 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
212 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
215 // Hook each function manually, call them
217 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
218 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
219 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
220 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
224 ADD_STATE(State_Return(p->Func3()));
225 ADD_STATE(State_Return(p->Func4(400)));
227 CHECK_STATES((&g_States,
228 new State_Func1H_Called(p),
229 new State_Func1_Called(p),
230 new State_Func2H_Called(p, 200),
231 new State_Func2_Called(p, 0x87654321),
232 new State_Func3H_Called(p),
233 new State_Func3_Called(p),
235 new State_Func4H_Called(p, 400),
236 new State_Func4_Called(p, 0x12345678),
240 // Now through the mcallclass
242 // Call them through the mcallclass
244 // Now call each function through the manual call class, using the hook decl and manually
245 SH_MCALL(cc, TheWall_Func1)();
246 SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
247 SH_MCALL(cc, TheWall_Func2)(200);
248 SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
249 ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
250 ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
251 ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
252 ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
254 CHECK_STATES((&g_States,
255 new State_Func1_Called(p),
256 new State_Func1_Called(p),
257 new State_Func2_Called(p, 200),
258 new State_Func2_Called(p, 200),
259 new State_Func3_Called(p),
261 new State_Func3_Called(p),
263 new State_Func4_Called(p, 400),
265 new State_Func4_Called(p, 400),
270 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
271 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
272 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
273 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
276 // Hook each function manually, then normally, call, unhook
278 AnotherBrick handler_inst;
281 // 1) tests sh_add_manualhook_memfunc
282 // 2) in my tests, the proto of the manual hook was not equal to the proto of the auto hook
283 // (because there are no attribs for manual hooks).
284 // sourcehook.cpp did a !strcmp(..), so it assigned a new hook manager even though there
285 // already was one for this vfnptr. This hook manager stored the pointer of the original
286 // hook manager's hookfunc as the orig pointer - everything seemingly worked.
287 // The problem with this is that returning MRES_SUPERCEDE (as AnotherBrick::Handler_Func1
288 // does) will supercede the second hook func from being called - thus bypassing the call
289 // of the auto hook here.
290 SH_ADD_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false);
291 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
292 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
293 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
295 SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
296 SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
297 SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
298 SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
302 ADD_STATE(State_Return(p->Func3()));
303 ADD_STATE(State_Return(p->Func4(400)));
305 CHECK_STATES((&g_States,
306 new State_Func1H_Called(p),
307 new State_Func1H_Called(p),
308 //new State_Func1_Called(p),
309 new State_Func2H_Called(p, 200),
310 new State_Func2H_Called(p, 0x87654321),
311 new State_Func2_Called(p, 0x87654321),
312 new State_Func3H_Called(p),
313 new State_Func3H_Called(p),
314 new State_Func3_Called(p),
316 new State_Func4H_Called(p, 400),
317 new State_Func4H_Called(p, 0x12345678),
318 new State_Func4_Called(p, 0x12345678),
322 SH_REMOVE_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false);
323 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
324 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
325 SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
327 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
328 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
329 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
330 SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
332 // 5) Reconfigure TheWall_Func1 to actually hook Func5:
333 SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 4, 0, 0);
334 SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
338 CHECK_STATES((&g_States,
339 new State_Func1H_Called(p),
340 new State_Func5_Called(p),
343 // 6) Test auto-remove on reconfig
344 SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 0, 0, 0);
349 CHECK_STATES((&g_States,
350 new State_Func1_Called(p),
351 new State_Func5_Called(p),