Merge branch 'master' into master

swiggybobo

src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs

@@ -14,20 +14,20 @@ namespace Ryujinx.BuildValidationTasks
         {
             string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
 
-            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
+            if (path.Split(new string[] { "src" }, StringSplitOptions.None).Length == 1 )
             {
                 //i assume that we are in a build directory in the solution dir
-                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+                path = new FileInfo(path).Directory.Parent.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
             }
             else
             {
-                path = path.Split(["src"], StringSplitOptions.None)[0];
-                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+                path = path.Split(new string[] { "src" }, StringSplitOptions.None)[0];
+                path = new FileInfo(path).Directory.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
             }
 
             string data;
 
-            using (StreamReader sr = new(path))
+            using (StreamReader sr = new StreamReader(path))
             {
                 data = sr.ReadToEnd();
             }
@@ -38,10 +38,13 @@ namespace Ryujinx.BuildValidationTasks
             {
                 LocalesEntry locale = json.Locales[i];
 
-                foreach (string langCode in json.Languages.Where(it => !locale.Translations.ContainsKey(it)))
+                foreach (string language in json.Languages)
                 {
-                    locale.Translations.Add(langCode, string.Empty);
-                    Log.LogMessage(MessageImportance.High, $"Added '{langCode}' to Locale '{locale.ID}'");
+                    if (!locale.Translations.ContainsKey(language))
+                    {
+                        locale.Translations.Add(language, "");
+                        Log.LogMessage(MessageImportance.High, $"Added {{{language}}} to Locale {{{locale.ID}}}");
+                    }
                 }
 
                 locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
@@ -50,7 +53,7 @@ namespace Ryujinx.BuildValidationTasks
 
             string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);
 
-            using (StreamWriter sw = new(path))
+            using (StreamWriter sw = new StreamWriter(path))
             {
                 sw.Write(jsonString);
             }

src/Ryujinx.Common/ReleaseInformation.cs

@@ -6,6 +6,7 @@ namespace Ryujinx.Common
     // DO NOT EDIT, filled by CI
     public static class ReleaseInformation
     {
+        private const string FlatHubChannel = "flathub";
         private const string CanaryChannel = "canary";
         private const string ReleaseChannel = "release";
 
@@ -28,6 +29,8 @@ namespace Ryujinx.Common
             !ReleaseChannelRepo.StartsWith("%%") &&
             !ConfigFileName.StartsWith("%%");
 
+        public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannel);
+
         public static bool IsCanaryBuild => IsValid && ReleaseChannelName.Equals(CanaryChannel);
         
         public static bool IsReleaseBuild => IsValid && ReleaseChannelName.Equals(ReleaseChannel);

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -230,20 +230,25 @@ namespace Ryujinx.Cpu.AppleHv
         {
             if (size == 0)
             {
-                yield break;
+                return Enumerable.Empty<HostMemoryRange>();
             }
 
             var guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
-                yield break;
+                return null;
             }
 
-            foreach (var guestRegion in guestRegions)
+            var regions = new HostMemoryRange[guestRegions.Count];
+
+            for (int i = 0; i < regions.Length; i++)
             {
+                var guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
-                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
+                regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
+
+            return regions;
         }
 
         /// <inheritdoc/>
@@ -251,24 +256,23 @@ namespace Ryujinx.Cpu.AppleHv
         {
             if (size == 0)
             {
-                yield break;
+                return Enumerable.Empty<MemoryRange>();
             }
 
-            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
-            {
-                yield return physicalRegion;
-            }
+            return GetPhysicalRegionsImpl(va, size);
         }
 
-        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                yield break;
+                return null;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
+            var regions = new List<MemoryRange>();
+
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -276,14 +280,14 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    yield break;
+                    return null;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    yield return new MemoryRange(regionStart, regionSize);
+                    regions.Add(new MemoryRange(regionStart, regionSize));
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -292,7 +296,9 @@ namespace Ryujinx.Cpu.AppleHv
                 regionSize += PageSize;
             }
 
