From f41687f4c1948e9e111afd70e979e98ea5de52fa Mon Sep 17 00:00:00 2001 From: Mary Date: Mon, 1 Nov 2021 23:38:13 +0100 Subject: hle: Make Ryujinx.HLE project entirely safe (#2789) * Remove a bit of unsafety around * Regenerate StructArrayHelpers with a max element value of 256 * hle: remove unsafe marker from all struct that had it * hle: make SoftwareKeyboardRenderer.TryCopyTo safe * hle: remove unsafety in NpadDevice and remove AllowUnsafeBlocks from csproj * Revert "Regenerate StructArrayHelpers with a max element value of 256" This reverts commit f32a6e5be094f50571970eb1116b65c080781d05. * Introduce ByteArray of various size and use that instead of ArrayXXX to avoid stackoverflow in .NET runtime type resolution * Use ByteArray more * Add some missing spaces on Pack = 1 for various structs * Fix broken logic for TryCopyTo * Address gdkchan's comment * Address gdkchan's comment --- .../HOS/Applets/Controller/ControllerSupportArgV7.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs') diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs index a01e7c04..efb95ea5 100644 --- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs +++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs @@ -1,16 +1,26 @@ +using Ryujinx.Common.Memory; +using System; using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Applets { #pragma warning disable CS0649 // (8.0.0+ version) - [StructLayout(LayoutKind.Sequential, Pack=1)] - unsafe struct ControllerSupportArgV7 + [StructLayout(LayoutKind.Sequential, Pack = 1)] + struct ControllerSupportArgV7 { public ControllerSupportArgHeader Header; - public fixed uint IdentificationColor[8]; + public Array8 IdentificationColor; public byte EnableExplainText; - public fixed byte ExplainText[8 * 0x81]; + public ExplainTextStruct ExplainText; + + [StructLayout(LayoutKind.Sequential, Size = 8 * 0x81)] + public struct ExplainTextStruct + { + private byte element; + + public Span ToSpan() => MemoryMarshal.CreateSpan(ref element, 8 * 0x81); + } } #pragma warning restore CS0649 } \ No newline at end of file -- cgit v1.2.3