diff --git a/.editorconfig b/.editorconfig index a0cd5584f..1b1377fca 100644 --- a/.editorconfig +++ b/.editorconfig @@ -140,3 +140,8 @@ indent_style = space indent_size = 4 tab_width = 4 dotnet_style_parentheses_in_other_operators=always_for_clarity:silent + +[*.{yaml,yml}] +indent_style = space +indent_size = 2 +tab_width = 2 diff --git a/.github/workflows/tag-build.yml b/.github/workflows/tag-build.yml index f367c2fc9..042630191 100644 --- a/.github/workflows/tag-build.yml +++ b/.github/workflows/tag-build.yml @@ -1,5 +1,10 @@ name: Tag Build -on: [push] +on: + push: + branches: + - master + tags-ignore: + - '*' # don't needlessly execute on tags jobs: tag: diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 5796056a3..f02baa890 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -20,12 +20,12 @@ using Dalamud.Interface.Internal.ManagedAsserts; using Dalamud.Interface.Internal.Notifications; using Dalamud.Interface.Style; using Dalamud.Interface.Windowing; -using Dalamud.Logging.Internal; using Dalamud.Utility; using Dalamud.Utility.Timing; using ImGuiNET; using ImGuiScene; using PInvoke; +using Serilog; // general dev notes, here because it's easiest @@ -47,8 +47,6 @@ namespace Dalamud.Interface.Internal; [ServiceManager.BlockingEarlyLoadedService] internal class InterfaceManager : IDisposable, IServiceType { - private static ModuleLog Log = new ModuleLog("IM"); - private const float DefaultFontSizePt = 12.0f; private const float DefaultFontSizePx = DefaultFontSizePt * 4.0f / 3.0f; private const ushort Fallback1Codepoint = 0x3013; // Geta mark; FFXIV uses this to indicate that a glyph is missing. @@ -78,41 +76,16 @@ internal class InterfaceManager : IDisposable, IServiceType private bool isOverrideGameCursor = true; [ServiceManager.ServiceConstructor] - private InterfaceManager(SigScanner sigScanner) + private InterfaceManager() { - Log.Verbose("ctor called"); - this.dispatchMessageWHook = Hook.FromImport( null, "user32.dll", "DispatchMessageW", 0, this.DispatchMessageWDetour); this.setCursorHook = Hook.FromImport( null, "user32.dll", "SetCursor", 0, this.SetCursorDetour); - Log.Verbose("Import hooks applied"); this.fontBuildSignal = new ManualResetEvent(false); this.address = new SwapChainVtableResolver(); - this.address.Setup(); - Log.Verbose("Resolver setup complete"); - - Log.Verbose("===== S W A P C H A I N ====="); - Log.Verbose($"Is ReShade: {this.address.IsReshade}"); - Log.Verbose($"Present address 0x{this.address.Present.ToInt64():X}"); - Log.Verbose($"ResizeBuffers address 0x{this.address.ResizeBuffers.ToInt64():X}"); - - this.presentHook = Hook.FromAddress(this.address.Present, this.PresentDetour); - this.resizeBuffersHook = Hook.FromAddress(this.address.ResizeBuffers, this.ResizeBuffersDetour); - Log.Verbose("Present and ResizeBuffers hooked"); - - var wndProcAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 80 7C 24 ?? ?? 74 ?? B8"); - Log.Verbose($"WndProc address 0x{wndProcAddress.ToInt64():X}"); - this.processMessageHook = Hook.FromAddress(wndProcAddress, this.ProcessMessageDetour); - - this.setCursorHook.Enable(); - this.presentHook.Enable(); - this.resizeBuffersHook.Enable(); - this.dispatchMessageWHook.Enable(); - this.processMessageHook.Enable(); - Log.Verbose("Hooks enabled"); } [UnmanagedFunctionPointer(CallingConvention.ThisCall)] @@ -1009,9 +982,10 @@ internal class InterfaceManager : IDisposable, IServiceType } [ServiceManager.CallWhenServicesReady] - private void ContinueConstruction() + private void ContinueConstruction(SigScanner sigScanner, Framework framework) { - this.framework.RunOnFrameworkThread(() => + this.address.Setup(sigScanner); + framework.RunOnFrameworkThread(() => { while ((this.GameWindowHandle = NativeFunctions.FindWindowEx(IntPtr.Zero, this.GameWindowHandle, "FFXIVGAME", IntPtr.Zero)) != IntPtr.Zero) { @@ -1030,6 +1004,23 @@ internal class InterfaceManager : IDisposable, IServiceType { Log.Error(ex, "Could not enable immersive mode"); } + + this.presentHook = Hook.FromAddress(this.address.Present, this.PresentDetour, true); + this.resizeBuffersHook = Hook.FromAddress(this.address.ResizeBuffers, this.ResizeBuffersDetour, true); + + Log.Verbose("===== S W A P C H A I N ====="); + Log.Verbose($"Present address 0x{this.presentHook!.Address.ToInt64():X}"); + Log.Verbose($"ResizeBuffers address 0x{this.resizeBuffersHook!.Address.ToInt64():X}"); + + var wndProcAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 80 7C 24 ?? ?? 74 ?? B8"); + Log.Verbose($"WndProc address 0x{wndProcAddress.ToInt64():X}"); + this.processMessageHook = Hook.FromAddress(wndProcAddress, this.ProcessMessageDetour); + + this.setCursorHook.Enable(); + this.presentHook.Enable(); + this.resizeBuffersHook.Enable(); + this.dispatchMessageWHook.Enable(); + this.processMessageHook.Enable(); }); } diff --git a/Dalamud/Networking/Http/HappyEyeballsCallback.cs b/Dalamud/Networking/Http/HappyEyeballsCallback.cs index af854fb2c..7ca77576c 100644 --- a/Dalamud/Networking/Http/HappyEyeballsCallback.cs +++ b/Dalamud/Networking/Http/HappyEyeballsCallback.cs @@ -91,11 +91,7 @@ public class HappyEyeballsCallback : IDisposable private async Task AttemptConnection(IPAddress address, int port, CancellationToken token, CancellationToken delayToken) { await AsyncUtils.CancellableDelay(-1, delayToken).ConfigureAwait(false); - - if (token.IsCancellationRequested) - { - return Task.FromCanceled(token).Result; - } + token.ThrowIfCancellationRequested(); var socket = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp) { @@ -116,9 +112,9 @@ public class HappyEyeballsCallback : IDisposable private async Task> GetSortedAddresses(string hostname, CancellationToken token) { - // This method abuses DNS ordering and LINQ a bit. We can normally assume that "addresses" will be provided in + // This method abuses DNS ordering and LINQ a bit. We can normally assume that addresses will be provided in // the order the system wants to use. GroupBy will return its groups *in the order they're discovered*. Meaning, - // the first group created will always be the "preferred" group, and all other groups are in preference order. + // the first group created will always be the preferred group, and all other groups are in preference order. // This means a straight zipper merge is nice and clean and gives us most -> least preferred, repeating. var dnsRecords = await Dns.GetHostAddressesAsync(hostname, this.forcedAddressFamily, token); diff --git a/Dalamud/Utility/AsyncUtils.cs b/Dalamud/Utility/AsyncUtils.cs index d252bd5d5..c0fbbb8a4 100644 --- a/Dalamud/Utility/AsyncUtils.cs +++ b/Dalamud/Utility/AsyncUtils.cs @@ -51,7 +51,7 @@ public static class AsyncUtils { try { - await Task.Delay(millisecondsDelay, cancellationToken); + await Task.Delay(millisecondsDelay, cancellationToken).ConfigureAwait(false); } catch (TaskCanceledException) { diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 5e9568845..7c59a8393 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 5e9568845ac302540ce1135abbff7bef98314714 +Subproject commit 7c59a83931338d7124d3fd75a2d7734dcc5dc2a1