sourcehook/test/test1.cpp
changeset 380 f9e21a2ac558
parent 328 3a04ef79edf1
child 386 08583103ba6f
     1.1 --- a/sourcehook/test/test1.cpp	Sun Oct 07 03:12:19 2007 +0000
     1.2 +++ b/sourcehook/test/test1.cpp	Sun Oct 07 22:10:07 2007 +0000
     1.3 @@ -338,11 +338,6 @@
     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 @@ -421,36 +416,43 @@
    1.16  	g_PLID = 1337;
    1.17  
    1.18  	HandlersF1 f1_handlers;
    1.19 -	Whatever test;
    1.20 +	Test test;
    1.21  	Test *pTest = &test;
    1.22  
    1.23 -	// 1) SH_CALL it and call it normally
    1.24 +	// 1) Get a call class and call the member through it and normally
    1.25 +	SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(pTest);
    1.26  
    1.27 -	return true;
    1.28 -	SH_CALL(pTest, &Test::F1)();
    1.29 -	
    1.30 +	ADD_STATE(State_F1_CallClassGenerated);
    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(pTest, &Test::F1)();
    1.46 -	SH_CALL(pTest, &Test::F1)();
    1.47 +	SH_CALL(cc, &Test::F1)();
    1.48 +	SH_CALL(cc2, &Test::F1)();
    1.49  	pTest->F1();
    1.50  
    1.51 -	SH_CALL(pTest, &Test::F1)();
    1.52 +	SH_RELEASE_CALLCLASS(cc2);
    1.53 +	ADD_STATE(State_F1_CallClassReleased);
    1.54 +
    1.55 +	SH_CALL(cc, &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 -
    1.64 +		new State_F1_CallClassReleased,
    1.65  		new State_F1_Called,
    1.66  		new State_F1_Called,
    1.67  		NULL), "Part 2");
    1.68 @@ -460,7 +462,7 @@
    1.69  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
    1.70  	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false) ? true : false));
    1.71  
    1.72 -	SH_CALL(pTest, &Test::F1)();
    1.73 +	SH_CALL(cc, &Test::F1)();
    1.74  	pTest->F1();
    1.75  
    1.76  	CHECK_STATES((&g_States,
    1.77 @@ -469,26 +471,30 @@
    1.78  		new State_F1_PreHandler_Called(&f1_handlers),
    1.79  		NULL), "Part 3");
    1.80  
    1.81 -	// 4) Test source-level compat with callclasses
    1.82 -	SourceHook::CallClass<Test> *pCC = SH_GET_CALLCLASS(pTest);
    1.83 +	// 4) Rerequest the callclass
    1.84 +	SH_RELEASE_CALLCLASS(cc);
    1.85  
    1.86 -	SH_CALL(pCC, &Test::F1)();
    1.87 +	ADD_STATE(State_F1_CallClassReleased);
    1.88 +	cc2 = SH_GET_CALLCLASS(pTest);
    1.89 +	ADD_STATE(State_F1_CallClassGenerated);
    1.90 +
    1.91 +	SH_CALL(cc, &Test::F1)();
    1.92  	pTest->F1();
    1.93  
    1.94 -	SH_RELEASE_CALLCLASS(pCC);
    1.95 -
    1.96  	CHECK_STATES((&g_States,
    1.97 +		new State_F1_CallClassReleased,
    1.98 +		new State_F1_CallClassGenerated,
    1.99  		new State_F1_Called,
   1.100  		new State_F1_PreHandler_Called(&f1_handlers),
   1.101  		NULL), "Part 4");
   1.102  
   1.103  	// 5) Check ignore / supercede
   1.104  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
   1.105 -	SH_CALL(pTest, &Test::F1)();
   1.106 +	SH_CALL(cc, &Test::F1)();
   1.107  	pTest->F1();
   1.108  
   1.109  	g_F1Pre_WhatToDo = MRES_IGNORED;
   1.110 -	SH_CALL(pTest, &Test::F1)();
   1.111 +	SH_CALL(cc, &Test::F1)();
   1.112  	pTest->F1();
   1.113  
   1.114  	CHECK_STATES((&g_States,
   1.115 @@ -504,7 +510,7 @@
   1.116  	SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false);
   1.117  	ADD_STATE(State_F1_HookRemoved);
   1.118  
   1.119 -	SH_CALL(pTest, &Test::F1)();
   1.120 +	SH_CALL(cc, &Test::F1)();
   1.121  	pTest->F1();
   1.122  
   1.123  	CHECK_STATES((&g_States,
   1.124 @@ -517,7 +523,7 @@
   1.125  	g_F1Post_WhatToDo = MRES_IGNORED;
   1.126  	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true) ? true : false));
   1.127  
   1.128 -	SH_CALL(pTest, &Test::F1)();
   1.129 +	SH_CALL(cc, &Test::F1)();
   1.130  	pTest->F1();
   1.131  
   1.132  	CHECK_STATES((&g_States,
   1.133 @@ -531,11 +537,11 @@
   1.134  	g_F1Pre_WhatToDo = MRES_IGNORED;
   1.135  	ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false) ? true : false));
   1.136  
   1.137 -	SH_CALL(pTest, &Test::F1)();
   1.138 +	SH_CALL(cc, &Test::F1)();
   1.139  	pTest->F1();
   1.140  
   1.141  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
   1.142 -	SH_CALL(pTest, &Test::F1)();
   1.143 +	SH_CALL(cc, &Test::F1)();
   1.144  	pTest->F1();
   1.145  
   1.146  	CHECK_STATES((&g_States,
   1.147 @@ -555,7 +561,7 @@
   1.148  	SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true);
   1.149  	ADD_STATE(State_F1_HookRemoved);
   1.150  
   1.151 -	SH_CALL(pTest, &Test::F1)();
   1.152 +	SH_CALL(cc, &Test::F1)();
   1.153  	pTest->F1();
   1.154  
   1.155  	CHECK_STATES((&g_States,
   1.156 @@ -570,7 +576,7 @@
   1.157  	g_F299Pre_WhatToRet = false;
   1.158  
   1.159  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.160 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.161 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.162  
   1.163  	CHECK_STATES((&g_States,
   1.164  		new State_F299_Called("hi"),
   1.165 @@ -582,7 +588,7 @@
   1.166  	// (one add staticfunc in old format)
   1.167  	SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
   1.168  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.169 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.170 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.171  
   1.172  	CHECK_STATES((&g_States,
   1.173  		new State_F299_PreHandlerCalled("hi"),
   1.174 @@ -594,7 +600,7 @@
   1.175  
   1.176  	SH_ADD_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
   1.177  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.178 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.179 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.180  
   1.181  	CHECK_STATES((&g_States,
   1.182  		new State_F299_PreHandlerCalled("hi"),
   1.183 @@ -607,7 +613,7 @@
   1.184  
   1.185  	g_F299Pre_WhatToDo = MRES_OVERRIDE;
   1.186  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.187 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.188 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.189  
   1.190  	CHECK_STATES((&g_States,
   1.191  		new State_F299_PreHandlerCalled("hi"),
   1.192 @@ -620,7 +626,7 @@
   1.193  
   1.194  	g_F299Pre_WhatToDo = MRES_SUPERCEDE;
   1.195  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.196 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.197 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.198  
   1.199  	CHECK_STATES((&g_States,
   1.200  		new State_F299_PreHandlerCalled("hi"),
   1.201 @@ -633,7 +639,7 @@
   1.202  	// (one remove staticfunc in old format)
   1.203  	SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
   1.204  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.205 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.206 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.207  
   1.208  	CHECK_STATES((&g_States,
   1.209  		new State_F299_Called("hi"),
   1.210 @@ -645,7 +651,7 @@
   1.211  
   1.212  	SH_REMOVE_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
   1.213  	ADD_STATE(State_F299Ret(pTest->F299("hi")));
   1.214 -	ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
   1.215 +	ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
   1.216  
   1.217  	CHECK_STATES((&g_States,
   1.218  		new State_F299_Called("hi"),
   1.219 @@ -654,6 +660,14 @@
   1.220  		new State_F299Ret(true),
   1.221  		NULL), "Part 10.7");
   1.222  
   1.223 +	// 11) Release callclass
   1.224 +	SH_RELEASE_CALLCLASS(cc);
   1.225 +	ADD_STATE(State_F1_CallClassReleased);
   1.226 +
   1.227 +
   1.228 +	CHECK_STATES((&g_States,
   1.229 +		new State_F1_CallClassReleased,
   1.230 +		NULL), "Part 11");
   1.231  
   1.232  	// 11 1/2) Test removing hook by id
   1.233