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

Update of /cvsroot/mingw/msys/dvlpr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22527

Modified Files:
	ChangeLog 
Log Message:

	* doc/msys/MSYS-1.0.10-changes.rtf: Update for move of Environment
	Variable munging and add section for 1.0.11 version.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ChangeLog	2 Feb 2004 14:23:00 -0000	1.38
--- ChangeLog	24 Feb 2004 18:49:11 -0000	1.39
***************
*** 1,2 ****
--- 1,7 ----
+ 2004.02.24  Earnie Boyd  <ea...@us...>
+ 
+ 	* doc/msys/MSYS-1.0.10-changes.rtf: Update for move of Environment
+ 	Variable munging and add section for 1.0.11 version.
+ 
  2004.02.02  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/msys/dvlpr/doc/msys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22527/doc/msys

Modified Files:
	MSYS-1.0.10-changes.rtf 
Log Message:

	* doc/msys/MSYS-1.0.10-changes.rtf: Update for move of Environment
	Variable munging and add section for 1.0.11 version.



Index: MSYS-1.0.10-changes.rtf
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/doc/msys/MSYS-1.0.10-changes.rtf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsEaHGK5 and /tmp/cvskD8nEE differ

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15066

Modified Files:
	ChangeLog.MSYS cygerrno.h cygheap.cc cygheap.h debug.cc 
	debug.h dtable.cc miscfuncs.cc 
Added Files:
	wsock_event.h 
Log Message:

	* cygerrno.h: Include errno.h.
	* cygheap.c (_cygheap_start): Move definition from here.
	* cygheap.h (_cygheap_start): To here.
	* debug.cc (add_handle): Add parameter.
	* debug.h (add_handle): Ditto.
	(ProtectHandleINH, ProtectHandle1INH, ProtectHandle2INH): New 
	definitions.
	* dtable.cc: Add TRACE_IN throughout.
	* miscfuncs.cc: Include winnls.h.
	(get_cp): New function.
	* include/cygwin/socket.h (SOMAXCONN): Modify value 
	from 5 to 0x7fffffff.
	(MSG_WINMASK): New constant.
	(MSG_NOSIGNAL): Ditto.
	(IPTOS_LOWDELAY, IPTOS_THROUGHPUT, IPTOS_RELIABILITY): Filter
	definition based on IPTOS_LOWDELAY being defined or not.
	(TCP_NODELAY, TCP_MAXSEG): Filter definition based on TCP_NODELAY
	being defined or not.



--- NEW FILE: wsock_event.h ---
/* wsock_event.h: Defining the wsock_event class

   Copyright 2002 Red Hat, Inc.

This file is part of Cygwin.

This software is a copyrighted work licensed under the terms of the
Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
details. */

#ifndef __WSOCK_EVENT_H__
#define __WSOCK_EVENT_H__

class wsock_event
{
  WSAEVENT		event;
  WSAOVERLAPPED		ovr;
public:
  wsock_event () : event (NULL) {};
  ~wsock_event ()
    {
      if (event)
	WSACloseEvent (event);
      event = NULL;
    };

  /* The methods are implemented in net.cc */
  LPWSAOVERLAPPED prepare ();
  int wait (int socket, LPDWORD flags);
};

#endif /* __WSOCK_EVENT_H__ */

Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** ChangeLog.MSYS	11 Oct 2003 14:35:26 -0000	1.57
--- ChangeLog.MSYS	24 Feb 2004 18:17:29 -0000	1.58
***************
*** 1,2 ****
--- 1,23 ----
+ 2004-02-24  Earnie Boyd  <ea...@us...>
+ 
+ 	* cygerrno.h: Include errno.h.
+ 	* cygheap.c (_cygheap_start): Move definition from here.
+ 	* cygheap.h (_cygheap_start): To here.
+ 	* debug.cc (add_handle): Add parameter.
+ 	* debug.h (add_handle): Ditto.
+ 	(ProtectHandleINH, ProtectHandle1INH, ProtectHandle2INH): New 
+ 	definitions.
+ 	* dtable.cc: Add TRACE_IN throughout.
+ 	* miscfuncs.cc: Include winnls.h.
+ 	(get_cp): New function.
+ 	* include/cygwin/socket.h (SOMAXCONN): Modify value 
+ 	from 5 to 0x7fffffff.
+ 	(MSG_WINMASK): New constant.
+ 	(MSG_NOSIGNAL): Ditto.
+ 	(IPTOS_LOWDELAY, IPTOS_THROUGHPUT, IPTOS_RELIABILITY): Filter
+ 	definition based on IPTOS_LOWDELAY being defined or not.
+ 	(TCP_NODELAY, TCP_MAXSEG): Filter definition based on TCP_NODELAY
+ 	being defined or not.
+ 	
  2003-10-11  Earnie Boyd  <ea...@us...>
  

Index: cygerrno.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/cygerrno.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cygerrno.h	7 Aug 2001 17:51:07 -0000	1.1.1.1
--- cygerrno.h	24 Feb 2004 18:17:29 -0000	1.2
***************
*** 9,12 ****
--- 9,14 ----
  details. */
  
+ #include <errno.h>
+ 
  void __stdcall seterrno_from_win_error (const char *file, int line, DWORD code) __attribute__ ((regparm(3)));
  void __stdcall seterrno (const char *, int line) __attribute__ ((regparm(2)));

Index: cygheap.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/cygheap.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cygheap.cc	17 Feb 2003 21:05:54 -0000	1.3
--- cygheap.cc	24 Feb 2004 18:17:29 -0000	1.4
***************
*** 46,50 ****
  extern "C" {
  static void __stdcall _cfree (void *ptr) __attribute__((regparm(1)));
- extern void *_cygheap_start;
  }
  
--- 46,49 ----

Index: cygheap.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/cygheap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cygheap.h	15 Oct 2001 22:22:32 -0000	1.2
--- cygheap.h	24 Feb 2004 18:17:29 -0000	1.3
***************
*** 189,191 ****
--- 189,192 ----
  char *__stdcall cstrdup1 (const char *) __attribute__ ((regparm(1)));
  void __stdcall cygheap_init ();
+ extern DWORD _cygheap_start;
  }

Index: debug.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/debug.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debug.cc	15 Oct 2001 22:22:32 -0000	1.2
--- debug.cc	24 Feb 2004 18:17:29 -0000	1.3
***************
*** 253,257 ****
  /* Add a handle to the linked list of known handles. */
  void __stdcall
