Update USBPcap installer packaged in our Windows installer and add a warning

The newer version creates a system restore point during installation
Also add an explicit note in Wireshark installer explaining that USBPcap is
experimental and some hints on how to recover in case of issue

Bug: 12316
Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0
Reviewed-on: https://code.wireshark.org/review/14854
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: Anders Broman <a.broman58@gmail.com>

4 files changed, 30 insertions, 5 deletions

diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 8ba44ad350..3f1ad9416d 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -76,7 +76,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
 set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION})
 string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}")
 
-set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26")
+set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3")
 
 set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
 # XXX Shouldn't this reflect the API / ABI version?
diff --git a/packaging/nsis/USBPcapPage.ini b/packaging/nsis/USBPcapPage.ini
index 5b40701c64..53cd5ab0e2 100644
--- a/packaging/nsis/USBPcapPage.ini
+++ b/packaging/nsis/USBPcapPage.ini
@@ -43,6 +43,31 @@ Bottom=58
 Text=This text will be replaced, depending if USBPcap is already installed
 
 [Field 6]
+Type=GroupBox
+Left=0
+Right=-1
+Top=70
+Bottom=105
+Text=Important notice
+
+[Field 7]
+Type=Label
+Left=10
+Right=290
+Top=80
+Bottom=88
+Text=In case of issue after installation, please use the system restore point created or read
+
+[Field 8]
+Type=Link
+Left=10
+Right=250
+Top=89
+Bottom=97
+Text=https://github.com/desowin/usbpcap/issues/3
+State=https://github.com/desowin/usbpcap/issues/3
+
+[Field 9]
 Type=Button
 Left=0
 Right=100
diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in
index 0030b1de8d..827aa88f32 100644
--- a/packaging/nsis/config.nsh.in
+++ b/packaging/nsis/config.nsh.in
@@ -13,7 +13,7 @@
 !define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@"
 !define WINPCAP_PACKAGE_VERSION @WINPCAP_PACKAGE_VERSION@
 !define PCAP_DISPLAY_VERSION @PCAP_DISPLAY_VERSION@
-!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26"
+!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3"
 !define VERSION @VERSION@
 !define VERSION_MAJOR @VERSION_MAJOR@
 !define VERSION_MINOR @VERSION_MINOR@
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 1a57f6d0b6..cd001dfe5f 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -327,7 +327,7 @@ Function DisplayWinPcapPage
 FunctionEnd
 
 Function DisplayUSBPcapPage
-  !insertmacro MUI_HEADER_TEXT "Install USBPcap?" "USBPcap is required to capture USB traffic. Should USBPcap be installed?"
+  !insertmacro MUI_HEADER_TEXT "Install USBPcap?" "USBPcap is required to capture USB traffic. Should USBPcap be installed (experimental)?"
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "USBPcapPage.ini"
 FunctionEnd
 
@@ -841,8 +841,8 @@ IfSilent SecRequired_skip_USBPcap
 ReadINIStr $0 "$PLUGINSDIR\USBPcapPage.ini" "Field 4" "State"
 StrCmp $0 "0" SecRequired_skip_USBPcap
 SetOutPath $INSTDIR
-File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}-1.exe"
-ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}-1.exe"' $0
+File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}.exe"
+ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}.exe"' $0
 DetailPrint "USBPcap installer returned $0"
 ${If} $0 == "0"
     ${If} ${RunningX64}