Fix SaveCurrentScreenshot (ryubing/ryujinx!230)

See merge request ryubing/ryujinx!230

src/Ryujinx.Common/Utilities/OsUtils.cs

@@ -20,5 +20,21 @@ namespace Ryujinx.Common.Utilities
                 Debug.Assert(res != -1);
             }
         }
+
+        // "dumpable" attribute of the calling process
+        private const int PR_SET_DUMPABLE = 4;
+
+        [DllImport("libc", SetLastError = true)]
+        private static extern int prctl(int option, int arg2);
+
+        public static void SetCoreDumpable(bool dumpable)
+        {
+            if (OperatingSystem.IsLinux())
+            {
+                int dumpableInt = dumpable ? 1 : 0;
+                int result = prctl(PR_SET_DUMPABLE, dumpableInt);
+                Debug.Assert(result == 0);
+            }
+        }
     }
 }

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -483,10 +483,29 @@ namespace Ryujinx.HLE.FileSystem
         {
             if (Directory.Exists(keysSource))
             {
-                foreach (string filePath in Directory.EnumerateFiles(keysSource, "*.keys"))
+                string[] keyPaths = Directory.EnumerateFiles(keysSource, "*.keys").ToArray();
+
+                if (keyPaths.Length is 0)
+                    throw new FileNotFoundException($"Directory '{keysSource}' contained no '.keys' files.");
+
+                foreach (string filePath in keyPaths)
                 {
-                    VerifyKeysFile(filePath);
-                    File.Copy(filePath, Path.Combine(installDirectory, Path.GetFileName(filePath)), true);
+                    try
+                    {
+                        VerifyKeysFile(filePath);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error?.Print(LogClass.Application, e.Message);
+                        continue;
+                    }
+
+                    string destPath = Path.Combine(installDirectory, Path.GetFileName(filePath));
+
+                    if (File.Exists(destPath))
+                        File.Delete(destPath);
+
+                    File.Copy(filePath, destPath, true);
                 }
 
                 return;
@@ -501,13 +520,25 @@ namespace Ryujinx.HLE.FileSystem
 
             using FileStream file = File.OpenRead(keysSource);
 
-            if (info.Extension is ".keys")
+            if (info.Extension is not ".keys")
+                throw new InvalidFirmwarePackageException("Input file extension is not .keys");
+
+            try
             {
                 VerifyKeysFile(keysSource);
-                File.Copy(keysSource, Path.Combine(installDirectory, info.Name), true);
-            } 
-            else
+            }
+            catch
+            {
                 throw new InvalidFirmwarePackageException("Input file is not a valid key package");
+            }
+
+            string dest = Path.Combine(installDirectory, info.Name);
+
+            if (File.Exists(dest))
+                File.Delete(dest);
+
+            // overwrite: true seems to not work on its own? https://github.com/Ryubing/Issues/issues/189
+            File.Copy(keysSource, dest, true);
         }
 
         private void FinishInstallation(string temporaryDirectory, string registeredDirectory)
@@ -985,8 +1016,8 @@ namespace Ryujinx.HLE.FileSystem
         public static void VerifyKeysFile(string filePath)
         {
             // Verify the keys file format refers to https://github.com/Thealexbarney/LibHac/blob/master/KEYS.md
-            string genericPattern = @"^[a-z0-9_]+ = [a-z0-9]+$";
-            string titlePattern = @"^[a-z0-9]{32} = [a-z0-9]{32}$";
+            string genericPattern = "^[a-z0-9_]+ = [a-z0-9]+$";
+            string titlePattern = "^[a-z0-9]{32} = [a-z0-9]{32}$";
 
             if (File.Exists(filePath))
             {
@@ -994,24 +1025,13 @@ namespace Ryujinx.HLE.FileSystem
                 string fileName = Path.GetFileName(filePath);
                 string[] lines = File.ReadAllLines(filePath);
 
-                bool verified;
-                switch (fileName)
+                bool verified = fileName switch
                 {
-                    case "prod.keys":
-                        verified = VerifyKeys(lines, genericPattern);
-                        break;
-                    case "title.keys":
-                        verified = VerifyKeys(lines, titlePattern);
-                        break;
-                    case "console.keys":
-                        verified = VerifyKeys(lines, genericPattern);
-                        break;
-                    case "dev.keys":
-                        verified = VerifyKeys(lines, genericPattern);
-                        break;
-                    default:
-                        throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
-                }
+                    "prod.keys" or "console.keys" or "dev.keys" => VerifyKeys(lines, genericPattern),
+                    "title.keys" => VerifyKeys(lines, titlePattern),
+                    _ => throw new FormatException(
+                        $"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.")
+                };
 
                 if (!verified)
                 {

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs

@@ -416,7 +416,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
                 return ResultCode.InvalidParameters;
             }
 
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { albumReportOption });
+            context.Device.UIHandler.TakeScreenshot();
 
             return ResultCode.Success;
         }

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

