From 2236009e218d5e507654f7512297eaa20df7c72d Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 13 Oct 2021 10:32:26 -0700
Subject: [PATCH] Packaging: Add captype to the Windows installers.

Add captype and its documentation to the NSIS and WiX packages.
---
 packaging/nsis/uninstall.nsi      |  1 +
 packaging/nsis/wireshark.nsi      |  8 ++++++++
 packaging/wix/ComponentGroups.wxi | 18 ++++++++++++++++++
 packaging/wix/Features.wxi        |  3 +++
 4 files changed, 30 insertions(+)

diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index 7b9d72705d..5e650522fe 100644
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -129,6 +129,7 @@ Push "${EXECUTABLE_MARKER}"
 Push "${PROGRAM_NAME}"
 Push "androiddump"
 Push "capinfos"
+Push "captype"
 Push "ciscodump"
 Push "dftest"
 Push "dumpcap"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 5f98869427..04cf01a094 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -1141,6 +1141,13 @@ File "${STAGING_DIR}\capinfos.exe"
 File "${STAGING_DIR}\capinfos.html"
 SectionEnd
 
+Section "Captype" SecCaptype
+;-------------------------------------------
+SetOutPath $INSTDIR
+File "${STAGING_DIR}\captype.exe"
+File "${STAGING_DIR}\captype.html"
+SectionEnd
+
 Section "Rawshark" SecRawshark
 ;-------------------------------------------
 SetOutPath $INSTDIR
@@ -1255,6 +1262,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Copy packets to a new file, sorted by time."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDFTest} "Shows display filter byte-code, for debugging dfilter routines"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Print information about capture files."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCaptype} "Print the types capture files."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Raw packet filter."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpkt} "Random packet generator."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMMDBResolve} "MaxMind Database resolution tool"
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 8516e65209..5b924d4d48 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -389,6 +389,24 @@
     </ComponentGroup>
   </Fragment>
 
+  <!-- Captype -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpCaptype_exe" Guid="*">
+        <File Id="filCaptype_exe" KeyPath="yes" Source="$(var.Staging.Dir)\captype.exe" />
+      </Component>
+      <Component Id="cmpCaptype_html" Guid="*">
+        <File Id="filCaptype_html" KeyPath="yes" Source="$(var.Staging.Dir)\captype.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Captype">
+      <ComponentRef Id="cmpCaptype_exe" />
+      <ComponentRef Id="cmpCaptype_html" />
+    </ComponentGroup>
+  </Fragment>
+
   <!-- Rawshark -->
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER">
diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi
index 35aefc60de..536fbfde6f 100644
--- a/packaging/wix/Features.wxi
+++ b/packaging/wix/Features.wxi
@@ -76,6 +76,9 @@
       <Feature Id="Fe.Tools.Capinfos" Title="Capinfos" Level="1" AllowAdvertise="yes" Display="expand" Description="Print information about capture files.">
         <ComponentGroupRef Id="CG.Tools.Capinfos" />
       </Feature>
+      <Feature Id="Fe.Tools.Captype" Title="Captype" Level="1" AllowAdvertise="yes" Display="expand" Description="Print the types of capture files.">
+        <ComponentGroupRef Id="CG.Tools.Captype" />
+      </Feature>
       <Feature Id="Fe.Tools.Rawshark" Title="Rawshark" Level="1" AllowAdvertise="yes" Display="expand" Description="Raw packet filter.">
         <ComponentGroupRef Id="CG.Tools.Rawshark" />
       </Feature>