Removed platform check for Pointer.get_virtual_func

- Added Pointer.make_virtual_function

Author: Ayuto

src/core/modules/memory/memory_callback.cpp

@@ -39,11 +39,15 @@ using namespace DynamicHooks;
 
 
 // ============================================================================
-// >> CLASSES
+// >> MACROS
 // ============================================================================
 #define GET_CALLBACK_CALLER(type) \
 	GET_FUNCTION(type, CallbackCaller<type>, CCallback*, unsigned long, unsigned long)
 
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
 CCallback::CCallback(object oCallback, Convention_t eConv, char* szParams)
     : CFunction(NULL, eConv, szParams)
 {

src/core/modules/memory/memory_tools.cpp

@@ -165,16 +165,11 @@ void CPointer::Move(object oDest, unsigned long ulNumBytes)
 	memmove((void *) ulDest, (void *) m_ulAddr, ulNumBytes);
 }
 
-CPointer* CPointer::GetVirtualFunc(int iIndex, bool bPlatformCheck /* = true */)
+CPointer* CPointer::GetVirtualFunc(int iIndex)
 {
 	if (!IsValid())
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Pointer is NULL.")
 
-#ifdef __linux__
-	if (bPlatformCheck)
-		iIndex++;
-#endif
-
 	void** vtable = *(void ***) m_ulAddr;
 	if (!vtable)
 		return new CPointer();
@@ -190,6 +185,11 @@ CFunction* CPointer::MakeFunction(Convention_t eConv, char* szParams)
 	return new CFunction(m_ulAddr, eConv, szParams);
 }
 
+CFunction* CPointer::MakeVirtualFunction(int iIndex, Convention_t eConv, char* szParams)
+{
+	return GetVirtualFunc(iIndex)->MakeFunction(eConv, szParams);
+}
+
 //-----------------------------------------------------------------------------
 // CFunction class
 //-----------------------------------------------------------------------------

src/core/modules/memory/memory_tools.h

@@ -187,12 +187,14 @@ class CPointer
 
 	bool                IsValid() { return m_ulAddr != 0; }
 
-	CPointer*           GetVirtualFunc(int iIndex, bool bPlatformCheck = true);
+	CPointer*           GetVirtualFunc(int iIndex);
 
 	void                Realloc(int iSize) { m_ulAddr = (unsigned long) UTIL_Realloc((void *) m_ulAddr, iSize); }
 	void                Dealloc() { UTIL_Dealloc((void *) m_ulAddr); m_ulAddr = 0; }
 
 	CFunction*          MakeFunction(Convention_t eConv, char* szParams);
+	CFunction*          MakeVirtualFunction(int iIndex, Convention_t eConv, char* szParams);
+
 
 public:
 	unsigned long m_ulAddr;

src/core/modules/memory/memory_wrap_python.cpp

@@ -175,9 +175,6 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(set_ptr_overload, SetPtr, 1, 2)
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(set_string_ptr_overload, SetStringPtr, 1, 2)
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(set_string_array_overload, SetStringArray, 1, 2)
 
-// Other overloads
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_virtual_func_overload, GetVirtualFunc, 1, 2)
-
 void export_memtools()
 {
 	class_<CPointer>("Pointer", init< optional<unsigned long> >())
@@ -255,10 +252,23 @@ void export_memtools()
 		// Other methods
 		.def("get_virtual_func",
 			&CPointer::GetVirtualFunc,
-			get_virtual_func_overload(
-				"Returns the address (as a CPointer instance) of a virtual function at the given index.",
-				args("index", "platform_check")
-			)[manage_new_object_policy()]
+			"Returns the address (as a CPointer instance) of a virtual function at the given index.",
+			args("index"),
+			manage_new_object_policy()
+		)
+
+		.def("make_function",
+			&CPointer::MakeFunction,
+			"Creates a new Function instance.",
+			args("convention", "parameters"),
+			manage_new_object_policy()
+		)
+
+		.def("make_virtual_function",
+			&CPointer::MakeVirtualFunction,
+			"Creates a new Function instance.",
+			args("index", "convention", "parameters"),
+			manage_new_object_policy()
 		)
 
 		.def("realloc",
@@ -272,13 +282,6 @@ void export_memtools()
 			"Deallocates a memory block."
 		)
 
-		.def("make_function",
-			&CPointer::MakeFunction,
-			"Creates a new Function instance.",
-			args("convention", "parameters"),
-			manage_new_object_policy()
-		)
-
 		 .def("get_size",
 			&CPointer::GetSize,
 			"Returns the size of the memory block."