1.1 --- a/sourcehook/test/sourcehook_test.h Mon Oct 08 20:47:11 2007 +0000
1.2 +++ b/sourcehook/test/sourcehook_test.h Tue Oct 09 14:48:09 2007 +0000
1.3 @@ -15,7 +15,8 @@
1.4 {
1.5 T *m_Ptr;
1.6 CAutoPtrDestruction(T *p) : m_Ptr(p) { }
1.7 - ~CAutoPtrDestruction() { delete m_Ptr; }
1.8 + ~CAutoPtrDestruction() { if (m_Ptr) delete m_Ptr; }
1.9 + void clear() { m_Ptr = NULL; }
1.10 };
1.11
1.12 struct CSHPtrAutoDestruction
2.1 --- a/sourcehook/test/test1.cpp Mon Oct 08 20:47:11 2007 +0000
2.2 +++ b/sourcehook/test/test1.cpp Tue Oct 09 14:48:09 2007 +0000
2.3 @@ -707,7 +707,14 @@
2.4
2.5 NULL), "Part 11 1/2");
2.6
2.7 - // 12) Test? Test.
2.8 + // 12) Try out one ref param
2.9 + SH_ADD_HOOK(Test, F60, pTest, SH_STATIC(F60_Pre), false);
2.10 + int a = 0;
2.11 + pTest->F60(a);
2.12 + CHECK_COND(a == 10, "Part12");
2.13 + SH_REMOVE_HOOK(Test, F60, pTest, SH_STATIC(F60_Pre), false);
2.14 +
2.15 + // 13) Remove hooks after the instance has been removed
2.16 SH_ADD_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
2.17 SH_ADD_HOOK(Test, F2, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
2.18 SH_ADD_HOOK(Test, F3, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.19 @@ -719,6 +726,9 @@
2.20 SH_ADD_HOOK(Test, F9, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.21 SH_ADD_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.22
2.23 + delete pTest;
2.24 + apd.clear();
2.25 +
2.26 SH_REMOVE_HOOK(Test, F1, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
2.27 SH_REMOVE_HOOK(Test, F2, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), true);
2.28 SH_REMOVE_HOOK(Test, F3, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.29 @@ -729,14 +739,9 @@
2.30 SH_REMOVE_HOOK(Test, F8, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.31 SH_REMOVE_HOOK(Test, F9, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.32 SH_REMOVE_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false);
2.33 -
2.34 - SH_ADD_HOOK(Test, F60, pTest, SH_STATIC(F60_Pre), false);
2.35 + CHECK_COND(SH_REMOVE_HOOK(Test, F10, pTest, SH_MEMBER(&f1_handlers, &HandlersF1::Pre), false) == false, "Part 12.1");
2.36
2.37 - int a = 0;
2.38 - pTest->F60(a);
2.39 Test_CompleteShutdown(g_SHPtr);
2.40
2.41 - CHECK_COND(a == 10, "Part12.a");
2.42 -
2.43 return true;
2.44 }