This commit was manufactured by cvs2svn to create tag 'cygwin-cygwin-1_7_15-release

1_7_15-release'.

Sprout from cygwin-64bit-branch 2012-08-10 09:37:33 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from master 2012-05-09 07:32:48 UTC Yaakov Selkowitz <yselkowi@redhat.com> '	* new-features.sgml (ov-new1.7.15): Fix XML syntax.':
    COPYING3
    COPYING3.LIB
    ChangeLog
    MAINTAINERS
    compile
    config.rpath
    config/ChangeLog
    config/mh-darwin
    config/mh-interix
    config/mh-ppc-aix
    config/mt-alphaieee
    config/mt-sde
    config/picflag.m4
    config/stdint.m4
    config/tcl.m4
    configure
    configure.ac
    include/ChangeLog
    include/dis-asm.h
    include/dwarf2.def
    include/dwarf2.h
    include/elf/ChangeLog
    include/elf/avr.h
    include/elf/common.h
    include/elf/m68hc11.h
    include/elf/ppc.h
    include/elf/s390.h
    include/filenames.h
    include/gdb/ChangeLog
    include/gdb/callback.h
    include/gdb/signals.def
    include/gdb/signals.h
    include/mach-o/ChangeLog
    include/mach-o/codesign.h
    include/mach-o/external.h
    include/mach-o/loader.h
    include/mach-o/reloc.h
    include/mach-o/x86-64.h
    include/opcode/ChangeLog
    include/opcode/avr.h
    include/opcode/m68hc11.h
    include/opcode/mips.h
    include/opcode/ppc.h
    include/opcode/xgate.h
    include/plugin-api.h
    ltgcc.m4
    ltoptions.m4
    ltversion.m4
    lt~obsolete.m4
    newlib/ChangeLog
    newlib/doc/Makefile.am
    newlib/doc/Makefile.in
    newlib/libc/include/stdio.h
    newlib/libc/include/string.h
    newlib/libc/include/sys/signal.h
    newlib/libc/include/sys/stat.h
    newlib/libc/include/sys/time.h
    newlib/libc/include/sys/times.h
    newlib/libc/include/sys/types.h
    newlib/libc/include/sys/unistd.h
    newlib/libc/include/sys/wait.h
    newlib/libc/locale/lmessages.c
    newlib/libc/locale/lmonetary.c
    newlib/libc/locale/nl_langinfo.c
    newlib/libc/machine/cr16/sys/asm.h
    newlib/libc/machine/epiphany/Makefile.am
    newlib/libc/machine/epiphany/Makefile.in
    newlib/libc/machine/epiphany/aclocal.m4
    newlib/libc/machine/epiphany/configure
    newlib/libc/machine/epiphany/configure.in
    newlib/libc/machine/epiphany/machine/stdlib.h
    newlib/libc/machine/epiphany/setjmp.S
    newlib/libc/machine/rl78/Makefile.am
    newlib/libc/machine/rl78/Makefile.in
    newlib/libc/machine/rl78/aclocal.m4
    newlib/libc/machine/rl78/configure
    newlib/libc/machine/rl78/configure.in
    newlib/libc/machine/rl78/setjmp.S
    newlib/libc/posix/collate.c
    newlib/libc/posix/engine.c
    newlib/libc/posix/glob.c
    newlib/libc/posix/popen.c
    newlib/libc/posix/readdir.c
    newlib/libc/posix/regcomp.c
    newlib/libc/posix/telldir.c
    newlib/libc/posix/wordexp.c
    newlib/libc/reent/mkdirr.c
    newlib/libc/reent/renamer.c
    newlib/libc/search/hash.c
    newlib/libc/search/hash_bigkey.c
    newlib/libc/search/hash_page.c
    newlib/libc/search/hcreate_r.c
    newlib/libc/stdio/asiprintf.c
    newlib/libc/stdio/asprintf.c
    newlib/libc/stdio/clearerr.c
    newlib/libc/stdio/fclose.c
    newlib/libc/stdio/fdopen.c
    newlib/libc/stdio/feof.c
    newlib/libc/stdio/ferror.c
    newlib/libc/stdio/fflush.c
    newlib/libc/stdio/fgetc.c
    newlib/libc/stdio/fgets.c
    newlib/libc/stdio/fgetwc.c
    newlib/libc/stdio/fgetws.c
    newlib/libc/stdio/fileno.c
    newlib/libc/stdio/findfp.c
    newlib/libc/stdio/fmemopen.c
    newlib/libc/stdio/fopen.c
    newlib/libc/stdio/fopencookie.c
    newlib/libc/stdio/fpurge.c
    newlib/libc/stdio/fputc.c
    newlib/libc/stdio/fputs.c
    newlib/libc/stdio/fputwc.c
    newlib/libc/stdio/fputws.c
    newlib/libc/stdio/fread.c
    newlib/libc/stdio/freopen.c
    newlib/libc/stdio/fseek.c
    newlib/libc/stdio/ftell.c
    newlib/libc/stdio/funopen.c
    newlib/libc/stdio/fwide.c
    newlib/libc/stdio/fwrite.c
    newlib/libc/stdio/getc.c
    newlib/libc/stdio/getdelim.c
    newlib/libc/stdio/gets.c
    newlib/libc/stdio/local.h
    newlib/libc/stdio/mktemp.c
    newlib/libc/stdio/open_memstream.c
    newlib/libc/stdio/putc.c
    newlib/libc/stdio/setvbuf.c
    newlib/libc/stdio/ungetc.c
    newlib/libc/stdio/ungetwc.c
    newlib/libc/stdio/vasiprintf.c
    newlib/libc/stdio/vasprintf.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/vfwprintf.c
    newlib/libc/stdio/vfwscanf.c
    newlib/libc/stdio64/fdopen64.c
    newlib/libc/stdio64/fopen64.c
    newlib/libc/stdio64/freopen64.c
    newlib/libc/stdio64/fseeko64.c
    newlib/libc/stdio64/ftello64.c
    newlib/libc/stdlib/mbtowc_r.c
    newlib/libc/stdlib/mprec.h
    newlib/libc/stdlib/wctomb_r.c
    newlib/libc/string/Makefile.am
    newlib/libc/string/Makefile.in
    newlib/libc/string/strcasestr.c
    newlib/libc/sys/epiphany/Makefile.am
    newlib/libc/sys/epiphany/Makefile.in
    newlib/libc/sys/epiphany/aclocal.m4
    newlib/libc/sys/epiphany/configure
    newlib/libc/sys/epiphany/configure.in
    newlib/libc/sys/epiphany/e_printf.c
    newlib/libc/sys/rtems/crt0.c
    newlib/libc/sys/rtems/machine/_types.h
    newlib/libc/sys/sysnecv850/crt0.S
    newlib/libc/time/strptime.c
    newlib/libm/common/sf_round.c
    newlib/libm/math/e_atan2.c
    newlib/libm/math/e_exp.c
    newlib/libm/math/e_pow.c
    newlib/libm/math/e_rem_pio2.c
    newlib/libm/math/ef_exp.c
    newlib/libm/math/ef_pow.c
    newlib/libm/math/er_lgamma.c
    newlib/libm/math/erf_lgamma.c
    newlib/testsuite/newlib.stdio/stdio.exp
    newlib/testsuite/newlib.stdio/swprintf.c
    winsup/ChangeLog
    winsup/Makefile.common
    winsup/cygserver/ChangeLog
    winsup/cygserver/woutsup.h
    winsup/cygwin/ChangeLog
    winsup/cygwin/DevNotes
    winsup/cygwin/Makefile.in
    winsup/cygwin/advapi32.cc
    winsup/cygwin/child_info.h
    winsup/cygwin/configure.in
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/devices.cc
    winsup/cygwin/devices.in
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dtable.cc
    winsup/cygwin/dtable.h
    winsup/cygwin/exceptions.cc
    winsup/cygwin/external.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_disk_file.cc
    winsup/cygwin/fhandler_dsp.cc
    winsup/cygwin/fhandler_fifo.cc
    winsup/cygwin/fhandler_mem.cc
    winsup/cygwin/fhandler_procnet.cc
    winsup/cygwin/fhandler_registry.cc
    winsup/cygwin/fhandler_serial.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/fhandler_virtual.cc
    winsup/cygwin/fhandler_windows.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/gendef
    winsup/cygwin/gentls_offsets
    winsup/cygwin/globals.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/hookapi.cc
    winsup/cygwin/include/cygwin/if.h
    winsup/cygwin/include/cygwin/in.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/elf.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/mntent.h
    winsup/cygwin/include/netdb.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/sys/elf32.h
    winsup/cygwin/include/sys/elf64.h
    winsup/cygwin/include/sys/elf_common.h
    winsup/cygwin/include/sys/elf_generic.h
    winsup/cygwin/include/sys/wait.h
    winsup/cygwin/kernel32.cc
    winsup/cygwin/lib/_cygwin_crt0_common.cc
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/libc/inet_addr.c
    winsup/cygwin/libc/inet_network.c
    winsup/cygwin/libc/minires-os-if.c
    winsup/cygwin/libc/minires.h
    winsup/cygwin/libc/rcmd.cc
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/miscfuncs.h
    winsup/cygwin/mkvers.sh
    winsup/cygwin/mount.cc
    winsup/cygwin/mount.h
    winsup/cygwin/net.cc
    winsup/cygwin/ntdll.h
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/posix.sgml
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/registry.cc
    winsup/cygwin/release/1.7.10
    winsup/cygwin/release/1.7.11
    winsup/cygwin/release/1.7.12
    winsup/cygwin/release/1.7.13
    winsup/cygwin/release/1.7.14
    winsup/cygwin/release/1.7.15
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/select.h
    winsup/cygwin/shared.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/strace.cc
    winsup/cygwin/strfuncs.cc
    winsup/cygwin/syscalls.cc
    winsup/cygwin/syslog.cc
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/tlsoffsets.h
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/winlean.h
    winsup/cygwin/winsup.h
    winsup/doc/ChangeLog
    winsup/doc/faq-programming.xml
    winsup/doc/faq-using.xml
    winsup/doc/new-features.sgml
    winsup/doc/pathnames.sgml
    winsup/doc/setup-net.sgml
    winsup/doc/using.sgml
    winsup/lsaauth/ChangeLog
    winsup/lsaauth/Makefile.in
    winsup/lsaauth/cyglsa.c
    winsup/lsaauth/cyglsa64.dll
    winsup/lsaauth/make-64bit-version-with-mingw-w64.sh
    winsup/mingw/ChangeLog
    winsup/mingw/configure
    winsup/mingw/configure.in
    winsup/mingw/include/_mingw.h
    winsup/mingw/include/excpt.h
    winsup/mingw/include/inttypes.h
    winsup/mingw/include/limits.h
    winsup/mingw/include/process.h
    winsup/mingw/include/stdint.h
    winsup/mingw/include/stdio.h
    winsup/mingw/include/stdlib.h
    winsup/mingw/include/sys/param.h
    winsup/mingw/include/wchar.h
    winsup/mingw/mingwex/Makefile.in
    winsup/mingw/mingwex/gdtoa/gd_qnan.h
    winsup/mingw/mingwex/tsearch.c
    winsup/utils/ChangeLog
    winsup/utils/Makefile.in
    winsup/utils/bloda.cc
    winsup/utils/cygcheck.cc
    winsup/utils/cygpath.cc
    winsup/utils/dump_setup.cc
    winsup/utils/dumper.cc
    winsup/utils/locale.cc
    winsup/utils/ps.cc
    winsup/utils/regtool.cc
    winsup/utils/strace.cc
    winsup/w32api/ChangeLog
    winsup/w32api/include/setupapi.h
    winsup/w32api/include/winbase.h
    winsup/w32api/include/windows.h
    winsup/w32api/include/winnt.h
    winsup/w32api/include/winsock.h
    winsup/w32api/include/winsock2.h
    winsup/w32api/include/winuser.h
    winsup/w32api/include/winver.h
    winsup/w32api/include/wtsapi32.h
    winsup/w32api/lib/Makefile.in
    winsup/w32api/lib/kernel32.def
    winsup/w32api/lib/wtsapi32.def
