JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygcheck.cc (dump_sysinfo): Drop "not yet supported" text from

Browse Source 
Windows 8.  Update products array.
This commit is contained in:
Corinna Vinschen
2012-09-02 10:06:12 +00:00
parent 44c61e4a63
commit 199a8245e0
2 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@@ -1,3 +1,8 @@
2012-09-02 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Drop "not yet supported" text from
Windows 8. Update products array.
2012-07-11 Corinna Vinschen <corinna@vinschen.de> 2012-07-11 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (cygcheck.exe): Link against psapi.dll. * Makefile.in (cygcheck.exe): Link against psapi.dll.

77
winsup/utils/cygcheck.cc
View File

@@ -1440,11 +1440,8 @@ dump_sysinfo ()
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "7" : "2008 R2"); ? "7" : "2008 R2");
else if (osversion.dwMinorVersion == 2) else if (osversion.dwMinorVersion == 2)
{
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "8" : "Server 2012"); ? "8" : "Server 2012 (not yet supported!)");
strcat (osname, " (not yet supported!)");
}
DWORD prod; DWORD prod;
if (GetProductInfo (osversion.dwMajorVersion, if (GetProductInfo (osversion.dwMajorVersion,
osversion.dwMinorVersion, osversion.dwMinorVersion,
@@ -1453,8 +1450,8 @@ dump_sysinfo ()
&prod)) &prod))
{ {
#define PRODUCT_UNLICENSED 0xabcdabcd #define PRODUCT_UNLICENSED 0xabcdabcd
#ifndef PRODUCT_ULTIMATE_E #ifndef PRODUCT_PROFESSIONAL_WMC
#define PRODUCT_ULTIMATE_E 0x00000047 #define PRODUCT_PROFESSIONAL_WMC 0x00000067
#endif #endif
const char *products[] = const char *products[] =
{ {
@@ -1483,7 +1480,7 @@ dump_sysinfo ()
/* 0x00000016 */ " Storage Server Workgroup", /* 0x00000016 */ " Storage Server Workgroup",
/* 0x00000017 */ " Storage Server Enterprise", /* 0x00000017 */ " Storage Server Enterprise",
/* 0x00000018 */ " for Windows Essential Server Solutions", /* 0x00000018 */ " for Windows Essential Server Solutions",
/* 0x00000019 */ "", /* 0x00000019 */ " Small Business Server Premium",
/* 0x0000001a */ " Home Premium N", /* 0x0000001a */ " Home Premium N",
/* 0x0000001b */ " Enterprise N", /* 0x0000001b */ " Enterprise N",
/* 0x0000001c */ " Ultimate N", /* 0x0000001c */ " Ultimate N",
@@ -1501,28 +1498,28 @@ dump_sysinfo ()
/* 0x00000028 */ " Server Standard Core without Hyper-V", /* 0x00000028 */ " Server Standard Core without Hyper-V",
/* 0x00000029 */ " Server Enterprise Core without Hyper-V", /* 0x00000029 */ " Server Enterprise Core without Hyper-V",
/* 0x0000002a */ " Hyper-V Server", /* 0x0000002a */ " Hyper-V Server",
/* 0x0000002b */ "", /* 0x0000002b */ " Storage Server Express Core",
/* 0x0000002c */ "", /* 0x0000002c */ " Storage Server Standard Core",
/* 0x0000002d */ "", /* 0x0000002d */ " Storage Server Workgroup Core",
/* 0x0000002e */ "", /* 0x0000002e */ " Storage Server Enterprise Core",
/* 0x0000002f */ " Starter N", /* 0x0000002f */ " Starter N",
/* 0x00000030 */ " Professional", /* 0x00000030 */ " Professional",
/* 0x00000031 */ " Professional N", /* 0x00000031 */ " Professional N",
/* 0x00000032 */ " Home Server 2011", /* 0x00000032 */ " Small Business Server 2011 Essentials"
/* 0x00000033 */ "", /* 0x00000033 */ " Server For SB Solutions",
/* 0x00000034 */ "", /* 0x00000034 */ " Server Solutions Premium",
/* 0x00000035 */ "", /* 0x00000035 */ " Server Solutions Premium Core",
/* 0x00000036 */ "", /* 0x00000036 */ " Server For SB Solutions EM", /* per MSDN, 2012-09-01 */
/* 0x00000037 */ "", /* 0x00000037 */ " Server For SB Solutions EM", /* per MSDN, 2012-09-01 */
/* 0x00000038 */ " Multipoint Server", /* 0x00000038 */ " Multipoint Server",
/* 0x00000039 */ "", /* 0x00000039 */ "",
/* 0x0000003a */ "", /* 0x0000003a */ "",
/* 0x0000003b */ "", /* 0x0000003b */ " Essential Server Solution Management",
/* 0x0000003c */ "", /* 0x0000003c */ " Essential Server Solution Additional",
/* 0x0000003d */ "", /* 0x0000003d */ " Essential Server Solution Management SVC",
/* 0x0000003e */ "", /* 0x0000003e */ " Essential Server Solution Additional SVC",
/* 0x0000003f */ "", /* 0x0000003f */ " Small Business Server Premium Core",
/* 0x00000040 */ "", /* 0x00000040 */ " Server Hyper Core V",
/* 0x00000041 */ "", /* 0x00000041 */ "",
/* 0x00000042 */ " Starter E", /* 0x00000042 */ " Starter E",
/* 0x00000043 */ " Home Basic E", /* 0x00000043 */ " Home Basic E",
@@ -1530,10 +1527,42 @@ dump_sysinfo ()
/* 0x00000045 */ " Professional E", /* 0x00000045 */ " Professional E",
/* 0x00000046 */ " Enterprise E", /* 0x00000046 */ " Enterprise E",
/* 0x00000047 */ " Ultimate 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) if (prod == PRODUCT_UNLICENSED)
strcat (osname, "Unlicensed"); strcat (osname, "Unlicensed");
else if (prod > PRODUCT_ULTIMATE_E) else if (prod > PRODUCT_PROFESSIONAL_WMC)
strcat (osname, ""); strcat (osname, "");
else else
strcat (osname, products[prod]); strcat (osname, products[prod]);