Wireshark-commits: [Wireshark-commits] master-2.6 f4c57ef: Windows: Fetch our version using RtlGetV
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f4c57ef8b373360ae810697d3476e44bf1cfa2c6
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark
Commits:
f4c57ef by Gerald Combs (gerald@xxxxxxxxxxxxx):
Windows: Fetch our version using RtlGetVersion.
GetVersionEx is deprecated. Use RtlGetVersion instead. Remove
get_windows_major_version since it's no longer needed.
Change-Id: I02f6458608c2328a96a0ac71c6b1f9187babd049
Reviewed-on: https://code.wireshark.org/review/28443
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit c74dba69fc4118e1d81c2bdcbc6ba52fd5a465d5)
Reviewed-on: https://code.wireshark.org/review/28775
Actions performed:
from 0bc642e Extcap programs must write to the packet pipe in binary mode.
adds f4c57ef Windows: Fetch our version using RtlGetVersion.
Summary of changes:
tshark.c | 3 +-
ui/gtk/main.c | 3 +-
wireshark-qt.cpp | 3 +-
wsutil/os_version_info.c | 124 +++++++++++++++++++++--------------------------
wsutil/os_version_info.h | 7 ---
5 files changed, 57 insertions(+), 83 deletions(-)