diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-07 18:33:46 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-07 16:50:06 +0000 |
| commit | 9d50c5e89646ee98569636ed2b83b55c28bad909 (patch) | |
| tree | 09ff0a146c62965989d4e6ac5d75c14b22129cd8 /version_info.c | |
| parent | bddc9def30aeb859067d5c79c06e75fdc6857960 (diff) | |
| download | wireshark-9d50c5e89646ee98569636ed2b83b55c28bad909.tar.gz | |
Add identification of Windows 10 / Windows Server 2016
Change-Id: I7498efd97681185e1bcaed18c0382b2215b75573
Reviewed-on: https://code.wireshark.org/review/9541
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/version_info.c b/version_info.c index 36d07da3da..404a886313 100644 --- a/version_info.c +++ b/version_info.c @@ -494,6 +494,27 @@ void get_os_version_info(GString *str) } break; } /* case 6 */ + + case 10: { + gboolean is_nt_workstation; + + if (system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + g_string_append(str, "64-bit "); + else if (system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + g_string_append(str, "32-bit "); + is_nt_workstation = (info.wProductType == VER_NT_WORKSTATION); + switch (info.dwMinorVersion) { + case 0: + g_string_append_printf(str, is_nt_workstation ? "Windows 10" : "Windows Server 2016"); + break; + default: + g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", + info.dwMajorVersion, info.dwMinorVersion); + break; + } + break; + } /* case 10 */ + default: g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); |