diff -r 723c1470431a -r f34718303c8f sourcehook/test/testref.cpp --- a/sourcehook/test/testref.cpp Fri Sep 28 21:32:02 2007 +0000 +++ b/sourcehook/test/testref.cpp Fri Sep 28 21:40:58 2007 +0000 @@ -76,6 +76,7 @@ return sth.Func(); } }; + class CHelloDerived : public CHello { }; class CHook { @@ -99,12 +100,10 @@ CDerived der; CDerived2 der2(11); CDerived2 der3(12); - CHello hello; + CHelloDerived hello; CHello *pHello = &hello; CHook hook; - SourceHook::CallClass *cc = SH_GET_CALLCLASS(&hello); - ADD_STATE(State_Result(pHello->Func(base))); ADD_STATE(State_Result(pHello->Func(der))); ADD_STATE(State_Result(pHello->Func(der2))); @@ -117,10 +116,10 @@ new State_Result(12), NULL), "Part 1"); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base))); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der))); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2))); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(base))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der2))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der3))); CHECK_STATES((&g_States, new State_Result(0), @@ -129,7 +128,7 @@ new State_Result(12), NULL), "Part 2"); - SH_ADD_HOOK_MEMFUNC(CHello, Func, &hello, &hook, &CHook::Func, false); + SH_ADD_HOOK(CHello, Func, &hello, SH_MEMBER(&hook, &CHook::Func), false); ADD_STATE(State_Result(pHello->Func(base))); ADD_STATE(State_Result(pHello->Func(der))); @@ -147,10 +146,10 @@ new State_Result(20), NULL), "Part 3"); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base))); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der))); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2))); - ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(base))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der2))); + ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der3))); CHECK_STATES((&g_States, new State_Result(0),