mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
8cb46354e6
It was still crashing as the thisptr should actually be passed into the alloc callback. Changed and the function call is now identical to engine's impl. Tested in Debug, Profile and Release, Release has also been tested with LTCG.
66 lines
2.4 KiB
C++
66 lines
2.4 KiB
C++
#ifndef TSLIST_H
|
|
#define TSLIST_H
|
|
|
|
//-----------------------------------------------------------------------------
|
|
//
|
|
//-----------------------------------------------------------------------------
|
|
class CAlignedMemAlloc
|
|
{
|
|
public:
|
|
// Passed explicit parameters for 'this' pointer; the game expects one,
|
|
// albeit unused. Do NOT optimize this away!
|
|
typedef void* (*FnAlloc_t)(CAlignedMemAlloc* thisptr, size_t nSize, size_t nAlignment);
|
|
typedef void (*FnFree_t)(CAlignedMemAlloc* thisptr, void* pMem);
|
|
|
|
CAlignedMemAlloc(FnAlloc_t pAllocCallback, FnFree_t pFreeCallback);
|
|
|
|
inline void* Alloc(size_t nSize, size_t nAlign = 0)
|
|
{
|
|
return m_pAllocCallback(this, nSize, nAlign);
|
|
}
|
|
inline void Free(void* pMem)
|
|
{
|
|
m_pFreeCallback(this, pMem);
|
|
}
|
|
|
|
private:
|
|
FnAlloc_t m_pAllocCallback;
|
|
FnFree_t m_pFreeCallback;
|
|
};
|
|
|
|
extern CAlignedMemAlloc* g_pAlignedMemAlloc;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// Singleton aligned memalloc
|
|
//-----------------------------------------------------------------------------
|
|
inline CAlignedMemAlloc* AlignedMemAlloc()
|
|
{
|
|
return g_pAlignedMemAlloc;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
class VTSListBase : public IDetour
|
|
{
|
|
virtual void GetAdr(void) const
|
|
{
|
|
LogVarAdr("g_AlignedMemAlloc", reinterpret_cast<uintptr_t>(g_pAlignedMemAlloc));
|
|
}
|
|
virtual void GetFun(void) const { }
|
|
virtual void GetVar(void) const
|
|
{
|
|
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
|
|
g_pAlignedMemAlloc = g_GameDll.FindPatternSIMD("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 41 54 41 55 41 56 41 57 48 81 EC ?? ?? ?? ?? 48 8B D9 FF 15 ?? ?? ?? ??")
|
|
.Offset(0x600).FindPatternSelf("48 8D 15 ?? ?? ?? 01", CMemory::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).RCast<CAlignedMemAlloc*>();
|
|
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
|
|
g_pAlignedMemAlloc = g_GameDll.FindPatternSIMD("48 89 5C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 55 41 54 41 55 41 56 41 57 48 8D AC 24 ?? ?? ?? ?? B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B D9")
|
|
.Offset(0x130).FindPatternSelf("48 8D 15 ?? ?? ?? 01", CMemory::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).RCast<CAlignedMemAlloc*>();
|
|
#endif
|
|
}
|
|
virtual void GetCon(void) const { }
|
|
virtual void Attach(void) const { }
|
|
virtual void Detach(void) const { }
|
|
};
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#endif // TSLIST_H
|