[POWERCFG] Various enhancements (reactos#8389)

- Don't hardcode buffer sizes.
- `ShowWindow()` 2nd parameter is an `SW_*` flag, not `TRUE`/`FALSE`.
- The "FIXME: Add battery page" comment is outdated since commit 4bdbb30
- Use standard `IDC_STATIC` instead of `-1` for resource control IDs.
- `AUTOCHECKBOX` already contains `WS_TABSTOP`, no need to add it explicitly.
- Reformat file headers.

Author: HBelusca

dll/cpl/powercfg/advanced.c

@@ -1,12 +1,11 @@
 /*
- * PROJECT:         ReactOS Power Configuration Applet
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            dll/cpl/powercfg/advanced.c
- * PURPOSE:         advanced tab of applet
- * PROGRAMMERS:     Alexander Wurzinger (Lohnegrim at gmx dot net)
- *                  Johannes Anderwald ([email protected])
- *                  Martin Rottensteiner
- *                  Dmitry Chapyshev ([email protected])
+ * PROJECT:     ReactOS Power Configuration Applet
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Advanced tab
+ * COPYRIGHT:   Copyright 2006 Alexander Wurzinger <[email protected]>
+ *              Copyright 2006 Johannes Anderwald <[email protected]>
+ *              Copyright 2006 Martin Rottensteiner <[email protected]>
+ *              Copyright 2019 Eric Kohl <[email protected]>
  */
 
 #include "powercfg.h"
@@ -48,7 +47,7 @@ AddItem(HWND hDlgCtrl, INT ResourceId, LPARAM lParam, POWER_ACTION * lpAction)
     TCHAR szBuffer[MAX_PATH];
     LRESULT Index;
 
-    if (LoadString(hApplet, ResourceId, szBuffer, MAX_PATH) < MAX_PATH)
+    if (LoadString(hApplet, ResourceId, szBuffer, _countof(szBuffer)) < _countof(szBuffer))
     {
         Index = SendMessage(hDlgCtrl, CB_INSERTSTRING, -1, (LPARAM)szBuffer);
         if (Index != CB_ERR)
@@ -78,18 +77,8 @@ IsBatteryUsed(VOID)
 {
     SYSTEM_BATTERY_STATE sbs;
 
-    if (CallNtPowerInformation(SystemBatteryState,NULL, (ULONG)0, &sbs, sizeof(SYSTEM_BATTERY_STATE)) == STATUS_SUCCESS)
-    {
-        if (sbs.BatteryPresent)
-        {
-            if (sbs.AcOnLine)
-            {
-                return FALSE;
-            }
-            return TRUE;
-        }
-    }
-
+    if (CallNtPowerInformation(SystemBatteryState, NULL, 0, &sbs, sizeof(sbs)) == STATUS_SUCCESS)
+        return (sbs.BatteryPresent && !sbs.AcOnLine);
     return FALSE;
 }
 
@@ -108,7 +97,6 @@ GetPowerActionFromPolicy(
     // for PowerActionWarmEject + PowerActionShutdown but sets it
     // to PowerActionNone and sets the Flags & EventCode
 
-
      _stprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags);
      MessageBoxW(NULL, szBuffer, NULL, MB_OK);
 
@@ -118,18 +106,12 @@ GetPowerActionFromPolicy(
     {
         if (Policy->Flags == (POWER_ACTION_UI_ALLOWED | POWER_ACTION_QUERY_ALLOWED))
         {
-            if (Policy->EventCode  == POWER_FORCE_TRIGGER_RESET)
-            {
+            if (Policy->EventCode == POWER_FORCE_TRIGGER_RESET)
                 poAction = PowerActionNone;
-            }
-            else if (Policy->EventCode  == POWER_USER_NOTIFY_BUTTON)
-            {
+            else if (Policy->EventCode == POWER_USER_NOTIFY_BUTTON)
                 poAction = PowerActionWarmEject;
-            }
             else if (Policy->EventCode == POWER_USER_NOTIFY_SHUTDOWN)
-            {
                 poAction = PowerActionShutdown;
-            }
         }
     }
     else
@@ -278,15 +260,9 @@ VOID
 Adv_InitDialog(
     HWND hwndDlg)
 {
-    HWND hList1;
-    HWND hList2;
-    HWND hList3;
-
-    BOOLEAN bSuspend;
-    BOOLEAN bHibernate;
-    BOOLEAN bShutdown;
+    HWND hList1, hList2, hList3;
+    BOOLEAN bSuspend, bHibernate, bShutdown;
     BOOL bEnabled;
-
     SYSTEM_POWER_CAPABILITIES spc;
 
     bEnabled = GetSystrayPowerIconState();
@@ -315,92 +291,74 @@ Adv_InitDialog(
     hList1 = GetDlgItem(hwndDlg, IDC_LIDCLOSE);
     SendMessage(hList1, CB_RESETCONTENT, 0, 0);
 
-    memset(g_SystemBatteries, 0x0, sizeof(g_SystemBatteries));
+    ZeroMemory(g_SystemBatteries, sizeof(g_SystemBatteries));
     if (spc.SystemBatteriesPresent)
     {
         AddItem(hList1, IDS_PowerActionNone1, (LPARAM)PowerActionNone, g_SystemBatteries);
 
         if (bSuspend)
-        {
             AddItem(hList1, IDS_PowerActionSleep, (LPARAM)PowerActionSleep, g_SystemBatteries);
-        }
 
         if (bHibernate)
-        {
             AddItem(hList1, IDS_PowerActionHibernate, (LPARAM)PowerActionHibernate, g_SystemBatteries);
-        }
     }
     else
     {
-        ShowWindow(GetDlgItem(hwndDlg, IDC_VIDEODIMDISPLAY), FALSE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_SLIDCLOSE), FALSE);
-        ShowWindow(hList1, FALSE);
+        ShowWindow(GetDlgItem(hwndDlg, IDC_VIDEODIMDISPLAY), SW_HIDE);
+        ShowWindow(GetDlgItem(hwndDlg, IDC_SLIDCLOSE), SW_HIDE);
+        ShowWindow(hList1, SW_HIDE);
     }
 
     hList2 = GetDlgItem(hwndDlg, IDC_POWERBUTTON);
     SendMessage(hList2, CB_RESETCONTENT, 0, 0);
 
-    memset(g_PowerButton, 0x0, sizeof(g_PowerButton));
+    ZeroMemory(g_PowerButton, sizeof(g_PowerButton));
     if (spc.PowerButtonPresent)
     {
         AddItem(hList2, IDS_PowerActionNone1, (LPARAM)PowerActionNone, g_PowerButton);
         AddItem(hList2, IDS_PowerActionWarmEject, (LPARAM)PowerActionWarmEject, g_PowerButton);
 
         if (bSuspend)
-        {
             AddItem(hList2, IDS_PowerActionSleep, (LPARAM)PowerActionSleep, g_PowerButton);
-        }
 
         if (bHibernate)
-        {
             AddItem(hList2, IDS_PowerActionHibernate, (LPARAM)PowerActionHibernate, g_PowerButton);
-        }
 
         if (bShutdown)
-        {
             AddItem(hList2, IDS_PowerActionShutdown, (LPARAM)PowerActionShutdown, g_PowerButton);
-        }
     }
     else
     {
-        ShowWindow(GetDlgItem(hwndDlg, IDC_SPOWERBUTTON), FALSE);
-        ShowWindow(hList2, FALSE);
+        ShowWindow(GetDlgItem(hwndDlg, IDC_SPOWERBUTTON), SW_HIDE);
+        ShowWindow(hList2, SW_HIDE);
     }
 
     hList3 = GetDlgItem(hwndDlg, IDC_SLEEPBUTTON);
     SendMessage(hList3, CB_RESETCONTENT, 0, 0);
-    memset(g_SleepButton, 0x0, sizeof(g_SleepButton));
 
+    ZeroMemory(g_SleepButton, sizeof(g_SleepButton));
     if (spc.SleepButtonPresent)
     {
         AddItem(hList3, IDS_PowerActionNone1, (LPARAM)PowerActionNone, g_SleepButton);
         AddItem(hList3, IDS_PowerActionWarmEject, (LPARAM)PowerActionWarmEject, g_SleepButton);
 
         if (bSuspend)
-        {
             AddItem(hList3, IDS_PowerActionSleep, (LPARAM)PowerActionSleep, g_SleepButton);
-        }
 
         if (bHibernate)
-        {
             AddItem(hList3, IDS_PowerActionHibernate, (LPARAM)PowerActionHibernate, g_SleepButton);
-        }
 
         if (bShutdown)
-        {
             AddItem(hList3, IDS_PowerActionShutdown, (LPARAM)PowerActionShutdown, g_SleepButton);
-        }
     }
     else
     {
-        ShowWindow(GetDlgItem(hwndDlg, IDC_SSLEEPBUTTON), FALSE);
-        ShowWindow(hList3, FALSE);
+        ShowWindow(GetDlgItem(hwndDlg, IDC_SSLEEPBUTTON), SW_HIDE);
+        ShowWindow(hList3, SW_HIDE);
     }
 
     if (ReadGlobalPwrPolicy(&gGPP))
-    {
         ShowCurrentPowerActionPolicies(hwndDlg, &spc);
-    }
 }
 
 static VOID

dll/cpl/powercfg/alarms.c

@@ -1,12 +1,10 @@
 /*
- * PROJECT:         ReactOS Power Configuration Applet
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            dll/cpl/powercfg/alarms.c
- * PURPOSE:         alarms tab of applet
- * PROGRAMMERS:     Alexander Wurzinger (Lohnegrim at gmx dot net)
- *                  Johannes Anderwald ([email protected])
- *                  Martin Rottensteiner
- *                  Dmitry Chapyshev ([email protected])
+ * PROJECT:     ReactOS Power Configuration Applet
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Alarms tab
+ * COPYRIGHT:   Copyright 2006 Alexander Wurzinger <[email protected]>
+ *              Copyright 2006 Johannes Anderwald <[email protected]>
+ *              Copyright 2006 Martin Rottensteiner <[email protected]>
  */
 
 #include "powercfg.h"
@@ -23,73 +21,65 @@ Ala_InitData(HWND hwndDlg)
     TCHAR szProgram[MAX_PATH];
 
     if (!ReadGlobalPwrPolicy(&gGPP))
-    {
         return FALSE;
-    }
 
     if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].Enable)
     {
         CheckDlgButton(hwndDlg, IDC_ALARM1,
             gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].Enable ? BST_CHECKED : BST_UNCHECKED);
 
-        if (LoadString(hApplet, IDS_PERCENT, szTemp, MAX_PATH))
+        if (LoadString(hApplet, IDS_PERCENT, szTemp, _countof(szTemp)))
         {
             _stprintf(szBatteryLevel, szTemp, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel);
             SetDlgItemText(hwndDlg, IDC_ALARMVALUE1, szBatteryLevel);
         }
 
         SendDlgItemMessage(hwndDlg, IDC_ALARMBAR1,
-            TBM_SETRANGE,
-            (WPARAM)TRUE,
-            (LPARAM)MAKELONG(0, 100));
+                           TBM_SETRANGE,
+                           (WPARAM)TRUE,
+                           (LPARAM)MAKELONG(0, 100));
         SendDlgItemMessage(hwndDlg, IDC_ALARMBAR1,
-            TBM_SETTICFREQ,
-            (WPARAM)TRUE,
-            (LPARAM)20);
+                           TBM_SETTICFREQ,
+                           (WPARAM)TRUE,
+                           (LPARAM)20);
         SendDlgItemMessage(hwndDlg, IDC_ALARMBAR1,
-            TBM_SETPOS,
-            (WPARAM)TRUE,
-            (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel);
+                           TBM_SETPOS,
+                           (WPARAM)TRUE,
+                           (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel);
 
-        if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH))
+        if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].PowerPolicy.Action+IDS_PowerActionNone1, szAction, _countof(szAction)))
         {
             SetDlgItemText(hwndDlg, IDC_ALARMAKTION1, szAction);
         }
 
