sourcehook/test/testmanual.cpp
changeset 324 257f0837a885
parent 294 0d87bc8606f8
child 328 3a04ef79edf1
     1.1 --- a/sourcehook/test/testmanual.cpp	Mon May 07 18:33:34 2007 +0000
     1.2 +++ b/sourcehook/test/testmanual.cpp	Mon May 07 18:35:59 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,7 +111,7 @@
    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 @@ -155,10 +160,10 @@
    1.25  
    1.26  	// 2)
    1.27  	// Hook each function normally, call them
    1.28 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
    1.29 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
    1.30 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
    1.31 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
    1.32 +	SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
    1.33 +	SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
    1.34 +	SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
    1.35 +	SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
    1.36  
    1.37  	p->Func1();
    1.38  	p->Func2(200);
    1.39 @@ -206,18 +211,18 @@
    1.40  		NULL), "Part 2.1");
    1.41  
    1.42  	// Unhook them
    1.43 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
    1.44 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
    1.45 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
    1.46 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
    1.47 +	SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
    1.48 +	SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
    1.49 +	SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
    1.50 +	SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
    1.51  
    1.52  	// 3)
    1.53  	// Hook each function manually, call them
    1.54  
    1.55 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
    1.56 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
    1.57 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
    1.58 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
    1.59 +	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
    1.60 +	SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
    1.61 +	SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
    1.62 +	SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
    1.63  
    1.64  	p->Func1();
    1.65  	p->Func2(200);
    1.66 @@ -267,10 +272,10 @@
    1.67  		NULL), "Part 3.1");
    1.68  
    1.69  	// Unhook them
    1.70 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
    1.71 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
    1.72 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
    1.73 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
    1.74 +	SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
    1.75 +	SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
    1.76 +	SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
    1.77 +	SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
    1.78  
    1.79  	// 4)
    1.80  	// Hook each function manually, then normally, call, unhook
    1.81 @@ -278,7 +283,7 @@
    1.82  	AnotherBrick handler_inst;
    1.83  
    1.84  	// Why this?
    1.85 -	// 1) tests sh_add_manualhook_memfunc
    1.86 +	// 1) tests sh_add_manualhook
    1.87  	// 2) in my tests, the proto of the manual hook was not equal to the proto of the auto hook
    1.88  	//    (because there are no attribs for manual hooks).
    1.89  	//    sourcehook.cpp did a !strcmp(..), so it assigned a new hook manager even though there
    1.90 @@ -287,15 +292,15 @@
    1.91  	//    The problem with this is that returning MRES_SUPERCEDE (as AnotherBrick::Handler_Func1
    1.92  	//    does) will supercede the second hook func from being called - thus bypassing the call
    1.93  	//    of the auto hook here.
    1.94 -	SH_ADD_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false);
    1.95 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
    1.96 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
    1.97 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
    1.98 +	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false);
    1.99 +	SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
   1.100 +	SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
   1.101 +	SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
   1.102  
   1.103 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
   1.104 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
   1.105 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
   1.106 -	SH_ADD_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
   1.107 +	SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
   1.108 +	SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
   1.109 +	SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
   1.110 +	SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
   1.111  
   1.112  	p->Func1();
   1.113  	p->Func2(200);
   1.114 @@ -319,19 +324,19 @@
   1.115  		new State_Return(4),
   1.116  		NULL), "Part 4");
   1.117  
   1.118 -	SH_REMOVE_MANUALHOOK_MEMFUNC(TheWall_Func1, p, &handler_inst, &AnotherBrick::Handler_Func1, false);
   1.119 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func2, p, Handler_Func2, false);
   1.120 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func3, p, Handler_Func3, false);
   1.121 -	SH_REMOVE_MANUALHOOK_STATICFUNC(TheWall_Func4, p, Handler_Func4, false);
   1.122 +	SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false);
   1.123 +	SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
   1.124 +	SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
   1.125 +	SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
   1.126  
   1.127 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func1, p, Handler_Func1, false);
   1.128 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func2, p, Handler_Func2, false);
   1.129 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func3, p, Handler_Func3, false);
   1.130 -	SH_REMOVE_HOOK_STATICFUNC(TheWall, Func4, p, Handler_Func4, false);
   1.131 +	SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
   1.132 +	SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
   1.133 +	SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
   1.134 +	SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
   1.135  
   1.136  	// 5) Reconfigure TheWall_Func1 to actually hook Func5:
   1.137  	SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 4, 0, 0);
   1.138 -	SH_ADD_MANUALHOOK_STATICFUNC(TheWall_Func1, p, Handler_Func1, false);
   1.139 +	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
   1.140  
   1.141  	p->Func5();
   1.142