mirrors/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-12-02 21:52:03 +00:00
Code Issues Releases Activity

Revert SwKbd Applet ReadStruct and fix IApplet's ReadStruct to catch (#1087)

Browse source 
error at compile time
This commit is contained in:
mageven 2020-04-03 12:23:06 +05:30 committed by GitHub
parent e93ca84b14
commit 4d93f97408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.HLE/HOS/Applets/IApplet.cs
View file

@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Applets
ResultCode GetResult(); ResultCode GetResult();
static T ReadStruct<T>(ReadOnlySpan<byte> data) where T : struct static T ReadStruct<T>(ReadOnlySpan<byte> data) where T : unmanaged
{ {
return MemoryMarshal.Cast<byte, T>(data)[0]; return MemoryMarshal.Cast<byte, T>(data)[0];
} }

17
Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
View file

@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Applets
var keyboardConfig = _normalSession.Pop(); var keyboardConfig = _normalSession.Pop();
var transferMemory = _normalSession.Pop(); var transferMemory = _normalSession.Pop();
_keyboardConfig = IApplet.ReadStruct<SoftwareKeyboardConfig>(keyboardConfig); _keyboardConfig = ReadStruct<SoftwareKeyboardConfig>(keyboardConfig);
if (_keyboardConfig.UseUtf8) if (_keyboardConfig.UseUtf8)
{ {
@ -176,5 +176,20 @@ namespace Ryujinx.HLE.HOS.Applets
return stream.ToArray(); return stream.ToArray();
} }
} }
private static T ReadStruct<T>(byte[] data)
where T : struct
{
GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);
try
{
return Marshal.PtrToStructure<T>(handle.AddrOfPinnedObject());
}
finally
{
handle.Free();
}
}
} }
} }