Re: include file cleanup : another step

[Vincent Béron]

Le jeu 09/12/2004 à 15:47, Rémi Assailly a écrit :
> I moved some defines, ttydrv will not use gdi.h any longer.
> I notice that some headers are declared twice, I removed useless 
> declarations.
>
> Changelog:
> - moved some defines from gdi.h
> --- dlls/gdi/palette.c~	2004-10-18 23:18:58.000000000 +0200
> +++ dlls/gdi/palette.c	2004-12-09 14:14:52.000000000 +0100
> @@ -37,6 +37,11 @@
>  #include "wine/debug.h"
>  #include "winerror.h"
>
> +/* palette object */
> +#define NB_RESERVED_COLORS     20   /* number of fixed colors in system palette */
> -
>
> +#define PC_SYS_USED            0x80 /* palentry is used (both system and logical) */
> -
>
> WINE_DEFAULT_DEBUG_CHANNEL(palette);
>
> static INT PALETTE_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
>
> --- include/gdi.h~	2004-03-04 21:41:13.000000000 +0100
> +++ include/gdi.h	2004-12-09 19:01:20.154559672 +0100
> @@ -83,14 +83,6 @@
>      SEGPTR      segptr_bits;  /* segptr to DIB bits */
>  } BITMAPOBJ;
>
> -/* palette object */
> -
>
> -#define NB_RESERVED_COLORS     20   /* number of fixed colors in system palette */
> -
>
> -#define PC_SYS_USED            0x80 /* palentry is used (both system and logical) */
> -#define PC_SYS_RESERVED        0x40 /* system palentry is not to be mapped to */
> -#define PC_SYS_MAPPED          0x10 /* logical palentry is a direct alias for system palentry */
> -
>
> typedef struct tagPALETTEOBJ
>  {
>      GDIOBJHDR                    header;
>
> --- dlls/ttydrv/palette.c~	2004-12-09 18:57:42.835597176 +0100
> +++ dlls/ttydrv/palette.c	2004-12-09 14:27:48.000000000 +0100
> @@ -22,10 +22,14 @@
>
> #include <stdlib.h>
>
> -#include "gdi.h"
> -#include "winbase.h"
>  #include "ttydrv.h"
>  #include "wine/debug.h"
> +#include "wine/wingdi16.h"
> -
>
> +/* palette object */
> +#define NB_RESERVED_COLORS     20   /* number of fixed colors in system palette */
> -
>
> +#define PC_SYS_USED            0x80 /* palentry is used (both system and logical) */
>
> WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
>
> --- dlls/x11drv/palette.c~	2004-12-01 12:32:11.000000000 +0100
> +++ dlls/x11drv/palette.c	2004-12-09 19:03:03.933782832 +0100
> @@ -24,11 +24,16 @@
>  #include <string.h>
>
> #include "gdi.h"
> -#include "windef.h"
>  #include "winreg.h"
>  #include "x11drv.h"
>  #include "wine/debug.h"
>
> +/* palette object */
> +#define NB_RESERVED_COLORS     20   /* number of fixed colors in system palette */
> -
>
> +#define PC_SYS_USED            0x80 /* palentry is used (both system and logical) */
> +#define PC_SYS_RESERVED        0x40 /* system palentry is not to be mapped to */
> -
>
> WINE_DEFAULT_DEBUG_CHANNEL(palette);
>
> /* Palette indexed mode:

Defining the same thing in multiple files is a clear indication an
#include is needed.

Vincent