From 0fbcd630bc57885d6b94fd3c4b3546493e09059e Mon Sep 17 00:00:00 2001 From: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> Date: Thu, 15 Dec 2022 12:07:31 -0500 Subject: Replace `DllImport` usage with `LibraryImport` (#4084) * Replace usage of `DllImport` with `LibraryImport` * Mark methods as `partial` * Marshalling * More `partial` & marshalling * More `partial` and marshalling * More partial and marshalling * Update GdiPlusHelper to LibraryImport * Unicorn * More Partial * Marshal * Specify EntryPoint * Specify EntryPoint * Change GlobalMemoryStatusEx to LibraryImport * Change RegisterClassEx to LibraryImport * Define EntryPoints * Update Ryujinx.Ava/Ui/Controls/Win32NativeInterop.cs Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Update Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Move return mashal * Remove calling convention specification * Remove calling conventions * Update Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Update Ryujinx/Modules/Updater/Updater.cs Co-authored-by: Mary-nyan * Update Ryujinx.Ava/Modules/Updater/Updater.cs Co-authored-by: Mary-nyan Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Co-authored-by: Mary-nyan --- Ryujinx.Ava/Helper/MetalHelper.cs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'Ryujinx.Ava/Helper') diff --git a/Ryujinx.Ava/Helper/MetalHelper.cs b/Ryujinx.Ava/Helper/MetalHelper.cs index ae07ce69..2d4d828b 100644 --- a/Ryujinx.Ava/Helper/MetalHelper.cs +++ b/Ryujinx.Ava/Helper/MetalHelper.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Ava.Ui.Helper public delegate void UpdateBoundsCallbackDelegate(Rect rect); [SupportedOSPlatform("macos")] - static class MetalHelper + static partial class MetalHelper { private const string LibObjCImport = "/usr/lib/libobjc.A.dylib"; @@ -100,28 +100,28 @@ namespace Ryujinx.Ava.Ui.Helper // TODO } - [DllImport(LibObjCImport)] - private static unsafe extern IntPtr sel_registerName(byte* data); + [LibraryImport(LibObjCImport)] + private static unsafe partial IntPtr sel_registerName(byte* data); - [DllImport(LibObjCImport)] - private static unsafe extern IntPtr objc_getClass(byte* data); + [LibraryImport(LibObjCImport)] + private static unsafe partial IntPtr objc_getClass(byte* data); - [DllImport(LibObjCImport)] - private static extern void objc_msgSend(IntPtr receiver, Selector selector); + [LibraryImport(LibObjCImport)] + private static partial void objc_msgSend(IntPtr receiver, Selector selector); - [DllImport(LibObjCImport)] - private static extern void objc_msgSend(IntPtr receiver, Selector selector, byte value); + [LibraryImport(LibObjCImport)] + private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value); - [DllImport(LibObjCImport)] - private static extern void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value); + [LibraryImport(LibObjCImport)] + private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value); - [DllImport(LibObjCImport)] - private static extern void objc_msgSend(IntPtr receiver, Selector selector, NSRect point); + [LibraryImport(LibObjCImport)] + private static partial void objc_msgSend(IntPtr receiver, Selector selector, NSRect point); - [DllImport(LibObjCImport)] - private static extern void objc_msgSend(IntPtr receiver, Selector selector, double value); + [LibraryImport(LibObjCImport)] + private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value); - [DllImport(LibObjCImport, EntryPoint = "objc_msgSend")] - private static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector); + [LibraryImport(LibObjCImport, EntryPoint = "objc_msgSend")] + private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector); } } \ No newline at end of file -- cgit v1.2.3