Commit graph

409 commits

Author SHA1 Message Date
Jeff Morriss
d8310ff499 Assume we HAVE_GZCLEARERR on Windows and when using cmake
svn path=/trunk/; revision=34192
2010-09-23 05:50:10 +00:00
Gerald Combs
a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().
svn path=/trunk/; revision=34137
2010-09-16 19:20:06 +00:00
Bill Meier
03b7c7b8fa I suspect the changes to config.nmake committed in SVN #33942 were not intended.
Revert the changes (for now ?) so the Buildbot will run again.

svn path=/trunk/; revision=33945
2010-08-26 23:40:27 +00:00
Anders Broman
d4e0b348cf Doxygen fixes.
svn path=/trunk/; revision=33942
2010-08-26 20:31:09 +00:00
Gerald Combs
607b228df6 Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
2010-08-25 20:30:59 +00:00
Jeff Morriss
43af5f6344 Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 on Win64 too (for consistency more than anything I think).
svn path=/trunk/; revision=33923
2010-08-25 18:20:56 +00:00
Jeff Morriss
44f8a8824e Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps builds to pick up WinPcap again.
svn path=/trunk/; revision=33921
2010-08-25 15:27:14 +00:00
Jaap Keuter
93497759a3 Remove experimental marker from NEW_PACKET_LIST.
svn path=/trunk/; revision=33719
2010-08-05 19:11:35 +00:00
Gerald Combs
349fac664b 1.3.6 -> 1.5.0
svn path=/trunk/; revision=33138
2010-06-07 16:43:09 +00:00
Gerald Combs
fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Gerald Combs
55c48a28ed Our default target platform is still win32.
svn path=/trunk/; revision=32698
2010-05-06 23:58:18 +00:00
Anders Broman
f9981411f1 Checking in Stigs changes from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475
BUT not activating the check for 
pcap_create()
pcap_set_buffer_size()
This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic.

The code for handling the 'B' option should be OK in any case.

svn path=/trunk/; revision=32688
2010-05-06 18:34:30 +00:00
Gerald Combs
e535271512 1.3.5 -> 1.3.6.
svn path=/trunk/; revision=32667
2010-05-05 00:28:24 +00:00
Bill Meier
0303dfbf9f Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
2010-04-22 19:35:47 +00:00
Anders Broman
f739b285c9 Add settings for "Microsoft Visual Studio 2010" note that
Wireshark does not build with Visual studio 10 yet.

svn path=/trunk/; revision=32529
2010-04-21 05:23:29 +00:00
Gerald Combs
6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link.
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
2010-04-09 21:42:51 +00:00
Bill Meier
a5b180a3a8 Add coment about why 'links' fails if it is used to generate release-notes.txt
svn path=/trunk/; revision=32387
2010-04-05 19:42:07 +00:00
Gerald Combs
ab71d9d92b 1.3.4 -> 1.3.5.
svn path=/trunk/; revision=32345
2010-03-31 22:54:07 +00:00
Gerald Combs
12e2df52e1 Update c-ares to 1.7.1.
svn path=/trunk/; revision=32293
2010-03-26 18:36:27 +00:00
Guy Harris
1e0bcd0740 Define HAVE_PCAP_LIST_DATALINKS, HAVE_PCAP_FREE_DATALINKS, and
HAVE_PCAP_SET_DATALINK only if we have the WinPcap development package;
otherwise, don't define them - if you don't have the WinPcap development
package when building on Windows, we don't define HAVE_LIBPCAP, so we
won't include any of the code controlled by those ifdefs in any case,
and, if you do have the WinPcap development package, you'll need to have
the 4.1 version (you won't need WinPcap 4.1 at run time, but you will
need the 4.1 development package at build time).

svn path=/trunk/; revision=32230
2010-03-17 22:09:19 +00:00
Guy Harris
42a9ea8eaa Use the right #define value to check whether WinPcap has
pcap_free_datalinks().

*Set* that #define, while we're at it.

svn path=/trunk/; revision=32220
2010-03-17 18:04:21 +00:00
Gerald Combs
a5b39ae47a Use the latest GTK+ 2.16 bundle. For the Win32 build this means downgrading
from GTK+ 2.18. According to https://bugzilla.gnome.org/show_bug.cgi?id=598299
we should probably hold off on using 2.18 for a while.

svn path=/trunk/; revision=31992
2010-02-24 21:08:09 +00:00
Guy Harris
2b2879b098 Correct GTK+ package for Win64.
svn path=/trunk/; revision=31890
2010-02-15 23:46:39 +00:00
Anders Broman
72cfbf1e01 Use the latest GTK bundle (2.18.7)
svn path=/trunk/; revision=31882
2010-02-15 20:57:50 +00:00
Gerald Combs
7e9faae9d9 1.3.3 -> 1.3.4.
svn path=/trunk/; revision=31865
2010-02-11 16:38:42 +00:00
Stephen Fisher
490be8cf45 Remove comment stating that GTK 2.12 is being used since Wireshark 0.99.7.
Gerald just changed it from 2.16 to 2.18.


