Wireshark-commits: [Wireshark-commits] master 40ce324: Set the extcap working directory on Windows.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 15 Apr 2015 20:26:18 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=40ce324f4d0beda62a957f5f6c47dcc9ac5c5c18
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

40ce324 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Set the extcap working directory on Windows.
    
    On Windows, prepend the main program directory to %Path% when spawning
    extcap processes. This lets us place androiddump in extcap while allowing
    it to locate its DLLs.
    
    Change-Id: I406c47ce71323266d5f14fb596931398464e452d
    Reviewed-on: https://code.wireshark.org/review/8057
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  05c0152   Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length.
    adds  40ce324   Set the extcap working directory on Windows.


Summary of changes:
 CMakeLists.txt                        |   29 ++++++++++++++++++++---------
 Makefile.nmake                        |   14 +++-----------
 extcap.c                              |   24 +++++++++++++++++++++++-
 packaging/nsis/uninstall.nsi          |    1 -
 packaging/nsis/wireshark.nsi          |    4 ++--
 packaging/portableapps/Makefile.nmake |    1 -
 ui/qt/Wireshark.pro                   |   13 -------------
 7 files changed, 48 insertions(+), 38 deletions(-)