mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/runtime/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26305/include

Modified Files:
	_mingw.h 
Log Message:
Merge Cygwin changes

Index: _mingw.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/_mingw.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** _mingw.h	12 Aug 2005 22:04:23 -0000	1.24
--- _mingw.h	13 Aug 2005 12:43:44 -0000	1.25
***************
*** 159,165 ****
  #endif
  
! #define __MINGW32_VERSION 3.7
  #define __MINGW32_MAJOR_VERSION 3
! #define __MINGW32_MINOR_VERSION 7
  
  #endif /* __MINGW_H */
--- 159,165 ----
  #endif
  
! #define __MINGW32_VERSION 3.8
  #define __MINGW32_MAJOR_VERSION 3
! #define __MINGW32_MINOR_VERSION 8
  
  #endif /* __MINGW_H */

Update of /cvsroot/mingw/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26305

Modified Files:
	Makefile.in 
Log Message:
Merge Cygwin changes

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/runtime/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Makefile.in	13 Jan 2005 19:52:17 -0000	1.34
--- Makefile.in	13 Aug 2005 12:43:44 -0000	1.35
***************
*** 19,23 ****
  
  PACKAGE = mingw-runtime
! VERSION = 3.7
  CYGRELEASE = 1
  
--- 19,23 ----
  
  PACKAGE = mingw-runtime
! VERSION = 3.8
  CYGRELEASE = 1
  

Update of /cvsroot/mingw/runtime/mingwex/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/mingwex/math

Modified Files:
	nextafterf.c signbit.c signbitf.c signbitl.c 
Added Files:
	erfl.c expm1.c expm1f.c expm1l.c nextafterl.c nexttoward.c 
	nexttowardf.c 
Log Message:
Merge Cygwin changes

--- NEW FILE: nextafterl.c ---
/*
   nextafterl.c
   Contributed by Danny Smith <dan...@us...>
   No copyright claimed, absolutely no warranties.

   2005-05-09
*/

#include <math.h>

long double
nextafterl (long double x, long double y)
{
  union {
      long double ld;
      struct {
        unsigned long long mantissa;
        unsigned short expn;
        unsigned short pad;
      } __attribute__ ((packed)) parts; 
  } u;

  /* The normal bit is explicit for long doubles, unlike
     float and double.  */
  static const unsigned long long normal_bit = 0x8000000000000000ull;

  if (isnan (y) || isnan (x))
    return x + y;

  if (x == y )
     /* nextafter (0.0, -O.0) should return -0.0.  */
     return y;

  u.ld = x;
  if (x == 0.0L)
    {
      u.parts.mantissa = 1ull;
      return y > 0.0L ? u.ld : -u.ld;
    }

  if (((x > 0.0L) ^ (y > x)) == 0)
    {
      u.parts.mantissa++;
      if ((u.parts.mantissa & ~normal_bit) == 0ull)
	u.parts.expn++;
    }
  else
    {
      if ((u.parts.mantissa & ~normal_bit) == 0ull)
	u.parts.expn--;
      u.parts.mantissa--;
    }

  /* If we have updated the expn of a normal number,
     or moved from denormal to normal, [re]set the normal bit.  */ 
     
  if (u.parts.expn & 0x7fff)
    u.parts.mantissa |=  normal_bit;

  return u.ld;
}

/* nexttowardl is the same function with a different name.  */
long double
nexttowardl (long double, long double) __attribute__ ((alias("nextafterl")));

--- NEW FILE: nexttoward.c ---
/*
   nexttoward.c
   Contributed by Danny Smith <dan...@us...>
   No copyright claimed, absolutely no warranties.

   2005-05-10
*/

#include <math.h>

double
nexttoward (double x, long double y)
{
  union
  {
    double d;
    unsigned long long ll;
  } u;

  long double xx = x;

  if (isnan (y) || isnan (x))
    return x + y;

  if (xx == y)
     /* nextafter (0.0, -O.0) should return -0.0.  */
     return y;
  u.d = x; 
  if (x == 0.0)
    {
      u.ll = 1;
      return y > 0.0L ? u.d : -u.d;
    }

  /* Non-extended encodings are lexicographically ordered,
     with implicit "normal" bit.  */ 
  if (((x > 0.0) ^ (y > xx)) == 0)
    u.ll++;
  else
    u.ll--;
  return u.d;
}

--- NEW FILE: expm1l.c ---
/*
 * Written 2005 by Gregory W. Chicares <chi...@co...> with
 * help from Danny Smith. dan...@us...>.
 * Public domain.
 *
 * F2XM1's input is constrained to (-1, +1), so the domain of
 * 'x * LOG2EL' is (-LOGE2L, +LOGE2L). Outside that domain,
 * delegating to expl() handles C99 7.12.6.3/2 range errors.
 *
 * Constants from moshier.net, file cephes/ldouble/constl.c,
 * are used instead of M_LN2 and M_LOG2E, which would not be
 * visible with 'gcc std=c99'.  The use of these extended precision
 * constants also allows gcc to replace them with x87 opcodes.
 */

#include <math.h> /* expl() */
#include "cephes_mconf.h"

long double expm1l (long double x)
{
  if (fabsl(x) < LOGE2L)
    {
      x *= LOG2EL;
      __asm__("f2xm1" : "=t" (x) : "0" (x));
      return x;
    }
  else
    return expl(x) - 1.0L;
}

Index: signbitf.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/signbitf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** signbitf.c	12 Aug 2002 13:06:40 -0000	1.1
--- signbitf.c	12 Aug 2005 22:04:23 -0000	1.2
***************
*** 6,10 ****
  	   : "=a" (sw)
  	   : "t" (x) );
!   return sw & __FP_SIGNBIT;
  }
  int __attribute__ ((alias ("__signbitf"))) signbitf (float);
--- 6,10 ----
  	   : "=a" (sw)
  	   : "t" (x) );
!   return (sw & __FP_SIGNBIT) != 0;
  }
  int __attribute__ ((alias ("__signbitf"))) signbitf (float);

--- NEW FILE: expm1f.c ---
/*
 * Written 2005 by Gregory W. Chicares <chi...@co...>.
 * Adapted to float by Danny Smith <dan...@us...>. 
 * Public domain.
 *
 * F2XM1's input is constrained to (-1, +1), so the domain of
 * 'x * LOG2EL' is (-LOGE2L, +LOGE2L). Outside that domain,
 * delegating to exp() handles C99 7.12.6.3/2 range errors.
 *
 * Constants from moshier.net, file cephes/ldouble/constl.c,
 * are used instead of M_LN2 and M_LOG2E, which would not be
 * visible with 'gcc std=c99'. The use of these extended precision
 * constants also allows gcc to replace them with x87 opcodes.
 */

#include <math.h> /* expl() */
#include "cephes_mconf.h"

float expm1f (float x)
{
  if (fabsf(x) < LOGE2L)
    {
      x *= LOG2EL;
      __asm__("f2xm1" : "=t" (x) : "0" (x));
      return x;
    }
  else
    return expf(x) - 1.0F;
}

--- NEW FILE: nexttowardf.c ---
/*
   nexttowardf.c
   Contributed by Danny Smith <dan...@us...>
   No copyright claimed, absolutely no warranties.

   2005-05-10
*/

#include <math.h>

float
nexttowardf (float x, long double y)
{
  union
  {
    float f;
    unsigned int i;
  } u;

  long double xx = x;

  if (isnan (y) || isnan (x))
    return x + y;
  if (xx == y )
     /* nextafter (0.0, -O.0) should return -0.0.  */
     return y;
  u.f = x; 
  if (x == 0.0F)
    {
      u.i = 1;
      return y > 0.0L ? u.f : -u.f;
    }
  if (((x > 0.0F) ^ (y > xx)) == 0)
    u.i++;
  else
    u.i--;
  return u.f;
}

Index: signbitl.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/signbitl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** signbitl.c	12 Aug 2002 13:06:40 -0000	1.1
--- signbitl.c	12 Aug 2005 22:04:23 -0000	1.2
***************
*** 6,10 ****
  	   : "=a" (sw)
  	   : "t" (x) );
!   return sw & __FP_SIGNBIT;
  }
  
--- 6,10 ----
  	   : "=a" (sw)
  	   : "t" (x) );
!   return (sw & __FP_SIGNBIT) != 0;
  }
  

--- NEW FILE: expm1.c ---
/*
 * Written 2005 by Gregory W. Chicares <chi...@co...>.
 * Adapted to double by Danny Smith <dan...@us...>. 
 * Public domain.
 *
 * F2XM1's input is constrained to (-1, +1), so the domain of
 * 'x * LOG2EL' is (-LOGE2L, +LOGE2L). Outside that domain,
 * delegating to exp() handles C99 7.12.6.3/2 range errors.
 *
 * Constants from moshier.net, file cephes/ldouble/constl.c,
 * are used instead of M_LN2 and M_LOG2E, which would not be
 * visible with 'gcc std=c99'.  The use of these extended precision
 * constants also allows gcc to replace them with x87 opcodes.
 */

#include <math.h> /* expl() */
#include "cephes_mconf.h"
double expm1 (double x)
{
  if (fabs(x) < LOGE2L)
    {
      x *= LOG2EL;
      __asm__("f2xm1" : "=t" (x) : "0" (x));
      return x;
    }
  else
    return exp(x) - 1.0;
}

Index: nextafterf.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/nextafterf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nextafterf.c	12 Aug 2002 13:06:39 -0000	1.1
--- nextafterf.c	12 Aug 2005 22:04:23 -0000	1.2
***************
*** 12,26 ****
      return x + y;
    if (x == y )
!      return x;
    u.f = x; 
!   if (u.i == 0u)
      {
!       if (y > 0.0F)
! 	u.i = 1;
!       else
! 	u.i = 0x80000001;
!       return u.f;
      }
!    if (((x > 0.0F) ^ (y > x)) == 0)
      u.i++;
    else
--- 12,24 ----
      return x + y;
    if (x == y )
!      /* nextafter (0.0, -O.0) should return -0.0.  */
!      return y;
    u.f = x; 
!   if (x == 0.0F)
      {
!       u.i = 1;
!       return y > 0.0F ? u.f : -u.f;
      }
!   if (((x > 0.0F) ^ (y > x)) == 0)
      u.i++;
    else

Index: signbit.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/math/signbit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** signbit.c	12 Aug 2002 13:06:40 -0000	1.1
--- signbit.c	12 Aug 2005 22:04:23 -0000	1.2
***************
*** 6,10 ****
  	   : "=a" (sw)
  	   : "t" (x) );
!   return sw & __FP_SIGNBIT;
  }
  
--- 6,10 ----
  	   : "=a" (sw)
  	   : "t" (x) );
!   return (sw & __FP_SIGNBIT) != 0;
  }
  

--- NEW FILE: erfl.c ---
/*							erfl.c
 *
 *	Error function
 *
 *
 *
 * SYNOPSIS:
 *
 * long double x, y, erfl();
 *
 * y = erfl( x );
 *
 *
 *
 * DESCRIPTION:
 *
 * The integral is
 *
 *                           x 
 *                            -
 *                 2         | |          2
 *   erf(x)  =  --------     |    exp( - t  ) dt.
 *              sqrt(pi)   | |
 *                          -
 *                           0
 *
 * The magnitude of x is limited to about 106.56 for IEEE
 * arithmetic; 1 or -1 is returned outside this range.
 *
 * For 0 <= |x| < 1, erf(x) = x * P6(x^2)/Q6(x^2);
 * Otherwise: erf(x) = 1 - erfc(x).
 *
 *
 *
 * ACCURACY:
 *
 *                      Relative error:
 * arithmetic   domain     # trials      peak         rms
 *    IEEE      0,1         50000       2.0e-19     5.7e-20
 *
 */

/*							erfcl.c
 *
 *	Complementary error function
 *
 *
 *
 * SYNOPSIS:
 *
 * long double x, y, erfcl();
 *
 * y = erfcl( x );
 *
 *
 *
 * DESCRIPTION:
 *
 *
 *  1 - erf(x) =
 *
 *                           inf. 
 *                             -
 *                  2         | |          2
 *   erfc(x)  =  --------     |    exp( - t  ) dt
 *               sqrt(pi)   | |
 *                           -
 *                            x
 *
 *
 * For small x, erfc(x) = 1 - erf(x); otherwise rational
 * approximations are computed.
 *
 * A special function expx2l.c is used to suppress error amplification
 * in computing exp(-x^2).
 *
 *
 * ACCURACY:
 *
 *                      Relative error:
 * arithmetic   domain     # trials      peak         rms
 *    IEEE      0,13        50000      8.4e-19      9.7e-20
 *    IEEE      6,106.56    20000      2.9e-19      7.1e-20
 *
 *
 * ERROR MESSAGES:
 *
 *   message          condition              value returned
 * erfcl underflow    x^2 > MAXLOGL              0.0
 *
 *
 */


/*
Modified from file ndtrl.c
Cephes Math Library Release 2.3:  January, 1995
Copyright 1984, 1995 by Stephen L. Moshier
*/

#include <math.h>
#include "cephes_mconf.h"

/* erfc(x) = exp(-x^2) P(1/x)/Q(1/x)
   1/8 <= 1/x <= 1
   Peak relative error 5.8e-21  */

static const unsigned short P[] = {
0x4bf0,0x9ad8,0x7a03,0x86c7,0x401d, XPD
0xdf23,0xd843,0x4032,0x8881,0x401e, XPD
0xd025,0xcfd5,0x8494,0x88d3,0x401e, XPD
0xb6d0,0xc92b,0x5417,0xacb1,0x401d, XPD
0xada8,0x356a,0x4982,0x94a6,0x401c, XPD
0x4e13,0xcaee,0x9e31,0xb258,0x401a, XPD
0x5840,0x554d,0x37a3,0x9239,0x4018, XPD
0x3b58,0x3da2,0xaf02,0x9780,0x4015, XPD
0x0144,0x489e,0xbe68,0x9c31,0x4011, XPD
0x333b,0xd9e6,0xd404,0x986f,0xbfee, XPD
};
static const unsigned short Q[] = {
/* 0x0000,0x0000,0x0000,0x8000,0x3fff, XPD */
0x0e43,0x302d,0x79ed,0x86c7,0x401d, XPD
0xf817,0x9128,0xc0f8,0xd48b,0x401e, XPD
0x8eae,0x8dad,0x6eb4,0x9aa2,0x401f, XPD
0x00e7,0x7595,0xcd06,0x88bb,0x401f, XPD
0x4991,0xcfda,0x52f1,0xa2a9,0x401e, XPD
0xc39d,0xe415,0xc43d,0x87c0,0x401d, XPD
0xa75d,0x436f,0x30dd,0xa027,0x401b, XPD
0xc4cb,0x305a,0xbf78,0x8220,0x4019, XPD
0x3708,0x33b1,0x07fa,0x8644,0x4016, XPD
0x24fa,0x96f6,0x7153,0x8a6c,0x4012, XPD
};

/* erfc(x) = exp(-x^2) 1/x R(1/x^2) / S(1/x^2)
   1/128 <= 1/x < 1/8
   Peak relative error 1.9e-21  */

static const unsigned short R[] = {
0x260a,0xab95,0x2fc7,0xe7c4,0x4000, XPD
0x4761,0x613e,0xdf6d,0xe58e,0x4001, XPD
0x0615,0x4b00,0x575f,0xdc7b,0x4000, XPD
0x521d,0x8527,0x3435,0x8dc2,0x3ffe, XPD
0x22cf,0xc711,0x6c5b,0xdcfb,0x3ff9, XPD
};
static const unsigned short S[] = {
/* 0x0000,0x0000,0x0000,0x8000,0x3fff, XPD */
0x5de6,0x17d7,0x54d6,0xaba9,0x4002, XPD
0x55d5,0xd300,0xe71e,0xf564,0x4002, XPD
0xb611,0x8f76,0xf020,0xd255,0x4001, XPD
0x3684,0x3798,0xb793,0x80b0,0x3fff, XPD
0xf5af,0x2fb2,0x1e57,0xc3d7,0x3ffa, XPD
};

/* erf(x)  = x T(x^2)/U(x^2)
   0 <= x <= 1
   Peak relative error 7.6e-23  */

static const unsigned short T[] = {
0xfd7a,0x3a1a,0x705b,0xe0c4,0x3ffb, XPD
0x3128,0xc337,0x3716,0xace5,0x4001, XPD
0x9517,0x4e93,0x540e,0x8f97,0x4007, XPD
0x6118,0x6059,0x9093,0xa757,0x400a, XPD
0xb954,0xa987,0xc60c,0xbc83,0x400e, XPD
0x7a56,0xe45a,0xa4bd,0x975b,0x4010, XPD
0xc446,0x6bab,0x0b2a,0x86d0,0x4013, XPD
};

static const unsigned short U[] = {
/* 0x0000,0x0000,0x0000,0x8000,0x3fff, XPD */
0x3453,0x1f8e,0xf688,0xb507,0x4004, XPD
0x71ac,0xb12f,0x21ca,0xf2e2,0x4008, XPD
0xffe8,0x9cac,0x3b84,0xc2ac,0x400c, XPD
0x481d,0x445b,0xc807,0xc232,0x400f, XPD
0x9ad5,0x1aef,0x45b1,0xe25e,0x4011, XPD
0x71a7,0x1cad,0x012e,0xeef3,0x4012, XPD
};

/*							expx2l.c
 *
 *	Exponential of squared argument
 *
 *
 *
 * SYNOPSIS:
 *
 * long double x, y, expmx2l();
 * int sign;
 *
 * y = expx2l( x );
 *
 *
 *
 * DESCRIPTION:
 *
 * Computes y = exp(x*x) while suppressing error amplification
 * that would ordinarily arise from the inexactness of the
 * exponential argument x*x.
 *
 *
 *
 * ACCURACY:
 *
 *                      Relative error:
 * arithmetic      domain        # trials      peak         rms
 *   IEEE     -106.566, 106.566    10^5       1.6e-19     4.4e-20
 *
 */

#define M 32768.0L
#define MINV 3.0517578125e-5L

static long double expx2l (long double x)
{
  long double u, u1, m, f;

  x = fabsl (x);
  /* Represent x as an exact multiple of M plus a residual.
     M is a power of 2 chosen so that exp(m * m) does not overflow
     or underflow and so that |x - m| is small.  */
  m = MINV * floorl(M * x + 0.5L);
  f = x - m;

  /* x^2 = m^2 + 2mf + f^2 */
  u = m * m;
  u1 = 2 * m * f  +  f * f;

  if ((u+u1) > MAXLOGL)
    return (INFINITYL);

  /* u is exact, u1 is small.  */
  u = expl(u) * expl(u1);
  return(u);
}

long double erfcl(long double a)
{
long double p,q,x,y,z;

if (isinf (a))
	return (signbit (a) ? 2.0 : 0.0);

x = fabsl (a);

if (x < 1.0L)
	return (1.0L - erfl(a));

z = a * a;

if( z  > MAXLOGL )
	{
under:
	mtherr( "erfcl", UNDERFLOW );
        errno = ERANGE;
	return (signbit (a) ? 2.0 : 0.0);
	}

/* Compute z = expl(a * a).  */
z = expx2l (a);
y = 1.0L/x;

if (x < 8.0L)
	{
	p = polevll (y, P, 9);
	q = p1evll (y, Q, 10);
	}
else
	{
	q = y * y;
	p = y * polevll (q, R, 4);
	q = p1evll (q, S, 5);
	}
y = p/(q * z);

if (a < 0.0L)
	y = 2.0L - y;

if (y == 0.0L)
	goto under;

return (y);
}

long double erfl(long double x)
{
long double y, z;

if( x == 0.0L )
	return (x);

if (isinf (x))
	return (signbit (x) ?  -1.0L : 1.0L);

if (fabsl(x) > 1.0L)
	return (1.0L - erfcl (x));

z = x * x;
y = x * polevll( z, T, 6 ) / p1evll( z, U, 6 );
return( y );
}

Update of /cvsroot/mingw/runtime/profile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/profile

Modified Files:
	mcount.c profile.h 
Log Message:
Merge Cygwin changes

Index: profile.h
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/profile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profile.h	3 May 2003 13:48:49 -0000	1.2
--- profile.h	12 Aug 2005 22:04:24 -0000	1.3
***************
*** 40,45 ****
   * The differences should be within __MINGW32__ guard.
   */
  
! #define	_MCOUNT_DECL static inline void _mcount
  
  #define	MCOUNT \
--- 40,51 ----
   * The differences should be within __MINGW32__ guard.
   */
+ /* If compiler doesn't inline, at least avoid passing args on the stack. */
+ #define _MCOUNT_CALL __attribute__ ((regparm (2)))
+ #define _MCOUNT_DECL static __inline__  void _MCOUNT_CALL _mcount
  
! /* FIXME: This works, but it would be cleaner to convert mcount into an
!    assembler stub that calls an extern  _mcount. 
!    Older versions of GCC (pre-4.1) will still fail with regparm since the
!    compiler used %edx to store an unneeded counter variable.  */
  
  #define	MCOUNT \
***************
*** 47,51 ****
  mcount()								\
  {									\
! 	 u_long selfpc, frompcindex;					\
  	/*								\
  	 * find the return address for mcount,				\
--- 53,64 ----
  mcount()								\
  {									\
! 	u_long selfpc, frompcindex;					\
! 	/*								\
! 	 * Save registers, since this may be called from		\
! 	 * the prologue of a regparm function.				\
! 	 */								\
! 	__asm __volatile__ ("pushl %eax\n\t"				\
! 			    "pushl %ecx\n\t"				\
! 		 	    "pushl %edx");				\
  	/*								\
  	 * find the return address for mcount,				\
***************
*** 54,65 ****
  	 * selfpc = pc pushed by mcount call				\
  	 */								\
! 	/* __asm volatile ("movl 4(%%ebp),%0" : "=r" (selfpc));	*/	\
  	selfpc = (u_long) __builtin_return_address (0);			\
  	/*								\
  	 * frompcindex = pc pushed by call into self.			\
  	 */								\
! 	/* __asm ("movl (%%ebp),%0;movl 4(%0),%0" : "=r" (frompcindex)); */	\
  	frompcindex = (u_long) __builtin_return_address (1);		\
  	_mcount(frompcindex, selfpc);					\
  }
- 
--- 67,83 ----
  	 * selfpc = pc pushed by mcount call				\
  	 */								\
! 	/* __asm  ("movl 4(%%ebp),%0" : "=r" (selfpc));	*/		\
  	selfpc = (u_long) __builtin_return_address (0);			\
  	/*								\
  	 * frompcindex = pc pushed by call into self.			\
  	 */								\
! 	/*  __asm ("movl (%%ebp),%0;movl 4(%0),%0" : "=r" (frompcindex)); */  \
  	frompcindex = (u_long) __builtin_return_address (1);		\
  	_mcount(frompcindex, selfpc);					\
+ 	/*								\
+ 	 * Restore registers.						\
+ 	 */								\
+ 	__asm __volatile__ ("popl %edx\n\t"				\
+ 			    "popl %ecx\n\t"				\
+ 			    "popl %eax");				\
  }

Index: mcount.c
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/mcount.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mcount.c	4 Jun 2001 23:26:03 -0000	1.1.1.1
--- mcount.c	12 Aug 2005 22:04:24 -0000	1.2
***************
*** 62,68 ****
   * perform this optimization.
   */
