1
1
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2025-09-19 11:47:54 -05:00

[Ryujinx.Horizon] Address dotnet-format issues (#5381)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0052 warnings

* Address dotnet format CA1822 warnings

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Revert formatting changes for while and for-loops

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Remove a few unused parameters

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Address IDE0251 warnings

* Silence IDE0060 in .editorconfig

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass

* Add trailing commas and fix formatting issues

* Convert if-else chain to switch block

* Address review feedback
This commit is contained in:
TSRBerry
2023-07-01 12:42:10 +02:00
committed by GitHub
parent 801b71a128
commit 02b5c7ea89
105 changed files with 617 additions and 637 deletions

View File

@@ -5,16 +5,16 @@ namespace Ryujinx.Horizon.Sm.Impl
struct ServiceInfo
{
public ServiceName Name;
public ulong OwnerProcessId;
public int PortHandle;
public ulong OwnerProcessId;
public int PortHandle;
public void Free()
{
HorizonStatic.Syscall.CloseHandle(PortHandle);
Name = ServiceName.Invalid;
Name = ServiceName.Invalid;
OwnerProcessId = 0L;
PortHandle = 0;
PortHandle = 0;
}
}
}
}

View File

@@ -40,7 +40,7 @@ namespace Ryujinx.Horizon.Sm.Impl
return result == KernelResult.SessionCountExceeded ? SmResult.OutOfSessions : result;
}
private Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
private static Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
{
return HorizonStatic.Syscall.ConnectToPort(out handle, serviceInfo.PortHandle);
}
@@ -96,8 +96,8 @@ namespace Ryujinx.Horizon.Sm.Impl
return result;
}
freeService.PortHandle = clientPort;
freeService.Name = name;
freeService.PortHandle = clientPort;
freeService.Name = name;
freeService.OwnerProcessId = processId;
return Result.Success;
@@ -140,7 +140,7 @@ namespace Ryujinx.Horizon.Sm.Impl
int nameLength = 1;
for (; nameLength < name.Length; nameLength++)
for (; nameLength < ServiceName.Length; nameLength++)
{
if (name[nameLength] == 0)
{
@@ -148,7 +148,7 @@ namespace Ryujinx.Horizon.Sm.Impl
}
}
while (nameLength < name.Length)
while (nameLength < ServiceName.Length)
{
if (name[nameLength++] != 0)
{
@@ -182,4 +182,4 @@ namespace Ryujinx.Horizon.Sm.Impl
return -1;
}
}
}
}

View File

@@ -10,7 +10,7 @@ namespace Ryujinx.Horizon.Sm.Ipc
private readonly ServiceManager _serviceManager;
private ulong _clientProcessId;
private bool _initialized;
private bool _initialized;
public UserService(ServiceManager serviceManager)
{
@@ -21,7 +21,7 @@ namespace Ryujinx.Horizon.Sm.Ipc
public Result Initialize([ClientProcessId] ulong clientProcessId)
{
_clientProcessId = clientProcessId;
_initialized = true;
_initialized = true;
return Result.Success;
}
@@ -63,4 +63,4 @@ namespace Ryujinx.Horizon.Sm.Ipc
return _serviceManager.UnregisterService(_clientProcessId, name);
}
}
}
}

View File

@@ -1,6 +1,4 @@
using Ryujinx.Horizon.Prepo;
using Ryujinx.Horizon.Prepo.Types;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm;
using Ryujinx.Horizon.Sm.Impl;
using Ryujinx.Horizon.Sm.Types;
@@ -9,8 +7,8 @@ namespace Ryujinx.Horizon.Sm
{
public class SmMain
{
private const int SmMaxSessionsCount = 64;
private const int SmmMaxSessionsCount = 1;
private const int SmMaxSessionsCount = 64;
private const int SmmMaxSessionsCount = 1;
private const int SmTotalMaxSessionsCount = SmMaxSessionsCount + SmmMaxSessionsCount;
private const int MaxPortsCount = 2;
@@ -31,4 +29,4 @@ namespace Ryujinx.Horizon.Sm
_serverManager.ServiceRequests();
}
}
}
}

View File

@@ -6,6 +6,7 @@ namespace Ryujinx.Horizon.Sm
{
private const int ModuleId = 21;
#pragma warning disable IDE0055 // Disable formatting
public static Result OutOfProcess => new(ModuleId, 1);
public static Result InvalidClient => new(ModuleId, 2);
public static Result OutOfSessions => new(ModuleId, 3);
@@ -15,5 +16,6 @@ namespace Ryujinx.Horizon.Sm
public static Result NotRegistered => new(ModuleId, 7);
public static Result NotAllowed => new(ModuleId, 8);
public static Result TooLargeAccessControl => new(ModuleId, 9);
#pragma warning restore IDE0055
}
}
}

View File

@@ -21,10 +21,10 @@ namespace Ryujinx.Horizon.Sm
{
return (SmPortIndex)portIndex switch
{
SmPortIndex.User => AcceptImpl(server, new UserService(_serviceManager)),
SmPortIndex.User => AcceptImpl(server, new UserService(_serviceManager)),
SmPortIndex.Manager => AcceptImpl(server, new ManagerService()),
_ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
_ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
};
}
}
}
}

View File

@@ -3,6 +3,6 @@
enum SmPortIndex
{
User,
Manager
Manager,
}
}
}