SonarQube cleanup + always-on context-menu icons

* ZipRegistry: MenuIcons defaults ON when no registry value
  (Key_Get_BoolPair_true, matches Cascaded/ElimDup).
* ContextMenu.cpp: drop the ci.MenuIcons.Val conditional — shell
  context-menu icons are now unconditional.
* g_bProcessError -> ProgressDialog_SetError()/HadError() pair backed
  by a function-local static in an anonymous namespace (3x S5421).
  Callers in App.cpp and ExtractGUI.cpp updated.
* CProgressDialog: extract 3 SysTray methods + state into a CSysTray
  helper struct (Icons, IconArrayId, Menu, LoadIcons, UpdateIcon,
  BuildPopupMenu). Class falls 38 -> 35 methods, fixes S1448.
  Behavior unchanged.
* wchar_t buf[N] -> std::array<wchar_t, N> in BrowseDialog (szFree,
  szTotal), ProgressDialog2 (szPercent, tip): 4x S5945.
* HICON[] -> std::array<HICON, N> (S5945), Z7_ARRAY_SIZE for szTip
  (S7127), range-for loops for icon arrays (2x S5566).
* CopyDialog.h: CCopyDialog() = default (S3490).
* ExtractDialog.h: PathMode_Force in-class init, ctor body-only (S3230).

Author: 3V0S8N

CPP/7zip/UI/Common/ZipRegistry.cpp

@@ -646,7 +646,7 @@ void CContextMenuInfo::Load()
 
   Key_Get_BoolPair_true(key, kCascadedMenu, Cascaded);
   Key_Get_BoolPair_true(key, kElimDup, ElimDup);
-  Key_Get_BoolPair(key, kMenuIcons, MenuIcons);
+  Key_Get_BoolPair_true(key, kMenuIcons, MenuIcons);
 
   Key_Get_UInt32(key, kWriteZoneId, WriteZone);
 

CPP/7zip/UI/Explorer/ContextMenu.cpp

@@ -648,14 +648,10 @@ Z7_COMWF_B CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
   _elimDup = ci.ElimDup;
   _writeZone = ci.WriteZone;
 
-  HBITMAP bitmap = NULL;
-  if (ci.MenuIcons.Val)
-  {
-    ODS("### 45")
-    if (!_bitmap)
-      _bitmap = ::LoadBitmap(g_hInstance, MAKEINTRESOURCE(IDB_MENU_LOGO));
-    bitmap = _bitmap;
-  }
+  ODS("### 45")
+  if (!_bitmap)
+    _bitmap = ::LoadBitmap(g_hInstance, MAKEINTRESOURCE(IDB_MENU_LOGO));
+  HBITMAP bitmap = _bitmap;
 
   UINT subIndex = indexMenu;
 

CPP/7zip/UI/FileManager/App.cpp

@@ -41,8 +41,6 @@ using namespace NName;
 
 extern HINSTANCE g_hInstance;
 
-extern bool g_bProcessError;
-
 #define kTempDirPrefix FTEXT("7zE")
 
 // Walk up, delete found archive.
@@ -853,7 +851,7 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
     SaveCopyHistory(copyFolders);
   }
 
-  g_bProcessError = false;
+  ProgressDialog_SetError(false);
 
   bool useSrcPanel = !useDestPanel || !srcPanel.Is_IO_FS_Folder();
 
@@ -952,7 +950,7 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
   disableNotify2.Restore();
   srcPanel.SetFocusToList();
 
-  if (!g_bProcessError && result == S_OK)
+  if (!ProgressDialog_HadError() && result == S_OK)
   {
     if (openOutputFolder && NFind::DoesDirExist_FollowLink(us2fs(destPath)))
     {

CPP/7zip/UI/FileManager/BrowseDialog.cpp

@@ -1,7 +1,9 @@
 // BrowseDialog.cpp
- 
+
 #include "StdAfx.h"
 
+#include <array>
+
 #include "../../../Common/MyWindows.h"
 
 #include "../../../Common/IntToString.h"
@@ -628,13 +630,13 @@ void FormatPathFreeSpace(UString &strPath, UString &strText)
   if (!GetDiskFreeSpaceExW(strPath, &freeBytes, &totalBytes, &totalFree))
     return;
 
-  wchar_t szFree[40];
-  wchar_t szTotal[40];
-  FreeSpace_ConvertSizeToString(totalFree.QuadPart, szFree);
-  FreeSpace_ConvertSizeToString(totalBytes.QuadPart, szTotal);
-  strText = szFree;
+  std::array<wchar_t, 40> szFree;
+  std::array<wchar_t, 40> szTotal;
+  FreeSpace_ConvertSizeToString(totalFree.QuadPart, szFree.data());
+  FreeSpace_ConvertSizeToString(totalBytes.QuadPart, szTotal.data());
+  strText = szFree.data();
   strText += L" Free (Total: ";
-  strText += szTotal;
+  strText += szTotal.data();
   strText += L")";
 }
 

CPP/7zip/UI/FileManager/CopyDialog.h

@@ -27,7 +27,7 @@ class CCopyDialog: public NWindows::NControl::CModalDialog
   void ShowPathFreeSpace(UString & strPath);
 
 public:
-  CCopyDialog() {}
+  CCopyDialog() = default;
 
   UString Title;
   UString Static;

CPP/7zip/UI/FileManager/ProgressDialog2.cpp

@@ -26,8 +26,17 @@ using namespace NWindows;
 
 extern HINSTANCE g_hInstance;
 extern bool g_DisableUserQuestions;
-// Set true by CProgressDialog when error messages occur.
-bool g_bProcessError = false;
+
+namespace {
+  bool& ProcessErrorRef()
+  {
+    static bool s_error = false;
+    return s_error;
+  }
+}
+
+void ProgressDialog_SetError(bool error) { ProcessErrorRef() = error; }
+bool ProgressDialog_HadError()           { return ProcessErrorRef(); }
 
 static const UINT WM_TRAY_ICON_NOTIFY = WM_APP + 10;
 static const UINT ID_SYSTRAY_ICON     = 100;
@@ -52,7 +61,7 @@ static BOOL SetSysTray(HWND dlg,
 
   if (tip != nullptr && *tip != 0)
   {
-    ::lstrcpynW(data.szTip, tip, sizeof(data.szTip) / sizeof(WCHAR));
+    ::lstrcpynW(data.szTip, tip, Z7_ARRAY_SIZE(data.szTip));
   }
 
   return Shell_NotifyIconW(message, &data);
@@ -303,11 +312,6 @@ CProgressDialog::CProgressDialog():
     IconID(-1),
     MainWindow(NULL)
 {
-  for (int i = 0; i < kNumTrayIcons; i++)
-    _iconSysTrayArray[i] = nullptr;
-  _sysTrayIconArrayId = -1;
-  _sysTrayMenu = nullptr;
-
   if (_dialogCreatedEvent.Create() != S_OK)
     throw 1334987;
   if (_createDialogEvent.Create() != S_OK)
@@ -888,14 +892,14 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
         _prevPercentValue = percent;
         needSetTitle = true;
 
-        wchar_t szPercent[32];
-        wchar_t *p = ConvertUInt64ToString(percent, szPercent);
+        std::array<wchar_t, 32> szPercent;
+        wchar_t *p = ConvertUInt64ToString(percent, szPercent.data());
         *p++ = L'%';
         *p = 0;
-        SetItemText(IDC_PROGRESS_PERCENT, szPercent);
+        SetItemText(IDC_PROGRESS_PERCENT, szPercent.data());
 
-        if (_background && _iconSysTrayArray[0] != nullptr)
-          UpdateSysTrayIcon(false, true);
+        if (_background && _sysTray.Icons[0] != nullptr)
+          _sysTray.UpdateIcon(_window, _prevPercentValue, false, true);
       }
     }
 
@@ -1131,18 +1135,18 @@ bool CProgressDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
         if (MainWindow != nullptr)
           ShowWindow(MainWindow, SW_SHOW);
       }
-      if (_iconSysTrayArray[0] != nullptr)
+      if (_sysTray.Icons[0] != nullptr)
       {
-        for (int i = 0; i < kNumTrayIcons; i++)
+        for (auto &icon : _sysTray.Icons)
         {
-          DestroyIcon(_iconSysTrayArray[i]);
-          _iconSysTrayArray[i] = nullptr;
+          DestroyIcon(icon);
+          icon = nullptr;
         }
       }
-      if (_sysTrayMenu != nullptr)
+      if (_sysTray.Menu != nullptr)
       {
-        ::DestroyMenu(_sysTrayMenu);
-        _sysTrayMenu = nullptr;
+        ::DestroyMenu(_sysTray.Menu);
+        _sysTray.Menu = nullptr;
       }
       return OnExternalCloseMessage();
     }
@@ -1204,8 +1208,8 @@ void CProgressDialog::SetPauseText()
   SetItemText(IDB_PAUSE, pszText);
   SetTitleText();
 