-            yield return new MemoryRange(regionStart, regionSize);
+            regions.Add(new MemoryRange(regionStart, regionSize));
+
+            return regions;
         }
 
         /// <remarks>

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -250,20 +250,25 @@ namespace Ryujinx.Cpu.Jit
         {
             if (size == 0)
             {
-                yield break;
+                return Enumerable.Empty<HostMemoryRange>();
             }
 
             var guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
-                yield break;
+                return null;
             }
 
-            foreach (var guestRegion in guestRegions)
+            var regions = new HostMemoryRange[guestRegions.Count];
+
+            for (int i = 0; i < regions.Length; i++)
             {
+                var guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
-                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
+                regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
+
+            return regions;
         }
 
         /// <inheritdoc/>
@@ -271,24 +276,23 @@ namespace Ryujinx.Cpu.Jit
         {
             if (size == 0)
             {
-                yield break;
+                return Enumerable.Empty<MemoryRange>();
             }
 
-            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
-            {
-                yield return physicalRegion;
-            }
+            return GetPhysicalRegionsImpl(va, size);
         }
 
-        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                yield break;
+                return null;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
+            var regions = new List<MemoryRange>();
+
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -296,14 +300,14 @@ namespace Ryujinx.Cpu.Jit
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    yield break;
+                    return null;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    yield return new MemoryRange(regionStart, regionSize);
+                    regions.Add(new MemoryRange(regionStart, regionSize));
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -312,7 +316,9 @@ namespace Ryujinx.Cpu.Jit
                 regionSize += PageSize;
             }
 
-            yield return new MemoryRange(regionStart, regionSize);
+            regions.Add(new MemoryRange(regionStart, regionSize));
+
+            return regions;
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs

@@ -475,15 +475,17 @@ namespace Ryujinx.Cpu.Jit
             return GetPhysicalRegionsImpl(va, size);
         }
 
-        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                yield break;
+                return null;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
+            var regions = new List<MemoryRange>();
+
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -491,14 +493,14 @@ namespace Ryujinx.Cpu.Jit
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    yield break;
+                    return null;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    yield return new MemoryRange(regionStart, regionSize);
+                    regions.Add(new MemoryRange(regionStart, regionSize));
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -507,7 +509,9 @@ namespace Ryujinx.Cpu.Jit
                 regionSize += PageSize;
             }
 
-            yield return new MemoryRange(regionStart, regionSize);
+            regions.Add(new MemoryRange(regionStart, regionSize));
+
+            return regions;
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/StackWalker.cs

@@ -8,6 +8,8 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
     {
         public IEnumerable<ulong> GetCallStack(nint framePointer, nint codeRegionStart, int codeRegionSize, nint codeRegion2Start, int codeRegion2Size)
         {
+            List<ulong> functionPointers = new();
+
             while (true)
             {
                 nint functionPointer = Marshal.ReadIntPtr(framePointer, nint.Size);
@@ -18,9 +20,11 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
                     break;
                 }
 
-                yield return (ulong)functionPointer - 4;
+                functionPointers.Add((ulong)functionPointer - 4);
                 framePointer = Marshal.ReadIntPtr(framePointer);
             }
+
+            return functionPointers;
         }
     }
 }

src/Ryujinx.Graphics.Vulkan/BufferMirrorRangeList.cs

@@ -168,14 +168,16 @@ namespace Ryujinx.Graphics.Vulkan
             return BinarySearch(list, offset, size) >= 0;
         }
 
-        public readonly IEnumerable<Range> FindOverlaps(int offset, int size)
+        public readonly List<Range> FindOverlaps(int offset, int size)
         {
             var list = _ranges;
             if (list == null)
             {
-                yield break;
+                return null;
             }
 
+            List<Range> result = null;
+
             int index = BinarySearch(list, offset, size);
 
             if (index >= 0)
@@ -187,10 +189,12 @@ namespace Ryujinx.Graphics.Vulkan
 
                 do
                 {
-                    yield return list[index++];
+                    (result ??= new List<Range>()).Add(list[index++]);
                 }
                 while (index < list.Count && list[index].OverlapsWith(offset, size));
             }
+
+            return result;
         }
 
         private static int BinarySearch(List<Range> list, int offset, int size)

src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs

@@ -62,7 +62,7 @@ namespace Ryujinx.Graphics.Vulkan
             _api = api;
             _physicalDevice = physicalDevice;
 
