WiX banner and dialog images.

Add initial Wireshark-branded artwork to the WiX installer.

Change-Id: I1997023784112890f5366a577ca3b8101be530da
Reviewed-on: https://code.wireshark.org/review/15383
Reviewed-by: Michael Mann <mmann78@netscape.net>

8 files changed, 161 insertions, 6 deletions

diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 856d2e1e0d..9d14c0ee62 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -301,7 +301,7 @@ set(WIX_CANDLE_DEFINES
 	-dWiresharkName=${CMAKE_PROJECT_NAME}
 	-dWiresharkVersion=${PRODUCT_VERSION}
 	-dWiretapVersion=${WTAP_VERSION}
-	-dEulaDir=${CMAKE_SOURCE_DIR}/packaging/wix
+	-dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix
 	-dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}
 	-dVCRedistVersion=${MSVC_CRT_VERSION}
 	-dVCRedistDir=${MSVC_REDIST_DIR}
diff --git a/packaging/wix/README b/packaging/wix/README
index 57ae2fefc8..e851082aeb 100644
--- a/packaging/wix/README
+++ b/packaging/wix/README
@@ -21,11 +21,10 @@ 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
+2. 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
+3. 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
diff --git a/packaging/wix/UserInterface.wxi b/packaging/wix/UserInterface.wxi
index 8e10bb07aa..114efb68f8 100644
--- a/packaging/wix/UserInterface.wxi
+++ b/packaging/wix/UserInterface.wxi
@@ -3,7 +3,8 @@
   <!-- Define the appearance, sequence, and available options in the user interface -->
   <Fragment>
     <WixVariable Id="WixUILicenseRtf" Value="$(var.EulaPath)" />
-
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.BannerImagePath)" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.DialogImagePath)" />
     <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
 
     <!-- This UI identifier will be used in the product definition-->
diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs
index b0479dd7c3..fc9027a414 100644
--- a/packaging/wix/Wireshark.wxs
+++ b/packaging/wix/Wireshark.wxs
@@ -4,7 +4,10 @@
   <?define WiresharkFileAssociation = "wireshark-capture-file" ?>
 
   <!-- The path to the installer's End-User License Agreement, displayed during installation -->
-  <?define EulaPath="$(var.EulaDir)\COPYING.rtf"?>
+  <?define EulaPath="$(var.AssetDir)\COPYING.rtf"?>
+  <!-- Windows 8 and later supports PNG. Until then we use cave paintings^W^W BMP. -->
+  <?define BannerImagePath="$(var.AssetDir)\banner.bmp"?>
+  <?define DialogImagePath="$(var.AssetDir)\dialog.bmp"?>
 
   <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" />
diff --git a/packaging/wix/banner.bmp b/packaging/wix/banner.bmp
new file mode 100755
index 0000000000..10ab9e600e
--- /dev/null
+++ b/packaging/wix/banner.bmp
diff --git a/packaging/wix/banner.svg b/packaging/wix/banner.svg
new file mode 100644
index 0000000000..4bacfe5a45
--- /dev/null
+++ b/packaging/wix/banner.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="493"
+   height="58"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="banner.svg"
+   viewBox="0 0 493 58"
+   inkscape:export-filename="/tmp/banner.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.8356998"
+     inkscape:cx="246.5"
+     inkscape:cy="29"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="398"
+     inkscape:window-y="899"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-994.36218)">
+    <image
+       xlink:href="../../image/wsiconinst48.png"
+       width="48"
+       height="48"
+       preserveAspectRatio="none"
+       id="image4971"
+       x="440"
+       y="999.36218" />
+  </g>
+</svg>
diff --git a/packaging/wix/dialog.bmp b/packaging/wix/dialog.bmp
new file mode 100755
index 0000000000..f6a704a348
--- /dev/null
+++ b/packaging/wix/dialog.bmp
diff --git a/packaging/wix/dialog.svg b/packaging/wix/dialog.svg
new file mode 100644
index 0000000000..1754c805f0
--- /dev/null
+++ b/packaging/wix/dialog.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="500"
+   height="314"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="dialog.svg"
+   viewBox="0 0 500 314"
+   inkscape:export-filename="/tmp/dialog.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.824"
+     inkscape:cx="248.78641"
+     inkscape:cy="157"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="251"
+     inkscape:window-y="882"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-738.36218)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4907"
+       width="163"
+       height="313"
+       x="0.5"
+       y="738.86218" />
+    <image
+       xlink:href="../../image/wsiconinst128.png"
+       width="128"
+       height="128"
+       preserveAspectRatio="none"
+       id="image4904"
+       x="18"
+       y="756.36218" />
+    <rect
+       y="738.86218"
+       x="0.5"
+       height="313"
+       width="163"
+       id="rect4690"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#babdb6;fill-opacity:0.49723756;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>