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>

docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc

@@ -519,15 +519,11 @@ Note: You should have successfully built Wireshark
 before doing the following.
 
 If you want to build your own
-_Wireshark-win64-{wireshark-version}-myprotocol123.exe_,
-you'll need NSIS.
+_Wireshark-win32-{wireshark-version}-myprotocol123.exe_, you'll need
+NSIS. You can download it from http://nsis.sourceforge.net[].
 
-. NSIS:
-http://nsis.sourceforge.net[Download] and install NSIS
-+
 Note that the 32-bit version of NSIS will work for both 32-bit and
-64-bit versions of Wireshark. NSIS v3 is recommended and may be required
-in the future.
+64-bit versions of Wireshark. NSIS v3 is required.
 
 Note: If you do not yet have a copy of vcredist_x86.exe or vcredist_x64.exe in _./wireshark-win**XX**-libs_ (where *_XX_* is 32 or 64) you will need to download the appropriate file and place it in _./wireshark-win**XX**-libs_ before starting this step.
 

docbook/wsdg_src/WSDG_chapter_tools.asciidoc

@@ -1214,8 +1214,8 @@ needed to be installed, including all required DLLs, plugins, and supporting
 files.
 
 To install it, download the latest released version from
-http://nsis.sourceforge.net[]. NSIS v3 is recommended and may be
-required in the future. You can also install it using Chocolatey:
+http://nsis.sourceforge.net[]. NSIS v3 is required. You can also install
+it using Chocolatey:
 
 [source,cmd]
 ----

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/

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

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"

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