aboutsummaryrefslogtreecommitdiff
path: root/src/ext/DirectX/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2022-01-30 17:02:13 -0500
committerBob Arnson <github@bobs.org>2022-01-30 17:50:26 -0500
commitbfe5ab76b5ecc1a21078534e6fba90d12cfd3c00 (patch)
treed05102b0868f2b375d7692c5a47cd0b541d31524 /src/ext/DirectX/wixlib
parent7ce477c6863c74ef0a50d117d8c28b2f19971b42 (diff)
downloadwix-bfe5ab76b5ecc1a21078534e6fba90d12cfd3c00.tar.gz
wix-bfe5ab76b5ecc1a21078534e6fba90d12cfd3c00.tar.bz2
wix-bfe5ab76b5ecc1a21078534e6fba90d12cfd3c00.zip
Add platform-specific CAs and compiler extension.
https://github.com/wixtoolset/issues/issues/5933
Diffstat (limited to 'src/ext/DirectX/wixlib')
-rw-r--r--src/ext/DirectX/wixlib/DirectXExtension.wxs33
-rw-r--r--src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi23
-rw-r--r--src/ext/DirectX/wixlib/DirectXExtension_arm64.wxs7
-rw-r--r--src/ext/DirectX/wixlib/DirectXExtension_x64.wxs7
-rw-r--r--src/ext/DirectX/wixlib/DirectXExtension_x86.wxs7
-rw-r--r--src/ext/DirectX/wixlib/caerr.wxi96
-rw-r--r--src/ext/DirectX/wixlib/directx.wixproj10
7 files changed, 53 insertions, 130 deletions
diff --git a/src/ext/DirectX/wixlib/DirectXExtension.wxs b/src/ext/DirectX/wixlib/DirectXExtension.wxs
deleted file mode 100644
index b83dc98d..00000000
--- a/src/ext/DirectX/wixlib/DirectXExtension.wxs
+++ /dev/null
@@ -1,33 +0,0 @@
1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caerr.wxi ?>
6
7 <!-- DirectX Custom Action DLL Definitions -->
8 <Fragment>
9 <Binary Id="DirectXCA" SourceFile="directxca.dll" />
10 </Fragment>
11
12 <Fragment>
13 <CustomAction Id="WixQueryDirectXCaps" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="DirectXCA" />
14
15 <InstallUISequence>
16 <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT &gt; 400" />
17 </InstallUISequence>
18
19 <InstallExecuteSequence>
20 <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT &gt; 400" />
21 </InstallExecuteSequence>
22 </Fragment>
23
24 <Fragment>
25 <Property Id="WIX_DIRECTX_VERTEXSHADERVERSION" Secure="yes" Value="NotSet" />
26 <CustomActionRef Id="WixQueryDirectXCaps" />
27 </Fragment>
28
29 <Fragment>
30 <Property Id="WIX_DIRECTX_PIXELSHADERVERSION" Secure="yes" Value="NotSet" />
31 <CustomActionRef Id="WixQueryDirectXCaps" />
32 </Fragment>
33</Wix>
diff --git a/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi b/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi
new file mode 100644
index 00000000..317e75d4
--- /dev/null
+++ b/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi
@@ -0,0 +1,23 @@
1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include ..\..\caDecor.wxi ?>
6
7 <!-- DirectX Custom Action DLL Definitions -->
8 <Fragment>
9 <Binary Id="$(var.Prefix)DXCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dxca.dll" />
10 </Fragment>
11
12 <Fragment>
13 <CustomAction Id="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="$(var.Prefix)DXCA$(var.Suffix)" />
14
15 <InstallUISequence>
16 <Custom Action="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
17 </InstallUISequence>
18
19 <InstallExecuteSequence>
20 <Custom Action="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
21 </InstallExecuteSequence>
22 </Fragment>
23</Include>
diff --git a/src/ext/DirectX/wixlib/DirectXExtension_arm64.wxs b/src/ext/DirectX/wixlib/DirectXExtension_arm64.wxs
new file mode 100644
index 00000000..b3172384
--- /dev/null
+++ b/src/ext/DirectX/wixlib/DirectXExtension_arm64.wxs
@@ -0,0 +1,7 @@
1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?define platform=arm64 ?>
6 <?include DirectXExtension_Platform.wxi ?>
7</Wix>
diff --git a/src/ext/DirectX/wixlib/DirectXExtension_x64.wxs b/src/ext/DirectX/wixlib/DirectXExtension_x64.wxs
new file mode 100644
index 00000000..31646944
--- /dev/null
+++ b/src/ext/DirectX/wixlib/DirectXExtension_x64.wxs
@@ -0,0 +1,7 @@
1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?define platform=x64 ?>
6 <?include DirectXExtension_Platform.wxi ?>
7</Wix>
diff --git a/src/ext/DirectX/wixlib/DirectXExtension_x86.wxs b/src/ext/DirectX/wixlib/DirectXExtension_x86.wxs
new file mode 100644
index 00000000..5381957c
--- /dev/null
+++ b/src/ext/DirectX/wixlib/DirectXExtension_x86.wxs
@@ -0,0 +1,7 @@
1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?define platform=x86 ?>
6 <?include DirectXExtension_Platform.wxi ?>
7</Wix>
diff --git a/src/ext/DirectX/wixlib/caerr.wxi b/src/ext/DirectX/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/DirectX/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
1<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 <?define msierrSecureObjectsFailedSet = 25521?>
4 <?define msierrSecureObjectsUnknownType = 25522?>
5 <?define msierrXmlFileFailedRead = 25530?>
6 <?define msierrXmlFileFailedOpen = 25531?>
7 <?define msierrXmlFileFailedSelect = 25532?>
8 <?define msierrXmlFileFailedSave = 25533?>
9 <?define msierrXmlConfigFailedRead = 25540?>
10 <?define msierrXmlConfigFailedOpen = 25541?>
11 <?define msierrXmlConfigFailedSelect = 25542?>
12 <?define msierrXmlConfigFailedSave = 25543?>
13 <?define msierrFirewallCannotConnect = 25580?>
14 <?define msierrIISCannotConnect = 26001?>
15 <?define msierrIISFailedReadWebSite = 26002?>
16 <?define msierrIISFailedReadWebDirs = 26003?>
17 <?define msierrIISFailedReadVDirs = 26004?>
18 <?define msierrIISFailedReadFilters = 26005?>
19 <?define msierrIISFailedReadAppPool = 26006?>
20 <?define msierrIISFailedReadMimeMap = 26007?>
21 <?define msierrIISFailedReadProp = 26008?>
22 <?define msierrIISFailedReadWebSvcExt = 26009?>
23 <?define msierrIISFailedReadWebError = 26010?>
24 <?define msierrIISFailedReadHttpHeader = 26011?>
25 <?define msierrIISFailedSchedTransaction = 26031?>
26 <?define msierrIISFailedSchedInstallWebs = 26032?>
27 <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 <?define msierrIISFailedSchedInstallFilters = 26035?>
30 <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 <?define msierrIISFailedSchedInstallProp = 26037?>
32 <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 <?define msierrIISFailedSchedUninstallProp = 26056?>
39 <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 <?define msierrIISFailedStartTransaction = 26101?>
41 <?define msierrIISFailedOpenKey = 26102?>
42 <?define msierrIISFailedCreateKey = 26103?>
43 <?define msierrIISFailedWriteData = 26104?>
44 <?define msierrIISFailedCreateApp = 26105?>
45 <?define msierrIISFailedDeleteKey = 26106?>
46 <?define msierrIISFailedDeleteApp = 26107?>
47 <?define msierrIISFailedDeleteValue = 26108?>
48 <?define msierrIISFailedCommitInUse = 26109?>
49 <?define msierrSQLFailedCreateDatabase = 26201?>
50 <?define msierrSQLFailedDropDatabase = 26202?>
51 <?define msierrSQLFailedConnectDatabase = 26203?>
52 <?define msierrSQLFailedExecString = 26204?>
53 <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 <?define msierrInstallPerfCounterData = 26253?>
57 <?define msierrUninstallPerfCounterData = 26254?>
58 <?define msierrSMBFailedCreate = 26301?>
59 <?define msierrSMBFailedDrop = 26302?>
60 <?define msierrCERTFailedOpen = 26351?>
61 <?define msierrCERTFailedAdd = 26352?>
62 <?define msierrUSRFailedUserCreate = 26401?>
63 <?define msierrUSRFailedUserCreatePswd = 26402?>
64 <?define msierrUSRFailedUserGroupAdd = 26403?>
65 <?define msierrUSRFailedUserCreateExists = 26404?>
66 <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 <?define msierrDependencyMissingDependencies = 26451?>
68 <?define msierrDependencyHasDependents = 26452?>
69 <?define msierrDotNetRuntimeRequired = 27000?>
70 <?define msierrComPlusCannotConnect = 28001?>
71 <?define msierrComPlusPartitionReadFailed = 28002?>
72 <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 <?define msierrComPlusApplicationReadFailed = 28006?>
76 <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 <?define msierrComPlusAssembliesReadFailed = 28009?>
79 <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 <?define msierrComPlusPartitionDependency = 28011?>
81 <?define msierrComPlusPartitionNotFound = 28012?>
82 <?define msierrComPlusPartitionIdConflict = 28013?>
83 <?define msierrComPlusPartitionNameConflict = 28014?>
84 <?define msierrComPlusApplicationDependency = 28015?>
85 <?define msierrComPlusApplicationNotFound = 28016?>
86 <?define msierrComPlusApplicationIdConflict = 28017?>
87 <?define msierrComPlusApplicationNameConflict = 28018?>
88 <?define msierrComPlusApplicationRoleDependency = 28019?>
89 <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 <?define msierrComPlusApplicationRoleConflict = 28021?>
91 <?define msierrComPlusAssemblyDependency = 28022?>
92 <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 <?define msierrComPlusFailedLookupNames = 28025?>
95 <?define msierrMsmqCannotConnect = 28101?>
96</Include> \ No newline at end of file
diff --git a/src/ext/DirectX/wixlib/directx.wixproj b/src/ext/DirectX/wixlib/directx.wixproj
index a7281dd0..ea0f3330 100644
--- a/src/ext/DirectX/wixlib/directx.wixproj
+++ b/src/ext/DirectX/wixlib/directx.wixproj
@@ -6,7 +6,15 @@
6 </PropertyGroup> 6 </PropertyGroup>
7 7
8 <ItemGroup> 8 <ItemGroup>
9 <ProjectReference Include="..\ca\directxca.vcxproj" ReferenceOutputAssembly="false" /> 9 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
10 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
11 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
12 </ItemGroup>
13
14 <ItemGroup>
15 <ProjectReference Include="..\ca\directxca.vcxproj" Properties="Platform=x86" />
16 <ProjectReference Include="..\ca\directxca.vcxproj" Properties="Platform=x64" />
17 <ProjectReference Include="..\ca\directxca.vcxproj" Properties="Platform=ARM64" />
10 </ItemGroup> 18 </ItemGroup>
11 19
12 <ItemGroup> 20 <ItemGroup>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-02-01 05:52:09 +0000