Mirror/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2025-02-09 13:14:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some results from Atmosphere

Browse Source
This commit is contained in:
Alex Barney 2020-01-22 17:43:16 -07:00
parent 9034c54318
commit 5910b9f9c2
19 changed files with 84 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LibHac/Common/HResult.cs
View File

@ -26,7 +26,7 @@ namespace LibHac.Common
ERROR_PATH_NOT_FOUND => ResultFs.PathNotFound.Value,
ERROR_ACCESS_DENIED => ResultFs.TargetLocked.Value,
ERROR_SHARING_VIOLATION => ResultFs.TargetLocked.Value,
ERROR_HANDLE_EOF => ResultFs.ValueOutOfRange.Value,
ERROR_HANDLE_EOF => ResultFs.OutOfRange.Value,
ERROR_HANDLE_DISK_FULL => ResultFs.InsufficientFreeSpace.Value,
ERROR_FILE_EXISTS => ResultFs.PathAlreadyExists.Value,
ERROR_DISK_FULL => ResultFs.InsufficientFreeSpace.Value,

4
src/LibHac/Fs/Accessors/MountTable.cs
View File

@ -31,7 +31,7 @@ namespace LibHac.Fs.Accessors
{
if (!Table.TryGetValue(name, out fileSystem))
{
return ResultFs.MountNameNotFound.Log();
return ResultFs.NotMounted.Log();
}
return Result.Success;
@ -44,7 +44,7 @@ namespace LibHac.Fs.Accessors
{
if (!Table.TryGetValue(name, out FileSystemAccessor fsAccessor))
{
return ResultFs.MountNameNotFound.Log();
return ResultFs.NotMounted.Log();
}
Table.Remove(name);

8
src/LibHac/Fs/FileBase.cs
View File

@ -28,7 +28,7 @@ namespace LibHac.Fs
if (IsDisposed) return ResultFs.PreconditionViolation.Log();
if (destination.Length == 0) return Result.Success;
if (offset < 0) return ResultFs.ValueOutOfRange.Log();
if (offset < 0) return ResultFs.OutOfRange.Log();
return ReadImpl(out bytesRead, offset, destination, options);
}
@ -47,7 +47,7 @@ namespace LibHac.Fs
return Result.Success;
}
if (offset < 0) return ResultFs.ValueOutOfRange.Log();
if (offset < 0) return ResultFs.OutOfRange.Log();
return WriteImpl(offset, source, options);
}
@ -62,7 +62,7 @@ namespace LibHac.Fs
public Result SetSize(long size)
{
if (IsDisposed) return ResultFs.PreconditionViolation.Log();
if (size < 0) return ResultFs.ValueOutOfRange.Log();
if (size < 0) return ResultFs.OutOfRange.Log();
return SetSizeImpl(size);
}
@ -112,7 +112,7 @@ namespace LibHac.Fs
if (offset > fileSize)
{
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
}
bytesToRead = Math.Min(fileSize - offset, size);

4
src/LibHac/Fs/FileHandleStorage.cs
View File

@ -30,7 +30,7 @@ namespace LibHac.Fs
Result rc = UpdateSize();
if (rc.IsFailure()) return rc;
if (!IsRangeValid(offset, destination.Length, FileSize)) return ResultFs.ValueOutOfRange.Log();
if (!IsRangeValid(offset, destination.Length, FileSize)) return ResultFs.OutOfRange.Log();
return FsClient.ReadFile(Handle, offset, destination);
}
@ -45,7 +45,7 @@ namespace LibHac.Fs
Result rc = UpdateSize();
if (rc.IsFailure()) return rc;
if (!IsRangeValid(offset, source.Length, FileSize)) return ResultFs.ValueOutOfRange.Log();
if (!IsRangeValid(offset, source.Length, FileSize)) return ResultFs.OutOfRange.Log();
return FsClient.WriteFile(Handle, offset, source);
}

6
src/LibHac/Fs/FileStorage2.cs
View File

