kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect newer Windows versions for system name display 

- Handle Windows 6.1 - 6.3 which equals Windows 7, 8 and 8.1 including
  its server variants
- Shorten the client/server differentiation by using a variable
This commit is contained in:
Stefan Gehn 2014-11-23 22:05:40 +01:00
parent d4fe37aef1
commit aef224495d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/sysdeps/win32.c
View File

@ -1917,14 +1917,19 @@ gchar *gkrellm_sys_get_system_name(void)
else else
GetSystemInfo(&si); GetSystemInfo(&si);
if (vi.dwMajorVersion == 6 && vi.dwMinorVersion == 0) /* NT Workstation identifies some Client/Desktop Windows version */
{ gboolean isWks = (vi.wProductType == VER_NT_WORKSTATION);
// Windows 6.0 aka Vista or Server 2008
if (vi.wProductType == VER_NT_WORKSTATION) if (vi.dwMajorVersion == 6)
g_strlcpy(sysname, "Windows Vista", sizeof(sysname)); {
else if (vi.dwMinorVersion == 0)
g_strlcpy(sysname, "Windows Server 2008", sizeof(sysname)); g_strlcpy(sysname, isWks ? "Windows Vista" : "Windows Server 2008", sizeof(sysname));
else if (vi.dwMinorVersion == 1)
g_strlcpy(sysname, isWks ? "Windows 7" : "Windows Server 2008 R2", sizeof(sysname));
else if (vi.dwMinorVersion == 2)
g_strlcpy(sysname, isWks ? "Windows 8" : "Windows Server 2012", sizeof(sysname));
else if (vi.dwMinorVersion == 3)
g_strlcpy(sysname, isWks ? "Windows 8.1" : "Windows Server 2012 R2", sizeof(sysname));
} }
else if (vi.dwMajorVersion == 5) else if (vi.dwMajorVersion == 5)
{ {
@ -1932,10 +1937,7 @@ gchar *gkrellm_sys_get_system_name(void)
if (vi.dwMinorVersion == 0) if (vi.dwMinorVersion == 0)
{ {
if (vi.wProductType == VER_NT_WORKSTATION) g_strlcpy(sysname, isWks ? "Windows 2000 Professional" : "Windows 2000 Server", sizeof(sysname));
g_strlcpy(sysname, "Windows 2000 Professional", sizeof(sysname));
else
g_strlcpy(sysname, "Windows 2000 Server", sizeof(sysname));
} }
else if (vi.dwMinorVersion == 1) else if (vi.dwMinorVersion == 1)
{ {