Add elements to reference platform-specific extension custom actions.

10 files changed, 323 insertions, 258 deletions

diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
new file mode 100644
index 00000000..7f6cd7fa
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
@@ -0,0 +1,26 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+
+        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+
+        <util:BroadcastEnvironmentChange />
+        <util:CheckRebootRequired />
+        <util:QueryWindowsDriverInfo />
+        <util:QueryWindowsSuiteInfo />
+
+        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+            <ComponentGroupRef Id="ProductComponents" />
+        </Feature>
+    </Product>
+
+    <Fragment>
+        <util:BroadcastSettingChange />
+        
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+            </Directory>
+        </Directory>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
new file mode 100644
index 00000000..e2dce4ae
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+            <Component>
+                <File Source="example.txt" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt b/src/test/WixToolsetTest.Util/TestData/Queries/example.txt
new file mode 100644
index 00000000..1b4ffe8a
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/example.txt
@@ -0,0 +1 @@
+This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 78a9f967..848e4aa2 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -133,6 +133,24 @@ namespace WixToolsetTest.Util
         }
 
         [Fact]
+        public void CanBuildWithQueries()
+        {
+            var folder = TestData.Get(@"TestData\Queries");
+            var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder });
+
+            var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction");
+            Assert.Equal(new[]
+            {
+                "Binary:Wix4UtilCA_A64\t[Binary data]",
+                "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t",
+                "CustomAction:Wix4BroadcastSettingChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastSettingChange\t",
+                "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t",
+                "CustomAction:Wix4QueryOsDriverInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsDriverInfo\t",
+                "CustomAction:Wix4QueryOsInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsInfo\t",
+            }, results.OrderBy(s => s).ToArray());
+        }
+
+        [Fact]
         public void CanBuildBundleWithSearches()
         {
             var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe");
diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index fcac4644..f2d5c486 100644
--- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
@@ -39,6 +39,10 @@
     <Content Include="TestData\EventManifest\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\EventManifest\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\EventManifest\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Queries\example.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Queries\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Queries\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Queries\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 79dbbc6d..fdc1c9eb 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -233,6 +233,19 @@ namespace WixToolset.Util
                         case "User":
                             this.ParseUserElement(intermediate, section, element, null);
                             break;
+                        case "BroadcastEnvironmentChange":
+                        case "BroadcastSettingChange":
+                        case "CheckRebootRequired":
+                        case "ExitEarlyWithSuccess":
+                        case "FailWhenDeferred":
+                        case "QueryWindowsDirectories":
+                        case "QueryWindowsDriverInfo":
+                        case "QueryWindowsSuiteInfo":
+                        case "QueryWindowsWellKnownSIDs":
+                        case "WaitForEvent":
+                        case "WaitForEventDeferred":
+                            this.AddCustomActionReference(intermediate, section, element, parentElement);
+                            break;
                         case "ComponentSearch":
                         case "ComponentSearchRef":
                         case "DirectorySearch":
@@ -340,6 +353,24 @@ namespace WixToolset.Util
                             break;
                     }
                     break;
+                case "UI":
+                    switch (element.Name.LocalName)
+                    {
+                        case "BroadcastEnvironmentChange":
+                        case "BroadcastSettingChange":
+                        case "CheckRebootRequired":
+                        case "ExitEarlyWithSuccess":
+                        case "FailWhenDeferred":
+                        case "QueryWindowsDirectories":
+                        case "QueryWindowsDriverInfo":
+                        case "QueryWindowsSuiteInfo":
+                        case "QueryWindowsWellKnownSIDs":
+                        case "WaitForEvent":
+                        case "WaitForEventDeferred":
+                            this.AddCustomActionReference(intermediate, section, element, parentElement);
+                            break;
+                    }
+                    break;
                 default:
                     this.ParseHelper.UnexpectedElement(parentElement, element);
                     break;
@@ -348,6 +379,60 @@ namespace WixToolset.Util
             return possibleKeyPath;
         }
 
+        private void AddCustomActionReference(Intermediate intermediate, IntermediateSection section, XElement element, XElement parentElement)
+        {
+            // These elements are not supported for bundles.
+            if (parentElement.Name.LocalName == "Bundle")
+            {
+                this.ParseHelper.UnexpectedElement(parentElement, element);
+                return;
+            }
+
+            var customAction = element.Name.LocalName;
+            switch (element.Name.LocalName)
+            {
+                case "BroadcastEnvironmentChange":
+                case "BroadcastSettingChange":
+                case "CheckRebootRequired":
+                case "ExitEarlyWithSuccess":
+                case "FailWhenDeferred":
+                case "WaitForEvent":
+                case "WaitForEventDeferred":
+                    //default: customAction = element.Name.LocalName;
+                    break;
+                case "QueryWindowsDirectories":
+                    customAction = "QueryOsDirs";
+                    break;
+                case "QueryWindowsDriverInfo":
+                    customAction = "QueryOsDriverInfo";
+                    break;
+                case "QueryWindowsSuiteInfo":
+                    customAction = "QueryOsInfo";
+                    break;
+                case "QueryWindowsWellKnownSIDs":
+                    customAction = "QueryOsWellKnownSID";
+                    break;
+            }
+
+            foreach (var attrib in element.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    // no attributes today
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
+                }
+            }
+
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
+
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
+        }
+
         /// <summary>
         /// Parses the common search attributes shared across all searches.
         /// </summary>
diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd
index b6f0365b..133a93fa 100644
--- a/src/wixext/util.xsd
+++ b/src/wixext/util.xsd
@@ -1586,6 +1586,127 @@
       </xs:attribute>
     </xs:complexType>
   </xs:element>
