diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2022-12-15 12:07:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 18:07:31 +0100 |
| commit | 0fbcd630bc57885d6b94fd3c4b3546493e09059e (patch) | |
| tree | 8e1f74775d3393d85e86a845c119a43907459884 /Ryujinx.Common/System | |
| parent | f4d731ae2094128dcd1dc4a4be60b068047a77a7 (diff) | |
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 <thog@protonmail.com>
* Update Ryujinx.Ava/Modules/Updater/Updater.cs
Co-authored-by: Mary-nyan <thog@protonmail.com>
Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Co-authored-by: Mary-nyan <thog@protonmail.com>
Diffstat (limited to 'Ryujinx.Common/System')
| -rw-r--r-- | Ryujinx.Common/System/DisplaySleep.cs | 35 | ||||
| -rw-r--r-- | Ryujinx.Common/System/ForceDpiAware.cs | 95 | ||||
| -rw-r--r-- | Ryujinx.Common/System/GdiPlusHelper.cs | 76 | ||||
| -rw-r--r-- | Ryujinx.Common/System/WindowsMultimediaTimerResolution.cs | 114 |
4 files changed, 0 insertions, 320 deletions
diff --git a/Ryujinx.Common/System/DisplaySleep.cs b/Ryujinx.Common/System/DisplaySleep.cs deleted file mode 100644 index bad964b9..00000000 --- a/Ryujinx.Common/System/DisplaySleep.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Ryujinx.Common.System -{ - public class DisplaySleep - { - [Flags] - enum EXECUTION_STATE : uint - { - ES_CONTINUOUS = 0x80000000, - ES_DISPLAY_REQUIRED = 0x00000002, - ES_SYSTEM_REQUIRED = 0x00000001 - } - - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags); - - static public void Prevent() - { - if (OperatingSystem.IsWindows()) - { - SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED | EXECUTION_STATE.ES_DISPLAY_REQUIRED); - } - } - - static public void Restore() - { - if (OperatingSystem.IsWindows()) - { - SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS); - } - } - } -} diff --git a/Ryujinx.Common/System/ForceDpiAware.cs b/Ryujinx.Common/System/ForceDpiAware.cs deleted file mode 100644 index 8d19876e..00000000 --- a/Ryujinx.Common/System/ForceDpiAware.cs +++ /dev/null @@ -1,95 +0,0 @@ -using Ryujinx.Common.Logging; -using System; -using System.Globalization; -using System.Runtime.InteropServices; - -namespace Ryujinx.Common.System -{ - public static class ForceDpiAware - { - [DllImport("user32.dll")] - private static extern bool SetProcessDPIAware(); - - private const string X11LibraryName = "libX11.so.6"; - - [DllImport(X11LibraryName)] - private static extern IntPtr XOpenDisplay(string display); - - [DllImport(X11LibraryName)] - private static extern IntPtr XGetDefault(IntPtr display, string program, string option); - - [DllImport(X11LibraryName)] - private static extern int XDisplayWidth(IntPtr display, int screenNumber); - - [DllImport(X11LibraryName)] - private static extern int XDisplayWidthMM(IntPtr display, int screenNumber); - - [DllImport(X11LibraryName)] - private static extern int XCloseDisplay(IntPtr display); - - private static readonly double _standardDpiScale = 96.0; - private static readonly double _maxScaleFactor = 1.25; - - /// <summary> - /// Marks the application as DPI-Aware when running on the Windows operating system. - /// </summary> - public static void Windows() - { - // Make process DPI aware for proper window sizing on high-res screens. - if (OperatingSystem.IsWindowsVersionAtLeast(6)) - { - SetProcessDPIAware(); - } - } - - public static double GetActualScaleFactor() - { - double userDpiScale = 96.0; - - try - { - if (OperatingSystem.IsWindows()) - { - userDpiScale = GdiPlusHelper.GetDpiX(IntPtr.Zero); - } - else if (OperatingSystem.IsLinux()) - { - string xdgSessionType = Environment.GetEnvironmentVariable("XDG_SESSION_TYPE")?.ToLower(); - - if (xdgSessionType == null || xdgSessionType == "x11") - { - IntPtr display = XOpenDisplay(null); - string dpiString = Marshal.PtrToStringAnsi(XGetDefault(display, "Xft", "dpi")); - if (dpiString == null || !double.TryParse(dpiString, NumberStyles.Any, CultureInfo.InvariantCulture, out userDpiScale)) - { - userDpiScale = (double)XDisplayWidth(display, 0) * 25.4 / (double)XDisplayWidthMM(display, 0); - } - XCloseDisplay(display); - } - else if (xdgSessionType == "wayland") - { - // TODO - Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: Wayland not yet supported"); - } - else - { - Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: Unrecognised XDG_SESSION_TYPE: {xdgSessionType}"); - } - } - } - catch (Exception e) - { - Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: {e.Message}"); - } - - return userDpiScale; - } - - public static double GetWindowScaleFactor() - { - double userDpiScale = GetActualScaleFactor(); - - return Math.Min(userDpiScale / _standardDpiScale, _maxScaleFactor); - } - } -} 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; - } - } -} diff --git a/Ryujinx.Common/System/WindowsMultimediaTimerResolution.cs b/Ryujinx.Common/System/WindowsMultimediaTimerResolution.cs deleted file mode 100644 index d19fbe73..00000000 --- a/Ryujinx.Common/System/WindowsMultimediaTimerResolution.cs +++ /dev/null @@ -1,114 +0,0 @@ -using Ryujinx.Common.Logging; -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Runtime.Versioning; - -namespace Ryujinx.Common.System -{ - /// <summary> - /// Handle Windows Multimedia timer resolution. - /// </summary> - [SupportedOSPlatform("windows")] - public class WindowsMultimediaTimerResolution : IDisposable - { - [StructLayout(LayoutKind.Sequential)] - public struct TimeCaps - { - public uint wPeriodMin; - public uint wPeriodMax; - }; - - [DllImport("winmm.dll", EntryPoint = "timeGetDevCaps", SetLastError = true)] - private static extern uint TimeGetDevCaps(ref TimeCaps timeCaps, uint sizeTimeCaps); - - [DllImport("winmm.dll", EntryPoint = "timeBeginPeriod")] - private static extern uint TimeBeginPeriod(uint uMilliseconds); - - [DllImport("winmm.dll", EntryPoint = "timeEndPeriod")] - private static extern uint TimeEndPeriod(uint uMilliseconds); - - private uint _targetResolutionInMilliseconds; - private bool _isActive; - - /// <summary> - /// Create a new <see cref="WindowsMultimediaTimerResolution"/> and activate the given resolution. - /// </summary> - /// <param name="targetResolutionInMilliseconds"></param> - public WindowsMultimediaTimerResolution(uint targetResolutionInMilliseconds) - { - _targetResolutionInMilliseconds = targetResolutionInMilliseconds; - - EnsureResolutionSupport(); - Activate(); - } - - private void EnsureResolutionSupport() - { - TimeCaps timeCaps = default; - - uint result = TimeGetDevCaps(ref timeCaps, (uint)Unsafe.SizeOf<TimeCaps>()); - - if (result != 0) - { - Logger.Notice.Print(LogClass.Application, $"timeGetDevCaps failed with result: {result}"); - } - else - { - uint supportedTargetResolutionInMilliseconds = Math.Min(Math.Max(timeCaps.wPeriodMin, _targetResolutionInMilliseconds), timeCaps.wPeriodMax); - - if (supportedTargetResolutionInMilliseconds != _targetResolutionInMilliseconds) - { - Logger.Notice.Print(LogClass.Application, $"Target resolution isn't supported by OS, using closest resolution: {supportedTargetResolutionInMilliseconds}ms"); - - _targetResolutionInMilliseconds = supportedTargetResolutionInMilliseconds; - } - } - } - - private void Activate() - { - uint result = TimeBeginPeriod(_targetResolutionInMilliseconds); - - if (result != 0) - { - Logger.Notice.Print(LogClass.Application, $"timeBeginPeriod failed with result: {result}"); - } - else - { - _isActive = true; - } - } - - private void Disable() - { - if (_isActive) - { - uint result = TimeEndPeriod(_targetResolutionInMilliseconds); - - if (result != 0) - { - Logger.Notice.Print(LogClass.Application, $"timeEndPeriod failed with result: {result}"); - } - else - { - _isActive = false; - } - } - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected virtual void Dispose(bool disposing) - { - if (disposing) - { - Disable(); - } - } - } -}
\ No newline at end of file |
