[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5cf5e2640119eef54638dd146d5144b6fd9596f0
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

5cf5e26 by Christian Tellefsen (chris-git@xxxxxxxxxxxxx):

    Add %ProgramW6432% to the list of search paths when looking for 7-Zip.
    
    This allows a 64bit 7-Zip installation to be located even though
    win-setup.ps1 is run by a 32-bit process.
    
    This applies to 64bit Windows (7, 10, Server 2008 R2, Server 2012).
    Tested on 2012.
    
    Ref:
    https://msdn.microsoft.com/en-us/library/windows/desktop/aa384274%28v=vs.85%29.aspx
    
    Change-Id: I6f4f3226b25c890cd674bf4c4d9ea73ddfc8ece0
    Reviewed-on: https://code.wireshark.org/review/12740
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit aa002845d931e0a17a35c93385054bddc8524b18)
    Reviewed-on: https://code.wireshark.org/review/12742
    

Actions performed:

    from  b9493b0   Add missing ERF types, mention another missing type, mention reserved space.
    adds  5cf5e26   Add %ProgramW6432% to the list of search paths when looking for 7-Zip.


Summary of changes:
 tools/win-setup.ps1 |    1 +
 1 file changed, 1 insertion(+)