Adjust naming conventions and general refactoring in HLE Project (#490)

* Rename enum fields

* Naming conventions

* Remove unneeded ".this"

* Remove unneeded semicolons

* Remove unused Usings

* Don't use var

* Remove unneeded enum underlying types

* Explicitly label class visibility

* Remove unneeded @ prefixes

* Remove unneeded commas

* Remove unneeded if expressions

* Method doesn't use unsafe code

* Remove unneeded casts

* Initialized objects don't need an empty constructor

* Remove settings from DotSettings

* Revert "Explicitly label class visibility"

This reverts commit ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51.

* Small changes

* Revert external enum renaming

* Changes from feedback

* Remove unneeded property setters
This commit is contained in:
Alex Barney 2018-12-04 14:23:37 -06:00 committed by gdkchan
parent c86aacde76
commit 85dbb9559a
299 changed files with 12268 additions and 12276 deletions

View file

@ -5,53 +5,53 @@ namespace Ryujinx.HLE.HOS.Services.Android
{
static class Parcel
{
public static byte[] GetParcelData(byte[] Parcel)
public static byte[] GetParcelData(byte[] parcel)
{
if (Parcel == null)
if (parcel == null)
{
throw new ArgumentNullException(nameof(Parcel));
throw new ArgumentNullException(nameof(parcel));
}
using (MemoryStream MS = new MemoryStream(Parcel))
using (MemoryStream ms = new MemoryStream(parcel))
{
BinaryReader Reader = new BinaryReader(MS);
BinaryReader reader = new BinaryReader(ms);
int DataSize = Reader.ReadInt32();
int DataOffset = Reader.ReadInt32();
int ObjsSize = Reader.ReadInt32();
int ObjsOffset = Reader.ReadInt32();
int dataSize = reader.ReadInt32();
int dataOffset = reader.ReadInt32();
int objsSize = reader.ReadInt32();
int objsOffset = reader.ReadInt32();
MS.Seek(DataOffset - 0x10, SeekOrigin.Current);
ms.Seek(dataOffset - 0x10, SeekOrigin.Current);
return Reader.ReadBytes(DataSize);
return reader.ReadBytes(dataSize);
}
}
public static byte[] MakeParcel(byte[] Data, byte[] Objs)
public static byte[] MakeParcel(byte[] data, byte[] objs)
{
if (Data == null)
if (data == null)
{
throw new ArgumentNullException(nameof(Data));
throw new ArgumentNullException(nameof(data));
}
if (Objs == null)
if (objs == null)
{
throw new ArgumentNullException(nameof(Objs));
throw new ArgumentNullException(nameof(objs));
}
using (MemoryStream MS = new MemoryStream())
using (MemoryStream ms = new MemoryStream())
{
BinaryWriter Writer = new BinaryWriter(MS);
BinaryWriter writer = new BinaryWriter(ms);
Writer.Write(Data.Length);
Writer.Write(0x10);
Writer.Write(Objs.Length);
Writer.Write(Data.Length + 0x10);
writer.Write(data.Length);
writer.Write(0x10);
writer.Write(objs.Length);
writer.Write(data.Length + 0x10);
Writer.Write(Data);
Writer.Write(Objs);
writer.Write(data);
writer.Write(objs);
return MS.ToArray();
return ms.ToArray();
}
}
}