! //_MCOUNT_DECL __P((u_long frompc, u_long selfpc));
! _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
! 	register u_long frompc, selfpc;
  {
  	register u_short *frompcindex;
--- 62,67 ----
   * perform this optimization.
   */
! /* _mcount; may be static, inline, etc */
! _MCOUNT_DECL (u_long frompc, u_long selfpc)
  {
  	register u_short *frompcindex;

Update of /cvsroot/mingw/runtime/mingwex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/mingwex

Modified Files:
	Makefile.in dirent.c mingw-fseek.c strtold.c 
Added Files:
	btowc.c mb_wc_common.h mbrtowc.c wcrtomb.c wctob.c wctrans.c 
	wctype.c 
Removed Files:
	fopen64.c fseeko64.c ftello64.c lseek64.c 
Log Message:
Merge Cygwin changes

--- fopen64.c DELETED ---

Index: dirent.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/dirent.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dirent.c	20 Apr 2004 23:26:34 -0000	1.5
--- dirent.c	12 Aug 2005 22:04:23 -0000	1.6
***************
*** 76,81 ****
    /* Allocate enough space to store DIR structure and the complete
     * directory path given. */
!   nd = (_TDIR *) malloc (sizeof (_TDIR) + (_tcslen(szFullPath) + _tcslen (SLASH) +
! 			 _tcslen(SUFFIX) + 1) * sizeof(_TCHAR));
  
    if (!nd)
--- 76,83 ----
    /* Allocate enough space to store DIR structure and the complete
     * directory path given. */
!   nd = (_TDIR *) malloc (sizeof (_TDIR) + (_tcslen (szFullPath)
! 					   + _tcslen (SLASH)
! 					   + _tcslen (SUFFIX) + 1)
! 					  * sizeof (_TCHAR));
  
    if (!nd)
***************
*** 90,96 ****
  
    /* Add on a slash if the path does not end with one. */
!   if (nd->dd_name[0] != _T('\0') &&
!       nd->dd_name[_tcslen (nd->dd_name) - 1] != _T('/') &&
!       nd->dd_name[_tcslen (nd->dd_name) - 1] != _T('\\'))
      {
        _tcscat (nd->dd_name, SLASH);
--- 92,100 ----
  
    /* Add on a slash if the path does not end with one. */
!   if (nd->dd_name[0] != _T('\0')
!       && _tcsrchr (nd->dd_name, _T('/')) != nd->dd_name
! 					    + _tcslen (nd->dd_name) - 1
!       && _tcsrchr (nd->dd_name, _T('\\')) != nd->dd_name
!       					     + _tcslen (nd->dd_name) - 1)
      {
        _tcscat (nd->dd_name, SLASH);
***************
*** 149,153 ****
        dirp->dd_handle = _tfindfirst (dirp->dd_name, &(dirp->dd_dta));
  
!   	  if (dirp->dd_handle == -1)
  	{
  	  /* Whoops! Seems there are no files in that
--- 153,157 ----
        dirp->dd_handle = _tfindfirst (dirp->dd_name, &(dirp->dd_dta));
  
!       if (dirp->dd_handle == -1)
  	{
  	  /* Whoops! Seems there are no files in that
***************
*** 168,172 ****
  	     _findnext sets errno to ENOENT if no more file
  	     Undo this. */ 
! 	  DWORD winerr = GetLastError();
  	  if (winerr == ERROR_NO_MORE_FILES)
  	    errno = 0;	
--- 172,176 ----
  	     _findnext sets errno to ENOENT if no more file
  	     Undo this. */ 
! 	  DWORD winerr = GetLastError ();
  	  if (winerr == ERROR_NO_MORE_FILES)
  	    errno = 0;	

--- NEW FILE: mb_wc_common.h ---
#include <locale.h>
#include <string.h>
#include <stdlib.h>

static inline
unsigned int get_cp_from_locale (void)
{
  char* cp_string;
  /*
    locale :: "lang[_country[.code_page]]" 
               | ".code_page"

  */

  if ((cp_string = strchr(setlocale(LC_CTYPE, NULL), '.')))
    return  ((unsigned) atoi (cp_string + 1));
  return 0;
}

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in	13 Jan 2005 19:52:19 -0000	1.15
--- Makefile.in	12 Aug 2005 22:04:23 -0000	1.16
***************
*** 34,40 ****
  	mingw-fseek.c sitest.c strtof.c strtoimax.c strtold.c strtoumax.c \
  	testwmem.c tst-aligned-malloc.c ulltoa.c ulltow.c wcstof.c \
! 	wcstoimax.c wcstold.c wcstoumax.c wdirent.c wmemchr.c wmemcmp.c \
! 	wmemcpy.c wmemmove.c wmemset.c wtoll.c
! 	
  MATH_DISTFILES = \
  	acosf.c acosl.c asinf.c asinl.c atan2f.c atan2l.c \
--- 34,40 ----
  	mingw-fseek.c sitest.c strtof.c strtoimax.c strtold.c strtoumax.c \
  	testwmem.c tst-aligned-malloc.c ulltoa.c ulltow.c wcstof.c \
! 	wcstoimax.c wcstold.c wcstoumax.c wctrans.c wctype.c \
! 	wdirent.c wmemchr.c wmemcmp.c wmemcpy.c wmemmove.c wmemset.c wtoll.c \
! 	wcrtomb.c wctob.c mbrtowc.c btowc.c mb_wc_common.h
  MATH_DISTFILES = \
  	acosf.c acosl.c asinf.c asinl.c atan2f.c atan2l.c \
***************
*** 42,46 ****
  	cephes_emath.h cephes_emath.c cephes_mconf.h \
  	copysign.S copysignf.S copysignl.S cosf.S coshf.c coshl.c cosl.S \
! 	exp2.S exp2f.S exp2l.S expf.c expl.c fabs.c fabsf.c fabsl.c \
  	fdim.c fdimf.c fdiml.c floorf.S floorl.S fma.S fmaf.S fmal.c \
  	fmax.c fmaxf.c fmaxl.c fmin.c fminf.c fminl.c fmodf.c \
--- 42,47 ----
  	cephes_emath.h cephes_emath.c cephes_mconf.h \
  	copysign.S copysignf.S copysignl.S cosf.S coshf.c coshl.c cosl.S \
! 	erfl.c exp2.S exp2f.S exp2l.S expf.c expl.c expm1.c expm1l.c expm1f.c \
! 	fabs.c fabsf.c fabsl.c \
  	fdim.c fdimf.c fdiml.c floorf.S floorl.S fma.S fmaf.S fmal.c \
  	fmax.c fmaxf.c fmaxl.c fmin.c fminf.c fminl.c fmodf.c \
***************
*** 54,58 ****
  	log2l.S logb.c logbf.c logbl.c logf.S logl.S lrint.c lrintf.c \
  	lrintl.c lround.c lroundf.c lroundl.c modff.c modfl.c \
! 	nearbyint.S nearbyintf.S nearbyintl.S nextafterf.c \
  	powf.c powi.c powif.c powil.c powl.c \
  	remainder.S remainderf.S remainderl.S remquo.S \
--- 55,60 ----
  	log2l.S logb.c logbf.c logbl.c logf.S logl.S lrint.c lrintf.c \
  	lrintl.c lround.c lroundf.c lroundl.c modff.c modfl.c \
! 	nearbyint.S nearbyintf.S nearbyintl.S \
! 	nextafterf.c nextafterl.c nexttowardf.c nexttoward.c \
  	powf.c powi.c powif.c powil.c powl.c \
  	remainder.S remainderf.S remainderl.S remquo.S \
***************
*** 114,118 ****
  	fwide.o imaxabs.o imaxdiv.o mbsinit.o \
  	strtoimax.o strtoumax.o wcstoimax.o wcstoumax.o \
! 	wmemchr.o wmemcmp.o wmemcpy.o wmemmove.o wmemset.o
  STDLIB_OBJS = \
  	strtold.o wcstold.o
--- 116,121 ----
  	fwide.o imaxabs.o imaxdiv.o mbsinit.o \
  	strtoimax.o strtoumax.o wcstoimax.o wcstoumax.o \
! 	wmemchr.o wmemcmp.o wmemcpy.o wmemmove.o wmemset.o \
! 	wctrans.o wctype.o wcrtomb.o wctob.o mbrtowc.o btowc.o
  STDLIB_OBJS = \
  	strtold.o wcstold.o
***************
*** 132,136 ****
  	cephes_emath.o \
  	copysign.o copysignf.o copysignl.o cosf.o coshf.o coshl.o cosl.o \
! 	exp2.o exp2f.o exp2l.o expf.o expl.o fabs.o fabsf.o fabsl.o \
  	fdim.o fdimf.o fdiml.o floorf.o floorl.o fma.o fmaf.o fmal.o \
  	fmax.o fmaxf.o fmaxl.o fmin.o fminf.o fminl.o fmodf.o \
--- 135,140 ----
  	cephes_emath.o \
  	copysign.o copysignf.o copysignl.o cosf.o coshf.o coshl.o cosl.o \
! 	erfl.o exp2.o exp2f.o exp2l.o expf.o expl.o expm1.o expm1l.o expm1f.o \
! 	fabs.o fabsf.o fabsl.o \
  	fdim.o fdimf.o fdiml.o floorf.o floorl.o fma.o fmaf.o fmal.o \
  	fmax.o fmaxf.o fmaxl.o fmin.o fminf.o fminl.o fmodf.o \
***************
*** 144,148 ****
  	log2l.o logb.o logbf.o logbl.o logf.o logl.o lrint.o lrintf.o \
  	lrintl.o lround.o lroundf.o lroundl.o modff.o modfl.o \
! 	nearbyint.o nearbyintf.o nearbyintl.o nextafterf.o \
  	powf.o powi.o powif.o powil.o powl.o \
  	remainder.o remainderf.o remainderl.o remquo.o \
--- 148,153 ----
  	log2l.o logb.o logbf.o logbl.o logf.o logl.o lrint.o lrintf.o \
  	lrintl.o lround.o lroundf.o lroundl.o modff.o modfl.o \
! 	nearbyint.o nearbyintf.o nearbyintl.o \
! 	nextafterf.o nextafterl.o nexttowardf.o nexttoward.o \
  	powf.o powi.o powif.o powil.o powl.o \
  	remainder.o remainderf.o remainderl.o remquo.o \
***************
*** 231,235 ****
  asinh.o asinhf.o asinhl.o \
  atanh.o atanhf.o atanhl.o: fastmath.h
! 
  
  dist:
--- 236,240 ----
  asinh.o asinhf.o asinhl.o \
  atanh.o atanhf.o atanhl.o: fastmath.h
! mbrtowc.o wcrtomb.o: mb_wc_common.h  
  
  dist:

--- lseek64.c DELETED ---

--- NEW FILE: wctob.c ---
#include "mb_wc_common.h"
#include <wchar.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

/* Return just the first byte after translating to multibyte.  */
int wctob (wint_t wc )
{
    wchar_t w = wc;
    char c;
    int invalid_char = 0;
    if (!WideCharToMultiByte (get_cp_from_locale(), 
			      0 /* Is this correct flag? */,
			      &w, 1, &c, 1, NULL, &invalid_char)
         || invalid_char)
      return EOF;
    return (int) c;
}

--- ftello64.c DELETED ---

Index: strtold.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/strtold.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** strtold.c	19 Apr 2004 17:22:41 -0000	1.2
--- strtold.c	12 Aug 2005 22:04:23 -0000	1.3
***************
*** 256,259 ****
--- 256,261 ----
  esign = 1;
  exp = 0;
+ /* Save position in case we need to fall back.  */
+ sp = s;
  ++s;
  /* check for + or - */
***************
*** 266,269 ****
--- 268,278 ----
  	++s;
  
+ /* Check for valid exponent.  */
+ if (!(*s >= '0' && *s <= '9'))
+   {
+     s = sp;
+     goto daldone;
+   }
+ 
  while( (*s >= '0') && (*s <= '9') )
  {

--- NEW FILE: wctype.c ---
/*
  wctype.c
  7.25.2.2.2 The wctype function

  Contributed by: Danny Smith  <dan...@us...>
		  2005-02-24
   
  This source code is placed in the PUBLIC DOMAIN. It is modified
  from the Q8 package created by Doug Gwyn <gw...@ar...>  

  The wctype function constructs a value with type wctype_t that
  describes a class of wide characters identified by the string
  argument property.

  In particular, we map the property strings so that:

  iswctype(wc, wctype("alnum")) == iswalnum(wc) 
  iswctype(wc, wctype("alpha")) == iswalpha(wc)
  iswctype(wc, wctype("cntrl")) == iswcntrl(wc)
  iswctype(wc, wctype("digit")) == iswdigit(wc)
  iswctype(wc, wctype("graph")) == iswgraph(wc)
  iswctype(wc, wctype("lower")) == iswlower(wc)
  iswctype(wc, wctype("print")) == iswprint(wc)
  iswctype(wc, wctype("punct")) == iswpunct(wc)
  iswctype(wc, wctype("space")) == iswspace(wc)
  iswctype(wc, wctype("upper")) == iswupper(wc)
  iswctype(wc, wctype("xdigit")) == iswxdigit(wc)

*/

#include	<string.h>
#include	<wctype.h>

/* Using the bit-OR'd ctype character classification flags as return
   values achieves compatibility with MS iswctype().  */
static const struct {
  const char *name;
  wctype_t flags;} cmap[] = {
    {"alnum", _ALPHA|_DIGIT},
    {"alpha", _ALPHA},
    {"cntrl", _CONTROL},
    {"digit", _DIGIT},
    {"graph", _PUNCT|_ALPHA|_DIGIT},
    {"lower", _LOWER},
    {"print", _BLANK|_PUNCT|_ALPHA|_DIGIT},
    {"punct", _PUNCT},
    {"space", _SPACE},
    {"upper", _UPPER},
    {"xdigit", _HEX}
  };

#define NCMAP	(sizeof cmap / sizeof cmap[0])
wctype_t wctype (const char *property)
{
  int i;
  for (i = 0; i < NCMAP; ++i)
    if (strcmp (property, cmap[i].name) == 0)
      return cmap[i].flags;
  return 0;
}

--- fseeko64.c DELETED ---

--- NEW FILE: mbrtowc.c ---
#include "mb_wc_common.h"
#include <wchar.h>
#include <stdlib.h>
#include <errno.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

static int __MINGW_ATTRIB_NONNULL(1) __MINGW_ATTRIB_NONNULL(4)
__mbrtowc_cp (wchar_t * __restrict__ pwc, const char * __restrict__ s,
	      size_t n, mbstate_t* __restrict__ ps,
	      const unsigned int cp, const unsigned int mb_max) 
{
  union {
    mbstate_t val;
    char mbcs[4];
  }  shift_state;


  /* Do the prelim checks */
  if (s == NULL)
    return 0;

  if (n == 0)
    /* The standard doesn't mention this case explicitly. Tell
       caller that the conversion from a non-null s is incomplete. */
    return -2;

  /* Save the current shift state, in case we need it in DBCS case.  */
  shift_state.val = *ps;
  *ps = 0;

  if (!*s)
    {
      *pwc = 0;
      return 0;
    }
 
  if (mb_max > 1)
    {
      if (shift_state.mbcs[0] != 0)
	{
	  /* Complete the mb char with the trailing byte.  */
          shift_state.mbcs[1] = *s;  /* the second byte */
          if (MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS,
				  shift_state.mbcs, 2, pwc, 1)
		 == 0)
	    {
	      /* An invalid trailing byte */	 
	      errno = EILSEQ;
	      return -1;
	    }
          return 2;
        }
      else if (IsDBCSLeadByteEx (cp, *s))
        {
          /* If told to translate one byte, just save the leadbyte
             in *ps.  */
	  if (n < 2)
	    {
	      ((char*) ps)[0] = *s; 
	      return -2;
	    }
          /* Else translate the first two bytes  */  
          else if (MultiByteToWideChar (cp, MB_ERR_INVALID_CHARS,
					s, 2, pwc, 1)
		    == 0)
	    {
	      errno = EILSEQ;
	      return -1;
	    }
          return 2;
        }
    }

  /* Fall through to single byte char  */ 
  if (cp == 0)
      *pwc = (wchar_t)(unsigned char)*s;
 
  else if (MultiByteToWideChar (cp, MB_ERR_INVALID_CHARS, s, 1, pwc, 1)
	    == 0)
    {
      errno = EILSEQ;
      return  -1;
    }
  return 1;
}

size_t
mbrtowc (wchar_t * __restrict__ pwc, const char * __restrict__ s,
	 size_t n, mbstate_t* __restrict__ ps)
{
  static mbstate_t internal_mbstate = 0;
  wchar_t  byte_bucket = 0;
  wchar_t* dst = pwc ? pwc : &byte_bucket;

  return (size_t) __mbrtowc_cp (dst, s, n, ps ? ps : &internal_mbstate,
				get_cp_from_locale(), MB_CUR_MAX);
}


size_t
mbsrtowcs (wchar_t* __restrict__ dst,  const char ** __restrict__ src,
	   size_t len, mbstate_t* __restrict__ ps)
{
  int ret =0 ;
  size_t n = 0;
  static mbstate_t internal_mbstate = 0;
  mbstate_t* internal_ps = ps ? ps : &internal_mbstate;
  const unsigned int cp = get_cp_from_locale();;
  const unsigned int mb_max = MB_CUR_MAX;

  if ( src == NULL || *src == NULL )	/* undefined behavior */
    return 0;

  if (dst != NULL)
    {
      while (n < len
	     && (ret = __mbrtowc_cp(dst, *src, len - n,
				    internal_ps, cp, mb_max))
		  > 0)
	{
	  ++dst;
   	  *src += ret;
          n += ret;
        }

      if (n < len && ret == 0)
        *src = (char *)NULL;
    }
  
  else
    {
      wchar_t byte_bucket = 0;
      while (n < len
	     && (ret = __mbrtowc_cp (&byte_bucket, *src, mb_max,
				     internal_ps, cp, mb_max))
		  > 0)
	{
          *src += ret;
          n += ret;
        }
    }
  return n;
}

size_t
mbrlen (const char * __restrict__ s, size_t n,
	mbstate_t * __restrict__ ps)
{
  static mbstate_t s_mbstate = 0;
  wchar_t byte_bucket = 0;
  return __mbrtowc_cp (&byte_bucket, s, n, (ps) ? ps : &s_mbstate,
		       get_cp_from_locale(), MB_CUR_MAX);
}

--- NEW FILE: wcrtomb.c ---
#include "mb_wc_common.h"
#include <wchar.h>
#include <stdlib.h>
#include <errno.h>
#include <limits.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>


static int __MINGW_ATTRIB_NONNULL(1)
 __wcrtomb_cp (char *dst, wchar_t wc, const unsigned int cp,
	       const unsigned int mb_max)
{       
 if (wc > 255)
    {
      errno = EILSEQ;
      return -1;
    }

  if (cp == 0)
    {
      *dst = (char) wc;
      return 1;
    }
  else
    {
      int invalid_char = 0;
   
      int size = WideCharToMultiByte(get_cp_from_locale(),
				     0 /* Is this correct flag? */,
				     &wc, 1, dst, mb_max,
				     NULL, &invalid_char);
      if (size == 0 || invalid_char)  
        {
          errno = EILSEQ;
          return -1;
        }
      return size;
    }
}

size_t
wcrtomb (char *dst, wchar_t wc, mbstate_t * __UNUSED_PARAM (ps))
{
  char byte_bucket [MB_LEN_MAX];
  char* tmp_dst = dst ? dst : byte_bucket;      
  return (size_t)__wcrtomb_cp (tmp_dst, wc, get_cp_from_locale (),
			       MB_CUR_MAX);
}

size_t wcsrtombs (char *dst, const wchar_t **src, size_t len,
		  mbstate_t * __UNUSED_PARAM (ps))
{
  int ret = 0;
  size_t n = 0;
  const unsigned int cp = get_cp_from_locale();
  const unsigned int mb_max = MB_CUR_MAX;

  if (src == NULL || *src == NULL) /* undefined behavior */
     return 0;

  if (dst != NULL)
    {
      const wchar_t ** saved_src = src;
      while (n < len)
        {
          if ((ret = __wcrtomb_cp (dst, **src, cp, mb_max)) <= 0)
	     return (size_t) -1;
  	  n += ret;
   	  dst += ret;
          if (*(dst - 1) == '\0')
	    {
	      *saved_src = (wchar_t) NULL;;
	      return (n  - 1);
	    }
	  *src++;
        }
    }
  else
    {
      char byte_bucket [MB_LEN_MAX];
      while (n < len)
        {
	  if ((ret = __wcrtomb_cp (byte_bucket, **src, cp, mb_max))
		 <= 0)
 	    return (size_t) -1;    
	  n += ret;
	  if (byte_bucket [ret - 1] == '\0')
	    return (n - 1);
          *src++;
        }
    }
  return n;
}

Index: mingw-fseek.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mingwex/mingw-fseek.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mingw-fseek.c	13 Jul 2004 10:57:39 -0000	1.3
--- mingw-fseek.c	12 Aug 2005 22:04:23 -0000	1.4
***************
*** 38,42 ****
  }
  
! int
  __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
  {
--- 38,42 ----
  }
  
! size_t
  __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
  {

--- NEW FILE: wctrans.c ---
/*
   wctrans.c 
   7.25.3.2 Extensible wide-character case mapping functions

   Contributed by: Danny Smith  <dan...@us...>
   		   2005-02-24
   
  This source code is placed in the PUBLIC DOMAIN. It is modified
  from the Q8 package created by Doug Gwyn <gw...@ar...>  

 */

#include <string.h>
#include <wctype.h>

/*
   This differs from the MS implementation of wctrans which
   returns 0 for tolower and 1 for toupper.  According to
   C99, a 0 return value indicates invalid input.

   These two function go in the same translation unit so that we
   can ensure that
     towctrans(wc, wctrans("tolower")) == towlower(wc) 
     towctrans(wc, wctrans("toupper")) == towupper(wc)
   It also ensures that
     towctrans(wc, wctrans("")) == wc
   which is not required by standard.
*/

static const struct {
  const char *name;
  wctrans_t val; } tmap[] = {
    {"tolower", _LOWER},
    {"toupper", _UPPER}
 };

#define	NTMAP	(sizeof tmap / sizeof tmap[0])

wctrans_t
wctrans (const char* property)
{
  int i;
  for ( i = 0; i < NTMAP; ++i )
    if (strcmp (property, tmap[i].name) == 0)
      return tmap[i].val;
   return 0;
}

wint_t towctrans (wint_t wc, wctrans_t desc)
{
  switch (desc)
    {
    case _LOWER:
      return towlower (wc);
    case _UPPER:
      return towupper (wc);
    default:
      return wc;
   }
}

--- NEW FILE: btowc.c ---
#include "mb_wc_common.h"
#include <wchar.h>
#include <stdio.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

wint_t btowc (int c)
{
  if (c == EOF)
    return (WEOF);
  else
    {
      unsigned char ch = c;
      wchar_t wc = WEOF;
      MultiByteToWideChar (get_cp_from_locale(), MB_ERR_INVALID_CHARS,
			   (char*)&ch, 1, &wc, 1);
      return wc;
    }
}

Update of /cvsroot/mingw/runtime/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/include

Modified Files:
	_mingw.h assert.h ctype.h malloc.h math.h stdint.h stdio.h 
	tchar.h wchar.h wctype.h 
Log Message:
Merge Cygwin changes

Index: ctype.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/ctype.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ctype.h	20 Apr 2004 23:26:26 -0000	1.10
--- ctype.h	12 Aug 2005 22:04:23 -0000	1.11
***************
*** 188,193 ****
  _CRTIMP int __cdecl iswxdigit(wint_t);
  
! _CRTIMP wchar_t __cdecl towlower(wchar_t);
! _CRTIMP wchar_t __cdecl towupper(wchar_t);
  
  _CRTIMP int __cdecl isleadbyte (int);
--- 188,196 ----
  _CRTIMP int __cdecl iswxdigit(wint_t);
  
! /* Older MS docs uses wchar_t for arg and return type, while newer
!    online MS docs say arg is wint_t and return is int.
!    ISO C uses wint_t for both.  */
! _CRTIMP wint_t __cdecl towlower (wint_t);
! _CRTIMP wint_t __cdecl towupper (wint_t);
  
  _CRTIMP int __cdecl isleadbyte (int);

Index: wctype.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/wctype.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wctype.h	10 Oct 2003 15:02:04 -0000	1.7
--- wctype.h	12 Aug 2005 22:04:23 -0000	1.8
***************
*** 80,85 ****
  _CRTIMP int __cdecl	iswxdigit(wint_t);
  
! _CRTIMP wchar_t __cdecl	towlower(wchar_t);
! _CRTIMP wchar_t __cdecl	towupper(wchar_t);
  
  _CRTIMP int __cdecl	isleadbyte (int);
--- 80,88 ----
  _CRTIMP int __cdecl	iswxdigit(wint_t);
  
! /* Older MS docs uses wchar_t for arg and return type, while newer
!    online MS docs say arg is wint_t and return is int.
!    ISO C uses wint_t for both.  */
! _CRTIMP wint_t __cdecl	towlower (wint_t);
! _CRTIMP wint_t __cdecl	towupper (wint_t);
  
  _CRTIMP int __cdecl	isleadbyte (int);
***************
*** 129,135 ****
  
  typedef wchar_t wctrans_t;
! _CRTIMP wint_t __cdecl		towctrans(wint_t, wctrans_t);
! _CRTIMP wctrans_t __cdecl	wctrans(const char*);
! _CRTIMP wctype_t __cdecl	wctype(const char*);
  
  #ifdef __cplusplus
--- 132,146 ----
  
  typedef wchar_t wctrans_t;
! 
! /* These are resolved by libmingwex.a.  Note, that they are also exported
!    by the MS C++ runtime lib (msvcp60.dll).  The msvcp60.dll implementations
!    of wctrans and towctrans are not C99 compliant in that wctrans("tolower")
!    returns 0, while std specifies that a non-zero value should be returned
!    for a valid string descriptor.  If you want the MS behaviour (and you have
!    msvcp60.dll in your path) add -lmsvcp60 to your command line.  */ 	
! 
! wint_t __cdecl		towctrans(wint_t, wctrans_t);
! wctrans_t __cdecl	wctrans(const char*);
! wctype_t __cdecl	wctype(const char*);
  
  #ifdef __cplusplus

Index: malloc.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/malloc.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** malloc.h	5 Sep 2004 13:52:44 -0000	1.12
--- malloc.h	12 Aug 2005 22:04:23 -0000	1.13
***************
*** 33,38 ****
  
  /* Values for _heapinfo.useflag */
! #define _USEDENTRY 0
! #define _FREEENTRY 1
  
  #ifdef	__cplusplus
--- 33,46 ----
  
  /* Values for _heapinfo.useflag */
! #define _FREEENTRY 0
! #define _USEDENTRY 1
! 
! /* Return codes for _heapwalk()  */
! #define _HEAPEMPTY	(-1)
! #define _HEAPOK		(-2)
! #define _HEAPBADBEGIN	(-3)
! #define _HEAPBADNODE	(-4)
! #define _HEAPEND	(-5)
! #define _HEAPBADPTR	(-6)
  
  #ifdef	__cplusplus

Index: stdio.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdio.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** stdio.h	13 Jan 2005 19:52:18 -0000	1.19
--- stdio.h	12 Aug 2005 22:04:23 -0000	1.20
***************
*** 313,317 ****
  
  int __cdecl __mingw_fseek (FILE *, long, int);
! int __cdecl __mingw_fwrite (const void*, size_t, size_t, FILE*);
  #define fseek(fp, offset, whence)  __mingw_fseek(fp, offset, whence)
  #define fwrite(buffer, size, count, fp)  __mingw_fwrite(buffer, size, count, fp)
--- 313,317 ----
  
  int __cdecl __mingw_fseek (FILE *, long, int);
! size_t __cdecl __mingw_fwrite (const void*, size_t, size_t, FILE*);
  #define fseek(fp, offset, whence)  __mingw_fseek(fp, offset, whence)
  #define fwrite(buffer, size, count, fp)  __mingw_fwrite(buffer, size, count, fp)

Index: _mingw.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/_mingw.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** _mingw.h	13 Jan 2005 19:52:18 -0000	1.23
--- _mingw.h	12 Aug 2005 22:04:23 -0000	1.24
***************
*** 111,114 ****
--- 111,122 ----
  #endif
  
+ #if defined (__GNUC__) && defined (__GNUC_MINOR__)
+ #define __MINGW_GNUC_PREREQ(major, minor) \
+   (__GNUC__ > (major) \
+    || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
+ #else
+ #define __MINGW_GNUC_PREREQ(major, minor)  0
+ #endif
+ 
  #ifdef __cplusplus
  # define __UNUSED_PARAM(x) 
***************
*** 129,133 ****
  #endif
  
! #if ( __GNUC__ >= 3)
  #define __MINGW_ATTRIB_MALLOC __attribute__ ((__malloc__))
  #define __MINGW_ATTRIB_PURE __attribute__ ((__pure__))
--- 137,141 ----
  #endif
  
! #if __MINGW_GNUC_PREREQ (3, 0)
  #define __MINGW_ATTRIB_MALLOC __attribute__ ((__malloc__))
  #define __MINGW_ATTRIB_PURE __attribute__ ((__pure__))
***************
*** 137,140 ****
--- 145,157 ----
  #endif
  
+ /* Attribute `nonnull' was valid as of gcc 3.3.  We don't use GCC's
+    variadiac macro facility, because variadic macros cause syntax
+    errors with  --traditional-cpp.  */
+ #if  __MINGW_GNUC_PREREQ (3, 3)
+ #define __MINGW_ATTRIB_NONNULL(arg) __attribute__ ((__nonnull__ (arg)))
+ #else
+ #define __MINGW_ATTRIB_NONNULL(arg)
+ #endif /* GNUC >= 3.3 */
+ 
  #ifndef __MSVCRT_VERSION__
  /*  High byte is the major version, low byte is the minor. */

Index: tchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/tchar.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tchar.h	13 Jan 2005 19:52:18 -0000	1.14
--- tchar.h	12 Aug 2005 22:04:23 -0000	1.15
***************
*** 200,203 ****
--- 200,205 ----
  #define _trmdir		_wrmdir
  #define _tstat		_wstat
+ #define _tstati64	_wstati64
+ #define _tstat64	_wstat64
  #endif  /* __MSVCRT__ */
  
***************
*** 375,378 ****
--- 377,382 ----
  #define _tfindnexti64   _findnexti64
  #define _tfinddatai64_t _finddatai64_t
+ #define _tstati64   _stati64
+ #define _tstat64    _stat64
  #endif  /* __MSVCRT__ */
  

Index: math.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/math.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** math.h	2 Jan 2005 16:00:40 -0000	1.21
--- math.h	12 Aug 2005 22:04:23 -0000	1.22
***************
*** 374,378 ****
    unsigned short stw;
    __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
!   return stw & 0x0200;
  }
  
--- 374,378 ----
    unsigned short stw;
    __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
!   return (stw & 0x0200) != 0;
  }
  
***************
*** 380,384 ****
    unsigned short stw;
    __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
!   return stw & 0x0200;
  }
  
--- 380,384 ----
    unsigned short stw;
    __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
!   return (stw & 0x0200) != 0;
  }
  
***************
*** 386,390 ****
    unsigned short stw;
    __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
!   return stw & 0x0200;
  }
  
--- 386,390 ----
    unsigned short stw;
    __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
!   return (stw & 0x0200) != 0;
  }
  
