3 files changed, 135 insertions, 0 deletions

diff --git a/src/wixext/DirectXDecompiler.cs b/src/wixext/DirectXDecompiler.cs
new file mode 100644
index 00000000..c8056c12
--- /dev/null
+++ b/src/wixext/DirectXDecompiler.cs
@@ -0,0 +1,70 @@
+// 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.
+
+namespace WixToolset.Extensions
+{
+    using System;
+    using System.Text;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using Wix = WixToolset.Data.Serialize;
+
+    /// <summary>
+    /// The WiX Toolset DirectX Extension.
+    /// </summary>
+    public sealed class DirectXDecompiler : DecompilerExtension
+    {
+        /// <summary>
+        /// Get the extensions library to be removed.
+        /// </summary>
+        /// <param name="tableDefinitions">Table definitions for library.</param>
+        /// <returns>Library to remove from decompiled output.</returns>
+        public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions)
+        {
+            return DirectXExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Called at the beginning of the decompilation of a database.
+        /// </summary>
+        /// <param name="tables">The collection of all tables.</param>
+        public override void Initialize(TableIndexedCollection tables)
+        {
+            Table propertyTable = tables["Property"];
+
+            if (null != propertyTable)
+            {
+                foreach (Row row in propertyTable.Rows)
+                {
+                    if ("SecureCustomProperties" == row[0].ToString())
+                    {
+                        // if we've referenced any of the DirectX properties, add
+                        // a PropertyRef to pick up the CA from the extension and then remove
+                        // it from the SecureCustomExtensions property so we don't get duplicates
+                        StringBuilder remainingProperties = new StringBuilder();
+                        string[] secureCustomProperties = row[1].ToString().Split(';');
+                        foreach (string property in secureCustomProperties)
+                        {
+                            if (property.StartsWith("WIX_DIRECTX_"))
+                            {
+                                Wix.PropertyRef propertyRef = new Wix.PropertyRef();
+                                propertyRef.Id = property;
+                                this.Core.RootElement.AddChild(propertyRef);
+                            }
+                            else
+                            {
+                                if (0 < remainingProperties.Length)
+                                {
+                                    remainingProperties.Append(";");
+                                }
+                                remainingProperties.Append(property);
+                            }
+                        }
+
+                        row[1] = remainingProperties.ToString();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/wixext/DirectXExtensionData.cs b/src/wixext/DirectXExtensionData.cs
new file mode 100644
index 00000000..828b087d
--- /dev/null
+++ b/src/wixext/DirectXExtensionData.cs
@@ -0,0 +1,34 @@
+// 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.
+
+namespace WixToolset.Extensions
+{
+    using System;
+    using System.Reflection;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// The WiX Toolset DirectX Extension.
+    /// </summary>
+    public sealed class DirectXExtensionData : ExtensionData
+    {
+        /// <summary>
+        /// Gets the library associated with this extension.
+        /// </summary>
+        /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
+        /// <returns>The loaded library.</returns>
+        public override Library GetLibrary(TableDefinitionCollection tableDefinitions)
+        {
+            return DirectXExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Internal mechanism to access the extension's library.
+        /// </summary>
+        /// <returns>Extension's library.</returns>
+        internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions)
+        {
+            return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.DirectX.wixlib", tableDefinitions);
+        }
+    }
+}
diff --git a/src/wixext/WixDirectXExtension.csproj b/src/wixext/WixDirectXExtension.csproj
new file mode 100644
index 00000000..577d36f3
--- /dev/null
+++ b/src/wixext/WixDirectXExtension.csproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{6182DBCA-146A-4F37-8406-3139BBE04636}</ProjectGuid>
+    <AssemblyName>WixDirectXExtension</AssemblyName>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolset.Extensions</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="DirectXDecompiler.cs" />
+    <Compile Include="DirectXExtensionData.cs" />
+    <EmbeddedResource Include="$(OutputPath)\DirectX.wixlib">
+      <Link>Data\DirectX.wixlib</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\..\libs\WixToolset.Data\WixToolset.Data.csproj" />
+    <ProjectReference Include="..\..\..\libs\WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
+    <ProjectReference Include="..\..\..\tools\wix\Wix.csproj" />
+    <ProjectReference Include="..\wixlib\DirectXExtension.wixproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>