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

Update of /cvsroot/mingw/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv1116

Modified Files:
	mingwfaq.shtml 
Log Message:
Altered slight typo from previous commit.


Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mingwfaq.shtml	2002/01/26 18:13:43	1.30
--- mingwfaq.shtml	2002/01/26 18:14:48	1.31
***************
*** 301,305 ****
           add the MinGW "/bin" subdirectory to your PATH (either within 
           MSYS's "/etc/profile" or in your overall system PATH).  There 
!          is no need to add MSYS's "/bin" to your PATH.
        </p>
        <p>
--- 301,305 ----
           add the MinGW &quot;/bin&quot; subdirectory to your PATH (either within 
           MSYS's &quot;/etc/profile&quot; or in your overall system PATH).  There 
!          is no need to add MSYS's &quot;/bin&quot; to your system PATH.
        </p>
        <p>

Update of /cvsroot/mingw/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv761

Modified Files:
	mingwfaq.shtml msys.shtml 
Log Message:
Altered verbiage of MSYS information, to remove suggestions of adding 
MSYS's "/bin" subdirectory to one's system PATH.


Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mingwfaq.shtml	2002/01/26 17:46:39	1.29
--- mingwfaq.shtml	2002/01/26 18:13:43	1.30
***************
*** 299,304 ****
           overlap in functionality to contend with (as there is with Cygwin).  Simply 
           decompress the contents of each archive into directories of your choosing, and 
!          add both the MinGW "/bin" and the MSYS "/bin" subdirectories
!          to your PATH.
        </p>
        <p>
--- 299,305 ----
           overlap in functionality to contend with (as there is with Cygwin).  Simply 
           decompress the contents of each archive into directories of your choosing, and 
!          add the MinGW &quot;/bin&quot; subdirectory to your PATH (either within 
!          MSYS's &quot;/etc/profile&quot; or in your overall system PATH).  There 
!          is no need to add MSYS's &quot;/bin&quot; to your PATH.
        </p>
        <p>

Index: msys.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/msys.shtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** msys.shtml	2002/01/20 03:01:20	1.4
--- msys.shtml	2002/01/26 18:13:43	1.5
***************
*** 32,36 ****
              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 on SourceForge</a>.
           </p>
           <p>
--- 32,36 ----
              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>
***************
*** 44,49 ****
           <p>
              To install the MSYS binaries, choose a location in your filesystem and unpack the 
!             binary distribution there.  It is recommended that you add the &quot;bin&quot; subdirectory
!             of the MSYS distribution to your system PATH.  More information about using MinGW with 
              MSYS can be found in the <a href="http://localhost/mingw/mingwfaq.shtml#faq-usingwithmsys">FAQ</a>, 
              and the current MSYS documentation can be found in the &quot;\msys\1.0\doc\msys&quot; 
--- 44,50 ----
           <p>
              To install the MSYS binaries, choose a location in your filesystem and unpack the 
!             binary distribution there.  It is recommended that you create a shortcut pointing to 
!             &quot;msys\1.0\msys.bat&quot;, and set the &quot;Start In:&quot; field of the shortcut 
!             to &quot;msys\1.0\bin&quot;.  More information about using MinGW with 
              MSYS can be found in the <a href="http://localhost/mingw/mingwfaq.shtml#faq-usingwithmsys">FAQ</a>, 
              and the current MSYS documentation can be found in the &quot;\msys\1.0\doc\msys&quot; 

Update of /cvsroot/mingw/htdocs/ssi
In directory usw-pr-cvs1:/tmp/cvs-serv604

Modified Files:
	bottombar.html 
Log Message:
Added MSYS link

Index: bottombar.html
===================================================================
RCS file: /cvsroot/mingw/htdocs/ssi/bottombar.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bottombar.html	2001/08/27 19:41:19	1.7
--- bottombar.html	2002/01/26 18:11:58	1.8
***************
*** 12,15 ****
--- 12,16 ----
  <a href="download.shtml">Download</a> |
  <a href="docs.shtml">Documentation</a>          |
+ <a href="msys.shtml">MSYS</a>          |
  <a href="mirrors.shtml">Mirror Sites</a>        |
  <a href="links.shtml">Related Sites</a>         |

Update of /cvsroot/mingw/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv28321

Modified Files:
	mingwfaq.shtml 
Log Message:
Fixed dead link for w32api README

Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mingwfaq.shtml	2002/01/20 03:01:20	1.28
--- mingwfaq.shtml	2002/01/26 17:46:39	1.29
***************
*** 203,207 ****
              W32API, which consists of the headers and import libraries related to
              WIN32 API access, is released under
!             <a href="http://www.acc.umu.se/%7Eanorland/gnu-win32/README.w32api">copyright</a>.  
              The copyright agreement states no restrictions are placed on programs or object 
              files compiled with the library.  There are restrictions if you wish to 
--- 203,207 ----
              W32API, which consists of the headers and import libraries related to
              WIN32 API access, is released under
!             <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/mingw/w32api/README?rev=1.1.1.1&content-type=text/vnd.viewcvs-markup">copyright</a>.  
              The copyright agreement states no restrictions are placed on programs or object 
              files compiled with the library.  There are restrictions if you wish to 
***************
*** 413,418 ****
           created by Anders Norlander and it's license is also non-restrictive.  For
           more information see Anders' README file 
!          <a href="http://www.acc.umu.se/%7Eanorland/gnu-win32/README.w32api" 
!          target="_nw"> README.w32api</a>.  
        </p>
        <p><a href="#index">Back to index</a></p>
--- 413,417 ----
           created by Anders Norlander and it's license is also non-restrictive.  For
           more information see Anders' README file 
!          <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/mingw/w32api/README?rev=1.1.1.1&content-type=text/vnd.viewcvs-markup"> README.w32api</a>.  
        </p>
        <p><a href="#index">Back to index</a></p>

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv3694/cygwin

Modified Files:
      Tag: msys-1_0_4
	ChangeLog.MSYS path.cc pinfo.cc spawn.cc uname.cc 
Log Message:

2001-01-25  Earnie Boyd  <ea...@us...>

	* spawn.cc (spawn_guts): Move path/switch filter code to
	cygwin_conv_to_win32_path.  Call cygwin_conv_to_win32_path for all
	command line arguments.
	* path.cc (cygwin_conv_to_win32_path): Move path/switch filter code
	from spawn_guts to here.  Pass back input if path not found.
	(class av::replace): New function.
	* uname.cc (uname): Change default system to MINGW32.
	* pinfo.cc (set_myself): Don't OuputDebugString unless strace.active.
	* include/cygwin/version.h: Increment to version 1.0.4.
	* include/sys/strace.h (_STRACE_ON): New macro.
	(_STRACE_OFF): Ditto.
	(MDEBUG): Ditto.



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** ChangeLog.MSYS	2001/11/30 16:41:08	1.2
--- ChangeLog.MSYS	2002/01/26 02:34:14	1.2.4.1
***************
*** 1,2 ****
--- 1,22 ----
+ 2001-01-25  Earnie Boyd  <ea...@us...>
+ 
+ 	* spawn.cc (spawn_guts): Move path/switch filter code to
+ 	cygwin_conv_to_win32_path.  Call cygwin_conv_to_win32_path for all
+ 	command line arguments.
+ 	* path.cc (cygwin_conv_to_win32_path): Move path/switch filter code
+ 	from spawn_guts to here.  Pass back input if path not found.
+ 	(class av::replace): New function.
+ 	* uname.cc (uname): Change default system to MINGW32.
+ 	* pinfo.cc (set_myself): Don't OuputDebugString unless strace.active.
+ 	* include/cygwin/version.h: Increment to version 1.0.4.
+ 	* include/sys/strace.h (_STRACE_ON): New macro.
+ 	(_STRACE_OFF): Ditto.
+ 	(MDEBUG): Ditto.
+ 
+ 2002-01-08  Earnie Boyd  <ea...@us...>
+ 
+ 	* spawn.cc (spawn_guts): Enhance path name translation filter.
+ 	* include/cygwin/version.h: Increment to version 1.0.3.
+ 
  2001-11-30  Earnie Boyd  <ea...@us...>
  

Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** path.cc	2001/11/30 16:41:09	1.4
--- path.cc	2002/01/26 02:34:14	1.4.4.1
***************
*** 180,183 ****
--- 180,184 ----
  
    syscall_printf ("src %s", src);
+   syscall_printf ("dst %s", dst);
    if (isdrive (src) || strpbrk (src, "\\:"))
      {
***************
*** 189,192 ****
--- 190,195 ----
        if (!cygheap->cwd.get (dst))
  	return get_errno ();
+       syscall_printf("src %s", src);
+       syscall_printf("dst %s", dst);
        dst = strchr (dst, '\0');
        if (*src == '.')
***************
*** 198,201 ****
--- 201,205 ----
        if (dst > dst_start && !isslash (dst[-1]))
  	*dst++ = '/';
+       syscall_printf("dst %s", dst);
      }
    /* Two leading /'s?  If so, preserve them.  */
***************
*** 3202,3214 ****
  cygwin_conv_to_win32_path (const char *path, char *win32_path)
  {
!   path_conv p (path, PC_SYM_FOLLOW);
!   if (p.error)
      {
!       set_errno (p.error);
!       return -1;
      }
  
!   strcpy (win32_path, p.get_win32 ());
!   return 0;
  }
  
--- 3206,3278 ----
  cygwin_conv_to_win32_path (const char *path, char *win32_path)
  {
!   bool found_path = true;
!   const char *spath = path;
!   debug_printf("path: %s", path);
! 
!   if (spath[0] == '/' && strlen(spath) == 2)
!       found_path = false;
!   else if (spath[0] == '-' &&
! 	   spath[1] &&
! 	   spath[1] != '-' &&
! 	   spath[2])
      {
!       spath += 2;
!       if (strchr(spath, '='))
! 	{
! 	  spath = strchr(spath, '=');
! 	  spath++;
! 	  if (*spath) 
! 	      found_path = true;
! 	}
!       else
! 	  found_path = true;
!     }
!   else if ((spath = strchr(spath, '=')))
!     {
!       spath++;
!       if (spath[0] )
! 	{
! 	  found_path = true;
! 	}
!       else
! 	{
! 	  spath = path;
! 	}
!     }
!   else
!     {
!       spath = path;
      }
  
!   if (found_path)
!     {
!       path_conv p (spath, PC_SYM_FOLLOW);
!       if (p.error)
! 	{
! 	  set_errno (p.error);
! 	  debug_printf("path_conv ERROR: %d", p.error);
! 	  return -1;
! 	}
!       strcpy(win32_path, p.get_win32());
!       if (win32_path[1] != ':' || win32_path[2] != '\\')
! 	{
! 	  strcpy(win32_path, path);
! 	  return 0;
! 	}
! 
!       *win32_path = '\0';
!       if (spath - path)
! 	{
! 	  strncpy (win32_path, path, spath - path);
! 	  *(win32_path + (spath - path)) = '\0';
! 	}
!       strcat (win32_path, p.get_win32 ());
!       return 0;
!     }
!   else
!     {
!       strcpy (win32_path, path);
!       return 0;
!     }
  }
  

Index: pinfo.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/pinfo.cc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** pinfo.cc	2001/10/15 22:22:33	1.2
--- pinfo.cc	2002/01/26 02:34:14	1.2.4.1
***************
*** 65,69 ****
    __small_sprintf (buf, "cYg%8x %x", _STRACE_INTERFACE_ACTIVATE_ADDR,
  		   &strace.active);
!   OutputDebugString (buf);
  
    (void) GetModuleFileName (NULL, myself->progname,
--- 65,70 ----
    __small_sprintf (buf, "cYg%8x %x", _STRACE_INTERFACE_ACTIVATE_ADDR,
  		   &strace.active);
!   if (strace.active)
!     OutputDebugString (buf);
  
    (void) GetModuleFileName (NULL, myself->progname,

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** spawn.cc	2001/11/30 16:41:15	1.3
--- spawn.cc	2002/01/26 02:34:14	1.3.4.1
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "winsup.h"
+ #include <stdio.h>
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 38,43 ****
  #include "environ.h"
  
- #define LINE_BUF_CHUNK (MAX_PATH * 2)
- 
  static suffix_info std_suffixes[] =
  {
--- 39,42 ----
***************
*** 176,188 ****
  class linebuf
  {
   public:
-   size_t ix;
    char *buf;
!   size_t alloced;
!   linebuf () : ix (0), buf (NULL), alloced (0) {}
    ~linebuf () {/* if (buf) free (buf);*/}
    void add (const char *what, int len);
    void add (const char *what) {add (what, strlen (what));}
    void prepend (const char *what, int len);
  };
  
--- 175,189 ----
  class linebuf
  {
+  private:
+   size_t bufidx;
+   size_t alloced;
   public:
    char *buf;
!   linebuf () : bufidx (0), alloced (0), buf (NULL) {}
    ~linebuf () {/* if (buf) free (buf);*/}
    void add (const char *what, int len);
    void add (const char *what) {add (what, strlen (what));}
    void prepend (const char *what, int len);
+   size_t idx() {return bufidx;}
  };
  
***************
*** 190,202 ****
  linebuf::add (const char *what, int len)
  {
!   size_t newix;
!   if ((newix = ix + len) >= alloced || !buf)
      {
!       alloced += LINE_BUF_CHUNK + newix;
        buf = (char *) realloc (buf, alloced + 1);
      }
!   memcpy (buf + ix, what, len);
!   ix = newix;
!   buf[ix] = '\0';
  }
  
--- 191,203 ----
  linebuf::add (const char *what, int len)
  {
!   size_t nbufidx;
!   if ((nbufidx = bufidx + len) >= alloced || !buf)
      {
!       alloced += (MAX_PATH * 2) + nbufidx;
        buf = (char *) realloc (buf, alloced + 1);
      }
!   memcpy (buf + bufidx, what, len);
!   bufidx = nbufidx;
!   buf[bufidx] = '\0';
  }
  
***************
*** 205,221 ****
  {
    int buflen;
!   size_t newix;
!   if ((newix = ix + len) >= alloced)
      {
!       alloced += LINE_BUF_CHUNK + newix;
        buf = (char *) realloc (buf, alloced + 1);
!       buf[ix] = '\0';
      }
    if ((buflen = strlen (buf)))
        memmove (buf + len, buf, buflen + 1);
    else
!       buf[newix] = '\0';
    memcpy (buf, what, len);
!   ix = newix;
  }
  
--- 206,222 ----
  {
    int buflen;
!   size_t nbufidx;
!   if ((nbufidx = bufidx + len) >= alloced)
      {
!       alloced += (MAX_PATH * 2) + nbufidx;
        buf = (char *) realloc (buf, alloced + 1);
!       buf[bufidx] = '\0';
      }
    if ((buflen = strlen (buf)))
        memmove (buf + len, buf, buflen + 1);
    else
!       buf[nbufidx] = '\0';
    memcpy (buf, what, len);
!   bufidx = nbufidx;
  }
  
***************
*** 249,256 ****
--- 250,265 ----
        }
    }
+   void replace (int i, const char *arg)
+     {
+       argv[i] = cstrdup1 (arg);
+     }
    void dup_maybe (int i)
    {
+     HMMM(i);
+     HMMM(calloced);
+     HMMM(argv[i]);
      if (i >= calloced)
        argv[i] = cstrdup1 (argv[i]);
+     HMMM(argv[i]);
    }
    void dup_all ()
***************
*** 314,318 ****
    path_conv real_path;
  
!   linebuf one_line;
  
    STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
--- 323,327 ----
    path_conv real_path;
  
!   class linebuf one_line;
  
    STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
***************
*** 355,359 ****
      /* nothing */;
  
!   av newargv (ac, argv);
  
    int null_app_name = 0;
--- 364,368 ----
      /* nothing */;
  
!   class av newargv (ac, argv);
  
    int null_app_name = 0;
***************
*** 374,377 ****
--- 383,387 ----
        strcpy (real_path, argv[0]);
        null_app_name = 1;
+       HMMM("skip_arg_parsing");
        goto skip_arg_parsing;
      }
***************
*** 388,391 ****
--- 398,402 ----
    /* If the file name ends in either .exe, .com, .bat, or .cmd we assume
       that it is NOT a script file */
+   HMMM(ext);
    while (*ext == '\0')
      {
***************
*** 468,509 ****
        find_exec (pgm, real_path, "PATH=", 0, &ext);
        newargv.unshift (real_path, 1);
      }
  
    if (real_path.iscygexec ())
      newargv.dup_all ();
    else
      {
-       // FIXME-1.0:
-       //	When iscygexec is fixed to truely identify an msys executable
-       //	the filter coding for an occurance of .*/bin.* needs to be 
-       //	removed.
        for (int i = 0; i < newargv.argc; i++)
  	{
  	  //convert argv to win32
  	  char tmpbuf[MAX_PATH];
! 	  // FIXME-0.1:
! 	  //	    Need to add a filter so that if newargv[0] contains
! 	  //	    .*/bin.* it doesn't convert to a win32 path.
! 	  //	    NOTE: This is a temporary work around until the FIXME-1.0
! 	  //		  can be developed.
! 	  //
! 	  // FIXME-0.2
! 	  //	    Need to filter win32 one character switches of the type /x
! 	  //	    where / switch indicator and x is the switch operator.  The
! 	  //	    condition for this is that the string length is exactly 2.
! 	  if (strchr(newargv[i], '/'))
! 	    {
! 	      if (strstr (newargv[i], "/bin") == 0 &&
! 		  strstr (newargv[i], "/sbin") == 0 &&
! 		  strlen (newargv[i]) != 2
! 		  )
! 		{
! 		  cygwin_conv_to_win32_path(newargv[i], tmpbuf);
! 		  debug_printf("%d of %d, %s, %s", i, ac, newargv[i], tmpbuf);
! 		  {
! 		    strcpy(newargv[i], tmpbuf);
! 		  }
! 		}
! 	    }
  	}
        for (int i = 0; i < newargv.argc; i++)
--- 479,499 ----
        find_exec (pgm, real_path, "PATH=", 0, &ext);
        newargv.unshift (real_path, 1);
+       HMMM(ext);
      }
  
+   FIXME(1.0);
+   // iscygexec needs adjusted so that it truely identifies an MSYS executable.
    if (real_path.iscygexec ())
      newargv.dup_all ();
    else
      {
        for (int i = 0; i < newargv.argc; i++)
  	{
  	  //convert argv to win32
  	  char tmpbuf[MAX_PATH];
! 
! 	  cygwin_conv_to_win32_path(newargv[i], tmpbuf);
! 	  debug_printf("%d of %d, %s, %s", i, ac, newargv[i], tmpbuf);
! 	  newargv.replace (i, tmpbuf);
  	}
        for (int i = 0; i < newargv.argc; i++)
***************
*** 514,517 ****
--- 504,508 ----
  	  newargv.dup_maybe (i);
  	  a = i ? newargv[i] : (char *) real_path;
+ 	  HMMM(a);
  	  int len = strlen (a);
  	  if (len != 0 && !strpbrk (a, " \t\n\r\""))
***************
*** 533,539 ****
  		  /* Find length of string of backslashes */
  		  int n = strspn (p, "\\");
  		  if (!n)
! 		    one_line.add ("\\\"", 2);	/* No backslashes, so it must be a ".
! 						   The " has to be protected with a backslash. */
  		  else
  		    {
--- 524,531 ----
  		  /* Find length of string of backslashes */
  		  int n = strspn (p, "\\");
+ 		   /* No backslashes, so it must be a ".
+ 		      The " has to be protected with a backslash. */
  		  if (!n)
! 		    one_line.add ("\\\"", 2);	
  		  else
  		    {
***************
*** 555,564 ****
  	}
  
        MALLOC_CHECK;
!       if (one_line.ix)
! 	one_line.buf[one_line.ix - 1] = '\0';
        else
  	one_line.add ("", 1);
        MALLOC_CHECK;
      }
  
--- 547,563 ----
  	}
  
+ #if 0
+       FIXME(1.1);
+       //    I renamed ix to bufidx and made it private.
+       //    This is the only public place it's used.
+       //    Null endings are handled by the linbuf class so I don't see this
+       //      need.  If argv is funky in children then this is the culprit.
        MALLOC_CHECK;
!       if (one_line.idx())
! 	one_line.buf[one_line.idx() - 1] = '\0';
        else
  	one_line.add ("", 1);
        MALLOC_CHECK;
+ #endif
      }
  

Index: uname.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/uname.cc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** uname.cc	2001/10/15 22:22:33	1.2
--- uname.cc	2002/01/26 02:34:14	1.2.4.1
***************
*** 28,32 ****
    memset (name, 0, sizeof (*name));
    if (! GetEnvironmentVariable("MSYSTEM", msystem, sizeof (msystem)))
!       strcpy (msystem, "MSYS");
    __small_sprintf (name->sysname, "%s_%s", msystem, osname);
  
--- 28,32 ----
    memset (name, 0, sizeof (*name));
    if (! GetEnvironmentVariable("MSYSTEM", msystem, sizeof (msystem)))
!       strcpy (msystem, "MINGW32");
    __small_sprintf (name->sysname, "%s_%s", msystem, osname);
  

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/sys
In directory usw-pr-cvs1:/tmp/cvs-serv3694/cygwin/include/sys

Modified Files:
      Tag: msys-1_0_4
	strace.h 
Log Message:

2001-01-25  Earnie Boyd  <ea...@us...>

	* spawn.cc (spawn_guts): Move path/switch filter code to
	cygwin_conv_to_win32_path.  Call cygwin_conv_to_win32_path for all
	command line arguments.
	* path.cc (cygwin_conv_to_win32_path): Move path/switch filter code
	from spawn_guts to here.  Pass back input if path not found.
	(class av::replace): New function.
	* uname.cc (uname): Change default system to MINGW32.
	* pinfo.cc (set_myself): Don't OuputDebugString unless strace.active.
	* include/cygwin/version.h: Increment to version 1.0.4.
	* include/sys/strace.h (_STRACE_ON): New macro.
	(_STRACE_OFF): Ditto.
	(MDEBUG): Ditto.



Index: strace.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/sys/strace.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.4.1
*** strace.h	2001/08/07 17:51:16	1.1.1.1
--- strace.h	2002/01/26 02:34:14	1.1.1.1.4.1
***************
*** 78,81 ****
--- 78,88 ----
  #define _STRACE_THREAD	 0x40000 // thread-locking calls
  #define _STRACE_NOTALL	 0x80000 // don't include if _STRACE_ALL
+ #if defined (DEBUGGING)
+ #define _STRACE_ON strace.active = 1;
+ #define _STRACE_OFF strace.active = 0;
+ #else
+ #define _STRACE_ON
+ #define _STRACE_OFF
+ #endif
  
  #ifdef __cplusplus
***************
*** 135,138 ****
--- 142,156 ----
  
  #define debug_printf(fmt, args...) strace_printf_wrap(DEBUG, fmt , ## args)
+ #if defined (DEBUGGING)
+ #define mdebug(mdebug_active, mdebug_function, mdebug_string) \
+   do { \
+       char mdebug_buf[2048]; \
+       sprintf (mdebug_buf, "%s [%d]: %s", mdebug_function, mdebug_active, mdebug_string); \
+       OutputDebugString (mdebug_buf); \
+      } \
+   while (0)
+ #else
+ #define mdebug(mdebug_active, mdebug_function, mdebug_string)
+ #endif
  #define paranoid_printf(fmt, args...) strace_printf_wrap(PARANOID, fmt , ## args)
  #define select_printf(fmt, args...) strace_printf_wrap(SELECT, fmt , ## args)

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv3694/cygwin/include/cygwin

Modified Files:
      Tag: msys-1_0_4
	version.h 
Log Message:

2001-01-25  Earnie Boyd  <ea...@us...>

	* spawn.cc (spawn_guts): Move path/switch filter code to
	cygwin_conv_to_win32_path.  Call cygwin_conv_to_win32_path for all
	command line arguments.
	* path.cc (cygwin_conv_to_win32_path): Move path/switch filter code
	from spawn_guts to here.  Pass back input if path not found.
	(class av::replace): New function.
	* uname.cc (uname): Change default system to MINGW32.
	* pinfo.cc (set_myself): Don't OuputDebugString unless strace.active.
	* include/cygwin/version.h: Increment to version 1.0.4.
	* include/sys/strace.h (_STRACE_ON): New macro.
	(_STRACE_OFF): Ditto.
	(MDEBUG): Ditto.



Index: version.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin/version.h,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** version.h	2001/11/30 16:41:25	1.4
--- version.h	2002/01/26 02:34:14	1.4.4.1
***************
*** 46,50 ****
  
  #define CYGWIN_VERSION_DLL_MAJOR 1000
! #define CYGWIN_VERSION_DLL_MINOR 2
  
        /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
--- 46,50 ----
  
  #define CYGWIN_VERSION_DLL_MAJOR 1000
! #define CYGWIN_VERSION_DLL_MINOR 4
  
        /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are

Update of /cvsroot/mingw/runtime/profile
In directory usw-pr-cvs1:/tmp/cvs-serv9626/profile

Modified Files:
	gcrt0.c gmon.c profil.c profil.h 
Log Message:
Merge Cygwin Changes

Index: gcrt0.c
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/gcrt0.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gcrt0.c	2001/06/04 23:26:03	1.1.1.1
--- gcrt0.c	2002/01/25 20:05:26	1.2
***************
*** 1,5 ****
  /* gcrt0.c
  
!    Copyright 1998 Cygnus Solutions.
  
  This file is part of Cygwin.
--- 1,5 ----
  /* gcrt0.c
  
!    Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
  
  This file is part of Cygwin.

Index: gmon.c
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/gmon.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gmon.c	2001/06/04 23:26:03	1.1.1.1
--- gmon.c	2002/01/25 20:05:27	1.2
***************
*** 56,59 ****
--- 56,63 ----
  //extern char *minbrk __asm ("minbrk");
  
+ #ifdef __MINGW32__
+ #define bzero(ptr,size) memset (ptr, 0, size);
+ #endif
+ 
  struct gmonparam _gmonparam = { GMON_PROF_OFF };
  
***************
*** 103,109 ****
  		return;
  	}
! #ifdef notdef
  	bzero(cp, p->kcountsize + p->fromssize + p->tossize);
! #endif
  	p->tos = (struct tostruct *)cp;
  	cp += p->tossize;
--- 107,114 ----
  		return;
  	}
! 
! 	/* zero out cp as value will be added there */
  	bzero(cp, p->kcountsize + p->fromssize + p->tossize);
! 
  	p->tos = (struct tostruct *)cp;
  	cp += p->tossize;

Index: profil.c
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/profil.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** profil.c	2001/06/04 23:26:03	1.1.1.1
--- profil.c	2002/01/25 20:05:27	1.2
***************
*** 1,5 ****
  /* profil.c -- win32 profil.c equivalent
  
!    Copyright 1998 Cygnus Solutions.
  
     This file is part of Cygwin.
--- 1,5 ----
  /* profil.c -- win32 profil.c equivalent
  
!    Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
  
     This file is part of Cygwin.

Index: profil.h
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/profil.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** profil.h	2001/06/04 23:26:03	1.1.1.1
--- profil.h	2002/01/25 20:05:27	1.2
***************
*** 1,5 ****
  /* profil.h: gprof profiling header file
  
!    Copyright 1998 Cygnus Solutions.
  
  This file is part of Cygwin.
--- 1,5 ----
  /* profil.h: gprof profiling header file
  
!    Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
  
  This file is part of Cygwin.
***************
*** 29,34 ****
  
  /* convert an index into an address */
! #define PROFADDR(idx, base, scale)	\
! 	((base) + ((((idx) << 16) / (scale)) << 1))
  
  /* convert a bin size into a scale */
--- 29,36 ----
  
  /* convert an index into an address */
! #define PROFADDR(idx, base, scale)		\
!   ((base)					\
!    + ((((unsigned long long)(idx) << 16)	\
!        / (unsigned long long)(scale)) << 1))
  
  /* convert a bin size into a scale */

Update of /cvsroot/mingw/runtime/include
In directory usw-pr-cvs1:/tmp/cvs-serv9626/include

Modified Files:
	tchar.h 
Log Message:
Merge Cygwin Changes

Index: tchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/tchar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tchar.h	2001/11/29 04:26:33	1.4
--- tchar.h	2002/01/25 20:05:26	1.5
***************
*** 56,59 ****
--- 56,60 ----
  #ifndef RC_INVOKED
  typedef	wchar_t	TCHAR;
+ typedef wchar_t _TCHAR;
  #endif	/* Not RC_INVOKED */
  #define _TCHAR_DEFINED
***************
*** 210,213 ****
--- 211,215 ----
  #ifndef RC_INVOKED
  typedef char	TCHAR;
+ typedef char	_TCHAR;
  #endif
  #define _TCHAR_DEFINED

Update of /cvsroot/mingw/runtime
In directory usw-pr-cvs1:/tmp/cvs-serv9626

Modified Files:
	ChangeLog 
Log Message:
Merge Cygwin Changes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/runtime/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog	2002/01/16 08:48:07	1.23
--- ChangeLog	2002/01/25 20:05:26	1.24
***************
*** 1,2 ****
--- 1,23 ----
+ 2002-01-25  Danny Smith  <dan...@us...>
+ 
+ 	* profile/profil.c: Update copyright info.
+ 	* profile/profil.h: Likewise.
+ 	* profile/gcrt0.c: Likewise.
+ 
+ 2002-01-25  Pascal Obry  <ob...@gn...>
+ 
+ 	* profile/profil.h (PROFADDR): Cast idx to unsigned long long to
+ 	avoid overflow.
+ 	* profile/gmon.c: Define bzero as memset if mingw32.
+ 	(monstartup): Use it.
+ 
+ 2002-01-25  Danny Smith  <dan...@us...> 
+ 
+ 	* include/tchar.h (_TCHAR): Add missing ;.
+ 
+ 2002-01-25  Danny Smith  <dan...@us...> 
+ 
+ 	* include/tchar.h (_TCHAR): Add typedefs.
+ 
  2002-01-16  Danny Smith  <dan...@us...>
  
***************
*** 8,12 ****
  	* msvcrt.def: Revert accidental change.
  	* include/stdlib.h: Ditto. 
- 
  
  2001-12-07  Earnie Boyd  <ea...@us...>
--- 29,32 ----

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv24906/include

Modified Files:
	wininet.h winnt.h winuser.h 
Log Message:
Merge Cygwin changes

Index: wininet.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wininet.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wininet.h	2001/09/04 22:58:56	1.2
--- wininet.h	2002/01/25 13:18:17	1.3
***************
*** 141,144 ****
--- 141,147 ----
  #define SECURITY_FLAG_PCT4 16
  #define SECURITY_FLAG_IETFSSL4 0x20
+ #define SECURITY_FLAG_IGNORE_REVOCATION 0x00000080
+ #define SECURITY_FLAG_IGNORE_UNKNOWN_CA 0x00000100
+ #define SECURITY_FLAG_IGNORE_WRONG_USAGE 0x00000200
  #define SECURITY_FLAG_40BIT 0x10000000
  #define SECURITY_FLAG_128BIT 0x20000000

Index: winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** winnt.h	2002/01/25 00:59:16	1.20
--- winnt.h	2002/01/25 13:18:18	1.21
***************
*** 76,81 ****
--- 76,83 ----
   */
  typedef WCHAR TCHAR;
+ typedef WCHAR _TCHAR;
  #else
  typedef CHAR TCHAR;
+ typedef CHAR _TCHAR;
  #endif
  #endif
***************
*** 630,646 ****
  #define MEM_RESET           0x80000
  #define MEM_TOP_DOWN       0x100000
  #define MEM_4MB_PAGES    0x80000000
  #define MEM_IMAGE 16777216
- <<<<<<< winnt.h
- #define MEM_MAPPED 262144
- #define MEM_PRIVATE 131072
- #define MEM_DECOMMIT 16384
- #define MEM_RELEASE 32768
- #define MEM_PHYSICAL	0x400000
- #define MEM_RESET	0x80000 /* NT */
- #define MEM_TOP_DOWN	0x100000 /* NT */
- #define MEM_WRITE_WATCH	0x200000 /* 98/Me */
- =======
- >>>>>>> 1.42
  #define SEC_FILE 0x800000
  #define SEC_IMAGE 0x1000000
--- 632,639 ----
  #define MEM_RESET           0x80000
  #define MEM_TOP_DOWN       0x100000
+ #define MEM_WRITE_WATCH	   0x200000 /* 98/Me */
+ #define MEM_PHYSICAL	   0x400000
  #define MEM_4MB_PAGES    0x80000000
  #define MEM_IMAGE 16777216
  #define SEC_FILE 0x800000
  #define SEC_IMAGE 0x1000000

Index: winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** winuser.h	2002/01/17 21:09:53	1.13
--- winuser.h	2002/01/25 13:18:18	1.14
***************
*** 12,15 ****
--- 12,16 ----
  #define ATF_TIMEOUTON	1
  #define ATF_ONOFFFEEDBACK	2
+ #define ATF_AVAILABLE	4 /* May be obsolete. Not in recent MS docs. */
  #define WH_MIN	(-1)
  #define WH_MSGFILTER	(-1)
***************
*** 1501,1504 ****
--- 1502,1506 ----
  #define MKF_MODIFIERS 64
  #define MKF_REPLACENUMBERS 128
+ #define SERKF_ACTIVE 8 /* May be obsolete. Not in recent MS docs. */
  #define SERKF_AVAILABLE 2
  #define SERKF_INDICATOR 4
***************
*** 1909,1913 ****
  	DWORD dwFlags;
  	DWORD iTimeOutMSec;
! } ACCESSTIMEOUT;
  typedef struct tagANIMATIONINFO {
  	UINT cbSize;
--- 1911,1915 ----
  	DWORD dwFlags;
  	DWORD iTimeOutMSec;
! } ACCESSTIMEOUT, *LPACCESSTIMEOUT;
  typedef struct tagANIMATIONINFO {
  	UINT cbSize;

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv24906

Modified Files:
	ChangeLog 
Log Message:
Merge Cygwin changes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** ChangeLog	2002/01/25 00:59:16	1.85
--- ChangeLog	2002/01/25 13:18:17	1.86
***************
*** 1,2 ****
--- 1,21 ----
+ 2002-01-25  Earnie Boyd  <ea...@us...>
+ 
+ 	* include/winnt.h: Remove merge conflict.
+ 
+ 2002-01-25  Danny Smith  <dan...@us...>
+ 
+ 	* include/winnt.h (_TCHAR): Add typedefs.
+ 
+ 2002-01-25  Tim Hughes  <tj...@de...>
+ 
+ 	* include/wininet.h (SECURITY_FLAG_IGNORE_*): Add missing
+ 	defines.
+ 
+ 2002-01-25  Andriy Palamarchuk  <ap...@ya...>
+ 
+ 	* include/winsuser.h (ATF_AVAILABLE, SERKF_ACTIVE):
+ 	Add defines.
+ 	(LPACCESSTIMEOUT): Add typedef.
+ 
  2002-01-24  Phillip Susi  <ps...@cf...> 
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv29011/include

Modified Files:
	commctrl.h ntsecapi.h objbase.h rapi.h rpc.h rpcdce.h 
	rpcdcep.h rpcndr.h rpcnsip.h rpcproxy.h windef.h wingdi.h 
	winnt.h winsvc.h 
Log Message:
Merge Cygwin differences

Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** commctrl.h	2001/12/11 20:38:04	1.6
--- commctrl.h	2002/01/25 00:59:16	1.7
***************
*** 195,198 ****
--- 195,199 ----
  #if (_WIN32_IE >= 0x0300)
  #define HDM_GETITEMRECT (HDM_FIRST+7)
+ #define HDM_GETORDERARRAY	(HDM_FIRST+17)
  #define HDM_SETORDERARRAY	(HDM_FIRST+18)
  #endif
***************
*** 222,225 ****
--- 223,230 ----
  #define HDN_TRACKA	(HDN_FIRST-8)
  #define HDN_TRACKW	(HDN_FIRST-28)
+ #if _WIN32_IE >= 0x0300
+ #define HDN_ENDDRAG	(HDN_FIRST-11)
+ #define HDN_BEGINDRAG	(HDN_FIRST-10)
+ #endif
  #define CMB_MASKED 2
  #define TBSTATE_CHECKED	1
***************
*** 591,594 ****
--- 596,601 ----
  #define LVS_EX_TRACKSELECT 8
  #define LVS_EX_TWOCLICKACTIVATE 128
+ #define LVSICF_NOINVALIDATEALL	0x00000001
+ #define LVSICF_NOSCROLL	0x00000002
  #if( _WIN32_IE >= 0x0400 )
  #define LVS_EX_FLATSB	0x00000100
***************
*** 1306,1310 ****
  } IMAGEINFO;
  DECLARE_HANDLE(HIMAGELIST);
! typedef struct _HD_ITEMA {
  	UINT mask;
  	int cxy;
--- 1313,1317 ----
  } IMAGEINFO;
  DECLARE_HANDLE(HIMAGELIST);
! typedef struct _HDITEMA {
  	UINT mask;
  	int cxy;
***************
*** 1322,1327 ****
  	LPVOID pvFilter;
  #endif
! } HD_ITEMA;
! typedef struct _HD_ITEMW {
  	UINT mask;
  	int cxy;
--- 1329,1334 ----
  	LPVOID pvFilter;
  #endif
! } HDITEMA, * LPHDITEMA;
! typedef struct _HDITEMW {
  	UINT mask;
  	int cxy;
***************
*** 1339,1347 ****
  	LPVOID pvFilter;
  #endif
! } HD_ITEMW;
  typedef struct _HD_LAYOUT {
  	RECT *prc;
  	WINDOWPOS *pwpos;
! } HD_LAYOUT;
  typedef struct _HD_HITTESTINFO {
  	POINT pt;
--- 1346,1359 ----
  	LPVOID pvFilter;
  #endif
! } HDITEMW, * LPHDITEMW;
! /* for backward compatability */
! #define HD_ITEMA HDITEMA
! #define HD_ITEMW HDITEMW
! #define HD_ITEM HDITEM
  typedef struct _HD_LAYOUT {
  	RECT *prc;
  	WINDOWPOS *pwpos;
! } HDLAYOUT, *LPHDLAYOUT;
! #define HD_LAYOUT HDLAYOUT /*  backward compatability */
  typedef struct _HD_HITTESTINFO {
  	POINT pt;
***************
*** 1595,1599 ****
  #define LV_COLUMNW LVCOLUMNW
  typedef int(CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM);
! typedef struct _NM_LISTVIEW {
  	NMHDR hdr;
  	int iItem;
--- 1607,1611 ----
  #define LV_COLUMNW LVCOLUMNW
  typedef int(CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM);
! typedef struct tagNMLISTVIEW {
  	NMHDR hdr;
  	int iItem;
***************
*** 1604,1608 ****
  	POINT ptAction;
  	LPARAM lParam;
! } NM_LISTVIEW,*LPNM_LISTVIEW;
  typedef struct tagNMLVDISPINFOA {
  	NMHDR hdr;
--- 1616,1624 ----
  	POINT ptAction;
  	LPARAM lParam;
! } NMLISTVIEW, *LPNMLISTVIEW;
! /* for backward compatability */
! #define _NM_LISTVIEW  tagNMLISTVIEW
! #define NM_LISTVIEW NMLISTVIEW
! #define LPNM_LISTVIEW LPNMLISTVIEW
  typedef struct tagNMLVDISPINFOA {
  	NMHDR hdr;
***************
*** 1930,1934 ****
  	DWORD dwRop;
  } IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
! #elif (_WIN32_IE >= 0x0400)
  typedef struct tagNMREBARCHILDSIZE {
  	NMHDR hdr;
--- 1946,1951 ----
  	DWORD dwRop;
  } IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
! #endif /* (_WIN32_IE >= 0x0300) */
! #if (_WIN32_IE >= 0x0400)
  typedef struct tagNMREBARCHILDSIZE {
  	NMHDR hdr;
***************
*** 2251,2255 ****
  #define WC_TABCONTROL WC_TABCONTROLW
  #define WC_TREEVIEW WC_TREEVIEWW
! typedef HD_ITEMW HD_ITEM;
  typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
  typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
--- 2268,2272 ----
  #define WC_TABCONTROL WC_TABCONTROLW
  #define WC_TREEVIEW WC_TREEVIEWW
! typedef HDITEMW HDITEM;
  typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
  typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
***************
*** 2392,2396 ****
  #define WC_TABCONTROL WC_TABCONTROLA
  #define WC_TREEVIEW WC_TREEVIEWA
! typedef HD_ITEMA HD_ITEM;
  typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
  typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
--- 2409,2413 ----
  #define WC_TABCONTROL WC_TABCONTROLA
  #define WC_TREEVIEW WC_TREEVIEWA
! typedef HDITEMA HDITEM;
  typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
  typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;

Index: ntsecapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ntsecapi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ntsecapi.h	2001/06/05 01:36:39	1.1.1.1
--- ntsecapi.h	2002/01/25 00:59:16	1.2
***************
*** 596,600 ****
  typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING,
                              ULONG,PUNICODE_STRING);
! typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)();
  typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
                              PUNICODE_STRING,BOOLEAN);
--- 596,600 ----
  typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING,
                              ULONG,PUNICODE_STRING);
! typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void);
  typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
                              PUNICODE_STRING,BOOLEAN);

Index: objbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objbase.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** objbase.h	2002/01/17 20:32:50	1.4
--- objbase.h	2002/01/25 00:59:16	1.5
***************
*** 164,169 ****
  WINOLEAPI CoCopyProxy(IUnknown*,IUnknown**);
  WINOLEAPI CoQueryClientBlanket(DWORD*,DWORD*,OLECHAR**, DWORD*,DWORD*,RPC_AUTHZ_HANDLE*,DWORD*);
! WINOLEAPI CoImpersonateClient();
! WINOLEAPI CoRevertToSelf();
  WINOLEAPI CoQueryAuthenticationServices(DWORD*, SOLE_AUTHENTICATION_SERVICE**);
  WINOLEAPI CoSwitchCallContext(IUnknown*,IUnknown**);
--- 164,169 ----
  WINOLEAPI CoCopyProxy(IUnknown*,IUnknown**);
  WINOLEAPI CoQueryClientBlanket(DWORD*,DWORD*,OLECHAR**, DWORD*,DWORD*,RPC_AUTHZ_HANDLE*,DWORD*);
! WINOLEAPI CoImpersonateClient(void);
! WINOLEAPI CoRevertToSelf(void);
  WINOLEAPI CoQueryAuthenticationServices(DWORD*, SOLE_AUTHENTICATION_SERVICE**);
  WINOLEAPI CoSwitchCallContext(IUnknown*,IUnknown**);

Index: rapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rapi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rapi.h	2001/06/05 01:36:41	1.1.1.1
--- rapi.h	2002/01/25 00:59:16	1.2
***************
*** 36,44 ****
  } RAPIINIT;
  
! STDAPI CeRapiInit ();
  STDAPI CeRapiInitEx (RAPIINIT*);
  STDAPI_(BOOL) CeCreateProcess (LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES,
  			       BOOL, DWORD, LPVOID, LPWSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
! STDAPI CeRapiUninit ();
  
  STDAPI_(BOOL) CeWriteFile (HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED);
--- 36,44 ----
  } RAPIINIT;
  
! STDAPI CeRapiInit (void);
  STDAPI CeRapiInitEx (RAPIINIT*);
  STDAPI_(BOOL) CeCreateProcess (LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES,
  			       BOOL, DWORD, LPVOID, LPWSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
! STDAPI CeRapiUninit (void);
  
  STDAPI_(BOOL) CeWriteFile (HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED);

Index: rpc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpc.h	2001/06/05 01:36:41	1.1.1.1
--- rpc.h	2002/01/25 00:59:16	1.2
***************
*** 47,51 ****
  
  RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE);
! RPC_STATUS RPC_ENTRY RpcRevertToSelf();
  long RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS);
  #ifdef __cplusplus
