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

Make patching code compatible with older compilers

Browse Source 
Make it compatible with older versions of the Visual Studio 2017 compiler.
This commit is contained in:
Kawe Mazidjatari 2023-03-20 00:21:03 +01:00
parent cdb03a5d97
commit 1bd1ef6330
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/public/utility/memaddr.cpp
View File

@ -17,7 +17,7 @@ bool CMemory::CheckOpCodes(const vector<uint8_t> vOpcodeArray) const
uintptr_t ref = ptr;
// Loop forward in the ptr class member.
for (auto [byteAtCurrentAddress, i] = std::tuple{ uint8_t(), (size_t)0 }; i < vOpcodeArray.size(); i++, ref++)
for (auto [byteAtCurrentAddress, i] = std::tuple<uint8_t, size_t>{ uint8_t(), (size_t)0 }; i < vOpcodeArray.size(); i++, ref++)
{
byteAtCurrentAddress = *reinterpret_cast<uint8_t*>(ref);
@ -84,7 +84,7 @@ CMemory CMemory::FindPattern(const string& svPattern, const Direction searchDire
uint8_t* pScanBytes = reinterpret_cast<uint8_t*>(ptr); // Get the base of the module.
const vector<int> PatternBytes = PatternToBytes(svPattern); // Convert our pattern to a byte array.
const pair bytesInfo = std::make_pair(PatternBytes.size(), PatternBytes.data()); // Get the size and data of our bytes.
const pair<size_t, const int*> bytesInfo = std::make_pair<size_t, const int*>(PatternBytes.size(), PatternBytes.data()); // Get the size and data of our bytes.
ptrdiff_t occurrences = 0;
for (long i = 01; i < opCodesToScan + bytesInfo.first; i++)
@ -131,7 +131,7 @@ CMemory CMemory::FindPatternSelf(const string& svPattern, const Direction search
uint8_t* pScanBytes = reinterpret_cast<uint8_t*>(ptr); // Get the base of the module.
const vector<int> PatternBytes = PatternToBytes(svPattern); // Convert our pattern to a byte array.
const pair bytesInfo = std::make_pair(PatternBytes.size(), PatternBytes.data()); // Get the size and data of our bytes.
const pair<size_t, const int*> bytesInfo = std::make_pair<size_t, const int*>(PatternBytes.size(), PatternBytes.data()); // Get the size and data of our bytes.
ptrdiff_t occurrences = 0;
for (long i = 01; i < opCodesToScan + bytesInfo.first; i++)

5
r5dev/public/utility/module.cpp
View File

@ -6,6 +6,7 @@
#include "core/stdafx.h"
#include "public/utility/utility.h"
#include "public/utility/memaddr.h"
#include "public/utility/sigcache.h"
//-----------------------------------------------------------------------------
// Purpose: constructor
@ -152,7 +153,7 @@ CMemory CModule::FindPatternSIMD(const string& svPattern, const ModuleSections_t
return CMemory(nRVA + GetModuleBase());
}
const pair patternInfo = PatternToMaskedBytes(svPattern);
const pair<vector<uint8_t>, string> patternInfo = PatternToMaskedBytes(svPattern);
const CMemory memory = FindPatternSIMD(patternInfo.first.data(), patternInfo.second.c_str(), moduleSection);
g_SigCache.AddEntry(svPattern, GetRVA(memory.GetPtr()));
@ -177,7 +178,7 @@ CMemory CModule::FindStringReadOnly(const string& svString, bool bNullTerminator
}
const 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.
const pair<size_t, const int*> bytesInfo = std::make_pair<size_t, const int*>(vBytes.size(), vBytes.data()); // Get the size and data of our bytes.
const uint8_t* pBase = reinterpret_cast<uint8_t*>(m_ReadOnlyData.m_pSectionBase); // Get start of .rdata section.