diff options
| -rw-r--r-- | image/wireshark.exe.manifest.in | 2 | ||||
| -rw-r--r-- | wsutil/os_version_info.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/image/wireshark.exe.manifest.in b/image/wireshark.exe.manifest.in index 3b80f8c699..9a3f32c912 100644 --- a/image/wireshark.exe.manifest.in +++ b/image/wireshark.exe.manifest.in @@ -39,6 +39,8 @@ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- Windows 8.1 --> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> </application> </compatibility> </assembly> diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c index 0949d5379a..5c79de3250 100644 --- a/wsutil/os_version_info.c +++ b/wsutil/os_version_info.c @@ -351,6 +351,9 @@ 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: + g_string_append_printf(str, is_nt_workstation ? "Windows 10" : "Windows Server 10"); + break; default: g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); |