Delete:
    config/asmcfi.m4
    config/math.m4
    config/mmap.m4
    config/weakref.m4
    include/gdb/gdb-index.h
    include/leb128.h
    newlib/libc/string/memrchr.c
    winsup/cygwin/cygwait.cc
    winsup/cygwin/cygwait.h
    winsup/cygwin/include/machine/elf.h
    winsup/cygwin/include/sys/elf.h
    winsup/mingw/mingwex/membarrier.c
    winsup/w32api/include/sdkddkver.h

10 files changed, 18 insertions, 224 deletions

diff --git a/winsup/w32api/include/sdkddkver.h b/winsup/w32api/include/sdkddkver.h
deleted file mode 100644
index 3005cf5ab..000000000
--- a/winsup/w32api/include/sdkddkver.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-    sdkddkver.h - Versioning file for Windows SDK/DDK.
-
-    This file is part of a free library for the Windows API.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-#ifndef _SDKDDKVER_H
-#define _SDKDDKVER_H
-
-/**
- * Define version masks
- * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx
- * Values and names are guessed based on comments in the documentation.
- */
-#define OSVERSION_MASK            0xFFFF0000
-#define SPVERSION_MASK            0x0000FF00
-#define SUBVERSION_MASK           0x000000FF
-
-/**
- * Macros to extract values from NTDDI version.
- * Derived from comments on MSDN or social.microsoft.com
- */
-#define OSVER(ver) ((ver) & OSVERSION_MASK)
-#define SPVER(ver) (((ver) & SPVERSION_MASK) >> 8)
-#define SUBVER(ver) ((ver) & SUBVERSION_MASK)
-
-/**
- * Macros to create the minimal NTDDI version from _WIN32_WINNT value.
- */
-#define NTDDI_VERSION_FROM_WIN32_WINNT(ver) _NTDDI_VERSION_FROM_WIN32_WINNT(ver)
-#define _NTDDI_VERSION_FROM_WIN32_WINNT(ver) ver##0000
-
-/**
- * Version constants defining _WIN32_WINNT versions.
- * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx
- */
-#define _WIN32_WINNT_NT4          0x0400
-#define _WIN32_WINNT_WIN2K        0x0500
-#define _WIN32_WINNT_WINXP        0x0501
-#define _WIN32_WINNT_WS03         0x0502
-#define _WIN32_WINNT_WIN6         0x0600
-#define _WIN32_WINNT_VISTA        0x0600
-#define _WIN32_WINNT_WS08         0x0600
-#define _WIN32_WINNT_LONGORN      0x0600
-#define _WIN32_WINNT_WIN7         0x0601
-
-/**
- * Version constants defining _WIN32_IE versions.
- * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx
- */
-#define _WIN32_IE_IE50            0x0500
-#define _WIN32_IE_IE501           0x0501
-#define _WIN32_IE_IE55            0x0550
-#define _WIN32_IE_IE60            0x0600
-#define _WIN32_IE_IE60SP1         0x0601
-#define _WIN32_IE_IE60SP2         0x0603
-#define _WIN32_IE_IE70            0x0700
-#define _WIN32_IE_IE80            0x0800
-
-/**
- * Version constants defining NTDDI_VERSION.
- * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx
- */
-#define __NTDDI_WIN5               0x05000000
-#define __NTDDI_WIN51              0x05010000
-#define __NTDDI_WIN52              0x05020000
-#define __NTDDI_WIN6               0x06000000
-#define __NTDDI_WIN61              0x06010000
-#define __NTDDI_SP0                0x00000000
-#define __NTDDI_SP1                0x00000100
-#define __NTDDI_SP2                0x00000200
-#define __NTDDI_SP3                0x00000300
-#define __NTDDI_SP4                0x00000400
-
-#define NTDDI_WIN2K               __NTDDI_WIN5 + __NTDDI_SP0
-#define NTDDI_WIN2KSP1            __NTDDI_WIN5 + __NTDDI_SP1
-#define NTDDI_WIN2KSP2            __NTDDI_WIN5 + __NTDDI_SP2
-#define NTDDI_WIN2KSP3            __NTDDI_WIN5 + __NTDDI_SP3
-#define NTDDI_WIN2KSP4            __NTDDI_WIN5 + __NTDDI_SP4
-
-#define NTDDI_WINXP               __NTDDI_WIN51 + __NTDDI_SP0
-#define NTDDI_WINXPSP1            __NTDDI_WIN51 + __NTDDI_SP1
-#define NTDDI_WINXPSP2            __NTDDI_WIN51 + __NTDDI_SP2
-#define NTDDI_WINXPSP3            __NTDDI_WIN51 + __NTDDI_SP3
-
-#define NTDDI_WS03                __NTDDI_WIN52 + __NTDDI_SP0
-#define NTDDI_WS03SP1             __NTDDI_WIN52 + __NTDDI_SP1
-#define NTDDI_WS03SP2             __NTDDI_WIN52 + __NTDDI_SP2
-
-#define NTDDI_VISTA               __NTDDI_WIN6 + __NTDDI_SP0
-#define NTDDI_VISTASP1            __NTDDI_WIN6 + __NTDDI_SP1
-#define NTDDI_VISTASP2		  __NTDDI_WIN6 + __NTDDI_SP2
-
-#define NTDDI_LONGHORN            NTDDI_VISTA
-
-#define NTDDI_WIN6                NTDDI_VISTA
-#define NTDDI_WIN6SP1             NTDDI_VISTASP1
-#define NTDDI_WIN6SP2		  NTDDI_VISTASP2
-
-#define NTDDI_WS08                __NTDDI_WIN6 + __NTDDI_SP1
-
-#define NTDDI_WIN7                __NTDDI_WIN61 + __NTDDI_SP0
-
-/**
- * Assign defaults
- */
-#ifdef NTDDI_VERSION
-#  ifdef _WIN32_WINNT
-#    if _WIN32_WINNT != OSDIR(NTDDI_VERSION)
-#      error The _WIN32_WINNT value does not match NTDDI_VERSION
-#    endif
-#  else
-#    define _WIN32_WINNT OSVER(NTDDI_VERSION)
-#    ifndef WINVER
-#      define WINVER _WIN32_WINNT
-#    endif
-#  endif
-#endif
-
-#ifndef _WIN32_WINNT
-#  ifdef WINVER
-#    define _WIN32_WINNT WINVER
-#  else
-#    warning _WIN32_WINNT is defaulting to _WIN32_WINNT_WIN2K
-#    define _WIN32_WINNT _WIN32_WINNT_WIN2K
-#  endif
-#endif
-
-#ifndef WINVER
-#  define WINVER _WIN32_WINNT
-#endif
-
-#ifndef NTDDI_VERSION
-#  warning NTDDI_VERSION is defaulting to _WIN32_WINNT version SPK0
-#  define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT)
-#endif
-
-#endif
diff --git a/winsup/w32api/include/setupapi.h b/winsup/w32api/include/setupapi.h
index 8fc7a6c82..ef38852a2 100644
--- a/winsup/w32api/include/setupapi.h
+++ b/winsup/w32api/include/setupapi.h
@@ -1046,7 +1046,7 @@ WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListA(HDSKSPC,LPCSTR,LONGLONG,PVOID,
 WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListW(HDSKSPC,LPCWSTR,LONGLONG,PVOID,UINT);
 WINSETUPAPI UINT WINAPI SetupBackupErrorA(HWND,PCSTR,PCSTR,PCSTR,UINT,DWORD);
 WINSETUPAPI UINT WINAPI SetupBackupErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD);