***************
*** 455,459 ****
  extern long double __cdecl exp2l(long double);
  
! /* 7.12.6.3 The expm1 functions: TODO */
  
  /* 7.12.6.4 Double in C89 */
--- 455,463 ----
  extern long double __cdecl exp2l(long double);
  
! /* 7.12.6.3 The expm1 functions */
! /* TODO: These could be inlined */
! extern double __cdecl expm1(double);
! extern float __cdecl expm1f(float);
! extern long double __cdecl expm1l(long double);
  
  /* 7.12.6.4 Double in C89 */
***************
*** 497,500 ****
--- 501,507 ----
  extern long double __cdecl logbl (long double);
  
+ /* Inline versions.  GCC-4.0+ can do a better fast-math optimization
+    with __builtins. */ 
+ #if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ )
  __CRT_INLINE double __cdecl logb (double x)
  {
***************
*** 520,523 ****
--- 527,531 ----
    return res;
  }
+ #endif /* !defined __FAST_MATH__ || !__MINGW_GNUC_PREREQ (4, 0) */
  
  /* 7.12.6.12  Double in C89 */
***************
*** 562,575 ****
  extern double __cdecl erf (double);
  extern float __cdecl erff (float);
- /* TODO
  extern long double __cdecl erfl (long double);
- */ 
  
  /* 7.12.8.2 The erfc functions  */
  extern double __cdecl erfc (double);
  extern float __cdecl erfcf (float);
- /* TODO
  extern long double __cdecl erfcl (long double);
- */ 
  
  /* 7.12.8.3 The lgamma functions */
--- 570,579 ----
***************
*** 598,601 ****
--- 602,621 ----
  /* 7.12.9.4 */
  /* round, using fpu control word settings */
+ extern double __cdecl rint (double);
+ extern float __cdecl rintf (float);
+ extern long double __cdecl rintl (long double);
+ 
+ /* 7.12.9.5 */
+ extern long __cdecl lrint (double);
+ extern long __cdecl lrintf (float);
+ extern long __cdecl lrintl (long double);
+ 
+ extern long long __cdecl llrint (double);
+ extern long long __cdecl llrintf (float);
+ extern long long __cdecl llrintl (long double);
+ 
+ /* Inline versions of above. 
+    GCC 4.0+ can do a better fast-math job with __builtins. */
+ #if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ )
  __CRT_INLINE double __cdecl rint (double x)
  {
***************
*** 619,628 ****
  }
  
- /* 7.12.9.5 */
  __CRT_INLINE long __cdecl lrint (double x) 
  {
    long retval;  
!   __asm__ __volatile__							      \
!     ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
    return retval;
  }
--- 639,647 ----
  }
  
  __CRT_INLINE long __cdecl lrint (double x) 
  {
    long retval;  
!   __asm__ __volatile__
!     ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");
    return retval;
  }
***************
*** 631,636 ****
  {
    long retval;
!   __asm__ __volatile__							      \
!     ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
    return retval;
  }
--- 650,655 ----
  {
    long retval;
!   __asm__ __volatile__
!     ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");
    return retval;
  }
***************
*** 639,660 ****
  {
    long retval;
!   __asm__ __volatile__							      \
!     ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
    return retval;
  }
  
! __CRT_INLINE long long __cdecl llrint (double x) 
  {
    long long retval;
!   __asm__ __volatile__							      \
!     ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
    return retval;
  }
  
! __CRT_INLINE long long __cdecl llrintf (float x) 
  {
    long long retval;
!   __asm__ __volatile__							      \
!     ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
    return retval;
  }
--- 658,679 ----
  {
    long retval;
!   __asm__ __volatile__
!     ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");
    return retval;
  }
  
! __CRT_INLINE long long __cdecl llrint (double x)
  {
    long long retval;
!   __asm__ __volatile__
!     ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");
    return retval;
  }
  
! __CRT_INLINE long long __cdecl llrintf (float x)
  {
    long long retval;
!   __asm__ __volatile__
!     ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");
    return retval;
  }
***************
*** 663,670 ****
  {
    long long retval;
!   __asm__ __volatile__							      \
!     ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
    return retval;
  }
  
  /* 7.12.9.6 */
--- 682,690 ----
  {
    long long retval;
!   __asm__ __volatile__
!     ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");
    return retval;
  }
+ #endif /* !__FAST_MATH__ || !__MINGW_GNUC_PREREQ (4,0)  */
  
  /* 7.12.9.6 */
***************
*** 722,729 ****
  extern double __cdecl nextafter (double, double); /* in libmoldname.a */
  extern float __cdecl nextafterf (float, float);
! /* TODO: Not yet implemented */
! /* extern long double __cdecl nextafterl (long double, long double); */
  
! /* 7.12.11.4 The nexttoward functions: TODO */
  
  /* 7.12.12.1 */
--- 742,751 ----
  extern double __cdecl nextafter (double, double); /* in libmoldname.a */
  extern float __cdecl nextafterf (float, float);
! extern long double __cdecl nextafterl (long double, long double);
  
! /* 7.12.11.4 The nexttoward functions */
! extern double __cdecl nexttoward (double,  long double);
! extern float __cdecl nexttowardf (float,  long double);
! extern long double __cdecl nexttowardl (long double, long double);
  
  /* 7.12.12.1 */

Index: wchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/wchar.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wchar.h	2 Jan 2005 16:00:40 -0000	1.15
--- wchar.h	12 Aug 2005 22:04:23 -0000	1.16
***************
*** 52,56 ****
  
  #define WCHAR_MIN	0
! #define WCHAR_MAX	((wchar_t)-1)
  
  #ifndef WEOF
--- 52,56 ----
  
  #define WCHAR_MIN	0
! #define WCHAR_MAX	0xffff
  
  #ifndef WEOF
***************
*** 255,261 ****
  #endif  /* _WSTRING_DEFINED */
  
! /* These are resolved by -lmsvcp60 */
! /* If you don't have msvcp60.dll in your windows system directory, you can
!    easily obtain it with a search from your favorite search engine. */
  #ifndef __STRICT_ANSI__
  typedef wchar_t _Wint_t;
--- 255,263 ----
  #endif  /* _WSTRING_DEFINED */
  
! /* These are resolved by -lmingwex. Alternatively, they can be resolved by
!    adding -lmsvcp60 to your command line, which will give you the VC++
!    versions of these functions. If you want the latter and don't have
!    msvcp60.dll in your windows system directory, you can easily obtain
!    it with a search from your favorite search engine.  */
  #ifndef __STRICT_ANSI__
  typedef wchar_t _Wint_t;
***************
*** 265,291 ****
  
  wint_t __cdecl btowc(int);
! size_t __cdecl mbrlen(const char *, size_t, mbstate_t *);
! size_t __cdecl mbrtowc(wchar_t *, const char *, size_t, mbstate_t *);
! size_t __cdecl mbsrtowcs(wchar_t *, const char **, size_t, mbstate_t *);
! 
! size_t __cdecl wcrtomb(char *, wchar_t, mbstate_t *);
! size_t __cdecl wcsrtombs(char *, const wchar_t **, size_t, mbstate_t *);
  int __cdecl wctob(wint_t);
  
  #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */
! __CRT_INLINE int __cdecl fwide(FILE* __UNUSED_PARAM(stream), int __UNUSED_PARAM(mode))
    {return -1;} /* limited to byte orientation */ 
  __CRT_INLINE int __cdecl mbsinit(const mbstate_t* __UNUSED_PARAM(ps))
    {return 1;}
! wchar_t* __cdecl wmemset(wchar_t* s, wchar_t c, size_t n);
! wchar_t* __cdecl wmemchr(const wchar_t* s, wchar_t c, size_t n);
! int wmemcmp(const wchar_t* s1, const wchar_t * s2, size_t n);
! wchar_t* __cdecl wmemcpy(wchar_t* __restrict__ s1, const wchar_t* __restrict__ s2,
! 		 size_t n);
! wchar_t* __cdecl wmemmove(wchar_t* s1, const wchar_t* s2, size_t n);
! long long __cdecl wcstoll(const wchar_t* __restrict__ nptr,
! 		  wchar_t** __restrict__ endptr, int base);
! unsigned long long __cdecl wcstoull(const wchar_t* __restrict__ nptr,
! 			    wchar_t ** __restrict__ endptr, int base);
  #endif /* __NO_ISOCEXT */
  
--- 267,299 ----
  
  wint_t __cdecl btowc(int);
! size_t __cdecl mbrlen(const char * __restrict__, size_t,
! 		      mbstate_t * __restrict__);
! size_t __cdecl mbrtowc(wchar_t * __restrict__, const char * __restrict__,
! 		       size_t, mbstate_t * __restrict__);
! size_t __cdecl mbsrtowcs(wchar_t * __restrict__, const char ** __restrict__,
! 			 size_t, mbstate_t * __restrict__);
! size_t __cdecl wcrtomb(char * __restrict__, wchar_t,
! 		       mbstate_t * __restrict__);
! size_t __cdecl wcsrtombs(char * __restrict__, const wchar_t ** __restrict__,
! 			 size_t, mbstate_t * __restrict__);
  int __cdecl wctob(wint_t);
  
  #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */
! __CRT_INLINE int __cdecl fwide(FILE* __UNUSED_PARAM(stream),
! 			       int __UNUSED_PARAM(mode))
    {return -1;} /* limited to byte orientation */ 
  __CRT_INLINE int __cdecl mbsinit(const mbstate_t* __UNUSED_PARAM(ps))
    {return 1;}
! wchar_t* __cdecl wmemset(wchar_t *, wchar_t, size_t);
! wchar_t* __cdecl wmemchr(const wchar_t*, wchar_t, size_t);
! int wmemcmp(const wchar_t*, const wchar_t *, size_t);
! wchar_t* __cdecl wmemcpy(wchar_t* __restrict__,
! 		         const wchar_t* __restrict__,
! 			 size_t);
! wchar_t* __cdecl wmemmove(wchar_t* s1, const wchar_t *, size_t);
! long long __cdecl wcstoll(const wchar_t * __restrict__,
! 			  wchar_t** __restrict__, int);
! unsigned long long __cdecl wcstoull(const wchar_t * __restrict__,
! 			    wchar_t ** __restrict__, int);
  #endif /* __NO_ISOCEXT */
  
***************
*** 387,390 ****
--- 395,400 ----
  };
  
+ #ifndef	_NO_OLDNAMES
+ /* NOTE: Must be the same as _stat above. */
  struct stat
  {
***************
*** 402,405 ****
--- 412,416 ----
  	time_t	st_ctime;	/* Creation time */
  };
+ #endif /* _NO_OLDNAMES */
  
  #if defined (__MSVCRT__)
***************
*** 427,431 ****
      short st_gid;
      _dev_t st_rdev;
!     _off_t st_size;
      __time64_t st_atime;
      __time64_t st_mtime;
--- 438,442 ----
      short st_gid;
      _dev_t st_rdev;
!     __int64 st_size;
      __time64_t st_atime;
      __time64_t st_mtime;

Index: assert.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/assert.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** assert.h	20 Apr 2004 23:26:26 -0000	1.5
--- assert.h	12 Aug 2005 22:04:23 -0000	1.6
***************
*** 9,19 ****
   */
  
! #ifndef _ASSERT_H_
! #define	_ASSERT_H_
  
  /* All the headers include this file. */
  #include <_mingw.h>
  
! #ifndef RC_INVOKED
  
  #ifdef	__cplusplus
--- 9,22 ----
   */
  
! /* We should be able to include this file multiple times to allow the assert
!    macro to be enabled/disabled for different parts of code.  So don't add a
!    header guard.  */ 
! 
! #ifndef RC_INVOKED
  
  /* All the headers include this file. */
  #include <_mingw.h>
  
! #undef assert
  
  #ifdef	__cplusplus
***************
*** 22,26 ****
  
  #ifdef NDEBUG
- 
  /*
   * If not debugging, assert does nothing.
--- 25,28 ----
***************
*** 34,42 ****
   * call to abort.
   */
! _CRTIMP void __cdecl _assert (const char*, const char*, int)
! #ifdef	__GNUC__
! 	__attribute__ ((noreturn))
! #endif
! 	;
  
  /*
--- 36,40 ----
   * call to abort.
   */
! _CRTIMP void __cdecl _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
  
  /*
***************
*** 44,47 ****
--- 42,46 ----
   */
  #define assert(e)       ((e) ? (void)0 : _assert(#e, __FILE__, __LINE__))
+ 
  #endif	/* NDEBUG */
  
***************
*** 51,55 ****
  
  #endif /* Not RC_INVOKED */
- 
- #endif /* Not _ASSERT_H_ */
- 
--- 50,51 ----

Index: stdint.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdint.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** stdint.h	19 Apr 2004 17:22:40 -0000	1.5
--- stdint.h	12 Aug 2005 22:04:23 -0000	1.6
***************
*** 138,142 ****
  #ifndef WCHAR_MIN  /* also in wchar.h */ 
  #define WCHAR_MIN 0
! #define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */
  #endif
  
--- 138,142 ----
  #ifndef WCHAR_MIN  /* also in wchar.h */ 
  #define WCHAR_MIN 0
! #define WCHAR_MAX 0xffff /* UINT16_MAX */
  #endif
  
***************
*** 145,149 ****
   */
  #define WINT_MIN 0
! #define WINT_MAX ((wint_t)-1) /* UINT16_MAX */
  
  #endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */
--- 145,149 ----
   */
  #define WINT_MIN 0
! #define WINT_MAX 0xffff /* UINT16_MAX */
  
  #endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */

Update of /cvsroot/mingw/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105

Modified Files:
	ChangeLog crt1.c moldname.def.in mthr_stub.c 
Removed Files:
	ctype_old.c string_old.c 
Log Message:
Merge Cygwin changes

Index: mthr_stub.c
===================================================================
RCS file: /cvsroot/mingw/runtime/mthr_stub.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mthr_stub.c	6 Nov 2001 08:06:35 -0000	1.2
--- mthr_stub.c	12 Aug 2005 22:04:23 -0000	1.3
***************
*** 16,20 ****
  #include <windows.h>
  #undef WIN32_LEAN_AND_MEAN
- #include <assert.h>
  
  /*
--- 16,19 ----
***************
*** 23,29 ****
   * Public interface called by C++ exception handling mechanism in
   * libgcc (cf: __gthread_key_create).
!  *
!  * THIS SHOULD NEVER BE CALLED!
!  *
   */
  
--- 22,26 ----
   * Public interface called by C++ exception handling mechanism in
   * libgcc (cf: __gthread_key_create).
!  * No-op versions.
   */
  
***************
*** 31,45 ****
  __mingwthr_key_dtor (DWORD key, void (*dtor) (void *))
  {
!   assert (0);
!   /* NOTREACHED */
    return 0;
  }
  
- 
  int
  __mingwthr_remove_key_dtor (DWORD key )
  {
!   assert (0);
!   /* NOTREACHED */
    return 0;
  }
--- 28,44 ----
  __mingwthr_key_dtor (DWORD key, void (*dtor) (void *))
  {
! #ifdef DEBUG
!   printf ("%s: ignoring key: (%ld) / dtor: (%x)\n", 
!           __FUNCTION__, key, dtor);
! #endif
    return 0;
  }
  
  int
  __mingwthr_remove_key_dtor (DWORD key )
  {
! #ifdef DEBUG
!   printf ("%s: ignoring key: (%ld)\n", __FUNCTION__, key );
! #endif
    return 0;
  }

--- ctype_old.c DELETED ---

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/runtime/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** ChangeLog	13 Jan 2005 19:52:17 -0000	1.70
--- ChangeLog	12 Aug 2005 22:04:23 -0000	1.71
***************
*** 1,2 ****
--- 1,189 ----
+ 2005-08-10  Danny Smith  <dan...@us...>
+ 
+ 	* include/wctype.h (towupper, towlower): Change arg and return value
+ 	types to wint_t.
+ 	* include/ctype.h (towupper, towlower): Likewise.
+ 
+ 2005-08-10  Danny Smith  <dan...@us...>
+ 
+ 	* mthr_stub.c (__mingwthr_key_dtor): Replace assert(0) with 
+ 	a diagnostic, guarded by #ifdef DEBUG.
+ 	(__mingwthr_remove_key_dtor): Likewise.
+ 
+ 2005-08-08  Danny Smith  <dan...@us...>
+ 
+ 	* moldname.def.in (sleep, beep, seterrormode): Remove.
+ 
+ 2005-06-16  Danny Smith  <dan...@us...>
+ 
+ 	* profile/profile.h (_MCOUNT_CALL): Define as regparm(2)
+ 	(_MCOUNT_DECL): Use it.
+ 	(MCOUNT): Save and restore eax, ecx, edx registers.
+ 	* profile/mcount.c (_mcount): ANSI-fy.
+ 
+ 2005-06-16  Danny Smith  <dan...@us...>
+ 
+ 	* include/_mingw.h (__MINGW_GNUC_PREREQ): Define. Use to
+ 	guard __MINGW_ATTRIB macro definitions.
+ 	* include/math.h (logb[fl]):  Don't define inlines for
+ 	GCC-4.0+ && __FAST_MATH__.
+ 	(rint[fl], lrint[fl], llrint[fl]); Likewise.  Clean up
+ 	line-continuation backslashes.
+ 
+ 2005-06-06  Danny Smith  <dan...@us...>
+ 
+ 	* include/_mingw.h (__MINGW_ATTRIBUTE_NONNULL): Fix typo
+ 	in GNUC version guard.
+ 
+ 2005-05-20  Danny Smith  <dan...@us...>
+ 
+ 	* crt1.c (_gnu_exception_handler): Handle illegal instruction
+ 	OS exception as a signal if user has defined a SIGILL handler.
+ 
+ 2005-05-10  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/math/nexttoward.c: New file.
+ 	* mingwex/math/nexttowardf.c: New file.
+ 	* mingwex/math/nextafterl.c: Add nexttowardl alias.
+ 	* mingwex/Makefile.in (MATH_DISTFILES): Add nexttoward.c,
+ 	mexttowardf.c,
+ 	(MATH_OBJS):  Add nexttoward.o,	nexttowardf.o,
+ 	* include/math.h (nexttoward, nextowardf, nexttowardl): Add
+ 	prototypes.
+ 
+ 2005-05-09  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/math/nextafterf.c (nextafterf): Correct
+ 	handling of -0.0.
+ 	* mingwex/math/nextafterl.c: New file.
+ 	* mingwex/Makefile.in (MATH_DISTFILES): Add nextafterl.c.
+ 	(MATH_OBJS): Add nextafterl.o.
+ 	* include/math.h (nextafterl): Uncomment prototype.
+ 
+ 2005-05-08  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/math/erfl.c: New file.
+ 	* mingwex/Makefile.in (MATH_DISTFILES): Add erfl.c.
+ 	(MATH_OBJS): Add erfl.o.
+ 	* include/math.h (erfl, erfcl): Uncomment prototypes.
+ 
+ 2005-05-04  Danny Smith  <dan...@us...>
+ 
+ 	* include/wchar.h (WCHAR_MAX): Define as 0xffff, so preprocessor
+ 	#if (WCHAR_MAX <= WCHAR_MIN) is false.
+ 	* include/stdint.h (WCHAR_MAX): Likwise.
+ 	(WINT_MAX): Likewise.
+ 
+ 2005-05-03  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/math/signbit.c (__signbit):  Make return value
+ 	consistent with GCC's __builtin_signbit.
+ 	* mingwex/math/signbitf.c (__signbitf):  Likewise.
+ 	* mingwex/math/signbitf.c (__signbitl):  Likewise.
+ 	* include/math.h (__signbit, __signbitf, __signbitl): Likewise
+ 	for inlines.
+ 
+ 2005-05-02  Danny Smith  <dan...@us...>
+ 
+ 	* include/_mingw.h (__MINGW_ATTRIB_NONNULL): Don't define as
+ 	variadic macro.
+ 	* mingwex/mbrtowc.c (__mbrtowc_cp): Use __MINGW_ATTRIB_NONNULL.
+ 	Remove unused MBTOWC_FLAGS define.
+ 
+ 2005-04-23  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/mbrtowc.c: New file.
+ 	* mingwex/wcrtomb.c: New file.
+ 	* mingwex/btowc.c: New file.
+ 	* mingwex/wctob.c: New file.
+ 	* mingwex/mb_wc_common.h: New file.
+ 	* mingwex/Makefile.in (DISTFILES): Add new files.
+ 	(Q8_OBJS): Add new objects.
+ 	* include/wchar.h: Adjust comment about mbrtowc() and related
+ 	funcions. Add __restrict__ to pointer params in prototypes.
+ 	(wmemset. wmemchr, wmemcpy, wmemmove, wcstoll, wcstoull): Remove
+ 	arg names from protototypes.
+ 
+ 2005-04-23  Wu Yongwei  <ad...@sh...>
+ 
+ 	* mingwex/dirent.c: Formatting changes.
+ 	* mingwex/dirent.c (_topendir): Make the end-of-path slash check
+ 	MBCS-safe.
+ 
+ 2005-03-31  Danny Smith  <dan...@us...>
+ 
+ 	* include/_mingw.h (__MINGW_ATTRIB_NONNULL): Define.
+ 
+ 2005-03-24  Danny Smith  <dan...@us...>
+ 
+ 	* include/stdio.h (__mingw_fwrite): Change return value to
+ 	size_t.
+ 	* mingwex/mingw-fseek.c (__mingw_fwrite): Likewise.
+ 
+ 2005-03-15  Hans Leidekker  <ha...@it...>
+ 
+ 	* include/malloc.h (_FREEENTRY, _USEDENTRY): Correct defines.
+ 
+ 2005-02-25  Danny Smith  <dan...@us...>
+ 
+ 	* include/wctype.h (wctrans): Remove _CRTIMP.
+ 	(towctrans): Likewise.
+ 	(wctype): Likewise,
+ 
+ 2005-02-25  Danny Smith  <dan...@us...>
+ 
+ 	* include/wctype.h:  Add comment on wctrans, towctrans, wctype.
+ 
+ 2005-02-25  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/wctype.c: New file.
+ 	* mingwex/wctrans.c: New file.
+ 	* mingwex/Makefile.in (DISTFILES): Add wctype.c, wctrans.c.
+ 	* mingwex/Makefile.in (Q8_OBJS): Add wctype.o, wctrans.o.
+ 
+ 2005-02-11  Danny Smith  <dan...@us...>
+ 
+ 	* include/tchar.h (_tstat64, _tstati64): Add Unicode/ANSI mappings.
+ 
+ 2005-02-11  Danny Smith  <dan...@us...>
+ 
+ 	* include/assert.h: Remove header guard.  #undef assert macro.
+ 	(_assert): Use __MINGW_ATTRIB_NORETURN define.
+ 
+ 2005-02-11  Gregory W. Chicares  <chi...@co...>
+             Danny Smith  <dan...@us...>
+ 
+ 	* include/math.h (expm1, expm1f, expmll): Add prototypes.
+ 	* mingwex/Makefile.in (MATH_DISTFILES): Add expm1.c,
+ 	expm1f.c, expm1l.c.
+ 	(MATH_OBJS): Add expm1.o, expm1f.o, expm1l.o.
+ 	* mingwex/math/expm1.c: New file.
+ 	* mingwex/math/expm1f.c: New file.
+ 	* mingwex/math/expm1l.c: New file.
+ 
+ 2005-02-07  Danny Smith  <dan...@us...>
+ 
+ 	* include/sys/stat.h (struct stat): Guard with _NO_OLDNAMES.
+ 	* include/wchar.h (struct stat): Likwwise.
+ 	Bug reported to Debian by Anand Kumria  <wil...@pr...>
+ 
+ 	* include/sys/stat.h: Remove empty __STRICT_ANSI__ guard.
+ 
+ 2005-02-01  Danny Smith  <dan...@us...>
+ 
+ 	* mingwex/strtold.c (__asctoe64): Set endptr to 'e' if exponent
+ 	string is not valid.
+ 
+ 2005-01-26  Oliver Stoeneberg  <oli...@on...>
+ 
+ 	* include/malloc.h: Add missing return code defines for
+ 	_heapwalk()
+ 
+ 2005-01-17  Danny Smith  <dan...@us...>
+ 
+ 	* include/sys/stat.h (struct __stat64): Change st_size type to
+ 	 __int64.
+ 	* include/wchar.h (struct __stat64): Change st_size type to __int64.
+ 
  2005-01-13  Earnie Boyd  <ea...@us...>
  

Index: moldname.def.in
===================================================================
RCS file: /cvsroot/mingw/runtime/moldname.def.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** moldname.def.in	19 Apr 2004 17:22:40 -0000	1.6
--- moldname.def.in	12 Aug 2005 22:04:23 -0000	1.7
***************
*** 26,30 ****
  EXPORTS
  access
- beep
  chdir
  chmod
--- 26,29 ----
***************
*** 88,94 ****
  rmtmp
  searchenv
- seterrormode
  setmode
- sleep
  sopen
  spawnl
--- 87,91 ----

--- string_old.c DELETED ---

Index: crt1.c
===================================================================
RCS file: /cvsroot/mingw/runtime/crt1.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** crt1.c	5 Sep 2004 13:52:44 -0000	1.8
--- crt1.c	12 Aug 2005 22:04:23 -0000	1.9
***************
*** 125,128 ****
--- 125,147 ----
        break;
  
+     case EXCEPTION_ILLEGAL_INSTRUCTION:
+     case EXCEPTION_PRIV_INSTRUCTION:
+       /* test if the user has set SIGILL */
+       old_handler = signal (SIGILL, SIG_DFL);
+       if (old_handler == SIG_IGN)
+ 	{
+ 	  /* this is undefined if the signal was raised by anything other
+ 	     than raise ().  */
+ 	  signal (SIGILL, SIG_IGN);
+ 	  action = EXCEPTION_CONTINUE_EXECUTION;
+ 	}
+       else if (old_handler != SIG_DFL)
+ 	{
+ 	  /* This means 'old' is a user defined function. Call it */
+ 	  (*old_handler) (SIGILL);
+ 	  action = EXCEPTION_CONTINUE_EXECUTION;
+ 	}
+       break;
+ 
      case EXCEPTION_FLT_INVALID_OPERATION:
      case EXCEPTION_FLT_DIVIDE_BY_ZERO:

Update of /cvsroot/mingw/runtime/include/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/include/sys

Modified Files:
	stat.h 
Log Message:
Merge Cygwin changes

Index: stat.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/sys/stat.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** stat.h	13 Jan 2005 19:52:18 -0000	1.9
--- stat.h	12 Aug 2005 22:04:23 -0000	1.10
***************
*** 27,32 ****
   * Constants for the stat st_mode member.
   */
- #ifndef __STRICT_ANSI__
- #endif
  #define	_S_IFIFO	0x1000	/* FIFO */
  #define	_S_IFCHR	0x2000	/* Character */
--- 27,30 ----
***************
*** 102,105 ****
--- 100,105 ----
  };
  
+ #ifndef	_NO_OLDNAMES
+ /* NOTE: Must be the same as _stat above. */
  struct stat
  {
***************
*** 117,120 ****
--- 117,121 ----
  	time_t	st_ctime;	/* Creation time */
  };
+ #endif /* _NO_OLDNAMES */
  
  #if defined (__MSVCRT__)
***************
*** 142,146 ****
      short st_gid;
      _dev_t st_rdev;
!     _off_t st_size;
      __time64_t st_atime;
      __time64_t st_mtime;
--- 143,147 ----
      short st_gid;
      _dev_t st_rdev;
!     __int64 st_size;
      __time64_t st_atime;
      __time64_t st_mtime;

Update of /cvsroot/mingw/w32api/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12053/lib

Removed Files:
	d3dim.def d3drm.def d3dxof.def ddraw.def dinput.c dinput.def 
	dplayx.def dsetup.def dsound.def dxguid.c 
Log Message:
Merged Cygwin changes

--- ddraw.def DELETED ---

--- d3dxof.def DELETED ---

--- dxguid.c DELETED ---

--- dinput.c DELETED ---

--- dplayx.def DELETED ---

--- d3drm.def DELETED ---

--- dinput.def DELETED ---

--- d3dim.def DELETED ---

--- dsound.def DELETED ---

--- dsetup.def DELETED ---

Update of /cvsroot/mingw/w32api/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298/include

Modified Files:
	w32api.h 
Log Message:
Merge Cygwin changes

Index: w32api.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/w32api.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** w32api.h	2 Jan 2005 14:16:34 -0000	1.18
--- w32api.h	11 Aug 2005 02:09:21 -0000	1.19
***************
*** 5,11 ****
  #endif
  
! #define __W32API_VERSION 3.2
  #define __W32API_MAJOR_VERSION 3
! #define __W32API_MINOR_VERSION 2
  
  /* The following defines are for documentation purposes.  The following defines
--- 5,11 ----
  #endif
  
! #define __W32API_VERSION 3.3
  #define __W32API_MAJOR_VERSION 3
! #define __W32API_MINOR_VERSION 3
  
  /* The following defines are for documentation purposes.  The following defines

Update of /cvsroot/mingw/w32api
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298

Modified Files:
	Makefile.in 
Log Message:
Merge Cygwin changes

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.in	2 Jan 2005 14:16:34 -0000	1.20
--- Makefile.in	11 Aug 2005 02:09:21 -0000	1.21
***************
*** 67,71 ****
  
  PACKAGE = w32api
! VERSION = 3.2
  CYGRELEASE = 1
  
--- 67,71 ----
  
  PACKAGE = w32api
! VERSION = 3.3
  CYGRELEASE = 1
  

Update of /cvsroot/mingw/w32api/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4063/include

Modified Files:
	basetyps.h commctrl.h commdlg.h richedit.h vfw.h winbase.h 
	wincon.h wingdi.h wininet.h winioctl.h winldap.h winnetwk.h 
	winnt.h winuser.h ws2tcpip.h 
Log Message:
Merged Cygwin changes

Index: commdlg.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commdlg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** commdlg.h	12 Sep 2003 13:26:51 -0000	1.8
--- commdlg.h	11 Aug 2005 00:59:49 -0000	1.9
***************
*** 116,120 ****
  #define OFN_SHARENOWARN 1
  #define OFN_SHAREWARN 0
! #define OFN_NODEREFERENCELINKS	0x100000
  #define FR_DIALOGTERM 64
  #define FR_DOWN 1
--- 116,123 ----
  #define OFN_SHARENOWARN 1
  #define OFN_SHAREWARN 0
! #define OFN_NODEREFERENCELINKS 0x100000
! #if (_WIN32_WINNT >= 0x0500)
! #define OFN_DONTADDTORECENT 0x02000000
! #endif
  #define FR_DIALOGTERM 64
  #define FR_DOWN 1

Index: winioctl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winioctl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** winioctl.h	15 Feb 2004 07:35:01 -0000	1.10
--- winioctl.h	11 Aug 2005 00:59:49 -0000	1.11
***************
*** 73,76 ****
--- 73,84 ----
  #define IOCTL_DISK_UPDATE_DRIVE_SIZE CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
  #define IOCTL_SERIAL_LSRMST_INSERT	CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS)
+ 
+ /*  Also in ddk/ntddvol.h */
+ #define IOCTL_VOLUME_BASE   ((ULONG) 'V')
+ #define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS \
+   CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
+ #define IOCTL_VOLUME_IS_CLUSTERED \
+   CTL_CODE(IOCTL_VOLUME_BASE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
+ 
  #define FSCTL_LOCK_VOLUME	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,6,METHOD_BUFFERED,FILE_ANY_ACCESS)
  #define FSCTL_UNLOCK_VOLUME	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,7,METHOD_BUFFERED,FILE_ANY_ACCESS)

Index: winbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winbase.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** winbase.h	2 Jan 2005 13:10:37 -0000	1.26
--- winbase.h	11 Aug 2005 00:59:49 -0000	1.27
***************
*** 1535,1539 ****
  WINBASEAPI SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */
  WINBASEAPI ATOM WINAPI GlobalDeleteAtom(ATOM);
! WINBASEAPI HGLOBAL GlobalDiscard(HGLOBAL);
  WINBASEAPI ATOM WINAPI GlobalFindAtomA(LPCSTR);
  WINBASEAPI ATOM WINAPI GlobalFindAtomW(LPCWSTR);
--- 1535,1539 ----
  WINBASEAPI SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */
  WINBASEAPI ATOM WINAPI GlobalDeleteAtom(ATOM);
! #define GlobalDiscard(hMem) GlobalReAlloc((hMem), 0, GMEM_MOVEABLE)
  WINBASEAPI ATOM WINAPI GlobalFindAtomA(LPCSTR);
  WINBASEAPI ATOM WINAPI GlobalFindAtomW(LPCWSTR);
***************
*** 1746,1749 ****
--- 1746,1752 ----
  WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER);
  WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,DWORD);
+ #if (_WIN32_WINNT >= 0x0500)
+ WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG);
+ #endif
  WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const DWORD*);
  WINBASEAPI BOOL WINAPI ReadDirectoryChangesW(HANDLE,PVOID,DWORD,BOOL,DWORD,PDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
***************
*** 1950,1954 ****
  #ifdef UNICODE
  typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO;
! typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA;
  typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
  #if (_WIN32_WINNT >= 0x0501)
--- 1953,1957 ----
  #ifdef UNICODE
  typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO;
! typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*PWIN32_FIND_DATA,*LPWIN32_FIND_DATA;
  typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
  #if (_WIN32_WINNT >= 0x0501)
***************
*** 2146,2150 ****
  #else
  typedef STARTUPINFOA STARTUPINFO,*LPSTARTUPINFO;
! typedef WIN32_FIND_DATAA WIN32_FIND_DATA,*LPWIN32_FIND_DATA;
  typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
  #if (_WIN32_WINNT >= 0x0501)
--- 2149,2153 ----
  #else
  typedef STARTUPINFOA STARTUPINFO,*LPSTARTUPINFO;
! typedef WIN32_FIND_DATAA WIN32_FIND_DATA,*PWIN32_FIND_DATA,*LPWIN32_FIND_DATA;
  typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
  #if (_WIN32_WINNT >= 0x0501)

Index: wingdi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wingdi.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wingdi.h	2 Jan 2005 13:10:37 -0000	1.17
--- wingdi.h	11 Aug 2005 00:59:49 -0000	1.18
***************
*** 10,14 ****
--- 10,21 ----
  #endif
  
+ #ifndef WINGDIAPI
+ #ifdef __W32API_USE_DLLIMPORT__
+ #define WINGDIAPI DECLSPEC_IMPORT
+ #else
  #define WINGDIAPI
+ #endif
+ #endif
+ 
  #define BI_RGB 0
  #define BI_RLE8 1
***************
*** 647,650 ****
--- 654,671 ----
  #define DESKTOPVERTRES 117
  #define BLTALIGNMENT 119
+ #if(WINVER >= 0x0500)
+ #define SHADEBLENDCAPS 120
+ #define SB_NONE 0x00
+ #define SB_CONST_ALPHA 0x01
+ #define SB_PIXEL_ALPHA 0x02
+ #define SB_PREMULT_ALPHA 0x04
+ #define SB_GRAD_RECT 0x10
+ #define SB_GRAD_TRI 0x20
+ #define COLORMGMTCAPS 121
+ #define CM_NONE 0x00
+ #define CM_DEVICE_ICM 0x01
+ #define CM_GAMMA_RAMP 0x02
+ #define CM_CMYK_COLOR 0x04
+ #endif
  #define RASTERCAPS 38
  #define RC_BANDING 2
***************
*** 802,808 ****
  #define DC_PEN	19
  #endif
- #define SYSPAL_NOSTATIC 2
- #define SYSPAL_STATIC 1
  #define SYSPAL_ERROR 0
  #define TA_BASELINE 24
  #define TA_BOTTOM 8
--- 823,830 ----
  #define DC_PEN	19
  #endif
  #define SYSPAL_ERROR 0
+ #define SYSPAL_STATIC 1
+ #define SYSPAL_NOSTATIC 2
+ #define SYSPAL_NOSTATIC256 3 
  #define TA_BASELINE 24
  #define TA_BOTTOM 8
***************
*** 1119,1122 ****
--- 1141,1145 ----
  #define TT_PRIM_LINE 1
  #define TT_PRIM_QSPLINE 2
+ #define TT_PRIM_CSPLINE 3 
  #define FONTMAPPER_MAX 10
  #define ENHMETA_STOCK_OBJECT 0x80000000
***************
*** 2527,2892 ****
  #define PALETTERGB(r,g,b)	(0x02000000|RGB(r,g,b))
  
! int WINAPI AbortDoc(HDC);
! BOOL WINAPI AbortPath(HDC);
! int WINAPI AddFontResourceA(LPCSTR);
! int WINAPI AddFontResourceW(LPCWSTR);
  #if (_WIN32_WINNT >= 0x0500)
! HANDLE WINAPI AddFontMemResourceEx(PVOID,DWORD,PVOID,DWORD *);
! int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID);
! int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID);
  #endif
