Create a Wix Installer

This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
author: Michael Mann <mmann78@netscape.net> 2016-04-07 19:03:51 -0400
committer: Michael Mann <mmann78@netscape.net> 2016-05-11 13:09:17 +0000
commit: c34996f970ab003bb8566825b38834de00f5159e (patch)
tree: fda0c581d87baf3cb0264affaaeb861354f66311 /packaging/wix
parent: 980f58bc277df178a15b4c730fb1b0cbd462da0b (diff)
download: wireshark-c34996f970ab003bb8566825b38834de00f5159e.tar.gz
15 files changed, 2707 insertions, 101 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
new file mode 100644
index 0000000000..da152caa53
--- /dev/null
+++ b/packaging/wix/CMakeLists.txt
@@ -0,0 +1,413 @@
+# CMakeLists.txt
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+# We should use CPack to help generate a .msi using WIX.
+
+set(WIX_GENERATED_FILES
+	${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wxs
+	${CMAKE_CURRENT_BINARY_DIR}/Diameter.wxs
+	${CMAKE_CURRENT_BINARY_DIR}/GtkDependentComponents.wxs
+	${CMAKE_CURRENT_BINARY_DIR}/QtDependentComponents.wxs
+	${CMAKE_CURRENT_BINARY_DIR}/QtTranslation.wxs
+	${CMAKE_CURRENT_BINARY_DIR}/RadiusDict.wxs
+	${CMAKE_CURRENT_BINARY_DIR}/SNMPMibs.wxs
+)
+set(WIX_GENERATED_FILES ${WIX_GENERATED_FILES} PARENT_SCOPE)
+
+set(WIX_SOURCE_FILES
+	${CMAKE_SOURCE_DIR}/packaging/wix/Wireshark.wxs
+	${CMAKE_SOURCE_DIR}/packaging/wix/WiresharkOptionsDlg.wxs
+	${CMAKE_SOURCE_DIR}/packaging/wix/WiresharkWixUI.wxs
+	${WIX_GENERATED_FILES}
+)
+set(WIX_SOURCE_FILES ${WIX_SOURCE_FILES} PARENT_SCOPE)
+
+set(WIX_FILES
+	ComponentGroups.wxi
+	COPYING.rtf
+	DirectoryStructure.wxi
+	Features.wxi
+	InputPaths.wxi
+	Plugins.wxi
+	Prerequisites.wxi
+	UserInterface.wxi
+	${WIX_SOURCE_FILES}
+	PARENT_SCOPE
+)
+
+set(WIX_OUT_FILES
+	${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/Diameter.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/GtkDependentComponents.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/QtDependentComponents.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/QtTranslation.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/RadiusDict.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/SNMPMibs.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/Wireshark.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/WiresharkOptionsDlg.wixobj
+	${CMAKE_CURRENT_BINARY_DIR}/WiresharkWixUI.wixobj
+)
+set(WIX_OUT_FILES ${WIX_OUT_FILES} PARENT_SCOPE)
+
+# Variables required for Wireshark.wxs
+set(PROGRAM_NAME ${CMAKE_PROJECT_NAME})
+file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}" TOP_SRC_DIR)
+# STAGING_DIR depends on the build configuration so we pass it
+# on the command line below.
+file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/docbook" USER_GUIDE_DIR)
+if ("${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win32")
+	set(TARGET_MACHINE x86)
+elseif ("${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64")
+	set(TARGET_MACHINE x64)
+else()
+	message(FATAL_ERROR "Your mysterious moon-man architecture \"${WIRESHARK_TARGET_PLATFORM}\" frightens and confuses us.")
+endif()
+
+# Path to the WinPcap installer.
+# XXX Come up with a better variable, e.g. cache WIRESHARK_LIB_DIR in FindWSWinLibs.
+file(TO_NATIVE_PATH "${GLIB2_DLL_DIR}/../.." _wireshark_lib_dir)
+set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
+
+# Must match ${WIRESHARK_LIB_DIR}/WinPcap_X_Y_Z.exe
+set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION})
+string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}")
+
+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?
+set(WTAP_VERSION ${PROJECT_VERSION})
+
+# To do:
+# - Sync the various version names between CMake and Wix.
+# - Set CMakeLists.txt version strings in make-version.pl
+# - Add a VERSION_EXTRA cmake option
+set (VERSION "${PROJECT_VERSION}")
+set (PRODUCT_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUILD})
+
+# Use the merge module that comes with Visual Studio (From MSVC 2013?)
+# This is currently hardcoded for MSVC 2013
+set (MSVC_CRT_VERSION "VC120")
+set (MSVC_REDIST_DIR "$ENV{PROGRAMFILES}/Common Files/Merge Modules")
+message(STATUS "Using ${MSVC_REDIST_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm for the installer")
+
+if(NOT ENABLE_STATIC)
+	# XXX Replace ENABLE_LIBWIRESHARK with !ENABLE_STATIC everywhere.
+	set(ENABLE_LIBWIRESHARK "-dENABLE_LIBWIRESHARK")
+endif()
+
+# DependentComponents.wxi. Can be created at configure time.
+set(_all_manifest_wix "${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wxs")
+file(WRITE "${_all_manifest_wix}" "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+file(APPEND "${_all_manifest_wix}" "<Wix xmlns=\"http://schemas.microsoft.com/wix/2006/wi\">\n\n")
+file(APPEND "${_all_manifest_wix}" "  <!-- Files required for all sections. Generated by CMake. -->\n")
+file(APPEND "${_all_manifest_wix}"  "<?include InputPaths.wxi ?>\n")
+file(APPEND "${_all_manifest_wix}" "  <Fragment>\n")
+file(APPEND "${_all_manifest_wix}" "    <DirectoryRef Id=\"INSTALLFOLDER\">\n")
+SET(unique_component "")
+foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL}
+		${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL} ${LIBSSH_DLL}
+		${WINSPARKLE_DLL} ${ZLIB_DLL}
+	)
+	#ensure uniqueness of files
+	IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)")
+		STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_dll})
+		file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
+		file(APPEND "${_all_manifest_wix}" "         <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\${_dll}\"/>\n")
+		file(APPEND "${_all_manifest_wix}" "       </Component>\n")
+		SET(unique_component ${unique_component} ${_dll})
+	ENDIF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)")
+endforeach()
+file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_exe\" Guid=\"*\">\n")
+file(APPEND "${_all_manifest_wix}" "         <File Id=\"filSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_exe\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\gspawn-${WIRESHARK_TARGET_PLATFORM}-helper.exe\"/>\n")
+file(APPEND "${_all_manifest_wix}" "       </Component>\n")
+file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_console_exe\" Guid=\"*\">\n")
+file(APPEND "${_all_manifest_wix}" "         <File Id=\"filSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_console_exe\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\gspawn-${WIRESHARK_TARGET_PLATFORM}-helper-console.exe\"/>\n")
+file(APPEND "${_all_manifest_wix}" "       </Component>\n")
+foreach(_script "init.lua" "console.lua" "dtd_gen.lua")
+	STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_script})
+	file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
+	file(APPEND "${_all_manifest_wix}" "         <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\${_script}\"/>\n")
+	file(APPEND "${_all_manifest_wix}" "       </Component>\n")
+endforeach()
+file(APPEND "${_all_manifest_wix}" "    </DirectoryRef>\n")
+file(APPEND "${_all_manifest_wix}" "  </Fragment>\n")
+file(APPEND "${_all_manifest_wix}" "  <Fragment>\n")
+file(APPEND "${_all_manifest_wix}" "    <ComponentGroup Id=\"CG.RequiredDependencies\">\n")
+SET(unique_file "")
+foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL}
+		${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL}
+		${WINSPARKLE_DLL} ${ZLIB_DLL}
+	)
+	#ensure uniqueness of files
+	IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)")
+		STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_dll})
+		file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
+		SET(unique_file ${unique_file} ${_dll})
+	ENDIF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)")
+endforeach()
+file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_exe\" />\n")
+file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_console_exe\" />\n")
+foreach(_script "init.lua" "console.lua" "dtd_gen.lua")
+	STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_script})
+	file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
+endforeach()
+file(APPEND "${_all_manifest_wix}" "    </ComponentGroup>\n")
+file(APPEND "${_all_manifest_wix}" "  </Fragment>\n")
+file(APPEND "${_all_manifest_wix}" "\n</Wix>\n")
+
+# GtkDependentComponents.wxs. Can be created at configure time.
+set(_gtk_dll_manifest_wix "${CMAKE_CURRENT_BINARY_DIR}/GtkDependentComponents.wxs")
+file(WRITE "${_gtk_dll_manifest_wix}" "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+file(APPEND "${_gtk_dll_manifest_wix}" "<Wix xmlns=\"http://schemas.microsoft.com/wix/2006/wi\">\n\n")
+if(BUILD_wireshark_gtk AND GTK_FOUND)
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  <!-- Files required for the GTK+ section. Generated by CMake. -->\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "<?include InputPaths.wxi ?>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  <Fragment>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    <DirectoryRef Id=\"INSTALLFOLDER\">\n")
+	foreach(_dll ${GTK2_DLLS} ${GTK3_DLLS})
+		IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)")
+			STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_dll})
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
+			file(APPEND "${_gtk_dll_manifest_wix}"  "         <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\${_dll}\"/>\n")
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       </Component>\n")
+			SET(unique_component ${unique_component} ${_dll})
+		ENDIF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)")
+	endforeach()
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    </DirectoryRef>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  </Fragment>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  <Fragment>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    <ComponentGroup Id=\"CG.GTKRequiredDependencies\">\n")
+	foreach(_dll ${GTK2_DLLS} ${GTK3_DLLS})
+		IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)")
+			STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_dll})
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
+			SET(unique_file ${unique_file} ${_dll})
+		ENDIF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)")
+	endforeach()
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    </ComponentGroup>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  </Fragment>\n")
+
+	#XXX - May be able to do this with heat.exe, but attaching it to existing GTK dependencies for now
+	if(GTK2_ETC_DIR)
+		file(APPEND "${_gtk_dll_manifest_wix}"  "  <Fragment>\n")
+		file(APPEND "${_gtk_dll_manifest_wix}"  "    <DirectoryRef Id=\"dirEtcGtk2_0\">\n")
+		file(GLOB gtk2_etc "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/etc/gtk-2.0/*")
+		foreach(_file ${gtk2_etc})
+			get_filename_component(_gtk_dll ${_file} NAME_WE)
+			get_filename_component(_gtk_dll_ext ${_file} EXT)
+			set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext})
+			STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll})
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
+			file(APPEND "${_gtk_dll_manifest_wix}"  "         <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.GTK2_0.Dir)\\${_gtk_dll}\" />\n")
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       </Component>\n")
+		endforeach()
+		file(APPEND "${_gtk_dll_manifest_wix}"  "    </DirectoryRef>\n")
+		file(APPEND "${_gtk_dll_manifest_wix}"  "  </Fragment>\n")
+	endif()
+	if(GTK2_ENGINES_DLL_DIR)
+		file(APPEND "${_gtk_dll_manifest_wix}"  "  <Fragment>\n")
+		file(APPEND "${_gtk_dll_manifest_wix}"  "    <DirectoryRef Id=\"dirLibGtk2_0_2_10_0_engines\">\n")
+		file(GLOB gtk2_engines "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/lib/gtk-2.0/2.10.0/engines/*")
+		foreach(_file ${gtk2_engines})
+			get_filename_component(_gtk_dll ${_file} NAME_WE)
+			get_filename_component(_gtk_dll_ext ${_file} EXT)
+			set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext})
+			STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll})
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
+			file(APPEND "${_gtk_dll_manifest_wix}"  "         <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Lib_GTK2_0_Engines.Dir)\\${_gtk_dll}\" />\n")
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       </Component>\n")
+		endforeach()
+		file(APPEND "${_gtk_dll_manifest_wix}"  "    </DirectoryRef>\n")
+		file(APPEND "${_gtk_dll_manifest_wix}"  "  </Fragment>\n")
+	endif()
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  <Fragment>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    <DirectoryRef Id=\"dirLibGtk2_0_modules\">\n")
+	file(GLOB gtk2_modules "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/lib/gtk-2.0/modules/*")
+	foreach(_file ${gtk2_modules})
+		get_filename_component(_gtk_dll ${_file} NAME_WE)
+		get_filename_component(_gtk_dll_ext ${_file} EXT)
+		set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext})
+		STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll})
+		file(APPEND "${_gtk_dll_manifest_wix}"  "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
+		file(APPEND "${_gtk_dll_manifest_wix}"  "         <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Lib_GTK2_0_Modules.Dir)\\${_gtk_dll}\" />\n")
+		file(APPEND "${_gtk_dll_manifest_wix}"  "       </Component>\n")
+	endforeach()
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    </DirectoryRef>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  </Fragment>\n")
+	#put the files into a group
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  <Fragment>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    <ComponentGroup Id=\"CG.GTKSubdirectory\">\n")
+	if(GTK2_ETC_DIR)
+		foreach(_file ${gtk2_etc})
+			get_filename_component(_gtk_dll ${_file} NAME_WE)
+			get_filename_component(_gtk_dll_ext ${_file} EXT)
+			set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext})
+			STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll})
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
+		endforeach()
+	endif()
+	if(GTK2_ENGINES_DLL_DIR)
+		foreach(_file ${gtk2_engines})
+			get_filename_component(_gtk_dll ${_file} NAME_WE)
+			get_filename_component(_gtk_dll_ext ${_file} EXT)
+			set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext})
+			STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll})
+			file(APPEND "${_gtk_dll_manifest_wix}"  "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
+		endforeach()
+	endif()
+	foreach(_file ${gtk2_modules})
+		get_filename_component(_gtk_dll ${_file} NAME_WE)
+		get_filename_component(_gtk_dll_ext ${_file} EXT)
+		set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext})
+		STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll})
+		file(APPEND "${_gtk_dll_manifest_wix}"  "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
+	endforeach()
+	file(APPEND "${_gtk_dll_manifest_wix}"  "    </ComponentGroup>\n")
+	file(APPEND "${_gtk_dll_manifest_wix}"  "  </Fragment>\n")
+
+endif()
+file(APPEND "${_gtk_dll_manifest_wix}"  "\n</Wix>\n")
+
+if(BUILD_wireshark_gtk AND GTK_FOUND)
+	set(use_gtk "-dGTK_DIR")
+endif()
+
+if(SMI_DIR)
+	set(use_smi "-dSMI_DIR")
+endif()
+
+set(WIX_CANDLE_DEFINES
+	-sw1076
+	-dPlatform=${TARGET_MACHINE}
+	-dWiresharkName=${CMAKE_PROJECT_NAME}
+	-dWiresharkVersion=${PRODUCT_VERSION}
+	-dWiretapVersion=${WTAP_VERSION}
+	-dEulaDir=${CMAKE_SOURCE_DIR}/packaging/wix
+	-dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}
+	-dVCRedistVersion=${MSVC_CRT_VERSION}
+	-dVCRedistDir=${MSVC_REDIST_DIR}
+	-dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs
+	-dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/radius
+	-dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter
+	-dQtTranslationDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/translations
+	${use_gtk}
+	${use_smi}
+	${ENABLE_LIBWIRESHARK}
+	-arch ${TARGET_MACHINE}
+	-ext WixUIExtension
+	-I${CMAKE_SOURCE_DIR}/packaging/wix
+	-out ${CMAKE_CURRENT_BINARY_DIR}/
+	PARENT_SCOPE
+)
+
+set(WIX_LIGHT_DEFINES
+	-out ${CMAKE_CURRENT_BINARY_DIR}/Wireshark.msi
+	-sw1076
+	-ext WixUIExtension
+	PARENT_SCOPE
+)
+
+set(WIX_HEAT_FLAGS
+	-ag
+	-nologo
+	-srd
+	-sreg
+	PARENT_SCOPE
+)
+
+macro( ADD_WIX_PACKAGE_TARGET )
+	set (_wix_source_dir ${CMAKE_SOURCE_DIR}/packaging/wix )
+	set (_wix_binary_dir ${CMAKE_BINARY_DIR}/packaging/wix )
+
+	# QtDependentComponents.wxs. Created using Wireshark.exe.
+	add_custom_command(OUTPUT ${_wix_binary_dir}/QtDependentComponents.wxs
+		COMMAND set "PATH=%PATH%;${QT_BIN_PATH}"
+		COMMAND ${POWERSHELL_COMMAND} "${_wix_source_dir}/windeployqt-to-wix.ps1"
+			-Executable $<TARGET_FILE:wireshark>
+			-FilePath ${_wix_binary_dir}/QtDependentComponents.wxs
+	)
+
+	# SNMPMibs.wxs. Collects all MIBs in "output" snmp/mibs directory. Generated with heat.exe
+	add_custom_command(OUTPUT ${_wix_binary_dir}/SNMPMibs.wxs
+		COMMAND ${WIX_HEAT_EXECUTABLE} dir ${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs
+				${WIX_HEAT_FLAGS} -cg CG.Plugins.SNMP -dr dirSnmpMibs -var var.SnmpMibDir
+				-out ${_wix_binary_dir}/SNMPMibs.wxs
+	)
+
+	# RadiusDict.wxs. Collects all Radius dictionary files in "output" radius directory. Generated with heat.exe
+	add_custom_command(OUTPUT ${_wix_binary_dir}/RadiusDict.wxs
+		COMMAND ${WIX_HEAT_EXECUTABLE} dir ${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/radius
+				${WIX_HEAT_FLAGS} -cg CG.RadiusDict -dr dirRadius -var var.RadiusDictDir
+				-out ${_wix_binary_dir}/RadiusDict.wxs
+	)
+
+	# Diameter.wxs. Collects all Diameter XML dictionary files in "output" diameter directory. Generated with heat.exe
+	add_custom_command(OUTPUT ${_wix_binary_dir}/Diameter.wxs
+		COMMAND ${WIX_HEAT_EXECUTABLE} dir ${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter
+				${WIX_HEAT_FLAGS} -cg CG.Diameter -dr dirDiameter -var var.DiameterDir
+				-out ${_wix_binary_dir}/Diameter.wxs
+	)
+
+	# QtTranslation.wxs. Collects all Qt translation files in "output" translations directory. Generated with heat.exe
+	add_custom_command(OUTPUT ${_wix_binary_dir}/QtTranslation.wxs
+		COMMAND ${WIX_HEAT_EXECUTABLE} dir ${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/translations
+				${WIX_HEAT_FLAGS} -cg CG.QtTranslations -dr dirTranslations -var var.QtTranslationDir
+				-out ${_wix_binary_dir}/QtTranslation.wxs
+	)
+
+	# Build WiX package dependencies. We build the package in two stages
+	# so that wix_package below doesn't trigger any dependencies that
+	# might clobber any signed executables.
+	add_custom_target(wix_package_prep
+		DEPENDS
+			${WIX_FILES}
+			copy_data_files
+			user_guides
+			${CMAKE_BINARY_DIR}/docbook/user-guide.chm
+	)
+	set_target_properties(wix_package_prep PROPERTIES FOLDER "Packaging")
+
+	# Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix to match
+	# the NMake environment for now.
+	# Note that executables and DLLs *must* be built separately
+	add_custom_target(wix_package
+		COMMAND ${WIX_CANDLE_EXECUTABLE} ${WIX_CANDLE_DEFINES} ${WIX_SOURCE_FILES}
+		WORKING_DIRECTORY ${_wix_source_dir}
+
+		COMMAND ${WIX_LIGHT_EXECUTABLE} ${WIX_LIGHT_DEFINES} ${WIX_OUT_FILES}
+		WORKING_DIRECTORY ${_wix_binary_dir}
+	)
+	set_target_properties(wix_package PROPERTIES FOLDER "Packaging")
+endmacro( ADD_WIX_PACKAGE_TARGET )
+
+set(CLEAN_FILES
+	DependentComponents.wxs
+	GtkDependentComponents.wxs
+	QtDependentComponents.wxs
+	SNMPMibs.wxs
+	RadiusDict.wxs
+	Diameter.wxs
+	QtTranslation.wxs
+	#NEWS.txt
+	#user-guide.chm
+	wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
+)
diff --git a/packaging/wix/COPYING.rtf b/packaging/wix/COPYING.rtf
new file mode 100644
index 0000000000..ec2bde5e7c
--- /dev/null
+++ b/packaging/wix/COPYING.rtf
@@ -0,0 +1,524 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Calibri;}{\f1\froman\fprq2\fcharset0 Times New Roman;}}
+{\colortbl ;\red0\green0\blue255;}
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\nowidctlpar\f0\fs20 This text consists of three parts:\par
+\par
+Part I: Some remarks regarding the license given in\par
+Part II: The actual license that covers Wireshark.\par
+Part III: Other applicable licenses.\par
+\par
+When in doubt: Part II/III is the legally binding part, Part I is just\par
+there to make it easier for people that are not familiar with the GPLv2.\par
+\par
+\par
+------------------------------------------------------------------------\par
+Part I:\par
+\par
+Wireshark is distributed under the GNU GPLv2. There are no restrictions\par
+on its use. There are restrictions on its distribution in source or\par
+binary form.\par
+\par
+Most parts of Wireshark are covered by a "GPL version 2 or later" license.\par
+Some files are covered by different licenses that are compatible with\par
+the GPLv2.\par
+\par
+As a notable exception, some utilities distributed with the Wireshark source are\par
+covered by other licenses that are not themselves directly compatible with the\par
+GPLv2. This is OK, as only the tools themselves are licensed this way, the\par
+output of the tools is not considered a derived work, and so can be safely\par
+licensed for Wireshark's use. An incomplete selection of these tools includes:\par
+ - the pidl utility (tools/pidl) is licensed under the GPLv3+.\par
+\par
+Parts of Wireshark can be built and distributed as libraries. These\par
+parts are still covered by the GPL, and NOT by the Lesser General Public\par
+License or any other license.\par
+\par
+If you integrate all or part of Wireshark into your own application, then\par
+that application must be released under a license compatible with the GPL.\par
+\par
+The full text of the GNU GPL and some of the other applicable licenses follows.\par
+\par
+------------------------------------------------------------------------\par
+Part II:\par
+\par
+                    GNU GENERAL PUBLIC LICENSE\par
+                       Version 2, June 1991\par
+\par
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\par
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\par
+ Everyone is permitted to copy and distribute verbatim copies\par
+ of this license document, but changing it is not allowed.\par
+\par
+                            Preamble\par
+\par
+  The licenses for most software are designed to take away your\par
+freedom to share and change it.  By contrast, the GNU General Public\par
+License is intended to guarantee your freedom to share and change free\par
+software--to make sure the software is free for all its users.  This\par
+General Public License applies to most of the Free Software\par
+Foundation's software and to any other program whose authors commit to\par
+using it.  (Some other Free Software Foundation software is covered by\par
+the GNU Lesser General Public License instead.)  You can apply it to\par
+your programs, too.\par
+\par
+  When we speak of free software, we are referring to freedom, not\par
+price.  Our General Public Licenses are designed to make sure that you\par
+have the freedom to distribute copies of free software (and charge for\par
+this service if you wish), that you receive source code or can get it\par
+if you want it, that you can change the software or use pieces of it\par
+in new free programs; and that you know you can do these things.\par
+\par
+  To protect your rights, we need to make restrictions that forbid\par
+anyone to deny you these rights or to ask you to surrender the rights.\par
+These restrictions translate to certain responsibilities for you if you\par
+distribute copies of the software, or if you modify it.\par
+\par
+  For example, if you distribute copies of such a program, whether\par
+gratis or for a fee, you must give the recipients all the rights that\par
+you have.  You must make sure that they, too, receive or can get the\par
+source code.  And you must show them these terms so they know their\par
+rights.\par
+\par
+  We protect your rights with two steps: (1) copyright the software, and\par
+(2) offer you this license which gives you legal permission to copy,\par
+distribute and/or modify the software.\par
+\par
+  Also, for each author's protection and ours, we want to make certain\par
+that everyone understands that there is no warranty for this free\par
+software.  If the software is modified by someone else and passed on, we\par
+want its recipients to know that what they have is not the original, so\par
+that any problems introduced by others will not reflect on the original\par
+authors' reputations.\par
+\par
+  Finally, any free program is threatened constantly by software\par
+patents.  We wish to avoid the danger that redistributors of a free\par
+program will individually obtain patent licenses, in effect making the\par
+program proprietary.  To prevent this, we have made it clear that any\par
+patent must be licensed for everyone's free use or not licensed at all.\par
+\par
+  The precise terms and conditions for copying, distribution and\par
+modification follow.\par
+\par
+                    GNU GENERAL PUBLIC LICENSE\par
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\par
+  0. This License applies to any program or other work which contains\par
+a notice placed by the copyright holder saying it may be distributed\par
+under the terms of this General Public License.  The "Program", below,\par
+refers to any such program or work, and a "work based on the Program"\par
+means either the Program or any derivative work under copyright law:\par
+that is to say, a work containing the Program or a portion of it,\par
+either verbatim or with modifications and/or translated into another\par
+language.  (Hereinafter, translation is included without limitation in\par
+the term "modification".)  Each licensee is addressed as "you".\par
+\par
+Activities other than copying, distribution and modification are not\par
+covered by this License; they are outside its scope.  The act of\par
+running the Program is not restricted, and the output from the Program\par
+is covered only if its contents constitute a work based on the\par
+Program (independent of having been made by running the Program).\par
+Whether that is true depends on what the Program does.\par
+\par
+  1. You may copy and distribute verbatim copies of the Program's\par
+source code as you receive it, in any medium, provided that you\par
+conspicuously and appropriately publish on each copy an appropriate\par
+copyright notice and disclaimer of warranty; keep intact all the\par
+notices that refer to this License and to the absence of any warranty;\par
+and give any other recipients of the Program a copy of this License\par
+along with the Program.\par
+\par
+You may charge a fee for the physical act of transferring a copy, and\par
+you may at your option offer warranty protection in exchange for a fee.\par
+\par
+  2. You may modify your copy or copies of the Program or any portion\par
+of it, thus forming a work based on the Program, and copy and\par
+distribute such modifications or work under the terms of Section 1\par
+above, provided that you also meet all of these conditions:\par
+\par
+    a) You must cause the modified files to carry prominent notices\par
+    stating that you changed the files and the date of any change.\par
+\par
+    b) You must cause any work that you distribute or publish, that in\par
+    whole or in part contains or is derived from the Program or any\par
+    part thereof, to be licensed as a whole at no charge to all third\par
+    parties under the terms of this License.\par
+\par
+    c) If the modified program normally reads commands interactively\par
+    when run, you must cause it, when started running for such\par
+    interactive use in the most ordinary way, to print or display an\par
+    announcement including an appropriate copyright notice and a\par
+    notice that there is no warranty (or else, saying that you provide\par
+    a warranty) and that users may redistribute the program under\par
+    these conditions, and telling the user how to view a copy of this\par
+    License.  (Exception: if the Program itself is interactive but\par
+    does not normally print such an announcement, your work based on\par
+    the Program is not required to print an announcement.)\par
+\par
+These requirements apply to the modified work as a whole.  If\par
+identifiable sections of that work are not derived from the Program,\par
+and can be reasonably considered independent and separate works in\par
+themselves, then this License, and its terms, do not apply to those\par
+sections when you distribute them as separate works.  But when you\par
+distribute the same sections as part of a whole which is a work based\par
+on the Program, the distribution of the whole must be on the terms of\par
+this License, whose permissions for other licensees extend to the\par
+entire whole, and thus to each and every part regardless of who wrote it.\par
+\par
+Thus, it is not the intent of this section to claim rights or contest\par
+your rights to work written entirely by you; rather, the intent is to\par
+exercise the right to control the distribution of derivative or\par
+collective works based on the Program.\par
+\par
+In addition, mere aggregation of another work not based on the Program\par
+with the Program (or with a work based on the Program) on a volume of\par
+a storage or distribution medium does not bring the other work under\par
+the scope of this License.\par
+\par
+  3. You may copy and distribute the Program (or a work based on it,\par
+under Section 2) in object code or executable form under the terms of\par
+Sections 1 and 2 above provided that you also do one of the following:\par
+\par
+    a) Accompany it with the complete corresponding machine-readable\par
+    source code, which must be distributed under the terms of Sections\par
+    1 and 2 above on a medium customarily used for software interchange; or,\par
+\par
+    b) Accompany it with a written offer, valid for at least three\par
+    years, to give any third party, for a charge no more than your\par
+    cost of physically performing source distribution, a complete\par
+    machine-readable copy of the corresponding source code, to be\par
+    distributed under the terms of Sections 1 and 2 above on a medium\par
+    customarily used for software interchange; or,\par
+\par
+    c) Accompany it with the information you received as to the offer\par
+    to distribute corresponding source code.  (This alternative is\par
+    allowed only for noncommercial distribution and only if you\par
+    received the program in object code or executable form with such\par
+    an offer, in accord with Subsection b above.)\par
+\par
+The source code for a work means the preferred form of the work for\par
+making modifications to it.  For an executable work, complete source\par
+code means all the source code for all modules it contains, plus any\par
+associated interface definition files, plus the scripts used to\par
+control compilation and installation of the executable.  However, as a\par
+special exception, the source code distributed need not include\par
+anything that is normally distributed (in either source or binary\par
+form) with the major components (compiler, kernel, and so on) of the\par
+operating system on which the executable runs, unless that component\par
+itself accompanies the executable.\par
+\par
+If distribution of executable or object code is made by offering\par
+access to copy from a designated place, then offering equivalent\par
+access to copy the source code from the same place counts as\par
+distribution of the source code, even though third parties are not\par
+compelled to copy the source along with the object code.\par
+\par
+  4. You may not copy, modify, sublicense, or distribute the Program\par
+except as expressly provided under this License.  Any attempt\par
+otherwise to copy, modify, sublicense or distribute the Program is\par
+void, and will automatically terminate your rights under this License.\par
+However, parties who have received copies, or rights, from you under\par
+this License will not have their licenses terminated so long as such\par
+parties remain in full compliance.\par
+\par
+  5. You are not required to accept this License, since you have not\par
+signed it.  However, nothing else grants you permission to modify or\par
+distribute the Program or its derivative works.  These actions are\par
+prohibited by law if you do not accept this License.  Therefore, by\par
+modifying or distributing the Program (or any work based on the\par
+Program), you indicate your acceptance of this License to do so, and\par
+all its terms and conditions for copying, distributing or modifying\par
+the Program or works based on it.\par
+\par
+  6. Each time you redistribute the Program (or any work based on the\par
+Program), the recipient automatically receives a license from the\par
+original licensor to copy, distribute or modify the Program subject to\par
+these terms and conditions.  You may not impose any further\par
+restrictions on the recipients' exercise of the rights granted herein.\par
+You are not responsible for enforcing compliance by third parties to\par
+this License.\par
+\par
+  7. If, as a consequence of a court judgment or allegation of patent\par
+infringement or for any other reason (not limited to patent issues),\par
+conditions are imposed on you (whether by court order, agreement or\par
+otherwise) that contradict the conditions of this License, they do not\par
+excuse you from the conditions of this License.  If you cannot\par
+distribute so as to satisfy simultaneously your obligations under this\par
+License and any other pertinent obligations, then as a consequence you\par
+may not distribute the Program at all.  For example, if a patent\par
+license would not permit royalty-free redistribution of the Program by\par
+all those who receive copies directly or indirectly through you, then\par
+the only way you could satisfy both it and this License would be to\par
+refrain entirely from distribution of the Program.\par
+\par
+If any portion of this section is held invalid or unenforceable under\par
+any particular circumstance, the balance of the section is intended to\par
+apply and the section as a whole is intended to apply in other\par
+circumstances.\par
+\par
+It is not the purpose of this section to induce you to infringe any\par
+patents or other property right claims or to contest validity of any\par
+such claims; this section has the sole purpose of protecting the\par
+integrity of the free software distribution system, which is\par
+implemented by public license practices.  Many people have made\par
+generous contributions to the wide range of software distributed\par
+through that system in reliance on consistent application of that\par
+system; it is up to the author/donor to decide if he or she is willing\par
+to distribute software through any other system and a licensee cannot\par
+impose that choice.\par
+\par
+This section is intended to make thoroughly clear what is believed to\par
+be a consequence of the rest of this License.\par
+\par
+  8. If the distribution and/or use of the Program is restricted in\par
+certain countries either by patents or by copyrighted interfaces, the\par
+original copyright holder who places the Program under this License\par
+may add an explicit geographical distribution limitation excluding\par
+those countries, so that distribution is permitted only in or among\par
+countries not thus excluded.  In such case, this License incorporates\par
+the limitation as if written in the body of this License.\par
+\par
+  9. The Free Software Foundation may publish revised and/or new versions\par
+of the General Public License from time to time.  Such new versions will\par
+be similar in spirit to the present version, but may differ in detail to\par
+address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number.  If the Program\par
+specifies a version number of this License which applies to it and "any\par
+later version", you have the option of following the terms and conditions\par
+either of that version or of any later version published by the Free\par
+Software Foundation.  If the Program does not specify a version number of\par
+this License, you may choose any version ever published by the Free Software\par
+Foundation.\par
+\par
+  10. If you wish to incorporate parts of the Program into other free\par
+programs whose distribution conditions are different, write to the author\par
+to ask for permission.  For software which is copyrighted by the Free\par
+Software Foundation, write to the Free Software Foundation; we sometimes\par
+make exceptions for this.  Our decision will be guided by the two goals\par
+of preserving the free status of all derivatives of our free software and\par
+of promoting the sharing and reuse of software generally.\par
+\par
+                            NO WARRANTY\par
+\par
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\par
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\par
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\par
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\par
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\par
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\par
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\par
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\par
+REPAIR OR CORRECTION.\par
+\par
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\par
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\par
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\par
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\par
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\par
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\par
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\par
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\par
+POSSIBILITY OF SUCH DAMAGES.\par
+\par
+                     END OF TERMS AND CONDITIONS\par
+\par
+            How to Apply These Terms to Your New Programs\par
+\par
+  If you develop a new program, and you want it to be of the greatest\par
+possible use to the public, the best way to achieve this is to make it\par
+free software which everyone can redistribute and change under these terms.\par
+\par
+  To do so, attach the following notices to the program.  It is safest\par
+to attach them to the start of each source file to most effectively\par
+convey the exclusion of warranty; and each file should have at least\par
+the "copyright" line and a pointer to where the full notice is found.\par
+\par
+    <one line to give the program's name and a brief idea of what it does.>\par
+    Copyright (C) <year>  <name of author>\par
+\par
+    This program is free software; you can redistribute it and/or modify\par
+    it under the terms of the GNU General Public License as published by\par
+    the Free Software Foundation; either version 2 of the License, or \par
+    (at your option) any later version.\par
+\par
+    This program is distributed in the hope that it will be useful,\par
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\par
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\par
+    GNU General Public License for more details.\par
+\par
+    You should have received a copy of the GNU General Public License along\par
+    with this program; if not, write to the Free Software Foundation, Inc.,\par
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par
+\par
+Also add information on how to contact you by electronic and paper mail.\par
+\par
+If the program is interactive, make it output a short notice like this\par
+when it starts in an interactive mode:\par
+\par
+    Gnomovision version 69, Copyright (C) year name of author\par
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\par
+    This is free software, and you are welcome to redistribute it\par
+    under certain conditions; type `show c' for details.\par
+\par
+The hypothetical commands `show w' and `show c' should show the appropriate\par
+parts of the General Public License.  Of course, the commands you use may\par
+be called something other than `show w' and `show c'; they could even be\par
+mouse-clicks or menu items--whatever suits your program.\par
+\par
+You should also get your employer (if you work as a programmer) or your\par
+school, if any, to sign a "copyright disclaimer" for the program, if\par
+necessary.  Here is a sample; alter the names:\par
+\par
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\par
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.\par
+\par
+  <signature of Ty Coon>, 1 April 1989\par
+  Ty Coon, President of Vice\par
+\par
+This General Public License does not permit incorporating your program into\par
+proprietary programs.  If your program is a subroutine library, you may\par
+consider it more useful to permit linking proprietary applications with the\par
+library.  If this is what you want to do, use the GNU Lesser General\par
+Public License instead of this License.\par
+\par
+------------------------------------------------------------------------\par
+Part III:\par
+\par
+Parts of this software are licensed as follows\par
+\par
+   Copyright (c) 1988, 1992, 1993\par
+        The Regents of the University of California.  All rights reserved.\par
+  \par
+   Redistribution and use in source and binary forms, with or without\par
+   modification, are permitted provided that the following conditions\par
+   are met:\par
+   1. Redistributions of source code must retain the above copyright\par
+      notice, this list of conditions and the following disclaimer.\par
+   2. Redistributions in binary form must reproduce the above copyright\par
+      notice, this list of conditions and the following disclaimer in the\par
+      documentation and/or other materials provided with the distribution.\par
+   3. Neither the name of the University nor the names of its contributors\par
+      may be used to endorse or promote products derived from this software\par
+      without specific prior written permission.\par
+  \par
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\par
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\par
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\par
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\par
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\par
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\par
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\par
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\par
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\par
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\par
+   SUCH DAMAGE.\par
+\par
+\par
+   Copyright (c) 2003 Markus Friedl.  All rights reserved.\par
+  \par
+   Redistribution and use in source and binary forms, with or without\par
+   modification, are permitted provided that the following conditions\par
+   are met:\par
+   1. Redistributions of source code must retain the above copyright\par
+      notice, this list of conditions and the following disclaimer.\par
+   2. Redistributions in binary form must reproduce the above copyright\par
+      notice, this list of conditions and the following disclaimer in the\par
+      documentation and/or other materials provided with the distribution.\par
+  \par
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\par
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\par
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\par
+   IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\par
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\par
+   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\par
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\par
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\par
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\par
+   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par
+\par
+\par
+   Copyright (c) 2003 Endace Technology Ltd, Hamilton, New Zealand.\par
+   All rights reserved.\par
+  \par
+   This software and documentation has been developed by Endace Technology Ltd.\par
+   along with the DAG PCI network capture cards. For further information please\par
+   visit {\field{\*\fldinst{HYPERLINK "http://www.endace.com/"}}{\fldrslt{\ul\cf1 http://www.endace.com/}}}\f0\fs20 .\par
+  \par
+   Redistribution and use in source and binary forms, with or without\par
+   modification, are permitted provided that the following conditions are met:\par
+  \par
+    1. Redistributions of source code must retain the above copyright notice,\par
+    this list of conditions and the following disclaimer.\par
+  \par
+    2. Redistributions in binary form must reproduce the above copyright\par
+    notice, this list of conditions and the following disclaimer in the\par
+    documentation and/or other materials provided with the distribution.\par
+  \par
+    3. The name of Endace Technology Ltd may not be used to endorse or promote\par
+    products derived from this software without specific prior written\par
+    permission.\par
+  \par
+   THIS SOFTWARE IS PROVIDED BY ENDACE TECHNOLOGY LTD ``AS IS'' AND ANY EXPRESS\par
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\par
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\par
+   EVENT SHALL ENDACE TECHNOLOGY LTD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\par
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\par
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\par
+   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER\par
+   IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\par
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\par
+   POSSIBILITY OF SUCH DAMAGE.\par
+\par
+\par
+   Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.\par
+   All rights reserved.\par
+  \par
+   Redistribution and use in source and binary forms, with or without\par
+   modification, are permitted provided that the following conditions\par
+   are met:\par
+   1. Redistributions of source code must retain the above copyright\par
+      notice, this list of conditions and the following disclaimer.\par
+   2. Redistributions in binary form must reproduce the above copyright\par
+      notice, this list of conditions and the following disclaimer in the\par
+      documentation and/or other materials provided with the distribution.\par
+   3. Neither the name of the project nor the names of its contributors\par
+      may be used to endorse or promote products derived from this software\par
+      without specific prior written permission.\par
+  \par
+   THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND\par
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\par
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\par
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE\par
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\par
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\par
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\par
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\par
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\par
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\par
+   SUCH DAMAGE.\par
+\par
+\par
+   Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.\par
+  \par
+   Redistribution and use in source and binary forms, with or without\par
+   modification, are permitted provided that the following conditions\par
+   are met:\par
+   1. Redistributions of source code must retain the above copyright\par
+      notice, this list of conditions and the following disclaimer.\par
+   2. Redistributions in binary form must reproduce the above copyright\par
+      notice, this list of conditions and the following disclaimer in the\par
+      documentation and/or other materials provided with the distribution.\par
+  \par
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\par
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\par
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\par
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\par
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\par
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\par
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\par
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\par
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\par
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\par
+   SUCH DAMAGE.\par
+\f1\par
+}
+
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
new file mode 100644
index 0000000000..05fff89ca9
--- /dev/null
+++ b/packaging/wix/ComponentGroups.wxi
@@ -0,0 +1,1008 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+
+  <!-- Wireshark -->
+    <Fragment>
+      <DirectoryRef Id="INSTALLFOLDER">
+        <Component Id="cmpWireshark_exe" Guid="*">
+          <File Id="filWireshark_exe" KeyPath="yes" Source="$(var.WiresharkQt.Dir)\Wireshark.exe" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.Wireshark">
+        <ComponentRef Id="cmpWireshark_exe" />
+      </ComponentGroup>
+    </Fragment>
+
+  <!-- Install for every user -->
+    <Fragment>
+      <DirectoryRef Id="INSTALLFOLDER">
+        <Component Id="cmpWiretap_dll" Guid="*">
+          <File Id="filWiretap_dll" KeyPath="yes" Source="$(var.Staging.Dir)\wiretap-$(var.WiretapVersion).dll" />
+        </Component>
+        <?ifdef ENABLE_LIBWIRESHARK?>
+          <Component Id="cmpLibwireshark_dll" Guid="*">
+            <File Id="filLibwireshark_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwireshark.dll" />
+          </Component>
+        <?endif?>
+        <Component Id="cmpLibwscodecs_dll" Guid="*">
+          <File Id="filLibwscodecs_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwscodecs.dll" />
+        </Component>
+        <Component Id="cmpLibwsutil_dll" Guid="*">
+          <File Id="filLibwsutil_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwsutil.dll" />
+        </Component>
+        <Component Id="cmpCOPYING_txt" Guid="*">
+          <File Id="filCOPYING_txt" KeyPath="yes" Source="$(var.Staging.Dir)\COPYING.txt" />
+        </Component>
+        <Component Id="cmpNEWS_txt" Guid="*">
+          <File Id="filNEWS_txt" KeyPath="yes" Source="$(var.Staging.Dir)\NEWS.txt" />
+        </Component>
+        <Component Id="cmpREADME_txt" Guid="*">
+          <File Id="filREADME_txt" KeyPath="yes" Source="$(var.Staging.Dir)\README.txt" />
+        </Component>
+        <Component Id="cmpREADME_windows_txt" Guid="*">
+          <File Id="filREADME_windows_txt" KeyPath="yes" Source="$(var.Staging.Dir)\README.windows.txt" />
+        </Component>
+        <Component Id="cmpAUTHORS_SHORT" Guid="*">
+          <File Id="filAUTHORS_SHORT" KeyPath="yes" Source="$(var.Staging.Dir)\AUTHORS-SHORT" />
+        </Component>
+        <Component Id="cmpManuf" Guid="*">
+          <File Id="filManuf" KeyPath="yes" Source="$(var.Staging.Dir)\manuf" />
+        </Component>
+        <Component Id="cmpServices" Guid="*">
+          <File Id="filServices" KeyPath="yes" Source="$(var.Staging.Dir)\services" />
+        </Component>
+        <Component Id="cmpPdml2html_xsl" Guid="*">
+          <File Id="filPdml2html_xsl" KeyPath="yes" Source="$(var.Staging.Dir)\pdml2html.xsl" />
+        </Component>
+        <Component Id="cmpWs_css" Guid="*">
+          <File Id="filWs_css" KeyPath="yes" Source="$(var.Staging.Dir)\ws.css" />
+        </Component>
+        <Component Id="cmpWireshark_html" Guid="*">
+          <File Id="filWireshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\wireshark.html" />
+        </Component>
+        <Component Id="cmpWireshark_filter_html" Guid="*">
+          <File Id="filWireshark_filter_html" KeyPath="yes" Source="$(var.Staging.Dir)\wireshark-filter.html" />
+        </Component>
+        <Component Id="cmpDumpcap_exe" Guid="*">
+          <File Id="filDumpcap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dumpcap.exe" />
+        </Component>
+        <Component Id="cmpDumpcap_html" Guid="*">
+          <File Id="filDumpcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\dumpcap.html" />
+        </Component>
+        <Component Id="cmpExtcap_html" Guid="*">
+          <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\extcap.html" />
+        </Component>
+        <Component Id="cmpIpmap_html" Guid="*">
+          <File Id="filIpmap_html" KeyPath="yes" Source="$(var.Staging.Dir)\ipmap.html" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.WiresharkRequired">
+        <ComponentRef Id="cmpWiretap_dll" />
+        <?ifdef ENABLE_LIBWIRESHARK?>
+          <ComponentRef Id="cmpLibwireshark_dll" />
+        <?endif?>
+        <ComponentRef Id="cmpLibwscodecs_dll" />
+        <ComponentRef Id="cmpLibwsutil_dll" />
+        <ComponentRef Id="cmpCOPYING_txt" />
+        <ComponentRef Id="cmpNEWS_txt" />
+        <ComponentRef Id="cmpREADME_txt" />
+        <ComponentRef Id="cmpREADME_windows_txt" />
+        <ComponentRef Id="cmpAUTHORS_SHORT" />
+        <ComponentRef Id="cmpManuf" />
+        <ComponentRef Id="cmpServices" />
+        <ComponentRef Id="cmpPdml2html_xsl" />
+        <ComponentRef Id="cmpWs_css" />
+        <ComponentRef Id="cmpWireshark_html" />
+        <ComponentRef Id="cmpWireshark_filter_html" />
+        <ComponentRef Id="cmpDumpcap_exe" />
+        <ComponentRef Id="cmpDumpcap_html" />
+        <ComponentRef Id="cmpExtcap_html" />
+        <ComponentRef Id="cmpIpmap_html" />
+      </ComponentGroup>
+    </Fragment>
+
+  <!-- global config files By design these shouldn't be overwritten if they already exist -->
+    <Fragment>
+      <DirectoryRef Id="INSTALLFOLDER">
+        <Component Id="cmpCfilters" Guid="*">
+          <File Id="filCfilters" KeyPath="yes" Source="$(var.Staging.Dir)\cfilters" />
+        </Component>
+        <Component Id="cmpColorfilters" Guid="*">
+          <File Id="filColorfilters" KeyPath="yes" Source="$(var.Staging.Dir)\colorfilters" />
+        </Component>
+        <Component Id="cmpDfilters" Guid="*">
+          <File Id="filDfilters" KeyPath="yes" Source="$(var.Staging.Dir)\dfilters" />
+        </Component>
+        <Component Id="cmpSmi_modules" Guid="*">
+          <File Id="filSmi_modules" KeyPath="yes" Source="$(var.Staging.Dir)\smi_modules" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.ColorFilters">
+        <ComponentRef Id="cmpCfilters" />
+        <ComponentRef Id="cmpColorfilters" />
+        <ComponentRef Id="cmpDfilters" />
+        <ComponentRef Id="cmpSmi_modules" />
+      </ComponentGroup>
+    </Fragment>
+
+  <!-- dtds -->
+    <Fragment>
+      <DirectoryRef Id="dirDtds">
+        <Component Id="cmpDc_dtd" Guid="*">
+          <File Id="filDc_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\dc.dtd" />
+        </Component>
+        <Component Id="cmpItunes_dtd" Guid="*">
+          <File Id="filItunes_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\itunes.dtd" />
+        </Component>
+        <Component Id="cmpMscml_dtd" Guid="*">
+          <File Id="filMscml_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\mscml.dtd" />
+        </Component>
+        <Component Id="cmpPocsettings_dtd" Guid="*">
+          <File Id="filPocsettings_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\pocsettings.dtd" />
+        </Component>
+        <Component Id="cmpPresence_dtd" Guid="*">
+          <File Id="filPresence_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\presence.dtd" />
+        </Component>
+        <Component Id="cmpReginfo_dtd" Guid="*">
+          <File Id="filReginfo_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\reginfo.dtd" />
+        </Component>
+        <Component Id="cmpRlmi_dtd" Guid="*">
+          <File Id="filRlmi_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\rlmi.dtd" />
+        </Component>
+        <Component Id="cmpRss_dtd" Guid="*">
+          <File Id="filRss_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\rss.dtd" />
+        </Component>
+        <Component Id="cmpSmil_dtd" Guid="*">
+          <File Id="filSmil_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\smil.dtd" />
+        </Component>
+        <Component Id="cmpXcap_caps_dtd" Guid="*">
+          <File Id="filXcap_caps_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\xcap-caps.dtd" />
+        </Component>
+        <Component Id="cmpXcap_error_dtd" Guid="*">
+          <File Id="filXcap_error_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\xcap-error.dtd" />
+        </Component>
+        <Component Id="cmpWatcherinfo_dtd" Guid="*">
+          <File Id="filWatcherinfo_dtd" KeyPath="yes" Source="$(var.Dtds.Dir)\watcherinfo.dtd" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.Dtds">
+        <ComponentRef Id="cmpDc_dtd" />
+        <ComponentRef Id="cmpItunes_dtd" />
+        <ComponentRef Id="cmpMscml_dtd" />
+        <ComponentRef Id="cmpPocsettings_dtd" />
+        <ComponentRef Id="cmpPresence_dtd" />
+        <ComponentRef Id="cmpReginfo_dtd" />
+        <ComponentRef Id="cmpRlmi_dtd" />
+        <ComponentRef Id="cmpRss_dtd" />
+        <ComponentRef Id="cmpSmil_dtd" />
+        <ComponentRef Id="cmpXcap_caps_dtd" />
+        <ComponentRef Id="cmpXcap_error_dtd" />
+        <ComponentRef Id="cmpWatcherinfo_dtd" />
+      </ComponentGroup>
+    </Fragment>
+
+  <!-- TPNCP DAT file -->
+    <Fragment>
+        <DirectoryRef Id="dirTpncp">
+            <Component Id="cmpTpncp_dat" Guid="*">
+                <File Id="filTpncp_dat" KeyPath="yes" Source="$(var.Tpncp.Dir)\tpncp.dat" />
+            </Component>
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="CG.Tpncp">
+            <ComponentRef Id="cmpTpncp_dat" />
+        </ComponentGroup>
+    </Fragment>
+
+  <!-- wimaxasncp TLV definitions -->
+    <Fragment>
+      <DirectoryRef Id="dirWimaxasncp">
+        <Component Id="cmpWimaxasncp_dictionary_xml" Guid="*">
+          <File Id="filWimaxasncp_dictionary_xml" KeyPath="yes" Source="$(var.Wimaxasncp.Dir)\dictionary.xml" />
+        </Component>
+        <Component Id="cmpWimaxasncp_dictionary_dtd" Guid="*">
+          <File Id="filWimaxasncp_dictionary_dtd" KeyPath="yes" Source="$(var.Wimaxasncp.Dir)\dictionary.dtd" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.Wimaxasncp">
+        <ComponentRef Id="cmpWimaxasncp_dictionary_xml" />
+        <ComponentRef Id="cmpWimaxasncp_dictionary_dtd" />
+      </ComponentGroup>
+    </Fragment>
+
+  <!-- Help files -->
+    <Fragment>
+      <DirectoryRef Id="dirHelp">
+        <Component Id="cmpHelp_toc" Guid="*">
+          <File Id="filHelp_toc" KeyPath="yes" Source="$(var.Help.Dir)\toc" />
+        </Component>
+        <Component Id="cmpHelp_overview_txt" Guid="*">
+          <File Id="filHelp_overview_txt" KeyPath="yes" Source="$(var.Help.Dir)\overview.txt" />
+        </Component>
+        <Component Id="cmpHelp_getting_started_txt" Guid="*">
+          <File Id="filHelp_getting_started_txt" KeyPath="yes" Source="$(var.Help.Dir)\getting_started.txt" />
+        </Component>
+        <Component Id="cmpHelp_capturing_txt" Guid="*">
+          <File Id="filHelp_capturing_txt" KeyPath="yes" Source="$(var.Help.Dir)\capturing.txt" />
+        </Component>
+        <Component Id="cmpHelp_capture_filters_txt" Guid="*">
+          <File Id="filHelp_capture_filters_txt" KeyPath="yes" Source="$(var.Help.Dir)\capture_filters.txt" />
+        </Component>
+        <Component Id="cmpHelp_display_filters_txt" Guid="*">
+          <File Id="filHelp_display_filters_txt" KeyPath="yes" Source="$(var.Help.Dir)\display_filters.txt" />
+        </Component>
+        <Component Id="cmpHelp_faq_txt" Guid="*">
+          <File Id="filHelp_faq_txt" KeyPath="yes" Source="$(var.Help.Dir)\faq.txt" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.Help">
+        <ComponentRef Id="cmpHelp_toc" />
+        <ComponentRef Id="cmpHelp_overview_txt" />
+        <ComponentRef Id="cmpHelp_getting_started_txt" />
+        <ComponentRef Id="cmpHelp_capturing_txt" />
+        <ComponentRef Id="cmpHelp_capture_filters_txt" />
+        <ComponentRef Id="cmpHelp_display_filters_txt" />
+        <ComponentRef Id="cmpHelp_faq_txt" />
+      </ComponentGroup>
+    </Fragment>
+
+  <!-- TShark -->
+    <Fragment>
+        <DirectoryRef Id="INSTALLFOLDER">
+            <Component Id="cmpTShark_exe" Guid="*">
+                <File Id="filTShark_exe" KeyPath="yes" Source="$(var.Staging.Dir)\tshark.exe" />
+            </Component>
+            <Component Id="cmpTShark_html" Guid="*">
+                <File Id="filTShark_html" KeyPath="yes" Source="$(var.Staging.Dir)\tshark.html" />
+            </Component>
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="CG.TShark">
+            <ComponentRef Id="cmpTShark_exe" />
+            <ComponentRef Id="cmpTShark_html" />
+        </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">
+      <Directory Id="dirBluetooth" Name="Bluetooth">
+        <Component Id="cmpBluetooth_colorfilters" Guid="*">
+          <File Id="filBluetooth_colorfilters" KeyPath="yes" Source="$(var.Profiles.Dir)\Bluetooth\colorfilters" />
+        </Component>
+      </Directory>
+      <Directory Id="dirClassic" Name="Classic">
+        <Component Id="cmpClassic_colorfilters" Guid="*">
+          <File Id="filClassic_colorfilters" KeyPath="yes" Source="$(var.Profiles.Dir)\Classic\colorfilters" />
+        </Component>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Plugins.ConfigurationProfiles">
+      <ComponentRef Id="cmpBluetooth_colorfilters" />
+      <ComponentRef Id="cmpClassic_colorfilters" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Editcap -->
+  <Fragment>
+      <DirectoryRef Id="INSTALLFOLDER">
+          <Component Id="cmpEditcap_exe" Guid="*">
+              <File Id="filEditcap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\editcap.exe" />
+          </Component>
+          <Component Id="cmpEditcap_html" Guid="*">
+              <File Id="filEditcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\editcap.html" />
+          </Component>
+      </DirectoryRef>
+  </Fragment>
+  <Fragment>
+      <ComponentGroup Id="CG.Tools.Editcap">
+          <ComponentRef Id="cmpEditcap_exe" />
+          <ComponentRef Id="cmpEditcap_html" />
+      </ComponentGroup>
+  </Fragment>
+
+  <!-- Text2Pcap -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpText2pcap_exe" Guid="*">
+        <File Id="filText2pcap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\text2pcap.exe" />
+      </Component>
+      <Component Id="cmpText2pcap_html" Guid="*">
+        <File Id="filText2pcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\text2pcap.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Text2Pcap">
+      <ComponentRef Id="cmpText2pcap_exe" />
+      <ComponentRef Id="cmpText2pcap_html" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Mergecap -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpMergecap_exe" Guid="*">
+        <File Id="filMergecap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\mergecap.exe" />
+      </Component>
+      <Component Id="cmpMergecap_html" Guid="*">
+        <File Id="filMergecap_html" KeyPath="yes" Source="$(var.Staging.Dir)\mergecap.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Mergecap">
+      <ComponentRef Id="cmpMergecap_exe" />
+      <ComponentRef Id="cmpMergecap_html" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Reordercap -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpReordercap_exe" Guid="*">
+        <File Id="filReordercap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.exe" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Reordercap">
+      <ComponentRef Id="cmpMergecap_exe" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Capinfos -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpCapinfos_exe" Guid="*">
+        <File Id="filCapinfos_exe" KeyPath="yes" Source="$(var.Staging.Dir)\capinfos.exe" />
+      </Component>
+      <Component Id="cmpCapinfos_html" Guid="*">
+        <File Id="filCapinfos_html" KeyPath="yes" Source="$(var.Staging.Dir)\capinfos.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Capinfos">
+      <ComponentRef Id="cmpCapinfos_exe" />
+      <ComponentRef Id="cmpCapinfos_html" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Rawshark -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpRawshark_exe" Guid="*">
+        <File Id="filRawshark_exe" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.exe" />
+      </Component>
+      <Component Id="cmpRawshark_html" Guid="*">
+        <File Id="filRawshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Rawshark">
+      <ComponentRef Id="cmpRawshark_exe" />
+      <ComponentRef Id="cmpRawshark_html" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Andrioddump -->
+  <Fragment>
+    <DirectoryRef Id="dirExtcap">
+      <Component Id="cmpAndroiddump_exe" Guid="*">
+        <File Id="filAndroiddump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\androiddump.exe" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpAndroiddump_html" Guid="*">
+        <File Id="filAndroiddump_html" KeyPath="yes" Source="$(var.Staging.Dir)\androiddump.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Androiddump">
+      <ComponentRef Id="cmpAndroiddump_exe" />
+      <ComponentRef Id="cmpAndroiddump_html" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Randpktdump -->
+  <Fragment>
+    <DirectoryRef Id="dirExtcap">
+      <Component Id="cmpRandpktdump_exe" Guid="*">
+        <File Id="filRandpktdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\randpktdump.exe" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpRandpktdump_html" Guid="*">
+        <File Id="filRandpktdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\randpktdump.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Randpktdump">
+      <ComponentRef Id="cmpRandpktdump_exe" />
+      <ComponentRef Id="cmpRandpktdump_html" />
+    </ComponentGroup>
+  </Fragment>
+
+  <!-- Sshdump - WIP: uncomment this section when sshdump on windows will be ready to go
+  <Fragment>
+    <DirectoryRef Id="dirExtcap">
+      <Component Id="cmpSshdump_exe" Guid="*">
+        <File Id="filSshdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\sshdump.exe" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="cmpSshdump_html" Guid="*">
+        <File Id="filSshdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\sshdump.html" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Tools.Randpktdump">
+      <ComponentRef Id="cmpSshdump_exe" />
+      <ComponentRef Id="cmpSshdump_html" />
+    </ComponentGroup>
+  </Fragment>
+  -->
+
+  <?ifdef USER_GUIDE_DIR?>
+    <!-- User Guide -->
+    <Fragment>
+      <DirectoryRef Id="INSTALLFOLDER">
+        <Component Id="cmpUserGuide_chm" Guid="*">
+          <File Id="filUserGuide_chm" KeyPath="yes" Source="$(var.USER_GUIDE_DIR)\user-guide.chm" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.UserGuide">
+        <ComponentRef Id="cmpUserGuide_chm" />
+      </ComponentGroup>
+    </Fragment>
+  <?endif?>
+
+  <!-- Shortcuts -->
+  <Fragment>
+    <ComponentGroup Id="CG.WiresharkStartMenu" Directory="ProgramMenuFolder">
+      <Component Id="cmpWiresharkShortcut">
+        <Shortcut Id="scWireshark" Name="$(var.WiresharkName)" Description="The $(var.WiresharkName) Network Protocol Analyzer" Target="[#filWireshark_exe]" WorkingDirectory="INSTALLFOLDER" />
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="StartMenuShortcut" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_START_MENU = "1"</Condition>
+      </Component>
+    </ComponentGroup>
+    <ComponentGroup Id="CG.WiresharkDesktopIcon" Directory="DesktopFolder">
+      <Component Id="cmpWiresharkDesktopIcon">
+        <Shortcut Id="scWiresharkDesktop" Name="$(var.WiresharkName)" Description="The $(var.WiresharkName) Network Protocol Analyzer" Target="[#filWireshark_exe]" WorkingDirectory="INSTALLFOLDER" />
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="DesktopIcon" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_DESKTOP_ICON = "1"</Condition>
+      </Component>
+    </ComponentGroup>
+    <ComponentGroup Id="CG.WiresharkQuickLaunchIcon" Directory="QuickLaunchFolder">
+      <Component Id="cmpWiresharkQuickLaunchIcon">
+        <Shortcut Id="scWiresharkQuickLaunch" Name="$(var.WiresharkName)" Description="The $(var.WiresharkName) Network Protocol Analyzer" Target="[#filWireshark_exe]" WorkingDirectory="INSTALLFOLDER" />
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="QuickLaunchIcon" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_QUICK_LAUNCH_ICON = "1"</Condition>
+        <!-- Done to keep ICE64 happy -->
+        <RemoveFolder Id="RemoveMicrosoftFolder" Directory="MicrosoftFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveInternetExplorerFolder" Directory="InternetExplorerFolder" On="uninstall" />
+        <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 -->
+  <Fragment>
+    <ComponentGroup Id="CG.WiresharkFileAssociations" Directory="INSTALLFOLDER">
+      <Component Id="cmpFA5vw">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="5vw">
+          <Extension Id="5vw">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="5vw" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAacp">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="acp">
+          <Extension Id="acp">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="acp" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAapc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="apc">
+          <Extension Id="apc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="apc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAatc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="atc">
+          <Extension Id="atc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="atc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAbfr">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="bfr">
+          <Extension Id="bfr">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="bfr" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAcap">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="cap">
+          <Extension Id="cap">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="cap" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAenc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="enc">
+          <Extension Id="enc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="enc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAerf">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="erf">
+          <Extension Id="erf">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="erf" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAfdc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="fdc">
+          <Extension Id="fdc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAmplog">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog">
+          <Extension Id="mplog">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="mplog" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAout">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="out">
+          <Extension Id="out">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFApcap">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap">
+          <Extension Id="pcap">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcap" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFApcapng">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcapng">
+          <Extension Id="pcapng">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFApkt">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt">
+          <Extension Id="pkt">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pkt" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFArf5">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="rf5">
+          <Extension Id="rf5">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="rf5" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAsnoop">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="snoop">
+          <Extension Id="snoop">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="snoop" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAsyc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="syc">
+          <Extension Id="syc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="syc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAtpc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="tpc">
+          <Extension Id="tpc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="tpc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAtr1">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="tr1">
+          <Extension Id="tr1">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="tr1" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAtrace">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="trace">
+          <Extension Id="trace">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="trace" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAtrc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="trc">
+          <Extension Id="trc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="trc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAvwr">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="vwr">
+          <Extension Id="vwr">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="vwr" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAwpc">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="wpc">
+          <Extension Id="wpc">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="wpc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+      <Component Id="cmpFAwpz">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="wpz">
+          <Extension Id="wpz">
+            <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="wpz" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+
+  <?ifdef GTK_DIR?>
+  <!-- File Associations (Wireshark GTK) -->
+  <Fragment>
+    <ComponentGroup Id="CG.WiresharkLegacyFileAssociations" Directory="INSTALLFOLDER">
+      <Component Id="cmpFA5vwLegacy" Guid="829147A9-B694-406D-950F-16DD44F2E138">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="5vw">
+          <Extension Id="5vw">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="5vw" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAacpLegacy" Guid="9D2D4C0B-636E-4A3A-B4A1-32C6FAB2B281">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="acp">
+          <Extension Id="acp">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="acp" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAapcLegacy" Guid="B0C2BB99-28E6-423E-B559-106BA7830D43">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="apc">
+          <Extension Id="apc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="apc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAatcLegacy" Guid="84817B21-9EEB-4D97-A6C9-979B8F5BA29B">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="atc">
+          <Extension Id="atc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="atc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAbfrLegacy" Guid="474A421B-3CFC-40C1-9B29-D817425D79C7">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="bfr">
+          <Extension Id="bfr">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="bfr" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAcapLegacy" Guid="BD5F2AFA-FFD3-4EBE-BB3A-7411D6CC8070">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="cap">
+          <Extension Id="cap">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="cap" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAencLegacy" Guid="DA5961DD-F570-43CB-8AE9-53FE2F40B52D">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="enc">
+          <Extension Id="enc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="enc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAerfLegacy" Guid="{E15ECA19-E201-48D5-9889-A6149C5B428C}">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="erf">
+          <Extension Id="erf">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="erf" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAfdcLegacy" Guid="00381091-977F-4F50-A2CC-BC1C2AACE81F">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="fdc">
+          <Extension Id="fdc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAmplogLegacy" Guid="7AA152AB-1225-466E-8C33-2DF9E6C1CBCE">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog">
+          <Extension Id="mplog">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="mplog" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAoutLegacy" Guid="75E60C7A-758F-45C9-A9CF-6B87F3609229">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="out">
+          <Extension Id="out">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFApcapLegacy" Guid="B419D3B0-2ECA-4F56-A23B-56A9A3FAAB35">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap">
+          <Extension Id="pcap">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcap" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFApcapngLegacy" Guid="5DEBBDAC-4F96-4CBF-A422-B12903ABD433">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcapng">
+          <Extension Id="pcapng">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFApktLegacy" Guid="3BF582A0-771E-4706-8414-975B24B4250B">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt">
+          <Extension Id="pkt">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pkt" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFArf5Legacy" Guid="A781EE08-BD29-4F77-9D8C-006833BF5DD3">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="rf5">
+          <Extension Id="rf5">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="rf5" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAsnoopLegacy" Guid="B5A2660C-5EFA-445A-B951-09033DE98BEB">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="snoop">
+          <Extension Id="snoop">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="snoop" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAsycLegacy" Guid="5727EFC5-A06B-48BE-86BE-8112574E10ED">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="syc">
+          <Extension Id="syc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="syc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAtpcLegacy" Guid="1E8F12E7-0829-409C-B5CC-CE3170CFEBF5">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="tpc">
+          <Extension Id="tpc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="tpc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAtr1Legacy" Guid="303B4418-0812-405A-BCFE-21DE823805D5">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="tr1">
+          <Extension Id="tr1">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="tr1" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAtraceLegacy" Guid="CDBDB7BF-9BA1-4561-A49F-887876B0CAD3">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="trace">
+          <Extension Id="trace">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="trace" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAtrcLegacy" Guid="A1D4B3F3-AC04-4669-9BA7-2FFCD89A02D7">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="trc">
+          <Extension Id="trc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="trc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAvwrLegacy" Guid="2173A6CE-C0E5-455F-8AE3-8614B3A0602D">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="vwr">
+          <Extension Id="vwr">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="vwr" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAwpcLegacy" Guid="34B9D0B5-483B-4906-B786-B3F7C08B28F2">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="wpc">
+          <Extension Id="wpc">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="wpc" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+      <Component Id="cmpFAwpzLegacy" Guid="F5A392F5-0C36-42E3-BF28-9B97F5475F4E">
+        <ProgId Id="$(var.WiresharkFileAssociation)" Description="wpz">
+          <Extension Id="wpz">
+            <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+          </Extension>
+        </ProgId>
+        <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="wpz" Type="integer" Value="1" KeyPath="yes"/>
+        <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+  <?endif?>
+
+  <!-- C-runtime redistributable -->
+  <Fragment>
+    <DirectoryRef Id="TARGETDIR">
+      <Merge Id="VCRedist" SourceFile="$(var.VCRedistDir)\Microsoft_$(var.VCRedistVersion)_CRT_$(var.Platform).msm" DiskId="1" Language="0"/>
+    </DirectoryRef>
+  </Fragment>
+
+</Include>
diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi
new file mode 100644
index 0000000000..6e24e2ce73
--- /dev/null
+++ b/packaging/wix/DirectoryStructure.wxi
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+
+  <!-- Basic directory structure -->
+  <Fragment>
+    <!-- "Special" directory, required for the root drive -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <!-- "Special" directory for desktop -->
+      <Directory Id="DesktopFolder" Name="Desktop"/>
+      <!-- "Special" directory, required for the Program Files folder -->
+      <Directory Id="$(var.PlatformProgramFilesFolder)">
+        <!-- These directories follow the typical hierarchical structure -->
+        <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.WiresharkVersion)"/>
+          </Directory>
+          <Directory Id="dirProfiles" Name="profiles"/>
+          <Directory Id="dirSnmp" Name="snmp">
+            <Directory Id="dirSnmpMibs" Name="mibs"/>
+          </Directory>
+          <Directory Id="dirTpncp" Name="tpncp"/>
+          <Directory Id="dirTranslations" Name="translations"/>
+          <Directory Id="dirWimaxasncp" Name="wimaxasncp"/>
+        </Directory>
+      </Directory>
+
+      <!-- "Special" directory for the Start Menu -->
+      <Directory Id="ProgramMenuFolder">
+        <!-- Shortcuts directly in menu -->
+      </Directory>
+      <!-- "Special" directory for Quick Launch -->
+      <Directory Id="AppDataFolder">
+        <Directory Id="MicrosoftFolder" Name="Microsoft">
+          <Directory Id="InternetExplorerFolder" Name="Internet Explorer">
+            <Directory Id="QuickLaunchFolder" Name="Quick Launch" />
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+  </Fragment>
+</Include>
+\ No newline at end of file
diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi
new file mode 100644
index 0000000000..ba9f0e4765
--- /dev/null
+++ b/packaging/wix/Features.wxi
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+
+  <!-- User-selectable features -->
+  <Fragment>
+    <Feature Id="Fe.Wireshark" Title="$(var.WiresharkName)" Level="1" AllowAdvertise="yes" Display="expand" Description="The main network protocol analyzer application.">
+      <ComponentGroupRef Id="CG.Wireshark" />
+      <ComponentGroupRef Id="CG.QtDependencies" />
+      <ComponentGroupRef Id="CG.QtTranslations" />
+      <ComponentGroupRef Id="CG.WiresharkStartMenu" />
+      <ComponentGroupRef Id="CG.WiresharkDesktopIcon" />
+      <ComponentGroupRef Id="CG.WiresharkQuickLaunchIcon" />
+      <ComponentGroupRef Id="CG.WiresharkFileAssociations" />
+    </Feature>
+    <Feature Id="Fe.WiresharkRequired" Title="Required" Level="1" AllowAdvertise="yes" Display="hidden" Description="Install for every user">
+      <ComponentGroupRef Id="CG.WiresharkRequired" />
+      <ComponentGroupRef Id="CG.ColorFilters" />
+      <ComponentGroupRef Id="CG.Diameter" />
+      <ComponentGroupRef Id="CG.RadiusDict" />
+      <ComponentGroupRef Id="CG.Dtds" />
+      <ComponentGroupRef Id="CG.Tpncp" />
+      <ComponentGroupRef Id="CG.Wimaxasncp" />
+      <ComponentGroupRef Id="CG.Help" />
+      <ComponentGroupRef Id="CG.RequiredDependencies" />
+
+    </Feature>
+    <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="1" 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.">
+        <ComponentGroupRef Id="CG.Plugins.Dissector" />
+      </Feature>
+      <Feature Id="Fe.Plugins.TreeStat" Title="Tree Statistics Plugin" Level="1" AllowAdvertise="yes" Display="expand" Description="Extended statistics.">
+        <ComponentGroupRef Id="CG.Plugins.TreeStat" />
+      </Feature>
+      <Feature Id="Fe.Plugins.Mate" Title="Mate - Meta Analysis and Tracing Engine" Level="1" AllowAdvertise="yes" Display="expand" Description="Plugin - Meta Analysis and Tracing Engine (Experimental).">
+        <ComponentGroupRef Id="CG.Plugins.Mate" />
+      </Feature>
+      <Feature Id="Fe.Plugins.ConfigurationProfiles" Title="Configuration Profiles" Level="1" AllowAdvertise="yes" Display="expand" Description="Configuration Profiles">
+        <!-- XXX - Cleanup configuration profiles directory on uninstall  -->
+        <ComponentGroupRef Id="CG.Plugins.ConfigurationProfiles" />
+      </Feature>
+      <?ifdef SMI_DIR?>
+        <Feature Id="Fe.Plugins.SNMP" Title="SNMP MIBs" Level="1" AllowAdvertise="yes" Display="expand" Description="SNMP MIBs for better SNMP dissection.">
+          <ComponentGroupRef Id="CG.Plugins.SNMP" />
+        </Feature>
+      <?endif?>
+    </Feature>
+    <Feature Id="Fe.Tools" Title="Tools" Level="1" AllowAdvertise="yes" Display="expand" Description="Additional command line based tools.">
+      <Feature Id="Fe.Tools.Editcap" Title="Editcap" Level="1" AllowAdvertise="yes" Display="expand" Description="Copy packets to a new file, optionally trimmming packets, omitting them, or saving to a different format.">
+        <ComponentGroupRef Id="CG.Tools.Editcap" />
+      </Feature>
+      <Feature Id="Fe.Tools.Text2Pcap" Title="Text2Pcap" Level="1" AllowAdvertise="yes" Display="expand" Description="Read an ASCII hex dump and write the data into a libpcap-style capture file.">
+        <ComponentGroupRef Id="CG.Tools.Text2Pcap" />
+      </Feature>
+      <Feature Id="Fe.Tools.Mergecap" Title="Mergecap" Level="1" AllowAdvertise="yes" Display="expand" Description="Combine multiple saved capture files into a single output file.">
+        <ComponentGroupRef Id="CG.Tools.Mergecap" />
+      </Feature>
+      <Feature Id="Fe.Tools.Reordercap" Title="Reordercap" Level="1" AllowAdvertise="yes" Display="expand" Description="Copy packets to a new file, sorted by time.">
+        <ComponentGroupRef Id="CG.Tools.Reordercap" />
+      </Feature>
+      <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.Rawshark" Title="Rawshark" Level="1" AllowAdvertise="yes" Display="expand" Description="Raw packet filter.">
+        <ComponentGroupRef Id="CG.Tools.Rawshark" />
+      </Feature>
+      <Feature Id="Fe.Tools.Androiddump" Title="Androiddump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide capture interfaces from Android devices.">
+        <ComponentGroupRef Id="CG.Tools.Androiddump" />
+      </Feature>
+      <Feature Id="Fe.Tools.Randpktdump" Title="Randpktdump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide random packet generator.">
+        <ComponentGroupRef Id="CG.Tools.Randpktdump" />
+      </Feature>
+      <!-- WIP: uncomment this section when sshdump on windows will be ready to go
+      <Feature Id="Fe.Tools.Sshdump" Title="Sshdump" Level="1" AllowAdvertise="no" Display="expand" Description="Provide remote capture through SSH.">
+        <ComponentGroupRef Id="CG.Tools.Sshdump" />
+      </Feature>
+        -->
+    </Feature>
+    <?ifdef USER_GUIDE_DIR?>
+      <Feature Id="Fe.UserGuide" Title="User's Guide" Level="1" AllowAdvertise="yes" Display="expand" Description="Install an offline copy of the User's Guide.">
+        <ComponentGroupRef Id="CG.UserGuide" />
+      </Feature>
+    <?endif?>
+    <Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAdvertise="no" Display="hidden" Level="1">
+      <MergeRef Id="VCRedist"/>
+    </Feature>
+  </Fragment>
+</Include>
diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi
new file mode 100644
index 0000000000..c85863162a
--- /dev/null
+++ b/packaging/wix/InputPaths.wxi
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+
+  <?if $(var.Platform) = x64 ?>
+  <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+  <?else?>
+  <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+  <?endif?>
+
+  <?define VCRedist.Version = "VC120" ?>
+  <?define VCRedist.Dir ="C:\Program Files (x86)\Common Files\Merge Modules\" ?>
+
+  <?define Staging.Dir ="$(var.BuildOutputDir)" ?>
+  <?define Plugins.Dir ="$(var.Staging.Dir)\plugins" ?>
+  <?define Profiles.Dir ="$(var.Staging.Dir)\profiles" ?>
+  <?define Extcap.Dir ="$(var.Staging.Dir)\extcap" ?>
+  <?define WiresharkQt.Dir ="$(var.Staging.Dir)" ?>
+  <?define Dtds.Dir ="$(var.Staging.Dir)\dtds" ?>
+  <?define Tpncp.Dir ="$(var.Staging.Dir)\tpncp" ?>
+  <?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>
diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi
new file mode 100644
index 0000000000..7964e27465
--- /dev/null
+++ b/packaging/wix/Plugins.wxi
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+
+  <!-- Plugins -->
+    <Fragment>
+        <DirectoryRef Id="dirPluginsVersion">
+            <Component Id="cmpDocsis_dll" Guid="*">
+                <File Id="filDocsis_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\docsis.dll" />
+            </Component>
+            <Component Id="cmpEthercat_dll" Guid="*">
+                <File Id="filEthercat_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\ethercat.dll" />
+            </Component>
+            <Component Id="cmpGryphon_dll" Guid="*">
+                <File Id="filGryphon_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\gryphon.dll" />
+            </Component>
+            <Component Id="cmpIrda_dll" Guid="*">
+                <File Id="filIrda_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\irda.dll" />
+            </Component>
+            <Component Id="cmpM2m_dll" Guid="*">
+                <File Id="filM2m_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\m2m.dll" />
+            </Component>
+            <Component Id="cmpOpcua_dll" Guid="*">
+                <File Id="filOpcua_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\opcua.dll" />
+            </Component>
+            <Component Id="cmpProfinet_dll" Guid="*">
+                <File Id="filProfinet_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\profinet.dll" />
+            </Component>
+            <Component Id="cmpUnistim_dll" Guid="*">
+                <File Id="filUnistim_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\unistim.dll" />
+            </Component>
+            <Component Id="cmpWimax_dll" Guid="*">
+                <File Id="filWimax_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\wimax.dll" />
+            </Component>
+            <Component Id="cmpWimaxasmcp_dll" Guid="*">
+                <File Id="filWimaxasmcp_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\wimaxasncp.dll" />
+            </Component>
+            <Component Id="cmpWimaxmacphy_dll" Guid="*">
+                <File Id="filWimaxmacphy_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\wimaxmacphy.dll" />
+            </Component>
+          <!-- Add custom plugin Components here -->
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="CG.Plugins.Dissector">
+            <ComponentRef Id="cmpDocsis_dll" />
+            <ComponentRef Id="cmpEthercat_dll" />
+            <ComponentRef Id="cmpGryphon_dll" />
+            <ComponentRef Id="cmpIrda_dll" />
+            <ComponentRef Id="cmpM2m_dll" />
+            <ComponentRef Id="cmpOpcua_dll" />
+            <ComponentRef Id="cmpProfinet_dll" />
+            <ComponentRef Id="cmpUnistim_dll" />
+            <ComponentRef Id="cmpWimax_dll" />
+            <ComponentRef Id="cmpWimaxasmcp_dll" />
+            <ComponentRef Id="cmpWimaxmacphy_dll" />
+            <!-- Add custom plugin ComponentRefs here -->
+        </ComponentGroup>
+    </Fragment>
+
+    <!-- Stats Tree -->
+    <Fragment>
+        <DirectoryRef Id="dirPluginsVersion">
+          <Component Id="cmpStatsTree_dll" Guid="*">
+            <File Id="filStatsTree_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\stats_tree.dll" />
+          </Component>
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="CG.Plugins.TreeStat">
+            <ComponentRef Id="cmpStatsTree_dll" />
+        </ComponentGroup>
+    </Fragment>
+
+  <!-- MATE -->
+  <Fragment>
+    <DirectoryRef Id="dirPluginsVersion">
+      <Component Id="cmpMate_dll" Guid="*">
+        <File Id="filMate_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\mate.dll" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Plugins.Mate">
+      <ComponentRef Id="cmpMate_dll" />
+    </ComponentGroup>
+  </Fragment>
+
+</Include>
diff --git a/packaging/wix/Prerequisites.wxi b/packaging/wix/Prerequisites.wxi
new file mode 100644
index 0000000000..820d167b87
--- /dev/null
+++ b/packaging/wix/Prerequisites.wxi
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+
+  <!-- Check for required dependencies here -->
+  <Fragment>
+
+    <!-- Do not remove: The contents of this "fragment" will not be included in the project,
+         unless we reference at least one item defined within it.
+         This "IncludePrerequisites" property is referenced in the "Product" element,
+         to ensure the entire fragment is included. -->
+    <Property Id="IncludePrerequisites">1</Property>
+
+    <Condition Message="Windows 2000 is no longer supported. Please install $(var.WiresharkName) 1.2 or 1.0 instead.">
+      <![CDATA[Installed OR (VersionNT < 500) OR (VersionNT > 500)]]>
+    </Condition>
+
+    <Condition Message="WindowsXP is no longer supported. Please install $(var.WiresharkName) 1.12 or 1.10 instead.">
+      <![CDATA[Installed OR (VersionNT < 501) OR (VersionNT > 501)]]>
+    </Condition>
+
+    <Condition Message="Windows Server 2003 is no longer supported. Please install $(var.WiresharkName) 1.12 or 1.10 instead.">
+      <![CDATA[Installed OR (VersionNT < 502) OR (VersionNT > 502)]]>
+    </Condition>
+
+    <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows Vista, Windows Server 2008, or higher.">
+      <![CDATA[Installed OR (VersionNT >= 600)]]>
+    </Condition>
+
+  </Fragment>
+</Include>
diff --git a/packaging/wix/README b/packaging/wix/README
new file mode 100644
index 0000000000..57ae2fefc8
--- /dev/null
+++ b/packaging/wix/README
@@ -0,0 +1,36 @@
+WiX installer for Wireshark
+
+This is currently an experimental feature to provide Wireshark with an .msi installer.
+It is intended to replace the NSIS installer, but needs to be a little more complete
+before doing so.
+
+(Developer) Differences/notes compared to NSIS installer:
+1. You need the WiX toolset to build the installer.  See http://wixtoolset.org/releases/
+(v3.10 is recommended)
+2. SNMP, Radius, Diameter, and Qt translations files are harvested to be included in
+the installer.  Any custom/additional files just need to be written to the appropriate
+build output directory and the installer will pick them up.  NSIS required modifying
+a file (custom_mibs.txt, etc) for inclusion
+3. Plugin DLLs are not automatically harvested.  To include your DLL, modify Plugins.wxi
+4. To build the WiX installer run:
+> msbuild /m /p:Configuration=RelWithDebInfo wix_package_prep.vcxproj
+> msbuild /m /p:Configuration=RelWithDebInfo wix_package.vcxproj
+
+
+Known issues:
+1. It does not include installing WinPcap or USBPcap (the NSIS installer does).  These
+currently come as NSIS installers and it seems it would make more sense to "bundle" them
+with WiX rather than include them as part of the Wireshark.msi.
+2. Installer needs to be customized to include Wireshark graphics.
+3. Needs more flexible handling of VC CRT Merge module (need build script to provide
+appropriate macros).  Something like (or modifying existing) FindMSVC_REDIST.cmake.
+Currently only VS2013 CRT120 is supported.
+4. Uninstalling previous versions.  NSIS installer did things more "manually" than Wix does
+by default.  Need to merge as best as possible to handle backwards compatibility. The .msi
+architecture uses an "UpgradeCode" help facilitate install/uninstall/upgrade and NSIS
+installer doesn't have that.  The NSIS installer also removed whole directories instead of
+just removing what it installed (still not sure if this is better or worse)
+
+
+Patches welcome to address any of the issues above or improvements you think can be
+made.
diff --git a/packaging/wix/UserInterface.wxi b/packaging/wix/UserInterface.wxi
new file mode 100644
index 0000000000..8e10bb07aa
--- /dev/null
+++ b/packaging/wix/UserInterface.wxi
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <!-- Define the appearance, sequence, and available options in the user interface -->
+  <Fragment>
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.EulaPath)" />
+
+    <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
+
+    <!-- This UI identifier will be used in the product definition-->
+    <UI Id="UI.Wireshark">
+
+      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" ></Property>
+      <UIRef Id="WiresharkWixUI" />
+    </UI>
+  </Fragment>
+</Include>
diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs
new file mode 100644
index 0000000000..b0479dd7c3
--- /dev/null
+++ b/packaging/wix/Wireshark.wxs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <?define WiresharkFileAssociation = "wireshark-capture-file" ?>
+
+  <!-- The path to the installer's End-User License Agreement, displayed during installation -->
+  <?define EulaPath="$(var.EulaDir)\COPYING.rtf"?>
+
+  <Product Id="*" Name="$(var.WiresharkName) $(var.WiresharkVersion)" Language="1033" Version="$(var.WiresharkVersion)" Manufacturer="The Wireshark developer community, http://www.wireshark.org/" UpgradeCode="0d67aace-269a-4264-81a3-da8055c1c79c">
+        <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" />
+    <!-- Values for Additional Tasks -->
+    <Property Id="WIRESHARK_START_MENU" Value="1" Secure="yes"/>
+    <Property Id="WIRESHARK_DESKTOP_ICON" Secure="yes"/>
+    <Property Id="WIRESHARK_QUICK_LAUNCH_ICON" Value="1" Secure="yes" />
+    <Property Id="WIRESHARK_LEGACY_START_MENU" Value="1" Secure="yes" />
+    <Property Id="WIRESHARK_LEGACY_DESKTOP_ICON" Secure="yes"/>
+    <Property Id="WIRESHARK_LEGACY_QUICK_LAUNCH_ICON" Value="1" Secure="yes" />
+    <Property Id="WIRESHARK_FILE_EXTENSIONS" Value="0"/>
+
+    <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.WiresharkName) is already installed." />
+        <MediaTemplate EmbedCab="yes" />
+
+    <!-- Include the prerequisites, by referencing the placeholder property -->
+    <PropertyRef Id="IncludePrerequisites" />
+
+    <!-- Include the top-most parent feature -->
+    <FeatureRef Id="Fe.Wireshark" />
+
+    <!-- Include the installer UI definition -->
+    <UIRef Id="UI.Wireshark"/>
+  </Product>
+
+  <?include InputPaths.wxi ?>
+  <?include DirectoryStructure.wxi ?>
+  <?include Prerequisites.wxi ?>
+  <?include ComponentGroups.wxi ?>
+  <?include Plugins.wxi ?>
+  <?include Features.wxi ?>
+  <?include UserInterface.wxi ?>
+</Wix>
+\ No newline at end of file
diff --git a/packaging/wix/WiresharkOptionsDlg.wxs b/packaging/wix/WiresharkOptionsDlg.wxs
new file mode 100644
index 0000000000..aa89e864f1
--- /dev/null
+++ b/packaging/wix/WiresharkOptionsDlg.wxs
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+        <UI>
+            <Dialog Id="WiresharkOptionsDlg" Width="370" Height="320" Title="!(loc.LicenseAgreementDlg_Title)">
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="Which additional tasks should be done?" />
+                <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="Select Additional Tasks" />
+
+                <Control Id="Shortcuts" Type="GroupBox" X="15" Y="50" Width="250" Height="125" Text="Create Shortcuts"/>
+                <Control Id="WiresharkStartMenuCB" Type="CheckBox" X="20" Y="65" Width="180" Height="15" CheckBoxValue="1"  Property="WIRESHARK_START_MENU" Text="Wireshark Start Menu Item" />
+                <Control Id="WiresharkDesktopIconCB" Type="CheckBox" X="20" Y="83" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_DESKTOP_ICON" Text="Wireshark Desktop Icon" />
+                <Control Id="WiresharkQuickLaunchIconCB" Type="CheckBox" X="20" Y="101" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_QUICK_LAUNCH_ICON" Text="Wireshark Quick Launch Icon" />
+                <Control Id="WiresharkLegacyStartMenuCB" Type="CheckBox" X="20" Y="117" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_START_MENU" Text="Wireshark Legacy Start Menu Item" />
+                <Control Id="WiresharkLegacyDesktopIconCB" Type="CheckBox" X="20" Y="135" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_DESKTOP_ICON" Text="Wireshark Legacy Desktop Icon" />
+                <Control Id="WiresharkLegacyQuickLaunchIconCB" Type="CheckBox" X="20" Y="153" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_QUICK_LAUNCH_ICON" Text="Wireshark Legacy Quick Launch Icon" />
+
+                <Control Id="FileExtensions" Type="GroupBox" X="15" Y="180" Width="250" Height="100" Text="File Extensions"/>
+                <Control Id="FileExtensionsRadio" Type="RadioButtonGroup"  X="20" Y="190" Width="235" Height="50" Property="WIRESHARK_FILE_EXTENSIONS">
+                  <RadioButtonGroup Property="WIRESHARK_FILE_EXTENSIONS">
+                    <RadioButton Value="0" X="5" Y="5" Height="15" Width="235" Text="Associate trace file extensions to Wireshark" />
+                    <RadioButton Value="1" X="5" Y="20" Height="15" Width="235" Text="Associate trace file extensions to Wireshark Legacy" />
+                    <RadioButton Value="2" X="5" Y="35" Height="15" Width="235" Text="None" />
+                  </RadioButtonGroup>
+                </Control>
+                <Control Id="FileExtensionsText1" Type="Text" X="20" Y="250" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, mplog, out, pcap," />
+                <Control Id="FileExtensionsText2" Type="Text" X="20" Y="265" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz" />
+
+                <Control Id="BottomLine" Type="Line" X="0" Y="284" Width="370" Height="0" />
+                <Control Id="Back" Type="PushButton" X="180" Y="293" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+                <Control Id="Next" Type="PushButton" X="236" Y="293" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"/>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="293" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
+\ No newline at end of file
diff --git a/packaging/wix/WiresharkWixUI.wxs b/packaging/wix/WiresharkWixUI.wxs
new file mode 100644
index 0000000000..789dccd6ba
--- /dev/null
+++ b/packaging/wix/WiresharkWixUI.wxs
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  <copyright file="WixUI_FeatureTree.wxs" company="Outercurve Foundation">
+    Copyright (c) 2004, Outercurve Foundation.
+    This software is released under Microsoft Reciprocal License (MS-RL).
+    The license and further copyright text can be found in the file
+    LICENSE.TXT at the root directory of the distribution.
+  </copyright>
+-->
+
+<!--
+First-time install dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_LicenseAgreementDlg
+ - WixUI_CustomizeDlg
+ - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+
+Maintenance dialog sequence:
+ - WixUI_MaintenanceWelcomeDlg
+ - WixUI_MaintenanceTypeDlg
+ - WixUI_CustomizeDlg
+ - WixUI_VerifyReadyDlg
+
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI Id="WiresharkWixUI">
+            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+            <Property Id="WixUI_Mode" Value="FeatureTree" />
+
+            <DialogRef Id="ErrorDlg" />
+            <DialogRef Id="FatalError" />
+            <DialogRef Id="FilesInUse" />
+            <DialogRef Id="MsiRMFilesInUse" />
+            <DialogRef Id="PrepareDlg" />
+            <DialogRef Id="ProgressDlg" />
+            <DialogRef Id="ResumeDlg" />
+            <DialogRef Id="UserExit" />
+
+            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+            <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+            <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg">LicenseAccepted = "1"</Publish>
+
+            <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish>
+            <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed</Publish>
+            <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="WiresharkOptionsDlg">1</Publish>
+
+            <Publish Dialog="WiresharkOptionsDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+            <Publish Dialog="WiresharkOptionsDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+
+            <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WiresharkOptionsDlg">1</Publish>
+            <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+            <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish>
+
+            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+            <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+        </UI>
+
+        <UIRef Id="WixUI_Common" />
+    </Fragment>
+</Wix>
+\ No newline at end of file
diff --git a/packaging/wix/gpl-2.0.rtf b/packaging/wix/gpl-2.0.rtf
deleted file mode 100644
index a66e14b32b..0000000000
--- a/packaging/wix/gpl-2.0.rtf
+++ /dev/null
@@ -1,101 +0,0 @@
-{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}
-{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
-\widowctrl\hyphauto
-
-{\pard \qc \f0 \sa180 \li0 \fi0 \b \fs36 GNU General Public License v2.0 - GNU Project - Free Software Foundation (FSF)\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 GNU GENERAL PUBLIC LICENSE\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Version 2, June 1991\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Copyright (C) 1989, 1991 Free Software Foundation, Inc.  \line
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\line
-\line
-Everyone is permitted to copy and distribute verbatim copies\line
-of this license document, but changing it is not allowed.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 Preamble\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The precise terms and conditions for copying, distribution and modification follow.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 0.} This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 1.} You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 2.} You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\par}
-{\pard \ql \f0 \sa0 \li0 \fi0 \par}
-{\pard \ql \f0 \sa0 \li360 \fi0 {\b a)} You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\par}
-{\pard \ql \f0 \sa0 \li0 \fi0 \par}
-{\pard \ql \f0 \sa0 \li360 \fi0 {\b b)} You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\par}
-{\pard \ql \f0 \sa0 \li0 \fi0 \par}
-{\pard \ql \f0 \sa0 \li360 \fi0 {\b c)} If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\sa180\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 3.} You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\par}
-{\pard \ql \f0 \sa0 \li0 \fi0 \par}
-{\pard \ql \f0 \sa0 \li360 \fi0 {\b a)} Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
-{\pard \ql \f0 \sa0 \li0 \fi0 \par}
-{\pard \ql \f0 \sa0 \li360 \fi0 {\b b)} Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
-{\pard \ql \f0 \sa0 \li0 \fi0 \par}
-{\pard \ql \f0 \sa0 \li360 \fi0 {\b c)} Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\sa180\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 4.} You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 5.} You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 6.} Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 7.} If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 8.} If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 9.} The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 10.} If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b NO WARRANTY}\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 11.} BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b 12.} IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 END OF TERMS AND CONDITIONS\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 How to Apply These Terms to Your New Programs\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \f1 one line to give the program's name and an idea of what it does.\line
-Copyright (C) yyyy  name of author\line
-\line
-This program is free software; you can redistribute it and/or\line
-modify it under the terms of the GNU General Public License\line
-as published by the Free Software Foundation; either version 2\line
-of the License, or (at your option) any later version.\line
-\line
-This program is distributed in the hope that it will be useful,\line
-but WITHOUT ANY WARRANTY; without even the implied warranty of\line
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\line
-GNU General Public License for more details.\line
-\line
-You should have received a copy of the GNU General Public License\line
-along with this program; if not, write to the Free Software\line
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Gnomovision version 69, Copyright (C) year name of author\line
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details\line
-type `show w'.  This is free software, and you are welcome\line
-to redistribute it under certain conditions; type `show c' \line
-for details.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Yoyodyne, Inc., hereby disclaims all copyright\line
-interest in the program `Gnomovision'\line
-(which makes passes at compilers) written \line
-by James Hacker.\line
-\line
-signature of Ty Coon, 1 April 1989\line
-Ty Coon, President of Vice\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/lgpl.html"}}{\fldrslt{\ul
-GNU Lesser General Public License
-}}}
- instead of this License.\par}
-}
diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1
new file mode 100644
index 0000000000..7623e5d2c4
--- /dev/null
+++ b/packaging/wix/windeployqt-to-wix.ps1
@@ -0,0 +1,240 @@
+# windeployqt-to-wix
+#
+# Windeployqt-to-wix - Convert the output of windeployqt to an equivalent set of
+# Wix file and component statements.
+#
+# Copyright 2016 Michael Mann
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#requires -version 2
+
+<#
+.SYNOPSIS
+Creates Wix components required for Qt packaging.
+
+.DESCRIPTION
+This script creates an Wix-compatible include file based on the following Qt
+versions:
+
+  - 5.3 and later: A list of DLLs and directories based on the output of the
+    "windeployqt" utility. Windeployqt lists the DLLs required to run a Qt
+    application. (The initial version that shipped with Qt 5.2 is unusable.)
+
+  - 5.2 and earlier: A hard-coded list of Qt DLLs and directories appropriate
+    for earlier Qt versions.
+
+  - None: A dummy file.
+
+If building with Qt, QMake must be in your PATH.
+
+.PARAMETER Executable
+The path to a Qt application. It will be examined for dependent DLLs.
+
+.PARAMETER FilePath
+Output filename.
+
+.INPUTS
+-Executable Path to the Qt application.
+-FilePath Output Wix include file.
+
+.OUTPUTS
+Wix file required to package supporting DLLs.
+
+.EXAMPLE
+C:\PS> .\windeployqt-to-wix.ps1 windeployqt.exe ..\..\staging\wireshark.exe qt-dll-manifest.wxs
+#>
+
+Param(
+    [Parameter(Mandatory=$true, Position=0)]
+    [String] $Executable,
+
+    [Parameter(Position=1)]
+    [String] $FilePath = "qt-dll-manifest.wxs"
+)
+
+
+try {
+    $qtVersion = [version](qmake -query QT_VERSION)
+    $wixComponents = "<Wix xmlns=`"http://schemas.microsoft.com/wix/2006/wi`">
+<?include InputPaths.wxi ?>
+"
+    $wixComponents += @("<!-- Qt version " + $qtVersion ; "-->
+")
+
+    if ($qtVersion -ge "5.3") {
+        # Qt 5.3 or later. Windeployqt is present and works
+
+        $wdqtList = windeployqt `
+            --release `
+            --no-compiler-runtime `
+            --list relative `
+            $Executable
+
+        $dllPath = Split-Path -Parent $Executable
+
+        $dllList = "   <Fragment>
+     <DirectoryRef Id=`"INSTALLFOLDER`">
+"
+        $dirList = ""
+		$currentDir = ""
+		$startDirList = "   <Fragment>
+     <DirectoryRef Id=`"INSTALLFOLDER`">
+"
+		$endDirList = "       </Directory>
+     </DirectoryRef>
+   </Fragment>
+"
+		$currentDirList = $startDirList
+
+        $componentGroup = "   <Fragment>
+      <ComponentGroup Id=`"CG.QtDependencies`">
+"
+        foreach ($entry in $wdqtList) {
+            $dir = Split-Path -Parent $entry
+            if ($dir) {
+				if ($dir -ne $currentDir) {
+					if ($currentDir -ne "") { # for everything but first directory found
+						$currentDirList += $endDirList
+
+						# Previous directory complete, add to list
+						$dirList += $currentDirList
+					} else {
+					}
+
+					$currentDirList = $startDirList + "       <Directory Id=`"dir$dir`" Name=`"$dir`">
+"
+
+					$currentDir = $dir
+				}
+
+
+				$wix_name = $entry -replace "[\\|\.]", "_"
+                $currentDirList += "           <Component Id=`"cmp$wix_name`" Guid=`"*`">
+              <File Id=`"fil$wix_name`" KeyPath=`"yes`" Source=`"`$(var.Staging.Dir)\$entry`" />
+           </Component>
+"
+				$componentGroup += "         <ComponentRef Id=`"cmp$wix_name`" />
+"
+            } else {
+
+               $dllList += "       <Component Id=`"cmp$entry`" Guid=`"*`">
+          <File Id=`"fil$entry`" KeyPath=`"yes`" Source=`"`$(var.Staging.Dir)\$entry`" />
+       </Component>
+"
+			  $componentGroup += "         <ComponentRef Id=`"cmp$entry`" />
+"
+            }
+        }
+
+		#finish up the last directory
+		$currentDirList += $endDirList
+		$dirList += $currentDirList
+
+		$dllList += "     </DirectoryRef>
+   </Fragment>
+"
+		$componentGroup += "      </ComponentGroup>
+   </Fragment>
+"
+
+        $wixComponents += $dllList + $dirList + $componentGroup
+
+    } elseif ($qtVersion -ge "5.0") {
+        # Qt 5.0 - 5.2. Windeployqt is buggy or not present
+
+        $wixComponents += @"
+    <Fragment>
+      <DirectoryRef Id=`"INSTALLFOLDER`">
+        <Component Id=`"cmpQt5Core_dll`" Guid=`"*`">
+          <File Id=`"filQt5Core_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\Qt5Core.dll`" />
+        </Component>
+        <Component Id=`"cmpQt5Gui_dll`" Guid=`"*`">
+          <File Id=`"filQt5Gui_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\Qt5Gui.dll`" />
+        </Component>
+        <Component Id=`"cmpQt5Widgets_dll`" Guid=`"*`">
+          <File Id=`"filQt5Widgets_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\Qt5Widgets.dll`" />
+        </Component>
+        <Component Id=`"cmpQt5PrintSupport_dll`" Guid=`"*`">
+          <File Id=`"filQt5PrintSupport_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\Qt5PrintSupport.dll`" />
+        </Component>
+        <Component Id=`"cmpQwindows_dll`" Guid=`"*`">
+          <File Id=`"filQwindows_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\platforms\qwindows.dll`" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id=`"CG.QtDependencies`">
+          <ComponentRef Id=`"cmpQt5Core_dll`" />
+          <ComponentRef Id=`"cmpQt5Gui_dll`" />
+          <ComponentRef Id=`"cmpQt5Widgets_dll`" />
+          <ComponentRef Id=`"cmpQt5PrintSupport_dll`" />
+          <ComponentRef Id=`"cmpQwindows_dll`" />
+        </ComponentGroup>
+    </Fragment>
+"@
+
+    } else {
+        # Assume Qt 4
+
+        $wixComponents += @"
+    <Fragment>
+      <DirectoryRef Id=`"INSTALLFOLDER`">
+        <Component Id=`"cmpQt4Core_dll`" Guid=`"*`">
+          <File Id=`"filQt4Core_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\QtCore4.dll`" />
+        </Component>
+        <Component Id=`"cmpQt4Gui_dll`" Guid=`"*`">
+          <File Id=`"filQt4Gui_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\QtGui4.dll`" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id=`"CG.QtDependencies`">
+          <ComponentRef Id=`"cmpQt4Core_dll`" />
+          <ComponentRef Id=`"cmpQt4Gui_dll`" />
+        </ComponentGroup>
+    </Fragment>
+"@
+
+    }
+
+    $wixComponents += @"
+</Wix>
+"@
+
+}
+
+catch {
+
+    $wixComponents = "<?xml version=`"1.0`" encoding=`"utf-8`"?>
+<Include>
+<!--- Qt not configured -->
+</Include>
+"
+
+}
+
+Set-Content $FilePath @"
+<?xml version=`"1.0`" encoding=`"utf-8`"?>
+<!--
+   Automatically generated by $($MyInvocation.MyCommand.Name)
+-->
+"@
+
+Add-Content $FilePath $wixComponents
+\ No newline at end of file
author	Michael Mann <mmann78@netscape.net>	2016-04-07 19:03:51 -0400
committer	Michael Mann <mmann78@netscape.net>	2016-05-11 13:09:17 +0000
commit	c34996f970ab003bb8566825b38834de00f5159e (patch)
tree	fda0c581d87baf3cb0264affaaeb861354f66311 /packaging/wix
parent	980f58bc277df178a15b4c730fb1b0cbd462da0b (diff)
download	wireshark-c34996f970ab003bb8566825b38834de00f5159e.tar.gz