sourcehook/test/test1.cpp
branchsourcemm-1.6.0
changeset 361 f34718303c8f
parent 347 e82968c21606
     1.1 --- a/sourcehook/test/test1.cpp	Fri Sep 28 21:32:02 2007 +0000
     1.2 +++ b/sourcehook/test/test1.cpp	Fri Sep 28 21:40:58 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,52 +421,46 @@
    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 -	SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(pTest);
    1.25 +	// 1) SH_CALL it and call it normally
    1.26  
    1.27 -	ADD_STATE(State_F1_CallClassGenerated);
    1.28 +	return true;
    1.29 +	SH_CALL(pTest, &Test::F1)();
    1.30 +	
    1.31  
    1.32 -	SH_CALL(cc, &Test::F1)();
    1.33  	pTest->F1();
    1.34  
    1.35  	CHECK_STATES((&g_States,
    1.36 -		new State_F1_CallClassGenerated,
    1.37  		new State_F1_Called,
    1.38  		new State_F1_Called,
    1.39  		NULL), "Part 1");
    1.40  
    1.41  	// 2) Request a call class again
    1.42 -	SourceHook::CallClass<Test> *cc2 = SH_GET_CALLCLASS(pTest);
    1.43 -	ADD_STATE(State_F1_CallClassGenerated);
    1.44  
    1.45 -	SH_CALL(cc, &Test::F1)();
    1.46 -	SH_CALL(cc2, &Test::F1)();
    1.47 +	SH_CALL(pTest, &Test::F1)();
    1.48 +	SH_CALL(pTest, &Test::F1)();
    1.49  	pTest->F1();
    1.50  
    1.51 -	SH_RELEASE_CALLCLASS(cc2);
    1.52 -	ADD_STATE(State_F1_CallClassReleased);
    1.53 -
    1.54 -	SH_CALL(cc, &Test::F1)();
    1.55 +	SH_CALL(pTest, &Test::F1)();
    1.56  	pTest->F1();
    1.57  
    1.58  	CHECK_STATES((&g_States,
    1.59 -		new State_F1_CallClassGenerated,
    1.60  		new State_F1_Called,
    1.61  		new State_F1_Called,
    1.62  		new State_F1_Called,
    1.63 -		new State_F1_CallClassReleased,
    1.64 +
    1.65  		new State_F1_Called,
    1.66  		new State_F1_Called,
    1.67  		NULL), "Part 2");
    1.68  
    1.69  	// 3) Add a pre hook
    1.70 +	//   (one add memfunc in old format)
    1.71  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
    1.72 -	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false)));
    1.73 +	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false) ? true : false));
    1.74  
    1.75 -	SH_CALL(cc, &Test::F1)();
    1.76 +	SH_CALL(pTest, &Test::F1)();
    1.77  	pTest->F1();
    1.78  
    1.79  	CHECK_STATES((&g_States,
    1.80 @@ -470,30 +469,26 @@
    1.81  		new State_F1_PreHandler_Called(&f1_handlers),
    1.82  		NULL), "Part 3");
    1.83  
    1.84 -	// 4) Rerequest the callclass
    1.85 -	SH_RELEASE_CALLCLASS(cc);
    1.86 +	// 4) Test source-level compat with callclasses
    1.87 +	SourceHook::CallClass<Test> *pCC = SH_GET_CALLCLASS(pTest);
    1.88  
    1.89 -	ADD_STATE(State_F1_CallClassReleased);
    1.90 -	cc2 = SH_GET_CALLCLASS(pTest);
    1.91 -	ADD_STATE(State_F1_CallClassGenerated);
    1.92 -
    1.93 -	SH_CALL(cc, &Test::F1)();
    1.94 +	SH_CALL(pCC, &Test::F1)();
    1.95  	pTest->F1();
    1.96  
    1.97 +	SH_RELEASE_CALLCLASS(pCC);
    1.98 +
    1.99  	CHECK_STATES((&g_States,
   1.100 -		new State_F1_CallClassReleased,
   1.101 -		new State_F1_CallClassGenerated,
   1.102  		new State_F1_Called,
   1.103  		new State_F1_PreHandler_Called(&f1_handlers),
   1.104  		NULL), "Part 4");
   1.105  
   1.106  	// 5) Check ignore / supercede
   1.107  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
   1.108 -	SH_CALL(cc, &Test::F1)();
   1.109 +	SH_CALL(pTest, &Test::F1)();
   1.110  	pTest->F1();
   1.111  
   1.112  	g_F1Pre_WhatToDo = MRES_IGNORED;
   1.113 -	SH_CALL(cc, &Test::F1)();
   1.114 +	SH_CALL(pTest, &Test::F1)();
   1.115  	pTest->F1();
   1.116  
   1.117  	CHECK_STATES((&g_States,
   1.118 @@ -505,10 +500,11 @@
   1.119  		NULL), "Part 5");
   1.120  
   1.121  	// 6) remove the hook again
   1.122 +	//   (one remove memfunc in old format)
   1.123  	SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.124  	ADD_STATE(State_F1_HookRemoved);
   1.125  
   1.126 -	SH_CALL(cc, &Test::F1)();
   1.127 +	SH_CALL(pTest, &Test::F1)();
   1.128  	pTest->F1();
   1.129  
   1.130  	CHECK_STATES((&g_States,
   1.131 @@ -519,9 +515,9 @@
   1.132  
   1.133  	// 7) add a post hook now
   1.134  	g_F1Post_WhatToDo = MRES_IGNORED;
   1.135 -	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Post, true)));
   1.136 +	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true) ? true : false));
   1.137  
   1.138 -	SH_CALL(cc, &Test::F1)();
   1.139 +	SH_CALL(pTest, &Test::F1)();
   1.140  	pTest->F1();
   1.141  
   1.142  	CHECK_STATES((&g_States,
   1.143 @@ -533,13 +529,13 @@
   1.144  
   1.145  	// 8) And a pre hook again
   1.146  	g_F1Pre_WhatToDo = MRES_IGNORED;
   1.147 -	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false)));
   1.148 +	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false) ? true : false));
   1.149  
   1.150 -	SH_CALL(cc, &Test::F1)();
   1.151 +	SH_CALL(pTest, &Test::F1)();
   1.152  	pTest->F1();
   1.153  
   1.154  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
   1.155 -	SH_CALL(cc, &Test::F1)();
   1.156 +	SH_CALL(pTest, &Test::F1)();
   1.157  	pTest->F1();
   1.158  
   1.159  	CHECK_STATES((&g_States,
   1.160 @@ -554,12 +550,12 @@
   1.161  		NULL), "Part 8");
   1.162  
   1.163  	// 9) Remove all hooks
   1.164 -	SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.165 +	SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.166  	ADD_STATE(State_F1_HookRemoved);
   1.167 -	SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Post, true);
   1.168 +	SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true);
   1.169  	ADD_STATE(State_F1_HookRemoved);
   1.170  
   1.171 -	SH_CALL(cc, &Test::F1)();
   1.172 +	SH_CALL(pTest, &Test::F1)();
   1.173  	pTest->F1();
   1.174  
   1.175  	CHECK_STATES((&g_States,
   1.176 @@ -574,7 +570,7 @@
   1.177  	g_F299Pre_WhatToRet = false;
   1.178  
   1.179  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.180 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.181 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.182  
   1.183  	CHECK_STATES((&g_States,
   1.184  		new State_F299_Called("hi"),
   1.185 @@ -583,9 +579,10 @@
   1.186  		new State_F299Ret(true),
   1.187  		NULL), "Part 10.1");
   1.188  
   1.189 +	// (one add staticfunc in old format)
   1.190  	SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
   1.191  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.192 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.193 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.194  
   1.195  	CHECK_STATES((&g_States,
   1.196  		new State_F299_PreHandlerCalled("hi"),
   1.197 @@ -595,9 +592,9 @@
   1.198  		new State_F299Ret(true),
   1.199  		NULL), "Part 10.2");
   1.200  
   1.201 -	SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Post, true);
   1.202 +	SH_ADD_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
   1.203  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.204 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.205 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.206  
   1.207  	CHECK_STATES((&g_States,
   1.208  		new State_F299_PreHandlerCalled("hi"),
   1.209 @@ -610,7 +607,7 @@
   1.210  
   1.211  	g_F299Pre_WhatToDo = MRES_OVERRIDE;
   1.212  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.213 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.214 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.215  
   1.216  	CHECK_STATES((&g_States,
   1.217  		new State_F299_PreHandlerCalled("hi"),
   1.218 @@ -623,7 +620,7 @@
   1.219  
   1.220  	g_F299Pre_WhatToDo = MRES_SUPERCEDE;
   1.221  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.222 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.223 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.224  
   1.225  	CHECK_STATES((&g_States,
   1.226  		new State_F299_PreHandlerCalled("hi"),
   1.227 @@ -633,9 +630,10 @@
   1.228  		new State_F299Ret(true),
   1.229  		NULL), "Part 10.5");
   1.230  
   1.231 +	// (one remove staticfunc in old format)
   1.232  	SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
   1.233  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.234 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.235 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.236  
   1.237  	CHECK_STATES((&g_States,
   1.238  		new State_F299_Called("hi"),
   1.239 @@ -645,9 +643,9 @@
   1.240  		new State_F299Ret(true),
   1.241  		NULL), "Part 10.6");
   1.242  
   1.243 -	SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Post, true);
   1.244 +	SH_REMOVE_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
   1.245  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.246 -	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.247 +	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.248  
   1.249  	CHECK_STATES((&g_States,
   1.250  		new State_F299_Called("hi"),
   1.251 @@ -656,39 +654,59 @@
   1.252  		new State_F299Ret(true),
   1.253  		NULL), "Part 10.7");
   1.254  
   1.255 -	// 11) Release callclass
   1.256 -	SH_RELEASE_CALLCLASS(cc);
   1.257 -	ADD_STATE(State_F1_CallClassReleased);
   1.258 +
   1.259 +	// 11 1/2) Test removing hook by id
   1.260 +
   1.261 +	g_F1Pre_WhatToDo = MRES_IGNORED;
   1.262  
   1.263 +	pTest->F1();
   1.264 +	int hookPre = SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.265 +	int hookPost = SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true);
   1.266 +
   1.267 +	pTest->F1();
   1.268 +	SH_REMOVE_HOOK_ID(hookPost);
   1.269 +	pTest->F1();
   1.270 +	SH_REMOVE_HOOK_ID(hookPre);
   1.271 +	pTest->F1();
   1.272  
   1.273  	CHECK_STATES((&g_States,
   1.274 -		new State_F1_CallClassReleased,
   1.275 -		NULL), "Part 11");
   1.276 +		new State_F1_Called,
   1.277 +
   1.278 +		new State_F1_PreHandler_Called(&f1_handlers),
   1.279 +		new State_F1_Called,
   1.280 +		new State_F1_PostHandler_Called(&f1_handlers),
   1.281 +
   1.282 +		new State_F1_PreHandler_Called(&f1_handlers),
   1.283 +		new State_F1_Called,
   1.284 +
   1.285 +		new State_F1_Called,
   1.286 +
   1.287 +		NULL), "Part 11 1/2");
   1.288  
   1.289  	// 12) Test? Test.
   1.290 -	SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.291 -	SH_ADD_HOOK_MEMFUNC(Test, F2, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.292 -	SH_ADD_HOOK_MEMFUNC(Test, F3, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.293 -	SH_ADD_HOOK_MEMFUNC(Test, F4, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.294 -	SH_ADD_HOOK_MEMFUNC(Test, F5, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.295 -	SH_ADD_HOOK_MEMFUNC(Test, F6, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.296 -	SH_ADD_HOOK_MEMFUNC(Test, F7, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.297 -	SH_ADD_HOOK_MEMFUNC(Test, F8, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.298 -	SH_ADD_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.299 -	SH_ADD_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.300 +	SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.301 +	SH_ADD_HOOK(Test, F2, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.302 +	SH_ADD_HOOK(Test, F3, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.303 +	SH_ADD_HOOK(Test, F4, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.304 +	SH_ADD_HOOK(Test, F5, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.305 +	SH_ADD_HOOK(Test, F6, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.306 +	SH_ADD_HOOK(Test, F7, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.307 +	SH_ADD_HOOK(Test, F8, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.308 +	SH_ADD_HOOK(Test, F9, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.309 +	SH_ADD_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.310  
   1.311 -	SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.312 -	SH_REMOVE_HOOK_MEMFUNC(Test, F2, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.313 -	SH_REMOVE_HOOK_MEMFUNC(Test, F3, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.314 -	SH_REMOVE_HOOK_MEMFUNC(Test, F4, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.315 -	SH_REMOVE_HOOK_MEMFUNC(Test, F5, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.316 -	SH_REMOVE_HOOK_MEMFUNC(Test, F6, pTest, &f1_handlers, &HandlersF1::Pre, true);
   1.317 -	SH_REMOVE_HOOK_MEMFUNC(Test, F7, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.318 -	SH_REMOVE_HOOK_MEMFUNC(Test, F8, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.319 -	SH_REMOVE_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.320 -	SH_REMOVE_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.321 +	SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.322 +	SH_REMOVE_HOOK(Test, F2, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.323 +	SH_REMOVE_HOOK(Test, F3, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.324 +	SH_REMOVE_HOOK(Test, F4, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.325 +	SH_REMOVE_HOOK(Test, F5, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.326 +	SH_REMOVE_HOOK(Test, F6, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
   1.327 +	SH_REMOVE_HOOK(Test, F7, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.328 +	SH_REMOVE_HOOK(Test, F8, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.329 +	SH_REMOVE_HOOK(Test, F9, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.330 +	SH_REMOVE_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
   1.331  
   1.332 -	SH_ADD_HOOK_STATICFUNC(Test, F60, pTest, F60_Pre, false);
   1.333 +	SH_ADD_HOOK(Test, F60, pTest, SH_STATIC(F60_Pre), false);
   1.334  
   1.335  	int a = 0;
   1.336  	pTest->F60(a);