-        memset(szMessage, 0x0, sizeof(szMessage));
-        LoadString(hApplet, IDS_NOACTION, szMessage, MAX_PATH);
+        ZeroMemory(szMessage, sizeof(szMessage));
+        LoadString(hApplet, IDS_NOACTION, szMessage, _countof(szMessage));
 
         if (LOWORD(gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].PowerPolicy.EventCode) & POWER_LEVEL_USER_NOTIFY_TEXT)
         {
             if (LOWORD(gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].PowerPolicy.EventCode) & POWER_LEVEL_USER_NOTIFY_SOUND)
             {
-                if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH) && LoadString(hApplet, IDS_TEXT, szText, MAX_PATH))
-                {
-                    _stprintf(szMessage,_T("%s, %s"),szSound,szText);
-                }
+                if (LoadString(hApplet, IDS_SOUND, szSound, _countof(szSound)) && LoadString(hApplet, IDS_TEXT, szText, _countof(szText)))
+                    _stprintf(szMessage, _T("%s, %s"), szSound, szText);
             }
             else
             {
-                if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH))
-                {
-                    _stprintf(szMessage,_T("%s"),szText);
-                }
+                if (LoadString(hApplet, IDS_TEXT, szText, _countof(szText)))
+                    _stprintf(szMessage, _T("%s"), szText);
             }
         }
         else
         {
             if (LOWORD(gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].PowerPolicy.EventCode) & POWER_LEVEL_USER_NOTIFY_SOUND)
             {
-                if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH))
-                {
-                    _stprintf(szMessage,_T("%s"),szSound);
-                }
+                if (LoadString(hApplet, IDS_SOUND, szSound, _countof(szSound)))
+                    _stprintf(szMessage, _T("%s"), szSound);
             }
         }
 
         SetDlgItemText(hwndDlg, IDC_ALARMMSG1, szMessage);
 
