sourcehook/test/test4.cpp
branchsourcemm-1.6.0
changeset 361 f34718303c8f
parent 347 e82968c21606
     1.1 --- a/sourcehook/test/test4.cpp	Fri Sep 28 21:32:02 2007 +0000
     1.2 +++ b/sourcehook/test/test4.cpp	Fri Sep 28 21:40:58 2007 +0000
     1.3 @@ -40,6 +40,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_HOOK0_void(Test, Func1, SH_NOATTRIB, 0);
    1.13  	SH_DECL_HOOK0_void(Test, Func2, SH_NOATTRIB, 0);
    1.14  	SH_DECL_HOOK0_void(Test, Func3, SH_NOATTRIB, 0);
    1.15 @@ -63,14 +68,14 @@
    1.16  	GET_SHPTR(g_SHPtr);
    1.17  	g_PLID = 1;
    1.18  
    1.19 -	Test inst;
    1.20 +	Whatever inst;
    1.21  	Test *pInst = &inst;
    1.22  
    1.23  	// 1)
    1.24  	//   Add hooks, then issue a complete shutdown
    1.25 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.26 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.27 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.28 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.29 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.30 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.31  
    1.32  	pInst->Func1();
    1.33  	pInst->Func2();
    1.34 @@ -101,23 +106,23 @@
    1.35  	//   Add hooks from "different plugins", then shutdown the plugins
    1.36  
    1.37  	g_PLID = 1;
    1.38 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.39 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.40  	g_PLID = 2;
    1.41 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.42 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.43  	g_PLID = 3;
    1.44 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.45 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.46  
    1.47  	g_PLID = 1;
    1.48 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.49 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.50 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.51 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.52  
    1.53  	g_PLID = 2;
    1.54 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.55 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.56 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.57 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.58  
    1.59  	g_PLID = 3;
    1.60 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.61 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.62 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.63 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.64  
    1.65  	pInst->Func1();
    1.66  	pInst->Func2();
    1.67 @@ -237,23 +242,23 @@
    1.68  	//   Add hooks from "different plugins", then pause the plugins
    1.69  
    1.70  	g_PLID = 1;
    1.71 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.72 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.73  	g_PLID = 2;
    1.74 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.75 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.76  	g_PLID = 3;
    1.77 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.78 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.79  
    1.80  	g_PLID = 1;
    1.81 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.82 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.83 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.84 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.85  
    1.86  	g_PLID = 2;
    1.87 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.88 -	SH_ADD_HOOK_STATICFUNC(Test, Func3, pInst, Handler_Func3, false);
    1.89 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.90 +	SH_ADD_HOOK(Test, Func3, pInst, SH_STATIC(Handler_Func3), false);
    1.91  
    1.92  	g_PLID = 3;
    1.93 -	SH_ADD_HOOK_STATICFUNC(Test, Func1, pInst, Handler_Func1, false);
    1.94 -	SH_ADD_HOOK_STATICFUNC(Test, Func2, pInst, Handler_Func2, true);
    1.95 +	SH_ADD_HOOK(Test, Func1, pInst, SH_STATIC(Handler_Func1), false);
    1.96 +	SH_ADD_HOOK(Test, Func2, pInst, SH_STATIC(Handler_Func2), true);
    1.97  
    1.98  	pInst->Func1();
    1.99  	pInst->Func2();