diff options
| author | Mary <me@thog.eu> | 2021-11-01 23:38:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 19:38:13 -0300 |
| commit | f41687f4c1948e9e111afd70e979e98ea5de52fa (patch) | |
| tree | e7e34e4f8a986c7165cb3eb2fb3e216329d1c04d /Ryujinx.HLE/HOS/Services/Hid | |
| parent | e48530e9d9f0bbaeb8fa5978d1a66c99e6fecbac (diff) | |
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
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Hid')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs | 24 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs | 6 |
2 files changed, 7 insertions, 23 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs index 55f8070a..ff93204c 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs @@ -328,17 +328,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid private void UpdateUnusedInputIfNotEqual(ref RingLifo<NpadCommonState> currentlyUsed, ref RingLifo<NpadCommonState> possiblyUnused) { - bool isEquals; - - unsafe - { - var aPointer = Unsafe.AsPointer(ref currentlyUsed); - var bPointer = Unsafe.AsPointer(ref possiblyUnused); - - isEquals = aPointer == bPointer; - } - - if (!isEquals) + if (!Unsafe.AreSame(ref currentlyUsed, ref possiblyUnused)) { NpadCommonState newState = new NpadCommonState(); @@ -357,17 +347,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid private void UpdateUnusedSixInputIfNotEqual(ref RingLifo<SixAxisSensorState> currentlyUsed, ref RingLifo<SixAxisSensorState> possiblyUnused) { - bool isEquals; - - unsafe - { - var aPointer = Unsafe.AsPointer(ref currentlyUsed); - var bPointer = Unsafe.AsPointer(ref possiblyUnused); - - isEquals = aPointer == bPointer; - } - - if (!isEquals) + if (!Unsafe.AreSame(ref currentlyUsed, ref possiblyUnused)) { SixAxisSensorState newState = new SixAxisSensorState(); diff --git a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs index 5ef5f48d..b009f95e 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs @@ -1,4 +1,5 @@ using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common; +using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad { @@ -30,13 +31,16 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad public NpadBatteryLevel BatteryLevelJoyRight; public uint AppletFooterUiAttributes; public AppletFooterUiType AppletFooterUiType; - private unsafe fixed byte _reserved2[0x7B]; + private Reserved2Struct _reserved2; public RingLifo<NpadGcTriggerState> GcTrigger; public NpadLarkType LarkTypeLeftAndMain; public NpadLarkType LarkTypeRight; public NpadLuciaType LuciaType; public uint Unknown43EC; + [StructLayout(LayoutKind.Sequential, Size = 123, Pack = 1)] + private struct Reserved2Struct {} + public static NpadInternalState Create() { return new NpadInternalState |