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 --- .../System/WindowsMultimediaTimerResolution.cs | 114 --------------------- 1 file changed, 114 deletions(-) delete mode 100644 Ryujinx.Common/System/WindowsMultimediaTimerResolution.cs (limited to 'Ryujinx.Common/System/WindowsMultimediaTimerResolution.cs') 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 -{ - /// - /// Handle Windows Multimedia timer resolution. - /// - [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; - - /// - /// Create a new and activate the given resolution. - /// - /// - public WindowsMultimediaTimerResolution(uint targetResolutionInMilliseconds) - { - _targetResolutionInMilliseconds = targetResolutionInMilliseconds; - - EnsureResolutionSupport(); - Activate(); - } - - private void EnsureResolutionSupport() - { - TimeCaps timeCaps = default; - - uint result = TimeGetDevCaps(ref timeCaps, (uint)Unsafe.SizeOf()); - - 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 -- cgit v1.2.3