! add_handle (const char *func, int ln, HANDLE h, const char *name)
  {
    handle_list *hl;
--- 253,257 ----
  /* Add a handle to the linked list of known handles. */
  void __stdcall
! add_handle (const char *func, int ln, HANDLE h, const char *name, bool inh)
  {
    handle_list *hl;

Index: debug.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/debug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** debug.h	18 Apr 2003 12:16:47 -0000	1.3
--- debug.h	24 Feb 2004 18:17:29 -0000	1.4
***************
*** 49,52 ****
--- 49,55 ----
  # define ProtectHandle1(h,n) do {} while (0)
  # define ProtectHandle2(h,n) do {} while (0)
+ # define ProtectHandleINH(h) do {} while (0)
+ # define ProtectHandle1INH(h,n) do {} while (0)
+ # define ProtectHandle2INH(h,n) do {} while (0)
  # define debug_init() do {} while (0)
  # define setclexec_pid(h, b) do {} while (0)
***************
*** 71,77 ****
  # define ProtectHandle1(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n)
  # define ProtectHandle2(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), n)
  
  void debug_init ();
! void __stdcall add_handle (const char *, int, HANDLE, const char *)
    __attribute__ ((regparm (3)));
  BOOL __stdcall close_handle (const char *, int, HANDLE, const char *, BOOL)
--- 74,83 ----
  # define ProtectHandle1(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n)
  # define ProtectHandle2(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), n)
+ # define ProtectHandleINH(h) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h, 1)
+ # define ProtectHandle1INH(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n, 1)
+ # define ProtectHandle2INH(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), n, 1)
  
  void debug_init ();
! void __stdcall add_handle (const char *, int, HANDLE, const char *, bool = false)
    __attribute__ ((regparm (3)));
  BOOL __stdcall close_handle (const char *, int, HANDLE, const char *, BOOL)

Index: dtable.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/dtable.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dtable.cc	15 Oct 2001 22:22:32 -0000	1.2
--- dtable.cc	24 Feb 2004 18:17:29 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  dtable_init (void)
  {
+   TRACE_IN;
    if (!cygheap->fdtab.size)
      cygheap->fdtab.extend (NOFILE_INCR);
***************
*** 47,50 ****
--- 48,52 ----
  set_std_handle (int fd)
  {
+   TRACE_IN;
    if (fd == 0)
      SetStdHandle (std_consts[fd], cygheap->fdtab[fd]->get_handle ());
***************
*** 56,59 ****
--- 58,62 ----
  dtable::dec_console_fds ()
  {
+   TRACE_IN;
    if (console_fds > 0 && !--console_fds && myself->ctty != TTY_CONSOLE)
      FreeConsole ();
***************
*** 63,66 ****
--- 66,70 ----
  dtable::extend (int howmuch)
  {
+   TRACE_IN;
    int new_size = size + howmuch;
    fhandler_base **newfds;
***************
*** 96,99 ****
--- 100,104 ----
  stdio_init (void)
  {
+   TRACE_IN;
    extern void set_console_ctty ();
    /* Set these before trying to output anything from strace.
***************
*** 137,140 ****
--- 142,146 ----
  dtable::find_unused_handle (int start)
  {
+   TRACE_IN;
    AssertResourceOwner (LOCK_FD_LIST, READ_LOCK);
  
***************
*** 153,156 ****
--- 159,163 ----
  dtable::release (int fd)
  {
+   TRACE_IN;
    if (!not_open (fd))
      {
***************
*** 173,176 ****
--- 180,184 ----
  				  DWORD myaccess, const char *name)
  {
+   TRACE_IN;
    int bin;
  
***************
*** 221,224 ****
--- 229,233 ----
  			      DWORD myaccess)
  {
+   TRACE_IN;
    if (fd == -1)
      fd = cygheap->fdtab.find_unused_handle ();
***************
*** 231,234 ****
--- 240,244 ----
  dtable::build_fhandler (int fd, const char *name, HANDLE handle)
  {
+   TRACE_IN;
    int unit;
    DWORD devn;
***************
*** 263,266 ****
--- 273,277 ----
  dtable::build_fhandler (int fd, DWORD dev, const char *name, int unit)
  {
+   TRACE_IN;
    fhandler_base *fh;
    void *buf = ccalloc (HEAP_FHANDLER, 1, sizeof (fhandler_union) + 100);
***************
*** 341,344 ****
--- 352,356 ----
  dtable::dup_worker (fhandler_base *oldfh)
  {
+   TRACE_IN;
    fhandler_base *newfh = build_fhandler (-1, oldfh->get_device (), NULL);
    *newfh = *oldfh;
***************
*** 360,363 ****
--- 372,376 ----
  dtable::dup2 (int oldfd, int newfd)
  {
+   TRACE_IN;
    int res = -1;
    fhandler_base *newfh = NULL;	// = NULL to avoid an incorrect warning
***************
*** 425,428 ****
--- 438,442 ----
  dtable::select_read (int fd, select_record *s)
  {
+   TRACE_IN;
    if (not_open (fd))
      {
***************
*** 442,445 ****
--- 456,460 ----
  dtable::select_write (int fd, select_record *s)
  {
+   TRACE_IN;
    if (not_open (fd))
      {
***************
*** 459,462 ****
--- 474,478 ----
  dtable::select_except (int fd, select_record *s)
  {
+   TRACE_IN;
    if (not_open (fd))
      {
***************
*** 478,481 ****
--- 494,498 ----
  dtable::fixup_before_fork (DWORD target_proc_id)
  {
+   TRACE_IN;
    SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_fork");
    fhandler_base *fh;
***************
*** 492,495 ****
--- 509,513 ----
  dtable::fixup_before_exec (DWORD target_proc_id)
  {
+   TRACE_IN;
    SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_exec");
    fhandler_base *fh;
***************
*** 506,509 ****
--- 524,528 ----
  dtable::fixup_after_exec (HANDLE parent)
  {
+   TRACE_IN;
    first_fd_for_open = 0;
    fhandler_base *fh;
***************
*** 528,531 ****
--- 547,551 ----
  dtable::fixup_after_fork (HANDLE parent)
  {
+   TRACE_IN;
    fhandler_base *fh;
    for (size_t i = 0; i < size; i++)
***************
*** 547,550 ****
--- 567,571 ----
  dtable::vfork_child_dup ()
  {
+   TRACE_IN;
    fhandler_base **newtable;
    SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
***************
*** 575,578 ****
--- 596,600 ----
  dtable::vfork_parent_restore ()
  {
+   TRACE_IN;
    SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "restore");
  
***************
*** 590,593 ****
--- 612,616 ----
  dtable::vfork_child_fixup ()
  {
+   TRACE_IN;
    if (!fds_on_hold)
      return;

Index: miscfuncs.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/miscfuncs.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** miscfuncs.cc	15 Oct 2001 22:22:33 -0000	1.2
--- miscfuncs.cc	24 Feb 2004 18:17:29 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
  #include "cygerrno.h"
  #include <sys/errno.h>
+ #include <winnls.h>
  
  /********************** String Helper Functions ************************/
***************
*** 154,155 ****
--- 155,163 ----
    return __err;
  }
+ 
+ UINT
+ get_cp ()
+ {
+   return current_codepage == ansi_cp ? GetACP() : GetOEMCP();
+ }
+ 

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15066/include/cygwin

Modified Files:
	socket.h 
Log Message:

	* cygerrno.h: Include errno.h.
	* cygheap.c (_cygheap_start): Move definition from here.
	* cygheap.h (_cygheap_start): To here.
	* debug.cc (add_handle): Add parameter.
	* debug.h (add_handle): Ditto.
	(ProtectHandleINH, ProtectHandle1INH, ProtectHandle2INH): New 
	definitions.
	* dtable.cc: Add TRACE_IN throughout.
	* miscfuncs.cc: Include winnls.h.
	(get_cp): New function.
	* include/cygwin/socket.h (SOMAXCONN): Modify value 
	from 5 to 0x7fffffff.
	(MSG_WINMASK): New constant.
	(MSG_NOSIGNAL): Ditto.
	(IPTOS_LOWDELAY, IPTOS_THROUGHPUT, IPTOS_RELIABILITY): Filter
	definition based on IPTOS_LOWDELAY being defined or not.
	(TCP_NODELAY, TCP_MAXSEG): Filter definition based on TCP_NODELAY
	being defined or not.



Index: socket.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin/socket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** socket.h	15 Oct 2001 22:22:33 -0000	1.2
--- socket.h	24 Feb 2004 18:17:29 -0000	1.3
***************
*** 107,111 ****
  
  /* Maximum queue length specificable by listen.  */
! #define SOMAXCONN       5
  
  /* Flags we can use with send/ and recv. */
--- 107,111 ----
  
  /* Maximum queue length specificable by listen.  */
! #define SOMAXCONN       0x7fffffff
  
  /* Flags we can use with send/ and recv. */
***************
*** 113,116 ****
--- 113,118 ----
  #define MSG_PEEK        0x2             /* peek at incoming message */
  #define MSG_DONTROUTE   0x4             /* send without using routing tables */
+ #define MSG_WINMASK     0x7             /* flags understood by WinSock calls */
+ #define MSG_NOSIGNAL    0x20            /* Don't raise SIGPIPE */
  
  /* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */
***************
*** 124,130 ****
--- 126,134 ----
  
  /* IP options */
+ #ifndef IPTOS_LOWDELAY
  #define	IPTOS_LOWDELAY		0x10
  #define	IPTOS_THROUGHPUT	0x08
  #define	IPTOS_RELIABILITY	0x04
+ #endif
  
  /* These need to appear somewhere around here */
***************
*** 149,154 ****
--- 153,160 ----
  
  /* TCP options - this way around because someone left a set in the c library includes */
+ #ifndef TCP_NODELAY
  #define TCP_NODELAY     0x0001
  #define TCP_MAXSEG	2
+ #endif
  
  /* The various priorities. */

Update of /cvsroot/mingw/utils/reimp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28686/reimp

Modified Files:
	reimp.c 
Log Message:
Quote library names in reimp (Daan Leijen).

Index: reimp.c
===================================================================
RCS file: /cvsroot/mingw/utils/reimp/reimp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** reimp.c	10 Apr 2002 13:39:07 -0000	1.1
--- reimp.c	20 Feb 2004 11:55:09 -0000	1.2
***************
*** 236,240 ****
  
    /* print header */
!   fprintf (df->f, "LIBRARY %s\nEXPORTS\n", dll);
  
    /* set dllname */
--- 236,240 ----
  
    /* print header */
!   fprintf (df->f, "LIBRARY \"%s\"\nEXPORTS\n", dll);
  
    /* set dllname */

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

Modified Files:
	ChangeLog 
Log Message:
Quote library names in reimp (Daan Leijen).

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/utils/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	25 Nov 2003 16:53:22 -0000	1.9
--- ChangeLog	20 Feb 2004 11:55:08 -0000	1.10
***************
*** 1,2 ****
--- 1,16 ----
+ 2003-11-25 18:18  jrfonseca
+ 
+ 	* drmingw/: bucomm.h, budbg.h, debug.c, debug.h, debugx.c,
+ 	exchndl.c, ieee.c, ieee.h, prdbg.c, rdcoff.c, rddbg.c, stabs.c,
+ 	symbols.c, include/dis-asm.h, include/filenames.h,
+ 	include/getopt.h, include/libcoff.h, include/libiberty.h,
+ 	include/safe-ctype.h: Merge with latest binutils source.
+ 
+ 2003-11-25 16:53  jrfonseca
+ 
+ 	* ChangeLog, configure.ac, scripts/dsw2mak.in: Version bump.
+ 	Removed some redundant funciton checks in autoconf. Update
+ 	changelog.
+ 
  2003-11-25 16:51  jrfonseca
  

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

Modified Files:
	ChangeLog 
Log Message:
2004-02-18	Nathan Fisher <nf...@us...>

	* ChangeLog: Updated.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/htdocs/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** ChangeLog	29 Dec 2003 19:18:03 -0000	1.143
--- ChangeLog	18 Feb 2004 18:46:23 -0000	1.144
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-02-18	Nathan Fisher <nf...@us...>
+ 
+ 	* links.shtml: Add libunicow reference to the page.
+ 
  2003-12-29  Earnie Boyd  <ea...@us...>
  

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

Modified Files:
	links.shtml 
Log Message:
2004-02-18	Nathan Fisher <nf...@us...>

	* links.html: Add libunicode link to Windows32 Programmer section.



Index: links.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/links.shtml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** links.shtml	1 Mar 2003 17:55:00 -0000	1.28
--- links.shtml	18 Feb 2004 18:27:13 -0000	1.29
***************
*** 39,43 ****
                  <tr>
                    <td>
!                     <!-- ======================================================================= --><!--                                                                         --><!--                               Main Body                                 --><!--                                                                         -->
                      <h3 class="c1">
                        MinGW
--- 39,46 ----
                  <tr>
                    <td>
!                     <!-- ======================================================================= -->
! 										<!--                                                                         -->
! 										<!--                               Main Body                                 -->
! 										<!--                                                                         -->
                      <h3 class="c1">
                        MinGW
***************
*** 153,156 ****
--- 156,165 ----
                          http://webclub.kcom.ne.jp/ma/colinp/win32/index.html</a>
                        </li>
+ 											<li>
+ 												Libunicows is a Unicode implementation for use
+ 												across the range of Win32 platforms it can be found
+ 												at <a href="http://libunicows.sourceforge.net/">
+ 												http://libunicows.sourceforge.net/</a>
+ 											</li>
                      </ul>
                      <h3>

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

Modified Files:
	ChangeLog Makefile.in TODO 
Log Message:
Merge winsup changes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** ChangeLog	12 Sep 2003 13:26:50 -0000	1.119
--- ChangeLog	15 Feb 2004 07:34:59 -0000	1.120
***************
*** 1,2 ****
--- 1,1051 ----
+ 2004-02-13  Earnie Boyd  <ea...@us...>
+ 
+ 	* include/ddk/winddk.h (DIRECTORY_QUERY): Add define.
+ 	(DIRECTORY_TRAVERSE): Ditto.
+ 	(DIRECTORY_CREATE_OBJECT): Ditto.
+ 	(DIRECTORY_CREATE_SUBDIRECTORY): Ditto.
+ 	(DIRECTORY_ALL_ACCESS): Ditto.
+ 	Thanks to Konstantin Stepaniuk <sk...@us...>
+ 
[...1022 lines suppressed...]
+ 	OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF, LPPOINTF, CONTROLINFO,
+ 	LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO,
+ 	CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD,
+ 	PROPPAGEINFO, LPPROPPAGEINFO): ... to here, for consistency
+ 	with documentation.
+ 	* include/olectl.h: Do #include <ocidl.h>.
+ 	* include/ocidl.h: Don't #include <olectl.h>.
+ 
+ 2003-09-13  Danny Smith  <dan...@us...>
+ 
+ 	* include/winuser.h (_WIN32_WINNT, _WIN32_WINDOWS, WINVER):
+ 	Change guards to use numeric constants, throughout.
+ 
+ 2003-09-15  Earnie Boyd  <ea...@us...>
+ 
+ 	* include/w32api.h: Increment version to 2.5.
+ 	* Makefile.in: Ditto.
+ 
  2003-09-08  Justin Forest <vh...@us...>
  

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.in	12 Sep 2003 13:26:50 -0000	1.16
--- Makefile.in	15 Feb 2004 07:34:59 -0000	1.17
***************
*** 67,71 ****
  
  PACKAGE = w32api
! VERSION = 2.4
  CYGRELEASE = 1
  
--- 67,71 ----
  
  PACKAGE = w32api
! VERSION = 2.5
  CYGRELEASE = 1
  

Index: TODO
===================================================================
RCS file: /cvsroot/mingw/w32api/TODO,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TODO	5 Jun 2001 01:36:37 -0000	1.1.1.1
--- TODO	15 Feb 2004 07:34:59 -0000	1.2
***************
*** 9,15 ****
  Missing functions/defines/structs
  =================================
- CS_ENABLE
- CS_DISABLE
- CS_DELETE_TRANSFORM
  ATF_AVAILABLE
  SERKF_ACTIVE
--- 9,12 ----

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

Modified Files:
	accctrl.h aclapi.h basetyps.h cguid.h commctrl.h cpl.h dbt.h 
	mshtml.h nspapi.h ntsecapi.h oaidl.h objbase.h objidl.h 
	ocidl.h oleacc.h olectl.h oleidl.h prsht.h richedit.h 
	servprov.h setupapi.h shellapi.h shlguid.h shlobj.h shlwapi.h 
	sqlucode.h w32api.h winable.h winbase.h wincon.h wincrypt.h 
	winerror.h wingdi.h winioctl.h winnls.h winnt.h winspool.h 
	winuser.h ws2spi.h wtypes.h 
Added Files:
	afxres.h dhcpcsdk.h errorrep.h tmschema.h uxtheme.h windns.h 
Log Message:
Merge winsup changes

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

#ifdef __cplusplus
extern "C" {
#endif

#ifndef _WINDOWS_H
#include <windows.h>
#endif

/* IDC_STATIC is documented in winuser.h, but not defined. */
#ifndef IDC_STATIC
#define IDC_STATIC (-1)
#endif

#ifdef __cplusplus
}
#endif
#endif

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

#ifdef __cplusplus
extern "C" {
#endif

#if (_WIN32_WINNT >= 0x0500)
#define DHCPCAPI_REGISTER_HANDLE_EVENT 0x00000001
#define DHCPCAPI_REQUEST_PERSISTENT  0x00000001
#define DHCPCAPI_REQUEST_SYNCHRONOUS 0x00000002
typedef struct _DHCPAPI_CLASSID {
	ULONG Flags;
	LPBYTE Data;
	ULONG nBytesData;
} DHCPCAPI_CLASSID,*PDHCPCAPI_CLASSID,*LPDHCPCAPI_CLASSID;
typedef struct _DHCPAPI_PARAMS {
	ULONG Flags;
	ULONG OptionId;
	BOOL IsVendor;
	LPBYTE Data;
	DWORD nBytesData;
} DHCPAPI_PARAMS,*PDHCPAPI_PARAMS,*LPDHCPAPI_PARAMS;
typedef struct _DHCPAPI_PARAMS_ARRAY {
	ULONG nParams;
	LPDHCPAPI_PARAMS Params;
} DHCPCAPI_PARAMS_ARRAY,*PDHCPCAPI_PARAMS_ARRAY,*LPDHCPCAPI_PARAMS_ARRAY;
VOID WINAPI DhcpCApiCleanup(void);
DWORD WINAPI DhcpCApiInitialize(LPDWORD);
DWORD WINAPI DhcpDeRegisterParamChange(DWORD,LPVOID,LPVOID);
DWORD WINAPI DhcpRegisterParamChange(DWORD,LPVOID,PWSTR,LPDHCPCAPI_CLASSID,DHCPCAPI_PARAMS_ARRAY,LPVOID);
DWORD WINAPI DhcpRemoveDNSRegistrations(void);
DWORD WINAPI DhcpUndoRequestParams(DWORD,LPVOID,LPWSTR,LPWSTR);
#endif /* (_WIN32_WINNT >= 0x0500) */

#ifdef __cplusplus
}
#endif
#endif

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

#ifdef __cplusplus
extern "C" {
#endif

#if (_WIN32_WINNT >= 0x0501)
typedef enum {
	frrvErr = 3,
	frrvErrNoDW = 4,
	frrvErrTimeout = 5,
	frrvLaunchDebugger = 6,
	frrvOk = 0,
	frrvOkHeadless = 7,
	frrvOkManifest = 1,
	frrvOkQueued = 2
} EFaultRepRetVal;
BOOL WINAPI AddERExcludedApplicationA(LPCSTR);
BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);
EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);
#endif

#ifdef UNICODE
#if (_WIN32_WINNT >= 0x0501)
#define AddERExcludedApplication AddERExcludedApplicationW
#endif
#else
#if (_WIN32_WINNT >= 0x0501)
#define AddERExcludedApplication AddERExcludedApplicationA
#endif
#endif

#ifdef __cplusplus
}
#endif
#endif

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

/* BUTTON parts */
enum {
	BP_PUSHBUTTON = 1,
	BP_RADIOBUTTON = 2,
	BP_CHECKBOX = 3,
	BP_GROUPBOX = 4,
	BP_USERBUTTON = 5
};
enum {
	CBS_UNCHECKEDNORMAL = 1,
	CBS_UNCHECKEDHOT = 2,
	CBS_UNCHECKEDPRESSED = 3,
	CBS_UNCHECKEDDISABLED = 4,
	CBS_CHECKEDNORMAL = 5,
	CBS_CHECKEDHOT = 6,
	CBS_CHECKEDPRESSED = 7,
	CBS_CHECKEDDISABLED = 8,
	CBS_MIXEDNORMAL = 9,
	CBS_MIXEDHOT = 10,
	CBS_MIXEDPRESSED = 11,
	CBS_MIXEDDISABLED = 12
};
enum {
	GBS_NORMAL = 1,
	GBS_DISABLED = 2
};
enum {
	PBS_NORMAL = 1,
	PBS_HOT = 2,
	PBS_PRESSED = 3,
	PBS_DISABLED = 4,
	PBS_DEFAULTED = 5
};
enum {
	RBS_UNCHECKEDNORMAL = 1,
	RBS_UNCHECKEDHOT = 2,
	RBS_UNCHECKEDPRESSED = 3,
	RBS_UNCHECKEDDISABLED = 4,
	RBS_CHECKEDNORMAL = 5,
	RBS_CHECKEDHOT = 6,
	RBS_CHECKEDPRESSED = 7,
	RBS_CHECKEDDISABLED = 8
};
/* CLOCK parts */
enum {
	CLP_TIME = 1
};
enum {
	CLS_NORMAL = 1
};
/* COMBOBOX parts */
enum {
	CP_DROPDOWNBUTTON = 1
};
enum {
	CBXS_NORMAL = 1,
	CBXS_HOT = 2,
	CBXS_PRESSED = 3,
	CBXS_DISABLED = 4
};
/* EDIT parts */
enum {
	EP_EDITTEXT = 1,
	EP_CARET = 2
};
enum {
	ETS_NORMAL = 1,
	ETS_HOT = 2,
	ETS_SELECTED = 3,
	ETS_DISABLED = 4,
	ETS_FOCUSED = 5,
	ETS_READONLY = 6,
	ETS_ASSIST = 7
};
/* EXPLORERBAR parts */
enum {
	EBP_HEADERBACKGROUND = 1,
	EBP_HEADERCLOSE = 2,
	EBP_HEADERPIN = 3,
	EBP_IEBARMENU = 4,
	EBP_NORMALGROUPBACKGROUND = 5,
	EBP_NORMALGROUPCOLLAPSE = 6,
	EBP_NORMALGROUPEXPAND = 7,
	EBP_NORMALGROUPHEAD = 8,
	EBP_SPECIALGROUPBACKGROUND = 9,
	EBP_SPECIALGROUPCOLLAPSE = 10,
	EBP_SPECIALGROUPEXPAND = 11,
	EBP_SPECIALGROUPHEAD = 12
};
enum {
	EBHC_NORMAL = 1,
	EBHC_HOT = 2,
	EBHC_PRESSED = 3
};
enum {
	EBHP_NORMAL = 1,
	EBHP_HOT = 2,
	EBHP_PRESSED = 3,
	EBHP_SELECTEDNORMAL = 4,
	EBHP_SELECTEDHOT = 5,
	EBHP_SELECTEDPRESSED = 6
};
enum {
	EBM_NORMAL = 1,
	EBM_HOT = 2,
	EBM_PRESSED = 3
};
enum {
	EBNGC_NORMAL = 1,
	EBNGC_HOT = 2,
	EBNGC_PRESSED = 3
};
enum {
	EBNGE_NORMAL = 1,
	EBNGE_HOT = 2,
	EBNGE_PRESSED = 3
};
enum {
	EBSGC_NORMAL = 1,
	EBSGC_HOT = 2,
	EBSGC_PRESSED = 3
};
enum {
	EBSGE_NORMAL = 1,
	EBSGE_HOT = 2,
	EBSGE_PRESSED = 3
};
/* HEADER parts */
enum {
	HP_HEADERITEM = 1,
	HP_HEADERITEMLEFT = 2,
	HP_HEADERITEMRIGHT = 3,
	HP_HEADERSORTARROW = 4
};
enum {
	HIS_NORMAL = 1,
	HIS_HOT = 2,
	HIS_PRESSED = 3
};
enum {
	HILS_NORMAL = 1,
	HILS_HOT = 2,
	HILS_PRESSED = 3
};
enum {
	HIRS_NORMAL = 1,
	HIRS_HOT = 2,
	HIRS_PRESSED = 3
};
enum {
	HSAS_SORTEDUP = 1,
	HSAS_SORTEDDOWN = 2
};
/* LISTVIEW parts */
enum {
	LVP_LISTITEM = 1,
	LVP_LISTGROUP = 2,
	LVP_LISTDETAIL = 3,
	LVP_LISTSORTEDDETAIL = 4,
	LVP_EMPTYTEXT = 5
};
enum {
	LIS_NORMAL = 1,
	LIS_HOT = 2,
	LIS_SELECTED = 3,
	LIS_DISABLED = 4,
	LIS_SELECTEDNOTFOCUS = 5
};
/* MENU parts */
enum {
	MP_MENUITEM = 1,
	MP_MENUDROPDOWN = 2,
	MP_MENUBARITEM = 3,
	MP_MENUBARDROPDOWN = 4,
	MP_CHEVRON = 5,
	MP_SEPARATOR = 6
};
enum {
	MS_NORMAL = 1,
	MS_SELECTED = 2,
	MS_DEMOTED = 3
};
/* MENUBAND parts */
enum {
	MDP_NEWAPPBUTTON = 1,
	MDP_SEPERATOR = 2
};
enum {
	MDS_NORMAL = 1,
	MDS_HOT = 2,
	MDS_PRESSED = 3,
	MDS_DISABLED = 4,
	MDS_CHECKED = 5,
	MDS_HOTCHECKED = 6
};
/* PAGE parts */
enum {
	PGRP_UP = 1,
	PGRP_DOWN = 2,
	PGRP_UPHORZ = 3,
	PGRP_DOWNHORZ = 4
};
enum {
	DNS_NORMAL = 1,
	DNS_HOT = 2,
	DNS_PRESSED = 3,
	DNS_DISABLED = 4
};
enum {
	DNHZS_NORMAL = 1,
	DNHZS_HOT = 2,
	DNHZS_PRESSED = 3,
	DNHZS_DISABLED = 4
};
enum {
	UPS_NORMAL = 1,
	UPS_HOT = 2,
	UPS_PRESSED = 3,
	UPS_DISABLED = 4
};
enum {
	UPHZS_NORMAL = 1,
	UPHZS_HOT = 2,
	UPHZS_PRESSED = 3,
	UPHZS_DISABLED = 4
};
/* PROGRESS parts */
enum {
	PP_BAR = 1,
	PP_BARVERT = 2,
	PP_CHUNK = 3,
	PP_CHUNKVERT = 4
};
/* REBAR parts */
enum {
	RP_GRIPPER = 1,
	RP_GRIPPERVERT = 2,
	RP_BAND = 3,
	RP_CHEVRON = 4,
	RP_CHEVRONVERT = 5
};
enum {
	CHEVS_NORMAL = 1,
	CHEVS_HOT = 2,
	CHEVS_PRESSED = 3
};
/* SCROLLBAR parts */
enum {
	SBP_ARROWBTN = 1,
	SBP_THUMBBTNHORZ = 2,
	SBP_THUMBBTNVERT = 3,
	SBP_LOWERTRACKHORZ = 4,
	SBP_UPPERTRACKHORZ = 5,
	SBP_LOWERTRACKVERT = 6,
	SBP_UPPERTRACKVERT = 7,
	SBP_GRIPPERHORZ = 8,
	SBP_GRIPPERVERT = 9,
	SBP_SIZEBOX = 10
};
enum {
	ABS_UPNORMAL = 1,
	ABS_UPHOT = 2,
	ABS_UPPRESSED = 3,
	ABS_UPDISABLED = 4,
	ABS_DOWNNORMAL = 5,
	ABS_DOWNHOT = 6,
	ABS_DOWNPRESSED = 7,
	ABS_DOWNDISABLED = 8,
	ABS_LEFTNORMAL = 9,
	ABS_LEFTHOT = 10,
	ABS_LEFTPRESSED = 11,
	ABS_LEFTDISABLED = 12,
	ABS_RIGHTNORMAL = 13,
	ABS_RIGHTHOT = 14,
	ABS_RIGHTPRESSED = 15,
	ABS_RIGHTDISABLED = 16
};
enum {
	SCRBS_NORMAL = 1,
	SCRBS_HOT = 2,
	SCRBS_PRESSED = 3,
	SCRBS_DISABLED = 4
};
enum {
	SZB_RIGHTALIGN = 1,
	SZB_LEFTALIGN = 2
};
/* SPIN parts */
enum {
	SPNP_UP = 1,
	SPNP_DOWN = 2,
	SPNP_UPHORZ = 3,
	SPNP_DOWNHORZ = 4
};
/* STARTPANEL parts */
enum {
	SPP_USERPANE = 1,
	SPP_MOREPROGRAMS = 2,
	SPP_MOREPROGRAMSARROW = 3,
	SPP_PROGLIST = 4,
	SPP_PROGLISTSEPARATOR = 5,
	SPP_PLACESLIST = 6,
	SPP_PLACESLISTSEPARATOR = 7,
	SPP_LOGOFF = 8,
	SPP_LOGOFFBUTTONS = 9,
	SPP_USERPICTURE = 10,
	SPP_PREVIEW = 11
};
enum {
	SPLS_NORMAL = 1,
	SPLS_HOT = 2,
	SPLS_PRESSED = 3
};
enum {
	SPS_NORMAL = 1,
	SPS_HOT = 2,
	SPS_PRESSED = 3
};
/* STATUS parts */
enum {
	SP_PANE = 1,
	SP_GRIPPERPANE = 2,
	SP_GRIPPER = 3
};
/* TAB parts */
enum {
	TABP_TABITEM = 1,
	TABP_TABITEMLEFTEDGE = 2,
	TABP_TABITEMRIGHTEDGE = 3,
	TABP_TABITEMBOTHEDGE = 4,
	TABP_TOPTABITEM = 5,
	TABP_TOPTABITEMLEFTEDGE = 6,
	TABP_TOPTABITEMRIGHTEDGE = 7,
	TABP_TOPTABITEMBOTHEDGE = 8,
	TABP_PANE = 9,
	TABP_BODY = 10
};
enum {
	TIS_NORMAL = 1,
	TIS_HOT = 2,
	TIS_SELECTED = 3,
	TIS_DISABLED = 4,
	TIS_FOCUSED = 5
};
enum {
	TIBES_NORMAL = 1,
	TIBES_HOT = 2,
	TIBES_SELECTED = 3,
	TIBES_DISABLED = 4,
	TIBES_FOCUSED = 5
};
enum {
	TILES_NORMAL = 1,
	TILES_HOT = 2,
	TILES_SELECTED = 3,
	TILES_DISABLED = 4,
	TILES_FOCUSED = 5
};
enum {
	TIRES_NORMAL = 1,
	TIRES_HOT = 2,
	TIRES_SELECTED = 3,
	TIRES_DISABLED = 4,
	TIRES_FOCUSED = 5
};
enum {
	TTIS_NORMAL = 1,
	TTIS_HOT = 2,
	TTIS_SELECTED = 3,
	TTIS_DISABLED = 4,
	TTIS_FOCUSED = 5
};
enum {
	TTIBES_NORMAL = 1,
	TTIBES_HOT = 2,
	TTIBES_SELECTED = 3,
	TTIBES_DISABLED = 4,
	TTIBES_FOCUSED = 5
};
enum {
	TTILES_NORMAL = 1,
	TTILES_HOT = 2,
	TTILES_SELECTED = 3,
	TTILES_DISABLED = 4,
	TTILES_FOCUSED = 5
};
enum {
	TTIRES_NORMAL = 1,
	TTIRES_HOT = 2,
	TTIRES_SELECTED = 3,
	TTIRES_DISABLED = 4,
	TTIRES_FOCUSED = 5
};
/* TASKBAND parts */
enum {
	TDP_GROUPCOUNT = 1,
	TDP_FLASHBUTTON = 2,
	TDP_FLASHBUTTONGROUPMENU = 3
};
/* TASKBAR parts */
enum {
	TBP_BACKGROUNDBOTTOM = 1,
	TBP_BACKGROUNDRIGHT = 2,
	TBP_BACKGROUNDTOP = 3,
	TBP_BACKGROUNDLEFT = 4,
	TBP_SIZINGBARBOTTOM = 5,
	TBP_SIZINGBARRIGHT = 6,
	TBP_SIZINGBARTOP = 7,
	TBP_SIZINGBARLEFT = 8
};
/* TOOLBAR parts */
enum {
	TP_BUTTON = 1,
	TP_DROPDOWNBUTTON = 2,
	TP_SPLITBUTTON = 3,
	TP_SPLITBUTTONDROPDOWN = 4,
	TP_SEPARATOR = 5,
	TP_SEPARATORVERT = 6
};
enum {
	TS_NORMAL = 1,
	TS_HOT = 2,
	TS_PRESSED = 3,
	TS_DISABLED = 4,
	TS_CHECKED = 5,
	TS_HOTCHECKED = 6
};
/* TOOLTIP parts */
enum {
	TTP_STANDARD = 1,
	TTP_STANDARDTITLE = 2,
	TTP_BALLOON = 3,
	TTP_BALLOONTITLE = 4,
	TTP_CLOSE = 5
};
enum {
	TTBS_NORMAL = 1,
	TTBS_LINK = 2
};
enum {
	TTCS_NORMAL = 1,
	TTCS_HOT = 2,
	TTCS_PRESSED = 3
};
enum {
	TTSS_NORMAL = 1,
	TTSS_LINK = 2
};
/* TRACKBAR parts */
enum {
	TKP_TRACK = 1,
	TKP_TRACKVERT = 2,
	TKP_THUMB = 3,
	TKP_THUMBBOTTOM = 4,
	TKP_THUMBTOP = 5,
	TKP_THUMBVERT = 6,
	TKP_THUMBLEFT = 7,
	TKP_THUMBRIGHT = 8,
	TKP_TICS = 9,
	TKP_TICSVERT = 10
};
enum {
	TUS_NORMAL = 1,
	TUS_HOT = 2,
	TUS_PRESSED = 3,
	TUS_FOCUSED = 4,
	TUS_DISABLED = 5
};
enum {
	TUBS_NORMAL = 1,
	TUBS_HOT = 2,
	TUBS_PRESSED = 3,
	TUBS_FOCUSED = 4,
	TUBS_DISABLED = 5
};
enum {
	TUVLS_NORMAL = 1,
	TUVLS_HOT = 2,
	TUVLS_PRESSED = 3,
	TUVLS_FOCUSED = 4,
	TUVLS_DISABLED = 5
};
enum {
	TUVRS_NORMAL = 1,
	TUVRS_HOT = 2,
	TUVRS_PRESSED = 3,
	TUVRS_FOCUSED = 4,
	TUVRS_DISABLED = 5
};
enum {
	TUTS_NORMAL = 1,
	TUTS_HOT = 2,
	TUTS_PRESSED = 3,
	TUTS_FOCUSED = 4,
	TUTS_DISABLED = 5
};
enum {
	TUVS_NORMAL = 1,
	TUVS_HOT = 2,
	TUVS_PRESSED = 3,
	TUVS_FOCUSED = 4,
	TUVS_DISABLED = 5
};
enum {
	TSS_NORMAL = 1
};
enum {
	TSVS_NORMAL = 1
};
enum {
	TRS_NORMAL = 1
};
enum {
	TRVS_NORMAL = 1
};
/* TRAYNOTIFY parts */
enum {
	TNP_BACKGROUND = 1,
	TNP_ANIMBACKGROUND = 2
};
/* TREEVIEW parts */
enum {
	TVP_TREEITEM = 1,
	TVP_GLYPH = 2,
	TVP_BRANCH = 3
};
enum {
	GLPS_CLOSED = 1,
	GLPS_OPENED = 2
};
enum {
	TREIS_NORMAL = 1,
	TREIS_HOT = 2,
	TREIS_SELECTED = 3,
	TREIS_DISABLED = 4,
	TREIS_SELECTEDNOTFOCUS = 5
};
/* WINDOW parts */
enum {
	WP_CAPTION = 1,
	WP_SMALLCAPTION = 2,
	WP_MINCAPTION = 3,
	WP_SMALLMINCAPTION = 4,
	WP_MAXCAPTION = 5,
	WP_SMALLMAXCAPTION = 6,
	WP_FRAMELEFT = 7,
	WP_FRAMERIGHT = 8,
	WP_FRAMEBOTTOM = 9,
	WP_SMALLFRAMELEFT = 10,
	WP_SMALLFRAMERIGHT = 11,
	WP_SMALLFRAMEBOTTOM = 12,
	WP_SYSBUTTON = 13,
	WP_MDISYSBUTTON = 14,
	WP_MINBUTTON = 15,
	WP_MDIMINBUTTON = 16,
	WP_MAXBUTTON = 17,
	WP_CLOSEBUTTON = 18,
	WP_SMALLCLOSEBUTTON = 19,
	WP_MDICLOSEBUTTON = 20,
	WP_RESTOREBUTTON = 21,
	WP_MDIRESTOREBUTTON = 22,
	WP_HELPBUTTON = 23,
	WP_MDIHELPBUTTON = 24,
	WP_HORZSCROLL = 25,
	WP_HORZTHUMB = 26,
	WP_VERTSCROLL = 27,
	WP_VERTTHUMB = 28,
	WP_DIALOG = 29,
	WP_CAPTIONSIZINGTEMPLATE = 30,
	WP_SMALLCAPTIONSIZINGTEMPLATE = 31,
	WP_FRAMELEFTSIZINGTEMPLATE = 32,
	WP_SMALLFRAMELEFTSIZINGTEMPLATE = 33,
	WP_FRAMERIGHTSIZINGTEMPLATE = 34,
	WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,
	WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,
	WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37
};
enum {
	CS_ACTIVE = 1,
	CS_INACTIVE = 2,
	CS_DISABLED = 3
};
enum {
	CBS_NORMAL = 1,
	CBS_HOT = 2,
	CBS_PUSHED = 3,
	CBS_DISABLED = 4
};
enum {
	FS_ACTIVE = 1,
	FS_INACTIVE = 2
};
enum {
	HBS_NORMAL = 1,
	HBS_HOT = 2,
	HBS_PUSHED = 3,
	HBS_DISABLED = 4
};
enum {
	HSS_NORMAL = 1,
	HSS_HOT = 2,
	HSS_PUSHED = 3,
	HSS_DISABLED = 4
};
enum {
	HTS_NORMAL = 1,
	HTS_HOT = 2,
	HTS_PUSHED = 3,
	HTS_DISABLED = 4
};
enum {
	MAXBS_NORMAL = 1,
	MAXBS_HOT = 2,
	MAXBS_PUSHED = 3,
	MAXBS_DISABLED = 4
};
enum {
	MXCS_ACTIVE = 1,
	MXCS_INACTIVE = 2,
	MXCS_DISABLED = 3
};
enum {
	MINBS_NORMAL = 1,
	MINBS_HOT = 2,
	MINBS_PUSHED = 3,
	MINBS_DISABLED = 4
};
enum {
	RBS_NORMAL = 1,
	RBS_HOT = 2,
	RBS_PUSHED = 3,
	RBS_DISABLED = 4
};
enum {
	SBS_NORMAL = 1,
	SBS_HOT = 2,
	SBS_PUSHED = 3,
	SBS_DISABLED = 4
};
enum {
	MNCS_ACTIVE = 1,
	MNCS_INACTIVE = 2,
	MNCS_DISABLED = 3
};
enum {
	VSS_NORMAL = 1,
	VSS_HOT = 2,
	VSS_PUSHED = 3,
	VSS_DISABLED = 4
};
enum {
	VTS_NORMAL = 1,
	VTS_HOT = 2,
	VTS_PUSHED = 3,
	VTS_DISABLED = 4
};

#endif

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

#ifdef __cplusplus
extern "C" {
#endif

#if (_WIN32_WINNT >= 0x0501)
#define DTBG_CLIPRECT 0x00000001
#define DTBG_DRAWSOLID 0x00000002
#define DTBG_OMITBORDER 0x00000004
#define DTBG_OMITCONTENT 0x00000008
#define DTBG_COMPUTINGREGION 0x00000010
#define DTBG_MIRRORDC 0x00000020
#define DTT_GRAYED 0x00000001
#define ETDT_DISABLE 0x00000001
#define ETDT_ENABLE 0x00000002
#define ETDT_USETABTEXTURE 0x00000004
#define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE)
#define STAP_ALLOW_NONCLIENT 0x00000001
#define STAP_ALLOW_CONTROLS 0x00000002
#define STAP_ALLOW_WEBCONTENT 0x00000004
#define HTTB_BACKGROUNDSEG 0x0000  
#define HTTB_FIXEDBORDER 0x0002
#define HTTB_CAPTION 0x0004
#define HTTB_RESIZINGBORDER_LEFT 0x0010
#define HTTB_RESIZINGBORDER_TOP 0x0020
#define HTTB_RESIZINGBORDER_RIGHT 0x0040
#define HTTB_RESIZINGBORDER_BOTTOM 0x0080
#define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)
#define HTTB_SIZINGTEMPLATE 0x0100
#define HTTB_SYSTEMSIZINGMARGINS 0x0200

typedef enum PROPERTYORIGIN {
	PO_STATE = 0,
	PO_PART = 1,
	PO_CLASS = 2,
	PO_GLOBAL = 3,
	PO_NOTFOUND = 4
} PROPERTYORIGIN;
typedef enum THEMESIZE {
	TS_MIN,
	TS_TRUE,
	TS_DRAW
} THEME_SIZE;
typedef struct _DTBGOPTS {
	DWORD dwSize;
	DWORD dwFlags;
	RECT rcClip;
} DTBGOPTS, *PDTBGOPTS;
#define MAX_INTLIST_COUNT 10
typedef struct _INTLIST {
	int iValueCount;
	int iValues[MAX_INTLIST_COUNT];
} INTLIST, *PINTLIST;
typedef struct _MARGINS {
	int cxLeftWidth;
	int cxRightWidth;
	int cyTopHeight;
	int cyBottomHeight;
} MARGINS, *PMARGINS;
typedef HANDLE HTHEME;

HRESULT WINAPI CloseThemeData(HTHEME);
HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*);
HRESULT WINAPI DrawThemeBackgroundEx(HTHEME,HDC,int,int,const RECT*,const DTBGOPTS*);
HRESULT WINAPI DrawThemeEdge(HTHEME,HDC,int,int,const RECT*,UINT,UINT,RECT*);
HRESULT WINAPI DrawThemeIcon(HTHEME,HDC,int,int,const RECT*,HIMAGELIST,int);
HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*);
HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD,const RECT*);
HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD);
HRESULT WINAPI EnableTheming(BOOL);
HRESULT WINAPI GetCurrentThemeName(LPWSTR,int,LPWSTR,int,LPWSTR,int);
DWORD WINAPI GetThemeAppProperties();
HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME,HDC,int,int,const RECT*,RECT*);
HRESULT WINAPI GetThemeBackgroundExtent(HTHEME,HDC,int,int,const RECT*,RECT*);
HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*);
HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*);
HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*);
HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR,LPCWSTR,LPWSTR,int);
HRESULT WINAPI GetThemeEnumValue(HTHEME,int,int,int,int*);
HRESULT WINAPI GetThemeFilename(HTHEME,int,int,int,LPWSTR,int);
HRESULT WINAPI GetThemeFont(HTHEME,HDC,int,int,int,LOGFONT*);
HRESULT WINAPI GetThemeInt(HTHEME,int,int,int,int*);
HRESULT WINAPI GetThemeIntList(HTHEME,int,int,int,INTLIST*);
HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*);
HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*);
HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEME_SIZE,SIZE*);
HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*);
HRESULT WINAPI GetThemePropertyOrigin(HTHEME,int,int,int,PROPERTYORIGIN*);
HRESULT WINAPI GetThemeRect(HTHEME,int,int,int,RECT*);
HRESULT WINAPI GetThemeString(HTHEME,int,int,int,LPWSTR,int);
BOOL WINAPI GetThemeSysBool(HTHEME,int);
COLORREF WINAPI GetThemeSysColor(HTHEME,int);
HBRUSH WINAPI GetThemeSysColorBrush(HTHEME,int);
HRESULT WINAPI GetThemeSysFont(HTHEME,int,LOGFONT*);
HRESULT WINAPI GetThemeSysInt(HTHEME,int,int*);
int WINAPI GetThemeSysSize(HTHEME,int);
HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int);
HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,const RECT*,RECT*);
HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRIC*);
HTHEME WINAPI GetWindowTheme(HWND);
HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*,HRGN,POINT,WORD*);
BOOL WINAPI IsAppThemed();
BOOL WINAPI IsThemeActive();
BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int);
BOOL WINAPI IsThemeDialogTextureEnabled(HWND);
BOOL WINAPI IsThemePartDefined(HTHEME,int,int);
HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);
void WINAPI SetThemeAppProperties(DWORD);
HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);
#endif

