1.1 --- a/sourcehook/test/testreentr.cpp Fri Oct 14 17:45:36 2005 +0000
1.2 +++ b/sourcehook/test/testreentr.cpp Fri Oct 14 20:57:43 2005 +0000
1.3 @@ -66,6 +66,10 @@
1.4 MAKE_STATE_1(State_H_C7_G, C7*);
1.5 MAKE_STATE_1(State_H_C8_G, C8*);
1.6
1.7 + MAKE_STATE_1(State_H2_C4_G, C4*);
1.8 +
1.9 + int g_TestID;
1.10 +
1.11 struct C1
1.12 {
1.13 virtual void F()
1.14 @@ -163,6 +167,23 @@
1.15 }
1.16 };
1.17
1.18 + SH_DECL_HOOK0_void(C1, F, SH_NOATTRIB, 0);
1.19 + SH_DECL_HOOK0(C1, G, SH_NOATTRIB, 0, int);
1.20 + SH_DECL_HOOK0_void(C2, F, SH_NOATTRIB, 0);
1.21 + SH_DECL_HOOK0(C2, G, SH_NOATTRIB, 0, int);
1.22 + SH_DECL_HOOK0_void(C3, F, SH_NOATTRIB, 0);
1.23 + SH_DECL_HOOK0(C3, G, SH_NOATTRIB, 0, int);
1.24 + SH_DECL_HOOK0_void(C4, F, SH_NOATTRIB, 0);
1.25 + SH_DECL_HOOK0(C4, G, SH_NOATTRIB, 0, int);
1.26 + SH_DECL_HOOK0_void(C5, F, SH_NOATTRIB, 0);
1.27 + SH_DECL_HOOK0(C5, G, SH_NOATTRIB, 0, int);
1.28 + SH_DECL_HOOK0_void(C6, F, SH_NOATTRIB, 0);
1.29 + SH_DECL_HOOK0(C6, G, SH_NOATTRIB, 0, int);
1.30 + SH_DECL_HOOK0_void(C7, F, SH_NOATTRIB, 0);
1.31 + SH_DECL_HOOK0(C7, G, SH_NOATTRIB, 0, int);
1.32 + SH_DECL_HOOK0_void(C8, F, SH_NOATTRIB, 0);
1.33 + SH_DECL_HOOK0(C8, G, SH_NOATTRIB, 0, int);
1.34 +
1.35 void Handler_C1_F()
1.36 {
1.37 ADD_STATE(State_H_C1_F(META_IFACEPTR(C1)));
1.38 @@ -207,6 +228,11 @@
1.39 g_pC5->F();
1.40 return 4;
1.41 }
1.42 + int Handler2_C4_G()
1.43 + {
1.44 + ADD_STATE(State_H2_C4_G(META_IFACEPTR(C4)));
1.45 + return 4;
1.46 + }
1.47 void Handler_C5_F()
1.48 {
1.49 ADD_STATE(State_H_C5_F(META_IFACEPTR(C5)));
1.50 @@ -231,6 +257,11 @@
1.51 }
1.52 void Handler_C7_F()
1.53 {
1.54 + if (g_TestID == 1 || g_TestID == 2)
1.55 + SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false);
1.56 + if (g_TestID == 2)
1.57 + SH_REMOVE_HOOK_STATICFUNC(C4, G, g_pC4, Handler_C4_G, false);
1.58 +
1.59 ADD_STATE(State_H_C7_F(META_IFACEPTR(C7)));
1.60 g_pC7->G();
1.61 }
1.62 @@ -259,23 +290,6 @@
1.63 C6 g_C6;
1.64 C7 g_C7;
1.65 C8 g_C8;
1.66 -
1.67 - SH_DECL_HOOK0_void(C1, F, SH_NOATTRIB, 0);
1.68 - SH_DECL_HOOK0(C1, G, SH_NOATTRIB, 0, int);
1.69 - SH_DECL_HOOK0_void(C2, F, SH_NOATTRIB, 0);
1.70 - SH_DECL_HOOK0(C2, G, SH_NOATTRIB, 0, int);
1.71 - SH_DECL_HOOK0_void(C3, F, SH_NOATTRIB, 0);
1.72 - SH_DECL_HOOK0(C3, G, SH_NOATTRIB, 0, int);
1.73 - SH_DECL_HOOK0_void(C4, F, SH_NOATTRIB, 0);
1.74 - SH_DECL_HOOK0(C4, G, SH_NOATTRIB, 0, int);
1.75 - SH_DECL_HOOK0_void(C5, F, SH_NOATTRIB, 0);
1.76 - SH_DECL_HOOK0(C5, G, SH_NOATTRIB, 0, int);
1.77 - SH_DECL_HOOK0_void(C6, F, SH_NOATTRIB, 0);
1.78 - SH_DECL_HOOK0(C6, G, SH_NOATTRIB, 0, int);
1.79 - SH_DECL_HOOK0_void(C7, F, SH_NOATTRIB, 0);
1.80 - SH_DECL_HOOK0(C7, G, SH_NOATTRIB, 0, int);
1.81 - SH_DECL_HOOK0_void(C8, F, SH_NOATTRIB, 0);
1.82 - SH_DECL_HOOK0(C8, G, SH_NOATTRIB, 0, int);
1.83 }
1.84
1.85 bool TestReentr(std::string &error)
1.86 @@ -347,5 +361,223 @@
1.87 new State_C1_F(g_pC1),
1.88 NULL), "1");
1.89
1.90 +
1.91 + SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false);
1.92 +
1.93 + g_pC1->F();
1.94 +
1.95 + CHECK_STATES((&g_States,
1.96 + new State_H_C1_F(g_pC1),
1.97 + new State_H_C1_G(g_pC1),
1.98 + new State_H_C2_F(g_pC2),
1.99 + new State_H_C2_G(g_pC2),
1.100 + new State_H_C3_F(g_pC3),
1.101 + new State_H_C3_G(g_pC3),
1.102 + new State_H_C4_F(g_pC4),
1.103 + new State_H_C4_G(g_pC4),
1.104 + new State_H_C5_F(g_pC5),
1.105 + new State_H_C5_G(g_pC5),
1.106 + new State_H_C6_F(g_pC6),
1.107 + new State_H_C6_G(g_pC6),
1.108 + new State_H_C7_F(g_pC7),
1.109 + new State_H_C7_G(g_pC7),
1.110 + new State_H_C8_F(g_pC8),
1.111 + new State_H_C8_G(g_pC8),
1.112 + new State_C8_G(g_pC8),
1.113 + new State_C8_F(g_pC8),
1.114 + new State_C7_G(g_pC7),
1.115 + new State_C7_F(g_pC7),
1.116 + new State_C6_G(g_pC6),
1.117 + new State_C6_F(g_pC6),
1.118 + new State_C5_G(g_pC5),
1.119 + new State_C5_F(g_pC5),
1.120 + new State_H2_C4_G(g_pC4),
1.121 + new State_C4_G(g_pC4),
1.122 + new State_C4_F(g_pC4),
1.123 + new State_C3_G(g_pC3),
1.124 + new State_C3_F(g_pC3),
1.125 + new State_C2_G(g_pC2),
1.126 + new State_C2_F(g_pC2),
1.127 + new State_C1_G(g_pC1),
1.128 + new State_C1_F(g_pC1),
1.129 + NULL), "2");
1.130 +
1.131 + g_pC1->F();
1.132 +
1.133 + CHECK_STATES((&g_States,
1.134 + new State_H_C1_F(g_pC1),
1.135 + new State_H_C1_G(g_pC1),
1.136 + new State_H_C2_F(g_pC2),
1.137 + new State_H_C2_G(g_pC2),
1.138 + new State_H_C3_F(g_pC3),
1.139 + new State_H_C3_G(g_pC3),
1.140 + new State_H_C4_F(g_pC4),
1.141 + new State_H_C4_G(g_pC4),
1.142 + new State_H_C5_F(g_pC5),
1.143 + new State_H_C5_G(g_pC5),
1.144 + new State_H_C6_F(g_pC6),
1.145 + new State_H_C6_G(g_pC6),
1.146 + new State_H_C7_F(g_pC7),
1.147 + new State_H_C7_G(g_pC7),
1.148 + new State_H_C8_F(g_pC8),
1.149 + new State_H_C8_G(g_pC8),
1.150 + new State_C8_G(g_pC8),
1.151 + new State_C8_F(g_pC8),
1.152 + new State_C7_G(g_pC7),
1.153 + new State_C7_F(g_pC7),
1.154 + new State_C6_G(g_pC6),
1.155 + new State_C6_F(g_pC6),
1.156 + new State_C5_G(g_pC5),
1.157 + new State_C5_F(g_pC5),
1.158 + new State_H2_C4_G(g_pC4),
1.159 + new State_C4_G(g_pC4),
1.160 + new State_C4_F(g_pC4),
1.161 + new State_C3_G(g_pC3),
1.162 + new State_C3_F(g_pC3),
1.163 + new State_C2_G(g_pC2),
1.164 + new State_C2_F(g_pC2),
1.165 + new State_C1_G(g_pC1),
1.166 + new State_C1_F(g_pC1),
1.167 + NULL), "3");
1.168 +
1.169 + g_TestID = 1;
1.170 +
1.171 + g_pC1->F();
1.172 +
1.173 + CHECK_STATES((&g_States,
1.174 + new State_H_C1_F(g_pC1),
1.175 + new State_H_C1_G(g_pC1),
1.176 + new State_H_C2_F(g_pC2),
1.177 + new State_H_C2_G(g_pC2),
1.178 + new State_H_C3_F(g_pC3),
1.179 + new State_H_C3_G(g_pC3),
1.180 + new State_H_C4_F(g_pC4),
1.181 + new State_H_C4_G(g_pC4),
1.182 + new State_H_C5_F(g_pC5),
1.183 + new State_H_C5_G(g_pC5),
1.184 + new State_H_C6_F(g_pC6),
1.185 + new State_H_C6_G(g_pC6),
1.186 + new State_H_C7_F(g_pC7),
1.187 + new State_H_C7_G(g_pC7),
1.188 + new State_H_C8_F(g_pC8),
1.189 + new State_H_C8_G(g_pC8),
1.190 + new State_C8_G(g_pC8),
1.191 + new State_C8_F(g_pC8),
1.192 + new State_C7_G(g_pC7),
1.193 + new State_C7_F(g_pC7),
1.194 + new State_C6_G(g_pC6),
1.195 + new State_C6_F(g_pC6),
1.196 + new State_C5_G(g_pC5),
1.197 + new State_C5_F(g_pC5),
1.198 + new State_C4_G(g_pC4),
1.199 + new State_C4_F(g_pC4),
1.200 + new State_C3_G(g_pC3),
1.201 + new State_C3_F(g_pC3),
1.202 + new State_C2_G(g_pC2),
1.203 + new State_C2_F(g_pC2),
1.204 + new State_C1_G(g_pC1),
1.205 + new State_C1_F(g_pC1),
1.206 + NULL), "4");
1.207 +
1.208 + g_pC1->F();
1.209 +
1.210 + CHECK_STATES((&g_States,
1.211 + new State_H_C1_F(g_pC1),
1.212 + new State_H_C1_G(g_pC1),
1.213 + new State_H_C2_F(g_pC2),
1.214 + new State_H_C2_G(g_pC2),
1.215 + new State_H_C3_F(g_pC3),
1.216 + new State_H_C3_G(g_pC3),
1.217 + new State_H_C4_F(g_pC4),
1.218 + new State_H_C4_G(g_pC4),
1.219 + new State_H_C5_F(g_pC5),
1.220 + new State_H_C5_G(g_pC5),
1.221 + new State_H_C6_F(g_pC6),
1.222 + new State_H_C6_G(g_pC6),
1.223 + new State_H_C7_F(g_pC7),
1.224 + new State_H_C7_G(g_pC7),
1.225 + new State_H_C8_F(g_pC8),
1.226 + new State_H_C8_G(g_pC8),
1.227 + new State_C8_G(g_pC8),
1.228 + new State_C8_F(g_pC8),
1.229 + new State_C7_G(g_pC7),
1.230 + new State_C7_F(g_pC7),
1.231 + new State_C6_G(g_pC6),
1.232 + new State_C6_F(g_pC6),
1.233 + new State_C5_G(g_pC5),
1.234 + new State_C5_F(g_pC5),
1.235 + new State_C4_G(g_pC4),
1.236 + new State_C4_F(g_pC4),
1.237 + new State_C3_G(g_pC3),
1.238 + new State_C3_F(g_pC3),
1.239 + new State_C2_G(g_pC2),
1.240 + new State_C2_F(g_pC2),
1.241 + new State_C1_G(g_pC1),
1.242 + new State_C1_F(g_pC1),
1.243 + NULL), "5");
1.244 +
1.245 +
1.246 +
1.247 + SH_ADD_HOOK_STATICFUNC(C4, G, g_pC4, Handler2_C4_G, false);
1.248 +
1.249 + g_TestID = 2;
1.250 +
1.251 + g_pC1->F();
1.252 +
1.253 + CHECK_STATES((&g_States,
1.254 + new State_H_C1_F(g_pC1),
1.255 + new State_H_C1_G(g_pC1),
1.256 + new State_H_C2_F(g_pC2),
1.257 + new State_H_C2_G(g_pC2),
1.258 + new State_H_C3_F(g_pC3),
1.259 + new State_H_C3_G(g_pC3),
1.260 + new State_H_C4_F(g_pC4),
1.261 + new State_H_C4_G(g_pC4),
1.262 + new State_H_C5_F(g_pC5),
1.263 + new State_H_C5_G(g_pC5),
1.264 + new State_H_C6_F(g_pC6),
1.265 + new State_H_C6_G(g_pC6),
1.266 + new State_H_C7_F(g_pC7),
1.267 + new State_H_C7_G(g_pC7),
1.268 + new State_H_C8_F(g_pC8),
1.269 + new State_H_C8_G(g_pC8),
1.270 + new State_C8_G(g_pC8),
1.271 + new State_C8_F(g_pC8),
1.272 + new State_C7_G(g_pC7),
1.273 + new State_C7_F(g_pC7),
1.274 + new State_C6_G(g_pC6),
1.275 + new State_C6_F(g_pC6),
1.276 + new State_C5_G(g_pC5),
1.277 + new State_C5_F(g_pC5),
1.278 + new State_C4_G(g_pC4),
1.279 + new State_C4_F(g_pC4),
1.280 + new State_C3_G(g_pC3),
1.281 + new State_C3_F(g_pC3),
1.282 + new State_C2_G(g_pC2),
1.283 + new State_C2_F(g_pC2),
1.284 + new State_C1_G(g_pC1),
1.285 + new State_C1_F(g_pC1),
1.286 + NULL), "6");
1.287 +
1.288 + g_pC1->F();
1.289 +
1.290 + CHECK_STATES((&g_States,
1.291 + new State_H_C1_F(g_pC1),
1.292 + new State_H_C1_G(g_pC1),
1.293 + new State_H_C2_F(g_pC2),
1.294 + new State_H_C2_G(g_pC2),
1.295 + new State_H_C3_F(g_pC3),
1.296 + new State_H_C3_G(g_pC3),
1.297 + new State_H_C4_F(g_pC4),
1.298 + new State_C4_G(g_pC4),
1.299 + new State_C4_F(g_pC4),
1.300 + new State_C3_G(g_pC3),
1.301 + new State_C3_F(g_pC3),
1.302 + new State_C2_G(g_pC2),
1.303 + new State_C2_F(g_pC2),
1.304 + new State_C1_G(g_pC1),
1.305 + new State_C1_F(g_pC1),
1.306 + NULL), "7");
1.307 +
1.308 return true;
1.309 }
1.310 \ No newline at end of file