diff -r 0e01c64820e1 -r 3a04ef79edf1 sourcehook/test/test1.cpp --- a/sourcehook/test/test1.cpp Fri May 11 19:21:14 2007 +0000 +++ b/sourcehook/test/test1.cpp Sat May 12 08:08:01 2007 +0000 @@ -424,40 +424,33 @@ Whatever test; Test *pTest = &test; - // 1) Get a call class and call the member through it and normally - SourceHook::CallClass *cc = SH_GET_CALLCLASS(pTest); + // 1) SH_CALL it and call it normally - ADD_STATE(State_F1_CallClassGenerated); + return true; + SH_CALL(pTest, &Test::F1)(); + - SH_CALL(cc, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, - new State_F1_CallClassGenerated, new State_F1_Called, new State_F1_Called, NULL), "Part 1"); // 2) Request a call class again - SourceHook::CallClass *cc2 = SH_GET_CALLCLASS(pTest); - ADD_STATE(State_F1_CallClassGenerated); - SH_CALL(cc, &Test::F1)(); - SH_CALL(cc2, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); - SH_RELEASE_CALLCLASS(cc2); - ADD_STATE(State_F1_CallClassReleased); - - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, - new State_F1_CallClassGenerated, new State_F1_Called, new State_F1_Called, new State_F1_Called, - new State_F1_CallClassReleased, + new State_F1_Called, new State_F1_Called, NULL), "Part 2"); @@ -467,7 +460,7 @@ g_F1Pre_WhatToDo = MRES_SUPERCEDE; ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false) ? true : false)); - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, @@ -476,30 +469,26 @@ new State_F1_PreHandler_Called(&f1_handlers), NULL), "Part 3"); - // 4) Rerequest the callclass - SH_RELEASE_CALLCLASS(cc); + // 4) Test source-level compat with callclasses + SourceHook::CallClass *pCC = SH_GET_CALLCLASS(pTest); - ADD_STATE(State_F1_CallClassReleased); - cc2 = SH_GET_CALLCLASS(pTest); - ADD_STATE(State_F1_CallClassGenerated); - - SH_CALL(cc, &Test::F1)(); + SH_CALL(pCC, &Test::F1)(); pTest->F1(); + SH_RELEASE_CALLCLASS(pCC); + CHECK_STATES((&g_States, - new State_F1_CallClassReleased, - new State_F1_CallClassGenerated, new State_F1_Called, new State_F1_PreHandler_Called(&f1_handlers), NULL), "Part 4"); // 5) Check ignore / supercede g_F1Pre_WhatToDo = MRES_SUPERCEDE; - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); g_F1Pre_WhatToDo = MRES_IGNORED; - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, @@ -515,7 +504,7 @@ SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, false); ADD_STATE(State_F1_HookRemoved); - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, @@ -528,7 +517,7 @@ g_F1Post_WhatToDo = MRES_IGNORED; ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true) ? true : false)); - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, @@ -542,11 +531,11 @@ g_F1Pre_WhatToDo = MRES_IGNORED; ADD_STATE(State_F1_HookAdded(SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false) ? true : false)); - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); g_F1Pre_WhatToDo = MRES_SUPERCEDE; - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, @@ -566,7 +555,7 @@ SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Post), true); ADD_STATE(State_F1_HookRemoved); - SH_CALL(cc, &Test::F1)(); + SH_CALL(pTest, &Test::F1)(); pTest->F1(); CHECK_STATES((&g_States, @@ -581,7 +570,7 @@ g_F299Pre_WhatToRet = false; ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_Called("hi"), @@ -593,7 +582,7 @@ // (one add staticfunc in old format) SH_ADD_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false); ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_PreHandlerCalled("hi"), @@ -605,7 +594,7 @@ SH_ADD_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true); ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_PreHandlerCalled("hi"), @@ -618,7 +607,7 @@ g_F299Pre_WhatToDo = MRES_OVERRIDE; ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_PreHandlerCalled("hi"), @@ -631,7 +620,7 @@ g_F299Pre_WhatToDo = MRES_SUPERCEDE; ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_PreHandlerCalled("hi"), @@ -644,7 +633,7 @@ // (one remove staticfunc in old format) SH_REMOVE_HOOK_STATICFUNC(Test, F299, pTest, F299_Pre, false); ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_Called("hi"), @@ -656,7 +645,7 @@ SH_REMOVE_HOOK(Test, F299, pTest, SH_STATIC(F299_Post), true); ADD_STATE(State_F299Ret(pTest->F299("hi"))); - ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi"))); + ADD_STATE(State_F299Ret(SH_CALL(pTest, &Test::F299)("hi"))); CHECK_STATES((&g_States, new State_F299_Called("hi"), @@ -665,14 +654,6 @@ new State_F299Ret(true), NULL), "Part 10.7"); - // 11) Release callclass - SH_RELEASE_CALLCLASS(cc); - ADD_STATE(State_F1_CallClassReleased); - - - CHECK_STATES((&g_States, - new State_F1_CallClassReleased, - NULL), "Part 11"); // 11 1/2) Test removing hook by id