* ntdll.h (RtlGetVersion): Declare.

	* wincap.cc (wincapc::init): Rather than GetVersionEx, call
	RtlGetVersion which is not crippled by missing Windows 8.1 manifest.
	* wincap.h (wincapc): Change type of version to RTL_OSVERSIONINFOEXW.
	Align formatting of all class members.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8fa9089a35efe07ed7fa1694efb3a59efa8f5ea9..be4656050d7c02c5476d5159b8efeceff45dbc28 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-19  Corinna Vinschen  <corinna@vinschen.de>
+
+       * ntdll.h (RtlGetVersion): Declare.
+       * wincap.cc (wincapc::init): Rather than GetVersionEx, call
+       RtlGetVersion which is not crippled by missing Windows 8.1 manifest.
+       * wincap.h (wincapc): Change type of version to RTL_OSVERSIONINFOEXW.
+       Align formatting of all class members.
+
 2013-11-19  Corinna Vinschen  <corinna@vinschen.de>
 
        * wincap.cc (wincapc::init): Revert previous change.  It's not working.

diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 9c8e94b08e7ffad11425fa6648302a80c422ea45..89752cb46c73ab7fa7ac64090160efed75e851f8 100644 (file)
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -1390,6 +1390,7 @@ extern "C"
                                                PBOOLEAN);
   NTSTATUS NTAPI RtlGetOwnerSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID *,
                                                PBOOLEAN);
+  NTSTATUS NTAPI RtlGetVersion (PRTL_OSVERSIONINFOEXW);
   PSID_IDENTIFIER_AUTHORITY NTAPI RtlIdentifierAuthoritySid (PSID);
   VOID NTAPI RtlInitEmptyUnicodeString (PUNICODE_STRING, PCWSTR, USHORT);
   VOID NTAPI RtlInitAnsiString (PANSI_STRING, PCSTR);

diff --git a/winsup/cygwin/release/1.7.26 b/winsup/cygwin/release/1.7.26
index 722606cd0a3a9e1dff4a52ca56287171def58003..50a0bc7672a1449d532bd4a7b6d422c4ee678e09 100644 (file)
--- a/winsup/cygwin/release/1.7.26
+++ b/winsup/cygwin/release/1.7.26
@@ -56,3 +56,7 @@ Bug fixes:
 
 - Fix typos in cygcheck which could crash Windows 8 and 8.1 machines.
   Fixes: http://cygwin.com/ml/cygwin/2013-11/msg00334.html
+
+- Show OS version correctly even on Windows 8.1 and Server 2012 R2.
+  Fixes: http://cygwin.com/ml/cygwin/2013-11/msg00343.html
+

diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index d84679df55197b2499918c6e0ae8d909938776d7..cdbb1c37ecfcea05dadfc55aa2bb725041f246ce 100644 (file)
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -172,8 +172,8 @@ wincapc::init ()
     return;            // already initialized
 
   GetSystemInfo (&system_info);
-  version.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
-  GetVersionEx (reinterpret_cast<LPOSVERSIONINFO>(&version));
+  version.dwOSVersionInfoSize = sizeof (RTL_OSVERSIONINFOEXW);
+  RtlGetVersion (&version);
 
   switch (version.dwMajorVersion)
     {

diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h
index cf42dc90ef07a5043d6c9be8ce293e0118e02172..98fef2656cb8034a7ff3e716a9f791b923c34bb2 100644 (file)
--- a/winsup/cygwin/wincap.h
+++ b/winsup/cygwin/wincap.h
@@ -43,11 +43,11 @@ struct wincaps
 
 class wincapc
 {
-  SYSTEM_INFO      system_info;
-  OSVERSIONINFOEX  version;
-  char             osnam[40];
-  ULONG_PTR        wow64;
-  void             *caps;
+  SYSTEM_INFO          system_info;
+  RTL_OSVERSIONINFOEXW version;
+  char                 osnam[40];
+  ULONG_PTR            wow64;
+  void                 *caps;
 
 public:
   void init ();