-WINSETUPAPI BOOL WINAPI SetupCancelTemporarySourceList(VOID);
+WINSETUPAPI BOOL WINAPI SetupCancelTemporary(VOID);
 WINSETUPAPI BOOL WINAPI SetupCloseFileQueue(HSPFILEQ);
 WINSETUPAPI VOID WINAPI SetupCloseInfFile(HINF);
 WINSETUPAPI VOID WINAPI SetupCloseLog(VOID);
@@ -1157,7 +1157,7 @@ WINSETUPAPI BOOL WINAPI SetupDiGetINFClassW(PCWSTR,LPGUID,PWSTR,DWORD,PDWORD);
 WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDevice(HDEVINFO,PSP_DEVINFO_DATA);
 WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A);
 WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W);
-WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardPage(HDEVINFO,PSP_DEVINFO_DATA,PSP_INSTALLWIZARD_DATA,DWORD,DWORD);
+WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardage(HDEVINFO,PSP_DEVINFO_DATA,PSP_INSTALLWIZARD_DATA,DWORD,DWORD);
 WINSETUPAPI BOOL WINAPI SetupDiInstallClassA(HWND,PCSTR,DWORD,HSPFILEQ);
 WINSETUPAPI BOOL WINAPI SetupDiInstallClassW(HWND,PCWSTR,DWORD,HSPFILEQ);
 WINSETUPAPI BOOL WINAPI SetupDiInstallClassExA(HWND,PCSTR,DWORD,HSPFILEQ,CONST GUID*,PVOID,PVOID);
