4 files changed, 22 insertions, 19 deletions
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 68e06a6c5d..1349e3e43c 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -84,9 +84,9 @@ std::pair<int, FX_COLORREF> ArgbToColorRef(FX_ARGB argb) {
           FXSYS_RGB(FXARGB_R(argb), FXARGB_G(argb), FXARGB_B(argb))};
 }
 
-uint32_t ArgbEncode(int a, FX_COLORREF rgb) {
-  return FXARGB_MAKE(a, FXSYS_GetRValue(rgb), FXSYS_GetGValue(rgb),
-                     FXSYS_GetBValue(rgb));
+uint32_t ArgbEncode(int a, FX_COLORREF bgr) {
+  return FXARGB_MAKE(a, FXSYS_GetRValue(bgr), FXSYS_GetGValue(bgr),
+                     FXSYS_GetBValue(bgr));
 }
 
 FX_ARGB StringToFXARGB(const WideStringView& wsValue) {
diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h
index f7626afd35..8134c5066d 100644
--- a/core/fxge/fx_dib.h
+++ b/core/fxge/fx_dib.h
@@ -70,7 +70,9 @@ extern const int16_t SDP_Table[513];
 #define FXDIB_BLEND_LUMINOSITY 24
 #define FXDIB_BLEND_UNSUPPORTED -1
 
+// TODO(thestig): Rename to FXSYS_BGR() and check callers.
 #define FXSYS_RGB(r, g, b) ((r) | ((g) << 8) | ((b) << 16))
+// TODO(thestig): Rename parameter to |bgr| and check callers.
 #define FXSYS_GetRValue(rgb) ((rgb)&0xff)
 #define FXSYS_GetGValue(rgb) (((rgb) >> 8) & 0xff)
 #define FXSYS_GetBValue(rgb) (((rgb) >> 16) & 0xff)
@@ -93,7 +95,8 @@ std::pair<int, FX_COLORREF> ArgbToColorRef(FX_ARGB argb);
 inline FX_ARGB ArgbEncode(int a, int r, int g, int b) {
   return (a << 24) | (r << 16) | (g << 8) | b;
 }
-FX_ARGB ArgbEncode(int a, FX_COLORREF rgb);
+// TODO(thestig): Rename to AlphaAndColorRefToArgb().
+FX_ARGB ArgbEncode(int a, FX_COLORREF bgr);
 
 FX_ARGB StringToFXARGB(const WideStringView& view);
 
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index ec0ed3561d..673593cdda 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -133,10 +133,10 @@ HPEN CreateExtPen(const CFX_GraphStateData* pGraphState,
   }
 
   int a;
-  FX_COLORREF rgb;
-  std::tie(a, rgb) = ArgbToColorRef(argb);
+  FX_COLORREF bgr;
+  std::tie(a, bgr) = ArgbToColorRef(argb);
   LOGBRUSH lb;
-  lb.lbColor = rgb;
+  lb.lbColor = bgr;
   lb.lbStyle = BS_SOLID;
   lb.lbHatch = 0;
   std::vector<uint32_t> dashes;
@@ -156,9 +156,9 @@ HPEN CreateExtPen(const CFX_GraphStateData* pGraphState,
 
 HBRUSH CreateBrush(uint32_t argb) {
   int a;
-  FX_COLORREF rgb;
-  std::tie(a, rgb) = ArgbToColorRef(argb);
-  return CreateSolidBrush(rgb);
+  FX_COLORREF bgr;
+  std::tie(a, bgr) = ArgbToColorRef(argb);
+  return CreateSolidBrush(bgr);
 }
 
 void SetPathToDC(HDC hDC,
@@ -1073,15 +1073,15 @@ bool CGdiDeviceDriver::FillRectWithBlend(const FX_RECT* pRect,
     return false;
 
   int alpha;
-  FX_COLORREF rgb;
-  std::tie(alpha, rgb) = ArgbToColorRef(fill_color);
+  FX_COLORREF bgr;
+  std::tie(alpha, bgr) = ArgbToColorRef(fill_color);
   if (alpha == 0)
     return true;
 
   if (alpha < 255)
     return false;
 
-  HBRUSH hBrush = CreateSolidBrush(rgb);
+  HBRUSH hBrush = CreateSolidBrush(bgr);
   ::FillRect(m_hDC, (RECT*)pRect, hBrush);
   DeleteObject(hBrush);
   return true;
@@ -1127,12 +1127,12 @@ bool CGdiDeviceDriver::DrawCosmeticLine(const CFX_PointF& ptMoveTo,
     return false;
 
   int a;
-  FX_COLORREF rgb;
-  std::tie(a, rgb) = ArgbToColorRef(color);
+  FX_COLORREF bgr;
+  std::tie(a, bgr) = ArgbToColorRef(color);
   if (a == 0)
     return true;
 
-  HPEN hPen = CreatePen(PS_SOLID, 1, rgb);
+  HPEN hPen = CreatePen(PS_SOLID, 1, bgr);
   hPen = (HPEN)SelectObject(m_hDC, hPen);
   MoveToEx(m_hDC, FXSYS_round(ptMoveTo.x), FXSYS_round(ptMoveTo.y), nullptr);
   LineTo(m_hDC, FXSYS_round(ptLineTo.x), FXSYS_round(ptLineTo.y));
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index df9e8387d5..f2ae8a726e 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -281,9 +281,9 @@ bool CGdiPrinterDriver::DrawDeviceText(int nChars,
 
   // Color
   int iUnusedAlpha;
-  FX_COLORREF rgb;
-  std::tie(iUnusedAlpha, rgb) = ArgbToColorRef(color);
-  SetTextColor(m_hDC, rgb);
+  FX_COLORREF bgr;
+  std::tie(iUnusedAlpha, bgr) = ArgbToColorRef(color);
+  SetTextColor(m_hDC, bgr);
   SetBkMode(m_hDC, TRANSPARENT);
 
   // Text