#ifdef __cplusplus
}
#endif
#endif

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

#ifdef __cplusplus
extern "C" {
#endif

#define DNS_QUERY_STANDARD 0x0
#define DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE 0x1
#define DNS_QUERY_USE_TCP_ONLY 0x2
#define DNS_QUERY_NO_RECURSION 0x4
#define DNS_QUERY_BYPASS_CACHE 0x8
#define DNS_QUERY_NO_WIRE_QUERY	0x10
#define DNS_QUERY_NO_LOCAL_NAME 0x20
#define DNS_QUERY_NO_HOSTS_FILE 0x40
#define DNS_QUERY_NO_NETBT 0x80
#define DNS_QUERY_TREAT_AS_FQDN 0x1000
#define DNS_QUERY_WIRE_ONLY 0x100
#define DNS_QUERY_RETURN_MESSAGE 0x200
#define DNS_QUERY_DONT_RESET_TTL_VALUES 0x100000
#define DNS_QUERY_RESERVED 0xff000000

#define DNS_UPDATE_SECURITY_USE_DEFAULT	0x0
#define DNS_UPDATE_SECURITY_OFF 0x10
#define DNS_UPDATE_SECURITY_ON 0x20
#define DNS_UPDATE_SECURITY_ONLY 0x100
#define DNS_UPDATE_CACHE_SECURITY_CONTEXT 0x200
#define DNS_UPDATE_TEST_USE_LOCAL_SYS_ACCT 0x400
#define DNS_UPDATE_FORCE_SECURITY_NEGO 0x800
#define DNS_UPDATE_RESERVED 0xffff0000

#ifndef RC_INVOKE
typedef DWORD IP4_ADDRESS;
typedef DWORD DNS_STATUS;
enum {
	DNS_TYPE_A=1,
	DNS_TYPE_NS,
	DNS_TYPE_MD,
	DNS_TYPE_MF,
	DNS_TYPE_CNAME,
	DNS_TYPE_SOA,
	DNS_TYPE_MB,
	DNS_TYPE_MG,
	DNS_TYPE_MR,
	DNS_TYPE_NULL,
	DNS_TYPE_WKS,
	DNS_TYPE_PTR,
	DNS_TYPE_HINFO,
	DNS_TYPE_MINFO,
	DNS_TYPE_MX,
	DNS_TYPE_TEXT
};
typedef enum _DNS_CHARSET
{
	DnsCharSetUnknown, 
	DnsCharSetUnicode, 
	DnsCharSetUtf8, 
	DnsCharSetAnsi
} DNS_CHARSET;
typedef enum 
{
	DnsConfigPrimaryDomainName_W, 
	DnsConfigPrimaryDomainName_A, 
	DnsConfigPrimaryDomainName_UTF8, 
	DnsConfigAdapterDomainName_W, 
	DnsConfigAdapterDomainName_A, 
	DnsConfigAdapterDomainName_UTF8, 
	DnsConfigDnsServerList, 
	DnsConfigSearchList, 
	DnsConfigAdapterInfo, 
	DnsConfigPrimaryHostNameRegistrationEnabled, 
	DnsConfigAdapterHostNameRegistrationEnabled, 
	DnsConfigAddressRegistrationMaxCount, 
	DnsConfigHostName_W, 
	DnsConfigHostName_A, 
	DnsConfigHostName_UTF8, 
	DnsConfigFullHostName_W, 
	DnsConfigFullHostName_A, 
	DnsConfigFullHostName_UTF8
} DNS_CONFIG_TYPE;
typedef enum 
{
	DnsFreeFlat = 0, 
	DnsFreeRecordList, 
	DnsFreeParsedMessageFields
} DNS_FREE_TYPE;
typedef enum _DNS_NAME_FORMAT
{
	DnsNameDomain, 
	DnsNameDomainLabel, 
	DnsNameHostnameFull, 
	DnsNameHostnameLabel, 
	DnsNameWildcard, 
	DnsNameSrvRecord
} DNS_NAME_FORMAT;
typedef enum 
{
	DnsSectionQuestion, 
	DnsSectionAnswer, 
	DnsSectionAuthority, 
	DnsSectionAdditional
} DNS_SECTION;
typedef struct _IP4_ARRAY {
	DWORD AddrCount;
	IP4_ADDRESS AddrArray[1];
} IP4_ARRAY, *PIP4_ARRAY;
typedef struct {
	DWORD IP6Dword[4];
} IP6_ADDRESS, *PIP6_ADDRESS, DNS_IP6_ADDRESS, *PDNS_IP6_ADDRESS;
typedef struct _DNS_HEADER {
	WORD Xid;
	BYTE RecursionDesired;
	BYTE Truncation;
	BYTE Authoritative;
	BYTE Opcode;
	BYTE IsResponse;
	BYTE ResponseCode;
	BYTE Reserved;
	BYTE RecursionAvailable;
	WORD QuestionCount;
	WORD AnswerCount;
	WORD NameServerCount;
	WORD AdditionalCount;
} DNS_HEADER, *PDNS_HEADER;
typedef struct _DNS_MESSAGE_BUFFER {
	DNS_HEADER MessageHead;
	CHAR MessageBody[1];
} DNS_MESSAGE_BUFFER, *PDNS_MESSAGE_BUFFER;
typedef struct _DnsRecordFlags {
	DWORD Section	:2;
	DWORD Delete	:1;
	DWORD CharSet	:2;
	DWORD Unused	:3;
	DWORD Reserved	:24;
} DNS_RECORD_FLAGS;
typedef struct {
	IP4_ADDRESS IpAddress;
} DNS_A_DATA, *PDNS_A_DATA;
typedef struct {
	DNS_IP6_ADDRESS Ip6Address;
} DNS_AAAA_DATA, *PDNS_AAAA_DATA;
#define DNS_ATMA_MAX_ADDR_LENGTH 20
typedef struct {
	BYTE AddressType;
	BYTE Address[DNS_ATMA_MAX_ADDR_LENGTH];
} DNS_ATMA_DATA, *PDNS_ATMA_DATA;
typedef struct {
	WORD wFlags;
	BYTE chProtocol;
	BYTE chAlgorithm;
	BYTE Key[1];
} DNS_KEY_DATA, *PDNS_KEY_DATA;
typedef struct {
	WORD wVersion;
	WORD wSize;
	WORD wHorPrec;
	WORD wVerPrec;
	DWORD dwLatitude;
	DWORD dwLongitude;
	DWORD dwAltitude;
} DNS_LOC_DATA, *PDNS_LOC_DATA;
typedef struct {
	LPTSTR pNameMailbox;
	LPTSTR pNameErrorsMailbox;
} DNS_MINFO_DATA, *PDNS_MINFO_DATA;
typedef struct {
	LPTSTR pNameExchange;
	WORD wPreference;
	WORD Pad;
} DNS_MX_DATA, *PDNS_MX_DATA;
typedef struct {
	DWORD dwByteCount;
	BYTE Data[1];
} DNS_NULL_DATA, *PDNS_NULL_DATA;
typedef struct {
	LPTSTR pNameNext;
	WORD wNumTypes;
	WORD wTypes[1];
} DNS_NXT_DATA, *PDNS_NXT_DATA;
typedef struct {
	LPTSTR pNameHost;
} DNS_PTR_DATA, *PDNS_PTR_DATA;
typedef struct {
	LPTSTR pNameSigner;
	WORD wTypeCovered;
	BYTE chAlgorithm;
	BYTE chLabelCount;
	DWORD dwOriginalTtl;
	DWORD dwExpiration;
	DWORD dwTimeSigned;
	WORD wKeyTag;
	WORD Pad;
	BYTE Signature[1];
} DNS_SIG_DATA, *PDNS_SIG_DATA;
typedef struct {
	LPTSTR pNamePrimaryServer;
	LPTSTR pNameAdministrator;
	DWORD dwSerialNo;
	DWORD dwRefresh;
	DWORD dwRetry;
	DWORD dwExpire;
	DWORD dwDefaultTtl;
} DNS_SOA_DATA, *PDNS_SOA_DATA;
typedef struct {
	LPTSTR pNameTarget;
	WORD wPriority;
	WORD wWeight;
	WORD wPort;
	WORD Pad;
} DNS_SRV_DATA, *PDNS_SRV_DATA;
typedef struct {
	DWORD dwStringCount;
	LPTSTR pStringArray[1];
} DNS_TXT_DATA, *PDNS_TXT_DATA;
typedef struct {
	LPTSTR pNameAlgorithm;
	PBYTE pAlgorithmPacket;
	PBYTE pKey;
	PBYTE pOtherData;
	DWORD dwCreateTime;
	DWORD dwExpireTime;
	WORD wMode;
	WORD wError;
	WORD wKeyLength;
	WORD wOtherLength;
	UCHAR cAlgNameLength;
	BOOL bPacketPointers;
} DNS_TKEY_DATA, *PDNS_TKEY_DATA;
typedef struct {
	LPTSTR pNameAlgorithm;
	PBYTE pAlgorithmPacket;
	PBYTE pSignature;
	PBYTE pOtherData;
	LONGLONG i64CreateTime;
	WORD wFudgeTime;
	WORD wOriginalXid;
	WORD wError;
	WORD wSigLength;
	WORD wOtherLength;
	UCHAR cAlgNameLength;
	BOOL bPacketPointers;
} DNS_TSIG_DATA, *PDNS_TSIG_DATA;
typedef struct {
	DWORD dwMappingFlag;
	DWORD dwLookupTimeout;
	DWORD dwCacheTimeout;
	DWORD cWinsServerCount;
	IP4_ADDRESS WinsServers[1];
} DNS_WINS_DATA, *PDNS_WINS_DATA;
typedef struct {
	DWORD dwMappingFlag;
	DWORD dwLookupTimeout;
	DWORD dwCacheTimeout;
	LPTSTR pNameResultDomain;
} DNS_WINSR_DATA, *PDNS_WINSR_DATA;
typedef struct _DNS_WIRE_QUESTION {
	WORD QuestionType;
	WORD QuestionClass;
} DNS_WIRE_QUESTION, *PDNS_WIRE_QUESTION;
typedef struct _DNS_WIRE_RECORD {
	WORD RecordType;
	WORD RecordClass;
	DWORD TimeToLive;
	WORD DataLength;
} DNS_WIRE_RECORD, *PDNS_WIRE_RECORD;
typedef struct {
	IP4_ADDRESS IpAddress;
	UCHAR chProtocol;
	BYTE BitMask[1];
} DNS_WKS_DATA, *PDNS_WKS_DATA;
typedef struct _DnsRecord {
	struct _DnsRecord* pNext;
	LPTSTR pName;
	WORD wType;
	WORD wDataLength;
	union {
		DWORD DW;
		DNS_RECORD_FLAGS S;
	} Flags;
	DWORD dwTtl;
	DWORD dwReserved;
	union {
		DNS_A_DATA A;
		DNS_SOA_DATA SOA, Soa;
		DNS_PTR_DATA PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb,
			     MD, Md, MF, Mf, MG, Mg, MR, Mr;
		DNS_MINFO_DATA MINFO, Minfo, RP, Rp;
		DNS_MX_DATA MX, Mx, AFSDB, Afsdb, RT, Rt;
		DNS_TXT_DATA HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25;
		DNS_NULL_DATA Null;
		DNS_WKS_DATA WKS, Wks;
		DNS_AAAA_DATA AAAA;
		DNS_KEY_DATA KEY, Key;
		DNS_SIG_DATA SIG, Sig;
		DNS_ATMA_DATA ATMA, Atma;
		DNS_NXT_DATA NXT, Nxt;
		DNS_SRV_DATA SRV, Srv;
		DNS_TKEY_DATA TKEY, Tkey;
		DNS_TSIG_DATA TSIG, Tsig;
		DNS_WINS_DATA WINS, Wins;
		DNS_WINSR_DATA WINSR, WinsR, NBSTAT, Nbstat;
	} Data;
} DNS_RECORD, *PDNS_RECORD;
typedef struct _DnsRRSet {
	PDNS_RECORD pFirstRR;
	PDNS_RECORD pLastRR;
} DNS_RRSET, *PDNS_RRSET;

DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,HANDLE*);
DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,HANDLE*);
DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORD*);
DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORD*);
DNS_STATUS WINAPI DnsModifyRecordsInSet_A(PDNS_RECORD,PDNS_RECORD,DWORD,HANDLE,PIP4_ARRAY,PVOID);
DNS_STATUS WINAPI DnsModifyRecordsInSet_W(PDNS_RECORD,PDNS_RECORD,DWORD,HANDLE,PIP4_ARRAY,PVOID);
DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8(PDNS_RECORD,PDNS_RECORD,DWORD,HANDLE,PIP4_ARRAY,PVOID);
BOOL WINAPI DnsNameCompare_A(LPSTR,LPSTR);
BOOL WINAPI DnsNameCompare_W(LPWSTR,LPWSTR);
DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORD*,PVOID*);
DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORD*,PVOID*);
DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORD*,PVOID*);
DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PWSTR,PVOID,PVOID,PDWORD);
BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD);
PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET);
void WINAPI DnsRecordListFree(PDNS_RECORD,DNS_FREE_TYPE);
BOOL WINAPI DnsRecordSetCompare(PDNS_RECORD,PDNS_RECORD,PDNS_RECORD*,PDNS_RECORD*);
PDNS_RECORD WINAPI DnsRecordSetCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET);
PDNS_RECORD WINAPI DnsRecordSetDetach(PDNS_RECORD);
void WINAPI DnsReleaseContextHandle(HANDLE);
DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORD,DWORD,HANDLE,PIP4_ARRAY,PVOID);
DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORD,DWORD,HANDLE,PIP4_ARRAY,PVOID);
DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORD,DWORD,HANDLE,PIP4_ARRAY,PVOID);
DNS_STATUS WINAPI DnsValidateName_A(LPCSTR,DNS_NAME_FORMAT);
DNS_STATUS WINAPI DnsValidateName_W(LPCWSTR, DNS_NAME_FORMAT);
DNS_STATUS WINAPI DnsValidateName_UTF8(LPCSTR,DNS_NAME_FORMAT);
BOOL WINAPI DnsWriteQuestionToBuffer_W(PDNS_MESSAGE_BUFFER,LPDWORD,LPWSTR,WORD,WORD,BOOL);
BOOL WINAPI DnsWriteQuestionToBuffer_UTF8(PDNS_MESSAGE_BUFFER,LPDWORD,LPSTR,WORD,WORD,BOOL);

#ifdef UNICODE
#define DnsAcquireContextHandle DnsAcquireContextHandle_W
#define DnsModifyRecordsInSet DnsModifyRecordsInSet_W
#define DnsNameCompare DnsNameCompare_W
#define DnsQuery DnsQuery_W
#define DnsReplaceRecordSet DnsReplaceRecordSetW
#define DnsValidateName DnsValidateName_W
#else
#define DnsAcquireContextHandle DnsAcquireContextHandle_A
#define DnsModifyRecordsInSet DnsModifyRecordsInSet_A
#define DnsNameCompare DnsNameCompare_A
#define DnsQuery DnsQuery_A
#define DnsReplaceRecordSet DnsReplaceRecordSetA
#define DnsValidateName DnsValidateName_A
#endif

#endif /* RC_INVOKED */

#ifdef __cplusplus
}
#endif

#endif /* _WINDNS_H */

Index: accctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/accctrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** accctrl.h	5 Feb 2003 17:44:08 -0000	1.5
--- accctrl.h	15 Feb 2004 07:35:00 -0000	1.6
***************
*** 257,261 ****
  	TRUSTEE_W    Trustee;
  } EXPLICIT_ACCESS_W, *PEXPLICIT_ACCESS_W, EXPLICIT_ACCESSW, *PEXPLICIT_ACCESSW;
! typedef struct  _OBJECTS_AND_SID {
  	DWORD   ObjectsPresent;
  	GUID    ObjectTypeGuid;
--- 257,261 ----
  	TRUSTEE_W    Trustee;
  } EXPLICIT_ACCESS_W, *PEXPLICIT_ACCESS_W, EXPLICIT_ACCESSW, *PEXPLICIT_ACCESSW;
! typedef struct _OBJECTS_AND_SID {
  	DWORD   ObjectsPresent;
  	GUID    ObjectTypeGuid;
***************
*** 263,267 ****
  	SID     * pSid;
  } OBJECTS_AND_SID, *POBJECTS_AND_SID;
! typedef struct  _OBJECTS_AND_NAME_A {
  	DWORD    ObjectsPresent;
  	SE_OBJECT_TYPE ObjectType;
--- 263,267 ----
  	SID     * pSid;
  } OBJECTS_AND_SID, *POBJECTS_AND_SID;
! typedef struct _OBJECTS_AND_NAME_A {
  	DWORD    ObjectsPresent;
  	SE_OBJECT_TYPE ObjectType;
***************
*** 270,274 ****
  	LPSTR    ptstrName;
  } OBJECTS_AND_NAME_A, *POBJECTS_AND_NAME_A;
! typedef struct  _OBJECTS_AND_NAME_W {
  	DWORD          ObjectsPresent;
  	SE_OBJECT_TYPE ObjectType;
--- 270,274 ----
  	LPSTR    ptstrName;
  } OBJECTS_AND_NAME_A, *POBJECTS_AND_NAME_A;
! typedef struct _OBJECTS_AND_NAME_W {
  	DWORD          ObjectsPresent;
  	SE_OBJECT_TYPE ObjectType;
***************
*** 277,281 ****
  	LPWSTR   ptstrName;
  } OBJECTS_AND_NAME_W, *POBJECTS_AND_NAME_W;
