1.1 --- a/sourcehook/FastDelegate.h Sun May 01 09:55:51 2005 +0000
1.2 +++ b/sourcehook/FastDelegate.h Sun May 01 12:36:48 2005 +0000
1.3 @@ -41,9 +41,12 @@
1.4
1.5 #ifndef FASTDELEGATE_H
1.6 #define FASTDELEGATE_H
1.7 -#if _MSC_VER > 1000
1.8 -#pragma once
1.9 -#endif // _MSC_VER > 1000
1.10 +
1.11 +#ifdef _MSC_VER
1.12 +# if _MSC_VER > 1000
1.13 +# pragma once
1.14 +# endif // _MSC_VER > 1000
1.15 +#endif // #ifdef _MSC_VER
1.16
1.17 #include <memory.h> // to allow <,> comparisons
1.18
1.19 @@ -614,7 +617,7 @@
1.20 return right.IsLess(*this);
1.21 }
1.22 DelegateMemento (const DelegateMemento &right) :
1.23 - m_pFunction(right.m_pFunction), m_pthis(right.m_pthis)
1.24 + m_pthis(right.m_pthis), m_pFunction(right.m_pFunction)
1.25 #if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
1.26 , m_pStaticFunction (right.m_pStaticFunction)
1.27 #endif
2.1 --- a/sourcehook/generate/FastDelegate.hxx Sun May 01 09:55:51 2005 +0000
2.2 +++ b/sourcehook/generate/FastDelegate.hxx Sun May 01 12:36:48 2005 +0000
2.3 @@ -41,9 +41,12 @@
2.4
2.5 #ifndef FASTDELEGATE_H
2.6 #define FASTDELEGATE_H
2.7 -#if _MSC_VER > 1000
2.8 -#pragma once
2.9 -#endif // _MSC_VER > 1000
2.10 +
2.11 +#ifdef _MSC_VER
2.12 +# if _MSC_VER > 1000
2.13 +# pragma once
2.14 +# endif // _MSC_VER > 1000
2.15 +#endif // #ifdef _MSC_VER
2.16
2.17 #include <memory.h> // to allow <,> comparisons
2.18
2.19 @@ -614,7 +617,7 @@
2.20 return right.IsLess(*this);
2.21 }
2.22 DelegateMemento (const DelegateMemento &right) :
2.23 - m_pFunction(right.m_pFunction), m_pthis(right.m_pthis)
2.24 + m_pthis(right.m_pthis), m_pFunction(right.m_pFunction)
2.25 #if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
2.26 , m_pStaticFunction (right.m_pStaticFunction)
2.27 #endif
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/sourcehook/generate/generate Sun May 01 12:36:48 2005 +0000
3.3 @@ -0,0 +1,6 @@
3.4 +#/bin/sh
3.5 +
3.6 +./shworker.bin iter $1 sourcehook.hxx sourcehook.h
3.7 +./shworker.bin hopter $1 FastDelegate.hxx FastDelegate.h
3.8 +
3.9 +cp *.h ..
4.1 Binary file sourcehook/generate/shworker.bin has changed
5.1 --- a/sourcehook/generate/shworker/Makefile Sun May 01 09:55:51 2005 +0000
5.2 +++ b/sourcehook/generate/shworker/Makefile Sun May 01 12:36:48 2005 +0000
5.3 @@ -3,13 +3,13 @@
5.4 bin:
5.5 mkdir bin
5.6
5.7 -fd_hopter.o: fd_hopter.cpp
5.8 +fd_hopter.o: fd_hopter.cpp bin
5.9 gcc -fPIC -o bin/$@ -c $<
5.10
5.11 -main.o: main.cpp
5.12 +main.o: main.cpp bin
5.13 gcc -fPIC -o bin/$@ -c $<
5.14
5.15 -shworker: fd_hopter.o main.o
5.16 - gcc -ldl -lstdc++ bin/fd_hopter.o bin/main.o -o bin/shworker
5.17 +shworker: fd_hopter.o main.o bin
5.18 + gcc -ldl -lstdc++ bin/fd_hopter.o bin/main.o -o bin/shworker.bin
5.19
5.20
6.1 --- a/sourcehook/generate/sourcehook.hxx Sun May 01 09:55:51 2005 +0000
6.2 +++ b/sourcehook/generate/sourcehook.hxx Sun May 01 12:36:48 2005 +0000
6.3 @@ -20,7 +20,13 @@
6.4 #define SH_GLOB_PLUGPTR g_PLID
6.5 #endif
6.6
6.7 -#define SH_ASSERT(x, info) if (!(x)) __asm { int 3 }
6.8 +#ifdef SH_DEBUG
6.9 +# define SH_ASSERT__(x, info, file, line, func) \
6.10 + ((printf("SOURCEHOOK DEBUG ASSERTION FAILED:\n %s:%u(%s): %s\n", file, line, func, info), true) ? (abort(), 0) : 0)
6.11 +# define SH_ASSERT(x, info) if (!(x)) SH_ASSERT__(x, info, __FILE__, __LINE__, __FUNCTION__)
6.12 +#else
6.13 +# define SH_ASSERT(x, info)
6.14 +#endif
6.15
6.16 // System
6.17 #define SH_SYS_WIN32 1
6.18 @@ -67,7 +73,7 @@
6.19 MRES_IGNORED=0, // plugin didn't take any action
6.20 MRES_HANDLED, // plugin did something, but real function should still be called
6.21 MRES_OVERRIDE, // call real function, but use my return value
6.22 - MRES_SUPERCEDE, // skip real function; use my return value
6.23 + MRES_SUPERCEDE // skip real function; use my return value
6.24 };
6.25
6.26
6.27 @@ -671,7 +677,7 @@
6.28 @VARARGS@
6.29 // Support for @$@ arguments
6.30 @template<@@class Param%%|, @@> @RetType operator()(@Param%% p%%|, @) const
6.31 - SH_MAKE_EXECUTABLECLASS_OB((@p%%@), (@Param%%@))
6.32 + SH_MAKE_EXECUTABLECLASS_OB((@p%%|, @), (@Param%%|, @))
6.33
6.34 @ENDARGS@
6.35 };
6.36 @@ -698,4 +704,4 @@
6.37 #undef SH_MAKE_EXECUTABLECLASS_BODY
6.38
6.39 #endif
6.40 - // The pope is dead. -> :(
6.41 \ No newline at end of file
6.42 + // The pope is dead. -> :(
7.1 --- a/sourcehook/sourcehook.cpp Sun May 01 09:55:51 2005 +0000
7.2 +++ b/sourcehook/sourcehook.cpp Sun May 01 12:36:48 2005 +0000
7.3 @@ -401,7 +401,8 @@
7.4 CSourceHookImpl::HookManInfoList::iterator CSourceHookImpl::FindHookMan(HookManInfoList::iterator begin,
7.5 HookManInfoList::iterator end, const char *proto, int vtblofs, int vtblidx)
7.6 {
7.7 - for (HookManInfoList::iterator hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
7.8 + HookManInfoList::iterator hookmaniter;
7.9 + for (hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
7.10 {
7.11 if (strcmp(hookmaniter->proto, proto) == 0 && hookmaniter->vtbl_offs == vtblofs &&
7.12 hookmaniter->vtbl_idx == vtblidx)
8.1 --- a/sourcehook/sourcehook.h Sun May 01 09:55:51 2005 +0000
8.2 +++ b/sourcehook/sourcehook.h Sun May 01 12:36:48 2005 +0000
8.3 @@ -20,7 +20,13 @@
8.4 #define SH_GLOB_PLUGPTR g_PLID
8.5 #endif
8.6
8.7 -#define SH_ASSERT(x, info) if (!(x)) __asm { int 3 }
8.8 +#ifdef SH_DEBUG
8.9 +# define SH_ASSERT__(x, info, file, line, func) \
8.10 + ((printf("SOURCEHOOK DEBUG ASSERTION FAILED:\n %s:%u(%s): %s\n", file, line, func, info), true) ? (abort(), 0) : 0)
8.11 +# define SH_ASSERT(x, info) if (!(x)) SH_ASSERT__(x, info, __FILE__, __LINE__, __FUNCTION__)
8.12 +#else
8.13 +# define SH_ASSERT(x, info)
8.14 +#endif
8.15
8.16 // System
8.17 #define SH_SYS_WIN32 1
8.18 @@ -67,7 +73,7 @@
8.19 MRES_IGNORED=0, // plugin didn't take any action
8.20 MRES_HANDLED, // plugin did something, but real function should still be called
8.21 MRES_OVERRIDE, // call real function, but use my return value
8.22 - MRES_SUPERCEDE, // skip real function; use my return value
8.23 + MRES_SUPERCEDE // skip real function; use my return value
8.24 };
8.25
8.26
8.27 @@ -1492,63 +1498,63 @@
8.28
8.29 // Support for 2 arguments
8.30 template<class Param1, class Param2> RetType operator()(Param1 p1, Param2 p2) const
8.31 - SH_MAKE_EXECUTABLECLASS_OB((p1p2), (Param1Param2))
8.32 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2), (Param1, Param2))
8.33
8.34 // Support for 3 arguments
8.35 template<class Param1, class Param2, class Param3> RetType operator()(Param1 p1, Param2 p2, Param3 p3) const
8.36 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3), (Param1Param2Param3))
8.37 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3), (Param1, Param2, Param3))
8.38
8.39 // Support for 4 arguments
8.40 template<class Param1, class Param2, class Param3, class Param4> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4) const
8.41 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4), (Param1Param2Param3Param4))
8.42 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4), (Param1, Param2, Param3, Param4))
8.43
8.44 // Support for 5 arguments
8.45 template<class Param1, class Param2, class Param3, class Param4, class Param5> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5) const
8.46 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5), (Param1Param2Param3Param4Param5))
8.47 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5), (Param1, Param2, Param3, Param4, Param5))
8.48
8.49 // Support for 6 arguments
8.50 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6) const
8.51 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6), (Param1Param2Param3Param4Param5Param6))
8.52 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6), (Param1, Param2, Param3, Param4, Param5, Param6))
8.53
8.54 // Support for 7 arguments
8.55 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7) const
8.56 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7), (Param1Param2Param3Param4Param5Param6Param7))
8.57 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7), (Param1, Param2, Param3, Param4, Param5, Param6, Param7))
8.58
8.59 // Support for 8 arguments
8.60 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8) const
8.61 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8), (Param1Param2Param3Param4Param5Param6Param7Param8))
8.62 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8))
8.63
8.64 // Support for 9 arguments
8.65 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9) const
8.66 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9), (Param1Param2Param3Param4Param5Param6Param7Param8Param9))
8.67 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9))
8.68
8.69 // Support for 10 arguments
8.70 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10) const
8.71 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10))
8.72 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10))
8.73
8.74 // Support for 11 arguments
8.75 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11) const
8.76 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11))
8.77 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11))
8.78
8.79 // Support for 12 arguments
8.80 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12) const
8.81 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12))
8.82 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12))
8.83
8.84 // Support for 13 arguments
8.85 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13) const
8.86 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13))
8.87 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13))
8.88
8.89 // Support for 14 arguments
8.90 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14) const
8.91 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14))
8.92 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14))
8.93
8.94 // Support for 15 arguments
8.95 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15) const
8.96 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14p15), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14Param15))
8.97 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15))
8.98
8.99 // Support for 16 arguments
8.100 template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
8.101 - SH_MAKE_EXECUTABLECLASS_OB((p1p2p3p4p5p6p7p8p9p10p11p12p13p14p15p16), (Param1Param2Param3Param4Param5Param6Param7Param8Param9Param10Param11Param12Param13Param14Param15Param16))
8.102 + SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
8.103
8.104 };
8.105 }
8.106 @@ -1813,3 +1819,4 @@
8.107
8.108 #endif
8.109 // The pope is dead. -> :(
8.110 +
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/sourcehook/test/Makefile Sun May 01 12:36:48 2005 +0000
9.3 @@ -0,0 +1,23 @@
9.4 +CC=gcc
9.5 +CCFLAGS=-c -I.. -DSH_DEBUG
9.6 +
9.7 +test.bin: bin bin/main.o bin/test1.o bin/test2.o bin/sourcehook.o
9.8 + $(CC) bin/main.o bin/test1.o bin/test2.o bin/sourcehook.o -lstdc++ -o test.bin
9.9 +
9.10 +bin:
9.11 + mkdir bin
9.12 +
9.13 +bin/main.o: main.cpp ../sourcehook.h
9.14 + $(CC) $(CCFLAGS) -o bin/main.o main.cpp
9.15 +
9.16 +bin/test1.o: test1.cpp ../sourcehook.h
9.17 + $(CC) $(CCFLAGS) -o bin/test1.o test1.cpp
9.18 +
9.19 +bin/test2.o: test2.cpp ../sourcehook.h
9.20 + $(CC) $(CCFLAGS) -o bin/test2.o test2.cpp
9.21 +
9.22 +bin/sourcehook.o: ../sourcehook.cpp ../sourcehook.h
9.23 + $(CC) $(CCFLAGS) -o bin/sourcehook.o ../sourcehook.cpp
9.24 +
9.25 +../sourcehook.h: ../generate/sourcehook.hxx
9.26 + (cd ../generate; ./generate 16)
10.1 --- a/sourcehook/test/main.cpp Sun May 01 09:55:51 2005 +0000
10.2 +++ b/sourcehook/test/main.cpp Sun May 01 12:36:48 2005 +0000
10.3 @@ -71,4 +71,5 @@
10.4
10.5 char x;
10.6 cin.read(&x, 1);
10.7 -}
10.8 \ No newline at end of file
10.9 +}
10.10 +
11.1 --- a/sourcehook/test/test1.cpp Sun May 01 09:55:51 2005 +0000
11.2 +++ b/sourcehook/test/test1.cpp Sun May 01 12:36:48 2005 +0000
11.3 @@ -733,4 +733,5 @@
11.4 SH_REMOVE_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
11.5 SH_REMOVE_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
11.6 return true;
11.7 -}
11.8 \ No newline at end of file
11.9 +}
11.10 +
12.1 --- a/sourcehook/test/test2.cpp Sun May 01 09:55:51 2005 +0000
12.2 +++ b/sourcehook/test/test2.cpp Sun May 01 12:36:48 2005 +0000
12.3 @@ -106,4 +106,5 @@
12.4 SH_RELEASE_CALLCLASS(cc);
12.5
12.6 return true;
12.7 -}
12.8 \ No newline at end of file
12.9 +}
12.10 +
13.1 --- a/sourcehook/test/testevents.h Sun May 01 09:55:51 2005 +0000
13.2 +++ b/sourcehook/test/testevents.h Sun May 01 12:36:48 2005 +0000
13.3 @@ -1,6 +1,9 @@
13.4 #ifndef __TESTEVENTS_H__
13.5 #define __TESTEVENTS_H__
13.6
13.7 +#include <typeinfo>
13.8 +#include <stdarg.h>
13.9 +
13.10 namespace
13.11 {
13.12
13.13 @@ -69,4 +72,5 @@
13.14
13.15 #define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; }
13.16
13.17 -#endif
13.18 \ No newline at end of file
13.19 +#endif
13.20 +