core/sourcehook/test/testmanual.cpp
author Scott Ehlert <ds@alliedmods.net>
Thu Dec 10 00:59:50 2009 -0600 (2009-12-10)
changeset 689 4065ba5e9155
parent 539 db914129ae01
permissions -rw-r--r--
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.
pavolmarko@158
     1
#include <string>
pavolmarko@162
     2
#include "sourcehook.h"
pavolmarko@162
     3
#include "sourcehook_test.h"
pavolmarko@158
     4
#include "testevents.h"
pavolmarko@158
     5
pavolmarko@158
     6
// TESTMANUAL
pavolmarko@158
     7
// Test manual hooks
pavolmarko@158
     8
// :TODO: test more extensively
pavolmarko@158
     9
pavolmarko@158
    10
namespace
pavolmarko@158
    11
{
pavolmarko@158
    12
	StateList g_States;
pavolmarko@158
    13
	SourceHook::ISourceHook *g_SHPtr;
pavolmarko@158
    14
	SourceHook::Plugin g_PLID;
pavolmarko@158
    15
pavolmarko@158
    16
	MAKE_STATE_1(State_Func1_Called, void*);				// param1: This pointer
pavolmarko@158
    17
	MAKE_STATE_2(State_Func2_Called, void*, int);			// param1: This pointer; param2: parameter
pavolmarko@158
    18
	MAKE_STATE_1(State_Func3_Called, void*);				// param1: This pointer
pavolmarko@158
    19
	MAKE_STATE_2(State_Func4_Called, void*, int);			// param1: This pointer; param2: parameter
pavolmarko@158
    20
	MAKE_STATE_1(State_Func5_Called, void*);				// param1: This pointer
pavolmarko@158
    21
pavolmarko@158
    22
	MAKE_STATE_1(State_Func1H_Called, void*);
pavolmarko@158
    23
	MAKE_STATE_2(State_Func2H_Called, void*, int);
pavolmarko@158
    24
	MAKE_STATE_1(State_Func3H_Called, void*);
pavolmarko@158
    25
	MAKE_STATE_2(State_Func4H_Called, void*, int);
pavolmarko@158
    26
pavolmarko@158
    27
	MAKE_STATE_1(State_Return, short);
pavolmarko@158
    28
pavolmarko@158
    29
	class TheWall
pavolmarko@158
    30
	{
pavolmarko@158
    31
	public:
pavolmarko@158
    32
		virtual void Func1()
pavolmarko@158
    33
		{
pavolmarko@158
    34
			ADD_STATE(State_Func1_Called(reinterpret_cast<void*>(this)));
pavolmarko@158
    35
		}
pavolmarko@158
    36
		virtual void Func2(int x)
pavolmarko@158
    37
		{
pavolmarko@158
    38
			ADD_STATE(State_Func2_Called(reinterpret_cast<void*>(this), x));
pavolmarko@158
    39
		}
pavolmarko@158
    40
pavolmarko@158
    41
		virtual short Func3()
pavolmarko@158
    42
		{
pavolmarko@158
    43
			ADD_STATE(State_Func3_Called(reinterpret_cast<void*>(this)));
pavolmarko@158
    44
			return 3;
pavolmarko@158
    45
		}
pavolmarko@158
    46
		virtual short Func4(int x)
pavolmarko@158
    47
		{
pavolmarko@158
    48
			ADD_STATE(State_Func4_Called(reinterpret_cast<void*>(this), x));
pavolmarko@158
    49
			return 4;
pavolmarko@158
    50
		}
pavolmarko@158
    51
		virtual void Func5()
pavolmarko@158
    52
		{
pavolmarko@158
    53
			ADD_STATE(State_Func5_Called(reinterpret_cast<void*>(this)));
pavolmarko@158
    54
		}
pavolmarko@443
    55
pavolmarko@443
    56
		virtual const char *Func6()
pavolmarko@443
    57
		{
pavolmarko@443
    58
			return 0;
pavolmarko@443
    59
		}
pavolmarko@443
    60
		virtual char *Func7()
pavolmarko@443
    61
		{
pavolmarko@443
    62
			return 0;
pavolmarko@443
    63
		}
pavolmarko@158
    64
	};
pavolmarko@158
    65
pavolmarko@158
    66
	SH_DECL_HOOK0_void(TheWall, Func1, SH_NOATTRIB, 0);
pavolmarko@158
    67
	SH_DECL_HOOK1_void(TheWall, Func2, SH_NOATTRIB, 0, int);
pavolmarko@158
    68
	SH_DECL_HOOK0(TheWall, Func3, SH_NOATTRIB, 0, short);
pavolmarko@158
    69
	SH_DECL_HOOK1(TheWall, Func4, SH_NOATTRIB, 0, short, int);
pavolmarko@158
    70
pavolmarko@158
    71
	SH_DECL_MANUALHOOK0_void(TheWall_Func1, 0, 0, 0);
pavolmarko@158
    72
	SH_DECL_MANUALHOOK1_void(TheWall_Func2, 1, 0, 0, int);
pavolmarko@158
    73
	SH_DECL_MANUALHOOK0(TheWall_Func3, 2, 0, 0, short);
pavolmarko@158
    74
	SH_DECL_MANUALHOOK1(TheWall_Func4, 3, 0, 0, short, int);
pavolmarko@158
    75
pavolmarko@443
    76
	SH_DECL_MANUALHOOK0(TheWall_Func6, 5, 0, 0, const char *);
pavolmarko@443
    77
	SH_DECL_MANUALEXTERN0(TheWall_Func6, const char *);
pavolmarko@443
    78
pavolmarko@443
    79
	SH_DECL_MANUALHOOK0(TheWall_Func7, 6, 0, 0, char *);
pavolmarko@443
    80
	SH_DECL_MANUALEXTERN0(TheWall_Func7, char *);
pavolmarko@443
    81
pavolmarko@421
    82
	SH_DECL_MANUALEXTERN0_void(TheWall_Func1);
pavolmarko@440
    83
	SH_DECL_MANUALEXTERN1(TheWall_Func4, short, int);
pavolmarko@421
    84
pavolmarko@199
    85
	typedef void (SourceHook::EmptyClass::*MFP_Func1)();
pavolmarko@199
    86
	typedef void (SourceHook::EmptyClass::*MFP_Func2)(int);
pavolmarko@199
    87
	typedef short (SourceHook::EmptyClass::*MFP_Func3)();
pavolmarko@199
    88
	typedef short (SourceHook::EmptyClass::*MFP_Func4)(int);
pavolmarko@199
    89
pavolmarko@158
    90
	void Handler_Func1()
pavolmarko@158
    91
	{
pavolmarko@158
    92
		ADD_STATE(State_Func1H_Called(META_IFACEPTR(void)));
pavolmarko@158
    93
	}
pavolmarko@158
    94
	void Handler_Func2(int x)
pavolmarko@158
    95
	{
pavolmarko@158
    96
		ADD_STATE(State_Func2H_Called(META_IFACEPTR(void), x));
pavolmarko@211
    97
		RETURN_META_MNEWPARAMS(MRES_IGNORED, TheWall_Func2, (0x87654321));
pavolmarko@158
    98
	}
pavolmarko@158
    99
	short Handler_Func3()
pavolmarko@158
   100
	{
pavolmarko@158
   101
		ADD_STATE(State_Func3H_Called(META_IFACEPTR(void)));
pavolmarko@158
   102
		return 0;
pavolmarko@158
   103
	}
pavolmarko@158
   104
	short Handler_Func4(int x)
pavolmarko@158
   105
	{
pavolmarko@158
   106
		ADD_STATE(State_Func4H_Called(META_IFACEPTR(void), x));
pavolmarko@211
   107
pavolmarko@211
   108
		// newparams (recall) using the manual hook declaration!
pavolmarko@211
   109
		RETURN_META_VALUE_MNEWPARAMS(MRES_IGNORED, 0, TheWall_Func4, (0x12345678));
pavolmarko@158
   110
	}
pavolmarko@158
   111
pavolmarko@158
   112
	struct AnotherBrick
pavolmarko@158
   113
	{
pavolmarko@158
   114
		void Handler_Func1()
pavolmarko@158
   115
		{
pavolmarko@158
   116
			ADD_STATE(State_Func1H_Called(META_IFACEPTR(void)));
pavolmarko@158
   117
			RETURN_META(MRES_SUPERCEDE);
pavolmarko@158
   118
		}
pavolmarko@158
   119
	};
pavolmarko@387
   120
pavolmarko@387
   121
	TheWall *MyInstanceFactory()
pavolmarko@387
   122
	{
pavolmarko@387
   123
		return new TheWall;
pavolmarko@387
   124
	}
pavolmarko@158
   125
}
pavolmarko@158
   126