@@ -1204,8 +1204,8 @@ WINSETUPAPI BOOL WINAPI SetupFindFirstLineW(HINF,PCWSTR,PCWSTR,PINFCONTEXT);
 WINSETUPAPI BOOL WINAPI SetupFindNextLine(PINFCONTEXT,PINFCONTEXT);
 WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineA(PINFCONTEXT,PCSTR,PINFCONTEXT);
 WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineW(PINFCONTEXT,PCWSTR,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupFreeSourceListA(PCSTR**,UINT);
-WINSETUPAPI BOOL WINAPI SetupFreeSourceListW(PCWSTR**,UINT);
+WINSETUPAPI BOOL WINAPI SetupFreeA(PCSTR**,UINT);
+WINSETUPAPI BOOL WINAPI SetupFreeW(PCWSTR**,UINT);
 WINSETUPAPI BOOL WINAPI SetupGetBackupInformationA(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_A);
 WINSETUPAPI BOOL WINAPI SetupGetBackupInformationW(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_W);
 WINSETUPAPI BOOL WINAPI SetupGetBinaryField(PINFCONTEXT,DWORD,PBYTE,DWORD,LPDWORD);
@@ -1267,8 +1267,8 @@ WINSETUPAPI HINF WINAPI SetupOpenMasterInf(VOID);
 WINSETUPAPI UINT WINAPI SetupPromptForDiskA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD,PSTR,DWORD,PDWORD);
 WINSETUPAPI UINT WINAPI SetupPromptForDiskW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD,PWSTR,DWORD,PDWORD);
 WINSETUPAPI INT WINAPI SetupPromptReboot(HSPFILEQ,HWND,BOOL);
-WINSETUPAPI BOOL WINAPI SetupQuerySourceListA(DWORD,PCSTR**,PUINT);
-WINSETUPAPI BOOL WINAPI SetupQuerySourceListW(DWORD,PCWSTR**,PUINT);
+WINSETUPAPI BOOL WINAPI SetupQueryA(DWORD,PCSTR**,PUINT);
+WINSETUPAPI BOOL WINAPI SetupQueryW(DWORD,PCWSTR**,PUINT);
 WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC,PSTR,DWORD,PDWORD);
 WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC,PWSTR,DWORD,PDWORD);
 WINSETUPAPI BOOL WINAPI SetupQueryFileLogA(HSPFILELOG,PCSTR,PCSTR,SetupFileLogInfo,PSTR,DWORD,PDWORD);
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index aa168418b..a61547051 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1846,8 +1846,8 @@ LONG WINAPI InterlockedCompareExchange(LONG volatile *,LONG,LONG);
 /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */
 #define InterlockedCompareExchangePointer(d,e,c) \
     (PVOID)InterlockedCompareExchange((LONG volatile *)(d),(LONG)(e),(LONG)(c))
-LONG __cdecl InterlockedDecrement(LONG volatile *);
-LONG __cdecl InterlockedExchange(LONG volatile *,LONG);
+LONG WINAPI InterlockedDecrement(LONG volatile *);
+LONG WINAPI InterlockedExchange(LONG volatile *,LONG);
 /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */
 #define InterlockedExchangePointer(t,v) \
     (PVOID)InterlockedExchange((LONG volatile *)(t),(LONG)(v))
@@ -1855,7 +1855,7 @@ LONG WINAPI InterlockedExchangeAdd(LONG volatile *,LONG);
 #if (_WIN32_WINNT >= 0x0501)
 PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER);
 #endif
-LONG __cdecl InterlockedIncrement(LONG volatile *);
+LONG WINAPI InterlockedIncrement(LONG volatile *);
 #if (_WIN32_WINNT >= 0x0501)
 PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER);
 PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY);
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index db18aec8d..97e037e90 100644
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -16,8 +16,6 @@
 #pragma GCC system_header
 #endif
 
-#include <sdkddkver.h>
-
 /* translate GCC target defines to MS equivalents. Keep this synchronized
    with winnt.h. */
 #if defined(__i686__) && !defined(_M_IX86)
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index d650bf800..b31274bbe 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -4035,19 +4035,6 @@ struct _TEB * NtCurrentTeb(void);
 #endif /* __GNUC__ */
 #endif /* _X86_ */
 
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-# if defined(_AMD64_) || defined(__X86_64)
-#  define MemoryBarrier __faststorefence
-# elif defined(_IA64_)
-#  define MemoryBarrier __mf
-# else
-  void __mingworg_MemoryBarrier(void);
-#  define MemoryBarrier __mingworg_MemoryBarrier
-# endif
-#else
-# define MemoryBarrier
-#endif
-
 #endif /* RC_INVOKED */
 
 #ifdef __cplusplus
diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h
index 929c10348..b595b597c 100644
--- a/winsup/w32api/include/winsock.h
+++ b/winsup/w32api/include/winsock.h
@@ -240,7 +240,7 @@ typedef struct WSAData {
 } WSADATA;
 typedef WSADATA *LPWSADATA;
 
-#ifndef __INSIDE_MSYS__
+#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
 #define IP_OPTIONS	1
 #define SO_DEBUG	1
 #define SO_ACCEPTCONN	2
@@ -260,7 +260,7 @@ typedef WSADATA *LPWSADATA;
 #define SO_RCVTIMEO	0x1006
 #define SO_ERROR	0x1007
 #define SO_TYPE	0x1008
-#endif /* !__INSIDE_MSYS__ */
+#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
 /*
  * Note that the next 5 IP defines are specific to WinSock 1.1 (wsock32.dll).
  * They will cause errors or unexpected results if used with the
diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h
index 0279227b4..260c3fa5f 100644
--- a/winsup/w32api/include/winsock2.h
+++ b/winsup/w32api/include/winsock2.h
@@ -331,7 +331,7 @@ typedef WSADATA *LPWSADATA;
 #define AF_12844    25
 #define AF_IRDA     26
 #define AF_NETDES   28
-#ifndef __INSIDE_MSYS__
+#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
 #define AF_MAX	29
 struct sockaddr {
 	u_short sa_family;
@@ -359,7 +359,7 @@ struct sockaddr_storage {
     __int64 __ss_align;  	   /* force alignment */
     char __ss_pad2[_SS_PAD2SIZE];  /*  pad to 128 */
 };
-#endif /* !__INSIDE_MSYS__ */
+#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
 
 struct sockproto {
 	u_short sp_family;
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 76f493584..7fb6fe224 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -2771,7 +2771,7 @@ typedef struct tagMENUITEMINFOA {
 	HMENU hSubMenu;
 	HBITMAP hbmpChecked;
 	HBITMAP hbmpUnchecked;
-	ULONG_PTR dwItemData;
+	DWORD dwItemData;
 	LPSTR dwTypeData;
 	UINT cch;
 #if (_WIN32_WINNT >= 0x0500)
@@ -2788,7 +2788,7 @@ typedef struct tagMENUITEMINFOW {
 	HMENU hSubMenu;
 	HBITMAP hbmpChecked;
 	HBITMAP hbmpUnchecked;
-	ULONG_PTR dwItemData;
+	DWORD dwItemData;
 	LPWSTR dwTypeData;
 	UINT cch;
 #if (_WIN32_WINNT >= 0x0500)
diff --git a/winsup/w32api/include/winver.h b/winsup/w32api/include/winver.h
index f5a0dab85..9f8c9b76c 100644
--- a/winsup/w32api/include/winver.h
+++ b/winsup/w32api/include/winver.h
@@ -107,8 +107,8 @@ BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID);
 BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID);
 DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
 DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
-BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT);
-BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT);
+BOOL WINAPI VerQueryValueA(const LPVOID,LPCSTR,LPVOID*,PUINT);
+BOOL WINAPI VerQueryValueW(const LPVOID,LPCWSTR,LPVOID*,PUINT);
 #ifdef UNICODE
 #define VerFindFile VerFindFileW
 #define VerQueryValue VerQueryValueW
diff --git a/winsup/w32api/include/wtsapi32.h b/winsup/w32api/include/wtsapi32.h
index 298acb9b6..5bd09bbbd 100644
--- a/winsup/w32api/include/wtsapi32.h
+++ b/winsup/w32api/include/wtsapi32.h
@@ -74,7 +74,7 @@ BOOL WINAPI WTSQueryUserToken(ULONG SessionId, PHANDLE pToken);
 
 #endif /* _WIN32_WINNT >= 0x0501 */
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K)
+#if (_WIN32_WINNT >= 0x0500)
 
 typedef struct _WTS_SESSION_INFOW {
   DWORD SessionId;
@@ -168,56 +168,6 @@ BOOL WTSSendMessageW(
 #define WTSSendMessage WTSSendMessageA
 #endif
 
-BOOL WTSVirtualChannelClose(
-  __in  HANDLE hChannelHandle
-);
-
-HANDLE WTSVirtualChannelOpen(
-  __in  HANDLE hServer,
-  __in  DWORD SessionId,
-  __in  LPSTR pVirtualName
-);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-HANDLE WTSVirtualChannelOpenEx(
-  __in  DWORD SessionId,
-  __in  LPSTR pVirtualName,
-  __in  DWORD flags
-);
-#endif
-
-BOOL WTSVirtualChannelPurgeInput(
-  __in  HANDLE hChannelHandle
-);
-
-BOOL WTSVirtualChannelPurgeOutput(
-  __in  HANDLE hChannelHandle
-);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-BOOL WTSVirtualChannelQuery(
-  __in   HANDLE hChannelHandle,
-  __in   WTS_VIRTUAL_CLASS WtsVirtualClass,
-  __out  PVOID *ppBuffer,
-  __out  DWORD *pBytesReturned
-);
-#endif
-
-BOOL WTSVirtualChannelRead(
-  __in   HANDLE hChannelHandle,
-  __in   ULONG TimeOut,
-  __out  PCHAR Buffer,
-  __in   ULONG BufferSize,
-  __out  PULONG pBytesRead
-);
-
-BOOL WTSVirtualChannelWrite(
-  __in   HANDLE hChannelHandle,
-  __in   PCHAR Buffer,
-  __in   ULONG Length,
-  __out  PULONG pBytesWritten
-);
-
 #endif /* _WIN32_WINNT >= 0x0500 */
 
 #ifdef __cplusplus