-            int totalFormats = Enum.GetNames<Format>().Length;
+            int totalFormats = Enum.GetNames(typeof(Format)).Length;
 
             _bufferTable = new FormatFeatureFlags[totalFormats];
             _optimalTable = new FormatFeatureFlags[totalFormats];

src/Ryujinx.Graphics.Vulkan/FormatTable.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         static FormatTable()
         {
-            _table = new VkFormat[Enum.GetNames<Format>().Length];
+            _table = new VkFormat[Enum.GetNames(typeof(Format)).Length];
             _reverseMap = new Dictionary<VkFormat, Format>();
 
 #pragma warning disable IDE0055 // Disable formatting

src/Ryujinx.Graphics.Vulkan/Queries/Counters.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries
         {
             _pipeline = pipeline;
 
-            int count = Enum.GetNames<CounterType>().Length;
+            int count = Enum.GetNames(typeof(CounterType)).Length;
 
             _counterQueues = new CounterQueue[count];
 

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -341,7 +341,7 @@ namespace Ryujinx.HLE.HOS
         {
             if (VirtualAmiibo.ApplicationBytes.Length > 0)
             {
-                VirtualAmiibo.ApplicationBytes = Array.Empty<byte>();
+                VirtualAmiibo.ApplicationBytes = new byte[0];
                 VirtualAmiibo.InputBin = string.Empty;
             }
             if (NfpDevices[nfpDeviceId].State == NfpDeviceState.SearchingForTag)
@@ -356,7 +356,7 @@ namespace Ryujinx.HLE.HOS
             VirtualAmiibo.InputBin = path;
             if (VirtualAmiibo.ApplicationBytes.Length > 0)
             {
-                VirtualAmiibo.ApplicationBytes = Array.Empty<byte>();
+                VirtualAmiibo.ApplicationBytes = new byte[0];
             }
             byte[] encryptedData = File.ReadAllBytes(path);
             VirtualAmiiboFile newFile = AmiiboBinReader.ReadBinFile(encryptedData);

src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs

@@ -15,8 +15,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         private readonly long[] _current2;
         private readonly long[] _peak;
 
-        // type is not Lock due to Monitor class usage
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         private readonly LinkedList<KThread> _waitingThreads;
 

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -357,6 +357,7 @@ namespace Ryujinx.HLE.HOS
         {
             string cheatName = DefaultCheatName;
             List<string> instructions = new();
+            List<Cheat> cheats = new();
 
             using StreamReader cheatData = cheatFile.OpenText();
             while (cheatData.ReadLine() is { } line)
@@ -372,13 +373,13 @@ namespace Ryujinx.HLE.HOS
 
                         Logger.Warning?.Print(LogClass.ModLoader, $"Ignoring cheat '{cheatFile.FullName}' because it is malformed");
 
-                        yield break;
+                        return Array.Empty<Cheat>();
                     }
 
                     // Add the previous section to the list.
                     if (instructions.Count > 0)
                     {
-                        yield return new Cheat($"<{cheatName} Cheat>", cheatFile, instructions);
+                        cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
                     }
 
                     // Start a new cheat section.
@@ -395,8 +396,10 @@ namespace Ryujinx.HLE.HOS
             // Add the last section being processed.
             if (instructions.Count > 0)
             {
-                yield return new Cheat($"<{cheatName} Cheat>", cheatFile, instructions);
+                cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
             }
+
+            return cheats;
         }
 
         // Assumes searchDirPaths don't overlap

src/Ryujinx.HLE/HOS/Services/IpcService.cs

@@ -23,18 +23,18 @@ namespace Ryujinx.HLE.HOS.Services
 
         public IpcService(ServerBase server = null)
         {
-            CmifCommands = GetType().Assembly.GetTypes()
+            CmifCommands = typeof(IpcService).Assembly.GetTypes()
                 .Where(type => type == GetType())
                 .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
-                .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>()
-                .Select(command => (command.Id, methodInfo)))
+                .SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandCmifAttribute))
+                .Select(command => (((CommandCmifAttribute)command).Id, methodInfo)))
                 .ToDictionary(command => command.Id, command => command.methodInfo);
 
