aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil/os_version_info.c
AgeCommit message (Collapse)AuthorFilesLines
2018-06-27Add Windows 10 Release ID to About infoGraham Bloice1-0/+7
Adds the Windows 10 (and Server 2016) Release ID to the info in the About Wireshark blurb. The ID displayed in parentheses, e.g. Running on 64-bit Windows 10 (1803), build 17134 Change-Id: I1bbce27e149dbf6da6da7847ad1f7dd861176ece Reviewed-on: https://code.wireshark.org/review/28475 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-26Windows: Fetch our version using RtlGetVersion.Gerald Combs1-70/+54
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@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-01Windows: Remove cruft for unsupported versonsGraham Bloice1-21/+3
Remove all the existing LoadDLL\GetProcAddress combinations that allowed conditional Win32 API usage if supported on the running OS version. All the required functions are present in the versions we support. Change-Id: Ibc43e51cefcd1c7562d4e251784362509f224ed6 Reviewed-on: https://code.wireshark.org/review/26215 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-02-22And systemd weighs in on how to find out the distribution you're on....Guy Harris1-0/+15
Change-Id: I84e957617b81b6cfad815dc84439e166c0f936b6 Reviewed-on: https://code.wireshark.org/review/25980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo1-1/+1
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-10Convert to using use SPDX identifier on wsutil directoryMichael Mann1-13/+1
Change-Id: Id73e641499e75bc1afc1dea29682418156f461fe Reviewed-on: https://code.wireshark.org/review/24751 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-16Change some names to reflect Apple's new UNIX-for-Macs name.Guy Harris1-5/+5
{OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16Rename a routine to match the OS name.Guy Harris1-2/+5
It's now "macOS". While we're at it, note that the property list from which it fetches version information still calls it "Mac OS X". Change-Id: I438ef9dc65c2619d7378b0deb5efc84734a2ac6d Reviewed-on: https://code.wireshark.org/review/22159 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-6/+6
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-13Finish moving the parenthesis.Guy Harris1-1/+1
Change-Id: I02f099ef198e360663b03857bdf9538bb63a7de8 Reviewed-on: https://code.wireshark.org/review/15864 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-13Fix a compile error.Guy Harris1-1/+1
(Perhaps the Petri dish buildbots should, if a build fails, immediately mark the change as failing the Petri dish build, without waiting for the other build(s), so that you don't have to, for example, wait for the Ubuntu buildbot to finish doing a test build for a change that doesn't affect code built on UN*X.) Change-Id: I89ee1616d35c186fcabc0ec989936fa94116df70 Reviewed-on: https://code.wireshark.org/review/15863 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-13Don't assume we can get a module handle for kernel32.dll.Guy Harris1-1/+10
A failure "shouldn't happen", but check anyway; if nothing else, that squelches some complaining from the VS Code Analysis tool. Change-Id: I9b06db399741176d0e9f859eb650bed8a2f96d9c Reviewed-on: https://code.wireshark.org/review/15860 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07Next Windows Server version seems to be named Windows Server 2016 nowPascal Quantin1-1/+1
Change-Id: I31fb5495f5e17ccba1578a069ca33448a291923f Reviewed-on: https://code.wireshark.org/review/9539 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-28win32: fix detection of Windows 10 Technical PreviewPascal Quantin1-2/+20
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>
2014-12-29Restore string.h to os_version.cMartin Mathieson1-0/+1
Change-Id: I810a38c56829d5d3beaccc0171fc76f26ad79b52 Reviewed-on: https://code.wireshark.org/review/6108 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-28Deleting unnecessary #includes from wsutil.Martin Mathieson1-1/+0
Will look at cleaning up and committing script afterwards. Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527 Reviewed-on: https://code.wireshark.org/review/6086 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-11-02Add identification of Windows (Server) 10Pascal Quantin1-0/+3
Change-Id: I5ab7a4dc67ceac644faead0d9e460e3babaf6355 Reviewed-on: https://code.wireshark.org/review/5067 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-14Add editor-modelines; adjust whitespace.Bill Meier1-0/+13
Change-Id: I8cad872cee972a6d22a72852dac57fd188daca84 Reviewed-on: https://code.wireshark.org/review/4683 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-21Move get_os_major_version() to wsutil and rename it to ↵Guy Harris1-0/+24
get_windows_major_version(). It's Windows-specific, so name it appropriately. Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e Reviewed-on: https://code.wireshark.org/review/2528 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Clean up inclusion of cfutils.h.Guy Harris1-1/+1
Change-Id: I7da381f12db6721448e15d30d441a943127cbca1 Reviewed-on: https://code.wireshark.org/review/2522 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Need <string.h> for string routines.Guy Harris1-1/+3
Change-Id: I828bb29953727eb43e169fa9b06837c9657ca051 Reviewed-on: https://code.wireshark.org/review/2517 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21We need the Unicode utilities, at least on Windows.Guy Harris1-4/+2
Multiple UTFs FTW! Change-Id: Ib50dda4577f0038b11179be92dc6fb321b033618 Reviewed-on: https://code.wireshark.org/review/2516 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21We need <windows.h> on Windows.Guy Harris1-0/+4
Change-Id: I54c9991b3322d14966913367f951900cc7e54c4e Reviewed-on: https://code.wireshark.org/review/2513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_version_info() to libwsutil.Guy Harris1-0/+474
This mean we also have to move CFString_to_C_string() there for OS X. Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337 Reviewed-on: https://code.wireshark.org/review/2511 Reviewed-by: Guy Harris <guy@alum.mit.edu>