diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-08-22 20:08:31 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-25 07:26:12 +0000 |
| commit | d5049eaba76055ffc1104536cec59e2163c8d003 (patch) | |
| tree | 2a563eba4116a490ed5d14357afe9c2c2a0b4a0d /packaging/nsis/uninstall.nsi | |
| parent | e710f248bc4782a3b906a32c86719e6198129f70 (diff) | |
| download | wireshark-d5049eaba76055ffc1104536cec59e2163c8d003.tar.gz | |
win32: add detection of Npcap to Windows installer
If Npcap is installed without WinPcap API-compatible mode, propose to install WinPcap
If Npcap is installed with WinPcap API-compatible mode, do not allow to install Winpcap without manually uninstalling Npcap first
Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31
Reviewed-on: https://code.wireshark.org/review/10197
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Yang Luo <hsluoyz@sohu.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index d65d30c67a..9da64fc2e6 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -296,10 +296,12 @@ Section /o "Un.WinPcap" un.SecWinPcap SectionIn 2 ReadRegStr $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString" ;IfErrors un.lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not installed -;MessageBox MB_OK "WinPcap $1" /SD IDOK -ExecWait '$1' $0 -DetailPrint "WinPcap uninstaller returned $0" -;SetRebootFlag true +${If} $1 != "" + ;MessageBox MB_OK "WinPcap $1" /SD IDOK + ExecWait '$1' $0 + DetailPrint "WinPcap uninstaller returned $0" + ;SetRebootFlag true +${EndIf} ;un.lbl_winpcap_notinstalled: SectionEnd |