Changeset 6599 for trunk/src

Timestamp:

Aug 27, 2001, 10:42:13 AM (24 years ago)

Author:

sandervl

Message:

FillRect fix for brush 0

Location:

trunk/src/user32

Files:

• syscolor.cpp (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.28 2001-06-12 17:02:35 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.29 2001-08-27 08:42:11 sandervl Exp $ */
 
 /*
@@ -261 +261 @@
       return SysColorBrushes[nIndex];
 
-  //MED calls FillRect with (hardcoded) zero brush -> index -1
+  //TODO: is this still necessary (check in NT)
   dprintf2(("WARNING: Unknown index(%d)", nIndex ));
   return GetStockObject(LTGRAY_BRUSH);

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.111 2001-07-29 18:59:27 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.112 2001-08-27 08:42:13 sandervl Exp $ */
 
 /*
@@ -1134 +1134 @@
 int WIN32API FillRect(HDC hDC, const RECT * lprc, HBRUSH hbr)
 {
+    //SvL: brush 0 means currently selected brush (verified in NT4)
+    if(hbr == 0) {
+        hbr = GetCurrentObject(hDC, OBJ_BRUSH);
+    }
+    else
     if (hbr <= (HBRUSH) (COLOR_MAX + 1)) {
         hbr = GetSysColorBrush( (INT) hbr - 1 );