1.1 --- a/sourcehook/test/testreentr.cpp Fri Sep 28 21:32:02 2007 +0000
1.2 +++ b/sourcehook/test/testreentr.cpp Fri Sep 28 21:40:58 2007 +0000
1.3 @@ -82,6 +82,7 @@
1.4 return 1;
1.5 }
1.6 };
1.7 +
1.8 struct C2
1.9 {
1.10 virtual void F()
1.11 @@ -167,6 +168,15 @@
1.12 }
1.13 };
1.14
1.15 + struct C1_Derived : public C1 {};
1.16 + struct C2_Derived : public C2 {};
1.17 + struct C3_Derived : public C3 {};
1.18 + struct C4_Derived : public C4 {};
1.19 + struct C5_Derived : public C5 {};
1.20 + struct C6_Derived : public C6 {};
1.21 + struct C7_Derived : public C7 {};
1.22 + struct C8_Derived : public C8 {};
1.23 +
1.24 SH_DECL_HOOK0_void(C1, F, SH_NOATTRIB, 0);
1.25 SH_DECL_HOOK0(C1, G, SH_NOATTRIB, 0, int);
1.26 SH_DECL_HOOK0_void(C2, F, SH_NOATTRIB, 0);
1.27 @@ -258,9 +268,9 @@
1.28 void Handler_C7_F()
1.29 {
1.30 if (g_TestID == 1 || g_TestID == 2)
1.31 - SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false);
1.32 + SH_REMOVE_HOOK(C4, G, g_pC4, SH_STATIC(Handler2_C4_G), false);
1.33 if (g_TestID == 2)
1.34 - SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false);
1.35 + SH_REMOVE_HOOK(C4, G, g_pC4, SH_STATIC(Handler_C4_G), false);
1.36
1.37 ADD_STATE(State_H_C7_F(META_IFACEPTR(C7)));
1.38 g_pC7->G();
1.39 @@ -282,14 +292,14 @@
1.40 return 8;
1.41 }
1.42
1.43 - C1 g_C1;
1.44 - C2 g_C2;
1.45 - C3 g_C3;
1.46 - C4 g_C4;
1.47 - C5 g_C5;
1.48 - C6 g_C6;
1.49 - C7 g_C7;
1.50 - C8 g_C8;
1.51 + C1_Derived g_C1;
1.52 + C2_Derived g_C2;
1.53 + C3_Derived g_C3;
1.54 + C4_Derived g_C4;
1.55 + C5_Derived g_C5;
1.56 + C6_Derived g_C6;
1.57 + C7_Derived g_C7;
1.58 + C8_Derived g_C8;
1.59 }
1.60
1.61 bool TestReentr(std::string &error)
1.62 @@ -306,22 +316,22 @@
1.63 g_pC7 = &g_C7;
1.64 g_pC8 = &g_C8;
1.65
1.66 - SH_ADD_HOOK_STATICFUNC(C1, F, g_pC1, Handler_C1_F, false);
1.67 - SH_ADD_HOOK_STATICFUNC(C1, G, g_pC1, Handler_C1_G, false);
1.68 - SH_ADD_HOOK_STATICFUNC(C2, F, g_pC2, Handler_C2_F, false);
1.69 - SH_ADD_HOOK_STATICFUNC(C2, G, g_pC2, Handler_C2_G, false);
1.70 - SH_ADD_HOOK_STATICFUNC(C3, F, g_pC3, Handler_C3_F, false);
1.71 - SH_ADD_HOOK_STATICFUNC(C3, G, g_pC3, Handler_C3_G, false);
1.72 - SH_ADD_HOOK_STATICFUNC(C4, F, g_pC4, Handler_C4_F, false);
1.73 - SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false);
1.74 - SH_ADD_HOOK_STATICFUNC(C5, F, g_pC5, Handler_C5_F, false);
1.75 - SH_ADD_HOOK_STATICFUNC(C5, G, g_pC5, Handler_C5_G, false);
1.76 - SH_ADD_HOOK_STATICFUNC(C6, F, g_pC6, Handler_C6_F, false);
1.77 - SH_ADD_HOOK_STATICFUNC(C6, G, g_pC6, Handler_C6_G, false);
1.78 - SH_ADD_HOOK_STATICFUNC(C7, F, g_pC7, Handler_C7_F, false);
1.79 - SH_ADD_HOOK_STATICFUNC(C7, G, g_pC7, Handler_C7_G, false);
1.80 - SH_ADD_HOOK_STATICFUNC(C8, F, g_pC8, Handler_C8_F, false);
1.81 - SH_ADD_HOOK_STATICFUNC(C8, G, g_pC8, Handler_C8_G, false);
1.82 + SH_ADD_HOOK(C1, F, g_pC1, SH_STATIC(Handler_C1_F), false);
1.83 + SH_ADD_HOOK(C1, G, g_pC1, SH_STATIC(Handler_C1_G), false);
1.84 + SH_ADD_HOOK(C2, F, g_pC2, SH_STATIC(Handler_C2_F), false);
1.85 + SH_ADD_HOOK(C2, G, g_pC2, SH_STATIC(Handler_C2_G), false);
1.86 + SH_ADD_HOOK(C3, F, g_pC3, SH_STATIC(Handler_C3_F), false);
1.87 + SH_ADD_HOOK(C3, G, g_pC3, SH_STATIC(Handler_C3_G), false);
1.88 + SH_ADD_HOOK(C4, F, g_pC4, SH_STATIC(Handler_C4_F), false);
1.89 + SH_ADD_HOOK(C4, G, g_pC4, SH_STATIC(Handler_C4_G), false);
1.90 + SH_ADD_HOOK(C5, F, g_pC5, SH_STATIC(Handler_C5_F), false);
1.91 + SH_ADD_HOOK(C5, G, g_pC5, SH_STATIC(Handler_C5_G), false);
1.92 + SH_ADD_HOOK(C6, F, g_pC6, SH_STATIC(Handler_C6_F), false);
1.93 + SH_ADD_HOOK(C6, G, g_pC6, SH_STATIC(Handler_C6_G), false);
1.94 + SH_ADD_HOOK(C7, F, g_pC7, SH_STATIC(Handler_C7_F), false);
1.95 + SH_ADD_HOOK(C7, G, g_pC7, SH_STATIC(Handler_C7_G), false);
1.96 + SH_ADD_HOOK(C8, F, g_pC8, SH_STATIC(Handler_C8_F), false);
1.97 + SH_ADD_HOOK(C8, G, g_pC8, SH_STATIC(Handler_C8_G), false);
1.98
1.99 g_pC1->F();
1.100
1.101 @@ -361,7 +371,7 @@
1.102 NULL), "1");
1.103
1.104
1.105 - SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false);
1.106 + SH_ADD_HOOK(C4, G, g_pC4, SH_STATIC(Handler2_C4_G), false);
1.107
1.108 g_pC1->F();
1.109
1.110 @@ -517,7 +527,7 @@
1.111
1.112
1.113
1.114 - SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false);
1.115 + SH_ADD_HOOK(C4, G, g_pC4, SH_STATIC(Handler2_C4_G), false);
1.116
1.117 g_TestID = 2;
1.118
1.119 @@ -578,22 +588,22 @@
1.120 new State_C1_F(g_pC1),
1.121 NULL), "7");
1.122
1.123 - SH_REMOVE_HOOK_STATICFUNC(C1, F, g_pC1, Handler_C1_F, false);
1.124 - SH_REMOVE_HOOK_STATICFUNC(C1, G, g_pC1, Handler_C1_G, false);
1.125 - SH_REMOVE_HOOK_STATICFUNC(C2, F, g_pC2, Handler_C2_F, false);
1.126 - SH_REMOVE_HOOK_STATICFUNC(C2, G, g_pC2, Handler_C2_G, false);
1.127 - SH_REMOVE_HOOK_STATICFUNC(C3, F, g_pC3, Handler_C3_F, false);
1.128 - SH_REMOVE_HOOK_STATICFUNC(C3, G, g_pC3, Handler_C3_G, false);
1.129 - SH_REMOVE_HOOK_STATICFUNC(C4, F, g_pC4, Handler_C4_F, false);
1.130 - SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false);
1.131 - SH_REMOVE_HOOK_STATICFUNC(C5, F, g_pC5, Handler_C5_F, false);
1.132 - SH_REMOVE_HOOK_STATICFUNC(C5, G, g_pC5, Handler_C5_G, false);
1.133 - SH_REMOVE_HOOK_STATICFUNC(C6, F, g_pC6, Handler_C6_F, false);
1.134 - SH_REMOVE_HOOK_STATICFUNC(C6, G, g_pC6, Handler_C6_G, false);
1.135 - SH_REMOVE_HOOK_STATICFUNC(C7, F, g_pC7, Handler_C7_F, false);
1.136 - SH_REMOVE_HOOK_STATICFUNC(C7, G, g_pC7, Handler_C7_G, false);
1.137 - SH_REMOVE_HOOK_STATICFUNC(C8, F, g_pC8, Handler_C8_F, false);
1.138 - SH_REMOVE_HOOK_STATICFUNC(C8, G, g_pC8, Handler_C8_G, false);
1.139 + SH_REMOVE_HOOK(C1, F, g_pC1, SH_STATIC(Handler_C1_F), false);
1.140 + SH_REMOVE_HOOK(C1, G, g_pC1, SH_STATIC(Handler_C1_G), false);
1.141 + SH_REMOVE_HOOK(C2, F, g_pC2, SH_STATIC(Handler_C2_F), false);
1.142 + SH_REMOVE_HOOK(C2, G, g_pC2, SH_STATIC(Handler_C2_G), false);
1.143 + SH_REMOVE_HOOK(C3, F, g_pC3, SH_STATIC(Handler_C3_F), false);
1.144 + SH_REMOVE_HOOK(C3, G, g_pC3, SH_STATIC(Handler_C3_G), false);
1.145 + SH_REMOVE_HOOK(C4, F, g_pC4, SH_STATIC(Handler_C4_F), false);
1.146 + SH_REMOVE_HOOK(C4, G, g_pC4, SH_STATIC(Handler_C4_G), false);
1.147 + SH_REMOVE_HOOK(C5, F, g_pC5, SH_STATIC(Handler_C5_F), false);
1.148 + SH_REMOVE_HOOK(C5, G, g_pC5, SH_STATIC(Handler_C5_G), false);
1.149 + SH_REMOVE_HOOK(C6, F, g_pC6, SH_STATIC(Handler_C6_F), false);
1.150 + SH_REMOVE_HOOK(C6, G, g_pC6, SH_STATIC(Handler_C6_G), false);
1.151 + SH_REMOVE_HOOK(C7, F, g_pC7, SH_STATIC(Handler_C7_F), false);
1.152 + SH_REMOVE_HOOK(C7, G, g_pC7, SH_STATIC(Handler_C7_G), false);
1.153 + SH_REMOVE_HOOK(C8, F, g_pC8, SH_STATIC(Handler_C8_F), false);
1.154 + SH_REMOVE_HOOK(C8, G, g_pC8, SH_STATIC(Handler_C8_G), false);
1.155
1.156 return true;
1.157 }