svn path=/trunk/; revision=31603
2010-01-21 16:53:41 +00:00
Gerald Combs
16c2a0b4b0 Use the correct GTK_INST_VERSION.
svn path=/trunk/; revision=31602
2010-01-21 16:41:20 +00:00
Gerald Combs
f1958a48f9 Drop our requirement for MSVCR71.DLL.
svn path=/trunk/; revision=31578
2010-01-19 22:58:12 +00:00
Gerald Combs
7b42cf5135 Use the official kfw packages.
svn path=/trunk/; revision=31355
2009-12-23 00:22:12 +00:00
Gerald Combs
8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +00:00
Gerald Combs
7046509b99 Use the WinPcap version of pcap_datalink_val_to_description if it's
present.  Add an entry for DLT_PPI in case it's not.

svn path=/trunk/; revision=31316
2009-12-18 20:36:36 +00:00
Gerald Combs
a9e185a062 Disable PCRE in the Win32 build. GRegex uses a newer version than we do
and this matches the Win64 configuration.

svn path=/trunk/; revision=31304
2009-12-18 01:29:56 +00:00
Gerald Combs
7524c0b963 Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer
build.

svn path=/trunk/; revision=31301
2009-12-17 22:01:13 +00:00
Anders Broman
e1b992ef3b Use gtk+-bundle_2.18.5-20091215_win32
svn path=/trunk/; revision=31288
2009-12-17 06:36:37 +00:00
Anders Broman
65a85f0fba Use gtk+-bundle_2.16.6-20091215_win32
svn path=/trunk/; revision=31285
2009-12-16 20:54:40 +00:00
Gerald Combs
e5be652056 Fix compilation under Windows. Allocate our hash buffer dynamically so
that _chkstk doesn't throw a hissy fit. When hashing, open the file in
binary mode.

svn path=/trunk/; revision=31192
2009-12-08 00:13:57 +00:00
Gerald Combs
f08e18e9a5 Switch back to normal versioning. Bump the version to 1.3.3.
svn path=/trunk/; revision=31064
2009-11-24 05:57:05 +00:00
Gerald Combs
907bf4e36b Switch from individual GLib, GTK+, and related packages to the all-in-one
versions.

svn path=/trunk/; revision=31023
2009-11-19 20:27:08 +00:00
Gerald Combs
23df4e7f01 Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build.
svn path=/trunk/; revision=30945
2009-11-12 23:48:11 +00:00
Tomas Kukosa
7f38b7b889 Update to the GnuTLS 2.8.5
svn path=/trunk/; revision=30930
2009-11-11 09:58:29 +00:00
Gerald Combs
cc036df5ea Updates for FOP 0.95.
svn path=/trunk/; revision=30913
2009-11-10 01:32:59 +00:00
Gerald Combs
0ead6b73ff Switch the default Fop version to 0.95 and adjust custom_layer_pdf.xsl
accordinglty. Tweak the print resolution on all of the images again. Add
a MIME type for one of the images.

svn path=/trunk/; revision=30909
2009-11-09 18:41:21 +00:00
Anders Broman
a9c313a864 Bump development version.
svn path=/trunk/; revision=30750
2009-10-29 06:15:52 +00:00
Anders Broman
c5ce562d60 Use pango 1.26
svn path=/trunk/; revision=30687
2009-10-25 09:59:40 +00:00
Gerald Combs
0bbe1cb546 Make the new packet list the default on Win64.
svn path=/trunk/; revision=30668
2009-10-23 00:16:34 +00:00
Gerald Combs
839977fd7d Fix the WpdPack version on Win64.
svn path=/trunk/; revision=30665
2009-10-22 17:00:26 +00:00
Anders Broman
89e9745ed5 Use 2.22.2-1
svn path=/trunk/; revision=30653
2009-10-21 06:01:36 +00:00
Gerald Combs
09a0650607 Update WinPcap and the developer's pack to 4.1.1.
svn path=/trunk/; revision=30652
2009-10-21 03:13:42 +00:00
Kovarththanan Rajaratnam
0c75135ffd Cleanup comments wrt. /MP
svn path=/trunk/; revision=30337
2009-10-05 17:43:27 +00:00
Ulf Lamping
ab99aaf732 be more verbose how to get VCREDIST_EXE
svn path=/trunk/; revision=30247
2009-10-02 09:26:52 +00:00