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

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

Modified Files:
	mingwfaq.shtml 
Log Message:
Make three minor changes for correctness and consistency.

Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** mingwfaq.shtml	22 Jul 2002 04:08:22 -0000	1.35
--- mingwfaq.shtml	22 Jul 2002 05:38:00 -0000	1.36
***************
*** 41,45 ****
        <a href="mailto:min...@li..."> MinGW mailing list</a>.
        This page is updated by the MinGW Developers as time permits.  The
!       Q&A provided here were obtained from the MinGW mailing list,
        its members, various MinGW related web sites and experience.  We would like to
        thank all who have contributed to this FAQ.
--- 41,45 ----
        <a href="mailto:min...@li..."> MinGW mailing list</a>.
        This page is updated by the MinGW Developers as time permits.  The
!       Q&amp;A provided here were obtained from the MinGW mailing list,
        its members, various MinGW related web sites and experience.  We would like to
        thank all who have contributed to this FAQ.
***************
*** 450,455 ****
        </p>
        <p>
!         Once you have testdll.lib, it is trivial to produce the executable with
! MSVC:
          <blockquote>
            <code>cl testmain.c testdll.lib</code>
--- 450,454 ----
        </p>
        <p>
!         Once you have testdll.lib, it is trivial to produce the executable with MSVC:
          <blockquote>
            <code>cl testmain.c testdll.lib</code>
***************
*** 458,462 ****
        <p>
          Now for MinGW programs calling an MSVC DLL.  We have two methods.  One way
!         is to specify the LIB files directly on the command line <em>after</em> the
          main program.  For example, after
          <blockquote>
--- 457,461 ----
        <p>
          Now for MinGW programs calling an MSVC DLL.  We have two methods.  One way
!         is to specify the LIB files directly on the command line <i>after</i> the
          main program.  For example, after
          <blockquote>

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

Modified Files:
	mingwfaq.shtml 
Log Message:
Add MSVC/MinGW interlink FAQ.

Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mingwfaq.shtml	2 Jun 2002 05:48:10 -0000	1.34
--- mingwfaq.shtml	22 Jul 2002 04:08:22 -0000	1.35
***************
*** 67,70 ****
--- 67,71 ----
        <li><a href="#faq-w32api">What is w32api?</a></li>
        <li><a href="#faq-comsupport">Is support provided for COM?</a></li>
+       <li><a href="#faq-msvcdll">How can an MSVC program call a MinGW DLL, and vice versa?</a></li>
        <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>
***************
*** 424,427 ****
--- 425,502 ----
           progress to improve support.  Check the MinGW mailing list archives
           for more details on COM and more links to example files.
+       </p>
+       <p><a href="#index">Back to index</a></p>
+ 
+       <hr />
+ 
+ 
+ 
+       <a name="faq-msvcdll" />
+       <h3>How can an MSVC program call a MinGW DLL, and vice versa?</h3>
+       <p>
+         Assume we have a testdll.h, testdll.c, and testmain.c.  In the first case,
+         we will compile testdll.c with MinGW, and let the MSVC-compiled testmain
+         call it.  You should use
+         <blockquote>
+         <code>gcc -shared -o testdll.dll testdll.c \<br />
+         &nbsp;&nbsp;&nbsp; -Wl,--output-def,testdll.def,--out-implib,libtestdll.a</code>
+         </blockquote>
+         to produce the DLL and DEF files.  MSVC cannot use the MinGW library, but
+         since you have already the DEF file you may easily produce one by the Microsoft
+         <code>LIB</code> tool:
+         <blockquote>
+           <code>lib /machine:i386 /def:testdll.def</code>
+         </blockquote>
+       </p>
+       <p>
+         Once you have testdll.lib, it is trivial to produce the executable with
+ MSVC:
+         <blockquote>
+           <code>cl testmain.c testdll.lib</code>
+         </blockquote>
+       </p>
+       <p>
+         Now for MinGW programs calling an MSVC DLL.  We have two methods.  One way
+         is to specify the LIB files directly on the command line <em>after</em> the
+         main program.  For example, after
+         <blockquote>
+           <code>cl /LD testdll.c</code>
+         </blockquote>
+         use
+         <blockquote>
+           <code>gcc -o testmain testmain.c testdll.lib</code>
+         </blockquote>
+       </p>
+       <p>
+         The other way is to produce the .a files for GCC.  For <code>__cdecl</code>
+         functions (in most cases), it is simple: you only need to apply the <code>reimp</code>
+         tool from Anders Norlander (since his web site is no longer available, you may choose
+         to download <a href="http://mywebpage.netscape.com/yongweiwu/reimp_new.zip">here</a>
+         a version enhanced by Jose Fonseca):
+         <blockquote>
+           <code>reimp testdll.lib</code><br />
+           <code>gcc -o testmain testmain.c -L. -ltestdll</code>
+         </blockquote>
+       </p>
+       <p>
+         However, for <code>__stdcall</code> functions, the above method does not work.
+         For MSVC will prefix an underscore to <code>__stdcall</code> functions while
+         MinGW will not.  The right way is to produce the DEF file using the
+         <code>pexports</code> tool from
+         <a href="http://www.is.lg.ua/~paul/devel/binutils.html">http://www.is.lg.ua/~paul/devel/binutils.html</a>
+         and filter off the first underscore by <code>sed</code>:
+         <blockquote>
+           <code>pexports testdll.dll | sed "s/^_//" &gt; testdll.def</code>
+         </blockquote>
+         Then, when using <code>dlltool</code> to produce the import library, add
+         `<code>-U</code>' to the command line:
+         <blockquote>
+           <code>dlltool -U -d testdll.def -l libtestdll.a</code>
+         </blockquote>
+         And now, you can proceed in the usual way:
+         <blockquote>
+           <code>gcc -o testmain testmain.c -L. -ltestdll</code>
+         </blockquote>
+         Hooray, we got it.
        </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-serv13836

Modified Files:
	ChangeLog.MSYS msys_symlink.cc 
Log Message:

	* msys_symlink.cc: Don't recurse into created symlink directory.



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ChangeLog.MSYS	17 Jul 2002 13:06:56 -0000	1.19
--- ChangeLog.MSYS	19 Jul 2002 16:13:25 -0000	1.20
***************
*** 1,2 ****
--- 1,6 ----
+ 2002-07-19  Earnie Boyd  <ea...@us...>
+ 
+ 	* msys_symlink.cc: Don't recurse into created symlink directory.
+ 
  2002-07-17  Earnie Boyd  <ea...@us...>
  

Index: msys_symlink.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/msys_symlink.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys_symlink.cc	17 Jul 2002 13:06:56 -0000	1.2
--- msys_symlink.cc	19 Jul 2002 16:13:25 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
    char wtopath[MAX_PATH] = "\0";
    char wfrompath[MAX_PATH] = "\0";
+   static char dir_created[MAX_PATH];
    char *w_topath = wtopath;
    char *w_frompath = wfrompath;
***************
*** 109,112 ****
--- 110,115 ----
  	      return 1;
  	    }
+ 	  strcpy(dir_created, "./\0");
+ 	  strcat(dir_created, w_topath);
  	}
        else
***************
*** 132,141 ****
  		strcat(fromfile, "/");
  	    strcat(fromfile, dHfile->cFileName);
! 	    strcpy(tofile, w_topath);
! 	    //if (topath_needs_slash)
! 		strcat(tofile, "/");
! 	    strcat(tofile, dHfile->cFileName);
! 	    if (msys_symlink (tofile, fromfile))
! 		return 1;
  	    findfiles = FindNextFile (dH, dHfile);
  	    debug_printf("dHfile(4): %s", dHfile->cFileName);
--- 135,148 ----
  		strcat(fromfile, "/");
  	    strcat(fromfile, dHfile->cFileName);
! 	    debug_printf("%s <-> %s", fromfile, dir_created);
! 	    if (strcmp (fromfile, dir_created))
! 	      {
! 		strcpy(tofile, w_topath);
! 		//if (topath_needs_slash)
! 		    strcat(tofile, "/");
! 		strcat(tofile, dHfile->cFileName);
! 		if (msys_symlink (tofile, fromfile))
! 		    return 1;
! 	      }
  	    findfiles = FindNextFile (dH, dHfile);
  	    debug_printf("dHfile(4): %s", dHfile->cFileName);

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

Modified Files:
	ChangeLog.MSYS Makefile.in environ.cc msys_symlink.cc path.cc 
	poll.cc select.cc shared.cc spawn.cc tty.cc winsup.h 
Added Files:
	ismsys.cc 
Log Message:

	* Makefile.in (DLL_OFILES): Add ismsys.o.
	* ismsys.cc: New file.
	* winsup.h (TRACE_IN): New macro.
	(IsMsys): Add prototype.
	* environ.cc: Use TRACE_IN throughout.
	(winenv): Add DO_CPP_NEW logic.
	* msys_symlink.cc (msys_symlink): Ditto.
	* path.cc: Use TRACE_IN throughout.
	(symlink): Add DO_CPP_NEW logic.
	(hash_path_name): Ditto.
	(cwdstuff): Ditto.
	(cygwin_conv_to_win32_path): Ditto. Also, correct a bug in the path
	list routine.
	* poll.cc (poll): Use TRACE_IN.  Add DO_CPP_NEW logic.
	* select.cc (allocfd_set(n)): Add DO_CPP_NEW logic.
	* shared.cc (shared_info::heap_chunk_size): Change default from 6 to 2.
	* spawn.cc: Use TRACE_IN throughout.
	(spawn_guts): Add check for IsMsys executable.  Initialize tmpbuf.
	Use already calculated count of environment variables.
	Add some DO_CPP_NEW logic.
	Don't convert PATH and MSYS_WPATH to Win32 paths.
	* tty.cc: Add #include <stdlib.h>.  Use TRACE_IN throughout.
	(create_tty_master): Remove unneeded spacing.
	(tty_list::allocate_tty): Add DO_CPP_NEW logic.



--- NEW FILE: ismsys.cc ---
/*
 * Copyright (C) 2002  Earnie Boyd  <ea...@us...>
 * This file is a part of MSYS
 */

/*
 * bool IsMsys (const char * File)
 *
 * This function returns true or false based on the import section data of
 * the File containing the name msys-1.0.dll.
 */

#include <stdlib.h>
#include <stdio.h>
#include <windows.h>
#include "winsup.h"

#define FILEERROR(A) fprintf (stderr, (A))

struct SectionData
{
    char SectionName[8];
    int VA_Size;
    int VA_Ptr;
    int RD_Size;
    int RD_Ptr;
};

typedef SectionData SD;

struct ImportData
{
    unsigned attr;
    unsigned ts;
    unsigned chain;
    unsigned name;
    unsigned iat;
};

typedef ImportData ID;

static int
GetFileData(HANDLE fh, int offset, short bytes2get)
{
    TRACE_IN;
    int FileData;
    unsigned bytesread;

    if (SetFilePointer (fh, offset, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER
	&& GetLastError () != NO_ERROR)
      {
	FILEERROR("int GetFileData: SetFilePointer");
	exit (1);
      }

    if (!ReadFile (fh, &FileData, bytes2get, (DWORD *) & bytesread, 0))
      {
	FILEERROR("int GetFileData: ReadFile");
	exit (1);
      }

    return FileData;
}

static char *
GetFileDataStr(HANDLE fh, int offset, unsigned long bytes2get)
{
    TRACE_IN;
    char *FileData = new char [bytes2get];
    unsigned bytesread;

    if (SetFilePointer (fh, offset, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER
	&& GetLastError () != NO_ERROR)
      {
	FILEERROR("GetFileData: SetFilePointer");
	exit (1);
      }

    if (!ReadFile (fh, FileData, bytes2get, (DWORD *) & bytesread, 0))
      {
	FILEERROR("GetFileData: ReadFile");
	exit (1);
      }

    return FileData;
}

bool
IsMsys (const char *File)
{
    TRACE_IN;
    debug_printf("%s", File);
    HANDLE fh =
      CreateFile (File, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
	  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
    if (fh == INVALID_HANDLE_VALUE)
      {
	fprintf (stderr, " - Cannot open");
	exit (1);
      }
    bool retval = false;
    int PE_Offset = GetFileData (fh, 0x3c, 4);
    int PE_Option = PE_Offset + 4 + 20;
    unsigned char *PE_Import;
    int PE_ImportRva = GetFileData (fh, PE_Option + 104, 4);
    int PE_ImportBase = 0;
    int PE_ImportDataSz = 0;
    short PE_SectionCnt = GetFileData (fh, PE_Offset + 4 + 2, 2);
    short PE_SectionOfs = GetFileData (fh, PE_Offset + 4 + 16, 2) + PE_Option;
    char * PE_Sections = GetFileDataStr (fh, PE_SectionOfs, PE_SectionCnt * 40);
    for (int I=0; I < PE_SectionCnt; I++)
      {
	SD *sec = (SD *) (PE_Sections + (I * 40));
	if (PE_ImportRva >= sec->VA_Ptr &&
	    PE_ImportRva < sec->VA_Ptr + sec->VA_Size)
	  {
	    PE_ImportBase = PE_ImportRva - sec->VA_Ptr + sec->RD_Ptr;
	    PE_ImportDataSz = sec->VA_Ptr + sec->VA_Size - PE_ImportRva;
	    break;
	  }
      }
    if (PE_ImportBase && PE_ImportDataSz)
      {
	PE_Import = 
	  (unsigned char *)GetFileDataStr (fh, PE_ImportBase, PE_ImportDataSz);
	ID *impdata = (ID *)PE_Import;
	for (int I=0; impdata[I].name; I++)
	  {
	    if (!strcmp((char *) PE_Import + impdata[I].name - PE_ImportRva,
		  "msys-1.0.dll"))
	      {
		retval = true;
		break;
	      }
	  }
      }
    delete PE_Sections;
    delete PE_Import;
    CloseHandle (fh);
    debug_printf("%d", retval);
    return retval;
}

Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog.MSYS	19 Jun 2002 12:23:00 -0000	1.18
--- ChangeLog.MSYS	17 Jul 2002 13:06:56 -0000	1.19
***************
*** 1,2 ****
--- 1,29 ----
+ 2002-07-17  Earnie Boyd  <ea...@us...>
+ 
+ 	* Makefile.in (DLL_OFILES): Add ismsys.o.
+ 	* ismsys.cc: New file.
+ 	* winsup.h (TRACE_IN): New macro.
+ 	(IsMsys): Add prototype.
+ 	* environ.cc: Use TRACE_IN throughout.
+ 	(winenv): Add DO_CPP_NEW logic.
+ 	* msys_symlink.cc (msys_symlink): Ditto.
+ 	* path.cc: Use TRACE_IN throughout.
+ 	(symlink): Add DO_CPP_NEW logic.
+ 	(hash_path_name): Ditto.
+ 	(cwdstuff): Ditto.
+ 	(cygwin_conv_to_win32_path): Ditto. Also, correct a bug in the path
+ 	list routine.
+ 	* poll.cc (poll): Use TRACE_IN.  Add DO_CPP_NEW logic.
+ 	* select.cc (allocfd_set(n)): Add DO_CPP_NEW logic.
+ 	* shared.cc (shared_info::heap_chunk_size): Change default from 6 to 2.
+ 	* spawn.cc: Use TRACE_IN throughout.
+ 	(spawn_guts): Add check for IsMsys executable.  Initialize tmpbuf.
+ 	Use already calculated count of environment variables.
+ 	Add some DO_CPP_NEW logic.
+ 	Don't convert PATH and MSYS_WPATH to Win32 paths.
+ 	* tty.cc: Add #include <stdlib.h>.  Use TRACE_IN throughout.
+ 	(create_tty_master): Remove unneeded spacing.
+ 	(tty_list::allocate_tty): Add DO_CPP_NEW logic.
+ 
  2002-06-19  Earnie Boyd  <ea...@us...>
  

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in	13 Jun 2002 21:54:21 -0000	1.3
--- Makefile.in	17 Jul 2002 13:06:56 -0000	1.4
***************
*** 121,129 ****
  	fhandler_raw.o fhandler_serial.o fhandler_socket.o fhandler_tape.o \
  	fhandler_termios.o fhandler_tty.o fhandler_windows.o fhandler_zero.o \
! 	fork.o glob.o grp.o heap.o init.o ioctl.o localtime.o malloc.o \
! 	miscfuncs.o mmap.o msys.o msys_symlink.o\
  	net.o ntea.o passwd.o path.o pinfo.o pipe.o poll.o \
  	pthread.o regexp.o regerror.o regsub.o registry.o resource.o scandir.o \
! 	sched.o sec_acl.o sec_helper.o security.o select.o shared.o shortcut.o signal.o sigproc.o \
  	smallprint.o spawn.o strace.o strsep.o sync.o syscalls.o sysconf.o \
  	syslog.o termios.o thread.o times.o tty.o uinfo.o uname.o wait.o \
--- 121,130 ----
  	fhandler_raw.o fhandler_serial.o fhandler_socket.o fhandler_tape.o \
  	fhandler_termios.o fhandler_tty.o fhandler_windows.o fhandler_zero.o \
! 	fork.o glob.o grp.o heap.o init.o ioctl.o ismsys.o localtime.o \
! 	malloc.o miscfuncs.o mmap.o msys.o msys_symlink.o \
  	net.o ntea.o passwd.o path.o pinfo.o pipe.o poll.o \
  	pthread.o regexp.o regerror.o regsub.o registry.o resource.o scandir.o \
! 	sched.o sec_acl.o sec_helper.o security.o select.o shared.o shortcut.o \
! 	signal.o sigproc.o \
  	smallprint.o spawn.o strace.o strsep.o sync.o syscalls.o sysconf.o \
  	syslog.o termios.o thread.o times.o tty.o uinfo.o uname.o wait.o \

Index: environ.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/environ.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** environ.cc	13 Jun 2002 21:54:21 -0000	1.6
--- environ.cc	17 Jul 2002 13:06:56 -0000	1.7
***************
*** 78,81 ****
--- 78,82 ----
  win_env::add_cache (const char *in_posix, const char *in_native)
  {
+   TRACE_IN;
    posix = (char *) realloc (posix, strlen (in_posix) + 1);
    strcpy (posix, in_posix);
***************
*** 105,108 ****
--- 106,110 ----
  getwinenv (const char *env, const char *in_posix)
  {
+   TRACE_IN;
    if (!conv_start_chars[(unsigned char)*env])
      return NULL;
***************
*** 128,131 ****
--- 130,134 ----
  posify (char **here, const char *value)
  {
+   TRACE_IN;
    char *src = *here;
    win_env *conv;
***************
*** 160,163 ****
--- 163,167 ----
  my_findenv (const char *name, int *offset)
  {
+   TRACE_IN;
    register int len;
    register char **p;
***************
*** 190,193 ****
--- 194,198 ----
  getenv (const char *name)
  {
+   TRACE_IN;
    int offset;
  
***************
*** 198,201 ****
--- 203,207 ----
  envsize (const char * const *in_envp, int debug_print)
  {
+   TRACE_IN;
    const char * const *envp;
    for (envp = in_envp; *envp; envp++)
***************
*** 211,214 ****
--- 217,221 ----
  _addenv (const char *name, const char *value, int overwrite)
  {
+   TRACE_IN;
    int issetenv = overwrite >= 0;
    int offset;
***************
*** 293,296 ****
--- 300,304 ----
  putenv (const char *str)
  {
+   TRACE_IN;
    int res;
    if ((res = check_null_empty_str (str)))
***************
*** 316,319 ****
--- 324,328 ----
  setenv (const char *name, const char *value, int overwrite)
  {
+   TRACE_IN;
    int res;
    if ((res = check_null_empty_str (value)) == EFAULT)
***************
*** 338,341 ****
--- 347,351 ----
  unsetenv (const char *name)
  {
+   TRACE_IN;
    register char **e;
    int offset;
***************
*** 352,355 ****
--- 362,366 ----
  ucenv (char *p, char *eq)
  {
+   TRACE_IN;
    /* Amazingly, NT has a case sensitive environment name list,
       but only sometimes.
***************
*** 384,387 ****
--- 395,399 ----
  glob_init (const char *buf)
  {
+   TRACE_IN;
    if (!buf || !*buf)
      {
***************
*** 404,407 ****
--- 416,420 ----
  check_case_init (const char *buf)
  {
+   TRACE_IN;
    if (!buf || !*buf)
      return;
***************
*** 431,434 ****
--- 444,448 ----
  set_file_api_mode (codepage_type cp)
  {
+   TRACE_IN;
    if (cp == oem_cp)
      {
***************
*** 446,449 ****
--- 460,464 ----
  codepage_init (const char *buf)
  {
+   TRACE_IN;
    if (!buf || !*buf)
      return;
***************
*** 468,471 ****
--- 483,487 ----
  subauth_id_init (const char *buf)
  {
+   TRACE_IN;
    if (!buf || !*buf)
      return;
***************
*** 526,529 ****
--- 542,546 ----
  parse_options (char *buf)
  {
+   TRACE_IN;
    int istrue;
    char *p, *lasts;
***************
*** 611,614 ****
--- 628,632 ----
  regopt (const char *name)
  {
+   TRACE_IN;
    MALLOC_CHECK;
    /* FIXME: should not be under mount */
***************
*** 637,640 ****
--- 655,659 ----
  environ_init (char **envp, int envc)
  {
+   TRACE_IN;
    char *rawenv;
    int i;
***************
*** 744,747 ****
--- 763,767 ----
  env_sort (const void *a, const void *b)
  {
+   TRACE_IN;
    const char **p = (const char **) a;
    const char **q = (const char **) b;
***************
*** 770,773 ****
--- 790,794 ----
  winenv (const char * const *envp, int keep_posix)
  {
+   TRACE_IN;
    int srcplen, envc, envblocklen;
    const char * const *srcp;
***************
*** 794,798 ****
--- 815,823 ----
        else
  	{
+ #if DO_CPP_NEW
  	  tptr = new char  [strlen (conv->native) + 1];
+ #else
+ 	  tptr = (char *) alloca (strlen (conv->native) + 1);
+ #endif
  	  strcpy (tptr, conv->native);
  	  *dstp = tptr;
***************
*** 801,805 ****
--- 826,834 ----
        if ((*dstp)[0] == '!' && isdrive ((*dstp) + 1) && (*dstp)[3] == '=')
  	{
+ #if DO_CPP_NEW
  	  tptr = new char [strlen (*dstp) + 1];
+ #else
+ 	  tptr = (char *) alloca (strlen (*dstp) + 1);
+ #endif
  	  strcpy (tptr, *dstp);
  	  *tptr = '=';
***************
*** 816,820 ****
--- 845,853 ----
        {
  	srcplen = strlen (forced_winenv_vars[i]);
+ #if DO_CPP_NEW
  	tptr = new char [srcplen + MAX_PATH + 1];
+ #else
+ 	tptr = (char *) alloca (srcplen + MAX_PATH + 1);
+ #endif
  	strcpy (tptr, forced_winenv_vars[i]);
  	strcat (tptr, "=");
***************
*** 838,842 ****
--- 871,880 ----
    /* Create an environment block suitable for passing to CreateProcess.  */
    char *ptr, *envblock;
+ #if DO_CPP_NEW
    envblock = new char [envblocklen + 2 + (MAX_PATH * 256)];
+ #else
+   //envblock = (char *) malloc (envblocklen + 2 + (MAX_PATH * 256));
+   envblock = (char *) malloc (envblocklen + 2);
+ #endif
    for (srcp = newenvp, ptr = envblock; *srcp; srcp++)
      {
***************
*** 857,860 ****
--- 895,899 ----
  cur_environ ()
  {
+   TRACE_IN;
    if (*main_environ != __cygwin_environ)
      {

Index: msys_symlink.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/msys_symlink.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** msys_symlink.cc	13 Jun 2002 21:54:21 -0000	1.1
--- msys_symlink.cc	17 Jul 2002 13:06:56 -0000	1.2
***************
*** 5,8 ****
--- 5,11 ----
  
  #include "msys_symlink.h"
+ #if !DO_CPP_NEW
+ #include <stdlib.h>
+ #endif
  
  extern "C"
***************
*** 15,25 ****
    char *w_topath = wtopath;
    char *w_frompath = wfrompath;
    struct stat *sb_frompath = new struct stat;
    struct stat *sb_topath = new struct stat;
    int existing_destination;
    int destination_isdir;
    int src_isdir;
    HANDLE dH;
-   struct _WIN32_FIND_DATAA *dHfile = new struct _WIN32_FIND_DATAA;
    BOOL findfiles;
    BOOL frompath_needs_slash;
--- 18,34 ----
    char *w_topath = wtopath;
    char *w_frompath = wfrompath;
+ #if DO_CPP_NEW
    struct stat *sb_frompath = new struct stat;
    struct stat *sb_topath = new struct stat;
+   struct _WIN32_FIND_DATAA *dHfile = new struct _WIN32_FIND_DATAA;
+ #else
+   struct stat *sb_frompath = (struct stat *) malloc (sizeof (struct stat));
+   struct stat *sb_topath = (struct stat *) malloc (sizeof (struct stat));
+   struct _WIN32_FIND_DATAA *dHfile = (struct _WIN32_FIND_DATAA *) malloc (sizeof (struct _WIN32_FIND_DATAA));
+ #endif
    int existing_destination;
    int destination_isdir;
    int src_isdir;
    HANDLE dH;
    BOOL findfiles;
    BOOL frompath_needs_slash;

Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** path.cc	13 Jun 2002 21:54:21 -0000	1.15
--- path.cc	17 Jul 2002 13:06:56 -0000	1.16
***************
*** 143,146 ****
--- 143,147 ----
  path_prefix_p (const char *path1, const char *path2, int len1)
  {
+   TRACE_IN;
    /* Handle case where PATH1 has trailing '/' and when it doesn't.  */
    if (len1 > 0 && SLASH_P (path1[len1 - 1]))
***************
*** 160,163 ****
--- 161,165 ----
  pathnmatch (const char *path1, const char *path2, int len)
  {
+   TRACE_IN;
    debug_printf("pathnmatch(%s, %s, %d))", path1, path2, len);
    // Paths of just dots can't be matched so don't say they are.
***************
*** 179,182 ****
--- 181,185 ----
  pathmatch (const char *path1, const char *path2)
  {
+   TRACE_IN;
    debug_printf("pathmatch(%s, %s))", path1, path2);
    // Paths of just dots can't be matched so don't say they are.
***************
*** 204,207 ****
--- 207,211 ----
  normalize_posix_path (const char *src, char *dst)
  {
+   TRACE_IN;
    const char *src_start = src;
    char *dst_start = dst;
***************
*** 318,321 ****
--- 322,326 ----
  path_conv::add_ext_from_sym (symlink_info &sym)
  {
+   TRACE_IN;
    if (sym.ext_here && *sym.ext_here)
      {
***************
*** 330,333 ****
--- 335,339 ----
  mkrelpath (char *path)
  {
+   TRACE_IN;
    char cwd_win32[MAX_PATH];
    debug_printf("entr %s", path);
***************
*** 358,361 ****
--- 364,368 ----
  path_conv::update_fs_info (const char* win32_path)
  {
+   TRACE_IN;
    char tmp_buf [MAX_PATH];
    strncpy (tmp_buf, win32_path, MAX_PATH);
***************
*** 416,419 ****
--- 423,427 ----
  		  const suffix_info *suffixes)
  {
+   TRACE_IN;
    /* ******************************************************************
     * So what do we need to check, or what the &*(# is this doing?
***************
*** 840,843 ****
--- 848,852 ----
  digits (const char *name)
  {
+   TRACE_IN;
    char *p;
    int n = strtol(name, &p, 10);
***************
*** 878,881 ****
--- 887,891 ----
  get_raw_device_number (const char *uxname, const char *w32path, int &unit)
  {
+   TRACE_IN;
    DWORD devn = FH_BAD;
  
***************
*** 904,907 ****
--- 914,918 ----
  get_device_number (const char *name, int &unit, BOOL from_conv)
  {
+   TRACE_IN;
    DWORD devn = FH_BAD;
    unit = 0;
***************
*** 986,989 ****
--- 997,1001 ----
  		   DWORD &devn, int &unit)
  {
+   TRACE_IN;
    const char *devfmt;
  
***************
*** 1011,1014 ****
--- 1023,1027 ----
  normalize_win32_path (const char *src, char *dst)
  {
+   TRACE_IN;
    const char *src_start = src;
    char *dst_start = dst;
***************
*** 1098,1101 ****
--- 1111,1115 ----
  slashify (const char *src, char *dst, int trailing_slash_p)
  {
+   TRACE_IN;
    const char *start = src;
  
***************
*** 1122,1125 ****
--- 1136,1140 ----
  backslashify (const char *src, char *dst, int trailing_slash_p)
  {
+   TRACE_IN;
    const char *start = src;
  
***************
*** 1145,1148 ****
--- 1160,1164 ----
  nofinalslash (const char *src, char *dst)
  {
+   TRACE_IN;
    int len = strlen (src);
    if (src != dst)
***************
*** 1157,1160 ****
--- 1173,1177 ----
  slash_unc_prefix_p (const char *path)
  {
+   TRACE_IN;
    char *p = NULL;
    int ret = (isdirsep (path[0])
***************
*** 1181,1184 ****
--- 1198,1202 ----
  conv_path_list (const char *src, char *dst, int to_posix_p)
  {
+   TRACE_IN;
    char *s;
    char *d = dst;
***************
*** 1215,1218 ****
--- 1233,1237 ----
  mount_info::init ()
  {
+   TRACE_IN;
    nmounts = 0;
    had_to_create_mount_areas = 0;
***************
*** 1241,1244 ****
--- 1260,1264 ----
  				bool no_normalize)
  {
+   TRACE_IN;
    static char last_src_path[MAX_PATH];
    static char last_dst[MAX_PATH];
***************
*** 1465,1468 ****
--- 1485,1489 ----
  mount_info::cygdrive_posix_path (const char *src, char *dst, int trailing_slash_p)
  {
+   TRACE_IN;
    int len = cygdrive_len;
  
***************
*** 1491,1494 ****
--- 1512,1516 ----
  mount_info::cygdrive_win32_path (const char *src, char *dst, int trailing_slash_p)
  {
+   TRACE_IN;
    const char *p = src + cygdrive_len;
    if (!isalpha (*p) || (!isdirsep (p[1]) && p[1]))
***************
*** 1512,1515 ****
--- 1534,1538 ----
  				int keep_rel_p)
  {
+   TRACE_IN;
    int src_path_len = strlen (src_path);
    int relative_path_p = !isabspath (src_path);
***************
*** 1634,1637 ****
--- 1657,1661 ----
  mount_info::set_flags_from_win32_path (const char *p)
  {
+   TRACE_IN;
    for (int i = 0; i < nmounts; i++)
      {
***************
*** 1649,1652 ****
--- 1673,1677 ----
  mount_info::read_mounts (reg_key& r)
  {
+   TRACE_IN;
    char native_path[4];
    char posix_path[MAX_PATH];
***************
*** 1761,1764 ****
--- 1786,1790 ----
  mount_info::from_registry ()
  {
+   TRACE_IN;
      reg_key r;
      read_mounts (r);
***************
*** 1773,1776 ****
--- 1799,1803 ----
  mount_info::add_reg_mount (const char * native_path, const char * posix_path, unsigned mountflags)
  {
+   TRACE_IN;
    int res = 0;
  
***************
*** 1810,1813 ****
--- 1837,1841 ----
  mount_info::del_reg_mount (const char * posix_path, unsigned flags)
  {
+   TRACE_IN;
    set_errno(ENOSYS);
    return -1;
***************
*** 1821,1824 ****
--- 1849,1853 ----
  mount_info::read_cygdrive_info_from_registry ()
  {
+   TRACE_IN;
    set_errno(ENOSYS);
  }
***************
*** 1831,1834 ****
--- 1860,1864 ----
  mount_info::write_cygdrive_info_to_registry (const char *cygdrive_prefix, unsigned flags)
  {
+   TRACE_IN;
    set_errno(ENOSYS);
    return -1;
***************
*** 1838,1841 ****
--- 1868,1872 ----
  mount_info::remove_cygdrive_info_from_registry (const char *cygdrive_prefix, unsigned flags)
  {
+   TRACE_IN;
    set_errno(ENOSYS);
    return -1;
***************
*** 1846,1849 ****
--- 1877,1881 ----
  			       char* system_flags)
  {
+   TRACE_IN;
    set_errno(ENOSYS);
    return -1;
***************
*** 1859,1862 ****
--- 1891,1895 ----
  sort_by_posix_name (const void *a, const void *b)
  {
+   TRACE_IN;
    mount_item *ap = mounts_for_sort + (*((int*) a));
    mount_item *bp = mounts_for_sort + (*((int*) b));
***************
*** 1895,1898 ****
--- 1928,1932 ----
  sort_by_native_name (const void *a, const void *b)
  {
+   TRACE_IN;
    mount_item *ap = mounts_for_sort + (*((int*) a));
    mount_item *bp = mounts_for_sort + (*((int*) b));
***************
*** 1927,1930 ****
--- 1961,1965 ----
  mount_info::sort ()
  {
+   TRACE_IN;
    for (int i = 0; i < nmounts; i++)
      native_sorted[i] = posix_sorted[i] = i;
***************
*** 1945,1948 ****
--- 1980,1984 ----
  mount_info::add_item (const char *native, const char *posix, unsigned mountflags, int reg_p)
  {
+   TRACE_IN;
    /* Something's wrong if either path is NULL or empty, or if it's
       not a UNC or absolute path. */
***************
*** 2015,2018 ****
--- 2051,2055 ----
  mount_info::del_item (const char *path, unsigned flags, int reg_p)
  {
+   TRACE_IN;
    char pathtmp[MAX_PATH];
    int posix_path_p = FALSE;
***************
*** 2069,2072 ****
--- 2106,2110 ----
  fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
  {
+   TRACE_IN;
  #ifdef _MT_SAFE
    struct mntent &ret=_reent_winsup()->mntbuf;
***************
*** 2127,2130 ****
--- 2165,2169 ----
  mount_item::getmntent ()
  {
+   TRACE_IN;
    return fillout_mntent (native_path, posix_path, flags);
  }
***************
*** 2133,2136 ****
--- 2172,2176 ----
  cygdrive_getmntent ()
  {
+   TRACE_IN;
    char native_path[4];
    char posix_path[MAX_PATH];
***************
*** 2163,2166 ****
--- 2203,2207 ----
  mount_info::getmntent (int x)
  {
+   TRACE_IN;
    if (x < 0 || x >= nmounts)
      return cygdrive_getmntent ();
***************
*** 2174,2177 ****
--- 2215,2219 ----
  mount_item::init (const char *native, const char *posix, unsigned mountflags)
  {
+   TRACE_IN;
    strcpy ((char *) native_path, native);
    strcpy ((char *) posix_path, posix);
***************
*** 2196,2199 ****
--- 2238,2242 ----
  mount (const char *win32_path, const char *posix_path, unsigned flags)
  {
+   TRACE_IN;
    set_errno(ENOSYS);
    return -1;
***************
*** 2209,2212 ****
--- 2252,2256 ----
  umount (const char *path)
  {
+   TRACE_IN;
    set_errno(ENOSYS);
    return -1;
***************
*** 2221,2224 ****
--- 2265,2269 ----
  cygwin_umount (const char *path, unsigned flags)
  {
+   TRACE_IN;
    int res = -1;
  
***************
*** 2243,2246 ****
--- 2288,2292 ----
  setmntent (const char *filep, const char *)
  {
+   TRACE_IN;
    iteration = 0;
    available_drives = GetLogicalDrives ();
***************
*** 2252,2255 ****
--- 2298,2302 ----
  getmntent (FILE *)
  {
+   TRACE_IN;
    return mount_table->getmntent (iteration++);
  }
***************
*** 2259,2262 ****
--- 2306,2310 ----
  endmntent (FILE *)
  {
+   TRACE_IN;
    return 1;
  }
***************
*** 2268,2271 ****
--- 2316,2320 ----
  get_symlink_ea (const char* frompath, char* buf, int buf_size)
  {
+   TRACE_IN;
    int res = NTReadEA (frompath, SYMLINK_EA_NAME, buf, buf_size);
    if (res == 0)
***************
*** 2278,2281 ****
--- 2327,2331 ----
  set_symlink_ea (const char* frompath, const char* topath)
  {
+   TRACE_IN;
    if (!NTWriteEA (frompath, SYMLINK_EA_NAME, topath, strlen (topath) + 1))
      {
***************
*** 2296,2299 ****
--- 2346,2350 ----
  symlink (const char *topath, const char *frompath)
  {
+   TRACE_IN;
  #if NO_SYMLINK
      int res;
***************
*** 2376,2380 ****
      {
        set_security_attribute (S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO,
! 			    &sa, (new void [4096]), 4096);
      }
  
--- 2427,2437 ----
      {
        set_security_attribute (S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO,
! 			    &sa, 
! #if DO_CPP_NEW
! 			    (new void [4096]), 
! #else
! 			    alloca (4096),
! #endif
! 			    4096);
      }
  
***************
*** 2453,2456 ****
--- 2510,2514 ----
  	       char *contents, int *error, unsigned *pflags)
  {
+   TRACE_IN;
    char cookie_buf[sizeof (SYMLINK_COOKIE) - 1];
    DWORD got;
***************
*** 2511,2514 ****
--- 2569,2573 ----
  suffix_scan::has (const char *in_path, const suffix_info *in_suffixes)
  {
+   TRACE_IN;
    nextstate = SCAN_BEG;
    suffixes = suffixes_start = in_suffixes;
***************
*** 2552,2555 ****
--- 2611,2615 ----
  suffix_scan::next ()
  {
+   TRACE_IN;
    if (suffixes)
      {
***************
*** 2643,2646 ****
--- 2703,2707 ----
  symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt)
  {
+   TRACE_IN;
    HANDLE h;
    int res = 0;
***************
*** 2697,2700 ****
--- 2758,2762 ----
  symlink_info::case_check (char *path)
  {
+   TRACE_IN;
    WIN32_FIND_DATA data;
    HANDLE h;
***************
*** 2736,2739 ****
--- 2798,2802 ----
  readlink (const char *path, char *buf, int buflen)
  {
+   TRACE_IN;
    extern suffix_info stat_suffixes[];
  
***************
*** 2784,2787 ****
--- 2847,2851 ----
  hash_path_name (unsigned long hash, const char *name)
  {
+   TRACE_IN;
    if (!*name)
      return hash;
***************
*** 2799,2803 ****
--- 2863,2871 ----
        if (name[1] == ':')
  	{
+ #if DO_CPP_NEW
  	  char *nn, *newname = new char [(strlen (name) + 2)];
+ #else
+ 	  char *nn, *newname = (char *) alloca (strlen (name) + 2);
+ #endif
  	  nn = newname;
  	  *nn = isupper (*name) ? cyg_tolower (*name) : *name;
***************
*** 2808,2812 ****
--- 2876,2882 ----
  	  strcpy (++nn, name);
  	  name = newname;
+ #if DO_CPP_NEW
  	  delete[] newname;
+ #endif
  	  goto hashit;
  	}
***************
*** 2843,2846 ****
--- 2913,2917 ----
  getcwd (char *buf, size_t ulen)
  {
+   TRACE_IN;
    // This cygheap->cwd.get function is a part of struct cwdstuff.
    // The following are the parameters.
***************
*** 2858,2861 ****
--- 2929,2933 ----
  getwd (char *buf)
  {
+   TRACE_IN;
    return getcwd (buf, MAX_PATH);
  }
***************
*** 2865,2868 ****
--- 2937,2941 ----
  chdir (const char *in_dir)
  {
+   TRACE_IN;
    if (check_null_empty_str_errno (in_dir))
      return -1;
***************
*** 2957,2960 ****
--- 3030,3034 ----
  fchdir (int fd)
  {
+   TRACE_IN;
    sigframe thisframe (mainthread);
  
***************
*** 3021,3032 ****
  cygwin_conv_to_win32_path (const char *path, char *win32_path)
  {
    bool found_path = true;
    const char *spath = path;
    char *sptr;
    char * sspath;
!   char *swin32_path = new char [MAX_PATH*4];
    int swin32_pathlen;
    // retpath will be what sets win32_path before exiting.
!   char *retpath = new char [MAX_PATH*4];
    int retpath_len = 0;
    int retpath_buflen = MAX_PATH*4;
--- 3095,3115 ----
  cygwin_conv_to_win32_path (const char *path, char *win32_path)
  {
+   TRACE_IN;
    bool found_path = true;
    const char *spath = path;
    char *sptr;
    char * sspath;
! #if DO_CPP_NEW
!   char *swin32_path = new char [MAX_PATH * 4];
! #else
!   char *swin32_path = (char *)malloc (MAX_PATH * 4);
! #endif
    int swin32_pathlen;
    // retpath will be what sets win32_path before exiting.
! #if DO_CPP_NEW
!   char *retpath = new char [MAX_PATH * 4];
! #else
!   char *retpath = (char *)malloc (MAX_PATH * 4);
! #endif
    int retpath_len = 0;
    int retpath_buflen = MAX_PATH*4;
***************
*** 3082,3086 ****
  	  if (sspath)
  	    {
! 	      retpathcat (spath);
  	      break;
  	    }
--- 3165,3169 ----
  	  if (sspath)
  	    {
! 	      retpathcpy (spath);
  	      break;
  	    }
***************
*** 3255,3259 ****
--- 3338,3347 ----
      }
    strcpy (win32_path, retpath);
+ #if DO_CPP_NEW
    delete[] swin32_path;
+ #else
+   if (swin32_path)
+     free (swin32_path);
+ #endif
    *retpath = '\0';
    retpath_len = 0;
***************
*** 3265,3268 ****
--- 3353,3357 ----
  cygwin_conv_to_full_win32_path (const char *path, char *win32_path)
  {
+   TRACE_IN;
    path_conv p (path, PC_SYM_FOLLOW | PC_FULL);
    if (p.error)
***************
*** 3282,3285 ****
--- 3371,3375 ----
  cygwin_conv_to_posix_path (const char *path, char *posix_path)
  {
+   TRACE_IN;
    if (check_null_empty_str_errno (path))
      return -1;
***************
*** 3292,3295 ****
--- 3382,3386 ----
  cygwin_conv_to_full_posix_path (const char *path, char *posix_path)
  {
+   TRACE_IN;
    if (check_null_empty_str_errno (path))
      return -1;
***************
*** 3304,3307 ****
--- 3395,3399 ----
  realpath (const char *path, char *resolved)
  {
+   TRACE_IN;
    int err;
  
***************
*** 3345,3348 ****
--- 3437,3441 ----
  cygwin_posix_path_list_p (const char *path)
  {
+   TRACE_IN;
    int posix_p = !(strchr (path, ';') || isdrive (path));
    return posix_p;
***************
*** 3357,3360 ****
--- 3450,3454 ----
  conv_path_list_buf_size (const char *path_list, int to_posix_p)
  {
+   TRACE_IN;
    int i, num_elms, max_mount_path_len, size;
    const char *p;
***************
*** 3387,3390 ****
--- 3481,3485 ----
  cygwin_win32_to_posix_path_list_buf_size (const char *path_list)
  {
+   TRACE_IN;
    return conv_path_list_buf_size (path_list, 1);
  }
***************
*** 3394,3397 ****
--- 3489,3493 ----
  cygwin_posix_to_win32_path_list_buf_size (const char *path_list)
  {
+   TRACE_IN;
    return conv_path_list_buf_size (path_list, 0);
  }
***************
*** 3401,3404 ****
--- 3497,3501 ----
  cygwin_win32_to_posix_path_list (const char *win32, char *posix)
  {
+   TRACE_IN;
    conv_path_list (win32, posix, 1);
    return 0;
***************
*** 3409,3412 ****
--- 3506,3510 ----
  cygwin_posix_to_win32_path_list (const char *posix, char *win32)
  {
+   TRACE_IN;
    conv_path_list (posix, win32, 0);
    return 0;
***************
*** 3436,3439 ****
--- 3534,3538 ----
  cygwin_split_path (const char *path, char *dir, char *file)
  {
+   TRACE_IN;
    int dir_started_p = 0;
  
***************
*** 3502,3505 ****
--- 3601,3605 ----
  cwdstuff::get_hash ()
  {
+   TRACE_IN;
    DWORD hashnow;
    lock->acquire ();
***************
*** 3513,3516 ****
--- 3613,3617 ----
  cwdstuff::init ()
  {
+   TRACE_IN;
    lock = new_muto (FALSE, "cwd");
  }
***************
*** 3521,3524 ****
--- 3622,3626 ----
  cwdstuff::get_initial ()
  {
+   TRACE_IN;
    lock->acquire ();
  
***************
*** 3555,3558 ****
--- 3657,3661 ----
  cwdstuff::set (const char *win32_cwd, const char *posix_cwd)
  {
+   TRACE_IN;
    char pathbuf[MAX_PATH];
  
***************
*** 3584,3587 ****
--- 3687,3691 ----
  cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
  {
+   TRACE_IN;
    MALLOC_CHECK;
  
***************
*** 3623,3627 ****
--- 3727,3735 ----
      {
        if (!buf)
+ #if DO_CPP_NEW
  	buf = new char [(strlen (tocopy) + 1)];
+ #else
+ 	buf = (char *) malloc (strlen (tocopy) + 1);
+ #endif
        strcpy (buf, tocopy);
        if (!buf[0])	/* Should only happen when chroot */

Index: poll.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/poll.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** poll.cc	13 Jun 2002 21:54:21 -0000	1.3
--- poll.cc	17 Jul 2002 13:06:56 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  poll (struct pollfd *fds, unsigned int nfds, int timeout)
  {
+   TRACE_IN;
    int max_fd = 0;
    fd_set *open_fds, *read_fds, *write_fds, *except_fds;
***************
*** 35,42 ****
--- 36,50 ----
    size_t fds_size = howmany(max_fd + 1, NFDBITS) * sizeof (fd_mask);
  
+ #if DO_CPP_NEW
    open_fds = new fd_set [fds_size];
    read_fds = new fd_set [fds_size];
    write_fds = new fd_set [fds_size];
    except_fds = new fd_set [fds_size];
+ #else
+   open_fds = (fd_set *) alloca (fds_size);
+   read_fds = (fd_set *) alloca (fds_size);
+   write_fds = (fd_set *) alloca (fds_size);
+   except_fds = (fd_set *) alloca (fds_size);
+ #endif
  
    if (!open_fds || !read_fds || !write_fds || !except_fds)

Index: select.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/select.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** select.cc	13 Jun 2002 21:54:21 -0000	1.3
--- select.cc	17 Jul 2002 13:06:56 -0000	1.4
***************
*** 81,85 ****
--- 81,89 ----
    bzero ((caddr_t)(p), sizeof_fd_set ((n)))
  
+ #if DO_CPP_NEW
  #define allocfd_set(n) ((fd_set *) memset ((new fd_set [(sizeof_fd_set (n))]), 0, sizeof_fd_set (n)))
+ #else
+ #define allocfd_set(n) ((fd_set *) memset (alloca (sizeof_fd_set (n)), 0, sizeof_fd_set (n)))
+ #endif
  #define copyfd_set(to, from, n) memcpy (to, from, sizeof_fd_set (n));
  

Index: shared.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/shared.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shared.cc	19 Jun 2002 12:23:00 -0000	1.4
--- shared.cc	17 Jul 2002 13:06:56 -0000	1.5
***************
*** 202,208 ****
  
        heap_chunk_in_mb = reg.get_int ("heap_chunk_in_mb", 256);
!       if (heap_chunk_in_mb < 6)
  	{
! 	  heap_chunk_in_mb = 6;
  	  reg.set_int ("heap_chunk_in_mb", heap_chunk_in_mb);
  	}
--- 202,208 ----
  
        heap_chunk_in_mb = reg.get_int ("heap_chunk_in_mb", 256);
!       if (heap_chunk_in_mb < 2)
  	{
! 	  heap_chunk_in_mb = 2;
  	  reg.set_int ("heap_chunk_in_mb", heap_chunk_in_mb);
  	}

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** spawn.cc	13 Jun 2002 21:54:21 -0000	1.8
--- spawn.cc	17 Jul 2002 13:06:56 -0000	1.9
***************
*** 60,63 ****
--- 60,64 ----
  perhaps_suffix (const char *prog, path_conv &buf)
  {
+   TRACE_IN;
    char *ext;
  
***************
*** 88,91 ****
--- 89,93 ----
  	   int null_if_notfound, const char **known_suffix)
  {
+   TRACE_IN;
    const char *suffix = "";
    debug_printf ("find_exec (%s)", name);
***************
*** 153,156 ****
--- 155,159 ----
  handle (int n, int direction)
  {
+   TRACE_IN;
    fhandler_base *fh = cygheap->fdtab[n];
  
***************
*** 167,170 ****
--- 170,174 ----
  iscmd (const char *argv0, const char *what)
  {
+   TRACE_IN;
    int n;
    n = strlen (argv0) - strlen (what);
***************
*** 193,196 ****
--- 197,201 ----
  linebuf::add (const char *what, int len)
  {
+   TRACE_IN;
    size_t nbufidx;
    if ((nbufidx = bufidx + len) >= alloced || !buf)
***************
*** 207,210 ****
--- 212,216 ----
  linebuf::prepend (const char *what, int len)
  {
+   TRACE_IN;
    int buflen;
    size_t nbufidx;
***************
*** 231,234 ****
--- 237,241 ----
    av (int ac, const char * const *av) : calloced (0), argc (ac)
    {
+   TRACE_IN;
      argv = (char **) cmalloc (HEAP_1_ARGV, (argc + 5) * sizeof (char *));
      memcpy (argv, av, (argc + 1) * sizeof (char *));
***************
*** 236,239 ****
--- 243,247 ----
    ~av ()
    {
+   TRACE_IN;
      for (int i = 0; i < calloced; i++)
        cfree (argv[i]);
***************
*** 241,249 ****
    }
    int unshift (const char *what, int conv = 0);
!   operator char **() {return argv;}
!   void all_calloced () {calloced = argc;}
    void replace0_maybe (const char *arg0)
    {
      /* Note: Assumes that argv array has not yet been "unshifted" */
      if (!calloced)
        {
--- 249,258 ----
    }
    int unshift (const char *what, int conv = 0);
!   operator char **() {TRACE_IN; return argv;}
!   void all_calloced () {TRACE_IN; calloced = argc;}
    void replace0_maybe (const char *arg0)
    {
      /* Note: Assumes that argv array has not yet been "unshifted" */
+   TRACE_IN;
      if (!calloced)
        {
***************
*** 254,261 ****
--- 263,272 ----
    void replace (int i, const char *arg)
      {
+   TRACE_IN;
        argv[i] = cstrdup1 (arg);
      }
    void dup_maybe (int i)
    {
+   TRACE_IN;
      if (i >= calloced)
        argv[i] = cstrdup1 (argv[i]);
***************
*** 263,266 ****
--- 274,278 ----
    void dup_all ()
    {
+   TRACE_IN;
      for (int i = calloced; i < argc; i++)
        argv[i] = cstrdup1 (argv[i]);
***************
*** 271,274 ****
--- 283,287 ----
  av::unshift (const char *what, int conv)
  {
+   TRACE_IN;
    char **av;
    av = (char **) crealloc (argv, (argc + 2) * sizeof (char *));
***************
*** 297,300 ****
--- 310,314 ----
  	    const char *const envp[], int mode)
  {
+   TRACE_IN;
    BOOL rc;
    pid_t cygpid;
***************
*** 486,490 ****
    FIXME(1.0);
    // iscygexec needs adjusted so that it truely identifies an MSYS executable.
!   if (real_path.iscygexec ())
      newargv.dup_all ();
    else
--- 500,504 ----
    FIXME(1.0);
    // iscygexec needs adjusted so that it truely identifies an MSYS executable.
!   if (real_path.iscygexec () || IsMsys((char *)real_path))
      newargv.dup_all ();
    else
***************
*** 493,497 ****
  	{
  	  //convert argv to win32
! 	  char tmpbuf[MAX_PATH];
  
  	  if (strlen(newargv[i]) < MAX_PATH)
--- 507,511 ----
  	{
  	  //convert argv to win32
! 	  char tmpbuf[MAX_PATH] = "\0";
  
  	  if (strlen(newargv[i]) < MAX_PATH)
***************
*** 621,624 ****
--- 635,639 ----
        envblockcnt = 0;
        debug_printf("envblockn");
+ #if 0
        while (*envblockn)
  	{
***************
*** 627,631 ****
--- 642,653 ----
  	  envblockn = strchr(envblockn, '\0') + 1;
  	}
+ #else
+       envblockcnt = ciresrv.moreinfo->envc;
+ #endif
+ #if DO_CPP_NEW
        char **envblockarg = new char *[envblockcnt + 1], *tptr, *wpath;
+ #else
+       char **envblockarg = (char **) malloc (sizeof (char *) * (envblockcnt + 1)), *tptr, *wpath;
+ #endif
        int envblocknlen, envblockarglen = 0;
        envblockn = envblock;
***************
*** 633,639 ****
--- 655,669 ----
  	{
  	  envblocknlen = strlen(envblockn);
+ #if DO_CPP_NEW
  	  envblockarg[i] = new char [envblocknlen + MAX_PATH];
+ #else
+ 	  envblockarg[i] = (char *) malloc (envblocknlen + MAX_PATH);
+ #endif
  	  memset (envblockarg[i], 0, envblocknlen + MAX_PATH);
+ #if DO_CPP_NEW
  	  wpath = new char [envblocknlen + MAX_PATH];
+ #else
+ 	  wpath = (char *) malloc (envblocknlen + MAX_PATH);
+ #endif
  	  memset (wpath, 0, envblocknlen + MAX_PATH);
  	  if ((tptr = strchr(envblockn, '=')))
***************
*** 641,645 ****
  	      tptr++;
  	      strncpy (envblockarg[i], envblockn, tptr - envblockn);
! 	      if (*tptr == '/')
  		{
  		  cygwin_conv_to_win32_path (tptr, wpath);
--- 671,678 ----
  	      tptr++;
  	      strncpy (envblockarg[i], envblockn, tptr - envblockn);
! 	      //FIXME: There's a better way to do this!!
! 	      if (*tptr == '/' && 
! 		  strncmp(envblockn, "PATH=", 5) &&
! 		  strncmp(envblockn, "MSYS_WPATH=", 11))
  		{
  		  cygwin_conv_to_win32_path (tptr, wpath);
***************
*** 654,661 ****
--- 687,705 ----
  	  envblockarglen += strlen(envblockarg[i]) + 1;
  	  envblockn = strchr (envblockn, '\0') + 1;
+ #if DO_CPP_NEW
  	  delete[] wpath;
+ #else
+ 	  if (wpath)
+ 	    free (wpath);
+ #endif
  	}
+ #if DO_CPP_NEW
        delete[] envblock;
        envblock = new char [envblockarglen + 1];
+ #else
+       if (envblock)
+ 	free (envblock);
+       envblock = (char *) malloc (envblockarglen + 1);
+ #endif
        tptr = envblock;
        for (int i=0;i < envblockcnt;i++)
***************
*** 664,671 ****
--- 708,725 ----
  	  memcpy (tptr, envblockarg[i], envblocknlen);
  	  tptr += envblocknlen;
+ #if DO_CPP_NEW
  	  delete[] envblockarg[i];
+ #else
+ 	  //if (envblockarg[i])
+ 	    //free (envblockarg[i]);
+ #endif
  	}
        *++tptr = '\0';
+ #if DO_CPP_NEW
        delete[] envblockarg;
+ #else
+       if (envblockarg)
+ 	free (envblockarg);
+ #endif
      }
  
***************
*** 771,775 ****
--- 825,834 ----
  
    MALLOC_CHECK;
+ #if DO_CPP_NEW
    delete[] envblock;
+ #else
+   if (envblock)
+     free (envblock);
+ #endif
    cygheap_setup_for_child_cleanup (&ciresrv);
    MALLOC_CHECK;
***************
*** 954,957 ****
--- 1013,1017 ----
  cwait (int *result, int pid, int)
  {
+   TRACE_IN;
    return waitpid (pid, result, 0);
  }
***************
*** 966,969 ****
--- 1026,1030 ----
  	  const char *const *envp)
  {
+   TRACE_IN;
    int ret;
    vfork_save *vf = vfork_storage.val ();
***************
*** 1019,1022 ****
--- 1080,1084 ----
  spawnl (int mode, const char *path, const char *arg0, ...)
  {
+   TRACE_IN;
    int i;
    va_list args;
***************
*** 1044,1047 ****
--- 1106,1110 ----
  spawnle (int mode, const char *path, const char *arg0, ...)
  {
+   TRACE_IN;
    int i;
    va_list args;
***************
*** 1072,1075 ****
--- 1135,1139 ----
  spawnlp (int mode, const char *path, const char *arg0, ...)
  {
+   TRACE_IN;
    int i;
    va_list args;
***************
*** 1097,1100 ****
--- 1161,1165 ----
  spawnlpe (int mode, const char *path, const char *arg0, ...)
  {
+   TRACE_IN;
    int i;
    va_list args;
***************
*** 1124,1127 ****
--- 1189,1193 ----
  spawnv (int mode, const char *path, const char * const *argv)
  {
+   TRACE_IN;
  #if DEBUGGING
    for (int i=0;argv[i];i++)
***************
*** 1135,1138 ****
--- 1201,1205 ----
  					     const char * const *envp)
  {
+   TRACE_IN;
  #if DEBUGGING
    for (int i=0;argv[i];i++)
***************
*** 1145,1148 ****
--- 1212,1216 ----
  spawnvp (int mode, const char *path, const char * const *argv)
  {
+   TRACE_IN;
  #if DEBUGGING
    for (int i=0;argv[i];i++)
***************
*** 1156,1159 ****
--- 1224,1228 ----
  					     const char * const *envp)
  {
+   TRACE_IN;
    path_conv buf;
  #if DEBUGGING

Index: tty.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/tty.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tty.cc	15 Oct 2001 22:22:33 -0000	1.2
--- tty.cc	17 Jul 2002 13:06:56 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  #include "winsup.h"
  #include <errno.h>
+ #include <stdlib.h>
  #include <unistd.h>
  #include <utmp.h>
***************
*** 32,35 ****
--- 33,37 ----
  grantpt (int fd)
  {
+   TRACE_IN;
    return 0;
  }
***************
*** 39,42 ****
--- 41,45 ----
  unlockpt (int fd)
  {
+   TRACE_IN;
    return 0;
  }
***************
*** 46,49 ****
--- 49,53 ----
  ttyslot (void)
  {
+   TRACE_IN;
    if (NOTSTATE (myself, PID_USETTY))
      return -1;
***************
*** 54,57 ****
--- 58,62 ----
  tty_init (void)
  {
+   TRACE_IN;
    if (NOTSTATE (myself, PID_USETTY))
      return;
***************
*** 70,75 ****
  create_tty_master (int ttynum)
  {
!   tty_master = (fhandler_tty_master *) cygheap->fdtab.build_fhandler (-1, FH_TTYM,
! 							     "/dev/ttym", ttynum);
    if (tty_master->init (ttynum))
      api_fatal ("Can't create master tty");
--- 75,80 ----
  create_tty_master (int ttynum)
  {
!   TRACE_IN;
!   tty_master = (fhandler_tty_master *) cygheap->fdtab.build_fhandler (-1, FH_TTYM, "/dev/ttym", ttynum);
    if (tty_master->init (ttynum))
      api_fatal ("Can't create master tty");
***************
*** 93,96 ****
--- 98,102 ----
  tty_terminate (void)
  {
+   TRACE_IN;
    if (NOTSTATE (myself, PID_USETTY))
      return;
***************
*** 101,104 ****
--- 107,111 ----
  attach_tty (int num)
  {
+   TRACE_IN;
    if (num != -1)
      {
***************
*** 113,116 ****
--- 120,124 ----
  tty_list::terminate (void)
  {
+   TRACE_IN;
    int ttynum = myself->ctty;
  
***************
*** 153,156 ****
--- 161,165 ----
  tty_list::connect_tty (int ttynum)
  {
+   TRACE_IN;
    if (ttynum < 0 || ttynum >= NTTYS)
      {
***************
*** 170,173 ****
--- 179,183 ----
  tty_list::init (void)
  {
+   TRACE_IN;
    for (int i = 0; i < NTTYS; i++)
      {
***************
*** 185,188 ****
--- 195,199 ----
  tty_list::allocate_tty (int with_console)
  {
+   TRACE_IN;
    HWND console;
  
***************
*** 193,197 ****
--- 204,212 ----
    else
      {
+ #if DO_CPP_NEW
        char *oldtitle = new char [TITLESIZE];
+ #else
+       char *oldtitle = (char *) malloc (TITLESIZE);
+ #endif
  
        if (!oldtitle)
***************
*** 216,219 ****
--- 231,239 ----
        console = FindWindow (NULL, buf);
        SetConsoleTitle (oldtitle);
+ #if DO_CPP_NEW
+       delete[] oldtitle;
+ #else
+       free (oldtitle);
+ #endif
        Sleep (40);
        ReleaseMutex (title_mutex);
***************
*** 280,283 ****
--- 300,304 ----
  tty::slave_alive ()
  {
+   TRACE_IN;
    return alive (TTY_SLAVE_ALIVE);
  }
***************
*** 286,289 ****
--- 307,311 ----
  tty::master_alive ()
  {
+   TRACE_IN;
    return alive (TTY_MASTER_ALIVE);
  }
***************
*** 292,295 ****
--- 314,318 ----
  tty::alive (const char *fmt)
  {
+   TRACE_IN;
    HANDLE ev;
    char buf[sizeof (TTY_MASTER_ALIVE) + 16];
***************
*** 304,307 ****
--- 327,331 ----
  tty::create_inuse (const char *fmt)
  {
+   TRACE_IN;
    HANDLE h;
    char buf[sizeof (TTY_MASTER_ALIVE) + 16];
***************
*** 318,321 ****
--- 342,346 ----
  tty::init (void)
  {
+   TRACE_IN;
    output_stopped = 0;
    setsid (0);
***************
*** 330,333 ****
--- 355,359 ----
  tty::get_event (const char *fmt, BOOL manual_reset)
  {
+   TRACE_IN;
    HANDLE hev;
    char buf[40];
***************
*** 348,351 ****
--- 374,378 ----
  tty::make_pipes (fhandler_pty_master *ptym)
  {
+   TRACE_IN;
    /* Create communication pipes */
  
***************
*** 380,383 ****
--- 407,411 ----
  tty::common_init (fhandler_pty_master *ptym)
  {
+   TRACE_IN;
    /* Set termios information.  Force initialization. */
    ptym->tcinit (this, TRUE);

Index: winsup.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/winsup.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** winsup.h	13 Jun 2002 21:54:21 -0000	1.6
--- winsup.h	17 Jul 2002 13:06:56 -0000	1.7
***************
*** 23,26 ****
--- 23,31 ----
  #define FIXME(FIXNO) debug_printf("%s-%s", "FIXME", (FIXNO))
  #define HMMM(HUM) debug_printf("%s-%d: %s", "HMMM", __LINE__, (HUM))
+ #if DEBUGGING
+ # define TRACE_IN debug_printf("TRACE_IN: %s, %d", __FILE__, __LINE__)
+ #else
+ # define TRACE_IN
+ #endif
  
  #define alloca __builtin_alloca
***************
*** 268,271 ****
--- 273,278 ----
  extern HANDLE hMainThread;
  extern HANDLE hMainProc;
+ 
+ extern bool IsMsys (const char *);
  
  #endif /* defined __cplusplus */

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

Modified Files:
	commctrl.h objidl.h rpc.h winbase.h winioctl.h winnt.h 
	wtypes.h 
Log Message:
Merge changes from Cygwin

Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** commctrl.h	21 May 2002 16:07:06 -0000	1.9
--- commctrl.h	9 Jul 2002 13:29:21 -0000	1.10
***************
*** 41,44 ****
--- 41,48 ----
  #define UPDOWN_CLASSA	"msctls_updown32"
  #define UPDOWN_CLASSW	L"msctls_updown32"
+ #define WC_COMBOBOXEXW	L"ComboBoxEx32"
+ #define WC_COMBOBOXEXA	"ComboBoxEx32"
+ #define WC_IPADDRESSW	L"SysIPAddress32"
+ #define WC_IPADDRESSA	"SysIPAddress32"
  #define WC_LISTVIEWA	"SysListView32"
  #define WC_LISTVIEWW	L"SysListView32"
***************
*** 64,67 ****
--- 68,88 ----
  #define ACN_START	1
  #define ACN_STOP	2
+ #define CBEIF_TEXT	0x00000001
+ #define CBEIF_IMAGE	0x00000002
+ #define CBEIF_SELECTEDIMAGE	0x00000004
+ #define CBEIF_OVERLAY	0x00000008
+ #define CBEIF_INDENT	0x00000010
+ #define CBEIF_LPARAM	0x00000020
+ #define CBEIF_DI_SETITEM	0x10000000
+ #define CBEN_INSERTITEM	(CBEN_FIRST - 1)
+ #define CBEN_DELETEITEM	(CBEN_FIRST - 2)
+ #define CBEN_BEGINEDIT	(CBEN_FIRST - 4)
+ #define CBEN_ENDEDITA	(CBEN_FIRST - 5)
+ #define CBEN_ENDEDITW	(CBEN_FIRST - 6)
+ #define CBENF_KILLFOCUS	1
+ #define CBENF_RETURN	2
+ #define CBENF_ESCAPE	3
+ #define CBENF_DROPDOWN	4
+ #define CBEMAXSTRLEN 260
  #define DL_BEGINDRAG	1157
  #define DL_CANCELDRAG	1160
***************
*** 163,166 ****
--- 184,192 ----
  #define CBEN_LAST	(-830)
  #endif /* _WIN32_IE */
+ #if (_WIN32_IE >= 0x0400)
+ #define IPN_FIRST	(-860)
+ #define IPN_LAST	(-879)
+ #define IPN_FIELDCHANGED	(IPN_FIRST-0)
+ #endif /* _WIN32_IE >= 0x0400 */
  #define HDI_WIDTH	1
  #define HDI_HEIGHT	1
***************
*** 180,183 ****
--- 206,213 ----
  #define CBES_EX_NOSIZELIMIT	0x00000008
  #define CBES_EX_CASESENSITIVE	0x00000010
+ #define CBEN_GETDISPINFOA	(CBEN_FIRST - 0)
+ #define CBEN_GETDISPINFOW	(CBEN_FIRST - 7)
+ #define CBEN_DRAGBEGINA	(CBEN_FIRST - 8)
+ #define CBEN_DRAGBEGINW	(CBEN_FIRST - 9)
  #endif /* _WIN32_IE >= 0x0400 */
  #if (_WIN32_IE >= 0x0500)
***************
*** 239,242 ****
--- 269,278 ----
  #define HDN_BEGINDRAG	(HDN_FIRST-10)
  #endif
+ #define IPM_CLEARADDRESS	(WM_USER+100)
+ #define IPM_SETADDRESS	(WM_USER+101)
+ #define IPM_GETADDRESS	(WM_USER+102)
+ #define IPM_SETRANGE	(WM_USER+103)
+ #define IPM_SETFOCUS	(WM_USER+104)
+ #define IPM_ISBLANK	(WM_USER+105)
  #define CMB_MASKED 2
  #define TBSTATE_CHECKED	1
***************
*** 1267,1270 ****
--- 1303,1369 ----
  
  #ifndef RC_INVOKED
+ typedef struct tagCOMBOBOXEXITEMA{
+ 	UINT mask;
+ 	int iItem;
+ 	LPSTR pszText;
+ 	int cchTextMax;
+ 	int iImage;
+ 	int iSelectedImage;
+ 	int iOverlay;
+ 	int iIndent;
+ 	LPARAM lParam;
+ } COMBOBOXEXITEMA, *PCOMBOBOXEXITEMA;
+ typedef COMBOBOXEXITEMA CONST *PCCOMBOEXITEMA;
+ typedef struct tagCOMBOBOXEXITEMW{
+ 	UINT mask;
+ 	int iItem;
+ 	LPWSTR pszText;
+ 	int cchTextMax;
+ 	int iImage;
+ 	int iSelectedImage;
+ 	int iOverlay;
+ 	int iIndent;
+ 	LPARAM lParam;
+ } COMBOBOXEXITEMW, *PCOMBOBOXEXITEMW;
+ typedef COMBOBOXEXITEMW CONST *PCCOMBOEXITEMW;
+ #if (_WIN32_IE >= 0x0400)
+ typedef struct {
+ 	NMHDR hdr;
+ 	COMBOBOXEXITEMA ceItem;
+ } NMCOMBOBOXEXA, *PNMCOMBOBOXEXA;
+ typedef struct {
+ 	NMHDR hdr;
+ 	COMBOBOXEXITEMW ceItem;
+ } NMCOMBOBOXEXW, *PNMCOMBOBOXEXW;
+ typedef struct {
+ 	NMHDR   hdr;
+ 	int iItemid;
+ 	WCHAR   szText[CBEMAXSTRLEN];
+ }NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
+ typedef struct {
+ 	NMHDR   hdr;
+ 	int iItemid;
+ 	char    szText[CBEMAXSTRLEN];
+ }NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+ typedef struct tagNMIPADDRESS{
+ 	NMHDR hdr;
+ 	int iField;
+ 	int iValue;
+ } NMIPADDRESS, *LPNMIPADDRESS;
+ #endif /*_WIN32_IE >= 0x0400*/
+ typedef struct {
+ 	NMHDR hdr;
+ 	BOOL fChanged;
+ 	int iNewSelection;
+ 	WCHAR szText[CBEMAXSTRLEN];
+ 	int iWhy;
+ } NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
+ typedef struct {
+ 	NMHDR hdr;
+ 	BOOL fChanged;
+ 	int iNewSelection;
+ 	char szText[CBEMAXSTRLEN];
+ 	int iWhy;
+ } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
  typedef struct _COLORMAP {
  	COLORREF from;
***************
*** 2000,2003 ****
--- 2099,2108 ----
  #define FORWARD_WM_NOTIFY(h,i,p,f) (LRESULT)(f)((h),WM_NOTIFY,(WPARAM)(int)(i),(LPARAM)(NMHDR*)(p))
  #define CCSIZEOF_STRUCT(n,m) (((int)((PBYTE)(&((s*)0)->m)-((PBYTE)((s*)0))))+sizeof(((s*)0)->m))
+ #define MAKEIPADDRESS(b1,b2,b3,b4) ((LPARAM)(((DWORD)(b1)<<24)+((DWORD)(b2)<<16)+((DWORD)(b3)<<8)+((DWORD)(b4))))
+ #define MAKEIPRANGE(low,high) ((LPARAM)(WORD)(((BYTE)(high)<<8)+(BYTE)(low)))
+ #define FIRST_IPADDRESS(a) ((a>>24) & 0xff)
+ #define SECOND_IPADDRESS(a) ((a>>16) & 0xff)
+ #define THIRD_IPADDRESS(a)  ((a>>8) & 0xff)
+ #define FOURTH_IPADDRESS(a) (a & 0xff)
  #define Animate_Create(w,i,s,hI) CreateWindow(ANIMATE_CLASS,NULL,s,0,0,0,0,w,(HMENU)(i),hI,NULL)
  #define Animate_Open(w,f) (BOOL)SNDMSG(w,ACM_OPEN,0,(LPARAM)f)
***************
*** 2282,2286 ****
--- 2387,2393 ----
  #define TRACKBAR_CLASS TRACKBAR_CLASSW
  #define UPDOWN_CLASS UPDOWN_CLASSW
+ #define WC_COMBOBOXEX WC_COMBOBOXEXW
  #define WC_HEADER WC_HEADERW
+ #define WC_IPADDRESS WC_IPADDRESSW
  #define WC_LISTVIEW WC_LISTVIEWW
  #define WC_TABCONTROL WC_TABCONTROLW
***************
*** 2300,2308 ****
  typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
  #define ACM_OPEN ACM_OPENW
  #define SB_GETTEXT	SB_GETTEXTW
  #define SB_SETTEXT	SB_SETTEXTW
  #define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHW
  #define STATUSCLASSNAME         STATUSCLASSNAMEW
- #define WC_HEADER WC_HEADERW
  #define HDM_INSERTITEM HDM_INSERTITEMW
  #define HDM_GETITEM HDM_GETITEMW
--- 2407,2433 ----
  typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
  #define ACM_OPEN ACM_OPENW
+ #define COMBOBOXEXITEM	COMBOBOXEXITEMW
+ #define PCOMBOBOXEXITEM	PCOMBOBOXEXITEMW
+ #define PCCOMBOBOXEXITEM	PCCOMBOBOXEXITEMW
+ #define CBEM_INSERTITEM	CBEM_INSERTITEMW
+ #define CBEM_SETITEM	CBEM_SETITEMW
+ #define CBEM_GETITEM	CBEM_GETITEMW
+ #define CBEN_ENDEDIT	CBEN_ENDEDITW
+ #define NMCBEENDEDIT	NMCBEENDEDITW
+ #define LPNMCBEENDEDIT	LPNMCBEENDEDITW
+ #define PNMCBEENDEDIT	PNMCBEENDEDITW
+ #if _WIN32_IE >= 0x0400
+ #define NMCOMBOBOXEX	NMCOMBOBOXEXW
+ #define PNMCOMBOBOXEX	PNMCOMBOBOXEXW
+ #define CBEN_GETDISPINFO	CBEN_GETDISPINFOW
+ #define CBEN_DRAGBEGIN	CBEN_DRAGBEGINW
+ #define NMCBEDRAGBEGIN	NMCBEDRAGBEGINW
+ #define LPNMCBEDRAGBEGIN	LPNMCBEDRAGBEGINW
+ #define PNMCBEDRAGBEGIN PNMCBEDRAGBEGINW
+ #endif /* _WIN32_IE >= 0x0400 */
  #define SB_GETTEXT	SB_GETTEXTW
  #define SB_SETTEXT	SB_SETTEXTW
  #define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHW
  #define STATUSCLASSNAME         STATUSCLASSNAMEW
  #define HDM_INSERTITEM HDM_INSERTITEMW
  #define HDM_GETITEM HDM_GETITEMW
***************
*** 2348,2352 ****
  #define PROGRESS_CLASS PROGRESS_CLASSW
  #define HOTKEY_CLASS HOTKEY_CLASSW
- #define WC_LISTVIEW WC_LISTVIEWW
  #define LV_ITEM LV_ITEMW
  #define LVITEM LVITEMW
--- 2473,2476 ----
***************
*** 2374,2378 ****
  #define LV_DISPINFO LV_DISPINFOW
  #define NMLVDISPINFO NMLVDISPINFOW
- #define WC_TREEVIEW WC_TREEVIEWW
  #define TVM_INSERTITEM TVM_INSERTITEMW
  #define TVM_GETITEM TVM_GETITEMW
--- 2498,2501 ----
***************
*** 2392,2396 ****
  #define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW
  #define TVN_ENDLABELEDIT TVN_ENDLABELEDITW
- #define WC_TABCONTROL WC_TABCONTROLW
  #define TC_ITEMHEADER TC_ITEMHEADERW
  #define TC_ITEM TC_ITEMW
--- 2515,2518 ----
***************
*** 2414,2418 ****
  #define RB_INSERTBAND RB_INSERTBANDW
  #define RB_SETBANDINFO RB_SETBANDINFOW
! #else
  #define ANIMATE_CLASS ANIMATE_CLASSA
  #define HOTKEY_CLASS HOTKEY_CLASSA
--- 2536,2540 ----
  #define RB_INSERTBAND RB_INSERTBANDW
  #define RB_SETBANDINFO RB_SETBANDINFOW
! #else /* UNICODE */
  #define ANIMATE_CLASS ANIMATE_CLASSA
  #define HOTKEY_CLASS HOTKEY_CLASSA
***************
*** 2423,2427 ****
--- 2545,2551 ----
  #define TRACKBAR_CLASS TRACKBAR_CLASSA
  #define UPDOWN_CLASS UPDOWN_CLASSA
+ #define WC_COMBOBOXEX WC_COMBOBOXEXA
  #define WC_HEADER WC_HEADERA
+ #define WC_IPADDRESS WC_IPADDRESSA
  #define WC_LISTVIEW WC_LISTVIEWA
  #define WC_TABCONTROL WC_TABCONTROLA
***************
*** 2441,2444 ****
--- 2565,2587 ----
  typedef NMTREEVIEWA NMTREEVIEW,*LPNMTREEVIEW;
  #define ACM_OPEN ACM_OPENA
+ #define COMBOBOXEXITEM	COMBOBOXEXITEMA
+ #define PCOMBOBOXEXITEM	PCOMBOBOXEXITEMA
+ #define PCCOMBOBOXEXITEM	PCCOMBOBOXEXITEMA
+ #define CBEM_INSERTITEM	CBEM_INSERTITEMA
+ #define CBEM_SETITEM	CBEM_SETITEMA
+ #define CBEM_GETITEM	CBEM_GETITEMA
+ #define CBEN_ENDEDIT	CBEN_ENDEDITA
+ #define NMCBEENDEDIT	NMCBEENDEDITA
+ #define LPNMCBEENDEDIT	LPNMCBEENDEDITA
+ #define PNMCBEENDEDIT	PNMCBEENDEDITA
+ #if _WIN32_IE >= 0x0400
+ #define NMCOMBOBOXEX	NMCOMBOBOXEXA
+ #define PNMCOMBOBOXEX	PNMCOMBOBOXEXA
+ #define CBEN_DRAGBEGIN	CBEN_DRAGBEGINA
+ #define CBEN_GETDISPINFO	CBEN_GETDISPINFOA
+ #define NMCBEDRAGBEGIN	NMCBEDRAGBEGINA
+ #define LPNMCBEDRAGBEGIN	LPNMCBEDRAGBEGINA
+ #define PNMCBEDRAGBEGIN	PNMCBEDRAGBEGINA
+ #endif /* _WIN32_IE >= 0x0400 */
  #define SB_GETTEXT	SB_GETTEXTA
  #define SB_SETTEXT	SB_SETTEXTA

Index: objidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objidl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** objidl.h	9 Apr 2002 21:17:17 -0000	1.3
--- objidl.h	9 Jul 2002 13:29:21 -0000	1.4
***************
*** 306,310 ****
  		USHORT uiVal;
  		VARIANT_BOOL boolVal;
! #ifndef __cplusplus
  		_VARIANT_BOOL bool;
  #endif
--- 306,312 ----
  		USHORT uiVal;
  		VARIANT_BOOL boolVal;
! #if 0
! /* bool is a standard type in C++, and a standard macro expanding
!    to the _Bool type in C99 (see stdbool.h) */   
  		_VARIANT_BOOL bool;
  #endif

Index: rpc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/rpc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpc.h	9 Apr 2002 21:17:17 -0000	1.3
--- rpc.h	9 Jul 2002 13:29:21 -0000	1.4
***************
*** 1,2 ****
--- 1,6 ----
+ #ifndef RPC_NO_WINDOWS_H
+ #include <windows.h>
+ #endif
+ 
  #ifndef _RPC_H
  #define _RPC_H
***************
*** 5,11 ****
  #endif
  
- #ifndef RPC_NO_WINDOWS_H
- #include <windows.h>
- #endif
  #ifdef __cplusplus
  extern "C" {
--- 9,12 ----

Index: winbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winbase.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** winbase.h	9 Jul 2002 02:37:32 -0000	1.13
--- winbase.h	9 Jul 2002 13:29:21 -0000	1.14
***************
*** 5,9 ****
--- 5,11 ----
  #endif
  
+ #ifndef WINBASEAPI
  #define WINBASEAPI DECLSPEC_IMPORT
+ #endif
  #ifdef __cplusplus
  extern "C" {
***************
*** 184,187 ****
--- 186,192 ----
  #define FILE_FLAG_OPEN_REPARSE_POINT	2097152
  #define FILE_FLAG_OPEN_NO_RECALL	1048576
+ #if (_WIN32_WINNT >= 0x0500)
+ #define FILE_FLAG_FIRST_PIPE_INSTANCE	524288
+ #endif
  #define CLRDTR 6
  #define CLRRTS 4

Index: winioctl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winioctl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** winioctl.h	9 Apr 2002 21:17:17 -0000	1.4
--- winioctl.h	9 Jul 2002 13:29:21 -0000	1.5
***************
*** 135,139 ****
--- 135,144 ----
  #define PARTITION_HUGE	6
  #define PARTITION_IFS	7
+ #define PARTITION_FAT32 0x0B
+ #define PARTITION_FAT32_XINT13 0x0C
+ #define PARTITION_XINT13 0x0E
+ #define PARTITION_XINT13_EXTENDED 0x0F
  #define PARTITION_PREP	0x41
+ #define PARTITION_LDM	0x42
  #define PARTITION_UNIX	0x63
  #define PARTITION_NTFT	128
***************
*** 150,153 ****
--- 155,159 ----
  #define FILE_READ_ACCESS	1
  #define FILE_WRITE_ACCESS	2
+ #define FILE_SPECIAL_ACCESS (FILE_ANY_ACCESS)
  #define DISK_LOGGING_START	0
  #define DISK_LOGGING_STOP	1
***************
*** 261,265 ****
  	DWORD Signature;
  	PARTITION_INFORMATION PartitionEntry[1];
! } DRIVE_LAYOUT_INFORMATION;
  typedef struct _PERF_BIN {
  	DWORD NumberOfBins;
--- 267,271 ----
  	DWORD Signature;
  	PARTITION_INFORMATION PartitionEntry[1];
! } DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION;
  typedef struct _PERF_BIN {
  	DWORD NumberOfBins;
***************
*** 282,293 ****
  	DWORD Length;
  } VERIFY_INFORMATION,*PVERIFY_INFORMATION;
! #define IsRecognizedPartition(t) (((t&PARTITION_NTFT)&&((t&~0xC0)==PARTITION_FAT_12))||\
! 	((t&PARTITION_NTFT)&&((t&~0xC0)==PARTITION_FAT_16))||\
! 	((t&PARTITION_NTFT)&&((t&~0xC0)==PARTITION_IFS))||\
! 	((t&PARTITION_NTFT)&&((t&~0xC0)==PARTITION_HUGE))||\
  	((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\
  	((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\
  	((t&~PARTITION_NTFT)==PARTITION_IFS)||\
! 	((t&~PARTITION_NTFT)==PARTITION_HUGE))
  #ifdef __cplusplus
  }
--- 288,311 ----
  	DWORD Length;
  } VERIFY_INFORMATION,*PVERIFY_INFORMATION;
! #define IsRecognizedPartition(t)\
!   (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_16))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_IFS))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_HUGE))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\
  	((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\
  	((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\
  	((t&~PARTITION_NTFT)==PARTITION_IFS)||\
! 	((t&~PARTITION_NTFT)==PARTITION_HUGE)||\
! 	((t&~PARTITION_NTFT)==PARTITION_FAT32)||\
! 	((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\
! 	((t&~PARTITION_NTFT)==PARTITION_XINT13))
! #define IsContainerPartition(t)\
!   (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_EXTENDED))||\
! 	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\
! 	((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\
! 	((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED))
  #ifdef __cplusplus
  }

Index: winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** winnt.h	14 Jun 2002 11:44:47 -0000	1.24
--- winnt.h	9 Jul 2002 13:29:21 -0000	1.25
***************
*** 50,54 ****
  typedef short SHORT;
  typedef long LONG;
! typedef CHAR CCHAR;
  typedef unsigned char UCHAR,*PUCHAR;
  typedef unsigned short USHORT,*PUSHORT;
--- 50,54 ----
  typedef short SHORT;
  typedef long LONG;
! typedef char CCHAR, *PCCHAR;
  typedef unsigned char UCHAR,*PUCHAR;
  typedef unsigned short USHORT,*PUSHORT;
***************
*** 148,151 ****
--- 148,154 ----
  typedef BYTE BOOLEAN,*PBOOLEAN;
  #endif
+ typedef BYTE FCHAR;
+ typedef WORD FSHORT;
+ typedef DWORD FLONG;
  
  #define NTAPI __stdcall
***************
*** 257,260 ****
--- 260,264 ----
  #define PROCESS_TERMINATE	1
  #define PROCESS_CREATE_THREAD	2
+ #define PROCESS_SET_SESSIONID	4
  #define PROCESS_VM_OPERATION	8
  #define PROCESS_VM_READ	16
***************
*** 312,315 ****
--- 316,329 ----
  #define SECURITY_BUILTIN_DOMAIN_RID   32
  #define SECURITY_PRINCIPAL_SELF_RID   10
+ #define SECURITY_CREATOR_OWNER_SERVER_RID 0x2
+ #define SECURITY_CREATOR_GROUP_SERVER_RID 0x3
+ #define SECURITY_LOGON_IDS_RID_COUNT 0x3
+ #define SECURITY_ANONYMOUS_LOGON_RID 0x7
+ #define SECURITY_PROXY_RID 0x8
+ #define SECURITY_ENTERPRISE_CONTROLLERS_RID 0x9
+ #define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID
+ #define SECURITY_AUTHENTICATED_USER_RID 0xB
+ #define SECURITY_RESTRICTED_CODE_RID 0xC
+ #define SECURITY_NT_NON_UNIQUE_RID 0x15
  #define SID_REVISION 1
  #define DOMAIN_USER_RID_ADMIN 0x1F4L
***************
*** 660,663 ****
--- 674,678 ----
  #define SECTION_MAP_WRITE 2
  #define SECTION_QUERY 1
+ #define SECTION_MAP_EXECUTE 8
  #define SECTION_ALL_ACCESS 0xf001f
  #define MESSAGE_RESOURCE_UNICODE 1
***************
*** 1786,1790 ****
  	LUID   Luid;
  	DWORD  Attributes;
! } LUID_AND_ATTRIBUTES;
  #pragma pack(pop)
  typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
--- 1801,1805 ----
  	LUID   Luid;
  	DWORD  Attributes;
! } LUID_AND_ATTRIBUTES, *PLUID_AND_ATTRIBUTES;
  #pragma pack(pop)
  typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
***************
*** 1805,1809 ****
  	SecurityImpersonation,
  	SecurityDelegation
! } SECURITY_IMPERSONATION_LEVEL;
  typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE;
  typedef struct _SECURITY_QUALITY_OF_SERVICE {
--- 1820,1824 ----
  	SecurityImpersonation,
  	SecurityDelegation
! } SECURITY_IMPERSONATION_LEVEL,*PSECURITY_IMPERSONATION_LEVEL;
  typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE;
  typedef struct _SECURITY_QUALITY_OF_SERVICE {
***************
*** 1833,1837 ****
  	PSID Sid;
  	DWORD Attributes;
! } SID_AND_ATTRIBUTES;
  typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
  typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY;
--- 1848,1852 ----
  	PSID Sid;
  	DWORD Attributes;
! } SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES;
  typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
  typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY;
***************
*** 1863,1867 ****
  	LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
  } TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES;
! typedef enum tagTOKEN_TYPE { TokenPrimary=1,TokenImpersonation }TOKEN_TYPE;
  typedef struct _TOKEN_STATISTICS {
  	LUID TokenId;
--- 1878,1882 ----
  	LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
  } TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES;
! typedef enum tagTOKEN_TYPE { TokenPrimary=1,TokenImpersonation }TOKEN_TYPE, *PTOKEN_TYPE;
  typedef struct _TOKEN_STATISTICS {
  	LUID TokenId;
***************
*** 1875,1879 ****
  	DWORD PrivilegeCount;
  	LUID ModifiedId;
! } TOKEN_STATISTICS;
  typedef struct _TOKEN_USER {
  	SID_AND_ATTRIBUTES User;
--- 1890,1894 ----
  	DWORD PrivilegeCount;
  	LUID ModifiedId;
! } TOKEN_STATISTICS, *PTOKEN_STATISTICS;
  typedef struct _TOKEN_USER {
  	SID_AND_ATTRIBUTES User;

Index: wtypes.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wtypes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wtypes.h	4 Jul 2002 02:20:43 -0000	1.5
--- wtypes.h	9 Jul 2002 13:29:21 -0000	1.6
***************
*** 1,2 ****
--- 1,5 ----
+ #include <rpc.h>
+ #include <rpcndr.h>
+ 
  #ifndef _WTYPES_H
  #define _WTYPES_H

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

Modified Files:
	ChangeLog README.w32api 
Log Message:
Merge changes from Cygwin

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** ChangeLog	9 Jul 2002 02:37:32 -0000	1.99
--- ChangeLog	9 Jul 2002 13:29:21 -0000	1.100
***************
*** 8,11 ****
--- 8,88 ----
  	* include/wtypes.h (HMETAFILEPICT): Add typedef.
  
+ 2002-07-04  Danny Smith  <dan...@us...>
+ 
+ 	* include/rpc.h: Conditionally include <windows.h> before
+ 	header guard.
+ 	* include/wtypes.h: Include <rpc.h> and <rpcndr.h> before
+ 	header guard.
+ 
+ 
+ 2002-07-02  Danny Smith <dan...@us...>
+ 
+ 	* include/commctrl.h (WC_*): Remove some duplicate defines.
+ 
+ 2002-07-02  Ken Fitlike  <ken...@ho...>
+ 
+ 	* include/commctrl.h (WC_IPADDRESS[AW]): Add defines and
+ 	UNICODE mappings.
+ 	(IPM*): Add defines.
+ 	(IPN_*): Add defines.
+ 	(NMIPADDRESS): Add structure and typedefs.
+ 	(MAKEIPADDRESS): Add macro.
+ 	(MAKEIPRANGE): Add macro.
+ 	(FIRST_IPADDRESS): Add macro.
+ 	(SECOND_IPADDRESS): Add macro.
+ 	(THIRD_IPADDRESS): Add macro.
+ 	(FOURTH_IPADDRESS): Add macro.
+ 
+ 2002-06-25  Conrad Scott  <con...@ds...>
+ 
+ 	* include/winbase.h (FILE_FLAG_FIRST_PIPE_INSTANCE): Add constant.
+ 
+ 2002-06-26  Casper S. Hornstrup  <ch...@us...>
+ 
+ 	* include/winbase.h (WINBASEAPI): Don't define if prior
+ 	definition.
+ 
+ 	* include/winioctl.h (PARTITION_FAT32, PARTITION_FAT32_XINT13,
+ 	PARTITION_XINT13, PARTITION_XINT13_EXTENDED, PARTITION_LDM,
+ 	PARTITION_UNIX): Add defines.
+ 	(PDRIVE_LAYOUT_INFORMATION): Add typedef.
+ 	(IsRecognizedPartition): Also check for PARTITION_FAT32,
+ 	PARTITION_FAT32_XINT13 and PARTITION_XINT13.
+ 	(IsContainerPartition): Add macro.
+ 
+ 2002-06-25  Ken Fitlike  <ken...@ho...>
+ 
+ 	* include/commctrl.h: (CBEIF_*): Add defines.
+ 	(CBEN_*): Add defines and UNICODE mappings
+ 	(WC_COMBOBOXEX[AW]): Add defines and UNICODE mappings.
+ 	(CBEMAXSTRLEN): Add define.
+ 	(COMBOBOXEXITEM[AW]): Add structures and typedefs.
+ 	(NMCOMBOBOXEX[AW]): Add structures and typedefs.
+ 	(NMCBEDRAGBEGIN[AW]): Add structure and typedefs.
+ 	(NMCBEENDEDIT[AW]): Add structure and typedefs.
+ 
+ 2002-06-24  Danny Smith  <dan...@us...>
+ 
+ 	* include/objidl.h (struct tagPROPVARIANT): Kill obsolete
+ 	union member _VARIANT_BOOL bool.
+ 	
+ 2002-06-24  Danny Smith  <dan...@us...>
+ 
+ 	* include/winioctl.h (FILE_SPECIAL_ACCESS): Add define.
+ 
+ 2002-06-24  Casper S. Hornstrup  <ch...@us...>
+ 
+ 	* include/winnt.h (PCCHAR, FCHAR, FSHORT, FLONG,
+ 	PLUID_AND_ATTRIBUTES,PSECURITY_IMPERSONATION_LEVEL,
+ 	PSID_AND_ATTRIBUTES, PTOKEN_TYPE, PTOKEN_STATISTICS):
+ 	Add typedefs.
+ 	(CCHAR): Correct typedef.
+ 	(PROCESS_SET_SESSIONID, SECURITY_*,SECTION_MAP_EXECUTE):
+ 	Add defines.
+ 
+ 2002-06-24  Casper S. Hornstrup  <ch...@us...>
+ 
+ 	* README.w32api: Correct spelling error.
+ 
  2002-06-19  Casper S. Hornstrup  <ch...@us...>
  

Index: README.w32api
===================================================================
RCS file: /cvsroot/mingw/w32api/README.w32api,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README.w32api	14 Jun 2002 13:52:13 -0000	1.1
--- README.w32api	9 Jul 2002 13:29:21 -0000	1.2
***************
*** 19,23 ****
    You may distribute this library as part of another package or as a
    modified package if and only if you do *not* restrict others freedoms as
!   set forth in the above paragraph as it concerns this pakcage.  You do have
    the right to restrict uses of any package using this package.
  
--- 19,23 ----
    You may distribute this library as part of another package or as a
    modified package if and only if you do *not* restrict others freedoms as
!   set forth in the above paragraph as it concerns this package.  You do have
    the right to restrict uses of any package using this package.
  

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

Added Files:
	ntdll.def 
Log Message:
Merge cygwin changes

--- NEW FILE: ntdll.def ---
;note that the Zw... functions are alternate names for the
;Nt... functions.  (see www.sysinternals.com for details)
;if you change a Nt.. function DON'T FORGET to change the
;Zw one too.

LIBRARY ntdll.dll
EXPORTS

DbgBreakPoint@0
DbgPrint
DbgUiConnectToDbg@0
DbgUiContinue@8
DbgUiWaitStateChange@8
DbgUserBreakPoint@0
LdrGetProcedureAddress@16
LdrProcessRelocationBlock@16
NlsAnsiCodePage
NlsMbCodePageTag
NlsMbOemCodePageTag
NtAllocateVirtualMemory@24
NtClose@4
NtCreateFile@44
NtCurrentTeb@0
NtDisplayString@4
NtFlushVirtualMemory@16
NtFreeVirtualMemory@16
NtLockVirtualMemory@16
NtOpenFile@24
NtProtectVirtualMemory@20
NtQueryVirtualMemory@24
NtReadFile@36
NtReadVirtualMemory@20
NtShutdownSystem@4
NtUnlockVirtualMemory@16
NtWriteFile@36
NtWriteVirtualMemory@20
RtlAcquirePebLock@0
RtlAllocateAndInitializeSid@44
RtlAllocateHandle@8
RtlAllocateHeap@12
RtlAnsiCharToUnicodeChar@4
RtlAnsiStringToUnicodeSize@4
RtlAnsiStringToUnicodeString@12
RtlAppendAsciizToString@8
RtlAppendStringToString@8
RtlAppendUnicodeStringToString@8
RtlAppendUnicodeToString@8
RtlAreBitsClear@12
RtlAreBitsSet@12
RtlCharToInteger@12
RtlClearAllBits@4
RtlClearBits@12
RtlCompareMemory@12
RtlCompareMemoryUlong@12
RtlCompareString@12
RtlCompareUnicodeString@12
RtlConvertSidToUnicodeString@12
RtlCopySid@12
RtlCopyString@8
RtlCopyUnicodeString@8
RtlCreateEnvironment@8
RtlCreateHeap@24
RtlCreateProcessParameters@40
RtlCreateUnicodeString@8
RtlDeNormalizeProcessParams@4
RtlDestroyEnvironment@4
RtlDestroyHandleTable@4
RtlDestroyHeap@4
RtlDestroyProcessParameters@4
RtlDetermineDosPathNameType_U@4
RtlDoesFileExists_U@4
RtlDosPathNameToNtPathName_U@16
RtlDosSearchPath_U@24
RtlDowncaseUnicodeString@12
RtlEnumProcessHeaps@8
RtlEqualComputerName@8
RtlEqualDomainName@8
RtlEqualPrefixSid@8
RtlEqualSid@8
RtlEqualString@12
RtlEqualUnicodeString@12
RtlEraseUnicodeString@4
RtlExpandEnvironmentStrings_U@16
RtlFillMemory@12
RtlFillMemoryUlong@12
RtlFindClearBits@12
RtlFindClearBitsAndSet@12
RtlFindLongestRunClear@8
RtlFindLongestRunSet@8
RtlFindSetBits@12
RtlFindSetBitsAndClear@12
RtlFreeAnsiString@4
RtlFreeHandle@8
RtlFreeHeap@12
RtlFreeOemString@4
RtlFreeSid@4
RtlFreeUnicodeString@4
RtlGetCurrentDirectory_U@8
RtlGetFullPathName_U@16
RtlGetLongestNtPathLength@0
RtlGetNtGlobalFlags@0
RtlGetProcessHeaps@8
RtlIdentifierAuthoritySid@4
RtlImageDirectoryEntryToData@16
RtlImageNtHeader@4
RtlImageRvaToSection@12
RtlImageRvaToVa@16
RtlInitAnsiString@8
RtlInitCodePageTable@8
RtlInitNlsTables@16
RtlInitString@8
RtlInitUnicodeString@8
RtlInitializeBitMap@12
RtlInitializeHandleTable@12
RtlInitializeSid@12
RtlIntegerToChar@16
RtlIntegerToUnicodeString@12
RtlIsDosDeviceName_U@4
RtlIsNameLegalDOS8Dot3@12
RtlIsValidHandle@8
RtlIsValidIndexHandle@12
RtlLengthRequiredSid@4
RtlLengthSid@4
RtlLockHeap@4
RtlMoveMemory@12
RtlNormalizeProcessParams@4
RtlNtStatusToDosError@4
RtlNumberOfClearBits@4
RtlNumberOfSetBits@4
RtlOemStringToUnicodeSize@4
RtlOemStringToUnicodeString@12
RtlOemToUnicodeN@12
RtlPrefixString@12
RtlPrefixUnicodeString@12
RtlQueryEnvironmentVariable_U@12
RtlReAllocateHeap@16
RtlReleasePebLock@0
RtlResetRtlTranslations@4
RtlSetAllBits@4
RtlSetBits@12
RtlSetCurrentDirectory_U@4
RtlSetCurrentEnvironment@8
RtlSetEnvironmentVariable@12
RtlSizeHeap@12
RtlSubAuthorityCountSid@4
RtlSubAuthoritySid@8
RtlUnicodeStringToAnsiSize@4
RtlUnicodeStringToAnsiString@12
RtlUnicodeStringToCountedOemString@12
RtlUnicodeStringToOemSize@4
RtlUnicodeStringToOemString@12
RtlUnicodeToMultiByteN@20
RtlUnicodeToMultiByteSize@12
RtlUnicodeToOemN@20
RtlUnlockHeap@4
RtlUpcaseUnicodeChar@4
RtlUpcaseUnicodeString@12
RtlUpcaseUnicodeStringToAnsiString@12
RtlUpcaseUnicodeStringToCountedOemString@12
RtlUpcaseUnicodeStringToOemString@12
RtlUpcaseUnicodeToMultiByteN@20
RtlUpcaseUnicodeToOemN@20
RtlUpperChar@4
RtlUpperString@12
RtlValidSid@4
RtlValidateHeap@12
RtlValidateProcessHeaps@0
RtlZeroMemory@8
RtlxAnsiStringToUnicodeSize@4
RtlxOemStringToUnicodeSize@4
RtlxUnicodeStringToAnsiSize@4
RtlxUnicodeStringToOemSize@4
ZwAllocateVirtualMemory@24
ZwClose@4
ZwCreateFile@44
ZwFlushVirtualMemory@16
ZwFreeVirtualMemory@16
ZwLockVirtualMemory@16
ZwOpenFile@24
ZwProtectVirtualMemory@20
ZwQueryVirtualMemory@24
ZwReadFile@36
ZwReadVirtualMemory@20
ZwUnlockVirtualMemory@16
ZwWriteFile@36 
ZwWriteVirtualMemory@20
__isascii
__iscsym
__iscsymf
__toascii
_itoa
_itow
_ltoa
_ltow
_snprintf
_snwprintf
_strcmpi
_stricmp
_strlwr
_strnicmp
_strupr
_tolower
_toupper
_ultoa
_ultow
_vsnprintf
_wcsicmp
_wcslwr
_wcsnicmp
_wcsupr
_wtoi
_wtol
abs
atan
atoi
atol
ceil
cos
fabs
floor
isalnum
isalpha
iscntrl
isdigit
isgraph
islower
isprint
ispunct
isspace
isupper
iswalpha
iswctype
isxdigit
labs
log
mbstowcs
memchr
memcmp
memcpy
memmove
memset
pow
sin
sprintf
sqrt
strcat
strchr
strcmp
strcpy
strcspn
strlen
strncat
strncmp
strncpy
strpbrk
strrchr
strspn
strstr
strtol
strtoul
swprintf
tan
tolower
toupper
towlower
towupper
vsprintf
wcscat
wcschr
wcscmp
wcscpy
wcscspn
wcslen
wcsncat
wcsncmp
wcsncpy
wcspbrk
wcsrchr
wcsspn
wcsstr
wcstol
wcstombs
wcstoul

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

Added Files:
	ntdll.h 
Log Message:
Merge cygwin changes

--- NEW FILE: ntdll.h ---
#ifndef _NTDLL_H
#define _NTDLL_H
#if __GNUC__ >=3
#pragma GCC system_header
#endif

typedef enum _SHUTDOWN_ACTION {
     ShutdownNoReboot,
     ShutdownReboot,
     ShutdownPowerOff
 } SHUTDOWN_ACTION;

DWORD WINAPI NtShutdownSystem (SHUTDOWN_ACTION Action);

#endif /* _NTDLL_H */

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

Modified Files:
	ChangeLog 
Log Message:
	* include/winbase.h (OpenThread): Add prototype.
	* lib/kernel32.def (OpenThread): Add symbol.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** ChangeLog	4 Jul 2002 02:20:43 -0000	1.98
--- ChangeLog	9 Jul 2002 02:37:32 -0000	1.99
***************
*** 1,2 ****
--- 1,7 ----
+ 2002-07-05  Luke Dunstan  <in...@us...>
+ 
+ 	* include/winbase.h (OpenThread): Add prototype.
+ 	* lib/kernel32.def (OpenThread): Add symbol.
+ 
  2002-07-04  Luke Dunstan  <in...@us...>
  

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

Modified Files:
	kernel32.def 
Log Message:
	* include/winbase.h (OpenThread): Add prototype.
	* lib/kernel32.def (OpenThread): Add symbol.



Index: kernel32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/kernel32.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kernel32.def	14 Jun 2002 11:44:47 -0000	1.3
--- kernel32.def	9 Jul 2002 02:37:32 -0000	1.4
***************
*** 503,506 ****
--- 503,507 ----
  OpenSemaphoreA@12
  OpenSemaphoreW@12
+ OpenThread@12
  OpenWaitableTimerA@12
  OpenWaitableTimerW@12

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

Modified Files:
	winbase.h 
Log Message:
	* include/winbase.h (OpenThread): Add prototype.
	* lib/kernel32.def (OpenThread): Add symbol.



Index: winbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winbase.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** winbase.h	20 Jun 2002 16:18:03 -0000	1.12
--- winbase.h	9 Jul 2002 02:37:32 -0000	1.13
***************
*** 1408,1411 ****
--- 1408,1414 ----
  HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
  HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
+ #if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
+ HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD);
+ #endif
  BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
  HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR);

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

Modified Files:
	ChangeLog 
Log Message:
* include/wtypes.h (HMETAFILEPICT): Add typedef.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** ChangeLog	20 Jun 2002 16:18:02 -0000	1.97
--- ChangeLog	4 Jul 2002 02:20:43 -0000	1.98
***************
*** 1,2 ****
--- 1,6 ----
+ 2002-07-04  Luke Dunstan  <in...@us...>
+ 
+ 	* include/wtypes.h (HMETAFILEPICT): Add typedef.
+ 
  2002-06-19  Casper S. Hornstrup  <ch...@us...>
  

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

Modified Files:
	wtypes.h 
Log Message:
* include/wtypes.h (HMETAFILEPICT): Add typedef.

Index: wtypes.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/wtypes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wtypes.h	9 Apr 2002 21:17:17 -0000	1.4
--- wtypes.h	4 Jul 2002 02:20:43 -0000	1.5
***************
*** 164,167 ****
--- 164,168 ----
  	} DUMMYUNIONNAME2;
  } DECIMAL;
+ typedef void *HMETAFILEPICT;
  #ifdef __cplusplus
  }