From ff90e30944764552a198338f6b37982e1a8287cc Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 10 May 2018 17:14:00 -0700
Subject: [PATCH] WiX: Remove remaining GTK+ content.

Change-Id: I3dc06b62f8a6afa2de82b2a2a5f7dc8a63400ac3
Reviewed-on: https://code.wireshark.org/review/27451
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 packaging/wix/ComponentGroups.wxi    | 43 ----------------------------
 packaging/wix/DirectoryStructure.wxi | 11 -------
 packaging/wix/Features.wxi           | 11 -------
 packaging/wix/InputPaths.wxi         |  5 +---
 4 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index e430d1678e..204ffc5548 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -277,22 +277,6 @@
         </ComponentGroup>
     </Fragment>
 
-  <!-- Wireshark GTK -->
-  <?ifdef GTK_DIR?>
-    <Fragment>
-      <DirectoryRef Id="INSTALLFOLDER">
-        <Component Id="cmpWiresharkGTK_exe" Guid="*">
-          <File Id="filWiresharkGTK_exe" KeyPath="yes" Source="$(var.Staging.Dir)\Wireshark-gtk.exe" />
-        </Component>
-      </DirectoryRef>
-    </Fragment>
-    <Fragment>
-      <ComponentGroup Id="CG.WiresharkGTK">
-        <ComponentRef Id="cmpWiresharkGTK_exe" />
-      </ComponentGroup>
-    </Fragment>
-  <?endif?>
-
   <!-- Configuration Profiles -->
   <Fragment>
     <DirectoryRef Id="dirProfiles">
@@ -596,33 +580,6 @@
         <RemoveFolder Id="RemoveQuickLaunchFolder" Directory="QuickLaunchFolder" On="uninstall" />
       </Component>
     </ComponentGroup>
-    <?ifdef GTK_DIR?>
-    <ComponentGroup Id="CG.WiresharkLegacyStartMenu" Directory="ProgramMenuFolder">
-      <Component Id="cmpWiresharkLegacyShortcut">
-        <Shortcut Id="scWiresharkLegacy" Name="Legacy $(var.WiresharkName)" Description="The $(var.WiresharkName) Network Protocol Analyzer (classic UI)" Target="[#filWiresharkGTK_exe]" WorkingDirectory="INSTALLFOLDER" />
-        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="StartMenuLegacyShortcut" Type="integer" Value="1" KeyPath="yes"/>
-        <Condition>WIRESHARK_LEGACY_START_MENU = "1"</Condition>
-      </Component>
-    </ComponentGroup>
-    <ComponentGroup Id="CG.WiresharkLegacyDesktopIcon" Directory="DesktopFolder">
-      <Component Id="cmpWiresharkLegacyDesktopIcon">
-        <Shortcut Id="scWiresharkLegacyDesktop" Name="Legacy $(var.WiresharkName)" Description="The $(var.WiresharkName) Network Protocol Analyzer (classic UI)" Target="[#filWiresharkGTK_exe]" WorkingDirectory="INSTALLFOLDER" />
-        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="LegacyDesktopIcon" Type="integer" Value="1" KeyPath="yes"/>
-        <Condition>WIRESHARK_LEGACY_DESKTOP_ICON = "1"</Condition>
-      </Component>
-    </ComponentGroup>
-    <ComponentGroup Id="CG.WiresharkLegacyQuickLaunchIcon" Directory="QuickLaunchFolder">
-      <Component Id="cmpWiresharkLegacyQuickLaunchIcon">
-        <Shortcut Id="scWiresharkLegacyQuickLaunch" Name="Legacy $(var.WiresharkName)" Description="The $(var.WiresharkName) Network Protocol Analyzer (classic UI)" Target="[#filWiresharkGTK_exe]" WorkingDirectory="INSTALLFOLDER" />
-        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="LegacyQuickLaunchIcon" Type="integer" Value="1" KeyPath="yes"/>
-        <Condition>WIRESHARK_LEGACY_QUICK_LAUNCH_ICON = "1"</Condition>
-        <!-- Done to keep ICE64 happy -->
-        <RemoveFolder Id="RemoveMicrosoftFolderGTK" Directory="MicrosoftFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveInternetExplorerFolderGTK" Directory="InternetExplorerFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveQuickLaunchFolderGTK" Directory="QuickLaunchFolder" On="uninstall" />
-      </Component>
-    </ComponentGroup>
-    <?endif?>
   </Fragment>
 
   <!-- File Associations -->
diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi
index 34dcaf8403..fe70b66393 100644
--- a/packaging/wix/DirectoryStructure.wxi
+++ b/packaging/wix/DirectoryStructure.wxi
@@ -13,19 +13,8 @@
         <Directory Id="INSTALLFOLDER" Name="$(var.WiresharkName)">
           <Directory Id="dirDtds" Name="dtds"/>
           <Directory Id="dirDiameter" Name="diameter"/>
-          <Directory Id="dirEtc" Name="etc">
-            <Directory Id="dirEtcGtk2_0" Name="gtk-2.0"/>
-          </Directory>
           <Directory Id="dirExtcap" Name="extcap"/>
           <Directory Id="dirHelp" Name="help"/>
-          <Directory Id="dirLib" Name="lib">
-            <Directory Id="dirLibGtk2_0" Name="gtk-2.0">
-              <Directory Id="dirLibGtk2_0_2_10_0" Name="2.10.0">
-                <Directory Id="dirLibGtk2_0_2_10_0_engines" Name="engines"/>
-              </Directory>
-              <Directory Id="dirLibGtk2_0_modules" Name="modules"/>
-            </Directory>
-          </Directory>
           <Directory Id="dirRadius" Name="radius"/>
           <Directory Id="dirPlugins" Name="plugins">
             <Directory Id="dirPluginsVersion" Name="$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)">
diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi
index 918da3bb66..102de25704 100644
--- a/packaging/wix/Features.wxi
+++ b/packaging/wix/Features.wxi
@@ -27,17 +27,6 @@
     <Feature Id="Fe.TShark" Title="TShark" Level="1" AllowAdvertise="yes" Display="expand" Description="Text based network protocol analyzer.">
       <ComponentGroupRef Id="CG.TShark" />
     </Feature>
-    <?ifdef GTK_DIR?>
-      <Feature Id="Fe.WiresharkGTK" Title="Wireshark 1" Level="2" AllowAdvertise="yes" Display="expand" Description="The classic user interface.">
-        <ComponentGroupRef Id="CG.WiresharkGTK" />
-        <ComponentGroupRef Id="CG.GTKRequiredDependencies" />
-        <ComponentGroupRef Id="CG.GTKSubdirectory" />
-        <ComponentGroupRef Id="CG.WiresharkLegacyStartMenu" />
-        <ComponentGroupRef Id="CG.WiresharkLegacyDesktopIcon" />
-        <ComponentGroupRef Id="CG.WiresharkLegacyQuickLaunchIcon" />
-        <ComponentGroupRef Id="CG.WiresharkLegacyFileAssociations" />
-      </Feature>
-    <?endif?>
     <Feature Id="Fe.Plugins" Title="Plugins &amp; Extensions" Level="1" AllowAdvertise="yes" Display="expand" Description="Plugins and extensions for both $(var.WiresharkName) and TShark.">
       <!-- XXX - Cleanup plugins directory on uninstall  -->
       <Feature Id="Fe.Plugins.Dissector" Title="Dissector Plugins" Level="1" AllowAdvertise="yes" Display="expand" Description="Additional protocol dissectors.">
diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi
index 1b7d016250..8ae31b6689 100644
--- a/packaging/wix/InputPaths.wxi
+++ b/packaging/wix/InputPaths.wxi
@@ -7,7 +7,7 @@
   <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?endif?>
 
-  <?define VCRedist.Version = "VC140" ?>
+  <?define VCRedist.Version = "VC141" ?>
   <?define VCRedist.Dir ="C:\Program Files (x86)\Common Files\Merge Modules\" ?>
 
   <?define Staging.Dir ="$(var.BuildOutputDir)" ?>
@@ -20,8 +20,5 @@
   <?define Wimaxasncp.Dir ="$(var.Staging.Dir)\wimaxasncp" ?>
   <?define Help.Dir ="$(var.Staging.Dir)\help" ?>
   <?define Epan.Lua.Dir ="..\..\epan\wslua" ?>
-  <?define GTK2_0.Dir ="$(var.Staging.Dir)\etc\gtk-2.0" ?>
-  <?define Lib_GTK2_0_Engines.Dir ="$(var.Staging.Dir)\lib\gtk-2.0\2.10.0\engines" ?>
-  <?define Lib_GTK2_0_Modules.Dir ="$(var.Staging.Dir)\lib\gtk-2.0\modules" ?>
 
 </Include>