Added the ability to wrap pointers

- Added the ability to get the address of objects

Author: Ayuto

src/core/modules/memory/memory_tools.cpp

@@ -303,17 +303,4 @@ void CFunction::RemoveHook(DynamicHooks::HookType_t eType, PyObject* pCallable)
 		return;
 
 	g_mapCallbacks[pHook][eType].remove(pCallable);
-}
-
-//-----------------------------------------------------------------------------
-// Functions
-//-----------------------------------------------------------------------------
-int GetError()
-{
-	return dcGetError(g_pCallVM);
-}
-
-CPointer* Alloc(int iSize)
-{
-	return new CPointer((unsigned long) UTIL_Alloc(iSize));
 }

src/core/modules/memory/memory_tools.h

@@ -248,6 +248,7 @@ class CPointer
 	unsigned long m_ulAddr;
 };
 
+
 class CFunction: public CPointer
 {
 public:
@@ -276,7 +277,36 @@ class CFunction: public CPointer
 	Convention_t  m_eConv;
 };
 
-int GetError();
-CPointer* Alloc(int iSize);
+
+class Wrap
+{
+public:
+	template<class T>
+	static T* WrapIt(object ptr)
+	{
+		unsigned long ulPtr = ExtractPyPtr(ptr);
+		return (T *) ulPtr;
+	}
+};
+
+
+//-----------------------------------------------------------------------------
+// Functions
+//-----------------------------------------------------------------------------
+inline int GetError()
+{
+	return dcGetError(g_pCallVM);
+}
+
+inline CPointer Alloc(int iSize)
+{
+	return CPointer((unsigned long) UTIL_Alloc(iSize));
+}
+
+template<class T>
+CPointer GetAddress(T* ptr)
+{
+	return CPointer((unsigned long) ptr);
+}
 
 #endif // _MEMORY_TOOLS_H

src/core/modules/memory/memory_wrap_python.cpp

@@ -44,6 +44,7 @@ void export_memtools();
 void export_dyncall();
 void export_dynamichooks();
 void export_callbacks();
+void export_get_address();
 
 DECLARE_SP_MODULE(memory_c)
 {
@@ -52,6 +53,7 @@ DECLARE_SP_MODULE(memory_c)
 	export_dyncall();
 	export_dynamichooks();
 	export_callbacks();
+	export_get_address();
 }
 
 //-----------------------------------------------------------------------------
@@ -109,7 +111,7 @@ void export_binaryfile()
 
 
 //-----------------------------------------------------------------------------
-// Exposes CPointer
+// Exposes CPointer and CFunction
 //-----------------------------------------------------------------------------
 #define OVERLOAD_GET_TYPE(name, type) \
 	BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_##name##_overload, CPointer::Get<type>, 0, 1)
@@ -380,8 +382,7 @@ void export_memtools()
 	def("alloc",
 		Alloc,
 		"Allocates a memory block.",
-		args("size"),
-		manage_new_object_policy()
+		args("size")
 	);
 
 	class_<CFunction, bases<CPointer> >("Function", init<unsigned long, Convention_t, char*>())
@@ -481,6 +482,9 @@ void export_dynamichooks()
 	;
 }
 
+//-----------------------------------------------------------------------------
+// Exposes CCallback
+//-----------------------------------------------------------------------------
 void export_callbacks()
 {
     class_< CCallback, bases< CFunction > >("Callback", init< object, Convention_t, char * >())
@@ -490,3 +494,43 @@ void export_callbacks()
         )
     ;
 }
+
+
+//-----------------------------------------------------------------------------
+// Exposes wrap/get_address functionality
+//-----------------------------------------------------------------------------
+// Use this macro to add the ability to get the address of an object
+#define GET_ADDRESS(type) \
+	def("get_address", \
+		&GetAddress<type>, \
+		"Returns the memory address of the given object.", \
+		args("object") \
+	);
+
+// Use this macro if the Python name of the type is different to the C++ name
+#define WRAP_ADDRESS0(type, pyname) \
+	.def(XSTRINGIFY(pyname), \
+		&Wrap::WrapIt<type>, \
+		"Wraps the given address.", \
+		args("pointer"), \
+		reference_existing_object_policy() \
+	).staticmethod(XSTRINGIFY(pyname))
+
+// Use this macro if the Python and C++ name of the type are the same
+#define WRAP_ADDRESS1(type) \
+	WRAP_ADDRESS0(type, type)
+
+void export_get_address()
+{
+	// get_address()
+	GET_ADDRESS(Vector)
+	GET_ADDRESS(QAngle)
+
+	// wrap.<type>()
+	class_<Wrap>("wrap", no_init)
+
+		WRAP_ADDRESS1(Vector)
+		WRAP_ADDRESS1(QAngle)
+
+	;
+}