ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

fix(byte_patch): sometimes the page protections get modified between apply and restore: make sure the protections are fine for us to memcpy. (#1831)

Browse Source 
* feat(BytePatch): add is_active member function
* fix(byte_patch): sometimes the page protections get modified between the apply and restore of the byte_patch, make sure the protections are fine for us to memcpy

Co-authored-by: Quentin E. / iDeath <xiaoxiao921@hotmail.fr>
This commit is contained in:
Andreas Maerten 2023-07-24 16:13:09 +02:00 committed by GitHub
parent 16e8e571f0
commit 0289576677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/commands/system/window_hook.cpp
View File

@ -8,23 +8,19 @@ namespace big
{ {
using bool_command::bool_command; using bool_command::bool_command;
memory::byte_patch* m_window_hook_patch;
virtual void refresh() override virtual void refresh() override
{ {
static auto patch = (m_window_hook_patch = memory::byte_patch::make(g_pointers->m_gta.m_window_hook.as<void*>(), std::to_array({0xC3, 0x90, 0x90, 0x90})) static auto& window_hook_patch = memory::byte_patch::make(g_pointers->m_gta.m_window_hook.as<void*>(), std::to_array({0xC3, 0x90, 0x90, 0x90}));
.get(),
true);
if (m_toggle) if (m_toggle)
{ {
m_window_hook_patch->apply(); window_hook_patch->apply();
UnhookWindowsHookEx(*g_pointers->m_gta.m_window_hook.add(45).rip().as<HHOOK*>()); UnhookWindowsHookEx(*g_pointers->m_gta.m_window_hook.add(45).rip().as<HHOOK*>());
} }
else else
{ {
SetWindowsHookExA(13, g_pointers->m_gta.m_window_hook.add(18).rip().as<HOOKPROC>(), GetModuleHandleA("GTA5.exe"), 0); SetWindowsHookExA(13, g_pointers->m_gta.m_window_hook.add(18).rip().as<HOOKPROC>(), GetModuleHandleA("GTA5.exe"), 0);
m_window_hook_patch->restore(); window_hook_patch->restore();
} }
} }
}; };

7
src/memory/byte_patch.cpp
View File

@ -9,15 +9,20 @@ namespace memory
void byte_patch::apply() const void byte_patch::apply() const
{ {
DWORD temp;
VirtualProtect(m_address, m_size, PAGE_EXECUTE_READWRITE, (PDWORD)&m_old_protect); VirtualProtect(m_address, m_size, PAGE_EXECUTE_READWRITE, (PDWORD)&m_old_protect);
memcpy(m_address, m_value.get(), m_size); memcpy(m_address, m_value.get(), m_size);
VirtualProtect(m_address, m_size, m_old_protect, &temp);
} }
void byte_patch::restore() const void byte_patch::restore() const
{ {
DWORD temp; DWORD temp;
VirtualProtect(m_address, m_size, m_old_protect, &temp);
VirtualProtect(m_address, m_size, PAGE_EXECUTE_READWRITE, (PDWORD)&temp);
memcpy(m_address, m_original_bytes.get(), m_size); memcpy(m_address, m_original_bytes.get(), m_size);
VirtualProtect(m_address, m_size, m_old_protect, &temp);
} }
void byte_patch::remove() const void byte_patch::remove() const

1
src/memory/byte_patch.hpp
View File

@ -12,7 +12,6 @@ namespace memory
virtual ~byte_patch(); virtual ~byte_patch();
void apply() const; void apply() const;
void restore() const; void restore() const;
void remove() const; void remove() const;