diff -r 723c1470431a -r f34718303c8f sourcehook/test/test2.cpp --- a/sourcehook/test/test2.cpp Fri Sep 28 21:32:02 2007 +0000 +++ b/sourcehook/test/test2.cpp Fri Sep 28 21:40:58 2007 +0000 @@ -50,6 +50,11 @@ } }; + // GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup! + class Whatever : public IGaben + { + }; + SH_DECL_HOOK0_void(IGaben, EatYams, SH_NOATTRIB, 0); SH_DECL_HOOK1(IGaben, EatYams, const, 1, bool, const char *); SH_DECL_HOOK2_void_vafmt(IGaben, Vafmt1, SH_NOATTRIB, 0, bool, int); @@ -92,14 +97,12 @@ GET_SHPTR(g_SHPtr); g_PLID = 1337; - IGaben gabgab; + Whatever gabgab; IGaben *pGab = &gabgab; - SourceHook::CallClass *cc = SH_GET_CALLCLASS(pGab); - // Part 1 - SH_CALL(cc, static_cast(&IGaben::EatYams))(); - SH_CALL(cc, static_cast(&IGaben::EatYams))("Here!"); + SH_CALL(pGab, static_cast(&IGaben::EatYams))(); + SH_CALL(pGab, static_cast(&IGaben::EatYams))("Here!"); SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams0_Handler, false); SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams1_Handler, false); @@ -121,9 +124,9 @@ // Part 2 pGab->Vafmt1(true, 55, "Hello %s%d%s", "BA", 1, "L"); - SH_CALL(cc, &IGaben::Vafmt1)(true, 55, "Hello %s%d%s", "BA", 1, "L"); + SH_CALL(pGab, &IGaben::Vafmt1)(true, 55, "Hello %s%d%s", "BA", 1, "L"); pGab->Vafmt2("Hello %s%d%s", "BA", 1, "LOPAN"); - SH_CALL(cc, &IGaben::Vafmt2)("Hello %s%d%s", "BA", 1, "LOPAN"); + SH_CALL(pGab, &IGaben::Vafmt2)("Hello %s%d%s", "BA", 1, "LOPAN"); CHECK_STATES((&g_States, new State_Vafmt_Called(1, "Hello BA1L"), @@ -165,7 +168,5 @@ new State_Vafmt_Called(2, "Hello BA1LOPAN"), NULL), "Part 4"); - SH_RELEASE_CALLCLASS(cc); - return true; }