From 948ec9a8223c722c6bfb4590168abfce44458aea Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 25 Jan 2024 12:55:26 +0800 Subject: [PATCH] code style --- .../GeniusInvokationDecoding.cs | 36 ++++- .../IocHttpClientConfiguration.cs | 1 + .../Core/Windowing/WindowController.cs | 2 +- .../Core/Windowing/WindowSubclass.cs | 1 - .../Model/Metadata/Item/Materials.cs | 135 ++++++++++++++---- .../ViewModel/Guide/GuideViewModel.cs | 2 +- src/Snap.Hutao/Snap.Hutao/Win32/ComCtl32.cs | 1 + src/Snap.Hutao/Snap.Hutao/Win32/Gdi32.cs | 2 + src/Snap.Hutao/Snap.Hutao/Win32/Kernel32.cs | 2 + src/Snap.Hutao/Snap.Hutao/Win32/Macros.cs | 1 + src/Snap.Hutao/Snap.Hutao/Win32/Ole32.cs | 2 + .../Win32/Registry/REG_SAM_FLAGS.cs | 1 + src/Snap.Hutao/Snap.Hutao/Win32/Shell32.cs | 2 + .../Snap.Hutao/Win32/System/Com/CLSCTX.cs | 1 + .../Snap.Hutao/Win32/System/Com/STGM.cs | 1 + .../Win32/System/Console/CONSOLE_MODE.cs | 1 + .../System/Diagnostics/Debug/FACILITY_CODE.cs | 1 + .../System/SystemServices/SFGAO_FLAGS.cs | 1 + .../System/WinRT/IMemoryBufferByteAccess.cs | 1 + .../Win32/UI/Input/KeyboardAndMouse/INPUT.cs | 2 +- .../UI/Input/KeyboardAndMouse/VIRTUAL_KEY.cs | 1 + .../Snap.Hutao/Win32/UI/Shell/IFileDialog.cs | 1 + .../Win32/UI/Shell/SIATTRIBFLAGS.cs | 1 + .../UI/WindowsAndMessaging/SHOW_WINDOW_CMD.cs | 1 + .../UI/WindowsAndMessaging/WINDOWPLACEMENT.cs | 9 +- .../UI/WindowsAndMessaging/WINDOW_EX_STYLE.cs | 1 + .../WINDOW_LONG_PTR_INDEX.cs | 1 + src/Snap.Hutao/Snap.Hutao/Win32/User32.cs | 2 + 28 files changed, 171 insertions(+), 42 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao.Test/IncomingFeature/GeniusInvokationDecoding.cs b/src/Snap.Hutao/Snap.Hutao.Test/IncomingFeature/GeniusInvokationDecoding.cs index 7a72c3e5..dbe81736 100644 --- a/src/Snap.Hutao/Snap.Hutao.Test/IncomingFeature/GeniusInvokationDecoding.cs +++ b/src/Snap.Hutao/Snap.Hutao.Test/IncomingFeature/GeniusInvokationDecoding.cs @@ -160,9 +160,39 @@ public sealed class GeniusInvokationDecoding ushort[] testKnownResult = [ - 060, 019, 001, 079, 120, 120, 129, 151, 151, 153, 153, - 181, 184, 184, 185, 185, 194, 194, 200, 200, 201, 201, - 217, 217, 219, 241, 241, 244, 244, 245, 245, 270, 270, + 060, + 019, + 001, + 079, + 120, + 120, + 129, + 151, + 151, + 153, + 153, + 181, + 184, + 184, + 185, + 185, + 194, + 194, + 200, + 200, + 201, + 201, + 217, + 217, + 219, + 241, + 241, + 244, + 244, + 245, + 245, + 270, + 270, ]; CollectionAssert.AreEqual(resultArray, testKnownResult); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs index debe28d1..de15b6d4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs @@ -89,6 +89,7 @@ internal static partial class IocHttpClientConfiguration /// HoYoLAB web /// /// 配置后的客户端 + [SuppressMessage("", "IDE0051")] private static void XRpc4Configuration(HttpClient client) { client.Timeout = Timeout.InfiniteTimeSpan; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs index 5d3d9c3b..09397083 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs @@ -109,7 +109,7 @@ internal sealed class WindowController GetWindowPlacement(options.Hwnd, ref windowPlacement); // prevent save value when we are maximized. - if (!windowPlacement.showCmd.HasFlag(SHOW_WINDOW_CMD.SW_SHOWMAXIMIZED)) + if (!windowPlacement.ShowCmd.HasFlag(SHOW_WINDOW_CMD.SW_SHOWMAXIMIZED)) { double scale = 1.0 / options.GetRasterizationScale(); LocalSetting.Set(SettingKeys.WindowRect, (CompactRect)window.AppWindow.GetRect().Scale(scale)); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs index 862cd1be..b4464981 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs @@ -7,7 +7,6 @@ using Snap.Hutao.Core.Windowing.HotKey; using Snap.Hutao.Win32.Foundation; using Snap.Hutao.Win32.UI.Shell; using Snap.Hutao.Win32.UI.WindowsAndMessaging; -using System.Runtime.InteropServices; using static Snap.Hutao.Win32.ComCtl32; using static Snap.Hutao.Win32.ConstValues; using static Snap.Hutao.Win32.User32; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs index e491d8d1..f0942f48 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs @@ -13,43 +13,118 @@ internal static class Materials { public static FrozenSet MondayThursdayItems { get; } = FrozenSet.ToFrozenSet( [ - 104301U, 104302U, 104303U, // 「自由」 - 104310U, 104311U, 104312U, // 「繁荣」 - 104320U, 104321U, 104322U, // 「浮世」 - 104329U, 104330U, 104331U, // 「诤言」 - 104338U, 104339U, 104340U, // 「公平」 - 114001U, 114002U, 114003U, 114004U, // 高塔孤王 - 114013U, 114014U, 114015U, 114016U, // 孤云寒林 - 114025U, 114026U, 114027U, 114028U, // 远海夷地 - 114037U, 114038U, 114039U, 114040U, // 谧林涓露 - 114049U, 114050U, 114051U, 114052U, // 悠古弦音 + 104301U, + 104302U, + 104303U, // 「自由」 + 104310U, + 104311U, + 104312U, // 「繁荣」 + 104320U, + 104321U, + 104322U, // 「浮世」 + 104329U, + 104330U, + 104331U, // 「诤言」 + 104338U, + 104339U, + 104340U, // 「公平」 + 114001U, + 114002U, + 114003U, + 114004U, // 高塔孤王 + 114013U, + 114014U, + 114015U, + 114016U, // 孤云寒林 + 114025U, + 114026U, + 114027U, + 114028U, // 远海夷地 + 114037U, + 114038U, + 114039U, + 114040U, // 谧林涓露 + 114049U, + 114050U, + 114051U, + 114052U, // 悠古弦音 ]); public static FrozenSet TuesdayFridayItems { get; } = FrozenSet.ToFrozenSet( [ - 104304U, 104305U, 104306U, // 「抗争」 - 104313U, 104314U, 104315U, // 「勤劳」 - 104323U, 104324U, 104325U, // 「风雅」 - 104332U, 104333U, 104334U, // 「巧思」 - 104341U, 104342U, 104343U, // 「正义」 - 114005U, 114006U, 114007U, 114008U, // 凛风奔狼 - 114017U, 114018U, 114019U, 114020U, // 雾海云间 - 114029U, 114030U, 114031U, 114032U, // 鸣神御灵 - 114041U, 114042U, 114043U, 114044U, // 绿洲花园 - 114053U, 114054U, 114055U, 114056U, // 纯圣露滴 + 104304U, + 104305U, + 104306U, // 「抗争」 + 104313U, + 104314U, + 104315U, // 「勤劳」 + 104323U, + 104324U, + 104325U, // 「风雅」 + 104332U, + 104333U, + 104334U, // 「巧思」 + 104341U, + 104342U, + 104343U, // 「正义」 + 114005U, + 114006U, + 114007U, + 114008U, // 凛风奔狼 + 114017U, + 114018U, + 114019U, + 114020U, // 雾海云间 + 114029U, + 114030U, + 114031U, + 114032U, // 鸣神御灵 + 114041U, + 114042U, + 114043U, + 114044U, // 绿洲花园 + 114053U, + 114054U, + 114055U, + 114056U, // 纯圣露滴 ]); public static FrozenSet WednesdaySaturdayItems { get; } = FrozenSet.ToFrozenSet( [ - 104307U, 104308U, 104309U, // 「诗文」 - 104316U, 104317U, 104318U, // 「黄金」 - 104326U, 104327U, 104328U, // 「天光」 - 104335U, 104336U, 104337U, // 「笃行」 - 104344U, 104345U, 104346U, // 「秩序」 - 114009U, 114010U, 114011U, 114012U, // 狮牙斗士 - 114021U, 114022U, 114023U, 114024U, // 漆黑陨铁 - 114033U, 114034U, 114035U, 114036U, // 今昔剧画 - 114045U, 114046U, 114047U, 114048U, // 谧林涓露 - 114057U, 114058U, 114059U, 114060U, // 无垢之海 + 104307U, + 104308U, + 104309U, // 「诗文」 + 104316U, + 104317U, + 104318U, // 「黄金」 + 104326U, + 104327U, + 104328U, // 「天光」 + 104335U, + 104336U, + 104337U, // 「笃行」 + 104344U, + 104345U, + 104346U, // 「秩序」 + 114009U, + 114010U, + 114011U, + 114012U, // 狮牙斗士 + 114021U, + 114022U, + 114023U, + 114024U, // 漆黑陨铁 + 114033U, + 114034U, + 114035U, + 114036U, // 今昔剧画 + 114045U, + 114046U, + 114047U, + 114048U, // 谧林涓露 + 114057U, + 114058U, + 114059U, + 114060U, // 无垢之海 ]); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/GuideViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/GuideViewModel.cs index d98650f4..d36d9661 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/GuideViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/GuideViewModel.cs @@ -164,7 +164,7 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel .Select(category => new DownloadSummary(serviceProvider, category)) .ToObservableCollection(); - await Parallel.ForEachAsync([..DownloadSummaries], async (summary, token) => + await Parallel.ForEachAsync([.. DownloadSummaries], async (summary, token) => { if (await summary.DownloadAndExtractAsync().ConfigureAwait(false)) { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/ComCtl32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/ComCtl32.cs index bf32e784..af0736aa 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/ComCtl32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/ComCtl32.cs @@ -8,6 +8,7 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32; +// [SuppressMessage("", "SH002")] [SuppressMessage("", "SYSLIB1054")] internal static class ComCtl32 { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Gdi32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Gdi32.cs index a3a4babb..6cf41ec0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/Gdi32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/Gdi32.cs @@ -7,6 +7,8 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32; +[SuppressMessage("", "SH002")] +[SuppressMessage("", "SYSLIB1054")] internal static class Gdi32 { [DllImport("GDI32.dll", ExactSpelling = true)] diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Kernel32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Kernel32.cs index ab59432b..333acc51 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/Kernel32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/Kernel32.cs @@ -10,6 +10,8 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32; +[SuppressMessage("", "SH002")] +[SuppressMessage("", "SYSLIB1054")] internal static class Kernel32 { [DllImport("KERNEL32.dll", ExactSpelling = true, SetLastError = true)] diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Macros.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Macros.cs index 10d531e8..a261ce73 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/Macros.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/Macros.cs @@ -7,6 +7,7 @@ using System.Runtime.CompilerServices; namespace Snap.Hutao.Win32; +[SuppressMessage("", "SH002")] internal static class Macros { [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Ole32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Ole32.cs index 7195cdbb..fef2009f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/Ole32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/Ole32.cs @@ -8,6 +8,8 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32; +// [SuppressMessage("", "SH002")] +[SuppressMessage("", "SYSLIB1054")] internal static class Ole32 { [DllImport("OLE32.dll", ExactSpelling = true)] diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Registry/REG_SAM_FLAGS.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Registry/REG_SAM_FLAGS.cs index a8e34194..6374c6b9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/Registry/REG_SAM_FLAGS.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/Registry/REG_SAM_FLAGS.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.Registry; +[SuppressMessage("", "CA1069")] [Flags] internal enum REG_SAM_FLAGS : uint { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Shell32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Shell32.cs index 67fa1da0..55bda29c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/Shell32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/Shell32.cs @@ -8,6 +8,8 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32; +[SuppressMessage("", "SH002")] +[SuppressMessage("", "SYSLIB1054")] internal static class Shell32 { [DllImport("SHELL32.dll", ExactSpelling = true)] diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/CLSCTX.cs b/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/CLSCTX.cs index 8c487b09..e58277fa 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/CLSCTX.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/CLSCTX.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.System.Com; +[SuppressMessage("", "CA1069")] [Flags] internal enum CLSCTX : uint { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/STGM.cs b/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/STGM.cs index 6b3eee43..b23eafce 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/STGM.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/System/Com/STGM.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.System.Com; +[SuppressMessage("", "CA1069")] internal enum STGM : uint { STGM_DIRECT = 0u, diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/System/Console/CONSOLE_MODE.cs b/src/Snap.Hutao/Snap.Hutao/Win32/System/Console/CONSOLE_MODE.cs index 4e4bd163..6b6ec074 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/System/Console/CONSOLE_MODE.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/System/Console/CONSOLE_MODE.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.System.Console; +[SuppressMessage("", "CA1069")] [Flags] internal enum CONSOLE_MODE : uint { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/System/Diagnostics/Debug/FACILITY_CODE.cs b/src/Snap.Hutao/Snap.Hutao/Win32/System/Diagnostics/Debug/FACILITY_CODE.cs index 6f3b36e9..4beca576 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/System/Diagnostics/Debug/FACILITY_CODE.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/System/Diagnostics/Debug/FACILITY_CODE.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.System.Diagnostics.Debug; +[SuppressMessage("", "CA1069")] internal enum FACILITY_CODE : uint { FACILITY_NULL = 0u, diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/System/SystemServices/SFGAO_FLAGS.cs b/src/Snap.Hutao/Snap.Hutao/Win32/System/SystemServices/SFGAO_FLAGS.cs index 9c2344fe..d81ac8c5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/System/SystemServices/SFGAO_FLAGS.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/System/SystemServices/SFGAO_FLAGS.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.System.SystemServices; +[SuppressMessage("", "CA1069")] [Flags] internal enum SFGAO_FLAGS : uint { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/System/WinRT/IMemoryBufferByteAccess.cs b/src/Snap.Hutao/Snap.Hutao/Win32/System/WinRT/IMemoryBufferByteAccess.cs index 349c6a45..3b418c31 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/System/WinRT/IMemoryBufferByteAccess.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/System/WinRT/IMemoryBufferByteAccess.cs @@ -6,6 +6,7 @@ using System.Runtime.InteropServices; namespace Snap.Hutao.Win32.System.WinRT; +[SuppressMessage("", "SYSLIB1096")] [ComImport] [Guid("5B0D3235-4DBA-4D44-865E-8F1D0E4FD04D")] [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/INPUT.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/INPUT.cs index 6a56363f..d619c421 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/INPUT.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/INPUT.cs @@ -12,7 +12,7 @@ internal struct INPUT public AnonymousUnion Anonymous; [StructLayout(LayoutKind.Explicit)] - public struct AnonymousUnion + internal struct AnonymousUnion { [FieldOffset(0)] public MOUSEINPUT mi; diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/VIRTUAL_KEY.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/VIRTUAL_KEY.cs index fd4c8ab7..9ae9ee56 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/VIRTUAL_KEY.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Input/KeyboardAndMouse/VIRTUAL_KEY.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.UI.Input.KeyboardAndMouse; +[SuppressMessage("", "CA1069")] internal enum VIRTUAL_KEY : ushort { VK_0 = 48, diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/IFileDialog.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/IFileDialog.cs index 15fb36e1..0be5d970 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/IFileDialog.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/IFileDialog.cs @@ -9,6 +9,7 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32.UI.Shell; +[SuppressMessage("", "SH002")] [SupportedOSPlatform("windows6.0.6000")] internal unsafe struct IFileDialog { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/SIATTRIBFLAGS.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/SIATTRIBFLAGS.cs index e62eb304..f85ab78c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/SIATTRIBFLAGS.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/Shell/SIATTRIBFLAGS.cs @@ -4,6 +4,7 @@ namespace Snap.Hutao.Win32.UI.Shell; [Flags] +[SuppressMessage("", "CA1069")] internal enum SIATTRIBFLAGS { SIATTRIBFLAGS_AND = 1, diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/SHOW_WINDOW_CMD.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/SHOW_WINDOW_CMD.cs index a24d3eac..b756a53d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/SHOW_WINDOW_CMD.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/SHOW_WINDOW_CMD.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.UI.WindowsAndMessaging; +[SuppressMessage("", "CA1069")] internal enum SHOW_WINDOW_CMD : int { SW_HIDE = 0, diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOWPLACEMENT.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOWPLACEMENT.cs index b610fe82..61a3748d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOWPLACEMENT.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOWPLACEMENT.cs @@ -6,21 +6,20 @@ using Snap.Hutao.Win32.Foundation; namespace Snap.Hutao.Win32.UI.WindowsAndMessaging; [SuppressMessage("", "SA1202")] -[SuppressMessage("", "SA1300")] [SuppressMessage("", "SA1307")] internal struct WINDOWPLACEMENT { public uint length; public WINDOWPLACEMENT_FLAGS flags; - private uint privateShowCmd; + private uint showCmd; public POINT ptMinPosition; public POINT ptMaxPosition; public RECT rcNormalPosition; - public SHOW_WINDOW_CMD showCmd + public SHOW_WINDOW_CMD ShowCmd { - get => (SHOW_WINDOW_CMD)privateShowCmd; - set => privateShowCmd = (uint)value; + readonly get => (SHOW_WINDOW_CMD)showCmd; + set => showCmd = (uint)value; } public static unsafe WINDOWPLACEMENT Create() diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_EX_STYLE.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_EX_STYLE.cs index 30d2ba5e..6ab9475c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_EX_STYLE.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_EX_STYLE.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.UI.WindowsAndMessaging; +[SuppressMessage("", "CA1069")] [Flags] internal enum WINDOW_EX_STYLE : uint { diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_LONG_PTR_INDEX.cs b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_LONG_PTR_INDEX.cs index f027e9cb..5b237c76 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_LONG_PTR_INDEX.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/UI/WindowsAndMessaging/WINDOW_LONG_PTR_INDEX.cs @@ -3,6 +3,7 @@ namespace Snap.Hutao.Win32.UI.WindowsAndMessaging; +[SuppressMessage("", "CA1069")] internal enum WINDOW_LONG_PTR_INDEX { GWL_EXSTYLE = -20, diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/User32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/User32.cs index bb60b6e4..9a6ca787 100644 --- a/src/Snap.Hutao/Snap.Hutao/Win32/User32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Win32/User32.cs @@ -10,6 +10,8 @@ using System.Runtime.Versioning; namespace Snap.Hutao.Win32; +[SuppressMessage("", "SH002")] +[SuppressMessage("", "SYSLIB1054")] internal static class User32 { [DllImport("USER32.dll", ExactSpelling = true)]