1 files changed, 101 insertions, 118 deletions
diff --git a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
index c3e45d46..e8e57a48 100644
--- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
@@ -60,55 +60,51 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
         {
             uint resSize = 2 * sizeof(uint) + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.FinishedInitialize, writer);
-                writer.Write((byte)1); // Data (ignored by the program)
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.FinishedInitialize, writer);
+            writer.Write((byte)1); // Data (ignored by the program)
+
+            return stream.ToArray();
         }
 
         public static byte[] Default(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.Default, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.Default, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedString(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedString, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedString, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursor(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursor, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursor, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedTab(string text, uint cursor, InlineKeyboardState state)
@@ -117,182 +113,169 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedTab, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedTab, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+
+            return stream.ToArray();
         }
 
         public static byte[] DecidedEnter(string text, InlineKeyboardState state)
         {
             uint resSize = 3 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.DecidedEnter, writer);
-                WriteString(text, writer, MaxStrLenUTF16, Encoding.Unicode);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.DecidedEnter, writer);
+            WriteString(text, writer, MaxStrLenUTF16, Encoding.Unicode);
+
+            return stream.ToArray();
         }
 
         public static byte[] DecidedCancel(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.DecidedCancel, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.DecidedCancel, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedStringUtf8(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF8;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursorUtf8(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF8;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
+
+            return stream.ToArray();
         }
 
         public static byte[] DecidedEnterUtf8(string text, InlineKeyboardState state)
         {
             uint resSize = 3 * sizeof(uint) + MaxStrLenUTF8;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.DecidedEnterUtf8, writer);
-                WriteString(text, writer, MaxStrLenUTF8, Encoding.UTF8);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.DecidedEnterUtf8, writer);
+            WriteString(text, writer, MaxStrLenUTF8, Encoding.UTF8);
+
+            return stream.ToArray();
         }
 
         public static byte[] UnsetCustomizeDic(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.UnsetCustomizeDic, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.UnsetCustomizeDic, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ReleasedUserWordInfo(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ReleasedUserWordInfo, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ReleasedUserWordInfo, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] UnsetCustomizedDictionaries(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.UnsetCustomizedDictionaries, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.UnsetCustomizedDictionaries, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedStringV2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF16 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedStringV2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedStringV2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursorV2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF16 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursorV2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursorV2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedStringUtf8V2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF8 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8V2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8V2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursorUtf8V2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF8 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8V2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8V2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
     }
 }