diff -r ea2afceb651e -r 158b860440c0 sourcehook/test/testbail.cpp --- a/sourcehook/test/testbail.cpp Mon Oct 03 18:37:35 2005 +0000 +++ b/sourcehook/test/testbail.cpp Wed Oct 05 21:51:02 2005 +0000 @@ -5,6 +5,28 @@ void *___testbail_gabgab; +namespace +{ + class zomg_lolz + { + public: + virtual void zomg() + { + } + }; + SH_DECL_HOOK0_void(zomg_lolz, zomg, SH_NOATTRIB, 0); + void Handler() + { + printf("H1\n"); + SH_REMOVE_HOOK_STATICFUNC(zomg_lolz, zomg, reinterpret_cast(META_IFACEPTR), + Handler, false); + } + void Handler2() + { + printf("H2\n"); + } +} + bool TestBail(std::string &error) { SourceHook::CSourceHookImpl g_SHImpl; @@ -32,6 +54,23 @@ // If it didn't crash, it's ok + // NEW TEST: Remove hook from handler + zomg_lolz inst; + SH_ADD_HOOK_STATICFUNC(zomg_lolz, zomg, &inst, Handler, false); + SH_ADD_HOOK_STATICFUNC(zomg_lolz, zomg, &inst, Handler2, false); + + zomg_lolz *mwah = &inst; + mwah->zomg(); + mwah->zomg(); + + SH_ADD_HOOK_STATICFUNC(zomg_lolz, zomg, &inst, Handler, false); + SH_REMOVE_HOOK_STATICFUNC(zomg_lolz, zomg, &inst, Handler2, false); + + mwah->zomg(); + mwah->zomg(); + + // Shouldn't crash again... + return true; }