ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: adjust for base address when saving .text offsets

Browse source
This commit is contained in:
goaaats 2022-06-19 23:06:13 +02:00
parent 7dbeea8900
commit 8cc34ea1b6
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Game/SigScanner.cs
View file

@ -25,7 +25,7 @@ namespace Dalamud.Game
private IntPtr moduleCopyPtr; private IntPtr moduleCopyPtr;
private long moduleCopyOffset; private long moduleCopyOffset;
private Dictionary<string, IntPtr>? textCache; private Dictionary<string, long>? textCache;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="SigScanner"/> class using the main module of the current process. /// Initializes a new instance of the <see cref="SigScanner"/> class using the main module of the current process.
@ -308,11 +308,10 @@ namespace Dalamud.Game
{ {
if (this.textCache != null && this.textCache.TryGetValue(signature, out var address)) if (this.textCache != null && this.textCache.TryGetValue(signature, out var address))
{ {
return address; return new IntPtr(address + this.Module.BaseAddress.ToInt64());
} }
var mBase = this.IsCopy ? this.moduleCopyPtr : this.TextSectionBase; var mBase = this.IsCopy ? this.moduleCopyPtr : this.TextSectionBase;
var scanRet = Scan(mBase, this.TextSectionSize, signature); var scanRet = Scan(mBase, this.TextSectionSize, signature);
if (this.IsCopy) if (this.IsCopy)
@ -323,7 +322,7 @@ namespace Dalamud.Game
if (insnByte == 0xE8 || insnByte == 0xE9) if (insnByte == 0xE8 || insnByte == 0xE9)
return ReadJmpCallSig(scanRet); return ReadJmpCallSig(scanRet);
this.textCache?.Add(signature, scanRet); this.textCache?.Add(signature, scanRet.ToInt64() - this.Module.BaseAddress.ToInt64());
return scanRet; return scanRet;
} }
@ -518,7 +517,7 @@ namespace Dalamud.Game
return; return;
} }
this.textCache = JsonConvert.DeserializeObject<Dictionary<string, IntPtr>>(File.ReadAllText(this.cacheFile.FullName)) ?? new Dictionary<string, IntPtr>(); this.textCache = JsonConvert.DeserializeObject<Dictionary<string, long>>(File.ReadAllText(this.cacheFile.FullName)) ?? new Dictionary<string, long>();
} }
} }
} }