First draft of dynamic detours using Ayuto's DynamicHooks library

https://github.com/Ayuto/DynamicHooks

DynamicHooks/conventions/x86GccCdecl.h

@@ -0,0 +1,46 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+#ifndef _X86_GCC_CDECL_H
+#define _X86_GCC_CDECL_H
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "x86MsCdecl.h"
+
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
+typedef x86MsCdecl x86GccCdecl;
+
+
+#endif // _X86_GCC_CDECL_H

DynamicHooks/conventions/x86GccThiscall.h

@@ -0,0 +1,46 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+#ifndef _X86_GCC_THISCALL_H
+#define _X86_GCC_THISCALL_H
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "x86GccCdecl.h"
+
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
+typedef x86GccCdecl x86GccThiscall;
+
+
+#endif // _X86_GCC_THISCALL_H

DynamicHooks/conventions/x86MsCdecl.cpp

@@ -0,0 +1,145 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "x86MsCdecl.h"
+#include <string.h>
+
+
+// ============================================================================
+// >> x86MsCdecl
+// ============================================================================
+x86MsCdecl::x86MsCdecl(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
+	ICallingConvention(vecArgTypes, returnType, iAlignment)
+{
+	if (m_returnType.size > 4)
+	{
+		m_pReturnBuffer = malloc(m_returnType.size);
+	}
+	else
+	{
+		m_pReturnBuffer = NULL;
+	}
+}
+
+x86MsCdecl::~x86MsCdecl()
+{
+	if (m_pReturnBuffer)
+	{
+		free(m_pReturnBuffer);
+	}
+}
+
+std::list<Register_t> x86MsCdecl::GetRegisters()
+{
+	std::list<Register_t> registers;
+
+	registers.push_back(ESP);
+
+	if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
+	{
+		registers.push_back(ST0);
+	}
+	else
+	{
+		registers.push_back(EAX);
+		if (m_pReturnBuffer)
+		{
+			registers.push_back(EDX);
+		}
+	}
+
+	return registers;
+}
+
+int x86MsCdecl::GetPopSize()
+{
+	return 0;
+}
+
+int x86MsCdecl::GetArgStackSize()
+{
+	int iArgStackSize = 0;
+
+	for (unsigned int i = 0; i < m_vecArgTypes.size(); i++)
+	{
+		iArgStackSize += m_vecArgTypes[i].size;
+	}
+
+	return iArgStackSize;
+}
+
+void** x86MsCdecl::GetStackArgumentPtr(CRegisters* pRegisters)
+{
+	return (void **)(pRegisters->m_esp->GetValue<unsigned long>() + 4);
+}
+
+void* x86MsCdecl::GetArgumentPtr(int iIndex, CRegisters* pRegisters)
+{
+	int iOffset = 4;
+	for(int i=0; i < iIndex; i++)
+	{
+		iOffset += m_vecArgTypes[i].size;
+	}
+
+	return (void *) (pRegisters->m_esp->GetValue<unsigned long>() + iOffset);
+}
+
+void x86MsCdecl::ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr)
+{
+}
+
+void* x86MsCdecl::GetReturnPtr(CRegisters* pRegisters)
+{
+	if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
+		return pRegisters->m_st0->m_pAddress;
+
+	if (m_pReturnBuffer)
+	{
+		// First half in eax, second half in edx
+		memcpy(m_pReturnBuffer, pRegisters->m_eax, 4);
+		memcpy((void *) ((unsigned long) m_pReturnBuffer + 4), pRegisters->m_edx, 4);
+		return m_pReturnBuffer;
+	}
+
+	return pRegisters->m_eax->m_pAddress;
+}
+
+void x86MsCdecl::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
+{
+	if (m_pReturnBuffer)
+	{
+		// First half in eax, second half in edx
+		memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
+		memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
+	}
+}

DynamicHooks/conventions/x86MsCdecl.h

