From 39de0c3687c8a6af70bf7c07849c948c653536f6 Mon Sep 17 00:00:00 2001 From: PixieCore <41352111+IcePixelx@users.noreply.github.com> Date: Fri, 24 Jun 2022 23:32:47 +0200 Subject: [PATCH] memaddr adjustments. --- r5dev/public/include/memaddr.h | 2 +- r5dev/public/memaddr.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r5dev/public/include/memaddr.h b/r5dev/public/include/memaddr.h index 666bc1fe..680db972 100644 --- a/r5dev/public/include/memaddr.h +++ b/r5dev/public/include/memaddr.h @@ -124,7 +124,7 @@ public: CMemory FollowNearCallSelf(ptrdiff_t opcodeOffset = 0x1, ptrdiff_t nextInstructionOffset = 0x5); CMemory ResolveRelativeAddress(ptrdiff_t registerOffset = 0x0, ptrdiff_t nextInstructionOffset = 0x4) const; CMemory ResolveRelativeAddressSelf(ptrdiff_t registerOffset = 0x0, ptrdiff_t nextInstructionOffset = 0x4); - static void HookVirtualMethod(uintptr_t virtualTable, void* pHookMethod, void** pOriginalMethod, ptrdiff_t methodIndex); + static void HookVirtualMethod(uintptr_t virtualTable, void* pHookMethod, void** ppOriginalMethod, ptrdiff_t methodIndex); private: uintptr_t ptr = 0; diff --git a/r5dev/public/memaddr.cpp b/r5dev/public/memaddr.cpp index 3133cee1..e7d360a1 100644 --- a/r5dev/public/memaddr.cpp +++ b/r5dev/public/memaddr.cpp @@ -239,7 +239,7 @@ CMemory CMemory::ResolveRelativeAddressSelf(ptrdiff_t registerOffset, ptrdiff_t // pOriginalMethod - // Output : void** via pOriginalMethod //----------------------------------------------------------------------------- -void CMemory::HookVirtualMethod(uintptr_t virtualTable, void* pHookMethod, void** pOriginalMethod, ptrdiff_t methodIndex) +void CMemory::HookVirtualMethod(uintptr_t virtualTable, void* pHookMethod, void** ppOriginalMethod, ptrdiff_t methodIndex) { DWORD oldProt = NULL; @@ -259,5 +259,5 @@ void CMemory::HookVirtualMethod(uintptr_t virtualTable, void* pHookMethod, void* VirtualProtect(reinterpret_cast(virtualMethod), sizeof(virtualMethod), oldProt, &oldProt); // Move original function into argument. - *pOriginalMethod = reinterpret_cast(originalFunction); + *ppOriginalMethod = reinterpret_cast(originalFunction); } \ No newline at end of file