Wireshark-commits: [Wireshark-commits] rev 33935: /trunk-1.2/ /trunk-1.2/doc/: README.capture /trun

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: gerald@xxxxxxxxxxxxx
Date: Thu, 26 Aug 2010 17:35:31 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=33935

User: gerald
Date: 2010/08/26 10:35 AM

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.2/doc/
  Changes    Path              Action
  +1 -1      README.capture    Modified

Directory: /trunk-1.2/epan/
  Changes    Path            Action
  +1 -1      filesystem.c    Modified

Directory: /trunk-1.2/gtk/
  Changes    Path          Action
  +15 -3     main.c        Modified

Directory: /trunk-1.2/
  Changes    Path                      Action
  +2 -1      airpcap_loader.c          Modified
  +4 -2      capture-wpcap.c           Modified
  +2 -1      capture_wpcap_packet.c    Modified
  +11 -2     dumpcap.c                 Modified
  +1 -1      nio-ie5.c                 Modified

Directory: /trunk-1.2/wsutil/
  Changes    Path               Action
  +113 -3    file_util.c        Modified
  +21 -1     file_util.h        Modified
  +2 -0      libwsutil.def      Modified


(1 file not shown)