1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Feedback plugin : add support for Windows 10 / Server 2016.

Browse Source 
Also add fallback version string for unknown future versions.
This commit is contained in:
Vladislav Vaintroub 2016-09-28 12:52:01 +00:00
parent b38d3c3d8a
commit 0e76054b7b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/feedback/utils.cc
View File

@ -43,7 +43,11 @@ static const char *get_os_version_name(OSVERSIONINFOEX *ver)
{ {
DWORD major = ver->dwMajorVersion; DWORD major = ver->dwMajorVersion;
DWORD minor = ver->dwMinorVersion; DWORD minor = ver->dwMinorVersion;
if (major == 10 && minor == 0)
{
return (ver->wProductType == VER_NT_WORKSTATION) ?
"Windows 10" : "Windows Server 2016";
}
if (major == 6 && minor == 3) if (major == 6 && minor == 3)
{ {
return (ver->wProductType == VER_NT_WORKSTATION)? return (ver->wProductType == VER_NT_WORKSTATION)?
@ -102,7 +106,12 @@ static int uname(struct utsname *buf)
if(version_str && version_str[0]) if(version_str && version_str[0])
sprintf(buf->version, "%s %s",version_str, ver.szCSDVersion); sprintf(buf->version, "%s %s",version_str, ver.szCSDVersion);
else else
sprintf(buf->version, "%s", ver.szCSDVersion); {
/* Fallback for unknown versions, e.g "Windows <major_ver>.<minor_ver>" */
sprintf(buf->version, "Windows %d.%d%s",
ver.dwMajorVersion, ver.dwMinorVersion,
(ver.wProductType == VER_NT_WORKSTATION ? "" : " Server"));
}
#ifdef _WIN64 #ifdef _WIN64
strcpy(buf->machine, "x64"); strcpy(buf->machine, "x64");