Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 12:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL]

Browse source 
- Handle failure to allocate VM for thunk code
- Factor out the assembly thumk code, fix amd64 code and implement ARM code

svn path=/trunk/; revision=67535
This commit is contained in:
Timo Kreuzer 2015-05-03 18:03:31 +00:00
parent a1bc58aee7
commit 11a3512389
1 changed files with 66 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

104
reactos/lib/atl/atlwin.h
View file

@ -143,13 +143,70 @@ public:
#pragma pack(push,1) #pragma pack(push,1)
struct thunkCode struct thunkCode
{ {
DWORD m_mov; DWORD m_mov; /* mov dword ptr [esp+4], m_this */
DWORD m_this; DWORD m_this;
BYTE m_jmp; BYTE m_jmp; /* jmp relproc */
DWORD m_relproc; DWORD m_relproc;
void
Init(WNDPROC proc, void *pThis)
{
m_mov = 0x042444C7;
m_this = PtrToUlong(pThis);
m_jmp = 0xe9;
m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode)));
}
}; };
#pragma pack(pop) #pragma pack(pop)
#elif defined(_AMD64_)
#pragma pack(push,1)
struct thunkCode
{
USHORT m_mov_rcx; /* mov rcx, m_this */
ULONG64 m_this;
USHORT m_mov_rax; /* mov rax, m_proc */
ULONG64 m_proc;
USHORT m_jmp; /* jmp rax */
void
Init(WNDPROC proc, void *pThis)
{
m_mov_rcx = 0xb948;
m_this = (ULONG64)pThis;
m_mov_rax = 0xb848;
m_proc = (ULONG64)proc;
m_jmp = 0xe0ff;
}
};
#pragma pack(pop)
#elif defined(_M_ARM)
#pragma pack(push,4)
struct thunkCode
{
DWORD m_mov_r0; /* mov r0, m_this */
DWORD m_mov_pc; /* mov pc, m_proc */
DWORD m_this;
DWORD m_proc;
void
Init(WNDPROC proc, void *pThis)
{
m_mov_r0 = 0xE59F0000;
m_mov_pc = 0xE59FF000;
m_this = (DWORD)pThis;
m_proc = (DWORD)proc;
}
};
#pragma pack(pop)
#else
#error ARCH not supported
#endif
class CWndProcThunk class CWndProcThunk
{ {
public: public:
@ -164,15 +221,15 @@ public:
~CWndProcThunk() ~CWndProcThunk()
{ {
if (m_pthunk != NULL)
VirtualFree(m_pthunk, 0, MEM_RELEASE); VirtualFree(m_pthunk, 0, MEM_RELEASE);
} }
BOOL Init(WNDPROC proc, void *pThis) BOOL Init(WNDPROC proc, void *pThis)
{ {
m_pthunk->m_mov = 0x042444C7; if (m_pthunk == NULL)
m_pthunk->m_this = PtrToUlong(pThis); return FALSE;
m_pthunk->m_jmp = 0xe9; m_pthunk->Init(proc, pThis);
m_pthunk->m_relproc = DWORD(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(m_pthunk) + sizeof(thunkCode)));
return TRUE; return TRUE;
} }
@ -182,41 +239,6 @@ public:
} }
}; };
#elif _AMD64_ //WARNING: NOT VERIFIED
#pragma pack(push,1)
struct thunkCode
{
DWORD_PTR m_mov;
DWORD_PTR m_this;
BYTE m_jmp;
DWORD_PTR m_relproc;
};
#pragma pack(pop)
class CWndProcThunk
{
public:
thunkCode m_thunk;
_AtlCreateWndData cd;
public:
BOOL Init(WNDPROC proc, void *pThis)
{
m_thunk.m_mov = 0xffff8000042444C7LL;
m_thunk.m_this = (DWORD_PTR)pThis;
m_thunk.m_jmp = 0xe9;
m_thunk.m_relproc = DWORD_PTR(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode)));
return TRUE;
}
WNDPROC GetWNDPROC()
{
return reinterpret_cast<WNDPROC>(&m_thunk);
}
};
#else
#error ARCH not supported
#endif
class CMessageMap class CMessageMap
{ {
public: public: