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

1_7_17-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 cygwin-64bit-branch 2012-10-09 12:05:52 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-':
    newlib/libc/posix/wordexp2.h
Cherrypick from master 2012-10-20 15:31:50 UTC Corinna Vinschen <corinna@vinschen.de> '	* new-features.sgml (ov-new1.7.17): Add section.':
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    compile
    config.guess
    config.sub
    config/ChangeLog
    config/cloog.m4
    config/isl.m4
    config/mt-sde
    configure
    include/ChangeLog
    include/demangle.h
    include/dis-asm.h
    include/dwarf2.def
    include/elf/ChangeLog
    include/elf/aarch64.h
    include/elf/arm.h
    include/elf/common.h
    include/elf/tilegx.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/objalloc.h
    include/opcode/ChangeLog
    include/opcode/aarch64.h
    include/opcode/arm.h
    include/opcode/hppa.h
    include/opcode/ia64.h
    include/opcode/mips.h
    include/opcode/moxie.h
    include/opcode/s390.h
    include/opcode/sparc.h
    include/plugin-api.h
    libtool.m4
    ltoptions.m4
    ltversion.m4
    lt~obsolete.m4
    newlib/ChangeLog
    newlib/HOWTO
    newlib/README
    newlib/configure.host
    newlib/doc/makedoc.c
    newlib/libc/include/_ansi.h
    newlib/libc/include/assert.h
    newlib/libc/include/machine/_default_types.h
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/machine/time.h
    newlib/libc/include/math.h
    newlib/libc/include/stdint.h
    newlib/libc/include/sys/config.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/tgmath.h
    newlib/libc/machine/configure
    newlib/libc/machine/configure.in
    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/engine.c
    newlib/libc/posix/wordexp.c
    newlib/libc/posix/wordfree.c
    newlib/libc/search/hash_buf.c
    newlib/libc/stdio/fgets.c
    newlib/libc/stdio/flags.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdlib/btowc.c
    newlib/libc/stdlib/getopt.c
    newlib/libc/string/strcasestr.c
    newlib/libc/sys/sysnecv850/sbrk.c
    newlib/libc/time/strftime.c
    newlib/libm/machine/configure
    newlib/libm/machine/configure.in
    newlib/testsuite/newlib.stdio/stdio.exp
    newlib/testsuite/newlib.stdio/swprintf.c
    winsup/cygwin/ChangeLog
    winsup/cygwin/DevNotes
    winsup/cygwin/child_info.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwait.cc
    winsup/cygwin/cygwait.h
    winsup/cygwin/dll_init.cc
    winsup/cygwin/errno.cc
    winsup/cygwin/exceptions.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_raw.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/gendef
    winsup/cygwin/glob.cc
    winsup/cygwin/globals.cc
    winsup/cygwin/gmon.c
    winsup/cygwin/hookapi.cc
    winsup/cygwin/include/cygwin/fs.h
    winsup/cygwin/include/cygwin/in.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mount.cc
    winsup/cygwin/mount.h
    winsup/cygwin/net.cc
    winsup/cygwin/path.cc
    winsup/cygwin/pinfo.cc
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/pseudo-reloc.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/release/1.7.16
    winsup/cygwin/release/1.7.17
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/syscalls.cc
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/tty.h
    winsup/cygwin/wait.cc
    winsup/doc/ChangeLog
    winsup/doc/faq-what.xml
    winsup/doc/new-features.sgml
    winsup/utils/ChangeLog
    winsup/utils/Makefile.in
    winsup/utils/cygcheck.cc
    winsup/w32api/ChangeLog
    winsup/w32api/include/winbase.h
    winsup/w32api/lib/kernel32.def

1 files changed, 64 insertions, 29 deletions

diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index de45addd2..17c15fd38 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1433,17 +1433,20 @@ dump_sysinfo ()
 	  BOOL (WINAPI *GetProductInfo) (DWORD, DWORD, DWORD, DWORD, PDWORD) =
 		  (BOOL (WINAPI *)(DWORD, DWORD, DWORD, DWORD, PDWORD))
 		  GetProcAddress (k32, "GetProductInfo");
-	  if (osversion.dwMinorVersion == 0)
-	    strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
-			    ? "Vista" : "2008");
-	  else if (osversion.dwMinorVersion == 1)
-	    strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
-			    ? "7" : "2008 R2");
-	  else if (osversion.dwMinorVersion == 2)
+	  switch (osversion.dwMinorVersion)
 	    {
+	    case 0:
+	      strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
+			      ? "Vista" : "2008");
+	      break;
+	    case 1:
+	      strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
+			      ? "7" : "2008 R2");
+	      break;
+	    default:
 	      strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
