Merge branch 'master' into more-launch-checks

never should have been included tbh, i forgot to remove it lol

.github/workflows/canary.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -162,7 +162,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -215,7 +215,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH

.github/workflows/release.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -161,7 +161,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -217,7 +217,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH

assets/Locales/Root.json

@@ -592,7 +592,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
-        "sv_SE": "Starta om emulering",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -11342,7 +11342,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
-        "sv_SE": "Spara",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -246,21 +246,21 @@ namespace Ryujinx.HLE.HOS
         public void InitializeServices()
         {
             SmRegistry = new SmRegistry();
-            SmServer = new ServerBase(KernelContext, "Sm", () => new IUserInterface(KernelContext, SmRegistry));
+            SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext, SmRegistry));
 
             // Wait until SM server thread is done with initialization,
             // only then doing connections to SM is safe.
             SmServer.InitDone.WaitOne();
 
-            BsdServer = new ServerBase(KernelContext, "Bsd");
-            FsServer = new ServerBase(KernelContext, "Fs");
-            HidServer = new ServerBase(KernelContext, "Hid");
-            NvDrvServer = new ServerBase(KernelContext, "Nv");
-            TimeServer = new ServerBase(KernelContext, "Time");
-            ViServer = new ServerBase(KernelContext, "Vi:u");
-            ViServerM = new ServerBase(KernelContext, "Vi:m");
-            ViServerS = new ServerBase(KernelContext, "Vi:s");
-            LdnServer = new ServerBase(KernelContext, "Ldn");
+            BsdServer = new ServerBase(KernelContext, "BsdServer");
+            FsServer = new ServerBase(KernelContext, "FsServer");
+            HidServer = new ServerBase(KernelContext, "HidServer");
+            NvDrvServer = new ServerBase(KernelContext, "NvservicesServer");
+            TimeServer = new ServerBase(KernelContext, "TimeServer");
+            ViServer = new ServerBase(KernelContext, "ViServerU");
+            ViServerM = new ServerBase(KernelContext, "ViServerM");
+            ViServerS = new ServerBase(KernelContext, "ViServerS");
+            LdnServer = new ServerBase(KernelContext, "LdnServer");
 
             StartNewServices();
         }
@@ -286,7 +286,7 @@ namespace Ryujinx.HLE.HOS
                     ProcessCreationFlags.Is64Bit |
                     ProcessCreationFlags.PoolPartitionSystem;
 
-                ProcessCreationInfo creationInfo = new(service.Name, 1, 0, 0x8000000, 1, Flags, 0, 0);
+                ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
                 uint[] defaultCapabilities =
                 [

src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs

@@ -584,13 +584,8 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         
         public bool isAtRest(int playerNumber)
         {
-            ref NpadInternalState currentNpad = ref _device.Hid.SharedMemory.Npads[playerNumber].InternalState;
-
-            if (currentNpad.StyleSet == NpadStyleTag.None)
-            {
-                return true; // it will always be at rest because it cannot move.
-            }
             
+            ref NpadInternalState currentNpad = ref _device.Hid.SharedMemory.Npads[playerNumber].InternalState;
             ref SixAxisSensorState storage = ref GetSixAxisSensorLifo(ref currentNpad, false).GetCurrentEntryRef();
                 
             float acceleration = Math.Abs(storage.Acceleration.X)

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

@@ -79,15 +79,9 @@ namespace Ryujinx.HLE.HOS.Services
                 ProcessCreationFlags.Is64Bit |
                 ProcessCreationFlags.PoolPartitionSystem;
 
-            ProcessCreationInfo creationInfo = new(Name, 1, 0, 0x8000000, 1, Flags, 0, 0);
+            ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
-            KernelStatic.StartInitialProcess(context, creationInfo, DefaultCapabilities, 44, () =>
-            {
-                var currentThread = KernelStatic.GetCurrentThread();
-                currentThread.HostThread.Name = $"{{{Name}}}";
-
-                Main();
-            });
+            KernelStatic.StartInitialProcess(context, creationInfo, DefaultCapabilities, 44, Main);
         }
 
         private void AddPort(int serverPortHandle, Func<IpcService> objectFactory)

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

@@ -17,12 +17,13 @@ namespace Ryujinx.HLE.HOS.Services.Sm
         private static readonly Dictionary<string, Type> _services;
 
         private readonly SmRegistry _registry;
-        private ServerBase _commonServer;
+        private readonly ServerBase _commonServer;
 
         private bool _isInitialized;
 
         public IUserInterface(KernelContext context, SmRegistry registry) : base(registerTipc: true)
         {
+            _commonServer = new ServerBase(context, "CommonServer");
             _registry = registry;
         }
 
@@ -96,11 +97,6 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
                     IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
 
-                    if (_commonServer is null)
-                    {
-                        _commonServer = new ServerBase(context.Device.System.KernelContext, "Common");
-                    }
-                    
                     service.TrySetServer(_commonServer);
                     service.Server.AddSessionObj(session.ServerSession, service);
                 }
@@ -257,7 +253,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
         public override void DestroyAtExit()
         {
-            _commonServer?.Dispose();
+            _commonServer.Dispose();
 
             base.DestroyAtExit();
         }

src/Ryujinx.Horizon/ServiceEntry.cs

@@ -9,14 +9,12 @@ namespace Ryujinx.Horizon
         private readonly Action<ServiceTable> _entrypoint;
         private readonly ServiceTable _serviceTable;
         private readonly HorizonOptions _options;
-        public readonly string Name;
 
-        internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options, string name)
+        internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options)
         {
             _entrypoint = entrypoint;
             _serviceTable = serviceTable;
             _options = options;
-            Name = name;
         }
 
         public void Start(ISyscallApi syscallApi, IVirtualMemoryManager addressSpace, IThreadContext threadContext)

src/Ryujinx.Horizon/ServiceTable.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.Horizon
 
             void RegisterService<T>() where T : IService
             {
-                entries.Add(new ServiceEntry(T.Main, this, options, typeof(T).Name));
+                entries.Add(new ServiceEntry(T.Main, this, options));
             }
 
             RegisterService<ArpMain>();

src/Ryujinx/Program.cs

@@ -54,17 +54,39 @@ namespace Ryujinx.Ava
             {
                 if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
                 {
-                    _ = Win32NativeInterop.MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
+                    Logger.Error?.PrintMsg(LogClass.Application, "Ryujinx is not intended to be run on an outdated version of Windows. Exiting...");
+                    _ = Win32NativeInterop.MessageBoxA(nint.Zero,
+                        "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n",
+                        $"Ryujinx {Version}", MbIconwarning);
                     return 0;
                 }
 
-                var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
-                var programFilesX86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
+                string onedriveFiles = Environment.GetEnvironmentVariable("Onedrive");
+                string onedriveConsumerFiles = Environment.GetEnvironmentVariable("OnedriveConsumer");
+                string onedriveCommercialFiles = Environment.GetEnvironmentVariable("OnedriveCommercial");
+
+                // Apparently not everyone has OneDrive shoved onto their system.
+                if ((onedriveFiles is not null && Environment.CurrentDirectory.StartsWithIgnoreCase(onedriveFiles))
+                    || (onedriveConsumerFiles is not null && Environment.CurrentDirectory.StartsWithIgnoreCase(onedriveConsumerFiles))
+                    || (onedriveCommercialFiles is not null && Environment.CurrentDirectory.StartsWithIgnoreCase(onedriveCommercialFiles)))
+                {
+                    Logger.Error?.PrintMsg(LogClass.Application, "Ryujinx is not intended to be run from a OneDrive folder. Exiting...");
+                    _ = Win32NativeInterop.MessageBoxA(nint.Zero,
+                        "Ryujinx is not intended to be run from a OneDrive folder. Please move it out and relaunch.",
+                        $"Ryujinx {Version}", MbIconwarning);
+                    return 0;
+                }
+
+                string programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+                string programFilesX86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
 
                 if (Environment.CurrentDirectory.StartsWithIgnoreCase(programFiles) ||
                     Environment.CurrentDirectory.StartsWithIgnoreCase(programFilesX86))
                 {
-                    _ = Win32NativeInterop.MessageBoxA(nint.Zero, "Ryujinx is not intended to be run from the Program Files folder. Please move it out and relaunch.", $"Ryujinx {Version}", MbIconwarning);
+                    Logger.Error?.PrintMsg(LogClass.Application, "Ryujinx is not intended to be run from the Program Files folder. Exiting...");
+                    _ = Win32NativeInterop.MessageBoxA(nint.Zero,
+                        "Ryujinx is not intended to be run from the Program Files folder. Please move it out and relaunch.",
+                        $"Ryujinx {Version}", MbIconwarning);
                     return 0;
                 }
 
@@ -74,10 +96,54 @@ namespace Ryujinx.Ava
                 // ...but this reads like it checks if the current is in/has the Windows admin role? lol
                 if (new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator))
                 {
-                    _ = Win32NativeInterop.MessageBoxA(nint.Zero, "Ryujinx is not intended to be run as administrator.", $"Ryujinx {Version}", MbIconwarning);
+                    Logger.Error?.PrintMsg(LogClass.Application, "Ryujinx is not intended to be run as administrator. Exiting...");
+                    _ = Win32NativeInterop.MessageBoxA(nint.Zero, "Ryujinx is not intended to be run as administrator.",
+                        $"Ryujinx {Version}", MbIconwarning);
                     return 0;
                 }
             }
+            else // Unix
+            {
+                // sudo check
+                [DllImport("libc")]
+                static extern uint geteuid();
+                bool root = geteuid().Equals(0);
+
+                if (OperatingSystem.IsMacOS())
+                {
+                    if (root)
+                    {
+                        Logger.Error?.PrintMsg(LogClass.Application, "Ryujinx is not intended to be run as administrator. Exiting...");
+                        macOSNativeInterop.SimpleMessageBox($"Ryujinx {Version}",
+                            "Ryujinx is not intended to be run as administrator.", "Ok");
+                        return 0;
+                    }
+                }
+
+                if (OperatingSystem.IsLinux())
+                {
+                    if (root)
+                    {
+                        Logger.Error?.PrintMsg(LogClass.Application, "Ryujinx is not intended to be run as administrator. Exiting...");
+                        LinuxSDLInterop.SimpleMessageBox($"Ryujinx {Version}", "Ryujinx is not intended to be run as administrator.");
+                        return 0;
+                    }
+                    
+                    string container = Environment.GetEnvironmentVariable("container");
+                    
+                    if (container is not null && container.EqualsIgnoreCase("flatpak"))
+                    {
+                        Logger.Warning?.PrintMsg(LogClass.Application, "This is very likely an unofficial build, Ryujinx does NOT have a flatpak!");
+                        Logger.Info?.PrintMsg(LogClass.Application, "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=");
+                        Logger.Info?.PrintMsg(LogClass.Application, "Please visit https://ryujinx.app/ for our official builds.");
+                        Logger.Info?.PrintMsg(LogClass.Application,
+                            "    AppImage >> https://update.ryujinx.app/download/query?os=linuxappimage&arch=x64&rc=stable");
+                        Logger.Info?.PrintMsg(LogClass.Application,
+                            "    Tarball >> https://update.ryujinx.app/download/query?os=linux&arch=x64&rc=stable");
+                        Logger.Info?.PrintMsg(LogClass.Application, "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=");
+                    }
+                }
+            }
 
             bool noGuiArg = ConsumeCommandLineArgument(ref args, "--no-gui") || ConsumeCommandLineArgument(ref args, "nogui");
             bool coreDumpArg = ConsumeCommandLineArgument(ref args, "--core-dumps");
@@ -310,7 +376,7 @@ namespace Ryujinx.Ava
                     "never" => HideCursorMode.Never,
                     "onidle" => HideCursorMode.OnIdle,
                     "always" => HideCursorMode.Always,
-                    _ => ConfigurationState.Instance.HideCursor,
+                    _ => ConfigurationState.Instance.HideCursor
                 };
 
             // Check if memoryManagerMode was overridden. 