-            TipcCommands = GetType().Assembly.GetTypes()
+            TipcCommands = typeof(IpcService).Assembly.GetTypes()
                 .Where(type => type == GetType())
                 .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
-                .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
-                .Select(command => (command.Id, methodInfo)))
+                .SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandTipcAttribute))
+                .Select(command => (((CommandTipcAttribute)command).Id, methodInfo)))
                 .ToDictionary(command => command.Id, command => command.methodInfo);
 
             Server = server;

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -444,7 +444,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
         private ResultCode ScanInternal(IVirtualMemoryManager memory, ushort channel, ScanFilter scanFilter, ulong bufferPosition, ulong bufferSize, out ulong counter)
         {
-            ulong networkInfoSize = (ulong)Marshal.SizeOf<NetworkInfo>();
+            ulong networkInfoSize = (ulong)Marshal.SizeOf(typeof(NetworkInfo));
             ulong maxGames = bufferSize / networkInfoSize;
 
             MemoryHelper.FillWithZeros(memory, bufferPosition, (int)bufferSize);

src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
     static class VirtualAmiibo
     {
         public static uint OpenedApplicationAreaId;
-        public static byte[] ApplicationBytes = Array.Empty<byte>();
+        public static byte[] ApplicationBytes = new byte[0];
         public static string InputBin = string.Empty;
         public static string NickName = string.Empty;
         private static readonly AmiiboJsonSerializerContext _serializerContext = AmiiboJsonSerializerContext.Default;
@@ -137,7 +137,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
             if (ApplicationBytes.Length > 0)
             {
                 byte[] bytes = ApplicationBytes;
-                ApplicationBytes = Array.Empty<byte>();
+                ApplicationBytes = new byte[0];
                 return bytes;
             }
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);

src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs

@@ -94,7 +94,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
             {
                 if (_services.TryGetValue(name, out Type type))
                 {
-                    ServiceAttribute serviceAttribute = type.GetCustomAttributes<ServiceAttribute>().First(service => service.Name == name);
+                    ServiceAttribute serviceAttribute = (ServiceAttribute)type.GetCustomAttributes(typeof(ServiceAttribute)).First(service => ((ServiceAttribute)service).Name == name);
 
                     IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
 

src/Ryujinx.Horizon.Kernel.Generators/SyscallGenerator.cs

@@ -34,14 +34,14 @@ namespace Ryujinx.Horizon.Kernel.Generators
         private const string TypeResult = NamespaceHorizonCommon + "." + TypeResultName;
         private const string TypeExecutionContext = "IExecutionContext";
 
-        private static readonly string[] _expectedResults =
-        [
+        private static readonly string[] _expectedResults = new string[]
+        {
             $"{TypeResultName}.Success",
             $"{TypeKernelResultName}.TimedOut",
             $"{TypeKernelResultName}.Cancelled",
             $"{TypeKernelResultName}.PortRemoteClosed",
             $"{TypeKernelResultName}.InvalidState",
-        ];
+        };
 
         private readonly struct OutParameter
         {

src/Ryujinx.Memory/AddressSpaceManager.cs

@@ -106,13 +106,10 @@ namespace Ryujinx.Memory
         {
             if (size == 0)
             {
-                yield break;
+                return Enumerable.Empty<HostMemoryRange>();
             }
 
-            foreach (var hostRegion in GetHostRegionsImpl(va, size))
-            {
-                yield return hostRegion;
-            }
+            return GetHostRegionsImpl(va, size);
         }
 
         /// <inheritdoc/>
@@ -120,36 +117,51 @@ namespace Ryujinx.Memory
         {
             if (size == 0)
             {
-                yield break;
+                return Enumerable.Empty<MemoryRange>();
             }
 
             var hostRegions = GetHostRegionsImpl(va, size);
             if (hostRegions == null)
             {
-                yield break;
+                return null;
             }
 
+            var regions = new MemoryRange[hostRegions.Count];
+
             ulong backingStart = (ulong)_backingMemory.Pointer;
             ulong backingEnd = backingStart + _backingMemory.Size;
 
-            foreach (var hostRegion in hostRegions)
+            int count = 0;
+
+            for (int i = 0; i < regions.Length; i++)
             {
+                var hostRegion = hostRegions[i];
+
                 if (hostRegion.Address >= backingStart && hostRegion.Address < backingEnd)
                 {
-                    yield return new MemoryRange(hostRegion.Address - backingStart, hostRegion.Size);
+                    regions[count++] = new MemoryRange(hostRegion.Address - backingStart, hostRegion.Size);
                 }
             }
+
+            if (count != regions.Length)
+            {
+                return new ArraySegment<MemoryRange>(regions, 0, count);
+            }
+
+            return regions;
         }
 
-        private IEnumerable<HostMemoryRange> GetHostRegionsImpl(ulong va, ulong size)
+        private List<HostMemoryRange> GetHostRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                yield break;
+                return null;
             }
 
             int pages = GetPagesCount(va, size, out va);
 
+            var regions = new List<HostMemoryRange>();
+
             nuint regionStart = GetHostAddress(va);
             ulong regionSize = PageSize;
 
@@ -157,14 +169,14 @@ namespace Ryujinx.Memory
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    yield break;
+                    return null;
                 }
 
                 nuint newHostAddress = GetHostAddress(va + PageSize);
 
                 if (GetHostAddress(va) + PageSize != newHostAddress)
                 {
-                    yield return new HostMemoryRange(regionStart, regionSize);
+                    regions.Add(new HostMemoryRange(regionStart, regionSize));
                     regionStart = newHostAddress;
                     regionSize = 0;
                 }
@@ -173,7 +185,9 @@ namespace Ryujinx.Memory
                 regionSize += PageSize;
             }
 
-            yield return new HostMemoryRange(regionStart, regionSize);
+            regions.Add(new HostMemoryRange(regionStart, regionSize));
+
+            return regions;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Ryujinx.UI.Common/App/ApplicationData.cs

@@ -38,7 +38,7 @@ namespace Ryujinx.UI.App.Common
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 
-        public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n") ?? LocalizedNever();
+        public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed) ?? LocalizedNever();
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
 

src/Ryujinx.UI.Common/Helper/FileAssociationHelper.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.UI.Common.Helper
         [LibraryImport("shell32.dll", SetLastError = true)]
         public static partial void SHChangeNotify(uint wEventId, uint uFlags, nint dwItem1, nint dwItem2);
 
-        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows());
+        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows()) && !ReleaseInformation.IsFlatHubBuild;
         
         public static bool AreMimeTypesRegistered
         {

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -17,6 +17,7 @@
     <MenuItem
         Click="CreateApplicationShortcut_Click"
         Header="{ext:Locale GameListContextMenuCreateShortcut}"
+        IsEnabled="{Binding CreateShortcutEnabled}"
         Icon="{ext:Icon fa-solid fa-bookmark}"
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <Separator />

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -97,7 +97,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 if (IsModified)
                 {
-
+                    
                     _playerIdChoose = value;
                     return;
                 }
@@ -105,7 +105,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 IsModified = false;
                 _playerId = value;
 
-                if (!Enum.IsDefined<PlayerIndex>(_playerId))
+                if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
                 {
                     _playerId = PlayerIndex.Player1;
 

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -424,6 +424,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
 
+        public bool CreateShortcutEnabled => !ReleaseInformation.IsFlatHubBuild;
+
         public string LoadHeading
         {
             get => _loadHeading;

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -287,16 +287,9 @@
                 <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">
                     <MenuItem Header="{ext:Locale MenuBarViewWindow720}" Tag="1280 720" Click="ChangeWindowSize_Click" />
                     <MenuItem Header="{ext:Locale MenuBarViewWindow1080}" Tag="1920 1080" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{ext:Locale MenuBarViewWindow1440}" Tag="2560 1440" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{ext:Locale MenuBarViewWindow2160}" Tag="3840 2160" Click="ChangeWindowSize_Click" />
                 </MenuItem>
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
-                <MenuItem
-                    Click="OpenAboutWindow"
-                    Header="{ext:Locale MenuBarHelpAbout}"
-                    Icon="{ext:Icon fa-solid fa-circle-info}"
-                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
                 <MenuItem
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
@@ -305,26 +298,30 @@
                     Icon="{ext:Icon mdi-update}"
                     ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <Separator />
-                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
-                    <MenuItem
-                        Click="MenuItem_OnClick"
-                        Header="{ext:Locale MenuBarHelpFaq}"
-                        Icon="{ext:Icon fa-github}"
-                        Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
-                        ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
-                    <MenuItem
-                        Click="MenuItem_OnClick"
-                        Header="{ext:Locale MenuBarHelpSetup}"
-                        Icon="{ext:Icon fa-github}"
-                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
-                        ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
-                    <MenuItem
-                        Click="MenuItem_OnClick"
-                        Header="{ext:Locale MenuBarHelpMultiplayer}"
-                        Icon="{ext:Icon fa-github}"
-                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
-                        ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
-                </MenuItem>
+                <MenuItem
+                    Click="MenuItem_OnClick"
+                    Header="{ext:Locale MenuBarHelpFaq}"
+                    Icon="{ext:Icon fa-github}"
+                    Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                    ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
+                <MenuItem
+                    Click="MenuItem_OnClick"
+                    Header="{ext:Locale MenuBarHelpSetup}"
+                    Icon="{ext:Icon fa-github}"
+                    Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                    ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
+                <MenuItem
+                    Click="MenuItem_OnClick"
+                    Header="{ext:Locale MenuBarHelpMultiplayer}"
+                    Icon="{ext:Icon fa-github}"
+                    Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                    ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
+                <Separator />
+                <MenuItem
+                    Click="OpenAboutWindow"
+                    Header="{ext:Locale MenuBarHelpAbout}"
+                    Icon="{ext:Icon fa-solid fa-circle-info}"
+                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
             </MenuItem>
         </Menu>
     </DockPanel>

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -52,7 +52,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void AspectRatioStatus_OnClick(object sender, RoutedEventArgs e)
         {
             AspectRatio aspectRatio = ConfigurationState.Instance.Graphics.AspectRatio.Value;
-            ConfigurationState.Instance.Graphics.AspectRatio.Value = (int)aspectRatio + 1 > Enum.GetNames<AspectRatio>().Length - 1 ? AspectRatio.Fixed4x3 : aspectRatio + 1;
+            ConfigurationState.Instance.Graphics.AspectRatio.Value = (int)aspectRatio + 1 > Enum.GetNames(typeof(AspectRatio)).Length - 1 ? AspectRatio.Fixed4x3 : aspectRatio + 1;
         }
 
         private void Refresh_OnClick(object sender, RoutedEventArgs e) => Window.LoadApplications();

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -181,11 +181,15 @@
                             SelectedTime="{Binding CurrentTime}"
                             Width="350"
                             ToolTip.Tip="{ext:Locale TimeTooltip}" />
+                    </StackPanel>
+                    <StackPanel
+                        Margin="350,0,0,10"
+                        Orientation="Horizontal">
                         <Button
-                            Margin="10, 0, 0, 0"
                             VerticalAlignment="Center"
                             Click="MatchSystemTime_OnClick"
                             Background="{DynamicResource SystemAccentColor}"
+                            Width="150"
                             ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
                             <TextBlock Text="{ext:Locale SettingsTabSystemSystemTimeMatch}" />
                         </Button>

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs

@@ -1,7 +1,7 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.ViewModels;
+using System;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
 namespace Ryujinx.Ava.UI.Views.Settings

src/Ryujinx/Updater.cs

@@ -686,11 +686,22 @@ namespace Ryujinx.Ava
 #else
             if (showWarnings)
             {
-                Dispatcher.UIThread.InvokeAsync(() =>
-                    ContentDialogHelper.CreateWarningDialog(
-                        LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage])
+                if (ReleaseInformation.IsFlatHubBuild)
+                {
+                    Dispatcher.UIThread.InvokeAsync(() =>
+                        ContentDialogHelper.CreateWarningDialog(
+                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
+                            LocaleManager.Instance[LocaleKeys.DialogUpdaterFlatpakNotSupportedMessage])
                     );
+                }
+                else
+                {
+                    Dispatcher.UIThread.InvokeAsync(() =>
+                        ContentDialogHelper.CreateWarningDialog(
+                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
+                            LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage])
+                    );
+                }
             }
 
             return false;