@@ -0,0 +1,84 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+#ifndef _X86_MS_CDECL_H
+#define _X86_MS_CDECL_H
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "../convention.h"
+
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
+/*
+Source: DynCall manual and Windows docs
+
+Registers:
+	- eax = return value
+	- edx = return value
+	- esp = stack pointer
+	- st0 = floating point return value
+
+Parameter passing:
+	- stack parameter order: right-to-left
+	- caller cleans up the stack
+	- all arguments are pushed onto the stack
+	- alignment: 4 bytes
+
+Return values:
+	- return values of pointer or intergral type (<= 32 bits) are returned via the eax register
+	- integers > 32 bits are returned via the eax and edx registers
+	- floating pointer types are returned via the st0 register
+*/
+class x86MsCdecl: public ICallingConvention
+{	
+public:
+	x86MsCdecl(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
+	~x86MsCdecl();
+
+	virtual std::list<Register_t> GetRegisters();
+	virtual int GetPopSize();
+	virtual int GetArgStackSize();
+	virtual void** GetStackArgumentPtr(CRegisters* pRegisters);
+	
+	virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters);
+	virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr);
+
+	virtual void* GetReturnPtr(CRegisters* pRegisters);
+	virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr);
+
+private:
+	void* m_pReturnBuffer;
+};
+
+#endif // _X86_MS_CDECL_H

DynamicHooks/conventions/x86MsStdcall.cpp

@@ -0,0 +1,152 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "x86MsStdcall.h"
+#include <string.h>
+
+
+// ============================================================================
+// >> x86MsStdcall
+// ============================================================================
+x86MsStdcall::x86MsStdcall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
+	ICallingConvention(vecArgTypes, returnType, iAlignment)
+{
+	if (m_returnType.size > 4)
+	{
+		m_pReturnBuffer = malloc(m_returnType.size);
+	}
+	else
+	{
+		m_pReturnBuffer = NULL;
+	}
+}
+
+x86MsStdcall::~x86MsStdcall()
+{
+	if (m_pReturnBuffer)
+	{
+		free(m_pReturnBuffer);
+	}
+}
+
+std::list<Register_t> x86MsStdcall::GetRegisters()
+{
+	std::list<Register_t> registers;
+
+	registers.push_back(ESP);
+
+	if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
+	{
+		registers.push_back(ST0);
+	}
+	else
+	{
+		registers.push_back(EAX);
+		if (m_pReturnBuffer)
+		{
+			registers.push_back(EDX);
+		}
+	}
+
+	return registers;
+}
+
+int x86MsStdcall::GetPopSize()
+{
+	int iPopSize = 0;
+
+	for(unsigned int i=0; i < m_vecArgTypes.size(); i++)
+	{
+		iPopSize += m_vecArgTypes[i].size;
+	}
+
+	return iPopSize;
+}
+
+int x86MsStdcall::GetArgStackSize()
+{
+	int iArgStackSize = 0;
+
+	for (unsigned int i = 0; i < m_vecArgTypes.size(); i++)
+	{
+		iArgStackSize += m_vecArgTypes[i].size;
+	}
+
+	return iArgStackSize;
+}
+
+void** x86MsStdcall::GetStackArgumentPtr(CRegisters* pRegisters)
+{
+	return (void **)(pRegisters->m_esp->GetValue<unsigned long>() + 4);
+}
+
+void* x86MsStdcall::GetArgumentPtr(int iIndex, CRegisters* pRegisters)
+{
+	int iOffset = 4;
+	for(int i=0; i < iIndex; i++)
+	{
+		iOffset += m_vecArgTypes[i].size;
+	}
+
+	return (void *) (pRegisters->m_esp->GetValue<unsigned long>() + iOffset);
+}
+
+void x86MsStdcall::ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr)
+{
+}
+
+void* x86MsStdcall::GetReturnPtr(CRegisters* pRegisters)
+{
+	if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
+		return pRegisters->m_st0->m_pAddress;
+
+	if (m_pReturnBuffer)
+	{
+		// First half in eax, second half in edx
+		memcpy(m_pReturnBuffer, pRegisters->m_eax, 4);
+		memcpy((void *) ((unsigned long) m_pReturnBuffer + 4), pRegisters->m_edx, 4);
+		return m_pReturnBuffer;
+	}
+
+	return pRegisters->m_eax->m_pAddress;
+}
+
+void x86MsStdcall::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
+{
+	if (m_pReturnBuffer)
+	{
+		// First half in eax, second half in edx
+		memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
+		memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
+	}
+}

