aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-03-16 14:19:59 -0700
committerAnders Broman <a.broman58@gmail.com>2018-03-17 05:05:54 +0000
commit535dd5cb6a5abfe36e4515b6cd1c3669ea50cbe0 (patch)
treeaad5a7b8a1906256336876b94a301b355e6e2713 /packaging
parent2d15d7d51bce3599112c339c4272872b621b4561 (diff)
NSIS: Link to Npcap.
Mention Npcap on the WinPcap installer page and add a link to it. Update some other text and tell developers to use NSIS 3.0 while we're here. Change-Id: I64728f014f518439ba4a38eda7a283274d40fcdc Reviewed-on: https://code.wireshark.org/review/26515 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/USBPcapPage.ini10
-rw-r--r--packaging/nsis/WinPcapPage.ini21
-rw-r--r--packaging/nsis/common.nsh4
-rw-r--r--packaging/nsis/wireshark.nsi8
4 files changed, 26 insertions, 17 deletions
diff --git a/packaging/nsis/USBPcapPage.ini b/packaging/nsis/USBPcapPage.ini
index 53cd5ab0e2..64d62df392 100644
--- a/packaging/nsis/USBPcapPage.ini
+++ b/packaging/nsis/USBPcapPage.ini
@@ -67,11 +67,11 @@ Bottom=97
Text=https://github.com/desowin/usbpcap/issues/3
State=https://github.com/desowin/usbpcap/issues/3
-[Field 9]
-Type=Button
+[Field 7]
+Type=Link
Left=0
-Right=100
-Top=120
+Right=290
+Top=127
Bottom=135
-Text=What is USBPcap?
+Text=Learn more about USBPcap
State=http://desowin.org/usbpcap/
diff --git a/packaging/nsis/WinPcapPage.ini b/packaging/nsis/WinPcapPage.ini
index 7ffc2da937..4a27b661e2 100644
--- a/packaging/nsis/WinPcapPage.ini
+++ b/packaging/nsis/WinPcapPage.ini
@@ -1,5 +1,5 @@
[Settings]
-NumFields=9
+NumFields=7
[Field 1]
Type=GroupBox
@@ -7,7 +7,7 @@ Left=0
Right=-1
Top=0
Bottom=25
-Text=Currently installed WinPcap version
+Text=Currently installed Npcap or WinPcap version
[Field 2]
Type=Label
@@ -43,10 +43,19 @@ Bottom=58
Text=This text will be replaced, depending if WinPcap is already installed
[Field 6]
-Type=Button
+Type=Link
Left=0
-Right=100
-Top=120
+Right=290
+Top=112
+Bottom=120
+Text=Get Npcap
+State=https://nmap.org/npcap
+
+[Field 7]
+Type=Link
+Left=0
+Right=290
+Top=127
Bottom=135
-Text=What is WinPcap?
+Text=Learn more about Npcap and WinPcap
State=https://wiki.wireshark.org/WinPcap
diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh
index 1c09eecf96..47424d2407 100644
--- a/packaging/nsis/common.nsh
+++ b/packaging/nsis/common.nsh
@@ -30,8 +30,8 @@ Name "${DISPLAY_NAME}"
VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
-; NSIS handles the copyright symbol correctly using CP-1252 but not UTF-8.
-VIAddVersionKey "LegalCopyright" " Gerald Combs and many others"
+; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol.
+VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others"
VIAddVersionKey "LegalTrademarks" "Wireshark and the 'fin' logo are registered trademarks of the Wireshark Foundation"
VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for ${BITS}-bit Windows"
VIAddVersionKey "Language" "English"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 50bf42afc6..f490e67d63 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -53,7 +53,7 @@ Icon "${TOP_SRC_DIR}\image\wiresharkinst.ico"
;!addplugindir ".\Plugins"
!define MUI_ICON "${TOP_SRC_DIR}\image\wiresharkinst.ico"
-BrandingText "Wireshark Installer (tm)"
+BrandingText "Wireshark${U+00ae} Installer"
!define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_NOAUTOCLOSE
@@ -398,12 +398,12 @@ Function DisplayAdditionalTasksPage
FunctionEnd
Function DisplayWinPcapPage
- !insertmacro MUI_HEADER_TEXT "Install WinPcap?" "WinPcap is required to capture live network data. Should WinPcap be installed?"
+ !insertmacro MUI_HEADER_TEXT "Packet Capture" "Wireshark requires either Npcap or WinPcap to capture live network data."
!insertmacro MUI_INSTALLOPTIONS_DISPLAY "WinPcapPage.ini"
FunctionEnd
Function DisplayUSBPcapPage
- !insertmacro MUI_HEADER_TEXT "Install USBPcap?" "USBPcap is required to capture USB traffic. Should USBPcap be installed (experimental)?"
+ !insertmacro MUI_HEADER_TEXT "USB Capture" "USBPcap is required to capture USB traffic. Should USBPcap be installed (experimental)?"
!insertmacro MUI_INSTALLOPTIONS_DISPLAY "USBPcapPage.ini"
FunctionEnd
@@ -1345,7 +1345,7 @@ Function myShowCallback
; check also if Npcap is installed
ReadRegStr $NPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\NpcapInst" "DisplayName"
IfErrors 0 lbl_npcap_installed
- WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed"
+ WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "Neither of these are installed"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Flags" "DISABLED"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "(Use Add/Remove Programs first to uninstall any undetected old WinPcap versions)"
Goto lbl_winpcap_done