-  if (_sysTrayMenu != nullptr)
-    ModifyMenuW(_sysTrayMenu, IDB_PAUSE, MF_BYCOMMAND, IDB_PAUSE, pszText);
+  if (_sysTray.Menu != nullptr)
+    ModifyMenuW(_sysTray.Menu, IDB_PAUSE, MF_BYCOMMAND, IDB_PAUSE, pszText);
 }
 
 void CProgressDialog::OnPauseButton()
@@ -1235,7 +1239,7 @@ void CProgressDialog::OnPriorityButton()
   SetPriorityClass(GetCurrentProcess(), _background ? IDLE_PRIORITY_CLASS : NORMAL_PRIORITY_CLASS);
   if (!_background) // foreground
   {
-    if (_iconSysTrayArray[0] != nullptr)
+    if (_sysTray.Icons[0] != nullptr)
     {
       if (MainWindow != nullptr)
         ShowWindow(MainWindow, SW_SHOW);
@@ -1245,12 +1249,12 @@ void CProgressDialog::OnPriorityButton()
   }
   else
   {
-    if (LoadSysTrayIcons())
+    if (_sysTray.LoadIcons(g_hInstance, IDI_SYSTRAY_0))
     {
       if (MainWindow != nullptr)
         ShowWindow(MainWindow, SW_HIDE);
       Show(SW_HIDE);
-      UpdateSysTrayIcon(true, true);
+      _sysTray.UpdateIcon(_window, _prevPercentValue, true, true);
     }
   }
   #endif
@@ -1316,7 +1320,7 @@ void CProgressDialog::UpdateMessagesDialog()
   }
   if (!messages.IsEmpty())
   {
-    g_bProcessError = true;
+    ProgressDialog_SetError(true);
 
     FOR_VECTOR (i, messages)
       AddMessage(messages[i]);
@@ -1499,67 +1503,76 @@ void CProgressDialog::CopyToClipboard()
 }
 
 
-bool CProgressDialog::LoadSysTrayIcons()
+CSysTray::CSysTray() : IconArrayId(-1), Menu(nullptr)
 {
-  if (_iconSysTrayArray[0] != nullptr) return true;
+  for (auto &icon : Icons)
+    icon = nullptr;
+}
 
-  int id = IDI_SYSTRAY_0;
-  for (int n = 0; n < kNumTrayIcons; n++, id++)
+bool CSysTray::LoadIcons(HINSTANCE hInst, int firstResId)
+{
+  if (Icons[0] != nullptr) return true;
+
+  int id = firstResId;
+  for (auto &icon : Icons)
   {
-    _iconSysTrayArray[n] = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+    icon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(id), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+    id++;
   }
 
-  return _iconSysTrayArray[0] != nullptr;
+  return Icons[0] != nullptr;
 }
 
-void CProgressDialog::UpdateSysTrayIcon(bool addIcon, bool updateTip)
+void CSysTray::UpdateIcon(HWND dlg, UInt64 percentValue, bool addIcon, bool updateTip)
 {
-  int newIconId = (_prevPercentValue / kTrayPercentPerIcon) % kNumTrayIcons;
-  bool updateIcon = newIconId > _sysTrayIconArrayId;
+  int newIconId = (int)((percentValue / kPercentPerIcon) % kNumIcons);
+  bool updateIcon = newIconId > IconArrayId;
 
   if (updateIcon || updateTip || addIcon)
   {
-    wchar_t tip[64];
-    wchar_t *p = ConvertUInt64ToString(_prevPercentValue, tip);
+    std::array<wchar_t, 64> tip;
+    wchar_t *p = ConvertUInt64ToString(percentValue, tip.data());
     *p++ = L'%';
     *p = 0;
 
     UINT flags = NIF_TIP;
     if (updateIcon)
       flags |= NIF_ICON;
 
-    if (!SetSysTray(_window, NIM_MODIFY, ID_SYSTRAY_ICON, flags, 0, _iconSysTrayArray[newIconId], tip))
+    if (!SetSysTray(dlg, NIM_MODIFY, ID_SYSTRAY_ICON, flags, 0, Icons[newIconId], tip.data()))
     {
-      SetSysTray(_window, NIM_DELETE, ID_SYSTRAY_ICON, 0, 0, nullptr, nullptr);
-      SetSysTray(_window, NIM_ADD, ID_SYSTRAY_ICON, NIF_ICON | NIF_MESSAGE | NIF_TIP, WM_TRAY_ICON_NOTIFY,
-          _iconSysTrayArray[newIconId], tip);
+      SetSysTray(dlg, NIM_DELETE, ID_SYSTRAY_ICON, 0, 0, nullptr, nullptr);
+      SetSysTray(dlg, NIM_ADD, ID_SYSTRAY_ICON, NIF_ICON | NIF_MESSAGE | NIF_TIP, WM_TRAY_ICON_NOTIFY,
+          Icons[newIconId], tip.data());
     }
 
-    _sysTrayIconArrayId = newIconId;
+    IconArrayId = newIconId;
   }
 }
 