DynamicHooks/conventions/x86MsStdcall.h

@@ -0,0 +1,84 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+#ifndef _X86_MS_STDCALL_H
+#define _X86_MS_STDCALL_H
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "../convention.h"
+
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
+/*
+Source: DynCall manual and Windows docs
+
+Registers:
+	- eax = return value
+	- edx = return value
+	- esp = stack pointer
+	- st0 = floating point return value
+
+Parameter passing:
+	- stack parameter order: right-to-left
+	- callee cleans up the stack
+	- all arguments are pushed onto the stack
+	- alignment: 4 bytes
+
+Return values:
+	- return values of pointer or intergral type (<= 32 bits) are returned via the eax register
+	- integers > 32 bits are returned via the eax and edx registers
+	- floating pointer types are returned via the st0 register
+*/
+class x86MsStdcall: public ICallingConvention
+{	
+public:
+	x86MsStdcall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
+	~x86MsStdcall();
+
+	virtual std::list<Register_t> GetRegisters();
+	virtual int GetPopSize();
+	virtual int GetArgStackSize();
+	virtual void** GetStackArgumentPtr(CRegisters* pRegisters);
+	
+	virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters);
+	virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr);
+
+	virtual void* GetReturnPtr(CRegisters* pRegisters);
+	virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr);
+
+private:
+	void* m_pReturnBuffer;
+};
+
+#endif // _X86_MS_STDCALL_H

DynamicHooks/conventions/x86MsThiscall.cpp

@@ -0,0 +1,161 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "x86MsThiscall.h"
+#include <string.h>
+
+
+// ============================================================================
+// >> x86MsThiscall
+// ============================================================================
+x86MsThiscall::x86MsThiscall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
+	ICallingConvention(vecArgTypes, returnType, iAlignment)
+{
+	if (m_returnType.size > 4)
+	{
+		m_pReturnBuffer = malloc(m_returnType.size);
+	}
+	else
+	{
+		m_pReturnBuffer = NULL;
+	}
+}
+
+x86MsThiscall::~x86MsThiscall()
+{
+	if (m_pReturnBuffer)
+	{
+		free(m_pReturnBuffer);
+	}
+}
+
+std::list<Register_t> x86MsThiscall::GetRegisters()
+{
+	std::list<Register_t> registers;
+	
+	registers.push_back(ESP);
+	registers.push_back(ECX);
+
+	if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
+	{
+		registers.push_back(ST0);
+	}
+	else
+	{
+		registers.push_back(EAX);
+		if (m_pReturnBuffer)
+		{
+			registers.push_back(EDX);
+		}
+	}
+
+	return registers;
+}
+
+int x86MsThiscall::GetPopSize()
+{
+	// This pointer.
+	// FIXME LINUX
+	//int iPopSize = GetDataTypeSize(DATA_TYPE_POINTER, m_iAlignment);
+	int iPopSize = 0;
+
+	for(unsigned int i=0; i < m_vecArgTypes.size(); i++)
+	{
+		iPopSize += m_vecArgTypes[i].size;
+	}
+
+	return iPopSize;
+}
+
+int x86MsThiscall::GetArgStackSize()
+{
+	int iArgStackSize = 0;
+
+	for (unsigned int i = 0; i < m_vecArgTypes.size(); i++)
+	{
+		iArgStackSize += m_vecArgTypes[i].size;
+	}
+
+	return iArgStackSize;
+}
+
+void** x86MsThiscall::GetStackArgumentPtr(CRegisters* pRegisters)
+{
+	return (void **)(pRegisters->m_esp->GetValue<unsigned long>() + 4);
+}
+
+void* x86MsThiscall::GetArgumentPtr(int iIndex, CRegisters* pRegisters)
+{
+	if (iIndex == 0)
+	{
+		return pRegisters->m_ecx->m_pAddress;
+	}
+
+	int iOffset = 4;
+	for(int i=0; i < iIndex-1; i++)
+	{
+		iOffset += m_vecArgTypes[i].size;
+	}
+
+	return (void *) (pRegisters->m_esp->GetValue<unsigned long>() + iOffset);
+}
+
+void x86MsThiscall::ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr)
+{
+}
+
+void* x86MsThiscall::GetReturnPtr(CRegisters* pRegisters)
+{
+	if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
+		return pRegisters->m_st0->m_pAddress;
+
+	if (m_pReturnBuffer)
+	{
+		// First half in eax, second half in edx
+		memcpy(m_pReturnBuffer, pRegisters->m_eax, 4);
+		memcpy((void *) ((unsigned long) m_pReturnBuffer + 4), pRegisters->m_edx, 4);
+		return m_pReturnBuffer;
+	}
+
+	return pRegisters->m_eax->m_pAddress;
+}
+
+void x86MsThiscall::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
+{
+	if (m_pReturnBuffer)
+	{
+		// First half in eax, second half in edx
+		memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
+		memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
+	}
+}

