refactor(mfc): modernize PCH usage and replace legacy min/max helpers

- Replace __min/__max with std::min/std::max in ColorCopDlg
- Add <algorithm> and tidy standard library includes
- Remove redundant includes now provided by stdafx.h (windows.h, cstdint, cmath)
- Centralize Windows config in stdafx.h (NOMINMAX, WIN32_LEAN_AND_MEAN)
- Make feature flag bit shifts unsigned (1u << n) to avoid sign/overflow pitfalls
- Replace PI macro with constexpr kPi and promote MULTIPIX_* to constexpr

Author: j4y

ColorCopDlg.cpp

@@ -17,22 +17,19 @@
 #include "Label.h"       // used for the links in the AboutDlg
 #include "SystemTray.h"  // used to minimize to the systray
 
-// Windows headers
-#include <windows.h>
+// Windows SDK headers (explicit APIs used in this file)
 #include <commctrl.h>
 #include <htmlhelp.h>
 
 // C++ standard library headers
-#include <cstdint>
-#include <random>
-#include <cmath>     // pow, sqrt, atan (or atan2)
-#include <cstdlib>   // strtoul, abs (int)
-#include <cstring>   // memcpy
+#include <algorithm>  // std::min, std::max
+#include <random>     // std::mt19937, std::uniform_int_distribution
+#include <cstdlib>    // strtoul, abs
+#include <cstring>    // memcpy
 
 constexpr int WEBSAFE_STEP = 51;
 constexpr int RGB_MIN = 0;
 constexpr int RGB_MAX = 255;