pavolmarko@158
   127
bool TestManual(std::string &error)
pavolmarko@158
   128
{
pavolmarko@162
   129
	GET_SHPTR(g_SHPtr);
pavolmarko@158
   130
	g_PLID = 1337;
pavolmarko@158
   131
pavolmarko@387
   132
	TheWall *p = MyInstanceFactory();
pavolmarko@387
   133
	CAutoPtrDestruction<TheWall> apd(p);
pavolmarko@158
   134
pavolmarko@380
   135
	SourceHook::ManualCallClass *cc = SH_GET_MCALLCLASS(p, sizeof(void*));
pavolmarko@380
   136
pavolmarko@158
   137
	// 1)
pavolmarko@158
   138
	// Call each function
pavolmarko@158
   139
	p->Func1();
pavolmarko@158
   140
	p->Func2(200);
pavolmarko@158
   141
	ADD_STATE(State_Return(p->Func3()));
pavolmarko@158
   142
	ADD_STATE(State_Return(p->Func4(400)));
pavolmarko@158
   143
pavolmarko@158
   144
	CHECK_STATES((&g_States,
pavolmarko@158
   145
		new State_Func1_Called(p),
pavolmarko@158
   146
		new State_Func2_Called(p, 200),
pavolmarko@158
   147
		new State_Func3_Called(p),
pavolmarko@158
   148
		new State_Return(3),
pavolmarko@158
   149
		new State_Func4_Called(p, 400),
pavolmarko@158
   150
		new State_Return(4),
pavolmarko@158
   151
		NULL), "Part 1");
pavolmarko@158
   152
pavolmarko@199
   153
	// 1.1)
pavolmarko@199
   154
	// Now call each function through the manual call class, using the hook decl and manually
pavolmarko@380
   155
	SH_MCALL(cc, TheWall_Func1)();
pavolmarko@380
   156
	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
pavolmarko@380
   157
	SH_MCALL(cc, TheWall_Func2)(200);
pavolmarko@380
   158
	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
pavolmarko@380
   159
	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
pavolmarko@380
   160
	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
pavolmarko@380
   161
	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
pavolmarko@380
   162
	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
pavolmarko@199
   163
pavolmarko@199
   164
	CHECK_STATES((&g_States,
pavolmarko@199
   165
		new State_Func1_Called(p),
pavolmarko@199
   166
		new State_Func1_Called(p),
pavolmarko@199
   167
		new State_Func2_Called(p, 200),
pavolmarko@199
   168
		new State_Func2_Called(p, 200),
pavolmarko@199
   169
		new State_Func3_Called(p),
pavolmarko@199
   170
		new State_Return(3),
pavolmarko@199
   171
		new State_Func3_Called(p),
pavolmarko@199
   172
		new State_Return(3),
pavolmarko@199
   173
		new State_Func4_Called(p, 400),
pavolmarko@199
   174
		new State_Return(4),
pavolmarko@199
   175
		new State_Func4_Called(p, 400),
pavolmarko@199
   176
		new State_Return(4),
pavolmarko@199
   177
		NULL), "Part 1.1");
pavolmarko@199
   178
pavolmarko@158
   179
	// 2)
pavolmarko@199
   180
	// Hook each function normally, call them
pavolmarko@324
   181
	SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@324
   182
	SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   183
	SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   184
	SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   185
pavolmarko@158
   186
	p->Func1();
pavolmarko@158
   187
	p->Func2(200);
pavolmarko@158
   188
	ADD_STATE(State_Return(p->Func3()));
pavolmarko@158
   189
	ADD_STATE(State_Return(p->Func4(400)));
pavolmarko@158
   190
pavolmarko@158
   191
	CHECK_STATES((&g_States,
pavolmarko@158
   192
		new State_Func1H_Called(p),
pavolmarko@158
   193
		new State_Func1_Called(p),
pavolmarko@158
   194
		new State_Func2H_Called(p, 200),
pavolmarko@211
   195
		new State_Func2_Called(p, 0x87654321),
pavolmarko@158
   196
		new State_Func3H_Called(p),
pavolmarko@158
   197
		new State_Func3_Called(p),
pavolmarko@158
   198
		new State_Return(3),
pavolmarko@158
   199
		new State_Func4H_Called(p, 400),
pavolmarko@211
   200
		new State_Func4_Called(p, 0x12345678),
pavolmarko@158
   201
		new State_Return(4),
pavolmarko@158
   202
		NULL), "Part 2");
pavolmarko@158
   203
pavolmarko@199
   204
	// Call them through the mcallclass
pavolmarko@199
   205
	// 2.1)
pavolmarko@199
   206
	// Now call each function through the manual call class, using the hook decl and manually
pavolmarko@380
   207
	SH_MCALL(cc, TheWall_Func1)();
pavolmarko@380
   208
	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
pavolmarko@380
   209
	SH_MCALL(cc, TheWall_Func2)(200);
pavolmarko@380
   210
	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
pavolmarko@380
   211
	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
pavolmarko@380
   212
	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
pavolmarko@380
   213
	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
pavolmarko@380
   214
	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
pavolmarko@199
   215
pavolmarko@199
   216
	CHECK_STATES((&g_States,
pavolmarko@199
   217
		new State_Func1_Called(p),
pavolmarko@199
   218
		new State_Func1_Called(p),
pavolmarko@199
   219
		new State_Func2_Called(p, 200),
pavolmarko@199
   220
		new State_Func2_Called(p, 200),
pavolmarko@199
   221
		new State_Func3_Called(p),
pavolmarko@199
   222
		new State_Return(3),
pavolmarko@199
   223
		new State_Func3_Called(p),
pavolmarko@199
   224
		new State_Return(3),
pavolmarko@199
   225
		new State_Func4_Called(p, 400),
pavolmarko@199
   226
		new State_Return(4),
pavolmarko@199
   227
		new State_Func4_Called(p, 400),
pavolmarko@199
   228
		new State_Return(4),
pavolmarko@199
   229
		NULL), "Part 2.1");
pavolmarko@199
   230
pavolmarko@199
   231
	// Unhook them
pavolmarko@324
   232
	SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@324
   233
	SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   234
	SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   235
	SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   236
pavolmarko@158
   237
	// 3)
pavolmarko@199
   238
	// Hook each function manually, call them
pavolmarko@158
   239
pavolmarko@324
   240
	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@324
   241
	SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   242
	SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   243
	SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   244
pavolmarko@158
   245
	p->Func1();
pavolmarko@158
   246
	p->Func2(200);
pavolmarko@158
   247
	ADD_STATE(State_Return(p->Func3()));
pavolmarko@158
   248
	ADD_STATE(State_Return(p->Func4(400)));
pavolmarko@158
   249
pavolmarko@158
   250
	CHECK_STATES((&g_States,
pavolmarko@158
   251
		new State_Func1H_Called(p),
pavolmarko@158
   252
		new State_Func1_Called(p),
pavolmarko@158
   253
		new State_Func2H_Called(p, 200),
pavolmarko@211
   254
		new State_Func2_Called(p, 0x87654321),
pavolmarko@158
   255
		new State_Func3H_Called(p),
pavolmarko@158
   256
		new State_Func3_Called(p),
pavolmarko@158
   257
		new State_Return(3),
pavolmarko@158
   258
		new State_Func4H_Called(p, 400),
pavolmarko@211
   259
		new State_Func4_Called(p, 0x12345678),
pavolmarko@158
   260
		new State_Return(4),
pavolmarko@158
   261
		NULL), "Part 3");
pavolmarko@158
   262
pavolmarko@199
   263
	// Now through the mcallclass
pavolmarko@199
   264
pavolmarko@199
   265
	// Call them through the mcallclass
pavolmarko@199
   266
	// 3.1)
pavolmarko@199
   267
	// Now call each function through the manual call class, using the hook decl and manually
pavolmarko@380
   268
	SH_MCALL(cc, TheWall_Func1)();
pavolmarko@380
   269
	SH_MCALL2(cc, MFP_Func1(), 0, 0, 0)();
pavolmarko@380
   270
	SH_MCALL(cc, TheWall_Func2)(200);
pavolmarko@380
   271
	SH_MCALL2(cc, MFP_Func2(), 1, 0, 0)(200);
pavolmarko@380
   272
	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func3)()));
pavolmarko@380
   273
	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func3(), 2, 0, 0)()));
pavolmarko@380
   274
	ADD_STATE(State_Return(SH_MCALL(cc, TheWall_Func4)(400)));
pavolmarko@380
   275
	ADD_STATE(State_Return(SH_MCALL2(cc, MFP_Func4(), 3, 0, 0)(400)));
pavolmarko@199
   276
pavolmarko@199
   277
	CHECK_STATES((&g_States,
pavolmarko@199
   278
		new State_Func1_Called(p),
pavolmarko@199
   279
		new State_Func1_Called(p),
pavolmarko@199
   280
		new State_Func2_Called(p, 200),
pavolmarko@199
   281
		new State_Func2_Called(p, 200),
pavolmarko@199
   282
		new State_Func3_Called(p),
pavolmarko@199
   283
		new State_Return(3),
pavolmarko@199
   284
		new State_Func3_Called(p),
pavolmarko@199
   285
		new State_Return(3),
pavolmarko@199
   286
		new State_Func4_Called(p, 400),
pavolmarko@199
   287
		new State_Return(4),
pavolmarko@199
   288
		new State_Func4_Called(p, 400),
pavolmarko@199
   289
		new State_Return(4),
pavolmarko@199
   290
		NULL), "Part 3.1");
