R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

CModule class optimizations

Browse Source 
Module segments are now part of the class to eliminate unnecessary re-inits and copies.
This commit is contained in:
Kawe Mazidjatari 2022-06-13 23:34:06 +02:00
parent 133c40940f
commit 9fd39d4e21
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/bsplib/bsplib.cpp
View File

@ -396,10 +396,8 @@ void* __fastcall BuildPropStaticFrustumCullMap(int64_t a1, int64_t a2, unsigned
++v64;
v67 += 92i64;
static CModule::ModuleSections_t mData = g_mGameDll.GetSectionByName(".data");
static CModule::ModuleSections_t mPData = g_mGameDll.GetSectionByName(".pdata");
if (reinterpret_cast<uintptr_t>(v68) < mData.m_pSectionBase ||
reinterpret_cast<uintptr_t>(v68) > mPData.m_pSectionBase || error) // Check bounds (data could only be within the '.data' segment.
if (reinterpret_cast<uintptr_t>(v68) < g_mGameDll.m_RunTimeData.m_pSectionBase || // Check bounds (data could only be within the '.data' segment.
reinterpret_cast<uintptr_t>(v68) > g_mGameDll.m_ExceptionTable.m_pSectionBase || error)
{
error = true;
continue;

2
r5dev/common/opcodes.cpp
View File

@ -355,7 +355,7 @@ void Dedicated_Init()
void RuntimePtc_Init() /* .TEXT */
{
#ifndef DEDICATED
p_WASAPI_GetAudioDevice.Offset(0x410).FindPattern("FF 15 ?? ?? 01 00", CMemory::Direction::DOWN, 100).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xEB }); // CAL --> NOP | Disable debugger check when miles searches for audio device to allow attaching the debugger to the game upon launch.
p_WASAPI_GetAudioDevice.Offset(0x410).FindPatternSelf("FF 15 ?? ?? 01 00", CMemory::Direction::DOWN, 100).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xEB }); // CAL --> NOP | Disable debugger check when miles searches for audio device to allow attaching the debugger to the game upon launch.
FairFight_Init.Offset(0x0).FindPatternSelf("0F 87", CMemory::Direction::DOWN, 200).Patch({ 0x0F, 0x85 }); // JA --> JNZ | Prevent 'FairFight' anti-cheat from initializing on the server by comparing RAX against 0x0 instead. Init will crash since the plugins aren't shipped.
SCR_BeginLoadingPlaque.Offset(0x1AD).FindPatternSelf("75 27", CMemory::Direction::DOWN).Patch({ 0xEB, 0x27 }); // JNE --> JMP | Prevent connect command from crashing by invalid call to UI function.
p_SQVM_CompileError.Offset(0x0).FindPatternSelf("41 B0 01", CMemory::Direction::DOWN, 400).Patch({ 0x41, 0xB0, 0x00 }); // MOV --> MOV | Set script error level to 0 (not severe): 'mov r8b, 0'.

7
r5dev/public/include/module.h
View File

@ -32,13 +32,18 @@ public:
DWORD GetModuleSize(void) const;
string GetModuleName(void) const;
ModuleSections_t m_ExecutableCode;
ModuleSections_t m_ExceptionTable;
ModuleSections_t m_RunTimeData;
ModuleSections_t m_ReadOnlyData;
private:
string m_svModuleName;
uintptr_t m_pModuleBase{};
DWORD m_nModuleSize{};
IMAGE_NT_HEADERS64* m_pNTHeaders = nullptr;
IMAGE_DOS_HEADER* m_pDOSHeader = nullptr;
vector<ModuleSections_t> m_vModuleSections{};
vector<ModuleSections_t> m_vModuleSections;
};
#endif // MODULE_H

28
r5dev/public/module.cpp
View File