-constexpr double kPi = 3.14159265358979323846;
 
 class CAboutDlg : public CDialog {
  public:
@@ -959,7 +956,7 @@ void CColorCopDlg::UpdateCMYKFromRGB(int red, int green, int blue) {
     m_Magenta = static_cast<int>(std::pow(1.0 - g, 45));
     m_Yellow  = static_cast<int>(std::pow(1.0 - b, 45));
 
-    m_Black = __min(__min(m_Cyan, m_Magenta), m_Yellow);
+    m_Black = std::min({ m_Cyan, m_Magenta, m_Yellow });
 
     m_Cyan = m_Cyan - m_Black;
     m_Magenta = m_Magenta - m_Black;
@@ -975,10 +972,9 @@ void CColorCopDlg::RGBtoHSL(double R, double G, double B) {
     /////////////////////////////////////
     // get min, max, and diff
     //
-    MinNum = __min(R, __min(G, B));        // min
-    MaxNum = __max(R, __max(G, B));        // max
-
-    Diff = (MaxNum - MinNum);            // diff
+    MinNum = std::min({ R, G, B });
+    MaxNum = std::max({ R, G, B });
+    Diff = (MaxNum - MinNum);
 
     if (Diff == 0) {    // this is a greyscale color
         Diff = 5.0;    // since greyscale colors don't have compliments,
@@ -995,7 +991,6 @@ void CColorCopDlg::RGBtoHSL(double R, double G, double B) {
         Sat = (static_cast<double>(Diff)) / (static_cast<double>(MaxNum));
     }
 
-
     // find the Hue
     R_Dist = static_cast<double>((MaxNum) - R) / static_cast<double>((Diff));
     G_Dist = static_cast<double>((MaxNum) - G) / static_cast<double>((Diff));
@@ -1010,7 +1005,6 @@ void CColorCopDlg::RGBtoHSL(double R, double G, double B) {
     }
     Hue = Hue / 6.0;
 
-
     if (Hue < 0.0) {
         Hue = (Hue + 1.0);
     }
@@ -2223,11 +2217,9 @@ void CColorCopDlg::OnPopupColorConverttograyscale() {
         // which is why the image appears as a grayscale.
 
         // formula: L = {Max(R, G, B) + Min(R, G, B)}/2;
-        Max = __max(m_Reddec, m_Greendec);
-        Max = __max(Max, m_Bluedec);
+        Max = std::max({ m_Reddec, m_Greendec, m_Bluedec });
+        Min = std::min({ m_Reddec, m_Greendec, m_Bluedec });
 
-        Min = __min(m_Reddec, m_Greendec);
-        Min = __min(Min, m_Bluedec);
         L = static_cast<int>((Min) + Max) / 2;
 
         m_Reddec   = L;

StdAfx.h

@@ -3,47 +3,77 @@
 
 #pragma once
 
-// Feature flags (bitmask values)
-#define AlwaysOnTop            (1 << 2)
-#define UpperCaseHex           (1 << 3)
-#define OmitPound              (1 << 4)
-#define SnaptoWebsafe          (1 << 5)
-#define AutoCopytoClip         (1 << 6)
-#define MimimizetoTray         (1 << 7)
-#define EasyMove               (1 << 8)
-#define MinimizeonStart        (1 << 9)
-#define ExpandedDialog         (1 << 10)
-#define ModeHTML               (1 << 11)
-#define ModeDelphi             (1 << 12)
-#define ModePowerBuilder       (1 << 13)
-#define ModeVisualBasic        (1 << 14)
-#define ModeVisualC            (1 << 15)
-#define Sampling1              (1 << 16)
-#define Sampling3x3            (1 << 17)
-#define Sampling5x5            (1 << 18)
-#define MultipleInstances      (1 << 19)
-#define DetectWebsafeColors    (1 << 20)
-#define RGBINT                 (1 << 21)
-#define RGBFLOAT               (1 << 22)
-#define MAGWHILEEYEDROP        (1 << 23)
-#define USECROSSHAIR           (1 << 24)
-#define SETCURSORONEYEDROP     (1 << 25)
-#define MULTIPIXELSAMPLE       (1 << 26)
-#define SamplingMULTI          (1 << 27)
-#define SpaceRGB               (1 << 28)
-#define SpaceCMYK              (1 << 29)
-#define ModeClarion            (1 << 30)
-
-#define MULTIPIX_MIN 1
-#define MULTIPIX_MAX 15
-
-#define PI (3.1415926535897932384626433832795)
-
-// MFC includes
-#include <afxwin.h>
-#include <afxext.h>
+//------------------------------------------------------------------------------
+// Platform / Windows configuration
+//------------------------------------------------------------------------------
+
+#define NOMINMAX              // Prevent Windows macros from breaking std::min/std::max
+#define WIN32_LEAN_AND_MEAN   // Exclude rarely-used Windows headers
+
+//------------------------------------------------------------------------------
+// Standard library
+//------------------------------------------------------------------------------
+
+#include <cstdint>
+#include <cmath>
+
+//------------------------------------------------------------------------------
+// Application feature flags (bitmask)
+//------------------------------------------------------------------------------
+//
+// NOTE:
+// These are intentionally kept as macros for minimal churn.
+// A future modernization step would be a strongly-typed enum class.
+//
+
+#define AlwaysOnTop            (1u << 2)
+#define UpperCaseHex           (1u << 3)
+#define OmitPound              (1u << 4)
+#define SnaptoWebsafe          (1u << 5)
+#define AutoCopytoClip         (1u << 6)
+#define MimimizetoTray         (1u << 7)
+#define EasyMove               (1u << 8)
+#define MinimizeonStart        (1u << 9)
+#define ExpandedDialog         (1u << 10)
+#define ModeHTML               (1u << 11)
+#define ModeDelphi             (1u << 12)
+#define ModePowerBuilder       (1u << 13)
+#define ModeVisualBasic        (1u << 14)
+#define ModeVisualC            (1u << 15)
+#define Sampling1              (1u << 16)
+#define Sampling3x3            (1u << 17)
+#define Sampling5x5            (1u << 18)
+#define MultipleInstances      (1u << 19)
+#define DetectWebsafeColors    (1u << 20)
+#define RGBINT                 (1u << 21)
+#define RGBFLOAT               (1u << 22)
+#define MAGWHILEEYEDROP        (1u << 23)
+#define USECROSSHAIR           (1u << 24)
+#define SETCURSORONEYEDROP     (1u << 25)
+#define MULTIPIXELSAMPLE       (1u << 26)
+#define SamplingMULTI          (1u << 27)
+#define SpaceRGB               (1u << 28)
+#define SpaceCMYK              (1u << 29)
+#define ModeClarion            (1u << 30)
+
+//------------------------------------------------------------------------------
+// Constants
+//------------------------------------------------------------------------------
+
+constexpr int MULTIPIX_MIN = 1;
+constexpr int MULTIPIX_MAX = 15;
+
+// Prefer constexpr over macros for typed constants
+constexpr double kPi = 3.14159265358979323846;
+
+//------------------------------------------------------------------------------
+// MFC headers
+//------------------------------------------------------------------------------
+
+#include <afxwin.h>    // Core MFC components
+#include <afxext.h>    // Extensions (controls, OLE)
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>
+#include <afxcmn.h>    // Common controls
 #endif
 
 //{{AFX_INSERT_LOCATION}} // NOLINT(whitespace/comments)