pavolmarko@199
   291
pavolmarko@199
   292
	// Unhook them
pavolmarko@324
   293
	SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@324
   294
	SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   295
	SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   296
	SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   297
pavolmarko@158
   298
	// 4)
pavolmarko@158
   299
	// Hook each function manually, then normally, call, unhook
pavolmarko@158
   300
pavolmarko@158
   301
	AnotherBrick handler_inst;
pavolmarko@158
   302
pavolmarko@158
   303
	// Why this?
pavolmarko@324
   304
	// 1) tests sh_add_manualhook
pavolmarko@158
   305
	// 2) in my tests, the proto of the manual hook was not equal to the proto of the auto hook
pavolmarko@158
   306
	//    (because there are no attribs for manual hooks).
pavolmarko@158
   307
	//    sourcehook.cpp did a !strcmp(..), so it assigned a new hook manager even though there
pavolmarko@158
   308
	//    already was one for this vfnptr. This hook manager stored the pointer of the original
pavolmarko@158
   309
	//    hook manager's hookfunc as the orig pointer - everything seemingly worked.
pavolmarko@158
   310
	//    The problem with this is that returning MRES_SUPERCEDE (as AnotherBrick::Handler_Func1
pavolmarko@158
   311
	//    does) will supercede the second hook func from being called - thus bypassing the call