-        if (LoadString(hApplet, IDS_PowerActionNone2, szProgram, MAX_PATH))
+        if (LoadString(hApplet, IDS_PowerActionNone2, szProgram, _countof(szProgram)))
         {
             SetDlgItemText(hwndDlg, IDC_ALARMPROG1, szProgram);
         }
@@ -100,60 +90,54 @@ Ala_InitData(HWND hwndDlg)
         CheckDlgButton(hwndDlg, IDC_ALARM2,
             gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED);
 
-        if (LoadString(hApplet, IDS_PERCENT, szTemp, MAX_PATH))
+        if (LoadString(hApplet, IDS_PERCENT, szTemp, _countof(szTemp)))
         {
             _stprintf(szBatteryLevel, szTemp, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel);
             SetDlgItemText(hwndDlg, IDC_ALARMVALUE2, szBatteryLevel);
         }
 
         SendDlgItemMessage(hwndDlg, IDC_ALARMBAR2,
-            TBM_SETRANGE,
-            (WPARAM)TRUE,
-            (LPARAM)MAKELONG(0, 100));
+                           TBM_SETRANGE,
+                           (WPARAM)TRUE,
+                           (LPARAM)MAKELONG(0, 100));
         SendDlgItemMessage(hwndDlg, IDC_ALARMBAR2,
-            TBM_SETPOS,
-            (WPARAM)TRUE,
-            (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel);
+                           TBM_SETPOS,
+                           (WPARAM)TRUE,
+                           (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel);
 
-        if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH))
+        if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, _countof(szAction)))
         {
             SetDlgItemText(hwndDlg, IDC_ALARMAKTION2, szAction);
         }
 
