diff -r 7dcb118abe09 -r 257f0837a885 sourcehook/test/testrefret.cpp --- a/sourcehook/test/testrefret.cpp Mon May 07 18:33:34 2007 +0000 +++ b/sourcehook/test/testrefret.cpp Mon May 07 18:35:59 2007 +0000 @@ -48,6 +48,10 @@ return m_Var2; } }; + + class Whatever : public Test + { + }; class CHook { @@ -98,7 +102,7 @@ GET_SHPTR(g_SHPtr); g_PLID = 1; - Test test; + Whatever test; Test *pTest = &test; CHook hook; @@ -111,7 +115,7 @@ NULL), "Part 1"); // Now add Func1_Pre1, which supercedes and returns hook.m_Var - SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Pre1, false); + SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Pre1), false); int &ret2 = pTest->Func1(); ADD_STATE(State_Func1_Ret(&ret2)); @@ -123,7 +127,7 @@ NULL), "Part 2"); // Now add Func1_Post1, which only reports orig ret and override ret - SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Post1, true); + SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Post1), true); int &ret3 = pTest->Func1(); ADD_STATE(State_Func1_Ret(&ret3)); @@ -139,8 +143,8 @@ // Now add Func1_Pre2, which supercedes and returns g_Var (it also sets the override ret from pre1 to 1337) // and add Func1_Post2, which overrides and returns hook.m_Var again. - SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Pre2, false); - SH_ADD_HOOK_MEMFUNC(Test, Func1, &test, &hook, &CHook::Func1_Post2, true); + SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Pre2), false); + SH_ADD_HOOK(Test, Func1, &test, SH_MEMBER(&hook, &CHook::Func1_Post2), true); int &ret4 = pTest->Func1(); ADD_STATE(State_Func1_Ret(&ret4)); @@ -160,7 +164,7 @@ CHECK_COND(hook.m_Var == 1337, "Part 4.1"); // Through a callclass - SourceHook::CallClass *cc1 = SH_GET_CALLCLASS(&test); + SourceHook::CallClass *cc1 = SH_GET_CALLCLASS(pTest); int &ret5 = SH_CALL(cc1, &Test::Func1)(); ADD_STATE(State_Func1_Ret(&ret5)); @@ -181,8 +185,8 @@ new State_Func2_Ret(&test.m_Var2), NULL), "Part 6"); - SH_ADD_HOOK_MEMFUNC(Test, Func2, &test, &hook, &CHook::Func2_Pre1, false); - SH_ADD_HOOK_MEMFUNC(Test, Func2, &test, &hook, &CHook::Func2_Post1, true); + SH_ADD_HOOK(Test, Func2, &test, SH_MEMBER(&hook, &CHook::Func2_Pre1), false); + SH_ADD_HOOK(Test, Func2, &test, SH_MEMBER(&hook, &CHook::Func2_Post1), true); const int &ret22 = pTest->Func2(500); ADD_STATE(State_Func2_Ret(&ret22));