sourcehook/test/testrecall.cpp
changeset 324 257f0837a885
parent 179 3ade923f508b
child 380 f9e21a2ac558
     1.1 --- a/sourcehook/test/testrecall.cpp	Mon May 07 18:33:34 2007 +0000
     1.2 +++ b/sourcehook/test/testrecall.cpp	Mon May 07 18:35:59 2007 +0000
     1.3 @@ -48,6 +48,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 +	struct Whatever : Test
     1.9 +	{
    1.10 +	};
    1.11 +
    1.12  	void Handler1_Func1(int a)
    1.13  	{
    1.14  		ADD_STATE(State_H1_Func1(a));
    1.15 @@ -119,12 +124,12 @@
    1.16  	GET_SHPTR(g_SHPtr);
    1.17  	g_PLID = 1337;
    1.18  
    1.19 -	Test inst;
    1.20 +	Whatever inst;
    1.21  	Test *ptr = &inst;
    1.22  
    1.23 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, ptr, Handler1_Func1, false);
    1.24 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, ptr, Handler2_Func1, false);
    1.25 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, ptr, HandlerPost_Func1, true);
    1.26 +	SH_ADD_HOOK(Test, Func1, ptr, SH_STATIC(Handler1_Func1), false);
    1.27 +	SH_ADD_HOOK(Test, Func1, ptr, SH_STATIC(Handler2_Func1), false);
    1.28 +	SH_ADD_HOOK(Test, Func1, ptr, SH_STATIC(HandlerPost_Func1), true);
    1.29  
    1.30  	ptr->Func1(77);
    1.31  
    1.32 @@ -135,10 +140,10 @@
    1.33  		new State_HP_Func1(0, ptr),
    1.34  		NULL), "Part 1");
    1.35  
    1.36 -	SH_REMOVE_HOOK_STATICFUNC(Test, Func1, ptr, Handler1_Func1, false);
    1.37 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, ptr, Handler2_Func1, false);
    1.38 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, ptr, Handler2_Func1, false);
    1.39 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, ptr, Handler2_Func1, false);
    1.40 +	SH_REMOVE_HOOK(Test, Func1, ptr, SH_STATIC(Handler1_Func1), false);
    1.41 +	SH_ADD_HOOK(Test, Func1, ptr, SH_STATIC(Handler2_Func1), false);
    1.42 +	SH_ADD_HOOK(Test, Func1, ptr, SH_STATIC(Handler2_Func1), false);
    1.43 +	SH_ADD_HOOK(Test, Func1, ptr, SH_STATIC(Handler2_Func1), false);
    1.44  
    1.45  	ptr->Func1(77);
    1.46  
    1.47 @@ -151,8 +156,8 @@
    1.48  		new State_HP_Func1(57, ptr),
    1.49  		NULL), "Part 2");
    1.50  
    1.51 -	SH_REMOVE_HOOK_STATICFUNC(Test, Func1, ptr, Handler2_Func1, false);
    1.52 -	SH_REMOVE_HOOK_STATICFUNC(Test, Func1, ptr, HandlerPost_Func1, true);
    1.53 +	SH_REMOVE_HOOK(Test, Func1, ptr, SH_STATIC(Handler2_Func1), false);
    1.54 +	SH_REMOVE_HOOK(Test, Func1, ptr, SH_STATIC(HandlerPost_Func1), true);
    1.55  
    1.56  	ptr->Func1(77);
    1.57  
    1.58 @@ -162,8 +167,8 @@
    1.59  
    1.60  	// Func2
    1.61  
    1.62 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func2, false);
    1.63 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost_Func2, true);
    1.64 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(Handler1_Func2), false);
    1.65 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost_Func2), true);
    1.66  
    1.67  	int a = ptr->Func2(77);
    1.68  	CHECK_STATES((&g_States,
    1.69 @@ -175,8 +180,8 @@
    1.70  	CHECK_COND(a == 500, "Part 4.1");
    1.71  
    1.72  	// Func2, with other handler
    1.73 -	SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func2, false);
    1.74 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler2_Func2, false);
    1.75 +	SH_REMOVE_HOOK(Test, Func2, ptr, SH_STATIC(Handler1_Func2), false);
    1.76 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(Handler2_Func2), false);
    1.77  
    1.78  	a = ptr->Func2(77);
    1.79  	CHECK_STATES((&g_States,
    1.80 @@ -191,9 +196,9 @@
    1.81  
    1.82  	// 1) WITH OVERRIDE
    1.83  
    1.84 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, Handler1_Func22, false);
    1.85 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1A_Func22, true);
    1.86 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true);
    1.87 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(Handler1_Func22), false);
    1.88 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost1A_Func22), true);
    1.89 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost2_Func22), true);
    1.90  	
    1.91  	a = ptr->Func2(10, 11);
    1.92  	CHECK_STATES((&g_States,
    1.93 @@ -206,11 +211,11 @@
    1.94  	CHECK_COND(a == 0, "Part 5.1");
    1.95  
    1.96  	// 2) WITH IGNORE
    1.97 -	SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1A_Func22, true);
    1.98 -	SH_REMOVE_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true);
    1.99 +	SH_REMOVE_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost1A_Func22), true);
   1.100 +	SH_REMOVE_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost2_Func22), true);
   1.101  
   1.102 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost1_Func22, true);
   1.103 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, ptr, HandlerPost2_Func22, true);
   1.104 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost1_Func22), true);
   1.105 +	SH_ADD_HOOK(Test, Func2, ptr, SH_STATIC(HandlerPost2_Func22), true);
   1.106  
   1.107  	a = ptr->Func2(10, 11);
   1.108  	CHECK_STATES((&g_States,