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.Common/System/GdiPlusHelper.cs | 76 ---------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 Ryujinx.Common/System/GdiPlusHelper.cs (limited to 'Ryujinx.Common/System/GdiPlusHelper.cs') diff --git a/Ryujinx.Common/System/GdiPlusHelper.cs b/Ryujinx.Common/System/GdiPlusHelper.cs deleted file mode 100644 index c084c651..00000000 --- a/Ryujinx.Common/System/GdiPlusHelper.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Runtime.Versioning; - -namespace Ryujinx.Common.System -{ - [SupportedOSPlatform("windows")] - public static class GdiPlusHelper - { - private const string LibraryName = "gdiplus.dll"; - - private static readonly IntPtr _initToken; - - static GdiPlusHelper() - { - CheckStatus(GdiplusStartup(out _initToken, StartupInputEx.Default, out _)); - } - - private static void CheckStatus(int gdiStatus) - { - if (gdiStatus != 0) - { - throw new Exception($"GDI Status Error: {gdiStatus}"); - } - } - - private struct StartupInputEx - { - public int GdiplusVersion; - -#pragma warning disable CS0649 - public IntPtr DebugEventCallback; - public int SuppressBackgroundThread; - public int SuppressExternalCodecs; - public int StartupParameters; -#pragma warning restore CS0649 - - public static StartupInputEx Default => new StartupInputEx - { - // We assume Windows 8 and upper - GdiplusVersion = 2, - DebugEventCallback = IntPtr.Zero, - SuppressBackgroundThread = 0, - SuppressExternalCodecs = 0, - StartupParameters = 0, - }; - } - - private struct StartupOutput - { - public IntPtr NotificationHook; - public IntPtr NotificationUnhook; - } - - [DllImport(LibraryName)] - private static extern int GdiplusStartup(out IntPtr token, in StartupInputEx input, out StartupOutput output); - - [DllImport(LibraryName)] - private static extern int GdipCreateFromHWND(IntPtr hwnd, out IntPtr graphics); - - [DllImport(LibraryName)] - private static extern int GdipDeleteGraphics(IntPtr graphics); - - [DllImport(LibraryName)] - private static extern int GdipGetDpiX(IntPtr graphics, out float dpi); - - public static float GetDpiX(IntPtr hwnd) - { - CheckStatus(GdipCreateFromHWND(hwnd, out IntPtr graphicsHandle)); - CheckStatus(GdipGetDpiX(graphicsHandle, out float result)); - CheckStatus(GdipDeleteGraphics(graphicsHandle)); - - return result; - } - } -} -- cgit v1.2.3