! BOOL WINAPI AngleArc(HDC,int,int,DWORD,FLOAT,FLOAT);
! BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
! BOOL WINAPI Arc(HDC,int,int,int,int,int,int,int,int);
! BOOL WINAPI ArcTo(HDC,int,int,int,int,int,int,int,int);
! BOOL WINAPI BeginPath(HDC);
! BOOL WINAPI BitBlt(HDC,int,int,int,int,HDC,int,int,DWORD);
! BOOL WINAPI CancelDC(HDC);
! BOOL WINAPI CheckColorsInGamut(HDC,PVOID,PVOID,DWORD);
! BOOL WINAPI Chord(HDC,int,int,int,int,int,int,int,int);
! int WINAPI ChoosePixelFormat(HDC,CONST PIXELFORMATDESCRIPTOR*);
! HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
! BOOL WINAPI CloseFigure(HDC);
! HMETAFILE WINAPI CloseMetaFile(HDC);
! BOOL WINAPI ColorMatchToTarget(HDC,HDC,DWORD);
! int WINAPI CombineRgn(HRGN,HRGN,HRGN,int);
! BOOL WINAPI CombineTransform(LPXFORM,const XFORM*,const XFORM*);
! HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR);
! HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR);
! HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR);
! HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR);
! HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,PCVOID);
! HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*);
! HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*);
! HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA);
! HCOLORSPACE WINAPI CreateColorSpaceW(LPLOGCOLORSPACEW);
! HBITMAP WINAPI CreateCompatibleBitmap(HDC,int,int);
! HDC WINAPI CreateCompatibleDC(HDC);
! HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
! HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
! HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,PCVOID,const BITMAPINFO*,UINT);
! HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
! HBRUSH WINAPI CreateDIBPatternBrushPt(PCVOID,UINT);
! HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,void**,HANDLE,DWORD);
! HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int);
! HRGN WINAPI CreateEllipticRgn(int,int,int,int);
! HRGN WINAPI CreateEllipticRgnIndirect(LPCRECT);
! HDC WINAPI CreateEnhMetaFileA(HDC,LPCSTR,LPCRECT,LPCSTR);
! HDC WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,LPCRECT,LPCWSTR);
! HFONT WINAPI CreateFontA(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR);
! HFONT WINAPI CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR);
! HFONT WINAPI CreateFontIndirectA(const LOGFONTA*);
! HFONT WINAPI CreateFontIndirectW(const LOGFONTW*);
! HPALETTE WINAPI CreateHalftonePalette(HDC);
! HBRUSH WINAPI CreateHatchBrush(int,COLORREF);
! HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
! HDC WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
! HDC WINAPI CreateMetaFileA(LPCSTR);
! HDC WINAPI CreateMetaFileW(LPCWSTR);
! HPALETTE WINAPI CreatePalette(const LOGPALETTE*);
! HBRUSH WINAPI CreatePatternBrush(HBITMAP);
! HPEN WINAPI CreatePen(int,int,COLORREF);
! HPEN WINAPI CreatePenIndirect(const LOGPEN*);
! HRGN WINAPI CreatePolygonRgn(const POINT*,int,int);
! HRGN WINAPI CreatePolyPolygonRgn(const POINT*,const INT*,int,int);
! HRGN WINAPI CreateRectRgn(int,int,int,int);
! HRGN WINAPI CreateRectRgnIndirect(LPCRECT);
! HRGN WINAPI CreateRoundRectRgn(int,int,int,int,int,int);
! BOOL WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
! BOOL WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
! HBRUSH WINAPI CreateSolidBrush(COLORREF);
! BOOL WINAPI DeleteColorSpace(HCOLORSPACE);
! BOOL WINAPI DeleteDC(HDC);
! BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE);
! BOOL WINAPI DeleteMetaFile(HMETAFILE);
! BOOL WINAPI DeleteObject(HGDIOBJ);
! int WINAPI DescribePixelFormat(HDC,int,UINT,LPPIXELFORMATDESCRIPTOR);
! DWORD WINAPI DeviceCapabilitiesA(LPCSTR,LPCSTR,WORD,LPSTR,const DEVMODEA*);
! DWORD WINAPI DeviceCapabilitiesW(LPCWSTR,LPCWSTR,WORD,LPWSTR,const DEVMODEW*);
! BOOL WINAPI DPtoLP(HDC,LPPOINT,int);
! int WINAPI DrawEscape(HDC,int,int,LPCSTR);
! BOOL WINAPI Ellipse(HDC,int,int,int,int);
! int WINAPI EndDoc(HDC);
! int WINAPI EndPage(HDC);
! BOOL WINAPI EndPath(HDC);
! BOOL WINAPI EnumEnhMetaFile(HDC,HENHMETAFILE,ENHMFENUMPROC,PVOID,LPCRECT);
! int WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
! int WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
! int WINAPI EnumFontFamiliesExA(HDC,PLOGFONTA,FONTENUMPROCA,LPARAM,DWORD);
! int WINAPI EnumFontFamiliesExW(HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD);
! int WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
! int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
! int WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM);
! int WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM);
! BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
! int WINAPI EnumObjects(HDC,int,GOBJENUMPROC,LPARAM);
! BOOL WINAPI EqualRgn(HRGN,HRGN);
! int WINAPI Escape(HDC,int,int,LPCSTR,PVOID);
! int WINAPI ExcludeClipRect(HDC,int,int,int,int);
! int WINAPI ExcludeUpdateRgn(HDC,HWND);
! HPEN WINAPI ExtCreatePen(DWORD,DWORD,const LOGBRUSH*,DWORD,const DWORD*);
! HRGN WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
! int WINAPI ExtEscape(HDC,int,int,LPCSTR,int,LPSTR);
! BOOL WINAPI ExtFloodFill(HDC,int,int,COLORREF,UINT);
! int WINAPI ExtSelectClipRgn(HDC,HRGN,int);
! BOOL WINAPI ExtTextOutA(HDC,int,int,UINT,LPCRECT,LPCSTR,UINT,const INT*);
! BOOL WINAPI ExtTextOutW(HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*);
! BOOL WINAPI FillPath(HDC);
! int WINAPI FillRect(HDC,LPCRECT,HBRUSH);
! int WINAPI FillRgn(HDC,HRGN,HBRUSH);
! BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT);
! BOOL WINAPI FlattenPath(HDC);
! BOOL WINAPI FloodFill(HDC,int,int,COLORREF);
! BOOL WINAPI GdiComment(HDC,UINT,const BYTE*);
! BOOL WINAPI GdiFlush(void);
! DWORD WINAPI GdiGetBatchLimit(void);
! DWORD WINAPI GdiSetBatchLimit(DWORD);
! int WINAPI GetArcDirection(HDC);
! BOOL WINAPI GetAspectRatioFilterEx(HDC,LPSIZE);
! LONG WINAPI GetBitmapBits(HBITMAP,LONG,PVOID);
! BOOL WINAPI GetBitmapDimensionEx(HBITMAP,LPSIZE);
! COLORREF WINAPI GetBkColor(HDC);
! int WINAPI GetBkMode(HDC);
! UINT WINAPI GetBoundsRect(HDC,LPRECT,UINT);
! BOOL WINAPI GetBrushOrgEx(HDC,LPPOINT);
! BOOL WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
! BOOL WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
! BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
! BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
! DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,int,int,LPGCP_RESULTSA,DWORD);
! DWORD WINAPI GetCharacterPlacementW(HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD);
! BOOL WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
! BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
! BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
! BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
! BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
! BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
! int WINAPI GetClipBox(HDC,LPRECT);
! int WINAPI GetClipRgn(HDC,HRGN);
! BOOL WINAPI GetColorAdjustment(HDC,LPCOLORADJUSTMENT);
! HANDLE WINAPI GetColorSpace(HDC);
! HGDIOBJ WINAPI GetCurrentObject(HDC,UINT);
! BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
! HCURSOR WINAPI GetCursor(void);
! BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
! int WINAPI GetDeviceCaps(HDC,int);
! BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID);
! UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
! int WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,PVOID,LPBITMAPINFO,UINT);
! HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
! HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
! UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE);
! UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR);
! UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR);
! UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER);
! UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY);
! UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,CONST PIXELFORMATDESCRIPTOR*);
! DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD);
! DWORD WINAPI GetFontLanguageInfo(HDC);
! DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
! DWORD WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
! int WINAPI GetGraphicsMode(HDC);
! BOOL WINAPI GetICMProfileA(HDC,DWORD,LPSTR);
! BOOL WINAPI GetICMProfileW(HDC,DWORD,LPWSTR);
! DWORD WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
! DWORD WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
! BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE,LPLOGCOLORSPACEA,DWORD);
! BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE,LPLOGCOLORSPACEW,DWORD);
! int WINAPI GetMapMode(HDC);
! HMETAFILE WINAPI GetMetaFileA(LPCSTR);
! HMETAFILE WINAPI GetMetaFileW(LPCWSTR);
! UINT WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,PVOID);
! int WINAPI GetMetaRgn(HDC,HRGN);
! BOOL WINAPI GetMiterLimit(HDC,PFLOAT);
! COLORREF WINAPI GetNearestColor(HDC,COLORREF);
! UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
! int WINAPI GetObjectA(HGDIOBJ,int,PVOID);
! int WINAPI GetObjectW(HGDIOBJ,int,PVOID);
! DWORD WINAPI GetObjectType(HGDIOBJ);
! UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
! UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
! UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
! int WINAPI GetPath(HDC,LPPOINT,PBYTE,int);
! COLORREF WINAPI GetPixel(HDC,int,int);
! int WINAPI GetPixelFormat(HDC);
! int WINAPI GetPolyFillMode(HDC);
! BOOL WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
! int WINAPI GetRandomRgn (HDC,HRGN,INT);
! DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
! int WINAPI GetRgnBox(HRGN,LPRECT);
! int WINAPI GetROP2(HDC);
! HGDIOBJ WINAPI GetStockObject(int);
! int WINAPI GetStretchBltMode(HDC);
! UINT WINAPI GetSystemPaletteEntries(HDC,UINT,UINT,LPPALETTEENTRY);
! UINT WINAPI GetSystemPaletteUse(HDC);
! UINT WINAPI GetTextAlign(HDC);
! int WINAPI GetTextCharacterExtra(HDC);
! int WINAPI GetTextCharset(HDC);
! int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
! COLORREF WINAPI GetTextColor(HDC);
! BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE);
! BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );
! BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,int,LPSIZE);
! BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,int,LPSIZE);
! BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE);
! BOOL WINAPI GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE);
! int WINAPI GetTextFaceA(HDC,int,LPSTR);
! int WINAPI GetTextFaceW(HDC,int,LPWSTR);
! BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
! BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
! BOOL WINAPI GetViewportExtEx(HDC,LPSIZE);
! BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT);
! BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);
! BOOL WINAPI GetWindowOrgEx(HDC,LPPOINT);
! UINT WINAPI GetWinMetaFileBits(HENHMETAFILE,UINT,LPBYTE,INT,HDC);
! BOOL WINAPI GetWorldTransform(HDC,LPXFORM);
! int WINAPI IntersectClipRect(HDC,int,int,int,int);
! BOOL WINAPI InvertRgn(HDC,HRGN);
! BOOL WINAPI LineDDA(int,int,int,int,LINEDDAPROC,LPARAM);
! BOOL WINAPI LineTo(HDC,int,int);
! BOOL WINAPI LPtoDP(HDC,LPPOINT,int);
! BOOL WINAPI MaskBlt(HDC,int,int,int,int,HDC,int,int,HBITMAP,int,int,DWORD);
! BOOL WINAPI ModifyWorldTransform(HDC,const XFORM*,DWORD);
! BOOL WINAPI MoveToEx(HDC,int,int,LPPOINT);
! int WINAPI OffsetClipRgn(HDC,int,int);
! int WINAPI OffsetRgn(HRGN,int,int);
! BOOL WINAPI OffsetViewportOrgEx(HDC,int,int,LPPOINT);
! BOOL WINAPI OffsetWindowOrgEx(HDC,int,int,LPPOINT);
! BOOL WINAPI PaintRgn(HDC,HRGN);
! BOOL WINAPI PatBlt(HDC,int,int,int,int,DWORD);
! HRGN WINAPI PathToRegion(HDC);
! BOOL WINAPI Pie(HDC,int,int,int,int,int,int,int,int);
! BOOL WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,LPCRECT);
! BOOL WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT);
! BOOL WINAPI PlayMetaFile(HDC,HMETAFILE);
! BOOL WINAPI PlayMetaFileRecord(HDC,LPHANDLETABLE,LPMETARECORD,UINT);
! BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int);
! BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD);
! BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
! BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int);
! BOOL WINAPI Polygon(HDC,const POINT*,int);
! BOOL WINAPI Polyline(HDC,const POINT*,int);
! BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD);
! BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int);
! BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
! BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int);
! BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int);
! BOOL WINAPI PtInRegion(HRGN,int,int);
! BOOL WINAPI PtVisible(HDC,int,int);
! UINT WINAPI RealizePalette(HDC);
! BOOL WINAPI Rectangle(HDC,int,int,int,int);
! BOOL WINAPI RectInRegion(HRGN,LPCRECT);
! BOOL WINAPI RectVisible(HDC,LPCRECT);
! BOOL WINAPI RemoveFontResourceA(LPCSTR);
! BOOL WINAPI RemoveFontResourceW(LPCWSTR);
  #if (_WIN32_WINNT >= 0x0500)
! BOOL WINAPI RemoveFontMemResourceEx(HANDLE);
! BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID);
! BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID);
  #endif
! HDC WINAPI ResetDCA(HDC,const DEVMODEA*);
! HDC WINAPI ResetDCW(HDC,const DEVMODEW*);
! BOOL WINAPI ResizePalette(HPALETTE,UINT);
! BOOL WINAPI RestoreDC(HDC,int);
! BOOL WINAPI RoundRect(HDC,int,int,int,int,int,int);
! int WINAPI SaveDC(HDC);
! BOOL WINAPI ScaleViewportExtEx(HDC,int,int,int,int,LPSIZE);
! BOOL WINAPI ScaleWindowExtEx(HDC,int,int,int,int,LPSIZE);
! BOOL WINAPI SelectClipPath(HDC,int);
! int WINAPI SelectClipRgn(HDC,HRGN);
! HGDIOBJ WINAPI SelectObject(HDC,HGDIOBJ);
! HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
! int WINAPI SetAbortProc(HDC,ABORTPROC);
! int WINAPI SetArcDirection(HDC,int);
! LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID);
! BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE);
! COLORREF WINAPI SetBkColor(HDC,COLORREF);
! int WINAPI SetBkMode(HDC,int);
! UINT WINAPI SetBoundsRect(HDC,LPCRECT,UINT);
! BOOL WINAPI SetBrushOrgEx(HDC,int,int,LPPOINT);
! BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
! BOOL WINAPI SetColorSpace(HDC,HCOLORSPACE);
  #if (_WIN32_WINNT >= 0x0500)
! COLORREF WINAPI SetDCBrushColor(HDC,COLORREF);
! COLORREF WINAPI SetDCPenColor(HDC,COLORREF);
  #endif
! BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID);
! UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*);
! int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
! int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
! HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*);
! int WINAPI SetGraphicsMode(HDC,int);
! int WINAPI SetICMMode(HDC,int);
! BOOL WINAPI SetICMProfileA(HDC,LPSTR);
! BOOL WINAPI SetICMProfileW(HDC,LPWSTR);
! int WINAPI SetMapMode(HDC,int);
! DWORD WINAPI SetMapperFlags(HDC,DWORD);
! HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE *);
! int WINAPI SetMetaRgn(HDC);
! BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT);
! UINT WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,const PALETTEENTRY*);
! COLORREF WINAPI SetPixel(HDC,int,int,COLORREF);
! BOOL WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*);
! BOOL WINAPI SetPixelV(HDC,int,int,COLORREF);
! int WINAPI SetPolyFillMode(HDC,int);
! BOOL WINAPI SetRectRgn(HRGN,int,int,int,int);
! int WINAPI SetROP2(HDC,int);
! int WINAPI SetStretchBltMode(HDC,int);
! UINT WINAPI SetSystemPaletteUse(HDC,UINT);
! UINT WINAPI SetTextAlign(HDC,UINT);
! int WINAPI SetTextCharacterExtra(HDC,int);
! COLORREF WINAPI SetTextColor(HDC,COLORREF);
! BOOL WINAPI SetTextJustification(HDC,int,int);
! BOOL WINAPI SetViewportExtEx(HDC,int,int,LPSIZE);
! BOOL WINAPI SetViewportOrgEx(HDC,int,int,LPPOINT);
! BOOL WINAPI SetWindowExtEx(HDC,int,int,LPSIZE);
! BOOL WINAPI SetWindowOrgEx(HDC,int,int,LPPOINT);
! HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,const BYTE*,HDC,const METAFILEPICT*);
! BOOL WINAPI SetWorldTransform(HDC,const XFORM *);
! int WINAPI StartDocA(HDC,const DOCINFOA*);
! int WINAPI StartDocW(HDC,const DOCINFOW*);
! int WINAPI StartPage(HDC);
! BOOL WINAPI StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD);
! int WINAPI StretchDIBits(HDC,int,int,int,int,int,int,int,int,const VOID *,const BITMAPINFO *,UINT,DWORD);
! BOOL WINAPI StrokeAndFillPath(HDC);
! BOOL WINAPI StrokePath(HDC);
! BOOL WINAPI SwapBuffers(HDC);
! BOOL WINAPI TextOutA(HDC,int,int,LPCSTR,int);
! BOOL WINAPI TextOutW(HDC,int,int,LPCWSTR,int);
! BOOL WINAPI TranslateCharsetInfo(PDWORD,LPCHARSETINFO,DWORD);
! BOOL WINAPI UnrealizeObject(HGDIOBJ);
! BOOL WINAPI UpdateColors(HDC);
! BOOL WINAPI UpdateICMRegKeyA(DWORD,DWORD,LPSTR,UINT);
! BOOL WINAPI UpdateICMRegKeyW(DWORD,DWORD,LPWSTR,UINT);
! BOOL WINAPI WidenPath(HDC);
! BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT);
! HGLRC WINAPI wglCreateContext(HDC);
! HGLRC WINAPI wglCreateLayerContext(HDC,int);
! BOOL WINAPI wglDeleteContext(HGLRC);
! BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR);
! HGLRC WINAPI wglGetCurrentContext(void);
! HDC WINAPI wglGetCurrentDC(void);
! int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*);
! PROC WINAPI wglGetProcAddress(LPCSTR);
! BOOL WINAPI wglMakeCurrent(HDC,HGLRC);
! BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL);
! int WINAPI wglSetLayerPaletteEntries(HDC,int,int,int,const COLORREF*);
! BOOL WINAPI wglShareLists(HGLRC,HGLRC);
! BOOL WINAPI wglSwapLayerBuffers(HDC,UINT);
! BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD);
! BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD);
! BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
! BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
! 
  #if (WINVER >= 0x0500)
! BOOL WINAPI AlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
! BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG);
! BOOL WINAPI TransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
  #endif
- 
  #if (_WIN32_WINNT >= 0x0500)
! DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET);
! DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,int,LPWORD,DWORD);
! DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,int,LPWORD,DWORD);
  #endif
  
--- 2550,2913 ----
  #define PALETTERGB(r,g,b)	(0x02000000|RGB(r,g,b))
  
! WINGDIAPI int WINAPI AbortDoc(HDC);
! WINGDIAPI BOOL WINAPI AbortPath(HDC);
! WINGDIAPI int WINAPI AddFontResourceA(LPCSTR);
! WINGDIAPI int WINAPI AddFontResourceW(LPCWSTR);
  #if (_WIN32_WINNT >= 0x0500)
! WINGDIAPI HANDLE WINAPI AddFontMemResourceEx(PVOID,DWORD,PVOID,DWORD *);
! WINGDIAPI int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID);
! WINGDIAPI int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID);
  #endif