@ -48,7 +48,7 @@ namespace LibHac.Fs
if (rc.IsFailure()) return rc;
if (!IsRangeValid(offset, destination.Length, FileSize))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
return BaseFile.Read(out _, offset, destination, ReadOption.None);
}
@ -62,7 +62,7 @@ namespace LibHac.Fs
if (rc.IsFailure()) return rc;
if (!IsRangeValid(offset, source.Length, FileSize))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
return BaseFile.Write(offset, source, WriteOption.None);
}
@ -117,7 +117,7 @@ namespace LibHac.Fs
if (size < 0 || offset < 0)
{
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
}
return BaseFile.OperateRange(outBuffer, operationId, offset, size, inBuffer);

2
src/LibHac/Fs/FileSystemClient.File.cs
View File

@ -16,7 +16,7 @@ namespace LibHac.Fs
if (bytesRead == destination.Length) return Result.Success;
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
}
public Result ReadFile(out long bytesRead, FileHandle handle, long offset, Span<byte> destination)

6
src/LibHac/Fs/InMemoryFileSystem.cs
View File

@ -346,7 +346,7 @@ namespace LibHac.Fs
if (offset > BaseStream.Length)
{
bytesRead = default;
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
}
BaseStream.Position = offset;
@ -368,7 +368,7 @@ namespace LibHac.Fs
}
if (offset + source.Length > MemStreamMaxLength)
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
}
BaseStream.Position = offset;
@ -388,7 +388,7 @@ namespace LibHac.Fs
lock (Locker)
{
if (size > MemStreamMaxLength)
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
BaseStream.SetLength(size);

4
src/LibHac/Fs/MemoryStorage.cs
View File

@ -17,7 +17,7 @@ namespace LibHac.Fs
return Result.Success;
if (!IsRangeValid(offset, destination.Length, StorageBuffer.Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
StorageBuffer.AsSpan((int)offset, destination.Length).CopyTo(destination);
@ -30,7 +30,7 @@ namespace LibHac.Fs
return Result.Success;
if (!IsRangeValid(offset, source.Length, StorageBuffer.Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
source.CopyTo(StorageBuffer.AsSpan((int)offset));

60
src/LibHac/Fs/ResultFs.cs
View File

@ -2,7 +2,7 @@
namespace LibHac.Fs
{
public class ResultFs
public static class ResultFs
{
public const int ModuleFs = 2;
@ -10,13 +10,23 @@ namespace LibHac.Fs
public static Result.Base PathAlreadyExists => new Result.Base(ModuleFs, 2);
public static Result.Base TargetLocked => new Result.Base(ModuleFs, 7);
public static Result.Base DirectoryNotEmpty => new Result.Base(ModuleFs, 8);
public static Result.Base InsufficientFreeSpace { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 30, 45); }
public static Result.Base InsufficientFreeSpace => new Result.Base(ResultFs.ModuleFs, 30, 45);
public static Result.Base InsufficientFreeSpaceBis => new Result.Base(ResultFs.ModuleFs, 34, 38);
public static Result.Base InsufficientFreeSpaceBisCalibration => new Result.Base(ModuleFs, 35);
public static Result.Base InsufficientFreeSpaceBisSafe => new Result.Base(ModuleFs, 36);
public static Result.Base InsufficientFreeSpaceBisUser => new Result.Base(ModuleFs, 37);
public static Result.Base InsufficientFreeSpaceBisSystem => new Result.Base(ModuleFs, 38);
public static Result.Base InsufficientFreeSpaceSdCard => new Result.Base(ModuleFs, 38);
public static Result.Base MountNameAlreadyExists => new Result.Base(ModuleFs, 60);
public static Result.Base PartitionNotFound => new Result.Base(ModuleFs, 1001);
public static Result.Base TargetNotFound => new Result.Base(ModuleFs, 1002);
public static Result.Base ExternalKeyNotFound => new Result.Base(ModuleFs, 1004);
public static Result.Base SdCardAccessFailed { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 2000, 2499); }
public static Result.Base SdCardNotPresent => new Result.Base(ModuleFs, 2001);
public static Result.Base GameCardAccessFailed { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 2500, 2999); }
public static Result.Base InvalidBufferForGameCard => new Result.Base(ModuleFs, 2503);
public static Result.Base GameCardNotInserted => new Result.Base(ModuleFs, 2520);
@ -29,14 +39,17 @@ namespace LibHac.Fs
public static Result.Base NotImplemented => new Result.Base(ModuleFs, 3001);
public static Result.Base Result3002 => new Result.Base(ModuleFs, 3002);
public static Result.Base SaveDataPathAlreadyExists => new Result.Base(ModuleFs, 3003);
public static Result.Base ValueOutOfRange => new Result.Base(ModuleFs, 3005);
public static Result.Base OutOfRange => new Result.Base(ModuleFs, 3005);
public static Result.Base AllocationMemoryFailed { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 3200, 3499); }
public static Result.Base AesXtsFileFileStorageAllocationError => new Result.Base(ModuleFs, 3312);
public static Result.Base AesXtsFileXtsStorageAllocationError => new Result.Base(ModuleFs, 3313);
public static Result.Base AesXtsFileAlignmentStorageAllocationError => new Result.Base(ModuleFs, 3314);
public static Result.Base AesXtsFileStorageFileAllocationError => new Result.Base(ModuleFs, 3315);
public static Result.Base AesXtsFileSubStorageAllocationError => new Result.Base(ModuleFs, 3383);
public static Result.Base MmcAccessFailed { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 3500, 3999); }
public static Result.Base DataCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4000, 4999); }
public static Result.Base RomCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4001, 4299); }
public static Result.Base InvalidIndirectStorageSource => new Result.Base(ModuleFs, 4023);
@ -51,7 +64,6 @@ namespace LibHac.Fs
public static Result.Base SaveIvfcHashIsEmpty => new Result.Base(ModuleFs, 4372);
public static Result.Base InvalidHashInSaveIvfcTopLayer => new Result.Base(ModuleFs, 4373);
public static Result.Base Result4402 => new Result.Base(ModuleFs, 4402);
public static Result.Base Result4427 => new Result.Base(ModuleFs, 4427);
public static Result.Base SaveDataAllocationTableCorrupted => new Result.Base(ModuleFs, 4462);
@ -60,14 +72,14 @@ namespace LibHac.Fs
public static Result.Base NcaCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4501, 4599); }
public static Result.Base IvfcStorageCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4601, 4639); }
public static Result.Base IntegrityVerificationStorageCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4601, 4639); }
public static Result.Base Result4602 => new Result.Base(ModuleFs, 4602);
public static Result.Base Result4603 => new Result.Base(ModuleFs, 4603);
public static Result.Base InvalidHashInIvfc => new Result.Base(ModuleFs, 4604);
public static Result.Base IvfcHashIsEmpty => new Result.Base(ModuleFs, 4612);
public static Result.Base InvalidHashInIvfcTopLayer => new Result.Base(ModuleFs, 4613);
public static Result.Base PartitionFsCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4641, 4659); }
public static Result.Base PartitionFileSystemCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4641, 4659); }
public static Result.Base InvalidPartitionFileSystemHashOffset => new Result.Base(ModuleFs, 4642);
public static Result.Base InvalidPartitionFileSystemHash => new Result.Base(ModuleFs, 4643);
public static Result.Base InvalidPartitionFileSystemMagic => new Result.Base(ModuleFs, 4644);
@ -77,13 +89,15 @@ namespace LibHac.Fs
public static Result.Base BuiltInStorageCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4661, 4679); }
public static Result.Base Result4662 => new Result.Base(ModuleFs, 4662);
public static Result.Base FatFsCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4681, 4699); }
public static Result.Base HostFsCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4701, 4719); }
public static Result.Base FatFileSystemCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4681, 4699); }
public static Result.Base HostFileSystemCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4701, 4719); }
public static Result.Base FileTableCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4721, 4739); }
public static Result.Base DatabaseCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4721, 4739); }
public static Result.Base SaveDataAllocationTableCorruptedInternal => new Result.Base(ModuleFs, 4722);
public static Result.Base SaveDataFileTableCorruptedInternal => new Result.Base(ModuleFs, 4723);
public static Result.Base AllocationTableIteratedRangeEntryInternal => new Result.Base(ModuleFs, 4724);
public static Result.Base AesXtsFileSystemCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4741, 4759); }
public static Result.Base AesXtsFileHeaderTooShort => new Result.Base(ModuleFs, 4742);
public static Result.Base AesXtsFileHeaderInvalidKeys => new Result.Base(ModuleFs, 4743);
public static Result.Base AesXtsFileHeaderInvalidMagic => new Result.Base(ModuleFs, 4744);
@ -92,11 +106,15 @@ namespace LibHac.Fs
public static Result.Base AesXtsFileHeaderInvalidKeysInRenameFile => new Result.Base(ModuleFs, 4747);
public static Result.Base AesXtsFileHeaderInvalidKeysInSetSize => new Result.Base(ModuleFs, 4748);
public static Result.Base Range4771To4779 { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4771, 4779); }
public static Result.Base SaveDataTransferDataCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4761, 4769); }
public static Result.Base SignedSystemPartitionDataCorrupted { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4771, 4779); }
public static Result.Base GameCardLogoDataCorrupted => new Result.Base(ModuleFs, 4781);
public static Result.Base Range4811To4819 { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 4811, 4819); }
public static Result.Base Result4812 => new Result.Base(ModuleFs, 4812);
public static Result.Base UnexpectedFailure { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 5000, 5999); }
public static Result.Base Unexpected { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 5000, 5999); }
public static Result.Base UnexpectedErrorInHostFileFlush => new Result.Base(ModuleFs, 5307);
public static Result.Base UnexpectedErrorInHostFileGetSize => new Result.Base(ModuleFs, 5308);
@ -113,9 +131,12 @@ namespace LibHac.Fs
public static Result.Base DirectoryUnobtainable => new Result.Base(ModuleFs, 6006);
public static Result.Base NotNormalized => new Result.Base(ModuleFs, 6007);
public static Result.Base InvalidPathForOperation { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6030, 6059); }
public static Result.Base DirectoryNotDeletable => new Result.Base(ModuleFs, 6031);
public static Result.Base DestinationIsSubPathOfSource => new Result.Base(ModuleFs, 6032);
public static Result.Base PathNotFoundInSaveDataFileTable => new Result.Base(ModuleFs, 6033);
public static Result.Base DifferentDestFileSystem => new Result.Base(ModuleFs, 6034);
public static Result.Base InvalidOffset => new Result.Base(ModuleFs, 6061);
public static Result.Base InvalidSize => new Result.Base(ModuleFs, 6062);
public static Result.Base NullArgument => new Result.Base(ModuleFs, 6063);
@ -123,14 +144,17 @@ namespace LibHac.Fs
public static Result.Base ExtensionSizeTooLarge => new Result.Base(ModuleFs, 6066);
public static Result.Base ExtensionSizeInvalid => new Result.Base(ModuleFs, 6067);
public static Result.Base ReadOldSaveDataInfoReader => new Result.Base(ModuleFs, 6068);
public static Result.Base InvalidEnumValue { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6080, 6099); }
public static Result.Base InvalidSaveDataState => new Result.Base(ModuleFs, 6081);
public static Result.Base InvalidSaveDataSpaceId => new Result.Base(ModuleFs, 6082);
public static Result.Base InvalidOpenModeOperation => new Result.Base(ModuleFs, 6200);
public static Result.Base InvalidOperationForOpenMode { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6200, 6299); }
public static Result.Base FileExtensionWithoutOpenModeAllowAppend => new Result.Base(ModuleFs, 6201);
public static Result.Base InvalidOpenModeForRead => new Result.Base(ModuleFs, 6202);
public static Result.Base InvalidOpenModeForWrite => new Result.Base(ModuleFs, 6203);
public static Result.Base UnsupportedOperation => new Result.Base(ModuleFs, 6300);
public static Result.Base UnsupportedOperation { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6300, 6399); }
public static Result.Base SubStorageNotResizable => new Result.Base(ModuleFs, 6302);
public static Result.Base SubStorageNotResizableMiddleOfFile => new Result.Base(ModuleFs, 6303);
public static Result.Base UnsupportedOperationInMemoryStorageSetSize => new Result.Base(ModuleFs, 6304);
@ -152,21 +176,27 @@ namespace LibHac.Fs
public static Result.Base UnsupportedOperationInPartitionFileSetSize => new Result.Base(ModuleFs, 6376);
public static Result.Base UnsupportedOperationIdInPartitionFileSystem => new Result.Base(ModuleFs, 6377);
public static Result.Base PermissionDenied => new Result.Base(ModuleFs, 6400);
public static Result.Base PermissionDenied { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6400, 6449); }
public static Result.Base ExternalKeyAlreadyRegistered => new Result.Base(ModuleFs, 6452);
public static Result.Base WriteStateUnflushed => new Result.Base(ModuleFs, 6454);
public static Result.Base WritableFileOpen => new Result.Base(ModuleFs, 6457);
public static Result.Base AllocatorAlignmentViolation => new Result.Base(ModuleFs, 6461);
public static Result.Base UserNotExist => new Result.Base(ModuleFs, 6465);
public static Result.Base EntryNotFound { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6600, 6699); }
public static Result.Base OutOfResource { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6700, 6799); }
public static Result.Base MappingTableFull => new Result.Base(ModuleFs, 6706);
public static Result.Base AllocationTableInsufficientFreeBlocks => new Result.Base(ModuleFs, 6707);
public static Result.Base OpenCountLimit => new Result.Base(ModuleFs, 6709);
public static Result.Base MappingFailed { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6800, 6899); }
public static Result.Base RemapStorageMapFull => new Result.Base(ModuleFs, 6811);
public static Result.Base BadState { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ResultFs.ModuleFs, 6900, 6999); }
public static Result.Base SubStorageNotInitialized => new Result.Base(ModuleFs, 6902);
public static Result.Base MountNameNotFound => new Result.Base(ModuleFs, 6905);
public static Result.Base NotMounted => new Result.Base(ModuleFs, 6905);
public static Result.Base SaveDataIsExtending => new Result.Base(ModuleFs, 6906);
}
}

