aboutsummaryrefslogtreecommitdiff
path: root/primedev/core
diff options
context:
space:
mode:
Diffstat (limited to 'primedev/core')
-rw-r--r--primedev/core/hooks.h1
-rw-r--r--primedev/core/memory.cpp347
-rw-r--r--primedev/core/memory.h90
-rw-r--r--primedev/core/tier0.cpp6
-rw-r--r--primedev/core/tier1.cpp2
-rw-r--r--primedev/core/tier1.h2
6 files changed, 5 insertions, 443 deletions
diff --git a/primedev/core/hooks.h b/primedev/core/hooks.h
index 7c1b001c..f842afbb 100644
--- a/primedev/core/hooks.h
+++ b/primedev/core/hooks.h
@@ -1,5 +1,4 @@
#pragma once
-#include "memory.h"
#include <string>
#include <iostream>
diff --git a/primedev/core/memory.cpp b/primedev/core/memory.cpp
deleted file mode 100644
index 41110aee..00000000
--- a/primedev/core/memory.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-#include "memory.h"
-
-CMemoryAddress::CMemoryAddress() : m_nAddress(0) {}
-CMemoryAddress::CMemoryAddress(const uintptr_t nAddress) : m_nAddress(nAddress) {}
-CMemoryAddress::CMemoryAddress(const void* pAddress) : m_nAddress(reinterpret_cast<uintptr_t>(pAddress)) {}
-
-// operators
-CMemoryAddress::operator uintptr_t() const
-{
- return m_nAddress;
-}
-
-CMemoryAddress::operator void*() const
-{
- return reinterpret_cast<void*>(m_nAddress);
-}
-
-CMemoryAddress::operator bool() const
-{
- return m_nAddress != 0;
-}
-
-bool CMemoryAddress::operator==(const CMemoryAddress& other) const
-{
- return m_nAddress == other.m_nAddress;
-}
-
-bool CMemoryAddress::operator!=(const CMemoryAddress& other) const
-{
- return m_nAddress != other.m_nAddress;
-}
-
-bool CMemoryAddress::operator==(const uintptr_t& addr) const
-{
- return m_nAddress == addr;
-}
-
-bool CMemoryAddress::operator!=(const uintptr_t& addr) const
-{
- return m_nAddress != addr;
-}
-
-CMemoryAddress CMemoryAddress::operator+(const CMemoryAddress& other) const
-{
- return Offset(other.m_nAddress);
-}
-
-CMemoryAddress CMemoryAddress::operator-(const CMemoryAddress& other) const
-{
- return CMemoryAddress(m_nAddress - other.m_nAddress);
-}
-
-CMemoryAddress CMemoryAddress::operator+(const uintptr_t& addr) const
-{
- return Offset(addr);
-}
-
-CMemoryAddress CMemoryAddress::operator-(const uintptr_t& addr) const
-{
- return CMemoryAddress(m_nAddress - addr);
-}
-
-CMemoryAddress CMemoryAddress::operator*() const
-{
- return Deref();
-}
-
-// traversal
-CMemoryAddress CMemoryAddress::Offset(const uintptr_t nOffset) const
-{
- return CMemoryAddress(m_nAddress + nOffset);
-}
-
-CMemoryAddress CMemoryAddress::Deref(const int nNumDerefs) const
-{
- uintptr_t ret = m_nAddress;
- for (int i = 0; i < nNumDerefs; i++)
- ret = *reinterpret_cast<uintptr_t*>(ret);
-
- return CMemoryAddress(ret);
-}
-
-// patching
-void CMemoryAddress::Patch(const uint8_t* pBytes, const size_t nSize)
-{
- if (nSize)
- WriteProcessMemory(GetCurrentProcess(), reinterpret_cast<LPVOID>(m_nAddress), pBytes, nSize, NULL);
-}
-
-void CMemoryAddress::Patch(const std::initializer_list<uint8_t> bytes)
-{
- uint8_t* pBytes = new uint8_t[bytes.size()];
-
- int i = 0;
- for (const uint8_t& byte : bytes)
- pBytes[i++] = byte;
-
- Patch(pBytes, bytes.size());
- delete[] pBytes;
-}
-
-inline std::vector<uint8_t> HexBytesToString(const char* pHexString)
-{
- std::vector<uint8_t> ret;
-
- size_t size = strlen(pHexString);
- for (int i = 0; i < size; i++)
- {
- // If this is a space character, ignore it
- if (isspace(pHexString[i]))
- continue;
-
- if (i < size - 1)
- {
- BYTE result = 0;
- for (int j = 0; j < 2; j++)
- {
- int val = 0;
- char c = *(pHexString + i + j);
- if (c >= 'a')
- {
- val = c - 'a' + 0xA;
- }
- else if (c >= 'A')
- {
- val = c - 'A' + 0xA;
- }
- else if (isdigit(c))
- {
- val = c - '0';
- }
- else
- {
- assert_msg(false, "Failed to parse invalid hex string.");
- val = -1;
- }
-
- result += (j == 0) ? val * 16 : val;
- }
- ret.push_back(result);
- }
-
- i++;
- }
-
- return ret;
-}
-
-void CMemoryAddress::Patch(const char* pBytes)
-{
- std::vector<uint8_t> vBytes = HexBytesToString(pBytes);
- Patch(vBytes.data(), vBytes.size());
-}
-
-void CMemoryAddress::NOP(const size_t nSize)
-{
- uint8_t* pBytes = new uint8_t[nSize];
-
- memset(pBytes, 0x90, nSize);
- Patch(pBytes, nSize);
-
- delete[] pBytes;
-}
-
-bool CMemoryAddress::IsMemoryReadable(const size_t nSize)
-{
- static SYSTEM_INFO sysInfo;
- if (!sysInfo.dwPageSize)
- GetSystemInfo(&sysInfo);
-
- MEMORY_BASIC_INFORMATION memInfo;
- if (!VirtualQuery(reinterpret_cast<LPCVOID>(m_nAddress), &memInfo, sizeof(memInfo)))
- return false;
-
- return memInfo.RegionSize >= nSize && memInfo.State & MEM_COMMIT && !(memInfo.Protect & PAGE_NOACCESS);
-}
-
-CModule::CModule(const HMODULE pModule)
-{
- MODULEINFO mInfo {0};
-
- if (pModule && pModule != INVALID_HANDLE_VALUE)
- GetModuleInformation(GetCurrentProcess(), pModule, &mInfo, sizeof(MODULEINFO));
-
- m_nModuleSize = static_cast<size_t>(mInfo.SizeOfImage);
- m_pModuleBase = reinterpret_cast<uintptr_t>(mInfo.lpBaseOfDll);
- m_nAddress = m_pModuleBase;
-
- if (!m_nModuleSize || !m_pModuleBase)
- return;
-
- m_pDOSHeader = reinterpret_cast<IMAGE_DOS_HEADER*>(m_pModuleBase);
- m_pNTHeaders = reinterpret_cast<IMAGE_NT_HEADERS64*>(m_pModuleBase + m_pDOSHeader->e_lfanew);
-
- const IMAGE_SECTION_HEADER* hSection = IMAGE_FIRST_SECTION(m_pNTHeaders); // Get first image section.
-
- for (WORD i = 0; i < m_pNTHeaders->FileHeader.NumberOfSections; i++) // Loop through the sections.
- {
- const IMAGE_SECTION_HEADER& hCurrentSection = hSection[i]; // Get current section.
-
- ModuleSections_t moduleSection = ModuleSections_t(
- std::string(reinterpret_cast<const char*>(hCurrentSection.Name)),
- static_cast<uintptr_t>(m_pModuleBase + hCurrentSection.VirtualAddress),
- hCurrentSection.SizeOfRawData);
-
- if (!strcmp((const char*)hCurrentSection.Name, ".text"))
- m_ExecutableCode = moduleSection;
- else if (!strcmp((const char*)hCurrentSection.Name, ".pdata"))
- m_ExceptionTable = moduleSection;
- else if (!strcmp((const char*)hCurrentSection.Name, ".data"))
- m_RunTimeData = moduleSection;
- else if (!strcmp((const char*)hCurrentSection.Name, ".rdata"))
- m_ReadOnlyData = moduleSection;
-
- m_vModuleSections.push_back(moduleSection); // Push back a struct with the section data.
- }
-}
-
-CModule::CModule(const char* pModuleName) : CModule(GetModuleHandleA(pModuleName)) {}
-
-CMemoryAddress CModule::GetExport(const char* pExportName)
-{
- return CMemoryAddress(reinterpret_cast<uintptr_t>(GetProcAddress(reinterpret_cast<HMODULE>(m_nAddress), pExportName)));
-}
-
-CMemoryAddress CModule::FindPattern(const uint8_t* pPattern, const char* pMask)
-{
- if (!m_ExecutableCode.IsSectionValid())
- return CMemoryAddress();
-
- 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(pMask);
-
- int nMasks[64]; // 64*16 = enough masks for 1024 bytes.
- int iNumMasks = static_cast<int>(ceil(static_cast<float>(strlen(pMask)) / 16.f));
-
- memset(nMasks, '\0', iNumMasks * sizeof(int));
- for (intptr_t i = 0; i < iNumMasks; ++i)
- {
- for (intptr_t j = strnlen(pMask + i * 16, 16) - 1; j >= 0; --j)
- {
- if (pMask[i * 16 + j] == 'x')
- {
- _bittestandset(reinterpret_cast<LONG*>(&nMasks[i]), j);
- }
- }
- }
- __m128i xmm1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(pPattern));
- __m128i xmm2, xmm3, msks;
- for (; pData != pEnd; _mm_prefetch(reinterpret_cast<const char*>(++pData + 64), _MM_HINT_NTA))
- {
- if (pPattern[0] == pData[0])
- {
- xmm2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(pData));
- msks = _mm_cmpeq_epi8(xmm1, xmm2);
- if ((_mm_movemask_epi8(msks) & nMasks[0]) == nMasks[0])
- {
- for (uintptr_t i = 1; i < static_cast<uintptr_t>(iNumMasks); ++i)
- {
- xmm2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>((pData + i * 16)));
- xmm3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>((pPattern + i * 16)));
- msks = _mm_cmpeq_epi8(xmm2, xmm3);
- if ((_mm_movemask_epi8(msks) & nMasks[i]) == nMasks[i])
- {
- if ((i + 1) == iNumMasks)
- {
- return CMemoryAddress(const_cast<uint8_t*>(pData));
- }
- }
- else
- goto CONTINUE;
- }
-
- return CMemoryAddress((&*(const_cast<uint8_t*>(pData))));
- }
- }
-
- CONTINUE:;
- }
-
- return CMemoryAddress();
-}
-
-inline std::pair<std::vector<uint8_t>, std::string> MaskedBytesFromPattern(const char* pPatternString)
-{
- std::vector<uint8_t> vRet;
- std::string sMask;
-
- size_t size = strlen(pPatternString);
- for (int i = 0; i < size; i++)
- {
- // If this is a space character, ignore it
- if (isspace(pPatternString[i]))
- continue;
-
- if (pPatternString[i] == '?')
- {
- // Add a wildcard
- vRet.push_back(0);
- sMask.append("?");
- }
- else if (i < size - 1)
- {
- BYTE result = 0;
- for (int j = 0; j < 2; j++)
- {
- int val = 0;
- char c = *(pPatternString + i + j);
- if (c >= 'a')
- {
- val = c - 'a' + 0xA;
- }
- else if (c >= 'A')
- {
- val = c - 'A' + 0xA;
- }
- else if (isdigit(c))
- {
- val = c - '0';
- }
- else
- {
- assert_msg(false, "Failed to parse invalid pattern string.");
- val = -1;
- }
-
- result += (j == 0) ? val * 16 : val;
- }
-
- vRet.push_back(result);
- sMask.append("x");
- }
-
- i++;
- }
-
- return std::make_pair(vRet, sMask);
-}
-
-CMemoryAddress CModule::FindPattern(const char* pPattern)
-{
- const auto pattern = MaskedBytesFromPattern(pPattern);
- return FindPattern(pattern.first.data(), pattern.second.c_str());
-}
diff --git a/primedev/core/memory.h b/primedev/core/memory.h
deleted file mode 100644
index a978963e..00000000
--- a/primedev/core/memory.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#pragma once
-
-class CMemoryAddress
-{
-public:
- uintptr_t m_nAddress;
-
-public:
- CMemoryAddress();
- CMemoryAddress(const uintptr_t nAddress);
- CMemoryAddress(const void* pAddress);
-
- // operators
- operator uintptr_t() const;
- operator void*() const;
- operator bool() const;
-
- bool operator==(const CMemoryAddress& other) const;
- bool operator!=(const CMemoryAddress& other) const;
- bool operator==(const uintptr_t& addr) const;
- bool operator!=(const uintptr_t& addr) const;
-
- CMemoryAddress operator+(const CMemoryAddress& other) const;
- CMemoryAddress operator-(const CMemoryAddress& other) const;
- CMemoryAddress operator+(const uintptr_t& other) const;
- CMemoryAddress operator-(const uintptr_t& other) const;
- CMemoryAddress operator*() const;
-
- template <typename T> T RCast()
- {
- return reinterpret_cast<T>(m_nAddress);
- }
-
- // traversal
- CMemoryAddress Offset(const uintptr_t nOffset) const;
- CMemoryAddress Deref(const int nNumDerefs = 1) const;
-
- // patching
- void Patch(const uint8_t* pBytes, const size_t nSize);
- void Patch(const std::initializer_list<uint8_t> bytes);
- void Patch(const char* pBytes);
- void NOP(const size_t nSize);
-
- bool IsMemoryReadable(const size_t nSize);
-};
-
-// based on https://github.com/Mauler125/r5sdk/blob/master/r5dev/public/include/module.h
-class CModule : public CMemoryAddress
-{
-public:
- struct ModuleSections_t
- {
- ModuleSections_t(void) = default;
- ModuleSections_t(const std::string& svSectionName, uintptr_t pSectionBase, size_t nSectionSize)
- : m_svSectionName(svSectionName), m_pSectionBase(pSectionBase), m_nSectionSize(nSectionSize)
- {
- }
-
- bool IsSectionValid(void) const
- {
- return m_nSectionSize != 0;
- }
-
- std::string m_svSectionName; // Name of section.
- uintptr_t m_pSectionBase {}; // Start address of section.
- size_t m_nSectionSize {}; // Size of section.
- };
-
- ModuleSections_t m_ExecutableCode;
- ModuleSections_t m_ExceptionTable;
- ModuleSections_t m_RunTimeData;
- ModuleSections_t m_ReadOnlyData;
-
-private:
- std::string m_svModuleName;
- uintptr_t m_pModuleBase {};
- DWORD m_nModuleSize {};
- IMAGE_NT_HEADERS64* m_pNTHeaders = nullptr;
- IMAGE_DOS_HEADER* m_pDOSHeader = nullptr;
- std::vector<ModuleSections_t> m_vModuleSections;
-
-public:
- CModule() = delete; // no default, we need a module name
- CModule(const HMODULE pModule);
- CModule(const char* pModuleName);
-
- CMemoryAddress GetExport(const char* pExportName);
- CMemoryAddress FindPattern(const uint8_t* pPattern, const char* pMask);
- CMemoryAddress FindPattern(const char* pPattern);
-};
diff --git a/primedev/core/tier0.cpp b/primedev/core/tier0.cpp
index 1f59722c..dd5ac245 100644
--- a/primedev/core/tier0.cpp
+++ b/primedev/core/tier0.cpp
@@ -24,7 +24,7 @@ ON_DLL_LOAD("tier0.dll", Tier0GameFuncs, (CModule module))
TryCreateGlobalMemAlloc();
// setup tier0 funcs
- CommandLine = module.GetExport("CommandLine").RCast<CommandLineType>();
- Plat_FloatTime = module.GetExport("Plat_FloatTime").RCast<Plat_FloatTimeType>();
- ThreadInServerFrameThread = module.GetExport("ThreadInServerFrameThread").RCast<ThreadInServerFrameThreadType>();
+ CommandLine = module.GetExportedFunction("CommandLine").RCast<CommandLineType>();
+ Plat_FloatTime = module.GetExportedFunction("Plat_FloatTime").RCast<Plat_FloatTimeType>();
+ ThreadInServerFrameThread = module.GetExportedFunction("ThreadInServerFrameThread").RCast<ThreadInServerFrameThreadType>();
}
diff --git a/primedev/core/tier1.cpp b/primedev/core/tier1.cpp
index a2995496..f857fdba 100644
--- a/primedev/core/tier1.cpp
+++ b/primedev/core/tier1.cpp
@@ -3,7 +3,7 @@
// Note: this file is tier1/interface.cpp in primedev, but given that tier0 is yet to be split
// I am following the existing "pattern" and putting this here
-CMemoryAddress Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFactoryName)
+CMemory Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFactoryName)
{
HMODULE hModule = GetModuleHandleA(svModuleName.c_str());
diff --git a/primedev/core/tier1.h b/primedev/core/tier1.h
index 5be58274..d162e7c8 100644
--- a/primedev/core/tier1.h
+++ b/primedev/core/tier1.h
@@ -9,4 +9,4 @@
typedef void* (*CreateInterfaceFn)(const char* pName, int* pReturnCode);
-CMemoryAddress Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFact);
+CMemory Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFact);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 20:34:18 +0000