1.1 --- a/sourcehook/test/test1.cpp Wed May 04 13:59:57 2005 +0000
1.2 +++ b/sourcehook/test/test1.cpp Thu May 05 10:40:47 2005 +0000
1.3 @@ -13,8 +13,8 @@
1.4 // Hooking and callclass
1.5
1.6 MAKE_STATE(State_F1_Called);
1.7 - MAKE_STATE(State_F1_PreHandler_Called);
1.8 - MAKE_STATE(State_F1_PostHandler_Called);
1.9 + MAKE_STATE_1(State_F1_PreHandler_Called, void*);
1.10 + MAKE_STATE_1(State_F1_PostHandler_Called, void*);
1.11 MAKE_STATE_1(State_F1_HookAdded, bool);
1.12 MAKE_STATE(State_F1_HookRemoved);
1.13 MAKE_STATE(State_F1_CallClassGenerated);
1.14 @@ -354,13 +354,13 @@
1.15 {
1.16 void Pre()
1.17 {
1.18 - ADD_STATE(State_F1_PreHandler_Called);
1.19 + ADD_STATE(State_F1_PreHandler_Called(reinterpret_cast<void*>(this)));
1.20 RETURN_META(g_F1Pre_WhatToDo);
1.21 }
1.22
1.23 void Post()
1.24 {
1.25 - ADD_STATE(State_F1_PostHandler_Called);
1.26 + ADD_STATE(State_F1_PostHandler_Called(reinterpret_cast<void*>(this)));
1.27 RETURN_META(g_F1Post_WhatToDo);
1.28 }
1.29 };
1.30 @@ -440,7 +440,7 @@
1.31 CHECK_STATES((&g_States,
1.32 new State_F1_HookAdded(true),
1.33 new State_F1_Called,
1.34 - new State_F1_PreHandler_Called,
1.35 + new State_F1_PreHandler_Called(&f1_handlers),
1.36 NULL), "Part 3");
1.37
1.38 // 4) Rerequest the callclass
1.39 @@ -456,7 +456,7 @@
1.40 new State_F1_CallClassReleased,
1.41 new State_F1_CallClassGenerated,
1.42 new State_F1_Called,
1.43 - new State_F1_PreHandler_Called,
1.44 + new State_F1_PreHandler_Called(&f1_handlers),
1.45 NULL), "Part 4");
1.46
1.47 // 5) Check ignore / supercede
1.48 @@ -470,9 +470,9 @@
1.49
1.50 CHECK_STATES((&g_States,
1.51 new State_F1_Called,
1.52 - new State_F1_PreHandler_Called,
1.53 + new State_F1_PreHandler_Called(&f1_handlers),
1.54 new State_F1_Called,
1.55 - new State_F1_PreHandler_Called,
1.56 + new State_F1_PreHandler_Called(&f1_handlers),
1.57 new State_F1_Called,
1.58 NULL), "Part 5");
1.59
1.60 @@ -500,7 +500,7 @@
1.61 new State_F1_HookAdded(true),
1.62 new State_F1_Called,
1.63 new State_F1_Called,
1.64 - new State_F1_PostHandler_Called,
1.65 + new State_F1_PostHandler_Called(&f1_handlers),
1.66 NULL), "Part 7");
1.67
1.68 // 8) And a pre hook again
1.69 @@ -517,12 +517,12 @@
1.70 CHECK_STATES((&g_States,
1.71 new State_F1_HookAdded(true),
1.72 new State_F1_Called,
1.73 - new State_F1_PreHandler_Called,
1.74 + new State_F1_PreHandler_Called(&f1_handlers),
1.75 new State_F1_Called,
1.76 - new State_F1_PostHandler_Called,
1.77 + new State_F1_PostHandler_Called(&f1_handlers),
1.78 new State_F1_Called,
1.79 - new State_F1_PreHandler_Called,
1.80 - new State_F1_PostHandler_Called,
1.81 + new State_F1_PreHandler_Called(&f1_handlers),
1.82 + new State_F1_PostHandler_Called(&f1_handlers),
1.83 NULL), "Part 8");
1.84
1.85 // 9) Remove all hooks