Fixed MemberFunction not returning the correct return type. (#396)

* Fixed MemberFunction not returning the correct return type.

* Restored copy constructor of CFunction.

* Changed MemberFunction to be initialized from a copy.

Author: CookStar

addons/source-python/packages/source-python/memory/helpers.py

@@ -316,9 +316,7 @@ class MemberFunction(Function):
     def __init__(self, manager, return_type, func, this):
         """Initialize the instance."""
         self._function = func
-        super().__init__(
-            func.address, func.convention, func.arguments, func.return_type
-        )
+        super().__init__(func)
 
         # This should always hold a TypeManager instance
         self._manager = manager

src/core/modules/memory/memory_function.cpp

@@ -179,6 +179,29 @@ CFunction::CFunction(unsigned long ulAddr, Convention_t eCallingConvention,
 	m_oConverter = oConverter;
 }
 
+CFunction::CFunction(const CFunction& obj)
+	:CPointer(obj)
+{
+	m_tArgs = obj.m_tArgs;
+	m_eReturnType = obj.m_eReturnType;
+	m_oConverter = obj.m_oConverter;
+
+	m_eCallingConvention = obj.m_eCallingConvention;
+	m_iCallingConvention = obj.m_iCallingConvention;
+
+	if (m_eCallingConvention != CONV_CUSTOM)
+	{
+		m_pCallingConvention = MakeDynamicHooksConvention(m_eCallingConvention, ObjectToDataTypeVector(m_tArgs), m_eReturnType);
+		m_oCallingConvention = object();
+	}
+	else
+	{
+		m_pCallingConvention = obj.m_pCallingConvention;
+		m_oCallingConvention = obj.m_oCallingConvention;
+		Py_INCREF(m_oCallingConvention.ptr());
+	}
+}
+
 CFunction::~CFunction()
 {
 	if (!m_pCallingConvention)

src/core/modules/memory/memory_function.h

@@ -53,13 +53,15 @@ enum Convention_t
 // ============================================================================
 // >> CFunction
 // ============================================================================
-class CFunction: public CPointer, private boost::noncopyable
+class CFunction: public CPointer
 {
 public:
 	CFunction(unsigned long ulAddr, object oCallingConvention, object oArgs, object oReturnType);
 	CFunction(unsigned long ulAddr, Convention_t eCallingConvention, int iCallingConvention,
 		boost::python::tuple tArgs, DataType_t eReturnType, object oConverter);
 
+	CFunction(const CFunction& obj);
+
 	~CFunction();
 
 	bool IsCallable();
@@ -105,7 +107,6 @@ class CFunction: public CPointer, private boost::noncopyable
 
 	// DynamicHooks calling convention (built-in and custom)
 	ICallingConvention*		m_pCallingConvention;
-	bool					m_bAllocatedCallingConvention;
 
 	// Custom calling convention
 	object					m_oCallingConvention;

src/core/modules/memory/memory_wrap.cpp

@@ -453,9 +453,9 @@ void export_type_info_iter(scope _memory)
 // ============================================================================
 void export_function(scope _memory)
 {
-	class_<CFunction, bases<CPointer>, boost::noncopyable >("Function", init<unsigned long, object, object, object>())
-		// Don't allow copies, because they will hold references to our calling convention.
-		// .def(init<CFunction&>())
+	class_<CFunction, bases<CPointer> >("Function", init<unsigned long, object, object, object>())
+		.def(init<CFunction&>())
+
 		.def("__call__",
 			raw_method(&CFunction::Call),
 			"Calls the function dynamically."