From a216ed1df9394325bc573cd3f1693eb467a89938 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 4 Feb 2015 04:48:44 -0800 Subject: [PATCH] Partial fix for Windows 10 detection --- src/common/util.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index 37d214c0..d650c820 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -500,7 +500,22 @@ get_sys_str (int with_cpu) static char winver[20]; double mhz; - if (IsWindows8Point1OrGreater ()) + /* Broken since major bumped to 10, should start to work eventually. + * No, IsWindowsVersionOrGreater (10, 0, 0) doesn't work either. + * TODO: replace with IsWindows10OrGreater() once added to the SDK. + */ + if (IsWindowsVersionOrGreater (6, 4, 0)) + { + if (IsWindowsServer ()) + { + strcpy (winver, "Server 10"); + } + else + { + strcpy (winver, "10"); + } + } + else if (IsWindows8Point1OrGreater ()) { if (IsWindowsServer ()) {