@@ -56,7 +56,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             _activeCount = 0;
 
             JoyHold = NpadJoyHoldType.Vertical;
-            SixAxisActive = false;
         }
 
         internal ref KEvent GetStyleSetUpdateEvent(PlayerIndex player)
@@ -581,23 +580,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
             return needUpdateRight;
         }
-        
-        public bool isAtRest(int playerNumber)
-        {
-            
-            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)
-                                 + Math.Abs(storage.Acceleration.Y)
-                                 + Math.Abs(storage.Acceleration.Z);
-
-            float angularVelocity = Math.Abs(storage.AngularVelocity.X)
-                                    + Math.Abs(storage.AngularVelocity.Y)
-                                    + Math.Abs(storage.AngularVelocity.Z);
-
-            return ((acceleration <= 1.5F) && (angularVelocity <= 1.1F));
-        }
 
         private void UpdateDisconnectedInputSixAxis(PlayerIndex index)
         {

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -602,52 +602,19 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         }
 
         [CommandCmif(82)]
-        // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAtRest
+        // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAsRest
         public ResultCode IsSixAxisSensorAtRest(ServiceCtx context)
         {
             int sixAxisSensorHandle = context.RequestData.ReadInt32();
-            
-            // 4 byte struct w/ 4-byte alignment
-            // 0x0 	0x4 	TypeValue
-            // 0x0 	0x1 	NpadStyleIndex
-            // 0x1 	0x1 	PlayerNumber
-            // 0x2 	0x1 	DeviceIdx 
-            
-            // uint typeValue = (uint) sixAxisSensorHandle;
-            // uint npadStyleIndex = (uint) sixAxisSensorHandle & 0xff;
-            int playerNumber = (sixAxisSensorHandle << 8) & 0xff;
-            // uint deviceIdx= ((uint) sixAxisSensorHandle << 16) & 0xff;
-            // uint unknown = ((uint) sixAxisSensorHandle << 24) & 0xff;
-            
-            // 32bit sign extension padding
-            // if = 0, + offset, else - offset
-            // npadStyleIndex = ((npadStyleIndex & 0x8000) == 0) ? npadStyleIndex | 0xFFFF0000 : npadStyleIndex & 0xFFFF0000;
-            // playerNumber = ((playerNumber & 0x8000) == 0) ? playerNumber | 0xFFFF0000 : playerNumber & 0xFFFF0000;
-            // deviceIdx = ((deviceIdx & 0x8000) == 0) ? deviceIdx | 0xFFFF0000 : deviceIdx & 0xFFFF0000;
-            // unknown = ((unknown & 0x8000) == 0) ? unknown | 0xFFFF0000 : unknown & 0xFFFF0000;
-            
             context.RequestData.BaseStream.Position += 4; // Padding
             long appletResourceUserId = context.RequestData.ReadInt64();
 
-            bool isAtRest;
-            
-            // TODO: link to context.Device.Hid.Npads.SixAxisActive when properly implemented
-            // We currently do not support stopping or starting SixAxisTracking.
-            // It is just always tracking, the bool is unused.
-            // See Ryujinx.HLE.HOS.Services.Hid.NpadDevices
-            
-            // common cases: if
-            //     controller is keyboard (keyboards don't have gyroscopes, silly goose!)
-            //     controller has no gyroscope
-            //     SixAxisActive == false
-            //     SixAxisTracking == false
-            // then isAtRest = true
-            // else check gyroscopic activity
-            
-            // check gyroscopic activity
-            isAtRest = context.Device.Hid.Npads.isAtRest(playerNumber);
-            
+            bool isAtRest = true;
+
             context.ResponseData.Write(isAtRest);
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle, isAtRest });
+
             return ResultCode.Success;
         }
 
