From c7bed5a084324ba94aae5108bac94374ce9dfe39 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 2 Feb 2019 12:54:41 -0600 Subject: Import code from old v4 repo --- src/ca/directx.cpp | 49 ++++++++++++++++++++++++ src/ca/directx.def | 7 ++++ src/ca/directx.vcxproj | 47 +++++++++++++++++++++++ src/ca/dllmain.cpp | 26 +++++++++++++ src/ca/precomp.h | 14 +++++++ src/wixext/DirectXDecompiler.cs | 70 +++++++++++++++++++++++++++++++++++ src/wixext/DirectXExtensionData.cs | 34 +++++++++++++++++ src/wixext/WixDirectXExtension.csproj | 31 ++++++++++++++++ src/wixlib/DirectXExtension.wixproj | 24 ++++++++++++ src/wixlib/DirectXExtension.wxs | 34 +++++++++++++++++ 10 files changed, 336 insertions(+) create mode 100644 src/ca/directx.cpp create mode 100644 src/ca/directx.def create mode 100644 src/ca/directx.vcxproj create mode 100644 src/ca/dllmain.cpp create mode 100644 src/ca/precomp.h create mode 100644 src/wixext/DirectXDecompiler.cs create mode 100644 src/wixext/DirectXExtensionData.cs create mode 100644 src/wixext/WixDirectXExtension.csproj create mode 100644 src/wixlib/DirectXExtension.wixproj create mode 100644 src/wixlib/DirectXExtension.wxs (limited to 'src') diff --git a/src/ca/directx.cpp b/src/ca/directx.cpp new file mode 100644 index 00000000..21838262 --- /dev/null +++ b/src/ca/directx.cpp @@ -0,0 +1,49 @@ +// 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. + +#include "precomp.h" + +/******************************************************************** +WixQueryDirectXCaps - entry point for WixQueryDirectXCaps CA + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties that identify the DirectX + capabilities ("caps") of the system. +********************************************************************/ +extern "C" UINT __stdcall WixQueryDirectXCaps( + __in MSIHANDLE hInstall + ) +{ +#if 0 + ::MessageBoxA(0, "break into debugger now please", "---->> ATTACH TO ME!", MB_ICONEXCLAMATION); +#endif + + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + LPDIRECT3D9 pD3D = NULL; + + hr = WcaInitialize(hInstall, "WixQueryDirectXCaps"); + ExitOnFailure(hr, "failed to initialize"); + + pD3D = Direct3DCreate9(D3D_SDK_VERSION); + ExitOnNull(pD3D, hr, E_FAIL, "Direct3DCreate9 failed"); + + D3DCAPS9 d3dCaps; + hr = pD3D->GetDeviceCaps( + 0, // first adapter + D3DDEVTYPE_HAL, // fail on non-HAL devices + &d3dCaps + ); + ExitOnFailure(hr, "GetDeviceCaps call failed"); + + int iVertexShaderVersion = D3DSHADER_VERSION_MAJOR(d3dCaps.VertexShaderVersion) * 100 + D3DSHADER_VERSION_MINOR(d3dCaps.VertexShaderVersion); + WcaSetIntProperty(L"WIX_DIRECTX_VERTEXSHADERVERSION", iVertexShaderVersion); + + int iPixelShaderVersion = D3DSHADER_VERSION_MAJOR(d3dCaps.PixelShaderVersion) * 100 + D3DSHADER_VERSION_MINOR(d3dCaps.PixelShaderVersion); + WcaSetIntProperty(L"WIX_DIRECTX_PIXELSHADERVERSION", iPixelShaderVersion); + +LExit: + ReleaseObject(pD3D); + return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} + + diff --git a/src/ca/directx.def b/src/ca/directx.def new file mode 100644 index 00000000..5841db88 --- /dev/null +++ b/src/ca/directx.def @@ -0,0 +1,7 @@ +; 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. + + +LIBRARY "directx" + +EXPORTS + WixQueryDirectXCaps diff --git a/src/ca/directx.vcxproj b/src/ca/directx.vcxproj new file mode 100644 index 00000000..e4020bcc --- /dev/null +++ b/src/ca/directx.vcxproj @@ -0,0 +1,47 @@ + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981} + DynamicLibrary + Unicode + directx + directx.def + + + + + + $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\libs\wcautil + d3d9.lib;msi.lib;dutil.lib;wcautil.lib + + + + + + + + + + + + + + + + + + diff --git a/src/ca/dllmain.cpp b/src/ca/dllmain.cpp new file mode 100644 index 00000000..df53f872 --- /dev/null +++ b/src/ca/dllmain.cpp @@ -0,0 +1,26 @@ +// 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. + +#include "precomp.h" + +/******************************************************************** +DllMain - standard entry point for all WiX CustomActions + +********************************************************************/ +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInst, + IN ULONG ulReason, + IN LPVOID) +{ + switch(ulReason) + { + case DLL_PROCESS_ATTACH: + WcaGlobalInitialize(hInst); + break; + + case DLL_PROCESS_DETACH: + WcaGlobalFinalize(); + break; + } + + return TRUE; +} diff --git a/src/ca/precomp.h b/src/ca/precomp.h new file mode 100644 index 00000000..8480f2b2 --- /dev/null +++ b/src/ca/precomp.h @@ -0,0 +1,14 @@ +#pragma once +// 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. + + +#include +#include +#include +#include + +#include "wixstrsafe.h" +#include "wcautil.h" +#include "strutil.h" + +#include "CustomMsiErrors.h" 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; + + /// + /// The WiX Toolset DirectX Extension. + /// + public sealed class DirectXDecompiler : DecompilerExtension + { + /// + /// Get the extensions library to be removed. + /// + /// Table definitions for library. + /// Library to remove from decompiled output. + public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions) + { + return DirectXExtensionData.GetExtensionLibrary(tableDefinitions); + } + + /// + /// Called at the beginning of the decompilation of a database. + /// + /// The collection of all tables. + 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; + + /// + /// The WiX Toolset DirectX Extension. + /// + public sealed class DirectXExtensionData : ExtensionData + { + /// + /// Gets the library associated with this extension. + /// + /// The table definitions to use while loading the library. + /// The loaded library. + public override Library GetLibrary(TableDefinitionCollection tableDefinitions) + { + return DirectXExtensionData.GetExtensionLibrary(tableDefinitions); + } + + /// + /// Internal mechanism to access the extension's library. + /// + /// Extension's library. + 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 @@ + + + + + + + {6182DBCA-146A-4F37-8406-3139BBE04636} + WixDirectXExtension + Library + WixToolset.Extensions + + + + + + + Data\DirectX.wixlib + + + + + + + + + + false + + + + diff --git a/src/wixlib/DirectXExtension.wixproj b/src/wixlib/DirectXExtension.wixproj new file mode 100644 index 00000000..e98970e9 --- /dev/null +++ b/src/wixlib/DirectXExtension.wixproj @@ -0,0 +1,24 @@ + + + + + + + {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9} + directx + Library + true + true + en-us + + + + + + + + + + + + diff --git a/src/wixlib/DirectXExtension.wxs b/src/wixlib/DirectXExtension.wxs new file mode 100644 index 00000000..022ea5a5 --- /dev/null +++ b/src/wixlib/DirectXExtension.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + VersionNT > 400 + + + + VersionNT > 400 + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb