Merge branch 'allow-change-icon' into 'master'

feat: add ability to change app icon

See merge request [ryubing/ryujinx!128](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/128)

Directory.Packages.props

@@ -41,7 +41,7 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.129" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.126" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />
     <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.44" />
     <PackageVersion Include="Gommon" Version="2.8.0.1" />
@@ -56,6 +56,7 @@
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

assets/Locales/Root.json

@@ -700,56 +700,6 @@
         "zh_TW": "掃描 Amiibo"
       }
     },
-    {
-      "ID": "MenuBarActionsScanSkylander",
-      "Translations": {
-        "ar_SA": "‫فحص Skylander",
-        "de_DE": "Skylander scannen",
-        "el_GR": "Σάρωση Skylander",
-        "en_US": "Scan A Skylander",
-        "es_ES": "Escanear Skylander",
-        "fr_FR": "Scanner un Skylander",
-        "he_IL": "סרוק אמיבו",
-        "it_IT": "Scansiona un Skylander",
-        "ja_JP": "Skylander をスキャン",
-        "ko_KR": "Skylander 스캔",
-        "no_NO": "Skann en Skylander",
-        "pl_PL": "Skanuj Skylander",
-        "pt_BR": "Escanear um Skylander",
-        "ru_RU": "Сканировать Skylander",
-        "sv_SE": "Skanna en Skylander",
-        "th_TH": "สแกนหา Skylander",
-        "tr_TR": "Bir Skylander Tara",
-        "uk_UA": "Сканувати Skylander",
-        "zh_CN": "扫描 Skylander",
-        "zh_TW": "掃描 Skylander"
-      }
-    },
-    {
-      "ID": "MenuBarActionsRemoveSkylander",
-      "Translations": {
-        "ar_SA": "إزالة Skylander",
-        "de_DE": "Skylander entfernen",
-        "el_GR": "Αφαίρεση Skylander",
-        "en_US": "Remove Skylander",
-        "es_ES": "Eliminar Skylander",
-        "fr_FR": "Supprimer un Skylander",
-        "he_IL": "הסר Skylander",
-        "it_IT": "Rimuovi Skylander",
-        "ja_JP": "Skylander を削除",
-        "ko_KR": "Skylander 제거",
-        "no_NO": "Fjern Skylander",
-        "pl_PL": "Usuń Skylander",
-        "pt_BR": "Remover um Skylander",
-        "ru_RU": "Удалить Skylander",
-        "sv_SE": "Ta bort Skylander",
-        "th_TH": "ลบ Skylander",
-        "tr_TR": "Skylander'ı Kaldır",
-        "uk_UA": "Видалити Skylander",
-        "zh_CN": "移除 Skylander",
-        "zh_TW": "移除 Skylander"
-      }
-    },
     {
       "ID": "MenuBarActionsScanAmiiboBin",
       "Translations": {
@@ -11300,31 +11250,6 @@
         "zh_TW": "刪除"
       }
     },
-    {
-      "ID": "UserProfilesSave",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "Speichern",
-        "el_GR": "",
-        "en_US": "Save",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "UserProfilesClose",
       "Translations": {
@@ -12100,6 +12025,56 @@
         "zh_TW": "淺色"
       }
     },
+    {
+      "ID": "SettingsTabGeneralIcon",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Application icon:",
+        "es_ES": "Icono de aplicación:",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabGeneralIconTooltip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "An app restart may be required for the app icon to display properly across Ryujinx.",
+        "es_ES": "Podría ser necesario reiniciar la aplicación para que el icono se muestre correctamente en todo Ryujinx.",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "ControllerSettingsConfigureGeneral",
       "Translations": {

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -107,12 +107,12 @@ namespace Ryujinx.BuildValidationTasks
                         {
                             locale.Translations[langCode] = string.Empty;
                             Console.WriteLine(
-                                $"Language '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
+                                $"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
                         }
                         else
                         {
                             Console.WriteLine(
-                                $"Language '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
+                                $"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
                         }
                     }
 

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
     <PackageReference Include="MsgPack.Cli" />
+    <PackageReference Include="System.Management" />
     <PackageReference Include="Humanizer" />
     <PackageReference Include="Gommon" />
   </ItemGroup>

src/Ryujinx.Common/TitleIDs.cs

@@ -184,7 +184,6 @@ namespace Ryujinx.Common
             "01001b300b9be000", // Diablo III: Eternal Collection
             "010027400cdc6000", // Divinity Original 2 - Definitive Edition
             "01008c8012920000", // Dying Light Platinum Edition
-            "0100d11013e6a000", // Eschatos
             "01001cc01b2d4000", // Goat Simulator 3
             "01003620068ea000", // Hand of Fate 2
             "0100f7e00c70e000", // Hogwarts Legacy
@@ -194,15 +193,9 @@ namespace Ryujinx.Common
             "0100d71004694000", // Minecraft
             "01007430037f6000", // Monopoly
             "0100853015e86000", // No Man's Sky
-            "0100f85014ed0000", // No More Heroes
-            "0100463014ed4000", // No More Heroes 2
-            "0100e570094e8000", // Owlboy
             "01007bb017812000", // Portal
             "0100abd01785c000", // Portal 2
-            "01009f100bc52000", // Psikyo Collection 1
-            "01009d400c4a8000", // Psikyo Collection 2
             "01008e200c5c2000", // Muse Dash
-            "01005ff002e2a000", // Rayman Legends
             "01007820196a6000", // Red Dead Redemption
             "0100e8300a67a000", // Risk
             "01002f7013224000", // Rune Factory 5

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -20,7 +20,6 @@ using Ryujinx.HLE.HOS.Services.Mii;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.HOS.Services.Nfc.Nfp;
 using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
-using Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager;
 using Ryujinx.HLE.HOS.Services.Nv;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
 using Ryujinx.HLE.HOS.Services.Pcv.Bpc;
@@ -67,8 +66,6 @@ namespace Ryujinx.HLE.HOS
 
         internal List<NfpDevice> NfpDevices { get; private set; }
 
-        internal List<NfcDevice> NfcDevices { get; private set; }
-
         internal SmRegistry SmRegistry { get; private set; }
 
         internal ServerBase SmServer { get; private set; }
@@ -135,7 +132,6 @@ namespace Ryujinx.HLE.HOS
             PerformanceState = new PerformanceState();
 
             NfpDevices = [];
-            NfcDevices = [];
 
             // Note: This is not really correct, but with HLE of services, the only memory
             // region used that is used is Application, so we can use the other ones for anything.
@@ -376,15 +372,6 @@ namespace Ryujinx.HLE.HOS
             }
         }
 
-        public void ScanSkylander(int nfcDeviceId, byte[] data)
-        {
-            if (NfcDevices[nfcDeviceId].State == NfcDeviceState.SearchingForTag)
-            {
-                NfcDevices[nfcDeviceId].State = NfcDeviceState.TagFound;
-                NfcDevices[nfcDeviceId].Data = data;
-            }
-        }
-
         public bool SearchingForAmiibo(out int nfpDeviceId)
         {
             nfpDeviceId = default;
@@ -402,53 +389,6 @@ namespace Ryujinx.HLE.HOS
             return false;
         }
 
-        public bool SearchingForSkylander(out int nfcDeviceId)
-        {
-            nfcDeviceId = default;
-
-            for (int i = 0; i < NfcDevices.Count; i++)
-            {
-                if (NfcDevices[i].State == NfcDeviceState.SearchingForTag)
-                {
-                    nfcDeviceId = i;
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public bool HasSkylander(out int nfcDeviceId)
-        {
-            nfcDeviceId = default;
-
-            for (int i = 0; i < NfcDevices.Count; i++)
-            {
-                if (NfcDevices[i].State == NfcDeviceState.TagFound)
-                {
-                    nfcDeviceId = i;
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public void RemoveSkylander()
-        {
-            for (int i = 0; i < NfcDevices.Count; i++)
-            {
-                if (NfcDevices[i].State == NfcDeviceState.TagFound)
-                {
-                    NfcDevices[i].State = NfcDeviceState.Initialized;
-                    NfcDevices[i].SignalDeactivate();
-                    Thread.Sleep(100); // NOTE: Simulate skylander scanning delay.
-                }
-            }
-        }
-
         public void SignalDisplayResolutionChange()
         {
             DisplayResolutionChangeEvent.ReadableEvent.Signal();

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/IUserManager.cs

@@ -1,19 +1,8 @@
-using Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager;
-
 namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare
 {
     [Service("nfc:mf:u")]
     class IUserManager : IpcService
     {
         public IUserManager(ServiceCtx context) { }
-
-        [CommandCmif(0)]
-        // CreateUserInterface() -> object<nn::nfc::mf::IUser>
-        public ResultCode CreateUserInterface(ServiceCtx context)
-        {
-            MakeObject(context, new IMifare());
-
-            return ResultCode.Success;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/IMifare.cs

@@ -1,477 +0,0 @@
-using Ryujinx.Common.Memory;
-using Ryujinx.Cpu;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.Hid;
-using Ryujinx.HLE.HOS.Services.Hid.HidServer;
-using Ryujinx.Horizon.Common;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    class IMifare : IpcService
-    {
-        private State _state;
-
-        private KEvent _availabilityChangeEvent;
-
-        private CancellationTokenSource _cancelTokenSource;
-
-        public IMifare()
-        {
-            _state = State.NonInitialized;
-        }
-
-        [CommandCmif(0)]
-        public ResultCode Initialize(ServiceCtx context)
-        {
-            _state = State.Initialized;
-
-            NfcDevice devicePlayer1 = new()
-            {
-                NpadIdType = NpadIdType.Player1,
-                Handle = HidUtils.GetIndexFromNpadIdType(NpadIdType.Player1),
-                State = NfcDeviceState.Initialized,
-            };
-
-            context.Device.System.NfcDevices.Add(devicePlayer1);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1)]
-        public ResultCode Finalize(ServiceCtx context)
-        {
-            if (_state == State.Initialized)
-            {
-                _cancelTokenSource?.Cancel();
-
-                // NOTE: All events are destroyed here.
-                context.Device.System.NfcDevices.Clear();
-
-                _state = State.NonInitialized;
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(2)]
-        public ResultCode GetListDevices(ServiceCtx context)
-        {
-            if (context.Request.RecvListBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            ulong outputPosition = context.Request.RecvListBuff[0].Position;
-            ulong outputSize = context.Request.RecvListBuff[0].Size;
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            MemoryHelper.FillWithZeros(context.Memory, outputPosition, (int)outputSize);
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                context.Memory.Write(outputPosition + ((uint)i * sizeof(long)), (uint)context.Device.System.NfcDevices[i].Handle);
-            }
-
-            context.ResponseData.Write(context.Device.System.NfcDevices.Count);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(3)]
-        public ResultCode StartDetection(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].State = NfcDeviceState.SearchingForTag;
-
-                    break;
-                }
-            }
-
-            _cancelTokenSource = new CancellationTokenSource();
-
-            Task.Run(() =>
-            {
-                while (true)
-                {
-                    if (_cancelTokenSource.Token.IsCancellationRequested)
-                    {
-                        break;
-                    }
-
-                    for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-                    {
-                        if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagFound)
-                        {
-                            context.Device.System.NfcDevices[i].SignalActivate();
-                            Thread.Sleep(125); // NOTE: Simulate skylander scanning delay.
-
-                            break;
-                        }
-                    }
-                }
-            }, _cancelTokenSource.Token);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(4)]
-        public ResultCode StopDetection(ServiceCtx context)
-        {
-            _cancelTokenSource?.Cancel();
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].State = NfcDeviceState.Initialized;
-                    Array.Clear(context.Device.System.NfcDevices[i].Data);
-                    context.Device.System.NfcDevices[i].SignalDeactivate();
-
-                    break;
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(5)]
-        public ResultCode ReadMifare(ServiceCtx context)
-        {
-            if (context.Request.ReceiveBuff.Count == 0 || context.Request.SendBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            ulong outputPosition = context.Request.ReceiveBuff[0].Position;
-            ulong outputSize = context.Request.ReceiveBuff[0].Size;
-
-            MemoryHelper.FillWithZeros(context.Memory, outputPosition, (int)outputSize);
-
-            ulong inputPosition = context.Request.SendBuff[0].Position;
-            ulong inputSize = context.Request.SendBuff[0].Size;
-
-            byte[] readBlockParameter = new byte[inputSize];
-
-            context.Memory.Read(inputPosition, readBlockParameter);
-
-            var span = MemoryMarshal.Cast<byte, NfcMifareReadBlockParameter>(readBlockParameter);
-            var list = new List<NfcMifareReadBlockParameter>(span.Length);
-
-            foreach (var item in span)
-                list.Add(item);
-
-            Thread.Sleep(125 * list.Count); // NOTE: Simulate skylander scanning delay.
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagRemoved)
-                    {
-                        return ResultCode.TagNotFound;
-                    }
-                    else
-                    {
-                        for (int p = 0; p < list.Count; p++)
-                        {
-                            NfcMifareReadBlockData blockData = new()
-                            {
-                                SectorNumber = list[p].SectorNumber,
-                                Reserved = new Array7<byte>(),
-                            };
-                            byte[] data = new byte[16];
-
-                            switch (list[p].SectorKey.MifareCommand)
-                            {
-                                case NfcMifareCommand.NfcMifareCommand_Read:
-                                case NfcMifareCommand.NfcMifareCommand_AuthA:
-                                    if (IsCurrentBlockKeyBlock(list[p].SectorNumber))
-                                    {
-                                        Array.Copy(context.Device.System.NfcDevices[i].Data, (16 * list[p].SectorNumber) + 6, data, 6, 4);
-                                    }
-                                    else
-                                    {
-                                        Array.Copy(context.Device.System.NfcDevices[i].Data, 16 * list[p].SectorNumber, data, 0, 16);
-                                    }
-                                    data.CopyTo(blockData.Data.AsSpan());
-                                    context.Memory.Write(outputPosition + ((uint)(p * Unsafe.SizeOf<NfcMifareReadBlockData>())), blockData);
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(6)]
-        public ResultCode WriteMifare(ServiceCtx context)
-        {
-            if (context.Request.SendBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            ulong inputPosition = context.Request.SendBuff[0].Position;
-            ulong inputSize = context.Request.SendBuff[0].Size;
-
-            byte[] writeBlockParameter = new byte[inputSize];
-
-            context.Memory.Read(inputPosition, writeBlockParameter);
-
-            var span = MemoryMarshal.Cast<byte, NfcMifareWriteBlockParameter>(writeBlockParameter);
-            var list = new List<NfcMifareWriteBlockParameter>(span.Length);
-
-            foreach (var item in span)
-                list.Add(item);
-
-            Thread.Sleep(125 * list.Count); // NOTE: Simulate skylander scanning delay.
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagRemoved)
-                    {
-                        return ResultCode.TagNotFound;
-                    }
-                    else
-                    {
-                        for (int p = 0; p < list.Count; p++)
-                        {
-                            switch (list[p].SectorKey.MifareCommand)
-                            {
-                                case NfcMifareCommand.NfcMifareCommand_Write:
-                                case NfcMifareCommand.NfcMifareCommand_AuthA:
-                                    list[p].Data.AsSpan().CopyTo(context.Device.System.NfcDevices[i].Data.AsSpan(list[p].SectorNumber * 16, 16));
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(7)]
-        public ResultCode GetTagInfo(ServiceCtx context)
-        {
-            ResultCode resultCode = ResultCode.Success;
-
-            if (context.Request.RecvListBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            ulong outputPosition = context.Request.RecvListBuff[0].Position;
-
-            context.Response.PtrBuff[0] = context.Response.PtrBuff[0].WithSize((uint)Marshal.SizeOf<TagInfo>());
-
-            MemoryHelper.FillWithZeros(context.Memory, outputPosition, Marshal.SizeOf<TagInfo>());
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagRemoved)
-                    {
-                        resultCode = ResultCode.TagNotFound;
-                    }
-                    else
-                    {
-                        if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagMounted || context.Device.System.NfcDevices[i].State == NfcDeviceState.TagFound)
-                        {
-                            TagInfo tagInfo = new()
-                            {
-                                UuidLength = 4,
-                                Reserved1 = new Array21<byte>(),
-                                Protocol = (uint)NfcProtocol.NfcProtocol_TypeA, // Type A Protocol
-                                TagType = (uint)NfcTagType.NfcTagType_Mifare, // Mifare Type
-                                Reserved2 = new Array6<byte>(),
-                            };
-
-                            byte[] uuid = new byte[4];
-
-                            Array.Copy(context.Device.System.NfcDevices[i].Data, 0, uuid, 0, 4);
-
-                            uuid.CopyTo(tagInfo.Uuid.AsSpan());
-
-                            context.Memory.Write(outputPosition, tagInfo);
-
-                            resultCode = ResultCode.Success;
-                        }
-                        else
-                        {
-                            resultCode = ResultCode.WrongDeviceState;
-                        }
-                    }
-
-                    break;
-                }
-            }
-
-            return resultCode;
-        }
-
-        [CommandCmif(8)]
-        public ResultCode AttachActivateEvent(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].ActivateEvent = new KEvent(context.Device.System.KernelContext);
-
-                    if (context.Process.HandleTable.GenerateHandle(context.Device.System.NfcDevices[i].ActivateEvent.ReadableEvent, out int activateEventHandle) != Result.Success)
-                    {
-                        throw new InvalidOperationException("Out of handles!");
-                    }
-
-                    context.Response.HandleDesc = IpcHandleDesc.MakeCopy(activateEventHandle);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(9)]
-        public ResultCode AttachDeactivateEvent(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].DeactivateEvent = new KEvent(context.Device.System.KernelContext);
-
-                    if (context.Process.HandleTable.GenerateHandle(context.Device.System.NfcDevices[i].DeactivateEvent.ReadableEvent, out int deactivateEventHandle) != Result.Success)
-                    {
-                        throw new InvalidOperationException("Out of handles!");
-                    }
-
-                    context.Response.HandleDesc = IpcHandleDesc.MakeCopy(deactivateEventHandle);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(10)]
-        public ResultCode GetState(ServiceCtx context)
-        {
-            context.ResponseData.Write((int)_state);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(11)]
-        public ResultCode GetDeviceState(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State > NfcDeviceState.Finalized)
-                    {
-                        throw new InvalidOperationException($"{nameof(context.Device.System.NfcDevices)} contains an invalid state for device {i}: {context.Device.System.NfcDevices[i].State}");
-                    }
-                    context.ResponseData.Write((uint)context.Device.System.NfcDevices[i].State);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            context.ResponseData.Write((uint)NfcDeviceState.Unavailable);
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(12)]
-        public ResultCode GetNpadId(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    context.ResponseData.Write((uint)HidUtils.GetNpadIdTypeFromIndex(context.Device.System.NfcDevices[i].Handle));
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(13)]
-        public ResultCode AttachAvailabilityChangeEvent(ServiceCtx context)
-        {
-            _availabilityChangeEvent = new KEvent(context.Device.System.KernelContext);
-
-            if (context.Process.HandleTable.GenerateHandle(_availabilityChangeEvent.ReadableEvent, out int availabilityChangeEventHandle) != Result.Success)
-            {
-                throw new InvalidOperationException("Out of handles!");
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(availabilityChangeEventHandle);
-
-            return ResultCode.Success;
-        }
-
-        private bool IsCurrentBlockKeyBlock(byte block)
-        {
-            return ((block + 1) % 4) == 0;
-        }
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcDevice.cs

@@ -1,21 +0,0 @@
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.Hid;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    class NfcDevice
-    {
-        public KEvent ActivateEvent;
-        public KEvent DeactivateEvent;
-
-        public void SignalActivate() => ActivateEvent.ReadableEvent.Signal();
-        public void SignalDeactivate() => DeactivateEvent.ReadableEvent.Signal();
-
-        public NfcDeviceState State = NfcDeviceState.Unavailable;
-
-        public PlayerIndex Handle;
-        public NpadIdType NpadIdType;
-
-        public byte[] Data;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareCommand.cs

@@ -1,14 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcMifareCommand : byte
-    {
-        NfcMifareCommand_Read = 0x30,
-        NfcMifareCommand_AuthA = 0x60,
-        NfcMifareCommand_AuthB = 0x61,
-        NfcMifareCommand_Write = 0xA0,
-        NfcMifareCommand_Transfer = 0xB0,
-        NfcMifareCommand_Decrement = 0xC0,
-        NfcMifareCommand_Increment = 0xC1,
-        NfcMifareCommand_Store = 0xC2,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareReadBlockData.cs

@@ -1,13 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x18)]
-    struct NfcMifareReadBlockData
-    {
-        public Array16<byte> Data;
-        public byte SectorNumber;
-        public Array7<byte> Reserved;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareReadBlockParameter.cs

@@ -1,13 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x18)]
-    struct NfcMifareReadBlockParameter
-    {
-        public byte SectorNumber;
-        public Array7<byte> Reserved;
-        public NfcSectorKey SectorKey;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareWriteBlockParameter.cs

@@ -1,14 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x28)]
-    struct NfcMifareWriteBlockParameter
-    {
-        public Array16<byte> Data;
-        public byte SectorNumber;
-        public Array7<byte> Reserved;
-        public NfcSectorKey SectorKey;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcProtocol.cs

@@ -1,11 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcProtocol : byte
-    {
-        NfcProtocol_None = 0b_0000_0000,
-        NfcProtocol_TypeA = 0b_0000_0001, ///< ISO14443A
-        NfcProtocol_TypeB = 0b_0000_0010, ///< ISO14443B
-        NfcProtocol_TypeF = 0b_0000_0100, ///< Sony FeliCa
-        NfcProtocol_All = 0xFF,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcSectorKey.cs

@@ -1,16 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x10)]
-    struct NfcSectorKey
-    {
-        public NfcMifareCommand MifareCommand;
-        public byte Unknown;
-        public Array6<byte> Reserved1;
-        public Array6<byte> SectorKey;
-        public Array2<byte> Reserved2;
-
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcTagType.cs

@@ -1,15 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcTagType : byte
-    {
-        NfcTagType_None = 0b_0000_0000,
-        NfcTagType_Type1 = 0b_0000_0001, ///< ISO14443A RW. Topaz
-        NfcTagType_Type2 = 0b_0000_0010, ///< ISO14443A RW. Ultralight, NTAGX, ST25TN
-        NfcTagType_Type3 = 0b_0000_0100, ///< ISO14443A RW/RO. Sony FeliCa
-        NfcTagType_Type4A = 0b_0000_1000, ///< ISO14443A RW/RO. DESFire
-        NfcTagType_Type4B = 0b_0001_0000, ///< ISO14443B RW/RO. DESFire
-        NfcTagType_Type5 = 0b_0010_0000, ///< ISO15693 RW/RO. SLI, SLIX, ST25TV
-        NfcTagType_Mifare = 0b_0100_0000, ///< Mifare clasic. Skylanders
-        NfcTagType_All = 0xFF,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfpDeviceState.cs

@@ -1,13 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcDeviceState : byte
-    {
-        Initialized = 0,
-        SearchingForTag = 1,
-        TagFound = 2,
-        TagRemoved = 3,
-        TagMounted = 4,
-        Unavailable = 5,
-        Finalized = 6,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/State.cs

@@ -1,8 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum State
-    {
-        NonInitialized,
-        Initialized,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/TagInfo.cs

@@ -1,16 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x58)]
-    struct TagInfo
-    {
-        public Array10<byte> Uuid;
-        public byte UuidLength;
-        public Array21<byte> Reserved1;
-        public uint Protocol;
-        public uint TagType;
-        public Array6<byte> Reserved2;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/ResultCode.cs

@@ -1,17 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare
-{
-    public enum ResultCode
-    {
-        ModuleId = 161,
-        ErrorCodeShift = 9,
-
-        Success = 0,
-
-        DeviceNotFound = (64 << ErrorCodeShift) | ModuleId, // 0x80A1
-        WrongArgument = (65 << ErrorCodeShift) | ModuleId, // 0x82A1
-        WrongDeviceState = (73 << ErrorCodeShift) | ModuleId, // 0x92A1
-        NfcDisabled = (80 << ErrorCodeShift) | ModuleId, // 0xA0A1
-        TagNotFound = (97 << ErrorCodeShift) | ModuleId, // 0xC2A1
-        MifareAccessError = (288 << ErrorCodeShift) | ModuleId, // 0x240a1
-    }
-}

src/Ryujinx.HLE/HOS/SystemState/SystemLanguage.cs

@@ -20,7 +20,5 @@ namespace Ryujinx.HLE.HOS.SystemState
         SimplifiedChinese,
         TraditionalChinese,
         BrazilianPortuguese,
-        Polish,
-        Thai,
     }
 }

src/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs

@@ -23,9 +23,7 @@ namespace Ryujinx.HLE.HOS.SystemState
             "es-419",
             "zh-Hans",
             "zh-Hant",
-            "pt-BR",
-            "pl",
-            "th"
+            "pt-BR"
         ];
 
         internal long DesiredKeyboardLayout { get; private set; }

src/Ryujinx.HLE/HOS/SystemState/TitleLanguage.cs

@@ -18,7 +18,5 @@ namespace Ryujinx.HLE.HOS.SystemState
         TraditionalChinese,
         SimplifiedChinese,
         BrazilianPortuguese,
-        Polish,
-        Thai,
     }
 }

src/Ryujinx.Horizon/Sdk/Ns/ApplicationControlProperty.cs

@@ -1,19 +1,12 @@
 using Ryujinx.Common.Memory;
 using System;
-using System.Buffers.Binary;
-using System.IO;
-using System.IO.Compression;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Ryujinx.Horizon.Sdk.Ns
 {
     public struct ApplicationControlProperty
     {
-        /// <summary>
-        /// Use <see cref="Title"/> to access titles instead of accessing them directly.
-        /// </summary>
-        public Array16<ApplicationTitle> TitleBlock;
+        public Array16<ApplicationTitle> Title;
         public Array37<byte> Isbn;
         public StartupUserAccountValue StartupUserAccount;
         public UserAccountSwitchLockValue UserAccountSwitchLock;
@@ -65,10 +58,7 @@ namespace Ryujinx.Horizon.Sdk.Ns
         public RepairFlagValue RepairFlag;
         public byte ProgramIndex;
         public RequiredNetworkServiceLicenseOnLaunchValue RequiredNetworkServiceLicenseOnLaunchFlag;
-        public byte ApplicationErrorCodePrefix;
-        public TitleCompressionValue TitleCompression;
-        public byte AcdIndex;
-        public byte ApparentPlatform;
+        public Array4<byte> Reserved3214;
         public ApplicationNeighborDetectionClientConfiguration NeighborDetectionClientConfiguration;
         public ApplicationJitConfiguration JitConfiguration;
         public RequiredAddOnContentsSetBinaryDescriptor RequiredAddOnContentsSetBinaryDescriptors;
@@ -84,47 +74,6 @@ namespace Ryujinx.Horizon.Sdk.Ns
         public readonly string DisplayVersionString => Encoding.UTF8.GetString(DisplayVersion.AsSpan()).TrimEnd('\0');
         public readonly string ApplicationErrorCodeCategoryString => Encoding.UTF8.GetString(ApplicationErrorCodeCategory.AsSpan()).TrimEnd('\0');
         public readonly string BcatPassphraseString => Encoding.UTF8.GetString(BcatPassphrase.AsSpan()).TrimEnd('\0');
-        
-        private const int TitleCount = 32;
-        private const int TitleEntrySize = 0x300;
-        
-
-        /// <summary>
-        /// Returns the resolved title entries. When <see cref="TitleCompression"/> is
-        /// <see cref="TitleCompressionValue.Enable"/>, the raw <see cref="TitleBlock"/> bytes are
-        /// decompressed (raw deflate) from 0x3000 into 0x6000 bytes yielding up to 32 entries.
-        /// Otherwise the 16 uncompressed entries from <see cref="TitleBlock"/> are returned directly.
-        /// </summary>
-        public readonly ApplicationTitle[] Title
-        {
-            get
-            {
-                var titles = new ApplicationTitle[TitleCount];
-                
-                if (TitleCompression != TitleCompressionValue.Enable)
-                {
-                    TitleBlock.AsSpan().CopyTo(titles);
-                    
-                    return titles;
-                }
-
-                ReadOnlySpan<byte> titleBytes = MemoryMarshal.AsBytes(TitleBlock.AsSpan());
-                ushort compressedBlobSize = BinaryPrimitives.ReadUInt16LittleEndian(titleBytes);
-                ReadOnlySpan<byte> compressedBlob = titleBytes.Slice(2, compressedBlobSize);
-
-                byte[] decompressed = new byte[TitleCount * TitleEntrySize];
-
-                using (var compressedStream = new MemoryStream(compressedBlob.ToArray()))
-                using (var deflateStream = new DeflateStream(compressedStream, CompressionMode.Decompress))
-                {
-                    deflateStream.ReadExactly(decompressed, 0, decompressed.Length);
-                }
-
-                MemoryMarshal.Cast<byte, ApplicationTitle>(decompressed).CopyTo(titles);
-
-                return titles;
-            }
-        }
 
         public struct ApplicationTitle
         {
@@ -181,8 +130,6 @@ namespace Ryujinx.Horizon.Sdk.Ns
             TraditionalChinese = 13,
             SimplifiedChinese = 14,
             BrazilianPortuguese = 15,
-            Polish = 16,
-            Thai = 17,
         }
 
         public enum Organization
@@ -355,11 +302,5 @@ namespace Ryujinx.Horizon.Sdk.Ns
             Deny = 0,
             Allow = 1,
         }
-
-        public enum TitleCompressionValue : byte
-        {
-            Disable = 0,
-            Enable = 1,
-        }
     }
 }

src/Ryujinx/Common/Models/ApplicationIcon.cs

@@ -0,0 +1,23 @@
+using Avalonia.Media.Imaging;
+using Ryujinx.Ava.UI.Controls;
+
+namespace Ryujinx.Ava.Common.Models
+{
+    public class ApplicationIcon
+    {
+        public string Name { get; set; }
+        public string Filename { get; set; }
+        public string FullPath
+        {
+            get => $"Ryujinx/Assets/Icons/AppIcons/{Filename}";
+        }
+
+        public Bitmap Icon
+        {
+            get
+            {
+                return RyujinxLogo.GetBitmapForLogo(this);
+            }
+        }
+    }
+}

src/Ryujinx/Ryujinx.csproj

@@ -28,6 +28,11 @@
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>partial</TrimMode>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-arm64'">
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
   
   <!--
     FluentAvalonia, used in the Avalonia UI, requires a workaround for the json serializer used internally when using .NET 8+ System.Text.Json.
@@ -161,6 +166,7 @@
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConPair.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConRight.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_ProCon.svg" />
+    <EmbeddedResource Include="Assets\Icons\AppIcons\*" />
     <EmbeddedResource Include="Assets\UIImages\Icon_NCA.png" />
     <EmbeddedResource Include="Assets\UIImages\Icon_NRO.png" />
     <EmbeddedResource Include="Assets\UIImages\Icon_NSO.png" />

src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs

@@ -1404,7 +1404,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             if (string.IsNullOrWhiteSpace(data.Name))
             {
-                foreach (ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title)
+                foreach (ref readonly ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title)
                 {
                     if (!controlTitle.NameString.IsEmpty())
                     {
@@ -1417,7 +1417,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             if (string.IsNullOrWhiteSpace(data.Developer))
             {
-                foreach (ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title)
+                foreach (ref readonly ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title)
                 {
                     if (!controlTitle.PublisherString.IsEmpty())
                     {

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -356,6 +356,11 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// </summary>
         public string BaseStyle { get; set; }
 
+        /// <summary>
+        /// The name of the currently selected window icon
+        /// </summary>
+        public string SelectedWindowIcon { get; set; }
+
         /// <summary>
         /// Chooses the view mode of the game list // Not Used
         /// </summary>

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -134,6 +134,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             UI.ShownFileTypes.NSO.Value = shouldLoadFromFile ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
             UI.LanguageCode.Value = shouldLoadFromFile ? cff.LanguageCode : UI.LanguageCode.Value;
             UI.BaseStyle.Value = shouldLoadFromFile ? cff.BaseStyle : UI.BaseStyle.Value;
+            UI.SelectedWindowIcon.Value = shouldLoadFromFile ? cff.SelectedWindowIcon : UI.SelectedWindowIcon.Value;
             UI.GameListViewMode.Value = shouldLoadFromFile ? cff.GameListViewMode : UI.GameListViewMode.Value;
             UI.ShowNames.Value = shouldLoadFromFile ? cff.ShowNames : UI.ShowNames.Value;
             UI.IsAscendingOrder.Value = shouldLoadFromFile ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -151,6 +151,11 @@ namespace Ryujinx.Ava.Systems.Configuration
             /// </summary>
             public ReactiveObject<string> BaseStyle { get; private set; }
 
+            /// <summary>
+            /// The currently selected window icon.
+            /// </summary>
+            public ReactiveObject<string> SelectedWindowIcon { get; private set; }
+
             /// <summary>
             /// Start games in fullscreen mode
             /// </summary>
@@ -200,6 +205,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 ShownFileTypes = new ShownFileTypeSettings();
                 WindowStartup = new WindowStartupSettings();
                 BaseStyle = new ReactiveObject<string>();
+                SelectedWindowIcon = new ReactiveObject<string>();
                 StartFullscreen = new ReactiveObject<bool>();
                 StartNoUI = new ReactiveObject<bool>();
                 GameListViewMode = new ReactiveObject<int>();

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -126,6 +126,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 },
                 LanguageCode = UI.LanguageCode,
                 BaseStyle = UI.BaseStyle,
+                SelectedWindowIcon = UI.SelectedWindowIcon,
                 GameListViewMode = UI.GameListViewMode,
                 ShowNames = UI.ShowNames,
                 GridSize = UI.GridSize,

src/Ryujinx/Systems/Configuration/System/Language.cs

@@ -24,8 +24,6 @@ namespace Ryujinx.Ava.Systems.Configuration.System
         SimplifiedChinese,
         TraditionalChinese,
         BrazilianPortuguese,
-        Polish,
-        Thai,
     }
 
     public static class LanguageEnumHelper

src/Ryujinx/UI/Controls/RyujinxLogo.cs

@@ -1,28 +1,146 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
+using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Reflection;
+using Ryujinx.Common;
+using SkiaSharp;
+using Svg.Skia;
+using System;
+using System.IO;
+using System.Linq;
 
 namespace Ryujinx.Ava.UI.Controls
 {
     public class RyujinxLogo : Image
     {
-        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
-        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
-        // The border gets reduced to colored pixels in the 4 corners.
-        public static readonly Bitmap Bitmap =
-            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
-                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
+        public static ReactiveObject<Bitmap> CurrentLogoBitmap { get; private set; } = new();
 
         public RyujinxLogo()
         {
             Margin = new Thickness(7, 7, 7, 0);
             Height = 25;
             Width = 25;
-            Source = Bitmap;
+            Source = CurrentLogoBitmap.Value;
             IsVisible = !ConfigurationState.Instance.ShowOldUI;
+            ConfigurationState.Instance.UI.SelectedWindowIcon.Event += WindowIconChanged_Event;
+            CurrentLogoBitmap.Event += CurrentLogoBitmapChanged_Event;
+        }
+
+        private void CurrentLogoBitmapChanged_Event(object _, ReactiveEventArgs<Bitmap> e)
+        {
+            Source = e.NewValue;
+        }
+
+        public static void RefreshAppIconFromSettings()
+        {
+            SetNewAppIcon(ConfigurationState.Instance.UI.SelectedWindowIcon.Value);
+        }
+
+        private static void SetNewAppIcon(string newIconName)
+        {
+            string defaultIconName = "Bordered Ryupride";
+            if (string.IsNullOrEmpty(newIconName))
+            {
+                SetDefaultAppIcon(defaultIconName);
+            }
+
+            ApplicationIcon selectedIcon = RyujinxApp.AvailableApplicationIcons.FirstOrDefault(x => x.Name == newIconName);
+            if (selectedIcon == null)
+            {
+                // Always try to fallback to "Bordered Ryupride" as a default
+                // If not found, fallback to first found icon
+                if (newIconName != defaultIconName)
+                {
+                    SetDefaultAppIcon(defaultIconName);
+                    return;
+                }
+
+                if (RyujinxApp.AvailableApplicationIcons.Count > 0)
+                {
+                    SetDefaultAppIcon(RyujinxApp.AvailableApplicationIcons.First().Name);
+                    return;
+                }
+            }
+
+            Stream activeIconStream = EmbeddedResources.GetStream(selectedIcon.FullPath);
+            if (activeIconStream != null)
+            {
+                Bitmap logoBitmap = GetBitmapForLogo(selectedIcon);
+                if (logoBitmap != null)
+                {
+                    CurrentLogoBitmap.Value = logoBitmap;
+                }
+            }
+        }
+
+        private static void SetDefaultAppIcon(string defaultIconName)
+        {
+            // Doing this triggers the WindowIconChanged_Event, which will then
+            // call SetNewAppIcon again
+            ConfigurationState.Instance.UI.SelectedWindowIcon.Value = defaultIconName;
+        }
+        
+        private void WindowIconChanged_Event(object _, ReactiveEventArgs<string> rArgs) => SetNewAppIcon(rArgs.NewValue);
+
+        public static Bitmap GetBitmapForLogo(ApplicationIcon icon)
+        {
+            Stream activeIconStream = EmbeddedResources.GetStream(icon.FullPath);
+            if (activeIconStream == null)
+                return null;
+
+            // SVG files need to be converted to an image first
+            if (icon.FullPath.EndsWith(".svg", StringComparison.OrdinalIgnoreCase))
+            {
+                Stream pngStream = ConvertSvgToPng(activeIconStream);
+                return new Bitmap(pngStream);
+            }
+            else
+            {
+                return new Bitmap(activeIconStream);
+            }
+        }
+
+        private static Stream ConvertSvgToPng(Stream svgStream)
+        {
+            int width = 256;
+            int height = 256;
+
+            // Load SVG
+            var svg = new SKSvg();
+            svg.Load(svgStream);
+
+            // Determine size
+            var picture = svg.Picture;
+            if (picture == null)
+                throw new InvalidOperationException("Invalid SVG data");
+
+            var picWidth = width > 0 ? width : (int)svg.Picture.CullRect.Width;
+            var picHeight = height > 0 ? height : (int)svg.Picture.CullRect.Height;
+
+            // Create bitmap
+            using var bitmap = new SKBitmap(picWidth, picHeight);
+            using var canvas = new SKCanvas(bitmap);
+            canvas.Clear(SKColors.Transparent);
+
+            // Scale to fit
+            float scaleX = (float)picWidth / svg.Picture.CullRect.Width;
+            float scaleY = (float)picHeight / svg.Picture.CullRect.Height;
+            canvas.Scale(scaleX, scaleY);
+
+            canvas.DrawPicture(svg.Picture);
+            canvas.Flush();
+
+            // Encode PNG into memory stream
+            var outputStream = new MemoryStream();
+            using (var image = SKImage.FromBitmap(bitmap))
+            using (var data = image.Encode(SKEncodedImageFormat.Png, 100))
+            {
+                data.SaveTo(outputStream);
+            }
+
+            outputStream.Position = 0;
+            return outputStream;
         }
     }
 }

src/Ryujinx/UI/RyujinxApp.axaml.cs

@@ -8,7 +8,9 @@ using Avalonia.Threading;
 using FluentAvalonia.UI.Windowing;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Ava.UI.Windows;
@@ -17,7 +19,10 @@ using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.RenderDocApi;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
 
 namespace Ryujinx.Ava
 {
@@ -53,6 +58,9 @@ namespace Ryujinx.Ava
         {
             Name = FormatTitle();
 
+            RetrieveAvailableAppIcons();
+            RyujinxLogo.RefreshAppIconFromSettings();
+
             AvaloniaXamlLoader.Load(this);
 
             if (OperatingSystem.IsMacOS())
@@ -75,7 +83,6 @@ namespace Ryujinx.Ava
             if (Program.PreviewerDetached)
             {
                 ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
-
                 ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event;
             }
         }
@@ -154,5 +161,27 @@ namespace Ryujinx.Ava
         {
             await AboutView.Show();
         }
+
+        public static List<ApplicationIcon> AvailableApplicationIcons { get; set; } = [];
+        private static void RetrieveAvailableAppIcons()
+        {
+            AvailableApplicationIcons.Clear();
+            string resourceAssemblyPrefix = "Ryujinx.Assets.Icons.AppIcons.";
+
+            IEnumerable<string> availableAppIconResources = EmbeddedResources
+                .GetAllAvailableResources("Ryujinx/Assets")
+                .Where(x => x.StartsWith(resourceAssemblyPrefix));
+
+            foreach (string resource in availableAppIconResources)
+            {
+                string filename = resource.Remove(0, resourceAssemblyPrefix.Length);
+                string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filename);
+                AvailableApplicationIcons.Add(new ApplicationIcon()
+                {
+                    Name = fileNameWithoutExtension,
+                    Filename = filename
+                });
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -370,39 +370,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool CanScanAmiiboBinaries => AmiiboBinReader.HasAmiiboKeyFile;
 
-        public bool IsSkylanderRequested
-        {
-            get => field && _isGameRunning;
-            set
-            {
-                field = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool HasSkylander
-        {
-            get => field && _isGameRunning;
-            set
-            {
-                field = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowSkylanderActions
-        {
-            get => field && _isGameRunning;
-            set
-            {
-                field = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool ShowLoadProgress
         {
             get;
@@ -1897,46 +1864,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
             }
         }
-        public async Task OpenSkylanderWindow()
-        {
-            if (AppHost.Device.System.SearchingForSkylander(out int deviceId))
-            {
-                Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(
-                    new FilePickerOpenOptions
-                {
-                    Title = LocaleManager.Instance[LocaleKeys.OpenFileDialogTitle],
-                    FileTypeFilter = new List<FilePickerFileType>
-                {
-                    new(LocaleManager.Instance[LocaleKeys.AllSupportedFormats])
-                    {
-                        Patterns = ["*.sky", "*.bin", "*.dmp", "*.dump"],
-                    },
-                },
-                });
-                if (result.HasValue)
-                {
-                    // Open reading stream from the first file.
-                    await using var stream = await result.Value.OpenReadAsync();
-                    using var streamReader = new BinaryReader(stream);
-                    // Reads all the content of file as a text.
-                    byte[] data = new byte[1024];
-                    var count = streamReader.Read(data, 0, 1024);
-                    if (count < 1024)
-                    {
-                        return;
-                    }
-                    else
-                    {
-                        AppHost.Device.System.ScanSkylander(deviceId, data);
-                    }
-                }
-            }
-        }
-
-        public async Task RemoveSkylander()
-        {
-            AppHost.Device.System.RemoveSkylander();
-        }
 
         public void ReloadRenderDocApi()
         {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -10,12 +10,14 @@ using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL3;
 using Ryujinx.Audio.Backends.SoundIo;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.Systems.Configuration.System;
 using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
@@ -509,6 +511,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             Task.Run(CheckSoundBackends);
             Task.Run(PopulateNetworkInterfaces);
+            ApplicationIcons = new(RyujinxApp.AvailableApplicationIcons);
 
             if (Program.PreviewerDetached)
             {
@@ -636,6 +639,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             HideCursor = (int)config.HideCursor.Value;
             UpdateCheckerType = (int)config.UpdateCheckerType.Value;
             FocusLostActionType = (int)config.FocusLostActionType.Value;
+            AppIconSelectedIndex = _appIcons.ToList().FindIndex(x => x.Name == config.UI.SelectedWindowIcon.Value);
 
             GameDirectories.Clear();
             GameDirectories.AddRange(config.UI.GameDirs.Value);
@@ -754,6 +758,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
             config.UI.GameDirs.Value = [.. GameDirectories];
             config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
+            config.UI.SelectedWindowIcon.Value = _appIcons[_appIconSelectedIndex].Name;
 
             config.UI.BaseStyle.Value = BaseStyleIndex switch
             {
@@ -941,5 +946,27 @@ namespace Ryujinx.Ava.UI.ViewModels
             RevertIfNotSaved(IsCustomConfig, IsGameRunning);
             CloseWindow?.Invoke();
         }
+
+        private AvaloniaList<ApplicationIcon> _appIcons = [];
+        public AvaloniaList<ApplicationIcon> ApplicationIcons
+        {
+            get => _appIcons;
+            set
+            {
+                _appIcons = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private int _appIconSelectedIndex;
+        public int AppIconSelectedIndex
+        {
+            get => _appIconSelectedIndex;
+            set
+            {
+                _appIconSelectedIndex = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

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

@@ -184,22 +184,6 @@
                     IsVisible="{Binding CanScanAmiiboBinaries}"
                     InputGesture="Ctrl + B"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
-                <MenuItem
-                    Command="{Binding OpenSkylanderWindow}"
-                    AttachedToVisualTree="ScanSkylanderMenuItem_AttachedToVisualTree"
-                    Header="{ext:Locale MenuBarActionsScanSkylander}"
-                    Icon="{ext:Icon fa-solid fa-cube}"
-                    IsVisible="{Binding ShowSkylanderActions}"
-                    InputGesture="Ctrl + S"
-                    IsEnabled="{Binding IsSkylanderRequested}" />
-                <MenuItem
-                    Command="{Binding RemoveSkylander}"
-                    AttachedToVisualTree="RemoveSkylanderMenuItem_AttachedToVisualTree"
-                    Header="{ext:Locale MenuBarActionsRemoveSkylander}"
-                    Icon="{ext:Icon fa-solid fa-cube}"
-                    IsVisible="{Binding ShowSkylanderActions}"
-                    InputGesture="Ctrl + D"
-                    IsEnabled="{Binding HasSkylander}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
                     Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"

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

@@ -193,20 +193,6 @@ namespace Ryujinx.Ava.UI.Views.Main
                 ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasAmiiboKeyFile;
         }
 
-        private void ScanSkylanderMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
-        {
-            if (sender is MenuItem)
-                ViewModel.IsSkylanderRequested = ViewModel.AppHost.Device.System.SearchingForSkylander(out _);
-                ViewModel.ShowSkylanderActions = string.Equals(ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper(), "0100CCC0002E6000");
-        }
-
-        private void RemoveSkylanderMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
-        {
-            if (sender is MenuItem)
-                ViewModel.HasSkylander = ViewModel.AppHost.Device.System.HasSkylander(out _);
-                ViewModel.ShowSkylanderActions = string.Equals(ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper(), "0100CCC0002E6000");
-        }
-
         private async Task InstallFileTypes()
         {
             ViewModel.AreMimeTypesRegistered = FileAssociationHelper.Install();

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

@@ -140,6 +140,32 @@
                                 Content="{ext:Locale SettingsTabGeneralThemeDark}" />
                             </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                        </StackPanel>                        
+                        <StackPanel
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            Margin="0, 15, 0, 10"
+                            ToolTip.Tip="{ext:Locale SettingsTabGeneralIconTooltip}"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Text="{ext:Locale SettingsTabGeneralIcon}"
+                                Width="150" />
+                            <ComboBox
+                                MinWidth="100"
+                                HorizontalAlignment="Left"
+                                ItemsSource="{Binding ApplicationIcons}"
+                                SelectedIndex="{Binding AppIconSelectedIndex}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel Orientation="Horizontal" >
+                                            <Image Source="{Binding Icon}" Width="24" Height="24" Margin="0,0,8,0" />
+                                            <TextBlock Text="{Binding Name}" />
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
                     </StackPanel>
                 </StackPanel>

src/Ryujinx/UI/Views/User/UserEditorView.axaml

@@ -108,7 +108,7 @@
             <Button
                 Name="SaveButton"
                 Click="SaveButton_Click">
-                <TextBlock Text="{ext:Locale UserProfilesSave}" />
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
             </Button>
         </StackPanel>
     </Grid>

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -3,11 +3,13 @@ using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Common;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows
@@ -39,7 +41,8 @@ namespace Ryujinx.Ava.UI.Windows
                     TitleBar.Height = titleBarHeight.Value;
             }
 
-            Icon = RyujinxLogo.Bitmap;
+            Icon = RyujinxLogo.CurrentLogoBitmap.Value;
+            RyujinxLogo.CurrentLogoBitmap.Event += WindowIconChanged_Event;
         }
 
         private void LocaleChanged()
@@ -53,6 +56,12 @@ namespace Ryujinx.Ava.UI.Windows
 
             ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
         }
+
+        private void WindowIconChanged_Event(object _, ReactiveEventArgs<Bitmap> rArgs) => UpdateIcon(rArgs.NewValue);
+        private void UpdateIcon(Bitmap newIcon)
+        {
+            Icon = newIcon;
+        }
     }
 
     public abstract class StyleableWindow : Window
@@ -73,7 +82,8 @@ namespace Ryujinx.Ava.UI.Windows
             LocaleManager.Instance.LocaleChanged += LocaleChanged;
             LocaleChanged();
 
-            Icon = new WindowIcon(RyujinxLogo.Bitmap);
+            Icon = new WindowIcon(RyujinxLogo.CurrentLogoBitmap.Value);
+            RyujinxLogo.CurrentLogoBitmap.Event += WindowIconChanged_Event;
         }
 
         private void LocaleChanged()
@@ -87,5 +97,11 @@ namespace Ryujinx.Ava.UI.Windows
 
             ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
         }
+
+        private void WindowIconChanged_Event(object _, ReactiveEventArgs<Bitmap> rArgs) => UpdateIcon(rArgs.NewValue);
+        private void UpdateIcon(Bitmap newIcon)
+        {
+            Icon = new WindowIcon(newIcon);
+        }
     }
 }

src/Ryujinx/Utilities/SystemInfo/WindowsSystemInfo.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common.Logging;
 using System;
+using System.Management;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
@@ -10,7 +11,7 @@ namespace Ryujinx.Ava.Utilities.SystemInfo
     {
         internal WindowsSystemInfo()
         {
-            CpuName = $"{GetCpuidCpuName() ?? GetCpuNameFromRegistry()} ; {LogicalCoreCount} logical";
+            CpuName = $"{GetCpuidCpuName() ?? GetCpuNameWMI()} ; {LogicalCoreCount} logical"; // WMI is very slow
             (RamTotal, RamAvailable) = GetMemoryStats();
         }
 
@@ -27,26 +28,25 @@ namespace Ryujinx.Ava.Utilities.SystemInfo
             return (0, 0);
         }
 
-        private static string GetCpuNameFromRegistry()
+        private static string GetCpuNameWMI()
         {
-            try
-            {
-                using var key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0");
+            ManagementObjectCollection cpuObjs = GetWMIObjects("root\\CIMV2", "SELECT * FROM Win32_Processor");
 
-                return key?.GetValue("ProcessorNameString")?.ToString()?.Trim();
-            }
-            catch (Exception ex)
+            if (cpuObjs != null)
             {
-                Logger.Error?.Print(LogClass.Application, $"Registry CPU name lookup failed: {ex.Message}");
-
-                return Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER")?.Trim();
+                foreach (ManagementBaseObject cpuObj in cpuObjs)
+                {
+                    return cpuObj["Name"].ToString().Trim();
+                }
             }
+
+            return Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER")?.Trim();
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        private struct MemoryStatusEx()
+        private struct MemoryStatusEx
         {
-            public uint Length = (uint)Marshal.SizeOf<MemoryStatusEx>();
+            public uint Length;
             public uint MemoryLoad;
             public ulong TotalPhys;
             public ulong AvailPhys;
@@ -55,10 +55,33 @@ namespace Ryujinx.Ava.Utilities.SystemInfo
             public ulong TotalVirtual;
             public ulong AvailVirtual;
             public ulong AvailExtendedVirtual;
+
+            public MemoryStatusEx()
+            {
+                Length = (uint)Marshal.SizeOf<MemoryStatusEx>();
+            }
         }
 
         [LibraryImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool GlobalMemoryStatusEx(ref MemoryStatusEx lpBuffer);
+
+        private static ManagementObjectCollection GetWMIObjects(string scope, string query)
+        {
+            try
+            {
+                return new ManagementObjectSearcher(scope, query).Get();
+            }
+            catch (PlatformNotSupportedException ex)
+            {
+                Logger.Error?.Print(LogClass.Application, $"WMI isn't available : {ex.Message}");
+            }
+            catch (COMException ex)
+            {
+                Logger.Error?.Print(LogClass.Application, $"WMI isn't available : {ex.Message}");
+            }
+
+            return null;
+        }
     }
 }