From 91c496ab4894d1e921038fe6bfd70bc3afae4265 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 15 Nov 2026 14:41:48 +0100 Subject: [PATCH 1/2] fix: graphics wrappers beside the starter no longer reach its window ReShade installed for Direct3D as dxgi.dll in the simulator's folder was loaded into the starter as well, and its window came up empty. The system dxgi, d3d11, d3d9 and opengl32 are loaded first, and the window code's own imports are handed those. The simulator still finds its wrappers. --software-render draws the window on the processor, on Windows and X11, for a machine on which it still comes up empty. --- .../Infrastructure/SystemGraphicsLibraries.cs | 76 +++++++++++++++++++ StarterNG/Program.cs | 29 +++++++ 2 files changed, 105 insertions(+) create mode 100644 StarterNG/Infrastructure/SystemGraphicsLibraries.cs diff --git a/StarterNG/Infrastructure/SystemGraphicsLibraries.cs b/StarterNG/Infrastructure/SystemGraphicsLibraries.cs new file mode 100644 index 0000000..2aa2f3a --- /dev/null +++ b/StarterNG/Infrastructure/SystemGraphicsLibraries.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Runtime.InteropServices; + +namespace StarterNG.Infrastructure; + +/// +/// The starter sits in the simulator's folder, and so do the graphics wrappers a player +/// puts there for the simulator - ReShade and the like, named after the system library +/// they stand in for. Windows looks in the program's own folder first, so the starter's +/// window drew through them too, and with some of them it drew nothing at all. +/// Loaded from System32 by full path before anything asks for them, these names are +/// taken: a native library that asks by name gets the system one. .NET looks beside the +/// program by full path before it asks by name, so the window code's own imports are +/// handed the same libraries. The simulator is a process of its own and still finds its +/// wrappers. +/// Elsewhere there is nothing of the kind to keep out. Under Wine or Proton the system +/// folder is the prefix's, so what is taken there is what would have been taken anyway. +/// +public static class SystemGraphicsLibraries +{ + // dxgi ahead of d3d11, which asks for it. + private static readonly string[] Names = { "dxgi", "d3d11", "d3d9", "opengl32" }; + + private static readonly Dictionary Loaded = new(StringComparer.OrdinalIgnoreCase); + private static readonly List Shadowed = new(); + + /// The assemblies whose imports of these libraries are to get the system ones. + public static void LoadFirst(params Assembly[] importers) + { + if (!OperatingSystem.IsWindows()) + return; + + string system = Environment.SystemDirectory; + string own = AppContext.BaseDirectory; + + foreach (string name in Names) + { + string file = name + ".dll"; + if (File.Exists(Path.Combine(own, file))) + Shadowed.Add(file); + if (NativeLibrary.TryLoad(Path.Combine(system, file), out IntPtr handle)) + Loaded[name] = handle; + } + + foreach (var importer in importers) + { + try + { + NativeLibrary.SetDllImportResolver(importer, Resolve); + } + catch (InvalidOperationException) + { + // It has a resolver of its own already; that one decides. + } + } + } + + private static IntPtr Resolve(string libraryName, Assembly assembly, DllImportSearchPath? searchPath) + { + string name = libraryName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) + ? libraryName[..^4] + : libraryName; + // Zero leaves the library to the usual search. + return Loaded.TryGetValue(name, out IntPtr handle) ? handle : IntPtr.Zero; + } + + /// Which of them lay beside the starter, once the log can take it. + public static void LogShadowed() + { + if (Shadowed.Count > 0) + Diagnostics.Log($"Graphics libraries beside the starter, left to the simulator: {string.Join(", ", Shadowed)}"); + } +} diff --git a/StarterNG/Program.cs b/StarterNG/Program.cs index 2c1beca..da02172 100644 --- a/StarterNG/Program.cs +++ b/StarterNG/Program.cs @@ -1,6 +1,7 @@ using Avalonia; using Avalonia.Threading; using System; +using System.Linq; using System.Threading.Tasks; using StarterNG.Application; using StarterNG.Infrastructure; @@ -10,12 +11,24 @@ namespace StarterNG; static class Program { + /// + /// Drawn by the processor instead of the graphics card, for a machine on which the + /// window comes up empty. Started with --software-render. + /// + private static bool _softwareRender; + [STAThread] public static void Main(string[] args) { + // Ahead of everything that could draw: what lies beside the starter is the simulator's. + SystemGraphicsLibraries.LoadFirst(typeof(Win32PlatformOptions).Assembly); + + _softwareRender = args.Any(a => string.Equals(a, "--software-render", StringComparison.OrdinalIgnoreCase)); + // Composition root first: everything below, including the crash handlers, // resolves its collaborators from this graph. AppServices.Initialize(); + SystemGraphicsLibraries.LogShadowed(); AppDomain.CurrentDomain.UnhandledException += (_, e) => { @@ -63,9 +76,25 @@ static class Program }; } + // Each platform reads only its own options, so both can be given everywhere. + private static AppBuilder WithSoftwareRenderIfAsked(this AppBuilder builder) => + _softwareRender + ? builder + .With(new Win32PlatformOptions + { + RenderingMode = new[] { Win32RenderingMode.Software }, + CompositionMode = new[] { Win32CompositionMode.RedirectionSurface } + }) + .With(new X11PlatformOptions + { + RenderingMode = new[] { X11RenderingMode.Software } + }) + : builder; + public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() .UsePlatformDetect() + .WithSoftwareRenderIfAsked() .WithInterFont() .WithDiagnosticsLogging() .AfterSetup(_ => LogUiExceptions()); From 6e2dbf9eac5b8130a6b13187bad8efc35590d527 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 15 Nov 2026 17:30:13 +0100 Subject: [PATCH 2/2] test: the system graphics libraries and the software render switch Taking the libraries and the switch's options are apart from Main, so they are tested on every system, not only where Windows has them to load. --- StarterNG.Tests/SoftwareRenderTests.cs | 45 +++++++++ .../SystemGraphicsLibrariesTests.cs | 98 +++++++++++++++++++ StarterNG/Infrastructure/SoftwareRender.cs | 32 ++++++ .../Infrastructure/SystemGraphicsLibraries.cs | 80 ++++++++------- StarterNG/Program.cs | 27 ++--- 5 files changed, 228 insertions(+), 54 deletions(-) create mode 100644 StarterNG.Tests/SoftwareRenderTests.cs create mode 100644 StarterNG.Tests/SystemGraphicsLibrariesTests.cs create mode 100644 StarterNG/Infrastructure/SoftwareRender.cs diff --git a/StarterNG.Tests/SoftwareRenderTests.cs b/StarterNG.Tests/SoftwareRenderTests.cs new file mode 100644 index 0000000..88cc2c9 --- /dev/null +++ b/StarterNG.Tests/SoftwareRenderTests.cs @@ -0,0 +1,45 @@ +using Avalonia; +using StarterNG.Infrastructure; + +namespace StarterNG.Tests; + +public class SoftwareRenderTests +{ + [Theory] + [InlineData("--software-render")] + [InlineData("--Software-Render")] + public void The_switch_asks_for_it_in_any_case(string arg) + { + Assert.True(SoftwareRender.AskedIn(new[] { "--other", arg })); + } + + [Fact] + public void Without_the_switch_the_graphics_card_draws() + { + Assert.False(SoftwareRender.AskedIn(Array.Empty())); + Assert.False(SoftwareRender.AskedIn(new[] { "--software" })); + } + + [Fact] + public void Windows_draws_on_the_processor_into_a_plain_window_surface() + { + var options = SoftwareRender.Win32Options; + + Assert.Equal(new[] { Win32RenderingMode.Software }, options.RenderingMode); + Assert.Equal(new[] { Win32CompositionMode.RedirectionSurface }, options.CompositionMode); + } + + [Fact] + public void X11_draws_on_the_processor() + { + Assert.Equal(new[] { X11RenderingMode.Software }, SoftwareRender.X11Options.RenderingMode); + } + + [Fact] + public void Both_platforms_options_go_to_the_same_builder() + { + var builder = AppBuilder.Configure(); + + Assert.Same(builder, SoftwareRender.ApplyTo(builder)); + } +} diff --git a/StarterNG.Tests/SystemGraphicsLibrariesTests.cs b/StarterNG.Tests/SystemGraphicsLibrariesTests.cs new file mode 100644 index 0000000..875699b --- /dev/null +++ b/StarterNG.Tests/SystemGraphicsLibrariesTests.cs @@ -0,0 +1,98 @@ +using StarterNG.Infrastructure; + +namespace StarterNG.Tests; + +public class SystemGraphicsLibrariesTests +{ + private const string System32 = @"C:\Windows\System32"; + private const string Game = @"E:\SteamLibrary\steamapps\common\MaSzyna"; + + private static readonly IntPtr Dxgi = new(0x1000); + private static readonly IntPtr D3d11 = new(0x2000); + + private static SystemGraphicsLibraries Take(Func beside, Dictionary system) + { + return SystemGraphicsLibraries.Take(System32, Game, beside, Load); + + bool Load(string path, out IntPtr handle) + { + handle = system.GetValueOrDefault(Path.GetFileName(path)); + return handle != IntPtr.Zero; + } + } + + private static SystemGraphicsLibraries WithDxgiAndD3d11(Func beside) => + Take(beside, new Dictionary { ["dxgi.dll"] = Dxgi, ["d3d11.dll"] = D3d11 }); + + [Fact] + public void An_import_by_name_gets_the_system_library_with_or_without_its_extension() + { + var taken = WithDxgiAndD3d11(_ => false); + + Assert.Equal(Dxgi, taken.Resolve("dxgi")); + Assert.Equal(Dxgi, taken.Resolve("dxgi.dll")); + Assert.Equal(D3d11, taken.Resolve("D3D11.DLL")); + } + + [Fact] + public void Other_libraries_and_ones_the_system_lacks_are_left_to_the_usual_search() + { + var taken = WithDxgiAndD3d11(_ => false); + + Assert.Equal(IntPtr.Zero, taken.Resolve("user32.dll")); + Assert.Equal(IntPtr.Zero, taken.Resolve("opengl32")); + } + + [Fact] + public void They_are_loaded_from_the_system_folder_dxgi_first() + { + var asked = new List(); + SystemGraphicsLibraries.Take(System32, Game, _ => false, Load); + + Assert.Equal(SystemGraphicsLibraries.Names.Select(n => Path.Combine(System32, n + ".dll")), asked); + Assert.Equal("dxgi", SystemGraphicsLibraries.Names[0]); + + bool Load(string path, out IntPtr handle) + { + asked.Add(path); + handle = IntPtr.Zero; + return false; + } + } + + [Fact] + public void A_wrapper_beside_the_starter_is_noted() + { + var taken = WithDxgiAndD3d11(path => path == Path.Combine(Game, "dxgi.dll")); + + Assert.Equal(new[] { "dxgi.dll" }, taken.Shadowed); + Assert.Contains("dxgi.dll", taken.Note); + } + + [Fact] + public void With_nothing_beside_the_starter_there_is_nothing_to_note() + { + var taken = WithDxgiAndD3d11(_ => false); + + Assert.Empty(taken.Shadowed); + Assert.Null(taken.Note); + } + + [Fact] + public void Only_windows_has_system_libraries_to_take() + { + var taken = SystemGraphicsLibraries.TakeOnWindows(); + + Assert.Equal(OperatingSystem.IsWindows(), taken is not null); + } + + [Fact] + public void An_assembly_with_a_resolver_of_its_own_keeps_it() + { + var taken = WithDxgiAndD3d11(_ => false); + var assembly = typeof(SystemGraphicsLibrariesTests).Assembly; + + Assert.True(taken.ServeTo(assembly)); + Assert.False(taken.ServeTo(assembly)); + } +} diff --git a/StarterNG/Infrastructure/SoftwareRender.cs b/StarterNG/Infrastructure/SoftwareRender.cs new file mode 100644 index 0000000..9d0443d --- /dev/null +++ b/StarterNG/Infrastructure/SoftwareRender.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Avalonia; + +namespace StarterNG.Infrastructure; + +/// +/// Drawn by the processor instead of the graphics card, for a machine on which the +/// window comes up empty. Each platform reads only its own options, so both are given. +/// +public static class SoftwareRender +{ + public const string Switch = "--software-render"; + + public static bool AskedIn(IEnumerable args) => + args.Any(a => string.Equals(a, Switch, StringComparison.OrdinalIgnoreCase)); + + public static Win32PlatformOptions Win32Options => new() + { + RenderingMode = new[] { Win32RenderingMode.Software }, + CompositionMode = new[] { Win32CompositionMode.RedirectionSurface } + }; + + public static X11PlatformOptions X11Options => new() + { + RenderingMode = new[] { X11RenderingMode.Software } + }; + + public static AppBuilder ApplyTo(AppBuilder builder) => + builder.With(Win32Options).With(X11Options); +} diff --git a/StarterNG/Infrastructure/SystemGraphicsLibraries.cs b/StarterNG/Infrastructure/SystemGraphicsLibraries.cs index 2aa2f3a..6c5cbe3 100644 --- a/StarterNG/Infrastructure/SystemGraphicsLibraries.cs +++ b/StarterNG/Infrastructure/SystemGraphicsLibraries.cs @@ -19,58 +19,72 @@ namespace StarterNG.Infrastructure; /// Elsewhere there is nothing of the kind to keep out. Under Wine or Proton the system /// folder is the prefix's, so what is taken there is what would have been taken anyway. /// -public static class SystemGraphicsLibraries +public sealed class SystemGraphicsLibraries { + public delegate bool Loader(string path, out IntPtr handle); + // dxgi ahead of d3d11, which asks for it. - private static readonly string[] Names = { "dxgi", "d3d11", "d3d9", "opengl32" }; + public static readonly IReadOnlyList Names = new[] { "dxgi", "d3d11", "d3d9", "opengl32" }; - private static readonly Dictionary Loaded = new(StringComparer.OrdinalIgnoreCase); - private static readonly List Shadowed = new(); + private readonly Dictionary _loaded = new(StringComparer.OrdinalIgnoreCase); + private readonly List _shadowed = new(); - /// The assemblies whose imports of these libraries are to get the system ones. - public static void LoadFirst(params Assembly[] importers) + private SystemGraphicsLibraries() { - if (!OperatingSystem.IsWindows()) - return; + } - string system = Environment.SystemDirectory; - string own = AppContext.BaseDirectory; + /// The files of these names that lay beside the starter. + public IReadOnlyList Shadowed => _shadowed; + /// What goes to the log about them, or null when none lay there. + public string? Note => _shadowed.Count > 0 + ? $"Graphics libraries beside the starter, left to the simulator: {string.Join(", ", _shadowed)}" + : null; + + /// The libraries of this Windows, or null on any other system. + public static SystemGraphicsLibraries? TakeOnWindows() => + OperatingSystem.IsWindows() + ? Take(Environment.SystemDirectory, AppContext.BaseDirectory, File.Exists, NativeLibrary.TryLoad) + : null; + + public static SystemGraphicsLibraries Take(string systemDirectory, string ownDirectory, + Func exists, Loader load) + { + var taken = new SystemGraphicsLibraries(); foreach (string name in Names) { string file = name + ".dll"; - if (File.Exists(Path.Combine(own, file))) - Shadowed.Add(file); - if (NativeLibrary.TryLoad(Path.Combine(system, file), out IntPtr handle)) - Loaded[name] = handle; - } - - foreach (var importer in importers) - { - try - { - NativeLibrary.SetDllImportResolver(importer, Resolve); - } - catch (InvalidOperationException) - { - // It has a resolver of its own already; that one decides. - } + if (exists(Path.Combine(ownDirectory, file))) + taken._shadowed.Add(file); + if (load(Path.Combine(systemDirectory, file), out IntPtr handle)) + taken._loaded[name] = handle; } + return taken; } - private static IntPtr Resolve(string libraryName, Assembly assembly, DllImportSearchPath? searchPath) + /// The system library for an import of one of these names; zero leaves it to the usual search. + public IntPtr Resolve(string libraryName) { string name = libraryName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) ? libraryName[..^4] : libraryName; - // Zero leaves the library to the usual search. - return Loaded.TryGetValue(name, out IntPtr handle) ? handle : IntPtr.Zero; + return _loaded.TryGetValue(name, out IntPtr handle) ? handle : IntPtr.Zero; } - /// Which of them lay beside the starter, once the log can take it. - public static void LogShadowed() + /// + /// The assembly's imports of these names get the system libraries. False when it + /// has a resolver of its own already; that one decides. + /// + public bool ServeTo(Assembly importer) { - if (Shadowed.Count > 0) - Diagnostics.Log($"Graphics libraries beside the starter, left to the simulator: {string.Join(", ", Shadowed)}"); + try + { + NativeLibrary.SetDllImportResolver(importer, (name, _, _) => Resolve(name)); + return true; + } + catch (InvalidOperationException) + { + return false; + } } } diff --git a/StarterNG/Program.cs b/StarterNG/Program.cs index da02172..aa0a8c8 100644 --- a/StarterNG/Program.cs +++ b/StarterNG/Program.cs @@ -1,7 +1,6 @@ using Avalonia; using Avalonia.Threading; using System; -using System.Linq; using System.Threading.Tasks; using StarterNG.Application; using StarterNG.Infrastructure; @@ -11,24 +10,22 @@ namespace StarterNG; static class Program { - /// - /// Drawn by the processor instead of the graphics card, for a machine on which the - /// window comes up empty. Started with --software-render. - /// private static bool _softwareRender; [STAThread] public static void Main(string[] args) { // Ahead of everything that could draw: what lies beside the starter is the simulator's. - SystemGraphicsLibraries.LoadFirst(typeof(Win32PlatformOptions).Assembly); + var graphics = SystemGraphicsLibraries.TakeOnWindows(); + graphics?.ServeTo(typeof(Win32PlatformOptions).Assembly); - _softwareRender = args.Any(a => string.Equals(a, "--software-render", StringComparison.OrdinalIgnoreCase)); + _softwareRender = SoftwareRender.AskedIn(args); // Composition root first: everything below, including the crash handlers, // resolves its collaborators from this graph. AppServices.Initialize(); - SystemGraphicsLibraries.LogShadowed(); + if (graphics?.Note is { } note) + Diagnostics.Log(note); AppDomain.CurrentDomain.UnhandledException += (_, e) => { @@ -76,20 +73,8 @@ static class Program }; } - // Each platform reads only its own options, so both can be given everywhere. private static AppBuilder WithSoftwareRenderIfAsked(this AppBuilder builder) => - _softwareRender - ? builder - .With(new Win32PlatformOptions - { - RenderingMode = new[] { Win32RenderingMode.Software }, - CompositionMode = new[] { Win32CompositionMode.RedirectionSurface } - }) - .With(new X11PlatformOptions - { - RenderingMode = new[] { X11RenderingMode.Software } - }) - : builder; + _softwareRender ? SoftwareRender.ApplyTo(builder) : builder; public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure()