From 288eca7849675a74920a718829811b8f51b09f1f Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 8 Aug 2020 17:18:25 -0700
Subject: [PATCH] Display a friendly error when the Windows Firewall service is
 disabled

---
 wix/Moonlight/Product.wxs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/wix/Moonlight/Product.wxs b/wix/Moonlight/Product.wxs
index f306eeb8..db9325a4 100644
--- a/wix/Moonlight/Product.wxs
+++ b/wix/Moonlight/Product.wxs
@@ -23,6 +23,18 @@
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize" />
     <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
 
+    <Property Id="MPSSVC_START">
+      <RegistrySearch Id="MpsSvcStart"
+                      Root="HKLM"
+                      Key="System\CurrentControlSet\Services\MpsSvc"
+                      Name="Start"
+                      Type="raw" />
+    </Property>
+
+    <Condition Message="Setup cannot proceed because the Windows Firewall service has been improperly disabled or stopped. You must start the Windows Firewall service (MpsSvc) to continue. If you would like to disable Windows Firewall properly, use the Windows Firewall options in Control Panel.">
+      <![CDATA[Installed OR MPSSVC_START="#2"]]>
+    </Condition>
+
     <?if $(var.Platform) = x64 ?>
       <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
     <?else ?>