@ -28,6 +28,11 @@ CModule::CModule(const string& svModuleName) : m_svModuleName(svModuleName)
m_vModuleSections.push_back(ModuleSections_t(string(reinterpret_cast<const char*>(hCurrentSection.Name)),
static_cast<uintptr_t>(m_pModuleBase + hCurrentSection.VirtualAddress), hCurrentSection.SizeOfRawData)); // Push back a struct with the section data.
}
m_ExecutableCode = GetSectionByName(".text");
m_ExceptionTable = GetSectionByName(".pdata");
m_RunTimeData = GetSectionByName(".data");
m_ReadOnlyData = GetSectionByName(".rdata");
}
//-----------------------------------------------------------------------------
@ -38,14 +43,13 @@ CModule::CModule(const string& svModuleName) : m_svModuleName(svModuleName)
//-----------------------------------------------------------------------------
CMemory CModule::FindPatternSIMD(const uint8_t* szPattern, const char* szMask) const
{
ModuleSections_t mInfo = GetSectionByName(".text"); // Get the .text section.
if (!mInfo.IsSectionValid())
if (!m_ExecutableCode.IsSectionValid())
{
return CMemory();
}
uint64_t nBase = static_cast<uint64_t>(mInfo.m_pSectionBase);
uint64_t nSize = static_cast<uint64_t>(mInfo.m_nSectionSize);
uint64_t nBase = static_cast<uint64_t>(m_ExecutableCode.m_pSectionBase);
uint64_t nSize = static_cast<uint64_t>(m_ExecutableCode.m_nSectionSize);
const uint8_t* pData = reinterpret_cast<uint8_t*>(nBase);
const uint8_t* pEnd = pData + static_cast<uint32_t>(nSize) - strlen(szMask);
@ -106,16 +110,15 @@ CMemory CModule::FindPatternSIMD(const uint8_t* szPattern, const char* szMask) c
//-----------------------------------------------------------------------------
CMemory CModule::FindStringReadOnly(const string& svString, bool bNullTerminator) const
{
ModuleSections_t rdataSection = GetSectionByName(".rdata");
if (!rdataSection.IsSectionValid())
if (!m_ReadOnlyData.IsSectionValid())
return CMemory();
vector<int> vBytes = StringToBytes(svString, bNullTerminator); // Convert our string to a byte array.
const pair bytesInfo = std::make_pair(vBytes.size(), vBytes.data()); // Get the size and data of our bytes.
uint8_t* pBase = reinterpret_cast<uint8_t*>(rdataSection.m_pSectionBase); // Get start of .rdata section.
uint8_t* pBase = reinterpret_cast<uint8_t*>(m_ReadOnlyData.m_pSectionBase); // Get start of .rdata section.
for (size_t i = 0ull; i < rdataSection.m_nSectionSize - bytesInfo.first; i++)
for (size_t i = 0ull; i < m_ReadOnlyData.m_nSectionSize - bytesInfo.first; i++)
{
bool bFound = true;
@ -147,8 +150,7 @@ CMemory CModule::FindStringReadOnly(const string& svString, bool bNullTerminator
//-----------------------------------------------------------------------------
CMemory CModule::FindString(const string& svString, const ptrdiff_t nOccurence, bool bNullTerminator) const
{
ModuleSections_t textSection = GetSectionByName(".text");
if (!textSection.IsSectionValid())
if (!m_ExecutableCode.IsSectionValid())
return CMemory();
CMemory stringAddress = FindStringReadOnly(svString, bNullTerminator); // Get Address for the string in the .rdata section.
@ -156,15 +158,15 @@ CMemory CModule::FindString(const string& svString, const ptrdiff_t nOccurence,
return CMemory();
uint8_t* pLatestOccurence = nullptr;
uint8_t* pTextStart = reinterpret_cast<uint8_t*>(textSection.m_pSectionBase); // Get the start of the .text section.
uint8_t* pTextStart = reinterpret_cast<uint8_t*>(m_ExecutableCode.m_pSectionBase); // Get the start of the .text section.
ptrdiff_t dOccurencesFound = 0;
for (size_t i = 0ull; i < textSection.m_nSectionSize - 0x5; i++)
for (size_t i = 0ull; i < m_ExecutableCode.m_nSectionSize - 0x5; i++)
{
byte byte = pTextStart[i];
if (byte == LEA)
{
CMemory skipOpCode = CMemory(reinterpret_cast<uintptr_t>(&pTextStart[i])).OffsetSelf(0x2); // Skip next 2 opcodes, those being the instruction and then the register.
CMemory skipOpCode = CMemory(reinterpret_cast<uintptr_t>(&pTextStart[i])).OffsetSelf(0x2); // Skip next 2 opcodes, those being the instruction and the register.
int32_t relativeAddress = skipOpCode.GetValue<int32_t>(); // Get 4-byte long string relative Address
uintptr_t nextInstruction = skipOpCode.Offset(0x4).GetPtr(); // Get location of next instruction.
CMemory potentialLocation = CMemory(nextInstruction + relativeAddress); // Get potential string location.

2
r5dev/squirrel/sqscript.cpp
View File

@ -210,7 +210,7 @@ SQInteger Script_LoadRson(const SQChar* szRsonName)
{
DevMsg(eDLL_T::ENGINE, "\n");
DevMsg(eDLL_T::ENGINE, "______________________________________________________________\n");
DevMsg(eDLL_T::ENGINE, "] RSON_SQVM --------------------------------------------------\n");
DevMsg(eDLL_T::ENGINE, "] RSON ]------------------------------------------------------\n");
DevMsg(eDLL_T::ENGINE, "] PATH: '%s'\n", szRsonName);
DevMsg(eDLL_T::ENGINE, "--------------------------------------------------------------\n");
DevMsg(eDLL_T::ENGINE, "\n");