--- 47,51 ----
  
  RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE);
! RPC_STATUS RPC_ENTRY RpcRevertToSelf(void);
  long RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS);
  #ifdef __cplusplus

Index: rpcdce.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcdce.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcdce.h	2001/06/05 01:36:41	1.1.1.1
--- rpcdce.h	2002/01/25 00:59:16	1.2
***************
*** 361,365 ****
  RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE,RPC_BINDING_HANDLE*);
  DECLSPEC_NORETURN void  RPC_ENTRY RpcRaiseException(RPC_STATUS);
! RPC_STATUS RPC_ENTRY RpcTestCancel();
  RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
  RPC_STATUS RPC_ENTRY UuidCreate(UUID*);
--- 361,365 ----
  RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE,RPC_BINDING_HANDLE*);
  DECLSPEC_NORETURN void  RPC_ENTRY RpcRaiseException(RPC_STATUS);
! RPC_STATUS RPC_ENTRY RpcTestCancel(void);
  RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
  RPC_STATUS RPC_ENTRY UuidCreate(UUID*);

Index: rpcdcep.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcdcep.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rpcdcep.h	2001/11/05 00:27:06	1.2
--- rpcdcep.h	2002/01/25 00:59:16	1.3
***************
*** 110,115 ****
  long __stdcall I_RpcAsyncSendReceive(RPC_MESSAGE*,void*);
  long __stdcall I_RpcGetThreadWindowHandle(void**);
! long __stdcall I_RpcServerThreadPauseListening();
! long __stdcall I_RpcServerThreadContinueListening();
  long __stdcall I_RpcServerUnregisterEndpointA(unsigned char*,unsigned char*);
  long __stdcall I_RpcServerUnregisterEndpointW(unsigned short*,unsigned short*);
--- 110,115 ----
  long __stdcall I_RpcAsyncSendReceive(RPC_MESSAGE*,void*);
  long __stdcall I_RpcGetThreadWindowHandle(void**);
! long __stdcall I_RpcServerThreadPauseListening(void);
! long __stdcall I_RpcServerThreadContinueListening(void);
  long __stdcall I_RpcServerUnregisterEndpointA(unsigned char*,unsigned char*);
  long __stdcall I_RpcServerUnregisterEndpointW(unsigned short*,unsigned short*);

Index: rpcndr.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcndr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcndr.h	2001/06/05 01:36:41	1.1.1.1
--- rpcndr.h	2002/01/25 00:59:16	1.2
***************
*** 250,254 ****
  } MIDL_FORMAT_STRING;
  typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE);
! typedef long(__RPC_API *SERVER_ROUTINE)();
  typedef struct _MIDL_SERVER_INFO_ {
  	PMIDL_STUB_DESC pStubDesc;
--- 250,254 ----
  } MIDL_FORMAT_STRING;
  typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE);
! typedef long(__RPC_API *SERVER_ROUTINE)(void);
  typedef struct _MIDL_SERVER_INFO_ {
  	PMIDL_STUB_DESC pStubDesc;

Index: rpcnsip.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcnsip.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpcnsip.h	2001/06/05 01:36:41	1.1.1.1
--- rpcnsip.h	2002/01/25 00:59:16	1.2
***************
*** 13,19 ****
  void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS);
  RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE);
! RPC_STATUS RPC_ENTRY I_NsServerBindSearch();
! RPC_STATUS RPC_ENTRY I_NsClientBindSearch();
! void RPC_ENTRY I_NsClientBindDone();
  #ifdef __cplusplus
  }
--- 13,19 ----
  void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS);
  RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE);
! RPC_STATUS RPC_ENTRY I_NsServerBindSearch(void);
! RPC_STATUS RPC_ENTRY I_NsClientBindSearch(void);
! void RPC_ENTRY I_NsClientBindDone(void);
  #ifdef __cplusplus
  }

Index: rpcproxy.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpcproxy.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpcproxy.h	2001/11/05 00:50:48	1.3
--- rpcproxy.h	2002/01/25 00:59:16	1.4
***************
*** 33,41 ****
  return TRUE; \
  } \
! HRESULT STDAPICALLTYPE DllRegisterServer() \
  {\
  return NdrDllRegisterProxy(hProxyDll, pProxyFileList, pClsID); \
  }\
! HRESULT STDAPICALLTYPE DllUnregisterServer()\
  {\
  return NdrDllUnregisterProxy(hProxyDll, pProxyFileList, pClsID);\
--- 33,41 ----
  return TRUE; \
  } \
! HRESULT STDAPICALLTYPE DllRegisterServer(void) \
  {\
  return NdrDllRegisterProxy(hProxyDll, pProxyFileList, pClsID); \
  }\
! HRESULT STDAPICALLTYPE DllUnregisterServer(void)\
  {\
  return NdrDllUnregisterProxy(hProxyDll, pProxyFileList, pClsID);\
***************
*** 65,69 ****
  #define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) HRESULT STDAPICALLTYPE DllGetClassObject(REFCLSID rclsid,REFIID riid,void **ppv) \
  { return NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); }
! #define DLLCANUNLOADNOW(pFactory) HRESULT STDAPICALLTYPE DllCanUnloadNow() \
  { return NdrDllCanUnloadNow( pFactory ); }
  #define DLLDUMMYPURECALL void __cdecl _purecall(void) { }
--- 65,69 ----
  #define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) HRESULT STDAPICALLTYPE DllGetClassObject(REFCLSID rclsid,REFIID riid,void **ppv) \
  { return NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); }
! #define DLLCANUNLOADNOW(pFactory) HRESULT STDAPICALLTYPE DllCanUnloadNow(void) \
  { return NdrDllCanUnloadNow( pFactory ); }
  #define DLLDUMMYPURECALL void __cdecl _purecall(void) { }

Index: windef.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/windef.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** windef.h	2001/11/05 00:27:06	1.2
--- windef.h	2002/01/25 00:59:16	1.3
***************
*** 201,207 ****
  typedef HICON HCURSOR;
  typedef DWORD COLORREF;
! typedef int (WINAPI *FARPROC)();
! typedef int (WINAPI *NEARPROC)();
! typedef int (WINAPI *PROC)();
  typedef struct tagRECT {
  	LONG left;
--- 201,207 ----
  typedef HICON HCURSOR;
  typedef DWORD COLORREF;
! typedef int (WINAPI *FARPROC)(void);
! typedef int (WINAPI *NEARPROC)(void);
! typedef int (WINAPI *PROC)(void);
  typedef struct tagRECT {
  	LONG left;

Index: wingdi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wingdi.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wingdi.h	2002/01/17 21:09:53	1.5
--- wingdi.h	2002/01/25 00:59:16	1.6
***************
*** 2018,2021 ****
--- 2018,2023 ----
  	char Buffer[1];
  } RGNDATA,*LPRGNDATA;
+ /* for GetRandomRgn */
+ #define SYSRGN  4
  typedef struct tagGCP_RESULTSA {
  	DWORD lStructSize;
***************
*** 2548,2551 ****
--- 2550,2554 ----
  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);

Index: winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** winnt.h	2002/01/14 23:03:56	1.19
--- winnt.h	2002/01/25 00:59:16	1.20
***************
*** 221,224 ****
--- 221,225 ----
  #define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x2000
  #define FILE_ATTRIBUTE_ENCRYPTED	0x4000
+ #define INVALID_FILE_ATTRIBUTES	((DWORD)-1)
  #define FILE_NOTIFY_CHANGE_FILE_NAME	1
  #define FILE_NOTIFY_CHANGE_DIR_NAME	2
***************
*** 620,627 ****
  #define PAGE_NOACCESS 1
  #define PAGE_NOCACHE 512
! #define MEM_COMMIT 4096
! #define MEM_FREE 65536
! #define MEM_RESERVE 8192
  #define MEM_IMAGE 16777216
  #define MEM_MAPPED 262144
  #define MEM_PRIVATE 131072
--- 621,636 ----
  #define PAGE_NOACCESS 1
  #define PAGE_NOCACHE 512
! #define MEM_COMMIT           0x1000
! #define MEM_RESERVE          0x2000
! #define MEM_DECOMMIT         0x4000
! #define MEM_RELEASE          0x8000
! #define MEM_FREE            0x10000
! #define MEM_PRIVATE         0x20000
! #define MEM_MAPPED          0x40000
! #define MEM_RESET           0x80000
! #define MEM_TOP_DOWN       0x100000
! #define MEM_4MB_PAGES    0x80000000
  #define MEM_IMAGE 16777216
+ <<<<<<< winnt.h
  #define MEM_MAPPED 262144
  #define MEM_PRIVATE 131072
***************
*** 632,635 ****
--- 641,646 ----
  #define MEM_TOP_DOWN	0x100000 /* NT */
  #define MEM_WRITE_WATCH	0x200000 /* 98/Me */
+ =======
+ >>>>>>> 1.42
  #define SEC_FILE 0x800000
  #define SEC_IMAGE 0x1000000

Index: winsvc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winsvc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** winsvc.h	2001/06/05 01:36:45	1.1.1.1
--- winsvc.h	2002/01/25 00:59:16	1.2
***************
*** 28,31 ****
--- 28,36 ----
  #define SERVICE_ACCEPT_PAUSE_CONTINUE	2
  #define SERVICE_ACCEPT_SHUTDOWN 4
+ #define SERVICE_ACCEPT_PARAMCHANGE    8
+ #define SERVICE_ACCEPT_NETBINDCHANGE  16
+ #define SERVICE_ACCEPT_HARDWAREPROFILECHANGE   32
+ #define SERVICE_ACCEPT_POWEREVENT              64
+ #define SERVICE_ACCEPT_SESSIONCHANGE           128
  #define SERVICE_CONTROL_STOP	1
  #define SERVICE_CONTROL_PAUSE	2
***************
*** 33,36 ****
--- 38,50 ----
  #define SERVICE_CONTROL_INTERROGATE	4
  #define SERVICE_CONTROL_SHUTDOWN	5
+ #define SERVICE_CONTROL_PARAMCHANGE     6
+ #define SERVICE_CONTROL_NETBINDADD      7
+ #define SERVICE_CONTROL_NETBINDREMOVE   8
+ #define SERVICE_CONTROL_NETBINDENABLE   9
+ #define SERVICE_CONTROL_NETBINDDISABLE  10
+ #define SERVICE_CONTROL_DEVICEEVENT     11
+ #define SERVICE_CONTROL_HARDWAREPROFILECHANGE 12
+ #define SERVICE_CONTROL_POWEREVENT            13
+ #define SERVICE_CONTROL_SESSIONCHANGE         14
  #define SERVICE_ACTIVE 1
  #define SERVICE_INACTIVE 2
***************
*** 46,50 ****
  #define SERVICE_USER_DEFINED_CONTROL 256
  #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL)
! 
  
  typedef struct _SERVICE_STATUS {
--- 60,66 ----
  #define SERVICE_USER_DEFINED_CONTROL 256
  #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL)
! #define SERVICE_RUNS_IN_SYSTEM_PROCESS 1
! #define SERVICE_CONFIG_DESCRIPTION     1
! #define SERVICE_CONFIG_FAILURE_ACTIONS 2
  
  typedef struct _SERVICE_STATUS {
***************
*** 57,60 ****
--- 73,93 ----
  	DWORD dwWaitHint;
  } SERVICE_STATUS,*LPSERVICE_STATUS;
+ typedef struct _SERVICE_STATUS_PROCESS {
+ 	DWORD dwServiceType;
+ 	DWORD dwCurrentState;
+ 	DWORD dwControlsAccepted;
+ 	DWORD dwWin32ExitCode;
+ 	DWORD dwServiceSpecificExitCode;
+ 	DWORD dwCheckPoint;
+ 	DWORD dwWaitHint;
+ 	DWORD dwProcessId;
+ 	DWORD dwServiceFlags;
+ } SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS;
+ typedef enum _SC_STATUS_TYPE {
+ 	SC_STATUS_PROCESS_INFO = 0
+ } SC_STATUS_TYPE;
+ typedef enum _SC_ENUM_TYPE {
+         SC_ENUM_PROCESS_INFO = 0
+ } SC_ENUM_TYPE;
  typedef struct _ENUM_SERVICE_STATUSA {
  	LPSTR lpServiceName;
***************
*** 67,70 ****
--- 100,113 ----
  	SERVICE_STATUS ServiceStatus;
  } ENUM_SERVICE_STATUSW,*LPENUM_SERVICE_STATUSW;
+ typedef struct _ENUM_SERVICE_STATUS_PROCESSA {
+ 	LPSTR lpServiceName;
+ 	LPSTR lpDisplayName;
+ 	SERVICE_STATUS_PROCESS ServiceStatusProcess;
+ } ENUM_SERVICE_STATUS_PROCESSA,*LPENUM_SERVICE_STATUS_PROCESSA;
+ typedef struct _ENUM_SERVICE_STATUS_PROCESSW {
+ 	LPWSTR lpServiceName;
+ 	LPWSTR lpDisplayName;
+ 	SERVICE_STATUS_PROCESS ServiceStatusProcess;
+ } ENUM_SERVICE_STATUS_PROCESSW,*LPENUM_SERVICE_STATUS_PROCESSW;
  typedef struct _QUERY_SERVICE_CONFIGA {
  	DWORD dwServiceType;
***************
*** 114,120 ****
--- 157,196 ----
  typedef DWORD SERVICE_STATUS_HANDLE;
  typedef VOID(WINAPI *LPHANDLER_FUNCTION)(DWORD);
+ typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID);
+ typedef struct _SERVICE_DESCRIPTIONA {
+ 	LPSTR lpDescription;
+ } SERVICE_DESCRIPTIONA,*LPSERVICE_DESCRIPTIONA;
+ typedef struct _SERVICE_DESCRIPTIONW {
+ 	LPWSTR lpDescription;
+ } SERVICE_DESCRIPTIONW,*LPSERVICE_DESCRIPTIONW;
+ typedef enum _SC_ACTION_TYPE {
+         SC_ACTION_NONE          = 0,
+         SC_ACTION_RESTART       = 1,
+         SC_ACTION_REBOOT        = 2,
+         SC_ACTION_RUN_COMMAND   = 3
+ } SC_ACTION_TYPE;
+ typedef struct _SC_ACTION {
+ 	SC_ACTION_TYPE	Type;
+ 	DWORD		Delay;
+ } SC_ACTION,*LPSC_ACTION;
+ typedef struct _SERVICE_FAILURE_ACTIONSA {
+ 	DWORD	dwResetPeriod;
+ 	LPSTR	lpRebootMsg;
+ 	LPSTR	lpCommand;
+ 	DWORD	cActions;
+ 	SC_ACTION * lpsaActions;
+ } SERVICE_FAILURE_ACTIONSA,*LPSERVICE_FAILURE_ACTIONSA;
+ typedef struct _SERVICE_FAILURE_ACTIONSW {
+ 	DWORD	dwResetPeriod;
+ 	LPWSTR	lpRebootMsg;
+ 	LPWSTR	lpCommand;
+ 	DWORD	cActions;
+ 	SC_ACTION * lpsaActions;
+ } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW;
  
  BOOL WINAPI ChangeServiceConfigA(SC_HANDLE,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,LPDWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR);
  BOOL WINAPI ChangeServiceConfigW(SC_HANDLE,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,LPDWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
+ BOOL WINAPI ChangeServiceConfig2A(SC_HANDLE,DWORD,LPVOID);
+ BOOL WINAPI ChangeServiceConfig2W(SC_HANDLE,DWORD,LPVOID);
  BOOL WINAPI CloseServiceHandle(SC_HANDLE);
  BOOL WINAPI ControlService(SC_HANDLE,DWORD,LPSERVICE_STATUS);
***************
*** 126,129 ****
--- 202,207 ----
  BOOL WINAPI EnumServicesStatusA(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD,PDWORD);
  BOOL WINAPI EnumServicesStatusW(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD,PDWORD);
+ BOOL WINAPI EnumServicesStatusExA(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCSTR);
+ BOOL WINAPI EnumServicesStatusExW(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCWSTR);
  BOOL WINAPI GetServiceDisplayNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD);
  BOOL WINAPI GetServiceDisplayNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD);
***************
*** 138,147 ****
--- 216,230 ----
  BOOL WINAPI QueryServiceConfigA(SC_HANDLE,LPQUERY_SERVICE_CONFIGA,DWORD,PDWORD);
  BOOL WINAPI QueryServiceConfigW(SC_HANDLE,LPQUERY_SERVICE_CONFIGW,DWORD,PDWORD);
+ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD);
+ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD);
  BOOL WINAPI QueryServiceLockStatusA(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSA,DWORD,PDWORD);
  BOOL WINAPI QueryServiceLockStatusW(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSW,DWORD,PDWORD);
  BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
  BOOL WINAPI QueryServiceStatus(SC_HANDLE,LPSERVICE_STATUS);
+ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE,SC_STATUS_TYPE,LPBYTE,DWORD,LPDWORD);
  SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(LPCSTR,LPHANDLER_FUNCTION);
  SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR,LPHANDLER_FUNCTION);
+ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID);
+ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(LPCWSTR,LPHANDLER_FUNCTION_EX,LPVOID);
  BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
  BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS);
***************
*** 154,168 ****
--- 237,259 ----
  #ifdef UNICODE
  typedef ENUM_SERVICE_STATUSW ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS;
+ typedef ENUM_SERVICE_STATUS_PROCESSW ENUM_SERVICE_STATUS_PROCESS;
+ typedef LPENUM_SERVICE_STATUS_PROCESSW LPENUM_SERVICE_STATUS_PROCESS;
  typedef QUERY_SERVICE_CONFIGW QUERY_SERVICE_CONFIG,*LPQUERY_SERVICE_CONFIG;
  typedef QUERY_SERVICE_LOCK_STATUSW QUERY_SERVICE_LOCK_STATUS,*LPQUERY_SERVICE_LOCK_STATUS;
  typedef SERVICE_TABLE_ENTRYW SERVICE_TABLE_ENTRY,*LPSERVICE_TABLE_ENTRY;
  typedef LPSERVICE_MAIN_FUNCTIONW LPSERVICE_MAIN_FUNCTION;
+ typedef SERVICE_DESCRIPTIONW SERVICE_DESCRIPTION;
+ typedef LPSERVICE_DESCRIPTIONW LPSERVICE_DESCRIPTION;
+ typedef SERVICE_FAILURE_ACTIONSW SERVICE_FAILURE_ACTIONS;
+ typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS;
  #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW
  #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW
  #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW
  #define ChangeServiceConfig ChangeServiceConfigW
+ #define ChangeServiceConfig2 ChangeServiceConfig2W
  #define CreateService CreateServiceW
  #define EnumDependentServices EnumDependentServicesW
  #define EnumServicesStatus EnumServicesStatusW
+ #define EnumServicesStatusEx  EnumServicesStatusExW
  #define GetServiceDisplayName GetServiceDisplayNameW
  #define GetServiceKeyName GetServiceKeyNameW
***************
*** 170,190 ****
--- 261,291 ----
  #define OpenService OpenServiceW
  #define QueryServiceConfig QueryServiceConfigW
+ #define QueryServiceConfig2 QueryServiceConfig2W
  #define QueryServiceLockStatus QueryServiceLockStatusW
  #define RegisterServiceCtrlHandler RegisterServiceCtrlHandlerW
+ #define RegisterServiceCtrlHandlerEx RegisterServiceCtrlHandlerExW
  #define StartService StartServiceW
  #define StartServiceCtrlDispatcher StartServiceCtrlDispatcherW
  #else
  typedef ENUM_SERVICE_STATUSA ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS;
+ typedef ENUM_SERVICE_STATUS_PROCESSA ENUM_SERVICE_STATUS_PROCESS;
+ typedef LPENUM_SERVICE_STATUS_PROCESSA LPENUM_SERVICE_STATUS_PROCESS;
  typedef QUERY_SERVICE_CONFIGA QUERY_SERVICE_CONFIG,*LPQUERY_SERVICE_CONFIG;
  typedef QUERY_SERVICE_LOCK_STATUSA QUERY_SERVICE_LOCK_STATUS,*LPQUERY_SERVICE_LOCK_STATUS;
  typedef SERVICE_TABLE_ENTRYA SERVICE_TABLE_ENTRY,*LPSERVICE_TABLE_ENTRY;
  typedef LPSERVICE_MAIN_FUNCTIONA LPSERVICE_MAIN_FUNCTION;
+ typedef SERVICE_DESCRIPTIONA SERVICE_DESCRIPTION;
+ typedef LPSERVICE_DESCRIPTIONA LPSERVICE_DESCRIPTION;
+ typedef SERVICE_FAILURE_ACTIONSA SERVICE_FAILURE_ACTIONS;
+ typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS;
  #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA
  #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA
  #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA
  #define ChangeServiceConfig ChangeServiceConfigA
+ #define ChangeServiceConfig2 ChangeServiceConfig2A
  #define CreateService CreateServiceA
  #define EnumDependentServices EnumDependentServicesA
  #define EnumServicesStatus EnumServicesStatusA
+ #define EnumServicesStatusEx  EnumServicesStatusExA
  #define GetServiceDisplayName GetServiceDisplayNameA
  #define GetServiceKeyName GetServiceKeyNameA
***************
*** 192,197 ****
--- 293,300 ----
  #define OpenService OpenServiceA
  #define QueryServiceConfig QueryServiceConfigA
+ #define QueryServiceConfig2 QueryServiceConfig2A
  #define QueryServiceLockStatus QueryServiceLockStatusA
  #define RegisterServiceCtrlHandler RegisterServiceCtrlHandlerA
+ #define RegisterServiceCtrlHandlerEx RegisterServiceCtrlHandlerExA
  #define StartService StartServiceA
  #define StartServiceCtrlDispatcher StartServiceCtrlDispatcherA

Update of /cvsroot/mingw/w32api/lib
In directory usw-pr-cvs1:/tmp/cvs-serv29011/lib

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

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in	2001/12/03 20:08:37	1.9
--- Makefile.in	2002/01/25 00:59:17	1.10
***************
*** 20,24 ****
  target_alias = @target_alias@
  prefix = @prefix@
- config_prefix = @prefix@
  includedir:=@includedir@
  
--- 20,23 ----
***************
*** 38,57 ****
  datadir = @datadir@
  infodir = @infodir@
- #FIXME.  The inst_includedir and inst_libdir need to be modified to use
- #$(tooldir)/usr/include/w32api and $(tooldir)/usr/lib/w32api for the dist 
- #targets.
  ifneq (,$(findstring cygwin,$(target_alias)))
- ifeq ($(build_alias),$(host_alias))
- ifeq ($(prefix),$(config_prefix))
- inst_includedir:=$(tooldir)/include/w32api
- inst_libdir:=$(tooldir)/lib/w32api
- else
  inst_includedir:=$(tooldir)/include/w32api
  inst_libdir:=$(tooldir)/lib/w32api
- endif
- else
- inst_includedir:=$(includedir)
- inst_libdir:=$(libdir)
- endif
  else
  inst_includedir:=$(includedir)
--- 37,43 ----

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv29011

Modified Files:
	ChangeLog 
Log Message:
Merge Cygwin differences

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** ChangeLog	2002/01/17 21:09:53	1.84
--- ChangeLog	2002/01/25 00:59:16	1.85
***************
*** 1,2 ****
--- 1,24 ----
+ 2002-01-24  Phillip Susi  <ps...@cf...> 
+ 
+ 	* include/commctrl.h: Add missing HDM_*,HDN_*,LVSICF_* defines.
+ 
+ 2002-01-24  Danny Smith  <dan...@us...>
+ 
+ 	* include/commctrl.h (HDITEM[AW]): Rename _HD_ITEM[AW] to
+ 	_HDITEM[AW], with parallel changes to typedefs.	Use defines for
+ 	backward compatability with old names. Update UNICODE mappings.
+ 	(HDLAYOUT): Remove struct _HD_LAYOUT_XP.  Use new typedefs
+ 	for struct _HD_LAYOUT and add defines for backward
+ 	compatability with old names.
+ 	(NMLISTVIEW): Rename _NM_LISTVIEW to tagNMLISTVIEW, with
+ 	parallel chages to typedefs. Add defines for backward
+ 	compatability with old names.
+ 	(TCHITTESTINFO, IMAGELISTDRAWPARAMS): Fix _WIN32_IE guard.
+ 
+ 2002-01-21  Robert Collins  <rbt...@ho...>
+ 
+ 	* include/winnt.h: Add missing MEM_ defines, and convert existing to 
+ 	hex for readability.
+ 
  2002-01-17  Marcus Geelnard  <mar...@ho...>
  
***************
*** 23,26 ****
--- 45,52 ----
  
  
+ 2002-01-14  Corinna Vinschen  <vin...@re...>
+ 
+ 	* include/winnt.h: Add INVALID_FILE_ATTRIBUTES.
+ 
  2002-01-11  Danny Smith  <dan...@us...>
  
***************
*** 33,36 ****
--- 59,76 ----
  	* lib/user32.def (EnumDisplayMonitors): Add stub.
  	
+ 2002-01-11 Ralf Habacker  <Ral...@fr...>
+ 
+ 	* include/ntsecapi.h:  Fixed missing void parameter type in some 
+ 	prototypes.
+ 	* include/objbase.h: Ditto.
+ 	* include/rapi.h: Ditto.
+ 	* include/rpc.h: Ditto.
+ 	* include/rpcdce.h: Ditto.
+ 	* include/rpcdcep.h: Ditto.
+ 	* include/rpcndr.h: Ditto.
+ 	* include/rpcnsip.h: Ditto.
+ 	* include/rpcproxy.h: Ditto.
+ 	* include/windef.h: Ditto.
+ 									
  2002-01-07  Danny Smith  <dan...@us...>
  
***************
*** 55,58 ****
--- 95,123 ----
  	(SetCriticalSectionSpinCount): Likewise.
  
+ 2001-12-30  Guido Serassio <ser...@li...>
+ 
+ 	* include/winsvc.h: Add EnumServiceStatusEx(),
+ 	QueryServiceStatusEx()
+ 	& RegisterServiceCtrlHandlerEx()
+   
+ 2001-12-21  Robert Collins  <rbt...@ho...>
+ 
+ 	* include/wingdi.h: Add GetRandomRgn and SYSRGN.
+ 
+ 2001-12-20  Christopher Faylor  <cg...@re...>
+ 
+ 	* lib/Makefile.in: Revert inst_installdir definitions to working
+ 	versions.
+ 
+ 2001-12-17  Guido Serassio <ser...@li...>
+ 
+ 	* include/winsvc.h: Add ChangeServiceConfig2() &
+ 	QueryServiceConfig2() definition
+     
+ 2001-12-17  Robert Collins  <rbt...@ho...>
+ 
+ 	* include/commctrl.h: New typedefs for HDLAYOUT and LPHDLAYOUT based
+ 	on MSDN documentation for XP.
+ 	
  2001-12-15  Andrew Begel  <ab...@ee...>
  
***************
*** 85,88 ****
--- 150,166 ----
  	* include/winbase.h (VirtualAllocEx): Add prototype.
  	* include/winuser.h (SS_*): Add new defines.
+ 
+ 2001-12-07  Earnie Boyd  <ea...@us...>
+ 
+ 	* Makefile.in: Increment VERSION.
+ 	* include/w32api.h: Ditto.
+ 
+ 2001-12-07  Danny Smith  <dan...@us...>
+ 
+ 	* include/setupi.h (SetupDiCreateDeviceInterfaceRegKey[AW],
+ 	SetupDiCreateDevRegKey[AW],SetupDiDeleteDeviceInterfaceRegKey,
+ 	SetupDiDeleteDevRegKey,SetupDiOpenClassRegKey,
+ 	SetupDiOpenClassRegKeyEx[AW],SetupDiOpenDeviceInterfaceRegKey,
+ 	SetupDiOpenDevRegKey): Correct function names.
  
  2001-12-07  Earnie Boyd  <ea...@us...>

Update of /cvsroot/mingw/htdocs/ssi
In directory usw-pr-cvs1:/tmp/cvs-serv16008/ssi

Modified Files:
	lsidebar.html 
Log Message:
Updating the FAQ, MSYS page, and left navigation bar to reflect current information
on MSYS.


Index: lsidebar.html
===================================================================
RCS file: /cvsroot/mingw/htdocs/ssi/lsidebar.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lsidebar.html	2001/12/22 03:34:20	1.8
--- lsidebar.html	2002/01/20 03:01:20	1.9
***************
*** 11,14 ****
--- 11,15 ----
     <tr><td><tt>&nbsp;</tt></td>
     <td><small><a href="mingwfaq.shtml">Frequently Asked Questions (FAQ)</a></small></td></tr>
+    <tr><td colspan="2"><a href="msys.shtml">MSYS</a></td></tr>
     <tr><td colspan="2"><a href="mirrors.shtml">Mirror Sites</a></td></tr>
     <tr><td colspan="2"><a href="links.shtml">Related Sites</a></td></tr>

Update of /cvsroot/mingw/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv16008

Modified Files:
	mingwfaq.shtml msys.shtml 
Log Message:
Updating the FAQ, MSYS page, and left navigation bar to reflect current information
on MSYS.


Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mingwfaq.shtml	2001/12/22 04:36:02	1.27
--- mingwfaq.shtml	2002/01/20 03:01:20	1.28
***************
*** 62,67 ****
        <li><a href="#faq-usingolderversions">Can I use older versions?</a></li>
        <li><a href="#faq-configure">How do I execute configure scripts?</a></li>
-       <li><a href="#faq-usingwithcygwin">How do I use MinGW with Cygwin?</a></li>
        <li><a href="#faq-usingwithmsys">How do I use MinGW with MSYS?</a></li>
        <li><a href="#faq-runtime">Which runtime should I use?</a></li>
        <li><a href="#faq-w32api">What is w32api?</a></li>
--- 62,67 ----
        <li><a href="#faq-usingolderversions">Can I use older versions?</a></li>
        <li><a href="#faq-configure">How do I execute configure scripts?</a></li>
        <li><a href="#faq-usingwithmsys">How do I use MinGW with MSYS?</a></li>
+       <li><a href="#faq-usingwithcygwin">How do I use MinGW with Cygwin?</a></li>
        <li><a href="#faq-runtime">Which runtime should I use?</a></li>
        <li><a href="#faq-w32api">What is w32api?</a></li>
***************
*** 69,79 ****
        <li><a href="#faq-cross">How can I build a cross compiler?</a></li>
        <li><a href="#faq-bugreports">How can I report bugs?</a></li>
-    <!-- 
-    The following section commented out 8/20/2001 by Steve D. Perkins
-    If the FAQ becomes too large and unwieldy, why don't we just break it into 
-    chunks based on logical subsections... rather than creating a confusing setup 
-    of "new faq" and "old faq", with neither being maintained?
-      <li><a name="i-oldfaq"	href="#faq-oldfaq">	What happened to the old FAQ?</a></li>
-    -->
     </ul>
  
--- 69,72 ----
***************
*** 284,289 ****
  
  
- 
- 
        <a name="faq-configure" />
        <h3>How do I execute configure scripts?</h3>
--- 277,280 ----
***************
*** 300,304 ****
  
        <hr />
!       
  
  
--- 291,317 ----
  
        <hr />
! 
! 
!       <a name="faq-usingwithmsys" />
!       <h3>How do I use MinGW with MSYS?</h3>
!       <p>
!          It's easy to configure an MSYS environment for MinGW useage, since there is no
!          overlap in functionality to contend with (as there is with Cygwin).  Simply 
!          decompress the contents of each archive into directories of your choosing, and 
!          add both the MinGW &quot;/bin&quot; and the MSYS &quot;/bin&quot; subdirectories
!          to your PATH.
!       </p>
!       <p>
!          You may install the MinGW and MSYS packages anywhere on your filesystem, even nesting 
!          one within the other (creating a &quot;mingw&quot; subdirectory beneath your 
!          &quot;msys&quot; directory, for instance).  However, it is important to remember 
!          that NO executables other than what ships with MSYS should be placed in the MSYS 
!          &quot;bin&quot; subdirectory.  Therefore, do not attempt to &quot;merge&quot; the 
!          two packages.
!       </p>
!       <p>
!       <p><a href="#index">Back to index</a></p>
! 
!       <hr />      
  
  
***************
*** 314,318 ****
           bash shell environment with all the familiar tools a UNIX developer would 
           work with.  Cygwin allows developers to work on a Win32 machine, and feel 
!          as if they're developing on a UNIX box.
        </p>
        <p>
--- 327,333 ----
           bash shell environment with all the familiar tools a UNIX developer would 
           work with.  Cygwin allows developers to work on a Win32 machine, and feel 
!          as if they're developing on a UNIX box.  Work on a Cygwin-based X-Windows 
!          server has advanced to the point where it's even possible to run a Gnome 
!          or KDE session within MS-Windows using Cygwin.
        </p>
        <p>
***************
*** 336,340 ****
           maintainence of the option has NOT be a priority in development.  There is a
           distinct possibility that "-mno-cygwin" will become depreciated in future 
!          releases of Cygwin.
        </p>
        <p>
--- 351,357 ----
           maintainence of the option has NOT be a priority in development.  There is a
           distinct possibility that "-mno-cygwin" will become depreciated in future 
!          releases of Cygwin.  If you would like to experiment with &quot;-mno-cygwin"&quot;,
!          the most intuitive documentation can be found 
!          <a href="http://www.colomsat.net.co/freehost/ngiraldo/cppcygwin.html">here</a>.
        </p>
        <p>
***************
*** 342,349 ****
           generate non-Cygwin-dependant executables, a much easier option to 
           "-mno-cygwin" exists.  Simply install Cygwin and the MinGW distribution 
!          in seperate directories (i.e. "C:\CYGWIN" and "C:\MINGW"), and make sure 
!          that the "/bin" subdirectory beneath your MinGW installation comes before 
!          Cygwin's "/bin" subdirectory in your PATH environment variable
!          (i.e. "PATH=%PATH%;C:\MINGW\BIN;C:\CYGWIN\BIN").  This will allow you access 
           to all the UNIX tools you want, while ensuring that the instance of GCC used 
           is the MinGW version.
--- 359,366 ----
           generate non-Cygwin-dependant executables, a much easier option to 
           "-mno-cygwin" exists.  Simply install Cygwin and the MinGW distribution 
!          in seperate directories (i.e. &quot;C:\CYGWIN&quot; and &quot;C:\MINGW&quot;), and make sure 
!          that the &quot;/bin&quot; subdirectory beneath your MinGW installation comes before 
!          Cygwin's &quot;/bin&quot; subdirectory in your PATH environment variable
!          (i.e. &quot;PATH=%PATH%;C:\MINGW\BIN;C:\CYGWIN\BIN&quot;).  This will allow you access 
           to all the UNIX tools you want, while ensuring that the instance of GCC used 
           is the MinGW version.
***************
*** 360,380 ****
        <hr />
  
- 
-       <a name="faq-usingwithmsys" />
-       <h3>How do I use MinGW with MSYS?</h3>
-       <p>
-          It's easy to configure an MSYS environment for MinGW useage in the same manner 
-          as it is for Cygwin.  If the system's PATH environment variable is set with the 
-          MinGW "/bin" subdirectory before the MSYS "/bin", you will have access to all 
-          MSYS tools while using the MinGW instance of gcc/g++.
-       </p>
-       <p>
-          Just as with Cygwin, the "/etc/profile" of MSYS places additional directories 
-          before your system-level path in its PATH.  You must be sure that the MinGW "/bin" 
-          comes first in your MSYS environment as well, either by modifying "/etc/profile" or 
-          setting it manually.
-       <p><a href="#index">Back to index</a></p>
- 
-       <hr />
  
  
--- 377,380 ----

Index: msys.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/msys.shtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** msys.shtml	2001/12/22 04:28:21	1.3
--- msys.shtml	2002/01/20 03:01:20	1.4
***************
*** 26,58 ****
  
  <table border="0" cellspacing="6" cellpadding="0">
! <tr>
! <td valign="top" align="left">
! 
! <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.  We finally have
! that available and is downloadable from the SourceForge file distribution system
! which MinGW is using.
! </p><p>
! The current version is msys-1.0.2 and you need to download either the
! <a href="ftp://ftp1.sf.net/pub/sourceforge/msys-1.0.2-1.i686-bin.tar.gz">i686</a>
! binary distribution or the
! <a href="ftp://ftp1.sf.net/pub/sourceforge/msys-1.0.2-1.i386-bin.tar.gz">i386</a> 
! binary distribution.  The source distribution is delivered in
! <a href="ftp://ftp1.sf.net/pub/sourceforge/msys-1.0.2-1.src.tar.gz">this package</a> 
! and includes the source for both the runtime and all the packages from which
! the hand selected binaries were taken.
! </p><p>
! To install chose a drive device and unpack the binary distribution in the root
! of that drive.  The read the documentation in \msys\1.0\usr\doc\msys, especially
! the README file.
! </p><p>
! There is also a new mail list to discuss the use of MSYS called 
! min...@li....  See the <a href="lists.shtml">Mailing Lists</a> page 
! for a more
! information on this list.
! </p>
! </td>
! </tr>
  </table>
  
--- 26,59 ----
  
  <table border="0" cellspacing="6" cellpadding="0">
!    <tr>
!       <td valign="top" align="left">
!          <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 on SourceForge</a>.
!          </p>
!          <p>
!             There are three tarballs available for download, although most users will need only one.
!             The tarball flagged as &quot;src&quot; contains the source code for MSYS, unnecessary unless a 
!             manual build is desired.  The &quot;i686&quot; tarball is a binary distribution, compiled 
!             with optimizations for recent generations of the Pentium family (and compatibles).  The 
!             &quot;i386&quot; tarball is a binary distribution that will run on ANY 32-bit 
!             Intel-compatible processor.
!          </p>
!          <p>
!             To install the MSYS binaries, choose a location in your filesystem and unpack the 
!             binary distribution there.  It is recommended that you add the &quot;bin&quot; subdirectory
!             of the MSYS distribution to your system PATH.  More information about using MinGW with 
!             MSYS can be found in the <a href="http://localhost/mingw/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 new 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>
!       </td>
!    </tr>
  </table>
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv25332/w32api/include

Modified Files:
	wingdi.h winuser.h 
Log Message:
	* include/winsuser.h (tagKBDLLHOOKSTRUCT): Define struct
	and typedefs.
	(SPI_SETSCREENSAVERRUNNING): Add define.
	(LLKHF_ALTDOWN): Add define.
	* include/wingdi.h (PFD_GENERIC_ACCELERATED,
	PFD_DEPTH_DONTCARE): Add defines.



Index: wingdi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wingdi.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wingdi.h	2002/01/04 03:08:49	1.4
--- wingdi.h	2002/01/17 21:09:53	1.5
***************
*** 242,245 ****
--- 242,247 ----
  #define PFD_SWAP_EXCHANGE	0x00000200
  #define PFD_SWAP_COPY	0x00000400
+ #define PFD_GENERIC_ACCELERATED	0x00001000
+ #define PFD_DEPTH_DONTCARE	0x20000000
  #define PFD_DOUBLEBUFFER_DONTCARE	0x40000000
  #define PFD_STEREO_DONTCARE	0x80000000

Index: winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** winuser.h	2002/01/15 08:52:36	1.12
--- winuser.h	2002/01/17 21:09:53	1.13
***************
*** 1078,1081 ****
--- 1078,1082 ----
  #define SPI_SETSCREENREADER 71
  #define SPI_SETSCREENSAVEACTIVE 17
+ #define SPI_SETSCREENSAVERRUNNING 97
  #define SPI_SETSCREENSAVETIMEOUT 15
  #define SPI_SETSERIALKEYS 63
***************
*** 1872,1875 ****
--- 1873,1878 ----
  #define MOD_RIGHT 16384
  #define MOD_LEFT 32768
+ #define LLKHF_ALTDOWN  0x00000020
+ 
  #ifndef RC_INVOKED
  typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
***************
*** 2552,2555 ****
--- 2555,2566 ----
  	DWORD dwFlags;
  } MONITORINFO,*LPMONITORINFO;
+ typedef struct tagKBDLLHOOKSTRUCT {
+ 	DWORD vkCode;
+ 	DWORD scanCode;
+ 	DWORD flags;
+ 	DWORD time;
+ 	DWORD dwExtraInfo;
+ } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
+ 
  
  #define AnsiToOem CharToOemA

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv25332/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/winsuser.h (tagKBDLLHOOKSTRUCT): Define struct
	and typedefs.
	(SPI_SETSCREENSAVERRUNNING): Add define.
	(LLKHF_ALTDOWN): Add define.
	* include/wingdi.h (PFD_GENERIC_ACCELERATED,
	PFD_DEPTH_DONTCARE): Add defines.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ChangeLog	2002/01/17 20:32:50	1.83
--- ChangeLog	2002/01/17 21:09:53	1.84
***************
*** 1,2 ****
--- 1,11 ----
+ 2002-01-17  Marcus Geelnard  <mar...@ho...>
+ 
+ 	* include/winsuser.h (tagKBDLLHOOKSTRUCT): Define struct
+ 	and typedefs.
+ 	(SPI_SETSCREENSAVERRUNNING): Add define.
+ 	(LLKHF_ALTDOWN): Add define.
+ 	* include/wingdi.h (PFD_GENERIC_ACCELERATED,
+ 	PFD_DEPTH_DONTCARE): Add defines.
+ 
  2002-01-17  Danny Smith  <dan...@us...>
  

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv13971/w32api/include

Modified Files:
	objbase.h 
Log Message:
	* include/objbase.h (CoGetObject): Add prototype.


Index: objbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objbase.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** objbase.h	2001/10/31 23:55:13	1.3
--- objbase.h	2002/01/17 20:32:50	1.4
***************
*** 146,149 ****
--- 146,150 ----
  WINOLEAPI StgSetTimes(OLECHAR const*,FILETIME const*,FILETIME const*,FILETIME const*);
  WINOLEAPI BindMoniker(LPMONIKER,DWORD,REFIID,PVOID*);
+ WINOLEAPI CoGetObject(LPCWSTR,BIND_OPTS*,REFIID,void**);
  WINOLEAPI MkParseDisplayName(LPBC,LPCOLESTR,ULONG*,LPMONIKER*);
  WINOLEAPI MonikerRelativePathTo(LPMONIKER,LPMONIKER,LPMONIKER*,BOOL);

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv13971/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/objbase.h (CoGetObject): Add prototype.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** ChangeLog	2002/01/15 08:52:36	1.82
--- ChangeLog	2002/01/17 20:32:50	1.83
***************
*** 1,2 ****
--- 1,6 ----
+ 2002-01-17  Danny Smith  <dan...@us...>
+ 
+ 	* include/objbase.h (CoGetObject): Add prototype.
+ 
  2002-01-14  Timothy J. Wood  <tj...@om...>
  

Update of /cvsroot/mingw/runtime/include
In directory usw-pr-cvs1:/tmp/cvs-serv27843/runtime/include

Modified Files:
	stdlib.h 
Log Message:
	* include/stdlib.h (_onexit_t): Add typedef.
	(_onexit): Add prototype.



Index: stdlib.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdlib.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** stdlib.h	2002/01/11 21:53:48	1.8
--- stdlib.h	2002/01/16 08:48:08	1.9
***************
*** 350,353 ****
--- 350,357 ----
  void	_exit	(int) _ATTRIB_NORETURN;
  
+ /* _onexit is MS extension. Use atexit for portability.  */
+ typedef  int (* _onexit_t)(void); 
+ _onexit_t _onexit( _onexit_t );
+ 
  int	_putenv	(const char*);
  void	_searchenv (const char*, const char*, char*);

Update of /cvsroot/mingw/runtime
In directory usw-pr-cvs1:/tmp/cvs-serv27843/runtime

Modified Files:
	ChangeLog 
Log Message:
	* include/stdlib.h (_onexit_t): Add typedef.
	(_onexit): Add prototype.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/runtime/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog	2002/01/11 21:53:48	1.22
--- ChangeLog	2002/01/16 08:48:07	1.23
***************
*** 1,3 ****
! 2002-10-12  Danny Smith  <dan...@us...>
  
  	* msvcrt.def: Revert accidental change.
--- 1,8 ----
! 2002-01-16  Danny Smith  <dan...@us...>
! 
! 	* include/stdlib.h (_onexit_t): Add typedef.
! 	(_onexit): Add prototype.
! 
! 2002-01-12  Danny Smith  <dan...@us...>
  
  	* msvcrt.def: Revert accidental change.

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv26906/w32api/include

Modified Files:
	winuser.h 
Log Message:
	* include/winuser.h (ENUM_CURRENT_SETTINGS,
	ENUM_REGISTRY_SETTINGS): Add defines.


Index: winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** winuser.h	2002/01/11 19:52:50	1.11
--- winuser.h	2002/01/15 08:52:36	1.12
***************
*** 125,128 ****
--- 125,130 ----
  #define BSM_VXDS	1
  #define BROADCAST_QUERY_DENY	1112363332
+ #define ENUM_CURRENT_SETTINGS	((DWORD)-1)
+ #define ENUM_REGISTRY_SETTINGS	((DWORD)-2)
  #define DM_BITSPERPEL	0x40000
  #define DM_PELSWIDTH	0x80000

Update of /cvsroot/mingw/w32api
In directory usw-pr-cvs1:/tmp/cvs-serv26906/w32api

Modified Files:
	ChangeLog 
Log Message:
	* include/winuser.h (ENUM_CURRENT_SETTINGS,
	ENUM_REGISTRY_SETTINGS): Add defines.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** ChangeLog	2002/01/14 23:03:55	1.81
--- ChangeLog	2002/01/15 08:52:36	1.82
***************
*** 1,2 ****
--- 1,7 ----
+ 2002-01-14  Timothy J. Wood  <tj...@om...>
+ 
+ 	* include/winuser.h (ENUM_CURRENT_SETTINGS,
+ 	ENUM_REGISTRY_SETTINGS): Add defines.
+ 
  2002-01-14  Danny Smith  <dan...@us...>