! 
  
  #ifdef UNICODE
--- 277,290 ----
  	LPWSTR   ptstrName;
  } OBJECTS_AND_NAME_W, *POBJECTS_AND_NAME_W;
! #if (_WIN32_WINNT >= 0x0501)
! typedef struct {
! 	LONG     GenerationGap;
! 	LPSTR    AncestorName;
! } INHERITED_FROMA, *PINHERITED_FROMA;
! typedef struct {
! 	LONG     GenerationGap;
! 	LPWSTR   AncestorName;
! } INHERITED_FROMW, *PINHERITED_FROMW;
! #endif /* (_WIN32_WINNT >= 0x0501) */
  
  #ifdef UNICODE
***************
*** 293,296 ****
--- 302,308 ----
  typedef TRUSTEE_ACCESSW TRUSTEE_ACCESS, *PTRUSTEE_ACCESS;
  typedef OBJECTS_AND_NAME_W OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_;
+ #if (_WIN32_WINNT >= 0x0501)
+ typedef INHERITED_FROMW INHERITED_FROM, *PINHERITED_FROM;
+ #endif
  #else
  #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERA
***************
*** 307,315 ****
  typedef TRUSTEE_ACCESSA TRUSTEE_ACCESS, *PTRUSTEE_ACCESS;
  typedef OBJECTS_AND_NAME_A OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_;
  #endif
  
  #ifdef __cplusplus
  }
  #endif
! 
! #endif /* _ACCCTRL_H */
--- 319,329 ----
  typedef TRUSTEE_ACCESSA TRUSTEE_ACCESS, *PTRUSTEE_ACCESS;
  typedef OBJECTS_AND_NAME_A OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_;
+ #if (_WIN32_WINNT >= 0x0501)
+ typedef INHERITED_FROMA INHERITED_FROM, *PINHERITED_FROM;
  #endif
+ #endif /* UNICODE */
  
  #ifdef __cplusplus
  }
  #endif
! #endif 

Index: aclapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/aclapi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aclapi.h	12 Sep 2003 13:26:50 -0000	1.3
--- aclapi.h	15 Feb 2004 07:35:00 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  extern "C" {
  #endif
+ 
  VOID WINAPI BuildExplicitAccessWithNameA(PEXPLICIT_ACCESS_A,LPSTR,DWORD,ACCESS_MODE,DWORD);
  VOID WINAPI BuildExplicitAccessWithNameW(PEXPLICIT_ACCESS_W,LPWSTR,DWORD,ACCESS_MODE,DWORD);
***************
*** 33,36 ****
--- 34,41 ----
  DWORD WINAPI GetExplicitEntriesFromAclA(PACL,PULONG,PEXPLICIT_ACCESS_A*);
  DWORD WINAPI GetExplicitEntriesFromAclW(PACL,PULONG,PEXPLICIT_ACCESS_W*);
+ #if (_WIN32_WINNT >= 0x0501)
+ DWORD WINAPI GetInheritanceSourceA(LPSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,BOOL,GUID**,DWORD,PACL,void*,PGENERIC_MAPPING,PINHERITED_FROMA);
+ DWORD WINAPI GetInheritanceSourceW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,BOOL,GUID**,DWORD,PACL,void*,PGENERIC_MAPPING,PINHERITED_FROMW);
+ #endif
  DWORD WINAPI GetNamedSecurityInfoA(LPSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,
    PSID*,PSID*,PACL*,PACL*,PSECURITY_DESCRIPTOR*);
***************
*** 105,109 ****
  #define GetMultipleTrustee  GetMultipleTrusteeA
  #define GetMultipleTrusteeOperation  GetMultipleTrusteeOperationA
! #endif  /* UNICODE */
  
  #ifdef __cplusplus
--- 110,114 ----
  #define GetMultipleTrustee  GetMultipleTrusteeA
  #define GetMultipleTrusteeOperation  GetMultipleTrusteeOperationA
! #endif /* UNICODE */
  
  #ifdef __cplusplus
***************
*** 111,113 ****
  #endif
  #endif
- 
--- 116,117 ----

Index: basetyps.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/basetyps.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** basetyps.h	12 Sep 2003 13:26:51 -0000	1.5
--- basetyps.h	15 Feb 2004 07:35:00 -0000	1.6
***************
*** 141,145 ****
  #endif
  #define _REFGUID_DEFINED
! #define _REFGIID_DEFINED
  #define _REFCLSID_DEFINED
  #endif
--- 141,145 ----
  #endif
  #define _REFGUID_DEFINED
! #define _REFIID_DEFINED
  #define _REFCLSID_DEFINED
  #endif

Index: cguid.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/cguid.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cguid.h	9 Apr 2002 21:17:17 -0000	1.2
--- cguid.h	15 Feb 2004 07:35:00 -0000	1.3
***************
*** 76,79 ****
--- 76,80 ----
  extern const CLSID CLSID_Picture_EnhMetafile;
  extern const CLSID CLSID_Picture_Dib;
+ extern const CLSID CLSID_StdGlobalInterfaceTable;
  extern const GUID GUID_TRISTATE;
  #ifdef __cplusplus

Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** commctrl.h	12 Sep 2003 13:26:51 -0000	1.16
--- commctrl.h	15 Feb 2004 07:35:00 -0000	1.17
***************
*** 130,133 ****
--- 130,141 ----
  #endif
  
+ #if (_WIN32_IE >= 0x0500)
+ #if (_WIN32_WINNT >= 0x0501)
+ #define COMCTL32_VERSION 6
+ #else
+ #define COMCTL32_VERSION 5
+ #endif
+ #endif
+ 
  #define LVM_FIRST 0x1000
  #define TV_FIRST 0x1100
***************
*** 441,447 ****
  #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 16
  #endif /* _WIN32_IE >= 0x0501 */
! #if (_WIN32_WINNT >= _WXP)
  #define TBSTYLE_EX_DOUBLEBUFFER	0x80
! #endif /* _WIN32_WINNT >= _WXP */
  #if (_WIN32_IE >= 0x0500)
  #define BTNS_BUTTON	TBSTYLE_BUTTON
--- 449,455 ----
  #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 16
  #endif /* _WIN32_IE >= 0x0501 */
! #if (_WIN32_WINNT >= 0x0501)
  #define TBSTYLE_EX_DOUBLEBUFFER	0x80
! #endif /* _WIN32_WINNT >= 0x0501 */
  #if (_WIN32_IE >= 0x0500)
  #define BTNS_BUTTON	TBSTYLE_BUTTON
***************
*** 915,919 ****
  #define CDIS_MARKED 128
  #define CDIS_INDETERMINATE 256
! #if (_WIN32_WINNT >= _WXP)
  #define CDIS_SHOWKEYBOARDCUES 512
  #endif
--- 923,927 ----
  #define CDIS_MARKED 128
  #define CDIS_INDETERMINATE 256
! #if (_WIN32_WINNT >= 0x0501)
  #define CDIS_SHOWKEYBOARDCUES 512
  #endif
***************
*** 991,995 ****
  #define LVIF_NORECOMPUTE 2048
  #endif
! #if (_WIN32_WINNT >= _WXP)
  #define LVIF_GROUPID 128
  #define LVIF_COLUMNS 256
--- 999,1003 ----
  #define LVIF_NORECOMPUTE 2048
  #endif
! #if (_WIN32_WINNT >= 0x0501)
  #define LVIF_GROUPID 128
  #define LVIF_COLUMNS 256
***************
*** 1375,1378 ****
--- 1383,1390 ----
  #define TCIF_STATE	16
  #endif
+ #define TCIS_BUTTONPRESSED 1
+ #if (_WIN32_IE >= 0x0400)
+ #define TCIS_HIGHLIGHTED 2
+ #endif
  #define TCM_FIRST	0x1300
  #define TCM_GETIMAGELIST	(TCM_FIRST+2)
***************
*** 1442,1446 ****
  #define CCM_GETVERSION 0x2008
  #define CCM_SETNOTIFYWINDOW 0x2009
! #if (_WIN32_WINNT >= _WXP)
  #define CCM_SETWINDOWTHEME 0x200b
  #define CCM_DPISCALE 0x200c
--- 1454,1458 ----
  #define CCM_GETVERSION 0x2008
  #define CCM_SETNOTIFYWINDOW 0x2009
! #if (_WIN32_WINNT >= 0x0501)
  #define CCM_SETWINDOWTHEME 0x200b
  #define CCM_DPISCALE 0x200c
***************
*** 1464,1467 ****
--- 1476,1483 ----
  #define INFOTIPSIZE 1024
  #endif /* _WIN32_IE */
+ #if (_WIN32_WINNT >= 0x501)
+ #define ICC_STANDARD_CLASSES	0x00004000
+ #define ICC_LINK_CLASS		0x00008000
+ #endif
  #define GDTR_MIN 1
  #define GDTR_MAX 2
***************
*** 1737,1740 ****
--- 1753,1782 ----
  #define CBEM_SETITEMW	(WM_USER + 12)
  #define CBEM_GETITEMW	(WM_USER + 13)
+ #define DA_LAST	0x7fffffff
+ #define DPA_APPEND	0x7fffffff
+ #define DPA_ERR	-1
+ #define DSA_APPEND	0x7fffffff
+ #define DSA_ERR	-1
+ #define DPAS_SORTED	1
+ #define DPAS_INSERTBEFORE	2
+ #define DPAS_INSERTAFTER	4
+ #if (_WIN32_IE >= 0x400)
+ #define WSB_PROP_CYVSCROLL	1
+ #define WSB_PROP_CXHSCROLL	2
+ #define WSB_PROP_CYHSCROLL	4
+ #define WSB_PROP_CXVSCROLL	8
+ #define WSB_PROP_CXHTHUMB	16
+ #define WSB_PROP_CYVTHUMB	32
+ #define WSB_PROP_VBKGCOLOR	64
+ #define WSB_PROP_HBKGCOLOR	128
+ #define WSB_PROP_VSTYLE	256
+ #define WSB_PROP_HSTYLE	512
+ #define WSB_PROP_WINSTYLE	1024
+ #define WSB_PROP_PALETTE	2048
+ #define WSB_PROP_MASK	0xfff
+ #define FSB_FLAT_MODE	2
+ #define FSB_ENCARTA_MODE	1
+ #define FSB_REGULAR_MODE	0
+ #endif /* _WIN32_IE >= 0x400 */
  
  #ifndef RC_INVOKED
***************
*** 2120,2124 ****
  	int nStringBkMode;
  	int nHLStringBkMode;
! #if (_WIN32_WINNT >= _WXP)
  	int iListGap;
  #endif
--- 2162,2166 ----
  	int nStringBkMode;
  	int nHLStringBkMode;
! #if (_WIN32_WINNT >= 0x0501)
  	int iListGap;
  #endif
***************
*** 2276,2280 ****
  	int iIndent;
  #endif
! #if (_WIN32_WINNT >= _WXP)
  	int iGroupId;
  	UINT cColumns;
--- 2318,2322 ----
  	int iIndent;
  #endif
! #if (_WIN32_WINNT >= 0x0501)
  	int iGroupId;
  	UINT cColumns;
***************
*** 2297,2301 ****
  	int iIndent;
  #endif
! #if (_WIN32_WINNT >= _WXP)
  	int iGroupId;
  	UINT cColumns;
--- 2339,2343 ----
  	int iIndent;
  #endif
! #if (_WIN32_WINNT >= 0x0501)
  	int iGroupId;
  	UINT cColumns;
***************
*** 2537,2540 ****
--- 2579,2598 ----
  #define _TV_DISPINFOW tagNMTVDISPINFOW
  #define TV_DISPINFOW NMTVDISPINFOW
+ #if (_WIN32_IE >= 0x0400)
+ typedef struct tagNMTVGETINFOTIPA {
+ 	NMHDR hdr;
+ 	LPSTR pszText;
+ 	int cchTextMax;
+ 	HTREEITEM hItem;
+ 	LPARAM lParam;
+ } NMTVGETINFOTIPA, *LPNMTVGETINFOTIPA;
+ typedef struct tagNMTVGETINFOTIPW {
+ 	NMHDR hdr;
+ 	LPWSTR pszText;
+ 	int cchTextMax;
+ 	HTREEITEM hItem;
+ 	LPARAM lParam;
+ } NMTVGETINFOTIPW, *LPNMTVGETINFOTIPW;
+ #endif
  typedef struct _TV_KEYDOWN {
  	NMHDR hdr;
***************
*** 2701,2705 ****
  	UINT fStyle;
  	DWORD dwRop;
! #if (_WIN32_WINNT >= _WXP)
  	DWORD fState;
  	DWORD Frame;
--- 2759,2763 ----
  	UINT fStyle;
  	DWORD dwRop;
! #if (_WIN32_WINNT >= 0x0501)
  	DWORD fState;
  	DWORD Frame;
***************
*** 2746,2749 ****
--- 2804,2815 ----
  } RBHITTESTINFO,*LPRBHITTESTINFO;
  #endif
+ typedef struct _DSA *HDSA;
+ typedef struct _DPA *HDPA;
+ typedef INT (CALLBACK *PFNDPAENUMCALLBACK)(PVOID,PVOID);
+ typedef INT (CALLBACK *PFNDSAENUMCALLBACK)(PVOID,PVOID);
+ typedef INT (CALLBACK *PFNDPACOMPARE)(PVOID,PVOID,LPARAM);
+ #if (_WIN32_WINNT >= 0x0501)
+ typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR);
+ #endif /* _WIN32_WINNT >= 0x0501 */
  
  #define INDEXTOOVERLAYMASK(i) ((i)<<8)
***************
*** 2795,2798 ****
--- 2861,2908 ----
  #define Header_SetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_SETORDERARRAY,(WPARAM)(l),(LPARAM)(a))
  #endif
+ HDSA WINAPI DSA_Create(INT,INT);
+ BOOL WINAPI DSA_Destroy(HDSA);
+ VOID WINAPI DSA_DestroyCallback(HDSA,PFNDSAENUMCALLBACK,PVOID);
+ PVOID WINAPI DSA_GetItemPtr(HDSA,INT);
+ INT WINAPI DSA_InsertItem(HDSA,INT,PVOID);
+ HDPA WINAPI DPA_Create(INT);
+ BOOL WINAPI DPA_Destroy(HDPA);
+ PVOID WINAPI DPA_DeletePtr(HDPA,INT);
+ BOOL WINAPI DPA_DeleteAllPtrs(HDPA);
+ VOID WINAPI DPA_EnumCallback(HDPA,PFNDPAENUMCALLBACK,PVOID);
+ VOID WINAPI DPA_DestroyCallback(HDPA,PFNDPAENUMCALLBACK,PVOID);
+ BOOL WINAPI DPA_SetPtr(HDPA,INT,PVOID);
+ INT WINAPI DPA_InsertPtr(HDPA,INT,PVOID);
+ PVOID WINAPI DPA_GetPtr(HDPA,INT_PTR);
+ BOOL WINAPI DPA_Sort(HDPA,PFNDPACOMPARE,LPARAM);
+ INT WINAPI DPA_Search(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT);
+ BOOL WINAPI Str_SetPtrW(LPWSTR*,LPCWSTR);
+ #if (_WIN32_IE >= 0x0400)
+ BOOL WINAPI FlatSB_EnableScrollBar(HWND,INT,UINT);
+ BOOL WINAPI FlatSB_ShowScrollBar(HWND,INT,BOOL);
+ BOOL WINAPI FlatSB_GetScrollRange(HWND,INT,LPINT,LPINT);
+ BOOL WINAPI FlatSB_GetScrollInfo(HWND,INT,LPSCROLLINFO);
+ INT WINAPI FlatSB_GetScrollPos(HWND,INT);
+ BOOL WINAPI FlatSB_GetScrollProp(HWND,INT,LPINT);
+ #ifdef _WIN64
+ BOOL WINAPI FlatSB_GetScrollPropPtr(HWND,INT,PINT_PTR);
+ #else
+ #define FlatSB_GetScrollPropPtr FlatSB_GetScrollProp
+ #endif
+ INT WINAPI FlatSB_SetScrollPos(HWND,INT,INT,BOOL);
+ INT WINAPI FlatSB_SetScrollInfo(HWND,INT,LPSCROLLINFO,BOOL);
+ INT WINAPI FlatSB_SetScrollRange(HWND,INT,INT,INT,BOOL);
+ BOOL WINAPI FlatSB_SetScrollProp(HWND,UINT,INT_PTR,BOOL);
+ #define FlatSB_SetScrollPropPtr FlatSB_SetScrollProp
+ BOOL WINAPI InitializeFlatSB(HWND);
+ HRESULT WINAPI UninitializeFlatSB(HWND);
+ #endif /* _WIN32_IE >= 0x0400 */
+ #if (_WIN32_WINNT >= 0x0501)
+ BOOL WINAPI SetWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR,DWORD_PTR);
+ BOOL WINAPI GetWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR,DWORD_PTR*);
+ BOOL WINAPI RemoveWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR);
+ LRESULT WINAPI DefSubclassProc(HWND,UINT,WPARAM,LPARAM);
+ INT WINAPI DrawShadowText(HDC,LPCWSTR,UINT,RECT*,DWORD,COLORREF,COLORREF,INT,INT);
+ #endif /* _WIN32_WINNT >= 0x0501 */
  int WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
  #define ImageList_AddIcon(l,i) ImageList_ReplaceIcon(l,-1,i)
***************
*** 2849,2853 ****
  #define ListView_SetCallbackMask(w,m) (BOOL)SNDMSG((w),LVM_SETCALLBACKMASK,m,0)
  #define ListView_GetNextItem(w,i,f) (int)SNDMSG((w),LVM_GETNEXTITEM,i,MAKELPARAM((f),0))
! #define ListView_FindItem(w,i,p) (int)SNDMSG((w), LVM_FINDITEM,i,(LPARAM)(const LV_FINDINFO*)(p))
  #define ListView_GetItemRect(w,i,p,c) (BOOL)SNDMSG((w),LVM_GETITEMRECT,i,((p)?(((LPRECT)(p))->left=(c),(LPARAM)(LPRECT)(p)):0))
  #define ListView_SetItemPosition(w,i,x,y) (BOOL)SNDMSG((w),LVM_SETITEMPOSITION,i,MAKELPARAM(x,y))
--- 2959,2963 ----
  #define ListView_SetCallbackMask(w,m) (BOOL)SNDMSG((w),LVM_SETCALLBACKMASK,m,0)
  #define ListView_GetNextItem(w,i,f) (int)SNDMSG((w),LVM_GETNEXTITEM,i,MAKELPARAM((f),0))
! #define ListView_FindItem(w,i,p) (int)SNDMSG((w), LVM_FINDITEM,(WPARAM)i,(LPARAM)(const LV_FINDINFO*)(p))
  #define ListView_GetItemRect(w,i,p,c) (BOOL)SNDMSG((w),LVM_GETITEMRECT,i,((p)?(((LPRECT)(p))->left=(c),(LPARAM)(LPRECT)(p)):0))
  #define ListView_SetItemPosition(w,i,x,y) (BOOL)SNDMSG((w),LVM_SETITEMPOSITION,i,MAKELPARAM(x,y))
***************
*** 2910,2913 ****
--- 3020,3026 ----
  }
  #define ListView_GetSelectedCount(w) (UINT)SNDMSG((w),LVM_GETSELECTEDCOUNT,0,0)
+ #define ListView_GetCheckState(w,i) ((((UINT)(SNDMSG((w),LVM_GETITEMSTATE,(WPARAM)(i),LVIS_STATEIMAGEMASK)))>>12)-1)
+ #define ListView_SetCheckState(w,i,f) ListView_SetItemState(w,i,INDEXTOSTATEIMAGEMASK((f)+1),LVIS_STATEIMAGEMASK)
+ 
  BOOL WINAPI MakeDragList(HWND);
  void WINAPI MenuHelp(UINT,WPARAM,LPARAM,HMENU,HINSTANCE,HWND,PUINT);
***************
*** 2955,2958 ****
--- 3068,3072 ----
  #define TabCtrl_GetCurFocus(w) (int)SNDMSG((w),TCM_GETCURFOCUS,0,0)
  #define TabCtrl_SetCurFocus(w,i) (void)SNDMSG((w),TCM_SETCURFOCUS,i,0)
+ #define TabCtrl_GetImageList(w) (HIMAGELIST)SNDMSG((w),TCM_GETIMAGELIST,0,0)
  #define TabCtrl_SetImageList(w,h) (HIMAGELIST)SNDMSG((w),TCM_SETIMAGELIST,0,(LPARAM)(UINT)(h))
  #define TabCtrl_GetItemCount(w) (int)SNDMSG((w),TCM_GETITEMCOUNT,0,0)
***************
*** 2979,2983 ****
  #define TreeView_GetDropHilight(w)	TreeView_GetNextItem(w,NULL,TVGN_DROPHILITE)
  #define TreeView_GetRoot(w)	TreeView_GetNextItem(w,NULL,TVGN_ROOT)
! #define TreeView_Select(w,i,c) (HTREEITEM)SNDMSG((w),TVM_SELECTITEM,c,(LPARAM)(HTREEITEM)(i))
  #define TreeView_SelectItem(w,i)	TreeView_Select(w,i,TVGN_CARET)
  #define TreeView_SelectDropTarget(w,i)	TreeView_Select(w,i,TVGN_DROPHILITE)
--- 3093,3097 ----
  #define TreeView_GetDropHilight(w)	TreeView_GetNextItem(w,NULL,TVGN_DROPHILITE)
  #define TreeView_GetRoot(w)	TreeView_GetNextItem(w,NULL,TVGN_ROOT)
! #define TreeView_Select(w,i,c) (BOOL)SNDMSG((w),TVM_SELECTITEM,c,(LPARAM)(HTREEITEM)(i))
  #define TreeView_SelectItem(w,i)	TreeView_Select(w,i,TVGN_CARET)
  #define TreeView_SelectDropTarget(w,i)	TreeView_Select(w,i,TVGN_DROPHILITE)
***************
*** 3186,3189 ****
--- 3300,3308 ----
  #define NMTVDISPINFO NMTVDISPINFOW
  #define LPNMTVDISPINFO LPNMTVDISPINFOW
+ #if (_WIN32_IE >= 0x0400)
+ #define NMTVGETINFOTIP NMTVGETINFOTIPW
+ #define LPNMTVGETINFOTIP LPNMTVGETINFOTIPW
+ #define TVN_GETINFOTIP TVN_GETINFOTIPW
+ #endif
  #define TVN_SELCHANGING TVN_SELCHANGINGW
  #define TVN_SELCHANGED TVN_SELCHANGEDW
***************
*** 3350,3353 ****
--- 3469,3477 ----
  #define NMTVDISPINFO NMTVDISPINFOA
  #define LPNMTVDISPINFO LPNMTVDISPINFOA
+ #if (_WIN32_IE >= 0x0400)
+ #define NMTVGETINFOTIP NMTVGETINFOTIPA
+ #define LPNMTVGETINFOTIP LPNMTVGETINFOTIPA
+ #define TVN_GETINFOTIP TVN_GETINFOTIPA
+ #endif
  #define TVN_SELCHANGING TVN_SELCHANGINGA
  #define TVN_SELCHANGED TVN_SELCHANGEDA

Index: cpl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/cpl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cpl.h	9 Apr 2002 21:17:17 -0000	1.2
--- cpl.h	15 Feb 2004 07:35:00 -0000	1.3
***************
*** 19,23 ****
  #define CPL_EXIT 7
  #define CPL_NEWINQUIRE 8
! #define CPL_STARTWPARMS 9
  #define CPL_SETUP 200
  typedef LONG(APIENTRY *APPLET_PROC)(HWND,UINT,LONG,LONG);
--- 19,24 ----
  #define CPL_EXIT 7
  #define CPL_NEWINQUIRE 8
! #define CPL_STARTWPARMSA 9
! #define CPL_STARTWPARMSW 10
  #define CPL_SETUP 200
  typedef LONG(APIENTRY *APPLET_PROC)(HWND,UINT,LONG,LONG);
***************
*** 49,54 ****
--- 50,57 ----
  } NEWCPLINFOW,*LPNEWCPLINFOW;
  #ifdef UNICODE
+ #define CPL_STARTWPARMS CPL_STARTWPARMSW
  typedef NEWCPLINFOW NEWCPLINFO,*LPNEWCPLINFO;
  #else
+ #define CPL_STARTWPARMS CPL_STARTWPARMSA
  typedef NEWCPLINFOA NEWCPLINFO,*LPNEWCPLINFO;
  #endif

Index: dbt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/dbt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbt.h	6 Jan 2003 19:56:44 -0000	1.3
--- dbt.h	15 Feb 2004 07:35:00 -0000	1.4
***************
*** 40,55 ****
  #define DBTF_MEDIA	1
  #define DBTF_NET	2
! #define BSM_ALLCOMPONENTS 0
! #define BSM_VXDS 1
! #define BSM_NETDRIVER 2
! #define BSM_INSTALLABLEDRIVERS 4
! #define BSM_APPLICATIONS 8
! #define BSF_QUERY 1
! #define BSF_IGNORECURRENTTASK 2
! #define BSF_FLUSHDISK 4
! #define BSF_NOHANG 8
! #define BSF_POSTMESSAGE 16
! #define BSF_FORCEIFHUNG 32
! #define BSF_NOTIMEOUTIFNOTHUNG 64
  #define BSF_MSGSRV32ISOK_BIT 31
  #define BSF_MSGSRV32ISOK 0x80000000
--- 40,67 ----
  #define DBTF_MEDIA	1
  #define DBTF_NET	2
! 
! /* Also defined in winuser.h */
! #define BSM_ALLCOMPONENTS	0
! #define BSM_APPLICATIONS	8
! #define BSM_ALLDESKTOPS		16
! #define BSM_INSTALLABLEDRIVERS	4
! #define BSM_NETDRIVER	2
! #define BSM_VXDS	1
! #define BSF_FLUSHDISK 0x00000004
! #define BSF_FORCEIFHUNG 0x00000020
! #define BSF_IGNORECURRENTTASK 0x00000002
! #define BSF_NOHANG 0x00000008
! #define BSF_NOTIMEOUTIFNOTHUNG 0x00000040
! #define BSF_POSTMESSAGE 0x00000010
! #define BSF_QUERY 0x00000001
! #if (_WIN32_WINNT >= 0x0500)
! #define BSF_ALLOWSFW 0x00000080
! #define BSF_SENDNOTIFYMESSAGE 0x00000100
! #endif /* (_WIN32_WINNT >= 0x0500) */
! #if (_WIN32_WINNT >= 0x0501)
! #define BSF_LUID 0x00000400
! #define BSF_RETURNHDESK 0x00000200
! #endif /* (_WIN32_WINNT >= 0x0501) */
! 
  #define BSF_MSGSRV32ISOK_BIT 31
  #define BSF_MSGSRV32ISOK 0x80000000

Index: mshtml.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/mshtml.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mshtml.h	12 Sep 2003 13:26:51 -0000	1.2
--- mshtml.h	15 Feb 2004 07:35:00 -0000	1.3
***************
*** 224,229 ****
  	STDMETHOD(get_protocol)(THIS_ BSTR*) PURE;
  	STDMETHOD(get_nameProp)(THIS_ BSTR*) PURE;
! 	STDMETHOD(write)(THIS_ SAFEARRAY) PURE;
! 	STDMETHOD(writeln)(THIS_ SAFEARRAY) PURE;
  	STDMETHOD(open)(THIS_ BSTR,VARIANT,VARIANT,VARIANT,IDispatch**) PURE;
  	STDMETHOD(close)(THIS) PURE;
--- 224,229 ----
  	STDMETHOD(get_protocol)(THIS_ BSTR*) PURE;
  	STDMETHOD(get_nameProp)(THIS_ BSTR*) PURE;
! 	STDMETHOD(write)(THIS_ SAFEARRAY*) PURE;
! 	STDMETHOD(writeln)(THIS_ SAFEARRAY*) PURE;
  	STDMETHOD(open)(THIS_ BSTR,VARIANT,VARIANT,VARIANT,IDispatch**) PURE;
  	STDMETHOD(close)(THIS) PURE;

Index: nspapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/nspapi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nspapi.h	27 Aug 2002 12:39:55 -0000	1.3
--- nspapi.h	15 Feb 2004 07:35:00 -0000	1.4
***************
*** 103,109 ****
  typedef void *LPSERVICE_ASYNC_INFO;
  INT WINAPI SetServiceA(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
! INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
! INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD);
! INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD);
  
  #ifdef UNICODE
--- 103,109 ----
  typedef void *LPSERVICE_ASYNC_INFO;
  INT WINAPI SetServiceA(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
! INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOW,LPSERVICE_ASYNC_INFO,LPDWORD);
! INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPSTR,LPDWORD);
! INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPWSTR,LPDWORD);
  
  #ifdef UNICODE

Index: ntsecapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ntsecapi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ntsecapi.h	9 Apr 2002 21:17:17 -0000	1.3
--- ntsecapi.h	15 Feb 2004 07:35:00 -0000	1.4
***************
*** 130,133 ****
--- 130,134 ----
    PWSTR Buffer;
  } UNICODE_STRING, *PUNICODE_STRING;
+ typedef const UNICODE_STRING* PCUNICODE_STRING;
  typedef struct _STRING {
    USHORT Length;

Index: oaidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/oaidl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** oaidl.h	12 Sep 2003 13:26:51 -0000	1.6
--- oaidl.h	15 Feb 2004 07:35:00 -0000	1.7
***************
*** 55,58 ****
--- 55,59 ----
  
  typedef interface ITypeLib *LPTYPELIB;
+ typedef interface ITypeLib2 *LPTYPELIB2;
  typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
  typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
***************
*** 61,64 ****
--- 62,66 ----
  typedef interface ITypeComp *LPTYPECOMP;
  typedef interface ITypeInfo *LPTYPEINFO;
+ typedef interface ITypeInfo2 *LPTYPEINFO2;
  typedef interface IErrorInfo *LPERRORINFO;
  typedef interface IDispatch *LPDISPATCH;
***************
*** 69,72 ****
--- 71,75 ----
  
  extern const IID IID_ITypeLib;
+ extern const IID IID_ITypeLib2;
  extern const IID IID_ICreateTypeInfo;
  extern const IID IID_ICreateTypeInfo2;
***************
*** 74,77 ****
--- 77,81 ----
  extern const IID IID_ICreateTypeLib2;
  extern const IID IID_ITypeInfo;
+ extern const IID IID_ITypeInfo2;
  extern const IID IID_IErrorInfo;
  extern const IID IID_IDispatch;
***************
*** 520,523 ****
--- 524,570 ----
  
  #undef INTERFACE
+ #define INTERFACE ITypeInfo2
+ DECLARE_INTERFACE_(ITypeInfo2,ITypeInfo)
+ {
+ 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ 	STDMETHOD_(ULONG,Release)(THIS) PURE;
+ 	STDMETHOD(GetTypeAttr)(THIS_ LPTYPEATTR*) PURE;
+ 	STDMETHOD(GetTypeComp)(THIS_ LPTYPECOMP*) PURE;
+ 	STDMETHOD(GetFuncDesc)(THIS_ UINT,LPFUNCDESC*) PURE;
+ 	STDMETHOD(GetVarDesc)(THIS_ UINT,LPVARDESC*) PURE;
+ 	STDMETHOD(GetNames)(THIS_ MEMBERID,BSTR*,UINT,UINT*) PURE;
+ 	STDMETHOD(GetRefTypeOfImplType)(THIS_ UINT,HREFTYPE*) PURE;
+ 	STDMETHOD(GetImplTypeFlags)(THIS_ UINT,INT*) PURE;
+ 	STDMETHOD(GetIDsOfNames)(THIS_ LPOLESTR*,UINT,MEMBERID*) PURE;
+ 	STDMETHOD(Invoke)(THIS_ PVOID,MEMBERID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+ 	STDMETHOD(GetDocumentation)(THIS_ MEMBERID,BSTR*,BSTR*,DWORD*,BSTR*) PURE;
+ 	STDMETHOD(GetDllEntry)(THIS_ MEMBERID,INVOKEKIND,BSTR*,BSTR*,WORD*) PURE;
+ 	STDMETHOD(GetRefTypeInfo)(THIS_ HREFTYPE,LPTYPEINFO*) PURE;
+ 	STDMETHOD(AddressOfMember)(THIS_ MEMBERID,INVOKEKIND,PVOID*) PURE;
+ 	STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
+ 	STDMETHOD(GetMops)(THIS_ MEMBERID,BSTR*) PURE;
+ 	STDMETHOD(GetContainingTypeLib)(THIS_ LPTYPELIB*,UINT*) PURE;
+ 	STDMETHOD_(void,ReleaseTypeAttr)(THIS_ LPTYPEATTR) PURE;
+ 	STDMETHOD_(void,ReleaseFuncDesc)(THIS_ LPFUNCDESC) PURE;
+ 	STDMETHOD_(void,ReleaseVarDesc)(THIS_ LPVARDESC) PURE;
+ 	STDMETHOD(GetTypeKind)(THIS_ TYPEKIND*) PURE;
+ 	STDMETHOD(GetTypeFlags)(THIS_ ULONG*) PURE;
+ 	STDMETHOD(GetFuncIndexOfMemId)(THIS_ MEMBERID,INVOKEKIND,UINT*) PURE;
+ 	STDMETHOD(GetVarIndexOfMemId)(THIS_ MEMBERID,UINT*) PURE;
+ 	STDMETHOD(GetCustData)(THIS_ REFGUID,VARIANT*) PURE;
+ 	STDMETHOD(GetFuncCustData)(THIS_ UINT,REFGUID,VARIANT*) PURE;
+ 	STDMETHOD(GetParamCustData)(THIS_ UINT,UINT,REFGUID,VARIANT*) PURE;
+ 	STDMETHOD(GetVarCustData)(THIS_ UINT,REFGUID,VARIANT*) PURE;
+ 	STDMETHOD(GetImplTypeCustData)(THIS_ UINT,REFGUID,VARIANT*) PURE;
+ 	STDMETHOD(GetDocumentation2)(THIS_ MEMBERID,LCID,BSTR*,DWORD*,BSTR*) PURE;
+ 	STDMETHOD(GetAllCustData)(THIS_ CUSTDATA*) PURE;
+ 	STDMETHOD(GetAllFuncCustData)(THIS_ UINT,CUSTDATA*) PURE;
+ 	STDMETHOD(GetAllParamCustData)(THIS_ UINT,UINT,CUSTDATA*) PURE;
+ 	STDMETHOD(GetAllVarCustData)(THIS_ UINT,CUSTDATA*) PURE;
+ 	STDMETHOD(GetAllImplTypeCustData)(THIS_ UINT,CUSTDATA*) PURE;
+ };
+ 
+ #undef INTERFACE
  #define INTERFACE ITypeLib
  DECLARE_INTERFACE_(ITypeLib,IUnknown)
***************
*** 538,541 ****
--- 585,611 ----
  };
  
+ #undef INTERFACE
+ #define INTERFACE ITypeLib2
+ DECLARE_INTERFACE_(ITypeLib2,ITypeLib)
+ {
+ 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ 	STDMETHOD_(ULONG,Release)(THIS) PURE;
+ 	STDMETHOD_(UINT,GetTypeInfoCount)(THIS) PURE;
+ 	STDMETHOD(GetTypeInfo)(THIS_ UINT,ITypeInfo**) PURE;
+ 	STDMETHOD(GetTypeInfoType)(THIS_ UINT,TYPEKIND*) PURE;
+ 	STDMETHOD(GetTypeInfoOfGuid)(THIS_ REFGUID,ITypeInfo**) PURE;
+ 	STDMETHOD(GetLibAttr)(THIS_ TLIBATTR**) PURE;
+ 	STDMETHOD(GetTypeComp)(THIS_ ITypeComp*) PURE;
+ 	STDMETHOD(GetDocumentation)(THIS_ INT,BSTR*,BSTR*,DWORD*,BSTR*) PURE;
+ 	STDMETHOD(IsName)(THIS_ LPOLESTR,ULONG,BOOL*) PURE;
+ 	STDMETHOD(FindName)(THIS_ LPOLESTR,ULONG,ITypeInfo**,MEMBERID*,USHORT*) PURE;
+ 	STDMETHOD_(void,ReleaseTLibAttr)(THIS_ TLIBATTR*) PURE;
+ 	STDMETHOD(GetCustData)(THIS_ REFGUID,VARIANT*) PURE;
+ 	STDMETHOD(GetLibStatistics)(THIS_ ULONG*,ULONG*) PURE;
+ 	STDMETHOD(GetDocumentation2)(THIS_ INT,LCID,BSTR*,DWORD*,BSTR*) PURE;
+ 	STDMETHOD(GetAllCustData)(THIS_ CUSTDATA*) PURE;
+ };
+ 
  EXTERN_C const IID IID_IErrorInfo;
  #undef INTERFACE
***************
*** 553,556 ****
--- 623,637 ----
  };
  
+ #ifdef COBJMACROS
+ #define IErrorInfo_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
+ #define IErrorInfo_AddRef(T) (T)->lpVtbl->AddRef(T)
+ #define IErrorInfo_Release(T) (T)->lpVtbl->Release(T)
+ #define IErrorInfo_GetGUID(T,a) (T)->lpVtbl->GetGUID(T,a)
+ #define IErrorInfo_GetSource(T,a) (T)->lpVtbl->GetSource(T,a)
+ #define IErrorInfo_GetDescription(T,a) (T)->lpVtbl->GetDescription(T,a)
+ #define IErrorInfo_GetHelpFile(T,a) (T)->lpVtbl->GetHelpFile(T,a)
+ #define IErrorInfo_GetHelpContext(T,a) (T)->lpVtbl->GetHelpContext(T,a)
+ #endif
+ 
  EXTERN_C const IID IID_ICreateErrorInfo;
  #undef INTERFACE

Index: objbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objbase.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** objbase.h	11 Mar 2003 15:26:47 -0000	1.8
--- objbase.h	15 Feb 2004 07:35:00 -0000	1.9
***************
*** 40,43 ****
--- 40,44 ----
  #define STGM_CREATE 0x1000
  #define STGM_CONVERT 0x20000
+ #define STGM_NOSNAPSHOT 0x200000
  #define STGM_FAILIFTHERE 0
  #define CWCSTORAGENAME 32
***************
*** 93,97 ****
  WINOLEAPI CoRevokeMallocSpy(void);
  WINOLEAPI CoCreateStandardMalloc(DWORD,IMalloc**);
! #if DBG == 1
  WINOLEAPI_(ULONG) DebugCoGetRpcFault(void);
  WINOLEAPI_(void) DebugCoSetRpcFault(ULONG);
--- 94,98 ----
  WINOLEAPI CoRevokeMallocSpy(void);
  WINOLEAPI CoCreateStandardMalloc(DWORD,IMalloc**);
! #ifdef DBG
  WINOLEAPI_(ULONG) DebugCoGetRpcFault(void);
  WINOLEAPI_(void) DebugCoSetRpcFault(ULONG);
***************
*** 181,184 ****
--- 182,187 ----
  WINOLEAPI CoResumeClassObjects(void);
  WINOLEAPI CoSuspendClassObjects(void);
+ WINOLEAPI CoGetPSClsid(REFIID,CLSID*);
+ WINOLEAPI CoRegisterPSClsid(REFIID,REFCLSID);
  
  #pragma pack(pop)

Index: objidl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/objidl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** objidl.h	12 Sep 2003 13:26:51 -0000	1.6
--- objidl.h	15 Feb 2004 07:35:00 -0000	1.7
***************
*** 466,473 ****
  	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
  	STDMETHOD_(ULONG,Release)(THIS) PURE;
! 	STDMETHOD(GetUnmarshalClass) (THIS_ REFIID,DWORD,PVOID,DWORD,CLSID*) PURE;
! 	STDMETHOD(GetMarshalSizeMax) (THIS_ REFIID,DWORD,PVOID,DWORD,PDWORD) PURE;
! 	STDMETHOD(MarshalInterface) (THIS_ REFIID,DWORD,DWORD) PURE;
! 	STDMETHOD(UnmarshalInterface) (THIS_ IStream*,void**) PURE;
  	STDMETHOD(ReleaseMarshalData) (THIS_ IStream*) PURE;
  	STDMETHOD(DisconnectObject) (THIS_ DWORD) PURE;
--- 466,473 ----
  	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
  	STDMETHOD_(ULONG,Release)(THIS) PURE;
! 	STDMETHOD(GetUnmarshalClass) (THIS_ REFIID,PVOID,DWORD,PVOID,DWORD,CLSID*) PURE;
! 	STDMETHOD(GetMarshalSizeMax) (THIS_ REFIID,PVOID,DWORD,PVOID,PDWORD,ULONG*) PURE;
! 	STDMETHOD(MarshalInterface) (THIS_ IStream*,REFIID,PVOID,DWORD,PVOID,DWORD) PURE;
! 	STDMETHOD(UnmarshalInterface) (THIS_ IStream*,REFIID,void**) PURE;
  	STDMETHOD(ReleaseMarshalData) (THIS_ IStream*) PURE;
  	STDMETHOD(DisconnectObject) (THIS_ DWORD) PURE;
***************
*** 513,517 ****
  	STDMETHOD_(void*,PreFree)(THIS_ void*,BOOL) PURE;
  	STDMETHOD_(void,PostFree)(THIS_ BOOL) PURE;
! 	STDMETHOD_(ULONG,PreRealloc)(THIS_ void*,ULONG,void*) PURE;
  	STDMETHOD_(void*,PostRealloc)(THIS_ void*,BOOL) PURE;
  	STDMETHOD_(void*,PreGetSize)(THIS_ void*,BOOL) PURE;
--- 513,517 ----
  	STDMETHOD_(void*,PreFree)(THIS_ void*,BOOL) PURE;
  	STDMETHOD_(void,PostFree)(THIS_ BOOL) PURE;
! 	STDMETHOD_(ULONG,PreRealloc)(THIS_ void*,ULONG,void**,BOOL) PURE;
  	STDMETHOD_(void*,PostRealloc)(THIS_ void*,BOOL) PURE;
  	STDMETHOD_(void*,PreGetSize)(THIS_ void*,BOOL) PURE;
***************
*** 818,821 ****
--- 818,822 ----
  	STDMETHOD(CreateStub)(THIS_ REFIID,LPUNKNOWN,LPRPCSTUBBUFFER*) PURE;
  };
+ typedef interface IPSFactoryBuffer *LPPSFACTORYBUFFER;
  
  EXTERN_C const IID IID_ILockBytes;
***************
*** 1003,1006 ****
--- 1004,1029 ----
  };
  
+ EXTERN_C const IID IID_IGlobalInterfaceTable;
+ #undef INTERFACE
+ #define INTERFACE IGlobalInterfaceTable
+ DECLARE_INTERFACE_(IGlobalInterfaceTable,IUnknown)
+ {
+ 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+ 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ 	STDMETHOD_(ULONG,Release)(THIS) PURE;
+ 	STDMETHOD(RegisterInterfaceInGlobal)(THIS_ IUnknown*,REFIID,DWORD*) PURE;
+ 	STDMETHOD(RevokeInterfaceFromGlobal)(THIS_ DWORD) PURE;
+ 	STDMETHOD(GetInterfaceFromGlobal)(THIS_ DWORD,REFIID,void**) PURE;
+ };
+ 
+ #ifdef COBJMACROS
+ #define IGlobalInterfaceTable_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
+ #define IGlobalInterfaceTable_AddRef(T) (T)->lpVtbl->AddRef(T)
+ #define IGlobalInterfaceTable_Release(T) (T)->lpVtbl->Release(T)
+ #define IGlobalInterfaceTable_RegisterInterfaceInGlobal(T,a,b,c) (T)->lpVtbl->RegisterInterfaceInGlobal(T,a,b,c)
+ #define IGlobalInterfaceTable_RevokeInterfaceFromGlobal(T,a) (T)->lpVtbl->RevokeInterfaceFromGlobal(T,a)
+ #define IGlobalInterfaceTable_GetInterfaceFromGlobal(T,a,b,c) (T)->lpVtbl->GetInterfaceFromGlobal(T,a,b,c)
+ #endif
+ 
  HRESULT STDMETHODCALLTYPE IMarshal_GetUnmarshalClass_...
 
[truncated message content]

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

Modified Files:
	Makefile.in advapi32.def cap.def comctl32.def comdlg32.def 
	crypt32.def d3dim.def d3drm.def d3dxof.def ddraw.def 
	dinput.def dplayx.def dsetup.def dsound.def iphlpapi.def 
	kernel32.def rasdlg.def setupapi.def shell32.c shell32.def 
	shfolder.def test.c user32.def uuid.c winspool.def ws2_32.def 
Added Files:
	avicap32.def avifil32.def dhcpcsvc.def dnsapi.def faultrep.def 
	msvfw32.def uxtheme.def vfw32.mri 
Removed Files:
	vfw32.def 
Log Message:
Merge winsup changes

--- NEW FILE: avicap32.def ---
LIBRARY AVICAP32.DLL
EXPORTS
videoThunk32@20
capGetDriverDescriptionW@20
capGetDriverDescriptionA@20
capCreateCaptureWindowW@32
capCreateCaptureWindowA@32
AppCleanup@4

--- NEW FILE: avifil32.def ---
LIBRARY AVIFIL32.DLL
EXPORTS
IID_IGetFrame
IID_IAVIStream
IID_IAVIFile
IID_IAVIEditStream
EditStreamSetNameW@8
EditStreamSetNameA@8
EditStreamSetName@8
EditStreamSetInfoW@12
EditStreamSetInfoA@12
EditStreamSetInfo@12
EditStreamPaste@24
EditStreamCut@16
EditStreamCopy@16
EditStreamClone@8
CreateEditableStream@8
AVIStreamWriteData@16
AVIStreamWrite@32
AVIStreamTimeToSample@8
AVIStreamStart@4
AVIStreamSetFormat@16
AVIStreamSampleToTime@8
AVIStreamRelease@4
AVIStreamReadFormat@16
AVIStreamReadData@16
AVIStreamRead@28
AVIStreamOpenFromFileW@24
AVIStreamOpenFromFileA@24
AVIStreamOpenFromFile@24
AVIStreamLength@4
AVIStreamInfoW@12
AVIStreamInfoA@12
AVIStreamInfo@12
AVIStreamGetFrameOpen@8
AVIStreamGetFrameClose@4
AVIStreamGetFrame@8
AVIStreamFindSample@12
AVIStreamEndStreaming@4
AVIStreamCreate@16
AVIStreamBeginStreaming@16
AVIStreamAddRef@4
AVISaveW
AVISaveVW@24
AVISaveVA@24
AVISaveV@24
AVISaveOptionsFree@8
AVISaveOptions@20
AVISaveA
AVISave
AVIPutFileOnClipboard@4
AVIMakeStreamFromClipboard@12
AVIMakeFileFromStreams@12
AVIMakeCompressedStream@16
AVIGetFromClipboard@4
AVIFileWriteData@16
AVIFileRelease@4
AVIFileReadData@16
AVIFileOpenW@16
AVIFileOpenA@16
AVIFileOpen@16
AVIFileInit@0
AVIFileInfoW@12
AVIFileInfoA@12
AVIFileInfo@12
AVIFileGetStream@16
AVIFileExit@0
AVIFileEndRecord@4
AVIFileCreateStreamW@12
AVIFileCreateStreamA@12
AVIFileCreateStream@12
AVIFileAddRef@4
AVIClearClipboard@0
AVIBuildFilterW@12
AVIBuildFilterA@12
AVIBuildFilter@12


--- NEW FILE: dhcpcsvc.def ---
LIBRARY DHCPCSVC.DLL
EXPORTS
DhcpCApiCleanup@0
DhcpCApiInitialize@4
DhcpDeRegisterParamChange@12
DhcpRegisterParamChange@28
DhcpRemoveDNSRegistrations@0
DhcpUndoRequestParams@16

--- NEW FILE: dnsapi.def ---
LIBRARY DNSAPI.DLL
EXPORTS
DnsAcquireContextHandle_A@12
DnsAcquireContextHandle_W@12
DnsExtractRecordsFromMessage_UTF8@12
DnsExtractRecordsFromMessage_W@12
DnsModifyRecordsInSet_A@24
DnsModifyRecordsInSet_UTF8@24
DnsModifyRecordsInSet_W@24
DnsNameCompare_A@8
DnsNameCompare_W@8
DnsQuery_A@24
DnsQuery_UTF8@24
DnsQuery_W@24
DnsQueryConfig@24
DnsRecordCompare@8
DnsRecordCopyEx@12
DnsRecordListFree@8
DnsRecordSetCompare@16
DnsRecordSetCopyEx@12
DnsRecordSetDetach@4
DnsReleaseContextHandle@4
DnsReplaceRecordSetA@20
DnsReplaceRecordSetUTF8@20
DnsReplaceRecordSetW@20
DnsValidateName_A@8
DnsValidateName_UTF8@8
DnsValidateName_W@8
DnsWriteQuestionToBuffer_UTF8@24
DnsWriteQuestionToBuffer_W@24


--- NEW FILE: faultrep.def ---
LIBRARY faultrep.DLL
EXPORTS
AddERExcludedApplicationA@4
AddERExcludedApplicationW@4
ReportFault@8

--- NEW FILE: msvfw32.def ---
LIBRARY MSVFW32.DLL
EXPORTS
VideoForWindowsVersion@0
StretchDIB@48
MCIWndRegisterClass
MCIWndCreateW
MCIWndCreateA
MCIWndCreate
ICSeqCompressFrameStart@8
ICSeqCompressFrameEnd@4
ICSeqCompressFrame@20
ICSendMessage@16
ICRemove@12
ICOpenFunction@16
ICOpen@12
ICMThunk32@20
ICLocate@20
ICInstall@20
ICInfo@12
ICImageDecompress@20
ICImageCompress@28
ICGetInfo@12
ICGetDisplayFormat@24
ICDrawBegin
ICDraw
ICDecompress
ICCompressorFree@4
ICCompressorChoose@24
ICCompress
ICClose@4
GetSaveFileNamePreviewW@4
GetSaveFileNamePreviewA@4
GetOpenFileNamePreviewW@4
GetOpenFileNamePreviewA@4
GetOpenFileNamePreview@4
DrawDibTime@8
DrawDibStop@4
DrawDibStart@8
DrawDibSetPalette@8
DrawDibRealize@12
DrawDibProfileDisplay@4
DrawDibOpen@0
DrawDibGetPalette@4
DrawDibGetBuffer@16
DrawDibEnd@4
DrawDibDraw@52
DrawDibClose@4
DrawDibChangePalette@16
DrawDibBegin@32

--- NEW FILE: uxtheme.def ---
LIBRARY UxTheme.dll
EXPORTS
CloseThemeData@4
DrawThemeBackground@24
DrawThemeBackgroundEx@24
DrawThemeEdge@32
DrawThemeIcon@28
DrawThemeParentBackground@12
DrawThemeText@36
EnableThemeDialogTexture@8
EnableTheming@4
GetCurrentThemeName@24
GetThemeAppProperties@0
GetThemeBackgroundContentRect@24
GetThemeBackgroundExtent@24
GetThemeBackgroundRegion@24
GetThemeBool@20
GetThemeColor@20
GetThemeDocumentationProperty@16
GetThemeEnumValue@20
GetThemeFilename@24
GetThemeFont@24
GetThemeInt@20
GetThemeIntList@20
GetThemeMargins@28
GetThemeMetric@24
GetThemePartSize@28
GetThemePosition@20
GetThemePropertyOrigin@20
GetThemeRect@20
GetThemeString@24
GetThemeSysBool@8
GetThemeSysColor@8
GetThemeSysColorBrush@8
GetThemeSysFont@12
GetThemeSysInt@12
GetThemeSysSize@8
GetThemeSysString@16
GetThemeTextExtent@36
GetThemeTextMetrics@20
GetWindowTheme@4
HitTestThemeBackground@40
IsAppThemed@0
IsThemeActive@0
IsThemeBackgroundPartiallyTransparent@12
IsThemeDialogTextureEnabled@4
IsThemePartDefined@12
OpenThemeData@8
SetThemeAppProperties@4
SetWindowTheme@12

--- NEW FILE: vfw32.mri ---
CREATE libvfw32.a
ADDLIB libmsvfw32.a
ADDLIB libavicap32.a
ADDLIB libavifil32.a
SAVE
END

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.in	12 Sep 2003 13:26:51 -0000	1.17
--- Makefile.in	15 Feb 2004 07:35:01 -0000	1.18
***************
*** 111,117 ****
  
  DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
  IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
  EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
! LIBS = $(IMPLIBS) $(EXTRA_LIBS)
  UUID_OBJS = uuid.o mshtml-uuid.o
  EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \
--- 111,119 ----
  
  DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
+ MRI_FILES = $(notdir $(wildcard $(srcdir)/*.mri))
  IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
+ MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES)))
  EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
! LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS)
  UUID_OBJS = uuid.o mshtml-uuid.o
  EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \
***************
*** 121,125 ****
  dxguid.c res.rc test.c kernel32.c
  
! DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
  
  .NOTPARALLEL:
--- 123,127 ----
  dxguid.c res.rc test.c kernel32.c
  
! DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
  
  .NOTPARALLEL:
***************
*** 167,170 ****
--- 169,181 ----
  	$(RANLIB) $@
  
+ # libvfw32.a contains import stubs for 3 dll's.  Using an MRI script
+ # seems to be the simplest way to combine them into one archive.
+ # NB: With older dlltool, the object file members will not have unique
+ # names.
+ libvfw32.a : vfw32.mri libmsvfw32.a libavifil32.a libavicap32.a
+ 	rm -f $@
+ 	$(AR) -M < ${word 1,$^}
+ 	$(RANLIB) $@
+ 
  lib%.a : %.def %.o
  	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def

Index: advapi32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/advapi32.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** advapi32.def	24 Nov 2001 21:08:37 -0000	1.2
--- advapi32.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 1,3 ****
! LIBRARY "ADVAPI32.DLL"
  EXPORTS
  AbortSystemShutdownA@4
--- 1,3 ----
! LIBRARY ADVAPI32.DLL
  EXPORTS
  AbortSystemShutdownA@4
***************
*** 194,197 ****
--- 194,199 ----
  GetFileSecurityA@20
  GetFileSecurityW@20
+ GetInheritanceSourceA@40
+ GetInheritanceSourceW@40
  GetKernelObjectSecurity@20
  GetLengthSid@4

Index: cap.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/cap.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cap.def	5 Jun 2001 01:36:45 -0000	1.1.1.1
--- cap.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,3 ****
! LIBRARY "CAP.DLL"
  EXPORTS
  DumpCAP@0
--- 1,3 ----
! LIBRARY CAP.DLL
  EXPORTS
  DumpCAP@0

Index: comctl32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/comctl32.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** comctl32.def	6 Jan 2003 19:57:21 -0000	1.2
--- comctl32.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 1,3 ****
! LIBRARY "COMCTL32.DLL"
  EXPORTS
  _TrackMouseEvent@4
--- 1,3 ----
! LIBRARY COMCTL32.DLL
  EXPORTS
  _TrackMouseEvent@4

Index: comdlg32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/comdlg32.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** comdlg32.def	1 Nov 2001 00:20:14 -0000	1.2
--- comdlg32.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 1,3 ****
! LIBRARY "COMDLG32.DLL"
  EXPORTS
  ChooseColorA@4
--- 1,3 ----
! LIBRARY COMDLG32.DLL
  EXPORTS
  ChooseColorA@4

Index: crypt32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/crypt32.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** crypt32.def	9 Apr 2002 22:09:39 -0000	1.1
--- crypt32.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,3 ****
! LIBRARY "CRYPT32.DLL"
  EXPORTS
  CertFreeCertificateChain@4
--- 1,3 ----
! LIBRARY CRYPT32.DLL
  EXPORTS
  CertFreeCertificateChain@4

Index: d3dim.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/d3dim.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** d3dim.def	5 Jun 2001 01:36:45 -0000	1.1.1.1
--- d3dim.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "d3dim.dll"
  EXPORTS
  Direct3DCreate@12
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY d3dim.dll
  EXPORTS
  Direct3DCreate@12

Index: d3drm.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/d3drm.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** d3drm.def	5 Jun 2001 01:36:45 -0000	1.1.1.1
--- d3drm.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "d3drm.dll"
  EXPORTS
  D3DRMColorGetAlpha@4
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY d3drm.dll
  EXPORTS
  D3DRMColorGetAlpha@4

Index: d3dxof.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/d3dxof.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** d3dxof.def	5 Jun 2001 01:36:45 -0000	1.1.1.1
--- d3dxof.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "d3dxof.dll"
  EXPORTS
  DirectXFileCreate@4
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY d3dxof.dll
  EXPORTS
  DirectXFileCreate@4

Index: ddraw.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/ddraw.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ddraw.def	5 Jun 2001 01:36:45 -0000	1.1.1.1
--- ddraw.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "DDRAW.dll"
  EXPORTS
  D3DParseUnknownCommand@8
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY DDRAW.dll
  EXPORTS
  D3DParseUnknownCommand@8

Index: dinput.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/dinput.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dinput.def	20 Jun 2002 16:18:03 -0000	1.2
--- dinput.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "DINPUT.dll"
  EXPORTS
  DirectInputCreateA@16
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY DINPUT.dll
  EXPORTS
  DirectInputCreateA@16

Index: dplayx.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/dplayx.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dplayx.def	5 Jun 2001 01:36:46 -0000	1.1.1.1
--- dplayx.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "DPLAYX.dll"
  EXPORTS
  DirectPlayCreate@12
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY DPLAYX.dll
  EXPORTS
  DirectPlayCreate@12

Index: dsetup.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/dsetup.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dsetup.def	5 Jun 2001 01:36:46 -0000	1.1.1.1
--- dsetup.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "DSETUP.dll"
  EXPORTS
  DirectXDeviceDriverSetupA@16
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY DSETUP.dll
  EXPORTS
  DirectXDeviceDriverSetupA@16

Index: dsound.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/dsound.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dsound.def	5 Jun 2001 01:36:46 -0000	1.1.1.1
--- dsound.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,4 ****
  ; from DirectX 6.1
! LIBRARY "DSOUND.dll"
  EXPORTS
  DirectSoundCaptureCreate@12
--- 1,4 ----
  ; from DirectX 6.1
! LIBRARY DSOUND.dll
  EXPORTS
  DirectSoundCaptureCreate@12

Index: iphlpapi.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/iphlpapi.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iphlpapi.def	30 Nov 2001 08:01:04 -0000	1.2
--- iphlpapi.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 1,3 ****
! LIBRARY "IPHLPAPI.DLL"
  EXPORTS
  AddIPAddress@20
--- 1,3 ----
! LIBRARY IPHLPAPI.DLL
  EXPORTS
  AddIPAddress@20

Index: kernel32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/kernel32.def,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kernel32.def	12 Sep 2003 13:26:51 -0000	1.9
--- kernel32.def	15 Feb 2004 07:35:02 -0000	1.10
***************
*** 1,12 ****
--- 1,18 ----
  LIBRARY KERNEL32.dll
  EXPORTS
+ ActivateActCtx@8
  AddAtomA@4
  AddAtomW@4
  AddConsoleAliasA@12
  AddConsoleAliasW@12
+ AddLocalAlternateComputerNameA@8
+ AddLocalAlternateComputerNameW@8
+ AddRefActCtx@4
+ AddVectoredExceptionHandler@8
  AllocConsole@0
  AllocateUserPhysicalPages@12
  AreFileApisANSI@0
  AssignProcessToJobObject@8
+ AttachConsole@4
  BackupRead@28
  BackupSeek@24
***************
*** 22,29 ****
--- 28,39 ----
  CallNamedPipeA@28
  CallNamedPipeW@28
+ CancelDeviceWakeupRequest@4
  CancelIo@4
  CancelTimerQueueTimer@8
  CancelWaitableTimer@4
  ChangeTimerQueueTimer@16
+ CheckNameLegalDOS8Dot3A@20
+ CheckNameLegalDOS8Dot3W@20
+ CheckRemoteDebuggerPresent@8
  ClearCommBreak@4
  ClearCommError@12
***************
*** 41,44 ****
--- 51,55 ----
  ContinueDebugEvent@12
  ConvertDefaultLocale@4
+ ConvertFiberToThread@0
  ConvertThreadToFiber@4
  ConvertToGlobalHandle@4
***************
*** 47,50 ****
--- 58,63 ----
  CopyFileExA@24
  CopyFileExW@24
+ CreateActCtxA@4
+ CreateActCtxW@4
  CreateConsoleScreenBuffer@20
  CreateDirectoryA@8
***************
*** 55,58 ****
--- 68,72 ----
  CreateEventW@16
  CreateFiber@12
+ CreateFiberEx@12
  CreateFileA@28
  CreateFileMappingA@24
***************
*** 79,88 ****
--- 93,107 ----
  CreateThread@24
  CreateTimerQueue@0
+ CreateTimerQueueTimer@28
  CreateToolhelp32Snapshot@8
  CreateVirtualBuffer@12
  CreateWaitableTimerA@12
  CreateWaitableTimerW@12
+ DeactivateActCtx@8
  DebugActiveProcess@4
+ DebugActiveProcessStop@4
  DebugBreak@0
+ DebugBreakProcess@4
+ DebugSetProcessKillOnExit@4
  DefineDosDeviceA@12
  DefineDosDeviceW@12
***************
*** 93,96 ****
--- 112,117 ----
  DeleteFileW@4
  DeleteTimerQueue@4
+ DeleteTimerQueueEx@8
+ DeleteTimerQueueTimer@12
  DeleteVolumeMountPointA@4
  DeleteVolumeMountPointW@4
***************
*** 98,101 ****
--- 119,124 ----
  DisableThreadLibraryCalls@4
  DisconnectNamedPipe@4
+ DnsHostnameToComputerNameA@12
+ DnsHostnameToComputerNameW@12
  DosDateTimeToFileTime@12
  DuplicateConsoleHandle@16
***************
*** 122,125 ****
--- 145,149 ----
  EnumSystemCodePagesA@8
  EnumSystemCodePagesW@8
+ EnumSystemGeoID@12
  EnumSystemLanguageGroupsA@12
  EnumSystemLanguageGroupsW@12
***************
*** 149,152 ****
--- 173,179 ----
  FillConsoleOutputCharacterA@20
  FillConsoleOutputCharacterW@20
+ FindActCtxSectionGuid@20
+ FindActCtxSectionStringA@20
+ FindActCtxSectionStringW@20
  FindAtomA@4
  FindAtomW@4
***************
*** 216,219 ****
--- 243,248 ----
  GetComputerNameA@8
  GetComputerNameW@8
+ GetComputerNameExA@12
+ GetComputerNameExW@12
  GetConsoleAliasA@16
  GetConsoleAliasExesA@8
***************
*** 249,252 ****
--- 278,282 ----
  GetCurrencyFormatA@24
  GetCurrencyFormatW@24
+ GetCurrentActCtx@4
  GetCurrentConsoleFont@12
  GetCurrentDirectoryA@8
***************
*** 265,268 ****
--- 295,300 ----
  GetDiskFreeSpaceExA@16
  GetDiskFreeSpaceExW@16
+ GetDllDirectoryA@8
+ GetDllDirectoryW@8
  GetDriveTypeA@4
  GetDriveTypeW@4
***************
*** 284,289 ****
--- 316,325 ----
  GetFileTime@16
  GetFileType@4
+ GetFirmwareEnvironmentVariableA@16
+ GetFirmwareEnvironmentVariableW@16
  GetFullPathNameA@16
  GetFullPathNameW@16
+ GetGeoInfoA@20
+ GetGeoInfoW@20
  GetHandleInformation@8
  GetLargestConsoleWindowSize@4
***************
*** 302,308 ****
--- 338,347 ----
  GetModuleHandleA@4
  GetModuleHandleW@4
+ GetModuleHandleExA@12
+ GetModuleHandleExW@12
  GetNamedPipeHandleStateA@28
  GetNamedPipeHandleStateW@28
  GetNamedPipeInfo@20
+ GetNativeSystemInfo@4
  GetNextVDMCommand@4
  GetNumberFormatA@24
***************
*** 326,331 ****
--- 365,373 ----
  GetProcAddress@8
  GetProcessAffinityMask@12
+ GetProcessHandleCount@8
  GetProcessHeap@0
  GetProcessHeaps@8
+ GetProcessId@4
+ GetProcessIoCounters@8
  GetProcessPriorityBoost@8
  GetProcessShutdownParameters@8
***************
*** 357,364 ****
--- 399,411 ----
  GetSystemInfo@4
  GetSystemPowerStatus@4
+ GetSystemRegistryQuota@8
  GetSystemTime@4
  GetSystemTimes@12
  GetSystemTimeAdjustment@12
  GetSystemTimeAsFileTime@4
+ GetSystemWindowsDirectoryA@8
+ GetSystemWindowsDirectoryW@8
+ GetSystemWow64DirectoryA@8
+ GetSystemWow64DirectoryW@8
  GetTapeParameters@16
  GetTapePosition@20
***************
*** 369,372 ****
--- 416,420 ----
  GetTempPathW@8
  GetThreadContext@8
+ GetThreadIOPendingFlag@8
  GetThreadLocale@0
  GetThreadPriority@4
***************
*** 381,384 ****
--- 429,433 ----
  GetUserDefaultLangID@0
  GetUserDefaultUILanguage@0
+ GetUserGeoID@12
  GetVDMCurrentDirectories@8
  GetVersion@0
***************
*** 395,398 ****
--- 444,448 ----
  GetWindowsDirectoryA@8
  GetWindowsDirectoryW@8
+ GetWriteWatch@24
  GlobalAddAtomA@4
  GlobalAddAtomW@4
***************
*** 430,435 ****
--- 480,487 ----
  HeapFree@12
  HeapLock@4
+ HeapQueryInformation@20
  HeapQueryTagW@20
  HeapReAlloc@16
+ HeapSetInformation@16
  HeapSize@12
  HeapSummary@12
***************
*** 441,449 ****
--- 493,505 ----
  InitializeCriticalSection@4
  InitializeCriticalSectionAndSpinCount@8
+ InitializeSListHead@4
  InterlockedCompareExchange@12
  InterlockedDecrement@4
  InterlockedExchange@8
  InterlockedExchangeAdd@8
+ InterlockedFlushSList@4
  InterlockedIncrement@4
+ InterlockedPopEntrySList@4
+ InterlockedPushEntrySList@8
  InvalidateConsoleDIBits@8
  IsBadCodePtr@4
***************
*** 457,464 ****
--- 513,523 ----
  IsDBCSLeadByteEx@8
  IsDebuggerPresent@0
+ IsProcessInJob@12
  IsProcessorFeaturePresent@4
+ IsSystemResumeAutomatic@0
  IsValidCodePage@4
  IsValidLanguageGroup@8
  IsValidLocale@8
+ IsWow64Process@8
  LCMapStringA@24
  LCMapStringW@24
***************
*** 529,537 ****
--- 588,599 ----
  Process32Next@8
  Process32NextW@8
+ ProcessIdToSessionId@8
  PulseEvent@4
  PurgeComm@8
+ QueryActCtxW@28
  QueryDosDeviceA@12
  QueryDosDeviceW@12
  QueryInformationJobObject@20
+ QueryMemoryResourceNotification@8
  QueryPerformanceCounter@4
  QueryPerformanceFrequency@4
***************
*** 563,573 ****
--- 625,641 ----
  RegisterWowBaseHandlers@4
  RegisterWowExec@4
+ ReleaseActCtx@4
  ReleaseMutex@4
  ReleaseSemaphore@12
  RemoveDirectoryA@4
  RemoveDirectoryW@4
+ RemoveVectoredExceptionHandler@4
  ReplaceFile@24
+ ReplaceFileA@24
+ ReplaceFileW@24
  RequestWakeupLatency@4
  ResetEvent@4
+ ResetWriteWatch@8
+ RestoreLastError@4
  ResumeThread@4
  RtlFillMemory@12
***************
*** 588,591 ****
--- 656,661 ----
  SetComputerNameA@4
  SetComputerNameW@4
+ SetComputerNameExA@8
+ SetComputerNameExW@8
  SetConsoleActiveScreenBuffer@4
  SetConsoleCP@4
***************
*** 619,622 ****
--- 689,694 ----
  SetDefaultCommConfigA@12
  SetDefaultCommConfigW@12
+ SetDllDirectoryA@4
+ SetDllDirectoryW@4
  SetEndOfFile@4
  SetEnvironmentVariableA@8
***************
*** 630,634 ****
--- 702,709 ----
  SetFilePointer@16
  SetFilePointerEx@20
+ SetFileShortNameA@8
+ SetFileShortNameW@8
  SetFileTime@16
+ SetFileValidData@12
  SetHandleCount@4
  SetHandleInformation@12
***************
*** 662,665 ****
--- 737,741 ----
  SetTimerQueueTimer@24
  SetUnhandledExceptionFilter@4
+ SetUserGeoID@4
  SetVDMCurrentDirectories@8
  SetVolumeLabelA@8
***************
*** 700,703 ****
--- 776,780 ----
  UnmapViewOfFileVlm@4
  UnregisterWait@4
+ UnregisterWaitEx@8
  UpdateResourceA@24
  UpdateResourceW@24
***************
*** 706,709 ****
--- 783,787 ----
  VerLanguageNameA@12
  VerLanguageNameW@12
+ VerSetConditionMask@13
  VerifyConsoleIoHandle@4
  VerifyVersionInfoA@16
***************
*** 762,765 ****
--- 840,844 ----
  WriteProfileStringW@12
  WriteTapemark@16
+ ZombifyActCtx@4
  _hread@12
  _hwrite@12

Index: rasdlg.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/rasdlg.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rasdlg.def	11 Mar 2003 15:28:04 -0000	1.1
--- rasdlg.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,3 ****
! LIBRARY "RASDLG.DLL"
  EXPORTS
  RasDialDlgA@16
--- 1,3 ----
! LIBRARY RASDLG.DLL
  EXPORTS
  RasDialDlgA@16

Index: setupapi.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/setupapi.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setupapi.def	21 Aug 2001 03:06:24 -0000	1.1
--- setupapi.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 6,9 ****
--- 6,13 ----
  AppendStringToMultiSz@24
  AssertFail@12
+ CM_Request_Device_EjectA@20
+ CM_Request_Device_EjectW@20
+ CM_Request_Device_Eject_ExA@24
+ CM_Request_Device_Eject_ExW@24
  CaptureAndConvertAnsiArg@8
  CaptureStringArg@8

Index: shell32.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/shell32.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shell32.c	12 Sep 2003 13:26:51 -0000	1.2
--- shell32.c	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  DEFINE_SHLGUID(IID_IShellView,0x000214E3L,0,0);
  DEFINE_SHLGUID(IID_IContextMenu,0x000214E4L,0,0);
+ DEFINE_SHLGUID(IID_IQueryInfo,0x00021500L,0,0);
  DEFINE_SHLGUID(IID_IShellIcon,0x000214E5L,0,0);
  DEFINE_SHLGUID(IID_IShellFolder,0x000214E6L,0,0);
***************
*** 36,39 ****
--- 37,44 ----
  DEFINE_SHLGUID(IID_IShellCopyHookW,0x000214FCL,0,0);
  DEFINE_GUID(IID_IShellView2,0x88E39E80L,0x3578,0x11CF,0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62);
+ DEFINE_GUID(IID_IShellFolder2,0x93F2F68C,0x1D1B,0x11D3,0xA3,0x0E,0x00,0xC0,0x4F,0x79,0xAB,0xD1);
+ DEFINE_GUID(IID_IPersistFolder2,0x1AC3D9F0,0x175C,0x11D1,0x95,0xBE,0x00,0x60,0x97,0x97,0xEA,0x4F);
+ DEFINE_GUID(IID_IPersistFolder3,0xCEF04FDF,0xFE72,0x11D2,0x87,0xA5,0x00,0xC0,0x4F,0x68,0x37,0xCF);
+ DEFINE_GUID(IID_IFileSystemBindData,0x1E18D10,0x4D8B,0x11D2,0x85,0x5D,0x00,0x60,0x08,0x05,0x93,0x67);
  DEFINE_GUID(LIBID_SHDocVw,0xEAB22AC0,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
  DEFINE_GUID(IID_IShellExplorer,0xEAB22AC1,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
***************
*** 54,55 ****
--- 59,62 ----
  DEFINE_GUID(IID_IDropTargetHelper,0x4657278BL,0x411B,0x11D2,0x83,0x9A,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
  DEFINE_GUID(IID_IDragSourceHelper,0xDE5BF786L,0x477A,0x11D2,0x83,0x9D,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
+ DEFINE_GUID(IID_IColumnProvider,0xE8025004,0x1C42,0x11D2,0xBE,0x2C,0x0,0xA0,0xC9,0xA8,0x3D,0xA1);
+ DEFINE_GUID(IID_IShellIconOverlayIdentifier,0x0C6C4200L,0xC589,0x11D0,0x99,0x9A,0x00,0xC0,0x4F,0xD6,0x55,0xE1);

Index: shell32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/shell32.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shell32.def	12 Sep 2003 13:26:51 -0000	1.4
--- shell32.def	15 Feb 2004 07:35:02 -0000	1.5
***************
*** 119,122 ****
--- 119,123 ----
  SHCreateDirectoryExW@12
  SHCreateDirectoryExA@12
+ SHCoCreateInstance@20
  SHChangeNotify@16
  SHBrowseForFolderW@4
***************
*** 167,168 ****
--- 168,183 ----
  CheckEscapesW@8
  CheckEscapesA@8
+ ILAppendID@12
+ ILClone@4
+ ILCloneFirst@4
+ ILCombine@8
+ ILFindChild@8
+ ILFindLastID@4
+ ILFree@4
+ ILGetNext@4
+ ILGetSize@4
+ ILIsEqual@8
+ ILIsParent@12
+ ILLoadFromStream@8
+ ILRemoveLastID@4
+ ILSaveToStream@8

Index: shfolder.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/shfolder.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shfolder.def	14 Oct 2002 20:27:53 -0000	1.1
--- shfolder.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,3 ****
! LIBRARY "SHFOLDER.DLL"
  EXPORTS
  SHGetFolderPathA@20
--- 1,3 ----
! LIBRARY SHFOLDER.DLL
  EXPORTS
  SHGetFolderPathA@20

Index: test.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test.c	12 Sep 2003 13:26:51 -0000	1.12
--- test.c	15 Feb 2004 07:35:02 -0000	1.13
***************
*** 79,82 ****
--- 79,87 ----
  #include <mgmtapi.h>
  #include <vfw.h>
+ #include <uxtheme.h>
+ #include <tmschema.h>
+ #include <dhcpcsdk.h>
+ #include <errorrep.h>
+ #include <windns.h>
  
  #ifndef __OBJC__  /* problems with BOOL */

Index: user32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/user32.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** user32.def	12 Sep 2003 13:26:51 -0000	1.6
--- user32.def	15 Feb 2004 07:35:02 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  AdjustWindowRectEx@16
  AllowSetForegroundWindow@4
+ AnimateWindow@12
  AnyPopup@0
  AppendMenuA@16
***************
*** 12,17 ****
--- 13,23 ----
  BeginDeferWindowPos@4
  BeginPaint@8
+ BlockInput@4
  BringWindowToTop@4
  BroadcastSystemMessage@20
+ BroadcastSystemMessageA@20
+ BroadcastSystemMessageExA@24
+ BroadcastSystemMessageExW@24
+ BroadcastSystemMessageW@20
  CalcChildScroll@8
  CallMsgFilter@8
***************
*** 26,29 ****
--- 32,37 ----
  ChangeDisplaySettingsA@8
  ChangeDisplaySettingsW@8
+ ChangeDisplaySettingsExA@20
+ ChangeDisplaySettingsExW@20
  ChangeMenuA@20
  ChangeMenuW@20
***************
*** 125,132 ****
--- 133,142 ----
  DefMDIChildProcA@16
  DefMDIChildProcW@16
+ DefRawInputProc@12
  DefWindowProcA@16
  DefWindowProcW@16
  DeferWindowPos@32
  DeleteMenu@12
+ DeregisterShellHookWindow@4
  DestroyAcceleratorTable@4
  DestroyCaret@0
***************
*** 175,178 ****
--- 185,189 ----
  EndMenu@0
  EndPaint@8
+ EndTask@12
  EnumChildWindows@12
  EnumClipboardFormats@4
***************
*** 180,185 ****
--- 191,200 ----
  EnumDesktopsA@12
  EnumDesktopsW@12
+ EnumDisplayDevicesA@16
+ EnumDisplayDevicesW@16
  EnumDisplayMonitors@16
  EnumDisplaySettingsA@12
+ EnumDisplaySettingsExA@16
+ EnumDisplaySettingsExW@16
  EnumDisplaySettingsW@12
  EnumPropsA@8
***************
*** 200,209 ****
  FindWindowW@8
  FlashWindow@8
  FrameRect@12
  FreeDDElParam@8
  GetAltTabInfo@20
  GetAltTabInfoA@20	
  GetAltTabInfoW@20	
- GetActiveWindow@0
  GetAncestor@8
  GetAsyncKeyState@4
--- 215,225 ----
  FindWindowW@8
  FlashWindow@8
+ FlashWindowEx@4
  FrameRect@12
  FreeDDElParam@8
+ GetActiveWindow@0
  GetAltTabInfo@20
  GetAltTabInfoA@20	
  GetAltTabInfoW@20	
  GetAncestor@8
  GetAsyncKeyState@4
***************
*** 226,229 ****
--- 242,246 ----
  GetClipboardFormatNameW@12
  GetClipboardOwner@0
+ GetClipboardSequenceNumber@0
  GetClipboardViewer@0
  GetComboBoxInfo@8
***************
*** 243,246 ****
--- 260,265 ----
  GetFocus@0
  GetForegroundWindow@0
+ GetGUIThreadInfo@8
+ GetGuiResources@8
  GetIconInfo@8
  GetInputDesktop@0
***************
*** 281,284 ****
--- 300,304 ----
  GetMonitorInfoA@8
  GetMonitorInfoW@8
+ GetMouseMovePointsEx@20
  GetNextDlgGroupItem@12
  GetNextDlgTabItem@12
***************
*** 286,292 ****
--- 306,319 ----
  GetParent@4
  GetPriorityClipboardFormat@8
+ GetProcessDefaultLayout@4
  GetProcessWindowStation@0
  GetPropA@8
  GetPropW@8
+ GetRawInputBuffer@12
+ GetRawInputData@20
+ GetRawInputDeviceInfoA@16
+ GetRawInputDeviceInfoW@16
+ GetRawInputDeviceList@12
+ GetRegisteredRawInputDevices@12
  GetQueueStatus@4
  GetScrollBarInfo@12
***************
*** 335,338 ****
--- 362,366 ----
  ImpersonateDdeClientWindow@8
  InSendMessage@0
+ InSendMessageEx@4
  InflateRect@12
  InsertMenuA@20
***************
*** 358,364 ****
--- 386,395 ----
  IsDialogMessageW@8
  IsDlgButtonChecked@8
+ IsGUIThread@4
+ IsHungAppWindow@4
  IsIconic@4
  IsMenu@4
  IsRectEmpty@4
+ IsWinEventHookInstalled@4
  IsWindow@4
  IsWindowEnabled@4
***************
*** 390,393 ****
--- 421,425 ----
  LockSetForegroundWindow@4
  LockWindowUpdate@4
+ LockWorkStation@0
  LookupIconIdFromDirectory@8
  LookupIconIdFromDirectoryEx@20
***************
*** 434,438 ****
--- 466,474 ----
  PostThreadMessageA@16
  PostThreadMessageW@16
+ PrintWindow@12
  PtInRect@12
+ RealChildWindowFromPoint@12
+ RealGetWindowClassA@12
+ RealGetWindowClassW@12
  RedrawWindow@16
  RegisterClassA@4
***************
*** 442,446 ****
--- 478,485 ----
  RegisterClipboardFormatA@4
  RegisterClipboardFormatW@4
+ RegisterDeviceNotificationA@12
+ RegisterDeviceNotificationW@12
  RegisterHotKey@16
+ RegisterRawInputDevices@12
  RegisterWindowMessageA@4
  RegisterWindowMessageW@4
***************
*** 501,504 ****
--- 540,544 ----
  SetMessageQueue@4
  SetParent@8
+ SetProcessDefaultLayout@4
  SetProcessWindowStation@4
  SetPropA@12
***************
*** 519,522 ****
--- 559,563 ----
  SetUserObjectInformationW@16
  SetUserObjectSecurity@12
+ SetWinEventHook@28
  SetWindowContextHelpId@8
  _imp__SetWindowContextHelpId@8
***************
*** 542,545 ****
--- 583,587 ----
  SwapMouseButton@4
  SwitchDesktop@4
+ SwitchToThisWindow@8
  SystemParametersInfoA@16
  SystemParametersInfoW@16
***************
*** 560,563 ****
--- 602,606 ----
  TranslateMDISysAccel@8
  TranslateMessage@4
+ UnhookWinEvent@4
  UnhookWindowsHook@8
  UnhookWindowsHookEx@4
***************
*** 570,573 ****
--- 613,617 ----
  UpdateLayeredWindow@36
  UpdateWindow@4
+ UserHandleGrantAccess@12
  ValidateRect@8
  ValidateRgn@8

Index: uuid.c
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/uuid.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** uuid.c	12 Sep 2003 13:26:51 -0000	1.6
--- uuid.c	15 Feb 2004 07:35:02 -0000	1.7
***************
*** 102,105 ****
--- 102,106 ----
  DEFINE_GUID(GUID_YSIZEPIXEL,0x66504305,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
  DEFINE_GUID(IID_IAccessible,0x618736e0,0x3c3d,0x11cf,0x81,0x0c,0x00,0xaa,0x00,0x38,0x9b,0x71);
+ DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
  DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
  DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
***************
*** 174,177 ****
--- 175,179 ----
  DEFINE_GUID(IID_IFont,0xbef6e002,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
  DEFINE_GUID(IID_IFontDisp,0xbef6e003,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
+ DEFINE_GUID(IID_IGlobalInterfaceTable,0x146,0,0,0xc0,0,0,0,0,0,0,0x46);
  DEFINE_GUID(IID_IHlink,0x79eac9c3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
  DEFINE_GUID(IID_IHlinkBrowseContext,0x79eac9c7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
***************
*** 220,223 ****
--- 222,226 ----
  DEFINE_GUID(IID_IOlePresObj,0x120,0,0,0xc0,0,0,0,0,0,0,0x46);
  DEFINE_GUID(IID_IOleUndoManager00,0x97d001f2,0xceef,0x9b11,0xc9,0,0xaa,0,0x60,0x8e,0x1,0);
+ DEFINE_GUID(IID_IOleUndoManager,0xd001f200,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1);
  DEFINE_GUID(IID_IOleUndoUnit,0x894ad3b0,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1);
  DEFINE_GUID(IID_IOleWindow,0x114,0,0,0xc0,0,0,0,0,0,0,0x46);
***************
*** 233,236 ****
--- 236,240 ----
  DEFINE_GUID(IID_IPersistMoniker,0x79eac9c9,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0x0b);
  DEFINE_GUID(IID_IPersistPropertyBag,0x37d84f60,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51);
+ DEFINE_GUID(IID_IPersistPropertyBag2,0x22f55881,0x280b,0x11d0,0xa8,0xa9,0,0xa0,0xc9,0xc,0x20,4);
  DEFINE_OLEGUID(IID_IPersistStorage,0x0000010a,0,0);
  DEFINE_GUID(IID_IPersistStream,0x109,0,0,0xc0,0,0,0,0,0,0,0x46);
***************
*** 242,245 ****
--- 246,250 ----
  DEFINE_GUID(IID_IProgressNotify,0xa9d758a0,0x4617,0x11cf,0x95,0xfc,0,0xaa,0,0x68,0xd,0xb4);
  DEFINE_GUID(IID_IPropertyBag,0x55272a00,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51);
+ DEFINE_GUID(IID_IPropertyBag2,0x22f55882,0x280b,0x11d0,0xa8,0xa9,0,0xa0,0xc9,0xc,0x20,4);
  DEFINE_GUID(IID_IPropertyFrame,0xb196b28a,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
  DEFINE_GUID(IID_IPropertyNotifySink,0x9bfbbc02,0xeff1,0x101a,0x84,0xed,0,0xaa,0,0x34,0x1d,0x7);
***************
*** 261,264 ****
--- 266,270 ----
  DEFINE_GUID(IID_IRpcChannelBuffer,0xd5f56b60,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
  DEFINE_GUID(IID_IRpcProxy,0x7,0,0,0xc0,0,0,0,0,0,0,0x46);
+ DEFINE_GUID(IID_IRpcProxyBuffer,0xd5f56a34,0x593b,0x101a,0xb5,0x69,8,0,0x2b,0x2d,0xbf,0x7a);
  DEFINE_GUID(IID_IRpcProxyBuffer34,0x3bd5f56a,0x1a59,0xb510,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a,0);
  DEFINE_GUID(IID_IRpcStub,0x5,0,0,0xc0,0,0,0,0,0,0,0x46);

Index: winspool.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/winspool.def,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** winspool.def	5 Jun 2001 01:36:47 -0000	1.1.1.1
--- winspool.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 1,3 ****
! LIBRARY "WINSPOOL.DRV"
  EXPORTS
  ADVANCEDSETUPDIALOG@16
--- 1,3 ----
! LIBRARY WINSPOOL.DRV
  EXPORTS
  ADVANCEDSETUPDIALOG@16
***************
*** 86,89 ****
--- 86,91 ----
  FindNextPrinterChangeNotification@16
  FreePrinterNotifyInfo@4
+ GetDefaultPrinterA@8
+ GetDefaultPrinterW@8
  GetFormA@24
  GetFormW@24

Index: ws2_32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/ws2_32.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ws2_32.def	5 Feb 2003 17:44:09 -0000	1.2
--- ws2_32.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 1,3 ****
! LIBRARY "WS2_32.DLL"
  EXPORTS
  WEP@0
--- 1,3 ----
! LIBRARY WS2_32.DLL
  EXPORTS
  WEP@0

--- vfw32.def DELETED ---

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

Modified Files:
	cfgmgr32.def ntoskrnl.def 
Log Message:
Merge winsup changes

Index: cfgmgr32.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/ddk/cfgmgr32.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cfgmgr32.def	14 Oct 2002 20:25:35 -0000	1.1
--- cfgmgr32.def	15 Feb 2004 07:35:02 -0000	1.2
***************
*** 197,394 ****
  ;CM_Unregister_Device_Interface_ExA
  ;CM_Unregister_Device_Interface_ExW
- ;CMP_Init_Detection
- ;CMP_RegisterNotification
- ;CMP_Report_LogOn
- ;CMP_UnregisterNotification
- CMP_WaitNoPendingInstallEvents@4
- ;CMP_WaitServicesAvailable
- CM_Add_Empty_Log_Conf@16
- CM_Add_Empty_Log_Conf_Ex@20
- CM_Add_IDA@16
- CM_Add_IDW@16
- CM_Add_ID_ExA@16
- CM_Add_ID_ExW@16
- ;CM_Add_Range
- CM_Add_Res_Des@24
- CM_Add_Res_Des_Ex@28
- CM_Connect_MachineA@8
- CM_Connect_MachineW@8
- ;CM_Create_DevNodeA
- ;CM_Create_DevNodeW
- ;CM_Create_DevNode_ExA
- ;CM_Create_DevNode_ExW
- ;CM_Create_Range_List
- ;CM_Delete_Class_Key
- ;CM_Delete_Class_Key_Ex
- ;CM_Delete_DevNode_Key
- ;CM_Delete_DevNode_Key_Ex
- ;CM_Delete_Range
- ;CM_Detect_Resource_Conflict
- ;CM_Detect_Resource_Conflict_Ex
- ;CM_Disable_DevNode
- ;CM_Disable_DevNode_Ex
- CM_Disconnect_Machine@4
- ;CM_Dup_Range_List
- ;CM_Enable_DevNode
- ;CM_Enable_DevNode_Ex
- CM_Enumerate_Classes@12
- CM_Enumerate_Classes_Ex@16
- CM_Enumerate_EnumeratorsA@16
- CM_Enumerate_EnumeratorsW@16
- CM_Enumerate_Enumerators_ExA@20
- CM_Enumerate_Enumerators_ExW@20
- ;CM_Find_Range
- ;CM_First_Range
- CM_Free_Log_Conf@8
- CM_Free_Log_Conf_Ex@12
- CM_Free_Log_Conf_Handle@4
- ;CM_Free_Range_List
- CM_Free_Res_Des@12
- CM_Free_Res_Des_Ex@16
- CM_Free_Res_Des_Handle@4
- CM_Free_Resource_Conflict_Handle@4
- CM_Get_Child@12
- CM_Get_Child_Ex@16
- ;CM_Get_Class_Key_NameA
- ;CM_Get_Class_Key_NameW
- ;CM_Get_Class_Key_Name_ExA
- ;CM_Get_Class_Key_Name_ExW
- ;CM_Get_Class_NameA
- ;CM_Get_Class_NameW
- ;CM_Get_Class_Name_ExA
- ;CM_Get_Class_Name_ExW
- ;CM_Get_Class_Registry_PropertyA
- ;CM_Get_Class_Registry_PropertyW
- CM_Get_Depth@12
- CM_Get_Depth_Ex@16
- ;CM_Get_DevNode_Registry_PropertyA
- ;CM_Get_DevNode_Registry_PropertyW
- ;CM_Get_DevNode_Registry_Property_ExA
- ;CM_Get_DevNode_Registry_Property_ExW
- CM_Get_DevNode_Status@16
- CM_Get_DevNode_Status_Ex@20
- CM_Get_Device_IDA@16
- CM_Get_Device_IDW@16
- CM_Get_Device_ID_ExA@20
- CM_Get_Device_ID_ExW@20
- CM_Get_Device_ID_ListA@16
- CM_Get_Device_ID_ListW@16
- CM_Get_Device_ID_List_ExA@20
- CM_Get_Device_ID_List_ExW@20
- CM_Get_Device_ID_List_SizeA@12
- CM_Get_Device_ID_List_SizeW@12
- CM_Get_Device_ID_List_Size_ExA@16
- CM_Get_Device_ID_List_Size_ExW@16
- CM_Get_Device_ID_Size@12
- CM_Get_Device_ID_Size_Ex@16
- ;CM_Get_Device_Interface_AliasA
- ;CM_Get_Device_Interface_AliasW
- ;CM_Get_Device_Interface_Alias_ExA
- ;CM_Get_Device_Interface_Alias_ExW
- ;CM_Get_Device_Interface_ListA
- ;CM_Get_Device_Interface_ListW
- ;CM_Get_Device_Interface_List_ExA
- ;CM_Get_Device_Interface_List_ExW
- ;CM_Get_Device_Interface_List_SizeA
- ;CM_Get_Device_Interface_List_SizeW
- ;CM_Get_Device_Interface_List_Size_ExA
- ;CM_Get_Device_Interface_List_Size_ExW
- CM_Get_First_Log_Conf@12
- CM_Get_First_Log_Conf_Ex@16
- ;CM_Get_Global_State
- ;CM_Get_Global_State_Ex
- ;CM_Get_HW_Prof_FlagsA
- ;CM_Get_HW_Prof_FlagsW
- ;CM_Get_HW_Prof_Flags_ExA
- ;CM_Get_HW_Prof_Flags_ExW
- ;CM_Get_Hardware_Profile_InfoA
- ;CM_Get_Hardware_Profile_InfoW
- ;CM_Get_Hardware_Profile_Info_ExA
- ;CM_Get_Hardware_Profile_Info_ExW
- CM_Get_Log_Conf_Priority@12
- CM_Get_Log_Conf_Priority_Ex@16
- CM_Get_Next_Log_Conf@12
- CM_Get_Next_Log_Conf_Ex@16
- CM_Get_Next_Res_Des@20
- CM_Get_Next_Res_Des_Ex@24
- CM_Get_Parent@12
- CM_Get_Parent_Ex@16
- CM_Get_Res_Des_Data@16
- CM_Get_Res_Des_Data_Ex@20
- CM_Get_Res_Des_Data_Size@12
- CM_Get_Res_Des_Data_Size_Ex@16
- CM_Get_Resource_Conflict_Count@8
- CM_Get_Resource_Conflict_DetailsA@12
- CM_Get_Resource_Conflict_DetailsW@12
- CM_Get_Sibling@12
- CM_Get_Sibling_Ex@16
- CM_Get_Version@0
- CM_Get_Version_Ex@4
- ;CM_Intersect_Range_List
- ;CM_Invert_Range_List
- ;CM_Is_Dock_Station_Present
- ;CM_Is_Dock_Station_Present_Ex
- CM_Locate_DevNodeA@12
- CM_Locate_DevNodeW@12
- CM_Locate_DevNode_ExA@16
- CM_Locate_DevNode_ExW@16
- ;CM_Merge_Range_List
- CM_Modify_Res_Des@24
- CM_Modify_Res_Des_Ex@28
- ;CM_Move_DevNode
- ;CM_Move_DevNode_Ex
- ;CM_Next_Range
- ;CM_Open_Class_KeyA
- ;CM_Open_Class_KeyW
- ;CM_Open_Class_Key_ExA
- ;CM_Open_Class_Key_ExW
- ;CM_Open_DevNode_Key
- ;CM_Open_DevNode_Key_Ex
- CM_Query_And_Remove_SubTreeA@20
- CM_Query_And_Remove_SubTreeW@20
- CM_Query_And_Remove_SubTree_ExA@0
- CM_Query_And_Remove_SubTree_ExW@0
- ;CM_Query_Arbitrator_Free_Data
- ;CM_Query_Arbitrator_Free_Data_Ex
- ;CM_Query_Arbitrator_Free_Size
- ;CM_Query_Arbitrator_Free_Size_Ex
- ;CM_Query_Remove_SubTree
- ;CM_Query_Remove_SubTree_Ex
- CM_Query_Resource_Conflict_List@28
- CM_Reenumerate_DevNode@8
- CM_Reenumerate_DevNode_Ex@12
- ;CM_Register_Device_Driver
- ;CM_Register_Device_Driver_Ex
- ;CM_Register_Device_InterfaceA
- ;CM_Register_Device_InterfaceW
- ;CM_Register_Device_Interface_ExA
- ;CM_Register_Device_Interface_ExW
- ;CM_Remove_SubTree
- ;CM_Remove_SubTree_Ex
- ;CM_Request_Eject_PC
- ;CM_Request_Eject_PC_Ex
- ;CM_Run_Detection
- ;CM_Run_Detection_Ex
- ;CM_Set_Class_Registry_PropertyA
- ;CM_Set_Class_Registry_PropertyW
- ;CM_Set_DevNode_Problem
- ;CM_Set_DevNode_Problem_Ex
- ;CM_Set_DevNode_Registry_PropertyA
- ;CM_Set_DevNode_Registry_PropertyW
- ;CM_Set_DevNode_Registry_Property_ExA
- ;CM_Set_DevNode_Registry_Property_ExW
- ;CM_Set_HW_Prof
- ;CM_Set_HW_Prof_Ex
- ;CM_Set_HW_Prof_FlagsA
- ;CM_Set_HW_Prof_FlagsW
- ;CM_Set_HW_Prof_Flags_ExA
- ;CM_Set_HW_Prof_Flags_ExW
- ;CM_Setup_DevNode
- ;CM_Setup_DevNode_Ex
- ;CM_Test_Range_Available
- ;CM_Uninstall_DevNode
- ;CM_Uninstall_DevNode_Ex
- ;CM_Unregister_Device_InterfaceA
- ;CM_Unregister_Device_InterfaceW
- ;CM_Unregister_Device_Interface_ExA
- ;CM_Unregister_Device_Interface_ExW
--- 197,198 ----

Index: ntoskrnl.def
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/ddk/ntoskrnl.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntoskrnl.def	9 Feb 2003 13:26:41 -0000	1.2
--- ntoskrnl.def	15 Feb 2004 07:35:02 -0000	1.3
***************
*** 597,602 ****
  ;KeSetTimeIncrement
  @KeSetTimeUpdateNotifyRoutine@4
! KeSetTimer@12
! KeSetTimerEx@16
  ;KeStackAttachProcess
  KeSynchronizeExecution@12
--- 597,602 ----
  ;KeSetTimeIncrement
  @KeSetTimeUpdateNotifyRoutine@4
! KeSetTimer@16
! KeSetTimerEx@20
  ;KeStackAttachProcess
  KeSynchronizeExecution@12

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

Modified Files:
	cfg.h mcd.h srb.h storport.h video.h winddk.h 
Log Message:
Merge winsup changes

Index: cfg.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/cfg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cfg.h	12 Sep 2003 13:26:51 -0000	1.3
--- cfg.h	15 Feb 2004 07:35:01 -0000	1.4
***************
*** 100,103 ****
--- 100,123 ----
  #define MAX_LCPRI                         0x0000FFFF
  
+ #define DN_ROOT_ENUMERATED	0x00000001	/* Was enumerated by ROOT */
+ #define DN_DRIVER_LOADED	0x00000002	/* Has Register_Device_Driver */
+ #define DN_ENUM_LOADED		0x00000004	/* Has Register_Enumerator */
+ #define DN_STARTED		0x00000008	/* Is currently configured */
+ #define DN_MANUAL		0x00000010	/* Manually installed */
+ #define DN_NEED_TO_ENUM		0x00000020	/* May need reenumeration */
+ #define DN_NOT_FIRST_TIME	0x00000040	/* Has received a config */
+ #define DN_HARDWARE_ENUM	0x00000080	/* Enum generates hardware ID */
+ #define DN_LIAR			0x00000100	/* Lied about can reconfig once */
+ #define DN_HAS_MARK		0x00000200	/* Not CM_Create_DevNode lately */
+ #define DN_HAS_PROBLEM		0x00000400	/* Need device installer */
+ #define DN_FILTERED		0x00000800	/* Is filtered */
+ #define DN_MOVED		0x00001000	/* Has been moved */
+ #define DN_DISABLEABLE		0x00002000	/* Can be rebalanced */
+ #define DN_REMOVABLE		0x00004000	/* Can be removed */
+ #define DN_PRIVATE_PROBLEM	0x00008000	/* Has a private problem */
+ #define DN_MF_PARENT		0x00010000	/* Multi function parent */
+ #define DN_MF_CHILD		0x00020000	/* Multi function child */
+ #define DN_WILL_BE_REMOVED	0x00040000	/* Devnode is being removed */
+ 
  typedef enum _PNP_VETO_TYPE {
    PNP_VetoTypeUnknown,

Index: mcd.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/mcd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mcd.h	19 Nov 2002 14:45:07 -0000	1.2
--- mcd.h	15 Feb 2004 07:35:01 -0000	1.3
***************
*** 49,53 ****
  #endif
  
! #if DBG
  #define DebugPrint(x) ChangerClassDebugPrint x
  #else
--- 49,53 ----
  #endif
  
! #ifdef DBG
  #define DebugPrint(x) ChangerClassDebugPrint x
  #else

Index: srb.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/srb.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** srb.h	12 Sep 2003 13:26:51 -0000	1.3
--- srb.h	15 Feb 2004 07:35:01 -0000	1.4
***************
*** 42,46 ****
  #endif
  
! #if DBG
  #define DebugPrint(x) ScsiDebugPrint x
  #else
--- 42,46 ----
  #endif
  
! #ifdef DBG
  #define DebugPrint(x) ScsiDebugPrint x
  #else
***************
*** 65,69 ****
  #define MAXIMUM_CDB_SIZE                  12
  
! #if DBG
  #define SCSI_PORT_SIGNATURE               0x54524f50
  #endif
--- 65,69 ----
  #define MAXIMUM_CDB_SIZE                  12
  
! #ifdef DBG
  #define SCSI_PORT_SIGNATURE               0x54524f50
  #endif

Index: storport.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/storport.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** storport.h	19 Nov 2002 14:45:07 -0000	1.2
--- storport.h	15 Feb 2004 07:35:01 -0000	1.3
***************
*** 412,416 ****
    IN PVOID  Context);
  
! #if DBG
  #define DebugPrint(x) StorPortDebugPrint x
  #else
--- 412,416 ----
    IN PVOID  Context);
  
! #ifdef DBG
  #define DebugPrint(x) StorPortDebugPrint x
  #else

Index: video.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/video.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** video.h	12 Sep 2003 13:26:51 -0000	1.4
--- video.h	15 Feb 2004 07:35:01 -0000	1.5
***************
*** 92,96 ****
  
  
! #if DBG
  
  #define PAGED_CODE() \
--- 92,96 ----
  
  
! #ifdef DBG
  
  #define PAGED_CODE() \
***************
*** 1554,1558 ****
    IN ULONG  Length);
  
! #if DBG
  #define VideoDebugPrint(x) VideoPortDebugPrint x
  #else
--- 1554,1558 ----
    IN ULONG  Length);
  
! #ifdef DBG
  #define VideoDebugPrint(x) VideoPortDebugPrint x
  #else

Index: winddk.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/ddk/winddk.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** winddk.h	12 Sep 2003 13:26:51 -0000	1.5
--- winddk.h	15 Feb 2004 07:35:01 -0000	1.6
***************
*** 67,71 ****
  #define POINTER_ALIGNMENT
  
! 
  
  /*
--- 67,77 ----
  #define POINTER_ALIGNMENT
  
! #ifdef NONAMELESSUNION
! # define _DDK_DUMMYUNION_MEMBER(name) DUMMYUNIONNAME.name
! # define _DDK_DUMMYUNION_N_MEMBER(n, name) DUMMYUNIONNAME##n.name
! #else
! # define _DDK_DUMMYUNION_MEMBER(name) name
! # define _DDK_DUMMYUNION_N_MEMBER(n, name) name
! #endif
  
  /*
***************
*** 168,171 ****
--- 174,185 ----
  #define MAXIMUM_PRIORITY                  32
  
+ #define FILE_SUPERSEDED                   0x00000000
+ #define FILE_OPENED                       0x00000001
+ #define FILE_CREATED                      0x00000002
+ #define FILE_OVERWRITTEN                  0x00000003
+ #define FILE_EXISTS                       0x00000004
+ #define FILE_DOES_NOT_EXIST               0x00000005
+ 
+ /* also in winnt.h */
  #define FILE_LIST_DIRECTORY               0x00000001
  #define FILE_READ_DATA                    0x00000001
***************
*** 183,193 ****
  #define FILE_WRITE_ATTRIBUTES             0x00000100
  
- #define FILE_SUPERSEDED                   0x00000000
- #define FILE_OPENED                       0x00000001
- #define FILE_CREATED                      0x00000002
- #define FILE_OVERWRITTEN                  0x00000003
- #define FILE_EXISTS                       0x00000004
- #define FILE_DOES_NOT_EXIST               0x00000005
- 
  #define FILE_SHARE_READ                   0x00000001
  #define FILE_SHARE_WRITE                  0x00000002
--- 197,200 ----
***************
*** 280,284 ****
--- 287,298 ----
     FILE_APPEND_DATA | \
     SYNCHRONIZE)
+ /* end winnt.h */
  
+ #define DIRECTORY_QUERY (0x0001)
+ #define DIRECTORY_TRAVERSE (0x0002)
+ #define DIRECTORY_CREATE_OBJECT (0x0004)
+ #define DIRECTORY_CREATE_SUBDIRECTORY (0x0008)
+ #define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF)
+   
  /* Exported object types */
  extern NTOSAPI POBJECT_TYPE ExDesktopObjectType;
***************
*** 3162,3166 ****
  typedef struct _IO_REMOVE_LOCK {
    IO_REMOVE_LOCK_COMMON_BLOCK  Common;
! #if DBG
    IO_REMOVE_LOCK_DBG_BLOCK  Dbg;
  #endif
--- 3176,3180 ----
  typedef struct _IO_REMOVE_LOCK {
    IO_REMOVE_LOCK_COMMON_BLOCK  Common;
! #ifdef DBG
    IO_REMOVE_LOCK_DBG_BLOCK  Dbg;
  #endif
***************
*** 3939,3943 ****
    IN PCHAR  Message);
  
! #if DBG
  
  #define ASSERT(exp) \
--- 3953,3957 ----
    IN PCHAR  Message);
  
! #ifdef DBG
  
  #define ASSERT(exp) \
***************
*** 5049,5053 ****
    Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
  	if (Entry == NULL) {
! 		Lookaside->AllocateMisses++;
  		Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag);
  	}
--- 5063,5067 ----
    Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
  	if (Entry == NULL) {
! 		Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++;
  		Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag);
  	}
***************
*** 5064,5068 ****
    Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
    if (Entry == NULL) {
!     Lookaside->AllocateMisses++;
      Entry = (Lookaside->Allocate)(Lookaside->Type,
        Lookaside->Size, Lookaside->Tag);
--- 5078,5082 ----
    Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
    if (Entry == NULL) {
!     Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++;
      Entry = (Lookaside->Allocate)(Lookaside->Type,
        Lookaside->Size, Lookaside->Tag);
***************
*** 5180,5184 ****
    Lookaside->TotalFrees++;
  	if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
! 		Lookaside->FreeMisses++;
  		(Lookaside->Free)(Entry);
    } else {
--- 5194,5198 ----
    Lookaside->TotalFrees++;
  	if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
! 		Lookaside->_DDK_DUMMYUNION_N_MEMBER(2,FreeMisses)++;
  		(Lookaside->Free)(Entry);
    } else {
***************
*** 5195,5199 ****
    Lookaside->TotalFrees++;
    if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
!     Lookaside->FreeMisses++;
      (Lookaside->Free)(Entry);
    } else {
--- 5209,5213 ----
    Lookaside->TotalFrees++;
    if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
!     Lookaside->_DDK_DUMMYUNION_N_MEMBER(2,FreeMisses)++;
      (Lookaside->Free)(Entry);
    } else {
***************
*** 5533,5537 ****
    IN SUITE_TYPE  SuiteType);
  
! #if DBG
  
  #define PAGED_CODE() { \
--- 5547,5551 ----
    IN SUITE_TYPE  SuiteType);
  
! #ifdef DBG
  
  #define PAGED_CODE() { \
***************
*** 9060,9064 ****
    IN BOOLEAN  State);
  
! #if DBG
  
  #define KdPrint(_x_) DbgPrint _x_
--- 9074,9078 ----
    IN BOOLEAN  State);
  
! #ifdef DBG
  
  #define KdPrint(_x_) DbgPrint _x_

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

Modified Files:
	glu.h 
Log Message:
Merge winsup changes

Index: glu.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/GL/glu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** glu.h	22 Apr 2002 07:39:18 -0000	1.1
--- glu.h	15 Feb 2004 07:35:01 -0000	1.2
***************
*** 28,38 ****
  */
  
- /*
-  * 2002-Apr-15, Marcus Geelnard:
-  *   Changed GLAPIENTRY to APIENTRY.
-  */
- 
  #ifndef __glu_h__
  #define __glu_h__
  
  #include <GL/gl.h>
--- 28,37 ----
  */
  
  #ifndef __glu_h__
  #define __glu_h__
+ #define _GLU_H
+ #if __GNUC__ >= 3
+ #pragma GCC system_header
+ #endif
  
  #include <GL/gl.h>
***************
*** 44,51 ****
  /*************************************************************/
  
- /* Extensions */
- #define GLU_EXT_object_space_tess          1
- #define GLU_EXT_nurbs_tessellator          1
- 
  /* Boolean */
  #define GLU_FALSE                          0
--- 43,46 ----
***************
*** 55,59 ****
  #define GLU_VERSION_1_1                    1
  #define GLU_VERSION_1_2                    1
- #define GLU_VERSION_1_3                    1
  
  /* StringName */
--- 50,53 ----
***************
*** 72,103 ****
  #define GLU_OUTLINE_PATCH                  100241
  
- /* NurbsCallback */
- #define GLU_NURBS_ERROR                    100103
- #define GLU_ERROR                          100103
- #define GLU_NURBS_BEGIN                    100164
- #define GLU_NURBS_BEGIN_EXT                100164
- #define GLU_NURBS_VERTEX                   100165
- #define GLU_NURBS_VERTEX_EXT               100165
- #define GLU_NURBS_NORMAL                   100166
- #define GLU_NURBS_NORMAL_EXT               100166
- #define GLU_NURBS_COLOR                    100167
- #define GLU_NURBS_COLOR_EXT                100167
- #define GLU_NURBS_TEXTURE_COORD            100168
- #define GLU_NURBS_TEX_COORD_EXT            100168
- #define GLU_NURBS_END                      100169
- #define GLU_NURBS_END_EXT                  100169
- #define GLU_NURBS_BEGIN_DATA               100170
- #define GLU_NURBS_BEGIN_DATA_EXT           100170
- #define GLU_NURBS_VERTEX_DATA              100171
- #define GLU_NURBS_VERTEX_DATA_EXT          100171
- #define GLU_NURBS_NORMAL_DATA              100172
- #define GLU_NURBS_NORMAL_DATA_EXT          100172
- #define GLU_NURBS_COLOR_DATA               100173
- #define GLU_NURBS_COLOR_DATA_EXT           100173
- #define GLU_NURBS_TEXTURE_COORD_DATA       100174
- #define GLU_NURBS_TEX_COORD_DATA_EXT       100174
- #define GLU_NURBS_END_DATA                 100175
- #define GLU_NURBS_END_DATA_EXT             100175
- 
  /* NurbsError */
  #define GLU_NURBS_ERROR1                   100251
--- 66,69 ----
***************
*** 139,163 ****
  #define GLU_NURBS_ERROR37                  100287
  
- /* NurbsProperty */
- #define GLU_AUTO_LOAD_MATRIX               100200
- #define GLU_CULLING                        100201
- #define GLU_SAMPLING_TOLERANCE             100203
- #define GLU_DISPLAY_MODE                   100204
- #define GLU_PARAMETRIC_TOLERANCE           100202
- #define GLU_SAMPLING_METHOD                100205
- #define GLU_U_STEP                         100206
- #define GLU_V_STEP                         100207
- #define GLU_NURBS_MODE                     100160
- #define GLU_NURBS_MODE_EXT                 100160
- #define GLU_NURBS_TESSELLATOR              100161
- #define GLU_NURBS_TESSELLATOR_EXT          100161
- #define GLU_NURBS_RENDERER                 100162
- #define GLU_NURBS_RENDERER_EXT             100162
- 
  /* NurbsSampling */
- #define GLU_OBJECT_PARAMETRIC_ERROR        100208
- #define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
- #define GLU_OBJECT_PATH_LENGTH             100209
- #define GLU_OBJECT_PATH_LENGTH_EXT         100209
  #define GLU_PATH_LENGTH                    100215
  #define GLU_PARAMETRIC_ERROR               100216
--- 105,109 ----
***************
*** 239,242 ****
--- 185,192 ----
  #define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
  
+ /* Obsolete. For compatibility with previous Sun OpenGL versions */
+ #define GLU_INCOMPATIBLE_GL_VERSION        100903
+ 
+ 
  /*************************************************************/
  
***************
*** 266,276 ****
  GLAPI void APIENTRY gluBeginSurface (GLUnurbs* nurb);
  GLAPI void APIENTRY gluBeginTrim (GLUnurbs* nurb);
- GLAPI GLint APIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
  GLAPI GLint APIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
- GLAPI GLint APIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
  GLAPI GLint APIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
- GLAPI GLint APIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
- GLAPI GLint APIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
- GLAPI GLboolean APIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
  GLAPI void APIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
  GLAPI void APIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
--- 216,221 ----
***************
*** 283,286 ****
--- 228,232 ----
  GLAPI void APIENTRY gluEndTrim (GLUnurbs* nurb);
  GLAPI const GLubyte * APIENTRY gluErrorString (GLenum error);
+ GLAPI const wchar_t * APIENTRY gluErrorUnicodeStringEXT (GLenum error);
  GLAPI void APIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
  GLAPI const GLubyte * APIENTRY gluGetString (GLenum name);
***************
*** 293,298 ****
  GLAPI void APIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
  GLAPI void APIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
- GLAPI void APIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
- GLAPI void APIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
  GLAPI void APIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
  GLAPI void APIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
--- 239,242 ----
***************
*** 322,325 ****
--- 266,275 ----
  GLAPI GLint APIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
  
+ #ifdef UNICODE
+ #define gluErrorStringWIN gluErrorUnicodeStringEXT
+ #else
+ #define gluErrorStringWIN gluErrorString
+ #endif
+ 
  #ifdef __cplusplus
  }

Update of /cvsroot/mingw/msys/dvlpr/doc/msys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27427/doc/msys

Modified Files:
	MSYS-1.0.10-changes.rtf 
Log Message:

	* doc/msys/MSYS-1.0.10-changes.rtf: Add info about msys.bat changes.



Index: MSYS-1.0.10-changes.rtf
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/doc/msys/MSYS-1.0.10-changes.rtf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsO1UBBd and /tmp/cvsoqjguv differ

Update of /cvsroot/mingw/msys/dvlpr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27427

Modified Files:
	ChangeLog 
Log Message:

	* doc/msys/MSYS-1.0.10-changes.rtf: Add info about msys.bat changes.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ChangeLog	30 Jan 2004 13:12:21 -0000	1.37
--- ChangeLog	2 Feb 2004 14:23:00 -0000	1.38
***************
*** 1,2 ****
--- 1,6 ----
+ 2004.02.02  Earnie Boyd  <ea...@us...>
+ 
+ 	* doc/msys/MSYS-1.0.10-changes.rtf: Add info about msys.bat changes.
+ 
  2004.01.30  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/msys/dvlpr/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25653

Modified Files:
	msys.bat 
Log Message:
Add change notification at bottom of file.

Index: msys.bat
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/bin/msys.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** msys.bat	30 Jan 2004 13:12:21 -0000	1.9
--- msys.bat	2 Feb 2004 14:20:43 -0000	1.10
***************
*** 126,129 ****
  rem
  rem 2003.03.06  Earnie Boyd  mailto:ea...@us...
! rem	* Add -backspacekey swtich to rxvt startup.
  rem	* Move RXVT color setup to startrxvt label
--- 126,134 ----
  rem
  rem 2003.03.06  Earnie Boyd  mailto:ea...@us...
! rem	* Add -backspacekey switch to rxvt startup.
  rem	* Move RXVT color setup to startrxvt label
+ rem
+ rem 2004.01.30  Earnie Boyd  mailto:ea...@us...
+ rem	* Add -geometry parameter to work around an off by one issue with
+ rem       the default values.
+ rem	Thanks to Dave Schuyler mailto:par...@us...