source/sourcemod
1
0
Fork 0
mirror of https://github.com/alliedmodders/sourcemod.git synced 2025-12-07 02:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dhooks regression (#2249)

Browse Source 
Co-authored-by: Kenzzer <kenzzer@users.noreply.github.com>
This commit is contained in:
Benoist 2025-02-04 02:39:22 +01:00 committed by GitHub
parent b5e077c6f7
commit f6737a4760
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/dhooks/DynamicHooks/hook.cpp
View File

@ -317,9 +317,13 @@ void CHook::CreateBridge()
PrintRegisters(jit); PrintRegisters(jit);
// Jump to the trampoline // Jump to the trampoline
jit.sub(rsp, 8);
jit.push(rax);
jit.mov(rax, reinterpret_cast<std::uint64_t>(&m_pTrampoline)); jit.mov(rax, reinterpret_cast<std::uint64_t>(&m_pTrampoline));
jit.mov(rax, rax()); jit.mov(rax, rax());
jit.jump(rax); jit.mov(rsp(8), rax);
jit.pop(rax);
jit.retn();
// This code will be executed if a pre-hook returns ReturnAction_Supercede // This code will be executed if a pre-hook returns ReturnAction_Supercede
jit.rewrite<std::int32_t>(jumpOff - sizeof(std::int32_t), jit.get_outputpos() - jumpOff); jit.rewrite<std::int32_t>(jumpOff - sizeof(std::int32_t), jit.get_outputpos() - jumpOff);
@ -621,8 +625,12 @@ void CHook::CreateBridge()
masm.j(equal, &label_supercede); masm.j(equal, &label_supercede);
// Jump to the trampoline // Jump to the trampoline
masm.subl(esp, 4);
masm.push(eax);
masm.movl(eax, Operand(ExternalAddress(&m_pTrampoline))); masm.movl(eax, Operand(ExternalAddress(&m_pTrampoline)));
masm.jmp(eax); masm.movl(Operand(esp, 4), eax);
masm.pop(eax);
masm.ret();
// This code will be executed if a pre-hook returns ReturnAction_Supercede // This code will be executed if a pre-hook returns ReturnAction_Supercede
masm.bind(&label_supercede); masm.bind(&label_supercede);