ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-31 21:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make plugins load asynchronously (#896)

Browse source
This commit is contained in:
kizer 2022-06-25 21:12:46 +09:00 • committed by GitHub
parent 19eb54cd78
commit 7760457dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 204 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Dalamud/Game/SigScanner.cs
View file

@ -5,7 +5,7 @@ using System.Globalization;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
using Dalamud.Utility.Timing;
@ -340,9 +340,15 @@ namespace Dalamud.Game
/// <returns>The real offset of the found signature.</returns>
public IntPtr ScanText(string signature)
{
if (this.textCache != null && this.textCache.TryGetValue(signature, out var address))
if (this.textCache != null)
{
return new IntPtr(address + this.Module.BaseAddress.ToInt64());
lock (this.textCache)
{
if (this.textCache.TryGetValue(signature, out var address))
{
return new IntPtr(address + this.Module.BaseAddress.ToInt64());
}
}
}
var mBase = this.IsCopy ? this.moduleCopyPtr : this.TextSectionBase;
@ -356,7 +362,13 @@ namespace Dalamud.Game
if (insnByte == 0xE8 || insnByte == 0xE9)
scanRet = ReadJmpCallSig(scanRet);
this.textCache?.Add(signature, scanRet.ToInt64() - this.Module.BaseAddress.ToInt64());
if (this.textCache != null)
{
lock (this.textCache)
{
this.textCache[signature] = scanRet.ToInt64() - this.Module.BaseAddress.ToInt64();
}
}
return scanRet;
}