-        memset(szMessage, 0x0, sizeof(szMessage));
-        LoadString(hApplet, IDS_NOACTION, szMessage, MAX_PATH);
+        ZeroMemory(szMessage, sizeof(szMessage));
+        LoadString(hApplet, IDS_NOACTION, szMessage, _countof(szMessage));
 
         if (LOWORD(gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.EventCode) & POWER_LEVEL_USER_NOTIFY_TEXT)
         {
             if (LOWORD(gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.EventCode) & POWER_LEVEL_USER_NOTIFY_SOUND)
             {
-                if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH) && LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH))
-                {
-                    _stprintf(szMessage,_T("%s, %s"),szSound,szText);
-                }
+                if (LoadString(hApplet, IDS_TEXT, szText, _countof(szText)) && LoadString(hApplet, IDS_SOUND, szSound, _countof(szSound)))
+                    _stprintf(szMessage, _T("%s, %s"), szSound, szText);
             }
             else
             {
-                if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH))
-                {
-                    _stprintf(szMessage,_T("%s"),szText);
-                }
+                if (LoadString(hApplet, IDS_TEXT, szText, _countof(szText)))
+                    _stprintf(szMessage, _T("%s"), szText);
             }
         }
         else
         {
             if (LOWORD(gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.EventCode) & POWER_LEVEL_USER_NOTIFY_SOUND)
             {
-                if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH))
-                {
-                    _stprintf(szMessage,_T("%s"),szSound);
-                }
+                if (LoadString(hApplet, IDS_SOUND, szSound, _countof(szSound)))
+                    _stprintf(szMessage, _T("%s"), szSound);
             }
         }
 
         SetDlgItemText(hwndDlg, IDC_ALARMMSG2, szMessage);
 
-        if (LoadString(hApplet, IDS_PowerActionNone2, szProgram, MAX_PATH))
+        if (LoadString(hApplet, IDS_PowerActionNone2, szProgram, _countof(szProgram)))
         {
             SetDlgItemText(hwndDlg, IDC_ALARMPROG2, szProgram);
         }