crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-07-30 07:37:12 +02:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1015 changed files with 8173 additions and 7615 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.HLE/HOS/Services/Ncm/IContentManager.cs
View file

@ -5,4 +5,4 @@
{
public IContentManager(ServiceCtx context) { }
}
}
}

2
src/Ryujinx.HLE/HOS/Services/Ncm/Lr/ILocationResolverManager.cs
View file

@ -19,4 +19,4 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr
return ResultCode.Success;
}
}
}
}

17
src/Ryujinx.HLE/HOS/Services/Ncm/Lr/LocationResolverManager/ILocationResolver.cs
View file

@ -2,14 +2,13 @@
using LibHac.Tools.FsSystem.NcaUtils;
using Ryujinx.HLE.FileSystem;
using System.Text;
using static Ryujinx.HLE.Utilities.StringUtils;
namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager
{
class ILocationResolver : IpcService
{
private StorageId _storageId;
private readonly StorageId _storageId;
public ILocationResolver(StorageId storageId)
{
@ -215,8 +214,8 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager
private void RedirectPath(ServiceCtx context, ulong titleId, int flag, NcaContentType contentType)
{
string contentPath = ReadUtf8String(context);
LocationEntry newLocation = new LocationEntry(contentPath, flag, titleId, contentType);
string contentPath = ReadUtf8String(context);
LocationEntry newLocation = new(contentPath, flag, titleId, contentType);
context.Device.System.ContentManager.RedirectLocation(newLocation, _storageId);
}
@ -224,12 +223,14 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager
private bool ResolvePath(ServiceCtx context, ulong titleId, NcaContentType contentType)
{
ContentManager contentManager = context.Device.System.ContentManager;
string contentPath = contentManager.GetInstalledContentPath(titleId, _storageId, NcaContentType.Program);
string contentPath = contentManager.GetInstalledContentPath(titleId, _storageId, NcaContentType.Program);
if (!string.IsNullOrWhiteSpace(contentPath))
{
ulong position = context.Request.RecvListBuff[0].Position;
ulong size = context.Request.RecvListBuff[0].Size;
#pragma warning disable IDE0059 // Remove unnecessary value assignment
ulong size = context.Request.RecvListBuff[0].Size;
#pragma warning restore IDE0059
byte[] contentPathBuffer = Encoding.UTF8.GetBytes(contentPath);
@ -246,7 +247,9 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager
private void DeleteContentPath(ServiceCtx context, ulong titleId, NcaContentType contentType)
{
ContentManager contentManager = context.Device.System.ContentManager;
string contentPath = contentManager.GetInstalledContentPath(titleId, _storageId, NcaContentType.Manual);
#pragma warning disable IDE0059 // Remove unnecessary value assignment
string contentPath = contentManager.GetInstalledContentPath(titleId, _storageId, NcaContentType.Manual);
#pragma warning restore IDE0059
contentManager.ClearEntry(titleId, NcaContentType.Manual, _storageId);
}

20
src/Ryujinx.HLE/HOS/Services/Ncm/Lr/ResultCode.cs
View file

@ -2,19 +2,19 @@
{
enum ResultCode
{
ModuleId = 8,
ModuleId = 8,
ErrorCodeShift = 9,
Success = 0,
ProgramLocationEntryNotFound = (2 << ErrorCodeShift) | ModuleId,
InvalidContextForControlLocation = (3 << ErrorCodeShift) | ModuleId,
StorageNotFound = (4 << ErrorCodeShift) | ModuleId,
AccessDenied = (5 << ErrorCodeShift) | ModuleId,
OfflineManualHTMLLocationEntryNotFound = (6 << ErrorCodeShift) | ModuleId,
TitleIsNotRegistered = (7 << ErrorCodeShift) | ModuleId,
ControlLocationEntryForHostNotFound = (8 << ErrorCodeShift) | ModuleId,
LegalInfoHTMLLocationEntryNotFound = (9 << ErrorCodeShift) | ModuleId,
ProgramLocationForDebugEntryNotFound = (10 << ErrorCodeShift) | ModuleId
ProgramLocationEntryNotFound = (2 << ErrorCodeShift) | ModuleId,
InvalidContextForControlLocation = (3 << ErrorCodeShift) | ModuleId,
StorageNotFound = (4 << ErrorCodeShift) | ModuleId,
AccessDenied = (5 << ErrorCodeShift) | ModuleId,
OfflineManualHTMLLocationEntryNotFound = (6 << ErrorCodeShift) | ModuleId,
TitleIsNotRegistered = (7 << ErrorCodeShift) | ModuleId,
ControlLocationEntryForHostNotFound = (8 << ErrorCodeShift) | ModuleId,
LegalInfoHTMLLocationEntryNotFound = (9 << ErrorCodeShift) | ModuleId,
ProgramLocationForDebugEntryNotFound = (10 << ErrorCodeShift) | ModuleId,
}
}