osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add identification of Windows (Server) 10 

Change-Id: I5ab7a4dc67ceac644faead0d9e460e3babaf6355
Reviewed-on: https://code.wireshark.org/review/5067
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-11-02 13:27:37 +01:00
parent f8c3f15613
commit c49c775087
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/wireshark.exe.manifest.in
View File

@ -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>

3
wsutil/os_version_info.c
View File

@ -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);