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

* cygcheck.cc (dump_sysinfo): Revert Windows 8.1 hack. It's not

Browse Source 
working.  Add a (hopefully temporary) comment.
This commit is contained in:
Corinna Vinschen 2013-11-19 20:43:04 +00:00
parent 690d1333f5
commit f8863cbe54
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2013-11-19 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Revert Windows 8.1 hack. It's not
working. Add a (hopefully temporary) comment.
2013-11-19 Corinna Vinschen <corinna@vinschen.de> 2013-11-19 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Drop code trying to fetch OSVERSIONINFO * cygcheck.cc (dump_sysinfo): Drop code trying to fetch OSVERSIONINFO

15
winsup/utils/cygcheck.cc
View File

@ -1465,17 +1465,10 @@ dump_sysinfo ()
? "7" : "2008 R2"); ? "7" : "2008 R2");
break; break;
case 2: case 2:
/* No way to distinguish W8 and W8.1 by OS version numbers strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
alone, unless the executables have a matching manifest. ? "8" : "2012");
What a big, fat mess. */ break;
if (osversion.dwBuildNumber < 9200) case 3: /* Unreached due to mainfest nonsense. */
{
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "8" : "2012");
break;
}
/*FALLTHRU*/
case 3:
default: default:
osversion.dwMinorVersion = 3; osversion.dwMinorVersion = 3;
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION