NativeMethods replaced with common WinApiHelper

Author: sergiye

OpenHardwareMonitor/OpenHardwareMonitor.csproj

@@ -84,6 +84,7 @@
     <Compile Include="..\..\common\sergiye.Common\SerializerHelper.cs" Link="common\SerializerHelper.cs" />
     <Compile Include="..\..\common\sergiye.Common\Updater.cs" Link="common\Updater.cs" />
     <Compile Include="..\..\common\sergiye.Common\Crasher.cs" Link="common\Crasher.cs" />
+    <Compile Include="..\..\common\sergiye.Common\WinApiHelper.cs" Link="common\WinApiHelper.cs" />
     <Compile Include="..\..\common\sergiye.Common.UI\PersistentSettings.cs" Link="common\PersistentSettings.cs" />
     <Compile Include="..\..\common\sergiye.Common.UI\Themes\CustomTheme.cs" Link="common\Themes\CustomTheme.cs" />
     <Compile Include="..\..\common\sergiye.Common.UI\Themes\DarkTheme.cs" Link="common\Themes\DarkTheme.cs" />

OpenHardwareMonitor/UI/MainForm.cs

@@ -961,20 +961,15 @@ private void SysTrayHideShow()
 
     protected override void WndProc(ref Message m)
     {
-        const int WM_SYSCOMMAND = 0x112;
-        const int WM_WININICHANGE = 0x001A;
-        const int SC_MINIMIZE = 0xF020;
-        const int SC_CLOSE = 0xF060;
-
-        if (_minimizeToTray.Value && m.Msg == WM_SYSCOMMAND && m.WParam.ToInt64() == SC_MINIMIZE)
+        if (_minimizeToTray.Value && m.Msg == WinApiHelper.WM_SYS_COMMAND && m.WParam.ToInt64() == WinApiHelper.SC_MINIMIZE)
         {
             SysTrayHideShow();
         }
-        else if (m.Msg == WM_WININICHANGE && Marshal.PtrToStringUni(m.LParam) == "ImmersiveColorSet" && _autoThemeMenuItem?.Checked == true)
+        else if (m.Msg == WinApiHelper.WM_WININICHANGE && Marshal.PtrToStringUni(m.LParam) == "ImmersiveColorSet" && _autoThemeMenuItem?.Checked == true)
         {
             Theme.SetAutoTheme();
         }
-        else if (_minimizeOnClose.Value && m.Msg == WM_SYSCOMMAND && m.WParam.ToInt64() == SC_CLOSE)
+        else if (_minimizeOnClose.Value && m.Msg == WinApiHelper.WM_SYS_COMMAND && m.WParam.ToInt64() == WinApiHelper.SC_CLOSE)
         {
             //Apparently the user wants to minimize rather than close
             //Now we still need to check if we're going to the tray or not
@@ -986,13 +981,13 @@ protected override void WndProc(ref Message m)
             else
                 WindowState = FormWindowState.Minimized;
         }
-        else if (m.Msg == NativeMethods.WM_USER + 1)
+        else if (m.Msg == WinApiHelper.WM_SHOWME)
         {
             Visible = true;
             WindowState = FormWindowState.Normal;
             Activate();
             BringToFront();
-            NativeMethods.SetForegroundWindow(this.Handle);
+            WinApiHelper.SetForegroundWindow(this.Handle);
         }
         else
         {

OpenHardwareMonitor/UI/ShowDesktop.cs

@@ -21,7 +21,7 @@ private ShowDesktop()
 
         CreateParams cp = new CreateParams { ExStyle = GadgetWindow.WS_EX_TOOLWINDOW, Caption = _referenceWindowCaption };
         _referenceWindow.CreateHandle(cp);
-        NativeMethods.SetWindowPos(_referenceWindow.Handle,
+        WinApiHelper.SetWindowPos(_referenceWindow.Handle,
                                    GadgetWindow.HWND_BOTTOM,
                                    0,
                                    0,
@@ -82,23 +82,23 @@ private void StopTimer()
     // the desktop worker window (if available) can hide the reference window
     private IntPtr GetDesktopWorkerWindow()
     {
-        IntPtr shellWindow = NativeMethods.GetShellWindow();
+        IntPtr shellWindow = WinApiHelper.GetShellWindow();
         if (shellWindow == IntPtr.Zero)
             return IntPtr.Zero;
 
 
-        NativeMethods.GetWindowThreadProcessId(shellWindow, out int shellId);
+        WinApiHelper.GetWindowThreadProcessId(shellWindow, out int shellId);
 
         IntPtr workerWindow = IntPtr.Zero;
-        while ((workerWindow = NativeMethods.FindWindowEx(IntPtr.Zero, workerWindow, "WorkerW", null)) != IntPtr.Zero)
+        while ((workerWindow = WinApiHelper.FindWindowEx(IntPtr.Zero, workerWindow, "WorkerW", null)) != IntPtr.Zero)
         {
-            NativeMethods.GetWindowThreadProcessId(workerWindow, out int workerId);
+            WinApiHelper.GetWindowThreadProcessId(workerWindow, out int workerId);
             if (workerId == shellId)
             {
-                IntPtr window = NativeMethods.FindWindowEx(workerWindow, IntPtr.Zero, "SHELLDLL_DefView", null);
+                IntPtr window = WinApiHelper.FindWindowEx(workerWindow, IntPtr.Zero, "SHELLDLL_DefView", null);
                 if (window != IntPtr.Zero)
                 {
-                    IntPtr desktopWindow = NativeMethods.FindWindowEx(window, IntPtr.Zero, "SysListView32", null);
+                    IntPtr desktopWindow = WinApiHelper.FindWindowEx(window, IntPtr.Zero, "SysListView32", null);
                     if (desktopWindow != IntPtr.Zero)
                         return workerWindow;
                 }
@@ -116,7 +116,7 @@ private void OnTimer(object state)
         if (workerWindow != IntPtr.Zero)
         {
             // search if the reference window is behind the worker window
-            IntPtr reference = NativeMethods.FindWindowEx(IntPtr.Zero, workerWindow, null, _referenceWindowCaption);
+            IntPtr reference = WinApiHelper.FindWindowEx(IntPtr.Zero, workerWindow, null, _referenceWindowCaption);
             showDesktopDetected = reference != IntPtr.Zero;
         }
         else
@@ -132,30 +132,3 @@ private void OnTimer(object state)
         }
     }
 }
-
-internal static class NativeMethods
-{
-    internal const int WM_USER = 0x0400;
-    private const string USER = "user32.dll";
-
-    [DllImport(USER, CallingConvention = CallingConvention.Winapi)]
-    public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
-
-    [DllImport("user32.dll", EntryPoint = "SendMessageA", SetLastError = true)]
-    internal static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, int wParam, IntPtr lParam);
-
-    [DllImport("user32.dll")]
-    internal static extern bool SetForegroundWindow(IntPtr hWnd);
-
-    [DllImport(USER, CallingConvention = CallingConvention.Winapi)]
-    public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
-
-    [DllImport("user32.dll")]
-    internal static extern IntPtr FindWindow(string className, string windowName);
-
-    [DllImport(USER, CallingConvention = CallingConvention.Winapi)]
-    public static extern IntPtr GetShellWindow();
-
-    [DllImport(USER, CallingConvention = CallingConvention.Winapi)]
-    public static extern int GetWindowThreadProcessId(IntPtr hWnd, out int processId);
-}