diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2019-11-06 12:17:30 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2019-11-06 16:37:57 +0000 |
| commit | 99effcada27b9cf5f76d7c4058bbb951d9d2886c (patch) | |
| tree | b670226a40700807034cb0e4d1be68d279640ed0 /packaging | |
| parent | dd9af8018d1e14b5bdf2fb6a824511ec0ae18738 (diff) | |
Windows: upgrade Npcap to 0.9984
While we are at it, let's deactivate by default the legacy loopback adapter installation
Change-Id: I4950e9dc6de8a2faeda272c03165a9f305862f6b
Reviewed-on: https://code.wireshark.org/review/35004
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index d870321a4c..db70d0f7fa 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -46,7 +46,7 @@ endif() set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND}) # Must match ${EXTRA_INSTALLER_DIR}/Npcap-X.Y.Z.exe -set(NPCAP_PACKAGE_VERSION "0.9983") +set(NPCAP_PACKAGE_VERSION "0.9984") set(USBPCAP_PACKAGE_VERSION "1.5.3.0") diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 1c92387735..7bab79df9c 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -893,7 +893,7 @@ ReadINIStr $0 "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State" StrCmp $0 "0" SecRequired_skip_Npcap SetOutPath $INSTDIR File "${EXTRA_INSTALLER_DIR}\npcap-${NPCAP_PACKAGE_VERSION}.exe" -ExecWait '"$INSTDIR\npcap-${NPCAP_PACKAGE_VERSION}.exe" /winpcap_mode=no' $0 +ExecWait '"$INSTDIR\npcap-${NPCAP_PACKAGE_VERSION}.exe" /winpcap_mode=no /loopback_support=no' $0 DetailPrint "Npcap installer returned $0" SecRequired_skip_Npcap: @@ -1269,7 +1269,7 @@ FunctionEnd Var NPCAP_NAME ; DisplayName from Npcap installation Var WINPCAP_NAME ; DisplayName from WinPcap installation -Var REG_NPCAP_DISPLAY_VERSION ; DisplayVersion from WinPcap installation +Var NPCAP_DISPLAY_VERSION ; DisplayVersion from Npcap installation Var USBPCAP_NAME ; DisplayName from USBPcap installation Function myShowCallback @@ -1288,14 +1288,16 @@ Function myShowCallback Goto lbl_npcap_done lbl_npcap_installed: - ReadRegDWORD $0 HKEY_LOCAL_MACHINE "SOFTWARE\Npcap" "WinPcapCompatible" + ReadRegStr $NPCAP_DISPLAY_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\NpcapInst" "DisplayVersion" WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 1" "Text" "Currently installed Npcap version" + StrCmp $NPCAP_NAME "Npcap" 0 +3 + WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 2" "Text" "Npcap $NPCAP_DISPLAY_VERSION" + Goto +2 WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 2" "Text" "$NPCAP_NAME" ; Compare the installed build against the one we have. - ReadRegStr $REG_NPCAP_DISPLAY_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\NpcapInst" "DisplayVersion" - StrCmp $REG_NPCAP_DISPLAY_VERSION "" lbl_npcap_do_install ; Npcap wasn't installed improperly? - ${VersionConvert} $REG_NPCAP_DISPLAY_VERSION "" $R0 ; 0.99-r7 -> 0.99.114.7 + StrCmp $NPCAP_DISPLAY_VERSION "" lbl_npcap_do_install ; Npcap wasn't installed improperly? + ${VersionConvert} $NPCAP_DISPLAY_VERSION "" $R0 ; 0.99-r7 -> 0.99.114.7 ${VersionConvert} "${NPCAP_PACKAGE_VERSION}" "" $R1 ${VersionCompare} $R0 $R1 $1 StrCmp $1 "2" lbl_npcap_do_install @@ -1315,6 +1317,9 @@ lbl_winpcap_installed: lbl_npcap_do_install: ; seems to be an old version, install newer one WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State" "1" + StrCmp $NPCAP_NAME "Npcap" 0 +3 + WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 5" "Text" "The currently installed Npcap $NPCAP_DISPLAY_VERSION will be uninstalled first." + Goto +2 WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 5" "Text" "The currently installed $NPCAP_NAME will be uninstalled first." lbl_npcap_done: |