4
src/LibHac/Fs/SubStorage2.cs
View File

@ -28,7 +28,7 @@ namespace LibHac.Fs
if (BaseStorage == null) return ResultFs.SubStorageNotInitialized.Log();
if (destination.Length == 0) return Result.Success;
if (!IsRangeValid(offset, destination.Length, Size)) return ResultFs.ValueOutOfRange.Log();
if (!IsRangeValid(offset, destination.Length, Size)) return ResultFs.OutOfRange.Log();
return BaseStorage.Read(Offset + offset, destination);
}
@ -38,7 +38,7 @@ namespace LibHac.Fs
if (BaseStorage == null) return ResultFs.SubStorageNotInitialized.Log();
if (source.Length == 0) return Result.Success;
if (!IsRangeValid(offset, source.Length, Size)) return ResultFs.ValueOutOfRange.Log();
if (!IsRangeValid(offset, source.Length, Size)) return ResultFs.OutOfRange.Log();
return BaseStorage.Write(Offset + offset, source);
}

2
src/LibHac/FsService/FileSystemProxyCore.cs
View File

@ -360,7 +360,7 @@ namespace LibHac.FsService
string metaFilePath = $"/{(int)type:x8}.meta";
if (size < 0) return ResultFs.ValueOutOfRange.Log();
if (size < 0) return ResultFs.OutOfRange.Log();
return metaDirFs.CreateFile(metaFilePath, size, CreateFileOptions.None);
}

2
src/LibHac/FsService/SaveDataIndexer.cs
View File

@ -597,7 +597,7 @@ namespace LibHac.FsService
}
else
{
if (ResultFs.Range4771To4779.Includes(rc)) return rc;
if (ResultFs.SignedSystemPartitionDataCorrupted.Includes(rc)) return rc;
if (!ResultFs.DataCorrupted.Includes(rc)) return rc;
if (spaceId == SaveDataSpaceId.SdSystem) return rc;

4
src/LibHac/FsSystem/CachedStorage.cs
View File

@ -40,7 +40,7 @@ namespace LibHac.FsSystem
int outOffset = 0;
if (!IsRangeValid(offset, destination.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
lock (Blocks)
{
@ -70,7 +70,7 @@ namespace LibHac.FsSystem
int outOffset = 0;
if (!IsRangeValid(offset, source.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
lock (Blocks)
{

4
src/LibHac/FsSystem/ConcatenationStorage.cs
View File

@ -35,7 +35,7 @@ namespace LibHac.FsSystem
int remaining = destination.Length;
if (!IsRangeValid(offset, destination.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
int sourceIndex = FindSource(inPos);
@ -66,7 +66,7 @@ namespace LibHac.FsSystem
int remaining = source.Length;
if (!IsRangeValid(offset, source.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
int sourceIndex = FindSource(inPos);

2
src/LibHac/FsSystem/PartitionFile.cs
View File

@ -39,7 +39,7 @@ namespace LibHac.FsSystem
if (isResizeNeeded) return ResultFs.UnsupportedOperationInPartitionFileSetSize.Log();
if (offset > Size) return ResultFs.ValueOutOfRange.Log();
if (offset > Size) return ResultFs.OutOfRange.Log();
rc = BaseStorage.Write(offset, source);
if (rc.IsFailure()) return rc;

6
src/LibHac/FsSystem/PartitionFileSystemCore.cs
View File

@ -163,7 +163,7 @@ namespace LibHac.FsSystem
// Nintendo checks for overflow here but not in other places for some reason
if (storageOffset < 0)
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
IHash sha256 = Sha256.CreateSha256Generator();
sha256.Initialize();
@ -248,7 +248,7 @@ namespace LibHac.FsSystem
return ResultFs.UnsupportedOperationInPartitionFileSetSize.Log();
if (_entry.Size < offset)
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
if (_entry.Size < source.Length + offset)
return ResultFs.InvalidSize.Log();
@ -302,7 +302,7 @@ namespace LibHac.FsSystem
}
if (offset < 0 || offset > _entry.Size)
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
if (size < 0 || offset + size > _entry.Size)
return ResultFs.InvalidSize.Log();

4
src/LibHac/FsSystem/Save/DuplexStorage.cs
View File

@ -34,7 +34,7 @@ namespace LibHac.FsSystem.Save
int remaining = destination.Length;
if (!IsRangeValid(offset, destination.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
while (remaining > 0)
{
@ -63,7 +63,7 @@ namespace LibHac.FsSystem.Save
int remaining = source.Length;
if (!IsRangeValid(offset, source.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
while (remaining > 0)
{

4
src/LibHac/FsSystem/Save/JournalStorage.cs
View File

@ -40,7 +40,7 @@ namespace LibHac.FsSystem.Save
int remaining = destination.Length;
if (!IsRangeValid(offset, destination.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
while (remaining > 0)
{
@ -69,7 +69,7 @@ namespace LibHac.FsSystem.Save
int remaining = source.Length;
if (!IsRangeValid(offset, source.Length, Length))
return ResultFs.ValueOutOfRange.Log();
return ResultFs.OutOfRange.Log();
while (remaining > 0)
{

10
src/LibHac/FsSystem/Save/SaveResults.cs
View File

@ -23,7 +23,7 @@ namespace LibHac.FsSystem.Save
return ResultFs.Result4302.Value;
}
if (ResultFs.IvfcStorageCorrupted.Includes(result))
if (ResultFs.IntegrityVerificationStorageCorrupted.Includes(result))
{
if (ResultFs.Result4602.Includes(result))
{
@ -63,7 +63,7 @@ namespace LibHac.FsSystem.Save
return result;
}
if (ResultFs.HostFsCorrupted.Includes(result))
if (ResultFs.HostFileSystemCorrupted.Includes(result))
{
if (description > 4701 && description < 4706)
{
@ -83,7 +83,7 @@ namespace LibHac.FsSystem.Save
return result;
}
if (ResultFs.FileTableCorrupted.Includes(result))
if (ResultFs.DatabaseCorrupted.Includes(result))
{
if (description > 4721 && description < 4729)
{
@ -93,7 +93,7 @@ namespace LibHac.FsSystem.Save
return result;
}
if (ResultFs.FatFsCorrupted.Includes(result))
if (ResultFs.FatFileSystemCorrupted.Includes(result))
{
return result;
}
@ -115,7 +115,7 @@ namespace LibHac.FsSystem.Save
if (ResultFs.InvalidOffset.Includes(result))
{
return ResultFs.ValueOutOfRange.Value;
return ResultFs.OutOfRange.Value;
}
if (ResultFs.AllocationTableInsufficientFreeBlocks.Includes(result))