! WINGDIAPI BOOL WINAPI AngleArc(HDC,int,int,DWORD,FLOAT,FLOAT);
! WINGDIAPI BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
! WINGDIAPI BOOL WINAPI Arc(HDC,int,int,int,int,int,int,int,int);
! WINGDIAPI BOOL WINAPI ArcTo(HDC,int,int,int,int,int,int,int,int);
! WINGDIAPI BOOL WINAPI BeginPath(HDC);
! WINGDIAPI BOOL WINAPI BitBlt(HDC,int,int,int,int,HDC,int,int,DWORD);
! WINGDIAPI BOOL WINAPI CancelDC(HDC);
! WINGDIAPI BOOL WINAPI CheckColorsInGamut(HDC,PVOID,PVOID,DWORD);
! WINGDIAPI BOOL WINAPI Chord(HDC,int,int,int,int,int,int,int,int);
! WINGDIAPI int WINAPI ChoosePixelFormat(HDC,CONST PIXELFORMATDESCRIPTOR*);
! WINGDIAPI HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
! WINGDIAPI BOOL WINAPI CloseFigure(HDC);
! WINGDIAPI HMETAFILE WINAPI CloseMetaFile(HDC);
! WINGDIAPI BOOL WINAPI ColorMatchToTarget(HDC,HDC,DWORD);
! WINGDIAPI int WINAPI CombineRgn(HRGN,HRGN,HRGN,int);
! WINGDIAPI BOOL WINAPI CombineTransform(LPXFORM,const XFORM*,const XFORM*);
! WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR);
! WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR);
! WINGDIAPI HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR);
! WINGDIAPI HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR);
! WINGDIAPI HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,PCVOID);
! WINGDIAPI HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*);
! WINGDIAPI HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*);
! WINGDIAPI HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA);
! WINGDIAPI HCOLORSPACE WINAPI CreateColorSpaceW(LPLOGCOLORSPACEW);
! WINGDIAPI HBITMAP WINAPI CreateCompatibleBitmap(HDC,int,int);
! WINGDIAPI HDC WINAPI CreateCompatibleDC(HDC);
! WINGDIAPI HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
! WINGDIAPI HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
! WINGDIAPI HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,PCVOID,const BITMAPINFO*,UINT);
! WINGDIAPI HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
! WINGDIAPI HBRUSH WINAPI CreateDIBPatternBrushPt(PCVOID,UINT);
! WINGDIAPI HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,void**,HANDLE,DWORD);
! WINGDIAPI HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int);
! WINGDIAPI HRGN WINAPI CreateEllipticRgn(int,int,int,int);
! WINGDIAPI HRGN WINAPI CreateEllipticRgnIndirect(LPCRECT);
! WINGDIAPI HDC WINAPI CreateEnhMetaFileA(HDC,LPCSTR,LPCRECT,LPCSTR);
! WINGDIAPI HDC WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,LPCRECT,LPCWSTR);
! WINGDIAPI HFONT WINAPI CreateFontA(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR);
! WINGDIAPI HFONT WINAPI CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR);
! WINGDIAPI HFONT WINAPI CreateFontIndirectA(const LOGFONTA*);
! WINGDIAPI HFONT WINAPI CreateFontIndirectW(const LOGFONTW*);
! WINGDIAPI HPALETTE WINAPI CreateHalftonePalette(HDC);
! WINGDIAPI HBRUSH WINAPI CreateHatchBrush(int,COLORREF);
! WINGDIAPI HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
! WINGDIAPI HDC WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
! WINGDIAPI HDC WINAPI CreateMetaFileA(LPCSTR);
! WINGDIAPI HDC WINAPI CreateMetaFileW(LPCWSTR);
! WINGDIAPI HPALETTE WINAPI CreatePalette(const LOGPALETTE*);
! WINGDIAPI HBRUSH WINAPI CreatePatternBrush(HBITMAP);
! WINGDIAPI HPEN WINAPI CreatePen(int,int,COLORREF);
! WINGDIAPI HPEN WINAPI CreatePenIndirect(const LOGPEN*);
! WINGDIAPI HRGN WINAPI CreatePolygonRgn(const POINT*,int,int);
! WINGDIAPI HRGN WINAPI CreatePolyPolygonRgn(const POINT*,const INT*,int,int);
! WINGDIAPI HRGN WINAPI CreateRectRgn(int,int,int,int);
! WINGDIAPI HRGN WINAPI CreateRectRgnIndirect(LPCRECT);
! WINGDIAPI HRGN WINAPI CreateRoundRectRgn(int,int,int,int,int,int);
! WINGDIAPI BOOL WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
! WINGDIAPI BOOL WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
! WINGDIAPI HBRUSH WINAPI CreateSolidBrush(COLORREF);
! WINGDIAPI BOOL WINAPI DeleteColorSpace(HCOLORSPACE);
! WINGDIAPI BOOL WINAPI DeleteDC(HDC);
! WINGDIAPI BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE);
! WINGDIAPI BOOL WINAPI DeleteMetaFile(HMETAFILE);
! WINGDIAPI BOOL WINAPI DeleteObject(HGDIOBJ);
! WINGDIAPI int WINAPI DescribePixelFormat(HDC,int,UINT,LPPIXELFORMATDESCRIPTOR);
! WINGDIAPI DWORD WINAPI DeviceCapabilitiesA(LPCSTR,LPCSTR,WORD,LPSTR,const DEVMODEA*);
! WINGDIAPI DWORD WINAPI DeviceCapabilitiesW(LPCWSTR,LPCWSTR,WORD,LPWSTR,const DEVMODEW*);
! WINGDIAPI BOOL WINAPI DPtoLP(HDC,LPPOINT,int);
! WINGDIAPI int WINAPI DrawEscape(HDC,int,int,LPCSTR);
! WINGDIAPI BOOL WINAPI Ellipse(HDC,int,int,int,int);
! WINGDIAPI int WINAPI EndDoc(HDC);
! WINGDIAPI int WINAPI EndPage(HDC);
! WINGDIAPI BOOL WINAPI EndPath(HDC);
! WINGDIAPI BOOL WINAPI EnumEnhMetaFile(HDC,HENHMETAFILE,ENHMFENUMPROC,PVOID,LPCRECT);
! WINGDIAPI int WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
! WINGDIAPI int WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
! WINGDIAPI int WINAPI EnumFontFamiliesExA(HDC,PLOGFONTA,FONTENUMPROCA,LPARAM,DWORD);
! WINGDIAPI int WINAPI EnumFontFamiliesExW(HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD);
! WINGDIAPI int WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
! WINGDIAPI int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
! WINGDIAPI int WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM);
! WINGDIAPI int WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM);
! WINGDIAPI BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
! WINGDIAPI int WINAPI EnumObjects(HDC,int,GOBJENUMPROC,LPARAM);
! WINGDIAPI BOOL WINAPI EqualRgn(HRGN,HRGN);
! WINGDIAPI int WINAPI Escape(HDC,int,int,LPCSTR,PVOID);
! WINGDIAPI int WINAPI ExcludeClipRect(HDC,int,int,int,int);
! WINGDIAPI int WINAPI ExcludeUpdateRgn(HDC,HWND);
! WINGDIAPI HPEN WINAPI ExtCreatePen(DWORD,DWORD,const LOGBRUSH*,DWORD,const DWORD*);
! WINGDIAPI HRGN WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
! WINGDIAPI int WINAPI ExtEscape(HDC,int,int,LPCSTR,int,LPSTR);
! WINGDIAPI BOOL WINAPI ExtFloodFill(HDC,int,int,COLORREF,UINT);
! WINGDIAPI int WINAPI ExtSelectClipRgn(HDC,HRGN,int);
! WINGDIAPI BOOL WINAPI ExtTextOutA(HDC,int,int,UINT,LPCRECT,LPCSTR,UINT,const INT*);
! WINGDIAPI BOOL WINAPI ExtTextOutW(HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*);
! WINGDIAPI BOOL WINAPI FillPath(HDC);
! WINGDIAPI int WINAPI FillRect(HDC,LPCRECT,HBRUSH);
! WINGDIAPI int WINAPI FillRgn(HDC,HRGN,HBRUSH);
! WINGDIAPI BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT);
! WINGDIAPI BOOL WINAPI FlattenPath(HDC);
! WINGDIAPI BOOL WINAPI FloodFill(HDC,int,int,COLORREF);
! WINGDIAPI BOOL WINAPI GdiComment(HDC,UINT,const BYTE*);
! WINGDIAPI BOOL WINAPI GdiFlush(void);
! WINGDIAPI DWORD WINAPI GdiGetBatchLimit(void);
! WINGDIAPI DWORD WINAPI GdiSetBatchLimit(DWORD);
! WINGDIAPI int WINAPI GetArcDirection(HDC);
! WINGDIAPI BOOL WINAPI GetAspectRatioFilterEx(HDC,LPSIZE);
! WINGDIAPI LONG WINAPI GetBitmapBits(HBITMAP,LONG,PVOID);
! WINGDIAPI BOOL WINAPI GetBitmapDimensionEx(HBITMAP,LPSIZE);
! WINGDIAPI COLORREF WINAPI GetBkColor(HDC);
! WINGDIAPI int WINAPI GetBkMode(HDC);
! WINGDIAPI UINT WINAPI GetBoundsRect(HDC,LPRECT,UINT);
! WINGDIAPI BOOL WINAPI GetBrushOrgEx(HDC,LPPOINT);
! WINGDIAPI BOOL WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
! WINGDIAPI BOOL WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
! WINGDIAPI BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
! WINGDIAPI BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
! WINGDIAPI DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,int,int,LPGCP_RESULTSA,DWORD);
! WINGDIAPI DWORD WINAPI GetCharacterPlacementW(HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD);
! WINGDIAPI BOOL WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
! WINGDIAPI BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
! WINGDIAPI BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
! WINGDIAPI BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
! WINGDIAPI BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
! WINGDIAPI BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
! WINGDIAPI int WINAPI GetClipBox(HDC,LPRECT);
! WINGDIAPI int WINAPI GetClipRgn(HDC,HRGN);
! WINGDIAPI BOOL WINAPI GetColorAdjustment(HDC,LPCOLORADJUSTMENT);
! WINGDIAPI HANDLE WINAPI GetColorSpace(HDC);
! WINGDIAPI HGDIOBJ WINAPI GetCurrentObject(HDC,UINT);
! WINGDIAPI BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
! WINGDIAPI HCURSOR WINAPI GetCursor(void);
! WINGDIAPI BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
! WINGDIAPI int WINAPI GetDeviceCaps(HDC,int);
! WINGDIAPI BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID);
! WINGDIAPI UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
! WINGDIAPI int WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,PVOID,LPBITMAPINFO,UINT);
! WINGDIAPI HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
! WINGDIAPI HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
! WINGDIAPI UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE);
! WINGDIAPI UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR);
! WINGDIAPI UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR);
! WINGDIAPI UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER);
! WINGDIAPI UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY);
! WINGDIAPI UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,CONST PIXELFORMATDESCRIPTOR*);
! WINGDIAPI DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD);
! WINGDIAPI DWORD WINAPI GetFontLanguageInfo(HDC);
! WINGDIAPI DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
! WINGDIAPI DWORD WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
! WINGDIAPI int WINAPI GetGraphicsMode(HDC);
! WINGDIAPI BOOL WINAPI GetICMProfileA(HDC,DWORD,LPSTR);
! WINGDIAPI BOOL WINAPI GetICMProfileW(HDC,DWORD,LPWSTR);
! WINGDIAPI DWORD WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
! WINGDIAPI DWORD WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
! WINGDIAPI BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE,LPLOGCOLORSPACEA,DWORD);
! WINGDIAPI BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE,LPLOGCOLORSPACEW,DWORD);
! WINGDIAPI int WINAPI GetMapMode(HDC);
! WINGDIAPI HMETAFILE WINAPI GetMetaFileA(LPCSTR);
! WINGDIAPI HMETAFILE WINAPI GetMetaFileW(LPCWSTR);
! WINGDIAPI UINT WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,PVOID);
! WINGDIAPI int WINAPI GetMetaRgn(HDC,HRGN);
! WINGDIAPI BOOL WINAPI GetMiterLimit(HDC,PFLOAT);
! WINGDIAPI COLORREF WINAPI GetNearestColor(HDC,COLORREF);
! WINGDIAPI UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
! WINGDIAPI int WINAPI GetObjectA(HGDIOBJ,int,PVOID);
! WINGDIAPI int WINAPI GetObjectW(HGDIOBJ,int,PVOID);
! WINGDIAPI DWORD WINAPI GetObjectType(HGDIOBJ);
! WINGDIAPI UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
! WINGDIAPI UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
! WINGDIAPI UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
! WINGDIAPI int WINAPI GetPath(HDC,LPPOINT,PBYTE,int);
! WINGDIAPI COLORREF WINAPI GetPixel(HDC,int,int);
! WINGDIAPI int WINAPI GetPixelFormat(HDC);
! WINGDIAPI int WINAPI GetPolyFillMode(HDC);
! WINGDIAPI BOOL WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
! WINGDIAPI int WINAPI GetRandomRgn (HDC,HRGN,INT);
! WINGDIAPI DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
! WINGDIAPI int WINAPI GetRgnBox(HRGN,LPRECT);
! WINGDIAPI int WINAPI GetROP2(HDC);
! WINGDIAPI HGDIOBJ WINAPI GetStockObject(int);
! WINGDIAPI int WINAPI GetStretchBltMode(HDC);
! WINGDIAPI UINT WINAPI GetSystemPaletteEntries(HDC,UINT,UINT,LPPALETTEENTRY);
! WINGDIAPI UINT WINAPI GetSystemPaletteUse(HDC);
! WINGDIAPI UINT WINAPI GetTextAlign(HDC);
! WINGDIAPI int WINAPI GetTextCharacterExtra(HDC);
! WINGDIAPI int WINAPI GetTextCharset(HDC);
! WINGDIAPI int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
! WINGDIAPI COLORREF WINAPI GetTextColor(HDC);
! WINGDIAPI BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE);
! WINGDIAPI BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );
! WINGDIAPI BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,int,LPSIZE);
! WINGDIAPI BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,int,LPSIZE);
! WINGDIAPI BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE);
! WINGDIAPI BOOL WINAPI GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE);
! WINGDIAPI int WINAPI GetTextFaceA(HDC,int,LPSTR);
! WINGDIAPI int WINAPI GetTextFaceW(HDC,int,LPWSTR);
! WINGDIAPI BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
! WINGDIAPI BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
! WINGDIAPI BOOL WINAPI GetViewportExtEx(HDC,LPSIZE);
! WINGDIAPI BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT);
! WINGDIAPI BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);
! WINGDIAPI BOOL WINAPI GetWindowOrgEx(HDC,LPPOINT);
! WINGDIAPI UINT WINAPI GetWinMetaFileBits(HENHMETAFILE,UINT,LPBYTE,INT,HDC);
! WINGDIAPI BOOL WINAPI GetWorldTransform(HDC,LPXFORM);
! WINGDIAPI int WINAPI IntersectClipRect(HDC,int,int,int,int);
! WINGDIAPI BOOL WINAPI InvertRgn(HDC,HRGN);
! WINGDIAPI BOOL WINAPI LineDDA(int,int,int,int,LINEDDAPROC,LPARAM);
! WINGDIAPI BOOL WINAPI LineTo(HDC,int,int);
! WINGDIAPI BOOL WINAPI LPtoDP(HDC,LPPOINT,int);
! WINGDIAPI BOOL WINAPI MaskBlt(HDC,int,int,int,int,HDC,int,int,HBITMAP,int,int,DWORD);
! WINGDIAPI BOOL WINAPI ModifyWorldTransform(HDC,const XFORM*,DWORD);
! WINGDIAPI BOOL WINAPI MoveToEx(HDC,int,int,LPPOINT);
! WINGDIAPI int WINAPI OffsetClipRgn(HDC,int,int);
! WINGDIAPI int WINAPI OffsetRgn(HRGN,int,int);
! WINGDIAPI BOOL WINAPI OffsetViewportOrgEx(HDC,int,int,LPPOINT);
! WINGDIAPI BOOL WINAPI OffsetWindowOrgEx(HDC,int,int,LPPOINT);
! WINGDIAPI BOOL WINAPI PaintRgn(HDC,HRGN);
! WINGDIAPI BOOL WINAPI PatBlt(HDC,int,int,int,int,DWORD);
! WINGDIAPI HRGN WINAPI PathToRegion(HDC);
! WINGDIAPI BOOL WINAPI Pie(HDC,int,int,int,int,int,int,int,int);
! WINGDIAPI BOOL WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,LPCRECT);
! WINGDIAPI BOOL WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT);
! WINGDIAPI BOOL WINAPI PlayMetaFile(HDC,HMETAFILE);
! WINGDIAPI BOOL WINAPI PlayMetaFileRecord(HDC,LPHANDLETABLE,LPMETARECORD,UINT);
! WINGDIAPI BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int);
! WINGDIAPI BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD);
! WINGDIAPI BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
! WINGDIAPI BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int);
! WINGDIAPI BOOL WINAPI Polygon(HDC,const POINT*,int);
! WINGDIAPI BOOL WINAPI Polyline(HDC,const POINT*,int);
! WINGDIAPI BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD);
! WINGDIAPI BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int);
! WINGDIAPI BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
! WINGDIAPI BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int);
! WINGDIAPI BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int);
! WINGDIAPI BOOL WINAPI PtInRegion(HRGN,int,int);
! WINGDIAPI BOOL WINAPI PtVisible(HDC,int,int);
! WINGDIAPI UINT WINAPI RealizePalette(HDC);
! WINGDIAPI BOOL WINAPI Rectangle(HDC,int,int,int,int);
! WINGDIAPI BOOL WINAPI RectInRegion(HRGN,LPCRECT);
! WINGDIAPI BOOL WINAPI RectVisible(HDC,LPCRECT);
! WINGDIAPI BOOL WINAPI RemoveFontResourceA(LPCSTR);
! WINGDIAPI BOOL WINAPI RemoveFontResourceW(LPCWSTR);
  #if (_WIN32_WINNT >= 0x0500)
! WINGDIAPI BOOL WINAPI RemoveFontMemResourceEx(HANDLE);
! WINGDIAPI BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID);
! WINGDIAPI BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID);
  #endif
! WINGDIAPI HDC WINAPI ResetDCA(HDC,const DEVMODEA*);
! WINGDIAPI HDC WINAPI ResetDCW(HDC,const DEVMODEW*);
! WINGDIAPI BOOL WINAPI ResizePalette(HPALETTE,UINT);
! WINGDIAPI BOOL WINAPI RestoreDC(HDC,int);
! WINGDIAPI BOOL WINAPI RoundRect(HDC,int,int,int,int,int,int);
! WINGDIAPI int WINAPI SaveDC(HDC);
! WINGDIAPI BOOL WINAPI ScaleViewportExtEx(HDC,int,int,int,int,LPSIZE);
! WINGDIAPI BOOL WINAPI ScaleWindowExtEx(HDC,int,int,int,int,LPSIZE);
! WINGDIAPI BOOL WINAPI SelectClipPath(HDC,int);
! WINGDIAPI int WINAPI SelectClipRgn(HDC,HRGN);
! WINGDIAPI HGDIOBJ WINAPI SelectObject(HDC,HGDIOBJ);
! WINGDIAPI HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
! WINGDIAPI int WINAPI SetAbortProc(HDC,ABORTPROC);
! WINGDIAPI int WINAPI SetArcDirection(HDC,int);
! WINGDIAPI LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID);
! WINGDIAPI BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE);
! WINGDIAPI COLORREF WINAPI SetBkColor(HDC,COLORREF);
! WINGDIAPI int WINAPI SetBkMode(HDC,int);
! WINGDIAPI UINT WINAPI SetBoundsRect(HDC,LPCRECT,UINT);
! WINGDIAPI BOOL WINAPI SetBrushOrgEx(HDC,int,int,LPPOINT);
! WINGDIAPI BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
! WINGDIAPI BOOL WINAPI SetColorSpace(HDC,HCOLORSPACE);
  #if (_WIN32_WINNT >= 0x0500)
! WINGDIAPI COLORREF WINAPI SetDCBrushColor(HDC,COLORREF);
! WINGDIAPI COLORREF WINAPI SetDCPenColor(HDC,COLORREF);
  #endif
! WINGDIAPI BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID);
! WINGDIAPI UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*);
! WINGDIAPI int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
! WINGDIAPI int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
! WINGDIAPI HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*);
! WINGDIAPI int WINAPI SetGraphicsMode(HDC,int);
! WINGDIAPI int WINAPI SetICMMode(HDC,int);
! WINGDIAPI BOOL WINAPI SetICMProfileA(HDC,LPSTR);
! WINGDIAPI BOOL WINAPI SetICMProfileW(HDC,LPWSTR);
! WINGDIAPI int WINAPI SetMapMode(HDC,int);
! WINGDIAPI DWORD WINAPI SetMapperFlags(HDC,DWORD);
! WINGDIAPI HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE *);
! WINGDIAPI int WINAPI SetMetaRgn(HDC);
! WINGDIAPI BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT);
! WINGDIAPI UINT WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,const PALETTEENTRY*);
! WINGDIAPI COLORREF WINAPI SetPixel(HDC,int,int,COLORREF);
! WINGDIAPI BOOL WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*);
! WINGDIAPI BOOL WINAPI SetPixelV(HDC,int,int,COLORREF);
! WINGDIAPI int WINAPI SetPolyFillMode(HDC,int);
! WINGDIAPI BOOL WINAPI SetRectRgn(HRGN,int,int,int,int);
! WINGDIAPI int WINAPI SetROP2(HDC,int);
! WINGDIAPI int WINAPI SetStretchBltMode(HDC,int);
! WINGDIAPI UINT WINAPI SetSystemPaletteUse(HDC,UINT);
! WINGDIAPI UINT WINAPI SetTextAlign(HDC,UINT);
! WINGDIAPI int WINAPI SetTextCharacterExtra(HDC,int);
! WINGDIAPI COLORREF WINAPI SetTextColor(HDC,COLORREF);
! WINGDIAPI BOOL WINAPI SetTextJustification(HDC,int,int);
! WINGDIAPI BOOL WINAPI SetViewportExtEx(HDC,int,int,LPSIZE);
! WINGDIAPI BOOL WINAPI SetViewportOrgEx(HDC,int,int,LPPOINT);
! WINGDIAPI BOOL WINAPI SetWindowExtEx(HDC,int,int,LPSIZE);
! WINGDIAPI BOOL WINAPI SetWindowOrgEx(HDC,int,int,LPPOINT);
! WINGDIAPI HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,const BYTE*,HDC,const METAFILEPICT*);
! WINGDIAPI BOOL WINAPI SetWorldTransform(HDC,const XFORM *);
! WINGDIAPI int WINAPI StartDocA(HDC,const DOCINFOA*);
! WINGDIAPI int WINAPI StartDocW(HDC,const DOCINFOW*);
! WINGDIAPI int WINAPI StartPage(HDC);
! WINGDIAPI BOOL WINAPI StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD);
! WINGDIAPI int WINAPI StretchDIBits(HDC,int,int,int,int,int,int,int,int,const VOID *,const BITMAPINFO *,UINT,DWORD);
! WINGDIAPI BOOL WINAPI StrokeAndFillPath(HDC);
! WINGDIAPI BOOL WINAPI StrokePath(HDC);
! WINGDIAPI BOOL WINAPI SwapBuffers(HDC);
! WINGDIAPI BOOL WINAPI TextOutA(HDC,int,int,LPCSTR,int);
! WINGDIAPI BOOL WINAPI TextOutW(HDC,int,int,LPCWSTR,int);
! WINGDIAPI BOOL WINAPI TranslateCharsetInfo(PDWORD,LPCHARSETINFO,DWORD);
! WINGDIAPI BOOL WINAPI UnrealizeObject(HGDIOBJ);
! WINGDIAPI BOOL WINAPI UpdateColors(HDC);
! WINGDIAPI BOOL WINAPI UpdateICMRegKeyA(DWORD,DWORD,LPSTR,UINT);
! WINGDIAPI BOOL WINAPI UpdateICMRegKeyW(DWORD,DWORD,LPWSTR,UINT);
! WINGDIAPI BOOL WINAPI WidenPath(HDC);
! WINGDIAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT);
! WINGDIAPI HGLRC WINAPI wglCreateContext(HDC);
! WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,int);
! WINGDIAPI BOOL WINAPI wglDeleteContext(HGLRC);
! WINGDIAPI BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR);
! WINGDIAPI HGLRC WINAPI wglGetCurrentContext(void);
! WINGDIAPI HDC WINAPI wglGetCurrentDC(void);
! WINGDIAPI int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*);
! WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR);
! WINGDIAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC);
! WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL);
! WINGDIAPI int WINAPI wglSetLayerPaletteEntries(HDC,int,int,int,const COLORREF*);
! WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC);
! WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT);
! WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD);
! WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD);
! WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
! WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
  #if (WINVER >= 0x0500)
! WINGDIAPI BOOL WINAPI AlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
! WINGDIAPI BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG);
! WINGDIAPI BOOL WINAPI TransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
  #endif
  #if (_WIN32_WINNT >= 0x0500)
! WINGDIAPI DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET);
! WINGDIAPI DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,int,LPWORD,DWORD);
! WINGDIAPI DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,int,LPWORD,DWORD);
  #endif
  

Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** commctrl.h	2 Jan 2005 13:10:37 -0000	1.19
--- commctrl.h	11 Aug 2005 00:59:49 -0000	1.20
***************
*** 1603,1616 ****
  #define RB_SETCOLORSCHEME CCM_SETCOLORSCHEME
  #define RB_GETCOLORSCHEME CCM_GETCOLORSCHEME
! #define RBBS_BREAK 1
! #define RBBS_FIXEDSIZE 2
! #define RBBS_CHILDEDGE 4
! #define RBBS_HIDDEN 8
! #define RBBS_NOVERT 16
! #define RBBS_FIXEDBMP 32
  #if (_WIN32_IE >= 0x0501)
! #define RBBS_HIDETITLE 0x400
! #define RBBS_TOPALIGN 0x800
  #endif /* _WIN32_IE >= 0x0501 */
  #define RBBIM_STYLE 1
  #define RBBIM_COLORS 2
--- 1603,1622 ----
  #define RB_SETCOLORSCHEME CCM_SETCOLORSCHEME
  #define RB_GETCOLORSCHEME CCM_GETCOLORSCHEME
! #define RBBS_BREAK	0x0001
! #define RBBS_FIXEDSIZE	0x0002
! #define RBBS_CHILDEDGE	0x0004
! #define RBBS_HIDDEN	0x0008
! #define RBBS_NOVERT	0x0010
! #define RBBS_FIXEDBMP	0x0020
! #define RBBS_VARIABLEHEIGHT	0x0040
! #define RBBS_GRIPPERALWAYS	0x0080
! #define RBBS_NOGRIPPER	0x0100
! #if (_WIN32_IE >= 0x0500)
! #define RBBS_USECHEVRON	0x0200
  #if (_WIN32_IE >= 0x0501)
! #define RBBS_HIDETITLE	0x0400
! #define RBBS_TOPALIGN	0x0800
  #endif /* _WIN32_IE >= 0x0501 */
+ #endif /* _WIN32_IE >= 0x0500 */
  #define RBBIM_STYLE 1
  #define RBBIM_COLORS 2
***************
*** 1690,1696 ****
  #define RBS_VERTICALGRIPPER 16384
  #define RBS_DBLCLKTOGGLE  32768
- #define RBBS_VARIABLEHEIGHT 64
- #define RBBS_GRIPPERALWAYS 128
- #define RBBS_NOGRIPPER 256
  #define RBBIM_IDEALSIZE 512
  #define RBBIM_LPARAM 1024
--- 1696,1699 ----
***************
*** 2397,2400 ****
--- 2400,2415 ----
  #define _LV_FINDINFOW tagLVFINDINFOW
  #define LV_FINDINFOW LVFINDINFOW
