sourcehook/test/testmanual.cpp
changeset 380 f9e21a2ac558
parent 328 3a04ef79edf1
child 387 093c72464b35
     1.1 --- a/sourcehook/test/testmanual.cpp	Sun Oct 07 03:12:19 2007 +0000
     1.2 +++ b/sourcehook/test/testmanual.cpp	Sun Oct 07 22:10:07 2007 +0000
     1.3 @@ -52,11 +52,6 @@
     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 @@ -111,9 +106,11 @@
    1.16  	GET_SHPTR(g_SHPtr);
    1.17  	g_PLID = 1337;
    1.18  
    1.19 -	Whatever inst;
    1.20 +	TheWall 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 @@ -132,14 +129,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(p, TheWall_Func1)();
    1.33 -	SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
    1.34 -	SH_MCALL(p, TheWall_Func2)(200);
    1.35 -	SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
    1.36 -	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
    1.37 -	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
    1.38 -	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
    1.39 -	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
    1.40 +	SH_MCALL(cc, TheWall_Func1)();
    1.41 +	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
    1.42 +	SH_MCALL(cc, TheWall_Func2)(200);
    1.43 +	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
    1.44 +	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
    1.45 +	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
    1.46 +	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
    1.47 +	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
    1.48  
    1.49  	CHECK_STATES((&g_States,
    1.50  		new State_Func1_Called(p),
    1.51 @@ -156,17 +153,6 @@
    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(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
    1.69 @@ -195,14 +181,14 @@
    1.70  	// Call them through the mcallclass
    1.71  	// 2.1)
    1.72  	// Now call each function through the manual call class, using the hook decl and manually
    1.73 -	SH_MCALL(p, TheWall_Func1)();
    1.74 -	SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
    1.75 -	SH_MCALL(p, TheWall_Func2)(200);
    1.76 -	SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
    1.77 -	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
    1.78 -	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
    1.79 -	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
    1.80 -	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
    1.81 +	SH_MCALL(cc, TheWall_Func1)();
    1.82 +	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
    1.83 +	SH_MCALL(cc, TheWall_Func2)(200);
    1.84 +	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
    1.85 +	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
    1.86 +	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
    1.87 +	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
    1.88 +	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
    1.89  
    1.90  	CHECK_STATES((&g_States,
    1.91  		new State_Func1_Called(p),
    1.92 @@ -256,14 +242,14 @@
    1.93  	// Call them through the mcallclass
    1.94  	// 3.1)
    1.95  	// Now call each function through the manual call class, using the hook decl and manually
    1.96 -	SH_MCALL(p, TheWall_Func1)();
    1.97 -	SH_MCALL2(p, MFP_Func1(), 0, 0, 0)();
    1.98 -	SH_MCALL(p, TheWall_Func2)(200);
    1.99 -	SH_MCALL2(p, MFP_Func2(), 1, 0, 0)(200);
   1.100 -	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func3)()));
   1.101 -	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func3(), 2, 0, 0)()));
   1.102 -	ADD_STATE(State_Return(SH_MCALL(p, TheWall_Func4)(400)));
   1.103 -	ADD_STATE(State_Return(SH_MCALL2(p, MFP_Func4(), 3, 0, 0)(400)));
   1.104 +	SH_MCALL(cc, TheWall_Func1)();
   1.105 +	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
   1.106 +	SH_MCALL(cc, TheWall_Func2)(200);
   1.107 +	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
   1.108 +	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
   1.109 +	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
   1.110 +	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
   1.111 +	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
   1.112  
   1.113  	CHECK_STATES((&g_States,
   1.114  		new State_Func1_Called(p),