diff options
-rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 17 | ||||
-rw-r--r-- | tools/win-setup.ps1 | 8 |
3 files changed, 16 insertions, 11 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: diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index a44c12808d..599b5ecdaa 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -69,8 +69,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2019-09-05" -$Win32CurrentTag = "2019-09-05" +$Win64CurrentTag = "2019-11-06" +$Win32CurrentTag = "2019-11-06" # Archive file / SHA256 $Win64Archives = @{ @@ -129,12 +129,12 @@ $ArchivesSubDirectory = @{ # Plain file downloads $Win32Files = @{ - "npcap-0.9983.exe" = "8f9df254d9f93866ea89ec48f58a6698777d39d6506c780eeb1c30795b898c07"; + "npcap-0.9984.exe" = "1fbd6fae7f561f847854ab74ab5229fbf1d11db93f8b79d72f117e90f7d3fe7f"; "USBPcapSetup-1.5.3.0.exe" = "1ef63c1f8ebd0d8b9a660cd875c03d42771b81bff5879673beb80ab2a1c3aa8d"; } $Win64Files = @{ - "npcap-0.9983.exe" = "8f9df254d9f93866ea89ec48f58a6698777d39d6506c780eeb1c30795b898c07"; + "npcap-0.9984.exe" = "1fbd6fae7f561f847854ab74ab5229fbf1d11db93f8b79d72f117e90f7d3fe7f"; "USBPcapSetup-1.5.3.0.exe" = "1ef63c1f8ebd0d8b9a660cd875c03d42771b81bff5879673beb80ab2a1c3aa8d"; } |