ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 00:07:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #542 from daemitus/hookManager

Browse source
This commit is contained in:
goaaats 2021-09-07 15:13:15 +02:00 • committed by GitHub
commit b0f2486215
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.cs
View file

@ -388,7 +388,7 @@ namespace Dalamud
__result = (IntPtr)0xFFFFFFFF; __result = (IntPtr)0xFFFFFFFF;
} }
//Log.Verbose($"Process.Handle // {__instance.ProcessName} // {__result:X}"); // Log.Verbose($"Process.Handle // {__instance.ProcessName} // {__result:X}");
} }
private void ApplyProcessPatch() private void ApplyProcessPatch()

13
Dalamud/Hooking/Internal/HookManager.cs
View file

@ -169,15 +169,14 @@ namespace Dalamud.Hooking.Internal
break; break;
} }
var snippet = originalBytes[0..i];
if (i > 0) if (i > 0)
{ {
Log.Verbose($"Reverting hook at 0x{address.ToInt64():X}"); Log.Verbose($"Reverting hook at 0x{address.ToInt64():X} ({snippet.Length} bytes)");
fixed (byte* original = originalBytes) MemoryHelper.ChangePermission(address, i, MemoryProtection.ExecuteReadWrite, out var oldPermissions);
{ MemoryHelper.WriteRaw(address, snippet);
MemoryHelper.ChangePermission(address, i, MemoryProtection.ExecuteReadWrite, out var oldPermissions); MemoryHelper.ChangePermission(address, i, oldPermissions);
MemoryHelper.WriteRaw(address, originalBytes);
MemoryHelper.ChangePermission(address, i, oldPermissions);
}
} }
} }
} }