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

251
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs
View File

@@ -8,36 +8,34 @@ using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using static Ryujinx.HLE.HOS.Services.Time.TimeZone.TimeZoneRule;
namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
public class TimeZone
{
private const int TimeTypeSize = 8;
private const int EpochYear = 1970;
private const int YearBase = 1900;
private const int EpochWeekDay = 4;
private const int TimeTypeSize = 8;
private const int EpochYear = 1970;
private const int YearBase = 1900;
private const int EpochWeekDay = 4;
private const int SecondsPerMinute = 60;
private const int MinutesPerHour = 60;
private const int HoursPerDays = 24;
private const int DaysPerWekk = 7;
private const int DaysPerNYear = 365;
private const int DaysPerLYear = 366;
private const int MonthsPerYear = 12;
private const int SecondsPerHour = SecondsPerMinute * MinutesPerHour;
private const int SecondsPerDay = SecondsPerHour * HoursPerDays;
private const int MinutesPerHour = 60;
private const int HoursPerDays = 24;
private const int DaysPerWeek = 7;
private const int DaysPerNYear = 365;
private const int DaysPerLYear = 366;
private const int MonthsPerYear = 12;
private const int SecondsPerHour = SecondsPerMinute * MinutesPerHour;
private const int SecondsPerDay = SecondsPerHour * HoursPerDays;
private const int YearsPerRepeat = 400;
private const int YearsPerRepeat = 400;
private const long AverageSecondsPerYear = 31556952;
private const long SecondsPerRepeat = YearsPerRepeat * AverageSecondsPerYear;
private const long SecondsPerRepeat = YearsPerRepeat * AverageSecondsPerYear;
private static readonly int[] YearLengths = { DaysPerNYear, DaysPerLYear };
private static readonly int[][] MonthsLengths = new int[][]
{
new int[] { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
new int[] { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
private static readonly int[] _yearLengths = { DaysPerNYear, DaysPerLYear };
private static readonly int[][] _monthsLengths = {
new[] { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
new[] { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
};
private static ReadOnlySpan<byte> TimeZoneDefaultRule => ",M4.1.0,M10.5.0"u8;
@@ -46,14 +44,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
private struct CalendarTimeInternal
{
// NOTE: On the IPC side this is supposed to be a 16 bits value but internally this need to be a 64 bits value for ToPosixTime.
public long Year;
public long Year;
public sbyte Month;
public sbyte Day;
public sbyte Hour;
public sbyte Minute;
public sbyte Second;
public int CompareTo(CalendarTimeInternal other)
public readonly int CompareTo(CalendarTimeInternal other)
{
if (Year != other.Year)
{
@@ -98,16 +96,16 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
JulianDay,
DayOfYear,
MonthNthDayOfWeek
MonthNthDayOfWeek,
}
private struct Rule
{
public RuleType Type;
public int Day;
public int Week;
public int Month;
public int TransitionTime;
public int Day;
public int Week;
public int Month;
public int TransitionTime;
}
private static int Detzcode32(ReadOnlySpan<byte> bytes)
@@ -145,10 +143,10 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
TimeTypeInfo a = outRules.Ttis[aIndex];
TimeTypeInfo b = outRules.Ttis[bIndex];
return a.GmtOffset == b.GmtOffset &&
a.IsDaySavingTime == b.IsDaySavingTime &&
return a.GmtOffset == b.GmtOffset &&
a.IsDaySavingTime == b.IsDaySavingTime &&
a.IsStandardTimeDaylight == b.IsStandardTimeDaylight &&
a.IsGMT == b.IsGMT &&
a.IsGMT == b.IsGMT &&
StringUtils.CompareCStr(outRules.Chars[a.AbbreviationListIndex..], outRules.Chars[b.AbbreviationListIndex..]) == 0;
}
@@ -224,7 +222,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
seconds = 0;
bool isValid = GetNum(name, ref namePosition, out int num, 0, HoursPerDays * DaysPerWekk - 1);
bool isValid = GetNum(name, ref namePosition, out int num, 0, HoursPerDays * DaysPerWeek - 1);
if (!isValid)
{
return false;
@@ -310,7 +308,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
rule = new Rule();
bool isValid = false;
bool isValid;
if (name[namePosition] == 'J')
{
@@ -347,7 +345,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
return false;
}
isValid = GetNum(name, ref namePosition, out rule.Day, 0, DaysPerWekk - 1);
isValid = GetNum(name, ref namePosition, out rule.Day, 0, DaysPerWeek - 1);
}
else if (char.IsDigit((char)name[namePosition]))
{
@@ -391,7 +389,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
outRules = new TimeZoneRule();
int stdLen;
int stdLen;
ReadOnlySpan<byte> stdName = name;
int namePosition = 0;
@@ -408,7 +406,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
namePosition++;
stdName = name.Slice(namePosition);
stdName = name[namePosition..];
int stdNamePosition = namePosition;
@@ -442,10 +440,10 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
int charCount = stdLen + 1;
int destLen = 0;
int destLen = 0;
int dstOffset = 0;
ReadOnlySpan<byte> destName = name.Slice(namePosition);
ReadOnlySpan<byte> destName = name[namePosition..];
if (TzCharsArraySize < charCount)
{
@@ -456,7 +454,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
if (name[namePosition] == '<')
{
destName = name.Slice(++namePosition);
destName = name[++namePosition..];
int destNamePosition = namePosition;
namePosition = GetQZName(name.ToArray(), namePosition, '>');
@@ -471,9 +469,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
else
{
destName = name.Slice(namePosition);
destName = name[namePosition..];
namePosition = GetTZName(name, namePosition);
destLen = namePosition;
destLen = namePosition;
}
if (destLen == 0)
@@ -511,8 +509,8 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
namePosition++;
bool IsRuleValid = GetRule(name, ref namePosition, out Rule start);
if (!IsRuleValid)
bool isRuleValid = GetRule(name, ref namePosition, out Rule start);
if (!isRuleValid)
{
return false;
}
@@ -522,8 +520,8 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
return false;
}
IsRuleValid = GetRule(name, ref namePosition, out Rule end);
if (!IsRuleValid)
isRuleValid = GetRule(name, ref namePosition, out Rule end);
if (!isRuleValid)
{
return false;
}
@@ -537,28 +535,28 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
outRules.Ttis[0] = new TimeTypeInfo
{
GmtOffset = -dstOffset,
IsDaySavingTime = true,
AbbreviationListIndex = stdLen + 1
GmtOffset = -dstOffset,
IsDaySavingTime = true,
AbbreviationListIndex = stdLen + 1,
};
outRules.Ttis[1] = new TimeTypeInfo
{
GmtOffset = -stdOffset,
IsDaySavingTime = false,
AbbreviationListIndex = 0
GmtOffset = -stdOffset,
IsDaySavingTime = false,
AbbreviationListIndex = 0,
};
outRules.DefaultType = 0;
int timeCount = 0;
long janFirst = 0;
int janOffset = 0;
int yearBegining = EpochYear;
int timeCount = 0;
long janFirst = 0;
int janOffset = 0;
int yearBegining = EpochYear;
do
{
int yearSeconds = YearLengths[IsLeap(yearBegining - 1)] * SecondsPerDay;
int yearSeconds = _yearLengths[IsLeap(yearBegining - 1)] * SecondsPerDay;
yearBegining--;
if (IncrementOverflow64(ref janFirst, -yearSeconds))
{
@@ -573,17 +571,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
for (year = yearBegining; year < yearLimit; year++)
{
int startTime = TransitionTime(year, start, stdOffset);
int endTime = TransitionTime(year, end, dstOffset);
int endTime = TransitionTime(year, end, dstOffset);
int yearSeconds = YearLengths[IsLeap(year)] * SecondsPerDay;
int yearSeconds = _yearLengths[IsLeap(year)] * SecondsPerDay;
bool isReversed = endTime < startTime;
if (isReversed)
{
int swap = startTime;
startTime = endTime;
endTime = swap;
(endTime, startTime) = (startTime, endTime);
}
if (isReversed || (startTime < endTime && (endTime - startTime < (yearSeconds + (stdOffset - dstOffset)))))
@@ -632,7 +627,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
else if (YearsPerRepeat < year - yearBegining)
{
outRules.GoBack = true;
outRules.GoBack = true;
outRules.GoAhead = true;
}
}
@@ -653,18 +648,22 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
}
long theirDstOffset = 0;
long theirDstOffset;
for (int i = 0; i < outRules.TimeCount; i++)
{
int j = outRules.Types[i];
if (outRules.Ttis[j].IsDaySavingTime)
{
#pragma warning disable IDE0059 // Remove unnecessary value assignment
theirDstOffset = -outRules.Ttis[j].GmtOffset;
#pragma warning restore IDE0059
}
}
bool isDaySavingTime = false;
long theirOffset = theirStdOffset;
#pragma warning disable IDE0059 // Remove unnecessary value assignment
long theirOffset = theirStdOffset;
#pragma warning restore IDE0059
for (int i = 0; i < outRules.TimeCount; i++)
{
int j = outRules.Types[i];
@@ -684,7 +683,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
theirOffset = -outRules.Ttis[j].GmtOffset;
if (outRules.Ttis[j].IsDaySavingTime)
{
#pragma warning disable IDE0059 // Remove unnecessary value assignment
theirDstOffset = theirOffset;
#pragma warning restore IDE0059
}
else
{
@@ -694,33 +695,33 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
outRules.Ttis[0] = new TimeTypeInfo
{
GmtOffset = -stdOffset,
IsDaySavingTime = false,
AbbreviationListIndex = 0
GmtOffset = -stdOffset,
IsDaySavingTime = false,
AbbreviationListIndex = 0,
};
outRules.Ttis[1] = new TimeTypeInfo
{
GmtOffset = -dstOffset,
IsDaySavingTime = true,
AbbreviationListIndex = stdLen + 1
GmtOffset = -dstOffset,
IsDaySavingTime = true,
AbbreviationListIndex = stdLen + 1,
};
outRules.TypeCount = 2;
outRules.TypeCount = 2;
outRules.DefaultType = 0;
}
}
else
{
// default is perpetual standard time
outRules.TypeCount = 1;
outRules.TimeCount = 0;
outRules.TypeCount = 1;
outRules.TimeCount = 0;
outRules.DefaultType = 0;
outRules.Ttis[0] = new TimeTypeInfo
outRules.Ttis[0] = new TimeTypeInfo
{
GmtOffset = -stdOffset,
IsDaySavingTime = false,
AbbreviationListIndex = 0
GmtOffset = -stdOffset,
IsDaySavingTime = false,
AbbreviationListIndex = 0,
};
}
@@ -770,7 +771,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
case RuleType.MonthNthDayOfWeek:
// Here we use Zeller's Congruence to get the day of week of the first month.
int m1 = (rule.Month + 9) % 12 + 1;
int m1 = (rule.Month + 9) % 12 + 1;
int yy0 = (rule.Month <= 2) ? (year - 1) : year;
int yy1 = yy0 / 100;
int yy2 = yy0 % 100;
@@ -779,7 +780,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (dayOfWeek < 0)
{
dayOfWeek += DaysPerWekk;
dayOfWeek += DaysPerWeek;
}
// Get the zero origin
@@ -787,23 +788,23 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (d < 0)
{
d += DaysPerWekk;
d += DaysPerWeek;
}
for (int i = 1; i < rule.Week; i++)
{
if (d + DaysPerWekk >= MonthsLengths[leapYear][rule.Month - 1])
if (d + DaysPerWeek >= _monthsLengths[leapYear][rule.Month - 1])
{
break;
}
d += DaysPerWekk;
d += DaysPerWeek;
}
value = d * SecondsPerDay;
for (int i = 0; i < rule.Month - 1; i++)
{
value += MonthsLengths[leapYear][i] * SecondsPerDay;
value += _monthsLengths[leapYear][i] * SecondsPerDay;
}
break;
@@ -887,7 +888,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
outRules = new TimeZoneRule();
BinaryReader reader = new BinaryReader(inputData);
BinaryReader reader = new(inputData);
long streamLength = reader.BaseStream.Length;
@@ -902,10 +903,10 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
int ttisGMTCount = Detzcode32(header.TtisGMTCount);
int ttisSTDCount = Detzcode32(header.TtisSTDCount);
int leapCount = Detzcode32(header.LeapCount);
int timeCount = Detzcode32(header.TimeCount);
int typeCount = Detzcode32(header.TypeCount);
int charCount = Detzcode32(header.CharCount);
int leapCount = Detzcode32(header.LeapCount);
int timeCount = Detzcode32(header.TimeCount);
int typeCount = Detzcode32(header.TypeCount);
int charCount = Detzcode32(header.CharCount);
if (!(0 <= leapCount
&& leapCount < TzMaxLeaps
@@ -1053,7 +1054,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
long position = (workBuffer.Length - p.Length);
long nRead = streamLength - position;
long nRead = streamLength - position;
if (nRead < 0)
{
@@ -1077,7 +1078,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
byte[] name = new byte[TzNameMax];
Array.Copy(tempName, 1, name, 0, nRead - 1);
Box<TimeZoneRule> tempRulesBox = new Box<TimeZoneRule>();
Box<TimeZoneRule> tempRulesBox = new();
ref TimeZoneRule tempRules = ref tempRulesBox.Data;
if (ParsePosixName(name, ref tempRulesBox.Data, false))
@@ -1247,17 +1248,17 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
private static ResultCode CreateCalendarTime(long time, int gmtOffset, out CalendarTimeInternal calendarTime, out CalendarAdditionalInfo calendarAdditionalInfo)
{
long year = EpochYear;
long timeDays = time / SecondsPerDay;
long year = EpochYear;
long timeDays = time / SecondsPerDay;
long remainingSeconds = time % SecondsPerDay;
calendarTime = new CalendarTimeInternal();
calendarTime = new CalendarTimeInternal();
calendarAdditionalInfo = new CalendarAdditionalInfo();
while (timeDays < 0 || timeDays >= YearLengths[IsLeap((int)year)])
while (timeDays < 0 || timeDays >= _yearLengths[IsLeap((int)year)])
{
long timeDelta = timeDays / DaysPerLYear;
long delta = timeDelta;
long delta = timeDelta;
if (delta == 0)
{
@@ -1298,12 +1299,12 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
return ResultCode.OutOfRange;
}
dayOfYear += YearLengths[IsLeap((int)year)];
dayOfYear += _yearLengths[IsLeap((int)year)];
}
while (dayOfYear >= YearLengths[IsLeap((int)year)])
while (dayOfYear >= _yearLengths[IsLeap((int)year)])
{
dayOfYear -= YearLengths[IsLeap((int)year)];
dayOfYear -= _yearLengths[IsLeap((int)year)];
if (IncrementOverflow64(ref year, 1))
{
@@ -1311,13 +1312,13 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
}
calendarTime.Year = year;
calendarTime.Year = year;
calendarAdditionalInfo.DayOfYear = (uint)dayOfYear;
long dayOfWeek = (EpochWeekDay + ((year - EpochYear) % DaysPerWekk) * (DaysPerNYear % DaysPerWekk) + GetLeapDays(year - 1) - GetLeapDays(EpochYear - 1) + dayOfYear) % DaysPerWekk;
long dayOfWeek = (EpochWeekDay + ((year - EpochYear) % DaysPerWeek) * (DaysPerNYear % DaysPerWeek) + GetLeapDays(year - 1) - GetLeapDays(EpochYear - 1) + dayOfYear) % DaysPerWeek;
if (dayOfWeek < 0)
{
dayOfWeek += DaysPerWekk;
dayOfWeek += DaysPerWeek;
}
calendarAdditionalInfo.DayOfWeek = (uint)dayOfWeek;
@@ -1328,7 +1329,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
calendarTime.Minute = (sbyte)(remainingSeconds / SecondsPerMinute);
calendarTime.Second = (sbyte)(remainingSeconds % SecondsPerMinute);
int[] ip = MonthsLengths[IsLeap((int)year)];
int[] ip = _monthsLengths[IsLeap((int)year)];
for (calendarTime.Month = 0; dayOfYear >= ip[calendarTime.Month]; ++calendarTime.Month)
{
@@ -1338,14 +1339,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
calendarTime.Day = (sbyte)(dayOfYear + 1);
calendarAdditionalInfo.IsDaySavingTime = false;
calendarAdditionalInfo.GmtOffset = gmtOffset;
calendarAdditionalInfo.GmtOffset = gmtOffset;
return 0;
}
private static ResultCode ToCalendarTimeInternal(in TimeZoneRule rules, long time, out CalendarTimeInternal calendarTime, out CalendarAdditionalInfo calendarAdditionalInfo)
{
calendarTime = new CalendarTimeInternal();
calendarTime = new CalendarTimeInternal();
calendarAdditionalInfo = new CalendarAdditionalInfo();
ResultCode result;
@@ -1368,7 +1369,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
seconds -= 1;
years = (seconds / SecondsPerRepeat + 1) * YearsPerRepeat;
years = (seconds / SecondsPerRepeat + 1) * YearsPerRepeat;
seconds = years * AverageSecondsPerYear;
if (time < rules.Ats[0])
@@ -1411,7 +1412,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
}
else
{
int low = 1;
int low = 1;
int high = rules.TimeCount;
while (low < high)
@@ -1451,7 +1452,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
posixTime = 0;
int hour = calendarTime.Hour;
int hour = calendarTime.Hour;
int minute = calendarTime.Minute;
if (NormalizeOverflow32(ref hour, ref minute, MinutesPerHour))
@@ -1467,10 +1468,10 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
return ResultCode.Overflow;
}
calendarTime.Day = (sbyte)day;
calendarTime.Day = (sbyte)day;
calendarTime.Hour = (sbyte)hour;
long year = calendarTime.Year;
long year = calendarTime.Year;
long month = calendarTime.Month;
if (NormalizeOverflow64(ref year, ref month, MonthsPerYear))
@@ -1499,7 +1500,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
li++;
}
day += YearLengths[IsLeap((int)li)];
day += _yearLengths[IsLeap((int)li)];
}
while (day > DaysPerLYear)
@@ -1511,7 +1512,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
li++;
}
day -= YearLengths[IsLeap((int)li)];
day -= _yearLengths[IsLeap((int)li)];
if (IncrementOverflow64(ref year, 1))
{
@@ -1521,7 +1522,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
while (true)
{
int i = MonthsLengths[IsLeap((int)year)][calendarTime.Month];
int i = _monthsLengths[IsLeap((int)year)][calendarTime.Month];
if (day <= i)
{
@@ -1573,7 +1574,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
calendarTime.Second = 0;
}
long low = long.MinValue;
long low = long.MinValue;
long high = long.MaxValue;
while (true)
@@ -1670,15 +1671,15 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
Time = new CalendarTime()
{
Year = (short)calendarTime.Year,
Year = (short)calendarTime.Year,
// NOTE: Nintendo's month range is 1-12, internal range is 0-11.
Month = (sbyte)(calendarTime.Month + 1),
Day = calendarTime.Day,
Hour = calendarTime.Hour,
Day = calendarTime.Day,
Hour = calendarTime.Hour,
Minute = calendarTime.Minute,
Second = calendarTime.Second
Second = calendarTime.Second,
},
AdditionalInfo = calendarAdditionalInfo
AdditionalInfo = calendarAdditionalInfo,
};
return result;
@@ -1686,18 +1687,18 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
internal static ResultCode ToPosixTime(in TimeZoneRule rules, CalendarTime calendarTime, out long posixTime)
{
CalendarTimeInternal calendarTimeInternal = new CalendarTimeInternal()
CalendarTimeInternal calendarTimeInternal = new()
{
Year = calendarTime.Year,
Year = calendarTime.Year,
// NOTE: Nintendo's month range is 1-12, internal range is 0-11.
Month = (sbyte)(calendarTime.Month - 1),
Day = calendarTime.Day,
Hour = calendarTime.Hour,
Month = (sbyte)(calendarTime.Month - 1),
Day = calendarTime.Day,
Hour = calendarTime.Hour,
Minute = calendarTime.Minute,
Second = calendarTime.Second
Second = calendarTime.Second,
};
return ToPosixTimeInternal(in rules, calendarTimeInternal, out posixTime);
}
}
}
}

64
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs
View File

@@ -11,7 +11,6 @@ using Ryujinx.Cpu;
using Ryujinx.HLE.Exceptions;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS.Services.Time.Clock;
using Ryujinx.HLE.Utilities;
using System;
using System.Collections.Generic;
using System.IO;
@@ -24,11 +23,11 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
private const long TimeZoneBinaryTitleId = 0x010000000000080E;
private readonly string TimeZoneSystemTitleMissingErrorMessage = "TimeZoneBinary system title not found! TimeZone conversions will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide#initial-setup-continued---installation-of-firmware for more information)";
private const string TimeZoneSystemTitleMissingErrorMessage = "TimeZoneBinary system title not found! TimeZone conversions will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide#initial-setup-continued---installation-of-firmware for more information)";
private VirtualFileSystem _virtualFileSystem;
private VirtualFileSystem _virtualFileSystem;
private IntegrityCheckLevel _fsIntegrityCheckLevel;
private ContentManager _contentManager;
private ContentManager _contentManager;
public string[] LocationNameCache { get; private set; }
@@ -41,8 +40,8 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public void InitializeInstance(VirtualFileSystem virtualFileSystem, ContentManager contentManager, IntegrityCheckLevel fsIntegrityCheckLevel)
{
_virtualFileSystem = virtualFileSystem;
_contentManager = contentManager;
_virtualFileSystem = virtualFileSystem;
_contentManager = contentManager;
_fsIntegrityCheckLevel = fsIntegrityCheckLevel;
InitializeLocationNameCache();
@@ -90,31 +89,30 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
if (HasTimeZoneBinaryTitle())
{
using (IStorage ncaFileStream = new LocalStorage(_virtualFileSystem.SwitchPathToSystemPath(GetTimeZoneBinaryTitleContentPath()), FileAccess.Read, FileMode.Open))
using IStorage ncaFileStream = new LocalStorage(VirtualFileSystem.SwitchPathToSystemPath(GetTimeZoneBinaryTitleContentPath()), FileAccess.Read, FileMode.Open);
Nca nca = new(_virtualFileSystem.KeySet, ncaFileStream);
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, _fsIntegrityCheckLevel);
using var binaryListFile = new UniqueRef<IFile>();
romfs.OpenFile(ref binaryListFile.Ref, "/binaryList.txt".ToU8Span(), OpenMode.Read).ThrowIfFailure();
StreamReader reader = new(binaryListFile.Get.AsStream());
List<string> locationNameList = new();
string locationName;
while ((locationName = reader.ReadLine()) != null)
{
Nca nca = new Nca(_virtualFileSystem.KeySet, ncaFileStream);
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, _fsIntegrityCheckLevel);
using var binaryListFile = new UniqueRef<IFile>();
romfs.OpenFile(ref binaryListFile.Ref, "/binaryList.txt".ToU8Span(), OpenMode.Read).ThrowIfFailure();
StreamReader reader = new StreamReader(binaryListFile.Get.AsStream());
List<string> locationNameList = new List<string>();
string locationName;
while ((locationName = reader.ReadLine()) != null)
{
locationNameList.Add(locationName);
}
LocationNameCache = locationNameList.ToArray();
locationNameList.Add(locationName);
}
LocationNameCache = locationNameList.ToArray();
}
else
{
LocationNameCache = new string[] { "UTC" };
LocationNameCache = new[] { "UTC" };
Logger.Error?.Print(LogClass.ServiceTime, TimeZoneSystemTitleMissingErrorMessage);
}
@@ -129,9 +127,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
return new[] { (0, "UTC", "UTC") };
}
List<(int Offset, string Location, string Abbr)> outList = new List<(int Offset, string Location, string Abbr)>();
List<(int Offset, string Location, string Abbr)> outList = new();
var now = DateTimeOffset.Now.ToUnixTimeSeconds();
using (IStorage ncaStorage = new LocalStorage(_virtualFileSystem.SwitchPathToSystemPath(tzBinaryContentPath), FileAccess.Read, FileMode.Open))
using (IStorage ncaStorage = new LocalStorage(VirtualFileSystem.SwitchPathToSystemPath(tzBinaryContentPath), FileAccess.Read, FileMode.Open))
using (IFileSystem romfs = new Nca(_virtualFileSystem.KeySet, ncaStorage).OpenFileSystem(NcaSectionType.Data, _fsIntegrityCheckLevel))
{
foreach (string locName in LocationNameCache)
@@ -149,7 +147,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
continue;
}
TimeZoneRuleBox tzRuleBox = new TimeZoneRuleBox();
TimeZoneRuleBox tzRuleBox = new();
ref TimeZoneRule tzRule = ref tzRuleBox.Data;
TimeZone.ParseTimeZoneBinary(ref tzRule, tzif.Get.AsStream());
@@ -219,7 +217,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public ResultCode LoadLocationNameList(uint index, out string[] outLocationNameArray, uint maxLength)
{
List<string> locationNameList = new List<string>();
List<string> locationNameList = new();
for (int i = 0; i < LocationNameCache.Length && i < maxLength; i++)
{
@@ -259,16 +257,16 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
internal ResultCode GetTimeZoneBinary(string locationName, out Stream timeZoneBinaryStream, out LocalStorage ncaFile)
{
timeZoneBinaryStream = null;
ncaFile = null;
ncaFile = null;
if (!HasTimeZoneBinaryTitle() || !IsLocationNameValid(locationName))
{
return ResultCode.TimeZoneNotFound;
}
ncaFile = new LocalStorage(_virtualFileSystem.SwitchPathToSystemPath(GetTimeZoneBinaryTitleContentPath()), FileAccess.Read, FileMode.Open);
ncaFile = new LocalStorage(VirtualFileSystem.SwitchPathToSystemPath(GetTimeZoneBinaryTitleContentPath()), FileAccess.Read, FileMode.Open);
Nca nca = new Nca(_virtualFileSystem.KeySet, ncaFile);
Nca nca = new(_virtualFileSystem.KeySet, ncaFile);
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, _fsIntegrityCheckLevel);
using var timeZoneBinaryFile = new UniqueRef<IFile>();

42
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneManager.cs
View File

@@ -7,20 +7,20 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
{
class TimeZoneManager
{
private bool _isInitialized;
private Box<TimeZoneRule> _myRules;
private string _deviceLocationName;
private UInt128 _timeZoneRuleVersion;
private uint _totalLocationNameCount;
private bool _isInitialized;
private Box<TimeZoneRule> _myRules;
private string _deviceLocationName;
private UInt128 _timeZoneRuleVersion;
private uint _totalLocationNameCount;
private SteadyClockTimePoint _timeZoneUpdateTimePoint;
private readonly object _lock = new();
private readonly object _lock = new();
public TimeZoneManager()
{
_isInitialized = false;
_deviceLocationName = "UTC";
_isInitialized = false;
_deviceLocationName = "UTC";
_timeZoneRuleVersion = new UInt128();
_myRules = new Box<TimeZoneRule>();
_myRules = new Box<TimeZoneRule>();
_timeZoneUpdateTimePoint = SteadyClockTimePoint.GetRandom();
}
@@ -56,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (_isInitialized)
{
deviceLocationName = _deviceLocationName;
result = ResultCode.Success;
result = ResultCode.Success;
}
}
@@ -69,15 +69,15 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
lock (_lock)
{
Box<TimeZoneRule> rules = new Box<TimeZoneRule>();
Box<TimeZoneRule> rules = new();
bool timeZoneConversionSuccess = TimeZone.ParseTimeZoneBinary(ref rules.Data, timeZoneBinaryStream);
if (timeZoneConversionSuccess)
{
_deviceLocationName = locationName;
_myRules = rules;
result = ResultCode.Success;
_myRules = rules;
result = ResultCode.Success;
}
}
@@ -103,7 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (_isInitialized)
{
totalLocationNameCount = _totalLocationNameCount;
result = ResultCode.Success;
result = ResultCode.Success;
}
}
@@ -119,7 +119,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (_isInitialized || bypassUninitialized)
{
_timeZoneUpdateTimePoint = timeZoneUpdatedTimePoint;
result = ResultCode.Success;
result = ResultCode.Success;
}
}
@@ -135,12 +135,12 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (_isInitialized)
{
timeZoneUpdatedTimePoint = _timeZoneUpdateTimePoint;
result = ResultCode.Success;
result = ResultCode.Success;
}
else
{
timeZoneUpdatedTimePoint = SteadyClockTimePoint.GetRandom();
result = ResultCode.UninitializedClock;
result = ResultCode.UninitializedClock;
}
}
@@ -181,12 +181,12 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
if (_isInitialized)
{
timeZoneRuleVersion = _timeZoneRuleVersion;
result = ResultCode.Success;
result = ResultCode.Success;
}
else
{
timeZoneRuleVersion = new UInt128();
result = ResultCode.UninitializedClock;
result = ResultCode.UninitializedClock;
}
}
@@ -206,7 +206,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
else
{
calendar = new CalendarInfo();
result = ResultCode.UninitializedClock;
result = ResultCode.UninitializedClock;
}
}
@@ -238,7 +238,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
else
{
posixTime = 0;
result = ResultCode.UninitializedClock;
result = ResultCode.UninitializedClock;
}
}

2
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/Types/CalendarAdditionalInfo.cs
View File

@@ -18,4 +18,4 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public int GmtOffset;
}
}
}

4
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/Types/CalendarInfo.cs
View File

@@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
[StructLayout(LayoutKind.Sequential, Pack = 0x4, Size = 0x20, CharSet = CharSet.Ansi)]
struct CalendarInfo
{
public CalendarTime Time;
public CalendarTime Time;
public CalendarAdditionalInfo AdditionalInfo;
}
}
}

2
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/Types/CalendarTime.cs
View File

@@ -12,4 +12,4 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public sbyte Minute;
public sbyte Second;
}
}
}

2
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/Types/TimeTypeInfo.cs
View File

@@ -25,4 +25,4 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public ushort Padding2;
}
}
}

2
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/Types/TimeZoneRule.cs
View File

@@ -53,4 +53,4 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public int DefaultType;
}
}
}

2
src/Ryujinx.HLE/HOS/Services/Time/TimeZone/Types/TzifHeader.cs
View File

@@ -16,4 +16,4 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
public int TypeCount;
public int CharCount;
}
}
}