1.1 --- a/sourcehook/test/test4.cpp Sun Oct 07 03:12:19 2007 +0000
1.2 +++ b/sourcehook/test/test4.cpp Sun Oct 07 22:10:07 2007 +0000
1.3 @@ -19,8 +19,6 @@
1.4 MAKE_STATE(State_Func2H_Called);
1.5 MAKE_STATE(State_Func3H_Called);
1.6
1.7 - MAKE_STATE_2(State_PluginInUse, int, bool);
1.8 -
1.9 class Test
1.10 {
1.11 public:
1.12 @@ -40,14 +38,9 @@
1.13 }
1.14 };
1.15
1.16 - // GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup!
1.17 - class Whatever : public Test
1.18 - {
1.19 - };
1.20 -
1.21 - SH_DECL_HOOK0_void(Test, Func1, SH_NOATTRIB, 0);
1.22 - SH_DECL_HOOK0_void(Test, Func2, SH_NOATTRIB, 0);
1.23 - SH_DECL_HOOK0_void(Test, Func3, SH_NOATTRIB, 0);
1.24 + SH_DECL_HOOK0_void(Test, Func1, SH_NOATTRIB, 1);
1.25 + SH_DECL_HOOK0_void(Test, Func2, SH_NOATTRIB, 1);
1.26 + SH_DECL_HOOK0_void(Test, Func3, SH_NOATTRIB, 1);
1.27
1.28 void Handler_Func1()
1.29 {
1.30 @@ -68,7 +61,7 @@
1.31 GET_SHPTR(g_SHPtr);
1.32 g_PLID = 1;
1.33
1.34 - Whatever inst;
1.35 + Test inst;
1.36 Test *pInst = &inst;
1.37
1.38 // 1)
1.39 @@ -143,18 +136,6 @@
1.40 new State_Func3_Called,
1.41 NULL), "Part 2.1");
1.42
1.43 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.44 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.45 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.46 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.47 -
1.48 - CHECK_STATES((&g_States,
1.49 - new State_PluginInUse(1, true),
1.50 - new State_PluginInUse(2, true),
1.51 - new State_PluginInUse(3, true),
1.52 - new State_PluginInUse(4, false),
1.53 - NULL), "Part 2.2");
1.54 -
1.55 // Unload plugins one by one
1.56 Test_UnloadPlugin(g_SHPtr, 3);
1.57
1.58 @@ -174,18 +155,6 @@
1.59 new State_Func3_Called,
1.60 NULL), "Part 2.3.1");
1.61
1.62 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.63 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.64 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.65 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.66 -
1.67 - CHECK_STATES((&g_States,
1.68 - new State_PluginInUse(1, true),
1.69 - new State_PluginInUse(2, true),
1.70 - new State_PluginInUse(3, false),
1.71 - new State_PluginInUse(4, false),
1.72 - NULL), "Part 2.3.2");
1.73 -
1.74 Test_UnloadPlugin(g_SHPtr, 2);
1.75
1.76 pInst->Func1();
1.77 @@ -201,18 +170,6 @@
1.78 new State_Func3_Called,
1.79 NULL), "Part 2.4.1");
1.80
1.81 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.82 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.83 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.84 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.85 -
1.86 - CHECK_STATES((&g_States,
1.87 - new State_PluginInUse(1, true),
1.88 - new State_PluginInUse(2, false),
1.89 - new State_PluginInUse(3, false),
1.90 - new State_PluginInUse(4, false),
1.91 - NULL), "Part 2.4.2");
1.92 -
1.93 Test_UnloadPlugin(g_SHPtr, 1);
1.94
1.95 pInst->Func1();
1.96 @@ -225,18 +182,6 @@
1.97 new State_Func3_Called,
1.98 NULL), "Part 2.5.1");
1.99
1.100 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.101 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.102 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.103 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.104 -
1.105 - CHECK_STATES((&g_States,
1.106 - new State_PluginInUse(1, false),
1.107 - new State_PluginInUse(2, false),
1.108 - new State_PluginInUse(3, false),
1.109 - new State_PluginInUse(4, false),
1.110 - NULL), "Part 2.5.2");
1.111 -
1.112
1.113 // 3)
1.114 // Add hooks from "different plugins", then pause the plugins
1.115 @@ -279,18 +224,6 @@
1.116 new State_Func3_Called,
1.117 NULL), "Part 3.1");
1.118
1.119 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.120 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.121 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.122 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.123 -
1.124 - CHECK_STATES((&g_States,
1.125 - new State_PluginInUse(1, true),
1.126 - new State_PluginInUse(2, true),
1.127 - new State_PluginInUse(3, true),
1.128 - new State_PluginInUse(4, false),
1.129 - NULL), "Part 3.2");
1.130 -
1.131 // Unload plugins one by one
1.132 Test_PausePlugin(g_SHPtr, 3);
1.133
1.134 @@ -310,18 +243,6 @@
1.135 new State_Func3_Called,
1.136 NULL), "Part 3.3.1");
1.137
1.138 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.139 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.140 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.141 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.142 -
1.143 - CHECK_STATES((&g_States,
1.144 - new State_PluginInUse(1, true),
1.145 - new State_PluginInUse(2, true),
1.146 - new State_PluginInUse(3, true),
1.147 - new State_PluginInUse(4, false),
1.148 - NULL), "Part 3.3.2");
1.149 -
1.150 Test_PausePlugin(g_SHPtr, 2);
1.151
1.152 pInst->Func1();
1.153 @@ -337,18 +258,6 @@
1.154 new State_Func3_Called,
1.155 NULL), "Part 3.4.1");
1.156
1.157 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.158 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.159 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.160 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.161 -
1.162 - CHECK_STATES((&g_States,
1.163 - new State_PluginInUse(1, true),
1.164 - new State_PluginInUse(2, true),
1.165 - new State_PluginInUse(3, true),
1.166 - new State_PluginInUse(4, false),
1.167 - NULL), "Part 3.4.2");
1.168 -
1.169 Test_PausePlugin(g_SHPtr, 1);
1.170
1.171 pInst->Func1();
1.172 @@ -361,34 +270,10 @@
1.173 new State_Func3_Called,
1.174 NULL), "Part 3.5.1");
1.175
1.176 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.177 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.178 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.179 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.180 -
1.181 - CHECK_STATES((&g_States,
1.182 - new State_PluginInUse(1, true),
1.183 - new State_PluginInUse(2, true),
1.184 - new State_PluginInUse(3, true),
1.185 - new State_PluginInUse(4, false),
1.186 - NULL), "Part 3.5.2");
1.187 -
1.188 Test_UnpausePlugin(g_SHPtr, 1);
1.189 Test_UnpausePlugin(g_SHPtr, 2);
1.190 Test_UnpausePlugin(g_SHPtr, 3);
1.191
1.192 - ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.193 - ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.194 - ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.195 - ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.196 -
1.197 - CHECK_STATES((&g_States,
1.198 - new State_PluginInUse(1, true),
1.199 - new State_PluginInUse(2, true),
1.200 - new State_PluginInUse(3, true),
1.201 - new State_PluginInUse(4, false),
1.202 - NULL), "Part 3.6");
1.203 -
1.204 pInst->Func1();
1.205 pInst->Func2();
1.206 pInst->Func3();