-bool CProgressDialog::CreateSysTrayMenu()
+bool CSysTray::BuildPopupMenu(LPCWSTR foregroundText, LPCWSTR pauseOrContinueText, LPCWSTR cancelText)
 {
-  if (_sysTrayMenu != nullptr) return true;
+  if (Menu != nullptr) return true;
 
-  _sysTrayMenu = CreatePopupMenu();
-  AppendMenuW(_sysTrayMenu, MF_STRING, IDB_PROGRESS_BACKGROUND, _foreground_String);
-  AppendMenuW(_sysTrayMenu, MF_STRING, IDB_PAUSE, Sync.Get_Paused() ? _continue_String : _pause_String);
-  AppendMenuW(_sysTrayMenu, MF_STRING, IDCANCEL, cancelString);
-  return _sysTrayMenu != nullptr;
+  Menu = CreatePopupMenu();
+  AppendMenuW(Menu, MF_STRING, IDB_PROGRESS_BACKGROUND, foregroundText);
+  AppendMenuW(Menu, MF_STRING, IDB_PAUSE, pauseOrContinueText);
+  AppendMenuW(Menu, MF_STRING, IDCANCEL, cancelText);
+  return Menu != nullptr;
 }
 
 bool CProgressDialog::OnTrayNotification(LPARAM lParam)
 {
   switch (lParam)
   {
     case WM_RBUTTONUP:
-      if (CreateSysTrayMenu())
+      if (_sysTray.BuildPopupMenu(_foreground_String,
+              Sync.Get_Paused() ? _continue_String : _pause_String,
+              cancelString))
       {
         POINT point;
         ::GetCursorPos(&point);
-        ::TrackPopupMenu(_sysTrayMenu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, point.x, point.y, 0, _window, nullptr);
+        ::TrackPopupMenu(_sysTray.Menu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, point.x, point.y, 0, _window, nullptr);
         // BUGFIX: see "PRB: Menus for Notification Icons Don't Work Correctly"
         ::PostMessage(_window, WM_NULL, 0, 0);
       }

CPP/7zip/UI/FileManager/ProgressDialog2.h

@@ -3,6 +3,8 @@
 #ifndef ZIP7_INC_PROGRESS_DIALOG_2_H
 #define ZIP7_INC_PROGRESS_DIALOG_2_H
 
+#include <array>
+
 #include "../../../Common/MyCom.h"
 
 #include "../../../Windows/ErrorMsg.h"
@@ -103,6 +105,26 @@ class CProgressSync
 };
 
 
+void ProgressDialog_SetError(bool error);
+bool ProgressDialog_HadError();
+
+
+struct CSysTray
+{
+  static const int kNumIcons = 15;
+  static const int kPercentPerIcon = 7;
+
+  std::array<HICON, kNumIcons> Icons;
+  int IconArrayId;
+  HMENU Menu;
+
+  CSysTray();
+  bool LoadIcons(HINSTANCE hInst, int firstResId);
+  void UpdateIcon(HWND dlg, UInt64 percentValue, bool addIcon, bool updateTip);
+  bool BuildPopupMenu(LPCWSTR foregroundText, LPCWSTR pauseOrContinueText, LPCWSTR cancelText);
+};
+
+
 class CProgressDialog: public NWindows::NControl::CModalDialog
 {
   bool _isDir;
@@ -144,11 +166,7 @@ class CProgressDialog: public NWindows::NControl::CModalDialog
 
   UString _title;
 
-  static const int kNumTrayIcons = 15;
-  static const int kTrayPercentPerIcon = 7;
-  HICON _iconSysTrayArray[kNumTrayIcons];
-  int _sysTrayIconArrayId;
-  HMENU _sysTrayMenu;
+  CSysTray _sysTray;
 
   class CU64ToI32Converter
   {
@@ -273,10 +291,6 @@ class CProgressDialog: public NWindows::NControl::CModalDialog
 
   INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = NULL);
 
-  bool CreateSysTrayMenu();
-  bool LoadSysTrayIcons();
-  void UpdateSysTrayIcon(bool addIcon, bool updateTip);
-
   /* how it works:
      1) the working thread calls ProcessWasFinished()
         that sends kCloseMessage message to CProgressDialog (GUI) thread