1.1 --- a/sourcehook/test/test1.cpp Thu Sep 29 23:05:01 2005 +0000
1.2 +++ b/sourcehook/test/test1.cpp Mon Oct 03 17:20:22 2005 +0000
1.3 @@ -2,6 +2,8 @@
1.4 #include "sourcehook_impl.h"
1.5 #include "testevents.h"
1.6
1.7 +#include "sh_memory.h"
1.8 +
1.9 namespace
1.10 {
1.11 StateList g_States;
1.12 @@ -12,6 +14,7 @@
1.13 // Basic tests
1.14 // Hooking and callclass
1.15
1.16 + MAKE_STATE_1(State_ModuleInMemory, bool);
1.17 MAKE_STATE(State_F1_Called);
1.18 MAKE_STATE_1(State_F1_PreHandler_Called, void*);
1.19 MAKE_STATE_1(State_F1_PostHandler_Called, void*);
1.20 @@ -385,6 +388,22 @@
1.21
1.22 bool TestBasic(std::string &error)
1.23 {
1.24 +
1.25 + // Simple test for ModuleInMemory:
1.26 + // 1) &error should on the stack
1.27 + // 2) 0 should not be mapped
1.28 + // 3) &error to -1 should not be mapped
1.29 + ADD_STATE(State_ModuleInMemory(SourceHook::ModuleInMemory(reinterpret_cast<char*>(&error), sizeof(error))));
1.30 + ADD_STATE(State_ModuleInMemory(SourceHook::ModuleInMemory(0, 1)));
1.31 + ADD_STATE(State_ModuleInMemory(SourceHook::ModuleInMemory(reinterpret_cast<char*>(&error),
1.32 + (reinterpret_cast<std::string*>(-1) - &error) - 1)));
1.33 +
1.34 + CHECK_STATES((&g_States,
1.35 + new State_ModuleInMemory(true),
1.36 + new State_ModuleInMemory(false),
1.37 + new State_ModuleInMemory(false),
1.38 + NULL), "ModuleInMemory");
1.39 +
1.40 SourceHook::CSourceHookImpl g_SHImpl;
1.41 g_SHPtr = &g_SHImpl;
1.42 g_PLID = 1337;
1.43 @@ -401,7 +420,7 @@
1.44 SH_CALL(cc, &Test::F1)();
1.45 pTest->F1();
1.46
1.47 - CHECK_STATES((&g_States,
1.48 + CHECK_STATES((&g_States,
1.49 new State_F1_CallClassGenerated,
1.50 new State_F1_Called,
1.51 new State_F1_Called,
1.52 @@ -421,7 +440,7 @@
1.53 SH_CALL(cc, &Test::F1)();
1.54 pTest->F1();
1.55
1.56 - CHECK_STATES((&g_States,
1.57 + CHECK_STATES((&g_States,
1.58 new State_F1_CallClassGenerated,
1.59 new State_F1_Called,
1.60 new State_F1_Called,
1.61 @@ -437,8 +456,8 @@
1.62
1.63 SH_CALL(cc, &Test::F1)();
1.64 pTest->F1();
1.65 -
1.66 - CHECK_STATES((&g_States,
1.67 +
1.68 + CHECK_STATES((&g_States,
1.69 new State_F1_HookAdded(true),
1.70 new State_F1_Called,
1.71 new State_F1_PreHandler_Called(&f1_handlers),
1.72 @@ -446,7 +465,7 @@
1.73
1.74 // 4) Rerequest the callclass
1.75 SH_RELEASE_CALLCLASS(cc);
1.76 -
1.77 +
1.78 ADD_STATE(State_F1_CallClassReleased);
1.79 cc2 = SH_GET_CALLCLASS(pTest);
1.80 ADD_STATE(State_F1_CallClassGenerated);
1.81 @@ -454,11 +473,11 @@
1.82 SH_CALL(cc, &Test::F1)();
1.83 pTest->F1();
1.84
1.85 - CHECK_STATES((&g_States,
1.86 + CHECK_STATES((&g_States,
1.87 new State_F1_CallClassReleased,
1.88 new State_F1_CallClassGenerated,
1.89 new State_F1_Called,
1.90 - new State_F1_PreHandler_Called(&f1_handlers),
1.91 + new State_F1_PreHandler_Called(&f1_handlers),
1.92 NULL), "Part 4");
1.93
1.94 // 5) Check ignore / supercede
1.95 @@ -485,7 +504,7 @@
1.96 SH_CALL(cc, &Test::F1)();
1.97 pTest->F1();
1.98
1.99 - CHECK_STATES((&g_States,
1.100 + CHECK_STATES((&g_States,
1.101 new State_F1_HookRemoved,
1.102 new State_F1_Called,
1.103 new State_F1_Called,
1.104 @@ -498,7 +517,7 @@
1.105 SH_CALL(cc, &Test::F1)();
1.106 pTest->F1();
1.107
1.108 - CHECK_STATES((&g_States,
1.109 + CHECK_STATES((&g_States,
1.110 new State_F1_HookAdded(true),
1.111 new State_F1_Called,
1.112 new State_F1_Called,
1.113 @@ -516,7 +535,7 @@
1.114 SH_CALL(cc, &Test::F1)();
1.115 pTest->F1();
1.116
1.117 - CHECK_STATES((&g_States,
1.118 + CHECK_STATES((&g_States,
1.119 new State_F1_HookAdded(true),
1.120 new State_F1_Called,
1.121 new State_F1_PreHandler_Called(&f1_handlers),
1.122 @@ -536,7 +555,7 @@
1.123 SH_CALL(cc, &Test::F1)();
1.124 pTest->F1();
1.125
1.126 - CHECK_STATES((&g_States,
1.127 + CHECK_STATES((&g_States,
1.128 new State_F1_HookRemoved,
1.129 new State_F1_HookRemoved,
1.130 new State_F1_Called,
1.131 @@ -550,7 +569,7 @@
1.132 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.133 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.134
1.135 - CHECK_STATES((&g_States,
1.136 + CHECK_STATES((&g_States,
1.137 new State_F299_Called("hi"),
1.138 new State_F299Ret(true),
1.139 new State_F299_Called("hi"),
1.140 @@ -561,7 +580,7 @@
1.141 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.142 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.143
1.144 - CHECK_STATES((&g_States,
1.145 + CHECK_STATES((&g_States,
1.146 new State_F299_PreHandlerCalled("hi"),
1.147 new State_F299_Called("hi"),
1.148 new State_F299Ret(true),
1.149 @@ -573,7 +592,7 @@
1.150 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.151 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.152
1.153 - CHECK_STATES((&g_States,
1.154 + CHECK_STATES((&g_States,
1.155 new State_F299_PreHandlerCalled("hi"),
1.156 new State_F299_Called("hi"),
1.157 new State_F299_PostHandlerCalled("hi"),
1.158 @@ -586,7 +605,7 @@
1.159 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.160 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.161
1.162 - CHECK_STATES((&g_States,
1.163 + CHECK_STATES((&g_States,
1.164 new State_F299_PreHandlerCalled("hi"),
1.165 new State_F299_Called("hi"),
1.166 new State_F299_PostHandlerCalled("hi"),
1.167 @@ -599,7 +618,7 @@
1.168 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.169 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.170
1.171 - CHECK_STATES((&g_States,
1.172 + CHECK_STATES((&g_States,
1.173 new State_F299_PreHandlerCalled("hi"),
1.174 new State_F299_PostHandlerCalled("hi"),
1.175 new State_F299Ret(true),
1.176 @@ -611,7 +630,7 @@
1.177 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.178 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.179
1.180 - CHECK_STATES((&g_States,
1.181 + CHECK_STATES((&g_States,
1.182 new State_F299_Called("hi"),
1.183 new State_F299_PostHandlerCalled("hi"),
1.184 new State_F299Ret(false),
1.185 @@ -623,7 +642,7 @@
1.186 ADD_STATE(State_F299Ret(pTest->F299("hi")));
1.187 ADD_STATE(State_F299Ret(SH_CALL(cc, &Test::F299)("hi")));
1.188
1.189 - CHECK_STATES((&g_States,
1.190 + CHECK_STATES((&g_States,
1.191 new State_F299_Called("hi"),
1.192 new State_F299Ret(true),
1.193 new State_F299_Called("hi"),
1.194 @@ -635,7 +654,7 @@
1.195 ADD_STATE(State_F1_CallClassReleased);
1.196
1.197
1.198 - CHECK_STATES((&g_States,
1.199 + CHECK_STATES((&g_States,
1.200 new State_F1_CallClassReleased,
1.201 NULL), "Part 11");
1.202