Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-04 21:18:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert .NET 10 to .NET 9

Browse Source 
See merge request kenji-nx/ryujinx!19
This commit is contained in:
BeZide
2026-01-21 10:03:25 -06:00
committed by KeatonTheBot
parent 2c1b7bc667
commit 6d36f471dd
39 changed files with 464 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
+36 -9
View File
@@ -885,7 +885,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
result = new NestedName(name, prev);
}
context?.FinishWithTemplateArguments = false;
if (context != null)
{
context.FinishWithTemplateArguments = false;
}
return result;
}
@@ -1065,7 +1068,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
return null;
}
context?.CtorDtorConversion = true;
if (context != null)
{
context.CtorDtorConversion = true;
}
return new ConversionOperatorType(type);
default:
@@ -1333,7 +1339,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
_position++;
context?.CtorDtorConversion = true;
if (context != null)
{
context.CtorDtorConversion = true;
}
if (isInherited && ParseName(context) == null)
{
@@ -1353,7 +1362,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
_position++;
context?.CtorDtorConversion = true;
if (context != null)
{
context.CtorDtorConversion = true;
}
return new CtorDtorNameType(prev, true);
}
@@ -2956,10 +2968,16 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
BaseNode result = null;
CvType cv = new(ParseCvQualifiers(), null);
context?.Cv = cv;
if (context != null)
{
context.Cv = cv;
}
SimpleReferenceType Ref = ParseRefQualifiers();
context?.Ref = Ref;
if (context != null)
{
context.Ref = Ref;
}
if (ConsumeIf("St"))
{
@@ -3004,7 +3022,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
}
result = new NameTypeWithTemplateArguments(result, templateArgument);
context?.FinishWithTemplateArguments = true;
if (context != null)
{
context.FinishWithTemplateArguments = true;
}
_substitutionList.Add(result);
continue;
@@ -3194,7 +3215,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
return null;
}
context?.FinishWithTemplateArguments = true;
if (context != null)
{
context.FinishWithTemplateArguments = true;
}
return new NameTypeWithTemplateArguments(substitution, templateArguments);
}
@@ -3214,7 +3238,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
return null;
}
context?.FinishWithTemplateArguments = true;
if (context != null)
{
context.FinishWithTemplateArguments = true;
}
return new NameTypeWithTemplateArguments(result, templateArguments);
}
src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs
+4 -1
View File
@@ -177,7 +177,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
if (previousThread != nextThread)
{
previousThread?.LastScheduledTime = PerformanceCounter.ElapsedTicks;
if (previousThread != null)
{
previousThread.LastScheduledTime = PerformanceCounter.ElapsedTicks;
}
_state.SelectedThread = nextThread;
_state.NeedsScheduling = true;
src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
+2 -2
View File
@@ -1301,8 +1301,8 @@ namespace Ryujinx.HLE.HOS.Services.Hid
context.Memory.Read(context.Request.PtrBuff[1].Position, vibrationValueBuffer);
Span<VibrationDeviceHandle> deviceHandles = MemoryMarshal.Cast<byte, VibrationDeviceHandle>(new Span<byte>(vibrationDeviceHandleBuffer));
Span<VibrationValue> vibrationValues = MemoryMarshal.Cast<byte, VibrationValue>(new Span<byte>(vibrationValueBuffer));
Span<VibrationDeviceHandle> deviceHandles = MemoryMarshal.Cast<byte, VibrationDeviceHandle>(vibrationDeviceHandleBuffer);
Span<VibrationValue> vibrationValues = MemoryMarshal.Cast<byte, VibrationValue>(vibrationValueBuffer);
if (!deviceHandles.IsEmpty && vibrationValues.Length == deviceHandles.Length)
{
src/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
+4 -1
View File
@@ -85,7 +85,10 @@ namespace Ryujinx.HLE.HOS.Services.Nv
NvDeviceFile deviceFile = (NvDeviceFile)constructor?.Invoke([context, _clientMemory, _owner]);
deviceFile?.Path = path;
if (deviceFile != null)
{
deviceFile.Path = path;
}
fd = DeviceFileIdRegistry.Add(deviceFile);
src/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
+1
View File
@@ -10,6 +10,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Security.Cryptography;
using System.Linq;
namespace Ryujinx.HLE.HOS.Services.Ro
{
src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
+3 -1
View File
@@ -1169,7 +1169,9 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
public override void DestroyAtExit()
{
_context?.Dispose();
if (_context != null) {
_context.Dispose();
}
}
}
}