scroll bar two

Author: DarkFire01

win32ss/gdi/eng/engbrush.c

@@ -67,8 +67,20 @@ EBRUSHOBJ_vInit(EBRUSHOBJ *pebo,
     pebo->psoMask = NULL;
 
     /* Initialize 1 bpp fore and back colors */
-    pebo->crCurrentBack = crBackgroundClr;
-    pebo->crCurrentText = crForegroundClr;
+    /*
+     * COLORREF uses only 24 bits (0x00BBGGRR).
+     *
+     * Note that 0xFFFFFFFF is CLR_INVALID in GDI, but we have also observed
+     * some code paths feeding in ARGB values (e.g. 0xFFFFFFFF for opaque white).
+     * We normalize to sane 24-bit defaults if we get CLR_INVALID, and otherwise
+     * mask away any high byte to avoid sentinel collisions in drivers/ENG.
+     */
+
+    pebo->crCurrentBack = (crBackgroundClr == CLR_INVALID) ?
+                          0x00FFFFFF : (crBackgroundClr & 0x00FFFFFF);
+
+    pebo->crCurrentText = (crForegroundClr == CLR_INVALID) ?
+                          0x00000000 : (crForegroundClr & 0x00FFFFFF);
 
     pebo->psurfTrg = psurf;
     /* We are initializing for a new memory DC */
@@ -103,7 +115,7 @@ EBRUSHOBJ_vInit(EBRUSHOBJ *pebo,
 
         /* Use foreground color of hatch brushes */
         if (pbrush->flAttrs & BR_IS_HATCH)
-            pebo->crCurrentText = pbrush->BrushAttr.lbColor;
+            pebo->crCurrentText = pbrush->BrushAttr.lbColor & 0x00FFFFFF;
     }
 }