@@ -662,7 +629,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             context.ResponseData.Write(_isFirmwareUpdateAvailableForSixAxisSensor);
 
             Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle, _isFirmwareUpdateAvailableForSixAxisSensor });
-            
+
             return ResultCode.Success;
         }
 

src/Ryujinx.HLE/UI/IHostUIHandler.cs

@@ -68,5 +68,10 @@ namespace Ryujinx.HLE.UI
         /// Displays the player select dialog and returns the selected profile.
         /// </summary>
         UserProfile ShowPlayerSelectDialog();
+        
+        /// <summary>
+        /// Takes a screenshot from the current renderer and saves it in the screenshots folder.
+        /// </summary>
+        void TakeScreenshot();
     }
 }

src/Ryujinx/Headless/Windows/WindowBase.cs

@@ -580,5 +580,10 @@ namespace Ryujinx.Headless
         {
             return AccountSaveDataManager.GetLastUsedUser();
         }
+        
+        public void TakeScreenshot()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/Ryujinx/Program.cs

@@ -17,6 +17,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
+using Ryujinx.Common.Utilities;
 using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL3.Common;
@@ -46,7 +47,7 @@ namespace Ryujinx.Ava
         public static int Main(string[] args)
         {
             Version = ReleaseInformation.Version;
-            
+
             if (OperatingSystem.IsWindows())
             {
                 if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
@@ -55,8 +56,11 @@ namespace Ryujinx.Ava
                     return 0;
                 }
 
-                if (Environment.CurrentDirectory.StartsWithIgnoreCase("C:\\Program Files") || 
-                    Environment.CurrentDirectory.StartsWithIgnoreCase("C:\\Program Files (x86)"))
+                var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+                var 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);
                     return 0;
@@ -73,11 +77,23 @@ namespace Ryujinx.Ava
                 }
             }
 
+            bool noGuiArg = ConsumeCommandLineArgument(ref args, "--no-gui") || ConsumeCommandLineArgument(ref args, "nogui");
+            bool coreDumpArg = ConsumeCommandLineArgument(ref args, "--core-dumps");
+
+            // TODO: Ryujinx causes core dumps on Linux when it exits "uncleanly", eg. through an unhandled exception.
+            //       This is undesirable and causes very odd behavior during development (the process stops responding, 
+            //       the .NET debugger freezes or suddenly detaches, /tmp/ gets filled etc.), unless explicitly requested by the user.
+            //       This needs to be investigated, but calling prctl() is better than modifying system-wide settings or leaving this be.
+            if (!coreDumpArg)
+            {
+                OsUtils.SetCoreDumpable(false);
+            }
+
             PreviewerDetached = true;
 
-            if (args.Length > 0 && args[0] is "--no-gui" or "nogui")
+            if (noGuiArg)
             {
-                HeadlessRyujinx.Entrypoint(args[1..]);
+                HeadlessRyujinx.Entrypoint(args);
                 return 0;
             }
 
@@ -112,6 +128,14 @@ namespace Ryujinx.Ava
                         : [Win32RenderingMode.Software]
                 });
 
+        private static bool ConsumeCommandLineArgument(ref string[] args, string targetArgument)
+        {
+            List<string> argList = [.. args];
+            bool found = argList.Remove(targetArgument);
+            args = argList.ToArray();
+            return found;
+        }
+
         private static void Initialize(string[] args)
         {
             // Ensure Discord presence timestamp begins at the absolute start of when Ryujinx is launched
@@ -177,7 +201,6 @@ namespace Ryujinx.Ava
             }
         }
 
-
         public static string GetDirGameUserConfig(string gameId, bool changeFolderForGame = false)
         {
             if (string.IsNullOrEmpty(gameId))

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -327,5 +327,10 @@ namespace Ryujinx.Ava.UI.Applet
 
             return profile;
         }
+        
+        public void TakeScreenshot()
+        {
+            _parent.ViewModel.AppHost.ScreenshotRequested = true;
+        }
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1333,7 +1333,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public void TakeScreenshot() => AppHost.ScreenshotRequested = true;
+        public void TakeScreenshot()
+        {
+            AppHost.ScreenshotRequested = true;
+        }
 
         public void HideUi() => ShowMenuAndStatusBar = false;