Move COLORREF to windef.h

Francois Gouget fgouget at free.fr
Sun Oct 7 20:45:13 CDT 2001


   COLORREF is supposed to be declared in windef.h. Hence this patch.


Changelog:

 * include/windef.h,
   include/wingdi.h

   Move COLORREF from wingdi.h to windef.h


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
   Nouvelle version : les anciens bogues ont été remplacés par de nouveaux.
-------------- next part --------------
Index: include/windef.h
===================================================================
RCS file: /home/wine/wine/include/windef.h,v
retrieving revision 1.58
diff -u -r1.58 windef.h
--- include/windef.h	2001/07/30 18:57:18	1.58
+++ include/windef.h	2001/10/07 22:23:44
@@ -51,7 +51,9 @@
 typedef WORD            ATOM;
 typedef WORD            CATCHBUF[9];
 typedef WORD           *LPCATCHBUF;
+typedef DWORD           COLORREF, *LPCOLORREF;
 
+
 /* Handle types that exist both in Win16 and Win32. */
 
 typedef int HFILE;
@@ -191,7 +193,7 @@
 typedef struct tagRECTL
 {
     LONG left;
-    LONG top;  
+    LONG top;
     LONG right;
     LONG bottom;
 } RECTL, *PRECTL, *LPRECTL;
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.60
diff -u -r1.60 wingdi.h
--- include/wingdi.h	2001/09/07 15:27:51	1.60
+++ include/wingdi.h	2001/10/07 22:23:46
@@ -399,8 +399,6 @@
 
   /* Colors */
 
-typedef DWORD COLORREF, *LPCOLORREF;
-
 #define RGB(r,g,b)          ((COLORREF)((r) | ((g) << 8) | ((b) << 16)))
 #define PALETTERGB(r,g,b)   (0x02000000 | RGB(r,g,b))
 #define PALETTEINDEX(i)     ((COLORREF)(0x01000000 | (WORD)(i)))


More information about the wine-patches mailing list