diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-27 16:59:30 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-28 09:19:48 +0000 |
| commit | 53a5e4f6cbc018f6e480591715a863374617d7ad (patch) | |
| tree | 3c6aef18b1eef5afd6db7edb42e78650690e4104 /wsutil/os_version_info.c | |
| parent | 946856ada23bf399458265e25b1f68dbd455e756 (diff) | |
| download | wireshark-53a5e4f6cbc018f6e480591715a863374617d7ad.tar.gz | |
win32: fix detection of Windows 10 Technical Preview
The version number changed from 6.4 to 10.0
Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad
Reviewed-on: https://code.wireshark.org/review/6820
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'wsutil/os_version_info.c')
| -rw-r--r-- | wsutil/os_version_info.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c index 5c79de3250..a007904e1d 100644 --- a/wsutil/os_version_info.c +++ b/wsutil/os_version_info.c @@ -351,7 +351,24 @@ get_os_version_info(GString *str) case 3: g_string_append_printf(str, is_nt_workstation ? "Windows 8.1" : "Windows Server 2012 R2"); break; - case 4: + default: + g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", + info.dwMajorVersion, info.dwMinorVersion); + break; + } + 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 10"); break; default: @@ -360,7 +377,8 @@ get_os_version_info(GString *str) break; } break; - } /* case 6 */ + } /* case 10 */ + default: g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); |