Added trampoline_address property to CFunction.

Author: CookStar

src/core/modules/memory/memory_function.cpp

@@ -334,6 +334,15 @@ object CFunction::SkipHooks(tuple args, dict kw)
 	return Call(args, kw);
 }
 
+unsigned long CFunction::GetTrampolineAddress()
+{
+	CHook* pHook = GetHookManager()->FindHook((void *) m_ulAddr);
+	if (pHook)
+		return (unsigned long) pHook->m_pTrampoline;
+
+	return m_ulAddr;
+}
+
 CHook* HookFunctionHelper(void* addr, ICallingConvention* pConv)
 {
 	CHook* result;

src/core/modules/memory/memory_function.h

@@ -66,28 +66,30 @@ class CFunction: public CPointer, private boost::noncopyable
 	bool IsHookable();
 
 	bool IsHooked();
-    
+
 	object Call(boost::python::tuple args, dict kw);
 	object CallTrampoline(boost::python::tuple args, dict kw);
 	object SkipHooks(boost::python::tuple args, dict kw);
-	
+
+	unsigned long GetTrampolineAddress();
+
 	void AddHook(HookType_t eType, PyObject* pCallable);
 	void RemoveHook(HookType_t eType, PyObject* pCallable);
-    
+
 	void AddPreHook(PyObject* pCallable)
 	{ return AddHook(HOOKTYPE_PRE, pCallable); }
 
 	void AddPostHook(PyObject* pCallable)
 	{ return AddHook(HOOKTYPE_POST, pCallable); }
-    
+
 	void RemovePreHook(PyObject* pCallable)
 	{ RemoveHook(HOOKTYPE_PRE, pCallable); }
 
 	void RemovePostHook(PyObject* pCallable)
 	{ RemoveHook(HOOKTYPE_POST, pCallable);	}
 
 	void DeleteHook();
-    
+
 public:
 	boost::python::tuple	m_tArgs;
 	object					m_oConverter;

src/core/modules/memory/memory_wrap.cpp

@@ -539,6 +539,12 @@ void export_function(scope _memory)
 		.def_readonly("convention",
 			&CFunction::m_eCallingConvention
 		)
+
+		// Properties
+		.add_property("trampoline_address",
+			&CFunction::GetTrampolineAddress,
+			"Return the trampoline address if the function is hooked, otherwise return the function address."
+		)
 	;
 }