Merge 71ad868404 into 9f94aa1c79

src/Ryujinx.Common/Helpers/Patterns.cs

@@ -1,118 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Ryujinx.Common.Helper
-{
-    public static partial class Patterns
-    {
-        #region Accessors
-
-        public static readonly Regex Numeric = NumericRegex();
-
-        public static readonly Regex AmdGcn = AmdGcnRegex();
-        public static readonly Regex NvidiaConsumerClass = NvidiaConsumerClassRegex();
-
-        public static readonly Regex DomainLp1Ns = DomainLp1NsRegex();
-        public static readonly Regex DomainLp1Lp1Npln = DomainLp1Lp1NplnRegex();
-        public static readonly Regex DomainLp1Znc = DomainLp1ZncRegex();
-        public static readonly Regex DomainSbApi = DomainSbApiRegex();
-        public static readonly Regex DomainSbAccounts = DomainSbAccountsRegex();
-        public static readonly Regex DomainAccounts = DomainAccountsRegex();
-
-        public static readonly Regex Module = ModuleRegex();
-        public static readonly Regex FsSdk = FsSdkRegex();
-        public static readonly Regex SdkMw = SdkMwRegex();
-
-        // ReSharper disable once InconsistentNaming
-        public static readonly Regex CJK = CJKRegex();
-
-        public static readonly Regex LdnPassphrase = LdnPassphraseRegex();
-
-        public static readonly Regex CleanText = CleanTextRegex();
-
-        #endregion
-
-        #region Generated pattern stubs
-
-        #region Numeric validation
-
-        [GeneratedRegex("[0-9]|.")]
-        internal static partial Regex NumericRegex();
-
-        #endregion
-
-        #region GPU names
-
-        [GeneratedRegex(
-            "Radeon (((HD|R(5|7|9|X)) )?((M?[2-6]\\d{2}(\\D|$))|([7-8]\\d{3}(\\D|$))|Fury|Nano))|(Pro Duo)")]
-        internal static partial Regex AmdGcnRegex();
-
-        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
-        internal static partial Regex NvidiaConsumerClassRegex();
-
-        #endregion
-
-        #region DNS blocking
-
-        public static readonly Regex[] BlockedHosts =
-        [
-            DomainLp1Ns,
-            DomainLp1Lp1Npln,
-            DomainLp1Znc,
-            DomainSbApi,
-            DomainSbAccounts,
-            DomainAccounts
-        ];
-
-        const RegexOptions DnsRegexOpts =
-            RegexOptions.CultureInvariant | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
-
-        [GeneratedRegex(@"^(.*)\-lp1\.(n|s)\.n\.srv\.nintendo\.net$", DnsRegexOpts)]
-        internal static partial Regex DomainLp1NsRegex();
-
-        [GeneratedRegex(@"^(.*)\-lp1\.lp1\.t\.npln\.srv\.nintendo\.net$", DnsRegexOpts)]
-        internal static partial Regex DomainLp1Lp1NplnRegex();
-
-        [GeneratedRegex(@"^(.*)\-lp1\.(znc|p)\.srv\.nintendo\.net$", DnsRegexOpts)]
-        internal static partial Regex DomainLp1ZncRegex();
-
-        [GeneratedRegex(@"^(.*)\-sb\-api\.accounts\.nintendo\.com$", DnsRegexOpts)]
-        internal static partial Regex DomainSbApiRegex();
-
-        [GeneratedRegex(@"^(.*)\-sb\.accounts\.nintendo\.com$", DnsRegexOpts)]
-        internal static partial Regex DomainSbAccountsRegex();
-
-        [GeneratedRegex(@"^accounts\.nintendo\.com$", DnsRegexOpts)]
-        internal static partial Regex DomainAccountsRegex();
-
-        #endregion
-
-        #region Executable information
-
-        [GeneratedRegex(@"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
-        internal static partial Regex ModuleRegex();
-
-        [GeneratedRegex(@"sdk_version: ([0-9.]*)")]
-        internal static partial Regex FsSdkRegex();
-
-        [GeneratedRegex(@"SDK MW[ -~]*")]
-        internal static partial Regex SdkMwRegex();
-
-        #endregion
-
-        #region CJK
-
-        [GeneratedRegex(
-            "\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")]
-        private static partial Regex CJKRegex();
-
-        #endregion
-
-        [GeneratedRegex("Ryujinx-[0-9a-f]{8}")]
-        private static partial Regex LdnPassphraseRegex();
-
-        [GeneratedRegex(@"[^\u0000\u0009\u000A\u000D\u0020-\uFFFF]..")]
-        private static partial Regex CleanTextRegex();
-
-        #endregion
-    }
-}

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -16,8 +16,14 @@ namespace Ryujinx.Graphics.Vulkan
         Unknown,
     }
 
-    static class VendorUtils
+    static partial class VendorUtils
     {
+        [GeneratedRegex("Radeon (((HD|R(5|7|9|X)) )?((M?[2-6]\\d{2}(\\D|$))|([7-8]\\d{3}(\\D|$))|Fury|Nano))|(Pro Duo)")]
+        public static partial Regex AmdGcnRegex();
+
+        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
+        public static partial Regex NvidiaConsumerClassRegex();
+
         public static Vendor FromId(uint id)
         {
             return id switch

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -1,6 +1,5 @@
 using Gommon;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
@@ -376,11 +375,11 @@ namespace Ryujinx.Graphics.Vulkan
 
             GpuVersion = $"Vulkan v{ParseStandardVulkanVersion(properties.ApiVersion)}, Driver v{ParseDriverVersion(ref properties)}";
 
-            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && Patterns.AmdGcn.IsMatch(GpuRenderer);
+            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && VendorUtils.AmdGcnRegex().IsMatch(GpuRenderer);
 
             if (Vendor == Vendor.Nvidia)
             {
-                Match match = Patterns.NvidiaConsumerClass.Match(GpuRenderer);
+                Match match = VendorUtils.NvidiaConsumerClassRegex().Match(GpuRenderer);
 
                 if (match != null && int.TryParse(match.Groups[2].Value, out int gpuNumber))
                 {

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -5,7 +5,6 @@ using LibHac.FsSystem;
 using LibHac.Ncm;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using Ryujinx.HLE.HOS.SystemState;
@@ -31,6 +30,9 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         public event EventHandler AppletStateChanged;
 
+        [GeneratedRegex(@"[^\u0000\u0009\u000A\u000D\u0020-\uFFFF]..")]
+        private static partial Regex CleanTextRegex();
+
         public ErrorApplet(Horizon horizon)
         {
             _horizon = horizon;
@@ -105,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         private static string CleanText(string value)
         {
-            return Patterns.CleanText.Replace(value, string.Empty).Replace("\0", string.Empty);
+            return CleanTextRegex().Replace(value, string.Empty).Replace("\0", string.Empty);
         }
 
         private string GetMessageText(uint module, uint description, string key)

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs

@@ -0,0 +1,17 @@
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
+{
+    public static partial class CJKCharacterValidation
+    {
+        public static bool IsCJK(char value)
+        {
+            Regex regex = CJKRegex();
+
+            return regex.IsMatch(value.ToString());
+        }
+
+        [GeneratedRegex("\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")]
+        private static partial Regex CJKRegex();
+    }
+}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CharacterValidation.cs

@@ -1,10 +0,0 @@
-using Ryujinx.Common.Helper;
-
-namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
-{
-    public static class CharacterValidation
-    {
-        public static bool IsNumeric(char value) => Patterns.Numeric.IsMatch(value.ToString());
-        public static bool IsCJK(char value) => Patterns.CJK.IsMatch(value.ToString());
-    }
-}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/NumericCharacterValidation.cs

@@ -0,0 +1,17 @@
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
+{
+    public static partial class NumericCharacterValidation
+    {
+        public static bool IsNumeric(char value)
+        {
+            Regex regex = NumericRegex();
+
+            return regex.IsMatch(value.ToString());
+        }
+
+        [GeneratedRegex("[0-9]|.")]
+        private static partial Regex NumericRegex();
+    }
+}

src/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/Proxy/DnsBlacklist.cs

@@ -1,13 +1,37 @@
-using Ryujinx.Common.Helper;
 using System.Text.RegularExpressions;
 
 namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres.Proxy
 {
-    static class DnsBlacklist
+    static partial class DnsBlacklist
     {
+        const RegexOptions RegexOpts = RegexOptions.CultureInvariant | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
+
+        [GeneratedRegex(@"^(.*)\-lp1\.(n|s)\.n\.srv\.nintendo\.net$", RegexOpts)]
+        private static partial Regex BlockedHost1();
+        [GeneratedRegex(@"^(.*)\-lp1\.lp1\.t\.npln\.srv\.nintendo\.net$", RegexOpts)]
+        private static partial Regex BlockedHost2();
+        [GeneratedRegex(@"^(.*)\-lp1\.(znc|p)\.srv\.nintendo\.net$", RegexOpts)]
+        private static partial Regex BlockedHost3();
+        [GeneratedRegex(@"^(.*)\-sb\-api\.accounts\.nintendo\.com$", RegexOpts)]
+        private static partial Regex BlockedHost4();
+        [GeneratedRegex(@"^(.*)\-sb\.accounts\.nintendo\.com$", RegexOpts)]
+        private static partial Regex BlockedHost5();
+        [GeneratedRegex(@"^accounts\.nintendo\.com$", RegexOpts)]
+        private static partial Regex BlockedHost6();
+
+        private static readonly Regex[] _blockedHosts =
+        [
+            BlockedHost1(),
+            BlockedHost2(),
+            BlockedHost3(),
+            BlockedHost4(),
+            BlockedHost5(),
+            BlockedHost6()
+        ];
+
         public static bool IsHostBlocked(string host)
         {
-            foreach (Regex regex in Patterns.BlockedHosts)
+            foreach (Regex regex in _blockedHosts)
             {
                 if (regex.IsMatch(host))
                 {

src/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs

@@ -2,7 +2,6 @@ using LibHac.Common.FixedArrays;
 using LibHac.Fs;
 using LibHac.Loader;
 using LibHac.Tools.FsSystem;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;
@@ -30,6 +29,13 @@ namespace Ryujinx.HLE.Loaders.Executables
         public string Name;
         public Array32<byte> BuildId;
 
+        [GeneratedRegex(@"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+        private static partial Regex ModuleRegex();
+        [GeneratedRegex(@"sdk_version: ([0-9.]*)")]
+        private static partial Regex FsSdkRegex();
+        [GeneratedRegex(@"SDK MW[ -~]*")]
+        private static partial Regex SdkMwRegex();
+
         public NsoExecutable(IStorage inStorage, string name = null)
         {
             NsoReader reader = new();
@@ -84,7 +90,7 @@ namespace Ryujinx.HLE.Loaders.Executables
 
             if (string.IsNullOrEmpty(modulePath))
             {
-                Match moduleMatch = Patterns.Module.Match(rawTextBuffer);
+                Match moduleMatch = ModuleRegex().Match(rawTextBuffer);
                 if (moduleMatch.Success)
                 {
                     modulePath = moduleMatch.Value;
@@ -93,13 +99,13 @@ namespace Ryujinx.HLE.Loaders.Executables
 
             stringBuilder.AppendLine($"    Module: {modulePath}");
 
-            Match fsSdkMatch = Patterns.FsSdk.Match(rawTextBuffer);
+            Match fsSdkMatch = FsSdkRegex().Match(rawTextBuffer);
             if (fsSdkMatch.Success)
             {
                 stringBuilder.AppendLine($"    FS SDK Version: {fsSdkMatch.Value.Replace("sdk_version: ", string.Empty)}");
             }
 
-            MatchCollection sdkMwMatches = Patterns.SdkMw.Matches(rawTextBuffer);
+            MatchCollection sdkMwMatches = SdkMwRegex().Matches(rawTextBuffer);
             if (sdkMwMatches.Count != 0)
             {
                 string libHeader = "    SDK Libraries: ";

src/Ryujinx.Input.SDL3/SDL3MotionDriver.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Input;
 using SDL3;
 using System;
 using System.Collections.Generic;
@@ -5,81 +6,39 @@ using System.Linq;
 using System.Numerics;
 using static SDL3.SDL3;
 
-namespace Ryujinx.Input.SDL3
+namespace Ryujinx.Input.SDL3;
+
+public unsafe class SDL3MotionDriver : IHandheld, IDisposable
 {
-    public unsafe class SDL3MotionDriver : IHandheld, IDisposable
+    private Dictionary<SDL_SensorType, SDL_Sensor> sensors;
+    public SDL3MotionDriver()
     {
-        private readonly Dictionary<SDL_SensorType, SDL_Sensor> sensors;
-        private bool _disposed;
+        SDL_Init(SDL_InitFlags.Sensor);
+        sensors = SDL_GetSensors().ToArray().ToDictionary(SDL_GetSensorTypeForID, SDL_OpenSensor);
+    }
 
-        public SDL3MotionDriver()
+    public void Dispose()
+    {
+        foreach (var sensor in sensors.Values)
         {
-            int result = SDL_Init(SDL_InitFlags.Sensor);
-            if (result < 0)
-            {
-                throw new InvalidOperationException($"SDL sensor initialization failed: {SDL_GetError()}");
-            }
-            sensors = SDL_GetSensors().ToArray().ToDictionary(SDL_GetSensorTypeForID, SDL_OpenSensor);
+            SDL_CloseSensor(sensor);
         }
+    }
 
-        ~SDL3MotionDriver()
+    public Vector3 GetMotionData(MotionInputId gyroscope)
+    {
+        var data = stackalloc float[3];
+
+        switch (gyroscope)
         {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (disposing && sensors != null)
-            {
-                foreach (var sensor in sensors.Values)
-                {
-                    if (sensor != IntPtr.Zero)
-                    {
-                        SDL_CloseSensor(sensor);
-                    }
-                }
-            }
-
-            _disposed = true;
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputType)
-        {
-            ObjectDisposedException.ThrowIf(_disposed, this);
-
-            return inputType switch
-            {
-                MotionInputId.Gyroscope => GetSensorVector(SDL_SensorType.Gyro) * 180 / MathF.PI,
-                MotionInputId.Accelerometer => GetSensorVector(SDL_SensorType.Accel) / SDL_STANDARD_GRAVITY,
-                _ => Vector3.Zero
-            };
-        }
-
-        private Vector3 GetSensorVector(SDL_SensorType sensorType)
-        {
-            if (!sensors.TryGetValue(sensorType, out SDL_Sensor sensor))
-            {
+            case MotionInputId.Gyroscope:
+                SDL_GetSensorData(sensors[SDL_SensorType.Gyro], data, 3);
+                return new Vector3(data[0], data[1], data[2]) * (180 / MathF.PI);
+            case MotionInputId.Accelerometer:
+                SDL_GetSensorData(sensors[SDL_SensorType.Accel], data, 3);
+                return new Vector3(data[0], data[1], data[2]) / SDL_STANDARD_GRAVITY;
+            default:
                 return Vector3.Zero;
-            }
-
-            var data = stackalloc float[3];
-            if (SDL_GetSensorData(sensor, data, 3) < 0)
-            {
-                return Vector3.Zero;
-            }
-
-            return new Vector3(data[0], data[1], data[2]);
         }
     }
 }

src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs

@@ -144,12 +144,12 @@ namespace Ryujinx.Ava.UI.Controls
                 case KeyboardMode.Numeric:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeNumeric);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
-                    _checkInput = text => text.All(CharacterValidation.IsNumeric);
+                    _checkInput = text => text.All(NumericCharacterValidation.IsNumeric);
                     break;
                 case KeyboardMode.Alphabet:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeAlphabet);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
-                    _checkInput = text => text.All(value => !CharacterValidation.IsCJK(value));
+                    _checkInput = text => text.All(value => !CJKCharacterValidation.IsCJK(value));
                     break;
                 case KeyboardMode.ASCII:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeASCII);

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -16,7 +16,6 @@ using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Vulkan;
@@ -331,6 +330,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        [GeneratedRegex("Ryujinx-[0-9a-f]{8}")]
+        private static partial Regex LdnPassphraseRegex();
+
         public bool IsInvalidLdnPassphraseVisible { get; set; }
 
         public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
@@ -468,7 +470,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private bool ValidateLdnPassphrase(string passphrase)
         {
-            return string.IsNullOrEmpty(passphrase) || (passphrase.Length == 16 && Patterns.LdnPassphrase.IsMatch(passphrase));
+            return string.IsNullOrEmpty(passphrase) || (passphrase.Length == 16 && LdnPassphraseRegex().IsMatch(passphrase));
         }
 
         public void ValidateAndSetTimeZone(string location)