-			      ? "8" : "Server 2012");
-	      strcat (osname, " (not yet supported!)");
+			      ? "8" : "2012");
+	      break;
 	    }
 	  DWORD prod;
 	  if (GetProductInfo (osversion.dwMajorVersion,
@@ -1453,8 +1456,8 @@ dump_sysinfo ()
 			      &prod))
 	    {
 #define       PRODUCT_UNLICENSED 0xabcdabcd
-#ifndef PRODUCT_ULTIMATE_E
-#define       PRODUCT_ULTIMATE_E 0x00000047
+#ifndef PRODUCT_PROFESSIONAL_WMC
+#define       PRODUCT_PROFESSIONAL_WMC 0x00000067
 #endif
 	      const char *products[] =
 		{
@@ -1483,7 +1486,7 @@ dump_sysinfo ()
  /* 0x00000016 */ " Storage Server Workgroup",
  /* 0x00000017 */ " Storage Server Enterprise",
  /* 0x00000018 */ " for Windows Essential Server Solutions",
- /* 0x00000019 */ "",
+ /* 0x00000019 */ " Small Business Server Premium",
  /* 0x0000001a */ " Home Premium N",
  /* 0x0000001b */ " Enterprise N",
  /* 0x0000001c */ " Ultimate N",
@@ -1501,28 +1504,28 @@ dump_sysinfo ()
  /* 0x00000028 */ " Server Standard Core without Hyper-V",
  /* 0x00000029 */ " Server Enterprise Core without Hyper-V",
  /* 0x0000002a */ " Hyper-V Server",
- /* 0x0000002b */ "",
- /* 0x0000002c */ "",
- /* 0x0000002d */ "",
- /* 0x0000002e */ "",
+ /* 0x0000002b */ " Storage Server Express Core",
+ /* 0x0000002c */ " Storage Server Standard Core",
+ /* 0x0000002d */ " Storage Server Workgroup Core",
+ /* 0x0000002e */ " Storage Server Enterprise Core",
  /* 0x0000002f */ " Starter N",
  /* 0x00000030 */ " Professional",
  /* 0x00000031 */ " Professional N",
- /* 0x00000032 */ " Home Server 2011",
- /* 0x00000033 */ "",
- /* 0x00000034 */ "",
- /* 0x00000035 */ "",
- /* 0x00000036 */ "",
- /* 0x00000037 */ "",
+ /* 0x00000032 */ " Small Business Server 2011 Essentials"
+ /* 0x00000033 */ " Server For SB Solutions",
+ /* 0x00000034 */ " Server Solutions Premium",
+ /* 0x00000035 */ " Server Solutions Premium Core",
+ /* 0x00000036 */ " Server For SB Solutions EM", /* per MSDN, 2012-09-01 */
+ /* 0x00000037 */ " Server For SB Solutions EM", /* per MSDN, 2012-09-01 */
  /* 0x00000038 */ " Multipoint Server",
  /* 0x00000039 */ "",
  /* 0x0000003a */ "",
- /* 0x0000003b */ "",
- /* 0x0000003c */ "",
- /* 0x0000003d */ "",
- /* 0x0000003e */ "",
- /* 0x0000003f */ "",
- /* 0x00000040 */ "",
+ /* 0x0000003b */ " Essential Server Solution Management",
+ /* 0x0000003c */ " Essential Server Solution Additional",
+ /* 0x0000003d */ " Essential Server Solution Management SVC",
+ /* 0x0000003e */ " Essential Server Solution Additional SVC",
+ /* 0x0000003f */ " Small Business Server Premium Core",
+ /* 0x00000040 */ " Server Hyper Core V",
  /* 0x00000041 */ "",
  /* 0x00000042 */ " Starter E",
  /* 0x00000043 */ " Home Basic E",
@@ -1530,10 +1533,42 @@ dump_sysinfo ()
  /* 0x00000045 */ " Professional E",
  /* 0x00000046 */ " Enterprise E",
  /* 0x00000047 */ " Ultimate E"
+ /* 0x00000048 */ " Server Enterprise (Evaluation inst.)",
+ /* 0x00000049 */ "",
+ /* 0x0000004a */ "",
+ /* 0x0000004b */ "",
+ /* 0x0000004c */ " MultiPoint Server Standard",
+ /* 0x0000004d */ " MultiPoint Server Premium",
+ /* 0x0000004e */ "",
+ /* 0x0000004f */ " Server Standard (Evaluation inst.)",
+ /* 0x00000050 */ " Server Datacenter (Evaluation inst.)",
+ /* 0x00000051 */ "",
+ /* 0x00000052 */ "",
+ /* 0x00000053 */ "",
+ /* 0x00000054 */ " Enterprise N (Evaluation inst.)",
+ /* 0x00000055 */ "",
+ /* 0x00000056 */ "",
+ /* 0x00000057 */ "",
+ /* 0x00000058 */ "",
+ /* 0x00000059 */ "",
+ /* 0x0000005a */ "",
+ /* 0x0000005b */ "",
+ /* 0x0000005c */ "",
+ /* 0x0000005d */ "",
+ /* 0x0000005e */ "",
+ /* 0x0000005f */ " Storage Server Workgroup (Evaluation inst.)",
+ /* 0x00000060 */ " Storage Server Standard (Evaluation inst.)",
+ /* 0x00000061 */ "",
+ /* 0x00000062 */ " N",			/* "8 N" */
+ /* 0x00000063 */ " China",		/* "8 China" */
+ /* 0x00000064 */ " Single Language",	/* "8 Single Language" */
+ /* 0x00000065 */ "",			/* "8" */
+ /* 0x00000066 */ "",
+ /* 0x00000067 */ " Professional with Media Center"
 		};
 	      if (prod == PRODUCT_UNLICENSED)
 		strcat (osname, "Unlicensed");
-	      else if (prod > PRODUCT_ULTIMATE_E)
+	      else if (prod > PRODUCT_PROFESSIONAL_WMC)
 		strcat (osname, "");
 	      else
 		strcat (osname, products[prod]);