DynamicHooks/conventions/x86MsThiscall.h

@@ -0,0 +1,85 @@
+/**
+* =============================================================================
+* DynamicHooks
+* Copyright (C) 2015 Robin Gohmert. All rights reserved.
+* =============================================================================
+*
+* This software is provided 'as-is', without any express or implied warranty.
+* In no event will the authors be held liable for any damages arising from 
+* the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose, 
+* including commercial applications, and to alter it and redistribute it 
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not 
+* claim that you wrote the original software. If you use this software in a 
+* product, an acknowledgment in the product documentation would be 
+* appreciated but is not required.
+*
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+*
+* 3. This notice may not be removed or altered from any source distribution.
+*
+* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
+* -fPIC thunks correctly
+*
+* Idea and trampoline code taken from DynDetours (thanks your-name-here).
+*/
+
+#ifndef _X86_MS_THISCALL_H
+#define _X86_MS_THISCALL_H
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "../convention.h"
+
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
+/*
+Source: DynCall manual and Windows docs
+
+Registers:
+	- eax = return value
+	- ecx = this pointer
+	- edx = return value
+	- esp = stack pointer
+	- st0 = floating point return value
+
+Parameter passing:
+	- stack parameter order: right-to-left
+	- callee cleans up the stack
+	- all other arguments are pushed onto the stack
+	- alignment: 4 bytes
+
+Return values:
+	- return values of pointer or intergral type (<= 32 bits) are returned via the eax register
+	- integers > 32 bits are returned via the eax and edx registers
+	- floating pointer types are returned via the st0 register
+*/
+class x86MsThiscall: public ICallingConvention
+{	
+public:
+	x86MsThiscall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
+	~x86MsThiscall();
+
+	virtual std::list<Register_t> GetRegisters();
+	virtual int GetPopSize();
+	virtual int x86MsThiscall::GetArgStackSize();
+	virtual void** GetStackArgumentPtr(CRegisters* pRegisters);
+	
+	virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters);
+	virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr);
+
+	virtual void* GetReturnPtr(CRegisters* pRegisters);
+	virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr);
+
+private:
+	void* m_pReturnBuffer;
+};
+
+#endif // _X86_MS_THISCALL_H