1.1 --- a/sourcehook/test/test1.cpp Thu Dec 22 21:00:54 2005 +0000
1.2 +++ b/sourcehook/test/test1.cpp Fri Dec 23 11:58:11 2005 +0000
1.3 @@ -1,5 +1,5 @@
1.4 #include <string>
1.5 -#include "sourcehook_impl.h"
1.6 +#include "sourcehook_test.h"
1.7 #include "testevents.h"
1.8
1.9 #include "sh_memory.h"
1.10 @@ -92,7 +92,7 @@
1.11 virtual void F57(){}
1.12 virtual void F58(){}
1.13 virtual void F59(){}
1.14 - virtual void F60(){}
1.15 + virtual void F60(int &hello){}
1.16 virtual void F61(){}
1.17 virtual void F62(){}
1.18 virtual void F63(){}
1.19 @@ -350,6 +350,8 @@
1.20 SH_DECL_HOOK0_void(Test, F9, SH_NOATTRIB, 0);
1.21 SH_DECL_HOOK0_void(Test, F10, SH_NOATTRIB, 0);
1.22
1.23 + SH_DECL_HOOK1_void(Test, F60, SH_NOATTRIB, 0, int&);
1.24 +
1.25 META_RES g_F1Pre_WhatToDo;
1.26 META_RES g_F1Post_WhatToDo;
1.27
1.28 @@ -384,8 +386,18 @@
1.29 !META_RESULT_ORIG_RET(bool));
1.30 }
1.31
1.32 + void F60_Pre(int &hello)
1.33 + {
1.34 + hello = 10;
1.35 + }
1.36 }
1.37
1.38 +template <class T> T func(T a)
1.39 +{
1.40 + return a;
1.41 +}
1.42 +
1.43 +
1.44 bool TestBasic(std::string &error)
1.45 {
1.46 // Simple test for ModuleInMemory
1.47 @@ -399,8 +411,7 @@
1.48 new State_ModuleInMemory(false),
1.49 NULL), "ModuleInMemory");
1.50
1.51 - SourceHook::CSourceHookImpl g_SHImpl;
1.52 - g_SHPtr = &g_SHImpl;
1.53 + GET_SHPTR(g_SHPtr);
1.54 g_PLID = 1337;
1.55
1.56 HandlersF1 f1_handlers;
1.57 @@ -676,7 +687,13 @@
1.58 SH_REMOVE_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.59 SH_REMOVE_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
1.60
1.61 - g_SHImpl.CompleteShutdown();
1.62 + SH_ADD_HOOK_STATICFUNC(Test, F60, pTest, F60_Pre, false);
1.63 +
1.64 + int a = 0;
1.65 + pTest->F60(a);
1.66 + Test_CompleteShutdown(g_SHPtr);
1.67 +
1.68 + CHECK_COND(a == 10, "Part12.a");
1.69
1.70 return true;
1.71 }