+  <xs:element name="BroadcastEnvironmentChange">
+    <xs:annotation>
+      <xs:documentation>Schedules the BroadcastEnvironmentChange custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="BroadcastSettingChange">
+    <xs:annotation>
+      <xs:documentation>Schedules the BroadcastSettingChange custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="CheckRebootRequired">
+    <xs:annotation>
+      <xs:documentation>Schedules the CheckRebootRequired custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ExitEarlyWithSuccess">
+    <xs:annotation>
+      <xs:documentation>Schedules the ExitEarlyWithSuccess custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="FailWhenDeferred">
+    <xs:annotation>
+      <xs:documentation>Schedules the FailWhenDeferred custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  <xs:element name="WaitForEvent">
+    <xs:annotation>
+      <xs:documentation>Schedules the WaitForEvent custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WaitForEventDeferred">
+    <xs:annotation>
+      <xs:documentation>Schedules the WaitForEventDeferred custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="QueryWindowsDirectories">
+    <xs:annotation>
+      <xs:documentation>Schedules the QueryOsDirs custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="QueryWindowsDriverInfo">
+    <xs:annotation>
+      <xs:documentation>Schedules the QueryOsDriverInfo custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="QueryWindowsSuiteInfo">
+    <xs:annotation>
+      <xs:documentation>Schedules the QueryOsInfo custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="QueryWindowsWellKnownSIDs">
+    <xs:annotation>
+      <xs:documentation>Schedules the QueryOsWellKnownSID custom action for the current platform.</xs:documentation>
+      <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </xs:appinfo>
+    </xs:annotation>
+  </xs:element>
+
   <xs:attributeGroup name="SearchCommonAttributes">
     <xs:attribute name="Id" type="xs:string">
       <xs:annotation>
diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs
index 2e9ad272..fccba7bf 100644
--- a/src/wixlib/UtilExtension.wxs
+++ b/src/wixlib/UtilExtension.wxs
@@ -62,264 +62,6 @@
         </UI>
     </Fragment>
 
-    <!-- WiX OS-detection properties and custom action -->
-    <Fragment>
-        <CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
-        <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallExecuteSequence>
-        <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallUISequence>
-    </Fragment>
-
-    <Fragment>
-        <Property Id="WIX_SUITE_BACKOFFICE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_BLADE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_COMMUNICATIONS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_COMPUTE_SERVER" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_DATACENTER" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_EMBEDDED_RESTRICTED" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_EMBEDDEDNT" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_ENTERPRISE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_MEDIACENTER" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_PERSONAL" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_SECURITY_APPLIANCE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_SERVERR2" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_SINGLEUSERTS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_SMALLBUSINESS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_SMALLBUSINESS_RESTRICTED" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_STARTER" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_STORAGE_SERVER" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_TABLETPC" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_TERMINAL" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_SUITE_WH_SERVER" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
-    </Fragment>
-
-    <Fragment>
-        <CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
-        <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallExecuteSequence>
-        <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallUISequence>
-    </Fragment>
-
-    <Fragment>
-        <Property Id="WIX_DIR_ADMINTOOLS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_ALTSTARTUP" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_CDBURN_AREA" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_ADMINTOOLS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_ALTSTARTUP" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_DOCUMENTS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_FAVORITES" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_MUSIC" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_PICTURES" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COMMON_VIDEO" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_COOKIES" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_DESKTOP" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_HISTORY" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_INTERNET_CACHE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_MYMUSIC" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_MYPICTURES" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_MYVIDEO" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_NETHOOD" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_PERSONAL" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_PRINTHOOD" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_PROFILE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_RECENT" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_DIR_RESOURCES" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
-    </Fragment>
-
-    <Fragment>
-        <CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
-
-        <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallExecuteSequence>
-
-        <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallUISequence>
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_LOCALSYSTEM" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_LOCALSERVICE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_NETWORKSERVICE" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_ADMINISTRATORS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_USERS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_GUESTS" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <Property Id="WIX_ACCOUNT_PERFLOGUSERS" Secure="yes" />
-        <Property Id="WIX_ACCOUNT_PERFLOGUSERS_NODOMAIN" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
-    </Fragment>
-
-    <Fragment>
-        <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
-
-        <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallExecuteSequence>
-
-        <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
-        </InstallUISequence>
-    </Fragment>
-
-    <Fragment>
-        <Property Id="WIX_WDDM_DRIVER_PRESENT" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
-    </Fragment>
-
-    <Fragment>
-        <Property Id="WIX_DWM_COMPOSITION_ENABLED" Secure="yes" />
-        <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
-    </Fragment>
-
     <Fragment>
         <BundleExtension Id="WixUtilBundleExtension" SourceFile="utilbe.dll" Name="WixUtilBundleExtension\utilbe.dll" />
     </Fragment>
diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi
index c557e04b..5fb1d0ae 100644
--- a/src/wixlib/UtilExtension_Platform.wxi
+++ b/src/wixlib/UtilExtension_Platform.wxi
@@ -300,6 +300,54 @@
     </Fragment>
 
     <Fragment>
+        <CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+
+        <InstallExecuteSequence>
+            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallExecuteSequence>
+
+        <InstallUISequence>
+            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallUISequence>
+    </Fragment>
+    
+    <Fragment>
+        <CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+
+        <InstallExecuteSequence>
+            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallExecuteSequence>
+
+        <InstallUISequence>
+            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallUISequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+
+        <InstallExecuteSequence>
+            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallExecuteSequence>
+
+        <InstallUISequence>
+            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallUISequence>
+    </Fragment>
+    
+    <Fragment>
+        <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+
+        <InstallExecuteSequence>
+            <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallExecuteSequence>
+
+        <InstallUISequence>
+            <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+        </InstallUISequence>
+    </Fragment>
+
+    <Fragment>
         <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" />
     </Fragment>
 </Include>