pavolmarko@158
   312
	//    of the auto hook here.
pavolmarko@324
   313
	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false);
pavolmarko@324
   314
	SH_ADD_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   315
	SH_ADD_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   316
	SH_ADD_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   317
pavolmarko@324
   318
	SH_ADD_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@324
   319
	SH_ADD_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   320
	SH_ADD_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   321
	SH_ADD_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   322
pavolmarko@158
   323
	p->Func1();
pavolmarko@158
   324
	p->Func2(200);
pavolmarko@158
   325
	ADD_STATE(State_Return(p->Func3()));
pavolmarko@158
   326
	ADD_STATE(State_Return(p->Func4(400)));
pavolmarko@158
   327
pavolmarko@158
   328
	CHECK_STATES((&g_States,
pavolmarko@158
   329
		new State_Func1H_Called(p),
pavolmarko@158
   330
		new State_Func1H_Called(p),
pavolmarko@158
   331
		//new State_Func1_Called(p),
pavolmarko@158
   332
		new State_Func2H_Called(p, 200),
pavolmarko@211
   333
		new State_Func2H_Called(p, 0x87654321),
pavolmarko@211
   334
		new State_Func2_Called(p, 0x87654321),
pavolmarko@158
   335
		new State_Func3H_Called(p),
pavolmarko@158
   336
		new State_Func3H_Called(p),
pavolmarko@158
   337
		new State_Func3_Called(p),
pavolmarko@158
   338
		new State_Return(3),
pavolmarko@158
   339
		new State_Func4H_Called(p, 400),
pavolmarko@211
   340
		new State_Func4H_Called(p, 0x12345678),
pavolmarko@211
   341
		new State_Func4_Called(p, 0x12345678),
pavolmarko@158
   342
		new State_Return(4),
pavolmarko@158
   343
		NULL), "Part 4");
