diff -r bee78b10b2c0 -r b35a5fdbc654 core-legacy/sourcehook/test/testreentr.cpp --- a/core-legacy/sourcehook/test/testreentr.cpp Fri Feb 27 00:19:50 2009 -0600 +++ b/core-legacy/sourcehook/test/testreentr.cpp Wed Oct 28 23:14:32 2009 -0700 @@ -82,6 +82,7 @@ return 1; } }; + struct C2 { virtual void F() @@ -167,6 +168,15 @@ } }; + struct C1_Derived : public C1 {}; + struct C2_Derived : public C2 {}; + struct C3_Derived : public C3 {}; + struct C4_Derived : public C4 {}; + struct C5_Derived : public C5 {}; + struct C6_Derived : public C6 {}; + struct C7_Derived : public C7 {}; + struct C8_Derived : public C8 {}; + SH_DECL_HOOK0_void(C1, F, SH_NOATTRIB, 0); SH_DECL_HOOK0(C1, G, SH_NOATTRIB, 0, int); SH_DECL_HOOK0_void(C2, F, SH_NOATTRIB, 0); @@ -258,9 +268,9 @@ void Handler_C7_F() { if (g_TestID == 1 || g_TestID == 2) - SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false); + SH_REMOVE_HOOK(C4, G, g_pC4, SH_STATIC(Handler2_C4_G), false); if (g_TestID == 2) - SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false); + SH_REMOVE_HOOK(C4, G, g_pC4, SH_STATIC(Handler_C4_G), false); ADD_STATE(State_H_C7_F(META_IFACEPTR(C7))); g_pC7->G(); @@ -282,14 +292,14 @@ return 8; } - C1 g_C1; - C2 g_C2; - C3 g_C3; - C4 g_C4; - C5 g_C5; - C6 g_C6; - C7 g_C7; - C8 g_C8; + C1_Derived g_C1; + C2_Derived g_C2; + C3_Derived g_C3; + C4_Derived g_C4; + C5_Derived g_C5; + C6_Derived g_C6; + C7_Derived g_C7; + C8_Derived g_C8; } bool TestReentr(std::string &error) @@ -306,22 +316,22 @@ g_pC7 = &g_C7; g_pC8 = &g_C8; - SH_ADD_HOOK_STATICFUNC(C1, F, g_pC1, Handler_C1_F, false); - SH_ADD_HOOK_STATICFUNC(C1, G, g_pC1, Handler_C1_G, false); - SH_ADD_HOOK_STATICFUNC(C2, F, g_pC2, Handler_C2_F, false); - SH_ADD_HOOK_STATICFUNC(C2, G, g_pC2, Handler_C2_G, false); - SH_ADD_HOOK_STATICFUNC(C3, F, g_pC3, Handler_C3_F, false); - SH_ADD_HOOK_STATICFUNC(C3, G, g_pC3, Handler_C3_G, false); - SH_ADD_HOOK_STATICFUNC(C4, F, g_pC4, Handler_C4_F, false); - SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false); - SH_ADD_HOOK_STATICFUNC(C5, F, g_pC5, Handler_C5_F, false); - SH_ADD_HOOK_STATICFUNC(C5, G, g_pC5, Handler_C5_G, false); - SH_ADD_HOOK_STATICFUNC(C6, F, g_pC6, Handler_C6_F, false); - SH_ADD_HOOK_STATICFUNC(C6, G, g_pC6, Handler_C6_G, false); - SH_ADD_HOOK_STATICFUNC(C7, F, g_pC7, Handler_C7_F, false); - SH_ADD_HOOK_STATICFUNC(C7, G, g_pC7, Handler_C7_G, false); - SH_ADD_HOOK_STATICFUNC(C8, F, g_pC8, Handler_C8_F, false); - SH_ADD_HOOK_STATICFUNC(C8, G, g_pC8, Handler_C8_G, false); + SH_ADD_HOOK(C1, F, g_pC1, SH_STATIC(Handler_C1_F), false); + SH_ADD_HOOK(C1, G, g_pC1, SH_STATIC(Handler_C1_G), false); + SH_ADD_HOOK(C2, F, g_pC2, SH_STATIC(Handler_C2_F), false); + SH_ADD_HOOK(C2, G, g_pC2, SH_STATIC(Handler_C2_G), false); + SH_ADD_HOOK(C3, F, g_pC3, SH_STATIC(Handler_C3_F), false); + SH_ADD_HOOK(C3, G, g_pC3, SH_STATIC(Handler_C3_G), false); + SH_ADD_HOOK(C4, F, g_pC4, SH_STATIC(Handler_C4_F), false); + SH_ADD_HOOK(C4, G, g_pC4, SH_STATIC(Handler_C4_G), false); + SH_ADD_HOOK(C5, F, g_pC5, SH_STATIC(Handler_C5_F), false); + SH_ADD_HOOK(C5, G, g_pC5, SH_STATIC(Handler_C5_G), false); + SH_ADD_HOOK(C6, F, g_pC6, SH_STATIC(Handler_C6_F), false); + SH_ADD_HOOK(C6, G, g_pC6, SH_STATIC(Handler_C6_G), false); + SH_ADD_HOOK(C7, F, g_pC7, SH_STATIC(Handler_C7_F), false); + SH_ADD_HOOK(C7, G, g_pC7, SH_STATIC(Handler_C7_G), false); + SH_ADD_HOOK(C8, F, g_pC8, SH_STATIC(Handler_C8_F), false); + SH_ADD_HOOK(C8, G, g_pC8, SH_STATIC(Handler_C8_G), false); g_pC1->F(); @@ -361,7 +371,7 @@ NULL), "1"); - SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false); + SH_ADD_HOOK(C4, G, g_pC4, SH_STATIC(Handler2_C4_G), false); g_pC1->F(); @@ -517,7 +527,7 @@ - SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false); + SH_ADD_HOOK(C4, G, g_pC4, SH_STATIC(Handler2_C4_G), false); g_TestID = 2; @@ -578,22 +588,22 @@ new State_C1_F(g_pC1), NULL), "7"); - SH_REMOVE_HOOK_STATICFUNC(C1, F, g_pC1, Handler_C1_F, false); - SH_REMOVE_HOOK_STATICFUNC(C1, G, g_pC1, Handler_C1_G, false); - SH_REMOVE_HOOK_STATICFUNC(C2, F, g_pC2, Handler_C2_F, false); - SH_REMOVE_HOOK_STATICFUNC(C2, G, g_pC2, Handler_C2_G, false); - SH_REMOVE_HOOK_STATICFUNC(C3, F, g_pC3, Handler_C3_F, false); - SH_REMOVE_HOOK_STATICFUNC(C3, G, g_pC3, Handler_C3_G, false); - SH_REMOVE_HOOK_STATICFUNC(C4, F, g_pC4, Handler_C4_F, false); - SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false); - SH_REMOVE_HOOK_STATICFUNC(C5, F, g_pC5, Handler_C5_F, false); - SH_REMOVE_HOOK_STATICFUNC(C5, G, g_pC5, Handler_C5_G, false); - SH_REMOVE_HOOK_STATICFUNC(C6, F, g_pC6, Handler_C6_F, false); - SH_REMOVE_HOOK_STATICFUNC(C6, G, g_pC6, Handler_C6_G, false); - SH_REMOVE_HOOK_STATICFUNC(C7, F, g_pC7, Handler_C7_F, false); - SH_REMOVE_HOOK_STATICFUNC(C7, G, g_pC7, Handler_C7_G, false); - SH_REMOVE_HOOK_STATICFUNC(C8, F, g_pC8, Handler_C8_F, false); - SH_REMOVE_HOOK_STATICFUNC(C8, G, g_pC8, Handler_C8_G, false); + SH_REMOVE_HOOK(C1, F, g_pC1, SH_STATIC(Handler_C1_F), false); + SH_REMOVE_HOOK(C1, G, g_pC1, SH_STATIC(Handler_C1_G), false); + SH_REMOVE_HOOK(C2, F, g_pC2, SH_STATIC(Handler_C2_F), false); + SH_REMOVE_HOOK(C2, G, g_pC2, SH_STATIC(Handler_C2_G), false); + SH_REMOVE_HOOK(C3, F, g_pC3, SH_STATIC(Handler_C3_F), false); + SH_REMOVE_HOOK(C3, G, g_pC3, SH_STATIC(Handler_C3_G), false); + SH_REMOVE_HOOK(C4, F, g_pC4, SH_STATIC(Handler_C4_F), false); + SH_REMOVE_HOOK(C4, G, g_pC4, SH_STATIC(Handler_C4_G), false); + SH_REMOVE_HOOK(C5, F, g_pC5, SH_STATIC(Handler_C5_F), false); + SH_REMOVE_HOOK(C5, G, g_pC5, SH_STATIC(Handler_C5_G), false); + SH_REMOVE_HOOK(C6, F, g_pC6, SH_STATIC(Handler_C6_F), false); + SH_REMOVE_HOOK(C6, G, g_pC6, SH_STATIC(Handler_C6_G), false); + SH_REMOVE_HOOK(C7, F, g_pC7, SH_STATIC(Handler_C7_F), false); + SH_REMOVE_HOOK(C7, G, g_pC7, SH_STATIC(Handler_C7_G), false); + SH_REMOVE_HOOK(C8, F, g_pC8, SH_STATIC(Handler_C8_F), false); + SH_REMOVE_HOOK(C8, G, g_pC8, SH_STATIC(Handler_C8_G), false); return true; }