1.1 --- a/sourcehook/test/testref.cpp Wed Oct 10 21:48:44 2007 +0000
1.2 +++ b/sourcehook/test/testref.cpp Fri Oct 12 19:17:52 2007 +0000
1.3 @@ -24,6 +24,19 @@
1.4 MAKE_STATE_1(State_Result, int);
1.5 MAKE_STATE_1(State_Result_InHook, int);
1.6
1.7 + MAKE_STATE_2(State_F2_Called, int, int);
1.8 + MAKE_STATE_2(State_F2_Handler_Called, int, int);
1.9 +
1.10 + struct POD
1.11 + {
1.12 + int a;
1.13 + int b;
1.14 + int c;
1.15 + int d;
1.16 + int e;
1.17 + int f;
1.18 + };
1.19 +
1.20 class CBase
1.21 {
1.22 // Private copy constructor!
1.23 @@ -75,6 +88,21 @@
1.24 {
1.25 return sth.Func();
1.26 }
1.27 +
1.28 + virtual void F2(POD a)
1.29 + {
1.30 + }
1.31 + };
1.32 +
1.33 +
1.34 + class Test2
1.35 + {
1.36 + public:
1.37 + virtual void F1(){}
1.38 + virtual void F2(POD &a)
1.39 + {
1.40 + ADD_STATE(State_F2_Called(a.a, a.b));
1.41 + }
1.42 };
1.43
1.44 class CHook
1.45 @@ -85,8 +113,20 @@
1.46 ADD_STATE(State_Result_InHook(sth.Func()));
1.47 RETURN_META_VALUE(MRES_SUPERCEDE, 20);
1.48 }
1.49 +
1.50 + virtual void F2(POD &a)
1.51 + {
1.52 + ADD_STATE(State_F2_Handler_Called(a.a, a.b));
1.53 + }
1.54 +
1.55 + virtual void F21(POD a)
1.56 + {
1.57 + }
1.58 };
1.59 +
1.60 SH_DECL_HOOK1(CHello, Func, SH_NOATTRIB, 0, int, CBase&);
1.61 + SH_DECL_HOOK1_void(CHello, F2, SH_NOATTRIB, 0, POD);
1.62 + SH_DECL_HOOK1_void(Test2, F2, SH_NOATTRIB, 0, POD&);
1.63
1.64 CHello *MyInstanceFactory()
1.65 {
1.66 @@ -105,7 +145,9 @@
1.67 CDerived2 der2(11);
1.68 CDerived2 der3(12);
1.69 CHello *pHello = MyInstanceFactory();
1.70 + Test2 *pTest2 = new Test2;
1.71 CAutoPtrDestruction<CHello> apd(pHello);
1.72 + CAutoPtrDestruction<Test2> apd2(pTest2);
1.73 CHook hook;
1.74
1.75 SourceHook::CallClass<CHello> *cc = SH_GET_CALLCLASS(pHello);
1.76 @@ -164,5 +206,22 @@
1.77 new State_Result(12),
1.78 NULL), "Part 4");
1.79
1.80 + // Check for correct ref proto handling
1.81 +
1.82 + SH_ADD_HOOK(CHello, F2, pHello, SH_MEMBER(&hook, &(CHook::F21)), false);
1.83 + SH_ADD_HOOK(Test2, F2, pTest2, SH_MEMBER(&hook, &(CHook::F2)), false);
1.84 +
1.85 + POD pod = { 1, 2 };
1.86 + pTest2->F2(pod);
1.87 +
1.88 + int a = 5;
1.89 +
1.90 + pHello->F2(pod);
1.91 +
1.92 + CHECK_STATES((&g_States,
1.93 + new State_F2_Handler_Called(1, 2),
1.94 + new State_F2_Called(1, 2),
1.95 + NULL), "Part 5");
1.96 +
1.97 return true;
1.98 }