Macros to make everything pretty

Author: mmavipc

CMakeLists.txt

@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8)
 project (StarboundAPI)
 
 if(WIN32)
@@ -6,6 +7,10 @@ if(WIN32)
 	)
 endif()
 
+if(MSVC)
+MESSAGE("TURN OFF INCREMENTAL LINKING OR BAD SHIT WILL HAPPEN")
+endif()
+
 add_library(SBAPIDll SHARED
 	${OS_FILES}
 	main.cpp

Hooking.h

@@ -10,6 +10,7 @@
 #ifdef _WIN32
 #define ASM_START _asm {
 #define ASM_END }
+#define ASM_MACRO_SS _asm
 #define EXPORT _declspec(dllexport)
 #define FASTCALL __fastcall
 #define NAKED _declspec(naked)
@@ -25,6 +26,29 @@
 //addr is temporary, will be replaced with symbol/signature later
 #define HOOKMEMBERFUNCTION(funcName, addr) void hook_funcName();
 
+#define HOOKDEST_DECL(classname) friend class classname##_init; \
+	public: \
+	static std::unordered_map<std::string, void*> m_selfFuncAddrs; \
+	static std::unordered_map<std::string, void*> m_funcAddrs; 
+#define HOOKDEST_DEF(classname) std::unordered_map<std::string, void*> PluginTitle::m_selfFuncAddrs; \
+std::unordered_map<std::string, void*> PluginTitle::m_funcAddrs;
+
+#define HOOKTABLE_START(classname) template<typename T> \
+	struct classname##_hookinit { \
+	classname##_hookinit() { 
+
+#define SETUPHOOKEDFUNC(tgtClassname, funcName) T::m_selfFuncAddrs[ #funcName ] = &(void*&)T::##funcName; \
+	g_hookedClasses[ #tgtClassname ]->hookMemberFunc( #funcName , &(void*&)T::##funcName);
+
+#define HOOKTABLE_END(classname) }}; \
+	static classname##_hookinit<##classname##> classname##_init;
+
+#define CALL_FUNC(funcName, addrVarName) addrVarName = m_funcAddrs[ #funcName ]; \
+	ASM_START \
+		ASM_MACRO_SS mov ecx, this \
+		ASM_MACRO_SS call addrVarName \
+	ASM_END
+
 class ClassHooker;
 extern std::unordered_map<std::string, ClassHooker*> g_hookedClasses;
 

Title.cpp

@@ -22,33 +22,29 @@ struct TitleStruct
 //plugin
 
 //figuring out how to do the plugin side
-class PluginTitle : public TitleStruct
+struct PluginTitle : public TitleStruct
 {
-	friend class PluginTitle_hookinit;
 	void update(ClassHooker *ch)
 	{
 		ch->unhookMemberFunc("update");
-		void* dest = (void*)0x00419500;
-		ASM_START
-			mov ecx, this
-			call dest
-		ASM_END
+		void* funcAddr;
+		CALL_FUNC(update, funcAddr);
 		ch->hookMemberFunc("update", m_selfFuncAddrs["update"]);
 		return;
 	}
-	public:
-		static std::unordered_map<std::string, void*> m_selfFuncAddrs;
+	HOOKDEST_DECL(PluginTitle)
 };
-std::unordered_map<std::string, void*> PluginTitle::m_selfFuncAddrs;
+HOOKDEST_DEF(PluginTitle)
 
-class PluginTitle_hookinit
-{
-	public:
-		PluginTitle_hookinit()
-		{
-			PluginTitle::m_selfFuncAddrs["update"] = &(void*&)PluginTitle::update;
-			g_hookedClasses["Title"]->hookMemberFunc("update", &(void*&)PluginTitle::update);
-		}
-};
+HOOKTABLE_START(PluginTitle)
+	SETUPHOOKEDFUNC(Title, update)
+HOOKTABLE_END(PluginTitle)
 
-static PluginTitle_hookinit init;
+/*template<typename T> struct PluginTitle_hookinit { 
+	PluginTitle_hookinit() 
+	{
+		T::m_selfFuncAddrs[ "update" ] = &(void*&)T::update; 
+		g_hookedClasses[ "Title" ]->hookMemberFunc( "update" , &(void*&)T::update);
+	}
+}; 
+static PluginTitle_hookinit<PluginTitle> PluginTitle_init;*/