sourcehook/test/testmanual.cpp
branchsourcemm-1.6.0
changeset 361 f34718303c8f
parent 347 e82968c21606
     1.1 --- a/sourcehook/test/testmanual.cpp	Fri Sep 28 21:32:02 2007 +0000
     1.2 +++ b/sourcehook/test/testmanual.cpp	Fri Sep 28 21:40:58 2007 +0000
     1.3 @@ -52,6 +52,11 @@
     1.4  		{
     1.5  			ADD_STATE(State_Func5_Called(reinterpret_cast<void*>(this)));
     1.6  		}
     1.7 +
     1.8 +	};
     1.9 +	// GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup!
    1.10 +	class Whatever : public TheWall
    1.11 +	{
    1.12  	};
    1.13  
    1.14  	SH_DECL_HOOK0_void(TheWall, Func1, SH_NOATTRIB, 0);
    1.15 @@ -106,11 +111,9 @@
    1.16  	GET_SHPTR(g_SHPtr);
    1.17  	g_PLID = 1337;
    1.18  
    1.19 -	TheWall inst;
    1.20 +	Whatever inst;
    1.21  	TheWall *p = &inst;
    1.22  
    1.23 -	SourceHook::ManualCallClass *cc = SH_GET_MCALLCLASS(p, sizeof(void*));
    1.24 -
    1.25  	// 1)
    1.26  	// Call each function
    1.27  	p->Func1();
    1.28 @@ -129,14 +132,14 @@
    1.29  
    1.30  	// 1.1)
    1.31  	// Now call each function through the manual call class, using the hook decl and manually
    1.32 -	SH_MCALL(cc, TheWall_Func1)();
    1.33 -	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
    1.34 -	SH_MCALL(cc, TheWall_Func2)(200);
    1.35 -	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
    1.36 -	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
    1.37 -	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
    1.38 -	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
    1.39 -	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
    1.40 +	SH_MCALL(p, TheWall_Func1)();
    1.41 +	SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
    1.42 +	SH_MCALL(p, TheWall_Func2)(200);
    1.43 +	SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
    1.44 +	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
    1.45 +	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
    1.46 +	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
    1.47 +	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
    1.48  
    1.49  	CHECK_STATES((&g_States,
    1.50  		new State_Func1_Called(p),
    1.51 @@ -153,12 +156,23 @@
    1.52  		new State_Return(4),
    1.53  		NULL), "Part 1.1");
    1.54  
    1.55 +	// Compat: really get a manual call class!
    1.56 +	SourceHook::ManualCallClass *pCC = SH_GET_MCALLCLASS(p, sizeof(void*));
    1.57 +	SH_MCALL(pCC, TheWall_Func1)();
    1.58 +	SH_MCALL2(pCC, MFP_Func1(), 0, 0, 0)();
    1.59 +	CHECK_STATES((&g_States,
    1.60 +		new State_Func1_Called(p),
    1.61 +		new State_Func1_Called(p),
    1.62 +		NULL), "Part 1.2");
    1.63 +
    1.64 +	SH_RELEASE_CALLCLASS(pCC);
    1.65 +
    1.66  	// 2)
    1.67  	// Hook each function normally, call them
    1.68 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
    1.69 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
    1.70 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
    1.71 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
    1.72 +	SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
    1.73 +	SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
    1.74 +	SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
    1.75 +	SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
    1.76  
    1.77  	p->Func1();
    1.78  	p->Func2(200);
    1.79 @@ -181,14 +195,14 @@
    1.80  	// Call them through the mcallclass
    1.81  	// 2.1)
    1.82  	// Now call each function through the manual call class, using the hook decl and manually
    1.83 -	SH_MCALL(cc, TheWall_Func1)();
    1.84 -	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
    1.85 -	SH_MCALL(cc, TheWall_Func2)(200);
    1.86 -	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
    1.87 -	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
    1.88 -	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
    1.89 -	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
    1.90 -	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
    1.91 +	SH_MCALL(p, TheWall_Func1)();
    1.92 +	SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
    1.93 +	SH_MCALL(p, TheWall_Func2)(200);
    1.94 +	SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
    1.95 +	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
    1.96 +	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
    1.97 +	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
    1.98 +	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
    1.99  
   1.100  	CHECK_STATES((&g_States,
   1.101  		new State_Func1_Called(p),
   1.102 @@ -206,18 +220,18 @@
   1.103  		NULL), "Part 2.1");
   1.104  
   1.105  	// Unhook them
   1.106 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
   1.107 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
   1.108 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
   1.109 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
   1.110 +	SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
   1.111 +	SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
   1.112 +	SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
   1.113 +	SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
   1.114  
   1.115  	// 3)
   1.116  	// Hook each function manually, call them
   1.117  
   1.118 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
   1.119 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
   1.120 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
   1.121 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
   1.122 +	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
   1.123 +	SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
   1.124 +	SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
   1.125 +	SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
   1.126  
   1.127  	p->Func1();
   1.128  	p->Func2(200);
   1.129 @@ -242,14 +256,14 @@
   1.130  	// Call them through the mcallclass
   1.131  	// 3.1)
   1.132  	// Now call each function through the manual call class, using the hook decl and manually
   1.133 -	SH_MCALL(cc, TheWall_Func1)();
   1.134 -	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
   1.135 -	SH_MCALL(cc, TheWall_Func2)(200);
   1.136 -	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
   1.137 -	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
   1.138 -	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
   1.139 -	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
   1.140 -	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
   1.141 +	SH_MCALL(p, TheWall_Func1)();
   1.142 +	SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
   1.143 +	SH_MCALL(p, TheWall_Func2)(200);
   1.144 +	SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
   1.145 +	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
   1.146 +	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
   1.147 +	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
   1.148 +	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
   1.149  
   1.150  	CHECK_STATES((&g_States,
   1.151  		new State_Func1_Called(p),
   1.152 @@ -267,10 +281,10 @@
   1.153  		NULL), "Part 3.1");
   1.154  
   1.155  	// Unhook them
   1.156 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
   1.157 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
   1.158 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
   1.159 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
   1.160 +	SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
   1.161 +	SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
   1.162 +	SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
   1.163 +	SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
   1.164  
   1.165  	// 4)
   1.166  	// Hook each function manually, then normally, call, unhook
   1.167 @@ -278,7 +292,7 @@
   1.168  	AnotherBrick handler_inst;
   1.169  
   1.170  	// Why this?
   1.171 -	// 1) tests sh_add_manualhook_memfunc
   1.172 +	// 1) tests sh_add_manualhook
   1.173  	// 2) in my tests, the proto of the manual hook was not equal to the proto of the auto hook
   1.174  	//    (because there are no attribs for manual hooks).
   1.175  	//    sourcehook.cpp did a !strcmp(..), so it assigned a new hook manager even though there
   1.176 @@ -287,15 +301,15 @@
   1.177  	//    The problem with this is that returning MRES_SUPERCEDE (as AnotherBrick::Handler_Func1
   1.178  	//    does) will supercede the second hook func from being called - thus bypassing the call
   1.179  	//    of the auto hook here.
   1.180 -	SH_ADD_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false);
   1.181 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
   1.182 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
   1.183 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
   1.184 +	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false);
   1.185 +	SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
   1.186 +	SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
   1.187 +	SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
   1.188  
   1.189 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
   1.190 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
   1.191 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
   1.192 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
   1.193 +	SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
   1.194 +	SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
   1.195 +	SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
   1.196 +	SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
   1.197  
   1.198  	p->Func1();
   1.199  	p->Func2(200);
   1.200 @@ -319,19 +333,19 @@
   1.201  		new State_Return(4),
   1.202  		NULL), "Part 4");
   1.203  
   1.204 -	SH_REMOVE_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false);
   1.205 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
   1.206 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
   1.207 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
   1.208 +	SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false);
   1.209 +	SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
   1.210 +	SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
   1.211 +	SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
   1.212  
   1.213 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
   1.214 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
   1.215 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
   1.216 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
   1.217 +	SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
   1.218 +	SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
   1.219 +	SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
   1.220 +	SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
   1.221  
   1.222  	// 5) Reconfigure TheWall_Func1 to actually hook Func5:
   1.223  	SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 4, 0, 0);
   1.224 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
   1.225 +	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
   1.226  
   1.227  	p->Func5();
   1.228