+ typedef struct tagNMLVFINDITEMA {
+ 	NMHDR hdr;
+ 	int iStart;
+ 	LVFINDINFOA lvfi;
+ } NMLVFINDITEMA, *PNMLVFINDITEMA, FAR *LPNMLVFINDITEMA;
+ #define _NMLVFINDITEMA tagNMLVFINDITEMA
+ typedef struct tagNMLVFINDITEMW {
+ 	NMHDR hdr;
+ 	int iStart;
+ 	LVFINDINFOW lvfi;
+ } NMLVFINDITEMW, *PNMLVFINDITEMW, FAR *LPNMLVFINDITEMW;
+ #define _NMLVFINDITEMW tagNMLVFINDITEMW
  typedef struct _LVHITTESTINFO {
  	POINT pt;
***************
*** 3067,3070 ****
--- 3082,3090 ----
  #define ListView_GetISearchString(w, lpsz) (BOOL)SNDMSG((w), LVM_GETISEARCHSTRING, 0, (LPARAM) (LPTSTR)(lpsz)) 
  
+ #if (_WIN32_WINNT >= 0x0501)
+ #define ComboBox_SetMinVisible(w,i) (BOOL)SNDMSG((w), CB_SETMINVISIBLE, (WPARAM)(i), 0);
+ #define ComboBox_GetMinVisible(w) (int)SNDMSG((w), CB_GETMINVISIBLE, 0, 0);
+ #endif
+ 
  BOOL WINAPI MakeDragList(HWND);
  void WINAPI MenuHelp(UINT,WPARAM,LPARAM,HMENU,HINSTANCE,HWND,PUINT);
***************
*** 3217,3220 ****
--- 3237,3241 ----
  	TVITEM _tvi;\
  	_tvi.mask=TVIF_STATE;\
+ 	_tvi.hItem=i; \
  	_tvi.stateMask=m;\
  	_tvi.state=d;\
***************
*** 3331,3334 ****
--- 3352,3358 ----
  #define LVFINDINFO LVFINDINFOW
  #define LPFINDINFO LPFINDINFOW
+ #define NMLVFINDITEM NMLVFINDITEMW
+ #define PNMLVFINDITEM PNMLVFINDITEMW
+ #define LPNMLVFINDITEM LPNMLVFINDITEMW
  #define LVM_FINDITEM LVM_FINDITEMW
  #define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHW
***************
*** 3504,3507 ****
--- 3528,3534 ----
  #define LVFINDINFO LVFINDINFOA
  #define LPFINDINFO LPFINDINFOA
+ #define NMLVFINDITEM NMLVFINDITEMA
+ #define PNMLVFINDITEM PNMLVFINDITEMA
+ #define LPNMLVFINDITEM LPNMLVFINDITEMA
  #define LVM_FINDITEM LVM_FINDITEMA
  #define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHA

Index: winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** winnt.h	2 Jan 2005 13:10:37 -0000	1.36
--- winnt.h	11 Aug 2005 00:59:49 -0000	1.37
***************
*** 465,468 ****
--- 465,473 ----
  #define SE_REMOTE_SHUTDOWN_NAME	TEXT("SeRemoteShutdownPrivilege")
  #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege")
+ #define SE_UNDOCK_NAME TEXT("SeUndockPrivilege")
+ #define SE_MANAGE_VOLUME_NAME TEXT("SeManageVolumePrivilege")
+ #define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege")
+ #define SE_ENABLE_DELEGATION_NAME TEXT("SeEnableDelegationPrivilege")
+ #define SE_SYNC_AGENT_NAME TEXT("SeSyncAgentPrivilege")
  #define SE_GROUP_MANDATORY 1
  #define SE_GROUP_ENABLED_BY_DEFAULT 2
***************
*** 612,617 ****
  #define SUBLANG_NORWEGIAN_BOKMAL	0x01
  #define SUBLANG_NORWEGIAN_NYNORSK	0x02
! #define SUBLANG_PORTUGUESE	0x01
! #define SUBLANG_PORTUGUESE_BRAZILIAN	0x02
  #define SUBLANG_SERBIAN_LATIN	0x02
  #define SUBLANG_SERBIAN_CYRILLIC	0x03
--- 617,622 ----
  #define SUBLANG_NORWEGIAN_BOKMAL	0x01
  #define SUBLANG_NORWEGIAN_NYNORSK	0x02
! #define SUBLANG_PORTUGUESE_BRAZILIAN	0x01
! #define SUBLANG_PORTUGUESE	0x02
  #define SUBLANG_SERBIAN_LATIN	0x02
  #define SUBLANG_SERBIAN_CYRILLIC	0x03
***************
*** 1350,1354 ****
  	unsigned char  Data4[8];
  } GUID, *REFGUID, *LPGUID;
! #define SYSTEM_LUID { QuadPart:999 }
  #endif /* GUID_DEFINED */
  typedef struct _GENERIC_MAPPING {
--- 1355,1359 ----
  	unsigned char  Data4[8];
  } GUID, *REFGUID, *LPGUID;
! #define SYSTEM_LUID { 0x3e7, 0x0 }
  #endif /* GUID_DEFINED */
  typedef struct _GENERIC_MAPPING {
***************
*** 2003,2007 ****
    ULONGLONG QuadPart;
  } ULARGE_INTEGER, *PULARGE_INTEGER;
! typedef LARGE_INTEGER LUID,*PLUID;
  #pragma pack(push,4)
  typedef struct _LUID_AND_ATTRIBUTES {
--- 2008,2015 ----
    ULONGLONG QuadPart;
  } ULARGE_INTEGER, *PULARGE_INTEGER;
! typedef struct _LUID {
!   DWORD LowPart;
!   LONG HighPart;
! } LUID, *PLUID;
  #pragma pack(push,4)
  typedef struct _LUID_AND_ATTRIBUTES {
***************
*** 3342,3345 ****
--- 3350,3356 ----
  #if (_WIN32_WINNT >= 0x0500)
  ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE);
+ #define VER_SET_CONDITION(ConditionMask, TypeBitMask, ComparisonType)  \
+ 	((ConditionMask) = VerSetConditionMask((ConditionMask), \
+ 	(TypeBitMask), (ComparisonType)))
  #endif
  
***************
*** 3347,3350 ****
--- 3358,3362 ----
  PVOID GetFiberData(void);
  
+ #ifdef _X86_
  #if defined(__GNUC__)
  #if (__GNUC__ >= 3)
***************
*** 3433,3436 ****
--- 3445,3449 ----
          
  #endif /* __GNUC__ */
+ #endif /* _X86_ */
  
  #endif /* RC_INVOKED */

Index: winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** winuser.h	2 Jan 2005 13:10:37 -0000	1.29
--- winuser.h	11 Aug 2005 00:59:49 -0000	1.30
***************
*** 1130,1133 ****
--- 1130,1134 ----
  #define HSHELL_WINDOWCREATED 1
  #define HSHELL_WINDOWDESTROYED 2
+ #define HSHELL_RUDEAPPACTIVATED 32772
  #define HSHELL_FLASH 32774
  #if (WINVER >= 0x0500)
***************
*** 1534,1537 ****
--- 1535,1542 ----
  #define CB_SETTOPINDEX 348
  #define CB_SHOWDROPDOWN 335
+ #if (_WIN32_WINNT >= 0x0501)
+ #define CB_SETMINVISIBLE 0x1701
+ #define CB_GETMINVISIBLE 0x1702
+ #endif
  #define CBN_CLOSEUP 8
  #define CBN_DBLCLK 2
***************
*** 2076,2079 ****
--- 2081,2087 ----
  #define SW_INVALIDATE 2
  #define SW_ERASE 4
+ #if (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500)
+ #define SW_SMOOTHSCROLL	0x0010
+ #endif /* (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) */
  #define SC_SIZE 0xF000
  #define SC_MOVE 0xF010

Index: winldap.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winldap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** winldap.h	5 Sep 2004 15:16:58 -0000	1.2
--- winldap.h	11 Aug 2005 00:59:49 -0000	1.3
***************
*** 397,407 ****
  WINLDAPAPI ULONG ldap_sasl_bind_sW(LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*);
  WINLDAPAPI ULONG ldap_simple_bindA(LDAP*,const PCHAR,const PCHAR);
! WINLDAPAPI ULONG ldap_simple_bindW(LDAP*,const PWCHAR,const PCHAR);
  WINLDAPAPI ULONG ldap_simple_bind_sA(LDAP*,const PCHAR,const PCHAR);
! WINLDAPAPI ULONG ldap_simple_bind_sW(LDAP*,const PWCHAR,const PCHAR);
  WINLDAPAPI ULONG ldap_bindA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
! WINLDAPAPI ULONG ldap_bindW(LDAP*,const PWCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
  WINLDAPAPI ULONG ldap_bind_sA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
! WINLDAPAPI ULONG ldap_bind_sW(LDAP*,const PWCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
  WINLDAPAPI ULONG ldap_unbind(LDAP*);
  WINLDAPAPI ULONG ldap_unbind_s(LDAP*);
--- 397,407 ----
  WINLDAPAPI ULONG ldap_sasl_bind_sW(LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*);
  WINLDAPAPI ULONG ldap_simple_bindA(LDAP*,const PCHAR,const PCHAR);
! WINLDAPAPI ULONG ldap_simple_bindW(LDAP*,const PWCHAR,const PWCHAR);
  WINLDAPAPI ULONG ldap_simple_bind_sA(LDAP*,const PCHAR,const PCHAR);
! WINLDAPAPI ULONG ldap_simple_bind_sW(LDAP*,const PWCHAR,const PWCHAR);
  WINLDAPAPI ULONG ldap_bindA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
! WINLDAPAPI ULONG ldap_bindW(LDAP*,const PWCHAR,const PWCHAR,ULONG) _WINLDAP_DEPRECATED;
  WINLDAPAPI ULONG ldap_bind_sA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
! WINLDAPAPI ULONG ldap_bind_sW(LDAP*,const PWCHAR,const PWCHAR,ULONG) _WINLDAP_DEPRECATED;
  WINLDAPAPI ULONG ldap_unbind(LDAP*);
  WINLDAPAPI ULONG ldap_unbind_s(LDAP*);

Index: richedit.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/richedit.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** richedit.h	15 Feb 2004 07:35:00 -0000	1.6
--- richedit.h	11 Aug 2005 00:59:49 -0000	1.7
***************
*** 258,263 ****
  #define TM_SINGLECODEPAGE	16
  #define TM_MULTICODEPAGE	32
- #define GT_DEFAULT	0
- #define GT_USECRLF	1
  #define yHeightCharPtsMost 1638
  #define lDefaultTab 720
--- 258,261 ----
***************
*** 477,482 ****
  	UINT codepage;
  	LPCSTR lpDefaultChar;
! 	LPBOOL lpUsedDefaultChar;
  } GETTEXTEX;
  typedef LONG (*EDITWORDBREAKPROCEX)(char*,LONG,BYTE,INT);
  /* Defines for EM_SETTYPOGRAPHYOPTIONS */
--- 475,492 ----
  	UINT codepage;
  	LPCSTR lpDefaultChar;
! 	LPBOOL lpUsedDefChar;
  } GETTEXTEX;
+ /* GETTEXTEX flags */
+ #define GT_DEFAULT	0
+ #define GT_USECRLF	1
+ #define GT_SELECTION	2
+ typedef struct _settextex {
+ 	DWORD flags;
+ 	UINT codepage;
+ } SETTEXTEX;
+ /* SETTEXTEX flags */
+ #define ST_DEFAULT	0
+ #define ST_KEEPUNDO	1
+ #define ST_SELECTION	2
  typedef LONG (*EDITWORDBREAKPROCEX)(char*,LONG,BYTE,INT);
  /* Defines for EM_SETTYPOGRAPHYOPTIONS */

Index: basetyps.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/basetyps.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** basetyps.h	5 Sep 2004 15:16:58 -0000	1.7
--- basetyps.h	11 Aug 2005 00:59:49 -0000	1.8
***************
*** 18,22 ****
  # endif
  # ifndef __int16
! #  define __int16 int
  # endif
  # ifndef __int8
--- 18,22 ----
  # endif
  # ifndef __int16
! #  define __int16 short
  # endif
  # ifndef __int8

Index: vfw.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/vfw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vfw.h	12 Sep 2003 13:31:30 -0000	1.1
--- vfw.h	11 Aug 2005 00:59:49 -0000	1.2
***************
*** 1058,1061 ****
--- 1058,1067 ----
  }
  
+ /* AVICAP32 exports */
+ HWND VFWAPI capCreateCaptureWindowA (LPCSTR,DWORD,int,int,int,int,HWND,int);
+ HWND VFWAPI capCreateCaptureWindowW (LPCWSTR,DWORD,int,int,int,int,HWND,int);
+ BOOL VFWAPI capGetDriverDescriptionA (UINT,LPSTR,int,LPSTR,int);
+ BOOL VFWAPI capGetDriverDescriptionW (UINT,LPWSTR,int,LPWSTR,int);
+ 
  #ifdef UNICODE
  #define AVISTREAMINFO AVISTREAMINFOW
***************
*** 1089,1092 ****
--- 1095,1102 ----
  #define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGW
  #define MCIWNDM_OPEN MCIWNDM_OPENW
+ 
+ #define capCreateCaptureWindow  capCreateCaptureWindowW
+ #define capGetDriverDescription capGetDriverDescriptionW
+ 
  #else
  #define AVISTREAMINFO AVISTREAMINFOA
***************
*** 1120,1123 ****
--- 1130,1137 ----
  #define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGA
  #define MCIWNDM_OPEN MCIWNDM_OPENA
+ 
+ #define capCreateCaptureWindow  capCreateCaptureWindowA
+ #define capGetDriverDescription capGetDriverDescriptionA
+ 
  #endif
  

Index: ws2tcpip.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ws2tcpip.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ws2tcpip.h	5 Feb 2003 17:44:09 -0000	1.4
--- ws2tcpip.h	11 Aug 2005 00:59:49 -0000	1.5
***************
*** 295,302 ****
--- 295,311 ----
  };
  
+ #if (_WIN32_WINNT >= 0x0501)
  void WSAAPI freeaddrinfo (struct addrinfo*);
  int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*,
  		        struct addrinfo**);
+ int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
+ 		       char*,DWORD,int);
+ #else
+ /* FIXME: Need WS protocol-independent API helpers.  */
+ #endif
  
+ #if 0
+ /* These are not exported from any known w32api library.  Are they
+    implemented as macros or inline finctions?  */
  char* WSAAPI gai_strerrorA(int);
  WCHAR* WSAAPI gai_strerrorW(int);
***************
*** 306,313 ****
  #define gai_strerror   gai_strerrorA
  #endif  /* UNICODE */
! 
! int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
! 		       char*,DWORD,int);
! 
  
  /* Some older IPv4/IPv6 compatability stuff */
--- 315,319 ----
  #define gai_strerror   gai_strerrorA
  #endif  /* UNICODE */
! #endif /* 0 */
  
  /* Some older IPv4/IPv6 compatability stuff */

Index: wininet.h
===================================================================
RCS file: /cvsroot/mingw/w32api...
 
[truncated message content]

Update of /cvsroot/mingw/w32api/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4063/lib

Modified Files:
	kernel32.def user32.def 
Log Message:
Merged Cygwin changes

Index: kernel32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/kernel32.def,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** kernel32.def	2 Jan 2005 13:10:38 -0000	1.11
--- kernel32.def	11 Aug 2005 00:59:50 -0000	1.12
***************
*** 429,433 ****
  GetUserDefaultLangID@0
  GetUserDefaultUILanguage@0
! GetUserGeoID@12
  GetVDMCurrentDirectories@8
  GetVersion@0
--- 429,433 ----
  GetUserDefaultLangID@0
  GetUserDefaultUILanguage@0
! GetUserGeoID@4
  GetVDMCurrentDirectories@8
  GetVersion@0

Index: user32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/user32.def,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** user32.def	5 Sep 2004 15:17:00 -0000	1.8
--- user32.def	11 Aug 2005 00:59:50 -0000	1.9
***************
*** 440,444 ****
  ModifyMenuA@20
  ModifyMenuW@20
! MonitorFromPoint@8
  MonitorFromRect@8
  MonitorFromWindow@8
--- 440,444 ----
  ModifyMenuA@20
  ModifyMenuW@20
! MonitorFromPoint@12
  MonitorFromRect@8
  MonitorFromWindow@8

Update of /cvsroot/mingw/w32api/include/ddk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4063/include/ddk

Modified Files:
	ntifs.h 
Log Message:
Merged Cygwin changes

Index: ntifs.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/ntifs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ntifs.h	5 Sep 2004 15:16:59 -0000	1.4
--- ntifs.h	11 Aug 2005 00:59:49 -0000	1.5
***************
*** 939,942 ****
--- 939,980 ----
  } FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION;
  
+ #if (VER_PRODUCTBUILD >= 2600)
+ 
+ typedef struct _FILE_ID_FULL_DIRECTORY_INFORMATION {
+ 		ULONG	          NextEntryOffset;
+ 		ULONG	          FileIndex;
+ 		LARGE_INTEGER   CreationTime;
+ 		LARGE_INTEGER   LastAccessTime;
+ 		LARGE_INTEGER   LastWriteTime;
+ 		LARGE_INTEGER   ChangeTime;
+ 		LARGE_INTEGER   EndOfFile;
+ 		LARGE_INTEGER   AllocationSize;
+ 		ULONG           FileAttributes;
+ 		ULONG           FileNameLength;
+ 		ULONG           EaSize;
+ 		LARGE_INTEGER   FileId;
+ 		WCHAR           FileName[0];
+ } FILE_ID_FULL_DIRECTORY_INFORMATION, *PFILE_ID_FULL_DIRECTORY_INFORMATION;
+ 
+ typedef struct _FILE_ID_BOTH_DIRECTORY_INFORMATION {
+ 		ULONG         NextEntryOffset;
+ 		ULONG	        FileIndex;
+ 		LARGE_INTEGER CreationTime;
+ 		LARGE_INTEGER LastAccessTime;
+ 		LARGE_INTEGER LastWriteTime;
+ 		LARGE_INTEGER ChangeTime;
+ 		LARGE_INTEGER EndOfFile;
+ 		LARGE_INTEGER AllocationSize;
+ 		ULONG         FileAttributes;
+ 		ULONG         FileNameLength;
+ 		ULONG         EaSize;
+ 		CHAR          ShortNameLength;
+ 		WCHAR         ShortName[12];
+ 		LARGE_INTEGER FileId;
+ 		WCHAR         FileName[0];
+ } FILE_ID_BOTH_DIRECTORY_INFORMATION, *PFILE_ID_BOTH_DIRECTORY_INFORMATION;
+ 
+ #endif
+ 
  typedef struct _FILE_EA_INFORMATION {
      ULONG EaSize;

Update of /cvsroot/mingw/w32api/lib/directx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4063/lib/directx

Modified Files:
	dinput_joy.c dinput_joy2.c dinput_kbd.c dinput_mouse.c 
	dinput_mouse2.c dinput_private.h 
Log Message:
Merged Cygwin changes

Index: dinput_mouse2.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/directx/dinput_mouse2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dinput_mouse2.c	5 Sep 2004 15:22:12 -0000	1.1
--- dinput_mouse2.c	11 Aug 2005 00:59:50 -0000	1.2
***************
*** 13,17 ****
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT c_rgodfDIMouse2[] __attribute__ ((section(".text"))) =
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE,0x0},
--- 13,17 ----
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION c_rgodfDIMouse2[] =
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE,0x0},
***************
*** 28,30 ****
  };
  
! DIDATAFORMAT c_dfDIMouse2 __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,20,sizeof(c_rgodfDIMouse2)/sizeof(c_rgodfDIMouse2[0]),c_rgodfDIMouse2};
--- 28,30 ----
  };
  
! const DIDATAFORMAT c_dfDIMouse2 = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,20,sizeof(c_rgodfDIMouse2)/sizeof(c_rgodfDIMouse2[0]),c_rgodfDIMouse2};

Index: dinput_joy.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/directx/dinput_joy.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dinput_joy.c	5 Sep 2004 15:22:12 -0000	1.1
--- dinput_joy.c	11 Aug 2005 00:59:50 -0000	1.2
***************
*** 13,17 ****
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT c_rgodfDIJoy[] __attribute__ ((section(".text"))) = 
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,DIDOI_ASPECTPOSITION},
--- 13,17 ----
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION  c_rgodfDIJoy[] = 
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,DIDOI_ASPECTPOSITION},
***************
*** 61,63 ****
  };
  
! DIDATAFORMAT c_dfDIJoystick __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_ABSAXIS,80,sizeof(c_rgodfDIJoy)/sizeof(c_rgodfDIJoy[0]),c_rgodfDIJoy};
--- 61,63 ----
  };
  
! const DIDATAFORMAT c_dfDIJoystick = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_ABSAXIS,80,sizeof(c_rgodfDIJoy)/sizeof(c_rgodfDIJoy[0]),c_rgodfDIJoy};

Index: dinput_joy2.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/directx/dinput_joy2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dinput_joy2.c	5 Sep 2004 15:22:12 -0000	1.1
--- dinput_joy2.c	11 Aug 2005 00:59:50 -0000	1.2
***************
*** 13,17 ****
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT c_rgodfDIJoy2[] __attribute__ ((section(".text"))) =
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,DIDOI_ASPECTPOSITION},
--- 13,17 ----
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION c_rgodfDIJoy2[] =
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,DIDOI_ASPECTPOSITION},
***************
*** 181,183 ****
  };
  
! DIDATAFORMAT c_dfDIJoystick2 __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_ABSAXIS,272,sizeof(c_rgodfDIJoy2)/sizeof(c_rgodfDIJoy2[0]),c_rgodfDIJoy2};
--- 181,183 ----
  };
  
! const DIDATAFORMAT c_dfDIJoystick2 = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_ABSAXIS,272,sizeof(c_rgodfDIJoy2)/sizeof(c_rgodfDIJoy2[0]),c_rgodfDIJoy2};

Index: dinput_private.h
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/directx/dinput_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dinput_private.h	5 Sep 2004 15:22:12 -0000	1.1
--- dinput_private.h	11 Aug 2005 00:59:50 -0000	1.2
***************
*** 71,73 ****
--- 71,81 ----
  extern GUID GUID_POV;
  
+ #if defined (__WATCOMC__)
+ #define ATTRIBUTE_TEXT_SECTION __based( __segname( "_CODE" ) )
+ #elif defined (__GNUC__)
+ #define ATTRIBUTE_TEXT_SECTION  __attribute__ ((section(".text")))
+ #else
+ #define ATTRIBUTE_TEXT_SECTION
+ #endif
+ 
  #endif

Index: dinput_kbd.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/directx/dinput_kbd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dinput_kbd.c	5 Sep 2004 15:22:12 -0000	1.1
--- dinput_kbd.c	11 Aug 2005 00:59:50 -0000	1.2
***************
*** 13,17 ****
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT c_rgodfDIKeyboard[] __attribute__ ((section(".text"))) =
  {
  	{&GUID_Key,0x0,DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0x0)|DIDFT_OPTIONAL,0x0},
--- 13,17 ----
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION c_rgodfDIKeyboard[] =
  {
  	{&GUID_Key,0x0,DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0x0)|DIDFT_OPTIONAL,0x0},
