Fixed CCallback

Author: Ayuto

src/core/modules/memory/memory_callback.cpp

@@ -76,7 +76,7 @@ CCallback::CCallback(object oCallback, Convention_t eConv, tuple args, ReturnTyp
         case SIGCHAR_STRING:    pCallCallbackFunc = GET_CALLBACK_CALLER(char *); break;
         default: BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Unknown return type.");
     }
-
+    
     // Generate the function
     Assembler a;
 
@@ -134,15 +134,16 @@ int CCallback::GetPopSize()
 
 int CCallback::GetArgumentOffset(int iIndex)
 {
-	int offset = 8;
+	int offset = 4;
 	for(int i=0; i <= iIndex; i++)
 	{
 		offset += GetTypeSize(extract<Argument_t>(m_Args[i]));
 	}
 
 	// Subtract the this pointer on Windows
 #ifdef _WIN32
-	offset -= sizeof(void *);
+    if (m_eConv == CONV_THISCALL)
+        offset -= sizeof(void *);
 #endif
 
 	return offset;

src/core/modules/memory/memory_tools.cpp

@@ -280,7 +280,6 @@ handle<> CFunction::AddHook(DynamicHooks::HookType_t eType, PyObject* pCallable)
 
 	// Generate the argument string
 	char* szParams = extract<char*>(eval("lambda args, ret: ''.join(map(chr, args)) + ')' + chr(ret)")(m_Args, m_ReturnType));
-	puts(szParams);
 
 	// Hook the function
 	CHook* pHook = g_pHookMngr->HookFunction((void *) m_ulAddr, m_eConv, strdup(szParams));