1.1 --- a/sourcehook/test/test2.cpp Sun Oct 07 03:12:19 2007 +0000
1.2 +++ b/sourcehook/test/test2.cpp Sun Oct 07 22:10:07 2007 +0000
1.3 @@ -50,11 +50,6 @@
1.4 }
1.5 };
1.6
1.7 - // GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup!
1.8 - class Whatever : public IGaben
1.9 - {
1.10 - };
1.11 -
1.12 SH_DECL_HOOK0_void(IGaben, EatYams, SH_NOATTRIB, 0);
1.13 SH_DECL_HOOK1(IGaben, EatYams, const, 1, bool, const char *);
1.14 SH_DECL_HOOK2_void_vafmt(IGaben, Vafmt1, SH_NOATTRIB, 0, bool, int);
1.15 @@ -94,24 +89,25 @@
1.16
1.17 bool TestVafmtAndOverload(std::string &error)
1.18 {
1.19 + int h1, h2, h3, h4;
1.20 GET_SHPTR(g_SHPtr);
1.21 g_PLID = 1337;
1.22
1.23 - Whatever gabgab;
1.24 + IGaben gabgab;
1.25 IGaben *pGab = &gabgab;
1.26
1.27 // Part 1
1.28 SH_CALL(pGab, static_cast<void (IGaben::*)()>(&IGaben::EatYams))();
1.29 SH_CALL(pGab, static_cast<bool (IGaben::*)(const char *) const>(&IGaben::EatYams))("Here!");
1.30
1.31 - SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams0_Handler, false);
1.32 - SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams1_Handler, false);
1.33 + h1 = SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams0_Handler, false);
1.34 + h2 = SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams1_Handler, false);
1.35
1.36 pGab->EatYams();
1.37 pGab->EatYams("Here!");
1.38
1.39 - SH_REMOVE_HOOK(IGaben, EatYams, pGab, EatYams0_Handler, false);
1.40 - SH_REMOVE_HOOK(IGaben, EatYams, pGab, EatYams1_Handler, false);
1.41 + SH_REMOVE_HOOK_ID(h1);
1.42 + SH_REMOVE_HOOK_ID(h2);
1.43
1.44 CHECK_STATES((&g_States,
1.45 new State_EatYams_Called(0),
1.46 @@ -136,10 +132,10 @@
1.47 NULL), "Part 2");
1.48
1.49 // Part 3
1.50 - SH_ADD_HOOK(IGaben, Vafmt1, pGab, Vafmt1_PreHandler, false);
1.51 - SH_ADD_HOOK(IGaben, Vafmt1, pGab, Vafmt1_PostHandler, true);
1.52 - SH_ADD_HOOK(IGaben, Vafmt2, pGab, Vafmt2_PreHandler, false);
1.53 - SH_ADD_HOOK(IGaben, Vafmt2, pGab, Vafmt2_PostHandler, true);
1.54 + h1 = SH_ADD_HOOK(IGaben, Vafmt1, pGab, Vafmt1_PreHandler, false);
1.55 + h2 = SH_ADD_HOOK(IGaben, Vafmt1, pGab, Vafmt1_PostHandler, true);
1.56 + h3 = SH_ADD_HOOK(IGaben, Vafmt2, pGab, Vafmt2_PreHandler, false);
1.57 + h4 = SH_ADD_HOOK(IGaben, Vafmt2, pGab, Vafmt2_PostHandler, true);
1.58
1.59 pGab->Vafmt1(true, 55, "Hello %s%d%s", "BA", 1, "L");
1.60 pGab->Vafmt2("Hello %s%d%s", "BA", 1, "LOPAN");
1.61 @@ -155,10 +151,10 @@
1.62 NULL), "Part 3");
1.63
1.64 // Part 4
1.65 - SH_REMOVE_HOOK(IGaben, Vafmt1, pGab, Vafmt1_PreHandler, false);
1.66 - SH_REMOVE_HOOK(IGaben, Vafmt1, pGab, Vafmt1_PostHandler, true);
1.67 - SH_REMOVE_HOOK(IGaben, Vafmt2, pGab, Vafmt2_PreHandler, false);
1.68 - SH_REMOVE_HOOK(IGaben, Vafmt2, pGab, Vafmt2_PostHandler, true);
1.69 + SH_REMOVE_HOOK_ID(h1);
1.70 + SH_REMOVE_HOOK_ID(h2);
1.71 + SH_REMOVE_HOOK_ID(h3);
1.72 + SH_REMOVE_HOOK_ID(h4);
1.73
1.74 pGab->Vafmt1(true, 55, "Hello %s%d%s", "BA", 1, "L");
1.75 pGab->Vafmt2("Hello %s%d%s", "BA", 1, "LOPAN");