From a34b060e7b1375be7c8c557a985b484155ff2702 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 12 Jul 2020 22:40:30 -0400
Subject: Add elements to reference platform-specific extension custom actions.

---
 src/wixlib/UtilExtension.wxs          | 258 ----------------------------------
 src/wixlib/UtilExtension_Platform.wxi |  48 +++++++
 2 files changed, 48 insertions(+), 258 deletions(-)

(limited to 'src/wixlib')

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
@@ -299,6 +299,54 @@
         </InstallExecuteSequence>
     </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>
-- 
cgit v1.2.3-55-g6feb