aboutsummaryrefslogtreecommitdiffstats
path: root/ui/win32
AgeCommit message (Collapse)AuthorFilesLines
2019-12-10Win32: Remove win32_save_as_statstree.Gerald Combs2-84/+0
win32_save_as_statstree was GTK+-only. Change-Id: Ief029cd1a702b0c17d9602bee8a2d75ee4c3c393 Reviewed-on: https://code.wireshark.org/review/35384 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-12-10Win32: Fixup our file dialog titles.Gerald Combs2-14/+16
Add a "title" argument to each of the Win32 file dialog routines, and pass in one constructed using wsApp->windowTitleString. Change-Id: I5ff862bd28cd16093d99ae1559ecbaca907350da Reviewed-on: https://code.wireshark.org/review/35383 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-12-10Win32: Remove some unused code.Gerald Combs1-122/+3
Remove some code that's been #if 0'ed out since 2006 and 2012. Include file.h instead of globals.h. Change-Id: Ib4a84c03e112d732b25df4b7b26b54e029f717a4 Reviewed-on: https://code.wireshark.org/review/35378 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-12-10Win32: Factor out win32_check_save_as_with_comments.Gerald Combs2-100/+0
Stop using win32_check_save_as_with_comments and just use the Qt equivalent on Windows. It started out as a static funtion in file_dlg_win32.c and using the native Windows event loop may have been required for GTK+, but neither of those apply now. Change-Id: I66d7f1c6346df65b0fadb3aa9cba823c0e457703 Reviewed-on: https://code.wireshark.org/review/35382 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-12-08Win32: Fix the Export Packet Dissections dialog title.Gerald Combs1-1/+1
Change-Id: I25c40511b369ce93e1be2887488fc5389fdafd07 Reviewed-on: https://code.wireshark.org/review/35346 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-17Qt: Multiselection in PacketListRoland Knall1-12/+10
This implements multi-selection for the PacketList. It allows multiple lines to be selected, and either drag/drop them to a text editor or use Ctrl/Cmd+C to copy the content to a clipboard. Opening the context menu disables the selection, and it does not change the underlying currently selection. This is done on purpose, as multi-selection is a copy-task only functionality at this point Export & Print work as expected, exporting just the selected items. Same goes for the copy menu, which has the additional entries for copying the list elements Bug: 14612 Change-Id: I77960aa1ab1d172a21abfa469baac0cd57f9f9d9 Reviewed-on: https://code.wireshark.org/review/35073 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-09-21MSVC: Warn about unused formal parametersTomasz Moń1-1/+1
Provide _U_ macro definition for Visual Studio. Change the way _U_ macro is ifdefed for some targets to allow Visual Studio to recognize it. Ping-Bug: 15832 Change-Id: Ic7ce145cbe9e8aa751d64c9c09ce8ba6c1bbbd30 Reviewed-on: https://code.wireshark.org/review/34530 Tested-by: Petri Dish Buildbot Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-27HTTPS In Still More Places, update more URLs.Guy Harris1-1/+1
Microsoft reshuffled their documentation - almost all of it moved from msdn.microsoft.com to docs.microsoft.com. Some blogs moved to devblogs.microsoft.com; the comments *didn't* move, so in one case we go to the Wayback Machine - the link isn't dead, but it formats horribly, at least on my browser, but the archived version formats OK. Use the Wayback Machine for some URLs, and update others. Update the sections for MS-ADTS. Point to the HTML versions of some RFCs and I-Ds. Change-Id: I344b20f880de63f1ae2a4e3f9ff98af78a7fe139 Reviewed-on: https://code.wireshark.org/review/34101 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27HTTPS In More Places, update some URLs.Guy Harris1-4/+4
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-03-14Windows: Console log handler fixups.Gerald Combs2-77/+60
Make sure that we always print log messages on Windows. External programs or scripts (including our test suite) might need to see log messages independent of our console settings. Make sure that we always use our log handler and that its stdout / stderr routing matches GLib's. Flush our log output, which is something that GLib's default handler sometimes doesn't do: https://bugzilla.gnome.org/show_bug.cgi?id=792432 Bug: 15605 Change-Id: I4b17f2cb9269b2c87c21835d82770dae93bbfa20 Reviewed-on: https://code.wireshark.org/review/32412 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-31Update the comment again.Guy Harris1-6/+12
The third URL works, but let's go https: for it. The other two don't. Line-wrap another part of the comment while we're at it. Change-Id: I744770c859b317ace2a71e82f86e2419b6d7ef2b Reviewed-on: https://code.wireshark.org/review/31276 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-31Update a comment.Guy Harris1-3/+5
(Thanks for killing off a bunch of comment mechanisms, not saving the old comments and placing them somewhere useful, and not even allowing the Wayback Machine to archive at least some of those sites, Microsoft.) Change-Id: Ie4258250a0176a56ee33be77604acf43c6886e0f Reviewed-on: https://code.wireshark.org/review/31274 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27Try to squeeze some bytes out of the frame_data structure.Guy Harris1-3/+3
Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-16Use an enum for compression types in various interfaces.Guy Harris2-10/+11
This: 1) means that we don't have to flag the compression argument with a comment to indicate what it means (FALSE doesn't obviously say "not compressed", WTAP_UNCOMPRESSED does); 2) leaves space in the interfaces in question for additional compression types. (No, this is not part 1 of an implementation of additional compression types, it's just an API cleanup. Implementing additional compression types involves significant work in libwiretap, as well as UI changes to replace "compress the file" checkboxes with something to indicate *how* to compress the file, or to always use some other form of compression). Change-Id: I1d23dc720be10158e6b34f97baa247ba8a537abf Reviewed-on: https://code.wireshark.org/review/30660 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-10UI: Remove Win32 file dialog stuff specific to GTKPeter Wu2-376/+0
Remove "Export SSL Session Keys", "Import/Export Color Filters" and "Export Raw Bytes" dialogs. These were only used by GTK+ as Qt has its own implementation. Change-Id: I0520a0f6e35d0f8a55c58e77f89c5229393c2b23 Reviewed-on: https://code.wireshark.org/review/30559 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-27packet export: Add default file extensionGraham Bloice1-1/+13
Adds a default file extension when exporting packet dissection in various formats: text -> txt postscript -> ps csv -> csv pdml -> pdml psml -> psml c arrays -> c json -> json Change-Id: Ie5d942a3c694abd8edf9df184f6e219d4b870a1b Reviewed-on: https://code.wireshark.org/review/28490 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-26Remove code specific to older versions of Visual Studio.Gerald Combs1-36/+12
Remove -DBUILD_WINDOWS and sections of code that we no longer use. Bug: 14715 Change-Id: Iae1a950e2f52f4ce45fcf0ae5dea06c1172c3a28 Reviewed-on: https://code.wireshark.org/review/28466 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-08Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp.Gerald Combs1-2/+2
The Qt UI's main module started out as ui/qt/main.cpp but was moved to the top-level directory in order to appease Autotools. We don't need to do that any more, so move it back. Change-Id: Ic5bc0ed5b754e36cc2b9e682f2ca097781233dfd Reviewed-on: https://code.wireshark.org/review/28090 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17Win32: Add a missing check.Gerald Combs1-0/+1
...otherwise we'll crash on older versions of Windows. Change-Id: If9c1b653496930fbfad4e9e663a8340990f3f295 Reviewed-on: https://code.wireshark.org/review/27626 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-09Windows: Make sure native dialogs handle HiDPI.Gerald Combs2-80/+120
Enable per-monitor v2 DPI awareness before displaying native file dialogs so that they will render correctly on HiDPI displays. Add some notes about DPI awareness in our manifest and in wireshark-qt.cpp. Remove win32_get_ofnsize while we're here. Change-Id: Ic553fdeea0c05020c3a7ff06f648692cb814b3eb Reviewed-on: https://code.wireshark.org/review/27435 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17Remove some GTK+-only code.Gerald Combs1-5/+0
Change-Id: Ic2498c7acd6a1a522be45094148402ee34a6b4d1 Reviewed-on: https://code.wireshark.org/review/26958 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15Gtk: Remove source codeRoland Knall2-291/+0
Removing all gtk source code, except for main.? which will remain for the official removal during SFUS18 Change-Id: I4273baf207df1eaaa4b94623cfd10bf74b1fc4a4 Reviewed-on: https://code.wireshark.org/review/26937 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-28Fix StringCchPrintf() calls.Guy Harris1-3/+4
One was missing an argument; supply the necessary string. The other was assuming that an LPARAM was 32 bits when that's not the case on 64-bit Windows - the underlying value is 32-bit, so we just cast to int. Change-Id: Ie2a38e27f2ea211628d2c751a7807bb9ed396c64 Reviewed-on: https://code.wireshark.org/review/26190 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-10Separately count all records and data records.Guy Harris1-18/+31
A file might contain only metadata records, which exist only to provide information needed to interpret data records; no point in showing them in record counts. Put the counts into the structure that we fill in, and rename the structure and the routine to reflect that it determines statistics other than just times. Speak of data records rather than packets; the file might be full of Sysdig event records but not have any packets in it, for example. Change-Id: I8553181dca4129736bdae2c0cbba92becc28d6ef Reviewed-on: https://code.wireshark.org/review/25722 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Move the merge_action_e enum to the Win32 file dialog source file.Guy Harris1-0/+6
It's only used with the Windows dialog, so no need to make it public. Change-Id: I4976748d642399b57abc89bccc26f680e3938509 Reviewed-on: https://code.wireshark.org/review/25719 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Put the preview-generation loop into a common routine.Guy Harris1-60/+42
Don't have all the file open dialogs have their own copies. Change-Id: Icd6f2fd44b081575e6481a134027c90046938c64 Reviewed-on: https://code.wireshark.org/review/25717 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Do changes from Generalize wtap_pkthdr into a structure for packet andAndersBroman1-3/+3
non-packet records for file_dlg_win32.c Change-Id: I34ce10e574036b2d857675008c7109d5e38be6e7 Reviewed-on: https://code.wireshark.org/review/25710 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo6-6/+6
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>
2018-02-07Squelch an rc warning.Gerald Combs1-0/+2
Don't include glib if RC_INVOKED is defined so that the Microsoft Windows Resource Compiler doesn't generate the following complaint: \path\to\glib/gatomic.h(87): warning RC4011: identifier truncated to '__GCC_HAVE_SYNC_COMPARE_AND_SWA' Change-Id: I6637aee2842de4e7041b66ff4428f617478efcb4 Reviewed-on: https://code.wireshark.org/review/25670 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-09Use pcapng as the name of the file format.Guy Harris1-2/+2
At one point, I remember a discussion resulting in the official name of the next-generation replacement for pcap format being changed to "pcapng", with no hyphen. Make Wireshark reflect that. Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a Reviewed-on: https://code.wireshark.org/review/25214 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08Try to fix win32 build, add ui/packet_range.h include.Jakub Zawadzki1-0/+1
add ui/packet_range.h include to try to fix win32 build, compilation log: export_sslkeys.c 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2143: syntax error: missing ')' before '*' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2081: 'packet_range_t': name in formal parameter list illegal (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2143: syntax error: missing '{' before '*' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2059: syntax error: ')' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] Change-Id: I58c77fdcbe3fe2e738601c4ef97596c7774704ec Reviewed-on: https://code.wireshark.org/review/24743 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-08Have the frame_tvbuff.c routines not use the global cfile.Guy Harris1-1/+1
Have the routines that create them take a pointer to a struct packet_provider_data, store that in the tvbuff data, and use it to get the wtap from which packets are being read. While we're at it, don't include globals.h in any header files, and include it in source files iff the source file actually uses cfile. Add whatever includes that requires. Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229 Reviewed-on: https://code.wireshark.org/review/24733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04Put the structure of a capture_file back in cfile.h.Guy Harris1-1/+0
The split isn't necessary now that epan no longer uses the capture_file structure. Change-Id: Ia232712a2fb5db511865805518e8d03509b2167f Reviewed-on: https://code.wireshark.org/review/24693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03This also looks inside a capture_file structure.Guy Harris1-0/+1
Change-Id: I6c4de5212028643fa34c5d939608b592f554f2bd Reviewed-on: https://code.wireshark.org/review/24689 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-29Normalize ui/win32 indentation and switch to SPDX.Gerald Combs8-226/+144
Switch ui/win32/console_win32.[ch] to 4-space indentation to match the other files in that directory. Remove ui/.editorconfig. SPDX-abbreviate the license blurb in all files in that directory. Change-Id: I68aa5a3ae7ae184ea8d27d9dba06b968ac3d2472 Reviewed-on: https://code.wireshark.org/review/24636 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-15Remove superfluous null-checks before strdup/freeAhmad Fatoum1-7/+4
NULL checks were removed for following free functions: - g_free "If mem is NULL it simply returns" https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-free - g_slist_free(_full)? "NULL is considered to be the empty list" https://developer.gnome.org/glib/stable/glib-Singly-Linked-Lists.html - g_strfreev "If str_array is NULL, this function simply returns." https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strfreev - g_slice_free "If mem is NULL, this macro does nothing." https://developer.gnome.org/glib/stable/glib-Memory-Slices.html#g-slice-free - g_match_info_free "not NULL... otherwise does nothing" https://developer.gnome.org/glib/stable/glib-Perl-compatible-regular-expressions.html#g-match-info-free - dfilter_free defined in Wireshark code. Returns early when passed NULL epan/dfilter/dfilter.c They were also removed around calls to g_strdup where applicable: - g_strdup "If str is NULL it returns NULL." https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strdup Change-Id: Ie80c2db89bef531edc3aed7b7c9f654e1d654d04 Reviewed-on: https://code.wireshark.org/review/23406 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15Rename ui_util.h -> ws_ui_util.hPeter Wu1-1/+1
In preparation for possibly using AUTOUIC in CMake which treats "ui_*.h" files specially, rename ui_util.h. No other changes. Change-Id: Id026572c000b713ff0e9388dc7fff8d81d4df73e Reviewed-on: https://code.wireshark.org/review/23916 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27print_stream: free memory on exit.Dario Lombardo1-0/+1
Change-Id: I6c4acaa9026cfdf1d4230c28c30bccfb6c025cef Reviewed-on: https://code.wireshark.org/review/19920 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-10Have "All Capture Files" match only capture files.Guy Harris1-5/+4
We support reading some types of files that aren't capture files, in case we have a dissector for that file format (because, for example, it's often transported over HTTP). Don't include them in the set of files "All Capture Files" matches; you can still look for them as they have individual entries in the drop-down menu of file type patterns. Ultimately, there should be Fileshark/TFileshark programs to read those files - and other file types, and even capture files if the goal is to look at the file structure rather than at the packets - and *that's* the program that should offer the ability to load JPEGs and so on. (No, this does not reduce the "All Capture Files" list down to a level that makes the problem in bug 12837 go away. The right way to fix *that* is to arrange, somehow, that the "All Capture Files" entry not actually list all the suffixes it matches.) Change-Id: I705bff5fcd0694c6c6a11892621a195aa7cd0264 Reviewed-on: https://code.wireshark.org/review/17619 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-09Remove name resolution from the file dialogs.Gerald Combs2-61/+36
A single name resolution checkbox was added to the file dialog way back in 2000 in g0f7cf64. At that time it was needed because resolution was synchronous and could drastically affect your load time. Since then we've added asynchronous name resolution and more recently made it mandatory (ge005bc8). We've also added more name resolution checkboxes and other controls. Remove the name resolution checkboxes. You can just as easily change resolution options before or after opening a file and they take up valuable real estate. Combine the size and packets in the Qt and Win32 dialogs and pretty-print the size. Combine the start and elapsed times in the Qt, Win32, and GTK+ dialogs. This lets us shrink the custom areas of the file dialogs even further. Make the default file type combo item more descriptive. Change-Id: Id770adc0f284a4c7f08ee5a7db84f8435f4bf907 Reviewed-on: https://code.wireshark.org/review/17597 Tested-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-23Suggest using a task dialog, so we can label the buttons.Guy Harris1-18/+16
Change-Id: I2827ab8b5d4a9c17e6c178d9397fcf897a356c9f Reviewed-on: https://code.wireshark.org/review/16603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-17Fix printf style parameters complaints from VS Code AnalysisMichael Mann1-1/+1
Change-Id: I5669e2442582f899643fae4a9f86ab6d505dde07 Reviewed-on: https://code.wireshark.org/review/16505 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-20Add JSON export to Qt/GTK UIPascal Quantin1-1/+5
Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a Reviewed-on: https://code.wireshark.org/review/16013 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15Remove Nmake build systemPascal Quantin1-40/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-04-28Win32: Pass a mutable string to CreateProcess.Gerald Combs1-3/+3
CreateProcess can modify its second (lpCommandLine) argument. Don't pass it the output of utf_8to16. Constify the return value of utf_8to16. Change-Id: I0d4361396e90c88a4ab2a3f2f0e058230e897fdf Reviewed-on: https://code.wireshark.org/review/15155 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-08Add EditorConfig settings for most C filesJoão Valverde1-0/+8
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-01Don't show a progress bar when previewing for the Qt print dialog.Guy Harris1-2/+2
We don't do much work to do that - we don't print anything before the first selected page, and once we're finished generating that page, we terminate the printing process - so it shouldn't need a progress bar. (If it needs a progress bar, We Have A Problem, as that slows down the drawing of the dialog box.) This should prevent the problem seen in bug 12040. Bug: 12040 Change-Id: I129191e06fff3e1eb59a9631c7395b9e7f650809 Reviewed-on: https://code.wireshark.org/review/14255 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01Add a #define for the wildcard pattern that matches all files.Guy Harris1-13/+12
It's *.* on Windows, but just * on UN*X; add a header that provides the definition, and use it instead of hardwiring *.*. Call the entry "All Files", that being the conventional name, rather than "Any File", whilst we're at it. Change-Id: I7c29324fc5b41e93c150e1ec67f1529f171dc6a3 Reviewed-on: https://code.wireshark.org/review/14243 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+1
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01No need for toolkit-dependent color initialization.Guy Harris1-1/+1
We're not allocating colors ourselves in GTK+ (and haven't been doing so since at least 1.12), and all color_t values are valid colors, so we don't need any toolkit-specific processing to fill in a color_t. While we're at it, catch read errors when reading color filter files. Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b Reviewed-on: https://code.wireshark.org/review/12985 Reviewed-by: Guy Harris <guy@alum.mit.edu>