2004-04-15 Danny Smith <dannysmith@users.sourceforge.net>

	* include/wingdi.h (RGB): Correct macro.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 03f56fa..41a4033 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-15  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/wingdi.h (RGB): Correct macro.
+
 2004-04-14  Robert Wruck  <rwruck@users.sourceforge.net>
 
        * include/ddk/winddk.h (RtlEqualLuid): Correct macro.

diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 5c5f9a0..ec91de1 100644 (file)
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2464,7 +2464,7 @@ typedef UINT (CALLBACK *LPFNDEVMODE)(HWND,HMODULE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMO
 typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA);
 
 
-#define RGB(r,g,b)     ((DWORD)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16)))
+#define RGB(r,g,b)     ((COLORREF)((BYTE)(r) | ((BYTE)(g) << 8) | ((BYTE)(b) << 16)))
 #define MAKEPOINTS(l) (*((POINTS*)&(l)))
 #define MAKEROP4(f,b)  (DWORD)((((b)<<8)&0xFF000000)|(f))
 #define PALETTEINDEX(i)        ((0x01000000|(COLORREF)(WORD)(i)))