osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Windows: uncheck WinPcap API-compatible mode in Npcap installer 

Uninstalling WinPcap through recent Npcap installers seem to fail
for some users. For now install Npcap native mode instead.

Bug: 15476
Change-Id: I9114eb824fb1bd99d5da82e8bff87f7b7eb49a74
Reviewed-on: https://code.wireshark.org/review/31870
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-02-03 18:41:46 +01:00
parent 78827c8752
commit 7753ce58ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/nsis/wireshark.nsi
View File

@ -895,7 +895,7 @@ ReadINIStr $0 "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State"
StrCmp $0 "0" SecRequired_skip_Npcap
SetOutPath $INSTDIR
File "${WIRESHARK_LIB_DIR}\npcap-${NPCAP_PACKAGE_VERSION}.exe"
ExecWait '"$INSTDIR\npcap-${NPCAP_PACKAGE_VERSION}.exe"' $0
ExecWait '"$INSTDIR\npcap-${NPCAP_PACKAGE_VERSION}.exe" /winpcap_mode=no' $0
DetailPrint "Npcap installer returned $0"
SecRequired_skip_Npcap:
@ -1305,7 +1305,7 @@ lbl_npcap_installed:
lbl_winpcap_installed:
WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 2" "Text" "$WINPCAP_NAME"
WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State" "1"
WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 5" "Text" "The currently installed $WINPCAP_NAME will be uninstalled first."
WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 5" "Text" "The currently installed $WINPCAP_NAME may be uninstalled first."
Goto lbl_npcap_done
lbl_npcap_do_install: