Cleanup PowerStatus interop (#2041)

* Cleanup PowerStatus interop

* Use BOOLEAN instead of bool

src/Common/src/ExternDll.cs

@@ -25,7 +25,6 @@ internal static class ExternDll
         public const string Oleaut32 = "oleaut32.dll";
         public const string Olepro32 = "olepro32.dll";
         public const string PerfCounter = "perfcounter.dll";
-        public const string Powrprof = "Powrprof.dll";
         public const string Psapi = "psapi.dll";
         public const string Shell32 = "shell32.dll";
         public const string User32 = "user32.dll";

src/Common/src/Interop/Interop.BOOLEAN.cs

@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using static Interop;
+
+internal partial class Interop
+{
+    /// <summary>
+    ///  Blittable version of Windows BOOLEAN type. It is convenient in situations where
+    ///  manual marshalling is required, or to avoid overhead of regular BOOLEAN marshalling.
+    /// </summary>
+    /// <remarks>
+    ///  Some Windows APIs return arbitrary integer values although the return type is defined
+    ///  as BOOL. It is best to never compare BOOLEAN to TRUE. Always use bResult != BOOLEAN.FALSE
+    ///  or bResult == BOOLEAN.FALSE .
+    /// </remarks>
+    internal enum BOOLEAN : byte
+    {
+        FALSE = 0,
+        TRUE = 1,
+    }
+}
+
+internal static class BooleanExtensions
+{
+    public static bool IsTrue(this BOOLEAN b) => b != BOOLEAN.FALSE;
+    public static bool IsFalse(this BOOLEAN b) => b == BOOLEAN.FALSE;
+    public static BOOLEAN ToBOOLEAN(this bool b) => b ? BOOLEAN.TRUE : BOOLEAN.FALSE;
+}

src/Common/src/Interop/Interop.Libraries.cs

@@ -13,6 +13,7 @@ public static partial class Libraries
         public const string NtDll = "ntdll.dll";
         public const string Ole32 = "ole32.dll";
         public const string Oleaut32 = "oleaut32.dll";
+        public const string Powrprof = "Powrprof.dll";
         public const string RichEdit41 = "MsftEdit.DLL";
         public const string Shell32 = "shell32.dll";
         public const string Shlwapi = "shlwapi.dll";

src/Common/src/Interop/Kernel32/Interop.GetSystemPowerStatus.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+internal partial class Interop
+{
+    internal partial class Kernel32
+    {
+        [DllImport(Libraries.Kernel32, ExactSpelling = true)]
+        public static extern BOOL GetSystemPowerStatus(ref SYSTEM_POWER_STATUS lpSystemPowerStatus);
+    }
+}

src/Common/src/Interop/Kernel32/Interop.SYSTEM_POWER_STATUS.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+internal partial class Interop
+{
+    internal partial class Kernel32
+    {
+        public struct SYSTEM_POWER_STATUS
+        {
+            public byte ACLineStatus;
+            public byte BatteryFlag;
+            public byte BatteryLifePercent;
+            public byte Reserved1;
+            public int BatteryLifeTime;
+            public int BatteryFullLifeTime;
+        }
+    }
+}

src/Common/src/Interop/Powrprof/Interop.SetSuspendState.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+internal partial class Interop
+{
+    internal partial class Powrprof
+    {
+        [DllImport(Libraries.Powrprof, ExactSpelling = true, SetLastError = true)]
+        public static extern BOOLEAN SetSuspendState(BOOLEAN bHibernate, BOOLEAN bForce, BOOLEAN bWakeupEventsDisabled);
+    }
+}

src/Common/src/NativeMethods.cs

@@ -3175,17 +3175,6 @@ internal static string GetLocalPath(string fileName)
             return uri.LocalPath + uri.Fragment;
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SYSTEM_POWER_STATUS
-        {
-            public byte ACLineStatus;
-            public byte BatteryFlag;
-            public byte BatteryLifePercent;
-            public byte Reserved1;
-            public int BatteryLifeTime;
-            public int BatteryFullLifeTime;
-        }
-
         public enum PROCESS_DPI_AWARENESS
         {
             PROCESS_DPI_UNINITIALIZED = -1,

src/Common/src/UnsafeNativeMethods.cs

@@ -598,14 +598,6 @@ public static IntPtr SetWindowLong(HandleRef hWnd, int nIndex, NativeMethods.Wnd
         [DllImport(ExternDll.User32, ExactSpelling = true, SetLastError = true)]
         public static extern uint GetDpiForWindow(HandleRef hWnd);
 
-        // For system power status
-        //
-        [DllImport(ExternDll.Kernel32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern bool GetSystemPowerStatus([In, Out] ref NativeMethods.SYSTEM_POWER_STATUS systemPowerStatus);
-
-        [DllImport(ExternDll.Powrprof, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern bool SetSuspendState(bool hiberate, bool forceCritical, bool disableWakeEvent);
-
         //for RegionData
         [DllImport(ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = System.Runtime.InteropServices.CharSet.Auto)]
         public static extern int GetRegionData(HandleRef hRgn, int size, IntPtr lpRgnData);

src/System.Windows.Forms.Design.Editors/src/Misc/ExternDll.cs

@@ -54,7 +54,6 @@ internal static class ExternDll
         public const string Oleaut32 = "oleaut32.dll";
         public const string Olepro32 = "olepro32.dll";
         public const string PerfCounter = "perfcounter.dll";
-        public const string Powrprof = "Powrprof.dll";
         public const string Psapi = "psapi.dll";
         public const string Shell32 = "shell32.dll";
         public const string User32 = "user32.dll";

src/System.Windows.Forms/src/System/Windows/Forms/Application.cs

@@ -1241,7 +1241,7 @@ public static void SetCompatibleTextRenderingDefault(bool defaultValue)
         ///  Returns true if the call succeeded, else false.
         /// </summary>
         public static bool SetSuspendState(PowerState state, bool force, bool disableWakeEvent)
-            => UnsafeNativeMethods.SetSuspendState(state == PowerState.Hibernate, force, disableWakeEvent);
+            => Powrprof.SetSuspendState((state == PowerState.Hibernate).ToBOOLEAN(), force.ToBOOLEAN(), disableWakeEvent.ToBOOLEAN()).IsTrue();
 
         /// <summary>
         ///  Overload version of SetUnhandledExceptionMode that sets the UnhandledExceptionMode

src/System.Windows.Forms/src/System/Windows/Forms/PowerStatus.cs

@@ -2,11 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using static Interop;
+
 namespace System.Windows.Forms
 {
     public class PowerStatus
     {
-        private NativeMethods.SYSTEM_POWER_STATUS _systemPowerStatus;
+        private Kernel32.SYSTEM_POWER_STATUS _systemPowerStatus;
 
         internal PowerStatus()
         {
@@ -58,9 +60,6 @@ public int BatteryLifeRemaining
             }
         }
 
-        private void UpdateSystemPowerStatus()
-        {
-            UnsafeNativeMethods.GetSystemPowerStatus(ref _systemPowerStatus);
-        }
+        private void UpdateSystemPowerStatus() => Kernel32.GetSystemPowerStatus(ref _systemPowerStatus);
     }
 }