Wireshark-commits: [Wireshark-commits] rev 33940: /trunk-1.0/ /trunk-1.0/doc/: README.capture /trun
From: gerald@xxxxxxxxxxxxx
Date: Thu, 26 Aug 2010 20:10:31 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=33940 User: gerald Date: 2010/08/26 01:10 PM Log: Copy over revisions by hand: ------------------------------------------------------------------------ r33916 | gerald | 2010-08-24 16:39:29 -0700 (Tue, 24 Aug 2010) | 5 lines Changed paths: M /trunk/dumpcap.c M /trunk/gtk/main.c Partial fix for bug 5133. On Windows, call SetDllDirectory at startup if it's present in Wireshark and dumpcap. This takes care of the airpcap.dll PoC but we need to load wpcap.dll from a full path. We might want to call SetDllDirectory from our other executables as well. ------------------------------------------------------------------------ r33917 | gerald | 2010-08-24 17:20:50 -0700 (Tue, 24 Aug 2010) | 2 lines Changed paths: M /trunk/dumpcap.c Fix !Windows compilation. ------------------------------------------------------------------------ r33924 | gerald | 2010-08-25 13:30:59 -0700 (Wed, 25 Aug 2010) | 6 lines Changed paths: M /trunk/airpcap_loader.c M /trunk/capture-wpcap.c M /trunk/capture_wpcap_packet.c M /trunk/config.nmake M /trunk/doc/README.capture M /trunk/epan/filesystem.c M /trunk/epan/wspython/wspy_libws.py M /trunk/gtk/main.c M /trunk/nio-ie5.c M /trunk/wsutil/file_util.c M /trunk/wsutil/file_util.h M /trunk/wsutil/libwsutil.def 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. ------------------------------------------------------------------------ r33925 | gerald | 2010-08-25 15:41:26 -0700 (Wed, 25 Aug 2010) | 2 lines Changed paths: M /trunk/wsutil/file_util.h Move Windows-specific material inside an appropriate #ifdef. ------------------------------------------------------------------------ Directory: /trunk-1.0/doc/ Changes Path Action +1 -1 README.capture Modified Directory: /trunk-1.0/epan/ Changes Path Action +1 -1 filesystem.c Modified +3 -0 unicode-utils.h Modified +2 -1 xmlstub.c Modified Directory: /trunk-1.0/gtk/ Changes Path Action +15 -3 main.c Modified Directory: /trunk-1.0/ Changes Path Action +2 -1 airpcap_loader.c Modified +4 -2 capture-wpcap.c Modified +2 -1 capture_wpcap_packet.c Modified +9 -0 dumpcap.c Modified +1 -1 nio-ie5.c Modified (3 files not shown)
- Prev by Date: [Wireshark-commits] rev 33939: /trunk/ /trunk/: doxygen_global.cfg
- Next by Date: [Wireshark-commits] rev 33941: /trunk/ /trunk/: print.c
- Previous by thread: [Wireshark-commits] rev 33939: /trunk/ /trunk/: doxygen_global.cfg
- Next by thread: [Wireshark-commits] rev 33941: /trunk/ /trunk/: print.c
- Index(es):