Rewrote user message caching code to always use IServerGameDLL::GetUserMessageInfo (
bug 4117, r=dvander).
Games where the above function can crash are handled by detouring tier0's Error() function and jumping back to our own code. So in theory this should work on all games now.
1 #include "testevents.h"
2 #include "sourcehook_test.h"
4 // References and private copy constructors and stuff like that!
7 BAILOPAN, 29.04.2006 21:51 :
8 onoto-san, interesting error from VS
10 void GabHaben(ISomething &sth);
13 and SH_CALL(cc, &WHAT::GabHaben)(sth);
14 "No copy constructor available for class 'SomethingDerived'"
21 SourceHook::ISourceHook *g_SHPtr;
22 SourceHook::Plugin g_PLID;
24 MAKE_STATE_1(State_Result, int);
25 MAKE_STATE_1(State_Result_InHook, int);
27 MAKE_STATE_2(State_F2_Called, int, int);
28 MAKE_STATE_2(State_F2_Handler_Called, int, int);
42 // Private copy constructor!
57 class CDerived : public CBase
65 // Complicated derived shit !
70 class CDerived2 : private COtherWeirdBase, public CBase
74 CDerived2(int a) : m_Return(a)
87 virtual int Func(CBase &sth)
92 virtual void F2(POD a)
102 virtual void F2(POD &a)
104 ADD_STATE(State_F2_Called(a.a, a.b));
111 virtual int Func(CBase &sth)
113 ADD_STATE(State_Result_InHook(sth.Func()));
114 RETURN_META_VALUE(MRES_SUPERCEDE, 20);
117 virtual void F2(POD &a)
119 ADD_STATE(State_F2_Handler_Called(a.a, a.b));
122 virtual void F21(POD a)
127 SH_DECL_HOOK1(CHello, Func, SH_NOATTRIB, 0, int, CBase&);
128 SH_DECL_HOOK1_void(CHello, F2, SH_NOATTRIB, 0, POD);
129 SH_DECL_HOOK1_void(Test2, F2, SH_NOATTRIB, 0, POD&);
131 CHello *MyInstanceFactory()
138 bool TestRef(std::string &error)
147 CHello *pHello = MyInstanceFactory();
148 Test2 *pTest2 = new Test2;
149 CAutoPtrDestruction<CHello> apd(pHello);
150 CAutoPtrDestruction<Test2> apd2(pTest2);
153 SourceHook::CallClass<CHello> *cc = SH_GET_CALLCLASS(pHello);
155 ADD_STATE(State_Result(pHello->Func(base)));
156 ADD_STATE(State_Result(pHello->Func(der)));
157 ADD_STATE(State_Result(pHello->Func(der2)));
158 ADD_STATE(State_Result(pHello->Func(der3)));
160 CHECK_STATES((&g_States,
162 new State_Result(10),
163 new State_Result(11),
164 new State_Result(12),
167 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base)));
168 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der)));
169 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2)));
170 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3)));
172 CHECK_STATES((&g_States,
174 new State_Result(10),
175 new State_Result(11),
176 new State_Result(12),
179 SH_ADD_HOOK(CHello, Func, pHello, SH_MEMBER(&hook, &CHook::Func), false);
181 ADD_STATE(State_Result(pHello->Func(base)));
182 ADD_STATE(State_Result(pHello->Func(der)));
183 ADD_STATE(State_Result(pHello->Func(der2)));
184 ADD_STATE(State_Result(pHello->Func(der3)));
186 CHECK_STATES((&g_States,
187 new State_Result_InHook(0),
188 new State_Result(20),
189 new State_Result_InHook(10),
190 new State_Result(20),
191 new State_Result_InHook(11),
192 new State_Result(20),
193 new State_Result_InHook(12),
194 new State_Result(20),
197 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base)));
198 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der)));
199 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2)));
200 ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3)));
202 CHECK_STATES((&g_States,
204 new State_Result(10),
205 new State_Result(11),
206 new State_Result(12),
209 // Check for correct ref proto handling
211 SH_ADD_HOOK(CHello, F2, pHello, SH_MEMBER(&hook, &CHook::F21), false);
212 SH_ADD_HOOK(Test2, F2, pTest2, SH_MEMBER(&hook, &CHook::F2), false);
221 CHECK_STATES((&g_States,
222 new State_F2_Handler_Called(1, 2),
223 new State_F2_Called(1, 2),