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

feat: actually set BootLogPath from injector

Browse source
This commit is contained in:
goaaats 2022-06-19 12:45:12 +02:00
parent 90ed2b0282
commit 03304b3495
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud.Injector/EntryPoint.cs
View file

@ -187,8 +187,6 @@ namespace Dalamud.Injector
var logPath = GetLogPath("dalamud.injector"); var logPath = GetLogPath("dalamud.injector");
Environment.SetEnvironmentVariable("DALAMUD_BOOT_LOGFILE", GetLogPath("dalamud.boot"));
CullLogFile(logPath, 1 * 1024 * 1024); CullLogFile(logPath, 1 * 1024 * 1024);
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
@ -321,9 +319,10 @@ namespace Dalamud.Injector
startInfo.GameVersion = null; startInfo.GameVersion = null;
// Set boot defaults // Set boot defaults
startInfo.BootLogPath = GetLogPath("dalamud.boot");
startInfo.BootEnabledGameFixes = new List<string> { "prevent_devicechange_crashes", "disable_game_openprocess_access_check", "redirect_openprocess" }; startInfo.BootEnabledGameFixes = new List<string> { "prevent_devicechange_crashes", "disable_game_openprocess_access_check", "redirect_openprocess" };
startInfo.BootDotnetOpenProcessHookMode = 0; startInfo.BootDotnetOpenProcessHookMode = 0;
//startInfo.BootUnhookDlls = new List<string>() { "kernel32.dll", "ntdll.dll", "user32.dll" }; // startInfo.BootUnhookDlls = new List<string>() { "kernel32.dll", "ntdll.dll", "user32.dll" };
return startInfo; return startInfo;
} }

7
Dalamud/DalamudStartInfo.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Dalamud.Game; using Dalamud.Game;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -33,6 +34,7 @@ namespace Dalamud
this.Language = other.Language; this.Language = other.Language;
this.GameVersion = other.GameVersion; this.GameVersion = other.GameVersion;
this.DelayInitializeMs = other.DelayInitializeMs; this.DelayInitializeMs = other.DelayInitializeMs;
this.BootLogPath = other.BootLogPath;
this.BootShowConsole = other.BootShowConsole; this.BootShowConsole = other.BootShowConsole;
this.BootDisableFallbackConsole = other.BootDisableFallbackConsole; this.BootDisableFallbackConsole = other.BootDisableFallbackConsole;
this.BootWaitMessageBox = other.BootWaitMessageBox; this.BootWaitMessageBox = other.BootWaitMessageBox;
@ -85,6 +87,11 @@ namespace Dalamud
/// </summary> /// </summary>
public int DelayInitializeMs { get; set; } = 0; public int DelayInitializeMs { get; set; } = 0;
/// <summary>
/// Gets or sets the path the boot log file is supposed to be written to.
/// </summary>
public string BootLogPath { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether a Boot console should be shown. /// Gets or sets a value indicating whether a Boot console should be shown.
/// </summary> /// </summary>