1.1 --- a/sourcehook/test/test1.cpp Fri May 11 19:21:14 2007 +0000
1.2 +++ b/sourcehook/test/test1.cpp Sat May 12 08:08:01 2007 +0000
1.3 @@ -424,40 +424,33 @@
1.4 Whatever test;
1.5 Test *pTest = &test;
1.6
1.7 - // 1) Get a call class and call the member through it and normally
1.8 - SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(pTest);
1.9 + // 1) SH_CALL it and call it normally
1.10
1.11 - ADD_STATE(State_F1_CallClassGenerated);
1.12 + return true;
1.13 + SH_CALL(pTest, &Test::F1)();
1.14 +
1.15
1.16 - SH_CALL(cc, &Test::F1)();
1.17 pTest->F1();
1.18
1.19 CHECK_STATES((&g_States,
1.20 - new State_F1_CallClassGenerated,
1.21 new State_F1_Called,
1.22 new State_F1_Called,
1.23 NULL), "Part 1");
1.24
1.25 // 2) Request a call class again
1.26 - SourceHook::CallClass<Test> *cc2 = SH_GET_CALLCLASS(pTest);
1.27 - ADD_STATE(State_F1_CallClassGenerated);
1.28
1.29 - SH_CALL(cc, &Test::F1)();
1.30 - SH_CALL(cc2, &Test::F1)();
1.31 + SH_CALL(pTest, &Test::F1)();
1.32 + SH_CALL(pTest, &Test::F1)();
1.33 pTest->F1();
1.34
1.35 - SH_RELEASE_CALLCLASS(cc2);
1.36 - ADD_STATE(State_F1_CallClassReleased);
1.37 -
1.38 - SH_CALL(cc, &Test::F1)();
1.39 + SH_CALL(pTest, &Test::F1)();
1.40 pTest->F1();
1.41
1.42 CHECK_STATES((&g_States,
1.43 - new State_F1_CallClassGenerated,
1.44 new State_F1_Called,
1.45 new State_F1_Called,
1.46 new State_F1_Called,
1.47 - new State_F1_CallClassReleased,
1.48 +
1.49 new State_F1_Called,
1.50 new State_F1_Called,
1.51 NULL), "Part 2");
1.52 @@ -467,7 +460,7 @@
1.53 g_F1Pre_WhatToDo = MRES_SUPERCEDE;
1.54 ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false) ? true : false));
1.55
1.56 - SH_CALL(cc, &Test::F1)();
1.57 + SH_CALL(pTest, &Test::F1)();
1.58 pTest->F1();
1.59
1.60 CHECK_STATES((&g_States,
1.61 @@ -476,30 +469,26 @@
1.62 new State_F1_PreHandler_Called(&f1_handlers),
1.63 NULL), "Part 3");
1.64
1.65 - // 4) Rerequest the callclass
1.66 - SH_RELEASE_CALLCLASS(cc);
1.67 + // 4) Test source-level compat with callclasses
1.68 + SourceHook::CallClass<Test> *pCC = SH_GET_CALLCLASS(pTest);
1.69
1.70 - ADD_STATE(State_F1_CallClassReleased);
1.71 - cc2 = SH_GET_CALLCLASS(pTest);
1.72 - ADD_STATE(State_F1_CallClassGenerated);
1.73 -
1.74 - SH_CALL(cc, &Test::F1)();
1.75 + SH_CALL(pCC, &Test::F1)();
1.76 pTest->F1();
1.77
1.78 + SH_RELEASE_CALLCLASS(pCC);
1.79 +
1.80 CHECK_STATES((&g_States,
1.81 - new State_F1_CallClassReleased,
1.82 - new State_F1_CallClassGenerated,
1.83 new State_F1_Called,
1.84 new State_F1_PreHandler_Called(&f1_handlers),
1.85 NULL), "Part 4");
1.86
1.87 // 5) Check ignore / supercede
1.88 g_F1Pre_WhatToDo = MRES_SUPERCEDE;
1.89 - SH_CALL(cc, &Test::F1)();
1.90 + SH_CALL(pTest, &Test::F1)();
1.91 pTest->F1();
1.92
1.93 g_F1Pre_WhatToDo = MRES_IGNORED;
1.94 - SH_CALL(cc, &Test::F1)();
1.95 + SH_CALL(pTest, &Test::F1)();
1.96 pTest->F1();
1.97
1.98 CHECK_STATES((&g_States,
1.99 @@ -515,7 +504,7 @@
1.100 SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.101 ADD_STATE(State_F1_HookRemoved);
1.102
1.103 - SH_CALL(cc, &Test::F1)();
1.104 + SH_CALL(pTest, &Test::F1)();
1.105 pTest->F1();
1.106
1.107 CHECK_STATES((&g_States,
1.108 @@ -528,7 +517,7 @@
1.109 g_F1Post_WhatToDo = MRES_IGNORED;
1.110 ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true) ? true : false));
1.111
1.112 - SH_CALL(cc, &Test::F1)();
1.113 + SH_CALL(pTest, &Test::F1)();
1.114 pTest->F1();
1.115
1.116 CHECK_STATES((&g_States,
1.117 @@ -542,11 +531,11 @@
1.118 g_F1Pre_WhatToDo = MRES_IGNORED;
1.119 ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false) ? true : false));
1.120
1.121 - SH_CALL(cc, &Test::F1)();
1.122 + SH_CALL(pTest, &Test::F1)();
1.123 pTest->F1();
1.124
1.125 g_F1Pre_WhatToDo = MRES_SUPERCEDE;
1.126 - SH_CALL(cc, &Test::F1)();
1.127 + SH_CALL(pTest, &Test::F1)();
1.128 pTest->F1();
1.129
1.130 CHECK_STATES((&g_States,
1.131 @@ -566,7 +555,7 @@
1.132 SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true);
1.133 ADD_STATE(State_F1_HookRemoved);
1.134
1.135 - SH_CALL(cc, &Test::F1)();
1.136 + SH_CALL(pTest, &Test::F1)();
1.137 pTest->F1();
1.138
1.139 CHECK_STATES((&g_States,
1.140 @@ -581,7 +570,7 @@
1.141 g_F299Pre_WhatToRet = false;
1.142
1.143 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.144 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.145 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.146
1.147 CHECK_STATES((&g_States,
1.148 new State_F299_Called("hi"),
1.149 @@ -593,7 +582,7 @@
1.150 // (one add staticfunc in old format)
1.151 SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
1.152 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.153 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.154 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.155
1.156 CHECK_STATES((&g_States,
1.157 new State_F299_PreHandlerCalled("hi"),
1.158 @@ -605,7 +594,7 @@
1.159
1.160 SH_ADD_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
1.161 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.162 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.163 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.164
1.165 CHECK_STATES((&g_States,
1.166 new State_F299_PreHandlerCalled("hi"),
1.167 @@ -618,7 +607,7 @@
1.168
1.169 g_F299Pre_WhatToDo = MRES_OVERRIDE;
1.170 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.171 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.172 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.173
1.174 CHECK_STATES((&g_States,
1.175 new State_F299_PreHandlerCalled("hi"),
1.176 @@ -631,7 +620,7 @@
1.177
1.178 g_F299Pre_WhatToDo = MRES_SUPERCEDE;
1.179 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.180 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.181 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.182
1.183 CHECK_STATES((&g_States,
1.184 new State_F299_PreHandlerCalled("hi"),
1.185 @@ -644,7 +633,7 @@
1.186 // (one remove staticfunc in old format)
1.187 SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false);
1.188 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.189 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.190 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.191
1.192 CHECK_STATES((&g_States,
1.193 new State_F299_Called("hi"),
1.194 @@ -656,7 +645,7 @@
1.195
1.196 SH_REMOVE_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true);
1.197 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.198 - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.199 + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi")));
1.200
1.201 CHECK_STATES((&g_States,
1.202 new State_F299_Called("hi"),
1.203 @@ -665,14 +654,6 @@
1.204 new State_F299Ret(true),
1.205 NULL), "Part 10.7");
1.206
1.207 - // 11) Release callclass
1.208 - SH_RELEASE_CALLCLASS(cc);
1.209 - ADD_STATE(State_F1_CallClassReleased);
1.210 -
1.211 -
1.212 - CHECK_STATES((&g_States,
1.213 - new State_F1_CallClassReleased,
1.214 - NULL), "Part 11");
1.215
1.216 // 11 1/2) Test removing hook by id
1.217