Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-07 19:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc: Use nint/nuint instead of IntPtr/UIntPtr

Browse Source
This commit is contained in:
KeatonTheBot
2025-11-23 13:42:38 -06:00
parent 2d720fea03
commit c1e24961f9
163 changed files with 845 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.UI.Common/Helper/ConsoleHelper.cs
+2 -2
View File
@@ -45,9 +45,9 @@ namespace Ryujinx.UI.Common.Helper
const int SW_HIDE = 0;
const int SW_SHOW = 5;
IntPtr hWnd = GetConsoleWindow();
nint hWnd = GetConsoleWindow();
if (hWnd == IntPtr.Zero)
if (hWnd == nint.Zero)
{
Logger.Warning?.Print(LogClass.Application, "Attempted to show/hide console window but console window does not exist");
return;
src/Ryujinx.UI.Common/Helper/FileAssociationHelper.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Ryujinx.UI.Common.Helper
private const int SHCNF_FLUSH = 0x1000;
[LibraryImport("shell32.dll", SetLastError = true)]
public static partial void SHChangeNotify(uint wEventId, uint uFlags, IntPtr dwItem1, IntPtr dwItem2);
public static partial void SHChangeNotify(uint wEventId, uint uFlags, nint dwItem1, nint dwItem2);
public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows()) && !ReleaseInformation.IsFlatHubBuild;
src/Ryujinx.UI.Common/Helper/ObjectiveC.cs
+17 -17
View File
@@ -10,44 +10,44 @@ namespace Ryujinx.UI.Common.Helper
private const string ObjCRuntime = "/usr/lib/libobjc.A.dylib";
[LibraryImport(ObjCRuntime, StringMarshalling = StringMarshalling.Utf8)]
private static partial IntPtr sel_getUid(string name);
private static partial nint sel_getUid(string name);
[LibraryImport(ObjCRuntime, StringMarshalling = StringMarshalling.Utf8)]
private static partial IntPtr objc_getClass(string name);
private static partial nint objc_getClass(string name);
[LibraryImport(ObjCRuntime)]
private static partial void objc_msgSend(IntPtr receiver, Selector selector);
private static partial void objc_msgSend(nint receiver, Selector selector);
[LibraryImport(ObjCRuntime)]
private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value);
private static partial void objc_msgSend(nint receiver, Selector selector, byte value);
[LibraryImport(ObjCRuntime)]
private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
private static partial void objc_msgSend(nint receiver, Selector selector, nint value);
[LibraryImport(ObjCRuntime)]
private static partial void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
private static partial void objc_msgSend(nint receiver, Selector selector, NSRect point);
[LibraryImport(ObjCRuntime)]
private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value);
private static partial void objc_msgSend(nint receiver, Selector selector, double value);
[LibraryImport(ObjCRuntime, EntryPoint = "objc_msgSend")]
private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
private static partial nint IntPtr_objc_msgSend(nint receiver, Selector selector);
[LibraryImport(ObjCRuntime, EntryPoint = "objc_msgSend")]
private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector, IntPtr param);
private static partial nint IntPtr_objc_msgSend(nint receiver, Selector selector, nint param);
[LibraryImport(ObjCRuntime, EntryPoint = "objc_msgSend", StringMarshalling = StringMarshalling.Utf8)]
private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector, string param);
private static partial nint IntPtr_objc_msgSend(nint receiver, Selector selector, string param);
[LibraryImport(ObjCRuntime, EntryPoint = "objc_msgSend")]
[return: MarshalAs(UnmanagedType.Bool)]
private static partial bool bool_objc_msgSend(IntPtr receiver, Selector selector, IntPtr param);
private static partial bool bool_objc_msgSend(nint receiver, Selector selector, nint param);
public readonly struct Object
{
public readonly IntPtr ObjPtr;
public readonly nint ObjPtr;
private Object(IntPtr pointer)
private Object(nint pointer)
{
ObjPtr = pointer;
}
@@ -110,7 +110,7 @@ namespace Ryujinx.UI.Common.Helper
public readonly struct Selector
{
public readonly IntPtr SelPtr;
public readonly nint SelPtr;
private Selector(string name)
{
@@ -122,15 +122,15 @@ namespace Ryujinx.UI.Common.Helper
public readonly struct NSString
{
public readonly IntPtr StrPtr;
public readonly nint StrPtr;
public NSString(string aString)
{
IntPtr nsString = objc_getClass("NSString");
nint nsString = objc_getClass("NSString");
StrPtr = IntPtr_objc_msgSend(nsString, "stringWithUTF8String:", aString);
}
public static implicit operator IntPtr(NSString nsString) => nsString.StrPtr;
public static implicit operator nint(NSString nsString) => nsString.StrPtr;
}
public readonly struct NSPoint
src/Ryujinx.UI.Common/Helper/OpenHelper.cs
+6 -6
View File
@@ -9,13 +9,13 @@ namespace Ryujinx.UI.Common.Helper
public static partial class OpenHelper
{
[LibraryImport("shell32.dll", SetLastError = true)]
private static partial int SHOpenFolderAndSelectItems(IntPtr pidlFolder, uint cidl, IntPtr apidl, uint dwFlags);
private static partial int SHOpenFolderAndSelectItems(nint pidlFolder, uint cidl, nint apidl, uint dwFlags);
[LibraryImport("shell32.dll", SetLastError = true)]
private static partial void ILFree(IntPtr pidlList);
private static partial void ILFree(nint pidlList);
[LibraryImport("shell32.dll", SetLastError = true)]
private static partial IntPtr ILCreateFromPathW([MarshalAs(UnmanagedType.LPWStr)] string pszPath);
private static partial nint ILCreateFromPathW([MarshalAs(UnmanagedType.LPWStr)] string pszPath);
public static void OpenFolder(string path)
{
@@ -40,12 +40,12 @@ namespace Ryujinx.UI.Common.Helper
{
if (OperatingSystem.IsWindows())
{
IntPtr pidlList = ILCreateFromPathW(path);
if (pidlList != IntPtr.Zero)
nint pidlList = ILCreateFromPathW(path);
if (pidlList != nint.Zero)
{
try
{
Marshal.ThrowExceptionForHR(SHOpenFolderAndSelectItems(pidlList, 0, IntPtr.Zero, 0));
Marshal.ThrowExceptionForHR(SHOpenFolderAndSelectItems(pidlList, 0, nint.Zero, 0));
}
finally
{
src/Ryujinx.UI.Common/SystemInfo/MacOSSystemInfo.cs
+6 -6
View File
@@ -68,11 +68,11 @@ namespace Ryujinx.UI.Common.SystemInfo
private const string SystemLibraryName = "libSystem.dylib";
[LibraryImport(SystemLibraryName, SetLastError = true)]
private static partial int sysctlbyname([MarshalAs(UnmanagedType.LPStr)] string name, IntPtr oldValue, ref ulong oldSize, IntPtr newValue, ulong newValueSize);
private static partial int sysctlbyname([MarshalAs(UnmanagedType.LPStr)] string name, nint oldValue, ref ulong oldSize, nint newValue, ulong newValueSize);
private static int SysctlByName(string name, IntPtr oldValue, ref ulong oldSize)
private static int SysctlByName(string name, nint oldValue, ref ulong oldSize)
{
if (sysctlbyname(name, oldValue, ref oldSize, IntPtr.Zero, 0) == -1)
if (sysctlbyname(name, oldValue, ref oldSize, nint.Zero, 0) == -1)
{
int err = Marshal.GetLastWin32Error();
@@ -90,7 +90,7 @@ namespace Ryujinx.UI.Common.SystemInfo
{
ulong oldValueSize = (ulong)Unsafe.SizeOf<T>();
return SysctlByName(name, (IntPtr)Unsafe.AsPointer(ref oldValue), ref oldValueSize);
return SysctlByName(name, (nint)Unsafe.AsPointer(ref oldValue), ref oldValueSize);
}
}
@@ -100,7 +100,7 @@ namespace Ryujinx.UI.Common.SystemInfo
ulong strSize = 0;
int res = SysctlByName(name, IntPtr.Zero, ref strSize);
int res = SysctlByName(name, nint.Zero, ref strSize);
if (res == 0)
{
@@ -110,7 +110,7 @@ namespace Ryujinx.UI.Common.SystemInfo
{
fixed (byte* rawDataPtr = rawData)
{
res = SysctlByName(name, (IntPtr)rawDataPtr, ref strSize);
res = SysctlByName(name, (nint)rawDataPtr, ref strSize);
}
if (res == 0)