From e5242a2ffe524fd22e7e9fb806ff7cdbacbf3577 Mon Sep 17 00:00:00 2001 From: emmaus Date: Tue, 21 Aug 2018 18:53:58 +0000 Subject: [PATCH] fixed alignments --- Ryujinx.HLE/HOS/Services/Bsd/IClient.cs | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs b/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs index 651fb8b103..e2cd0dcdb7 100644 --- a/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs +++ b/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs @@ -74,8 +74,8 @@ namespace Ryujinx.HLE.HOS.Services.Bsd { BsdSocket NewBsdSocket = new BsdSocket { - Family = Context.RequestData.ReadInt32(), - Type = Context.RequestData.ReadInt32(), + Family = Context.RequestData.ReadInt32(), + Type = Context.RequestData.ReadInt32(), Protocol = Context.RequestData.ReadInt32() }; @@ -95,7 +95,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd public long Poll(ServiceCtx Context) { int PollCount = Context.RequestData.ReadInt32(); - int TimeOut = Context.RequestData.ReadInt32(); + int TimeOut = Context.RequestData.ReadInt32(); //https://github.com/torvalds/linux/blob/master/include/uapi/asm-generic/poll.h //https://msdn.microsoft.com/fr-fr/library/system.net.sockets.socket.poll(v=vs.110).aspx @@ -106,9 +106,9 @@ namespace Ryujinx.HLE.HOS.Services.Bsd byte[] SentBuffer = Context.Memory.ReadBytes(Context.Request.SendBuff[0].Position, Context.Request.SendBuff[0].Size); - int SocketId = Get32(SentBuffer, 0); + int SocketId = Get32(SentBuffer, 0); int RequestedEvents = Get16(SentBuffer, 4); - int ReturnedEvents = Get16(SentBuffer, 6); + int ReturnedEvents = Get16(SentBuffer, 6); //Todo: Stub - Need to implemented the Type-22 buffer. @@ -121,7 +121,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd //(u32 socket, u32 flags) -> (i32 ret, u32 bsd_errno, buffer message) public long Recv(ServiceCtx Context) { - int SocketId = Context.RequestData.ReadInt32(); + int SocketId = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32(); (long ReceivePosition, long ReceiveLength) = Context.Request.GetBufferType0x22(); @@ -149,7 +149,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd //(u32 socket, u32 flags, buffer) -> (i32 ret, u32 bsd_errno) public long Send(ServiceCtx Context) { - int SocketId = Context.RequestData.ReadInt32(); + int SocketId = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32(); (long SentPosition, long SentSize) = Context.Request.GetBufferType0x21(); @@ -175,7 +175,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd //(u32 socket, u32 flags, buffer, buffer) -> (i32 ret, u32 bsd_errno) public long SendTo(ServiceCtx Context) { - int SocketId = Context.RequestData.ReadInt32(); + int SocketId = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32(); byte[] SentBuffer = Context.Memory.ReadBytes(Context.Request.SendBuff[0].Position, @@ -245,7 +245,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd BsdSocket NewBsdSocket = new BsdSocket { IpAddress = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint).Address, - RemoteEP = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint), + RemoteEP = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint), Handle = HandleAccept }; @@ -337,7 +337,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd public long Listen(ServiceCtx Context) { int SocketId = Context.RequestData.ReadInt32(); - int BackLog = Context.RequestData.ReadInt32(); + int BackLog = Context.RequestData.ReadInt32(); try { @@ -361,7 +361,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd { int SocketId = Context.RequestData.ReadInt32(); - SocketOptionLevel SocketLevel = (SocketOptionLevel)Context.RequestData.ReadInt32(); + SocketOptionLevel SocketLevel = (SocketOptionLevel)Context.RequestData.ReadInt32(); SocketOptionName SocketOptionName = (SocketOptionName)Context.RequestData.ReadInt32(); byte[] SocketOptionValue = Context.Memory.ReadBytes(Context.Request.PtrBuff[0].Position, @@ -467,9 +467,9 @@ namespace Ryujinx.HLE.HOS.Services.Bsd { BinaryReader Reader = new BinaryReader(MS); - int Size = Reader.ReadByte(); + int Size = Reader.ReadByte(); int Family = Reader.ReadByte(); - int Port = EndianSwap.Swap16(Reader.ReadUInt16()); + int Port = EndianSwap.Swap16(Reader.ReadUInt16()); string IpAddress = Reader.ReadByte().ToString() + "." + Reader.ReadByte().ToString() + "." + @@ -477,8 +477,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd Reader.ReadByte().ToString(); Sockets[SocketId].IpAddress = IPAddress.Parse(IpAddress); - - Sockets[SocketId].RemoteEP = new IPEndPoint(Sockets[SocketId].IpAddress, Port); + Sockets[SocketId].RemoteEP = new IPEndPoint(Sockets[SocketId].IpAddress, Port); } }