aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-07-12 22:40:30 -0400
committerBob Arnson <bob@firegiant.com>2020-07-12 22:44:02 -0400
commita34b060e7b1375be7c8c557a985b484155ff2702 (patch)
tree4fa2e115e49467c12b14ce9cdb49b103c3e4515f /src/wixlib
parent3bbca19f75e748242f0966dce7461c0508c208ba (diff)
downloadwix-a34b060e7b1375be7c8c557a985b484155ff2702.tar.gz
wix-a34b060e7b1375be7c8c557a985b484155ff2702.tar.bz2
wix-a34b060e7b1375be7c8c557a985b484155ff2702.zip
Add elements to reference platform-specific extension custom actions.
Diffstat (limited to 'src/wixlib')
-rw-r--r--src/wixlib/UtilExtension.wxs258
-rw-r--r--src/wixlib/UtilExtension_Platform.wxi48
2 files changed, 48 insertions, 258 deletions
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 @@
62 </UI> 62 </UI>
63 </Fragment> 63 </Fragment>
64 64
65 <!-- WiX OS-detection properties and custom action -->
66 <Fragment>
67 <CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
68 <InstallExecuteSequence>
69 <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
70 </InstallExecuteSequence>
71 <InstallUISequence>
72 <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
73 </InstallUISequence>
74 </Fragment>
75
76 <Fragment>
77 <Property Id="WIX_SUITE_BACKOFFICE" Secure="yes" />
78 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
79 </Fragment>
80 <Fragment>
81 <Property Id="WIX_SUITE_BLADE" Secure="yes" />
82 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
83 </Fragment>
84 <Fragment>
85 <Property Id="WIX_SUITE_COMMUNICATIONS" Secure="yes" />
86 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
87 </Fragment>
88 <Fragment>
89 <Property Id="WIX_SUITE_COMPUTE_SERVER" Secure="yes" />
90 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
91 </Fragment>
92 <Fragment>
93 <Property Id="WIX_SUITE_DATACENTER" Secure="yes" />
94 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
95 </Fragment>
96 <Fragment>
97 <Property Id="WIX_SUITE_EMBEDDED_RESTRICTED" Secure="yes" />
98 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
99 </Fragment>
100 <Fragment>
101 <Property Id="WIX_SUITE_EMBEDDEDNT" Secure="yes" />
102 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
103 </Fragment>
104 <Fragment>
105 <Property Id="WIX_SUITE_ENTERPRISE" Secure="yes" />
106 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
107 </Fragment>
108 <Fragment>
109 <Property Id="WIX_SUITE_MEDIACENTER" Secure="yes" />
110 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
111 </Fragment>
112 <Fragment>
113 <Property Id="WIX_SUITE_PERSONAL" Secure="yes" />
114 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
115 </Fragment>
116 <Fragment>
117 <Property Id="WIX_SUITE_SECURITY_APPLIANCE" Secure="yes" />
118 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
119 </Fragment>
120 <Fragment>
121 <Property Id="WIX_SUITE_SERVERR2" Secure="yes" />
122 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
123 </Fragment>
124 <Fragment>
125 <Property Id="WIX_SUITE_SINGLEUSERTS" Secure="yes" />
126 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
127 </Fragment>
128 <Fragment>
129 <Property Id="WIX_SUITE_SMALLBUSINESS" Secure="yes" />
130 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
131 </Fragment>
132 <Fragment>
133 <Property Id="WIX_SUITE_SMALLBUSINESS_RESTRICTED" Secure="yes" />
134 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
135 </Fragment>
136 <Fragment>
137 <Property Id="WIX_SUITE_STARTER" Secure="yes" />
138 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
139 </Fragment>
140 <Fragment>
141 <Property Id="WIX_SUITE_STORAGE_SERVER" Secure="yes" />
142 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
143 </Fragment>
144 <Fragment>
145 <Property Id="WIX_SUITE_TABLETPC" Secure="yes" />
146 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
147 </Fragment>
148 <Fragment>
149 <Property Id="WIX_SUITE_TERMINAL" Secure="yes" />
150 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
151 </Fragment>
152 <Fragment>
153 <Property Id="WIX_SUITE_WH_SERVER" Secure="yes" />
154 <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
155 </Fragment>
156
157 <Fragment>
158 <CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
159 <InstallExecuteSequence>
160 <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
161 </InstallExecuteSequence>
162 <InstallUISequence>
163 <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
164 </InstallUISequence>
165 </Fragment>
166
167 <Fragment>
168 <Property Id="WIX_DIR_ADMINTOOLS" Secure="yes" />
169 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
170 </Fragment>
171 <Fragment>
172 <Property Id="WIX_DIR_ALTSTARTUP" Secure="yes" />
173 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
174 </Fragment>
175 <Fragment>
176 <Property Id="WIX_DIR_CDBURN_AREA" Secure="yes" />
177 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
178 </Fragment>
179 <Fragment>
180 <Property Id="WIX_DIR_COMMON_ADMINTOOLS" Secure="yes" />
181 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
182 </Fragment>
183 <Fragment>
184 <Property Id="WIX_DIR_COMMON_ALTSTARTUP" Secure="yes" />
185 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
186 </Fragment>
187 <Fragment>
188 <Property Id="WIX_DIR_COMMON_DOCUMENTS" Secure="yes" />
189 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
190 </Fragment>
191 <Fragment>
192 <Property Id="WIX_DIR_COMMON_FAVORITES" Secure="yes" />
193 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
194 </Fragment>
195 <Fragment>
196 <Property Id="WIX_DIR_COMMON_MUSIC" Secure="yes" />
197 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
198 </Fragment>
199 <Fragment>
200 <Property Id="WIX_DIR_COMMON_PICTURES" Secure="yes" />
201 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
202 </Fragment>
203 <Fragment>
204 <Property Id="WIX_DIR_COMMON_VIDEO" Secure="yes" />
205 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
206 </Fragment>
207 <Fragment>
208 <Property Id="WIX_DIR_COOKIES" Secure="yes" />
209 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
210 </Fragment>
211 <Fragment>
212 <Property Id="WIX_DIR_DESKTOP" Secure="yes" />
213 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
214 </Fragment>
215 <Fragment>
216 <Property Id="WIX_DIR_HISTORY" Secure="yes" />
217 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
218 </Fragment>
219 <Fragment>
220 <Property Id="WIX_DIR_INTERNET_CACHE" Secure="yes" />
221 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
222 </Fragment>
223 <Fragment>
224 <Property Id="WIX_DIR_MYMUSIC" Secure="yes" />
225 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
226 </Fragment>
227 <Fragment>
228 <Property Id="WIX_DIR_MYPICTURES" Secure="yes" />
229 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
230 </Fragment>
231 <Fragment>
232 <Property Id="WIX_DIR_MYVIDEO" Secure="yes" />
233 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
234 </Fragment>
235 <Fragment>
236 <Property Id="WIX_DIR_NETHOOD" Secure="yes" />
237 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
238 </Fragment>
239 <Fragment>
240 <Property Id="WIX_DIR_PERSONAL" Secure="yes" />
241 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
242 </Fragment>
243 <Fragment>
244 <Property Id="WIX_DIR_PRINTHOOD" Secure="yes" />
245 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
246 </Fragment>
247 <Fragment>
248 <Property Id="WIX_DIR_PROFILE" Secure="yes" />
249 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
250 </Fragment>
251 <Fragment>
252 <Property Id="WIX_DIR_RECENT" Secure="yes" />
253 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
254 </Fragment>
255 <Fragment>
256 <Property Id="WIX_DIR_RESOURCES" Secure="yes" />
257 <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
258 </Fragment>
259
260 <Fragment>
261 <CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
262
263 <InstallExecuteSequence>
264 <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
265 </InstallExecuteSequence>
266
267 <InstallUISequence>
268 <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
269 </InstallUISequence>
270 </Fragment>
271 <Fragment>
272 <Property Id="WIX_ACCOUNT_LOCALSYSTEM" Secure="yes" />
273 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
274 </Fragment>
275 <Fragment>
276 <Property Id="WIX_ACCOUNT_LOCALSERVICE" Secure="yes" />
277 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
278 </Fragment>
279 <Fragment>
280 <Property Id="WIX_ACCOUNT_NETWORKSERVICE" Secure="yes" />
281 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
282 </Fragment>
283 <Fragment>
284 <Property Id="WIX_ACCOUNT_ADMINISTRATORS" Secure="yes" />
285 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
286 </Fragment>
287 <Fragment>
288 <Property Id="WIX_ACCOUNT_USERS" Secure="yes" />
289 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
290 </Fragment>
291 <Fragment>
292 <Property Id="WIX_ACCOUNT_GUESTS" Secure="yes" />
293 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
294 </Fragment>
295 <Fragment>
296 <Property Id="WIX_ACCOUNT_PERFLOGUSERS" Secure="yes" />
297 <Property Id="WIX_ACCOUNT_PERFLOGUSERS_NODOMAIN" Secure="yes" />
298 <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
299 </Fragment>
300
301 <Fragment>
302 <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
303
304 <InstallExecuteSequence>
305 <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
306 </InstallExecuteSequence>
307
308 <InstallUISequence>
309 <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
310 </InstallUISequence>
311 </Fragment>
312
313 <Fragment>
314 <Property Id="WIX_WDDM_DRIVER_PRESENT" Secure="yes" />
315 <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
316 </Fragment>
317
318 <Fragment>
319 <Property Id="WIX_DWM_COMPOSITION_ENABLED" Secure="yes" />
320 <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
321 </Fragment>
322
323 <Fragment> 65 <Fragment>
324 <BundleExtension Id="WixUtilBundleExtension" SourceFile="utilbe.dll" Name="WixUtilBundleExtension\utilbe.dll" /> 66 <BundleExtension Id="WixUtilBundleExtension" SourceFile="utilbe.dll" Name="WixUtilBundleExtension\utilbe.dll" />
325 </Fragment> 67 </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 @@
300 </Fragment> 300 </Fragment>
301 301
302 <Fragment> 302 <Fragment>
303 <CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
304
305 <InstallExecuteSequence>
306 <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
307 </InstallExecuteSequence>
308
309 <InstallUISequence>
310 <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
311 </InstallUISequence>
312 </Fragment>
313
314 <Fragment>
315 <CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
316
317 <InstallExecuteSequence>
318 <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
319 </InstallExecuteSequence>
320
321 <InstallUISequence>
322 <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
323 </InstallUISequence>
324 </Fragment>
325
326 <Fragment>
327 <CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
328
329 <InstallExecuteSequence>
330 <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
331 </InstallExecuteSequence>
332
333 <InstallUISequence>
334 <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
335 </InstallUISequence>
336 </Fragment>
337
338 <Fragment>
339 <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
340
341 <InstallExecuteSequence>
342 <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
343 </InstallExecuteSequence>
344
345 <InstallUISequence>
346 <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
347 </InstallUISequence>
348 </Fragment>
349
350 <Fragment>
303 <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" /> 351 <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" />
304 </Fragment> 352 </Fragment>
305</Include> 353</Include>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-02-21 05:58:00 +0000