1.1 --- a/sourcehook/test/testhookmangen.cpp Fri Nov 02 12:41:00 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.cpp Fri Nov 02 20:15:19 2007 +0000
1.3 @@ -18,6 +18,17 @@
1.4
1.5 namespace
1.6 {
1.7 + StateList g_States;
1.8 + SourceHook::ISourceHook *g_SHPtr;
1.9 + SourceHook::Plugin g_PLID;
1.10 +
1.11 + // PtrBuf(ptr) gives ptrs unique numbers
1.12 + // in the order they appear
1.13 + SourceHook::List<const void*> g_PtrHash;
1.14 +
1.15 + bool g_Inside_LeafFunc = false; // inside a hook or a func
1.16 +
1.17 +
1.18 // POD / Object types
1.19 template <int MYSIZE>
1.20 struct POD
1.21 @@ -151,52 +162,6 @@
1.22 } \
1.23 };
1.24
1.25 - #include "testhookmangen.h"
1.26 -
1.27 - StateList g_States;
1.28 - SourceHook::ISourceHook *g_SHPtr;
1.29 - SourceHook::Plugin g_PLID;
1.30 -
1.31 - // PtrBuf(ptr) gives ptrs unique numbers
1.32 - // in the order they appear
1.33 - SourceHook::List<const void*> g_PtrHash;
1.34 -
1.35 - bool g_Inside_LeafFunc = false; // inside a hook or a func
1.36 -
1.37 - template <class T>
1.38 - int PtrBuf(T ptr)
1.39 - {
1.40 - int a = 0;
1.41 -
1.42 - const void *vptr = reinterpret_cast<const void*>(ptr);
1.43 - for (SourceHook::List<const void*>::iterator iter = g_PtrHash.begin(); iter != g_PtrHash.end(); ++iter)
1.44 - {
1.45 - if (*iter == vptr)
1.46 - return a;
1.47 - else
1.48 - ++a;
1.49 - }
1.50 - g_PtrHash.push_back(vptr);
1.51 - return static_cast<int>(g_PtrHash.size()) - 1;
1.52 - }
1.53 -
1.54 - template <class T>
1.55 - T PtrBufPtr(T ptr)
1.56 - {
1.57 - PtrBuf(ptr);
1.58 - return ptr;
1.59 - }
1.60 -
1.61 - void PtrBuf_Clear(int leave_in = 0)
1.62 - {
1.63 - for (SourceHook::List<const void*>::iterator iter = g_PtrHash.begin(); iter != g_PtrHash.end();)
1.64 - {
1.65 - if (--leave_in < 0)
1.66 - iter = g_PtrHash.erase(iter);
1.67 - else
1.68 - ++iter;
1.69 - }
1.70 - }
1.71
1.72
1.73 // "Increment" something: (reproducible change for recall tests)
1.74 @@ -250,6 +215,44 @@
1.75 }
1.76 };
1.77
1.78 + #include "testhookmangen.h"
1.79 +
1.80 + template <class T>
1.81 + int PtrBuf(T ptr)
1.82 + {
1.83 + int a = 0;
1.84 +
1.85 + const void *vptr = reinterpret_cast<const void*>(ptr);
1.86 + for (SourceHook::List<const void*>::iterator iter = g_PtrHash.begin(); iter != g_PtrHash.end(); ++iter)
1.87 + {
1.88 + if (*iter == vptr)
1.89 + return a;
1.90 + else
1.91 + ++a;
1.92 + }
1.93 + g_PtrHash.push_back(vptr);
1.94 + return static_cast<int>(g_PtrHash.size()) - 1;
1.95 + }
1.96 +
1.97 + template <class T>
1.98 + T PtrBufPtr(T ptr)
1.99 + {
1.100 + PtrBuf(ptr);
1.101 + return ptr;
1.102 + }
1.103 +
1.104 + void PtrBuf_Clear(int leave_in = 0)
1.105 + {
1.106 + for (SourceHook::List<const void*>::iterator iter = g_PtrHash.begin(); iter != g_PtrHash.end();)
1.107 + {
1.108 + if (--leave_in < 0)
1.109 + iter = g_PtrHash.erase(iter);
1.110 + else
1.111 + ++iter;
1.112 + }
1.113 + }
1.114 +
1.115 +
1.116 // MyDelegate base class for other delegates
1.117 class MyDelegate : public SourceHook::ISHDelegate
1.118 {
1.119 @@ -879,4 +882,4 @@
1.120 memset((void*)test4[2], 0, ps / 4);
1.121
1.122 return true;
1.123 -}
1.124 \ No newline at end of file
1.125 +}