diff -r 90056ffa9784 -r 71016f952503 sourcehook/test/test1.cpp --- a/sourcehook/test/test1.cpp Wed May 04 13:59:57 2005 +0000 +++ b/sourcehook/test/test1.cpp Thu May 05 10:40:47 2005 +0000 @@ -13,8 +13,8 @@ // Hooking and callclass MAKE_STATE(State_F1_Called); - MAKE_STATE(State_F1_PreHandler_Called); - MAKE_STATE(State_F1_PostHandler_Called); + MAKE_STATE_1(State_F1_PreHandler_Called, void*); + MAKE_STATE_1(State_F1_PostHandler_Called, void*); MAKE_STATE_1(State_F1_HookAdded, bool); MAKE_STATE(State_F1_HookRemoved); MAKE_STATE(State_F1_CallClassGenerated); @@ -354,13 +354,13 @@ { void Pre() { - ADD_STATE(State_F1_PreHandler_Called); + ADD_STATE(State_F1_PreHandler_Called(reinterpret_cast(this))); RETURN_META(g_F1Pre_WhatToDo); } void Post() { - ADD_STATE(State_F1_PostHandler_Called); + ADD_STATE(State_F1_PostHandler_Called(reinterpret_cast(this))); RETURN_META(g_F1Post_WhatToDo); } }; @@ -440,7 +440,7 @@ CHECK_STATES((&g_States, new State_F1_HookAdded(true), new State_F1_Called, - new State_F1_PreHandler_Called, + new State_F1_PreHandler_Called(&f1_handlers), NULL), "Part 3"); // 4) Rerequest the callclass @@ -456,7 +456,7 @@ new State_F1_CallClassReleased, new State_F1_CallClassGenerated, new State_F1_Called, - new State_F1_PreHandler_Called, + new State_F1_PreHandler_Called(&f1_handlers), NULL), "Part 4"); // 5) Check ignore / supercede @@ -470,9 +470,9 @@ CHECK_STATES((&g_States, new State_F1_Called, - new State_F1_PreHandler_Called, + new State_F1_PreHandler_Called(&f1_handlers), new State_F1_Called, - new State_F1_PreHandler_Called, + new State_F1_PreHandler_Called(&f1_handlers), new State_F1_Called, NULL), "Part 5"); @@ -500,7 +500,7 @@ new State_F1_HookAdded(true), new State_F1_Called, new State_F1_Called, - new State_F1_PostHandler_Called, + new State_F1_PostHandler_Called(&f1_handlers), NULL), "Part 7"); // 8) And a pre hook again @@ -517,12 +517,12 @@ CHECK_STATES((&g_States, new State_F1_HookAdded(true), new State_F1_Called, - new State_F1_PreHandler_Called, + new State_F1_PreHandler_Called(&f1_handlers), new State_F1_Called, - new State_F1_PostHandler_Called, + new State_F1_PostHandler_Called(&f1_handlers), new State_F1_Called, - new State_F1_PreHandler_Called, - new State_F1_PostHandler_Called, + new State_F1_PreHandler_Called(&f1_handlers), + new State_F1_PostHandler_Called(&f1_handlers), NULL), "Part 8"); // 9) Remove all hooks