***************
*** 273,275 ****
  };
  
! DIDATAFORMAT c_dfDIKeyboard __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,256,sizeof(c_rgodfDIKeyboard)/sizeof(c_rgodfDIKeyboard[0]),c_rgodfDIKeyboard};
--- 273,275 ----
  };
  
! const DIDATAFORMAT c_dfDIKeyboard = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,256,sizeof(c_rgodfDIKeyboard)/sizeof(c_rgodfDIKeyboard[0]),c_rgodfDIKeyboard};

Index: dinput_mouse.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/directx/dinput_mouse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dinput_mouse.c	5 Sep 2004 15:22:12 -0000	1.1
--- dinput_mouse.c	11 Aug 2005 00:59:50 -0000	1.2
***************
*** 13,17 ****
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT c_rgodfDIMouse[] __attribute__ ((section(".text"))) =
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE,0x0},
--- 13,17 ----
  #include "dinput_private.h"
  
! static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION c_rgodfDIMouse[] =
  {
  	{&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE,0x0},
***************
*** 24,26 ****
  };
  
! DIDATAFORMAT c_dfDIMouse __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,16,sizeof(c_rgodfDIMouse)/sizeof(c_rgodfDIMouse[0]),c_rgodfDIMouse};
--- 24,26 ----
  };
  
! const DIDATAFORMAT c_dfDIMouse = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,16,sizeof(c_rgodfDIMouse)/sizeof(c_rgodfDIMouse[0]),c_rgodfDIMouse};

Update of /cvsroot/mingw/w32api
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4063

Modified Files:
	ChangeLog 
Log Message:
Merged Cygwin changes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** ChangeLog	2 Jan 2005 14:16:34 -0000	1.124
--- ChangeLog	11 Aug 2005 00:59:49 -0000	1.125
***************
*** 1,5 ****
  2005-01-02  Earnie Boyd  <ea...@us...>
  
! 	* include/w32api.h: Increment version.
  	* Makefile.in: Ditto.
  	* include/afxres.h: Remove the \r from the line ending.
--- 1,199 ----
+ 2005-07-28  Earnie Boyd  <ea...@us...>
+ 
+ 	* include/winnt.h (SUBLANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN):
+ 	Correct their values.
+ 	Thanks to: Daniel K. O. <danielosmari at users dont sf dot net>
+ 
+ 2005-07-25  Chris Sutcliffe <ir0...@us...>
+ 
+ 	* include/winuser.h (HSHELL_RUDEAPPACTIVATED): Define.
+ 
+ 2005-07-20  Danny Smith  <dan...@us...>
+ 
+ 	* include/wingdi.h (TT_PRIM_CSPLINE): Define.
+ 	Thanks to: Bob Jamison <ishmal at users dot sourceforge dot net>
+ 
+ 2005-07-20  Danny Smith  <dan...@us...>
+ 
+ 	* include/richedit.h (SETTEXTEX): Define structure and
+ 	associated constants.
+ 	(GT_SELECTION): Define GETTEXTEX flag constant. 
+ 
+ 2005-07-19  Danny Smith  <dan...@us...>
+ 
+ 	* include/wingdi.h (SYSPAL_NOSTATIC256): Define.
+ 
+ 2005-07-19  Danny Smith  <dan...@us...>
+ 
+ 	* include/wingdi.h (WINGDIAPI): Define to DECLSPEC_DLLIMPORT
+ 	if __W32API_USE_DLLIMPORT__.   Use throughout to qualify
+ 	prototypes.
+ 
+ 2005-07-19  Danny Smith  <dan...@us...>
+ 
+ 	* include/commctrl.h (RBBS_USECHEVRON): Define.
+ 	(RBBS_*): Use hex notation, group together.
+ 
+ 2005-07-18  Danny Smith  <dan...@us...>
+ 
+ 	* lib/kernel32.def (GetUserGeoID): Correct suffix.
+ 	Thanks to: "bernd23" <bernd23 at users dot sourceforge dot net>
+ 
+ 2005-07-18  Danny Smith  <dan...@us...>
+ 
+ 	* include/commctrl.h (TreeView_SetItemState): Initilise
+ 	_tvi.hItem.
+ 	Thanks to:  Joseph Remes <jremes at users dot sourceforge dot net>
+ 
+ 2005-07-18  Mattia Barbon  <mb...@us...>
+ 
+ 	* include/commctrl.h (NMLVFINDITEM): Add structure.
+ 
+ 2005-07-18  Michael Gerdau  <mg...@us...>
+ 
+ 	* include/wininet.h (WININET_API_FLAG_*): Add defines.
+ 
+ 2005-07-18  Daniel Atallah  <dat...@us...>
+ 
+ 	* include/winnt.h (VER_SET_CONDITION): Define.
+ 
+ 2005-07-18  Michael Gerdau  <mg...@us...>
+ 
+ 	* include/wincon.h (AttachConsole): Correct _WIN32_WINNT guard.
+ 	(ATTACH_PARENT_PROCESS): Define.
+ 	(CONSOLE_WINDOWED_MODE): Correct definition to match MSDN
+ 	documentation.
+ 
+ 2005-07-17  Benoit Blanchon  <bbl...@us...>
+ 
+ 	* include/winbase.h (QueueUserWorkItem): Add prototype.
+ 
+ 2005-07-13  Benoit Blanchon  <bbl...@us...>
+ 
+ 	* include/wingdi.h (SHADEBLENDCAPS, SB_NONE, SB_CONST_ALPHA,
+ 	SB_PIXEL_ALPHA, SB_PREMULT_ALPHA, SB_GRAD_RECT, SB_GRAD_TRI,
+ 	COLORMGMTCAPS, CM_NONE, CM_DEVICE_ICM, CM_GAMMA_RAMP,
+ 	CM_CMYK_COLOR): Define.
+ 
+ 2005-06-19  Danny Smith  <dan...@us...>
+ 
+ 	* include/winldap.h (ldap_simple_bindW, ldap_simple_bind_sW,
+ 	ldap_bindW, ldap_bind_sW): Change PCHAR arg to PWCHAR.
+ 	Thanks to: Christian  <chhd at users dot sf dot net>
+ 
+ 2005-06-18  Danny Smith  <dan...@us...>
+ 
+ 	* include/richedit.h (GETTEXTEX): Correct name of lpUsedDefChar
+ 	field.
+ 	Thanks to: Saulius Menkevicius  <bobas at users dot sf dot net>
+ 
+ 2005-06-18  Danny Smith  <dan...@us...>
+ 
+ 	* include/winbase.h (GlobalDiscard): Define as macro.
+ 	Thanks to: David Golub  <david_golub  at users dot sf dot net>
+ 
+ 2005-05-13  Corinna Vinschen  <co...@vi...>
+ 
+ 	* include/winnetwk.h (WNetGetResourceParentA): Add missing declaration.
+ 	(WNetGetResourceParentW): Ditto.
+ 	* include/ddk/ntifs.h (FILE_ID_FULL_DIRECTORY_INFORMATION): Define.
+ 	(FILE_ID_BOTH_DIRECTORY_INFORMATION): Define.
+ 
+ 2005-04-26  Danny Smith  <dan...@us...>
+ 
+ 	* include/wininet.h (FtpGetFileSize): Add prototype.
+ 	(FtpCommand[AW]): Correct prototypes.
+ 	Reported by: <siger at users dot sf dot net>
+ 
+ 2005-04-25  Danny Smith  <dan...@us...>
+ 
+ 	* include/vfw.h (capCreateCaptureWindow[AW]): Add prototypes.
+ 	(capGetDriverDescription[AW]): Likewise.
+ 
+ 2005-04-03  Corinna Vinschen  <co...@vi...>
+ 
+ 	* include/winnt.h (SE_UNDOCK_NAME TEXT): Define.
+ 	(SE_MANAGE_VOLUME_NAME TEXT): Ditto.
+ 	(SE_IMPERSONATE_NAME TEXT): Ditto.
+ 	(SE_ENABLE_DELEGATION_NAME TEXT): Ditto.
+ 	(SE_SYNC_AGENT_NAME TEXT): Ditto.
+ 
+ 2005-03-16  Christopher Faylor  <cg...@ti...>
+ 
+ 	* include/winnt.h (SYSTEM_LUID): Fix definitition invalidated by below
+ 	change.
+ 
+ 2005-03-16  Danny Smith  <dan...@us...>
+ 
+ 	* include/winnt.h (_LUID): Add structure. Correct LUID typedef. 
+ 	Thanks to:
+ 	Paul-Christiaan Spruijtenburg <wakarimasu at users dot sf dot net>
+ 
+ 2005-03-07  Danny Smith  <dan...@us...>
+ 
+ 	* include/ws2tcpip.h (getaddrinfo, freeaddrinfo, getnameinfo):
+ 	Guard with _WIN32_WINNT >= 0x0501. Add FIXME comment.
+ 	(gai_strerror[AW]): Put into #if 0 block.
+ 
+ 2005-03-07  Danny Smith  <dan...@us...>
+ 
+ 	* include/basetyps.h (__int16): Correct define.
+ 
+ 2005-02-10  Jiri Malak  <Jir...@io...>
+             Danny Smith  <dan...@us...>
+ 
+ 	* lib/directx/dinput_private.h (ATTRIBUTE_TEXT_SECTION): New
+ 	define for Open Watcom portability.
+ 	* lib/directx/(dinput_joy.c, dinput_joy2.c, dinput_kbd.c, 
+ 	dinput_mouse.c, dinput_mouse2.c): Use new macro in definition
+ 	of local c_rgodfDI* objects. Replace .rdata section attribute
+ 	with 'const' keyword in definition of global c_dfDI* objects.
+ 
+ 2005-02-07  Danny Smith  <dan...@us...>
+ 
+ 	* include/winioctl.h (IOCTL_VOLUME_BASE,
+ 	IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS, IOCTL_VOLUME_IS_CLUSTERED):
+ 	Copy defines from include/ddk/ntdddvol.h.
+ 	Bug reported to Debian by Anand Kumria  <wil...@pr...>
+ 
+ 2005-01-27  Oliver Stoeneberg  <oli...@on...>
+ 
+ 	* include/winbase.h (PWIN32_FIND_DATA): Add typedef.
+ 
+ 2005-01-26  Danny Smith  <dan...@us...>
+ 
+ 	* include/winuser.h (SW_SMOOTHSCROLL): Add define. 
+ 	Reported by: Christian Ehrlicher  <che...@us...>
+ 
+ 2005-01-21  Chris Sutcliffe  <ir0...@us...>
+ 
+ 	* include/commdlg.h (OFN_DONTADDTORECENT): Added definition.
+ 
+ 2005-01-18  Danny Smith  <dan...@us...>
+ 
+ 	* lib/user32.def (MonitorFromPoint): Correct suffix.
+ 
+ 2005-01-13  Benoit Blanchon  <bbl...@us...>
+ 
+ 	* include/wininet.h (InternetCheckConnectionA,
+ 	InternetCheckConnectionW) Add prototypes.
+ 	(INTERNET_RAS_INSTALLED, INTERNET_CONNECTION_OFFLINE,
+ 	INTERNET_CONNECTION_CONFIGURED): Add defines.
+ 
+ 2005-01-07  Chris Sutcliffe  <ir0...@us...>
+ 
+ 	* include/commctrl.h (ComboBox_SetMinVisible,
+ 	ComboBox_GetMinVisible): Added Macros.
+ 	* include/winuser.h (CB_SETMINVISIBLE, CB_GETMINVISIBLE):
+ 	Added definitions.
+ 
+ 2005-01-02  Jiri Malak  <Jir...@ge...>
+ 
+ 	* include/winnt.h (GetCurrentFiber, GetFiberData): Make inline
+ 	assembly code conditional on _X86_.
+ 
  2005-01-02  Earnie Boyd  <ea...@us...>
  
! 	* include/w32api.h: Increment version to 3.2.
  	* Makefile.in: Ditto.
  	* include/afxres.h: Remove the \r from the line ending.
***************
*** 115,119 ****
  	* include/winuser.h (LLKHF_EXTENDED, LLKHF_INJECTED, LLKHF_UP):
  	Add defines.
! 	(LLKHF_ALTDOWN): Define based on KF_ALTDOWN,
               
  2004-11-19  Benoit Blanchon  <bbl...@us...>
--- 309,313 ----
  	* include/winuser.h (LLKHF_EXTENDED, LLKHF_INJECTED, LLKHF_UP):
  	Add defines.
! 	(LLKHF_ALTDOWN): Define based on KF_ALTDOWN.
               
  2004-11-19  Benoit Blanchon  <bbl...@us...>

Update of /cvsroot/mingw/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9377

Modified Files:
	ChangeLog index.shtml msys.shtml 
Log Message:
2005-08-02  Earnie Boyd  <ea...@us...>

	* index.shtml: Tidy. Add section for published system of choice.
	* msys.shtml: Tidy. Remove verbiage about the i386, i586 and i686
	older distributions.



Index: msys.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/msys.shtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** msys.shtml	2 May 2004 19:03:04 -0000	1.12
--- msys.shtml	2 Aug 2005 14:27:35 -0000	1.13
***************
*** 1,65 ****
  <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
! 	<title>MinGW - Minimal SYStem</title>
! </head>
  
! <body>
! <span style="visibility: hidden;">.</span>
  
! <!--#include virtual="ssi/header.html" -->
  
! <!--#include virtual="ssi/lside.html" -->
  
  
! <div id="Content">
! <h1>MinGW - Minimal SYStem</h1>
! <p>
! 				<p>
!             MSYS was created out of a long-lived desire to provide the MinGW community a
!             Minimal SYStem, with which a configure script could be executed.  This is finally 
!             available from the 
!             <a href="http://sourceforge.net/project/showfiles.php?group_id=2435">MinGW download area</a> on SourceForge.
!          </p>
!          <p>
!             Most users will need only the binary distribution of MSYS, which is provided
!             as a Windows installer executable. MSYS versions prior to 1.0.8 are available
!             for three processor architectures:
!          </p>
!             <ul>
!                <li><b>i386</b>, which will run on any 32-bit Intel-compatible processor.</li>
!                <li><b>i586</b>, which will run on Pentium processors or newer (and compatibles).</li>
!                <li><b>i686</b>, which will run on Pentium Pro, Pentium II and Celeron processors or newer
!                   (and compatibles).
!             </ul>
!          <p>
!             MSYS versions 1.0.8 and later include only the i386 binary distribution, which will run
!             on any 32-bit Intel-compatible processor.
!             The tarball flagged as &quot;src&quot; contains the source code for MSYS runtime and each package used to provide executable binaries, which is unnecessary unless a 
!             manual build is desired. Source tarballs may not be provided for snapshots and
!             prereleases, so the latest source should be obtained from the &quot;msys&quot; module in
!             <a href="http://sourceforge.net/cvs/?group_id=2435">MinGW CVS</a>.
!             The files flagged as &quot;odmp&quot; and &quot;perdr&quot;
!             are used to diagnose problems in MSYS itself, and are only useful for MSYS developers.
!          </p>
!          <p>
!             More information about using MinGW with 
!             MSYS can be found in the <a href="mingwfaq.shtml#faq-usingwithmsys">FAQ</a>, 
!             and the current MSYS documentation can be found in the &quot;\msys\1.0\doc\msys&quot; 
!             subdirectory within the binary distribution.
!          </p>
!          <p>
!             There is also a mailing list for MSYS discussion (MinGW-msys).  See the 
!             <a href="lists.shtml">Mailing Lists</a> page for more information and access to this list.
!          </p>
! </p>
! </div>
  
! <!--#include virtual="ssi/footer.html" -->
  
! </body>
  </html>
--- 1,50 ----
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <html>
!   <head>
!     <meta name="generator" content="HTML Tidy, see www.w3.org">
!     <meta name="description" content=
!     "Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!     <meta name="keywords" content=
!     "mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
!     <link rel="stylesheet" type="text/css" href="mingw.css">
  
!     <title>MinGW - Minimal SYStem</title>
!   </head>
  
!   <body>
!     <span style="visibility: hidden;">.</span> 
!     <!--#include virtual="ssi/header.html" -->
!     <!--#include virtual="ssi/lside.html" -->
  
!     <div id="Content">
!       <h1>MinGW - Minimal SYStem</h1>
  
+       <p>MSYS was created out of a long-lived desire to provide the MinGW
+       community a Minimal SYStem, with which a configure script could be
+       executed. This is finally available from the <a href=
+       "http://sourceforge.net/project/showfiles.php?group_id=2435">MinGW
+       download area</a> on SourceForge.</p>
  
!       <p>MSYS versions 1.0.8 and later include only the i386 binary
!       distribution, which will run on any 32-bit Intel-compatible processor.
!       The tarball flagged as "src" contains the source code for MSYS runtime
!       and each package used to provide executable binaries, which is
!       unnecessary unless a manual build is desired. Source tarballs may not
!       be provided for snapshots and prereleases, so the latest source should
!       be obtained from the "msys/rt" and "msys/packages" modules in <a href=
!       "http://sourceforge.net/cvs/?group_id=2435">MinGW CVS</a>. The files
!       ending in "odmp" and "perdr" are used to diagnose the a stackdump
!       should that occur.</p>
  
!       <p>More information about using MinGW with MSYS can be found in the <a
!       href="mingwfaq.shtml#faq-usingwithmsys">FAQ</a>, and the current MSYS
!       documentation can be found in the "\msys\1.0\doc\msys" subdirectory
!       within the binary distribution.</p>
  
!       <p>There is also a mailing list for MSYS discussion (MinGW-msys). See
!       the <a href="lists.shtml">Mailing Lists</a> page for more information
!       and access to this list.</p>
!     </div>
!     <!--#include virtual="ssi/footer.html" -->
!   </body>
  </html>

Index: index.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/index.shtml,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** index.shtml	6 May 2004 11:14:58 -0000	1.73
--- index.shtml	2 Aug 2005 14:27:35 -0000	1.74
***************
*** 1,54 ****
  <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
! 	<link rel="stylesheet" type="text/css" href="mingw_news.css">
! 	<title>MinGW - Home</title>
! </head>
  
! <body>
! <span style="visibility: hidden;">.</span>
  
! <!--#include virtual="ssi/header.html" -->
  
! <!--#include virtual="ssi/lside.html" -->
  
! <!--#include virtual="news-short.html" -->
  
! <div id="Content">
! <h1>MinGW - Home</h1>
! <p>
!                         <p><span class="bold">MinGW:</span> A
! collection of freely available and freely distributable Windows
! specific header files and import libraries combined with GNU toolsets
! that allow one to produce native Windows programs that do not rely on
! any 3rd-party C runtime DLLs.</p>
!             <p><span class="bold">MSYS:</span> A Minimal
! SYStem to provide POSIX/Bourne configure scripts the ability to execute
! and create a Makefile used by make.<br>
!             </p>
!             <p><span class="bold">Mailing Lists:</span> We
! have several <a href="lists.shtml">mailing lists</a> you are encouraged
! to join and participate in. There is a general discussion list&nbsp;<a
!  href="mailto:min...@li...">min...@li...</a> for
! general MinGW questions and a general discussion list&nbsp;<a
!  href="mailto:min...@li...">min...@li...</a> for
! questions more related to MSYS and to using the Minimal SYStem.
! Information for signup and links to the archives can be found by&nbsp;<a
!  href="lists.shtml">clicking here</a>. You may search the archives
! using the "Search the archives" form found on the left side of
! every&nbsp;<a href="http://www.mingw.org">www.mingw.org</a> page.
! 	    </p>
! 	    <p><span class="bold">Packages, Release Candidates, etc.</span>
! We've moved this information to the <a href="download.shtml">Download</a> web
! page.  We hope that you find our new look helpful.</p>
! </p>
! </div>
  
! <!--#include virtual="ssi/footer.html" -->
  
! </body>
  </html>
--- 1,74 ----
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ 
  <html>
!   <head>
!     <meta name="generator" content="HTML Tidy, see www.w3.org">
!     <meta name="description" content=
!     "Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!     <meta name="keywords" content=
!     "mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
!     <link rel="stylesheet" type="text/css" href="mingw.css">
!     <link rel="stylesheet" type="text/css" href="mingw_news.css">
  
!     <title>MinGW - Home</title>
!   </head>
  
!   <body>
!     <span style="visibility: hidden;">.</span> 
!     <!--#include virtual="ssi/header.html" -->
!      <!--#include virtual="ssi/lside.html" -->
!      <!--#include virtual="news-short.html" -->
!      
  
!     <div id="Content">
!       <h1>MinGW - Home</h1>
  
!       <p><span class="bold">MinGW:</span> A collection of freely available
!       and freely distributable Windows specific header files and import
!       libraries combined with GNU toolsets that allow one to produce native
!       Windows programs that do not rely on any 3rd-party C runtime DLLs.</p>
  
!       <p><span class="bold">MSYS:</span> A Minimal SYStem to provide
!       POSIX/Bourne configure scripts the ability to execute and create a
!       Makefile used by make.</p>
  
!       <p><span class="bold">Mailing Lists:</span> We have several <a href=
!       "lists.shtml">mailing lists</a> you are encouraged to join and
!       participate in. There is a general discussion list&nbsp;<a href=
!       "mailto:min...@li...">min...@li...</a> for
!       general MinGW questions and a general discussion list&nbsp;<a href=
!       "mailto:min...@li...">min...@li...</a> for
!       questions more related to MSYS and to using the Minimal SYStem.
!       Information for signup and links to the archives can be found
!       by&nbsp;<a href="lists.shtml">clicking here</a>. You may search the
!       archives using the "Search the archives" form found on the left side of
!       every&nbsp;<a href="http://www.mingw.org">www.mingw.org</a> page.</p>
  
!       <p><span class="bold">Packages, Release Candidates, etc.</span> We've
!       moved this information to the <a href="download.shtml">Download</a> web
!       page. We hope that you find our new look helpful.</p>
! 
!       <p><span class="bold">Publications promoting MinGW:</span> The
!       following list are published works suggesting or requiring MinGW and/or
!       MSYS as their Windows build system of choice.</p>
! 
!       <ul>
!         <li><em class="bold">Publisher:</em> <a href=
!         "http://www.syngress.com">Syngress Publishing, Inc</a><br>
!          <em class="bold">Title:</em> Host Integrity Monitoring Using Osiris
!         and Samhain<br>
!          <em class="bold">Author:</em> Brian Wotring<br>
!          <em class="bold">Technical Editor:</em> Bruce Potter<br>
!          <em class="bold">ISBN:</em> 1-597490-18-0<br>
!         </li>
!       </ul>
! 
!       <p class="small" >For information on adding your publication to this list; send your
!       queries to mingw-users-admin at list dot sourceforge dot net. Make
!       certain the subject of your email doesn't look like it may be SPAM or
!       it may be deleted without being read.</p>
!     </div>
!     <!--#include virtual="ssi/footer.html" -->
!   </body>
  </html>
+ 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/htdocs/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** ChangeLog	28 Jul 2005 11:23:28 -0000	1.155
--- ChangeLog	2 Aug 2005 14:27:35 -0000	1.156
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-08-02  Earnie Boyd  <ea...@us...>
+ 
+ 	* index.shtml: Tidy. Add section for published system of choice.
+ 	* msys.shtml: Tidy. Remove verbiage about the i386, i586 and i686
+ 	older distributions.
+ 
  2005-07-28  Earnie Boyd  <ea...@us...>