src/Ryujinx/UI/Helpers/LinuxSDLInterop.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+    public class LinuxSDLInterop
+    {
+        // TODO: add a parameter for prompt style
+        // TODO: look into adding text for the button
+        // TODO: check success of prompt box
+        public static int SimpleMessageBox(string caption, string text)
+        {
+            const string sdl = "SDL2";
+                        
+            [DllImport(sdl)]
+            static extern int SDL_Init(uint flags);
+                        
+            [DllImport(sdl, CallingConvention = CallingConvention.Cdecl)]
+            static extern int SDL_ShowSimpleMessageBox(uint flags, string title, string message, IntPtr window);
+                        
+            [DllImport(sdl)]
+            static extern void SDL_Quit();
+                        
+            SDL_Init(0); 
+            SDL_ShowSimpleMessageBox(32 /* 32 = warning style */, caption, text, IntPtr.Zero);
+            SDL_Quit();
+            return 0;
+        }
+    }
+}

src/Ryujinx/UI/Helpers/macOSNativeInterop.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+    public class macOSNativeInterop
+    {
+        // TODO: add a parameter for prompt style
+        // TODO: check success of prompt box
+        public static int SimpleMessageBox(string caption, string text, string button)
+        {
+            
+            // Grab what we need to make the message box.
+            const string ObjCRuntime = "/usr/lib/libobjc.A.dylib";
+            const string FoundationFramework = "/System/Library/Frameworks/Foundation.framework/Foundation";
+            const string AppKitFramework = "/System/Library/Frameworks/AppKit.framework/AppKit";
+                        
+            [DllImport(ObjCRuntime, EntryPoint = "sel_registerName")]
+            static extern IntPtr GetSelector(string name);
+                        
+            [DllImport(ObjCRuntime, EntryPoint = "objc_getClass")]
+            static extern IntPtr GetClass(string name);
+
+            [DllImport(FoundationFramework, EntryPoint = "objc_msgSend")]
+            static extern IntPtr SendMessage(IntPtr target, IntPtr selector);
+
+            [DllImport(FoundationFramework, EntryPoint = "objc_msgSend")]
+            static extern IntPtr SendMessageWithParameter(IntPtr target, IntPtr selector, IntPtr param);
+
+            [DllImport(ObjCRuntime)]
+            static extern IntPtr dlopen(string path, int mode);
+
+            dlopen(AppKitFramework, 0x1); // have to invoke AppKit so that NSAlert doesn't return a null pointer
+                        
+            IntPtr NSStringClass = GetClass("NSString");
+            IntPtr Selector = GetSelector("stringWithUTF8String:");
+            IntPtr SharedApp = SendMessage(GetClass("NSApplication"), GetSelector("sharedApplication"));
+            IntPtr NSAlert = SendMessage(GetClass("NSAlert"), GetSelector("alloc"));
+            IntPtr AlertInstance = SendMessage(NSAlert, GetSelector("init"));
+                        
+            // Create caption, text, and button text.
+            IntPtr boxCaption = SendMessageWithParameter(NSStringClass, Selector, Marshal.StringToHGlobalAnsi(caption));
+            IntPtr boxText = SendMessageWithParameter(NSStringClass, Selector, Marshal.StringToHGlobalAnsi(text));
+            IntPtr boxButton = SendMessageWithParameter(NSStringClass, Selector, Marshal.StringToHGlobalAnsi(button));
+                        
+            // Set up the window.
+            SendMessageWithParameter(SharedApp, GetSelector("setActivationPolicy:"), IntPtr.Zero); // Give it a window.
+            SendMessageWithParameter(SharedApp, GetSelector("activateIgnoringOtherApps:"), (IntPtr) 1); // Force it to the front.
+                        
+            // Set up the message box.
+            SendMessageWithParameter(AlertInstance, GetSelector("setAlertStyle:"), IntPtr.Zero); // Set style to warning.
+            SendMessageWithParameter(AlertInstance, GetSelector("setMessageText:"), boxCaption);
+            SendMessageWithParameter(AlertInstance, GetSelector("setInformativeText:"), boxText);
+            SendMessageWithParameter(AlertInstance, GetSelector("addButtonWithTitle:"), boxButton);
+                        
+            // Send prompt to user, then clean up.
+            SendMessage(AlertInstance, GetSelector("runModal"));
+            SendMessage(AlertInstance, GetSelector("release"));
+            return 0;
+        }
+    }
+}