sourcehook/test/testrefret.cpp
branchsourcemm-1.6.0
changeset 361 f34718303c8f
parent 347 e82968c21606
     1.1 --- a/sourcehook/test/testrefret.cpp	Fri Sep 28 21:32:02 2007 +0000
     1.2 +++ b/sourcehook/test/testrefret.cpp	Fri Sep 28 21:40:58 2007 +0000
     1.3 @@ -48,6 +48,10 @@
     1.4  			return m_Var2;
     1.5  		}
     1.6  	};
     1.7 +
     1.8 +	class Whatever : public Test
     1.9 +	{
    1.10 +	};
    1.11  
    1.12  	class CHook
    1.13  	{
    1.14 @@ -98,7 +102,7 @@
    1.15  	GET_SHPTR(g_SHPtr);
    1.16  	g_PLID = 1;
    1.17  
    1.18 -	Test test;
    1.19 +	Whatever test;
    1.20  	Test *pTest = &test;
    1.21  	CHook hook;
    1.22  
    1.23 @@ -111,7 +115,7 @@
    1.24  		NULL), "Part 1");
    1.25  
    1.26  	// Now add Func1_Pre1, which supercedes and returns hook.m_Var
    1.27 -	SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Pre1, false);
    1.28 +	SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Pre1), false);
    1.29  
    1.30  	int &ret2 = pTest->Func1();
    1.31  	ADD_STATE(State_Func1_Ret(&ret2));
    1.32 @@ -123,7 +127,7 @@
    1.33  		NULL), "Part 2");
    1.34  
    1.35  	// Now add Func1_Post1, which only reports orig ret and override ret
    1.36 -	SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Post1, true);
    1.37 +	SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Post1), true);
    1.38  
    1.39  	int &ret3 = pTest->Func1();
    1.40  	ADD_STATE(State_Func1_Ret(&ret3));
    1.41 @@ -139,8 +143,8 @@
    1.42  	// Now add Func1_Pre2, which supercedes and returns g_Var (it also sets the override ret from pre1 to 1337)
    1.43  	// and add Func1_Post2, which overrides and returns hook.m_Var again.
    1.44  
    1.45 -	SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Pre2, false);
    1.46 -	SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Post2, true);
    1.47 +	SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Pre2), false);
    1.48 +	SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Post2), true);
    1.49  
    1.50  	int &ret4 = pTest->Func1();
    1.51  	ADD_STATE(State_Func1_Ret(&ret4));
    1.52 @@ -160,8 +164,7 @@
    1.53  	CHECK_COND(hook.m_Var == 1337, "Part 4.1");
    1.54  	
    1.55  	// Through a callclass
    1.56 -	SourceHook::CallClass<Test> *cc1 = SH_GET_CALLCLASS(&test);
    1.57 -	int &ret5 = SH_CALL(cc1, &Test::Func1)();
    1.58 +	int &ret5 = SH_CALL(pTest, &Test::Func1)();
    1.59  	ADD_STATE(State_Func1_Ret(&ret5));
    1.60  
    1.61  	CHECK_STATES((&g_States,
    1.62 @@ -169,7 +172,6 @@
    1.63  		new State_Func1_Ret(&test.m_Var1),
    1.64  		NULL), "Part 5");
    1.65  
    1.66 -	SH_RELEASE_CALLCLASS(cc1);
    1.67  
    1.68  	////////////////////////////////////////////////////////////////////////////////////////
    1.69  	// Func2 tests
    1.70 @@ -181,8 +183,8 @@
    1.71  		new State_Func2_Ret(&test.m_Var2),
    1.72  		NULL), "Part 6");
    1.73  
    1.74 -	SH_ADD_HOOK_MEMFUNC(Test, Func2, &test, &hook, &CHook::Func2_Pre1, false);
    1.75 -	SH_ADD_HOOK_MEMFUNC(Test, Func2, &test, &hook, &CHook::Func2_Post1, true);
    1.76 +	SH_ADD_HOOK(Test, Func2, &test, SH_MEMBER(&hook, &CHook::Func2_Pre1), false);
    1.77 +	SH_ADD_HOOK(Test, Func2, &test, SH_MEMBER(&hook, &CHook::Func2_Post1), true);
    1.78  
    1.79  	const int &ret22 = pTest->Func2(500);
    1.80  	ADD_STATE(State_Func2_Ret(&ret22));