pavolmarko@158
   344
pavolmarko@324
   345
	SH_REMOVE_MANUALHOOK(TheWall_Func1, p, SH_MEMBER(&handler_inst, &AnotherBrick::Handler_Func1), false);
pavolmarko@324
   346
	SH_REMOVE_MANUALHOOK(TheWall_Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   347
	SH_REMOVE_MANUALHOOK(TheWall_Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   348
	SH_REMOVE_MANUALHOOK(TheWall_Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   349
pavolmarko@324
   350
	SH_REMOVE_HOOK(TheWall, Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@324
   351
	SH_REMOVE_HOOK(TheWall, Func2, p, SH_STATIC(Handler_Func2), false);
pavolmarko@324
   352
	SH_REMOVE_HOOK(TheWall, Func3, p, SH_STATIC(Handler_Func3), false);
pavolmarko@324
   353
	SH_REMOVE_HOOK(TheWall, Func4, p, SH_STATIC(Handler_Func4), false);
pavolmarko@158
   354
pavolmarko@158
   355
	// 5) Reconfigure TheWall_Func1 to actually hook Func5:
pavolmarko@158
   356
	SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 4, 0, 0);
dvander@391
   357
	SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 4, 0, 0);
pavolmarko@324
   358
	SH_ADD_MANUALHOOK(TheWall_Func1, p, SH_STATIC(Handler_Func1), false);
pavolmarko@158
   359
pavolmarko@158
   360
	p->Func5();
pavolmarko@158
   361
pavolmarko@443
   362
	SH_MCALL(p, TheWall_Func1)();
pavolmarko@443
   363
pavolmarko@158
   364
	CHECK_STATES((&g_States,
pavolmarko@158
   365
		new State_Func1H_Called(p),
pavolmarko@158
   366
		new State_Func5_Called(p),
pavolmarko@443
   367
		new State_Func5_Called(p),
pavolmarko@158
   368
		NULL), "Part 5");
pavolmarko@158
   369
pavolmarko@158
   370
	// 6) Test auto-remove on reconfig
pavolmarko@158
   371
	SH_MANUALHOOK_RECONFIGURE(TheWall_Func1, 0, 0, 0);
pavolmarko@158
   372
pavolmarko@158
   373
	p->Func1();
pavolmarko@158
   374
	p->Func5();
pavolmarko@158
   375
	
pavolmarko@158
   376
	CHECK_STATES((&g_States,
pavolmarko@158
   377
		new State_Func1_Called(p),
pavolmarko@158
   378
		new State_Func5_Called(p),
pavolmarko@158
   379
		NULL), "Part 6");
pavolmarko@158
   380
pavolmarko@158
   381
	return true;
pavolmarko@158
   382
}