ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 12:23:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: try to copy .text and .data of TargetModule to avoid conflicts(WIP, needs testing)

Browse source
This commit is contained in:
goat 2020-01-26 17:25:11 +09:00
parent 3ae9705e8d
commit e2f9773e33
5 changed files with 67 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Dalamud.cs
View file

@ -28,9 +28,9 @@ namespace Dalamud {
private readonly ManualResetEvent unloadSignal;
public readonly ProcessModule TargetModule;
private readonly ProcessModule targetModule;
private readonly SigScanner sigScanner;
public readonly SigScanner SigScanner;
public Framework Framework { get; }
@ -48,7 +48,7 @@ namespace Dalamud {
public readonly DalamudConfiguration Configuration;
internal readonly WinSockHandlers WinSock2;
private readonly WinSockHandlers WinSock2;
public readonly InterfaceManager InterfaceManager;
@ -63,11 +63,11 @@ namespace Dalamud {
this.unloadSignal = new ManualResetEvent(false);
// Initialize the process information.
this.TargetModule = Process.GetCurrentProcess().MainModule;
this.sigScanner = new SigScanner(this.TargetModule);
this.targetModule = Process.GetCurrentProcess().MainModule;
SigScanner = new SigScanner(this.targetModule, true);
// Initialize game subsystem
Framework = new Framework(this.sigScanner, this);
Framework = new Framework(this.SigScanner, this);
// Initialize managers. Basically handlers for the logic
CommandManager = new CommandManager(this, info.Language);
@ -76,7 +76,7 @@ namespace Dalamud {
ChatHandlers = new ChatHandlers(this);
NetworkHandlers = new NetworkHandlers(this, this.Configuration.OptOutMbCollection);
this.ClientState = new ClientState(this, info, this.sigScanner, this.TargetModule);
this.ClientState = new ClientState(this, info, this.SigScanner, this.targetModule);
this.BotManager = new DiscordBotManager(this, this.Configuration.DiscordFeatureConfig);
@ -84,7 +84,7 @@ namespace Dalamud {
this.WinSock2 = new WinSockHandlers();
this.InterfaceManager = new InterfaceManager(this, this.sigScanner);
this.InterfaceManager = new InterfaceManager(this, this.SigScanner);
this.InterfaceManager.OnDraw += BuildDalamudUi;
this.InterfaceManager.Enable();
}
@ -135,6 +135,8 @@ namespace Dalamud {
this.unloadSignal.Dispose();
this.WinSock2.Dispose();
this.SigScanner.Dispose();
}
#region Interface