mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ryujinx.HLE] Address dotnet-format issues (#5380)

Browse Source 
* 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 or silence dotnet format IDE1006 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA2208 warnings

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* Address dotnet format CA2211 warnings

* Address dotnet format CA1822 warnings

* Address or silence dotnet format CA1069 warnings

* Make dotnet format succeed in style mode

* Address or silence dotnet format CA2211 warnings

* Address review comments

* Address dotnet format CA2208 warnings properly

* Make ProcessResult readonly

* 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

* Add previously silenced warnings back

I have no clue how these disappeared

* Revert formatting changes for while and for-loops

* Format if-blocks correctly

* Run dotnet format style after rebase

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Fix a few disabled warnings

* Fix naming rule violation, Convert shader properties to auto-property and convert values to const

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

* Start working on disabled warnings

* Fix and silence a few dotnet-format warnings again

* Run dotnet format after rebase

* Use using declaration instead of block syntax

* Address IDE0251 warnings

* Address a few disabled IDE0060 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

* Fix naming rule violations

* Fix typo

* Add trailing commas, use targeted new and use array initializer

* Fix build issues

* Fix remaining build issues

* Remove SuppressMessage for CA1069 where possible

* Address dotnet format issues

* Address formatting issues

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Add GetHashCode implementation for RenderingSurfaceInfo

* Explicitly silence CA1822 for every affected method in Syscall

* Address formatting issues in Demangler.cs

* Address review feedback

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Revert marking service methods as static

* Next dotnet format pass

* Address review feedback

---------

Co-authored-by: Ac_K <acoustik666@gmail.com>
This commit is contained in:
TSRBerry
2023-07-16 19:31:14 +02:00
committed by GitHub
parent fec8291c17
commit 326749498b
1015 changed files with 8173 additions and 7615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs
View File

@@ -14,9 +14,11 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
class IManager : IpcService
{
public static readonly NsdSettings NsdSettings;
#pragma warning disable IDE0052 // Remove unread private member
private readonly FqdnResolver _fqdnResolver;
#pragma warning restore IDE0052
private bool _isInitialized = false;
private readonly bool _isInitialized = false;
public IManager(ServiceCtx context)
{
@@ -43,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
{
Initialized = true,
TestMode = (bool)testMode,
Environment = (string)environmentIdentifier
Environment = (string)environmentIdentifier,
};
}
@@ -158,7 +160,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
public ResultCode Resolve(ServiceCtx context)
{
ulong outputPosition = context.Request.ReceiveBuff[0].Position;
ulong outputSize = context.Request.ReceiveBuff[0].Size;
ulong outputSize = context.Request.ReceiveBuff[0].Size;
ResultCode result = _fqdnResolver.ResolveEx(context, out _, out string resolvedAddress);
@@ -181,7 +183,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
public ResultCode ResolveEx(ServiceCtx context)
{
ulong outputPosition = context.Request.ReceiveBuff[0].Position;
ulong outputSize = context.Request.ReceiveBuff[0].Size;
ulong outputSize = context.Request.ReceiveBuff[0].Size;
ResultCode result = _fqdnResolver.ResolveEx(context, out ResultCode errorCode, out string resolvedAddress);
@@ -377,7 +379,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
"sd" => (byte)ApplicationServerEnvironmentType.Sd,
"sp" => (byte)ApplicationServerEnvironmentType.Sp,
"dp" => (byte)ApplicationServerEnvironmentType.Dp,
_ => (byte)ApplicationServerEnvironmentType.None
_ => (byte)ApplicationServerEnvironmentType.None,
};
context.ResponseData.Write(environmentType);
@@ -399,4 +401,4 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
throw new ServiceNotImplementedException(this, context);
}
}
}
}

14
src/Ryujinx.HLE/HOS/Services/Sockets/Nsd/Manager/FqdnResolver.cs
View File

@@ -4,7 +4,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
{
class FqdnResolver
{
private const string _dummyAddress = "unknown.dummy.nintendo.net";
private const string DummyAddress = "unknown.dummy.nintendo.net";
public ResultCode GetEnvironmentIdentifier(out string identifier)
{
@@ -24,8 +24,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
public static ResultCode Resolve(string address, out string resolvedAddress)
{
if (address == "api.sect.srv.nintendo.net" ||
address == "ctest.cdn.nintendo.net" ||
if (address == "api.sect.srv.nintendo.net" ||
address == "ctest.cdn.nintendo.net" ||
address == "ctest.cdn.n.nintendoswitch.cn" ||
address == "unknown.dummy.nintendo.net")
{
@@ -50,6 +50,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
resolvedAddress = address switch
{
#pragma warning disable IDE0055 // Disable formatting
"e97b8a9d672e4ce4845ec6947cd66ef6-sb-api.accounts.nintendo.com" => "e97b8a9d672e4ce4845ec6947cd66ef6-sb.baas.nintendo.com", // dp1 environment
"api.accounts.nintendo.com" => "e0d67c509fb203858ebcb2fe3f88c2aa.baas.nintendo.com", // dp1 environment
"e97b8a9d672e4ce4845ec6947cd66ef6-sb.accounts.nintendo.com" => "e97b8a9d672e4ce4845ec6947cd66ef6-sb.baas.nintendo.com", // lp1 environment
@@ -60,6 +61,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
this + 0x2BE8 => this + 0x2BE8 + 0x300
*/
_ => address,
#pragma warning restore IDE0055
};
}
@@ -69,7 +71,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
public ResultCode ResolveEx(ServiceCtx context, out ResultCode resultCode, out string resolvedAddress)
{
ulong inputPosition = context.Request.SendBuff[0].Position;
ulong inputSize = context.Request.SendBuff[0].Size;
ulong inputSize = context.Request.SendBuff[0].Size;
byte[] addressBuffer = new byte[inputSize];
@@ -81,7 +83,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
if (resultCode != ResultCode.Success)
{
resolvedAddress = _dummyAddress;
resolvedAddress = DummyAddress;
}
if (IManager.NsdSettings.TestMode)
@@ -94,4 +96,4 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
}
}
}
}
}

20
src/Ryujinx.HLE/HOS/Services/Sockets/Nsd/ResultCode.cs
View File

@@ -2,18 +2,18 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
{
enum ResultCode
{
ModuleId = 141,
ModuleId = 141,
ErrorCodeShift = 9,
Success = 0,
InvalidSettingsValue = ( 1 << ErrorCodeShift) | ModuleId,
InvalidObject1 = ( 3 << ErrorCodeShift) | ModuleId,
InvalidObject2 = ( 4 << ErrorCodeShift) | ModuleId,
NullOutputObject = ( 5 << ErrorCodeShift) | ModuleId,
SettingsNotLoaded = ( 6 << ErrorCodeShift) | ModuleId,
InvalidArgument = ( 8 << ErrorCodeShift) | ModuleId,
SettingsNotInitialized = ( 10 << ErrorCodeShift) | ModuleId,
ServiceNotInitialized = (400 << ErrorCodeShift) | ModuleId,
InvalidSettingsValue = (1 << ErrorCodeShift) | ModuleId,
InvalidObject1 = (3 << ErrorCodeShift) | ModuleId,
InvalidObject2 = (4 << ErrorCodeShift) | ModuleId,
NullOutputObject = (5 << ErrorCodeShift) | ModuleId,
SettingsNotLoaded = (6 << ErrorCodeShift) | ModuleId,
InvalidArgument = (8 << ErrorCodeShift) | ModuleId,
SettingsNotInitialized = (10 << ErrorCodeShift) | ModuleId,
ServiceNotInitialized = (400 << ErrorCodeShift) | ModuleId,
}
}
}

4
src/Ryujinx.HLE/HOS/Services/Sockets/Nsd/Types/ApplicationServerEnvironmentType.cs
View File

@@ -6,6 +6,6 @@
Lp,
Sd,
Sp,
Dp
Dp,
}
}
}

6
src/Ryujinx.HLE/HOS/Services/Sockets/Nsd/Types/NsdSettings.cs
View File

@@ -2,8 +2,8 @@
{
class NsdSettings
{
public bool Initialized;
public bool TestMode;
public bool Initialized;
public bool TestMode;
public string Environment;
}
}
}