From c8f39be3f8b70b36a8b89b6ccdd4ebb94290b6b3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 30 Dec 2017 01:56:55 -0800 Subject: Initial code commit --- src/Cpp.Build.props | 101 + src/Directory.Build.props | 22 + src/FindLocalWix.props | 8 + src/ca/dllmain.cpp | 26 + src/ca/packages.config | 6 + src/ca/precomp.h | 13 + src/ca/utilca.cpp | 3 + src/ca/utilca.def | 7 + src/ca/utilca.vcxproj | 69 + .../TestData/UsingFileShare/Package.en-us.wxl | 11 + .../TestData/UsingFileShare/Package.wxs | 22 + .../TestData/UsingFileShare/PackageComponents.wxs | 16 + .../TestData/UsingFileShare/example.txt | 1 + .../WixToolsetTest.Util/UtilExtensionFixture.cs | 34 + .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 40 + src/wixext/PerformanceCounterType.cs | 192 + src/wixext/Tuples/EventManifestTuple.cs | 55 + src/wixext/Tuples/FileSharePermissionsTuple.cs | 63 + src/wixext/Tuples/FileShareTuple.cs | 95 + src/wixext/Tuples/GroupTuple.cs | 71 + src/wixext/Tuples/PerfmonManifestTuple.cs | 63 + src/wixext/Tuples/PerfmonTuple.cs | 63 + src/wixext/Tuples/PerformanceCategoryTuple.cs | 79 + src/wixext/Tuples/SecureObjectsTuple.cs | 87 + src/wixext/Tuples/ServiceConfigTuple.cs | 119 + src/wixext/Tuples/UserGroupTuple.cs | 55 + src/wixext/Tuples/UserTuple.cs | 87 + src/wixext/Tuples/UtilTupleDefinitions.cs | 111 + src/wixext/Tuples/WixCloseApplicationTuple.cs | 111 + src/wixext/Tuples/WixFormatFilesTuple.cs | 55 + src/wixext/Tuples/WixInternetShortcutTuple.cs | 103 + src/wixext/Tuples/WixRemoveFolderExTuple.cs | 71 + src/wixext/Tuples/WixRestartResourceTuple.cs | 71 + src/wixext/Tuples/WixTouchFileTuple.cs | 71 + src/wixext/Tuples/XmlConfigTuple.cs | 111 + src/wixext/Tuples/XmlFileTuple.cs | 103 + src/wixext/UtilBinder.cs | 347 + src/wixext/UtilCompiler.cs | 3911 +++++++ src/wixext/UtilConstants.cs | 17 + src/wixext/UtilDecompiler.cs | 1543 +++ src/wixext/UtilErrors.cs | 109 + src/wixext/UtilExtensionData.cs | 21 + src/wixext/UtilExtensionFactory.cs | 18 + src/wixext/UtilWarnings.cs | 72 + src/wixext/UtilWindowsInstallerBackendExtension.cs | 26 + src/wixext/WixToolset.Util.wixext.csproj | 34 + src/wixext/WixToolset.Util.wixext.targets | 8 + src/wixext/tables.xml | 242 + src/wixext/util.cs | 11461 +++++++++++++++++++ src/wixext/util.xsd | 1692 +++ src/wixlib/UtilExtension.wxs | 430 + src/wixlib/UtilExtension_Platform.wxi | 224 + src/wixlib/UtilExtension_x64.wxs | 8 + src/wixlib/UtilExtension_x86.wxs | 8 + src/wixlib/caSuffix.wxi | 28 + src/wixlib/caerr.wxi | 96 + src/wixlib/de-de.wxl | 33 + src/wixlib/en-us.wxl | 33 + src/wixlib/es-es.wxl | 32 + src/wixlib/fr-fr.wxl | 32 + src/wixlib/it-it.wxl | 33 + src/wixlib/ja-jp.wxl | 33 + src/wixlib/packages.config | 5 + src/wixlib/pt-br.wxl | 27 + src/wixlib/util.wixproj | 52 + 65 files changed, 22790 insertions(+) create mode 100644 src/Cpp.Build.props create mode 100644 src/Directory.Build.props create mode 100644 src/FindLocalWix.props create mode 100644 src/ca/dllmain.cpp create mode 100644 src/ca/packages.config create mode 100644 src/ca/precomp.h create mode 100644 src/ca/utilca.cpp create mode 100644 src/ca/utilca.def create mode 100644 src/ca/utilca.vcxproj create mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt create mode 100644 src/test/WixToolsetTest.Util/UtilExtensionFixture.cs create mode 100644 src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj create mode 100644 src/wixext/PerformanceCounterType.cs create mode 100644 src/wixext/Tuples/EventManifestTuple.cs create mode 100644 src/wixext/Tuples/FileSharePermissionsTuple.cs create mode 100644 src/wixext/Tuples/FileShareTuple.cs create mode 100644 src/wixext/Tuples/GroupTuple.cs create mode 100644 src/wixext/Tuples/PerfmonManifestTuple.cs create mode 100644 src/wixext/Tuples/PerfmonTuple.cs create mode 100644 src/wixext/Tuples/PerformanceCategoryTuple.cs create mode 100644 src/wixext/Tuples/SecureObjectsTuple.cs create mode 100644 src/wixext/Tuples/ServiceConfigTuple.cs create mode 100644 src/wixext/Tuples/UserGroupTuple.cs create mode 100644 src/wixext/Tuples/UserTuple.cs create mode 100644 src/wixext/Tuples/UtilTupleDefinitions.cs create mode 100644 src/wixext/Tuples/WixCloseApplicationTuple.cs create mode 100644 src/wixext/Tuples/WixFormatFilesTuple.cs create mode 100644 src/wixext/Tuples/WixInternetShortcutTuple.cs create mode 100644 src/wixext/Tuples/WixRemoveFolderExTuple.cs create mode 100644 src/wixext/Tuples/WixRestartResourceTuple.cs create mode 100644 src/wixext/Tuples/WixTouchFileTuple.cs create mode 100644 src/wixext/Tuples/XmlConfigTuple.cs create mode 100644 src/wixext/Tuples/XmlFileTuple.cs create mode 100644 src/wixext/UtilBinder.cs create mode 100644 src/wixext/UtilCompiler.cs create mode 100644 src/wixext/UtilConstants.cs create mode 100644 src/wixext/UtilDecompiler.cs create mode 100644 src/wixext/UtilErrors.cs create mode 100644 src/wixext/UtilExtensionData.cs create mode 100644 src/wixext/UtilExtensionFactory.cs create mode 100644 src/wixext/UtilWarnings.cs create mode 100644 src/wixext/UtilWindowsInstallerBackendExtension.cs create mode 100644 src/wixext/WixToolset.Util.wixext.csproj create mode 100644 src/wixext/WixToolset.Util.wixext.targets create mode 100644 src/wixext/tables.xml create mode 100644 src/wixext/util.cs create mode 100644 src/wixext/util.xsd create mode 100644 src/wixlib/UtilExtension.wxs create mode 100644 src/wixlib/UtilExtension_Platform.wxi create mode 100644 src/wixlib/UtilExtension_x64.wxs create mode 100644 src/wixlib/UtilExtension_x86.wxs create mode 100644 src/wixlib/caSuffix.wxi create mode 100644 src/wixlib/caerr.wxi create mode 100644 src/wixlib/de-de.wxl create mode 100644 src/wixlib/en-us.wxl create mode 100644 src/wixlib/es-es.wxl create mode 100644 src/wixlib/fr-fr.wxl create mode 100644 src/wixlib/it-it.wxl create mode 100644 src/wixlib/ja-jp.wxl create mode 100644 src/wixlib/packages.config create mode 100644 src/wixlib/pt-br.wxl create mode 100644 src/wixlib/util.wixproj (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props new file mode 100644 index 00000000..453aa442 --- /dev/null +++ b/src/Cpp.Build.props @@ -0,0 +1,101 @@ + + + + + + Win32 + $(OutputPath) + $(BaseIntermediateOutputPath)$(Platform)\ + $(OutputPath)$(Platform)\ + + + + + $(DisableSpecificCompilerWarnings) + Level4 + $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + Use + precomp.h + StdCall + true + false + -YlprecompDefine + /Zc:threadSafeInit- %(AdditionalOptions) + true + + + $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) + $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) + + + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + + + $(ProjectSubSystem) + $(ProjectModuleDefinitionFile) + $(ResourceOnlyDll) + true + $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) + /IGNORE:4099 %(AdditionalOptions) + + + + + + NoExtensions + + + + + CDecl + + + + + OldStyle + true + true + + + + + Disabled + EnableFastChecks + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + + MultiThreadedDebugDll + + + + + MinSpace + NDEBUG;%(PreprocessorDefinitions) + true + true + MultiThreaded + + + true + true + + + + + + MultiThreadedDll + + + + + $(LinkKeyFile) + $(LinkDelaySign) + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..63ad5d6e --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,22 @@ + + + + + + Debug + AnyCPU + $(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\ + $(MSBuildThisFileDirectory)..\build\$(Configuration)\ + + WiX Toolset Team + WiX Toolset + Copyright (c) .NET Foundation and contributors. All rights reserved. + + + + $(MSBuildThisFileDirectory)..\..\ + + + + + diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props new file mode 100644 index 00000000..016dac77 --- /dev/null +++ b/src/FindLocalWix.props @@ -0,0 +1,8 @@ + + + + + + $(MSBuildThisFileDirectory)..\..\Core\build\Release\publish\net461\wix.targets + + diff --git a/src/ca/dllmain.cpp b/src/ca/dllmain.cpp new file mode 100644 index 00000000..35ae6d1c --- /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 custom actions + +********************************************************************/ +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/packages.config b/src/ca/packages.config new file mode 100644 index 00000000..b74ff5d0 --- /dev/null +++ b/src/ca/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/ca/precomp.h b/src/ca/precomp.h new file mode 100644 index 00000000..3edad7ed --- /dev/null +++ b/src/ca/precomp.h @@ -0,0 +1,13 @@ +#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 + +#define MAXUINT USHRT_MAX +#include + +#include "wcautil.h" +#include "fileutil.h" +#include "strutil.h" diff --git a/src/ca/utilca.cpp b/src/ca/utilca.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ca/utilca.cpp @@ -0,0 +1,3 @@ +// 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" diff --git a/src/ca/utilca.def b/src/ca/utilca.def new file mode 100644 index 00000000..4b34b3a4 --- /dev/null +++ b/src/ca/utilca.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 "utilca" + +EXPORTS + diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj new file mode 100644 index 00000000..37b5c7de --- /dev/null +++ b/src/ca/utilca.vcxproj @@ -0,0 +1,69 @@ + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + {076018F7-19BD-423A-ABBF-229273DA08D8} + DynamicLibrary + utilca + v141 + Unicode + utilca.def + WiX Toolset Util CustomAction + + + + + + + + + + + + + + msi.lib + + + + + Create + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs new file mode 100644 index 00000000..68ff98fd --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs new file mode 100644 index 00000000..c548bc1d --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs new file mode 100644 index 00000000..5ce9f5ea --- /dev/null +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.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 WixToolsetTest.VisualStudio +{ + using System.Linq; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using WixToolset.Util; + using Xunit; + + public class VisualStudioExtensionFixture + { + [Fact] + public void CanBuildUsingFileShare() + { + var folder = TestData.Get(@"TestData\UsingFileShare"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(Build, "FileShare", "FileSharePermissions"); + Assert.Equal(new[] + { + "FileShare:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t0", + "FileSharePermissions:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t0", + }, results.OrderBy(s => s).ToArray()); + } + + private static void Build(string[] args) + { + var result = WixRunner.Execute(args, out var messages); + Assert.Equal(0, result); + Assert.Empty(messages); + } + } +} diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj new file mode 100644 index 00000000..9559059d --- /dev/null +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -0,0 +1,40 @@ + + + + + + netcoreapp2.0 + false + + + + NU1701 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/PerformanceCounterType.cs b/src/wixext/PerformanceCounterType.cs new file mode 100644 index 00000000..1e06efd3 --- /dev/null +++ b/src/wixext/PerformanceCounterType.cs @@ -0,0 +1,192 @@ +// Captured from: C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll + +namespace System.Diagnostics +{ + public enum PerformanceCounterType + { + // + // Summary: + // An instantaneous counter that shows the most recently observed value in hexadecimal + // format. Used, for example, to maintain a simple count of items or operations. + NumberOfItemsHEX32 = 0, + // + // Summary: + // An instantaneous counter that shows the most recently observed value. Used, for + // example, to maintain a simple count of a very large number of items or operations. + // It is the same as NumberOfItemsHEX32 except that it uses larger fields to accommodate + // larger values. + NumberOfItemsHEX64 = 256, + // + // Summary: + // An instantaneous counter that shows the most recently observed value. Used, for + // example, to maintain a simple count of items or operations. + NumberOfItems32 = 65536, + // + // Summary: + // An instantaneous counter that shows the most recently observed value. Used, for + // example, to maintain a simple count of a very large number of items or operations. + // It is the same as NumberOfItems32 except that it uses larger fields to accommodate + // larger values. + NumberOfItems64 = 65792, + // + // Summary: + // A difference counter that shows the change in the measured attribute between + // the two most recent sample intervals. + CounterDelta32 = 4195328, + // + // Summary: + // A difference counter that shows the change in the measured attribute between + // the two most recent sample intervals. It is the same as the CounterDelta32 counter + // type except that is uses larger fields to accomodate larger values. + CounterDelta64 = 4195584, + // + // Summary: + // An average counter that shows the average number of operations completed in one + // second. When a counter of this type samples the data, each sampling interrupt + // returns one or zero. The counter data is the number of ones that were sampled. + // It measures time in units of ticks of the system performance timer. + SampleCounter = 4260864, + // + // Summary: + // An average counter designed to monitor the average length of a queue to a resource + // over time. It shows the difference between the queue lengths observed during + // the last two sample intervals divided by the duration of the interval. This type + // of counter is typically used to track the number of items that are queued or + // waiting. + CountPerTimeInterval32 = 4523008, + // + // Summary: + // An average counter that monitors the average length of a queue to a resource + // over time. Counters of this type display the difference between the queue lengths + // observed during the last two sample intervals, divided by the duration of the + // interval. This counter type is the same as CountPerTimeInterval32 except that + // it uses larger fields to accommodate larger values. This type of counter is typically + // used to track a high-volume or very large number of items that are queued or + // waiting. + CountPerTimeInterval64 = 4523264, + // + // Summary: + // A difference counter that shows the average number of operations completed during + // each second of the sample interval. Counters of this type measure time in ticks + // of the system clock. + RateOfCountsPerSecond32 = 272696320, + // + // Summary: + // A difference counter that shows the average number of operations completed during + // each second of the sample interval. Counters of this type measure time in ticks + // of the system clock. This counter type is the same as the RateOfCountsPerSecond32 + // type, but it uses larger fields to accommodate larger values to track a high-volume + // number of items or operations per second, such as a byte-transmission rate. + RateOfCountsPerSecond64 = 272696576, + // + // Summary: + // An instantaneous percentage counter that shows the ratio of a subset to its set + // as a percentage. For example, it compares the number of bytes in use on a disk + // to the total number of bytes on the disk. Counters of this type display the current + // percentage only, not an average over time. + RawFraction = 537003008, + // + // Summary: + // A percentage counter that shows the average time that a component is active as + // a percentage of the total sample time. + CounterTimer = 541132032, + // + // Summary: + // A percentage counter that shows the active time of a component as a percentage + // of the total elapsed time of the sample interval. It measures time in units of + // 100 nanoseconds (ns). Counters of this type are designed to measure the activity + // of one component at a time. + Timer100Ns = 542180608, + // + // Summary: + // A percentage counter that shows the average ratio of hits to all operations during + // the last two sample intervals. + SampleFraction = 549585920, + // + // Summary: + // A percentage counter that displays the average percentage of active time observed + // during sample interval. The value of these counters is calculated by monitoring + // the percentage of time that the service was inactive and then subtracting that + // value from 100 percent. + CounterTimerInverse = 557909248, + // + // Summary: + // A percentage counter that shows the average percentage of active time observed + // during the sample interval. + Timer100NsInverse = 558957824, + // + // Summary: + // A percentage counter that displays the active time of one or more components + // as a percentage of the total time of the sample interval. Because the numerator + // records the active time of components operating simultaneously, the resulting + // percentage can exceed 100 percent. + CounterMultiTimer = 574686464, + // + // Summary: + // A percentage counter that shows the active time of one or more components as + // a percentage of the total time of the sample interval. It measures time in 100 + // nanosecond (ns) units. + CounterMultiTimer100Ns = 575735040, + // + // Summary: + // A percentage counter that shows the active time of one or more components as + // a percentage of the total time of the sample interval. It derives the active + // time by measuring the time that the components were not active and subtracting + // the result from 100 percent by the number of objects monitored. + CounterMultiTimerInverse = 591463680, + // + // Summary: + // A percentage counter that shows the active time of one or more components as + // a percentage of the total time of the sample interval. Counters of this type + // measure time in 100 nanosecond (ns) units. They derive the active time by measuring + // the time that the components were not active and subtracting the result from + // multiplying 100 percent by the number of objects monitored. + CounterMultiTimer100NsInverse = 592512256, + // + // Summary: + // An average counter that measures the time it takes, on average, to complete a + // process or operation. Counters of this type display a ratio of the total elapsed + // time of the sample interval to the number of processes or operations completed + // during that time. This counter type measures time in ticks of the system clock. + AverageTimer32 = 805438464, + // + // Summary: + // A difference timer that shows the total time between when the component or process + // started and the time when this value is calculated. + ElapsedTime = 807666944, + // + // Summary: + // An average counter that shows how many items are processed, on average, during + // an operation. Counters of this type display a ratio of the items processed to + // the number of operations completed. The ratio is calculated by comparing the + // number of items processed during the last interval to the number of operations + // completed during the last interval. + AverageCount64 = 1073874176, + // + // Summary: + // A base counter that stores the number of sampling interrupts taken and is used + // as a denominator in the sampling fraction. The sampling fraction is the number + // of samples that were 1 (or true) for a sample interrupt. Check that this value + // is greater than zero before using it as the denominator in a calculation of SampleFraction. + SampleBase = 1073939457, + // + // Summary: + // A base counter that is used in the calculation of time or count averages, such + // as AverageTimer32 and AverageCount64. Stores the denominator for calculating + // a counter to present "time per operation" or "count per operation". + AverageBase = 1073939458, + // + // Summary: + // A base counter that stores the denominator of a counter that presents a general + // arithmetic fraction. Check that this value is greater than zero before using + // it as the denominator in a RawFraction value calculation. + RawBase = 1073939459, + // + // Summary: + // A base counter that indicates the number of items sampled. It is used as the + // denominator in the calculations to get an average among the items sampled when + // taking timings of multiple, but similar items. Used with CounterMultiTimer, CounterMultiTimerInverse, + // CounterMultiTimer100Ns, and CounterMultiTimer100NsInverse. + CounterMultiBase = 1107494144 + } +} diff --git a/src/wixext/Tuples/EventManifestTuple.cs b/src/wixext/Tuples/EventManifestTuple.cs new file mode 100644 index 00000000..b74d2d59 --- /dev/null +++ b/src/wixext/Tuples/EventManifestTuple.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition EventManifest = new IntermediateTupleDefinition( + UtilTupleDefinitionType.EventManifest.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(EventManifestTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestTupleFields.File), IntermediateFieldType.String), + }, + typeof(EventManifestTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum EventManifestTupleFields + { + Component_, + File, + } + + public class EventManifestTuple : IntermediateTuple + { + public EventManifestTuple() : base(UtilTupleDefinitions.EventManifest, null, null) + { + } + + public EventManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.EventManifest, sourceLineNumber, id) + { + } + + public IntermediateField this[EventManifestTupleFields index] => this.Fields[(int)index]; + + public string Component_ + { + get => this.Fields[(int)EventManifestTupleFields.Component_].AsString(); + set => this.Set((int)EventManifestTupleFields.Component_, value); + } + + public string File + { + get => this.Fields[(int)EventManifestTupleFields.File].AsString(); + set => this.Set((int)EventManifestTupleFields.File, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/FileSharePermissionsTuple.cs b/src/wixext/Tuples/FileSharePermissionsTuple.cs new file mode 100644 index 00000000..3f037e0e --- /dev/null +++ b/src/wixext/Tuples/FileSharePermissionsTuple.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition FileSharePermissions = new IntermediateTupleDefinition( + UtilTupleDefinitionType.FileSharePermissions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShare_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.User_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.Permissions), IntermediateFieldType.Number), + }, + typeof(FileSharePermissionsTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum FileSharePermissionsTupleFields + { + FileShare_, + User_, + Permissions, + } + + public class FileSharePermissionsTuple : IntermediateTuple + { + public FileSharePermissionsTuple() : base(UtilTupleDefinitions.FileSharePermissions, null, null) + { + } + + public FileSharePermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileSharePermissions, sourceLineNumber, id) + { + } + + public IntermediateField this[FileSharePermissionsTupleFields index] => this.Fields[(int)index]; + + public string FileShare_ + { + get => this.Fields[(int)FileSharePermissionsTupleFields.FileShare_].AsString(); + set => this.Set((int)FileSharePermissionsTupleFields.FileShare_, value); + } + + public string User_ + { + get => this.Fields[(int)FileSharePermissionsTupleFields.User_].AsString(); + set => this.Set((int)FileSharePermissionsTupleFields.User_, value); + } + + public int Permissions + { + get => this.Fields[(int)FileSharePermissionsTupleFields.Permissions].AsNumber(); + set => this.Set((int)FileSharePermissionsTupleFields.Permissions, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs new file mode 100644 index 00000000..043f24bd --- /dev/null +++ b/src/wixext/Tuples/FileShareTuple.cs @@ -0,0 +1,95 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition FileShare = new IntermediateTupleDefinition( + UtilTupleDefinitionType.FileShare.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(FileShareTupleFields.FileShare), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.ShareName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.Directory_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.User_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.Permissions), IntermediateFieldType.Number), + }, + typeof(FileShareTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum FileShareTupleFields + { + FileShare, + ShareName, + Component_, + Description, + Directory_, + User_, + Permissions, + } + + public class FileShareTuple : IntermediateTuple + { + public FileShareTuple() : base(UtilTupleDefinitions.FileShare, null, null) + { + } + + public FileShareTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileShare, sourceLineNumber, id) + { + } + + public IntermediateField this[FileShareTupleFields index] => this.Fields[(int)index]; + + public string FileShare + { + get => this.Fields[(int)FileShareTupleFields.FileShare].AsString(); + set => this.Set((int)FileShareTupleFields.FileShare, value); + } + + public string ShareName + { + get => this.Fields[(int)FileShareTupleFields.ShareName].AsString(); + set => this.Set((int)FileShareTupleFields.ShareName, value); + } + + public string Component_ + { + get => this.Fields[(int)FileShareTupleFields.Component_].AsString(); + set => this.Set((int)FileShareTupleFields.Component_, value); + } + + public string Description + { + get => this.Fields[(int)FileShareTupleFields.Description].AsString(); + set => this.Set((int)FileShareTupleFields.Description, value); + } + + public string Directory_ + { + get => this.Fields[(int)FileShareTupleFields.Directory_].AsString(); + set => this.Set((int)FileShareTupleFields.Directory_, value); + } + + public string User_ + { + get => this.Fields[(int)FileShareTupleFields.User_].AsString(); + set => this.Set((int)FileShareTupleFields.User_, value); + } + + public int Permissions + { + get => this.Fields[(int)FileShareTupleFields.Permissions].AsNumber(); + set => this.Set((int)FileShareTupleFields.Permissions, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs new file mode 100644 index 00000000..97335714 --- /dev/null +++ b/src/wixext/Tuples/GroupTuple.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition Group = new IntermediateTupleDefinition( + UtilTupleDefinitionType.Group.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(GroupTupleFields.Group), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String), + }, + typeof(GroupTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum GroupTupleFields + { + Group, + Component_, + Name, + Domain, + } + + public class GroupTuple : IntermediateTuple + { + public GroupTuple() : base(UtilTupleDefinitions.Group, null, null) + { + } + + public GroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Group, sourceLineNumber, id) + { + } + + public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; + + public string Group + { + get => this.Fields[(int)GroupTupleFields.Group].AsString(); + set => this.Set((int)GroupTupleFields.Group, value); + } + + public string Component_ + { + get => this.Fields[(int)GroupTupleFields.Component_].AsString(); + set => this.Set((int)GroupTupleFields.Component_, value); + } + + public string Name + { + get => this.Fields[(int)GroupTupleFields.Name].AsString(); + set => this.Set((int)GroupTupleFields.Name, value); + } + + public string Domain + { + get => this.Fields[(int)GroupTupleFields.Domain].AsString(); + set => this.Set((int)GroupTupleFields.Domain, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonManifestTuple.cs b/src/wixext/Tuples/PerfmonManifestTuple.cs new file mode 100644 index 00000000..3f6cb8cc --- /dev/null +++ b/src/wixext/Tuples/PerfmonManifestTuple.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition PerfmonManifest = new IntermediateTupleDefinition( + UtilTupleDefinitionType.PerfmonManifest.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ResourceFileDirectory), IntermediateFieldType.String), + }, + typeof(PerfmonManifestTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum PerfmonManifestTupleFields + { + Component_, + File, + ResourceFileDirectory, + } + + public class PerfmonManifestTuple : IntermediateTuple + { + public PerfmonManifestTuple() : base(UtilTupleDefinitions.PerfmonManifest, null, null) + { + } + + public PerfmonManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerfmonManifest, sourceLineNumber, id) + { + } + + public IntermediateField this[PerfmonManifestTupleFields index] => this.Fields[(int)index]; + + public string Component_ + { + get => this.Fields[(int)PerfmonManifestTupleFields.Component_].AsString(); + set => this.Set((int)PerfmonManifestTupleFields.Component_, value); + } + + public string File + { + get => this.Fields[(int)PerfmonManifestTupleFields.File].AsString(); + set => this.Set((int)PerfmonManifestTupleFields.File, value); + } + + public string ResourceFileDirectory + { + get => this.Fields[(int)PerfmonManifestTupleFields.ResourceFileDirectory].AsString(); + set => this.Set((int)PerfmonManifestTupleFields.ResourceFileDirectory, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonTuple.cs b/src/wixext/Tuples/PerfmonTuple.cs new file mode 100644 index 00000000..00ea818b --- /dev/null +++ b/src/wixext/Tuples/PerfmonTuple.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition Perfmon = new IntermediateTupleDefinition( + UtilTupleDefinitionType.Perfmon.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonTupleFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Name), IntermediateFieldType.String), + }, + typeof(PerfmonTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum PerfmonTupleFields + { + Component_, + File, + Name, + } + + public class PerfmonTuple : IntermediateTuple + { + public PerfmonTuple() : base(UtilTupleDefinitions.Perfmon, null, null) + { + } + + public PerfmonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Perfmon, sourceLineNumber, id) + { + } + + public IntermediateField this[PerfmonTupleFields index] => this.Fields[(int)index]; + + public string Component_ + { + get => this.Fields[(int)PerfmonTupleFields.Component_].AsString(); + set => this.Set((int)PerfmonTupleFields.Component_, value); + } + + public string File + { + get => this.Fields[(int)PerfmonTupleFields.File].AsString(); + set => this.Set((int)PerfmonTupleFields.File, value); + } + + public string Name + { + get => this.Fields[(int)PerfmonTupleFields.Name].AsString(); + set => this.Set((int)PerfmonTupleFields.Name, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/PerformanceCategoryTuple.cs b/src/wixext/Tuples/PerformanceCategoryTuple.cs new file mode 100644 index 00000000..ec2ba73d --- /dev/null +++ b/src/wixext/Tuples/PerformanceCategoryTuple.cs @@ -0,0 +1,79 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition PerformanceCategory = new IntermediateTupleDefinition( + UtilTupleDefinitionType.PerformanceCategory.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.PerformanceCategory), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.IniData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ConstantData), IntermediateFieldType.String), + }, + typeof(PerformanceCategoryTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum PerformanceCategoryTupleFields + { + PerformanceCategory, + Component_, + Name, + IniData, + ConstantData, + } + + public class PerformanceCategoryTuple : IntermediateTuple + { + public PerformanceCategoryTuple() : base(UtilTupleDefinitions.PerformanceCategory, null, null) + { + } + + public PerformanceCategoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerformanceCategory, sourceLineNumber, id) + { + } + + public IntermediateField this[PerformanceCategoryTupleFields index] => this.Fields[(int)index]; + + public string PerformanceCategory + { + get => this.Fields[(int)PerformanceCategoryTupleFields.PerformanceCategory].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.PerformanceCategory, value); + } + + public string Component_ + { + get => this.Fields[(int)PerformanceCategoryTupleFields.Component_].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.Component_, value); + } + + public string Name + { + get => this.Fields[(int)PerformanceCategoryTupleFields.Name].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.Name, value); + } + + public string IniData + { + get => this.Fields[(int)PerformanceCategoryTupleFields.IniData].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.IniData, value); + } + + public string ConstantData + { + get => this.Fields[(int)PerformanceCategoryTupleFields.ConstantData].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.ConstantData, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs new file mode 100644 index 00000000..f54b23d8 --- /dev/null +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -0,0 +1,87 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition SecureObjects = new IntermediateTupleDefinition( + UtilTupleDefinitionType.SecureObjects.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Permission), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Component_), IntermediateFieldType.String), + }, + typeof(SecureObjectsTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum SecureObjectsTupleFields + { + SecureObject, + Table, + Domain, + User, + Permission, + Component_, + } + + public class SecureObjectsTuple : IntermediateTuple + { + public SecureObjectsTuple() : base(UtilTupleDefinitions.SecureObjects, null, null) + { + } + + public SecureObjectsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.SecureObjects, sourceLineNumber, id) + { + } + + public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; + + public string SecureObject + { + get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); + } + + public string Table + { + get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); + set => this.Set((int)SecureObjectsTupleFields.Table, value); + } + + public string Domain + { + get => this.Fields[(int)SecureObjectsTupleFields.Domain].AsString(); + set => this.Set((int)SecureObjectsTupleFields.Domain, value); + } + + public string User + { + get => this.Fields[(int)SecureObjectsTupleFields.User].AsString(); + set => this.Set((int)SecureObjectsTupleFields.User, value); + } + + public int Permission + { + get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNumber(); + set => this.Set((int)SecureObjectsTupleFields.Permission, value); + } + + public string Component_ + { + get => this.Fields[(int)SecureObjectsTupleFields.Component_].AsString(); + set => this.Set((int)SecureObjectsTupleFields.Component_, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs new file mode 100644 index 00000000..74d96bca --- /dev/null +++ b/src/wixext/Tuples/ServiceConfigTuple.cs @@ -0,0 +1,119 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition ServiceConfig = new IntermediateTupleDefinition( + UtilTupleDefinitionType.ServiceConfig.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.NewService), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.FirstFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.SecondFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ThirdFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ResetPeriodInDays), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ProgramCommandLine), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RebootMessage), IntermediateFieldType.String), + }, + typeof(ServiceConfigTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum ServiceConfigTupleFields + { + ServiceName, + Component_, + NewService, + FirstFailureActionType, + SecondFailureActionType, + ThirdFailureActionType, + ResetPeriodInDays, + RestartServiceDelayInSeconds, + ProgramCommandLine, + RebootMessage, + } + + public class ServiceConfigTuple : IntermediateTuple + { + public ServiceConfigTuple() : base(UtilTupleDefinitions.ServiceConfig, null, null) + { + } + + public ServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.ServiceConfig, sourceLineNumber, id) + { + } + + public IntermediateField this[ServiceConfigTupleFields index] => this.Fields[(int)index]; + + public string ServiceName + { + get => this.Fields[(int)ServiceConfigTupleFields.ServiceName].AsString(); + set => this.Set((int)ServiceConfigTupleFields.ServiceName, value); + } + + public string Component_ + { + get => this.Fields[(int)ServiceConfigTupleFields.Component_].AsString(); + set => this.Set((int)ServiceConfigTupleFields.Component_, value); + } + + public int NewService + { + get => this.Fields[(int)ServiceConfigTupleFields.NewService].AsNumber(); + set => this.Set((int)ServiceConfigTupleFields.NewService, value); + } + + public string FirstFailureActionType + { + get => this.Fields[(int)ServiceConfigTupleFields.FirstFailureActionType].AsString(); + set => this.Set((int)ServiceConfigTupleFields.FirstFailureActionType, value); + } + + public string SecondFailureActionType + { + get => this.Fields[(int)ServiceConfigTupleFields.SecondFailureActionType].AsString(); + set => this.Set((int)ServiceConfigTupleFields.SecondFailureActionType, value); + } + + public string ThirdFailureActionType + { + get => this.Fields[(int)ServiceConfigTupleFields.ThirdFailureActionType].AsString(); + set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value); + } + + public int ResetPeriodInDays + { + get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNumber(); + set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value); + } + + public int RestartServiceDelayInSeconds + { + get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNumber(); + set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value); + } + + public string ProgramCommandLine + { + get => this.Fields[(int)ServiceConfigTupleFields.ProgramCommandLine].AsString(); + set => this.Set((int)ServiceConfigTupleFields.ProgramCommandLine, value); + } + + public string RebootMessage + { + get => this.Fields[(int)ServiceConfigTupleFields.RebootMessage].AsString(); + set => this.Set((int)ServiceConfigTupleFields.RebootMessage, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/UserGroupTuple.cs b/src/wixext/Tuples/UserGroupTuple.cs new file mode 100644 index 00000000..0386a26e --- /dev/null +++ b/src/wixext/Tuples/UserGroupTuple.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition UserGroup = new IntermediateTupleDefinition( + UtilTupleDefinitionType.UserGroup.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(UserGroupTupleFields.User_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupTupleFields.Group_), IntermediateFieldType.String), + }, + typeof(UserGroupTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum UserGroupTupleFields + { + User_, + Group_, + } + + public class UserGroupTuple : IntermediateTuple + { + public UserGroupTuple() : base(UtilTupleDefinitions.UserGroup, null, null) + { + } + + public UserGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.UserGroup, sourceLineNumber, id) + { + } + + public IntermediateField this[UserGroupTupleFields index] => this.Fields[(int)index]; + + public string User_ + { + get => this.Fields[(int)UserGroupTupleFields.User_].AsString(); + set => this.Set((int)UserGroupTupleFields.User_, value); + } + + public string Group_ + { + get => this.Fields[(int)UserGroupTupleFields.Group_].AsString(); + set => this.Set((int)UserGroupTupleFields.Group_, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/UserTuple.cs b/src/wixext/Tuples/UserTuple.cs new file mode 100644 index 00000000..e8c5315c --- /dev/null +++ b/src/wixext/Tuples/UserTuple.cs @@ -0,0 +1,87 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition User = new IntermediateTupleDefinition( + UtilTupleDefinitionType.User.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(UserTupleFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserTupleFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserTupleFields.Password), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserTupleFields.Attributes), IntermediateFieldType.Number), + }, + typeof(UserTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum UserTupleFields + { + User, + Component_, + Name, + Domain, + Password, + Attributes, + } + + public class UserTuple : IntermediateTuple + { + public UserTuple() : base(UtilTupleDefinitions.User, null, null) + { + } + + public UserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.User, sourceLineNumber, id) + { + } + + public IntermediateField this[UserTupleFields index] => this.Fields[(int)index]; + + public string User + { + get => this.Fields[(int)UserTupleFields.User].AsString(); + set => this.Set((int)UserTupleFields.User, value); + } + + public string Component_ + { + get => this.Fields[(int)UserTupleFields.Component_].AsString(); + set => this.Set((int)UserTupleFields.Component_, value); + } + + public string Name + { + get => this.Fields[(int)UserTupleFields.Name].AsString(); + set => this.Set((int)UserTupleFields.Name, value); + } + + public string Domain + { + get => this.Fields[(int)UserTupleFields.Domain].AsString(); + set => this.Set((int)UserTupleFields.Domain, value); + } + + public string Password + { + get => this.Fields[(int)UserTupleFields.Password].AsString(); + set => this.Set((int)UserTupleFields.Password, value); + } + + public int Attributes + { + get => this.Fields[(int)UserTupleFields.Attributes].AsNumber(); + set => this.Set((int)UserTupleFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs new file mode 100644 index 00000000..00c98337 --- /dev/null +++ b/src/wixext/Tuples/UtilTupleDefinitions.cs @@ -0,0 +1,111 @@ +// 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.Util +{ + using System; + using WixToolset.Data; + + public enum UtilTupleDefinitionType + { + EventManifest, + FileShare, + FileSharePermissions, + Group, + Perfmon, + PerfmonManifest, + PerformanceCategory, + SecureObjects, + ServiceConfig, + User, + UserGroup, + WixCloseApplication, + WixFormatFiles, + WixInternetShortcut, + WixRemoveFolderEx, + WixRestartResource, + WixTouchFile, + XmlConfig, + XmlFile, + } + + public static partial class UtilTupleDefinitions + { + public static readonly Version Version = new Version("4.0.0"); + + public static IntermediateTupleDefinition ByName(string name) + { + if (!Enum.TryParse(name, out UtilTupleDefinitionType type)) + { + return null; + } + + return ByType(type); + } + + public static IntermediateTupleDefinition ByType(UtilTupleDefinitionType type) + { + switch (type) + { + case UtilTupleDefinitionType.EventManifest: + return UtilTupleDefinitions.EventManifest; + + case UtilTupleDefinitionType.FileShare: + return UtilTupleDefinitions.FileShare; + + case UtilTupleDefinitionType.FileSharePermissions: + return UtilTupleDefinitions.FileSharePermissions; + + case UtilTupleDefinitionType.Group: + return UtilTupleDefinitions.Group; + + case UtilTupleDefinitionType.Perfmon: + return UtilTupleDefinitions.Perfmon; + + case UtilTupleDefinitionType.PerfmonManifest: + return UtilTupleDefinitions.PerfmonManifest; + + case UtilTupleDefinitionType.PerformanceCategory: + return UtilTupleDefinitions.PerformanceCategory; + + case UtilTupleDefinitionType.SecureObjects: + return UtilTupleDefinitions.SecureObjects; + + case UtilTupleDefinitionType.ServiceConfig: + return UtilTupleDefinitions.ServiceConfig; + + case UtilTupleDefinitionType.User: + return UtilTupleDefinitions.User; + + case UtilTupleDefinitionType.UserGroup: + return UtilTupleDefinitions.UserGroup; + + case UtilTupleDefinitionType.WixCloseApplication: + return UtilTupleDefinitions.WixCloseApplication; + + case UtilTupleDefinitionType.WixFormatFiles: + return UtilTupleDefinitions.WixFormatFiles; + + case UtilTupleDefinitionType.WixInternetShortcut: + return UtilTupleDefinitions.WixInternetShortcut; + + case UtilTupleDefinitionType.WixRemoveFolderEx: + return UtilTupleDefinitions.WixRemoveFolderEx; + + case UtilTupleDefinitionType.WixRestartResource: + return UtilTupleDefinitions.WixRestartResource; + + case UtilTupleDefinitionType.WixTouchFile: + return UtilTupleDefinitions.WixTouchFile; + + case UtilTupleDefinitionType.XmlConfig: + return UtilTupleDefinitions.XmlConfig; + + case UtilTupleDefinitionType.XmlFile: + return UtilTupleDefinitions.XmlFile; + + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + } + } +} diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs new file mode 100644 index 00000000..c2095d93 --- /dev/null +++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs @@ -0,0 +1,111 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixCloseApplication = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixCloseApplication.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.WixCloseApplication), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.TerminateExitCode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Timeout), IntermediateFieldType.Number), + }, + typeof(WixCloseApplicationTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum WixCloseApplicationTupleFields + { + WixCloseApplication, + Target, + Description, + Condition, + Attributes, + Sequence, + Property, + TerminateExitCode, + Timeout, + } + + public class WixCloseApplicationTuple : IntermediateTuple + { + public WixCloseApplicationTuple() : base(UtilTupleDefinitions.WixCloseApplication, null, null) + { + } + + public WixCloseApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixCloseApplication, sourceLineNumber, id) + { + } + + public IntermediateField this[WixCloseApplicationTupleFields index] => this.Fields[(int)index]; + + public string WixCloseApplication + { + get => this.Fields[(int)WixCloseApplicationTupleFields.WixCloseApplication].AsString(); + set => this.Set((int)WixCloseApplicationTupleFields.WixCloseApplication, value); + } + + public string Target + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Target].AsString(); + set => this.Set((int)WixCloseApplicationTupleFields.Target, value); + } + + public string Description + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Description].AsString(); + set => this.Set((int)WixCloseApplicationTupleFields.Description, value); + } + + public string Condition + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Condition].AsString(); + set => this.Set((int)WixCloseApplicationTupleFields.Condition, value); + } + + public int Attributes + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Attributes].AsNumber(); + set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value); + } + + public int Sequence + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNumber(); + set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value); + } + + public string Property + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Property].AsString(); + set => this.Set((int)WixCloseApplicationTupleFields.Property, value); + } + + public int TerminateExitCode + { + get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNumber(); + set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value); + } + + public int Timeout + { + get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNumber(); + set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixFormatFilesTuple.cs b/src/wixext/Tuples/WixFormatFilesTuple.cs new file mode 100644 index 00000000..7fc092b0 --- /dev/null +++ b/src/wixext/Tuples/WixFormatFilesTuple.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixFormatFiles = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixFormatFiles.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.Binary_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.File_), IntermediateFieldType.String), + }, + typeof(WixFormatFilesTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum WixFormatFilesTupleFields + { + Binary_, + File_, + } + + public class WixFormatFilesTuple : IntermediateTuple + { + public WixFormatFilesTuple() : base(UtilTupleDefinitions.WixFormatFiles, null, null) + { + } + + public WixFormatFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixFormatFiles, sourceLineNumber, id) + { + } + + public IntermediateField this[WixFormatFilesTupleFields index] => this.Fields[(int)index]; + + public string Binary_ + { + get => this.Fields[(int)WixFormatFilesTupleFields.Binary_].AsString(); + set => this.Set((int)WixFormatFilesTupleFields.Binary_, value); + } + + public string File_ + { + get => this.Fields[(int)WixFormatFilesTupleFields.File_].AsString(); + set => this.Set((int)WixFormatFilesTupleFields.File_, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs new file mode 100644 index 00000000..5c29cda6 --- /dev/null +++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs @@ -0,0 +1,103 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixInternetShortcut = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixInternetShortcut.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.WixInternetShortcut), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Directory_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconIndex), IntermediateFieldType.Number), + }, + typeof(WixInternetShortcutTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum WixInternetShortcutTupleFields + { + WixInternetShortcut, + Component_, + Directory_, + Name, + Target, + Attributes, + IconFile, + IconIndex, + } + + public class WixInternetShortcutTuple : IntermediateTuple + { + public WixInternetShortcutTuple() : base(UtilTupleDefinitions.WixInternetShortcut, null, null) + { + } + + public WixInternetShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixInternetShortcut, sourceLineNumber, id) + { + } + + public IntermediateField this[WixInternetShortcutTupleFields index] => this.Fields[(int)index]; + + public string WixInternetShortcut + { + get => this.Fields[(int)WixInternetShortcutTupleFields.WixInternetShortcut].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.WixInternetShortcut, value); + } + + public string Component_ + { + get => this.Fields[(int)WixInternetShortcutTupleFields.Component_].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.Component_, value); + } + + public string Directory_ + { + get => this.Fields[(int)WixInternetShortcutTupleFields.Directory_].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.Directory_, value); + } + + public string Name + { + get => this.Fields[(int)WixInternetShortcutTupleFields.Name].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.Name, value); + } + + public string Target + { + get => this.Fields[(int)WixInternetShortcutTupleFields.Target].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.Target, value); + } + + public int Attributes + { + get => this.Fields[(int)WixInternetShortcutTupleFields.Attributes].AsNumber(); + set => this.Set((int)WixInternetShortcutTupleFields.Attributes, value); + } + + public string IconFile + { + get => this.Fields[(int)WixInternetShortcutTupleFields.IconFile].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value); + } + + public int IconIndex + { + get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNumber(); + set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixRemoveFolderExTuple.cs b/src/wixext/Tuples/WixRemoveFolderExTuple.cs new file mode 100644 index 00000000..35e22e2d --- /dev/null +++ b/src/wixext/Tuples/WixRemoveFolderExTuple.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixRemoveFolderEx = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixRemoveFolderEx.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.WixRemoveFolderEx), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.InstallMode), IntermediateFieldType.Number), + }, + typeof(WixRemoveFolderExTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum WixRemoveFolderExTupleFields + { + WixRemoveFolderEx, + Component_, + Property, + InstallMode, + } + + public class WixRemoveFolderExTuple : IntermediateTuple + { + public WixRemoveFolderExTuple() : base(UtilTupleDefinitions.WixRemoveFolderEx, null, null) + { + } + + public WixRemoveFolderExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRemoveFolderEx, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRemoveFolderExTupleFields index] => this.Fields[(int)index]; + + public string WixRemoveFolderEx + { + get => this.Fields[(int)WixRemoveFolderExTupleFields.WixRemoveFolderEx].AsString(); + set => this.Set((int)WixRemoveFolderExTupleFields.WixRemoveFolderEx, value); + } + + public string Component_ + { + get => this.Fields[(int)WixRemoveFolderExTupleFields.Component_].AsString(); + set => this.Set((int)WixRemoveFolderExTupleFields.Component_, value); + } + + public string Property + { + get => this.Fields[(int)WixRemoveFolderExTupleFields.Property].AsString(); + set => this.Set((int)WixRemoveFolderExTupleFields.Property, value); + } + + public int InstallMode + { + get => this.Fields[(int)WixRemoveFolderExTupleFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveFolderExTupleFields.InstallMode, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixRestartResourceTuple.cs b/src/wixext/Tuples/WixRestartResourceTuple.cs new file mode 100644 index 00000000..828d9d15 --- /dev/null +++ b/src/wixext/Tuples/WixRestartResourceTuple.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixRestartResource = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixRestartResource.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.WixRestartResource), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Resource), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Attributes), IntermediateFieldType.Number), + }, + typeof(WixRestartResourceTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum WixRestartResourceTupleFields + { + WixRestartResource, + Component_, + Resource, + Attributes, + } + + public class WixRestartResourceTuple : IntermediateTuple + { + public WixRestartResourceTuple() : base(UtilTupleDefinitions.WixRestartResource, null, null) + { + } + + public WixRestartResourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRestartResource, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRestartResourceTupleFields index] => this.Fields[(int)index]; + + public string WixRestartResource + { + get => this.Fields[(int)WixRestartResourceTupleFields.WixRestartResource].AsString(); + set => this.Set((int)WixRestartResourceTupleFields.WixRestartResource, value); + } + + public string Component_ + { + get => this.Fields[(int)WixRestartResourceTupleFields.Component_].AsString(); + set => this.Set((int)WixRestartResourceTupleFields.Component_, value); + } + + public string Resource + { + get => this.Fields[(int)WixRestartResourceTupleFields.Resource].AsString(); + set => this.Set((int)WixRestartResourceTupleFields.Resource, value); + } + + public int Attributes + { + get => this.Fields[(int)WixRestartResourceTupleFields.Attributes].AsNumber(); + set => this.Set((int)WixRestartResourceTupleFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixTouchFileTuple.cs b/src/wixext/Tuples/WixTouchFileTuple.cs new file mode 100644 index 00000000..f87f396e --- /dev/null +++ b/src/wixext/Tuples/WixTouchFileTuple.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixTouchFile = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixTouchFile.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.WixTouchFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Path), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Attributes), IntermediateFieldType.Number), + }, + typeof(WixTouchFileTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum WixTouchFileTupleFields + { + WixTouchFile, + Component_, + Path, + Attributes, + } + + public class WixTouchFileTuple : IntermediateTuple + { + public WixTouchFileTuple() : base(UtilTupleDefinitions.WixTouchFile, null, null) + { + } + + public WixTouchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixTouchFile, sourceLineNumber, id) + { + } + + public IntermediateField this[WixTouchFileTupleFields index] => this.Fields[(int)index]; + + public string WixTouchFile + { + get => this.Fields[(int)WixTouchFileTupleFields.WixTouchFile].AsString(); + set => this.Set((int)WixTouchFileTupleFields.WixTouchFile, value); + } + + public string Component_ + { + get => this.Fields[(int)WixTouchFileTupleFields.Component_].AsString(); + set => this.Set((int)WixTouchFileTupleFields.Component_, value); + } + + public string Path + { + get => this.Fields[(int)WixTouchFileTupleFields.Path].AsString(); + set => this.Set((int)WixTouchFileTupleFields.Path, value); + } + + public int Attributes + { + get => this.Fields[(int)WixTouchFileTupleFields.Attributes].AsNumber(); + set => this.Set((int)WixTouchFileTupleFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs new file mode 100644 index 00000000..093299b2 --- /dev/null +++ b/src/wixext/Tuples/XmlConfigTuple.cs @@ -0,0 +1,111 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition XmlConfig = new IntermediateTupleDefinition( + UtilTupleDefinitionType.XmlConfig.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.XmlConfig), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.VerifyPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Sequence), IntermediateFieldType.Number), + }, + typeof(XmlConfigTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum XmlConfigTupleFields + { + XmlConfig, + File, + ElementPath, + VerifyPath, + Name, + Value, + Flags, + Component_, + Sequence, + } + + public class XmlConfigTuple : IntermediateTuple + { + public XmlConfigTuple() : base(UtilTupleDefinitions.XmlConfig, null, null) + { + } + + public XmlConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlConfig, sourceLineNumber, id) + { + } + + public IntermediateField this[XmlConfigTupleFields index] => this.Fields[(int)index]; + + public string XmlConfig + { + get => this.Fields[(int)XmlConfigTupleFields.XmlConfig].AsString(); + set => this.Set((int)XmlConfigTupleFields.XmlConfig, value); + } + + public string File + { + get => this.Fields[(int)XmlConfigTupleFields.File].AsString(); + set => this.Set((int)XmlConfigTupleFields.File, value); + } + + public string ElementPath + { + get => this.Fields[(int)XmlConfigTupleFields.ElementPath].AsString(); + set => this.Set((int)XmlConfigTupleFields.ElementPath, value); + } + + public string VerifyPath + { + get => this.Fields[(int)XmlConfigTupleFields.VerifyPath].AsString(); + set => this.Set((int)XmlConfigTupleFields.VerifyPath, value); + } + + public string Name + { + get => this.Fields[(int)XmlConfigTupleFields.Name].AsString(); + set => this.Set((int)XmlConfigTupleFields.Name, value); + } + + public string Value + { + get => this.Fields[(int)XmlConfigTupleFields.Value].AsString(); + set => this.Set((int)XmlConfigTupleFields.Value, value); + } + + public int Flags + { + get => this.Fields[(int)XmlConfigTupleFields.Flags].AsNumber(); + set => this.Set((int)XmlConfigTupleFields.Flags, value); + } + + public string Component_ + { + get => this.Fields[(int)XmlConfigTupleFields.Component_].AsString(); + set => this.Set((int)XmlConfigTupleFields.Component_, value); + } + + public int Sequence + { + get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNumber(); + set => this.Set((int)XmlConfigTupleFields.Sequence, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs new file mode 100644 index 00000000..27ea7119 --- /dev/null +++ b/src/wixext/Tuples/XmlFileTuple.cs @@ -0,0 +1,103 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition XmlFile = new IntermediateTupleDefinition( + UtilTupleDefinitionType.XmlFile.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.XmlFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number), + }, + typeof(XmlFileTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public enum XmlFileTupleFields + { + XmlFile, + File, + ElementPath, + Name, + Value, + Flags, + Component_, + Sequence, + } + + public class XmlFileTuple : IntermediateTuple + { + public XmlFileTuple() : base(UtilTupleDefinitions.XmlFile, null, null) + { + } + + public XmlFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlFile, sourceLineNumber, id) + { + } + + public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index]; + + public string XmlFile + { + get => this.Fields[(int)XmlFileTupleFields.XmlFile].AsString(); + set => this.Set((int)XmlFileTupleFields.XmlFile, value); + } + + public string File + { + get => this.Fields[(int)XmlFileTupleFields.File].AsString(); + set => this.Set((int)XmlFileTupleFields.File, value); + } + + public string ElementPath + { + get => this.Fields[(int)XmlFileTupleFields.ElementPath].AsString(); + set => this.Set((int)XmlFileTupleFields.ElementPath, value); + } + + public string Name + { + get => this.Fields[(int)XmlFileTupleFields.Name].AsString(); + set => this.Set((int)XmlFileTupleFields.Name, value); + } + + public string Value + { + get => this.Fields[(int)XmlFileTupleFields.Value].AsString(); + set => this.Set((int)XmlFileTupleFields.Value, value); + } + + public int Flags + { + get => this.Fields[(int)XmlFileTupleFields.Flags].AsNumber(); + set => this.Set((int)XmlFileTupleFields.Flags, value); + } + + public string Component_ + { + get => this.Fields[(int)XmlFileTupleFields.Component_].AsString(); + set => this.Set((int)XmlFileTupleFields.Component_, value); + } + + public int Sequence + { + get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNumber(); + set => this.Set((int)XmlFileTupleFields.Sequence, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/UtilBinder.cs b/src/wixext/UtilBinder.cs new file mode 100644 index 00000000..ef80a876 --- /dev/null +++ b/src/wixext/UtilBinder.cs @@ -0,0 +1,347 @@ +// 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 +{ +#if TODO_BRINGBACK_FOR_BUNDLES + using System; + using System.Collections.Generic; + using System.Globalization; + using WixToolset.Data; + using WixToolset.Extensibility; + + /// + /// The binder for the WiX Toolset Utility Extension. + /// + public sealed class UtilBinder : BinderExtension + { + // TODO: When WixSearch is supported in Product, etc, we may need to call + // ReorderWixSearch() from each of those initializers. + + // TODO: A general-purpose "reorder this table given these constraints" + // mechanism may end up being helpful. This could be declaratively stated + // in the table definitions, or exposed from the core Wix.dll and called + // as-needed by any extensions. + + /// + /// Called before bundle binding occurs. + /// + public override void Initialize(Output bundle) + { + if (OutputType.Bundle == bundle.Type) + { + this.ReorderWixSearch(bundle); + } + } + + /// + /// Reorders Any WixSearch items. + /// + /// Output containing the tables to process. + private void ReorderWixSearch(Output output) + { + Table wixSearchTable = output.Tables["WixSearch"]; + if (null == wixSearchTable || wixSearchTable.Rows.Count == 0) + { + // nothing to do! + return; + } + + RowDictionary rowDictionary = new RowDictionary(); + foreach (Row row in wixSearchTable.Rows) + { + rowDictionary.AddRow(row); + } + + Constraints constraints = new Constraints(); + Table wixSearchRelationTable = output.Tables["WixSearchRelation"]; + if (null != wixSearchRelationTable && wixSearchRelationTable.Rows.Count > 0) + { + // add relational info to our data... + foreach (Row row in wixSearchRelationTable.Rows) + { + constraints.AddConstraint((string)row[0], (string)row[1]); + } + } + + this.FindCircularReference(constraints); + + if (this.Core.EncounteredError) + { + return; + } + + this.FlattenDependentReferences(constraints); + + // Reorder by topographical sort (http://en.wikipedia.org/wiki/Topological_sorting) + // We use a variation of Kahn (1962) algorithm as described in + // Wikipedia, with the additional criteria that start nodes are sorted + // lexicographically at each step to ensure a deterministic ordering + // based on 'after' dependencies and ID. + TopologicalSort sorter = new TopologicalSort(); + List sortedIds = sorter.Sort(rowDictionary.Keys, constraints); + + // Now, re-write the table with the searches in order... + wixSearchTable.Rows.Clear(); + foreach (string id in sortedIds) + { + wixSearchTable.Rows.Add(rowDictionary[id]); + } + } + + /// + /// A dictionary of Row items, indexed by their first column. + /// + private class RowDictionary : Dictionary + { + public void AddRow(Row row) + { + this.Add((string)row[0], row); + } + + // TODO: Hide other Add methods? + } + + /// + /// A dictionary of constraints, mapping an id to a list of ids. + /// + private class Constraints : Dictionary> + { + public void AddConstraint(string id, string afterId) + { + if (!this.ContainsKey(id)) + { + this.Add(id, new List()); + } + + // TODO: Show warning if a constraint is seen twice? + if (!this[id].Contains(afterId)) + { + this[id].Add(afterId); + } + } + + // TODO: Hide other Add methods? + } + + /// + /// Finds circular references in the constraints. + /// + /// Constraints to check. + /// This is not particularly performant, but it works. + private void FindCircularReference(Constraints constraints) + { + foreach (string id in constraints.Keys) + { + List seenIds = new List(); + string chain = null; + if (FindCircularReference(constraints, id, id, seenIds, out chain)) + { + // We will show a separate message for every ID that's in + // the loop. We could bail after the first one, but then + // we wouldn't catch disjoint loops in a single run. + this.Core.OnMessage(UtilErrors.CircularSearchReference(chain)); + } + } + } + + /// + /// Recursive function that finds circular references in the constraints. + /// + /// Constraints to check. + /// The identifier currently being looking for. (Fixed across a given run.) + /// The idenifier curently being tested. + /// A list of identifiers seen, to ensure each identifier is only expanded once. + /// If a circular reference is found, will contain the chain of references. + /// True if a circular reference is found, false otherwise. + private bool FindCircularReference(Constraints constraints, string checkId, string currentId, List seenIds, out string chain) + { + chain = null; + List afterList = null; + if (constraints.TryGetValue(currentId, out afterList)) + { + foreach (string afterId in afterList) + { + if (afterId == checkId) + { + chain = String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", currentId, afterId); + return true; + } + + if (!seenIds.Contains(afterId)) + { + seenIds.Add(afterId); + if (FindCircularReference(constraints, checkId, afterId, seenIds, out chain)) + { + chain = String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", currentId, chain); + return true; + } + } + } + } + + return false; + } + + /// + /// Flattens any dependency chains to simplify reordering. + /// + /// + private void FlattenDependentReferences(Constraints constraints) + { + foreach (string id in constraints.Keys) + { + List flattenedIds = new List(); + AddDependentReferences(constraints, id, flattenedIds); + List constraintList = constraints[id]; + foreach (string flattenedId in flattenedIds) + { + if (!constraintList.Contains(flattenedId)) + { + constraintList.Add(flattenedId); + } + } + } + } + + /// + /// Adds dependent references to a list. + /// + /// + /// + /// + private void AddDependentReferences(Constraints constraints, string currentId, List seenIds) + { + List afterList = null; + if (constraints.TryGetValue(currentId, out afterList)) + { + foreach (string afterId in afterList) + { + if (!seenIds.Contains(afterId)) + { + seenIds.Add(afterId); + AddDependentReferences(constraints, afterId, seenIds); + } + } + } + } + + /// + /// Reorder by topological sort + /// + /// + /// We use a variation of Kahn (1962) algorithm as described in + /// Wikipedia (http://en.wikipedia.org/wiki/Topological_sorting), with + /// the additional criteria that start nodes are sorted lexicographically + /// at each step to ensure a deterministic ordering based on 'after' + /// dependencies and ID. + /// + private class TopologicalSort + { + private List startIds = new List(); + private Constraints constraints; + + /// + /// Reorder by topological sort + /// + /// The complete list of IDs. + /// Constraints to use. + /// The topologically sorted list of IDs. + internal List Sort(IEnumerable allIds, Constraints constraints) + { + this.startIds.Clear(); + this.CopyConstraints(constraints); + + this.FindInitialStartIds(allIds); + + // We always create a new sortedId list, because we return it + // to the caller and don't know what its lifetime may be. + List sortedIds = new List(); + + while (this.startIds.Count > 0) + { + this.SortStartIds(); + + string currentId = this.startIds[0]; + sortedIds.Add(currentId); + this.startIds.RemoveAt(0); + + this.ResolveConstraint(currentId); + } + + return sortedIds; + } + + /// + /// Copies a Constraints set (to prevent modifying the incoming data). + /// + /// Constraints to copy. + private void CopyConstraints(Constraints constraints) + { + this.constraints = new Constraints(); + foreach (string id in constraints.Keys) + { + foreach (string afterId in constraints[id]) + { + this.constraints.AddConstraint(id, afterId); + } + } + } + + /// + /// Finds initial start IDs. (Those with no constraints.) + /// + /// The complete list of IDs. + private void FindInitialStartIds(IEnumerable allIds) + { + foreach (string id in allIds) + { + if (!this.constraints.ContainsKey(id)) + { + this.startIds.Add(id); + } + } + } + + /// + /// Sorts start IDs. + /// + private void SortStartIds() + { + this.startIds.Sort(); + } + + /// + /// Removes the resolved constraint and updates the list of startIds + /// with any now-valid (all constraints resolved) IDs. + /// + /// The ID to resolve from the set of constraints. + private void ResolveConstraint(string resolvedId) + { + List newStartIds = new List(); + + foreach (string id in constraints.Keys) + { + if (this.constraints[id].Contains(resolvedId)) + { + this.constraints[id].Remove(resolvedId); + + // If we just removed the last constraint for this + // ID, it is now a valid start ID. + if (0 == this.constraints[id].Count) + { + newStartIds.Add(id); + } + } + } + + foreach (string id in newStartIds) + { + this.constraints.Remove(id); + } + + this.startIds.AddRange(newStartIds); + } + } + } +#endif +} diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs new file mode 100644 index 00000000..da48e412 --- /dev/null +++ b/src/wixext/UtilCompiler.cs @@ -0,0 +1,3911 @@ +// 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.Util +{ + using System; + using System.Collections; + using System.Collections.Generic; + using System.Globalization; + using System.Linq; + using System.Text; + using System.Text.RegularExpressions; + using System.Xml.Linq; + using WixToolset.Data; + using WixToolset.Extensibility; + + /// + /// The compiler for the WiX Toolset Utility Extension. + /// + public sealed class UtilCompiler : BaseCompilerExtension + { + // user creation attributes definitions (from sca.h) + internal const int UserDontExpirePasswrd = 0x00000001; + internal const int UserPasswdCantChange = 0x00000002; + internal const int UserPasswdChangeReqdOnLogin = 0x00000004; + internal const int UserDisableAccount = 0x00000008; + internal const int UserFailIfExists = 0x00000010; + internal const int UserUpdateIfExists = 0x00000020; + internal const int UserLogonAsService = 0x00000040; + internal const int UserLogonAsBatchJob = 0x00000080; + + internal const int UserDontRemoveOnUninstall = 0x00000100; + internal const int UserDontCreateUser = 0x00000200; + internal const int UserNonVital = 0x00000400; + + [Flags] + internal enum WixFileSearchAttributes + { + Default = 0x001, + MinVersionInclusive = 0x002, + MaxVersionInclusive = 0x004, + MinSizeInclusive = 0x008, + MaxSizeInclusive = 0x010, + MinDateInclusive = 0x020, + MaxDateInclusive = 0x040, + WantVersion = 0x080, + WantExists = 0x100, + IsDirectory = 0x200, + } + + internal enum WixRegistrySearchFormat + { + Raw, + Compatible, + } + + [Flags] + internal enum WixRegistrySearchAttributes + { + Raw = 0x01, + Compatible = 0x02, + ExpandEnvironmentVariables = 0x04, + WantValue = 0x08, + WantExists = 0x10, + Win64 = 0x20, + } + + internal enum WixComponentSearchAttributes + { + KeyPath = 0x1, + State = 0x2, + WantDirectory = 0x4, + } + + [Flags] + internal enum WixProductSearchAttributes + { + Version = 0x01, + Language = 0x02, + State = 0x04, + Assignment = 0x08, + UpgradeCode = 0x10, + } + + internal enum WixRestartResourceAttributes + { + Filename = 1, + ProcessName, + ServiceName, + TypeMask = 0xf, + } + + internal enum WixRemoveFolderExOn + { + Install = 1, + Uninstall = 2, + Both = 3, + } + + private static readonly Regex FindPropertyBrackets = new Regex(@"\[(?!\\|\])|(? "http://wixtoolset.org/schemas/v4/wxs/util"; + + /// + /// Types of Internet shortcuts. + /// + public enum InternetShortcutType + { + /// Create a .lnk file. + Link = 0, + + /// Create a .url file. + Url, + } + + /// + /// Types of permission setting methods. + /// + private enum PermissionType + { + /// LockPermissions (normal) type permission setting. + LockPermissions, + + /// FileSharePermissions type permission setting. + FileSharePermissions, + + /// SecureObjects type permission setting. + SecureObjects, + } + + /// + /// Processes an element for the Compiler. + /// + /// Parent element of element to process. + /// Element to process. + /// Extra information about the context in which this element is being parsed. + public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) + { + this.ParsePossibleKeyPathElement(intermediate, section, parentElement, element, context); + } + + /// + /// Processes an element for the Compiler. + /// + /// Source line number for the parent element. + /// Parent element of element to process. + /// Element to process. + /// Extra information about the context in which this element is being parsed. + public override ComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) + { + ComponentKeyPath possibleKeyPath = null; + + switch (parentElement.Name.LocalName) + { + case "CreateFolder": + string createFolderId = context["DirectoryId"]; + string createFolderComponentId = context["ComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + bool createFolderWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, createFolderId, createFolderComponentId, createFolderWin64, "CreateFolder"); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "Component": + string componentId = context["ComponentId"]; + string directoryId = context["DirectoryId"]; + bool componentWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "EventSource": + possibleKeyPath = this.ParseEventSourceElement(intermediate, section, element, componentId); + break; + case "FileShare": + this.ParseFileShareElement(intermediate, section, element, componentId, directoryId); + break; + case "InternetShortcut": + this.ParseInternetShortcutElement(intermediate, section, element, componentId, directoryId); + break; + case "PerformanceCategory": + this.ParsePerformanceCategoryElement(intermediate, section, element, componentId); + break; + case "RemoveFolderEx": + this.ParseRemoveFolderExElement(intermediate, section, element, componentId); + break; + case "RestartResource": + this.ParseRestartResourceElement(intermediate, section, element, componentId); + break; + case "ServiceConfig": + this.ParseServiceConfigElement(intermediate, section, element, componentId, "Component", null); + break; + case "TouchFile": + this.ParseTouchFileElement(intermediate, section, element, componentId, componentWin64); + break; + case "User": + this.ParseUserElement(intermediate, section, element, componentId); + break; + case "XmlFile": + this.ParseXmlFileElement(intermediate, section, element, componentId); + break; + case "XmlConfig": + this.ParseXmlConfigElement(intermediate, section, element, componentId, false); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "File": + string fileId = context["FileId"]; + string fileComponentId = context["ComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + bool fileWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PerfCounter": + this.ParsePerfCounterElement(intermediate, section, element, fileComponentId, fileId); + break; + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, fileId, fileComponentId, fileWin64, "File"); + break; + case "PerfCounterManifest": + this.ParsePerfCounterManifestElement(intermediate, section, element, fileComponentId, fileId); + break; + case "EventManifest": + this.ParseEventManifestElement(intermediate, section, element, fileComponentId, fileId); + break; + case "FormatFile": + this.ParseFormatFileElement(intermediate, section, element, fileId, fileWin64); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "Bundle": + case "Fragment": + case "Module": + case "Product": + switch (element.Name.LocalName) + { + case "CloseApplication": + this.ParseCloseApplicationElement(intermediate, section, element); + break; + case "Group": + this.ParseGroupElement(intermediate, section, element, null); + break; + case "RestartResource": + // Currently not supported for Bundles. + if (parentElement.Name.LocalName != "Bundle") + { + this.ParseRestartResourceElement(intermediate, section, element, null); + } + else + { + this.ParseHelper.UnexpectedElement(parentElement, element); + } + break; + case "User": + this.ParseUserElement(intermediate, section, element, null); + break; + case "ComponentSearch": + case "ComponentSearchRef": + case "DirectorySearch": + case "DirectorySearchRef": + case "FileSearch": + case "FileSearchRef": + case "ProductSearch": + case "ProductSearchRef": + case "RegistrySearch": + case "RegistrySearchRef": + // These will eventually be supported under Module/Product, but are not yet. + if (parentElement.Name.LocalName == "Bundle" || parentElement.Name.LocalName == "Fragment") + { + // TODO: When these are supported by all section types, move + // these out of the nested switch and back into the surrounding one. + switch (element.Name.LocalName) + { + case "ComponentSearch": + this.ParseComponentSearchElement(intermediate, section, element); + break; + case "ComponentSearchRef": + this.ParseComponentSearchRefElement(intermediate, section, element); + break; + case "DirectorySearch": + this.ParseDirectorySearchElement(intermediate, section, element); + break; + case "DirectorySearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "FileSearch": + this.ParseFileSearchElement(intermediate, section, element); + break; + case "FileSearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "ProductSearch": + this.ParseProductSearchElement(intermediate, section, element); + break; + case "ProductSearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "RegistrySearch": + this.ParseRegistrySearchElement(intermediate, section, element); + break; + case "RegistrySearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + } + } + else + { + this.ParseHelper.UnexpectedElement(parentElement, element); + } + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "Registry": + case "RegistryKey": + case "RegistryValue": + string registryId = context["RegistryId"]; + string registryComponentId = context["ComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + bool registryWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, registryId, registryComponentId, registryWin64, "Registry"); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "ServiceInstall": + string serviceInstallId = context["ServiceInstallId"]; + string serviceInstallName = context["ServiceInstallName"]; + string serviceInstallComponentId = context["ServiceInstallComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + bool serviceInstallWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, serviceInstallId, serviceInstallComponentId, serviceInstallWin64, "ServiceInstall"); + break; + case "ServiceConfig": + this.ParseServiceConfigElement(intermediate, section, element, serviceInstallComponentId, "ServiceInstall", serviceInstallName); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + + return possibleKeyPath; + } + + /// + /// Parses the common search attributes shared across all searches. + /// + /// Source line number for the parent element. + /// Attribute to parse. + /// Value of the Id attribute. + /// Value of the Variable attribute. + /// Value of the Condition attribute. + /// Value of the After attribute. + private void ParseCommonSearchAttributes(SourceLineNumber sourceLineNumbers, XAttribute attrib, ref Identifier id, ref string variable, ref string condition, ref string after) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Variable": + variable = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + // TODO: handle standard bundle variables + break; + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "After": + after = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + System.Diagnostics.Debug.Assert(false); + break; + } + } + + /// + /// Parses a ComponentSearch element. + /// + /// Element to parse. + private void ParseComponentSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string guid = null; + string productCode = null; + Serialize.ComponentSearch.ResultType result = Serialize.ComponentSearch.ResultType.NotSet; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Guid": + guid = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); + break; + case "ProductCode": + productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); + break; + case "Result": + string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (!Serialize.ComponentSearch.TryParseResultType(resultValue, out result)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, + resultValue, + Serialize.ComponentSearch.ResultType.directory.ToString(), + Serialize.ComponentSearch.ResultType.state.ToString(), + Serialize.ComponentSearch.ResultType.keyPath.ToString())); + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == variable) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); + } + + if (null == guid) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Guid")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wcs", variable, condition, after, guid, productCode, result.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); + if (after != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); + // TODO: We're currently defaulting to "always run after", which we will need to change... + this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); + } + + WixComponentSearchAttributes attributes = WixComponentSearchAttributes.KeyPath; + switch (result) + { + case Serialize.ComponentSearch.ResultType.directory: + attributes = WixComponentSearchAttributes.WantDirectory; + break; + case Serialize.ComponentSearch.ResultType.keyPath: + attributes = WixComponentSearchAttributes.KeyPath; + break; + case Serialize.ComponentSearch.ResultType.state: + attributes = WixComponentSearchAttributes.State; + break; + } + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixComponentSearch", id); + row.Set(1, guid); + row.Set(2, productCode); + row.Set(3, (int)attributes); + } + } + + /// + /// Parses a ComponentSearchRef element + /// + /// Element to parse. + private void ParseComponentSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string refId = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixComponentSearch", refId); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + } + + /// + /// Parses an event source element. + /// + /// Element to parse. + /// Identifier of parent component. + private ComponentKeyPath ParseEventSourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string sourceName = null; + string logName = null; + string categoryMessageFile = null; + int categoryCount = CompilerConstants.IntegerNotSet; + string eventMessageFile = null; + string parameterMessageFile = null; + int typesSupported = 0; + bool isKeyPath = false; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "CategoryCount": + categoryCount = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + break; + case "CategoryMessageFile": + categoryMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "EventMessageFile": + eventMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "KeyPath": + isKeyPath = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Log": + logName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if ("Security" == logName) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, logName, "Application", "System", "")); + } + break; + case "Name": + sourceName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ParameterMessageFile": + parameterMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "SupportsErrors": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x01; // EVENTLOG_ERROR_TYPE + } + break; + case "SupportsFailureAudits": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x10; // EVENTLOG_AUDIT_FAILURE + } + break; + case "SupportsInformationals": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x04; // EVENTLOG_INFORMATION_TYPE + } + break; + case "SupportsSuccessAudits": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x08; // EVENTLOG_AUDIT_SUCCESS + } + break; + case "SupportsWarnings": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x02; // EVENTLOG_WARNING_TYPE + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == sourceName) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (null == logName) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "EventLog")); + } + + if (null == eventMessageFile) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "EventMessageFile")); + } + + if (null == categoryMessageFile && 0 < categoryCount) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "CategoryCount", "CategoryMessageFile")); + } + + if (null != categoryMessageFile && CompilerConstants.IntegerNotSet == categoryCount) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "CategoryMessageFile", "CategoryCount")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + int registryRoot = 2; // MsiInterop.MsidbRegistryRootLocalMachine + string eventSourceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\EventLog\{0}\{1}", logName, sourceName); + Identifier id = this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + + if (null != categoryMessageFile) + { + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); + } + + if (CompilerConstants.IntegerNotSet != categoryCount) + { + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); + } + + if (null != parameterMessageFile) + { + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); + } + + if (0 != typesSupported) + { + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); + } + + return new ComponentKeyPath() { Id = id.Id, Explicit = isKeyPath, Type = ComponentKeyPathType.Registry }; + } + + /// + /// Parses a close application element. + /// + /// Element to parse. + private void ParseCloseApplicationElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string condition = null; + string description = null; + string target = null; + string property = null; + Identifier id = null; + int attributes = 2; // default to CLOSEAPP_ATTRIBUTE_REBOOTPROMPT enabled + int sequence = CompilerConstants.IntegerNotSet; + int terminateExitCode = CompilerConstants.IntegerNotSet; + int timeout = CompilerConstants.IntegerNotSet; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Description": + description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Property": + property = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Sequence": + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + break; + case "Timeout": + timeout = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + break; + case "Target": + target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "CloseMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 1; // CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE + } + else + { + attributes &= ~1; // CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE + } + break; + case "EndSessionMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 8; // CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE + } + else + { + attributes &= ~8; // CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE + } + break; + case "PromptToContinue": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 0x40; // CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE + } + else + { + attributes &= ~0x40; // CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE + } + break; + case "RebootPrompt": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 2; // CLOSEAPP_ATTRIBUTE_REBOOTPROMPT + } + else + { + attributes &= ~2; // CLOSEAPP_ATTRIBUTE_REBOOTPROMPT + } + break; + case "ElevatedCloseMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 4; // CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE + } + else + { + attributes &= ~4; // CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE + } + break; + case "ElevatedEndSessionMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 0x10; // CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE + } + else + { + attributes &= ~0x10; // CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE + } + break; + case "TerminateProcess": + terminateExitCode = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + attributes |= 0x20; // CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == target) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target")); + } + else if (null == id) + { + id = this.ParseHelper.CreateIdentifier("ca", target); + } + + if (String.IsNullOrEmpty(description) && 0x40 == (attributes & 0x40)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithoutOtherAttribute(sourceLineNumbers, element.Name.LocalName, "PromptToContinue", "yes", "Description")); + } + + if (0x22 == (attributes & 0x22)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes")); + } + + // get the condition from the inner text of the element + condition = this.ParseHelper.GetConditionInnerText(element); + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + // Reference CustomAction since nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixCloseApplications_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixCloseApplications"); + } + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixCloseApplication", id); + row.Set(1, target); + row.Set(2, description); + row.Set(3, condition); + row.Set(4, attributes); + if (CompilerConstants.IntegerNotSet != sequence) + { + row.Set(5, sequence); + } + row.Set(6, property); + if (CompilerConstants.IntegerNotSet != terminateExitCode) + { + row.Set(7, terminateExitCode); + } + if (CompilerConstants.IntegerNotSet != timeout) + { + row.Set(8, timeout * 1000); // make the timeout milliseconds in the table. + } + } + } + + /// + /// Parses a DirectorySearch element. + /// + /// Element to parse. + private void ParseDirectorySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string path = null; + Serialize.DirectorySearch.ResultType result = Serialize.DirectorySearch.ResultType.NotSet; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Path": + path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); + break; + case "Result": + string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (!Serialize.DirectorySearch.TryParseResultType(resultValue, out result)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, + resultValue, Serialize.DirectorySearch.ResultType.exists.ToString())); + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == variable) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); + } + + if (null == path) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wds", variable, condition, after, path, result.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); + if (after != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); + // TODO: We're currently defaulting to "always run after", which we will need to change... + this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); + } + + WixFileSearchAttributes attributes = WixFileSearchAttributes.IsDirectory; + switch (result) + { + case Serialize.DirectorySearch.ResultType.exists: + attributes |= WixFileSearchAttributes.WantExists; + break; + } + + this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); + } + } + + /// + /// Parses a DirectorySearchRef, FileSearchRef, ProductSearchRef, and RegistrySearchRef elements + /// + /// Element to parse. + private void ParseWixSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string refId = null; + + foreach (XAttribute attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", refId); + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + } + + /// + /// Parses a FileSearch element. + /// + /// Element to parse. + private void ParseFileSearchElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string path = null; + Serialize.FileSearch.ResultType result = Serialize.FileSearch.ResultType.NotSet; + + foreach (XAttribute attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Path": + path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); + break; + case "Result": + string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (!Serialize.FileSearch.TryParseResultType(resultValue, out result)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, + resultValue, + Serialize.FileSearch.ResultType.exists.ToString(), + Serialize.FileSearch.ResultType.version.ToString())); + } + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + if (null == variable) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Variable")); + } + + if (null == path) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Path")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wfs", variable, condition, after, path, result.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); + if (after != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); + // TODO: We're currently defaulting to "always run after", which we will need to change... + this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); + } + + WixFileSearchAttributes attributes = WixFileSearchAttributes.Default; + switch (result) + { + case Serialize.FileSearch.ResultType.exists: + attributes |= WixFileSearchAttributes.WantExists; + break; + case Serialize.FileSearch.ResultType.version: + attributes |= WixFileSearchAttributes.WantVersion; + break; + } + + this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); + } + } + + /// + /// Creates a row in the WixFileSearch table. + /// + /// Source line number for the parent element. + /// Identifier of the search (key into the WixSearch table) + /// File/directory path to search for. + /// + private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixFileSearch", id); + row.Set(1, path); + //row.Set(2, minVersion; + //row.Set(3, maxVersion; + //row.Set(4, minSize; + //row.Set(5, maxSize; + //row.Set(6, minDate; + //row.Set(7, maxDate; + //row.Set(8, languages; + row.Set(9, (int)attributes); + } + + /// + /// Creates a row in the WixSearch table. + /// + /// Source line number for the parent element. + /// Identifier of the search. + /// The Burn variable to store the result into. + /// A condition to test before evaluating the search. + private void CreateWixSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string variable, string condition) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixSearch", id); + row.Set(1, variable); + row.Set(2, condition); + } + + /// + /// + /// + /// Source line number for the parent element. + /// Identifier of the search (key into the WixSearch table) + /// Identifier of the search that comes before (key into the WixSearch table) + /// Further details about the relation between id and parentId. + private void CreateWixSearchRelationRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixSearchRelation", id); + row.Set(1, parentId); + row.Set(2, attributes); + } + + /// + /// Parses a file share element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referred to directory. + private void ParseFileShareElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string directoryId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string description = null; + string name = null; + string id = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Description": + description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (!element.Elements().Any()) + { + this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission")); + } + + foreach (XElement child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "FileSharePermission": + this.ParseFileSharePermissionElement(intermediate, section, child, id); + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + // Reference ConfigureSmbInstall and ConfigureSmbUninstall since nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbInstall_ARM"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbUninstall_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbInstall"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbUninstall"); + } + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "FileShare"); + row.Set(0, id); + row.Set(1, name); + row.Set(2, componentId); + row.Set(3, description); + row.Set(4, directoryId); + } + } + + /// + /// Parses a FileSharePermission element. + /// + /// Element to parse. + /// The identifier of the parent FileShare element. + private void ParseFileSharePermissionElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileShareId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + BitArray bits = new BitArray(32); + int permission = 0; + string user = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "User": + user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "User", user); + break; + default: + YesNoType attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) + { + if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) + { + if (!this.TrySetBitFromName(UtilConstants.FolderPermissions, attrib.Name.LocalName, attribValue, bits, 0)) + { + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + } + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + permission = this.CreateIntegerFromBitArray(bits); + + if (null == user) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); + } + + if (int.MinValue == permission) // just GENERIC_READ, which is MSI_NULL + { + this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "FileSharePermissions"); + row.Set(0, fileShareId); + row.Set(1, user); + row.Set(2, permission); + } + } + + /// + /// Parses a group element. + /// + /// Node to be parsed. + /// Component Id of the parent component of this element. + private void ParseGroupElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string id = null; + string domain = null; + string name = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Domain": + domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "Group"); + row.Set(0, id); + row.Set(1, componentId); + row.Set(2, name); + row.Set(3, domain); + } + } + + /// + /// Parses a GroupRef element + /// + /// Element to parse. + /// Required user id to be joined to the group. + private void ParseGroupRefElement(Intermediate intermediate, IntermediateSection section, XElement element, string userId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string groupId = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Group", groupId); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "UserGroup"); + row.Set(0, userId); + row.Set(1, groupId); + } + } + + /// + /// Parses an InternetShortcut element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Default directory if none is specified on the InternetShortcut element. + private void ParseInternetShortcutElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string defaultTarget) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string id = null; + string name = null; + string target = null; + string directoryId = null; + string type = null; + string iconFile = null; + int iconIndex = 0; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Directory": + directoryId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Target": + target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Type": + type = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "IconFile": + iconFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "IconIndex": + iconIndex = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + // If there was no directoryId specified on the InternetShortcut element, default to the one on + // the parent component. + if (null == directoryId) + { + directoryId = defaultTarget; + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + // In theory this can never be the case, since InternetShortcut can only be under + // a component element, and if the Directory wasn't specified the default will come + // from the component. However, better safe than sorry, so here's a check to make sure + // it didn't wind up being null after setting it to the defaultTarget. + if (null == directoryId) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Directory")); + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (null == target) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + InternetShortcutType shortcutType = InternetShortcutType.Link; + if (0 == String.Compare(type, "url", StringComparison.OrdinalIgnoreCase)) + { + shortcutType = InternetShortcutType.Url; + } + + if (!this.Messaging.EncounteredError) + { + CreateWixInternetShortcut(intermediate, section, sourceLineNumbers, componentId, directoryId, id, name, target, shortcutType, iconFile, iconIndex); + } + } + + /// + /// Creates the rows needed for WixInternetShortcut to work. + /// + /// The CompilerCore object used to create rows. + /// Source line information about the owner element. + /// Identifier of parent component. + /// Identifier of directory containing shortcut. + /// Identifier of shortcut. + /// Name of shortcut without extension. + /// Target URL of shortcut. + public void CreateWixInternetShortcut(Intermediate intermediate, IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, string shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) + { + // add the appropriate extension based on type of shortcut + name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixInternetShortcut"); + row.Set(0, shortcutId); + row.Set(1, componentId); + row.Set(2, directoryId); + row.Set(3, name); + row.Set(4, target); + row.Set(5, (int)type); + row.Set(6, iconFile); + row.Set(7, iconIndex); + + // Reference custom action because nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedInternetShortcuts_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedInternetShortcuts"); + } + + // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); + + // use built-in MSI functionality to remove the shortcuts rather than doing so via CA + row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "RemoveFile"); + row.Set(0, shortcutId); + row.Set(1, componentId); + row.Set(2, this.ParseHelper.IsValidShortFilename(name, false) ? name : String.Concat(this.ParseHelper.CreateShortName(name, true, false, directoryId, name), "|", name)); + row.Set(3, directoryId); + row.Set(4, 2); // msidbRemoveFileInstallModeOnRemove + } + + /// + /// Parses a performance category element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParsePerformanceCategoryElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string id = null; + string name = null; + string help = null; + YesNoType multiInstance = YesNoType.No; + int defaultLanguage = 0x09; // default to "english" + + ArrayList parsedPerformanceCounters = new ArrayList(); + + // default to managed performance counter + string library = "netfxperf.dll"; + string openEntryPoint = "OpenPerformanceData"; + string collectEntryPoint = "CollectPerformanceData"; + string closeEntryPoint = "ClosePerformanceData"; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Close": + closeEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Collect": + collectEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "DefaultLanguage": + defaultLanguage = this.GetPerformanceCounterLanguage(sourceLineNumbers, attrib); + break; + case "Help": + help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Library": + library = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "MultiInstance": + multiInstance = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Open": + openEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + if (null == name) + { + name = id; + } + + // Process the child counter elements. + foreach (XElement child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "PerformanceCounter": + ParsedPerformanceCounter counter = this.ParsePerformanceCounterElement(intermediate, section, child, defaultLanguage); + if (null != counter) + { + parsedPerformanceCounters.Add(counter); + } + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + + if (!this.Messaging.EncounteredError) + { + // Calculate the ini and h file content. + string objectName = "OBJECT_1"; + string objectLanguage = defaultLanguage.ToString("D3", CultureInfo.InvariantCulture); + + StringBuilder sbIniData = new StringBuilder(); + sbIniData.AppendFormat("[info]\r\ndrivername={0}\r\nsymbolfile=wixperf.h\r\n\r\n[objects]\r\n{1}_{2}_NAME=\r\n\r\n[languages]\r\n{2}=LANG{2}\r\n\r\n", name, objectName, objectLanguage); + sbIniData.AppendFormat("[text]\r\n{0}_{1}_NAME={2}\r\n", objectName, objectLanguage, name); + if (null != help) + { + sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", objectName, objectLanguage, help); + } + + int symbolConstantsCounter = 0; + StringBuilder sbSymbolicConstants = new StringBuilder(); + sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", objectName, symbolConstantsCounter); + + StringBuilder sbCounterNames = new StringBuilder("[~]"); + StringBuilder sbCounterTypes = new StringBuilder("[~]"); + for (int i = 0; i < parsedPerformanceCounters.Count; ++i) + { + ParsedPerformanceCounter counter = (ParsedPerformanceCounter)parsedPerformanceCounters[i]; + string counterName = String.Concat("DEVICE_COUNTER_", i + 1); + + sbIniData.AppendFormat("{0}_{1}_NAME={2}\r\n", counterName, counter.Language, counter.Name); + if (null != counter.Help) + { + sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", counterName, counter.Language, counter.Help); + } + + symbolConstantsCounter += 2; + sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", counterName, symbolConstantsCounter); + + sbCounterNames.Append(UtilCompiler.FindPropertyBrackets.Replace(counter.Name, this.EscapeProperties)); + sbCounterNames.Append("[~]"); + sbCounterTypes.Append(counter.Type); + sbCounterTypes.Append("[~]"); + } + + sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); + + // Add the calculated INI and H strings to the PerformanceCategory table. + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "PerformanceCategory"); + row.Set(0, id); + row.Set(1, componentId); + row.Set(2, name); + row.Set(3, sbIniData.ToString()); + row.Set(4, sbSymbolicConstants.ToString()); + + // Set up the application's performance key. + int registryRoot = 2; // HKLM + string escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); + string linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); + string performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); + + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, linkageKey, "Export", escapedName, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "-", null, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Library", library, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Open", openEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Collect", collectEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Close", closeEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); + } + + // Reference InstallPerfCounterData and UninstallPerfCounterData since nothing will happen without them + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CAs are referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "InstallPerfCounterData_ARM"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "UninstallPerfCounterData_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "InstallPerfCounterData"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "UninstallPerfCounterData"); + } + } + + /// + /// Gets the performance counter language as a decimal number. + /// + /// Source line information about the owner element. + /// The attribute containing the value to get. + /// Numeric representation of the language as per WinNT.h. + private int GetPerformanceCounterLanguage(SourceLineNumber sourceLineNumbers, XAttribute attribute) + { + int language = 0; + if (String.Empty == attribute.Value) + { + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + } + else + { + switch (attribute.Value) + { + case "afrikaans": + language = 0x36; + break; + case "albanian": + language = 0x1c; + break; + case "arabic": + language = 0x01; + break; + case "armenian": + language = 0x2b; + break; + case "assamese": + language = 0x4d; + break; + case "azeri": + language = 0x2c; + break; + case "basque": + language = 0x2d; + break; + case "belarusian": + language = 0x23; + break; + case "bengali": + language = 0x45; + break; + case "bulgarian": + language = 0x02; + break; + case "catalan": + language = 0x03; + break; + case "chinese": + language = 0x04; + break; + case "croatian": + language = 0x1a; + break; + case "czech": + language = 0x05; + break; + case "danish": + language = 0x06; + break; + case "divehi": + language = 0x65; + break; + case "dutch": + language = 0x13; + break; + case "piglatin": + case "english": + language = 0x09; + break; + case "estonian": + language = 0x25; + break; + case "faeroese": + language = 0x38; + break; + case "farsi": + language = 0x29; + break; + case "finnish": + language = 0x0b; + break; + case "french": + language = 0x0c; + break; + case "galician": + language = 0x56; + break; + case "georgian": + language = 0x37; + break; + case "german": + language = 0x07; + break; + case "greek": + language = 0x08; + break; + case "gujarati": + language = 0x47; + break; + case "hebrew": + language = 0x0d; + break; + case "hindi": + language = 0x39; + break; + case "hungarian": + language = 0x0e; + break; + case "icelandic": + language = 0x0f; + break; + case "indonesian": + language = 0x21; + break; + case "italian": + language = 0x10; + break; + case "japanese": + language = 0x11; + break; + case "kannada": + language = 0x4b; + break; + case "kashmiri": + language = 0x60; + break; + case "kazak": + language = 0x3f; + break; + case "konkani": + language = 0x57; + break; + case "korean": + language = 0x12; + break; + case "kyrgyz": + language = 0x40; + break; + case "latvian": + language = 0x26; + break; + case "lithuanian": + language = 0x27; + break; + case "macedonian": + language = 0x2f; + break; + case "malay": + language = 0x3e; + break; + case "malayalam": + language = 0x4c; + break; + case "manipuri": + language = 0x58; + break; + case "marathi": + language = 0x4e; + break; + case "mongolian": + language = 0x50; + break; + case "nepali": + language = 0x61; + break; + case "norwegian": + language = 0x14; + break; + case "oriya": + language = 0x48; + break; + case "polish": + language = 0x15; + break; + case "portuguese": + language = 0x16; + break; + case "punjabi": + language = 0x46; + break; + case "romanian": + language = 0x18; + break; + case "russian": + language = 0x19; + break; + case "sanskrit": + language = 0x4f; + break; + case "serbian": + language = 0x1a; + break; + case "sindhi": + language = 0x59; + break; + case "slovak": + language = 0x1b; + break; + case "slovenian": + language = 0x24; + break; + case "spanish": + language = 0x0a; + break; + case "swahili": + language = 0x41; + break; + case "swedish": + language = 0x1d; + break; + case "syriac": + language = 0x5a; + break; + case "tamil": + language = 0x49; + break; + case "tatar": + language = 0x44; + break; + case "telugu": + language = 0x4a; + break; + case "thai": + language = 0x1e; + break; + case "turkish": + language = 0x1f; + break; + case "ukrainian": + language = 0x22; + break; + case "urdu": + language = 0x20; + break; + case "uzbek": + language = 0x43; + break; + case "vietnamese": + language = 0x2a; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + break; + } + } + + return language; + } + + /// + /// Parses a performance counter element. + /// + /// Element to parse. + /// Default language for the performance counter. + private ParsedPerformanceCounter ParsePerformanceCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, int defaultLanguage) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + ParsedPerformanceCounter parsedPerformanceCounter = null; + string name = null; + string help = null; + System.Diagnostics.PerformanceCounterType type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + int language = defaultLanguage; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Help": + help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Type": + type = this.GetPerformanceCounterType(sourceLineNumbers, attrib); + break; + case "Language": + language = this.GetPerformanceCounterLanguage(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (null == help) + { + this.Messaging.Write(UtilWarnings.RequiredAttributeForWindowsXP(sourceLineNumbers, element.Name.LocalName, "Help")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + parsedPerformanceCounter = new ParsedPerformanceCounter(name, help, type, language); + } + + return parsedPerformanceCounter; + } + + /// + /// Gets the performance counter type. + /// + /// Source line information about the owner element. + /// The attribute containing the value to get. + /// Numeric representation of the language as per WinNT.h. + private System.Diagnostics.PerformanceCounterType GetPerformanceCounterType(SourceLineNumber sourceLineNumbers, XAttribute attribute) + { + System.Diagnostics.PerformanceCounterType type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + if (String.Empty == attribute.Value) + { + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + } + else + { + switch (attribute.Value) + { + case "averageBase": + type = System.Diagnostics.PerformanceCounterType.AverageBase; + break; + case "averageCount64": + type = System.Diagnostics.PerformanceCounterType.AverageCount64; + break; + case "averageTimer32": + type = System.Diagnostics.PerformanceCounterType.AverageTimer32; + break; + case "counterDelta32": + type = System.Diagnostics.PerformanceCounterType.CounterDelta32; + break; + case "counterTimerInverse": + type = System.Diagnostics.PerformanceCounterType.CounterTimerInverse; + break; + case "sampleFraction": + type = System.Diagnostics.PerformanceCounterType.SampleFraction; + break; + case "timer100Ns": + type = System.Diagnostics.PerformanceCounterType.Timer100Ns; + break; + case "counterTimer": + type = System.Diagnostics.PerformanceCounterType.CounterTimer; + break; + case "rawFraction": + type = System.Diagnostics.PerformanceCounterType.RawFraction; + break; + case "timer100NsInverse": + type = System.Diagnostics.PerformanceCounterType.Timer100NsInverse; + break; + case "counterMultiTimer": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer; + break; + case "counterMultiTimer100Ns": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer100Ns; + break; + case "counterMultiTimerInverse": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimerInverse; + break; + case "counterMultiTimer100NsInverse": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer100NsInverse; + break; + case "elapsedTime": + type = System.Diagnostics.PerformanceCounterType.ElapsedTime; + break; + case "sampleBase": + type = System.Diagnostics.PerformanceCounterType.SampleBase; + break; + case "rawBase": + type = System.Diagnostics.PerformanceCounterType.RawBase; + break; + case "counterMultiBase": + type = System.Diagnostics.PerformanceCounterType.CounterMultiBase; + break; + case "rateOfCountsPerSecond64": + type = System.Diagnostics.PerformanceCounterType.RateOfCountsPerSecond64; + break; + case "rateOfCountsPerSecond32": + type = System.Diagnostics.PerformanceCounterType.RateOfCountsPerSecond32; + break; + case "countPerTimeInterval64": + type = System.Diagnostics.PerformanceCounterType.CountPerTimeInterval64; + break; + case "countPerTimeInterval32": + type = System.Diagnostics.PerformanceCounterType.CountPerTimeInterval32; + break; + case "sampleCounter": + type = System.Diagnostics.PerformanceCounterType.SampleCounter; + break; + case "counterDelta64": + type = System.Diagnostics.PerformanceCounterType.CounterDelta64; + break; + case "numberOfItems64": + type = System.Diagnostics.PerformanceCounterType.NumberOfItems64; + break; + case "numberOfItems32": + type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + break; + case "numberOfItemsHEX64": + type = System.Diagnostics.PerformanceCounterType.NumberOfItemsHEX64; + break; + case "numberOfItemsHEX32": + type = System.Diagnostics.PerformanceCounterType.NumberOfItemsHEX32; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + break; + } + } + + return type; + } + + /// + /// Parses a perf counter element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referenced file. + private void ParsePerfCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string name = null; + + this.Messaging.Write(UtilWarnings.DeprecatedPerfCounterElement(sourceLineNumbers)); + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "Perfmon"); + row.Set(0, componentId); + row.Set(1, $"[#{fileId}]"); + row.Set(2, name); + } + + // Reference ConfigurePerfmonInstall and ConfigurePerfmonUninstall since nothing will happen without them + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CAs are referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonInstall_ARM"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonUninstall_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonInstall"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonUninstall"); + } + } + + + /// + /// Parses a perf manifest element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referenced file. + private void ParsePerfCounterManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string resourceFileDirectory = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "ResourceFileDirectory": + resourceFileDirectory = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "PerfmonManifest"); + row.Set(0, componentId); + row.Set(1, $"[#{fileId}]"); + row.Set(2, resourceFileDirectory); + } + + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CAs are referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestRegister_ARM"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestUnregister_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestRegister"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestUnregister"); + } + } + + /// + /// Parses a format files element. + /// + /// Element to parse. + /// Identifier of referenced file. + /// Flag to determine whether the component is 64-bit. + private void ParseFormatFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId, bool win64) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string binaryId = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "BinaryKey": + binaryId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (null == binaryId) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryKey")); + } + + if (!this.Messaging.EncounteredError) + { + switch (this.Context.Platform) + { + case Platform.X86: + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedFormatFiles"); + break; + case Platform.X64: + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedFormatFiles_x64"); + break; + case Platform.IA64: + case Platform.ARM: + this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); + break; + } + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixFormatFiles"); + row.Set(0, binaryId); + row.Set(1, fileId); + + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Binary", binaryId); + } + } + + /// + /// Parses a event manifest element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referenced file. + private void ParseEventManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string messageFile = null; + string resourceFile = null; + string parameterFile = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "MessageFile": + messageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ResourceFile": + resourceFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ParameterFile": + parameterFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "EventManifest"); + row.Set(0, componentId); + row.Set(1, $"[#{fileId}]"); + + if (null != messageFile) + { + var messageRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + messageRow.Set(0, String.Concat("Config_", fileId, "MessageFile")); + messageRow.Set(1, $"[#{fileId}]"); + messageRow.Set(2, "/*/*/*/*[\\[]@messageFileName[\\]]"); + messageRow.Set(3, "messageFileName"); + messageRow.Set(4, messageFile); + messageRow.Set(5, 4 | 0x00001000); //bulk write | preserve modified date + messageRow.Set(6, componentId); + } + if (null != parameterFile) + { + var resourceRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + resourceRow.Set(0, String.Concat("Config_", fileId, "ParameterFile")); + resourceRow.Set(1, $"[#{fileId}]"); + resourceRow.Set(2, "/*/*/*/*[\\[]@parameterFileName[\\]]"); + resourceRow.Set(3, "parameterFileName"); + resourceRow.Set(4, parameterFile); + resourceRow.Set(5, 4 | 0x00001000); //bulk write | preserve modified date + resourceRow.Set(6, componentId); + } + if (null != resourceFile) + { + var resourceRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + resourceRow.Set(0, String.Concat("Config_", fileId, "ResourceFile")); + resourceRow.Set(1, $"[#{fileId}]"); + resourceRow.Set(2, "/*/*/*/*[\\[]@resourceFileName[\\]]"); + resourceRow.Set(3, "resourceFileName"); + resourceRow.Set(4, resourceFile); + resourceRow.Set(5, 4 | 0x00001000); //bulk write | preserve modified date + resourceRow.Set(6, componentId); + } + + } + + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestRegister_ARM"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestUnregister_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestRegister"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestUnregister"); + } + + if (null != messageFile || null != parameterFile || null != resourceFile) + { + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile"); + } + } + } + + /// + /// Parses a PermissionEx element. + /// + /// Element to parse. + /// Identifier of object to be secured. + /// Identifier of component, used to determine install state. + /// Flag to determine whether the component is 64-bit. + /// Name of table that contains objectId. + private void ParsePermissionExElement(Intermediate intermediate, IntermediateSection section, XElement element, string objectId, string componentId, bool win64, string tableName) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + BitArray bits = new BitArray(32); + string domain = null; + int permission = 0; + string[] specialPermissions = null; + string user = null; + + PermissionType permissionType = PermissionType.SecureObjects; + + switch (tableName) + { + case "CreateFolder": + specialPermissions = UtilConstants.FolderPermissions; + break; + case "File": + specialPermissions = UtilConstants.FilePermissions; + break; + case "Registry": + specialPermissions = UtilConstants.RegistryPermissions; + if (String.IsNullOrEmpty(objectId)) + { + this.Messaging.Write(UtilErrors.InvalidRegistryObject(sourceLineNumbers, element.Parent.Name.LocalName)); + } + break; + case "ServiceInstall": + specialPermissions = UtilConstants.ServicePermissions; + permissionType = PermissionType.SecureObjects; + break; + default: + this.ParseHelper.UnexpectedElement(element.Parent, element); + break; + } + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Domain": + if (PermissionType.FileSharePermissions == permissionType) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "User": + user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + YesNoType attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) + { + if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) + { + if (!this.TrySetBitFromName(specialPermissions, attrib.Name.LocalName, attribValue, bits, 0)) + { + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + } + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + permission = this.CreateIntegerFromBitArray(bits); + + if (null == user) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); + } + + if (int.MinValue == permission) // just GENERIC_READ, which is MSI_NULL + { + this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + if (win64) + { + if (this.Context.Platform == Platform.IA64) + { + this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, "ia64", element.Name.LocalName)); + } + else + { + // Ensure SchedSecureObjects (x64) is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects_x64"); + } + } + else if (this.Context.Platform == Platform.ARM) + { + // Ensure SchedSecureObjects (arm) is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects_ARM"); + } + else + { + // Ensure SchedSecureObjects (x86) is referenced, to handle this x86 component member + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects"); + } + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "SecureObjects"); + row.Set(0, objectId); + row.Set(1, tableName); + row.Set(2, domain); + row.Set(3, user); + row.Set(4, permission); + row.Set(5, componentId); + } + } + + /// + /// Parses a ProductSearch element. + /// + /// Element to parse. + private void ParseProductSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string productCode = null; + string upgradeCode = null; + + Serialize.ProductSearch.ResultType result = Serialize.ProductSearch.ResultType.NotSet; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "ProductCode": + productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); + break; + case "UpgradeCode": + upgradeCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); + break; + case "Result": + string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (!Serialize.ProductSearch.TryParseResultType(resultValue, out result)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, + resultValue, + Serialize.ProductSearch.ResultType.version.ToString(), + Serialize.ProductSearch.ResultType.language.ToString(), + Serialize.ProductSearch.ResultType.state.ToString(), + Serialize.ProductSearch.ResultType.assignment.ToString())); + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == variable) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); + } + + if (null == upgradeCode && null == productCode) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ProductCode", "UpgradeCode", true)); + } + + if (null != upgradeCode && null != productCode) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "UpgradeCode", "ProductCode")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wps", variable, condition, after, (productCode == null ? upgradeCode : productCode), result.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); + if (after != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); + // TODO: We're currently defaulting to "always run after", which we will need to change... + this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); + } + + WixProductSearchAttributes attributes = WixProductSearchAttributes.Version; + switch (result) + { + case Serialize.ProductSearch.ResultType.version: + attributes = WixProductSearchAttributes.Version; + break; + case Serialize.ProductSearch.ResultType.language: + attributes = WixProductSearchAttributes.Language; + break; + case Serialize.ProductSearch.ResultType.state: + attributes = WixProductSearchAttributes.State; + break; + case Serialize.ProductSearch.ResultType.assignment: + attributes = WixProductSearchAttributes.Assignment; + break; + } + + // set an additional flag if this is an upgrade code + if (null != upgradeCode) + { + attributes |= WixProductSearchAttributes.UpgradeCode; + } + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch"); + row.Set(0, id); + row.Set(1, productCode ?? upgradeCode); + row.Set(2, (int)attributes); + } + } + + /// + /// Parses a RegistrySearch element. + /// + /// Element to parse. + private void ParseRegistrySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + int root = CompilerConstants.IntegerNotSet; + string key = null; + string value = null; + YesNoType expand = YesNoType.NotSet; + YesNoType win64 = YesNoType.NotSet; + Serialize.RegistrySearch.ResultType result = Serialize.RegistrySearch.ResultType.NotSet; + Serialize.RegistrySearch.FormatType format = Serialize.RegistrySearch.FormatType.raw; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Root": + root = this.ParseHelper.GetAttributeMsidbRegistryRootValue(sourceLineNumbers, attrib, false); + break; + case "Key": + key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Value": + value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ExpandEnvironmentVariables": + expand = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Format": + string formatValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (!String.IsNullOrEmpty(formatValue)) + { + if (!Serialize.RegistrySearch.TryParseFormatType(formatValue, out format)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, + formatValue, Serialize.RegistrySearch.FormatType.raw.ToString(), Serialize.RegistrySearch.FormatType.compatible.ToString())); + } + } + break; + case "Result": + string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (!Serialize.RegistrySearch.TryParseResultType(resultValue, out result)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, + resultValue, Serialize.RegistrySearch.ResultType.exists.ToString(), Serialize.RegistrySearch.ResultType.value.ToString())); + } + break; + case "Win64": + win64 = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == variable) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); + } + + if (CompilerConstants.IntegerNotSet == root) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); + } + + if (null == key) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); + } + + if (Serialize.RegistrySearch.ResultType.NotSet == result) + { + result = Serialize.RegistrySearch.ResultType.value; + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wrs", variable, condition, after, root.ToString(), key, value, result.ToString()); + } + + WixRegistrySearchAttributes attributes = WixRegistrySearchAttributes.Raw; + switch (format) + { + case Serialize.RegistrySearch.FormatType.raw: + attributes = WixRegistrySearchAttributes.Raw; + break; + case Serialize.RegistrySearch.FormatType.compatible: + attributes = WixRegistrySearchAttributes.Compatible; + break; + } + + switch (result) + { + case Serialize.RegistrySearch.ResultType.exists: + attributes |= WixRegistrySearchAttributes.WantExists; + break; + case Serialize.RegistrySearch.ResultType.value: + attributes |= WixRegistrySearchAttributes.WantValue; + break; + } + + if (expand == YesNoType.Yes) + { + if (0 != (attributes & WixRegistrySearchAttributes.WantExists)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, + "ExpandEnvironmentVariables", expand.ToString(), "Result", result.ToString())); + } + + attributes |= WixRegistrySearchAttributes.ExpandEnvironmentVariables; + } + + if (win64 == YesNoType.Yes) + { + attributes |= WixRegistrySearchAttributes.Win64; + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); + if (after != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); + // TODO: We're currently defaulting to "always run after", which we will need to change... + this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); + } + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRegistrySearch", id); + row.Set(1, root); + row.Set(2, key); + row.Set(3, value); + row.Set(4, (int)attributes); + } + } + + /// + /// Parses a RemoveFolderEx element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParseRemoveFolderExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + int on = (int)WixRemoveFolderExOn.Uninstall; + string property = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "On": + string onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (onValue.Length == 0) + { + on = CompilerConstants.IllegalInteger; + } + else + { + switch (onValue) + { + case "install": + on = (int)WixRemoveFolderExOn.Install; + break; + case "uninstall": + on = (int)WixRemoveFolderExOn.Uninstall; + break; + case "both": + on = (int)WixRemoveFolderExOn.Both; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", onValue, "install", "uninstall", "both")); + on = CompilerConstants.IllegalInteger; + break; + } + } + break; + case "Property": + property = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (String.IsNullOrEmpty(property)) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Property")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wrf", componentId, property, on.ToString(CultureInfo.InvariantCulture.NumberFormat)); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRemoveFolderEx", id); + row.Set(1, componentId); + row.Set(2, property); + row.Set(3, on); + + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveFile"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRemoveFoldersEx"); + } + } + + /// + /// Parses a RestartResource element. + /// + /// The element to parse. + /// The identity of the parent component. + private void ParseRestartResourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string resource = null; + int attributes = CompilerConstants.IntegerNotSet; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + + case "Path": + resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + attributes = (int)WixRestartResourceAttributes.Filename; + break; + + case "ProcessName": + resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + attributes = (int)WixRestartResourceAttributes.ProcessName; + break; + + case "ServiceName": + resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + attributes = (int)WixRestartResourceAttributes.ServiceName; + break; + + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + // Validate the attribute. + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wrr", componentId, resource, attributes.ToString()); + } + + if (String.IsNullOrEmpty(resource) || CompilerConstants.IntegerNotSet == attributes) + { + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Path", "ServiceName")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + // Add a reference to the WixRegisterRestartResources custom action since nothing will happen without it. + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRegisterRestartResources_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRegisterRestartResources"); + } + + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRestartResource", id); + row.Set(1, componentId); + row.Set(2, resource); + row.Set(3, attributes); + } + } + + /// + /// Parses a service configuration element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Name of parent element. + /// Optional name of service + private void ParseServiceConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string parentTableName, string parentTableServiceName) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string firstFailureActionType = null; + bool newService = false; + string programCommandLine = null; + string rebootMessage = null; + int resetPeriod = CompilerConstants.IntegerNotSet; + int restartServiceDelay = CompilerConstants.IntegerNotSet; + string secondFailureActionType = null; + string serviceName = null; + string thirdFailureActionType = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "FirstFailureActionType": + firstFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ProgramCommandLine": + programCommandLine = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "RebootMessage": + rebootMessage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ResetPeriodInDays": + resetPeriod = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + break; + case "RestartServiceDelayInSeconds": + restartServiceDelay = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + break; + case "SecondFailureActionType": + secondFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ServiceName": + serviceName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThirdFailureActionType": + thirdFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + // if this element is a child of ServiceInstall then ignore the service name provided. + if ("ServiceInstall" == parentTableName) + { + // TODO: the ServiceName attribute should not be allowed in this case (the overwriting behavior may confuse users) + serviceName = parentTableServiceName; + newService = true; + } + else + { + // not a child of ServiceInstall, so ServiceName must have been provided + if (null == serviceName) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ServiceName")); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + // Reference SchedServiceConfig since nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedServiceConfig_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedServiceConfig"); + } + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "ServiceConfig"); + row.Set(0, serviceName); + row.Set(1, componentId); + row.Set(2, (newService ? 1 : 0)); + row.Set(3, firstFailureActionType); + row.Set(4, secondFailureActionType); + row.Set(5, thirdFailureActionType); + if (CompilerConstants.IntegerNotSet != resetPeriod) + { + row.Set(6, resetPeriod); + } + + if (CompilerConstants.IntegerNotSet != restartServiceDelay) + { + row.Set(7, restartServiceDelay); + } + row.Set(8, programCommandLine); + row.Set(9, rebootMessage); + } + } + + /// + /// Parses a touch file element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Indicates whether the path is a 64-bit path. + private void ParseTouchFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool win64) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string path = null; + YesNoType onInstall = YesNoType.NotSet; + YesNoType onReinstall = YesNoType.NotSet; + YesNoType onUninstall = YesNoType.NotSet; + YesNoType nonvital = YesNoType.NotSet; + int attributes = 0; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Path": + path = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "OnInstall": + onInstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "OnReinstall": + onReinstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "OnUninstall": + onUninstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Nonvital": + nonvital = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == path) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); + } + + // If none of the scheduling actions are set, default to touching on install and reinstall. + if (YesNoType.NotSet == onInstall && YesNoType.NotSet == onReinstall && YesNoType.NotSet == onUninstall) + { + onInstall = YesNoType.Yes; + onReinstall = YesNoType.Yes; + } + + attributes |= YesNoType.Yes == onInstall ? 0x1 : 0; + attributes |= YesNoType.Yes == onReinstall ? 0x2 : 0; + attributes |= YesNoType.Yes == onUninstall ? 0x4 : 0; + attributes |= win64 ? 0x10 : 0; + attributes |= YesNoType.Yes == nonvital ? 0 : 0x20; + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("tf", path, attributes.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixTouchFile", id); + row.Set(1, componentId); + row.Set(2, path); + row.Set(3, attributes); + + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixTouchFileDuringInstall"); + } + } + + /// + /// Parses an user element. + /// + /// Element to parse. + /// Optional identifier of parent component. + private void ParseUserElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + int attributes = 0; + string domain = null; + string name = null; + string password = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "CanNotChangePassword": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserPasswdCantChange; + } + break; + case "CreateUser": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDontCreateUser; + } + break; + case "Disabled": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDisableAccount; + } + break; + case "Domain": + domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "FailIfExists": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserFailIfExists; + } + break; + case "LogonAsService": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserLogonAsService; + } + break; + case "LogonAsBatchJob": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserLogonAsBatchJob; + } + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Password": + password = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "PasswordExpired": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserPasswdChangeReqdOnLogin; + } + break; + case "PasswordNeverExpires": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDontExpirePasswrd; + } + break; + case "RemoveOnUninstall": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDontRemoveOnUninstall; + } + break; + case "UpdateIfExists": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserUpdateIfExists; + } + break; + case "Vital": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserNonVital; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + foreach (XElement child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "GroupRef": + if (null == componentId) + { + SourceLineNumber childSourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(child); + this.Messaging.Write(UtilErrors.IllegalElementWithoutComponent(childSourceLineNumbers, child.Name.LocalName)); + } + + this.ParseGroupRefElement(intermediate, section, child, id.Id); + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + if (null != componentId) + { + // Reference ConfigureIIs since nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureUsers_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureUsers"); + } + } + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "User", id); + row.Set(1, componentId); + row.Set(2, name); + row.Set(3, domain); + row.Set(4, password); + row.Set(5, attributes); + } + } + + /// + /// Parses a XmlFile element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParseXmlFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string id = null; + string file = null; + string elementPath = null; + string name = null; + string value = null; + int sequence = -1; + int flags = 0; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Action": + string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (actionValue) + { + case "createElement": + flags |= 0x00000001; // XMLFILE_CREATE_ELEMENT + break; + case "deleteValue": + flags |= 0x00000002; // XMLFILE_DELETE_VALUE + break; + case "bulkSetValue": + flags |= 0x00000004; // XMLFILE_BULKWRITE_VALUE + break; + case "setValue": + // no flag for set value since it's the default + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Action", actionValue, "createElement", "deleteValue", "setValue", "bulkSetValue")); + break; + } + break; + case "SelectionLanguage": + string selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (selectionLanguage) + { + case "XPath": + flags |= 0x00000100; // XMLFILE_USE_XPATH + break; + case "XSLPattern": + // no flag for since it's the default + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "SelectionLanguage", selectionLanguage, "XPath", "XSLPattern")); + break; + } + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "File": + file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ElementPath": + elementPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Permanent": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + flags |= 0x00010000; // XMLFILE_DONT_UNINSTALL + } + break; + case "Sequence": + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); + break; + case "Value": + value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "PreserveModifiedDate": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + flags |= 0x00001000; // XMLFILE_PRESERVE_MODIFIED + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + if (null == file) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File")); + } + + if (null == elementPath) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ElementPath")); + } + + if ((0x00000001 /*XMLFILE_CREATE_ELEMENT*/ & flags) != 0 && null == name) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "Action", "Name")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + row.Set(0, id); + row.Set(1, file); + row.Set(2, elementPath); + row.Set(3, name); + row.Set(4, value); + row.Set(5, flags); + row.Set(6, componentId); + if (-1 != sequence) + { + row.Set(7, sequence); + } + } + + // Reference SchedXmlFile since nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile"); + } + } + + /// + /// Parses a XmlConfig element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Whether or not the element is nested. + private void ParseXmlConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool nested) + { + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string id = null; + string elementId = null; + string elementPath = null; + int flags = 0; + string file = null; + string name = null; + int sequence = CompilerConstants.IntegerNotSet; + string value = null; + string verifyPath = null; + + foreach (XAttribute attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Action": + if (nested) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + else + { + string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (actionValue) + { + case "create": + flags |= 0x10; // XMLCONFIG_CREATE + break; + case "delete": + flags |= 0x20; // XMLCONFIG_DELETE + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, actionValue, "create", "delete")); + break; + } + } + break; + case "ElementId": + elementId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ElementPath": + elementPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "File": + file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Node": + if (nested) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + else + { + string nodeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (nodeValue) + { + case "element": + flags |= 0x1; // XMLCONFIG_ELEMENT + break; + case "value": + flags |= 0x2; // XMLCONFIG_VALUE + break; + case "document": + flags |= 0x4; // XMLCONFIG_DOCUMENT + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, nodeValue, "element", "value", "document")); + break; + } + } + break; + case "On": + if (nested) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + else + { + string onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (onValue) + { + case "install": + flags |= 0x100; // XMLCONFIG_INSTALL + break; + case "uninstall": + flags |= 0x200; // XMLCONFIG_UNINSTALL + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, onValue, "install", "uninstall")); + break; + } + } + break; + case "PreserveModifiedDate": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + flags |= 0x00001000; // XMLCONFIG_PRESERVE_MODIFIED + } + break; + case "Sequence": + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); + break; + case "Value": + value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "VerifyPath": + verifyPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + } + + if (null == file) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File")); + } + + if (null == elementId && null == elementPath) + { + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "ElementPath")); + } + else if (null != elementId) + { + if (null != elementPath) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "ElementId", "ElementPath")); + } + + if (0 != flags) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On")); + } + + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "XmlConfig", elementId); + } + + string innerText = this.ParseHelper.GetTrimmedInnerText(element); + if (null != value) + { + // cannot specify both the value attribute and inner text + if (!String.IsNullOrEmpty(innerText)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, element.Name.LocalName, "Value")); + } + } + else // value attribute not specified + { + if (!String.IsNullOrEmpty(innerText)) + { + value = innerText; + } + } + + // find unexpected child elements + foreach (XElement child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "XmlConfig": + if (nested) + { + this.Messaging.Write(ErrorMessages.UnexpectedElement(sourceLineNumbers, element.Name.LocalName, child.Name.LocalName)); + } + else + { + this.ParseXmlConfigElement(intermediate, section, child, componentId, true); + } + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + if (!this.Messaging.EncounteredError) + { + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlConfig"); + row.Set(0, id); + row.Set(1, file); + row.Set(2, elementId ?? elementPath); + row.Set(3, verifyPath); + row.Set(4, name); + row.Set(5, value); + row.Set(6, flags); + row.Set(7, componentId); + if (CompilerConstants.IntegerNotSet != sequence) + { + row.Set(8, sequence); + } + } + + // Reference SchedXmlConfig since nothing will happen without it + if (this.Context.Platform == Platform.ARM) + { + // Ensure ARM version of the CA is referenced + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlConfig_ARM"); + } + else + { + // All other supported platforms use x86 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlConfig"); + } + } + + /// + /// Match evaluator to escape properties in a string. + /// + private string EscapeProperties(Match match) + { + string escape = null; + switch (match.Value) + { + case "[": + escape = @"[\[]"; + break; + case "]": + escape = @"[\]]"; + break; + } + + return escape; + } + + private int CreateIntegerFromBitArray(BitArray bits) + { + if (32 != bits.Length) + { + throw new ArgumentException(String.Format("Can only convert a bit array with 32-bits to integer. Actual number of bits in array: {0}", bits.Length), "bits"); + } + + int[] intArray = new int[1]; + bits.CopyTo(intArray, 0); + + return intArray[0]; + } + + private bool TrySetBitFromName(string[] attributeNames, string attributeName, YesNoType attributeValue, BitArray bits, int offset) + { + for (int i = 0; i < attributeNames.Length; i++) + { + if (attributeName.Equals(attributeNames[i], StringComparison.Ordinal)) + { + bits.Set(i + offset, YesNoType.Yes == attributeValue); + return true; + } + } + + return false; + } + + /// + /// Private class that stores the data from a parsed PerformanceCounter element. + /// + private class ParsedPerformanceCounter + { + string name; + string help; + int type; + string language; + + internal ParsedPerformanceCounter(string name, string help, System.Diagnostics.PerformanceCounterType type, int language) + { + this.name = name; + this.help = help; + this.type = (int)type; + this.language = language.ToString("D3", CultureInfo.InvariantCulture); + } + + internal string Name + { + get { return this.name; } + } + + internal string Help + { + get { return this.help; } + } + + internal int Type + { + get { return this.type; } + } + + internal string Language + { + get { return this.language; } + } + } + } +} diff --git a/src/wixext/UtilConstants.cs b/src/wixext/UtilConstants.cs new file mode 100644 index 00000000..28ff368f --- /dev/null +++ b/src/wixext/UtilConstants.cs @@ -0,0 +1,17 @@ +// 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.Util +{ + /// + /// Constants used by Utility Extension. + /// + internal static class UtilConstants + { + internal static readonly string[] FilePermissions = { "Read", "Write", "Append", "ReadExtendedAttributes", "WriteExtendedAttributes", "Execute", null, "ReadAttributes", "WriteAttributes" }; + internal static readonly string[] FolderPermissions = { "Read", "CreateFile", "CreateChild", "ReadExtendedAttributes", "WriteExtendedAttributes", "Traverse", "DeleteChild", "ReadAttributes", "WriteAttributes" }; + internal static readonly string[] GenericPermissions = { "GenericAll", "GenericExecute", "GenericWrite", "GenericRead" }; + internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" }; + internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" }; + internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" }; + } +} diff --git a/src/wixext/UtilDecompiler.cs b/src/wixext/UtilDecompiler.cs new file mode 100644 index 00000000..9ef3390f --- /dev/null +++ b/src/wixext/UtilDecompiler.cs @@ -0,0 +1,1543 @@ +// 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 +{ +#if TODO_CONSIDER_DECOMPILER + using System; + using System.IO; + using System.Text; + using System.Collections; + using System.Diagnostics; + using System.Globalization; + + using Util = WixToolset.Extensions.Serialize.Util; + using WixToolset.Data; + using WixToolset.Extensibility; + using Wix = WixToolset.Data.Serialize; + + /// + /// The decompiler for the WiX Toolset Utility Extension. + /// + public sealed class UtilDecompiler : DecompilerExtension + { + /// + /// Creates a decompiler for Utility Extension. + /// + public UtilDecompiler() + { + this.TableDefinitions = UtilExtensionData.GetExtensionTableDefinitions(); + } + + /// + /// Get the extensions library to be removed. + /// + /// Table definitions for library. + /// Library to remove from decompiled output. + public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions) + { + return UtilExtensionData.GetExtensionLibrary(tableDefinitions); + } + + /// + /// Called at the beginning of the decompilation of a database. + /// + /// The collection of all tables. + public override void Initialize(TableIndexedCollection tables) + { + this.CleanupSecureCustomProperties(tables); + this.CleanupInternetShortcutRemoveFileTables(tables); + } + + /// + /// Decompile the SecureCustomProperties field to PropertyRefs for known extension properties. + /// + /// + /// If we've referenced any of the suite or directory properties, add + /// a PropertyRef to refer to the Property (and associated custom action) + /// from the extension's library. Then remove the property from + /// SecureCustomExtensions property so later decompilation won't create + /// new Property elements. + /// + /// The collection of all tables. + private void CleanupSecureCustomProperties(TableIndexedCollection tables) + { + Table propertyTable = tables["Property"]; + + if (null != propertyTable) + { + foreach (Row row in propertyTable.Rows) + { + if ("SecureCustomProperties" == row[0].ToString()) + { + StringBuilder remainingProperties = new StringBuilder(); + string[] secureCustomProperties = row[1].ToString().Split(';'); + foreach (string property in secureCustomProperties) + { + if (property.StartsWith("WIX_SUITE_", StringComparison.Ordinal) || property.StartsWith("WIX_DIR_", StringComparison.Ordinal) + || property.StartsWith("WIX_ACCOUNT_", StringComparison.Ordinal)) + { + 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; + } + } + } + } + + /// + /// Remove RemoveFile rows that the InternetShortcut compiler extension adds for us. + /// + /// The collection of all tables. + private void CleanupInternetShortcutRemoveFileTables(TableIndexedCollection tables) + { + // index the WixInternetShortcut table + Table wixInternetShortcutTable = tables["WixInternetShortcut"]; + Hashtable wixInternetShortcuts = new Hashtable(); + if (null != wixInternetShortcutTable) + { + foreach (Row row in wixInternetShortcutTable.Rows) + { + wixInternetShortcuts.Add(row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), row); + } + } + + // remove the RemoveFile rows with primary keys that match the WixInternetShortcut table's + Table removeFileTable = tables["RemoveFile"]; + if (null != removeFileTable) + { + for (int i = removeFileTable.Rows.Count - 1; 0 <= i; i--) + { + if (null != wixInternetShortcuts[removeFileTable.Rows[i][0]]) + { + removeFileTable.Rows.RemoveAt(i); + } + } + } + } + + /// + /// Decompiles an extension table. + /// + /// The table to decompile. + public override void DecompileTable(Table table) + { + switch (table.Name) + { + case "WixCloseApplication": + this.DecompileWixCloseApplicationTable(table); + break; + case "WixRemoveFolderEx": + this.DecompileWixRemoveFolderExTable(table); + break; + case "WixRestartResource": + this.DecompileWixRestartResourceTable(table); + break; + case "FileShare": + this.DecompileFileShareTable(table); + break; + case "FileSharePermissions": + this.DecompileFileSharePermissionsTable(table); + break; + case "WixInternetShortcut": + this.DecompileWixInternetShortcutTable(table); + break; + case "Group": + this.DecompileGroupTable(table); + break; + case "Perfmon": + this.DecompilePerfmonTable(table); + break; + case "PerfmonManifest": + this.DecompilePerfmonManifestTable(table); + break; + case "EventManifest": + this.DecompileEventManifestTable(table); + break; + case "SecureObjects": + this.DecompileSecureObjectsTable(table); + break; + case "ServiceConfig": + this.DecompileServiceConfigTable(table); + break; + case "User": + this.DecompileUserTable(table); + break; + case "UserGroup": + this.DecompileUserGroupTable(table); + break; + case "XmlConfig": + this.DecompileXmlConfigTable(table); + break; + case "XmlFile": + // XmlFile decompilation has been moved to FinalizeXmlFileTable function + break; + default: + base.DecompileTable(table); + break; + } + } + + /// + /// Finalize decompilation. + /// + /// The collection of all tables. + public override void Finish(TableIndexedCollection tables) + { + this.FinalizePerfmonTable(tables); + this.FinalizePerfmonManifestTable(tables); + this.FinalizeSecureObjectsTable(tables); + this.FinalizeServiceConfigTable(tables); + this.FinalizeXmlConfigTable(tables); + this.FinalizeXmlFileTable(tables); + this.FinalizeEventManifestTable(tables); + } + + /// + /// Decompile the WixCloseApplication table. + /// + /// The table to decompile. + private void DecompileWixCloseApplicationTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.CloseApplication closeApplication = new Util.CloseApplication(); + + closeApplication.Id = (string)row[0]; + + closeApplication.Target = (string)row[1]; + + if (null != row[2]) + { + closeApplication.Description = (string)row[2]; + } + + if (null != row[3]) + { + closeApplication.Content = (string)row[3]; + } + + // set defaults + closeApplication.CloseMessage = Util.YesNoType.no; + closeApplication.RebootPrompt = Util.YesNoType.yes; + closeApplication.ElevatedCloseMessage = Util.YesNoType.no; + + if (null != row[4]) + { + int attribute = (int)row[4]; + + closeApplication.CloseMessage = (0x1 == (attribute & 0x1)) ? Util.YesNoType.yes : Util.YesNoType.no; + closeApplication.RebootPrompt = (0x2 == (attribute & 0x2)) ? Util.YesNoType.yes : Util.YesNoType.no; + closeApplication.ElevatedCloseMessage = (0x4 == (attribute & 0x4)) ? Util.YesNoType.yes : Util.YesNoType.no; + } + + if (null != row[5]) + { + closeApplication.Sequence = (int)row[5]; + } + + if (null != row[6]) + { + closeApplication.Property = (string)row[6]; + } + + this.Core.RootElement.AddChild(closeApplication); + } + } + + /// + /// Decompile the WixRemoveFolderEx table. + /// + /// The table to decompile. + private void DecompileWixRemoveFolderExTable(Table table) + { + foreach (Row row in table.Rows) + { + // Set the Id even if auto-generated previously. + Util.RemoveFolderEx removeFolder = new Util.RemoveFolderEx(); + removeFolder.Id = (string)row[0]; + removeFolder.Property = (string)row[2]; + + int installMode = (int)row[3]; + switch ((UtilCompiler.WixRemoveFolderExOn)installMode) + { + case UtilCompiler.WixRemoveFolderExOn.Install: + removeFolder.On = Util.RemoveFolderEx.OnType.install; + break; + + case UtilCompiler.WixRemoveFolderExOn.Uninstall: + removeFolder.On = Util.RemoveFolderEx.OnType.uninstall; + break; + + case UtilCompiler.WixRemoveFolderExOn.Both: + removeFolder.On = Util.RemoveFolderEx.OnType.both; + break; + + default: + this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "InstallMode", installMode)); + break; + } + + // Add to the appropriate Component or section element. + string componentId = (string)row[1]; + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", componentId); + if (null != component) + { + component.AddChild(removeFolder); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", componentId, "Component")); + } + } + } + + /// + /// Decompile the WixRestartResource table. + /// + /// The table to decompile. + private void DecompileWixRestartResourceTable(Table table) + { + foreach (Row row in table.Rows) + { + // Set the Id even if auto-generated previously. + Util.RestartResource restartResource = new Util.RestartResource(); + restartResource.Id = (string)row[0]; + + // Determine the resource type and set accordingly. + string resource = (string)row[2]; + int attributes = (int)row[3]; + UtilCompiler.WixRestartResourceAttributes type = (UtilCompiler.WixRestartResourceAttributes)(attributes & (int)UtilCompiler.WixRestartResourceAttributes.TypeMask); + + switch (type) + { + case UtilCompiler.WixRestartResourceAttributes.Filename: + restartResource.Path = resource; + break; + + case UtilCompiler.WixRestartResourceAttributes.ProcessName: + restartResource.ProcessName = resource; + break; + + case UtilCompiler.WixRestartResourceAttributes.ServiceName: + restartResource.ServiceName = resource; + break; + + default: + this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Attributes", attributes)); + break; + } + + // Add to the appropriate Component or section element. + string componentId = (string)row[1]; + if (!String.IsNullOrEmpty(componentId)) + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", componentId); + if (null != component) + { + component.AddChild(restartResource); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", componentId, "Component")); + } + } + else + { + this.Core.RootElement.AddChild(restartResource); + } + } + } + + /// + /// Decompile the FileShare table. + /// + /// The table to decompile. + private void DecompileFileShareTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.FileShare fileShare = new Util.FileShare(); + + fileShare.Id = (string)row[0]; + + fileShare.Name = (string)row[1]; + + if (null != row[3]) + { + fileShare.Description = (string)row[3]; + } + + // the Directory_ column is set by the parent Component + + // the User_ and Permissions columns are deprecated + + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]); + if (null != component) + { + component.AddChild(fileShare); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component")); + } + this.Core.IndexElement(row, fileShare); + } + } + + /// + /// Decompile the FileSharePermissions table. + /// + /// The table to decompile. + private void DecompileFileSharePermissionsTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.FileSharePermission fileSharePermission = new Util.FileSharePermission(); + + fileSharePermission.User = (string)row[1]; + + string[] specialPermissions = UtilConstants.FolderPermissions; + int permissions = (int)row[2]; + for (int i = 0; i < 32; i++) + { + if (0 != ((permissions >> i) & 1)) + { + string name = null; + + if (16 > i && specialPermissions.Length > i) + { + name = specialPermissions[i]; + } + else if (28 > i && UtilConstants.StandardPermissions.Length > (i - 16)) + { + name = UtilConstants.StandardPermissions[i - 16]; + } + else if (0 <= (i - 28) && UtilConstants.GenericPermissions.Length > (i - 28)) + { + name = UtilConstants.GenericPermissions[i - 28]; + } + + if (null == name) + { + this.Core.OnMessage(WixWarnings.UnknownPermission(row.SourceLineNumbers, row.Table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), i)); + } + else + { + switch (name) + { + case "ChangePermission": + fileSharePermission.ChangePermission = Util.YesNoType.yes; + break; + case "CreateChild": + fileSharePermission.CreateChild = Util.YesNoType.yes; + break; + case "CreateFile": + fileSharePermission.CreateFile = Util.YesNoType.yes; + break; + case "Delete": + fileSharePermission.Delete = Util.YesNoType.yes; + break; + case "DeleteChild": + fileSharePermission.DeleteChild = Util.YesNoType.yes; + break; + case "GenericAll": + fileSharePermission.GenericAll = Util.YesNoType.yes; + break; + case "GenericExecute": + fileSharePermission.GenericExecute = Util.YesNoType.yes; + break; + case "GenericRead": + fileSharePermission.GenericRead = Util.YesNoType.yes; + break; + case "GenericWrite": + fileSharePermission.GenericWrite = Util.YesNoType.yes; + break; + case "Read": + fileSharePermission.Read = Util.YesNoType.yes; + break; + case "ReadAttributes": + fileSharePermission.ReadAttributes = Util.YesNoType.yes; + break; + case "ReadExtendedAttributes": + fileSharePermission.ReadExtendedAttributes = Util.YesNoType.yes; + break; + case "ReadPermission": + fileSharePermission.ReadPermission = Util.YesNoType.yes; + break; + case "Synchronize": + fileSharePermission.Synchronize = Util.YesNoType.yes; + break; + case "TakeOwnership": + fileSharePermission.TakeOwnership = Util.YesNoType.yes; + break; + case "Traverse": + fileSharePermission.Traverse = Util.YesNoType.yes; + break; + case "WriteAttributes": + fileSharePermission.WriteAttributes = Util.YesNoType.yes; + break; + case "WriteExtendedAttributes": + fileSharePermission.WriteExtendedAttributes = Util.YesNoType.yes; + break; + default: + Debug.Fail(String.Format("Unknown permission '{0}'.", name)); + break; + } + } + } + } + + Util.FileShare fileShare = (Util.FileShare)this.Core.GetIndexedElement("FileShare", (string)row[0]); + if (null != fileShare) + { + fileShare.AddChild(fileSharePermission); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "FileShare_", (string)row[0], "FileShare")); + } + } + } + + /// + /// Decompile the Group table. + /// + /// The table to decompile. + private void DecompileGroupTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.Group group = new Util.Group(); + + group.Id = (string)row[0]; + + if (null != row[1]) + { + this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Component_", (string)row[1])); + } + + group.Name = (string)row[2]; + + if (null != row[3]) + { + group.Domain = (string)row[3]; + } + + this.Core.RootElement.AddChild(group); + } + } + + /// + /// Decompile the WixInternetShortcut table. + /// + /// The table to decompile. + private void DecompileWixInternetShortcutTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.InternetShortcut internetShortcut = new Util.InternetShortcut(); + internetShortcut.Id = (string)row[0]; + internetShortcut.Directory = (string)row[2]; + // remove .lnk/.url extension because compiler extension adds it back for us + internetShortcut.Name = Path.ChangeExtension((string)row[3], null); + internetShortcut.Target = (string)row[4]; + internetShortcut.IconFile = (string)row[6]; + internetShortcut.IconIndex = (int)row[7]; + + UtilCompiler.InternetShortcutType shortcutType = (UtilCompiler.InternetShortcutType)row[5]; + switch (shortcutType) + { + case UtilCompiler.InternetShortcutType.Link: + internetShortcut.Type = Util.InternetShortcut.TypeType.link; + break; + case UtilCompiler.InternetShortcutType.Url: + internetShortcut.Type = Util.InternetShortcut.TypeType.url; + break; + } + + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); + if (null != component) + { + component.AddChild(internetShortcut); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); + } + + this.Core.IndexElement(row, internetShortcut); + } + } + + /// + /// Decompile the Perfmon table. + /// + /// The table to decompile. + private void DecompilePerfmonTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.PerfCounter perfCounter = new Util.PerfCounter(); + + perfCounter.Name = (string)row[2]; + + this.Core.IndexElement(row, perfCounter); + } + } + + /// + /// Decompile the PerfmonManifest table. + /// + /// The table to decompile. + private void DecompilePerfmonManifestTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.PerfCounterManifest perfCounterManifest = new Util.PerfCounterManifest(); + + perfCounterManifest.ResourceFileDirectory = (string)row[2]; + + this.Core.IndexElement(row, perfCounterManifest); + } + } + + /// + /// Decompile the EventManifest table. + /// + /// The table to decompile. + private void DecompileEventManifestTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.EventManifest eventManifest = new Util.EventManifest(); + this.Core.IndexElement(row, eventManifest); + } + } + + /// + /// Decompile the SecureObjects table. + /// + /// The table to decompile. + private void DecompileSecureObjectsTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.PermissionEx permissionEx = new Util.PermissionEx(); + + string[] specialPermissions; + switch ((string)row[1]) + { + case "CreateFolder": + specialPermissions = UtilConstants.FolderPermissions; + break; + case "File": + specialPermissions = UtilConstants.FilePermissions; + break; + case "Registry": + specialPermissions = UtilConstants.RegistryPermissions; + break; + case "ServiceInstall": + specialPermissions = UtilConstants.ServicePermissions; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, row.Table.Name, row.Fields[1].Column.Name, row[1])); + return; + } + + int permissionBits = (int)row[4]; + for (int i = 0; i < 32; i++) + { + if (0 != ((permissionBits >> i) & 1)) + { + string name = null; + + if (16 > i && specialPermissions.Length > i) + { + name = specialPermissions[i]; + } + else if (28 > i && UtilConstants.StandardPermissions.Length > (i - 16)) + { + name = UtilConstants.StandardPermissions[i - 16]; + } + else if (0 <= (i - 28) && UtilConstants.GenericPermissions.Length > (i - 28)) + { + name = UtilConstants.GenericPermissions[i - 28]; + } + + if (null == name) + { + this.Core.OnMessage(WixWarnings.UnknownPermission(row.SourceLineNumbers, row.Table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), i)); + } + else + { + switch (name) + { + case "Append": + permissionEx.Append = Util.YesNoType.yes; + break; + case "ChangePermission": + permissionEx.ChangePermission = Util.YesNoType.yes; + break; + case "CreateChild": + permissionEx.CreateChild = Util.YesNoType.yes; + break; + case "CreateFile": + permissionEx.CreateFile = Util.YesNoType.yes; + break; + case "CreateLink": + permissionEx.CreateLink = Util.YesNoType.yes; + break; + case "CreateSubkeys": + permissionEx.CreateSubkeys = Util.YesNoType.yes; + break; + case "Delete": + permissionEx.Delete = Util.YesNoType.yes; + break; + case "DeleteChild": + permissionEx.DeleteChild = Util.YesNoType.yes; + break; + case "EnumerateSubkeys": + permissionEx.EnumerateSubkeys = Util.YesNoType.yes; + break; + case "Execute": + permissionEx.Execute = Util.YesNoType.yes; + break; + case "GenericAll": + permissionEx.GenericAll = Util.YesNoType.yes; + break; + case "GenericExecute": + permissionEx.GenericExecute = Util.YesNoType.yes; + break; + case "GenericRead": + permissionEx.GenericRead = Util.YesNoType.yes; + break; + case "GenericWrite": + permissionEx.GenericWrite = Util.YesNoType.yes; + break; + case "Notify": + permissionEx.Notify = Util.YesNoType.yes; + break; + case "Read": + permissionEx.Read = Util.YesNoType.yes; + break; + case "ReadAttributes": + permissionEx.ReadAttributes = Util.YesNoType.yes; + break; + case "ReadExtendedAttributes": + permissionEx.ReadExtendedAttributes = Util.YesNoType.yes; + break; + case "ReadPermission": + permissionEx.ReadPermission = Util.YesNoType.yes; + break; + case "ServiceChangeConfig": + permissionEx.ServiceChangeConfig = Util.YesNoType.yes; + break; + case "ServiceEnumerateDependents": + permissionEx.ServiceEnumerateDependents = Util.YesNoType.yes; + break; + case "ServiceInterrogate": + permissionEx.ServiceInterrogate = Util.YesNoType.yes; + break; + case "ServicePauseContinue": + permissionEx.ServicePauseContinue = Util.YesNoType.yes; + break; + case "ServiceQueryConfig": + permissionEx.ServiceQueryConfig = Util.YesNoType.yes; + break; + case "ServiceQueryStatus": + permissionEx.ServiceQueryStatus = Util.YesNoType.yes; + break; + case "ServiceStart": + permissionEx.ServiceStart = Util.YesNoType.yes; + break; + case "ServiceStop": + permissionEx.ServiceStop = Util.YesNoType.yes; + break; + case "ServiceUserDefinedControl": + permissionEx.ServiceUserDefinedControl = Util.YesNoType.yes; + break; + case "Synchronize": + permissionEx.Synchronize = Util.YesNoType.yes; + break; + case "TakeOwnership": + permissionEx.TakeOwnership = Util.YesNoType.yes; + break; + case "Traverse": + permissionEx.Traverse = Util.YesNoType.yes; + break; + case "Write": + permissionEx.Write = Util.YesNoType.yes; + break; + case "WriteAttributes": + permissionEx.WriteAttributes = Util.YesNoType.yes; + break; + case "WriteExtendedAttributes": + permissionEx.WriteExtendedAttributes = Util.YesNoType.yes; + break; + default: + throw new InvalidOperationException(String.Format("Unknown permission attribute '{0}'.", name)); + } + } + } + } + + if (null != row[2]) + { + permissionEx.Domain = (string)row[2]; + } + + permissionEx.User = (string)row[3]; + + this.Core.IndexElement(row, permissionEx); + } + } + + /// + /// Decompile the ServiceConfig table. + /// + /// The table to decompile. + private void DecompileServiceConfigTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.ServiceConfig serviceConfig = new Util.ServiceConfig(); + + serviceConfig.ServiceName = (string)row[0]; + + switch ((string)row[3]) + { + case "none": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.none; + break; + case "reboot": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.reboot; + break; + case "restart": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.restart; + break; + case "runCommand": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.runCommand; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[3].Column.Name, row[3])); + break; + } + + switch ((string)row[4]) + { + case "none": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.none; + break; + case "reboot": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.reboot; + break; + case "restart": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.restart; + break; + case "runCommand": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.runCommand; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[4].Column.Name, row[4])); + break; + } + + switch ((string)row[5]) + { + case "none": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.none; + break; + case "reboot": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.reboot; + break; + case "restart": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.restart; + break; + case "runCommand": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.runCommand; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[5].Column.Name, row[5])); + break; + } + + if (null != row[6]) + { + serviceConfig.ResetPeriodInDays = (int)row[6]; + } + + if (null != row[7]) + { + serviceConfig.RestartServiceDelayInSeconds = (int)row[7]; + } + + if (null != row[8]) + { + serviceConfig.ProgramCommandLine = (string)row[8]; + } + + if (null != row[9]) + { + serviceConfig.RebootMessage = (string)row[9]; + } + + this.Core.IndexElement(row, serviceConfig); + } + } + + /// + /// Decompile the User table. + /// + /// The table to decompile. + private void DecompileUserTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.User user = new Util.User(); + + user.Id = (string)row[0]; + + user.Name = (string)row[2]; + + if (null != row[3]) + { + user.Domain = (string)row[3]; + } + + if (null != row[4]) + { + user.Password = (string)row[4]; + } + + if (null != row[5]) + { + int attributes = (int)row[5]; + + if (UtilCompiler.UserDontExpirePasswrd == (attributes & UtilCompiler.UserDontExpirePasswrd)) + { + user.PasswordNeverExpires = Util.YesNoType.yes; + } + + if (UtilCompiler.UserPasswdCantChange == (attributes & UtilCompiler.UserPasswdCantChange)) + { + user.CanNotChangePassword = Util.YesNoType.yes; + } + + if (UtilCompiler.UserPasswdChangeReqdOnLogin == (attributes & UtilCompiler.UserPasswdChangeReqdOnLogin)) + { + user.PasswordExpired = Util.YesNoType.yes; + } + + if (UtilCompiler.UserDisableAccount == (attributes & UtilCompiler.UserDisableAccount)) + { + user.Disabled = Util.YesNoType.yes; + } + + if (UtilCompiler.UserFailIfExists == (attributes & UtilCompiler.UserFailIfExists)) + { + user.FailIfExists = Util.YesNoType.yes; + } + + if (UtilCompiler.UserUpdateIfExists == (attributes & UtilCompiler.UserUpdateIfExists)) + { + user.UpdateIfExists = Util.YesNoType.yes; + } + + if (UtilCompiler.UserLogonAsService == (attributes & UtilCompiler.UserLogonAsService)) + { + user.LogonAsService = Util.YesNoType.yes; + } + + if (UtilCompiler.UserDontRemoveOnUninstall == (attributes & UtilCompiler.UserDontRemoveOnUninstall)) + { + user.RemoveOnUninstall = Util.YesNoType.no; + } + + if (UtilCompiler.UserDontCreateUser == (attributes & UtilCompiler.UserDontCreateUser)) + { + user.CreateUser = Util.YesNoType.no; + } + + if (UtilCompiler.UserNonVital == (attributes & UtilCompiler.UserNonVital)) + { + user.Vital = Util.YesNoType.no; + } + } + + if (null != row[1]) + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); + + if (null != component) + { + component.AddChild(user); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); + } + } + else + { + this.Core.RootElement.AddChild(user); + } + this.Core.IndexElement(row, user); + } + } + + /// + /// Decompile the UserGroup table. + /// + /// The table to decompile. + private void DecompileUserGroupTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.User user = (Util.User)this.Core.GetIndexedElement("User", (string)row[0]); + + if (null != user) + { + Util.GroupRef groupRef = new Util.GroupRef(); + + groupRef.Id = (string)row[1]; + + user.AddChild(groupRef); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Group_", (string)row[0], "Group")); + } + } + } + + /// + /// Decompile the XmlConfig table. + /// + /// The table to decompile. + private void DecompileXmlConfigTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.XmlConfig xmlConfig = new Util.XmlConfig(); + + xmlConfig.Id = (string)row[0]; + + xmlConfig.File = (string)row[1]; + + xmlConfig.ElementPath = (string)row[2]; + + if (null != row[3]) + { + xmlConfig.VerifyPath = (string)row[3]; + } + + if (null != row[4]) + { + xmlConfig.Name = (string)row[4]; + } + + if (null != row[5]) + { + xmlConfig.Value = (string)row[5]; + } + + int flags = (int)row[6]; + + if (0x1 == (flags & 0x1)) + { + xmlConfig.Node = Util.XmlConfig.NodeType.element; + } + else if (0x2 == (flags & 0x2)) + { + xmlConfig.Node = Util.XmlConfig.NodeType.value; + } + else if (0x4 == (flags & 0x4)) + { + xmlConfig.Node = Util.XmlConfig.NodeType.document; + } + + if (0x10 == (flags & 0x10)) + { + xmlConfig.Action = Util.XmlConfig.ActionType.create; + } + else if (0x20 == (flags & 0x20)) + { + xmlConfig.Action = Util.XmlConfig.ActionType.delete; + } + + if (0x100 == (flags & 0x100)) + { + xmlConfig.On = Util.XmlConfig.OnType.install; + } + else if (0x200 == (flags & 0x200)) + { + xmlConfig.On = Util.XmlConfig.OnType.uninstall; + } + + if (0x00001000 == (flags & 0x00001000)) + { + xmlConfig.PreserveModifiedDate = Util.YesNoType.yes; + } + + if (null != row[8]) + { + xmlConfig.Sequence = (int)row[8]; + } + + this.Core.IndexElement(row, xmlConfig); + } + } + + /// + /// Finalize the Perfmon table. + /// + /// The collection of all tables. + /// + /// Since the PerfCounter element nests under a File element, but + /// the Perfmon table does not have a foreign key relationship with + /// the File table (instead it has a formatted string that usually + /// refers to a file row - but doesn't have to), the nesting must + /// be inferred during finalization. + /// + private void FinalizePerfmonTable(TableIndexedCollection tables) + { + Table perfmonTable = tables["Perfmon"]; + + if (null != perfmonTable) + { + foreach (Row row in perfmonTable.Rows) + { + string formattedFile = (string)row[1]; + Util.PerfCounter perfCounter = (Util.PerfCounter)this.Core.GetIndexedElement(row); + + // try to "de-format" the File column's value to determine the proper parent File element + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + + Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); + if (null != file) + { + file.AddChild(perfCounter); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, perfmonTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File", formattedFile, "File")); + } + } + else + { + this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "Perfmon")); + } + } + } + } + + /// + /// Finalize the PerfmonManifest table. + /// + /// The collection of all tables. + private void FinalizePerfmonManifestTable(TableIndexedCollection tables) + { + Table perfmonManifestTable = tables["PerfmonManifest"]; + + if (null != perfmonManifestTable) + { + foreach (Row row in perfmonManifestTable.Rows) + { + string formattedFile = (string)row[1]; + Util.PerfCounterManifest perfCounterManifest = (Util.PerfCounterManifest)this.Core.GetIndexedElement(row); + + // try to "de-format" the File column's value to determine the proper parent File element + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + + Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); + if (null != file) + { + file.AddChild(perfCounterManifest); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, perfCounterManifest.ResourceFileDirectory, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File", formattedFile, "File")); + } + } + else + { + this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "PerfmonManifest")); + } + } + } + } + + /// + /// Finalize the SecureObjects table. + /// + /// The collection of all tables. + /// + /// Nests the PermissionEx elements below their parent elements. There are no declared foreign + /// keys for the parents of the SecureObjects table. + /// + private void FinalizeSecureObjectsTable(TableIndexedCollection tables) + { + Table createFolderTable = tables["CreateFolder"]; + Table secureObjectsTable = tables["SecureObjects"]; + + Hashtable createFolders = new Hashtable(); + + // index the CreateFolder table because the foreign key to this table from the + // LockPermissions table is only part of the primary key of this table + if (null != createFolderTable) + { + foreach (Row row in createFolderTable.Rows) + { + Wix.CreateFolder createFolder = (Wix.CreateFolder)this.Core.GetIndexedElement(row); + string directoryId = (string)row[0]; + + if (!createFolders.Contains(directoryId)) + { + createFolders.Add(directoryId, new ArrayList()); + } + ((ArrayList)createFolders[directoryId]).Add(createFolder); + } + } + + if (null != secureObjectsTable) + { + foreach (Row row in secureObjectsTable.Rows) + { + string id = (string)row[0]; + string table = (string)row[1]; + + Util.PermissionEx permissionEx = (Util.PermissionEx)this.Core.GetIndexedElement(row); + + if ("CreateFolder" == table) + { + ArrayList createFolderElements = (ArrayList)createFolders[id]; + + if (null != createFolderElements) + { + foreach (Wix.CreateFolder createFolder in createFolderElements) + { + createFolder.AddChild(permissionEx); + } + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, "SecureObjects", row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "LockObject", id, table)); + } + } + else + { + Wix.IParentElement parentElement = (Wix.IParentElement)this.Core.GetIndexedElement(table, id); + + if (null != parentElement) + { + parentElement.AddChild(permissionEx); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, "SecureObjects", row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "LockObject", id, table)); + } + } + } + } + } + + /// + /// Finalize the ServiceConfig table. + /// + /// The collection of all tables. + /// + /// Since there is no foreign key from the ServiceName column to the + /// ServiceInstall table, this relationship must be handled late. + /// + private void FinalizeServiceConfigTable(TableIndexedCollection tables) + { + Table serviceConfigTable = tables["ServiceConfig"]; + Table serviceInstallTable = tables["ServiceInstall"]; + + Hashtable serviceInstalls = new Hashtable(); + + // index the ServiceInstall table because the foreign key used by the ServiceConfig + // table is actually the ServiceInstall.Name, not the ServiceInstall.ServiceInstall + // this is unfortunate because the service Name is not guaranteed to be unique, so + // decompiler must assume there could be multiple matches and add the ServiceConfig to each + // TODO: the Component column information should be taken into acount to accurately identify + // the correct column to use + if (null != serviceInstallTable) + { + foreach (Row row in serviceInstallTable.Rows) + { + string name = (string)row[1]; + Wix.ServiceInstall serviceInstall = (Wix.ServiceInstall)this.Core.GetIndexedElement(row); + + if (!serviceInstalls.Contains(name)) + { + serviceInstalls.Add(name, new ArrayList()); + } + + ((ArrayList)serviceInstalls[name]).Add(serviceInstall); + } + } + + if (null != serviceConfigTable) + { + foreach (Row row in serviceConfigTable.Rows) + { + Util.ServiceConfig serviceConfig = (Util.ServiceConfig)this.Core.GetIndexedElement(row); + + if (0 == (int)row[2]) + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); + + if (null != component) + { + component.AddChild(serviceConfig); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, serviceConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); + } + } + else + { + ArrayList serviceInstallElements = (ArrayList)serviceInstalls[row[0]]; + + if (null != serviceInstallElements) + { + foreach (Wix.ServiceInstall serviceInstall in serviceInstallElements) + { + serviceInstall.AddChild(serviceConfig); + } + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, serviceConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ServiceName", (string)row[0], "ServiceInstall")); + } + } + } + } + } + + /// + /// Finalize the XmlConfig table. + /// + /// Collection of all tables. + private void FinalizeXmlConfigTable(TableIndexedCollection tables) + { + Table xmlConfigTable = tables["XmlConfig"]; + + if (null != xmlConfigTable) + { + foreach (Row row in xmlConfigTable.Rows) + { + Util.XmlConfig xmlConfig = (Util.XmlConfig)this.Core.GetIndexedElement(row); + + if (null == row[6] || 0 == (int)row[6]) + { + Util.XmlConfig parentXmlConfig = (Util.XmlConfig)this.Core.GetIndexedElement("XmlConfig", (string)row[2]); + + if (null != parentXmlConfig) + { + parentXmlConfig.AddChild(xmlConfig); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ElementPath", (string)row[2], "XmlConfig")); + } + } + else + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[7]); + + if (null != component) + { + component.AddChild(xmlConfig); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[7], "Component")); + } + } + } + } + } + + + /// + /// Finalize the XmlFile table. + /// + /// The collection of all tables. + /// + /// Some of the XmlFile table rows are compiler generated from util:EventManifest node + /// These rows should not be appended to component. + /// + private void FinalizeXmlFileTable(TableIndexedCollection tables) + { + Table xmlFileTable = tables["XmlFile"]; + Table eventManifestTable = tables["EventManifest"]; + + if (null != xmlFileTable) + { + foreach (Row row in xmlFileTable.Rows) + { + bool bManifestGenerated = false; + string xmlFileConfigId = (string)row[0]; + if (null != eventManifestTable) + { + foreach (Row emrow in eventManifestTable.Rows) + { + string formattedFile = (string)emrow[1]; + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + if (String.Equals(String.Concat("Config_", fileId, "ResourceFile"), xmlFileConfigId)) + { + Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(emrow); + if (null != eventManifest) + { + eventManifest.ResourceFile = (string)row[4]; + } + bManifestGenerated = true; + } + + else if (String.Equals(String.Concat("Config_", fileId, "MessageFile"), xmlFileConfigId)) + { + Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(emrow); + if (null != eventManifest) + { + eventManifest.MessageFile = (string)row[4]; + } + bManifestGenerated = true; + } + } + } + } + + if (true == bManifestGenerated) + continue; + + Util.XmlFile xmlFile = new Util.XmlFile(); + + xmlFile.Id = (string)row[0]; + xmlFile.File = (string)row[1]; + xmlFile.ElementPath = (string)row[2]; + + if (null != row[3]) + { + xmlFile.Name = (string)row[3]; + } + + if (null != row[4]) + { + xmlFile.Value = (string)row[4]; + } + + int flags = (int)row[5]; + if (0x1 == (flags & 0x1) && 0x2 == (flags & 0x2)) + { + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, xmlFileTable.Name, row.Fields[5].Column.Name, row[5])); + } + else if (0x1 == (flags & 0x1)) + { + xmlFile.Action = Util.XmlFile.ActionType.createElement; + } + else if (0x2 == (flags & 0x2)) + { + xmlFile.Action = Util.XmlFile.ActionType.deleteValue; + } + else + { + xmlFile.Action = Util.XmlFile.ActionType.setValue; + } + + if (0x100 == (flags & 0x100)) + { + xmlFile.SelectionLanguage = Util.XmlFile.SelectionLanguageType.XPath; + } + + if (0x00001000 == (flags & 0x00001000)) + { + xmlFile.PreserveModifiedDate = Util.YesNoType.yes; + } + + if (0x00010000 == (flags & 0x00010000)) + { + xmlFile.Permanent = Util.YesNoType.yes; + } + + if (null != row[7]) + { + xmlFile.Sequence = (int)row[7]; + } + + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[6]); + + if (null != component) + { + component.AddChild(xmlFile); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlFileTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[6], "Component")); + } + } + } + } + + /// + /// Finalize the eventManifest table. + /// This function must be called after FinalizeXmlFileTable + /// + /// The collection of all tables. + private void FinalizeEventManifestTable(TableIndexedCollection tables) + { + Table eventManifestTable = tables["EventManifest"]; + + if (null != eventManifestTable) + { + foreach (Row row in eventManifestTable.Rows) + { + string formattedFile = (string)row[1]; + Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(row); + + // try to "de-format" the File column's value to determine the proper parent File element + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + + Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); + if (null != file) + { + file.AddChild(eventManifest); + } + } + else + { + this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "EventManifest")); + } + } + } + } + } +#endif +} diff --git a/src/wixext/UtilErrors.cs b/src/wixext/UtilErrors.cs new file mode 100644 index 00000000..988b8321 --- /dev/null +++ b/src/wixext/UtilErrors.cs @@ -0,0 +1,109 @@ +// 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.Util +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class UtilErrors + { + public static Message ArgumentRequiresValue(string argument) + { + return Message(null, Ids.ArgumentRequiresValue, "The argument '{0}' does not have a value specified and it is required.", argument); + } + + public static Message CircularSearchReference(string chain) + { + return Message(null, Ids.CircularSearchReference, "A circular reference of search ordering constraints was detected: {0}. Search ordering references must form a directed acyclic graph.", chain); + } + + public static Message DirectoryNotFound(string directory) + { + return Message(null, Ids.DirectoryNotFound, "The directory '{0}' could not be found.", directory); + } + + public static Message EmptyDirectory(string directory) + { + return Message(null, Ids.EmptyDirectory, "The directory '{0}' did not contain any files or sub-directories and since empty directories are not being kept, there was nothing to harvest.", directory); + } + + public static Message ErrorTransformingHarvestedWiX(string transform, string message) + { + return Message(null, Ids.ErrorTransformingHarvestedWiX, "Error applying transform {0} to harvested WiX: {1}", transform, message); + } + + public static Message FileNotFound(string file) + { + return Message(null, Ids.FileNotFound, "The file '{0}' cannot be found.", file); + } + + public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) + { + return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); + } + + public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName) + { + return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName); + } + + public static Message IllegalFileValueInPerfmonOrManifest(string file, string table) + { + return Message(null, Ids.IllegalFileValueInPerfmonOrManifest, "The value '{0}' in the File column, {1} table is invalid. It should be in the form of '[#file]' or '[!file]'.", file, table); + } + + public static Message InvalidRegistryObject(SourceLineNumber sourceLineNumbers, string registryElementName) + { + return Message(sourceLineNumbers, Ids.InvalidRegistryObject, "The {0} element has no id and cannot have its permissions set. If you want to set permissions on a 'placeholder' registry key, force its creation by setting the ForceCreateOnInstall attribute to yes.", registryElementName); + } + + public static Message PerformanceCategoryNotFound(string key) + { + return Message(null, Ids.PerformanceCategoryNotFound, "Performance category '{0}' not found.", key); + } + + public static Message SpacesNotAllowedInArgumentValue(string arg, string value) + { + return Message(null, Ids.SpacesNotAllowedInArgumentValue, "The switch '{0}' does not allow the spaces from the value. Please remove the spaces in from the value: {1}", arg, value); + } + + public static Message UnableToOpenRegistryKey(string key) + { + return Message(null, Ids.UnableToOpenRegistryKey, "Unable to open registry key '{0}'.", key); + } + + public static Message UnsupportedPerformanceCounterType(string key) + { + return Message(null, Ids.UnsupportedPerformanceCounterType, "Unsupported performance counter type '{0}'.", key); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + IllegalAttributeWithoutComponent = 5050, + IllegalElementWithoutComponent = 5051, + DirectoryNotFound = 5052, + EmptyDirectory = 5053, + IllegalFileValueInPerfmonOrManifest = 5054, + ErrorTransformingHarvestedWiX = 5055, + UnableToOpenRegistryKey = 5056, + SpacesNotAllowedInArgumentValue = 5057, + ArgumentRequiresValue = 5058, + FileNotFound = 5059, + PerformanceCategoryNotFound = 5060, + UnsupportedPerformanceCounterType = 5061, + CircularSearchReference = 5062, + InvalidRegistryObject = 5063, + } + } +} diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs new file mode 100644 index 00000000..7eefc238 --- /dev/null +++ b/src/wixext/UtilExtensionData.cs @@ -0,0 +1,21 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Extensibility; + + public sealed class UtilExtensionData : BaseExtensionData + { + public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + { + tupleDefinition = UtilTupleDefinitions.ByName(name); + return tupleDefinition != null; + } + + public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + { + return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", tupleDefinitions); + } + } +} diff --git a/src/wixext/UtilExtensionFactory.cs b/src/wixext/UtilExtensionFactory.cs new file mode 100644 index 00000000..07bfae85 --- /dev/null +++ b/src/wixext/UtilExtensionFactory.cs @@ -0,0 +1,18 @@ +// 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.Util +{ + using System; + using System.Collections.Generic; + using WixToolset.Extensibility; + + public class UtilExtensionFactory : BaseExtensionFactory + { + protected override IEnumerable ExtensionTypes => new[] + { + typeof(UtilCompiler), + typeof(UtilExtensionData), + typeof(UtilWindowsInstallerBackendExtension), + }; + } +} diff --git a/src/wixext/UtilWarnings.cs b/src/wixext/UtilWarnings.cs new file mode 100644 index 00000000..13dcea4e --- /dev/null +++ b/src/wixext/UtilWarnings.cs @@ -0,0 +1,72 @@ +// 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.Util +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class UtilWarnings + { + public static Message AssemblyHarvestFailed(string file, string message) + { + return Message(null, Ids.AssemblyHarvestFailed, "Could not harvest data from a file that was expected to be an assembly: {0}. If this file is not an assembly you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); + } + + public static Message DeprecatedPerfCounterElement(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.DeprecatedPerfCounterElement, "The PerfCounter element has been deprecated. Please use the PerformanceCounter element instead."); + } + + public static Message DuplicateDllRegistryEntry(string registryKey, string componentId) + { + return Message(null, Ids.DuplicateDllRegistryEntry, "Ignoring the registry key '{0}', it has already been added to the component '{1}'.", registryKey, componentId); + } + + public static Message DuplicateDllRegistryEntry(string registryKey, string registryKeyValue, string componentId) + { + return Message(null, Ids.DuplicateDllRegistryEntry, "Ignoring the registry key '{0}', it has already been added to the component '{2}'. The registry key value '{1}' will not be harvested.", registryKey, registryKeyValue, componentId); + } + + public static Message RequiredAttributeForWindowsXP(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) + { + return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP. You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName); + } + + public static Message SelfRegHarvestFailed(string file, string message) + { + return Message(null, Ids.SelfRegHarvestFailed, "Could not harvest data from a file that was expected to be a SelfReg DLL: {0}. If this file does not support SelfReg you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); + } + + public static Message TypeLibLoadFailed(string file, string message) + { + return Message(null, Ids.TypeLibLoadFailed, "Could not load file that was expected to be a type library based off of file extension: {0}. If this file is not a type library you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the load failure: {1}", file, message); + } + + public static Message UnsupportedRegistryType(string registryValue, int regFileLineNumber, string unsupportedType) + { + return Message(null, Ids.UnsupportedRegistryType, "Ignoring the registry value '{0}' found on line {1}, because it is of a type unsupported by Windows Installer ({2}).", registryValue, regFileLineNumber, unsupportedType); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + SelfRegHarvestFailed = 5150, + AssemblyHarvestFailed = 5151, + TypeLibLoadFailed = 5152, + DeprecatedPerfCounterElement = 5153, + RequiredAttributeForWindowsXP = 5154, + DuplicateDllRegistryEntry = 5156, + UnsupportedRegistryType = 5157, + } + } +} diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs new file mode 100644 index 00000000..00ac8d34 --- /dev/null +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -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. + +namespace WixToolset.Util +{ + using System.Linq; + using System.Xml; + using WixToolset.Data.WindowsInstaller; + using WixToolset.Extensibility; + + public class UtilWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension + { + private static readonly TableDefinition[] Tables = LoadTables(); + + protected override TableDefinition[] TableDefinitionsForTuples => Tables; + + private static TableDefinition[] LoadTables() + { + using (var resourceStream = typeof(UtilWindowsInstallerBackendExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) + using (var reader = XmlReader.Create(resourceStream)) + { + var tables = TableDefinitionCollection.Load(reader); + return tables.ToArray(); + } + } + } +} diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj new file mode 100644 index 00000000..a06298a3 --- /dev/null +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -0,0 +1,34 @@ + + + + + + netstandard2.0 + WixToolset.Util + WiX Toolset Utility Extension + WiX Toolset Util Extension + true + build + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets new file mode 100644 index 00000000..3b43c25c --- /dev/null +++ b/src/wixext/WixToolset.Util.wixext.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml new file mode 100644 index 00000000..190b0404 --- /dev/null +++ b/src/wixext/tables.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/util.cs b/src/wixext/util.cs new file mode 100644 index 00000000..9ebe89a7 --- /dev/null +++ b/src/wixext/util.cs @@ -0,0 +1,11461 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WixToolset.Util.Serialize +{ + using System; + using System.CodeDom.Compiler; + using System.Collections; + using System.Diagnostics.CodeAnalysis; + using System.Globalization; + using System.Xml; + using WixToolset.Data.Serialize; + + + /// + /// Values of this type will either be "yes" or "no". + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum YesNoType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + no, + + yes, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public class Enums + { + + /// + /// Parses a YesNoType from a string. + /// + public static YesNoType ParseYesNoType(string value) + { + YesNoType parsedValue; + Enums.TryParseYesNoType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a YesNoType from a string. + /// + public static bool TryParseYesNoType(string value, out YesNoType parsedValue) + { + parsedValue = YesNoType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("no" == value)) + { + parsedValue = YesNoType.no; + } + else + { + if (("yes" == value)) + { + parsedValue = YesNoType.yes; + } + else + { + parsedValue = YesNoType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Parses a PerformanceCounterLanguageType from a string. + /// + public static PerformanceCounterLanguageType ParsePerformanceCounterLanguageType(string value) + { + PerformanceCounterLanguageType parsedValue; + Enums.TryParsePerformanceCounterLanguageType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a PerformanceCounterLanguageType from a string. + /// + public static bool TryParsePerformanceCounterLanguageType(string value, out PerformanceCounterLanguageType parsedValue) + { + parsedValue = PerformanceCounterLanguageType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("afrikaans" == value)) + { + parsedValue = PerformanceCounterLanguageType.afrikaans; + } + else + { + if (("albanian" == value)) + { + parsedValue = PerformanceCounterLanguageType.albanian; + } + else + { + if (("arabic" == value)) + { + parsedValue = PerformanceCounterLanguageType.arabic; + } + else + { + if (("armenian" == value)) + { + parsedValue = PerformanceCounterLanguageType.armenian; + } + else + { + if (("assamese" == value)) + { + parsedValue = PerformanceCounterLanguageType.assamese; + } + else + { + if (("azeri" == value)) + { + parsedValue = PerformanceCounterLanguageType.azeri; + } + else + { + if (("basque" == value)) + { + parsedValue = PerformanceCounterLanguageType.basque; + } + else + { + if (("belarusian" == value)) + { + parsedValue = PerformanceCounterLanguageType.belarusian; + } + else + { + if (("bengali" == value)) + { + parsedValue = PerformanceCounterLanguageType.bengali; + } + else + { + if (("bulgarian" == value)) + { + parsedValue = PerformanceCounterLanguageType.bulgarian; + } + else + { + if (("catalan" == value)) + { + parsedValue = PerformanceCounterLanguageType.catalan; + } + else + { + if (("chinese" == value)) + { + parsedValue = PerformanceCounterLanguageType.chinese; + } + else + { + if (("croatian" == value)) + { + parsedValue = PerformanceCounterLanguageType.croatian; + } + else + { + if (("czech" == value)) + { + parsedValue = PerformanceCounterLanguageType.czech; + } + else + { + if (("danish" == value)) + { + parsedValue = PerformanceCounterLanguageType.danish; + } + else + { + if (("divehi" == value)) + { + parsedValue = PerformanceCounterLanguageType.divehi; + } + else + { + if (("dutch" == value)) + { + parsedValue = PerformanceCounterLanguageType.dutch; + } + else + { + if (("english" == value)) + { + parsedValue = PerformanceCounterLanguageType.english; + } + else + { + if (("estonian" == value)) + { + parsedValue = PerformanceCounterLanguageType.estonian; + } + else + { + if (("faeroese" == value)) + { + parsedValue = PerformanceCounterLanguageType.faeroese; + } + else + { + if (("farsi" == value)) + { + parsedValue = PerformanceCounterLanguageType.farsi; + } + else + { + if (("finnish" == value)) + { + parsedValue = PerformanceCounterLanguageType.finnish; + } + else + { + if (("french" == value)) + { + parsedValue = PerformanceCounterLanguageType.french; + } + else + { + if (("galician" == value)) + { + parsedValue = PerformanceCounterLanguageType.galician; + } + else + { + if (("georgian" == value)) + { + parsedValue = PerformanceCounterLanguageType.georgian; + } + else + { + if (("german" == value)) + { + parsedValue = PerformanceCounterLanguageType.german; + } + else + { + if (("greek" == value)) + { + parsedValue = PerformanceCounterLanguageType.greek; + } + else + { + if (("gujarati" == value)) + { + parsedValue = PerformanceCounterLanguageType.gujarati; + } + else + { + if (("hebrew" == value)) + { + parsedValue = PerformanceCounterLanguageType.hebrew; + } + else + { + if (("hindi" == value)) + { + parsedValue = PerformanceCounterLanguageType.hindi; + } + else + { + if (("hungarian" == value)) + { + parsedValue = PerformanceCounterLanguageType.hungarian; + } + else + { + if (("icelandic" == value)) + { + parsedValue = PerformanceCounterLanguageType.icelandic; + } + else + { + if (("indonesian" == value)) + { + parsedValue = PerformanceCounterLanguageType.indonesian; + } + else + { + if (("italian" == value)) + { + parsedValue = PerformanceCounterLanguageType.italian; + } + else + { + if (("japanese" == value)) + { + parsedValue = PerformanceCounterLanguageType.japanese; + } + else + { + if (("kannada" == value)) + { + parsedValue = PerformanceCounterLanguageType.kannada; + } + else + { + if (("kashmiri" == value)) + { + parsedValue = PerformanceCounterLanguageType.kashmiri; + } + else + { + if (("kazak" == value)) + { + parsedValue = PerformanceCounterLanguageType.kazak; + } + else + { + if (("konkani" == value)) + { + parsedValue = PerformanceCounterLanguageType.konkani; + } + else + { + if (("korean" == value)) + { + parsedValue = PerformanceCounterLanguageType.korean; + } + else + { + if (("kyrgyz" == value)) + { + parsedValue = PerformanceCounterLanguageType.kyrgyz; + } + else + { + if (("latvian" == value)) + { + parsedValue = PerformanceCounterLanguageType.latvian; + } + else + { + if (("lithuanian" == value)) + { + parsedValue = PerformanceCounterLanguageType.lithuanian; + } + else + { + if (("macedonian" == value)) + { + parsedValue = PerformanceCounterLanguageType.macedonian; + } + else + { + if (("malay" == value)) + { + parsedValue = PerformanceCounterLanguageType.malay; + } + else + { + if (("malayalam" == value)) + { + parsedValue = PerformanceCounterLanguageType.malayalam; + } + else + { + if (("manipuri" == value)) + { + parsedValue = PerformanceCounterLanguageType.manipuri; + } + else + { + if (("marathi" == value)) + { + parsedValue = PerformanceCounterLanguageType.marathi; + } + else + { + if (("mongolian" == value)) + { + parsedValue = PerformanceCounterLanguageType.mongolian; + } + else + { + if (("nepali" == value)) + { + parsedValue = PerformanceCounterLanguageType.nepali; + } + else + { + if (("norwegian" == value)) + { + parsedValue = PerformanceCounterLanguageType.norwegian; + } + else + { + if (("oriya" == value)) + { + parsedValue = PerformanceCounterLanguageType.oriya; + } + else + { + if (("polish" == value)) + { + parsedValue = PerformanceCounterLanguageType.polish; + } + else + { + if (("portuguese" == value)) + { + parsedValue = PerformanceCounterLanguageType.portuguese; + } + else + { + if (("punjabi" == value)) + { + parsedValue = PerformanceCounterLanguageType.punjabi; + } + else + { + if (("romanian" == value)) + { + parsedValue = PerformanceCounterLanguageType.romanian; + } + else + { + if (("russian" == value)) + { + parsedValue = PerformanceCounterLanguageType.russian; + } + else + { + if (("sanskrit" == value)) + { + parsedValue = PerformanceCounterLanguageType.sanskrit; + } + else + { + if (("serbian" == value)) + { + parsedValue = PerformanceCounterLanguageType.serbian; + } + else + { + if (("sindhi" == value)) + { + parsedValue = PerformanceCounterLanguageType.sindhi; + } + else + { + if (("slovak" == value)) + { + parsedValue = PerformanceCounterLanguageType.slovak; + } + else + { + if (("slovenian" == value)) + { + parsedValue = PerformanceCounterLanguageType.slovenian; + } + else + { + if (("spanish" == value)) + { + parsedValue = PerformanceCounterLanguageType.spanish; + } + else + { + if (("swahili" == value)) + { + parsedValue = PerformanceCounterLanguageType.swahili; + } + else + { + if (("swedish" == value)) + { + parsedValue = PerformanceCounterLanguageType.swedish; + } + else + { + if (("syriac" == value)) + { + parsedValue = PerformanceCounterLanguageType.syriac; + } + else + { + if (("tamil" == value)) + { + parsedValue = PerformanceCounterLanguageType.tamil; + } + else + { + if (("tatar" == value)) + { + parsedValue = PerformanceCounterLanguageType.tatar; + } + else + { + if (("telugu" == value)) + { + parsedValue = PerformanceCounterLanguageType.telugu; + } + else + { + if (("thai" == value)) + { + parsedValue = PerformanceCounterLanguageType.thai; + } + else + { + if (("turkish" == value)) + { + parsedValue = PerformanceCounterLanguageType.turkish; + } + else + { + if (("ukrainian" == value)) + { + parsedValue = PerformanceCounterLanguageType.ukrainian; + } + else + { + if (("urdu" == value)) + { + parsedValue = PerformanceCounterLanguageType.urdu; + } + else + { + if (("uzbek" == value)) + { + parsedValue = PerformanceCounterLanguageType.uzbek; + } + else + { + if (("vietnamese" == value)) + { + parsedValue = PerformanceCounterLanguageType.vietnamese; + } + else + { + parsedValue = PerformanceCounterLanguageType.IllegalValue; + return false; + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + return true; + } + + /// + /// Parses a PerformanceCounterTypesType from a string. + /// + public static PerformanceCounterTypesType ParsePerformanceCounterTypesType(string value) + { + PerformanceCounterTypesType parsedValue; + Enums.TryParsePerformanceCounterTypesType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a PerformanceCounterTypesType from a string. + /// + public static bool TryParsePerformanceCounterTypesType(string value, out PerformanceCounterTypesType parsedValue) + { + parsedValue = PerformanceCounterTypesType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("averageBase" == value)) + { + parsedValue = PerformanceCounterTypesType.averageBase; + } + else + { + if (("averageCount64" == value)) + { + parsedValue = PerformanceCounterTypesType.averageCount64; + } + else + { + if (("averageTimer32" == value)) + { + parsedValue = PerformanceCounterTypesType.averageTimer32; + } + else + { + if (("counterDelta32" == value)) + { + parsedValue = PerformanceCounterTypesType.counterDelta32; + } + else + { + if (("counterTimerInverse" == value)) + { + parsedValue = PerformanceCounterTypesType.counterTimerInverse; + } + else + { + if (("sampleFraction" == value)) + { + parsedValue = PerformanceCounterTypesType.sampleFraction; + } + else + { + if (("timer100Ns" == value)) + { + parsedValue = PerformanceCounterTypesType.timer100Ns; + } + else + { + if (("counterTimer" == value)) + { + parsedValue = PerformanceCounterTypesType.counterTimer; + } + else + { + if (("rawFraction" == value)) + { + parsedValue = PerformanceCounterTypesType.rawFraction; + } + else + { + if (("timer100NsInverse" == value)) + { + parsedValue = PerformanceCounterTypesType.timer100NsInverse; + } + else + { + if (("counterMultiTimer" == value)) + { + parsedValue = PerformanceCounterTypesType.counterMultiTimer; + } + else + { + if (("counterMultiTimer100Ns" == value)) + { + parsedValue = PerformanceCounterTypesType.counterMultiTimer100Ns; + } + else + { + if (("counterMultiTimerInverse" == value)) + { + parsedValue = PerformanceCounterTypesType.counterMultiTimerInverse; + } + else + { + if (("counterMultiTimer100NsInverse" == value)) + { + parsedValue = PerformanceCounterTypesType.counterMultiTimer100NsInverse; + } + else + { + if (("elapsedTime" == value)) + { + parsedValue = PerformanceCounterTypesType.elapsedTime; + } + else + { + if (("sampleBase" == value)) + { + parsedValue = PerformanceCounterTypesType.sampleBase; + } + else + { + if (("rawBase" == value)) + { + parsedValue = PerformanceCounterTypesType.rawBase; + } + else + { + if (("counterMultiBase" == value)) + { + parsedValue = PerformanceCounterTypesType.counterMultiBase; + } + else + { + if (("rateOfCountsPerSecond64" == value)) + { + parsedValue = PerformanceCounterTypesType.rateOfCountsPerSecond64; + } + else + { + if (("rateOfCountsPerSecond32" == value)) + { + parsedValue = PerformanceCounterTypesType.rateOfCountsPerSecond32; + } + else + { + if (("countPerTimeInterval64" == value)) + { + parsedValue = PerformanceCounterTypesType.countPerTimeInterval64; + } + else + { + if (("countPerTimeInterval32" == value)) + { + parsedValue = PerformanceCounterTypesType.countPerTimeInterval32; + } + else + { + if (("sampleCounter" == value)) + { + parsedValue = PerformanceCounterTypesType.sampleCounter; + } + else + { + if (("counterDelta64" == value)) + { + parsedValue = PerformanceCounterTypesType.counterDelta64; + } + else + { + if (("numberOfItems64" == value)) + { + parsedValue = PerformanceCounterTypesType.numberOfItems64; + } + else + { + if (("numberOfItems32" == value)) + { + parsedValue = PerformanceCounterTypesType.numberOfItems32; + } + else + { + if (("numberOfItemsHEX64" == value)) + { + parsedValue = PerformanceCounterTypesType.numberOfItemsHEX64; + } + else + { + if (("numberOfItemsHEX32" == value)) + { + parsedValue = PerformanceCounterTypesType.numberOfItemsHEX32; + } + else + { + parsedValue = PerformanceCounterTypesType.IllegalValue; + return false; + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + return true; + } + } + + /// + /// Enumeration of valid languages for performance counters. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum PerformanceCounterLanguageType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + afrikaans, + + albanian, + + arabic, + + armenian, + + assamese, + + azeri, + + basque, + + belarusian, + + bengali, + + bulgarian, + + catalan, + + chinese, + + croatian, + + czech, + + danish, + + divehi, + + dutch, + + english, + + estonian, + + faeroese, + + farsi, + + finnish, + + french, + + galician, + + georgian, + + german, + + greek, + + gujarati, + + hebrew, + + hindi, + + hungarian, + + icelandic, + + indonesian, + + italian, + + japanese, + + kannada, + + kashmiri, + + kazak, + + konkani, + + korean, + + kyrgyz, + + latvian, + + lithuanian, + + macedonian, + + malay, + + malayalam, + + manipuri, + + marathi, + + mongolian, + + nepali, + + norwegian, + + oriya, + + polish, + + portuguese, + + punjabi, + + romanian, + + russian, + + sanskrit, + + serbian, + + sindhi, + + slovak, + + slovenian, + + spanish, + + swahili, + + swedish, + + syriac, + + tamil, + + tatar, + + telugu, + + thai, + + turkish, + + ukrainian, + + urdu, + + uzbek, + + vietnamese, + } + + /// + /// Enumeration of valid types for performance counters. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum PerformanceCounterTypesType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + averageBase, + + averageCount64, + + averageTimer32, + + counterDelta32, + + counterTimerInverse, + + sampleFraction, + + timer100Ns, + + counterTimer, + + rawFraction, + + timer100NsInverse, + + counterMultiTimer, + + counterMultiTimer100Ns, + + counterMultiTimerInverse, + + counterMultiTimer100NsInverse, + + elapsedTime, + + sampleBase, + + rawBase, + + counterMultiBase, + + rateOfCountsPerSecond64, + + rateOfCountsPerSecond32, + + countPerTimeInterval64, + + countPerTimeInterval32, + + sampleCounter, + + counterDelta64, + + numberOfItems64, + + numberOfItems32, + + numberOfItemsHEX64, + + numberOfItemsHEX32, + } + + /// + /// Closes applications or schedules a reboot if application cannot be closed. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class CloseApplication : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string targetField; + + private bool targetFieldSet; + + private string descriptionField; + + private bool descriptionFieldSet; + + private int sequenceField; + + private bool sequenceFieldSet; + + private YesNoType closeMessageField; + + private bool closeMessageFieldSet; + + private YesNoType endSessionMessageField; + + private bool endSessionMessageFieldSet; + + private YesNoType elevatedCloseMessageField; + + private bool elevatedCloseMessageFieldSet; + + private YesNoType elevatedEndSessionMessageField; + + private bool elevatedEndSessionMessageFieldSet; + + private YesNoType rebootPromptField; + + private bool rebootPromptFieldSet; + + private YesNoType promptToContinueField; + + private bool promptToContinueFieldSet; + + private string propertyField; + + private bool propertyFieldSet; + + private int terminateProcessField; + + private bool terminateProcessFieldSet; + + private int timeoutField; + + private bool timeoutFieldSet; + + private string contentField; + + private bool contentFieldSet; + + private ISchemaElement parentElement; + + /// + /// Identifier for the close application (primary key). If the Id is not specified, one will be generated. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the exectuable to be closed. This should only be the file name. + /// + public string Target + { + get + { + return this.targetField; + } + set + { + this.targetFieldSet = true; + this.targetField = value; + } + } + + /// + /// Description to show if application is running and needs to be closed. + /// + public string Description + { + get + { + return this.descriptionField; + } + set + { + this.descriptionFieldSet = true; + this.descriptionField = value; + } + } + + /// + /// Optionally orders the applications to be closed. + /// + public int Sequence + { + get + { + return this.sequenceField; + } + set + { + this.sequenceFieldSet = true; + this.sequenceField = value; + } + } + + /// + /// Optionally sends a close message to the application. Default is no. + /// + public YesNoType CloseMessage + { + get + { + return this.closeMessageField; + } + set + { + this.closeMessageFieldSet = true; + this.closeMessageField = value; + } + } + + /// + /// Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application. Default is "no". + /// + public YesNoType EndSessionMessage + { + get + { + return this.endSessionMessageField; + } + set + { + this.endSessionMessageFieldSet = true; + this.endSessionMessageField = value; + } + } + + /// + /// Optionally sends a close message to the application from deffered action without impersonation. Default is no. + /// + public YesNoType ElevatedCloseMessage + { + get + { + return this.elevatedCloseMessageField; + } + set + { + this.elevatedCloseMessageFieldSet = true; + this.elevatedCloseMessageField = value; + } + } + + /// + /// Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application from a deffered action without impersonation. Default is "no". + /// + public YesNoType ElevatedEndSessionMessage + { + get + { + return this.elevatedEndSessionMessageField; + } + set + { + this.elevatedEndSessionMessageFieldSet = true; + this.elevatedEndSessionMessageField = value; + } + } + + /// + /// Optionally prompts for reboot if application is still running. The default is "yes". The TerminateProcess attribute must be "no" or not specified if this attribute is "yes". + /// + public YesNoType RebootPrompt + { + get + { + return this.rebootPromptField; + } + set + { + this.rebootPromptFieldSet = true; + this.rebootPromptField = value; + } + } + + /// + /// When this attribute is set to "yes", the user will be prompted when the application is still running. The Description attribute must contain the message to + /// display in the prompt. The prompt occurs before executing any of the other options and gives the options to "Abort", "Retry", or "Ignore". Abort will cancel + /// the install. Retry will attempt the check again and if the application is still running, prompt again. "Ignore" will continue and execute any other options + /// set on the CloseApplication element. The default is "no". + /// + public YesNoType PromptToContinue + { + get + { + return this.promptToContinueField; + } + set + { + this.promptToContinueFieldSet = true; + this.promptToContinueField = value; + } + } + + /// + /// Property to be set if application is still running. Useful for launch conditions or to conditionalize custom UI to ask user to shut down apps. + /// + public string Property + { + get + { + return this.propertyField; + } + set + { + this.propertyFieldSet = true; + this.propertyField = value; + } + } + + /// + /// Attempts to terminates process and return the specified exit code if application is still running after sending any requested close and/or end session messages. + /// If this attribute is specified, the RebootPrompt attribute must be "no". The default is "no". + /// + public int TerminateProcess + { + get + { + return this.terminateProcessField; + } + set + { + this.terminateProcessFieldSet = true; + this.terminateProcessField = value; + } + } + + /// + /// Optional time in seconds to wait for the application to exit after the close and/or end session messages. If the application is still running after the timeout then + /// the RebootPrompt or TerminateProcess attributes will be considered. The default value is "5" seconds. + /// + public int Timeout + { + get + { + return this.timeoutField; + } + set + { + this.timeoutFieldSet = true; + this.timeoutField = value; + } + } + + /// + /// Condition that determines if the application should be closed. Must be blank or evaluate to true + /// for the application to be scheduled for closing. + /// + public string Content + { + get + { + return this.contentField; + } + set + { + this.contentFieldSet = true; + this.contentField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("CloseApplication", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.targetFieldSet) + { + writer.WriteAttributeString("Target", this.targetField); + } + if (this.descriptionFieldSet) + { + writer.WriteAttributeString("Description", this.descriptionField); + } + if (this.sequenceFieldSet) + { + writer.WriteAttributeString("Sequence", this.sequenceField.ToString(CultureInfo.InvariantCulture)); + } + if (this.closeMessageFieldSet) + { + if ((this.closeMessageField == YesNoType.no)) + { + writer.WriteAttributeString("CloseMessage", "no"); + } + if ((this.closeMessageField == YesNoType.yes)) + { + writer.WriteAttributeString("CloseMessage", "yes"); + } + } + if (this.endSessionMessageFieldSet) + { + if ((this.endSessionMessageField == YesNoType.no)) + { + writer.WriteAttributeString("EndSessionMessage", "no"); + } + if ((this.endSessionMessageField == YesNoType.yes)) + { + writer.WriteAttributeString("EndSessionMessage", "yes"); + } + } + if (this.elevatedCloseMessageFieldSet) + { + if ((this.elevatedCloseMessageField == YesNoType.no)) + { + writer.WriteAttributeString("ElevatedCloseMessage", "no"); + } + if ((this.elevatedCloseMessageField == YesNoType.yes)) + { + writer.WriteAttributeString("ElevatedCloseMessage", "yes"); + } + } + if (this.elevatedEndSessionMessageFieldSet) + { + if ((this.elevatedEndSessionMessageField == YesNoType.no)) + { + writer.WriteAttributeString("ElevatedEndSessionMessage", "no"); + } + if ((this.elevatedEndSessionMessageField == YesNoType.yes)) + { + writer.WriteAttributeString("ElevatedEndSessionMessage", "yes"); + } + } + if (this.rebootPromptFieldSet) + { + if ((this.rebootPromptField == YesNoType.no)) + { + writer.WriteAttributeString("RebootPrompt", "no"); + } + if ((this.rebootPromptField == YesNoType.yes)) + { + writer.WriteAttributeString("RebootPrompt", "yes"); + } + } + if (this.promptToContinueFieldSet) + { + if ((this.promptToContinueField == YesNoType.no)) + { + writer.WriteAttributeString("PromptToContinue", "no"); + } + if ((this.promptToContinueField == YesNoType.yes)) + { + writer.WriteAttributeString("PromptToContinue", "yes"); + } + } + if (this.propertyFieldSet) + { + writer.WriteAttributeString("Property", this.propertyField); + } + if (this.terminateProcessFieldSet) + { + writer.WriteAttributeString("TerminateProcess", this.terminateProcessField.ToString(CultureInfo.InvariantCulture)); + } + if (this.timeoutFieldSet) + { + writer.WriteAttributeString("Timeout", this.timeoutField.ToString(CultureInfo.InvariantCulture)); + } + if (this.contentFieldSet) + { + writer.WriteString(this.contentField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Target" == name)) + { + this.targetField = value; + this.targetFieldSet = true; + } + if (("Description" == name)) + { + this.descriptionField = value; + this.descriptionFieldSet = true; + } + if (("Sequence" == name)) + { + this.sequenceField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.sequenceFieldSet = true; + } + if (("CloseMessage" == name)) + { + this.closeMessageField = Enums.ParseYesNoType(value); + this.closeMessageFieldSet = true; + } + if (("EndSessionMessage" == name)) + { + this.endSessionMessageField = Enums.ParseYesNoType(value); + this.endSessionMessageFieldSet = true; + } + if (("ElevatedCloseMessage" == name)) + { + this.elevatedCloseMessageField = Enums.ParseYesNoType(value); + this.elevatedCloseMessageFieldSet = true; + } + if (("ElevatedEndSessionMessage" == name)) + { + this.elevatedEndSessionMessageField = Enums.ParseYesNoType(value); + this.elevatedEndSessionMessageFieldSet = true; + } + if (("RebootPrompt" == name)) + { + this.rebootPromptField = Enums.ParseYesNoType(value); + this.rebootPromptFieldSet = true; + } + if (("PromptToContinue" == name)) + { + this.promptToContinueField = Enums.ParseYesNoType(value); + this.promptToContinueFieldSet = true; + } + if (("Property" == name)) + { + this.propertyField = value; + this.propertyFieldSet = true; + } + if (("TerminateProcess" == name)) + { + this.terminateProcessField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.terminateProcessFieldSet = true; + } + if (("Timeout" == name)) + { + this.timeoutField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.timeoutFieldSet = true; + } + if (("Content" == name)) + { + this.contentField = value; + this.contentFieldSet = true; + } + } + } + + /// + /// Describes a component search. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class ComponentSearch : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string variableField; + + private bool variableFieldSet; + + private string conditionField; + + private bool conditionFieldSet; + + private string afterField; + + private bool afterFieldSet; + + private string guidField; + + private bool guidFieldSet; + + private string productCodeField; + + private bool productCodeFieldSet; + + private ResultType resultField; + + private bool resultFieldSet; + + private ISchemaElement parentElement; + + /// + /// Id of the search for ordering and dependency. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the variable in which to place the result of the search. + /// + public string Variable + { + get + { + return this.variableField; + } + set + { + this.variableFieldSet = true; + this.variableField = value; + } + } + + /// + /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. + /// + public string Condition + { + get + { + return this.conditionField; + } + set + { + this.conditionFieldSet = true; + this.conditionField = value; + } + } + + /// + /// Id of the search that this one should come after. + /// + public string After + { + get + { + return this.afterField; + } + set + { + this.afterFieldSet = true; + this.afterField = value; + } + } + + /// + /// Component to search for. + /// + public string Guid + { + get + { + return this.guidField; + } + set + { + this.guidFieldSet = true; + this.guidField = value; + } + } + + /// + /// Optional ProductCode to determine if the component is installed. + /// + public string ProductCode + { + get + { + return this.productCodeField; + } + set + { + this.productCodeFieldSet = true; + this.productCodeField = value; + } + } + + /// + /// Rather than saving the matching key path into the variable, a ComponentSearch can save an attribute of the component instead. + /// + public ResultType Result + { + get + { + return this.resultField; + } + set + { + this.resultFieldSet = true; + this.resultField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a ResultType from a string. + /// + public static ResultType ParseResultType(string value) + { + ResultType parsedValue; + ComponentSearch.TryParseResultType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ResultType from a string. + /// + public static bool TryParseResultType(string value, out ResultType parsedValue) + { + parsedValue = ResultType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("directory" == value)) + { + parsedValue = ResultType.directory; + } + else + { + if (("state" == value)) + { + parsedValue = ResultType.state; + } + else + { + if (("keyPath" == value)) + { + parsedValue = ResultType.keyPath; + } + else + { + parsedValue = ResultType.IllegalValue; + return false; + } + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("ComponentSearch", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.variableFieldSet) + { + writer.WriteAttributeString("Variable", this.variableField); + } + if (this.conditionFieldSet) + { + writer.WriteAttributeString("Condition", this.conditionField); + } + if (this.afterFieldSet) + { + writer.WriteAttributeString("After", this.afterField); + } + if (this.guidFieldSet) + { + writer.WriteAttributeString("Guid", this.guidField); + } + if (this.productCodeFieldSet) + { + writer.WriteAttributeString("ProductCode", this.productCodeField); + } + if (this.resultFieldSet) + { + if ((this.resultField == ResultType.directory)) + { + writer.WriteAttributeString("Result", "directory"); + } + if ((this.resultField == ResultType.state)) + { + writer.WriteAttributeString("Result", "state"); + } + if ((this.resultField == ResultType.keyPath)) + { + writer.WriteAttributeString("Result", "keyPath"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Variable" == name)) + { + this.variableField = value; + this.variableFieldSet = true; + } + if (("Condition" == name)) + { + this.conditionField = value; + this.conditionFieldSet = true; + } + if (("After" == name)) + { + this.afterField = value; + this.afterFieldSet = true; + } + if (("Guid" == name)) + { + this.guidField = value; + this.guidFieldSet = true; + } + if (("ProductCode" == name)) + { + this.productCodeField = value; + this.productCodeFieldSet = true; + } + if (("Result" == name)) + { + this.resultField = ComponentSearch.ParseResultType(value); + this.resultFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ResultType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Saves the parent directory for the component's file key path; other types of key path are returned unmodified. + /// + directory, + + /// + /// Saves the state of the component: absent (2), locally installed (3), will run from source (4), or installed in default location (either local or from source) (5) + /// + state, + + /// + /// Saves the key path of the component if installed. This is the default. + /// + keyPath, + } + } + + /// + /// References a ComponentSearch. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class ComponentSearchRef : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private ISchemaElement parentElement; + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("ComponentSearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + } + } + + /// + /// Describes a directory search. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class DirectorySearch : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string variableField; + + private bool variableFieldSet; + + private string conditionField; + + private bool conditionFieldSet; + + private string afterField; + + private bool afterFieldSet; + + private string pathField; + + private bool pathFieldSet; + + private ResultType resultField; + + private bool resultFieldSet; + + private ISchemaElement parentElement; + + /// + /// Id of the search for ordering and dependency. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the variable in which to place the result of the search. + /// + public string Variable + { + get + { + return this.variableField; + } + set + { + this.variableFieldSet = true; + this.variableField = value; + } + } + + /// + /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. + /// + public string Condition + { + get + { + return this.conditionField; + } + set + { + this.conditionFieldSet = true; + this.conditionField = value; + } + } + + /// + /// Id of the search that this one should come after. + /// + public string After + { + get + { + return this.afterField; + } + set + { + this.afterFieldSet = true; + this.afterField = value; + } + } + + /// + /// Directory path to search for. + /// + public string Path + { + get + { + return this.pathField; + } + set + { + this.pathFieldSet = true; + this.pathField = value; + } + } + + /// + /// Rather than saving the matching directory path into the variable, a DirectorySearch can save an + /// attribute of the matching directory instead. + /// + public ResultType Result + { + get + { + return this.resultField; + } + set + { + this.resultFieldSet = true; + this.resultField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a ResultType from a string. + /// + public static ResultType ParseResultType(string value) + { + ResultType parsedValue; + DirectorySearch.TryParseResultType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ResultType from a string. + /// + public static bool TryParseResultType(string value, out ResultType parsedValue) + { + parsedValue = ResultType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("exists" == value)) + { + parsedValue = ResultType.exists; + } + else + { + parsedValue = ResultType.IllegalValue; + return false; + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("DirectorySearch", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.variableFieldSet) + { + writer.WriteAttributeString("Variable", this.variableField); + } + if (this.conditionFieldSet) + { + writer.WriteAttributeString("Condition", this.conditionField); + } + if (this.afterFieldSet) + { + writer.WriteAttributeString("After", this.afterField); + } + if (this.pathFieldSet) + { + writer.WriteAttributeString("Path", this.pathField); + } + if (this.resultFieldSet) + { + if ((this.resultField == ResultType.exists)) + { + writer.WriteAttributeString("Result", "exists"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Variable" == name)) + { + this.variableField = value; + this.variableFieldSet = true; + } + if (("Condition" == name)) + { + this.conditionField = value; + this.conditionFieldSet = true; + } + if (("After" == name)) + { + this.afterField = value; + this.afterFieldSet = true; + } + if (("Path" == name)) + { + this.pathField = value; + this.pathFieldSet = true; + } + if (("Result" == name)) + { + this.resultField = DirectorySearch.ParseResultType(value); + this.resultFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ResultType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Saves true if a matching directory is found; false otherwise. + /// + exists, + } + } + + /// + /// References a DirectorySearch. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class DirectorySearchRef : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private ISchemaElement parentElement; + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("DirectorySearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + } + } + + /// + /// Creates an event source. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class EventSource : ISchemaElement, ISetAttributes + { + + private int categoryCountField; + + private bool categoryCountFieldSet; + + private string categoryMessageFileField; + + private bool categoryMessageFileFieldSet; + + private string eventMessageFileField; + + private bool eventMessageFileFieldSet; + + private YesNoType keyPathField; + + private bool keyPathFieldSet; + + private string logField; + + private bool logFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string parameterMessageFileField; + + private bool parameterMessageFileFieldSet; + + private YesNoType supportsErrorsField; + + private bool supportsErrorsFieldSet; + + private YesNoType supportsFailureAuditsField; + + private bool supportsFailureAuditsFieldSet; + + private YesNoType supportsInformationalsField; + + private bool supportsInformationalsFieldSet; + + private YesNoType supportsSuccessAuditsField; + + private bool supportsSuccessAuditsFieldSet; + + private YesNoType supportsWarningsField; + + private bool supportsWarningsFieldSet; + + private ISchemaElement parentElement; + + /// + /// The number of categories in CategoryMessageFile. CategoryMessageFile + /// must be specified too. + /// + public int CategoryCount + { + get + { + return this.categoryCountField; + } + set + { + this.categoryCountFieldSet = true; + this.categoryCountField = value; + } + } + + /// + /// Name of the category message file. CategoryCount must be specified too. + /// Note that this is a formatted field, so you can use [#fileId] syntax to + /// refer to a file being installed. It is also written as a REG_EXPAND_SZ + /// string, so you can use %environment_variable% syntax to refer to a file + /// already present on the user's machine. + /// + public string CategoryMessageFile + { + get + { + return this.categoryMessageFileField; + } + set + { + this.categoryMessageFileFieldSet = true; + this.categoryMessageFileField = value; + } + } + + /// + /// Name of the event message file. + /// Note that this is a formatted field, so you can use [#fileId] syntax to + /// refer to a file being installed. It is also written as a REG_EXPAND_SZ + /// string, so you can use %environment_variable% syntax to refer to a file + /// already present on the user's machine. + /// + public string EventMessageFile + { + get + { + return this.eventMessageFileField; + } + set + { + this.eventMessageFileFieldSet = true; + this.eventMessageFileField = value; + } + } + + /// + /// Marks the EventSource registry as the key path of the component it belongs to. + /// + public YesNoType KeyPath + { + get + { + return this.keyPathField; + } + set + { + this.keyPathFieldSet = true; + this.keyPathField = value; + } + } + + /// + /// Name of the event source's log. + /// + public string Log + { + get + { + return this.logField; + } + set + { + this.logFieldSet = true; + this.logField = value; + } + } + + /// + /// Name of the event source. + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// Name of the parameter message file. + /// Note that this is a formatted field, so you can use [#fileId] syntax to + /// refer to a file being installed. It is also written as a REG_EXPAND_SZ + /// string, so you can use %environment_variable% syntax to refer to a file + /// already present on the user's machine. + /// + public string ParameterMessageFile + { + get + { + return this.parameterMessageFileField; + } + set + { + this.parameterMessageFileFieldSet = true; + this.parameterMessageFileField = value; + } + } + + /// + /// Equivalent to EVENTLOG_ERROR_TYPE. + /// + public YesNoType SupportsErrors + { + get + { + return this.supportsErrorsField; + } + set + { + this.supportsErrorsFieldSet = true; + this.supportsErrorsField = value; + } + } + + /// + /// Equivalent to EVENTLOG_AUDIT_FAILURE. + /// + public YesNoType SupportsFailureAudits + { + get + { + return this.supportsFailureAuditsField; + } + set + { + this.supportsFailureAuditsFieldSet = true; + this.supportsFailureAuditsField = value; + } + } + + /// + /// Equivalent to EVENTLOG_INFORMATION_TYPE. + /// + public YesNoType SupportsInformationals + { + get + { + return this.supportsInformationalsField; + } + set + { + this.supportsInformationalsFieldSet = true; + this.supportsInformationalsField = value; + } + } + + /// + /// Equivalent to EVENTLOG_AUDIT_SUCCESS. + /// + public YesNoType SupportsSuccessAudits + { + get + { + return this.supportsSuccessAuditsField; + } + set + { + this.supportsSuccessAuditsFieldSet = true; + this.supportsSuccessAuditsField = value; + } + } + + /// + /// Equivalent to EVENTLOG_WARNING_TYPE. + /// + public YesNoType SupportsWarnings + { + get + { + return this.supportsWarningsField; + } + set + { + this.supportsWarningsFieldSet = true; + this.supportsWarningsField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("EventSource", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.categoryCountFieldSet) + { + writer.WriteAttributeString("CategoryCount", this.categoryCountField.ToString(CultureInfo.InvariantCulture)); + } + if (this.categoryMessageFileFieldSet) + { + writer.WriteAttributeString("CategoryMessageFile", this.categoryMessageFileField); + } + if (this.eventMessageFileFieldSet) + { + writer.WriteAttributeString("EventMessageFile", this.eventMessageFileField); + } + if (this.keyPathFieldSet) + { + if ((this.keyPathField == YesNoType.no)) + { + writer.WriteAttributeString("KeyPath", "no"); + } + if ((this.keyPathField == YesNoType.yes)) + { + writer.WriteAttributeString("KeyPath", "yes"); + } + } + if (this.logFieldSet) + { + writer.WriteAttributeString("Log", this.logField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.parameterMessageFileFieldSet) + { + writer.WriteAttributeString("ParameterMessageFile", this.parameterMessageFileField); + } + if (this.supportsErrorsFieldSet) + { + if ((this.supportsErrorsField == YesNoType.no)) + { + writer.WriteAttributeString("SupportsErrors", "no"); + } + if ((this.supportsErrorsField == YesNoType.yes)) + { + writer.WriteAttributeString("SupportsErrors", "yes"); + } + } + if (this.supportsFailureAuditsFieldSet) + { + if ((this.supportsFailureAuditsField == YesNoType.no)) + { + writer.WriteAttributeString("SupportsFailureAudits", "no"); + } + if ((this.supportsFailureAuditsField == YesNoType.yes)) + { + writer.WriteAttributeString("SupportsFailureAudits", "yes"); + } + } + if (this.supportsInformationalsFieldSet) + { + if ((this.supportsInformationalsField == YesNoType.no)) + { + writer.WriteAttributeString("SupportsInformationals", "no"); + } + if ((this.supportsInformationalsField == YesNoType.yes)) + { + writer.WriteAttributeString("SupportsInformationals", "yes"); + } + } + if (this.supportsSuccessAuditsFieldSet) + { + if ((this.supportsSuccessAuditsField == YesNoType.no)) + { + writer.WriteAttributeString("SupportsSuccessAudits", "no"); + } + if ((this.supportsSuccessAuditsField == YesNoType.yes)) + { + writer.WriteAttributeString("SupportsSuccessAudits", "yes"); + } + } + if (this.supportsWarningsFieldSet) + { + if ((this.supportsWarningsField == YesNoType.no)) + { + writer.WriteAttributeString("SupportsWarnings", "no"); + } + if ((this.supportsWarningsField == YesNoType.yes)) + { + writer.WriteAttributeString("SupportsWarnings", "yes"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("CategoryCount" == name)) + { + this.categoryCountField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.categoryCountFieldSet = true; + } + if (("CategoryMessageFile" == name)) + { + this.categoryMessageFileField = value; + this.categoryMessageFileFieldSet = true; + } + if (("EventMessageFile" == name)) + { + this.eventMessageFileField = value; + this.eventMessageFileFieldSet = true; + } + if (("KeyPath" == name)) + { + this.keyPathField = Enums.ParseYesNoType(value); + this.keyPathFieldSet = true; + } + if (("Log" == name)) + { + this.logField = value; + this.logFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("ParameterMessageFile" == name)) + { + this.parameterMessageFileField = value; + this.parameterMessageFileFieldSet = true; + } + if (("SupportsErrors" == name)) + { + this.supportsErrorsField = Enums.ParseYesNoType(value); + this.supportsErrorsFieldSet = true; + } + if (("SupportsFailureAudits" == name)) + { + this.supportsFailureAuditsField = Enums.ParseYesNoType(value); + this.supportsFailureAuditsFieldSet = true; + } + if (("SupportsInformationals" == name)) + { + this.supportsInformationalsField = Enums.ParseYesNoType(value); + this.supportsInformationalsFieldSet = true; + } + if (("SupportsSuccessAudits" == name)) + { + this.supportsSuccessAuditsField = Enums.ParseYesNoType(value); + this.supportsSuccessAuditsFieldSet = true; + } + if (("SupportsWarnings" == name)) + { + this.supportsWarningsField = Enums.ParseYesNoType(value); + this.supportsWarningsFieldSet = true; + } + } + } + + /// + /// Describes a file search. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class FileSearch : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string variableField; + + private bool variableFieldSet; + + private string conditionField; + + private bool conditionFieldSet; + + private string afterField; + + private bool afterFieldSet; + + private string pathField; + + private bool pathFieldSet; + + private ResultType resultField; + + private bool resultFieldSet; + + private ISchemaElement parentElement; + + /// + /// Id of the search for ordering and dependency. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the variable in which to place the result of the search. + /// + public string Variable + { + get + { + return this.variableField; + } + set + { + this.variableFieldSet = true; + this.variableField = value; + } + } + + /// + /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. + /// + public string Condition + { + get + { + return this.conditionField; + } + set + { + this.conditionFieldSet = true; + this.conditionField = value; + } + } + + /// + /// Id of the search that this one should come after. + /// + public string After + { + get + { + return this.afterField; + } + set + { + this.afterFieldSet = true; + this.afterField = value; + } + } + + /// + /// File path to search for. + /// + public string Path + { + get + { + return this.pathField; + } + set + { + this.pathFieldSet = true; + this.pathField = value; + } + } + + /// + /// Rather than saving the matching file path into the variable, a FileSearch can save an attribute of the matching file instead. + /// + public ResultType Result + { + get + { + return this.resultField; + } + set + { + this.resultFieldSet = true; + this.resultField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a ResultType from a string. + /// + public static ResultType ParseResultType(string value) + { + ResultType parsedValue; + FileSearch.TryParseResultType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ResultType from a string. + /// + public static bool TryParseResultType(string value, out ResultType parsedValue) + { + parsedValue = ResultType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("exists" == value)) + { + parsedValue = ResultType.exists; + } + else + { + if (("version" == value)) + { + parsedValue = ResultType.version; + } + else + { + parsedValue = ResultType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("FileSearch", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.variableFieldSet) + { + writer.WriteAttributeString("Variable", this.variableField); + } + if (this.conditionFieldSet) + { + writer.WriteAttributeString("Condition", this.conditionField); + } + if (this.afterFieldSet) + { + writer.WriteAttributeString("After", this.afterField); + } + if (this.pathFieldSet) + { + writer.WriteAttributeString("Path", this.pathField); + } + if (this.resultFieldSet) + { + if ((this.resultField == ResultType.exists)) + { + writer.WriteAttributeString("Result", "exists"); + } + if ((this.resultField == ResultType.version)) + { + writer.WriteAttributeString("Result", "version"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Variable" == name)) + { + this.variableField = value; + this.variableFieldSet = true; + } + if (("Condition" == name)) + { + this.conditionField = value; + this.conditionFieldSet = true; + } + if (("After" == name)) + { + this.afterField = value; + this.afterFieldSet = true; + } + if (("Path" == name)) + { + this.pathField = value; + this.pathFieldSet = true; + } + if (("Result" == name)) + { + this.resultField = FileSearch.ParseResultType(value); + this.resultFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ResultType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Saves true if a matching file is found; false otherwise. + /// + exists, + + /// + /// Saves the version information for files that have it (.exe, .dll); zero-version (0.0.0.0) otherwise. + /// + version, + } + } + + /// + /// References a FileSearch. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class FileSearchRef : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private ISchemaElement parentElement; + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("FileSearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + } + } + + /// + /// Creates a file share out of the component's directory. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class FileShare : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes + { + + private ElementCollection children; + + private string idField; + + private bool idFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string descriptionField; + + private bool descriptionFieldSet; + + private ISchemaElement parentElement; + + public FileShare() + { + ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); + childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(FileSharePermission))); + this.children = childCollection0; + } + + public virtual IEnumerable Children + { + get + { + return this.children; + } + } + + [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] + public virtual IEnumerable this[System.Type childType] + { + get + { + return this.children.Filter(childType); + } + } + + /// + /// Identifier for the file share (primary key). + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the file share. + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// Description of the file share. + /// + public string Description + { + get + { + return this.descriptionField; + } + set + { + this.descriptionFieldSet = true; + this.descriptionField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + public virtual void AddChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.AddElement(child); + child.ParentElement = this; + } + + public virtual void RemoveChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.RemoveElement(child); + child.ParentElement = null; + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + ISchemaElement ICreateChildren.CreateChild(string childName) + { + if (String.IsNullOrEmpty(childName)) + { + throw new ArgumentNullException("childName"); + } + ISchemaElement childValue = null; + if (("FileSharePermission" == childName)) + { + childValue = new FileSharePermission(); + } + if ((null == childValue)) + { + throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); + } + return childValue; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("FileShare", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.descriptionFieldSet) + { + writer.WriteAttributeString("Description", this.descriptionField); + } + for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) + { + ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); + childElement.OutputXml(writer); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Description" == name)) + { + this.descriptionField = value; + this.descriptionFieldSet = true; + } + } + } + + /// + /// Sets ACLs on a FileShare. This element has no Id attribute. + /// The table and key are taken from the parent element. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class FileSharePermission : ISchemaElement, ISetAttributes + { + + private string userField; + + private bool userFieldSet; + + private YesNoType readField; + + private bool readFieldSet; + + private YesNoType deleteField; + + private bool deleteFieldSet; + + private YesNoType readPermissionField; + + private bool readPermissionFieldSet; + + private YesNoType changePermissionField; + + private bool changePermissionFieldSet; + + private YesNoType takeOwnershipField; + + private bool takeOwnershipFieldSet; + + private YesNoType readAttributesField; + + private bool readAttributesFieldSet; + + private YesNoType writeAttributesField; + + private bool writeAttributesFieldSet; + + private YesNoType readExtendedAttributesField; + + private bool readExtendedAttributesFieldSet; + + private YesNoType writeExtendedAttributesField; + + private bool writeExtendedAttributesFieldSet; + + private YesNoType synchronizeField; + + private bool synchronizeFieldSet; + + private YesNoType createFileField; + + private bool createFileFieldSet; + + private YesNoType createChildField; + + private bool createChildFieldSet; + + private YesNoType deleteChildField; + + private bool deleteChildFieldSet; + + private YesNoType traverseField; + + private bool traverseFieldSet; + + private YesNoType genericAllField; + + private bool genericAllFieldSet; + + private YesNoType genericExecuteField; + + private bool genericExecuteFieldSet; + + private YesNoType genericWriteField; + + private bool genericWriteFieldSet; + + private YesNoType genericReadField; + + private bool genericReadFieldSet; + + private ISchemaElement parentElement; + + public string User + { + get + { + return this.userField; + } + set + { + this.userFieldSet = true; + this.userField = value; + } + } + + public YesNoType Read + { + get + { + return this.readField; + } + set + { + this.readFieldSet = true; + this.readField = value; + } + } + + public YesNoType Delete + { + get + { + return this.deleteField; + } + set + { + this.deleteFieldSet = true; + this.deleteField = value; + } + } + + public YesNoType ReadPermission + { + get + { + return this.readPermissionField; + } + set + { + this.readPermissionFieldSet = true; + this.readPermissionField = value; + } + } + + public YesNoType ChangePermission + { + get + { + return this.changePermissionField; + } + set + { + this.changePermissionFieldSet = true; + this.changePermissionField = value; + } + } + + public YesNoType TakeOwnership + { + get + { + return this.takeOwnershipField; + } + set + { + this.takeOwnershipFieldSet = true; + this.takeOwnershipField = value; + } + } + + public YesNoType ReadAttributes + { + get + { + return this.readAttributesField; + } + set + { + this.readAttributesFieldSet = true; + this.readAttributesField = value; + } + } + + public YesNoType WriteAttributes + { + get + { + return this.writeAttributesField; + } + set + { + this.writeAttributesFieldSet = true; + this.writeAttributesField = value; + } + } + + public YesNoType ReadExtendedAttributes + { + get + { + return this.readExtendedAttributesField; + } + set + { + this.readExtendedAttributesFieldSet = true; + this.readExtendedAttributesField = value; + } + } + + public YesNoType WriteExtendedAttributes + { + get + { + return this.writeExtendedAttributesField; + } + set + { + this.writeExtendedAttributesFieldSet = true; + this.writeExtendedAttributesField = value; + } + } + + public YesNoType Synchronize + { + get + { + return this.synchronizeField; + } + set + { + this.synchronizeFieldSet = true; + this.synchronizeField = value; + } + } + + /// + /// For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. + /// + public YesNoType CreateFile + { + get + { + return this.createFileField; + } + set + { + this.createFileFieldSet = true; + this.createFileField = value; + } + } + + /// + /// For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. + /// + public YesNoType CreateChild + { + get + { + return this.createChildField; + } + set + { + this.createChildFieldSet = true; + this.createChildField = value; + } + } + + /// + /// For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. + /// + public YesNoType DeleteChild + { + get + { + return this.deleteChildField; + } + set + { + this.deleteChildFieldSet = true; + this.deleteChildField = value; + } + } + + /// + /// For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. + /// + public YesNoType Traverse + { + get + { + return this.traverseField; + } + set + { + this.traverseFieldSet = true; + this.traverseField = value; + } + } + + public YesNoType GenericAll + { + get + { + return this.genericAllField; + } + set + { + this.genericAllFieldSet = true; + this.genericAllField = value; + } + } + + public YesNoType GenericExecute + { + get + { + return this.genericExecuteField; + } + set + { + this.genericExecuteFieldSet = true; + this.genericExecuteField = value; + } + } + + public YesNoType GenericWrite + { + get + { + return this.genericWriteField; + } + set + { + this.genericWriteFieldSet = true; + this.genericWriteField = value; + } + } + + /// + /// specifying this will fail to grant read access + /// + public YesNoType GenericRead + { + get + { + return this.genericReadField; + } + set + { + this.genericReadFieldSet = true; + this.genericReadField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("FileSharePermission", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.userFieldSet) + { + writer.WriteAttributeString("User", this.userField); + } + if (this.readFieldSet) + { + if ((this.readField == YesNoType.no)) + { + writer.WriteAttributeString("Read", "no"); + } + if ((this.readField == YesNoType.yes)) + { + writer.WriteAttributeString("Read", "yes"); + } + } + if (this.deleteFieldSet) + { + if ((this.deleteField == YesNoType.no)) + { + writer.WriteAttributeString("Delete", "no"); + } + if ((this.deleteField == YesNoType.yes)) + { + writer.WriteAttributeString("Delete", "yes"); + } + } + if (this.readPermissionFieldSet) + { + if ((this.readPermissionField == YesNoType.no)) + { + writer.WriteAttributeString("ReadPermission", "no"); + } + if ((this.readPermissionField == YesNoType.yes)) + { + writer.WriteAttributeString("ReadPermission", "yes"); + } + } + if (this.changePermissionFieldSet) + { + if ((this.changePermissionField == YesNoType.no)) + { + writer.WriteAttributeString("ChangePermission", "no"); + } + if ((this.changePermissionField == YesNoType.yes)) + { + writer.WriteAttributeString("ChangePermission", "yes"); + } + } + if (this.takeOwnershipFieldSet) + { + if ((this.takeOwnershipField == YesNoType.no)) + { + writer.WriteAttributeString("TakeOwnership", "no"); + } + if ((this.takeOwnershipField == YesNoType.yes)) + { + writer.WriteAttributeString("TakeOwnership", "yes"); + } + } + if (this.readAttributesFieldSet) + { + if ((this.readAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("ReadAttributes", "no"); + } + if ((this.readAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("ReadAttributes", "yes"); + } + } + if (this.writeAttributesFieldSet) + { + if ((this.writeAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("WriteAttributes", "no"); + } + if ((this.writeAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("WriteAttributes", "yes"); + } + } + if (this.readExtendedAttributesFieldSet) + { + if ((this.readExtendedAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("ReadExtendedAttributes", "no"); + } + if ((this.readExtendedAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("ReadExtendedAttributes", "yes"); + } + } + if (this.writeExtendedAttributesFieldSet) + { + if ((this.writeExtendedAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("WriteExtendedAttributes", "no"); + } + if ((this.writeExtendedAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("WriteExtendedAttributes", "yes"); + } + } + if (this.synchronizeFieldSet) + { + if ((this.synchronizeField == YesNoType.no)) + { + writer.WriteAttributeString("Synchronize", "no"); + } + if ((this.synchronizeField == YesNoType.yes)) + { + writer.WriteAttributeString("Synchronize", "yes"); + } + } + if (this.createFileFieldSet) + { + if ((this.createFileField == YesNoType.no)) + { + writer.WriteAttributeString("CreateFile", "no"); + } + if ((this.createFileField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateFile", "yes"); + } + } + if (this.createChildFieldSet) + { + if ((this.createChildField == YesNoType.no)) + { + writer.WriteAttributeString("CreateChild", "no"); + } + if ((this.createChildField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateChild", "yes"); + } + } + if (this.deleteChildFieldSet) + { + if ((this.deleteChildField == YesNoType.no)) + { + writer.WriteAttributeString("DeleteChild", "no"); + } + if ((this.deleteChildField == YesNoType.yes)) + { + writer.WriteAttributeString("DeleteChild", "yes"); + } + } + if (this.traverseFieldSet) + { + if ((this.traverseField == YesNoType.no)) + { + writer.WriteAttributeString("Traverse", "no"); + } + if ((this.traverseField == YesNoType.yes)) + { + writer.WriteAttributeString("Traverse", "yes"); + } + } + if (this.genericAllFieldSet) + { + if ((this.genericAllField == YesNoType.no)) + { + writer.WriteAttributeString("GenericAll", "no"); + } + if ((this.genericAllField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericAll", "yes"); + } + } + if (this.genericExecuteFieldSet) + { + if ((this.genericExecuteField == YesNoType.no)) + { + writer.WriteAttributeString("GenericExecute", "no"); + } + if ((this.genericExecuteField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericExecute", "yes"); + } + } + if (this.genericWriteFieldSet) + { + if ((this.genericWriteField == YesNoType.no)) + { + writer.WriteAttributeString("GenericWrite", "no"); + } + if ((this.genericWriteField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericWrite", "yes"); + } + } + if (this.genericReadFieldSet) + { + if ((this.genericReadField == YesNoType.no)) + { + writer.WriteAttributeString("GenericRead", "no"); + } + if ((this.genericReadField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericRead", "yes"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("User" == name)) + { + this.userField = value; + this.userFieldSet = true; + } + if (("Read" == name)) + { + this.readField = Enums.ParseYesNoType(value); + this.readFieldSet = true; + } + if (("Delete" == name)) + { + this.deleteField = Enums.ParseYesNoType(value); + this.deleteFieldSet = true; + } + if (("ReadPermission" == name)) + { + this.readPermissionField = Enums.ParseYesNoType(value); + this.readPermissionFieldSet = true; + } + if (("ChangePermission" == name)) + { + this.changePermissionField = Enums.ParseYesNoType(value); + this.changePermissionFieldSet = true; + } + if (("TakeOwnership" == name)) + { + this.takeOwnershipField = Enums.ParseYesNoType(value); + this.takeOwnershipFieldSet = true; + } + if (("ReadAttributes" == name)) + { + this.readAttributesField = Enums.ParseYesNoType(value); + this.readAttributesFieldSet = true; + } + if (("WriteAttributes" == name)) + { + this.writeAttributesField = Enums.ParseYesNoType(value); + this.writeAttributesFieldSet = true; + } + if (("ReadExtendedAttributes" == name)) + { + this.readExtendedAttributesField = Enums.ParseYesNoType(value); + this.readExtendedAttributesFieldSet = true; + } + if (("WriteExtendedAttributes" == name)) + { + this.writeExtendedAttributesField = Enums.ParseYesNoType(value); + this.writeExtendedAttributesFieldSet = true; + } + if (("Synchronize" == name)) + { + this.synchronizeField = Enums.ParseYesNoType(value); + this.synchronizeFieldSet = true; + } + if (("CreateFile" == name)) + { + this.createFileField = Enums.ParseYesNoType(value); + this.createFileFieldSet = true; + } + if (("CreateChild" == name)) + { + this.createChildField = Enums.ParseYesNoType(value); + this.createChildFieldSet = true; + } + if (("DeleteChild" == name)) + { + this.deleteChildField = Enums.ParseYesNoType(value); + this.deleteChildFieldSet = true; + } + if (("Traverse" == name)) + { + this.traverseField = Enums.ParseYesNoType(value); + this.traverseFieldSet = true; + } + if (("GenericAll" == name)) + { + this.genericAllField = Enums.ParseYesNoType(value); + this.genericAllFieldSet = true; + } + if (("GenericExecute" == name)) + { + this.genericExecuteField = Enums.ParseYesNoType(value); + this.genericExecuteFieldSet = true; + } + if (("GenericWrite" == name)) + { + this.genericWriteField = Enums.ParseYesNoType(value); + this.genericWriteFieldSet = true; + } + if (("GenericRead" == name)) + { + this.genericReadField = Enums.ParseYesNoType(value); + this.genericReadFieldSet = true; + } + } + } + + /// + /// Formats a file's contents at install time. The contents are formatted according to the rules of the + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class FormatFile : ISchemaElement, ISetAttributes + { + + private string binaryKeyField; + + private bool binaryKeyFieldSet; + + private ISchemaElement parentElement; + + /// + /// The id of a Binary row that contains a copy of the file. The file in the Binary table overwrites whatever + /// file is installed by the parent component. + /// + public string BinaryKey + { + get + { + return this.binaryKeyField; + } + set + { + this.binaryKeyFieldSet = true; + this.binaryKeyField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("FormatFile", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.binaryKeyFieldSet) + { + writer.WriteAttributeString("BinaryKey", this.binaryKeyField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("BinaryKey" == name)) + { + this.binaryKeyField = value; + this.binaryKeyFieldSet = true; + } + } + } + + /// + /// Finds user groups on the local machine or specified Active Directory domain. The local machine will be + /// searched for the group first then fallback to looking in Active Directory. This element is not capable + /// of creating new groups but can be used to add new or existing users to an existing group. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class Group : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string domainField; + + private bool domainFieldSet; + + private ISchemaElement parentElement; + + /// + /// Unique identifier in your installation package for this group. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// A + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// An optional + /// + public string Domain + { + get + { + return this.domainField; + } + set + { + this.domainFieldSet = true; + this.domainField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("Group", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.domainFieldSet) + { + writer.WriteAttributeString("Domain", this.domainField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Domain" == name)) + { + this.domainField = value; + this.domainFieldSet = true; + } + } + } + + /// + /// Used to join a user to a group + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class GroupRef : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private ISchemaElement parentElement; + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("GroupRef", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + } + } + + /// + /// Creates a shortcut to a URL. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class InternetShortcut : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string directoryField; + + private bool directoryFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string targetField; + + private bool targetFieldSet; + + private TypeType typeField; + + private bool typeFieldSet; + + private string iconFileField; + + private bool iconFileFieldSet; + + private int iconIndexField; + + private bool iconIndexFieldSet; + + private ISchemaElement parentElement; + + /// + /// Unique identifier in your installation package for this Internet shortcut. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Identifier reference to Directory element where shortcut is to be created. This attribute's value defaults to the parent Component directory. + /// + public string Directory + { + get + { + return this.directoryField; + } + set + { + this.directoryFieldSet = true; + this.directoryField = value; + } + } + + /// + /// The name of the shortcut file, which is visible to the user. (The .lnk + /// extension is added automatically and by default, is not shown to the user.) + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// URL that should be opened when the user selects the shortcut. Windows + /// opens the URL in the appropriate handler for the protocol specified + /// in the URL. Note that this is a formatted field, so you can use + /// [#fileId] syntax to refer to a file being installed (using the file: + /// protocol). + /// + public string Target + { + get + { + return this.targetField; + } + set + { + this.targetFieldSet = true; + this.targetField = value; + } + } + + /// + /// Which type of shortcut should be created. + /// + public TypeType Type + { + get + { + return this.typeField; + } + set + { + this.typeFieldSet = true; + this.typeField = value; + } + } + + /// + /// Icon file that should be displayed. Note that this is a formatted field, so you can use + /// [#fileId] syntax to refer to a file being installed (using the file: + /// protocol). + /// + public string IconFile + { + get + { + return this.iconFileField; + } + set + { + this.iconFileFieldSet = true; + this.iconFileField = value; + } + } + + /// + /// Index of the icon being referenced + /// + public int IconIndex + { + get + { + return this.iconIndexField; + } + set + { + this.iconIndexFieldSet = true; + this.iconIndexField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a TypeType from a string. + /// + public static TypeType ParseTypeType(string value) + { + TypeType parsedValue; + InternetShortcut.TryParseTypeType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a TypeType from a string. + /// + public static bool TryParseTypeType(string value, out TypeType parsedValue) + { + parsedValue = TypeType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("url" == value)) + { + parsedValue = TypeType.url; + } + else + { + if (("link" == value)) + { + parsedValue = TypeType.link; + } + else + { + parsedValue = TypeType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("InternetShortcut", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.directoryFieldSet) + { + writer.WriteAttributeString("Directory", this.directoryField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.targetFieldSet) + { + writer.WriteAttributeString("Target", this.targetField); + } + if (this.typeFieldSet) + { + if ((this.typeField == TypeType.url)) + { + writer.WriteAttributeString("Type", "url"); + } + if ((this.typeField == TypeType.link)) + { + writer.WriteAttributeString("Type", "link"); + } + } + if (this.iconFileFieldSet) + { + writer.WriteAttributeString("IconFile", this.iconFileField); + } + if (this.iconIndexFieldSet) + { + writer.WriteAttributeString("IconIndex", this.iconIndexField.ToString(CultureInfo.InvariantCulture)); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Directory" == name)) + { + this.directoryField = value; + this.directoryFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Target" == name)) + { + this.targetField = value; + this.targetFieldSet = true; + } + if (("Type" == name)) + { + this.typeField = InternetShortcut.ParseTypeType(value); + this.typeFieldSet = true; + } + if (("IconFile" == name)) + { + this.iconFileField = value; + this.iconFileFieldSet = true; + } + if (("IconIndex" == name)) + { + this.iconIndexField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.iconIndexFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum TypeType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Creates .url files using IUniformResourceLocatorW. + /// + url, + + /// + /// Creates .lnk files using IShellLinkW (default). + /// + link, + } + } + + /// + /// Used to create performance categories and configure performance counters. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class PerformanceCategory : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes + { + + private ElementCollection children; + + private string idField; + + private bool idFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string helpField; + + private bool helpFieldSet; + + private YesNoType multiInstanceField; + + private bool multiInstanceFieldSet; + + private string libraryField; + + private bool libraryFieldSet; + + private string openField; + + private bool openFieldSet; + + private string closeField; + + private bool closeFieldSet; + + private string collectField; + + private bool collectFieldSet; + + private PerformanceCounterLanguageType defaultLanguageField; + + private bool defaultLanguageFieldSet; + + private ISchemaElement parentElement; + + public PerformanceCategory() + { + ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); + childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(PerformanceCounter))); + this.children = childCollection0; + } + + public virtual IEnumerable Children + { + get + { + return this.children; + } + } + + [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] + public virtual IEnumerable this[System.Type childType] + { + get + { + return this.children.Filter(childType); + } + } + + /// + /// Unique identifier in your installation package for this performance counter category. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name for the performance counter category. If this attribute is not provided the Id attribute is used as the name of the performance counter category. + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// Optional help text for the performance counter category. + /// + public string Help + { + get + { + return this.helpField; + } + set + { + this.helpFieldSet = true; + this.helpField = value; + } + } + + /// + /// Flag that specifies whether the performance counter category is multi or single instanced. Default is single instance. + /// + public YesNoType MultiInstance + { + get + { + return this.multiInstanceField; + } + set + { + this.multiInstanceFieldSet = true; + this.multiInstanceField = value; + } + } + + /// + /// DLL that contains the performance counter. The default is "netfxperf.dll" which should be used for all managed code performance counters. + /// + public string Library + { + get + { + return this.libraryField; + } + set + { + this.libraryFieldSet = true; + this.libraryField = value; + } + } + + /// + /// Function entry point in to the Library DLL called when opening the performance counter. The default is "OpenPerformanceData" which should be used for all managed code performance counters. + /// + public string Open + { + get + { + return this.openField; + } + set + { + this.openFieldSet = true; + this.openField = value; + } + } + + /// + /// Function entry point in to the Library DLL called when closing the performance counter. The default is "ClosePerformanceData" which should be used for all managed code performance counters. + /// + public string Close + { + get + { + return this.closeField; + } + set + { + this.closeFieldSet = true; + this.closeField = value; + } + } + + /// + /// Function entry point in to the Library DLL called when collecting data from the performance counter. The default is "CollectPerformanceData" which should be used for all managed code performance counters. + /// + public string Collect + { + get + { + return this.collectField; + } + set + { + this.collectFieldSet = true; + this.collectField = value; + } + } + + /// + /// Default language for the performance category and contained counters' names and help text. + /// + public PerformanceCounterLanguageType DefaultLanguage + { + get + { + return this.defaultLanguageField; + } + set + { + this.defaultLanguageFieldSet = true; + this.defaultLanguageField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + public virtual void AddChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.AddElement(child); + child.ParentElement = this; + } + + public virtual void RemoveChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.RemoveElement(child); + child.ParentElement = null; + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + ISchemaElement ICreateChildren.CreateChild(string childName) + { + if (String.IsNullOrEmpty(childName)) + { + throw new ArgumentNullException("childName"); + } + ISchemaElement childValue = null; + if (("PerformanceCounter" == childName)) + { + childValue = new PerformanceCounter(); + } + if ((null == childValue)) + { + throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); + } + return childValue; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("PerformanceCategory", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.helpFieldSet) + { + writer.WriteAttributeString("Help", this.helpField); + } + if (this.multiInstanceFieldSet) + { + if ((this.multiInstanceField == YesNoType.no)) + { + writer.WriteAttributeString("MultiInstance", "no"); + } + if ((this.multiInstanceField == YesNoType.yes)) + { + writer.WriteAttributeString("MultiInstance", "yes"); + } + } + if (this.libraryFieldSet) + { + writer.WriteAttributeString("Library", this.libraryField); + } + if (this.openFieldSet) + { + writer.WriteAttributeString("Open", this.openField); + } + if (this.closeFieldSet) + { + writer.WriteAttributeString("Close", this.closeField); + } + if (this.collectFieldSet) + { + writer.WriteAttributeString("Collect", this.collectField); + } + if (this.defaultLanguageFieldSet) + { + if ((this.defaultLanguageField == PerformanceCounterLanguageType.afrikaans)) + { + writer.WriteAttributeString("DefaultLanguage", "afrikaans"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.albanian)) + { + writer.WriteAttributeString("DefaultLanguage", "albanian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.arabic)) + { + writer.WriteAttributeString("DefaultLanguage", "arabic"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.armenian)) + { + writer.WriteAttributeString("DefaultLanguage", "armenian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.assamese)) + { + writer.WriteAttributeString("DefaultLanguage", "assamese"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.azeri)) + { + writer.WriteAttributeString("DefaultLanguage", "azeri"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.basque)) + { + writer.WriteAttributeString("DefaultLanguage", "basque"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.belarusian)) + { + writer.WriteAttributeString("DefaultLanguage", "belarusian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.bengali)) + { + writer.WriteAttributeString("DefaultLanguage", "bengali"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.bulgarian)) + { + writer.WriteAttributeString("DefaultLanguage", "bulgarian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.catalan)) + { + writer.WriteAttributeString("DefaultLanguage", "catalan"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.chinese)) + { + writer.WriteAttributeString("DefaultLanguage", "chinese"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.croatian)) + { + writer.WriteAttributeString("DefaultLanguage", "croatian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.czech)) + { + writer.WriteAttributeString("DefaultLanguage", "czech"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.danish)) + { + writer.WriteAttributeString("DefaultLanguage", "danish"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.divehi)) + { + writer.WriteAttributeString("DefaultLanguage", "divehi"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.dutch)) + { + writer.WriteAttributeString("DefaultLanguage", "dutch"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.english)) + { + writer.WriteAttributeString("DefaultLanguage", "english"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.estonian)) + { + writer.WriteAttributeString("DefaultLanguage", "estonian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.faeroese)) + { + writer.WriteAttributeString("DefaultLanguage", "faeroese"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.farsi)) + { + writer.WriteAttributeString("DefaultLanguage", "farsi"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.finnish)) + { + writer.WriteAttributeString("DefaultLanguage", "finnish"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.french)) + { + writer.WriteAttributeString("DefaultLanguage", "french"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.galician)) + { + writer.WriteAttributeString("DefaultLanguage", "galician"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.georgian)) + { + writer.WriteAttributeString("DefaultLanguage", "georgian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.german)) + { + writer.WriteAttributeString("DefaultLanguage", "german"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.greek)) + { + writer.WriteAttributeString("DefaultLanguage", "greek"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.gujarati)) + { + writer.WriteAttributeString("DefaultLanguage", "gujarati"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.hebrew)) + { + writer.WriteAttributeString("DefaultLanguage", "hebrew"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.hindi)) + { + writer.WriteAttributeString("DefaultLanguage", "hindi"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.hungarian)) + { + writer.WriteAttributeString("DefaultLanguage", "hungarian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.icelandic)) + { + writer.WriteAttributeString("DefaultLanguage", "icelandic"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.indonesian)) + { + writer.WriteAttributeString("DefaultLanguage", "indonesian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.italian)) + { + writer.WriteAttributeString("DefaultLanguage", "italian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.japanese)) + { + writer.WriteAttributeString("DefaultLanguage", "japanese"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.kannada)) + { + writer.WriteAttributeString("DefaultLanguage", "kannada"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.kashmiri)) + { + writer.WriteAttributeString("DefaultLanguage", "kashmiri"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.kazak)) + { + writer.WriteAttributeString("DefaultLanguage", "kazak"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.konkani)) + { + writer.WriteAttributeString("DefaultLanguage", "konkani"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.korean)) + { + writer.WriteAttributeString("DefaultLanguage", "korean"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.kyrgyz)) + { + writer.WriteAttributeString("DefaultLanguage", "kyrgyz"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.latvian)) + { + writer.WriteAttributeString("DefaultLanguage", "latvian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.lithuanian)) + { + writer.WriteAttributeString("DefaultLanguage", "lithuanian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.macedonian)) + { + writer.WriteAttributeString("DefaultLanguage", "macedonian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.malay)) + { + writer.WriteAttributeString("DefaultLanguage", "malay"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.malayalam)) + { + writer.WriteAttributeString("DefaultLanguage", "malayalam"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.manipuri)) + { + writer.WriteAttributeString("DefaultLanguage", "manipuri"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.marathi)) + { + writer.WriteAttributeString("DefaultLanguage", "marathi"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.mongolian)) + { + writer.WriteAttributeString("DefaultLanguage", "mongolian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.nepali)) + { + writer.WriteAttributeString("DefaultLanguage", "nepali"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.norwegian)) + { + writer.WriteAttributeString("DefaultLanguage", "norwegian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.oriya)) + { + writer.WriteAttributeString("DefaultLanguage", "oriya"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.polish)) + { + writer.WriteAttributeString("DefaultLanguage", "polish"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.portuguese)) + { + writer.WriteAttributeString("DefaultLanguage", "portuguese"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.punjabi)) + { + writer.WriteAttributeString("DefaultLanguage", "punjabi"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.romanian)) + { + writer.WriteAttributeString("DefaultLanguage", "romanian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.russian)) + { + writer.WriteAttributeString("DefaultLanguage", "russian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.sanskrit)) + { + writer.WriteAttributeString("DefaultLanguage", "sanskrit"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.serbian)) + { + writer.WriteAttributeString("DefaultLanguage", "serbian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.sindhi)) + { + writer.WriteAttributeString("DefaultLanguage", "sindhi"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.slovak)) + { + writer.WriteAttributeString("DefaultLanguage", "slovak"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.slovenian)) + { + writer.WriteAttributeString("DefaultLanguage", "slovenian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.spanish)) + { + writer.WriteAttributeString("DefaultLanguage", "spanish"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.swahili)) + { + writer.WriteAttributeString("DefaultLanguage", "swahili"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.swedish)) + { + writer.WriteAttributeString("DefaultLanguage", "swedish"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.syriac)) + { + writer.WriteAttributeString("DefaultLanguage", "syriac"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.tamil)) + { + writer.WriteAttributeString("DefaultLanguage", "tamil"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.tatar)) + { + writer.WriteAttributeString("DefaultLanguage", "tatar"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.telugu)) + { + writer.WriteAttributeString("DefaultLanguage", "telugu"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.thai)) + { + writer.WriteAttributeString("DefaultLanguage", "thai"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.turkish)) + { + writer.WriteAttributeString("DefaultLanguage", "turkish"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.ukrainian)) + { + writer.WriteAttributeString("DefaultLanguage", "ukrainian"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.urdu)) + { + writer.WriteAttributeString("DefaultLanguage", "urdu"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.uzbek)) + { + writer.WriteAttributeString("DefaultLanguage", "uzbek"); + } + if ((this.defaultLanguageField == PerformanceCounterLanguageType.vietnamese)) + { + writer.WriteAttributeString("DefaultLanguage", "vietnamese"); + } + } + for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) + { + ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); + childElement.OutputXml(writer); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Help" == name)) + { + this.helpField = value; + this.helpFieldSet = true; + } + if (("MultiInstance" == name)) + { + this.multiInstanceField = Enums.ParseYesNoType(value); + this.multiInstanceFieldSet = true; + } + if (("Library" == name)) + { + this.libraryField = value; + this.libraryFieldSet = true; + } + if (("Open" == name)) + { + this.openField = value; + this.openFieldSet = true; + } + if (("Close" == name)) + { + this.closeField = value; + this.closeFieldSet = true; + } + if (("Collect" == name)) + { + this.collectField = value; + this.collectFieldSet = true; + } + if (("DefaultLanguage" == name)) + { + this.defaultLanguageField = Enums.ParsePerformanceCounterLanguageType(value); + this.defaultLanguageFieldSet = true; + } + } + } + + /// + /// Creates a performance counter in a performance category. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class PerformanceCounter : ISchemaElement, ISetAttributes + { + + private string nameField; + + private bool nameFieldSet; + + private string helpField; + + private bool helpFieldSet; + + private PerformanceCounterTypesType typeField; + + private bool typeFieldSet; + + private PerformanceCounterLanguageType languageField; + + private bool languageFieldSet; + + private ISchemaElement parentElement; + + /// + /// Name for the performance counter. + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// Optional help text for the performance counter. + /// + public string Help + { + get + { + return this.helpField; + } + set + { + this.helpFieldSet = true; + this.helpField = value; + } + } + + /// + /// Type of the performance counter. + /// + public PerformanceCounterTypesType Type + { + get + { + return this.typeField; + } + set + { + this.typeFieldSet = true; + this.typeField = value; + } + } + + /// + /// Language for the peformance counter name and help. The default is to use the parent PerformanceCategory element's DefaultLanguage attribute. + /// + public PerformanceCounterLanguageType Language + { + get + { + return this.languageField; + } + set + { + this.languageFieldSet = true; + this.languageField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("PerformanceCounter", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.helpFieldSet) + { + writer.WriteAttributeString("Help", this.helpField); + } + if (this.typeFieldSet) + { + if ((this.typeField == PerformanceCounterTypesType.averageBase)) + { + writer.WriteAttributeString("Type", "averageBase"); + } + if ((this.typeField == PerformanceCounterTypesType.averageCount64)) + { + writer.WriteAttributeString("Type", "averageCount64"); + } + if ((this.typeField == PerformanceCounterTypesType.averageTimer32)) + { + writer.WriteAttributeString("Type", "averageTimer32"); + } + if ((this.typeField == PerformanceCounterTypesType.counterDelta32)) + { + writer.WriteAttributeString("Type", "counterDelta32"); + } + if ((this.typeField == PerformanceCounterTypesType.counterTimerInverse)) + { + writer.WriteAttributeString("Type", "counterTimerInverse"); + } + if ((this.typeField == PerformanceCounterTypesType.sampleFraction)) + { + writer.WriteAttributeString("Type", "sampleFraction"); + } + if ((this.typeField == PerformanceCounterTypesType.timer100Ns)) + { + writer.WriteAttributeString("Type", "timer100Ns"); + } + if ((this.typeField == PerformanceCounterTypesType.counterTimer)) + { + writer.WriteAttributeString("Type", "counterTimer"); + } + if ((this.typeField == PerformanceCounterTypesType.rawFraction)) + { + writer.WriteAttributeString("Type", "rawFraction"); + } + if ((this.typeField == PerformanceCounterTypesType.timer100NsInverse)) + { + writer.WriteAttributeString("Type", "timer100NsInverse"); + } + if ((this.typeField == PerformanceCounterTypesType.counterMultiTimer)) + { + writer.WriteAttributeString("Type", "counterMultiTimer"); + } + if ((this.typeField == PerformanceCounterTypesType.counterMultiTimer100Ns)) + { + writer.WriteAttributeString("Type", "counterMultiTimer100Ns"); + } + if ((this.typeField == PerformanceCounterTypesType.counterMultiTimerInverse)) + { + writer.WriteAttributeString("Type", "counterMultiTimerInverse"); + } + if ((this.typeField == PerformanceCounterTypesType.counterMultiTimer100NsInverse)) + { + writer.WriteAttributeString("Type", "counterMultiTimer100NsInverse"); + } + if ((this.typeField == PerformanceCounterTypesType.elapsedTime)) + { + writer.WriteAttributeString("Type", "elapsedTime"); + } + if ((this.typeField == PerformanceCounterTypesType.sampleBase)) + { + writer.WriteAttributeString("Type", "sampleBase"); + } + if ((this.typeField == PerformanceCounterTypesType.rawBase)) + { + writer.WriteAttributeString("Type", "rawBase"); + } + if ((this.typeField == PerformanceCounterTypesType.counterMultiBase)) + { + writer.WriteAttributeString("Type", "counterMultiBase"); + } + if ((this.typeField == PerformanceCounterTypesType.rateOfCountsPerSecond64)) + { + writer.WriteAttributeString("Type", "rateOfCountsPerSecond64"); + } + if ((this.typeField == PerformanceCounterTypesType.rateOfCountsPerSecond32)) + { + writer.WriteAttributeString("Type", "rateOfCountsPerSecond32"); + } + if ((this.typeField == PerformanceCounterTypesType.countPerTimeInterval64)) + { + writer.WriteAttributeString("Type", "countPerTimeInterval64"); + } + if ((this.typeField == PerformanceCounterTypesType.countPerTimeInterval32)) + { + writer.WriteAttributeString("Type", "countPerTimeInterval32"); + } + if ((this.typeField == PerformanceCounterTypesType.sampleCounter)) + { + writer.WriteAttributeString("Type", "sampleCounter"); + } + if ((this.typeField == PerformanceCounterTypesType.counterDelta64)) + { + writer.WriteAttributeString("Type", "counterDelta64"); + } + if ((this.typeField == PerformanceCounterTypesType.numberOfItems64)) + { + writer.WriteAttributeString("Type", "numberOfItems64"); + } + if ((this.typeField == PerformanceCounterTypesType.numberOfItems32)) + { + writer.WriteAttributeString("Type", "numberOfItems32"); + } + if ((this.typeField == PerformanceCounterTypesType.numberOfItemsHEX64)) + { + writer.WriteAttributeString("Type", "numberOfItemsHEX64"); + } + if ((this.typeField == PerformanceCounterTypesType.numberOfItemsHEX32)) + { + writer.WriteAttributeString("Type", "numberOfItemsHEX32"); + } + } + if (this.languageFieldSet) + { + if ((this.languageField == PerformanceCounterLanguageType.afrikaans)) + { + writer.WriteAttributeString("Language", "afrikaans"); + } + if ((this.languageField == PerformanceCounterLanguageType.albanian)) + { + writer.WriteAttributeString("Language", "albanian"); + } + if ((this.languageField == PerformanceCounterLanguageType.arabic)) + { + writer.WriteAttributeString("Language", "arabic"); + } + if ((this.languageField == PerformanceCounterLanguageType.armenian)) + { + writer.WriteAttributeString("Language", "armenian"); + } + if ((this.languageField == PerformanceCounterLanguageType.assamese)) + { + writer.WriteAttributeString("Language", "assamese"); + } + if ((this.languageField == PerformanceCounterLanguageType.azeri)) + { + writer.WriteAttributeString("Language", "azeri"); + } + if ((this.languageField == PerformanceCounterLanguageType.basque)) + { + writer.WriteAttributeString("Language", "basque"); + } + if ((this.languageField == PerformanceCounterLanguageType.belarusian)) + { + writer.WriteAttributeString("Language", "belarusian"); + } + if ((this.languageField == PerformanceCounterLanguageType.bengali)) + { + writer.WriteAttributeString("Language", "bengali"); + } + if ((this.languageField == PerformanceCounterLanguageType.bulgarian)) + { + writer.WriteAttributeString("Language", "bulgarian"); + } + if ((this.languageField == PerformanceCounterLanguageType.catalan)) + { + writer.WriteAttributeString("Language", "catalan"); + } + if ((this.languageField == PerformanceCounterLanguageType.chinese)) + { + writer.WriteAttributeString("Language", "chinese"); + } + if ((this.languageField == PerformanceCounterLanguageType.croatian)) + { + writer.WriteAttributeString("Language", "croatian"); + } + if ((this.languageField == PerformanceCounterLanguageType.czech)) + { + writer.WriteAttributeString("Language", "czech"); + } + if ((this.languageField == PerformanceCounterLanguageType.danish)) + { + writer.WriteAttributeString("Language", "danish"); + } + if ((this.languageField == PerformanceCounterLanguageType.divehi)) + { + writer.WriteAttributeString("Language", "divehi"); + } + if ((this.languageField == PerformanceCounterLanguageType.dutch)) + { + writer.WriteAttributeString("Language", "dutch"); + } + if ((this.languageField == PerformanceCounterLanguageType.english)) + { + writer.WriteAttributeString("Language", "english"); + } + if ((this.languageField == PerformanceCounterLanguageType.estonian)) + { + writer.WriteAttributeString("Language", "estonian"); + } + if ((this.languageField == PerformanceCounterLanguageType.faeroese)) + { + writer.WriteAttributeString("Language", "faeroese"); + } + if ((this.languageField == PerformanceCounterLanguageType.farsi)) + { + writer.WriteAttributeString("Language", "farsi"); + } + if ((this.languageField == PerformanceCounterLanguageType.finnish)) + { + writer.WriteAttributeString("Language", "finnish"); + } + if ((this.languageField == PerformanceCounterLanguageType.french)) + { + writer.WriteAttributeString("Language", "french"); + } + if ((this.languageField == PerformanceCounterLanguageType.galician)) + { + writer.WriteAttributeString("Language", "galician"); + } + if ((this.languageField == PerformanceCounterLanguageType.georgian)) + { + writer.WriteAttributeString("Language", "georgian"); + } + if ((this.languageField == PerformanceCounterLanguageType.german)) + { + writer.WriteAttributeString("Language", "german"); + } + if ((this.languageField == PerformanceCounterLanguageType.greek)) + { + writer.WriteAttributeString("Language", "greek"); + } + if ((this.languageField == PerformanceCounterLanguageType.gujarati)) + { + writer.WriteAttributeString("Language", "gujarati"); + } + if ((this.languageField == PerformanceCounterLanguageType.hebrew)) + { + writer.WriteAttributeString("Language", "hebrew"); + } + if ((this.languageField == PerformanceCounterLanguageType.hindi)) + { + writer.WriteAttributeString("Language", "hindi"); + } + if ((this.languageField == PerformanceCounterLanguageType.hungarian)) + { + writer.WriteAttributeString("Language", "hungarian"); + } + if ((this.languageField == PerformanceCounterLanguageType.icelandic)) + { + writer.WriteAttributeString("Language", "icelandic"); + } + if ((this.languageField == PerformanceCounterLanguageType.indonesian)) + { + writer.WriteAttributeString("Language", "indonesian"); + } + if ((this.languageField == PerformanceCounterLanguageType.italian)) + { + writer.WriteAttributeString("Language", "italian"); + } + if ((this.languageField == PerformanceCounterLanguageType.japanese)) + { + writer.WriteAttributeString("Language", "japanese"); + } + if ((this.languageField == PerformanceCounterLanguageType.kannada)) + { + writer.WriteAttributeString("Language", "kannada"); + } + if ((this.languageField == PerformanceCounterLanguageType.kashmiri)) + { + writer.WriteAttributeString("Language", "kashmiri"); + } + if ((this.languageField == PerformanceCounterLanguageType.kazak)) + { + writer.WriteAttributeString("Language", "kazak"); + } + if ((this.languageField == PerformanceCounterLanguageType.konkani)) + { + writer.WriteAttributeString("Language", "konkani"); + } + if ((this.languageField == PerformanceCounterLanguageType.korean)) + { + writer.WriteAttributeString("Language", "korean"); + } + if ((this.languageField == PerformanceCounterLanguageType.kyrgyz)) + { + writer.WriteAttributeString("Language", "kyrgyz"); + } + if ((this.languageField == PerformanceCounterLanguageType.latvian)) + { + writer.WriteAttributeString("Language", "latvian"); + } + if ((this.languageField == PerformanceCounterLanguageType.lithuanian)) + { + writer.WriteAttributeString("Language", "lithuanian"); + } + if ((this.languageField == PerformanceCounterLanguageType.macedonian)) + { + writer.WriteAttributeString("Language", "macedonian"); + } + if ((this.languageField == PerformanceCounterLanguageType.malay)) + { + writer.WriteAttributeString("Language", "malay"); + } + if ((this.languageField == PerformanceCounterLanguageType.malayalam)) + { + writer.WriteAttributeString("Language", "malayalam"); + } + if ((this.languageField == PerformanceCounterLanguageType.manipuri)) + { + writer.WriteAttributeString("Language", "manipuri"); + } + if ((this.languageField == PerformanceCounterLanguageType.marathi)) + { + writer.WriteAttributeString("Language", "marathi"); + } + if ((this.languageField == PerformanceCounterLanguageType.mongolian)) + { + writer.WriteAttributeString("Language", "mongolian"); + } + if ((this.languageField == PerformanceCounterLanguageType.nepali)) + { + writer.WriteAttributeString("Language", "nepali"); + } + if ((this.languageField == PerformanceCounterLanguageType.norwegian)) + { + writer.WriteAttributeString("Language", "norwegian"); + } + if ((this.languageField == PerformanceCounterLanguageType.oriya)) + { + writer.WriteAttributeString("Language", "oriya"); + } + if ((this.languageField == PerformanceCounterLanguageType.polish)) + { + writer.WriteAttributeString("Language", "polish"); + } + if ((this.languageField == PerformanceCounterLanguageType.portuguese)) + { + writer.WriteAttributeString("Language", "portuguese"); + } + if ((this.languageField == PerformanceCounterLanguageType.punjabi)) + { + writer.WriteAttributeString("Language", "punjabi"); + } + if ((this.languageField == PerformanceCounterLanguageType.romanian)) + { + writer.WriteAttributeString("Language", "romanian"); + } + if ((this.languageField == PerformanceCounterLanguageType.russian)) + { + writer.WriteAttributeString("Language", "russian"); + } + if ((this.languageField == PerformanceCounterLanguageType.sanskrit)) + { + writer.WriteAttributeString("Language", "sanskrit"); + } + if ((this.languageField == PerformanceCounterLanguageType.serbian)) + { + writer.WriteAttributeString("Language", "serbian"); + } + if ((this.languageField == PerformanceCounterLanguageType.sindhi)) + { + writer.WriteAttributeString("Language", "sindhi"); + } + if ((this.languageField == PerformanceCounterLanguageType.slovak)) + { + writer.WriteAttributeString("Language", "slovak"); + } + if ((this.languageField == PerformanceCounterLanguageType.slovenian)) + { + writer.WriteAttributeString("Language", "slovenian"); + } + if ((this.languageField == PerformanceCounterLanguageType.spanish)) + { + writer.WriteAttributeString("Language", "spanish"); + } + if ((this.languageField == PerformanceCounterLanguageType.swahili)) + { + writer.WriteAttributeString("Language", "swahili"); + } + if ((this.languageField == PerformanceCounterLanguageType.swedish)) + { + writer.WriteAttributeString("Language", "swedish"); + } + if ((this.languageField == PerformanceCounterLanguageType.syriac)) + { + writer.WriteAttributeString("Language", "syriac"); + } + if ((this.languageField == PerformanceCounterLanguageType.tamil)) + { + writer.WriteAttributeString("Language", "tamil"); + } + if ((this.languageField == PerformanceCounterLanguageType.tatar)) + { + writer.WriteAttributeString("Language", "tatar"); + } + if ((this.languageField == PerformanceCounterLanguageType.telugu)) + { + writer.WriteAttributeString("Language", "telugu"); + } + if ((this.languageField == PerformanceCounterLanguageType.thai)) + { + writer.WriteAttributeString("Language", "thai"); + } + if ((this.languageField == PerformanceCounterLanguageType.turkish)) + { + writer.WriteAttributeString("Language", "turkish"); + } + if ((this.languageField == PerformanceCounterLanguageType.ukrainian)) + { + writer.WriteAttributeString("Language", "ukrainian"); + } + if ((this.languageField == PerformanceCounterLanguageType.urdu)) + { + writer.WriteAttributeString("Language", "urdu"); + } + if ((this.languageField == PerformanceCounterLanguageType.uzbek)) + { + writer.WriteAttributeString("Language", "uzbek"); + } + if ((this.languageField == PerformanceCounterLanguageType.vietnamese)) + { + writer.WriteAttributeString("Language", "vietnamese"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Help" == name)) + { + this.helpField = value; + this.helpFieldSet = true; + } + if (("Type" == name)) + { + this.typeField = Enums.ParsePerformanceCounterTypesType(value); + this.typeFieldSet = true; + } + if (("Language" == name)) + { + this.languageField = Enums.ParsePerformanceCounterLanguageType(value); + this.languageFieldSet = true; + } + } + } + + /// + /// Used to install Perfmon counters. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class PerfCounter : ISchemaElement, ISetAttributes + { + + private string nameField; + + private bool nameFieldSet; + + private ISchemaElement parentElement; + + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("PerfCounter", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + } + } + + /// + /// Used to install Perfmon Counter Manifests. + /// Note that this functionality cannot be used with major upgrades that are scheduled after the InstallExecute, + /// InstallExecuteAgain, or InstallFinalize actions. For more information on major upgrade scheduling, see + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class PerfCounterManifest : ISchemaElement, ISetAttributes + { + + private string resourceFileDirectoryField; + + private bool resourceFileDirectoryFieldSet; + + private ISchemaElement parentElement; + + /// + /// The directory that holds the resource file of the providers in the perfmon counter manifest. Often the resource file path cannot be determined until setup time. Put the directory here and during perfmon manifest registrtion the path will be updated in the registry. If not specified, Perfmon will look for the resource file in the same directory of the perfmon counter manifest file. + /// + public string ResourceFileDirectory + { + get + { + return this.resourceFileDirectoryField; + } + set + { + this.resourceFileDirectoryFieldSet = true; + this.resourceFileDirectoryField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("PerfCounterManifest", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.resourceFileDirectoryFieldSet) + { + writer.WriteAttributeString("ResourceFileDirectory", this.resourceFileDirectoryField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("ResourceFileDirectory" == name)) + { + this.resourceFileDirectoryField = value; + this.resourceFileDirectoryFieldSet = true; + } + } + } + + /// + /// Used to install Event Manifests. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class EventManifest : ISchemaElement, ISetAttributes + { + + private string messageFileField; + + private bool messageFileFieldSet; + + private string parameterFileField; + + private bool parameterFileFieldSet; + + private string resourceFileField; + + private bool resourceFileFieldSet; + + private ISchemaElement parentElement; + + /// + /// The message file (including path) of all the providers in the event manifest. Often the message file path cannot be determined until setup time. Put your MessageFile here and the messageFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. + /// + public string MessageFile + { + get + { + return this.messageFileField; + } + set + { + this.messageFileFieldSet = true; + this.messageFileField = value; + } + } + + /// + /// The parameter file (including path) of all the providers in the event manifest. Often the parameter file path cannot be determined until setup time. Put your ParameterFile here and the parameterFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. + /// + public string ParameterFile + { + get + { + return this.parameterFileField; + } + set + { + this.parameterFileFieldSet = true; + this.parameterFileField = value; + } + } + + /// + /// The resource file (including path) of all the providers in the event manifest. Often the resource file path cannot be determined until setup time. Put your ResourceFile here and the resourceFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. + /// + public string ResourceFile + { + get + { + return this.resourceFileField; + } + set + { + this.resourceFileFieldSet = true; + this.resourceFileField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("EventManifest", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.messageFileFieldSet) + { + writer.WriteAttributeString("MessageFile", this.messageFileField); + } + if (this.parameterFileFieldSet) + { + writer.WriteAttributeString("ParameterFile", this.parameterFileField); + } + if (this.resourceFileFieldSet) + { + writer.WriteAttributeString("ResourceFile", this.resourceFileField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("MessageFile" == name)) + { + this.messageFileField = value; + this.messageFileFieldSet = true; + } + if (("ParameterFile" == name)) + { + this.parameterFileField = value; + this.parameterFileFieldSet = true; + } + if (("ResourceFile" == name)) + { + this.resourceFileField = value; + this.resourceFileFieldSet = true; + } + } + } + + /// + /// Sets ACLs on File, Registry, CreateFolder, or ServiceInstall. When under a Registry element, this cannot be used + /// if the Action attribute's value is remove or removeKeyOnInstall. This element has no Id attribute. + /// The table and key are taken from the parent element. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class PermissionEx : ISchemaElement, ISetAttributes + { + + private string domainField; + + private bool domainFieldSet; + + private string userField; + + private bool userFieldSet; + + private YesNoType readField; + + private bool readFieldSet; + + private YesNoType deleteField; + + private bool deleteFieldSet; + + private YesNoType readPermissionField; + + private bool readPermissionFieldSet; + + private YesNoType changePermissionField; + + private bool changePermissionFieldSet; + + private YesNoType takeOwnershipField; + + private bool takeOwnershipFieldSet; + + private YesNoType readAttributesField; + + private bool readAttributesFieldSet; + + private YesNoType writeAttributesField; + + private bool writeAttributesFieldSet; + + private YesNoType readExtendedAttributesField; + + private bool readExtendedAttributesFieldSet; + + private YesNoType writeExtendedAttributesField; + + private bool writeExtendedAttributesFieldSet; + + private YesNoType synchronizeField; + + private bool synchronizeFieldSet; + + private YesNoType createFileField; + + private bool createFileFieldSet; + + private YesNoType createChildField; + + private bool createChildFieldSet; + + private YesNoType deleteChildField; + + private bool deleteChildFieldSet; + + private YesNoType traverseField; + + private bool traverseFieldSet; + + private YesNoType appendField; + + private bool appendFieldSet; + + private YesNoType executeField; + + private bool executeFieldSet; + + private YesNoType writeField; + + private bool writeFieldSet; + + private YesNoType createSubkeysField; + + private bool createSubkeysFieldSet; + + private YesNoType enumerateSubkeysField; + + private bool enumerateSubkeysFieldSet; + + private YesNoType notifyField; + + private bool notifyFieldSet; + + private YesNoType createLinkField; + + private bool createLinkFieldSet; + + private YesNoType genericAllField; + + private bool genericAllFieldSet; + + private YesNoType genericExecuteField; + + private bool genericExecuteFieldSet; + + private YesNoType genericWriteField; + + private bool genericWriteFieldSet; + + private YesNoType genericReadField; + + private bool genericReadFieldSet; + + private YesNoType serviceQueryConfigField; + + private bool serviceQueryConfigFieldSet; + + private YesNoType serviceChangeConfigField; + + private bool serviceChangeConfigFieldSet; + + private YesNoType serviceQueryStatusField; + + private bool serviceQueryStatusFieldSet; + + private YesNoType serviceEnumerateDependentsField; + + private bool serviceEnumerateDependentsFieldSet; + + private YesNoType serviceStartField; + + private bool serviceStartFieldSet; + + private YesNoType serviceStopField; + + private bool serviceStopFieldSet; + + private YesNoType servicePauseContinueField; + + private bool servicePauseContinueFieldSet; + + private YesNoType serviceInterrogateField; + + private bool serviceInterrogateFieldSet; + + private YesNoType serviceUserDefinedControlField; + + private bool serviceUserDefinedControlFieldSet; + + private ISchemaElement parentElement; + + public string Domain + { + get + { + return this.domainField; + } + set + { + this.domainFieldSet = true; + this.domainField = value; + } + } + + public string User + { + get + { + return this.userField; + } + set + { + this.userFieldSet = true; + this.userField = value; + } + } + + public YesNoType Read + { + get + { + return this.readField; + } + set + { + this.readFieldSet = true; + this.readField = value; + } + } + + public YesNoType Delete + { + get + { + return this.deleteField; + } + set + { + this.deleteFieldSet = true; + this.deleteField = value; + } + } + + public YesNoType ReadPermission + { + get + { + return this.readPermissionField; + } + set + { + this.readPermissionFieldSet = true; + this.readPermissionField = value; + } + } + + public YesNoType ChangePermission + { + get + { + return this.changePermissionField; + } + set + { + this.changePermissionFieldSet = true; + this.changePermissionField = value; + } + } + + public YesNoType TakeOwnership + { + get + { + return this.takeOwnershipField; + } + set + { + this.takeOwnershipFieldSet = true; + this.takeOwnershipField = value; + } + } + + public YesNoType ReadAttributes + { + get + { + return this.readAttributesField; + } + set + { + this.readAttributesFieldSet = true; + this.readAttributesField = value; + } + } + + public YesNoType WriteAttributes + { + get + { + return this.writeAttributesField; + } + set + { + this.writeAttributesFieldSet = true; + this.writeAttributesField = value; + } + } + + public YesNoType ReadExtendedAttributes + { + get + { + return this.readExtendedAttributesField; + } + set + { + this.readExtendedAttributesFieldSet = true; + this.readExtendedAttributesField = value; + } + } + + public YesNoType WriteExtendedAttributes + { + get + { + return this.writeExtendedAttributesField; + } + set + { + this.writeExtendedAttributesFieldSet = true; + this.writeExtendedAttributesField = value; + } + } + + public YesNoType Synchronize + { + get + { + return this.synchronizeField; + } + set + { + this.synchronizeFieldSet = true; + this.synchronizeField = value; + } + } + + /// + /// For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. + /// + public YesNoType CreateFile + { + get + { + return this.createFileField; + } + set + { + this.createFileFieldSet = true; + this.createFileField = value; + } + } + + /// + /// For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. + /// + public YesNoType CreateChild + { + get + { + return this.createChildField; + } + set + { + this.createChildFieldSet = true; + this.createChildField = value; + } + } + + /// + /// For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. + /// + public YesNoType DeleteChild + { + get + { + return this.deleteChildField; + } + set + { + this.deleteChildFieldSet = true; + this.deleteChildField = value; + } + } + + /// + /// For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. + /// + public YesNoType Traverse + { + get + { + return this.traverseField; + } + set + { + this.traverseFieldSet = true; + this.traverseField = value; + } + } + + public YesNoType Append + { + get + { + return this.appendField; + } + set + { + this.appendFieldSet = true; + this.appendField = value; + } + } + + public YesNoType Execute + { + get + { + return this.executeField; + } + set + { + this.executeFieldSet = true; + this.executeField = value; + } + } + + public YesNoType Write + { + get + { + return this.writeField; + } + set + { + this.writeFieldSet = true; + this.writeField = value; + } + } + + public YesNoType CreateSubkeys + { + get + { + return this.createSubkeysField; + } + set + { + this.createSubkeysFieldSet = true; + this.createSubkeysField = value; + } + } + + public YesNoType EnumerateSubkeys + { + get + { + return this.enumerateSubkeysField; + } + set + { + this.enumerateSubkeysFieldSet = true; + this.enumerateSubkeysField = value; + } + } + + public YesNoType Notify + { + get + { + return this.notifyField; + } + set + { + this.notifyFieldSet = true; + this.notifyField = value; + } + } + + public YesNoType CreateLink + { + get + { + return this.createLinkField; + } + set + { + this.createLinkFieldSet = true; + this.createLinkField = value; + } + } + + public YesNoType GenericAll + { + get + { + return this.genericAllField; + } + set + { + this.genericAllFieldSet = true; + this.genericAllField = value; + } + } + + public YesNoType GenericExecute + { + get + { + return this.genericExecuteField; + } + set + { + this.genericExecuteFieldSet = true; + this.genericExecuteField = value; + } + } + + public YesNoType GenericWrite + { + get + { + return this.genericWriteField; + } + set + { + this.genericWriteFieldSet = true; + this.genericWriteField = value; + } + } + + /// + /// specifying this will fail to grant read access + /// + public YesNoType GenericRead + { + get + { + return this.genericReadField; + } + set + { + this.genericReadFieldSet = true; + this.genericReadField = value; + } + } + + /// + /// Required to call the QueryServiceConfig and QueryServiceConfig2 functions to query the service configuration. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceQueryConfig + { + get + { + return this.serviceQueryConfigField; + } + set + { + this.serviceQueryConfigFieldSet = true; + this.serviceQueryConfigField = value; + } + } + + /// + /// Required to call the ChangeServiceConfig or ChangeServiceConfig2 function to change the service configuration. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceChangeConfig + { + get + { + return this.serviceChangeConfigField; + } + set + { + this.serviceChangeConfigFieldSet = true; + this.serviceChangeConfigField = value; + } + } + + /// + /// Required to call the QueryServiceStatus function to ask the service control manager about the status of the service. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceQueryStatus + { + get + { + return this.serviceQueryStatusField; + } + set + { + this.serviceQueryStatusFieldSet = true; + this.serviceQueryStatusField = value; + } + } + + /// + /// Required to call the EnumDependentServices function to enumerate all the services dependent on the service. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceEnumerateDependents + { + get + { + return this.serviceEnumerateDependentsField; + } + set + { + this.serviceEnumerateDependentsFieldSet = true; + this.serviceEnumerateDependentsField = value; + } + } + + /// + /// Required to call the StartService function to start the service. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceStart + { + get + { + return this.serviceStartField; + } + set + { + this.serviceStartFieldSet = true; + this.serviceStartField = value; + } + } + + /// + /// Required to call the ControlService function to stop the service. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceStop + { + get + { + return this.serviceStopField; + } + set + { + this.serviceStopFieldSet = true; + this.serviceStopField = value; + } + } + + /// + /// Required to call the ControlService function to pause or continue the service. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServicePauseContinue + { + get + { + return this.servicePauseContinueField; + } + set + { + this.servicePauseContinueFieldSet = true; + this.servicePauseContinueField = value; + } + } + + /// + /// Required to call the ControlService function to ask the service to report its status immediately. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceInterrogate + { + get + { + return this.serviceInterrogateField; + } + set + { + this.serviceInterrogateFieldSet = true; + this.serviceInterrogateField = value; + } + } + + /// + /// Required to call the ControlService function to specify a user-defined control code. Only valid under a 'ServiceInstall' parent. + /// + public YesNoType ServiceUserDefinedControl + { + get + { + return this.serviceUserDefinedControlField; + } + set + { + this.serviceUserDefinedControlFieldSet = true; + this.serviceUserDefinedControlField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("PermissionEx", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.domainFieldSet) + { + writer.WriteAttributeString("Domain", this.domainField); + } + if (this.userFieldSet) + { + writer.WriteAttributeString("User", this.userField); + } + if (this.readFieldSet) + { + if ((this.readField == YesNoType.no)) + { + writer.WriteAttributeString("Read", "no"); + } + if ((this.readField == YesNoType.yes)) + { + writer.WriteAttributeString("Read", "yes"); + } + } + if (this.deleteFieldSet) + { + if ((this.deleteField == YesNoType.no)) + { + writer.WriteAttributeString("Delete", "no"); + } + if ((this.deleteField == YesNoType.yes)) + { + writer.WriteAttributeString("Delete", "yes"); + } + } + if (this.readPermissionFieldSet) + { + if ((this.readPermissionField == YesNoType.no)) + { + writer.WriteAttributeString("ReadPermission", "no"); + } + if ((this.readPermissionField == YesNoType.yes)) + { + writer.WriteAttributeString("ReadPermission", "yes"); + } + } + if (this.changePermissionFieldSet) + { + if ((this.changePermissionField == YesNoType.no)) + { + writer.WriteAttributeString("ChangePermission", "no"); + } + if ((this.changePermissionField == YesNoType.yes)) + { + writer.WriteAttributeString("ChangePermission", "yes"); + } + } + if (this.takeOwnershipFieldSet) + { + if ((this.takeOwnershipField == YesNoType.no)) + { + writer.WriteAttributeString("TakeOwnership", "no"); + } + if ((this.takeOwnershipField == YesNoType.yes)) + { + writer.WriteAttributeString("TakeOwnership", "yes"); + } + } + if (this.readAttributesFieldSet) + { + if ((this.readAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("ReadAttributes", "no"); + } + if ((this.readAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("ReadAttributes", "yes"); + } + } + if (this.writeAttributesFieldSet) + { + if ((this.writeAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("WriteAttributes", "no"); + } + if ((this.writeAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("WriteAttributes", "yes"); + } + } + if (this.readExtendedAttributesFieldSet) + { + if ((this.readExtendedAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("ReadExtendedAttributes", "no"); + } + if ((this.readExtendedAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("ReadExtendedAttributes", "yes"); + } + } + if (this.writeExtendedAttributesFieldSet) + { + if ((this.writeExtendedAttributesField == YesNoType.no)) + { + writer.WriteAttributeString("WriteExtendedAttributes", "no"); + } + if ((this.writeExtendedAttributesField == YesNoType.yes)) + { + writer.WriteAttributeString("WriteExtendedAttributes", "yes"); + } + } + if (this.synchronizeFieldSet) + { + if ((this.synchronizeField == YesNoType.no)) + { + writer.WriteAttributeString("Synchronize", "no"); + } + if ((this.synchronizeField == YesNoType.yes)) + { + writer.WriteAttributeString("Synchronize", "yes"); + } + } + if (this.createFileFieldSet) + { + if ((this.createFileField == YesNoType.no)) + { + writer.WriteAttributeString("CreateFile", "no"); + } + if ((this.createFileField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateFile", "yes"); + } + } + if (this.createChildFieldSet) + { + if ((this.createChildField == YesNoType.no)) + { + writer.WriteAttributeString("CreateChild", "no"); + } + if ((this.createChildField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateChild", "yes"); + } + } + if (this.deleteChildFieldSet) + { + if ((this.deleteChildField == YesNoType.no)) + { + writer.WriteAttributeString("DeleteChild", "no"); + } + if ((this.deleteChildField == YesNoType.yes)) + { + writer.WriteAttributeString("DeleteChild", "yes"); + } + } + if (this.traverseFieldSet) + { + if ((this.traverseField == YesNoType.no)) + { + writer.WriteAttributeString("Traverse", "no"); + } + if ((this.traverseField == YesNoType.yes)) + { + writer.WriteAttributeString("Traverse", "yes"); + } + } + if (this.appendFieldSet) + { + if ((this.appendField == YesNoType.no)) + { + writer.WriteAttributeString("Append", "no"); + } + if ((this.appendField == YesNoType.yes)) + { + writer.WriteAttributeString("Append", "yes"); + } + } + if (this.executeFieldSet) + { + if ((this.executeField == YesNoType.no)) + { + writer.WriteAttributeString("Execute", "no"); + } + if ((this.executeField == YesNoType.yes)) + { + writer.WriteAttributeString("Execute", "yes"); + } + } + if (this.writeFieldSet) + { + if ((this.writeField == YesNoType.no)) + { + writer.WriteAttributeString("Write", "no"); + } + if ((this.writeField == YesNoType.yes)) + { + writer.WriteAttributeString("Write", "yes"); + } + } + if (this.createSubkeysFieldSet) + { + if ((this.createSubkeysField == YesNoType.no)) + { + writer.WriteAttributeString("CreateSubkeys", "no"); + } + if ((this.createSubkeysField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateSubkeys", "yes"); + } + } + if (this.enumerateSubkeysFieldSet) + { + if ((this.enumerateSubkeysField == YesNoType.no)) + { + writer.WriteAttributeString("EnumerateSubkeys", "no"); + } + if ((this.enumerateSubkeysField == YesNoType.yes)) + { + writer.WriteAttributeString("EnumerateSubkeys", "yes"); + } + } + if (this.notifyFieldSet) + { + if ((this.notifyField == YesNoType.no)) + { + writer.WriteAttributeString("Notify", "no"); + } + if ((this.notifyField == YesNoType.yes)) + { + writer.WriteAttributeString("Notify", "yes"); + } + } + if (this.createLinkFieldSet) + { + if ((this.createLinkField == YesNoType.no)) + { + writer.WriteAttributeString("CreateLink", "no"); + } + if ((this.createLinkField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateLink", "yes"); + } + } + if (this.genericAllFieldSet) + { + if ((this.genericAllField == YesNoType.no)) + { + writer.WriteAttributeString("GenericAll", "no"); + } + if ((this.genericAllField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericAll", "yes"); + } + } + if (this.genericExecuteFieldSet) + { + if ((this.genericExecuteField == YesNoType.no)) + { + writer.WriteAttributeString("GenericExecute", "no"); + } + if ((this.genericExecuteField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericExecute", "yes"); + } + } + if (this.genericWriteFieldSet) + { + if ((this.genericWriteField == YesNoType.no)) + { + writer.WriteAttributeString("GenericWrite", "no"); + } + if ((this.genericWriteField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericWrite", "yes"); + } + } + if (this.genericReadFieldSet) + { + if ((this.genericReadField == YesNoType.no)) + { + writer.WriteAttributeString("GenericRead", "no"); + } + if ((this.genericReadField == YesNoType.yes)) + { + writer.WriteAttributeString("GenericRead", "yes"); + } + } + if (this.serviceQueryConfigFieldSet) + { + if ((this.serviceQueryConfigField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceQueryConfig", "no"); + } + if ((this.serviceQueryConfigField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceQueryConfig", "yes"); + } + } + if (this.serviceChangeConfigFieldSet) + { + if ((this.serviceChangeConfigField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceChangeConfig", "no"); + } + if ((this.serviceChangeConfigField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceChangeConfig", "yes"); + } + } + if (this.serviceQueryStatusFieldSet) + { + if ((this.serviceQueryStatusField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceQueryStatus", "no"); + } + if ((this.serviceQueryStatusField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceQueryStatus", "yes"); + } + } + if (this.serviceEnumerateDependentsFieldSet) + { + if ((this.serviceEnumerateDependentsField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceEnumerateDependents", "no"); + } + if ((this.serviceEnumerateDependentsField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceEnumerateDependents", "yes"); + } + } + if (this.serviceStartFieldSet) + { + if ((this.serviceStartField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceStart", "no"); + } + if ((this.serviceStartField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceStart", "yes"); + } + } + if (this.serviceStopFieldSet) + { + if ((this.serviceStopField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceStop", "no"); + } + if ((this.serviceStopField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceStop", "yes"); + } + } + if (this.servicePauseContinueFieldSet) + { + if ((this.servicePauseContinueField == YesNoType.no)) + { + writer.WriteAttributeString("ServicePauseContinue", "no"); + } + if ((this.servicePauseContinueField == YesNoType.yes)) + { + writer.WriteAttributeString("ServicePauseContinue", "yes"); + } + } + if (this.serviceInterrogateFieldSet) + { + if ((this.serviceInterrogateField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceInterrogate", "no"); + } + if ((this.serviceInterrogateField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceInterrogate", "yes"); + } + } + if (this.serviceUserDefinedControlFieldSet) + { + if ((this.serviceUserDefinedControlField == YesNoType.no)) + { + writer.WriteAttributeString("ServiceUserDefinedControl", "no"); + } + if ((this.serviceUserDefinedControlField == YesNoType.yes)) + { + writer.WriteAttributeString("ServiceUserDefinedControl", "yes"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Domain" == name)) + { + this.domainField = value; + this.domainFieldSet = true; + } + if (("User" == name)) + { + this.userField = value; + this.userFieldSet = true; + } + if (("Read" == name)) + { + this.readField = Enums.ParseYesNoType(value); + this.readFieldSet = true; + } + if (("Delete" == name)) + { + this.deleteField = Enums.ParseYesNoType(value); + this.deleteFieldSet = true; + } + if (("ReadPermission" == name)) + { + this.readPermissionField = Enums.ParseYesNoType(value); + this.readPermissionFieldSet = true; + } + if (("ChangePermission" == name)) + { + this.changePermissionField = Enums.ParseYesNoType(value); + this.changePermissionFieldSet = true; + } + if (("TakeOwnership" == name)) + { + this.takeOwnershipField = Enums.ParseYesNoType(value); + this.takeOwnershipFieldSet = true; + } + if (("ReadAttributes" == name)) + { + this.readAttributesField = Enums.ParseYesNoType(value); + this.readAttributesFieldSet = true; + } + if (("WriteAttributes" == name)) + { + this.writeAttributesField = Enums.ParseYesNoType(value); + this.writeAttributesFieldSet = true; + } + if (("ReadExtendedAttributes" == name)) + { + this.readExtendedAttributesField = Enums.ParseYesNoType(value); + this.readExtendedAttributesFieldSet = true; + } + if (("WriteExtendedAttributes" == name)) + { + this.writeExtendedAttributesField = Enums.ParseYesNoType(value); + this.writeExtendedAttributesFieldSet = true; + } + if (("Synchronize" == name)) + { + this.synchronizeField = Enums.ParseYesNoType(value); + this.synchronizeFieldSet = true; + } + if (("CreateFile" == name)) + { + this.createFileField = Enums.ParseYesNoType(value); + this.createFileFieldSet = true; + } + if (("CreateChild" == name)) + { + this.createChildField = Enums.ParseYesNoType(value); + this.createChildFieldSet = true; + } + if (("DeleteChild" == name)) + { + this.deleteChildField = Enums.ParseYesNoType(value); + this.deleteChildFieldSet = true; + } + if (("Traverse" == name)) + { + this.traverseField = Enums.ParseYesNoType(value); + this.traverseFieldSet = true; + } + if (("Append" == name)) + { + this.appendField = Enums.ParseYesNoType(value); + this.appendFieldSet = true; + } + if (("Execute" == name)) + { + this.executeField = Enums.ParseYesNoType(value); + this.executeFieldSet = true; + } + if (("Write" == name)) + { + this.writeField = Enums.ParseYesNoType(value); + this.writeFieldSet = true; + } + if (("CreateSubkeys" == name)) + { + this.createSubkeysField = Enums.ParseYesNoType(value); + this.createSubkeysFieldSet = true; + } + if (("EnumerateSubkeys" == name)) + { + this.enumerateSubkeysField = Enums.ParseYesNoType(value); + this.enumerateSubkeysFieldSet = true; + } + if (("Notify" == name)) + { + this.notifyField = Enums.ParseYesNoType(value); + this.notifyFieldSet = true; + } + if (("CreateLink" == name)) + { + this.createLinkField = Enums.ParseYesNoType(value); + this.createLinkFieldSet = true; + } + if (("GenericAll" == name)) + { + this.genericAllField = Enums.ParseYesNoType(value); + this.genericAllFieldSet = true; + } + if (("GenericExecute" == name)) + { + this.genericExecuteField = Enums.ParseYesNoType(value); + this.genericExecuteFieldSet = true; + } + if (("GenericWrite" == name)) + { + this.genericWriteField = Enums.ParseYesNoType(value); + this.genericWriteFieldSet = true; + } + if (("GenericRead" == name)) + { + this.genericReadField = Enums.ParseYesNoType(value); + this.genericReadFieldSet = true; + } + if (("ServiceQueryConfig" == name)) + { + this.serviceQueryConfigField = Enums.ParseYesNoType(value); + this.serviceQueryConfigFieldSet = true; + } + if (("ServiceChangeConfig" == name)) + { + this.serviceChangeConfigField = Enums.ParseYesNoType(value); + this.serviceChangeConfigFieldSet = true; + } + if (("ServiceQueryStatus" == name)) + { + this.serviceQueryStatusField = Enums.ParseYesNoType(value); + this.serviceQueryStatusFieldSet = true; + } + if (("ServiceEnumerateDependents" == name)) + { + this.serviceEnumerateDependentsField = Enums.ParseYesNoType(value); + this.serviceEnumerateDependentsFieldSet = true; + } + if (("ServiceStart" == name)) + { + this.serviceStartField = Enums.ParseYesNoType(value); + this.serviceStartFieldSet = true; + } + if (("ServiceStop" == name)) + { + this.serviceStopField = Enums.ParseYesNoType(value); + this.serviceStopFieldSet = true; + } + if (("ServicePauseContinue" == name)) + { + this.servicePauseContinueField = Enums.ParseYesNoType(value); + this.servicePauseContinueFieldSet = true; + } + if (("ServiceInterrogate" == name)) + { + this.serviceInterrogateField = Enums.ParseYesNoType(value); + this.serviceInterrogateFieldSet = true; + } + if (("ServiceUserDefinedControl" == name)) + { + this.serviceUserDefinedControlField = Enums.ParseYesNoType(value); + this.serviceUserDefinedControlFieldSet = true; + } + } + } + + /// + /// Describes a product search. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class ProductSearch : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string variableField; + + private bool variableFieldSet; + + private string conditionField; + + private bool conditionFieldSet; + + private string afterField; + + private bool afterFieldSet; + + private string guidField; + + private bool guidFieldSet; + + private string productCodeField; + + private bool productCodeFieldSet; + + private string upgradeCodeField; + + private bool upgradeCodeFieldSet; + + private ResultType resultField; + + private bool resultFieldSet; + + private ISchemaElement parentElement; + + /// + /// Id of the search for ordering and dependency. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the variable in which to place the result of the search. + /// + public string Variable + { + get + { + return this.variableField; + } + set + { + this.variableFieldSet = true; + this.variableField = value; + } + } + + /// + /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. + /// + public string Condition + { + get + { + return this.conditionField; + } + set + { + this.conditionFieldSet = true; + this.conditionField = value; + } + } + + /// + /// Id of the search that this one should come after. + /// + public string After + { + get + { + return this.afterField; + } + set + { + this.afterFieldSet = true; + this.afterField = value; + } + } + + /// + /// The Guid attribute has been deprecated; use the ProductCode or UpgradeCode attribute instead. If this attribute is used, it is assumed to be a ProductCode. + /// + public string Guid + { + get + { + return this.guidField; + } + set + { + this.guidFieldSet = true; + this.guidField = value; + } + } + + /// + /// The ProductCode to use for the search. This attribute must be omitted if UpgradeCode is specified. + /// + public string ProductCode + { + get + { + return this.productCodeField; + } + set + { + this.productCodeFieldSet = true; + this.productCodeField = value; + } + } + + /// + /// The UpgradeCode to use for the search. This attribute must be omitted if ProductCode is specified. Note that if multiple products are found, the highest versioned product will be used for the result. + /// + public string UpgradeCode + { + get + { + return this.upgradeCodeField; + } + set + { + this.upgradeCodeFieldSet = true; + this.upgradeCodeField = value; + } + } + + /// + /// Rather than saving the product version into the variable, a ProductSearch can save another attribute of the matching product instead. + /// + public ResultType Result + { + get + { + return this.resultField; + } + set + { + this.resultFieldSet = true; + this.resultField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a ResultType from a string. + /// + public static ResultType ParseResultType(string value) + { + ResultType parsedValue; + ProductSearch.TryParseResultType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ResultType from a string. + /// + public static bool TryParseResultType(string value, out ResultType parsedValue) + { + parsedValue = ResultType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("version" == value)) + { + parsedValue = ResultType.version; + } + else + { + if (("language" == value)) + { + parsedValue = ResultType.language; + } + else + { + if (("state" == value)) + { + parsedValue = ResultType.state; + } + else + { + if (("assignment" == value)) + { + parsedValue = ResultType.assignment; + } + else + { + parsedValue = ResultType.IllegalValue; + return false; + } + } + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("ProductSearch", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.variableFieldSet) + { + writer.WriteAttributeString("Variable", this.variableField); + } + if (this.conditionFieldSet) + { + writer.WriteAttributeString("Condition", this.conditionField); + } + if (this.afterFieldSet) + { + writer.WriteAttributeString("After", this.afterField); + } + if (this.guidFieldSet) + { + writer.WriteAttributeString("Guid", this.guidField); + } + if (this.productCodeFieldSet) + { + writer.WriteAttributeString("ProductCode", this.productCodeField); + } + if (this.upgradeCodeFieldSet) + { + writer.WriteAttributeString("UpgradeCode", this.upgradeCodeField); + } + if (this.resultFieldSet) + { + if ((this.resultField == ResultType.version)) + { + writer.WriteAttributeString("Result", "version"); + } + if ((this.resultField == ResultType.language)) + { + writer.WriteAttributeString("Result", "language"); + } + if ((this.resultField == ResultType.state)) + { + writer.WriteAttributeString("Result", "state"); + } + if ((this.resultField == ResultType.assignment)) + { + writer.WriteAttributeString("Result", "assignment"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Variable" == name)) + { + this.variableField = value; + this.variableFieldSet = true; + } + if (("Condition" == name)) + { + this.conditionField = value; + this.conditionFieldSet = true; + } + if (("After" == name)) + { + this.afterField = value; + this.afterFieldSet = true; + } + if (("Guid" == name)) + { + this.guidField = value; + this.guidFieldSet = true; + } + if (("ProductCode" == name)) + { + this.productCodeField = value; + this.productCodeFieldSet = true; + } + if (("UpgradeCode" == name)) + { + this.upgradeCodeField = value; + this.upgradeCodeFieldSet = true; + } + if (("Result" == name)) + { + this.resultField = ProductSearch.ParseResultType(value); + this.resultFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ResultType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Saves the version of a matching product if found; 0.0.0.0 otherwise. This is the default. + /// + version, + + /// + /// Saves the language of a matching product if found; empty otherwise. + /// + language, + + /// + /// Saves the state of the product: advertised (1), absent (2), or locally installed (5). + /// + state, + + /// + /// Saves the assignment type of the product: per-user (0), or per-machine (1). + /// + assignment, + } + } + + /// + /// References a ProductSearch. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class ProductSearchRef : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private ISchemaElement parentElement; + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("ProductSearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + } + } + + /// + /// Remove a folder and all contained files and folders if the parent component is selected for installation or removal. + /// The folder must be specified in the Property attribute as the name of a property that will have a value that resolves + /// to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used. + /// For more details, see the Remarks. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class RemoveFolderEx : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string propertyField; + + private bool propertyFieldSet; + + private OnType onField; + + private bool onFieldSet; + + private ISchemaElement parentElement; + + /// + /// Primary key used to identify this particular entry. If this is not specified, a stable identifier + /// will be generated at compile time based on the other attributes. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// The id of a property that resolves to the full path of the source directory. The property does not have + /// to exist in the installer database at creation time; it could be created at installation time by a custom + /// action, on the command line, etc. The property value can contain environment variables surrounded by + /// percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before + /// being evaluated for a full path. + /// + public string Property + { + get + { + return this.propertyField; + } + set + { + this.propertyFieldSet = true; + this.propertyField = value; + } + } + + /// + /// This value determines when the folder may be removed. + /// + public OnType On + { + get + { + return this.onField; + } + set + { + this.onFieldSet = true; + this.onField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a OnType from a string. + /// + public static OnType ParseOnType(string value) + { + OnType parsedValue; + RemoveFolderEx.TryParseOnType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a OnType from a string. + /// + public static bool TryParseOnType(string value, out OnType parsedValue) + { + parsedValue = OnType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("install" == value)) + { + parsedValue = OnType.install; + } + else + { + if (("uninstall" == value)) + { + parsedValue = OnType.uninstall; + } + else + { + if (("both" == value)) + { + parsedValue = OnType.both; + } + else + { + parsedValue = OnType.IllegalValue; + return false; + } + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("RemoveFolderEx", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.propertyFieldSet) + { + writer.WriteAttributeString("Property", this.propertyField); + } + if (this.onFieldSet) + { + if ((this.onField == OnType.install)) + { + writer.WriteAttributeString("On", "install"); + } + if ((this.onField == OnType.uninstall)) + { + writer.WriteAttributeString("On", "uninstall"); + } + if ((this.onField == OnType.both)) + { + writer.WriteAttributeString("On", "both"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Property" == name)) + { + this.propertyField = value; + this.propertyFieldSet = true; + } + if (("On" == name)) + { + this.onField = RemoveFolderEx.ParseOnType(value); + this.onFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum OnType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Removes the folder only when the parent component is being installed (msiInstallStateLocal or msiInstallStateSource). + /// + install, + + /// + /// Default: Removes the folder only when the parent component is being removed (msiInstallStateAbsent). + /// + uninstall, + + /// + /// Removes the folder when the parent component is being installed or removed. + /// + both, + } + } + + /// + /// Registers a resource with the Restart Manager. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class RestartResource : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string pathField; + + private bool pathFieldSet; + + private string processNameField; + + private bool processNameFieldSet; + + private string serviceNameField; + + private bool serviceNameFieldSet; + + private ISchemaElement parentElement; + + /// + /// The unique identifier for this resource. A unique identifier will + /// be generated automatically if not specified. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// The full path to the process module to register with the Restart Manager. + /// This can be a formatted value that resolves to a full path. + /// + public string Path + { + get + { + return this.pathField; + } + set + { + this.pathFieldSet = true; + this.pathField = value; + } + } + + /// + /// The name of a process to register with the Restart Manager. + /// This can be a formatted value that resolves to a process name. + /// + public string ProcessName + { + get + { + return this.processNameField; + } + set + { + this.processNameFieldSet = true; + this.processNameField = value; + } + } + + /// + /// The name of a Windows service to register with the Restart Manager. + /// This can be a formatted value that resolves to a service name. + /// + public string ServiceName + { + get + { + return this.serviceNameField; + } + set + { + this.serviceNameFieldSet = true; + this.serviceNameField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("RestartResource", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.pathFieldSet) + { + writer.WriteAttributeString("Path", this.pathField); + } + if (this.processNameFieldSet) + { + writer.WriteAttributeString("ProcessName", this.processNameField); + } + if (this.serviceNameFieldSet) + { + writer.WriteAttributeString("ServiceName", this.serviceNameField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Path" == name)) + { + this.pathField = value; + this.pathFieldSet = true; + } + if (("ProcessName" == name)) + { + this.processNameField = value; + this.processNameFieldSet = true; + } + if (("ServiceName" == name)) + { + this.serviceNameField = value; + this.serviceNameFieldSet = true; + } + } + } + + /// + /// Describes a registry search. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class RegistrySearch : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string variableField; + + private bool variableFieldSet; + + private string conditionField; + + private bool conditionFieldSet; + + private string afterField; + + private bool afterFieldSet; + + private RootType rootField; + + private bool rootFieldSet; + + private string keyField; + + private bool keyFieldSet; + + private string valueField; + + private bool valueFieldSet; + + private FormatType formatField; + + private bool formatFieldSet; + + private YesNoType expandEnvironmentVariablesField; + + private bool expandEnvironmentVariablesFieldSet; + + private ResultType resultField; + + private bool resultFieldSet; + + private YesNoType win64Field; + + private bool win64FieldSet; + + private ISchemaElement parentElement; + + /// + /// Id of the search for ordering and dependency. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Name of the variable in which to place the result of the search. + /// + public string Variable + { + get + { + return this.variableField; + } + set + { + this.variableFieldSet = true; + this.variableField = value; + } + } + + /// + /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. + /// + public string Condition + { + get + { + return this.conditionField; + } + set + { + this.conditionFieldSet = true; + this.conditionField = value; + } + } + + /// + /// Id of the search that this one should come after. + /// + public string After + { + get + { + return this.afterField; + } + set + { + this.afterFieldSet = true; + this.afterField = value; + } + } + + /// + /// Registry root hive to search under. + /// + public RootType Root + { + get + { + return this.rootField; + } + set + { + this.rootFieldSet = true; + this.rootField = value; + } + } + + /// + /// Key to search for. + /// + public string Key + { + get + { + return this.keyField; + } + set + { + this.keyFieldSet = true; + this.keyField = value; + } + } + + /// + /// Optional value to search for under the given Key. + /// + public string Value + { + get + { + return this.valueField; + } + set + { + this.valueFieldSet = true; + this.valueField = value; + } + } + + /// + /// What format to return the value in. + /// + public FormatType Format + { + get + { + return this.formatField; + } + set + { + this.formatFieldSet = true; + this.formatField = value; + } + } + + /// + /// Whether to expand any environment variables in REG_SZ, REG_EXPAND_SZ, or REG_MULTI_SZ values. + /// + public YesNoType ExpandEnvironmentVariables + { + get + { + return this.expandEnvironmentVariablesField; + } + set + { + this.expandEnvironmentVariablesFieldSet = true; + this.expandEnvironmentVariablesField = value; + } + } + + /// + /// Rather than saving the matching registry value into the variable, a RegistrySearch can save an attribute of the matching entry instead. + /// + public ResultType Result + { + get + { + return this.resultField; + } + set + { + this.resultFieldSet = true; + this.resultField = value; + } + } + + /// + /// Instructs the search to look in the 64-bit registry when the value is 'yes'. When the value is 'no', the search looks in the 32-bit registry. The default value is 'no'. + /// + public YesNoType Win64 + { + get + { + return this.win64Field; + } + set + { + this.win64FieldSet = true; + this.win64Field = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a RootType from a string. + /// + public static RootType ParseRootType(string value) + { + RootType parsedValue; + RegistrySearch.TryParseRootType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a RootType from a string. + /// + public static bool TryParseRootType(string value, out RootType parsedValue) + { + parsedValue = RootType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("HKLM" == value)) + { + parsedValue = RootType.HKLM; + } + else + { + if (("HKCU" == value)) + { + parsedValue = RootType.HKCU; + } + else + { + if (("HKCR" == value)) + { + parsedValue = RootType.HKCR; + } + else + { + if (("HKU" == value)) + { + parsedValue = RootType.HKU; + } + else + { + parsedValue = RootType.IllegalValue; + return false; + } + } + } + } + return true; + } + + /// + /// Parses a FormatType from a string. + /// + public static FormatType ParseFormatType(string value) + { + FormatType parsedValue; + RegistrySearch.TryParseFormatType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a FormatType from a string. + /// + public static bool TryParseFormatType(string value, out FormatType parsedValue) + { + parsedValue = FormatType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("raw" == value)) + { + parsedValue = FormatType.raw; + } + else + { + if (("compatible" == value)) + { + parsedValue = FormatType.compatible; + } + else + { + parsedValue = FormatType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Parses a ResultType from a string. + /// + public static ResultType ParseResultType(string value) + { + ResultType parsedValue; + RegistrySearch.TryParseResultType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ResultType from a string. + /// + public static bool TryParseResultType(string value, out ResultType parsedValue) + { + parsedValue = ResultType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("exists" == value)) + { + parsedValue = ResultType.exists; + } + else + { + if (("value" == value)) + { + parsedValue = ResultType.value; + } + else + { + parsedValue = ResultType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("RegistrySearch", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.variableFieldSet) + { + writer.WriteAttributeString("Variable", this.variableField); + } + if (this.conditionFieldSet) + { + writer.WriteAttributeString("Condition", this.conditionField); + } + if (this.afterFieldSet) + { + writer.WriteAttributeString("After", this.afterField); + } + if (this.rootFieldSet) + { + if ((this.rootField == RootType.HKLM)) + { + writer.WriteAttributeString("Root", "HKLM"); + } + if ((this.rootField == RootType.HKCU)) + { + writer.WriteAttributeString("Root", "HKCU"); + } + if ((this.rootField == RootType.HKCR)) + { + writer.WriteAttributeString("Root", "HKCR"); + } + if ((this.rootField == RootType.HKU)) + { + writer.WriteAttributeString("Root", "HKU"); + } + } + if (this.keyFieldSet) + { + writer.WriteAttributeString("Key", this.keyField); + } + if (this.valueFieldSet) + { + writer.WriteAttributeString("Value", this.valueField); + } + if (this.formatFieldSet) + { + if ((this.formatField == FormatType.raw)) + { + writer.WriteAttributeString("Format", "raw"); + } + if ((this.formatField == FormatType.compatible)) + { + writer.WriteAttributeString("Format", "compatible"); + } + } + if (this.expandEnvironmentVariablesFieldSet) + { + if ((this.expandEnvironmentVariablesField == YesNoType.no)) + { + writer.WriteAttributeString("ExpandEnvironmentVariables", "no"); + } + if ((this.expandEnvironmentVariablesField == YesNoType.yes)) + { + writer.WriteAttributeString("ExpandEnvironmentVariables", "yes"); + } + } + if (this.resultFieldSet) + { + if ((this.resultField == ResultType.exists)) + { + writer.WriteAttributeString("Result", "exists"); + } + if ((this.resultField == ResultType.value)) + { + writer.WriteAttributeString("Result", "value"); + } + } + if (this.win64FieldSet) + { + if ((this.win64Field == YesNoType.no)) + { + writer.WriteAttributeString("Win64", "no"); + } + if ((this.win64Field == YesNoType.yes)) + { + writer.WriteAttributeString("Win64", "yes"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Variable" == name)) + { + this.variableField = value; + this.variableFieldSet = true; + } + if (("Condition" == name)) + { + this.conditionField = value; + this.conditionFieldSet = true; + } + if (("After" == name)) + { + this.afterField = value; + this.afterFieldSet = true; + } + if (("Root" == name)) + { + this.rootField = RegistrySearch.ParseRootType(value); + this.rootFieldSet = true; + } + if (("Key" == name)) + { + this.keyField = value; + this.keyFieldSet = true; + } + if (("Value" == name)) + { + this.valueField = value; + this.valueFieldSet = true; + } + if (("Format" == name)) + { + this.formatField = RegistrySearch.ParseFormatType(value); + this.formatFieldSet = true; + } + if (("ExpandEnvironmentVariables" == name)) + { + this.expandEnvironmentVariablesField = Enums.ParseYesNoType(value); + this.expandEnvironmentVariablesFieldSet = true; + } + if (("Result" == name)) + { + this.resultField = RegistrySearch.ParseResultType(value); + this.resultFieldSet = true; + } + if (("Win64" == name)) + { + this.win64Field = Enums.ParseYesNoType(value); + this.win64FieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum RootType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// HKEY_LOCAL_MACHINE + /// + HKLM, + + /// + /// HKEY_CURRENT_USER + /// + HKCU, + + /// + /// HKEY_CLASSES_ROOT + /// + HKCR, + + /// + /// HKEY_USERS + /// + HKU, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum FormatType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Returns the unformatted value directly from the registry. For example, a REG_DWORD value of '1' is returned as '1', not '#1'. + /// + raw, + + /// + /// Returns the value formatted as Windows Installer would. For example, a REG_DWORD value of '1' is returned as '#1', not '1'. + /// + compatible, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ResultType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Saves true if a matching registry entry is found; false otherwise. + /// + exists, + + /// + /// Saves the value of the registry key in the variable. This is the default. + /// + value, + } + } + + /// + /// References a RegistrySearch. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class RegistrySearchRef : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private ISchemaElement parentElement; + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("RegistrySearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + } + } + + /// + /// Service configuration information for failure actions. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class ServiceConfig : ISchemaElement, ISetAttributes + { + + private string serviceNameField; + + private bool serviceNameFieldSet; + + private FirstFailureActionTypeType firstFailureActionTypeField; + + private bool firstFailureActionTypeFieldSet; + + private SecondFailureActionTypeType secondFailureActionTypeField; + + private bool secondFailureActionTypeFieldSet; + + private ThirdFailureActionTypeType thirdFailureActionTypeField; + + private bool thirdFailureActionTypeFieldSet; + + private int resetPeriodInDaysField; + + private bool resetPeriodInDaysFieldSet; + + private int restartServiceDelayInSecondsField; + + private bool restartServiceDelayInSecondsFieldSet; + + private string programCommandLineField; + + private bool programCommandLineFieldSet; + + private string rebootMessageField; + + private bool rebootMessageFieldSet; + + private ISchemaElement parentElement; + + /// + /// Required if not under a ServiceInstall element. + /// + public string ServiceName + { + get + { + return this.serviceNameField; + } + set + { + this.serviceNameFieldSet = true; + this.serviceNameField = value; + } + } + + /// + /// Action to take on the first failure of the service. + /// + public FirstFailureActionTypeType FirstFailureActionType + { + get + { + return this.firstFailureActionTypeField; + } + set + { + this.firstFailureActionTypeFieldSet = true; + this.firstFailureActionTypeField = value; + } + } + + /// + /// Action to take on the second failure of the service. + /// + public SecondFailureActionTypeType SecondFailureActionType + { + get + { + return this.secondFailureActionTypeField; + } + set + { + this.secondFailureActionTypeFieldSet = true; + this.secondFailureActionTypeField = value; + } + } + + /// + /// Action to take on the third failure of the service. + /// + public ThirdFailureActionTypeType ThirdFailureActionType + { + get + { + return this.thirdFailureActionTypeField; + } + set + { + this.thirdFailureActionTypeFieldSet = true; + this.thirdFailureActionTypeField = value; + } + } + + /// + /// Number of days after which to reset the failure count to zero if there are no failures. + /// + public int ResetPeriodInDays + { + get + { + return this.resetPeriodInDaysField; + } + set + { + this.resetPeriodInDaysFieldSet = true; + this.resetPeriodInDaysField = value; + } + } + + /// + /// If any of the three *ActionType attributes is "restart", this specifies the number of seconds to wait before doing so. + /// + public int RestartServiceDelayInSeconds + { + get + { + return this.restartServiceDelayInSecondsField; + } + set + { + this.restartServiceDelayInSecondsFieldSet = true; + this.restartServiceDelayInSecondsField = value; + } + } + + /// + /// If any of the three *ActionType attributes is "runCommand", this specifies the command to run when doing so. This value is formatted. + /// + public string ProgramCommandLine + { + get + { + return this.programCommandLineField; + } + set + { + this.programCommandLineFieldSet = true; + this.programCommandLineField = value; + } + } + + /// + /// If any of the three *ActionType attributes is "reboot", this specifies the message to broadcast to server users before doing so. + /// + public string RebootMessage + { + get + { + return this.rebootMessageField; + } + set + { + this.rebootMessageFieldSet = true; + this.rebootMessageField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a FirstFailureActionTypeType from a string. + /// + public static FirstFailureActionTypeType ParseFirstFailureActionTypeType(string value) + { + FirstFailureActionTypeType parsedValue; + ServiceConfig.TryParseFirstFailureActionTypeType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a FirstFailureActionTypeType from a string. + /// + public static bool TryParseFirstFailureActionTypeType(string value, out FirstFailureActionTypeType parsedValue) + { + parsedValue = FirstFailureActionTypeType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("none" == value)) + { + parsedValue = FirstFailureActionTypeType.none; + } + else + { + if (("reboot" == value)) + { + parsedValue = FirstFailureActionTypeType.reboot; + } + else + { + if (("restart" == value)) + { + parsedValue = FirstFailureActionTypeType.restart; + } + else + { + if (("runCommand" == value)) + { + parsedValue = FirstFailureActionTypeType.runCommand; + } + else + { + parsedValue = FirstFailureActionTypeType.IllegalValue; + return false; + } + } + } + } + return true; + } + + /// + /// Parses a SecondFailureActionTypeType from a string. + /// + public static SecondFailureActionTypeType ParseSecondFailureActionTypeType(string value) + { + SecondFailureActionTypeType parsedValue; + ServiceConfig.TryParseSecondFailureActionTypeType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a SecondFailureActionTypeType from a string. + /// + public static bool TryParseSecondFailureActionTypeType(string value, out SecondFailureActionTypeType parsedValue) + { + parsedValue = SecondFailureActionTypeType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("none" == value)) + { + parsedValue = SecondFailureActionTypeType.none; + } + else + { + if (("reboot" == value)) + { + parsedValue = SecondFailureActionTypeType.reboot; + } + else + { + if (("restart" == value)) + { + parsedValue = SecondFailureActionTypeType.restart; + } + else + { + if (("runCommand" == value)) + { + parsedValue = SecondFailureActionTypeType.runCommand; + } + else + { + parsedValue = SecondFailureActionTypeType.IllegalValue; + return false; + } + } + } + } + return true; + } + + /// + /// Parses a ThirdFailureActionTypeType from a string. + /// + public static ThirdFailureActionTypeType ParseThirdFailureActionTypeType(string value) + { + ThirdFailureActionTypeType parsedValue; + ServiceConfig.TryParseThirdFailureActionTypeType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ThirdFailureActionTypeType from a string. + /// + public static bool TryParseThirdFailureActionTypeType(string value, out ThirdFailureActionTypeType parsedValue) + { + parsedValue = ThirdFailureActionTypeType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("none" == value)) + { + parsedValue = ThirdFailureActionTypeType.none; + } + else + { + if (("reboot" == value)) + { + parsedValue = ThirdFailureActionTypeType.reboot; + } + else + { + if (("restart" == value)) + { + parsedValue = ThirdFailureActionTypeType.restart; + } + else + { + if (("runCommand" == value)) + { + parsedValue = ThirdFailureActionTypeType.runCommand; + } + else + { + parsedValue = ThirdFailureActionTypeType.IllegalValue; + return false; + } + } + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("ServiceConfig", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.serviceNameFieldSet) + { + writer.WriteAttributeString("ServiceName", this.serviceNameField); + } + if (this.firstFailureActionTypeFieldSet) + { + if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.none)) + { + writer.WriteAttributeString("FirstFailureActionType", "none"); + } + if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.reboot)) + { + writer.WriteAttributeString("FirstFailureActionType", "reboot"); + } + if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.restart)) + { + writer.WriteAttributeString("FirstFailureActionType", "restart"); + } + if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.runCommand)) + { + writer.WriteAttributeString("FirstFailureActionType", "runCommand"); + } + } + if (this.secondFailureActionTypeFieldSet) + { + if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.none)) + { + writer.WriteAttributeString("SecondFailureActionType", "none"); + } + if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.reboot)) + { + writer.WriteAttributeString("SecondFailureActionType", "reboot"); + } + if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.restart)) + { + writer.WriteAttributeString("SecondFailureActionType", "restart"); + } + if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.runCommand)) + { + writer.WriteAttributeString("SecondFailureActionType", "runCommand"); + } + } + if (this.thirdFailureActionTypeFieldSet) + { + if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.none)) + { + writer.WriteAttributeString("ThirdFailureActionType", "none"); + } + if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.reboot)) + { + writer.WriteAttributeString("ThirdFailureActionType", "reboot"); + } + if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.restart)) + { + writer.WriteAttributeString("ThirdFailureActionType", "restart"); + } + if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.runCommand)) + { + writer.WriteAttributeString("ThirdFailureActionType", "runCommand"); + } + } + if (this.resetPeriodInDaysFieldSet) + { + writer.WriteAttributeString("ResetPeriodInDays", this.resetPeriodInDaysField.ToString(CultureInfo.InvariantCulture)); + } + if (this.restartServiceDelayInSecondsFieldSet) + { + writer.WriteAttributeString("RestartServiceDelayInSeconds", this.restartServiceDelayInSecondsField.ToString(CultureInfo.InvariantCulture)); + } + if (this.programCommandLineFieldSet) + { + writer.WriteAttributeString("ProgramCommandLine", this.programCommandLineField); + } + if (this.rebootMessageFieldSet) + { + writer.WriteAttributeString("RebootMessage", this.rebootMessageField); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("ServiceName" == name)) + { + this.serviceNameField = value; + this.serviceNameFieldSet = true; + } + if (("FirstFailureActionType" == name)) + { + this.firstFailureActionTypeField = ServiceConfig.ParseFirstFailureActionTypeType(value); + this.firstFailureActionTypeFieldSet = true; + } + if (("SecondFailureActionType" == name)) + { + this.secondFailureActionTypeField = ServiceConfig.ParseSecondFailureActionTypeType(value); + this.secondFailureActionTypeFieldSet = true; + } + if (("ThirdFailureActionType" == name)) + { + this.thirdFailureActionTypeField = ServiceConfig.ParseThirdFailureActionTypeType(value); + this.thirdFailureActionTypeFieldSet = true; + } + if (("ResetPeriodInDays" == name)) + { + this.resetPeriodInDaysField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.resetPeriodInDaysFieldSet = true; + } + if (("RestartServiceDelayInSeconds" == name)) + { + this.restartServiceDelayInSecondsField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.restartServiceDelayInSecondsFieldSet = true; + } + if (("ProgramCommandLine" == name)) + { + this.programCommandLineField = value; + this.programCommandLineFieldSet = true; + } + if (("RebootMessage" == name)) + { + this.rebootMessageField = value; + this.rebootMessageFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum FirstFailureActionTypeType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + none, + + reboot, + + restart, + + runCommand, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum SecondFailureActionTypeType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + none, + + reboot, + + restart, + + runCommand, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ThirdFailureActionTypeType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + none, + + reboot, + + restart, + + runCommand, + } + } + + /// + /// Updates the last modified date/time of a file. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class TouchFile : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string pathField; + + private bool pathFieldSet; + + private YesNoType onInstallField; + + private bool onInstallFieldSet; + + private YesNoType onReinstallField; + + private bool onReinstallFieldSet; + + private YesNoType onUninstallField; + + private bool onUninstallFieldSet; + + private YesNoType nonvitalField; + + private bool nonvitalFieldSet; + + private ISchemaElement parentElement; + + /// + /// Identifier for the touch file operation. If the identifier is not specified it will be generated. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// Path of the file to update. This value is formatted. + /// + public string Path + { + get + { + return this.pathField; + } + set + { + this.pathFieldSet = true; + this.pathField = value; + } + } + + /// + /// Specifies whether or not the modified time of the file should be updated on install. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. + /// + public YesNoType OnInstall + { + get + { + return this.onInstallField; + } + set + { + this.onInstallFieldSet = true; + this.onInstallField = value; + } + } + + /// + /// Specifies whether or not the modified time of the file should be updated on reinstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. + /// + public YesNoType OnReinstall + { + get + { + return this.onReinstallField; + } + set + { + this.onReinstallFieldSet = true; + this.onReinstallField = value; + } + } + + /// + /// Specifies whether or not the modified time of the file should be updated on uninstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'no'. + /// + public YesNoType OnUninstall + { + get + { + return this.onUninstallField; + } + set + { + this.onUninstallFieldSet = true; + this.onUninstallField = value; + } + } + + /// + /// Indicates the installation will succeed even if the modified time of the file cannot be updated. The default is 'no'. + /// + public YesNoType Nonvital + { + get + { + return this.nonvitalField; + } + set + { + this.nonvitalFieldSet = true; + this.nonvitalField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("TouchFile", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.pathFieldSet) + { + writer.WriteAttributeString("Path", this.pathField); + } + if (this.onInstallFieldSet) + { + if ((this.onInstallField == YesNoType.no)) + { + writer.WriteAttributeString("OnInstall", "no"); + } + if ((this.onInstallField == YesNoType.yes)) + { + writer.WriteAttributeString("OnInstall", "yes"); + } + } + if (this.onReinstallFieldSet) + { + if ((this.onReinstallField == YesNoType.no)) + { + writer.WriteAttributeString("OnReinstall", "no"); + } + if ((this.onReinstallField == YesNoType.yes)) + { + writer.WriteAttributeString("OnReinstall", "yes"); + } + } + if (this.onUninstallFieldSet) + { + if ((this.onUninstallField == YesNoType.no)) + { + writer.WriteAttributeString("OnUninstall", "no"); + } + if ((this.onUninstallField == YesNoType.yes)) + { + writer.WriteAttributeString("OnUninstall", "yes"); + } + } + if (this.nonvitalFieldSet) + { + if ((this.nonvitalField == YesNoType.no)) + { + writer.WriteAttributeString("Nonvital", "no"); + } + if ((this.nonvitalField == YesNoType.yes)) + { + writer.WriteAttributeString("Nonvital", "yes"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Path" == name)) + { + this.pathField = value; + this.pathFieldSet = true; + } + if (("OnInstall" == name)) + { + this.onInstallField = Enums.ParseYesNoType(value); + this.onInstallFieldSet = true; + } + if (("OnReinstall" == name)) + { + this.onReinstallField = Enums.ParseYesNoType(value); + this.onReinstallFieldSet = true; + } + if (("OnUninstall" == name)) + { + this.onUninstallField = Enums.ParseYesNoType(value); + this.onUninstallFieldSet = true; + } + if (("Nonvital" == name)) + { + this.nonvitalField = Enums.ParseYesNoType(value); + this.nonvitalFieldSet = true; + } + } + } + + /// + /// User for all kinds of things. When it is not nested under a component it is included in the MSI so it can be referenced by other elements such as the User attribute in the AppPool element. When it is nested under a Component element, the User will be created on install and can also be used for reference. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class User : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes + { + + private ElementCollection children; + + private string idField; + + private bool idFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string domainField; + + private bool domainFieldSet; + + private string passwordField; + + private bool passwordFieldSet; + + private YesNoType passwordNeverExpiresField; + + private bool passwordNeverExpiresFieldSet; + + private YesNoType canNotChangePasswordField; + + private bool canNotChangePasswordFieldSet; + + private YesNoType removeOnUninstallField; + + private bool removeOnUninstallFieldSet; + + private YesNoType failIfExistsField; + + private bool failIfExistsFieldSet; + + private YesNoType logonAsServiceField; + + private bool logonAsServiceFieldSet; + + private YesNoType logonAsBatchJobField; + + private bool logonAsBatchJobFieldSet; + + private YesNoType updateIfExistsField; + + private bool updateIfExistsFieldSet; + + private YesNoType passwordExpiredField; + + private bool passwordExpiredFieldSet; + + private YesNoType disabledField; + + private bool disabledFieldSet; + + private YesNoType createUserField; + + private bool createUserFieldSet; + + private YesNoType vitalField; + + private bool vitalFieldSet; + + private ISchemaElement parentElement; + + public User() + { + ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); + childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(GroupRef))); + this.children = childCollection0; + } + + public virtual IEnumerable Children + { + get + { + return this.children; + } + } + + [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] + public virtual IEnumerable this[System.Type childType] + { + get + { + return this.children.Filter(childType); + } + } + + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// A + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// A + /// + public string Domain + { + get + { + return this.domainField; + } + set + { + this.domainFieldSet = true; + this.domainField = value; + } + } + + /// + /// Usually a Property that is passed in on the command-line to keep it more secure. + /// + public string Password + { + get + { + return this.passwordField; + } + set + { + this.passwordFieldSet = true; + this.passwordField = value; + } + } + + /// + /// The account's password never expires. Equivalent to UF_DONT_EXPIRE_PASSWD. + /// + public YesNoType PasswordNeverExpires + { + get + { + return this.passwordNeverExpiresField; + } + set + { + this.passwordNeverExpiresFieldSet = true; + this.passwordNeverExpiresField = value; + } + } + + /// + /// The user cannot change the account's password. Equivalent to UF_PASSWD_CANT_CHANGE. + /// + public YesNoType CanNotChangePassword + { + get + { + return this.canNotChangePasswordField; + } + set + { + this.canNotChangePasswordFieldSet = true; + this.canNotChangePasswordField = value; + } + } + + /// + /// Indicates whether the user account should be removed or left behind on uninstall. + /// + public YesNoType RemoveOnUninstall + { + get + { + return this.removeOnUninstallField; + } + set + { + this.removeOnUninstallFieldSet = true; + this.removeOnUninstallField = value; + } + } + + /// + /// Indicates if the install should fail if the user already exists. + /// + public YesNoType FailIfExists + { + get + { + return this.failIfExistsField; + } + set + { + this.failIfExistsFieldSet = true; + this.failIfExistsField = value; + } + } + + /// + /// Indicates whether or not the user can logon as a serivce. User creation can be skipped if all that is desired is to set this access right on the user. + /// + public YesNoType LogonAsService + { + get + { + return this.logonAsServiceField; + } + set + { + this.logonAsServiceFieldSet = true; + this.logonAsServiceField = value; + } + } + + /// + /// Indicates whether or not the user can logon as a batch job. User creation can be skipped if all that is desired is to set this access right on the user. + /// + public YesNoType LogonAsBatchJob + { + get + { + return this.logonAsBatchJobField; + } + set + { + this.logonAsBatchJobFieldSet = true; + this.logonAsBatchJobField = value; + } + } + + /// + /// Indicates if the user account properties should be updated if the user already exists. + /// + public YesNoType UpdateIfExists + { + get + { + return this.updateIfExistsField; + } + set + { + this.updateIfExistsFieldSet = true; + this.updateIfExistsField = value; + } + } + + /// + /// Indicates whether the user must change their password on their first login. + /// + public YesNoType PasswordExpired + { + get + { + return this.passwordExpiredField; + } + set + { + this.passwordExpiredFieldSet = true; + this.passwordExpiredField = value; + } + } + + /// + /// The account is disabled. Equivalent to UF_ACCOUNTDISABLE. + /// + public YesNoType Disabled + { + get + { + return this.disabledField; + } + set + { + this.disabledFieldSet = true; + this.disabledField = value; + } + } + + /// + /// Indicates whether or not to create the user. User creation can be skipped if all that is desired is to join a user to groups. + /// + public YesNoType CreateUser + { + get + { + return this.createUserField; + } + set + { + this.createUserFieldSet = true; + this.createUserField = value; + } + } + + /// + /// Indicates whether failure to create the user or add the user to a group fails the installation. The default value is "yes". + /// + public YesNoType Vital + { + get + { + return this.vitalField; + } + set + { + this.vitalFieldSet = true; + this.vitalField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + public virtual void AddChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.AddElement(child); + child.ParentElement = this; + } + + public virtual void RemoveChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.RemoveElement(child); + child.ParentElement = null; + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + ISchemaElement ICreateChildren.CreateChild(string childName) + { + if (String.IsNullOrEmpty(childName)) + { + throw new ArgumentNullException("childName"); + } + ISchemaElement childValue = null; + if (("GroupRef" == childName)) + { + childValue = new GroupRef(); + } + if ((null == childValue)) + { + throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); + } + return childValue; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("User", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.domainFieldSet) + { + writer.WriteAttributeString("Domain", this.domainField); + } + if (this.passwordFieldSet) + { + writer.WriteAttributeString("Password", this.passwordField); + } + if (this.passwordNeverExpiresFieldSet) + { + if ((this.passwordNeverExpiresField == YesNoType.no)) + { + writer.WriteAttributeString("PasswordNeverExpires", "no"); + } + if ((this.passwordNeverExpiresField == YesNoType.yes)) + { + writer.WriteAttributeString("PasswordNeverExpires", "yes"); + } + } + if (this.canNotChangePasswordFieldSet) + { + if ((this.canNotChangePasswordField == YesNoType.no)) + { + writer.WriteAttributeString("CanNotChangePassword", "no"); + } + if ((this.canNotChangePasswordField == YesNoType.yes)) + { + writer.WriteAttributeString("CanNotChangePassword", "yes"); + } + } + if (this.removeOnUninstallFieldSet) + { + if ((this.removeOnUninstallField == YesNoType.no)) + { + writer.WriteAttributeString("RemoveOnUninstall", "no"); + } + if ((this.removeOnUninstallField == YesNoType.yes)) + { + writer.WriteAttributeString("RemoveOnUninstall", "yes"); + } + } + if (this.failIfExistsFieldSet) + { + if ((this.failIfExistsField == YesNoType.no)) + { + writer.WriteAttributeString("FailIfExists", "no"); + } + if ((this.failIfExistsField == YesNoType.yes)) + { + writer.WriteAttributeString("FailIfExists", "yes"); + } + } + if (this.logonAsServiceFieldSet) + { + if ((this.logonAsServiceField == YesNoType.no)) + { + writer.WriteAttributeString("LogonAsService", "no"); + } + if ((this.logonAsServiceField == YesNoType.yes)) + { + writer.WriteAttributeString("LogonAsService", "yes"); + } + } + if (this.logonAsBatchJobFieldSet) + { + if ((this.logonAsBatchJobField == YesNoType.no)) + { + writer.WriteAttributeString("LogonAsBatchJob", "no"); + } + if ((this.logonAsBatchJobField == YesNoType.yes)) + { + writer.WriteAttributeString("LogonAsBatchJob", "yes"); + } + } + if (this.updateIfExistsFieldSet) + { + if ((this.updateIfExistsField == YesNoType.no)) + { + writer.WriteAttributeString("UpdateIfExists", "no"); + } + if ((this.updateIfExistsField == YesNoType.yes)) + { + writer.WriteAttributeString("UpdateIfExists", "yes"); + } + } + if (this.passwordExpiredFieldSet) + { + if ((this.passwordExpiredField == YesNoType.no)) + { + writer.WriteAttributeString("PasswordExpired", "no"); + } + if ((this.passwordExpiredField == YesNoType.yes)) + { + writer.WriteAttributeString("PasswordExpired", "yes"); + } + } + if (this.disabledFieldSet) + { + if ((this.disabledField == YesNoType.no)) + { + writer.WriteAttributeString("Disabled", "no"); + } + if ((this.disabledField == YesNoType.yes)) + { + writer.WriteAttributeString("Disabled", "yes"); + } + } + if (this.createUserFieldSet) + { + if ((this.createUserField == YesNoType.no)) + { + writer.WriteAttributeString("CreateUser", "no"); + } + if ((this.createUserField == YesNoType.yes)) + { + writer.WriteAttributeString("CreateUser", "yes"); + } + } + if (this.vitalFieldSet) + { + if ((this.vitalField == YesNoType.no)) + { + writer.WriteAttributeString("Vital", "no"); + } + if ((this.vitalField == YesNoType.yes)) + { + writer.WriteAttributeString("Vital", "yes"); + } + } + for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) + { + ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); + childElement.OutputXml(writer); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Domain" == name)) + { + this.domainField = value; + this.domainFieldSet = true; + } + if (("Password" == name)) + { + this.passwordField = value; + this.passwordFieldSet = true; + } + if (("PasswordNeverExpires" == name)) + { + this.passwordNeverExpiresField = Enums.ParseYesNoType(value); + this.passwordNeverExpiresFieldSet = true; + } + if (("CanNotChangePassword" == name)) + { + this.canNotChangePasswordField = Enums.ParseYesNoType(value); + this.canNotChangePasswordFieldSet = true; + } + if (("RemoveOnUninstall" == name)) + { + this.removeOnUninstallField = Enums.ParseYesNoType(value); + this.removeOnUninstallFieldSet = true; + } + if (("FailIfExists" == name)) + { + this.failIfExistsField = Enums.ParseYesNoType(value); + this.failIfExistsFieldSet = true; + } + if (("LogonAsService" == name)) + { + this.logonAsServiceField = Enums.ParseYesNoType(value); + this.logonAsServiceFieldSet = true; + } + if (("LogonAsBatchJob" == name)) + { + this.logonAsBatchJobField = Enums.ParseYesNoType(value); + this.logonAsBatchJobFieldSet = true; + } + if (("UpdateIfExists" == name)) + { + this.updateIfExistsField = Enums.ParseYesNoType(value); + this.updateIfExistsFieldSet = true; + } + if (("PasswordExpired" == name)) + { + this.passwordExpiredField = Enums.ParseYesNoType(value); + this.passwordExpiredFieldSet = true; + } + if (("Disabled" == name)) + { + this.disabledField = Enums.ParseYesNoType(value); + this.disabledFieldSet = true; + } + if (("CreateUser" == name)) + { + this.createUserField = Enums.ParseYesNoType(value); + this.createUserFieldSet = true; + } + if (("Vital" == name)) + { + this.vitalField = Enums.ParseYesNoType(value); + this.vitalFieldSet = true; + } + } + } + + /// + /// Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class XmlFile : ISchemaElement, ISetAttributes + { + + private string idField; + + private bool idFieldSet; + + private string elementPathField; + + private bool elementPathFieldSet; + + private string fileField; + + private bool fileFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private string valueField; + + private bool valueFieldSet; + + private ActionType actionField; + + private bool actionFieldSet; + + private YesNoType permanentField; + + private bool permanentFieldSet; + + private YesNoType preserveModifiedDateField; + + private bool preserveModifiedDateFieldSet; + + private int sequenceField; + + private bool sequenceFieldSet; + + private SelectionLanguageType selectionLanguageField; + + private bool selectionLanguageFieldSet; + + private ISchemaElement parentElement; + + /// + /// Identifier for xml file modification. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + /// + /// The XPath of the element to be modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. + /// + public string ElementPath + { + get + { + return this.elementPathField; + } + set + { + this.elementPathFieldSet = true; + this.elementPathField = value; + } + } + + /// + /// Path of the .xml file to configure. + /// + public string File + { + get + { + return this.fileField; + } + set + { + this.fileFieldSet = true; + this.fileField = value; + } + } + + /// + /// Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + /// + /// The value to be written. See the + /// + public string Value + { + get + { + return this.valueField; + } + set + { + this.valueFieldSet = true; + this.valueField = value; + } + } + + /// + /// The type of modification to be made to the XML file when the component is installed. + /// + public ActionType Action + { + get + { + return this.actionField; + } + set + { + this.actionFieldSet = true; + this.actionField = value; + } + } + + /// + /// Specifies whether or not the modification should be removed on uninstall. This has no effect on uninstall if the action was deleteValue. + /// + public YesNoType Permanent + { + get + { + return this.permanentField; + } + set + { + this.permanentFieldSet = true; + this.permanentField = value; + } + } + + /// + /// Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. + /// + public YesNoType PreserveModifiedDate + { + get + { + return this.preserveModifiedDateField; + } + set + { + this.preserveModifiedDateFieldSet = true; + this.preserveModifiedDateField = value; + } + } + + /// + /// Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. + /// + public int Sequence + { + get + { + return this.sequenceField; + } + set + { + this.sequenceFieldSet = true; + this.sequenceField = value; + } + } + + /// + /// Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language. + /// + public SelectionLanguageType SelectionLanguage + { + get + { + return this.selectionLanguageField; + } + set + { + this.selectionLanguageFieldSet = true; + this.selectionLanguageField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + /// + /// Parses a ActionType from a string. + /// + public static ActionType ParseActionType(string value) + { + ActionType parsedValue; + XmlFile.TryParseActionType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ActionType from a string. + /// + public static bool TryParseActionType(string value, out ActionType parsedValue) + { + parsedValue = ActionType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("createElement" == value)) + { + parsedValue = ActionType.createElement; + } + else + { + if (("deleteValue" == value)) + { + parsedValue = ActionType.deleteValue; + } + else + { + if (("setValue" == value)) + { + parsedValue = ActionType.setValue; + } + else + { + if (("bulkSetValue" == value)) + { + parsedValue = ActionType.bulkSetValue; + } + else + { + parsedValue = ActionType.IllegalValue; + return false; + } + } + } + } + return true; + } + + /// + /// Parses a SelectionLanguageType from a string. + /// + public static SelectionLanguageType ParseSelectionLanguageType(string value) + { + SelectionLanguageType parsedValue; + XmlFile.TryParseSelectionLanguageType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a SelectionLanguageType from a string. + /// + public static bool TryParseSelectionLanguageType(string value, out SelectionLanguageType parsedValue) + { + parsedValue = SelectionLanguageType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("XPath" == value)) + { + parsedValue = SelectionLanguageType.XPath; + } + else + { + if (("XSLPattern" == value)) + { + parsedValue = SelectionLanguageType.XSLPattern; + } + else + { + parsedValue = SelectionLanguageType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("XmlFile", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.elementPathFieldSet) + { + writer.WriteAttributeString("ElementPath", this.elementPathField); + } + if (this.fileFieldSet) + { + writer.WriteAttributeString("File", this.fileField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.valueFieldSet) + { + writer.WriteAttributeString("Value", this.valueField); + } + if (this.actionFieldSet) + { + if ((this.actionField == ActionType.createElement)) + { + writer.WriteAttributeString("Action", "createElement"); + } + if ((this.actionField == ActionType.deleteValue)) + { + writer.WriteAttributeString("Action", "deleteValue"); + } + if ((this.actionField == ActionType.setValue)) + { + writer.WriteAttributeString("Action", "setValue"); + } + if ((this.actionField == ActionType.bulkSetValue)) + { + writer.WriteAttributeString("Action", "bulkSetValue"); + } + } + if (this.permanentFieldSet) + { + if ((this.permanentField == YesNoType.no)) + { + writer.WriteAttributeString("Permanent", "no"); + } + if ((this.permanentField == YesNoType.yes)) + { + writer.WriteAttributeString("Permanent", "yes"); + } + } + if (this.preserveModifiedDateFieldSet) + { + if ((this.preserveModifiedDateField == YesNoType.no)) + { + writer.WriteAttributeString("PreserveModifiedDate", "no"); + } + if ((this.preserveModifiedDateField == YesNoType.yes)) + { + writer.WriteAttributeString("PreserveModifiedDate", "yes"); + } + } + if (this.sequenceFieldSet) + { + writer.WriteAttributeString("Sequence", this.sequenceField.ToString(CultureInfo.InvariantCulture)); + } + if (this.selectionLanguageFieldSet) + { + if ((this.selectionLanguageField == SelectionLanguageType.XPath)) + { + writer.WriteAttributeString("SelectionLanguage", "XPath"); + } + if ((this.selectionLanguageField == SelectionLanguageType.XSLPattern)) + { + writer.WriteAttributeString("SelectionLanguage", "XSLPattern"); + } + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("ElementPath" == name)) + { + this.elementPathField = value; + this.elementPathFieldSet = true; + } + if (("File" == name)) + { + this.fileField = value; + this.fileFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Value" == name)) + { + this.valueField = value; + this.valueFieldSet = true; + } + if (("Action" == name)) + { + this.actionField = XmlFile.ParseActionType(value); + this.actionFieldSet = true; + } + if (("Permanent" == name)) + { + this.permanentField = Enums.ParseYesNoType(value); + this.permanentFieldSet = true; + } + if (("PreserveModifiedDate" == name)) + { + this.preserveModifiedDateField = Enums.ParseYesNoType(value); + this.preserveModifiedDateFieldSet = true; + } + if (("Sequence" == name)) + { + this.sequenceField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.sequenceFieldSet = true; + } + if (("SelectionLanguage" == name)) + { + this.selectionLanguageField = XmlFile.ParseSelectionLanguageType(value); + this.selectionLanguageFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ActionType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + /// + /// Creates a new element under the element specified in ElementPath. The Name attribute is required in this case and specifies the name of the new element. The Value attribute is not necessary when createElement is specified as the action. If the Value attribute is set, it will cause the new element's text value to be set. + /// + createElement, + + /// + /// Deletes a value from the element specified in the ElementPath. If Name is specified, the attribute with that name is deleted. If Name is not specified, the text value of the element specified in the ElementPath is deleted. The Value attribute is ignored if deleteValue is the action specified. + /// + deleteValue, + + /// + /// Sets a value in the element specified in the ElementPath. If Name is specified, and attribute with that name is set to the value specified in Value. If Name is not specified, the text value of the element is set. Value is a required attribute if setValue is the action specified. + /// + setValue, + + /// + /// Sets all the values in the elements that match the ElementPath. If Name is specified, attributes with that name are set to the same value specified in Value. If Name is not specified, the text values of the elements are set. Value is a required attribute if setBulkValue is the action specified. + /// + bulkSetValue, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum SelectionLanguageType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + XPath, + + XSLPattern, + } + } + + /// + /// Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions. + /// + [GeneratedCode("XsdGen", "4.0.0.0")] + public class XmlConfig : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes + { + + private ElementCollection children; + + private string idField; + + private bool idFieldSet; + + private ActionType actionField; + + private bool actionFieldSet; + + private string elementIdField; + + private bool elementIdFieldSet; + + private string elementPathField; + + private bool elementPathFieldSet; + + private string fileField; + + private bool fileFieldSet; + + private string nameField; + + private bool nameFieldSet; + + private NodeType nodeField; + + private bool nodeFieldSet; + + private OnType onField; + + private bool onFieldSet; + + private YesNoType preserveModifiedDateField; + + private bool preserveModifiedDateFieldSet; + + private int sequenceField; + + private bool sequenceFieldSet; + + private string valueField; + + private bool valueFieldSet; + + private string verifyPathField; + + private bool verifyPathFieldSet; + + private ISchemaElement parentElement; + + public XmlConfig() + { + ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); + childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(XmlConfig))); + this.children = childCollection0; + } + + public virtual IEnumerable Children + { + get + { + return this.children; + } + } + + [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] + public virtual IEnumerable this[System.Type childType] + { + get + { + return this.children.Filter(childType); + } + } + + /// + /// Identifier for xml file modification. + /// + public string Id + { + get + { + return this.idField; + } + set + { + this.idFieldSet = true; + this.idField = value; + } + } + + public ActionType Action + { + get + { + return this.actionField; + } + set + { + this.actionFieldSet = true; + this.actionField = value; + } + } + + /// + /// The Id of another XmlConfig to add attributes to. In this case, the 'ElementPath', 'Action', 'Node', and 'On' attributes must be omitted. + /// + public string ElementId + { + get + { + return this.elementIdField; + } + set + { + this.elementIdFieldSet = true; + this.elementIdField = value; + } + } + + /// + /// The XPath of the parent element being modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. + /// + public string ElementPath + { + get + { + return this.elementPathField; + } + set + { + this.elementPathFieldSet = true; + this.elementPathField = value; + } + } + + /// + /// Path of the .xml file to configure. + /// + public string File + { + get + { + return this.fileField; + } + set + { + this.fileFieldSet = true; + this.fileField = value; + } + } + + /// + /// Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. + /// + public string Name + { + get + { + return this.nameField; + } + set + { + this.nameFieldSet = true; + this.nameField = value; + } + } + + public NodeType Node + { + get + { + return this.nodeField; + } + set + { + this.nodeFieldSet = true; + this.nodeField = value; + } + } + + public OnType On + { + get + { + return this.onField; + } + set + { + this.onFieldSet = true; + this.onField = value; + } + } + + /// + /// Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. + /// + public YesNoType PreserveModifiedDate + { + get + { + return this.preserveModifiedDateField; + } + set + { + this.preserveModifiedDateFieldSet = true; + this.preserveModifiedDateField = value; + } + } + + /// + /// Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. + /// + public int Sequence + { + get + { + return this.sequenceField; + } + set + { + this.sequenceFieldSet = true; + this.sequenceField = value; + } + } + + /// + /// The value to be written. See the + /// + public string Value + { + get + { + return this.valueField; + } + set + { + this.valueFieldSet = true; + this.valueField = value; + } + } + + /// + /// The XPath to the element being modified. This is required for 'delete' actions. For 'create' actions, VerifyPath is used to decide if the element already exists. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. + /// + public string VerifyPath + { + get + { + return this.verifyPathField; + } + set + { + this.verifyPathFieldSet = true; + this.verifyPathField = value; + } + } + + public virtual ISchemaElement ParentElement + { + get + { + return this.parentElement; + } + set + { + this.parentElement = value; + } + } + + public virtual void AddChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.AddElement(child); + child.ParentElement = this; + } + + public virtual void RemoveChild(ISchemaElement child) + { + if ((null == child)) + { + throw new ArgumentNullException("child"); + } + this.children.RemoveElement(child); + child.ParentElement = null; + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + ISchemaElement ICreateChildren.CreateChild(string childName) + { + if (String.IsNullOrEmpty(childName)) + { + throw new ArgumentNullException("childName"); + } + ISchemaElement childValue = null; + if (("XmlConfig" == childName)) + { + childValue = new XmlConfig(); + } + if ((null == childValue)) + { + throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); + } + return childValue; + } + + /// + /// Parses a ActionType from a string. + /// + public static ActionType ParseActionType(string value) + { + ActionType parsedValue; + XmlConfig.TryParseActionType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a ActionType from a string. + /// + public static bool TryParseActionType(string value, out ActionType parsedValue) + { + parsedValue = ActionType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("create" == value)) + { + parsedValue = ActionType.create; + } + else + { + if (("delete" == value)) + { + parsedValue = ActionType.delete; + } + else + { + parsedValue = ActionType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Parses a NodeType from a string. + /// + public static NodeType ParseNodeType(string value) + { + NodeType parsedValue; + XmlConfig.TryParseNodeType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a NodeType from a string. + /// + public static bool TryParseNodeType(string value, out NodeType parsedValue) + { + parsedValue = NodeType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("element" == value)) + { + parsedValue = NodeType.element; + } + else + { + if (("value" == value)) + { + parsedValue = NodeType.value; + } + else + { + if (("document" == value)) + { + parsedValue = NodeType.document; + } + else + { + parsedValue = NodeType.IllegalValue; + return false; + } + } + } + return true; + } + + /// + /// Parses a OnType from a string. + /// + public static OnType ParseOnType(string value) + { + OnType parsedValue; + XmlConfig.TryParseOnType(value, out parsedValue); + return parsedValue; + } + + /// + /// Tries to parse a OnType from a string. + /// + public static bool TryParseOnType(string value, out OnType parsedValue) + { + parsedValue = OnType.NotSet; + if (string.IsNullOrEmpty(value)) + { + return false; + } + if (("install" == value)) + { + parsedValue = OnType.install; + } + else + { + if (("uninstall" == value)) + { + parsedValue = OnType.uninstall; + } + else + { + parsedValue = OnType.IllegalValue; + return false; + } + } + return true; + } + + /// + /// Processes this element and all child elements into an XmlWriter. + /// + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + public virtual void OutputXml(XmlWriter writer) + { + if ((null == writer)) + { + throw new ArgumentNullException("writer"); + } + writer.WriteStartElement("XmlConfig", "http://wixtoolset.org/schemas/v4/wxs/util"); + if (this.idFieldSet) + { + writer.WriteAttributeString("Id", this.idField); + } + if (this.actionFieldSet) + { + if ((this.actionField == ActionType.create)) + { + writer.WriteAttributeString("Action", "create"); + } + if ((this.actionField == ActionType.delete)) + { + writer.WriteAttributeString("Action", "delete"); + } + } + if (this.elementIdFieldSet) + { + writer.WriteAttributeString("ElementId", this.elementIdField); + } + if (this.elementPathFieldSet) + { + writer.WriteAttributeString("ElementPath", this.elementPathField); + } + if (this.fileFieldSet) + { + writer.WriteAttributeString("File", this.fileField); + } + if (this.nameFieldSet) + { + writer.WriteAttributeString("Name", this.nameField); + } + if (this.nodeFieldSet) + { + if ((this.nodeField == NodeType.element)) + { + writer.WriteAttributeString("Node", "element"); + } + if ((this.nodeField == NodeType.value)) + { + writer.WriteAttributeString("Node", "value"); + } + if ((this.nodeField == NodeType.document)) + { + writer.WriteAttributeString("Node", "document"); + } + } + if (this.onFieldSet) + { + if ((this.onField == OnType.install)) + { + writer.WriteAttributeString("On", "install"); + } + if ((this.onField == OnType.uninstall)) + { + writer.WriteAttributeString("On", "uninstall"); + } + } + if (this.preserveModifiedDateFieldSet) + { + if ((this.preserveModifiedDateField == YesNoType.no)) + { + writer.WriteAttributeString("PreserveModifiedDate", "no"); + } + if ((this.preserveModifiedDateField == YesNoType.yes)) + { + writer.WriteAttributeString("PreserveModifiedDate", "yes"); + } + } + if (this.sequenceFieldSet) + { + writer.WriteAttributeString("Sequence", this.sequenceField.ToString(CultureInfo.InvariantCulture)); + } + if (this.valueFieldSet) + { + writer.WriteAttributeString("Value", this.valueField); + } + if (this.verifyPathFieldSet) + { + writer.WriteAttributeString("VerifyPath", this.verifyPathField); + } + for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) + { + ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); + childElement.OutputXml(writer); + } + writer.WriteEndElement(); + } + + [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + void ISetAttributes.SetAttribute(string name, string value) + { + if (String.IsNullOrEmpty(name)) + { + throw new ArgumentNullException("name"); + } + if (("Id" == name)) + { + this.idField = value; + this.idFieldSet = true; + } + if (("Action" == name)) + { + this.actionField = XmlConfig.ParseActionType(value); + this.actionFieldSet = true; + } + if (("ElementId" == name)) + { + this.elementIdField = value; + this.elementIdFieldSet = true; + } + if (("ElementPath" == name)) + { + this.elementPathField = value; + this.elementPathFieldSet = true; + } + if (("File" == name)) + { + this.fileField = value; + this.fileFieldSet = true; + } + if (("Name" == name)) + { + this.nameField = value; + this.nameFieldSet = true; + } + if (("Node" == name)) + { + this.nodeField = XmlConfig.ParseNodeType(value); + this.nodeFieldSet = true; + } + if (("On" == name)) + { + this.onField = XmlConfig.ParseOnType(value); + this.onFieldSet = true; + } + if (("PreserveModifiedDate" == name)) + { + this.preserveModifiedDateField = Enums.ParseYesNoType(value); + this.preserveModifiedDateFieldSet = true; + } + if (("Sequence" == name)) + { + this.sequenceField = Convert.ToInt32(value, CultureInfo.InvariantCulture); + this.sequenceFieldSet = true; + } + if (("Value" == name)) + { + this.valueField = value; + this.valueFieldSet = true; + } + if (("VerifyPath" == name)) + { + this.verifyPathField = value; + this.verifyPathFieldSet = true; + } + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum ActionType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + create, + + delete, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum NodeType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + element, + + value, + + document, + } + + [GeneratedCode("XsdGen", "4.0.0.0")] + public enum OnType + { + + IllegalValue = int.MaxValue, + + NotSet = -1, + + install, + + uninstall, + } + } +} diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd new file mode 100644 index 00000000..fb8d8032 --- /dev/null +++ b/src/wixext/util.xsd @@ -0,0 +1,1692 @@ + + + + + + + + The source code schema for the WiX Toolset Utility Extension. + + + + + + + + + + + Closes applications or schedules a reboot if application cannot be closed. + + + + + + + Condition that determines if the application should be closed. Must be blank or evaluate to true + for the application to be scheduled for closing. + + + + + Identifier for the close application (primary key). If the Id is not specified, one will be generated. + + + + + Name of the exectuable to be closed. This should only be the file name. + + + + + Description to show if application is running and needs to be closed. + + + + + Optionally orders the applications to be closed. + + + + + Optionally sends a close message to the application. Default is no. + + + + + Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application. Default is "no". + + + + + Optionally sends a close message to the application from deffered action without impersonation. Default is no. + + + + + Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application from a deffered action without impersonation. Default is "no". + + + + + Optionally prompts for reboot if application is still running. The default is "yes". The TerminateProcess attribute must be "no" or not specified if this attribute is "yes". + + + + + + When this attribute is set to "yes", the user will be prompted when the application is still running. The Description attribute must contain the message to + display in the prompt. The prompt occurs before executing any of the other options and gives the options to "Abort", "Retry", or "Ignore". Abort will cancel + the install. Retry will attempt the check again and if the application is still running, prompt again. "Ignore" will continue and execute any other options + set on the CloseApplication element. The default is "no". + + + + + + Property to be set if application is still running. Useful for launch conditions or to conditionalize custom UI to ask user to shut down apps. + + + + + + Attempts to terminates process and return the specified exit code if application is still running after sending any requested close and/or end session messages. + If this attribute is specified, the RebootPrompt attribute must be "no". The default is "no". + + + + + + + Optional time in seconds to wait for the application to exit after the close and/or end session messages. If the application is still running after the timeout then + the RebootPrompt or TerminateProcess attributes will be considered. The default value is "5" seconds. + + + + + + + + + + Describes a component search. + + + + + + + + + + Component to search for. + + + + + Optional ProductCode to determine if the component is installed. + + + + + + Rather than saving the matching key path into the variable, a ComponentSearch can save an attribute of the component instead. + + + + + + + Saves the parent directory for the component's file key path; other types of key path are returned unmodified. + + + + + Saves the state of the component: absent (2), locally installed (3), will run from source (4), or installed in default location (either local or from source) (5) + + + + + Saves the key path of the component if installed. This is the default. + + + + + + + + + + References a ComponentSearch. + + + + + + + + + + + + Describes a directory search. + + + + + + + + + + Directory path to search for. + + + + + + Rather than saving the matching directory path into the variable, a DirectorySearch can save an + attribute of the matching directory instead. + + + + + + + Saves true if a matching directory is found; false otherwise. + + + + + + + + + + References a DirectorySearch. + + + + + + + + + + + + + + + Creates an event source. + + + + + + The number of categories in CategoryMessageFile. CategoryMessageFile + must be specified too. + + + + + + + Name of the category message file. CategoryCount must be specified too. + Note that this is a formatted field, so you can use [#fileId] syntax to + refer to a file being installed. It is also written as a REG_EXPAND_SZ + string, so you can use %environment_variable% syntax to refer to a file + already present on the user's machine. + + + + + + + Name of the event message file. + Note that this is a formatted field, so you can use [#fileId] syntax to + refer to a file being installed. It is also written as a REG_EXPAND_SZ + string, so you can use %environment_variable% syntax to refer to a file + already present on the user's machine. + + + + + + + Marks the EventSource registry as the key path of the component it belongs to. + + + + + + Name of the event source's log. + + + + + Name of the event source. + + + + + + Name of the parameter message file. + Note that this is a formatted field, so you can use [#fileId] syntax to + refer to a file being installed. It is also written as a REG_EXPAND_SZ + string, so you can use %environment_variable% syntax to refer to a file + already present on the user's machine. + + + + + + + Equivalent to EVENTLOG_ERROR_TYPE. + + + + + + + Equivalent to EVENTLOG_AUDIT_FAILURE. + + + + + + + Equivalent to EVENTLOG_INFORMATION_TYPE. + + + + + + + Equivalent to EVENTLOG_AUDIT_SUCCESS. + + + + + + + Equivalent to EVENTLOG_WARNING_TYPE. + + + + + + + + Describes a file search. + + + + + + + + + + File path to search for. + + + + + + Rather than saving the matching file path into the variable, a FileSearch can save an attribute of the matching file instead. + + + + + + + Saves true if a matching file is found; false otherwise. + + + + + Saves the version information for files that have it (.exe, .dll); zero-version (0.0.0.0) otherwise. + + + + + + + + + + References a FileSearch. + + + + + + + + + + + + + + + Creates a file share out of the component's directory. + + + + + + ACL permission + + + + + + Identifier for the file share (primary key). + + + + + Name of the file share. + + + + + Description of the file share. + + + + + + + + Sets ACLs on a FileShare. This element has no Id attribute. + The table and key are taken from the parent element. + + + + + + + + + + + + + + + + + + + + For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. + + + + + For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. + + + + + For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. + + + + + For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. + + + + + + + + + specifying this will fail to grant read access + + + + + + + + + + + Formats a file's contents at install time. The contents are formatted according to the rules of the + Formatted data type. + + + + + + + The id of a Binary row that contains a copy of the file. The file in the Binary table overwrites whatever + file is installed by the parent component. + + + + + + + + + + + + + + Finds user groups on the local machine or specified Active Directory domain. The local machine will be + searched for the group first then fallback to looking in Active Directory. This element is not capable + of creating new groups but can be used to add new or existing users to an existing group. + + + + + + Unique identifier in your installation package for this group. + + + + + A Formatted string that contains the name of the group to be found. + + + + + An optional Formatted string that specifies the domain for the group. + + + + + + + Used to join a user to a group + + + + + + + + + + How To: Create a shortcut to a webpage + + Creates a shortcut to a URL. + + + + + Unique identifier in your installation package for this Internet shortcut. + + + + + Identifier reference to Directory element where shortcut is to be created. This attribute's value defaults to the parent Component directory. + + + + + + The name of the shortcut file, which is visible to the user. (The .lnk + extension is added automatically and by default, is not shown to the user.) + + + + + + + URL that should be opened when the user selects the shortcut. Windows + opens the URL in the appropriate handler for the protocol specified + in the URL. Note that this is a formatted field, so you can use + [#fileId] syntax to refer to a file being installed (using the file: + protocol). + + + + + + Which type of shortcut should be created. + + + + + + Creates .url files using IUniformResourceLocatorW. + + + + + Creates .lnk files using IShellLinkW (default). + + + + + + + + + Icon file that should be displayed. Note that this is a formatted field, so you can use + [#fileId] syntax to refer to a file being installed (using the file: + protocol). + + + + + + + Index of the icon being referenced + + + + + + + + + + + Used to create performance categories and configure performance counters. + + + + + + + + Unique identifier in your installation package for this performance counter category. + + + + + Name for the performance counter category. If this attribute is not provided the Id attribute is used as the name of the performance counter category. + + + + + Optional help text for the performance counter category. + + + + + Flag that specifies whether the performance counter category is multi or single instanced. Default is single instance. + + + + + DLL that contains the performance counter. The default is "netfxperf.dll" which should be used for all managed code performance counters. + + + + + Function entry point in to the Library DLL called when opening the performance counter. The default is "OpenPerformanceData" which should be used for all managed code performance counters. + + + + + Function entry point in to the Library DLL called when closing the performance counter. The default is "ClosePerformanceData" which should be used for all managed code performance counters. + + + + + Function entry point in to the Library DLL called when collecting data from the performance counter. The default is "CollectPerformanceData" which should be used for all managed code performance counters. + + + + + Default language for the performance category and contained counters' names and help text. + + + + + + + Creates a performance counter in a performance category. + + + + + Name for the performance counter. + + + + + Optional help text for the performance counter. + + + + + Type of the performance counter. + + + + + Language for the peformance counter name and help. The default is to use the parent PerformanceCategory element's DefaultLanguage attribute. + + + + + + + + + + + Used to install Perfmon counters. + + + + + + + + + + + + Used to install Perfmon Counter Manifests. + Note that this functionality cannot be used with major upgrades that are scheduled after the InstallExecute, + InstallExecuteAgain, or InstallFinalize actions. For more information on major upgrade scheduling, see + RemoveExistingProducts Action. + + + + + + The directory that holds the resource file of the providers in the perfmon counter manifest. Often the resource file path cannot be determined until setup time. Put the directory here and during perfmon manifest registrtion the path will be updated in the registry. If not specified, Perfmon will look for the resource file in the same directory of the perfmon counter manifest file. + + + + + + + + + + Used to install Event Manifests. + + + + + The message file (including path) of all the providers in the event manifest. Often the message file path cannot be determined until setup time. Put your MessageFile here and the messageFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. + + + + + The parameter file (including path) of all the providers in the event manifest. Often the parameter file path cannot be determined until setup time. Put your ParameterFile here and the parameterFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. + + + + + The resource file (including path) of all the providers in the event manifest. Often the resource file path cannot be determined until setup time. Put your ResourceFile here and the resourceFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. + + + + + + + + Sets ACLs on File, Registry, CreateFolder, or ServiceInstall. When under a Registry element, this cannot be used + if the Action attribute's value is remove or removeKeyOnInstall. This element has no Id attribute. + The table and key are taken from the parent element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. + + + + + For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. + + + + + For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. + + + + + For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. + + + + + + + + + + + + + + + + + + + specifying this will fail to grant read access + + + + + + Required to call the QueryServiceConfig and QueryServiceConfig2 functions to query the service configuration. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the ChangeServiceConfig or ChangeServiceConfig2 function to change the service configuration. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the QueryServiceStatus function to ask the service control manager about the status of the service. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the EnumDependentServices function to enumerate all the services dependent on the service. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the StartService function to start the service. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the ControlService function to stop the service. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the ControlService function to pause or continue the service. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the ControlService function to ask the service to report its status immediately. Only valid under a 'ServiceInstall' parent. + + + + + Required to call the ControlService function to specify a user-defined control code. Only valid under a 'ServiceInstall' parent. + + + + + + + Describes a product search. + + + + + + + + + + The Guid attribute has been deprecated; use the ProductCode or UpgradeCode attribute instead. If this attribute is used, it is assumed to be a ProductCode. + + + + + The ProductCode to use for the search. This attribute must be omitted if UpgradeCode is specified. + + + + + The UpgradeCode to use for the search. This attribute must be omitted if ProductCode is specified. Note that if multiple products are found, the highest versioned product will be used for the result. + + + + + + Rather than saving the product version into the variable, a ProductSearch can save another attribute of the matching product instead. + + + + + + + Saves the version of a matching product if found; 0.0.0.0 otherwise. This is the default. + + + + + Saves the language of a matching product if found; empty otherwise. + + + + + Saves the state of the product: advertised (1), absent (2), or locally installed (5). + + + + + Saves the assignment type of the product: per-user (0), or per-machine (1). + + + + + + + + + + References a ProductSearch. + + + + + + + + + + + + + + + + The custom action that implements RemoveFolderEx does so by writing temporary rows to the RemoveFile table + for each subfolder of the root folder you specify. Because it might dramatically affect Windows Installer's + File Costing, + the temporary rows must be written before the CostInitialize standard action. Unfortunately, MSI doesn't + create properties for the Directory hierarchy in your package until later, in the CostFinalize action. + An easy workaround for a typical use case of removing a folder during uninstall is to write the directory + path to the registry and to load it during uninstall. See + The WiX toolset's "Remember Property" pattern + for an example. + If you use custom actions to set properties, ensure that they are scheduled before the WixRemoveFoldersEx custom action. + + + + Remove a folder and all contained files and folders if the parent component is selected for installation or removal. + The folder must be specified in the Property attribute as the name of a property that will have a value that resolves + to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used. + For more details, see the Remarks. + + + + + + Primary key used to identify this particular entry. If this is not specified, a stable identifier + will be generated at compile time based on the other attributes. + + + + + + The id of a property that resolves to the full path of the source directory. The property does not have + to exist in the installer database at creation time; it could be created at installation time by a custom + action, on the command line, etc. The property value can contain environment variables surrounded by + percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before + being evaluated for a full path. + + + + + + + This value determines when the folder may be removed. + + + + + + + + Removes the folder only when the parent component is being installed (msiInstallStateLocal or msiInstallStateSource). + + + + + + + Default: Removes the folder only when the parent component is being removed (msiInstallStateAbsent). + + + + + + + Removes the folder when the parent component is being installed or removed. + + + + + + + + + + + Registers a resource with the Restart Manager. + + + + + + + + + + + The unique identifier for this resource. A unique identifier will + be generated automatically if not specified. + + + + + The full path to the process module to register with the Restart Manager. + This can be a formatted value that resolves to a full path. + + + + + The name of a process to register with the Restart Manager. + This can be a formatted value that resolves to a process name. + + + + + The name of a Windows service to register with the Restart Manager. + This can be a formatted value that resolves to a service name. + + + + + + + Describes a registry search. + + + + + + + + + + Registry root hive to search under. + + + + + + HKEY_LOCAL_MACHINE + + + + + HKEY_CURRENT_USER + + + + + HKEY_CLASSES_ROOT + + + + + HKEY_USERS + + + + + + + + Key to search for. + + + + + Optional value to search for under the given Key. + + + + + What format to return the value in. + + + + + + Returns the unformatted value directly from the registry. For example, a REG_DWORD value of '1' is returned as '1', not '#1'. + + + + + Returns the value formatted as Windows Installer would. For example, a REG_DWORD value of '1' is returned as '#1', not '1'. + + + + + + + + Whether to expand any environment variables in REG_SZ, REG_EXPAND_SZ, or REG_MULTI_SZ values. + + + + + + Rather than saving the matching registry value into the variable, a RegistrySearch can save an attribute of the matching entry instead. + + + + + + + Saves true if a matching registry entry is found; false otherwise. + + + + + Saves the value of the registry key in the variable. This is the default. + + + + + + + + Instructs the search to look in the 64-bit registry when the value is 'yes'. When the value is 'no', the search looks in the 32-bit registry. The default value is 'no'. + + + + + + + References a RegistrySearch. + + + + + + + + + + + + Service configuration information for failure actions. + + + + + + Nesting a ServiceConfig element under a ServiceInstall element will result in the service being installed to be configured. + Nesting a ServiceConfig element under a component element will result in an already installed service to be configured. If the service does not exist prior to the install of the MSI package, the install will fail. + + + + + + + + Required if not under a ServiceInstall element. + + + + + Action to take on the first failure of the service. + + + + + + + + + + + + + Action to take on the second failure of the service. + + + + + + + + + + + + + Action to take on the third failure of the service. + + + + + + + + + + + + + Number of days after which to reset the failure count to zero if there are no failures. + + + + + If any of the three *ActionType attributes is "restart", this specifies the number of seconds to wait before doing so. + + + + + If any of the three *ActionType attributes is "runCommand", this specifies the command to run when doing so. This value is formatted. + + + + + If any of the three *ActionType attributes is "reboot", this specifies the message to broadcast to server users before doing so. + + + + + + + Updates the last modified date/time of a file. + + + + + + + + Identifier for the touch file operation. If the identifier is not specified it will be generated. + + + + + Path of the file to update. This value is formatted. + + + + + Specifies whether or not the modified time of the file should be updated on install. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. + + + + + Specifies whether or not the modified time of the file should be updated on reinstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. + + + + + Specifies whether or not the modified time of the file should be updated on uninstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'no'. + + + + + Indicates the installation will succeed even if the modified time of the file cannot be updated. The default is 'no'. + + + + + + + User for all kinds of things. When it is not nested under a component it is included in the MSI so it can be referenced by other elements such as the User attribute in the AppPool element. When it is nested under a Component element, the User will be created on install and can also be used for reference. + + + + + + + + + + + + + + + + + A Formatted string that contains the name of the user account. + + + + + A Formatted string that contains the local machine or Active Directory domain for the user. + + + + + Usually a Property that is passed in on the command-line to keep it more secure. + + + + + The account's password never expires. Equivalent to UF_DONT_EXPIRE_PASSWD. + + + + + The user cannot change the account's password. Equivalent to UF_PASSWD_CANT_CHANGE. + + + + + Indicates whether the user account should be removed or left behind on uninstall. + + + + + Indicates if the install should fail if the user already exists. + + + + + Indicates whether or not the user can logon as a serivce. User creation can be skipped if all that is desired is to set this access right on the user. + + + + + Indicates whether or not the user can logon as a batch job. User creation can be skipped if all that is desired is to set this access right on the user. + + + + + Indicates if the user account properties should be updated if the user already exists. + + + + + Indicates whether the user must change their password on their first login. + + + + + The account is disabled. Equivalent to UF_ACCOUNTDISABLE. + + + + + Indicates whether or not to create the user. User creation can be skipped if all that is desired is to join a user to groups. + + + + + Indicates whether failure to create the user or add the user to a group fails the installation. The default value is "yes". + + + + + + + + Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions. + + + + + + + + + Identifier for xml file modification. + + + + + The XPath of the element to be modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. + + + + + Path of the .xml file to configure. + + + + + Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. + + + + + + The value to be written. See the Formatted topic for information how to escape square brackets in the value. + + + + + + The type of modification to be made to the XML file when the component is installed. + + + + + + Creates a new element under the element specified in ElementPath. The Name attribute is required in this case and specifies the name of the new element. The Value attribute is not necessary when createElement is specified as the action. If the Value attribute is set, it will cause the new element's text value to be set. + + + + + Deletes a value from the element specified in the ElementPath. If Name is specified, the attribute with that name is deleted. If Name is not specified, the text value of the element specified in the ElementPath is deleted. The Value attribute is ignored if deleteValue is the action specified. + + + + + Sets a value in the element specified in the ElementPath. If Name is specified, and attribute with that name is set to the value specified in Value. If Name is not specified, the text value of the element is set. Value is a required attribute if setValue is the action specified. + + + + + Sets all the values in the elements that match the ElementPath. If Name is specified, attributes with that name are set to the same value specified in Value. If Name is not specified, the text values of the elements are set. Value is a required attribute if setBulkValue is the action specified. + + + + + + + + Specifies whether or not the modification should be removed on uninstall. This has no effect on uninstall if the action was deleteValue. + + + + + Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. + + + + + Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. + + + + + + Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language. + + + + + + + + + + + + + + + Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions. + + + + + + + + + + + + Identifier for xml file modification. + + + + + + + + + + + + + The Id of another XmlConfig to add attributes to. In this case, the 'ElementPath', 'Action', 'Node', and 'On' attributes must be omitted. + + + + + The XPath of the parent element being modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. + + + + + Path of the .xml file to configure. + + + + + Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. + + + + + + + + + + + + + + + + + + + + + + Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. + + + + + Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. + + + + + + The value to be written. See the Formatted topic for information how to escape square brackets in the value. + + + + + + The XPath to the element being modified. This is required for 'delete' actions. For 'create' actions, VerifyPath is used to decide if the element already exists. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. + + + + + + + + Id of the search for ordering and dependency. + + + + + Name of the variable in which to place the result of the search. + + + + + Condition for evaluating the search. If this evaluates to false, the search is not executed at all. + + + + + Id of the search that this one should come after. + + + + + + Values of this type will either be "yes" or "no". + + + + + + + + + Enumeration of valid languages for performance counters. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Enumeration of valid types for performance counters. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs new file mode 100644 index 00000000..ac11c788 --- /dev/null +++ b/src/wixlib/UtilExtension.wxs @@ -0,0 +1,430 @@ + + + + + + + + + + !(loc.msierrUSRFailedUserCreate) + !(loc.msierrUSRFailedUserCreatePswd) + !(loc.msierrUSRFailedUserGroupAdd) + Failed to grant 'logon as service' rights to user. ([2] [3] [4] [5]) + !(loc.msierrUSRFailedUserCreateExists) + + + + + + !(loc.msierrSMBFailedCreate) + !(loc.msierrSMBFailedDrop) + + + + + + !(loc.msierrInstallPerfCounterData) + !(loc.msierrUninstallPerfCounterData) + + + + + + !(loc.msierrPERFMONFailedRegisterDLL) + !(loc.msierrPERFMONFailedUnregisterDLL) + + + + + + !(loc.msierrSecureObjectsFailedCreateSD) + !(loc.msierrSecureObjectsFailedSet) + !(loc.msierrSecureObjectsUnknownType) + + + + + + !(loc.msierrXmlFileFailedRead) + !(loc.msierrXmlFileFailedOpen) + !(loc.msierrXmlFileFailedSelect) + !(loc.msierrXmlFileFailedSave) + + + + + + !(loc.msierrXmlConfigFailedRead) + !(loc.msierrXmlConfigFailedOpen) + !(loc.msierrXmlConfigFailedSelect) + !(loc.msierrXmlConfigFailedSave) + + + + + + + + WIXFAILWHENDEFERRED=1 AND VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + + + NEWERVERSIONDETECTED AND VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi new file mode 100644 index 00000000..8328577f --- /dev/null +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + NOT REMOVE~="ALL" AND VersionNT > 400 + + + + + + + + + + VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 + + + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + NOT REMOVE~="ALL" AND VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 + + + + + + + + + + + + VersionNT > 400 + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + + + + NOT REMOVE~="ALL" AND VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/UtilExtension_x64.wxs b/src/wixlib/UtilExtension_x64.wxs new file mode 100644 index 00000000..e902f97a --- /dev/null +++ b/src/wixlib/UtilExtension_x64.wxs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixlib/UtilExtension_x86.wxs b/src/wixlib/UtilExtension_x86.wxs new file mode 100644 index 00000000..ff4f08c4 --- /dev/null +++ b/src/wixlib/UtilExtension_x86.wxs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi new file mode 100644 index 00000000..a56a2393 --- /dev/null +++ b/src/wixlib/caSuffix.wxi @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi new file mode 100644 index 00000000..141942f2 --- /dev/null +++ b/src/wixlib/caerr.wxi @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/wixlib/de-de.wxl b/src/wixlib/de-de.wxl new file mode 100644 index 00000000..47bfaaaa --- /dev/null +++ b/src/wixlib/de-de.wxl @@ -0,0 +1,33 @@ + + + + + + Konnte den Benutzer nicht anlegen. ([2] [3] [4] [5]) + Konnte den Benutzer auf Grund eines falschen Passwortes nicht anlegen. ([2] [3] [4] [5]) + Konnte Benutzer nicht zur Gruppe hinzufügen. ([2] [3] [4] [5]) + Konnte den Benutzer nicht anlegen, da er bereits existierte. ([2] [3] [4] [5]) + + Konnte Netzwerkfreigabe nicht anlegen. ([2] [3] [4] [5]) + Konnte Netzwerkfreigabe nicht entfernen. ([2] [3] [4] [5]) + + Konnte die DLL nicht für PerfMon registrieren. ([2] [3] [4] [5]) + Konnte die DLL nicht für PerfMon deregistrieren. ([2] [3] [4] [5]) + + Konnte die Daten der Leistungsüberwachung (performance counters) nicht installieren. ([2] [3] [4] [5]) + Konnte die Daten der Leistungsüberwachung (performance counters) nicht deinstallieren. ([2] [3] [4] [5]) + + Konnte keinen Security Descriptor für [3]\[4] erstellen, System Fehler: [2] + Konnte keinen Security Descriptor für das Objekt [3] erstellen, System Fehler: [2] + Unbekannter Objekt Typ [3], System Fehler: [2] + + Beim Lesen der XML Dateien trat ein Fehler auf. + Konnte XML Datei [3] nicht öffnen, System Fehler: [2] + Konnte Knoten [3] in der XML Datei [4] nicht finden, System Fehler: [2] + Beim Speichern der Änderungen an der XML Datei [3] trat ein Fehler auf, System Fehler: [2] + + Bei der Konfiguration der XML Dateien trat ein Fehler auf. + Konnte XML Datei [3] nicht öffnen, System Fehler: [2] + Konnte Knoten [3] in der XML Datei [4] nicht finden, System Fehler: [2] + Beim Speichern der Änderungen an der XML Datei [3] trat ein Fehler auf, System Fehler: [2] + diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl new file mode 100644 index 00000000..25ac4d5d --- /dev/null +++ b/src/wixlib/en-us.wxl @@ -0,0 +1,33 @@ + + + + + + Failed to create user. ([2] [3] [4] [5]) + Failed to create user due to invalid password. ([2] [3] [4] [5]) + Failed to add user to group. ([2] [3] [4] [5]) + Failed to create user because it already exists. ([2] [3] [4] [5]) + + Failed to create network share. ([2] [3] [4] [5]) + Failed to drop network share. ([2] [3] [4] [5]) + + Failed to register DLL with PerfMon. ([2] [3] [4] [5]) + Failed to unregister DLL with PerfMon. ([2] [3] [4] [5]) + + Failed to install performance counters. ([2] [3] [4] [5]) + Failed to uninstall performance counters. ([2] [3] [4] [5]) + + Failed to create security descriptor for [3]\[4], system error: [2] + Failed to set security descriptor on object [3], system error: [2] + Unknown Object Type [3], system error: [2] + + There was a failure while configuring XML files. + Failed to open XML file [3], system error: [2] + Failed to find node: [3] in XML file: [4], system error: [2] + Failed to save changes to XML file [3], system error: [2] + + There was a failure while configuring XML files. + Failed to open XML file [3], system error: [2] + Failed to find node: [3] in XML file: [4], system error: [2] + Failed to save changes to XML file [3], system error: [2] + diff --git a/src/wixlib/es-es.wxl b/src/wixlib/es-es.wxl new file mode 100644 index 00000000..9001d52e --- /dev/null +++ b/src/wixlib/es-es.wxl @@ -0,0 +1,32 @@ + + + + + La creación del usuario ha fracasado. ([2] [3] [4] [5]) + La creación del usuario ha fracasado porque la contraseña es incorrecta. ([2] [3] [4] [5]) + El aditamento del usuario al grupo ha fracasado. ([2] [3] [4] [5]) + La creación del usuario ha fracasado porque ya existe. ([2] [3] [4] [5]) + + La creación de la red compartida ha fracasado. ([2] [3] [4] [5]) + La eliminación de la red compartida ha fracasado. ([2] [3] [4] [5]) + + La inscripción al registro de la DLL con PerfMon ha fracasado. ([2] [3] [4] [5]) + La cancelación de la inscripción al registro de la DLL con PerfMon ha fracasado. ([2] [3] [4] [5]) + + La instalación de los contadores de rendimiento ha fracasado. ([2] [3] [4] [5]) + La desinstalación de los contadores de rendimiento ha fracasado. ([2] [3] [4] [5]) + + La creación de los ACLs ha fracasado por [3]\[4], error del sistema : [2] + El posicionamiento de los ACLs por el objecto [3] ha fracasado, error del sistema: [2] + Tipo de objecto no conocido [3], error del sistema: [2] + + Un problema ha aparecido durante la configuración de los ficheros XML. + Fracaso de la apertura de los ficheros XML [3], error del sistema: [2] + Fracaso de la búsqueda del nodo: [3] en el fichero XML: [4], error del sistema: [2] + Fracaso durante la salvaguardia de las modificaciones en el fichero XML [3], error del sistema: [2] + + Un problema ha aparecido durante la configuración de los ficheros XML. + Fracaso de la apertura de los ficheros XML [3], error del sistema: [2] + Fracaso de la búsqueda del nodo: [3] en el fichero XML: [4], error del sistema: [2] + Fracaso durante la salvaguardia de las modificaciones en el fichero XML [3], error del sistema: [2] + \ No newline at end of file diff --git a/src/wixlib/fr-fr.wxl b/src/wixlib/fr-fr.wxl new file mode 100644 index 00000000..066e7f81 --- /dev/null +++ b/src/wixlib/fr-fr.wxl @@ -0,0 +1,32 @@ + + + + + La création de l'utilisateur a échoué. ([2] [3] [4] [5]) + La création de l'utilisateur a échoué car le mot de passe est invalide. ([2] [3] [4] [5]) + L'ajout de l'utilisateur au groupe a échoué. ([2] [3] [4] [5]) + La création de l'utilisateur a échoué car il existe dejà. ([2] [3] [4] [5]) + + La création du partage reseau a échoué. ([2] [3] [4] [5]) + La suppression du partage reseau a échoué. ([2] [3] [4] [5]) + + L'inscription au registre de la DLL avec PerfMon a échoué. ([2] [3] [4] [5]) + La desinscription au registre de la DLL avec PerfMon a échoué. ([2] [3] [4] [5]) + + L'installation des compteurs de performance a échoué. ([2] [3] [4] [5]) + La desinstallation des compteurs de performance a échoué. ([2] [3] [4] [5]) + + La création des ACLs a échoué pour [3]\[4], erreur systeme: [2] + Le positionnement des ACLs pour l'objet [3] a échoué, erreur systeme: [2] + Type d'objet inconnu [3], erreur systeme: [2] + + Un problème est survenu lors de la configuration des fichiers XML. + Echec de l'ouverture des fichiers XML [3], erreur systeme: [2] + Echec de la recherche du noeud: [3] dans le fichier XML: [4], erreur systeme: [2] + Echec lors de la sauvegarde des modifications dans le fichier XML [3], erreur systeme: [2] + + Un problème est survenu lors de la configuration des fichiers XML. + Echec de l'ouverture des fichiers XML [3], erreur systeme: [2] + Echec de la recherche du noeud: [3] dans le fichier XML: [4], erreur systeme: [2] + Echec lors de la sauvegarde des modifications dans le fichier XML [3], erreur systeme: [2] + \ No newline at end of file diff --git a/src/wixlib/it-it.wxl b/src/wixlib/it-it.wxl new file mode 100644 index 00000000..35c62fc9 --- /dev/null +++ b/src/wixlib/it-it.wxl @@ -0,0 +1,33 @@ + + + + + + Impossibile creare l'utente. ([2] [3] [4] [5]) + Impossibile creare l'utente perchè la password è errata. ([2] [3] [4] [5]) + Impossibile aggiungere l'utente al gruppo. ([2] [3] [4] [5]) + Impossibile creare l'utente perchè già esistente. ([2] [3] [4] [5]) + + Impossibile creare la risorsa di rete. ([2] [3] [4] [5]) + Impossibile eliminare la risorsa di rete. ([2] [3] [4] [5]) + + Impossibile registrare la DLL con PerfMon. ([2] [3] [4] [5]) + Impossibile rimuovere la registrazione della DLL con PerfMon. ([2] [3] [4] [5]) + + Impossibile installare i contatori delle prestazioni. ([2] [3] [4] [5]) + Impossibile rimuovere i contatori delle prestazioni. ([2] [3] [4] [5]) + + Impossibile creare i descrittori di sicurezza per [3]\[4], errore di sistema: [2] + Impossibile impostare i descrittori di sicurezza sull'oggetto [3], errore di sistema: [2] + Tipo di oggetto sconosciuto [3], errore di sistema: [2] + + Si è verificato un errore durante la configurazione dei file XML. + Impossibile aprire il file XML [3], errore di sistema: [2] + Impossibile trovare il nodo: [3] nel file XML: [4], errore di sistema: [2] + Impossible salvare le modifiche al file XML [3], errore di sistema: [2] + + Si è verificato un errore durante la configurazione dei file XML. + Impossibile aprire il file XML [3], errore di sistema: [2] + Impossibile trovare il nodo: [3] nel file XML: [4], errore di sistema: [2] + Impossibile salvare le modifiche al file XML [3], errore di sitema: [2] + diff --git a/src/wixlib/ja-jp.wxl b/src/wixlib/ja-jp.wxl new file mode 100644 index 00000000..6206da64 --- /dev/null +++ b/src/wixlib/ja-jp.wxl @@ -0,0 +1,33 @@ + + + + + + ユーザー作成に失敗しました。 ([2] [3] [4] [5]) + パスワードが無効のためユーザー作成に失敗しました。 ([2] [3] [4] [5]) + ユーザーをグループに追加でいませんでした。 ([2] [3] [4] [5]) + ユーザーが既に存在するため作成できませんでした。 ([2] [3] [4] [5]) + + ネットワーク共有の作成に失敗しました。 ([2] [3] [4] [5]) + ネットワーク共有の削除に失敗しました。 ([2] [3] [4] [5]) + + DLL を PerfMon に登録でいませんでした。 ([2] [3] [4] [5]) + DLL を PerfMon より登録解除できませんでした。 ([2] [3] [4] [5]) + + パフォーマンス カウンタをインストールできませんでした。 ([2] [3] [4] [5]) + パフォーマンス カウンタをアンインストールできませんでした。 ([2] [3] [4] [5]) + + [3]\[4] 用セキュリティ ディスクリプターを作成できませんでした、システム エラー： [2] + オブジェクト [3] 上のセキュリティ ディスクリプターを設定できませんでした、システム エラー： [2] + 不明なオブジェクト種別 [3]、システム エラー： [2] + + XML ファイル構成中に失敗しました。 + XML ファイル [3] を開けませんでした、システム エラー： [2] + XML ファイル [4] 内にノード [3] が見つかりませんでした、システム エラー： [2] + XML ファイル [3] へ変更を保存できませんでした、システム エラー： [2] + + XML ファイル構成中に失敗しました。 + XML ファイル [3] を開けませんでした、システム エラー： [2] + XML ファイル [4] 内にノード [3] が見つかりませんでした、システム エラー： [2] + XML ファイル [3] へ変更を保存できませんでした、システム エラー： [2] + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config new file mode 100644 index 00000000..89544f1d --- /dev/null +++ b/src/wixlib/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/wixlib/pt-br.wxl b/src/wixlib/pt-br.wxl new file mode 100644 index 00000000..b2af3425 --- /dev/null +++ b/src/wixlib/pt-br.wxl @@ -0,0 +1,27 @@ + + + + + + Falha ao criar usuário. ([2] [3] [4] [5]) + Falha ao criar usuário devido a senha inválida. ([2] [3] [4] [5]) + Falha ao adicionar o usuário ao grupo. ([2] [3] [4] [5]) + Falha ao criar o usuário, porque ele já existe. ([2] [3] [4] [5]) + Falha ao criar o compartilhamento de rede. ([2] [3] [4] [5]) + Falha ao cair compartilhamento de rede. ([2] [3] [4] [5]) + Falha ao registrar DLL com PerfMon. ([2] [3] [4] [5]) + Falha ao cancelar o registro de DLL com PerfMon. ([2] [3] [4] [5]) + Falha ao instalar contadores de desempenho. ([2] [3] [4] [5]) + Falha ao desinstalar contadores de desempenho. ([2] [3] [4] [5]) + Falha ao criar o descritor de segurança [3] \ [4], erro do sistema: [2] + Falha ao definir o descritor de segurança sobre o objeto [3], erro do sistema: [2] + Objeto Desconhecido Tipo [3], erro do sistema: [2] + Houve uma falha ao configurar arquivos XML. + Falha ao abrir o arquivo XML [3], erro do sistema: [2] + Falha ao localizar nó: [3] no arquivo XML: [4], erro do sistema: [2] + Falha ao salvar as alterações para o arquivo XML [3], erro do sistema: [2] + Houve uma falha ao configurar arquivos XML. + Falha ao abrir o arquivo XML [3], erro do sistema: [2] + Falha ao localizar nó: [3] no arquivo XML: [4], erro do sistema: [2] + Falha ao salvar as alterações para o arquivo XML [3], erro do sistema: [2] + diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj new file mode 100644 index 00000000..2fc8c589 --- /dev/null +++ b/src/wixlib/util.wixproj @@ -0,0 +1,52 @@ + + + + + + + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} + util + Library + true + true + + + + + + + + + + + + + + + + + + + utilca + {076018F7-19BD-423A-ABBF-229273DA08D8} + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From a5b99dfd10f8c429af08c7b33de97ffbbf8502c9 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 1 Jan 2018 16:49:10 -0800 Subject: Set default culture and update to latest dependencies --- src/FindLocalWix.props | 2 +- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 6 +++--- src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 6 +++--- src/wixext/UtilCompiler.cs | 3 +-- src/wixext/UtilExtensionData.cs | 2 ++ src/wixext/WixToolset.Util.wixext.csproj | 8 +++++--- src/wixext/WixToolset.Util.wixext.targets | 5 ++++- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 9 files changed, 22 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props index 016dac77..1301b0e5 100644 --- a/src/FindLocalWix.props +++ b/src/FindLocalWix.props @@ -3,6 +3,6 @@ - $(MSBuildThisFileDirectory)..\..\Core\build\Release\publish\net461\wix.targets + $(MSBuildThisFileDirectory)..\..\Core\build\Debug\net461\wix.targets diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 5ce9f5ea..41c872d4 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -8,7 +8,7 @@ namespace WixToolsetTest.VisualStudio using WixToolset.Util; using Xunit; - public class VisualStudioExtensionFixture + public class UtilExtensionFixture { [Fact] public void CanBuildUsingFileShare() @@ -19,8 +19,8 @@ namespace WixToolsetTest.VisualStudio var results = build.BuildAndQuery(Build, "FileShare", "FileSharePermissions"); Assert.Equal(new[] { - "FileShare:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t0", - "FileSharePermissions:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t0", + "FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER\t\t0", + "FileSharePermissions:ExampleFileShare\tEveryone\t1", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 9559059d..056a86e5 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index da48e412..59b36d1c 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2676,8 +2676,7 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch"); - row.Set(0, id); + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch", id); row.Set(1, productCode ?? upgradeCode); row.Set(2, (int)attributes); } diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs index 7eefc238..55c9b046 100644 --- a/src/wixext/UtilExtensionData.cs +++ b/src/wixext/UtilExtensionData.cs @@ -7,6 +7,8 @@ namespace WixToolset.Util public sealed class UtilExtensionData : BaseExtensionData { + public override string DefaultCulture => "en-US"; + public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) { tupleDefinition = UtilTupleDefinitions.ByName(name); diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index a06298a3..23fa2cd0 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -19,9 +19,11 @@ - - - + + + + + diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets index 3b43c25c..e298b06e 100644 --- a/src/wixext/WixToolset.Util.wixext.targets +++ b/src/wixext/WixToolset.Util.wixext.targets @@ -2,7 +2,10 @@ + + $(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll" + - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 89544f1d..4250845c 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 2fc8c589..b94e8ca0 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 12872c0066bad5740f5bbc7165b84a8bff1b002a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 1 Jan 2018 23:02:24 -0800 Subject: Fix path to WixExtension in .targets file --- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/WixToolset.Util.wixext.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 41c872d4..3f112dc8 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -1,6 +1,6 @@ // 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 WixToolsetTest.VisualStudio +namespace WixToolsetTest.Util { using System.Linq; using WixBuildTools.TestSupport; diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets index e298b06e..64dff429 100644 --- a/src/wixext/WixToolset.Util.wixext.targets +++ b/src/wixext/WixToolset.Util.wixext.targets @@ -3,7 +3,7 @@ - $(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll" + $(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll -- cgit v1.2.3-55-g6feb From a2a077835e1a1e91a622015665ad0c92f416039d Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 23 Jul 2018 20:34:59 -0700 Subject: Integrate Core to Tools repro and Extensibility.Data namespace changes --- src/FindLocalWix.props | 2 +- src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 14 ++++++++------ src/wixext/UtilCompiler.cs | 1 + src/wixext/WixToolset.Util.wixext.csproj | 2 +- src/wixlib/packages.config | 4 ++-- src/wixlib/util.wixproj | 14 +++++++------- 6 files changed, 20 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props index 1301b0e5..a784e352 100644 --- a/src/FindLocalWix.props +++ b/src/FindLocalWix.props @@ -3,6 +3,6 @@ - $(MSBuildThisFileDirectory)..\..\Core\build\Debug\net461\wix.targets + $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 056a86e5..3639572f 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -3,7 +3,7 @@ - netcoreapp2.0 + netcoreapp2.1 false @@ -23,9 +23,11 @@ - - + + + + @@ -33,8 +35,8 @@ - - - + + + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 59b36d1c..3522d1fb 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -12,6 +12,7 @@ namespace WixToolset.Util using System.Xml.Linq; using WixToolset.Data; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; /// /// The compiler for the WiX Toolset Utility Extension. diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 23fa2cd0..553ae43a 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -31,6 +31,6 @@ - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 4250845c..45e5c7b1 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index b94e8ca0..2baaafbb 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - - + + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -39,14 +39,14 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - - \ No newline at end of file + + -- cgit v1.2.3-55-g6feb From 3307fdd341d80654570740a7874eb796f69011af Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 16 Aug 2018 17:22:19 -0400 Subject: Update to latest MSBuild NuGet package and Windows 10 SDK for CA --- src/ca/utilca.vcxproj | 1 + src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 37b5c7de..ef04c3ac 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -24,6 +24,7 @@ Unicode utilca.def WiX Toolset Util CustomAction + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 45e5c7b1..f3d424e1 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 2baaafbb..a55e64fb 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 4f732dd1b9dd8b1a13b1b0be4d18d4e8d10f106e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 2 Oct 2018 15:25:13 -0700 Subject: Enable NCrunch support --- Util.wixext.sln | 8 ++++---- src/Cpp.Build.props | 5 ++--- src/Directory.Build.props | 15 +++++++++++---- src/wixext/WixToolset.Util.wixext.csproj | 2 +- src/wixext/WixToolset.Util.wixext.v3.ncrunchproject | 7 +++++++ src/wixlib/util.v3.ncrunchproject | 5 +++++ 6 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 src/wixext/WixToolset.Util.wixext.v3.ncrunchproject create mode 100644 src/wixlib/util.v3.ncrunchproject (limited to 'src') diff --git a/Util.wixext.sln b/Util.wixext.sln index e25aa4fd..39f5646c 100644 --- a/Util.wixext.sln +++ b/Util.wixext.sln @@ -22,6 +22,7 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.Build.0 = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x64.ActiveCfg = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32 @@ -30,13 +31,12 @@ Global {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.ActiveCfg = Debug|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x64 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.Build.0 = Debug|x64 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.Build.0 = Debug|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x64 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.Build.0 = Release|x64 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86 {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 453aa442..296b36ca 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -3,9 +3,8 @@ - Win32 - $(OutputPath) - $(BaseIntermediateOutputPath)$(Platform)\ + Win32 + $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ $(OutputPath)$(Platform)\ diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 63ad5d6e..9eacf3f5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,16 +1,23 @@ - + Debug - AnyCPU - $(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\ - $(MSBuildThisFileDirectory)..\build\$(Configuration)\ + false + + $(MSBuildProjectName) + $(MSBuildThisFileDirectory)..\build\ + $(BaseOutputPath)obj\$(ProjectName)\ + $(BaseOutputPath)$(Configuration)\ WiX Toolset Team WiX Toolset Copyright (c) .NET Foundation and contributors. All rights reserved. + WiX Toolset diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 553ae43a..e86a57c1 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject b/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject new file mode 100644 index 00000000..d75e7ab3 --- /dev/null +++ b/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject @@ -0,0 +1,7 @@ + + + + ..\..\build\Debug\util.wixlib + + + \ No newline at end of file diff --git a/src/wixlib/util.v3.ncrunchproject b/src/wixlib/util.v3.ncrunchproject new file mode 100644 index 00000000..319cd523 --- /dev/null +++ b/src/wixlib/util.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 8904e039333cf3121ead1c203b5ab86522dfba50 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 3 Oct 2018 15:38:48 -0700 Subject: Adopt new WixRunner execution --- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 3f112dc8..7affe1f4 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -26,9 +26,8 @@ namespace WixToolsetTest.Util private static void Build(string[] args) { - var result = WixRunner.Execute(args, out var messages); - Assert.Equal(0, result); - Assert.Empty(messages); + var result = WixRunner.Execute(args) + .AssertSuccess(); } } } -- cgit v1.2.3-55-g6feb From 6ed8d107e6edf16956c778bda3573f8d7a7690fc Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 29 Nov 2018 14:02:44 -0500 Subject: Update extension for latest changes in WixToolset.Extensibility. --- src/wixext/UtilExtensionFactory.cs | 2 +- src/wixext/UtilWindowsInstallerBackendExtension.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixext/UtilExtensionFactory.cs b/src/wixext/UtilExtensionFactory.cs index 07bfae85..0f87a1ff 100644 --- a/src/wixext/UtilExtensionFactory.cs +++ b/src/wixext/UtilExtensionFactory.cs @@ -12,7 +12,7 @@ namespace WixToolset.Util { typeof(UtilCompiler), typeof(UtilExtensionData), - typeof(UtilWindowsInstallerBackendExtension), + typeof(UtilWindowsInstallerBackendBinderExtension), }; } } diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index 00ac8d34..0cb09678 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -7,7 +7,7 @@ namespace WixToolset.Util using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; - public class UtilWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension + public class UtilWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension { private static readonly TableDefinition[] Tables = LoadTables(); @@ -15,7 +15,7 @@ namespace WixToolset.Util private static TableDefinition[] LoadTables() { - using (var resourceStream = typeof(UtilWindowsInstallerBackendExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) + using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) using (var reader = XmlReader.Create(resourceStream)) { var tables = TableDefinitionCollection.Load(reader); -- cgit v1.2.3-55-g6feb From f7020c0d16baf2b960e7123e233e20c519f6a340 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 15 Dec 2018 21:46:30 -0600 Subject: Import implementation of UtilCA from old repo's WixCA/scasched/scaexec. (#3) --- src/ca/BroadcastSettingChange.cpp | 45 ++ src/ca/CheckReboot.cpp | 36 ++ src/ca/CloseApps.cpp | 570 +++++++++++++++++ src/ca/CustomMsiErrors.h | 32 + src/ca/FormatFiles.cpp | 221 +++++++ src/ca/OsInfo.cpp | 487 +++++++++++++++ src/ca/RemoveFoldersEx.cpp | 197 ++++++ src/ca/RestartManager.cpp | 185 ++++++ src/ca/TouchFile.cpp | 308 +++++++++ src/ca/XmlConfig.cpp | 1099 +++++++++++++++++++++++++++++++++ src/ca/XmlFile.cpp | 942 ++++++++++++++++++++++++++++ src/ca/caSuffix.h | 11 + src/ca/cost.h | 9 + src/ca/exitearlywithsuccess.cpp | 27 + src/ca/netshortcuts.cpp | 434 +++++++++++++ src/ca/precomp.h | 42 ++ src/ca/qtexecca.cpp | 312 ++++++++++ src/ca/sca.h | 19 + src/ca/scacost.h | 18 + src/ca/scaexec.cpp | 807 ++++++++++++++++++++++++ src/ca/scamanifest.cpp | 377 +++++++++++ src/ca/scaperf.cpp | 310 ++++++++++ src/ca/scaperfexec.cpp | 423 +++++++++++++ src/ca/scasched.cpp | 127 ++++ src/ca/scasmb.h | 46 ++ src/ca/scasmbexec.cpp | 316 ++++++++++ src/ca/scasmbexec.h | 27 + src/ca/scasmbsched.cpp | 639 +++++++++++++++++++ src/ca/scauser.cpp | 676 ++++++++++++++++++++ src/ca/scauser.h | 67 ++ src/ca/secureobj.cpp | 902 +++++++++++++++++++++++++++ src/ca/serviceconfig.cpp | 821 ++++++++++++++++++++++++ src/ca/shellexecca.cpp | 271 ++++++++ src/ca/test.cpp | 269 ++++++++ src/ca/utilca.def | 83 ++- src/ca/utilca.vcxproj | 35 +- src/wixlib/UtilExtension.wxs | 40 +- src/wixlib/UtilExtension_Platform.wxi | 2 +- 38 files changed, 11209 insertions(+), 23 deletions(-) create mode 100644 src/ca/BroadcastSettingChange.cpp create mode 100644 src/ca/CheckReboot.cpp create mode 100644 src/ca/CloseApps.cpp create mode 100644 src/ca/CustomMsiErrors.h create mode 100644 src/ca/FormatFiles.cpp create mode 100644 src/ca/OsInfo.cpp create mode 100644 src/ca/RemoveFoldersEx.cpp create mode 100644 src/ca/RestartManager.cpp create mode 100644 src/ca/TouchFile.cpp create mode 100644 src/ca/XmlConfig.cpp create mode 100644 src/ca/XmlFile.cpp create mode 100644 src/ca/caSuffix.h create mode 100644 src/ca/cost.h create mode 100644 src/ca/exitearlywithsuccess.cpp create mode 100644 src/ca/netshortcuts.cpp create mode 100644 src/ca/qtexecca.cpp create mode 100644 src/ca/sca.h create mode 100644 src/ca/scacost.h create mode 100644 src/ca/scaexec.cpp create mode 100644 src/ca/scamanifest.cpp create mode 100644 src/ca/scaperf.cpp create mode 100644 src/ca/scaperfexec.cpp create mode 100644 src/ca/scasched.cpp create mode 100644 src/ca/scasmb.h create mode 100644 src/ca/scasmbexec.cpp create mode 100644 src/ca/scasmbexec.h create mode 100644 src/ca/scasmbsched.cpp create mode 100644 src/ca/scauser.cpp create mode 100644 src/ca/scauser.h create mode 100644 src/ca/secureobj.cpp create mode 100644 src/ca/serviceconfig.cpp create mode 100644 src/ca/shellexecca.cpp create mode 100644 src/ca/test.cpp (limited to 'src') diff --git a/src/ca/BroadcastSettingChange.cpp b/src/ca/BroadcastSettingChange.cpp new file mode 100644 index 00000000..2e153ad3 --- /dev/null +++ b/src/ca/BroadcastSettingChange.cpp @@ -0,0 +1,45 @@ +// 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" + + +/******************************************************************** +WixBroadcastSettingChange + + Send WM_SETTINGCHANGE message to all top-level windows indicating + that unspecified settings have changed. +********************************************************************/ +extern "C" UINT __stdcall WixBroadcastSettingChange( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = WcaInitialize(hInstall, "WixBroadcastSettingChange"); + ExitOnFailure(hr, "failed to initialize WixBroadcastSettingChange"); + + // best effort; ignore failures + ::SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, NULL, SMTO_ABORTIFHUNG, 1000, NULL); + +LExit: + return WcaFinalize(ERROR_SUCCESS); +} + + +/******************************************************************** +WixBroadcastEnvironmentChange + + Send WM_SETTINGCHANGE message to all top-level windows indicating + that environment variables have changed. +********************************************************************/ +extern "C" UINT __stdcall WixBroadcastEnvironmentChange( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = WcaInitialize(hInstall, "WixBroadcastEnvironmentChange"); + ExitOnFailure(hr, "failed to initialize WixBroadcastEnvironmentChange"); + + // best effort; ignore failures + ::SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, reinterpret_cast(L"Environment"), SMTO_ABORTIFHUNG, 1000, NULL); + +LExit: + return WcaFinalize(ERROR_SUCCESS); +} diff --git a/src/ca/CheckReboot.cpp b/src/ca/CheckReboot.cpp new file mode 100644 index 00000000..ce056411 --- /dev/null +++ b/src/ca/CheckReboot.cpp @@ -0,0 +1,36 @@ +// 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" + + +/******************************************************************** +WixCheckRebootRequired - entry point for WixCheckRebootRequired Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence after InstallFinalize +********************************************************************/ +extern "C" UINT __stdcall WixCheckRebootRequired( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixCheckRebootRequired"); + ExitOnFailure(hr, "failed to initialize"); + + if (WcaDidDeferredActionRequireReboot()) + { + WcaLog(LOGMSG_STANDARD, "Reboot required by deferred CustomAction."); + + er = ::MsiSetMode(hInstall, MSIRUNMODE_REBOOTATEND, TRUE); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to schedule reboot."); + } + +LExit: + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ca/CloseApps.cpp b/src/ca/CloseApps.cpp new file mode 100644 index 00000000..a3f28ed3 --- /dev/null +++ b/src/ca/CloseApps.cpp @@ -0,0 +1,570 @@ +// 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" + +#define DEFAULT_PROCESS_EXIT_WAIT_TIME 5000 + +// WixCloseApplication Target Description Condition Attributes Sequence + +// structs +LPCWSTR wzQUERY_CLOSEAPPS = L"SELECT `WixCloseApplication`, `Target`, `Description`, `Condition`, `Attributes`, `Property`, `TerminateExitCode`, `Timeout` FROM `WixCloseApplication` ORDER BY `Sequence`"; +enum eQUERY_CLOSEAPPS { QCA_ID = 1, QCA_TARGET, QCA_DESCRIPTION, QCA_CONDITION, QCA_ATTRIBUTES, QCA_PROPERTY, QCA_TERMINATEEXITCODE, QCA_TIMEOUT }; + +// CloseApplication.Attributes +enum CLOSEAPP_ATTRIBUTES +{ + CLOSEAPP_ATTRIBUTE_NONE = 0x0, + CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE = 0x1, + CLOSEAPP_ATTRIBUTE_REBOOTPROMPT = 0x2, + CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE = 0x4, + CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE = 0x8, + CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE = 0x10, + CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS = 0x20, + CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE = 0x40, +}; + +struct PROCESS_AND_MESSAGE +{ + DWORD dwProcessId; + DWORD dwMessageId; + DWORD dwTimeout; +}; + + +/****************************************************************** + EnumWindowsProc - callback function which sends message if the + current window matches the passed in process ID + +******************************************************************/ +BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + PROCESS_AND_MESSAGE* pPM = reinterpret_cast(lParam); + DWORD dwProcessId = 0; + DWORD_PTR dwResult = 0; + BOOL fQueryEndSession = WM_QUERYENDSESSION == pPM->dwMessageId; + BOOL fContinueWindowsInProcess = TRUE; // assume we will send message to all top-level windows in a process. + + ::GetWindowThreadProcessId(hwnd, &dwProcessId); + + // check if the process Id is the one we're looking for + if (dwProcessId != pPM->dwProcessId) + { + return TRUE; + } + + WcaLog(LOGMSG_VERBOSE, "Sending message to process id 0x%x", dwProcessId); + + if (::SendMessageTimeoutW(hwnd, pPM->dwMessageId, 0, fQueryEndSession ? ENDSESSION_CLOSEAPP : 0, SMTO_BLOCK, pPM->dwTimeout, &dwResult)) + { + WcaLog(LOGMSG_VERBOSE, "Result 0x%x", dwResult); + + if (fQueryEndSession) + { + // If application said it was okay to close, do that. + if (dwResult) + { + ::SendMessageTimeoutW(hwnd, WM_ENDSESSION, TRUE, ENDSESSION_CLOSEAPP, SMTO_BLOCK, pPM->dwTimeout, &dwResult); + } + else // application said don't try to close it, so don't bother sending messages to any other top-level windows. + { + fContinueWindowsInProcess = FALSE; + } + } + } + else // log result message. + { + WcaLog(LOGMSG_VERBOSE, "Failed to send message id: %u, error: 0x%x", pPM->dwMessageId, ::GetLastError()); + } + + // so we know we succeeded + ::SetLastError(ERROR_SUCCESS); + + return fContinueWindowsInProcess; +} + +/****************************************************************** + PromptToContinue - displays the prompt if the application is still + running. + +******************************************************************/ +static HRESULT PromptToContinue( + __in_z LPCWSTR wzApplication, + __in_z LPCWSTR wzPrompt + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PMSIHANDLE hRecMessage = NULL; + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0; + + hRecMessage = ::MsiCreateRecord(1); + ExitOnNull(hRecMessage, hr, E_OUTOFMEMORY, "Failed to create record for prompt."); + + er = ::MsiRecordSetStringW(hRecMessage, 0, wzPrompt); + ExitOnWin32Error(er, hr, "Failed to set prompt record field string"); + + do + { + hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); + if (SUCCEEDED(hr) && 0 < cProcessIds) + { + er = WcaProcessMessage(static_cast(INSTALLMESSAGE_WARNING | MB_ABORTRETRYIGNORE | MB_DEFBUTTON3 | MB_ICONWARNING), hRecMessage); + if (IDABORT == er) + { + hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); + } + else if (IDRETRY == er) + { + hr = S_FALSE; + } + else if (IDIGNORE == er) + { + hr = S_OK; + } + else + { + ExitOnWin32Error(er, hr, "Unexpected return value from prompt to continue."); + } + } + + ReleaseNullMem(prgProcessIds); + cProcessIds = 0; + } while (S_FALSE == hr); + +LExit: + ReleaseMem(prgProcessIds); + return hr; +} + +/****************************************************************** + SendProcessMessage - helper function to enumerate the top-level + windows and send to all matching a process ID. + +******************************************************************/ +void SendProcessMessage( + __in DWORD dwProcessId, + __in DWORD dwMessageId, + __in DWORD dwTimeout + ) +{ + WcaLog(LOGMSG_VERBOSE, "Attempting to send process id 0x%x message id: %u", dwProcessId, dwMessageId); + + PROCESS_AND_MESSAGE pm = { }; + pm.dwProcessId = dwProcessId; + pm.dwMessageId = dwMessageId; + pm.dwTimeout = dwTimeout; + + if (!::EnumWindows(EnumWindowsProc, reinterpret_cast(&pm))) + { + DWORD dwLastError = ::GetLastError(); + if (ERROR_SUCCESS != dwLastError) + { + WcaLog(LOGMSG_VERBOSE, "CloseApp enumeration error: 0x%x", dwLastError); + } + } +} + +/****************************************************************** + SendApplicationMessage - helper function to iterate through the + processes for the specified application and send all + applicable process Ids a message and give them time to process + the message. + +******************************************************************/ +void SendApplicationMessage( + __in LPCWSTR wzApplication, + __in DWORD dwMessageId, + __in DWORD dwTimeout + ) +{ + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0, iProcessId; + HRESULT hr = S_OK; + + WcaLog(LOGMSG_VERBOSE, "Checking App: %ls ", wzApplication); + + hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); + + if (SUCCEEDED(hr) && 0 < cProcessIds) + { + WcaLog(LOGMSG_VERBOSE, "App: %ls found running, %d processes, attempting to send message.", wzApplication, cProcessIds); + + for (iProcessId = 0; iProcessId < cProcessIds; ++iProcessId) + { + SendProcessMessage(prgProcessIds[iProcessId], dwMessageId, dwTimeout); + } + + ProcWaitForIds(prgProcessIds, cProcessIds, dwTimeout); + } + + ReleaseMem(prgProcessIds); +} + +/****************************************************************** + SetRunningProcessProperty - helper function that sets the specified + property if there are any instances of the specified executable + running. Useful to show custom UI to ask for shutdown. +******************************************************************/ +void SetRunningProcessProperty( + __in LPCWSTR wzApplication, + __in LPCWSTR wzProperty + ) +{ + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0; + HRESULT hr = S_OK; + + WcaLog(LOGMSG_VERBOSE, "Checking App: %ls ", wzApplication); + + hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); + + if (SUCCEEDED(hr) && 0 < cProcessIds) + { + WcaLog(LOGMSG_VERBOSE, "App: %ls found running, %d processes, setting '%ls' property.", wzApplication, cProcessIds, wzProperty); + WcaSetIntProperty(wzProperty, cProcessIds); + } + + ReleaseMem(prgProcessIds); +} + +/****************************************************************** + TerminateProcesses - helper function that kills the provided set of + process ids such that they return a particular exit code. +******************************************************************/ +void TerminateProcesses( + __in_ecount(cProcessIds) DWORD rgdwProcessIds[], + __in DWORD cProcessIds, + __in DWORD dwExitCode + ) +{ + for (DWORD i = 0; i < cProcessIds; ++i) + { + HANDLE hProcess = ::OpenProcess(PROCESS_TERMINATE, FALSE, rgdwProcessIds[i]); + if (hProcess) + { + ::TerminateProcess(hProcess, dwExitCode); + ::CloseHandle(hProcess); + } + } +} + +/****************************************************************** + WixCloseApplications - entry point for WixCloseApplications Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence before InstallFiles +******************************************************************/ +extern "C" UINT __stdcall WixCloseApplications( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixCloseApplications"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwzId = NULL; + LPWSTR pwzTarget = NULL; + LPWSTR pwzDescription = NULL; + LPWSTR pwzCondition = NULL; + LPWSTR pwzProperty = NULL; + DWORD dwAttributes = 0; + DWORD dwTimeout = 0; + DWORD dwTerminateExitCode = 0; + MSICONDITION condition = MSICONDITION_NONE; + + DWORD cCloseApps = 0; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + MSIHANDLE hListboxTable = NULL; + MSIHANDLE hListboxColumns = NULL; + + LPWSTR pwzCustomActionData = NULL; + //DWORD cchCustomActionData = 0; + + // + // initialize + // + hr = WcaInitialize(hInstall, "WixCloseApplications"); + ExitOnFailure(hr, "failed to initialize"); + + // + // loop through all the objects to be secured + // + hr = WcaOpenExecuteView(wzQUERY_CLOSEAPPS, &hView); + ExitOnFailure(hr, "failed to open view on WixCloseApplication table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, QCA_ID, &pwzId); + ExitOnFailure(hr, "failed to get id from WixCloseApplication table"); + + hr = WcaGetRecordString(hRec, QCA_CONDITION, &pwzCondition); + ExitOnFailure(hr, "failed to get condition from WixCloseApplication table"); + + if (pwzCondition && *pwzCondition) + { + condition = ::MsiEvaluateConditionW(hInstall, pwzCondition); + if (MSICONDITION_ERROR == condition) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to process condition for WixCloseApplication '%ls'", pwzId); + } + else if (MSICONDITION_FALSE == condition) + { + continue; // skip processing this target + } + } + + hr = WcaGetRecordFormattedString(hRec, QCA_TARGET, &pwzTarget); + ExitOnFailure(hr, "failed to get target from WixCloseApplication table"); + + hr = WcaGetRecordFormattedString(hRec, QCA_DESCRIPTION, &pwzDescription); + ExitOnFailure(hr, "failed to get description from WixCloseApplication table"); + + hr = WcaGetRecordInteger(hRec, QCA_ATTRIBUTES, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to get attributes from WixCloseApplication table"); + + hr = WcaGetRecordFormattedString(hRec, QCA_PROPERTY, &pwzProperty); + ExitOnFailure(hr, "failed to get property from WixCloseApplication table"); + + hr = WcaGetRecordInteger(hRec, QCA_TERMINATEEXITCODE, reinterpret_cast(&dwTerminateExitCode)); + if (S_FALSE == hr) + { + dwTerminateExitCode = 0; + hr = S_OK; + } + ExitOnFailure(hr, "failed to get timeout from WixCloseApplication table"); + + hr = WcaGetRecordInteger(hRec, QCA_TIMEOUT, reinterpret_cast(&dwTimeout)); + if (S_FALSE == hr) + { + dwTimeout = DEFAULT_PROCESS_EXIT_WAIT_TIME; + hr = S_OK; + } + ExitOnFailure(hr, "failed to get timeout from WixCloseApplication table"); + + // Before trying any changes to the machine, prompt if requested. + if (dwAttributes & CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE) + { + hr = PromptToContinue(pwzTarget, pwzDescription ? pwzDescription : L""); + if (HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hr) + { + // Skip error message if user canceled. + ExitFunction(); + } + ExitOnFailure(hr, "Failure while prompting user to continue to close application."); + } + + // + // send WM_CLOSE or WM_QUERYENDSESSION to currently running applications + // + if (dwAttributes & CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_CLOSE, dwTimeout); + } + + if (dwAttributes & CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_QUERYENDSESSION, dwTimeout); + } + + // + // Pass the targets to the deferred action in case the app comes back + // even if we close it now. + // + if (dwAttributes & (CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE | CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE | CLOSEAPP_ATTRIBUTE_REBOOTPROMPT | CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS)) + { + hr = WcaWriteStringToCaData(pwzTarget, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add target data to CustomActionData"); + + hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add attribute data to CustomActionData"); + + hr = WcaWriteIntegerToCaData(dwTimeout, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add timeout data to CustomActionData"); + + hr = WcaWriteIntegerToCaData(dwTerminateExitCode, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add timeout data to CustomActionData"); + } + + if (pwzProperty && *pwzProperty) + { + SetRunningProcessProperty(pwzTarget, pwzProperty); + } + + ++cCloseApps; + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all apps to close"); + + // + // Do the UI dance now. + // + /* + + TODO: Do this eventually + + if (cCloseApps) + { + while (TRUE) + { + for (DWORD i = 0; i < cCloseApps; ++i) + { + hr = WcaAddTempRecord(&hListboxTable, &hListboxColumns, L"ListBox", NULL, 0, 4, L"FileInUseProcess", i, target, description); + if (FAILED(hr)) + { + } + } + } + } + */ + + // + // schedule the custom action and add to progress bar + // + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cCloseApps); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixCloseApplicationsDeferred"), pwzCustomActionData, cCloseApps * COST_CLOSEAPP); + ExitOnFailure(hr, "failed to schedule WixCloseApplicationsDeferred action"); + } + +LExit: + if (hListboxColumns) + { + ::MsiCloseHandle(hListboxColumns); + } + if (hListboxTable) + { + ::MsiCloseHandle(hListboxTable); + } + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzProperty); + ReleaseStr(pwzCondition); + ReleaseStr(pwzDescription); + ReleaseStr(pwzTarget); + ReleaseStr(pwzId); + + if (FAILED(hr)) + { + er = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hr ? ERROR_INSTALL_USEREXIT : ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/****************************************************************** + WixCloseApplicationsDeferred - entry point for + WixCloseApplicationsDeferred Custom Action + called as Type 1025 CustomAction + (deferred binary DLL) + + NOTE: deferred CustomAction since it modifies the machine + NOTE: CustomActionData == wzTarget\tdwAttributes\tdwTimeout\tdwTerminateExitCode\t... +******************************************************************/ +extern "C" UINT __stdcall WixCloseApplicationsDeferred( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixCloseApplicationsDeferred"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzTarget = NULL; + DWORD dwAttributes = 0; + DWORD dwTimeout = 0; + DWORD dwTerminateExitCode = 0; + + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0; + + // + // initialize + // + hr = WcaInitialize(hInstall, "WixCloseApplicationsDeferred"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + + // + // loop through all the passed in data + // + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzTarget); + ExitOnFailure(hr, "failed to process target from CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to process attributes from CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwTimeout)); + ExitOnFailure(hr, "failed to process timeout from CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwTerminateExitCode)); + ExitOnFailure(hr, "failed to process terminate exit code from CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Checking for App: %ls Attributes: %d", pwzTarget, dwAttributes); + + // + // send WM_CLOSE or WM_QUERYENDSESSION to currently running applications + // + if (dwAttributes & CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_CLOSE, dwTimeout); + } + + if (dwAttributes & CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_QUERYENDSESSION, dwTimeout); + } + + // If we find that an app that we need closed is still runing, require a + // restart or kill the process as directed. + ProcFindAllIdsFromExeName(pwzTarget, &prgProcessIds, &cProcessIds); + if (0 < cProcessIds) + { + if (dwAttributes & CLOSEAPP_ATTRIBUTE_REBOOTPROMPT) + { + WcaLog(LOGMSG_VERBOSE, "App: %ls found running, requiring a reboot.", pwzTarget); + + WcaDeferredActionRequiresReboot(); + } + else if (dwAttributes & CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS) + { + TerminateProcesses(prgProcessIds, cProcessIds, dwTerminateExitCode); + } + } + + hr = WcaProgressMessage(COST_CLOSEAPP, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + } + +LExit: + ReleaseMem(prgProcessIds); + + ReleaseStr(pwzTarget); + ReleaseStr(pwzData); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ca/CustomMsiErrors.h b/src/ca/CustomMsiErrors.h new file mode 100644 index 00000000..3218b61b --- /dev/null +++ b/src/ca/CustomMsiErrors.h @@ -0,0 +1,32 @@ +#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. + + +#define msierrSecureObjectsFailedCreateSD 25520 +#define msierrSecureObjectsFailedSet 25521 +#define msierrSecureObjectsUnknownType 25522 + +#define msierrXmlFileFailedRead 25530 +#define msierrXmlFileFailedOpen 25531 +#define msierrXmlFileFailedSelect 25532 +#define msierrXmlFileFailedSave 25533 + +#define msierrXmlConfigFailedRead 25540 +#define msierrXmlConfigFailedOpen 25541 +#define msierrXmlConfigFailedSelect 25542 +#define msierrXmlConfigFailedSave 25543 + +#define msierrPERFMONFailedRegisterDLL 26251 +#define msierrPERFMONFailedUnregisterDLL 26252 +#define msierrInstallPerfCounterData 26253 +#define msierrUninstallPerfCounterData 26254 + +#define msierrSMBFailedCreate 26301 +#define msierrSMBFailedDrop 26302 +#define msierrUSRFailedUserCreate 26401 +#define msierrUSRFailedUserCreatePswd 26402 +#define msierrUSRFailedUserGroupAdd 26403 +#define msierrUSRFailedUserCreateExists 26404 +#define msierrUSRFailedGrantLogonAsService 26405 + +//Last available is 26450 \ No newline at end of file diff --git a/src/ca/FormatFiles.cpp b/src/ca/FormatFiles.cpp new file mode 100644 index 00000000..6a816700 --- /dev/null +++ b/src/ca/FormatFiles.cpp @@ -0,0 +1,221 @@ +// 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" + +const UINT COST_FILEFORMATTING = 2000; + + +// +// WixSchedFormatFiles - immediate CA to schedule format files CAs +// +extern "C" UINT __stdcall WixSchedFormatFiles( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PSCZ sczBinaryKey; + PSCZ sczFileKey; + PSCZ sczComponentKey; + PSCZ sczFormattedFile; + PSCZ sczFilePath; + PMSIHANDLE hView; + PMSIHANDLE hRec; + PSCZ sczFileContent; + PSCZ sczFormattedContent; + PSCZ sczExecCustomActionData; + PSCZ sczRollbackCustomActionData; + + LPCWSTR wzQuery = + L"SELECT `WixFormatFiles`.`Binary_`, `WixFormatFiles`.`File_`, `File`.`Component_` " + L"FROM `WixFormatFiles`, `File` " + L"WHERE `WixFormatFiles`.`File_` = `File`.`File`"; + enum eQuery { eqBinaryKey = 1, eqFileKey, eqComponentKey }; + + // initialize + hr = WcaInitialize(hInstall, "WixSchedFormatFiles"); + ExitOnFailure(hr, "Failed to initialize for WixSchedFormatFiles."); + + // query and loop through all the files + hr = WcaOpenExecuteView(wzQuery, &hView); + ExitOnFailure(hr, "Failed to open view on WixFormatFiles table"); + + DWORD cFiles = 0; + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + ++cFiles; + + hr = WcaGetRecordString(hRec, eqBinaryKey, &sczBinaryKey); + ExitOnFailure(hr, "Failed to get Binary table key."); + + hr = WcaGetRecordString(hRec, eqFileKey, &sczFileKey); + ExitOnFailure(hr, "Failed to get File table key."); + + hr = WcaGetRecordString(hRec, eqComponentKey, &sczComponentKey); + ExitOnFailure(hr, "Failed to get Component table key."); + + // we need to know if the component's being installed, uninstalled, or reinstalled + WCA_TODO todo = WcaGetComponentToDo(sczComponentKey); + if (WCA_TODO_INSTALL == todo || WCA_TODO_REINSTALL == todo) + { + // turn the file key into the path to the target file + hr = StrAllocFormatted(&sczFormattedFile, L"[#%ls]", sczFileKey); + ExitOnFailure(hr, "Failed to format file string for file: %ls", sczFileKey); + hr = WcaGetFormattedString(sczFormattedFile, &sczFilePath); + ExitOnFailure(hr, "Failed to get path for file: %ls", sczFileKey); + + // extract binary to string + WCA_ENCODING encoding = WCA_ENCODING_UNKNOWN; + hr = WcaExtractBinaryToString(sczBinaryKey, &sczFileContent, &encoding); + ExitOnFailure(hr, "Failed to extract binary: %ls", sczBinaryKey); + + // format string + hr = WcaGetFormattedString(sczFileContent, &sczFormattedContent); + ExitOnFailure(hr, "Failed to format file content: %ls", sczFileContent); + + // write to deferred custom action data + hr = WcaWriteStringToCaData(sczFilePath, &sczExecCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for file: %ls", sczFilePath); + + hr = WcaWriteIntegerToCaData(encoding, &sczExecCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for encoding: %d", encoding); + + hr = WcaWriteStringToCaData(sczFormattedContent, &sczExecCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for file content: %ls", sczFilePath); + + // write to rollback custom action data + hr = WcaWriteStringToCaData(sczFilePath, &sczRollbackCustomActionData); + ExitOnFailure(hr, "Failed to write rollback custom action data for file: %ls", sczFilePath); + + hr = WcaWriteIntegerToCaData(encoding, &sczRollbackCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for encoding: %d", encoding); + + hr = WcaWriteStringToCaData(sczFileContent, &sczRollbackCustomActionData); + ExitOnFailure(hr, "Failed to write rollback custom action data for file content: %ls", sczFilePath); + } + } + + // reaching the end of the list is actually a good thing, not an error + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occurred while processing WixFormatFiles table"); + + // schedule deferred CAs if there's anything to do + if (sczRollbackCustomActionData && *sczRollbackCustomActionData) + { + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixRollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); + ExitOnFailure(hr, "Failed to schedule WixRollbackFormatFiles"); + } + + if (sczExecCustomActionData && *sczExecCustomActionData) + { + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); + ExitOnFailure(hr, "Failed to schedule WixExecFormatFiles"); + } + +LExit: + return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} + + +// +// WixExecFormatFiles - deferred and rollback CAs to write formatted files +// +extern "C" UINT __stdcall WixExecFormatFiles( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PSCZ sczCustomActionData; + LPWSTR pwz = NULL; + PSCZ sczFilePath; + PSCZ sczFileContent; + LPSTR psz = NULL; + + // initialize + hr = WcaInitialize(hInstall, "WixExecFormatFiles"); + ExitOnFailure(hr, "Failed to initialize for WixExecFormatFiles."); + + hr = WcaGetProperty(L"CustomActionData", &sczCustomActionData); + ExitOnFailure(hr, "Failed to get CustomActionData."); +#ifdef _DEBUG + WcaLog(LOGMSG_STANDARD, "CustomActionData: %ls", sczCustomActionData); +#endif + + // loop through all the passed in data + pwz = sczCustomActionData; + while (pwz && *pwz) + { + // extract the custom action data + hr = WcaReadStringFromCaData(&pwz, &sczFilePath); + ExitOnFailure(hr, "Failed to read file path from custom action data"); + + WCA_ENCODING encoding = WCA_ENCODING_UNKNOWN; + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&encoding)); + ExitOnFailure(hr, "Failed to read encoding from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &sczFileContent); + ExitOnFailure(hr, "Failed to read file content from custom action data"); + + // re-encode content + LPCBYTE pbData = NULL; + size_t cbData = 0; + switch (encoding) + { + case WCA_ENCODING_UTF_16: + pbData = reinterpret_cast(LPCWSTR(sczFileContent)); + cbData = lstrlenW(sczFileContent) * sizeof(WCHAR); + break; + + case WCA_ENCODING_UTF_8: + hr = StrAnsiAllocString(&psz, sczFileContent, 0, CP_UTF8); + ExitOnFailure(hr, "Failed to convert Unicode to UTF-8."); + pbData = reinterpret_cast(psz); + + hr = ::StringCbLengthA(psz, STRSAFE_MAX_CCH, &cbData); + ExitOnFailure(hr, "Failed to count UTF-8 bytes."); + break; + + case WCA_ENCODING_ANSI: + hr = StrAnsiAllocString(&psz, sczFileContent, 0, CP_ACP); + ExitOnFailure(hr, "Failed to convert Unicode to ANSI."); + pbData = reinterpret_cast(psz); + + hr = ::StringCbLengthA(psz, STRSAFE_MAX_CCH, &cbData); + ExitOnFailure(hr, "Failed to count UTF-8 bytes."); + break; + + default: + break; + } + +#ifdef _DEBUG + WcaLog(LOGMSG_STANDARD, "File: %ls", sczCustomActionData); + WcaLog(LOGMSG_STANDARD, "Content: %ls", sczFileContent); +#endif + + // write file and preserve modified time + FILETIME filetime; + + hr = FileGetTime(sczFilePath, NULL, NULL, &filetime); + ExitOnFailure(hr, "Failed to get modified time of file : %ls", sczFilePath); + + hr = FileWrite(sczFilePath, FILE_ATTRIBUTE_NORMAL, pbData, static_cast(cbData), NULL); + ExitOnFailure(hr, "Failed to write file content: %ls", sczFilePath); + + hr = FileSetTime(sczFilePath, NULL, NULL, &filetime); + ExitOnFailure(hr, "Failed to set modified time of file : %ls", sczFilePath); + + // Tick the progress bar + hr = WcaProgressMessage(COST_FILEFORMATTING, FALSE); + ExitOnFailure(hr, "Failed to tick progress bar for file: %ls", sczFilePath); + } + +LExit: + ReleaseStr(psz); + + return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} diff --git a/src/ca/OsInfo.cpp b/src/ca/OsInfo.cpp new file mode 100644 index 00000000..4783673e --- /dev/null +++ b/src/ca/OsInfo.cpp @@ -0,0 +1,487 @@ +// 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" + +// constants we'll pick up from later SDKs +#define SM_TABLETPC 86 +#define SM_MEDIACENTER 87 +#define SM_STARTER 88 +#define SM_SERVERR2 89 +#define VER_SUITE_WH_SERVER 0x00008000 + +/******************************************************************** +WixQueryOsInfo - entry point for WixQueryOsInfo custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties that identify OS information + and predefined directories +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsInfo( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + OSVERSIONINFOEXW ovix = {0}; + + hr = WcaInitialize(hInstall, "WixQueryOsInfo"); + ExitOnFailure(hr, "WixQueryOsInfo failed to initialize"); + + // identify product suites + ovix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); + #pragma warning(suppress: 4996) //TODO: use osutil + ::GetVersionExW(reinterpret_cast(&ovix)); + + if (VER_SUITE_SMALLBUSINESS == (ovix.wSuiteMask & VER_SUITE_SMALLBUSINESS)) + { + WcaSetIntProperty(L"WIX_SUITE_SMALLBUSINESS", 1); + } + + if (VER_SUITE_ENTERPRISE == (ovix.wSuiteMask & VER_SUITE_ENTERPRISE)) + { + WcaSetIntProperty(L"WIX_SUITE_ENTERPRISE", 1); + } + + if (VER_SUITE_BACKOFFICE == (ovix.wSuiteMask & VER_SUITE_BACKOFFICE)) + { + WcaSetIntProperty(L"WIX_SUITE_BACKOFFICE", 1); + } + + if (VER_SUITE_COMMUNICATIONS == (ovix.wSuiteMask & VER_SUITE_COMMUNICATIONS)) + { + WcaSetIntProperty(L"WIX_SUITE_COMMUNICATIONS", 1); + } + + if (VER_SUITE_TERMINAL == (ovix.wSuiteMask & VER_SUITE_TERMINAL)) + { + WcaSetIntProperty(L"WIX_SUITE_TERMINAL", 1); + } + + if (VER_SUITE_SMALLBUSINESS_RESTRICTED == (ovix.wSuiteMask & VER_SUITE_SMALLBUSINESS_RESTRICTED)) + { + WcaSetIntProperty(L"WIX_SUITE_SMALLBUSINESS_RESTRICTED", 1); + } + + if (VER_SUITE_EMBEDDEDNT == (ovix.wSuiteMask & VER_SUITE_EMBEDDEDNT)) + { + WcaSetIntProperty(L"WIX_SUITE_EMBEDDEDNT", 1); + } + + if (VER_SUITE_DATACENTER == (ovix.wSuiteMask & VER_SUITE_DATACENTER)) + { + WcaSetIntProperty(L"WIX_SUITE_DATACENTER", 1); + } + + if (VER_SUITE_SINGLEUSERTS == (ovix.wSuiteMask & VER_SUITE_SINGLEUSERTS)) + { + WcaSetIntProperty(L"WIX_SUITE_SINGLEUSERTS", 1); + } + + if (VER_SUITE_PERSONAL == (ovix.wSuiteMask & VER_SUITE_PERSONAL)) + { + WcaSetIntProperty(L"WIX_SUITE_PERSONAL", 1); + } + + if (VER_SUITE_BLADE == (ovix.wSuiteMask & VER_SUITE_BLADE)) + { + WcaSetIntProperty(L"WIX_SUITE_BLADE", 1); + } + + if (VER_SUITE_EMBEDDED_RESTRICTED == (ovix.wSuiteMask & VER_SUITE_EMBEDDED_RESTRICTED)) + { + WcaSetIntProperty(L"WIX_SUITE_EMBEDDED_RESTRICTED", 1); + } + + if (VER_SUITE_SECURITY_APPLIANCE == (ovix.wSuiteMask & VER_SUITE_SECURITY_APPLIANCE)) + { + WcaSetIntProperty(L"WIX_SUITE_SECURITY_APPLIANCE", 1); + } + + if (VER_SUITE_STORAGE_SERVER == (ovix.wSuiteMask & VER_SUITE_STORAGE_SERVER)) + { + WcaSetIntProperty(L"WIX_SUITE_STORAGE_SERVER", 1); + } + + if (VER_SUITE_COMPUTE_SERVER == (ovix.wSuiteMask & VER_SUITE_COMPUTE_SERVER)) + { + WcaSetIntProperty(L"WIX_SUITE_COMPUTE_SERVER", 1); + } + + if (VER_SUITE_WH_SERVER == (ovix.wSuiteMask & VER_SUITE_WH_SERVER)) + { + WcaSetIntProperty(L"WIX_SUITE_WH_SERVER", 1); + } + + // only for XP and later + if (5 < ovix.dwMajorVersion || (5 == ovix.dwMajorVersion && 0 < ovix.dwMinorVersion)) + { + if (::GetSystemMetrics(SM_SERVERR2)) + { + WcaSetIntProperty(L"WIX_SUITE_SERVERR2", 1); + } + + if (::GetSystemMetrics(SM_MEDIACENTER)) + { + WcaSetIntProperty(L"WIX_SUITE_MEDIACENTER", 1); + } + + if (::GetSystemMetrics(SM_STARTER)) + { + WcaSetIntProperty(L"WIX_SUITE_STARTER", 1); + } + + if (::GetSystemMetrics(SM_TABLETPC)) + { + WcaSetIntProperty(L"WIX_SUITE_TABLETPC", 1); + } + } + +LExit: + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + +/******************************************************************** +WixQueryOsDirs - entry point for WixQueryOsDirs custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties that identify predefined directories +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsDirs( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQueryOsDirs"); + ExitOnFailure(hr, "WixQueryOsDirs failed to initialize"); + + // get the paths of the CSIDLs that represent real paths and for which MSI + // doesn't yet have standard folder properties + WCHAR path[MAX_PATH]; + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_ADMINTOOLS, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_ADMINTOOLS", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_ALTSTARTUP, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_ALTSTARTUP", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_CDBURN_AREA, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_CDBURN_AREA", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_ADMINTOOLS, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_ADMINTOOLS", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_ALTSTARTUP, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_ALTSTARTUP", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_DOCUMENTS", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_FAVORITES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_MUSIC, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_MUSIC", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_PICTURES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_PICTURES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_VIDEO, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_VIDEO", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COOKIES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COOKIES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_DESKTOP", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_HISTORY, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_HISTORY", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_INTERNET_CACHE, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_INTERNET_CACHE", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYMUSIC, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_MYMUSIC", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_MYPICTURES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYVIDEO, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_MYVIDEO", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_NETHOOD, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_NETHOOD", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_PERSONAL", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PRINTHOOD, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_PRINTHOOD", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_PROFILE", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_RECENT", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_RESOURCES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_RESOURCES", path); + } + +LExit: + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** +SetPropertyWellKnownSID + + Set a property with the localized name of a well known windows SID +********************************************************************/ +static HRESULT SetPropertyWellKnownSID( + __in WELL_KNOWN_SID_TYPE sidType, + __in LPCWSTR wzPropertyName, + __in BOOL fIncludeDomainName + ) +{ + HRESULT hr = S_OK; + PSID psid = NULL; + WCHAR wzRefDomain[MAX_PATH] = {0}; + SID_NAME_USE nameUse; + DWORD refSize = MAX_PATH; + WCHAR wzName[MAX_PATH] = {0}; + LPWSTR pwzPropertyValue = NULL; + DWORD size = MAX_PATH; + + hr = AclGetWellKnownSid(sidType, &psid); + ExitOnFailure(hr, "Failed to get SID; skipping account %ls", wzPropertyName); + + if (!::LookupAccountSidW(NULL, psid, wzName, &size, wzRefDomain, &refSize, &nameUse)) + { + ExitWithLastError(hr, "Failed to look up account for SID; skipping account %ls.", wzPropertyName); + } + + if (fIncludeDomainName) + { + hr = StrAllocFormatted(&pwzPropertyValue, L"%s\\%s", wzRefDomain, wzName); + ExitOnFailure(hr, "Failed to format property value"); + + hr = WcaSetProperty(wzPropertyName, pwzPropertyValue); + ExitOnFailure(hr, "Failed write domain\\name property"); + } + else + { + hr = WcaSetProperty(wzPropertyName, wzName); + ExitOnFailure(hr, "Failed write to name-only property"); + } + +LExit: + if (NULL != psid) + { + ::LocalFree(psid); + } + ReleaseStr(pwzPropertyValue); + return hr; +} + +/******************************************************************** +WixQueryOsWellKnownSID - entry point for WixQueryOsWellKnownSID custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties with the localized names of built-in + Windows Security IDs +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsWellKnownSID( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQueryOsWellKnownSID"); + ExitOnFailure(hr, "WixQueryOsWellKnownSID failed to initialize"); + + SetPropertyWellKnownSID(WinLocalSystemSid, L"WIX_ACCOUNT_LOCALSYSTEM", TRUE); + SetPropertyWellKnownSID(WinLocalServiceSid, L"WIX_ACCOUNT_LOCALSERVICE", TRUE); + SetPropertyWellKnownSID(WinNetworkServiceSid, L"WIX_ACCOUNT_NETWORKSERVICE", TRUE); + SetPropertyWellKnownSID(WinBuiltinAdministratorsSid, L"WIX_ACCOUNT_ADMINISTRATORS", TRUE); + SetPropertyWellKnownSID(WinBuiltinUsersSid, L"WIX_ACCOUNT_USERS", TRUE); + SetPropertyWellKnownSID(WinBuiltinGuestsSid, L"WIX_ACCOUNT_GUESTS", TRUE); + SetPropertyWellKnownSID(WinBuiltinPerfLoggingUsersSid, L"WIX_ACCOUNT_PERFLOGUSERS", TRUE); + SetPropertyWellKnownSID(WinBuiltinPerfLoggingUsersSid, L"WIX_ACCOUNT_PERFLOGUSERS_NODOMAIN", FALSE); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/******************************************************************** +DetectWDDMDriver + + Set a property if the driver on the machine is a WDDM driver. One + reliable way to detect the presence of a WDDM driver is to try and + use the Direct3DCreate9Ex() function. This method attempts that + then sets the property appropriately. +********************************************************************/ +static HRESULT DetectWDDMDriver() +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + + // Manually load the d3d9.dll library. If the library couldn't be loaded then we obviously won't be able + // to try calling the function so just return. + hr = LoadSystemLibrary(L"d3d9.dll", &hModule); + if (E_MODNOTFOUND == hr) + { + TraceError(hr, "Unable to load DirectX APIs, skipping WDDM driver check."); + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to the load the existing DirectX APIs."); + + // Obtain the address of the Direct3DCreate9Ex function. If this fails we know it isn't a WDDM + // driver so just exit. + const void* Direct3DCreate9ExPtr = ::GetProcAddress(hModule, "Direct3DCreate9Ex"); + ExitOnNull(Direct3DCreate9ExPtr, hr, S_OK, "Unable to load Direct3DCreateEx function, so the driver is not a WDDM driver."); + + // At this point we know it's a WDDM driver so set the property. + hr = WcaSetIntProperty(L"WIX_WDDM_DRIVER_PRESENT", 1); + ExitOnFailure(hr, "Failed write property"); + +LExit: + if (NULL != hModule) + { + FreeLibrary(hModule); + } + + return hr; +} + +/******************************************************************** +DetectIsCompositionEnabled + + Set a property based on the return value of DwmIsCompositionEnabled(). +********************************************************************/ +static HRESULT DetectIsCompositionEnabled() +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + BOOL compositionState = false; + + // Manually load the d3d9.dll library. If the library can't load it's likely because we are not on a Vista + // OS. Just return ok, and the property won't get set. + hr = LoadSystemLibrary(L"dwmapi.dll", &hModule); + if (E_MODNOTFOUND == hr) + { + TraceError(hr, "Unable to load Vista desktop window manager APIs, skipping Composition Enabled check."); + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to load the existing window manager APIs."); + + // If for some reason we can't get the function pointer that's ok, just return. + typedef HRESULT (WINAPI *DWMISCOMPOSITIONENABLEDPTR)(BOOL*); + DWMISCOMPOSITIONENABLEDPTR DwmIsCompositionEnabledPtr = (DWMISCOMPOSITIONENABLEDPTR)::GetProcAddress(hModule, "DwmIsCompositionEnabled"); + ExitOnNull(hModule, hr, S_OK, "Unable to obtain function information, skipping Composition Enabled check."); + + hr = DwmIsCompositionEnabledPtr(&compositionState); + ExitOnFailure(hr, "Failed to retrieve Composition state"); + + if (compositionState) + { + hr = WcaSetIntProperty(L"WIX_DWM_COMPOSITION_ENABLED", 1); + ExitOnFailure(hr, "Failed write property"); + } + +LExit: + if (NULL != hModule) + { + FreeLibrary(hModule); + } + return hr; +} + +/******************************************************************** +WixQueryOsDriverInfo - entry point for WixQueryOsDriverInfo custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties about drivers installed on + the target machine +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsDriverInfo( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQueryOsDriverInfo"); + ExitOnFailure(hr, "WixQueryOsDriverInfo failed to initialize"); + + // Detect the WDDM driver status + hr = DetectWDDMDriver(); + ExitOnFailure(hr, "Failed to detect WIX_WDDM_DRIVER_PRESENT"); + + // Detect whether composition is enabled + hr = DetectIsCompositionEnabled(); + ExitOnFailure(hr, "Failed to detect WIX_DWM_COMPOSITION_ENABLED"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ca/RemoveFoldersEx.cpp b/src/ca/RemoveFoldersEx.cpp new file mode 100644 index 00000000..194c6662 --- /dev/null +++ b/src/ca/RemoveFoldersEx.cpp @@ -0,0 +1,197 @@ +// 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" + +LPCWSTR vcsRemoveFolderExQuery = L"SELECT `WixRemoveFolderEx`, `Component_`, `Property`, `InstallMode` FROM `WixRemoveFolderEx`"; +enum eRemoveFolderExQuery { rfqId = 1, rfqComponent, rfqProperty, feqMode }; + +static HRESULT RecursePath( + __in_z LPCWSTR wzPath, + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzComponent, + __in_z LPCWSTR wzProperty, + __in int iMode, + __inout DWORD* pdwCounter, + __inout MSIHANDLE* phTable, + __inout MSIHANDLE* phColumns + ) +{ + HRESULT hr = S_OK; + DWORD er; + LPWSTR sczSearch = NULL; + LPWSTR sczProperty = NULL; + HANDLE hFind = INVALID_HANDLE_VALUE; + WIN32_FIND_DATAW wfd; + LPWSTR sczNext = NULL; + + // First recurse down to all the child directories. + hr = StrAllocFormatted(&sczSearch, L"%s*", wzPath); + ExitOnFailure(hr, "Failed to allocate file search string in path: %S", wzPath); + + hFind = ::FindFirstFileW(sczSearch, &wfd); + if (INVALID_HANDLE_VALUE == hFind) + { + er = ::GetLastError(); + if (ERROR_PATH_NOT_FOUND == er) + { + WcaLog(LOGMSG_STANDARD, "Search path not found: %ls", sczSearch); + ExitFunction1(hr = S_FALSE); + } + else + { + hr = HRESULT_FROM_WIN32(er); + } + ExitOnFailure(hr, "Failed to find all files in path: %S", wzPath); + } + + do + { + // Skip files and the dot directories. + if (FILE_ATTRIBUTE_DIRECTORY != (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || L'.' == wfd.cFileName[0] && (L'\0' == wfd.cFileName[1] || (L'.' == wfd.cFileName[1] && L'\0' == wfd.cFileName[2]))) + { + continue; + } + + hr = StrAllocFormatted(&sczNext, L"%s%s\\", wzPath, wfd.cFileName); + ExitOnFailure(hr, "Failed to concat filename '%S' to string: %S", wfd.cFileName, wzPath); + + hr = RecursePath(sczNext, wzId, wzComponent, wzProperty, iMode, pdwCounter, phTable, phColumns); + ExitOnFailure(hr, "Failed to recurse path: %S", sczNext); + } while (::FindNextFileW(hFind, &wfd)); + + er = ::GetLastError(); + if (ERROR_NO_MORE_FILES == er) + { + hr = S_OK; + } + else + { + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed while looping through files in directory: %S", wzPath); + } + + // Finally, set a property that points at our path. + hr = StrAllocFormatted(&sczProperty, L"_%s_%u", wzProperty, *pdwCounter); + ExitOnFailure(hr, "Failed to allocate Property for RemoveFile table with property: %S.", wzProperty); + + ++(*pdwCounter); + + hr = WcaSetProperty(sczProperty, wzPath); + ExitOnFailure(hr, "Failed to set Property: %S with path: %S", sczProperty, wzPath); + + // Add the row to remove any files and another row to remove the folder. + hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFiles", wzComponent, L"*.*", sczProperty, iMode); + ExitOnFailure(hr, "Failed to add row to remove all files for WixRemoveFolderEx row: %S under path:", wzId, wzPath); + + hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFolder", wzComponent, NULL, sczProperty, iMode); + ExitOnFailure(hr, "Failed to add row to remove folder for WixRemoveFolderEx row: %S under path: %S", wzId, wzPath); + +LExit: + if (INVALID_HANDLE_VALUE != hFind) + { + ::FindClose(hFind); + } + + ReleaseStr(sczNext); + ReleaseStr(sczProperty); + ReleaseStr(sczSearch); + return hr; +} + +extern "C" UINT WINAPI WixRemoveFoldersEx( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixRemoveFoldersEx"); + + HRESULT hr = S_OK; + PMSIHANDLE hView; + PMSIHANDLE hRec; + LPWSTR sczId = NULL; + LPWSTR sczComponent = NULL; + LPWSTR sczProperty = NULL; + LPWSTR sczPath = NULL; + LPWSTR sczExpandedPath = NULL; + int iMode = 0; + DWORD dwCounter = 0; + DWORD_PTR cchLen = 0; + MSIHANDLE hTable = NULL; + MSIHANDLE hColumns = NULL; + + hr = WcaInitialize(hInstall, "WixRemoveFoldersEx"); + ExitOnFailure(hr, "Failed to initialize WixRemoveFoldersEx."); + + // anything to do? + if (S_OK != WcaTableExists(L"WixRemoveFolderEx")) + { + WcaLog(LOGMSG_STANDARD, "WixRemoveFolderEx table doesn't exist, so there are no folders to remove."); + ExitFunction(); + } + + // query and loop through all the remove folders exceptions + hr = WcaOpenExecuteView(vcsRemoveFolderExQuery, &hView); + ExitOnFailure(hr, "Failed to open view on WixRemoveFolderEx table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, rfqId, &sczId); + ExitOnFailure(hr, "Failed to get remove folder identity."); + + hr = WcaGetRecordString(hRec, rfqComponent, &sczComponent); + ExitOnFailure(hr, "Failed to get remove folder component."); + + hr = WcaGetRecordString(hRec, rfqProperty, &sczProperty); + ExitOnFailure(hr, "Failed to get remove folder property."); + + hr = WcaGetRecordInteger(hRec, feqMode, &iMode); + ExitOnFailure(hr, "Failed to get remove folder mode"); + + hr = WcaGetProperty(sczProperty, &sczPath); + ExitOnFailure(hr, "Failed to resolve remove folder property: %S for row: %S", sczProperty, sczId); + + // fail early if the property isn't set as you probably don't want your installers trying to delete SystemFolder + // StringCchLengthW succeeds only if the string is zero characters plus 1 for the terminating null + hr = ::StringCchLengthW(sczPath, 1, reinterpret_cast(&cchLen)); + if (SUCCEEDED(hr)) + { + ExitOnFailure(hr = E_INVALIDARG, "Missing folder property: %S for row: %S", sczProperty, sczId); + } + + hr = PathExpand(&sczExpandedPath, sczPath, PATH_EXPAND_ENVIRONMENT); + ExitOnFailure(hr, "Failed to expand path: %S for row: %S", sczPath, sczId); + + hr = PathBackslashTerminate(&sczExpandedPath); + ExitOnFailure(hr, "Failed to backslash-terminate path: %S", sczExpandedPath); + + WcaLog(LOGMSG_STANDARD, "Recursing path: %S for row: %S.", sczExpandedPath, sczId); + hr = RecursePath(sczExpandedPath, sczId, sczComponent, sczProperty, iMode, &dwCounter, &hTable, &hColumns); + ExitOnFailure(hr, "Failed while navigating path: %S for row: %S", sczPath, sczId); + } + + // reaching the end of the list is actually a good thing, not an error + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing WixRemoveFolderEx table"); + +LExit: + if (hColumns) + { + ::MsiCloseHandle(hColumns); + } + + if (hTable) + { + ::MsiCloseHandle(hTable); + } + + ReleaseStr(sczExpandedPath); + ReleaseStr(sczPath); + ReleaseStr(sczProperty); + ReleaseStr(sczComponent); + ReleaseStr(sczId); + + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ca/RestartManager.cpp b/src/ca/RestartManager.cpp new file mode 100644 index 00000000..3cfc07ee --- /dev/null +++ b/src/ca/RestartManager.cpp @@ -0,0 +1,185 @@ +// 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" +#include + +// Include space for the terminating null. +#define CCH_SESSION_KEY CCH_RM_SESSION_KEY + 1 + +enum eRmuResourceType +{ + etInvalid, + etFilename, + etApplication, + etServiceName, + + // Mask types from Attributes. + etTypeMask = 0xf, +}; + +LPCWSTR vcsRestartResourceQuery = + L"SELECT `WixRestartResource`.`WixRestartResource`, `WixRestartResource`.`Component_`, `WixRestartResource`.`Resource`, `WixRestartResource`.`Attributes` " + L"FROM `WixRestartResource`"; +enum eRestartResourceQuery { rrqRestartResource = 1, rrqComponent, rrqResource, rrqAttributes }; + +/******************************************************************** +WixRegisterRestartResources - Immediate CA to register resources with RM. + +Enumerates components before InstallValidate and registers resources +to be restarted by Restart Manager if the component action +is anything other than None. + +Do not disable file system redirection. + +********************************************************************/ +extern "C" UINT __stdcall WixRegisterRestartResources( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR wzSessionKey = NULL; + size_t cchSessionKey = 0; + PRMU_SESSION pSession = NULL; + + LPWSTR wzRestartResource = NULL; + LPWSTR wzComponent = NULL; + LPWSTR wzResource = NULL; + int iAttributes = NULL; + BOOL fIsComponentNull = FALSE; + WCA_TODO todo = WCA_TODO_UNKNOWN; + int iType = etInvalid; + + hr = WcaInitialize(hInstall, "WixRegisterRestartResources"); + ExitOnFailure(hr, "Failed to initialize."); + + // Skip if the table doesn't exist. + if (S_OK != WcaTableExists(L"WixRestartResource")) + { + WcaLog(LOGMSG_STANDARD, "The RestartResource table does not exist; there are no resources to register with Restart Manager."); + ExitFunction(); + } + + // Get the existing Restart Manager session if available. + hr = WcaGetProperty(L"MsiRestartManagerSessionKey", &wzSessionKey); + ExitOnFailure(hr, "Failed to get the MsiRestartManagerSessionKey property."); + + hr = ::StringCchLengthW(wzSessionKey, CCH_SESSION_KEY, &cchSessionKey); + ExitOnFailure(hr, "Failed to get the MsiRestartManagerSessionKey string length."); + + // Skip if the property doesn't exist. + if (0 == cchSessionKey) + { + WcaLog(LOGMSG_STANDARD, "The MsiRestartManagerSessionKey property is not available to join."); + ExitFunction(); + } + + // Join the existing Restart Manager session if supported. + hr = RmuJoinSession(&pSession, wzSessionKey); + if (E_MODNOTFOUND == hr) + { + WcaLog(LOGMSG_STANDARD, "The Restart Manager is not supported on this platform. Skipping."); + ExitFunction1(hr = S_OK); + } + else if (FAILED(hr)) + { + WcaLog(LOGMSG_STANDARD, "Failed to join the existing Restart Manager session %ls.", wzSessionKey); + ExitFunction1(hr = S_OK); + } + + // Loop through each record in the table. + hr = WcaOpenExecuteView(vcsRestartResourceQuery, &hView); + ExitOnFailure(hr, "Failed to open a view on the RestartResource table."); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, rrqRestartResource, &wzRestartResource); + ExitOnFailure(hr, "Failed to get the RestartResource field value."); + + hr = WcaGetRecordString(hRec, rrqComponent, &wzComponent); + ExitOnFailure(hr, "Failed to get the Component_ field value."); + + hr = WcaGetRecordFormattedString(hRec, rrqResource, &wzResource); + ExitOnFailure(hr, "Failed to get the Resource formatted field value."); + + hr = WcaGetRecordInteger(hRec, rrqAttributes, &iAttributes); + ExitOnFailure(hr, "Failed to get the Attributes field value."); + + fIsComponentNull = ::MsiRecordIsNull(hRec, rrqComponent); + todo = WcaGetComponentToDo(wzComponent); + + // Only register resources for components that are null, or being installed, reinstalled, or uninstalled. + if (!fIsComponentNull && WCA_TODO_UNKNOWN == todo) + { + WcaLog(LOGMSG_VERBOSE, "Skipping resource %ls.", wzRestartResource); + continue; + } + + // Get the type from Attributes and add to the Restart Manager. + iType = iAttributes & etTypeMask; + switch (iType) + { + case etFilename: + WcaLog(LOGMSG_VERBOSE, "Registering file name %ls with the Restart Manager.", wzResource); + hr = RmuAddFile(pSession, wzResource); + ExitOnFailure(hr, "Failed to register the file name with the Restart Manager session."); + break; + + case etApplication: + WcaLog(LOGMSG_VERBOSE, "Registering process name %ls with the Restart Manager.", wzResource); + hr = RmuAddProcessesByName(pSession, wzResource); + if (E_NOTFOUND == hr) + { + // ERROR_ACCESS_DENIED was returned when trying to register this process. + // Since other instances may have been registered, log a message and continue the setup rather than failing. + WcaLog(LOGMSG_STANDARD, "The process, %ls, could not be registered with the Restart Manager (probably because the setup is not elevated and the process is in another user context). A reboot may be requested later.", wzResource); + hr = S_OK; + } + else + { + ExitOnFailure(hr, "Failed to register the process name with the Restart Manager session."); + } + break; + + case etServiceName: + WcaLog(LOGMSG_VERBOSE, "Registering service name %ls with the Restart Manager.", wzResource); + hr = RmuAddService(pSession, wzResource); + ExitOnFailure(hr, "Failed to register the service name with the Restart Manager session."); + break; + + default: + WcaLog(LOGMSG_VERBOSE, "The resource type %d for %ls is not supported and will not be registered.", iType, wzRestartResource); + break; + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failed while looping through all rows to register resources."); + + // Register the resources and unjoin the session. + hr = RmuEndSession(pSession); + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to register the resources with the Restart Manager."); + ExitFunction1(hr = S_OK); + } + +LExit: + ReleaseStr(wzRestartResource); + ReleaseStr(wzComponent); + ReleaseStr(wzResource); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} diff --git a/src/ca/TouchFile.cpp b/src/ca/TouchFile.cpp new file mode 100644 index 00000000..1c40a3eb --- /dev/null +++ b/src/ca/TouchFile.cpp @@ -0,0 +1,308 @@ +// 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" + +LPCWSTR vcsTouchFileQuery = L"SELECT `WixTouchFile`, `Component_`, `Path`, `Attributes` FROM `WixTouchFile`"; +enum TOUCH_FILE_QUERY { tfqId = 1, tfqComponent, tfqPath, tfqTouchFileAttributes }; + +enum TOUCH_FILE_ATTRIBUTE +{ + TOUCH_FILE_ATTRIBUTE_ON_INSTALL = 0x01, + TOUCH_FILE_ATTRIBUTE_ON_REINSTALL = 0x02, + TOUCH_FILE_ATTRIBUTE_ON_UNINSTALL = 0x04, + TOUCH_FILE_ATTRIBUTE_64BIT = 0x10, + TOUCH_FILE_ATTRIBUTE_VITAL = 0x20 +}; + + +static BOOL SetExistingFileModifiedTime( + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzPath, + __in BOOL f64Bit, + __in FILETIME* pftModified + ) +{ + HRESULT hr = S_OK; + BOOL fReenableFileSystemRedirection = FALSE; + + if (f64Bit) + { + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Failed to disable 64-bit file system redirection to path: '%ls' for: %ls", wzPath, wzId); + + fReenableFileSystemRedirection = TRUE; + } + + hr = FileSetTime(wzPath, NULL, NULL, pftModified); + +LExit: + if (fReenableFileSystemRedirection) + { + WcaRevertWow64FSRedirection(); + } + + return SUCCEEDED(hr); +} + + +static HRESULT AddDataToCustomActionData( + __deref_inout_z LPWSTR* psczCustomActionData, + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzPath, + __in int iTouchFileAttributes, + __in FILETIME ftModified + ) +{ + HRESULT hr = S_OK; + + hr = WcaWriteStringToCaData(wzId, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file identity to custom action data."); + + hr = WcaWriteStringToCaData(wzPath, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file path to custom action data."); + + hr = WcaWriteIntegerToCaData(iTouchFileAttributes, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file attributes to custom action data."); + + hr = WcaWriteIntegerToCaData(ftModified.dwHighDateTime, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file high date/time to custom action data."); + + hr = WcaWriteIntegerToCaData(ftModified.dwLowDateTime, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file low date/time to custom action data."); + +LExit: + return hr; +} + + +static BOOL TryGetExistingFileModifiedTime( + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzPath, + __in BOOL f64Bit, + __inout FILETIME* pftModified + ) +{ + HRESULT hr = S_OK; + BOOL fReenableFileSystemRedirection = FALSE; + + if (f64Bit) + { + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Failed to disable 64-bit file system redirection to path: '%ls' for: %ls", wzPath, wzId); + + fReenableFileSystemRedirection = TRUE; + } + + hr = FileGetTime(wzPath, NULL, NULL, pftModified); + if (E_PATHNOTFOUND == hr || E_FILENOTFOUND == hr) + { + // If the file doesn't exist yet there is nothing to rollback (i.e. file will probably be removed during rollback), so + // keep the error code but don't log anything. + } + else if (FAILED(hr)) + { + WcaLog(LOGMSG_STANDARD, "Cannot access modified timestamp for file: '%ls' due to error: 0x%x. Continuing with out rollback for: %ls", wzPath, hr, wzId); + } + +LExit: + if (fReenableFileSystemRedirection) + { + WcaRevertWow64FSRedirection(); + } + + return SUCCEEDED(hr); +} + + +static HRESULT ProcessTouchFileTable( + __in BOOL fInstalling + ) +{ + HRESULT hr = S_OK; + + FILETIME ftModified = {}; + + PMSIHANDLE hView; + PMSIHANDLE hRec; + + LPWSTR sczId = NULL; + LPWSTR sczComponent = NULL; + int iTouchFileAttributes = 0; + LPWSTR sczPath = NULL; + + FILETIME ftRollbackModified = {}; + LPWSTR sczRollbackData = NULL; + LPWSTR sczExecuteData = NULL; + + if (S_OK != WcaTableExists(L"WixTouchFile")) + { + ExitFunction(); + } + + ::GetSystemTimeAsFileTime(&ftModified); + + hr = WcaOpenExecuteView(vcsTouchFileQuery, &hView); + ExitOnFailure(hr, "Failed to open view on WixTouchFile table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, tfqId, &sczId); + ExitOnFailure(hr, "Failed to get touch file identity."); + + hr = WcaGetRecordString(hRec, tfqComponent, &sczComponent); + ExitOnFailure(hr, "Failed to get touch file component for: %ls", sczId); + + hr = WcaGetRecordInteger(hRec, tfqTouchFileAttributes, &iTouchFileAttributes); + ExitOnFailure(hr, "Failed to get touch file attributes for: %ls", sczId); + + WCA_TODO todo = WcaGetComponentToDo(sczComponent); + + BOOL fOnInstall = fInstalling && WCA_TODO_INSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_INSTALL); + BOOL fOnReinstall = fInstalling && WCA_TODO_REINSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_REINSTALL); + BOOL fOnUninstall = !fInstalling && WCA_TODO_UNINSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_UNINSTALL); + + if (fOnInstall || fOnReinstall || fOnUninstall) + { + hr = WcaGetRecordFormattedString(hRec, tfqPath, &sczPath); + ExitOnFailure(hr, "Failed to get touch file path for: %ls", sczId); + + if (TryGetExistingFileModifiedTime(sczId, sczPath, (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_64BIT), &ftRollbackModified)) + { + hr = AddDataToCustomActionData(&sczRollbackData, sczId, sczPath, iTouchFileAttributes, ftRollbackModified); + ExitOnFailure(hr, "Failed to add to rollback custom action data for: %ls", sczId); + } + + hr = AddDataToCustomActionData(&sczExecuteData, sczId, sczPath, iTouchFileAttributes, ftModified); + ExitOnFailure(hr, "Failed to add to execute custom action data for: %ls", sczId); + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing WixTouchFile table"); + + if (sczRollbackData) + { + hr = WcaDoDeferredAction(L"WixRollbackTouchFile", sczRollbackData, 0); + ExitOnFailure(hr, "Failed to schedule WixRollbackTouchFile"); + } + + if (sczExecuteData) + { + hr = WcaDoDeferredAction(L"WixExecuteTouchFile", sczExecuteData, 0); + ExitOnFailure(hr, "Failed to schedule WixExecuteTouchFile"); + } + +LExit: + ReleaseStr(sczExecuteData); + ReleaseStr(sczRollbackData); + ReleaseStr(sczPath); + ReleaseStr(sczComponent); + ReleaseStr(sczId); + + return hr; +} + + +extern "C" UINT WINAPI WixTouchFileDuringInstall( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixTouchFileDuringInstall"); + + HRESULT hr = S_OK; + + hr = WcaInitialize(hInstall, "WixTouchFileDuringInstall"); + ExitOnFailure(hr, "Failed to initialize WixTouchFileDuringInstall."); + + hr = ProcessTouchFileTable(TRUE); + +LExit: + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +extern "C" UINT WINAPI WixTouchFileDuringUninstall( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixTouchFileDuringUninstall"); + + HRESULT hr = S_OK; + + hr = WcaInitialize(hInstall, "WixTouchFileDuringUninstall"); + ExitOnFailure(hr, "Failed to initialize WixTouchFileDuringUninstall."); + + hr = ProcessTouchFileTable(FALSE); + +LExit: + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +extern "C" UINT WINAPI WixExecuteTouchFile( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + + LPWSTR sczData = NULL; + LPWSTR pwz = NULL; + + LPWSTR sczId = NULL; + LPWSTR sczPath = NULL; + int iTouchFileAttributes = 0; + FILETIME ftModified = {}; + + hr = WcaInitialize(hInstall, "WixExecuteTouchFile"); + ExitOnFailure(hr, "Failed to initialize WixExecuteTouchFile."); + + hr = WcaGetProperty(L"CustomActionData", &sczData); + ExitOnFailure(hr, "Failed to get custom action data for WixExecuteTouchFile."); + + pwz = sczData; + + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &sczId); + ExitOnFailure(hr, "Failed to get touch file identity from custom action data."); + + hr = WcaReadStringFromCaData(&pwz, &sczPath); + ExitOnFailure(hr, "Failed to get touch file path from custom action data for: %ls", sczId); + + hr = WcaReadIntegerFromCaData(&pwz, &iTouchFileAttributes); + ExitOnFailure(hr, "Failed to get touch file attributes from custom action data for: %ls", sczId); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&ftModified.dwHighDateTime)); + ExitOnFailure(hr, "Failed to get touch file high date/time from custom action data for: %ls", sczId); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&ftModified.dwLowDateTime)); + ExitOnFailure(hr, "Failed to get touch file low date/time from custom action data for: %ls", sczId); + + hr = SetExistingFileModifiedTime(sczId, sczPath, (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_64BIT), &ftModified); + if (FAILED(hr)) + { + if (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_VITAL) + { + ExitOnFailure(hr, "Failed to touch file: '%ls' for: %ls", &sczPath, sczId); + } + else + { + WcaLog(LOGMSG_STANDARD, "Could not touch non-vital file: '%ls' for: %ls with error: 0x%x. Continuing...", sczPath, sczId, hr); + hr = S_OK; + } + } + } + +LExit: + ReleaseStr(sczPath); + ReleaseStr(sczId); + ReleaseStr(sczData); + + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp new file mode 100644 index 00000000..c12b2bc2 --- /dev/null +++ b/src/ca/XmlConfig.cpp @@ -0,0 +1,1099 @@ +// 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" + +#define XMLCONFIG_ELEMENT 0x00000001 +#define XMLCONFIG_VALUE 0x00000002 +#define XMLCONFIG_DOCUMENT 0x00000004 +#define XMLCONFIG_CREATE 0x00000010 +#define XMLCONFIG_DELETE 0x00000020 +#define XMLCONFIG_INSTALL 0x00000100 +#define XMLCONFIG_UNINSTALL 0x00000200 +#define XMLCONFIG_PRESERVE_MODIFIED 0x00001000 + +enum eXmlAction +{ + xaUnknown = 0, + xaOpenFile, + xaOpenFilex64, + xaWriteValue, + xaWriteDocument, + xaDeleteValue, + xaCreateElement, + xaDeleteElement, +}; + +enum eXmlPreserveDate +{ + xdDontPreserve = 0, + xdPreserve +}; + +LPCWSTR vcsXmlConfigQuery = + L"SELECT `XmlConfig`.`XmlConfig`, `XmlConfig`.`File`, `XmlConfig`.`ElementPath`, `XmlConfig`.`VerifyPath`, `XmlConfig`.`Name`, " + L"`XmlConfig`.`Value`, `XmlConfig`.`Flags`, `XmlConfig`.`Component_`, `Component`.`Attributes` " + L"FROM `XmlConfig`,`Component` WHERE `XmlConfig`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; +enum eXmlConfigQuery { xfqXmlConfig = 1, xfqFile, xfqElementPath, xfqVerifyPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; + +struct XML_CONFIG_CHANGE +{ + WCHAR wzId[MAX_DARWIN_KEY + 1]; + + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + WCHAR wzFile[MAX_PATH]; + LPWSTR pwzElementPath; + LPWSTR pwzVerifyPath; + WCHAR wzName[MAX_DARWIN_COLUMN]; + LPWSTR pwzValue; + BOOL fInstalledFile; + + int iXmlFlags; + int iCompAttributes; + + XML_CONFIG_CHANGE* pxfcAdditionalChanges; + int cAdditionalChanges; + + XML_CONFIG_CHANGE* pxfcPrev; + XML_CONFIG_CHANGE* pxfcNext; +}; + +static HRESULT FreeXmlConfigChangeList( + __in_opt XML_CONFIG_CHANGE* pxfcList + ) +{ + HRESULT hr = S_OK; + + XML_CONFIG_CHANGE* pxfcDelete; + while(pxfcList) + { + pxfcDelete = pxfcList; + pxfcList = pxfcList->pxfcNext; + + if (pxfcDelete->pwzElementPath) + { + hr = MemFree(pxfcDelete->pwzElementPath); + ExitOnFailure(hr, "failed to free xml file element path in change list item"); + } + + if (pxfcDelete->pwzVerifyPath) + { + hr = MemFree(pxfcDelete->pwzVerifyPath); + ExitOnFailure(hr, "failed to free xml file verify path in change list item"); + } + + if (pxfcDelete->pwzValue) + { + hr = MemFree(pxfcDelete->pwzValue); + ExitOnFailure(hr, "failed to free xml file value in change list item"); + } + + hr = MemFree(pxfcDelete); + ExitOnFailure(hr, "failed to free xml file change list item"); + } + +LExit: + return hr; +} + +static HRESULT AddXmlConfigChangeToList( + __inout XML_CONFIG_CHANGE** ppxfcHead, + __inout XML_CONFIG_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + + XML_CONFIG_CHANGE* pxfc = static_cast(MemAlloc(sizeof(XML_CONFIG_CHANGE), TRUE)); + ExitOnNull(pxfc, hr, E_OUTOFMEMORY, "failed to allocate memory for new xml file change list element"); + + // Add it to the end of the list + if (NULL == *ppxfcHead) + { + *ppxfcHead = pxfc; + *ppxfcTail = pxfc; + } + else + { + Assert(*ppxfcTail && (*ppxfcTail)->pxfcNext == NULL); + (*ppxfcTail)->pxfcNext = pxfc; + pxfc->pxfcPrev = *ppxfcTail; + *ppxfcTail = pxfc; + } + +LExit: + return hr; +} + + +static HRESULT ReadXmlConfigTable( + __inout XML_CONFIG_CHANGE** ppxfcHead, + __inout XML_CONFIG_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR pwzData = NULL; + + // loop through all the xml configurations + hr = WcaOpenExecuteView(vcsXmlConfigQuery, &hView); + ExitOnFailure(hr, "failed to open view on XmlConfig table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = AddXmlConfigChangeToList(ppxfcHead, ppxfcTail); + ExitOnFailure(hr, "failed to add xml file change to list"); + + // Get record Id + hr = WcaGetRecordString(hRec, xfqXmlConfig, &pwzData); + ExitOnFailure(hr, "failed to get XmlConfig record Id"); + hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); + ExitOnFailure(hr, "failed to copy XmlConfig record Id"); + + // Get component name + hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); + ExitOnFailure(hr, "failed to get component name for XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the component's state + if (0 < lstrlenW(pwzData)) + { + hr = StringCchCopyW((*ppxfcTail)->wzComponent, countof((*ppxfcTail)->wzComponent), pwzData); + ExitOnFailure(hr, "failed to copy component id"); + + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), (*ppxfcTail)->wzComponent, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for component id"); + } + + // Get the xml file + hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); + ExitOnFailure(hr, "failed to get xml file for XmlConfig: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); + ExitOnFailure(hr, "failed to copy xml file path"); + + // Figure out if the file is already on the machine or if it's being installed + hr = WcaGetRecordString(hRec, xfqFile, &pwzData); + ExitOnFailure(hr, "failed to get xml file for XmlConfig: %ls", (*ppxfcTail)->wzId); + if (NULL != wcsstr(pwzData, L"[!") || NULL != wcsstr(pwzData, L"[#")) + { + (*ppxfcTail)->fInstalledFile = TRUE; + } + + // Get the XmlConfig table flags + hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); + ExitOnFailure(hr, "failed to get XmlConfig flags for XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the Element Path + hr = WcaGetRecordFormattedString(hRec, xfqElementPath, &(*ppxfcTail)->pwzElementPath); + ExitOnFailure(hr, "failed to get Element Path for XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the Verify Path + hr = WcaGetRecordFormattedString(hRec, xfqVerifyPath, &(*ppxfcTail)->pwzVerifyPath); + ExitOnFailure(hr, "failed to get Verify Path for XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the name + hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); + ExitOnFailure(hr, "failed to get Name for XmlConfig: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); + ExitOnFailure(hr, "failed to copy name of element"); + + // Get the value + hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); + ExitOnFailure(hr, "failed to get Value for XmlConfig: %ls", (*ppxfcTail)->wzId); + hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); + ExitOnFailure(hr, "failed to allocate buffer for value"); + + // Get the component attributes + hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); + ExitOnFailure(hr, "failed to get component attributes for XmlConfig: %ls", (*ppxfcTail)->wzId); + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to secure"); + +LExit: + ReleaseStr(pwzData); + + return hr; +} + +static HRESULT ProcessChanges( + __inout XML_CONFIG_CHANGE** ppxfcHead + ) +{ + Assert(ppxfcHead && *ppxfcHead); + HRESULT hr = S_OK; + + XML_CONFIG_CHANGE* pxfc = NULL; + XML_CONFIG_CHANGE* pxfcNext = NULL; + XML_CONFIG_CHANGE* pxfcCheck = NULL; + int cAdditionalChanges = 0; + XML_CONFIG_CHANGE* pxfcLast = NULL; + + // If there's only one item in the list, none of this matters + if (pxfc && !pxfc->pxfcNext) + { + ExitFunction(); + } + + // Loop through the list + pxfc = *ppxfcHead; + while (pxfc) + { + // Keep track of where our next spot will be since our current node may be moved + pxfcNext = pxfc->pxfcNext; + + // With each node, check to see if it's element path matches the Id of some other node in the list + pxfcCheck = *ppxfcHead; + while (pxfcCheck) + { + if (0 == lstrcmpW(pxfc->pwzElementPath, pxfcCheck->wzId) && 0 == pxfc->iXmlFlags + && XMLCONFIG_CREATE & pxfcCheck->iXmlFlags && XMLCONFIG_ELEMENT & pxfcCheck->iXmlFlags) + { + // We found a match. First, take it out of the current list + if (pxfc->pxfcPrev) + { + pxfc->pxfcPrev->pxfcNext = pxfc->pxfcNext; + } + else // it was the head. Update the head + { + *ppxfcHead = pxfc->pxfcNext; + } + + if (pxfc->pxfcNext) + { + pxfc->pxfcNext->pxfcPrev = pxfc->pxfcPrev; + } + + pxfc->pxfcNext = NULL; + pxfc->pxfcPrev = NULL; + + // Now, add this node to the end of the matched node's additional changes list + if (!pxfcCheck->pxfcAdditionalChanges) + { + pxfcCheck->pxfcAdditionalChanges = pxfc; + pxfcCheck->cAdditionalChanges = 1; + } + else + { + pxfcLast = pxfcCheck->pxfcAdditionalChanges; + cAdditionalChanges = 1; + while (pxfcLast->pxfcNext) + { + pxfcLast = pxfcLast->pxfcNext; + ++cAdditionalChanges; + } + pxfcLast->pxfcNext = pxfc; + pxfc->pxfcPrev = pxfcLast; + pxfcCheck->cAdditionalChanges = ++cAdditionalChanges; + } + } + + pxfcCheck = pxfcCheck->pxfcNext; + } + + pxfc = pxfcNext; + } + +LExit: + + return hr; +} + + +static HRESULT BeginChangeFile( + __in LPCWSTR pwzFile, + __in int iCompAttributes, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pwzFile && *pwzFile && ppwzCustomActionData); + + HRESULT hr = S_OK; + BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; + + LPBYTE pbData = NULL; + DWORD cbData = 0; + + LPWSTR pwzRollbackCustomActionData = NULL; + + if (fIs64Bit) + { + hr = WcaWriteIntegerToCaData((int)xaOpenFilex64, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write 64-bit file indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaOpenFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file indicator to custom action data"); + } + + hr = WcaWriteStringToCaData(pwzFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file to custom action data: %ls", pwzFile); + + // If the file already exits, then we have to put it back the way it was on failure + if (FileExistsEx(pwzFile, NULL)) + { + hr = FileRead(&pbData, &cbData, pwzFile); + ExitOnFailure(hr, "failed to read file: %ls", pwzFile); + + // Set up the rollback for this file + hr = WcaWriteIntegerToCaData((int)fIs64Bit, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write component bitness to rollback custom action data"); + + hr = WcaWriteStringToCaData(pwzFile, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file name to rollback custom action data: %ls", pwzFile); + + hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlConfigRollback"), pwzRollbackCustomActionData, COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlConfigRollback for file: %ls", pwzFile); + + ReleaseStr(pwzRollbackCustomActionData); + } +LExit: + ReleaseMem(pbData); + + return hr; +} + + +static HRESULT WriteChangeData( + __in XML_CONFIG_CHANGE* pxfc, + __in eXmlAction action, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pxfc && ppwzCustomActionData); + + HRESULT hr = S_OK; + XML_CONFIG_CHANGE* pxfcAdditionalChanges = NULL; + + hr = WcaWriteStringToCaData(pxfc->pwzElementPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", pxfc->pwzElementPath); + + hr = WcaWriteStringToCaData(pxfc->pwzVerifyPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write VerifyPath to custom action data: %ls", pxfc->pwzVerifyPath); + + hr = WcaWriteStringToCaData(pxfc->wzName, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); + + hr = WcaWriteStringToCaData(pxfc->pwzValue, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); + + if (pxfc->iXmlFlags & XMLCONFIG_CREATE && pxfc->iXmlFlags & XMLCONFIG_ELEMENT && xaCreateElement == action && pxfc->pxfcAdditionalChanges) + { + hr = WcaWriteIntegerToCaData(pxfc->cAdditionalChanges, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write additional changes value to custom action data"); + + pxfcAdditionalChanges = pxfc->pxfcAdditionalChanges; + while (pxfcAdditionalChanges) + { + Assert((0 == lstrcmpW(pxfcAdditionalChanges->wzComponent, pxfc->wzComponent)) && 0 == pxfcAdditionalChanges->iXmlFlags && (0 == lstrcmpW(pxfcAdditionalChanges->wzFile, pxfc->wzFile))); + + hr = WcaWriteStringToCaData(pxfcAdditionalChanges->wzName, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); + + hr = WcaWriteStringToCaData(pxfcAdditionalChanges->pwzValue, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); + + pxfcAdditionalChanges = pxfcAdditionalChanges->pxfcNext; + } + } + else + { + hr = WcaWriteIntegerToCaData(0, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write additional changes value to custom action data"); + } + +LExit: + return hr; +} + + +/****************************************************************** + SchedXmlConfig - entry point for XmlConfig Custom Action + +********************************************************************/ +extern "C" UINT __stdcall SchedXmlConfig( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedXmlConfig"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzCurrentFile = NULL; + BOOL fCurrentFileChanged = FALSE; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + XML_CONFIG_CHANGE* pxfcHead = NULL; + XML_CONFIG_CHANGE* pxfcTail = NULL; // TODO: do we need this any more? + XML_CONFIG_CHANGE* pxfc = NULL; + + eXmlAction xa = xaUnknown; + eXmlPreserveDate xd; + + LPWSTR pwzCustomActionData = NULL; + + DWORD cFiles = 0; + + // initialize + hr = WcaInitialize(hInstall, "SchedXmlConfig"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ReadXmlConfigTable(&pxfcHead, &pxfcTail); + MessageExitOnFailure(hr, msierrXmlConfigFailedRead, "failed to read XmlConfig table"); + + hr = ProcessChanges(&pxfcHead); + ExitOnFailure(hr, "failed to process XmlConfig changes"); + + // loop through all the xml configurations + for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) + { + // If this is a different file, or the first file... + if (NULL == pwzCurrentFile || 0 != lstrcmpW(pwzCurrentFile, pxfc->wzFile)) + { + // Remember the file we're currently working on + hr = StrAllocString(&pwzCurrentFile, pxfc->wzFile, 0); + ExitOnFailure(hr, "failed to copy file name"); + + fCurrentFileChanged = TRUE; + } + + // + // Figure out what action to take + // + xa = xaUnknown; + + // If it's being installed or reinstalled or uninstalled and that matches + // what we are doing then calculate the right action. + if ((XMLCONFIG_INSTALL & pxfc->iXmlFlags && (WcaIsInstalling(pxfc->isInstalled, pxfc->isAction) || WcaIsReInstalling(pxfc->isInstalled, pxfc->isAction))) || + (XMLCONFIG_UNINSTALL & pxfc->iXmlFlags && WcaIsUninstalling(pxfc->isInstalled, pxfc->isAction))) + { + if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_ELEMENT & pxfc->iXmlFlags) + { + xa = xaCreateElement; + } + else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_ELEMENT & pxfc->iXmlFlags) + { + xa = xaDeleteElement; + } + else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_VALUE & pxfc->iXmlFlags) + { + xa = xaDeleteValue; + } + else if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_VALUE & pxfc->iXmlFlags) + { + xa = xaWriteValue; + } + else if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_DOCUMENT & pxfc->iXmlFlags) + { + xa = xaWriteDocument; + } + else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_DOCUMENT & pxfc->iXmlFlags) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "Invalid flag configuration. Cannot delete a fragment node."); + } + } + + if (XMLCONFIG_PRESERVE_MODIFIED & pxfc->iXmlFlags) + { + xd = xdPreserve; + } + else + { + xd= xdDontPreserve; + } + + if (xaUnknown != xa) + { + if (fCurrentFileChanged) + { + hr = BeginChangeFile(pwzCurrentFile, pxfc->iCompAttributes, &pwzCustomActionData); + ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); + + fCurrentFileChanged = FALSE; + ++cFiles; + } + + hr = WcaWriteIntegerToCaData((int)xa, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write action indicator custom action data"); + + hr = WcaWriteIntegerToCaData((int)xd, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); + + hr = WriteChangeData(pxfc, xa, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write change data"); + } + } + + // If we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // Schedule the custom action and add to progress bar + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cFiles); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlConfig"), pwzCustomActionData, cFiles * COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlConfig action"); + } + +LExit: + ReleaseStr(pwzCurrentFile); + ReleaseStr(pwzCustomActionData); + + FreeXmlConfigChangeList(pxfcHead); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/****************************************************************** + ExecXmlConfig - entry point for XmlConfig Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug ExecXmlConfig"); + HRESULT hr = S_OK; + HRESULT hrOpenFailure = S_OK; + UINT er = ERROR_SUCCESS; + + BOOL fIsWow64Process = FALSE; + BOOL fIsFSRedirectDisabled = FALSE; + BOOL fPreserveDate = FALSE; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzFile = NULL; + LPWSTR pwzElementPath = NULL; + LPWSTR pwzVerifyPath = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzValue = NULL; + LPWSTR pwz = NULL; + int cAdditionalChanges = 0; + + IXMLDOMDocument* pixd = NULL; + IXMLDOMNode* pixn = NULL; + IXMLDOMNode* pixnVerify = NULL; + IXMLDOMNode* pixnNewNode = NULL; + IXMLDOMNode* pixnRemovedChild = NULL; + + IXMLDOMDocument* pixdNew = NULL; + IXMLDOMElement* pixeNew = NULL; + + FILETIME ft; + + int id = IDRETRY; + + eXmlAction xa; + eXmlPreserveDate xd; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlConfig"); + ExitOnFailure(hr, "failed to initialize"); + + hr = XmlInitialize(); + ExitOnFailure(hr, "failed to initialize xml utilities"); + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Initialize the Wow64 API - store the result in fWow64APIPresent + // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases + WcaInitializeWow64(); + fIsWow64Process = WcaIsWow64Process(); + + if (xaOpenFile != xa && xaOpenFilex64 != xa) + { + ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); + } + + // loop through all the passed in data + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzFile); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + // Default to not preserve date, preserve it if any modifications require us to + fPreserveDate = FALSE; + + // Open the file + ReleaseNullObject(pixd); + + if (xaOpenFilex64 == xa) + { + if (!fIsWow64Process) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but the custom action process is not running in WOW."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); + + fIsFSRedirectDisabled = TRUE; + } + + hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); + if (FAILED(hr)) + { + // Ignore the return code for now. If they try to add something, we'll fail the install. If all they do is remove stuff then it doesn't matter. + hrOpenFailure = hr; + hr = S_OK; + } + else + { + hrOpenFailure = S_OK; + } + + WcaLog(LOGMSG_VERBOSE, "Configuring Xml File: %ls", pwzFile); + + while (pwz && *pwz) + { + // If we skip past an element that has additional changes we need to strip them off the stream before + // moving on to the next element. Do that now and then restart the outer loop. + if (cAdditionalChanges > 0) + { + while (cAdditionalChanges > 0) + { + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + + cAdditionalChanges--; + } + continue; + } + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Break if we need to move on to a different file + if (xaOpenFile == xa || xaOpenFilex64 == xa) + { + break; + } + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xd); + ExitOnFailure(hr, "failed to process CustomActionData"); + + if (xdPreserve == xd) + { + fPreserveDate = TRUE; + } + + // Get path, name, and value to be written + hr = WcaReadStringFromCaData(&pwz, &pwzElementPath); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzVerifyPath); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, &cAdditionalChanges); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // If we failed to open the file and we're adding something to the file, we've got a problem. Otherwise, just continue on since the file's already gone. + if (FAILED(hrOpenFailure)) + { + if (xaCreateElement == xa || xaWriteValue == xa || xaWriteDocument == xa) + { + MessageExitOnFailure(hr = hrOpenFailure, msierrXmlConfigFailedOpen, "failed to load XML file: %ls", pwzFile); + } + else + { + continue; + } + } + + // Select the node we're about to modify + ReleaseNullObject(pixn); + + hr = XmlSelectSingleNode(pixd, pwzElementPath, &pixn); + + // If we failed to find the node that we are going to add to, we've got a problem. Otherwise, just continue since the node's already gone. + if (S_FALSE == hr) + { + if (xaCreateElement == xa || xaWriteValue == xa || xaWriteDocument == xa) + { + hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); + } + else + { + hr = S_OK; + continue; + } + } + + MessageExitOnFailure(hr, msierrXmlConfigFailedSelect, "failed to find node: %ls in XML file: %ls", pwzElementPath, pwzFile); + + // Make the modification + switch (xa) + { + case xaWriteValue: + if (pwzName && *pwzName) + { + // We're setting an attribute + hr = XmlSetAttribute(pixn, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + } + else + { + // We're setting the text of the node + hr = XmlSetText(pixn, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzElementPath); + } + break; + case xaWriteDocument: + if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) + { + hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); + if (S_OK == hr) + { + // We found the verify path which means we have no further work to do + continue; + } + ExitOnFailure(hr, "failed to query verify path: %ls", pwzVerifyPath); + } + + hr = XmlLoadDocumentEx(pwzValue, XML_LOAD_PRESERVE_WHITESPACE, &pixdNew); + ExitOnFailure(hr, "Failed to load value as document."); + + hr = pixdNew->get_documentElement(&pixeNew); + ExitOnFailure(hr, "Failed to get document element."); + + hr = pixn->appendChild(pixeNew, NULL); + ExitOnFailure(hr, "Failed to append document element on to parent element."); + + ReleaseNullObject(pixeNew); + ReleaseNullObject(pixdNew); + break; + + case xaCreateElement: + if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) + { + hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); + if (S_OK == hr) + { + // We found the verify path which means we have no further work to do + continue; + } + ExitOnFailure(hr, "failed to query verify path: %ls", pwzVerifyPath); + } + + hr = XmlCreateChild(pixn, pwzName, &pixnNewNode); + ExitOnFailure(hr, "failed to create child element: %ls", pwzName); + + if (pwzValue && *pwzValue) + { + hr = XmlSetText(pixnNewNode, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for node: %ls", pwzValue, pwzName); + } + + while (cAdditionalChanges > 0) + { + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Set the additional attribute + hr = XmlSetAttribute(pixnNewNode, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + + cAdditionalChanges--; + } + + ReleaseNullObject(pixnNewNode); + break; + case xaDeleteValue: + if (pwzName && *pwzName) + { + // Delete the attribute + hr = XmlRemoveAttribute(pixn, pwzName); + ExitOnFailure(hr, "failed to remove attribute: %ls", pwzName); + } + else + { + // Clear the text value for the node + hr = XmlSetText(pixn, L""); + ExitOnFailure(hr, "failed to clear text value"); + } + break; + case xaDeleteElement: + if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) + { + hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); + if (S_OK == hr) + { + hr = pixn->removeChild(pixnVerify, &pixnRemovedChild); + ExitOnFailure(hr, "failed to remove created child element"); + + ReleaseNullObject(pixnRemovedChild); + } + else + { + WcaLog(LOGMSG_VERBOSE, "Failed to select path %ls for deleting. Skipping...", pwzVerifyPath); + hr = S_OK; + } + } + else + { + // TODO: This requires a VerifyPath to delete an element. Should we support not having one? + WcaLog(LOGMSG_VERBOSE, "No VerifyPath specified for delete element of ID: %ls", pwzElementPath); + } + break; + default: + ExitOnFailure(hr = E_UNEXPECTED, "Invalid modification specified in custom action data"); + break; + } + } + + + // Now that we've made all of the changes to this file, save it and move on to the next + if (S_OK == hrOpenFailure) + { + if (fPreserveDate) + { + hr = FileGetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to get modified time of file : %ls", pwzFile); + } + + int iSaveAttempt = 0; + + do + { + hr = XmlSaveDocument(pixd, pwzFile); + if (FAILED(hr)) + { + id = WcaErrorMessage(msierrXmlConfigFailedSave, hr, INSTALLMESSAGE_ERROR | MB_ABORTRETRYIGNORE, 1, pwzFile); + switch (id) + { + case IDABORT: + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + case IDRETRY: + hr = S_FALSE; // hit me, baby, one more time + break; + case IDIGNORE: + hr = S_OK; // pretend everything is okay and bail + break; + case 0: // No UI case, MsiProcessMessage returns 0 + if (STIERR_SHARING_VIOLATION == hr) + { + // Only in case of sharing violation do we retry 30 times, once a second. + if (iSaveAttempt < 30) + { + hr = S_FALSE; + ++iSaveAttempt; + WcaLog(LOGMSG_VERBOSE, "Unable to save changes to XML file: %ls, retry attempt: %x", pwzFile, iSaveAttempt); + Sleep(1000); + } + else + { + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + break; + default: // Unknown error + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + } while (S_FALSE == hr); + + if (fPreserveDate) + { + hr = FileSetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); + } + + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } + } + } + +LExit: + // Make sure we revert FS Redirection if necessary before exiting + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } + WcaFinalizeWow64(); + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzElementPath); + ReleaseStr(pwzVerifyPath); + ReleaseStr(pwzName); + ReleaseStr(pwzValue); + + ReleaseObject(pixeNew); + ReleaseObject(pixdNew); + + ReleaseObject(pixn); + ReleaseObject(pixd); + ReleaseObject(pixnNewNode); + ReleaseObject(pixnRemovedChild); + + XmlUninitialize(); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/****************************************************************** + ExecXmlConfigRollback - entry point for XmlConfig rollback Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlConfigRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecXmlConfigRollback"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + int iIs64Bit; + BOOL fIs64Bit = FALSE; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFileName = NULL; + LPBYTE pbData = NULL; + DWORD_PTR cbData = 0; + DWORD cbDataWritten = 0; + + FILETIME ft; + + HANDLE hFile = INVALID_HANDLE_VALUE; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlConfigRollback"); + ExitOnFailure(hr, "failed to initialize"); + + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, &iIs64Bit); + ExitOnFailure(hr, "failed to read component bitness from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzFileName); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); + ExitOnFailure(hr, "failed to read file contents from custom action data"); + + fIs64Bit = (BOOL)iIs64Bit; + + if (fIs64Bit) + { + hr = WcaInitializeWow64(); + if (S_FALSE == hr) + { + hr = TYPE_E_DLLFUNCTIONNOTFOUND; + } + ExitOnFailure(hr, "failed to initialize Wow64 API"); + + if (!WcaIsWow64Process()) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but the Wow64 API is unavailable."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); + } + + hr = FileGetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); + + // Open the file + hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, NULL, NULL, TRUNCATE_EXISTING, NULL, NULL); + ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); + + // Write out the old data + if (!::WriteFile(hFile, pbData, (DWORD)cbData, &cbDataWritten, NULL)) + { + ExitOnLastError(hr, "failed to write to file: %ls", pwzFileName); + } + + Assert(cbData == cbDataWritten); + + ReleaseFile(hFile); + + hr = FileSetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to set modified date of file %ls.", pwzFileName); + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzFileName); + + ReleaseFile(hFile); + + if (fIs64Bit) + { + WcaRevertWow64FSRedirection(); + WcaFinalizeWow64(); + } + + ReleaseMem(pbData); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp new file mode 100644 index 00000000..fc6f519b --- /dev/null +++ b/src/ca/XmlFile.cpp @@ -0,0 +1,942 @@ +// 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" + +#define XMLFILE_CREATE_ELEMENT 0x00000001 +#define XMLFILE_DELETE_VALUE 0x00000002 +#define XMLFILE_BULKWRITE_VALUE 0x00000004 + +#define XMLFILE_DONT_UNINSTALL 0x00010000 +#define XMLFILE_PRESERVE_MODIFIED 0x00001000 +#define XMLFILE_USE_XPATH 0x00000100 + +extern BOOL vfMsxml30; + +enum eXmlAction +{ + xaOpenFile = 1, + xaOpenFilex64, + xaWriteValue, + xaDeleteValue, + xaCreateElement, + xaDeleteElement, + xaBulkWriteValue, +}; + +enum eXmlPreserveDate +{ + xdDontPreserve = 0, + xdPreserve +}; + +enum eXmlSelectionLanguage +{ + xsXSLPattern = 0, + xsXPath = 1, +}; + +LPCWSTR vcsXmlFileQuery = + L"SELECT `XmlFile`.`XmlFile`, `XmlFile`.`File`, `XmlFile`.`ElementPath`, `XmlFile`.`Name`, `XmlFile`.`Value`, " + L"`XmlFile`.`Flags`, `XmlFile`.`Component_`, `Component`.`Attributes` " + L"FROM `XmlFile`,`Component` WHERE `XmlFile`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; +enum eXmlFileQuery { xfqXmlFile = 1, xfqFile, xfqXPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; + +struct XML_FILE_CHANGE +{ + WCHAR wzId[MAX_DARWIN_KEY]; + + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + WCHAR wzFile[MAX_PATH]; + LPWSTR pwzElementPath; + WCHAR wzName[MAX_DARWIN_COLUMN]; + LPWSTR pwzValue; + + int iXmlFlags; + int iCompAttributes; + + XML_FILE_CHANGE* pxfcPrev; + XML_FILE_CHANGE* pxfcNext; +}; + +//static HRESULT FreeXmlFileChangeList( +// __in XML_FILE_CHANGE* pxfcList +// ) +//{ +// HRESULT hr = S_OK; +// +// XML_FILE_CHANGE* pxfcDelete; +// while(pxfcList) +// { +// pxfcDelete = pxfcList; +// pxfcList = pxfcList->pxfcNext; +// +// ReleaseStr(pxfcDelete->pwzElementPath); +// ReleaseStr(pxfcDelete->pwzValue); +// +// hr = MemFree(pxfcDelete); +// ExitOnFailure(hr, "failed to free xml file change list item"); +// } +// +//LExit: +// return hr; +//} + +static HRESULT AddXmlFileChangeToList( + __inout XML_FILE_CHANGE** ppxfcHead, + __inout XML_FILE_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + + XML_FILE_CHANGE* pxfc = static_cast(MemAlloc(sizeof(XML_FILE_CHANGE), TRUE)); + ExitOnNull(pxfc, hr, E_OUTOFMEMORY, "failed to allocate memory for new xml file change list element"); + + // Add it to the end of the list + if (NULL == *ppxfcHead) + { + *ppxfcHead = pxfc; + *ppxfcTail = pxfc; + } + else + { + Assert(*ppxfcTail && (*ppxfcTail)->pxfcNext == NULL); + (*ppxfcTail)->pxfcNext = pxfc; + pxfc->pxfcPrev = *ppxfcTail; + *ppxfcTail = pxfc; + } + +LExit: + return hr; +} + + +static HRESULT ReadXmlFileTable( + __inout XML_FILE_CHANGE** ppxfcHead, + __inout XML_FILE_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR pwzData = NULL; + + // check to see if necessary tables are specified + if (S_FALSE == WcaTableExists(L"XmlFile")) + ExitFunction1(hr = S_FALSE); + + // loop through all the xml configurations + hr = WcaOpenExecuteView(vcsXmlFileQuery, &hView); + ExitOnFailure(hr, "failed to open view on XmlFile table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = AddXmlFileChangeToList(ppxfcHead, ppxfcTail); + ExitOnFailure(hr, "failed to add xml file change to list"); + + // Get record Id + hr = WcaGetRecordString(hRec, xfqXmlFile, &pwzData); + ExitOnFailure(hr, "failed to get XmlFile record Id"); + hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); + ExitOnFailure(hr, "failed to copy XmlFile record Id"); + + // Get component name + hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); + ExitOnFailure(hr, "failed to get component name for XmlFile: %ls", (*ppxfcTail)->wzId); + + // Get the component's state + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for Component: %ls", pwzData); + + // Get the xml file + hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); + ExitOnFailure(hr, "failed to get xml file for XmlFile: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); + ExitOnFailure(hr, "failed to copy xml file path"); + + // Get the XmlFile table flags + hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); + ExitOnFailure(hr, "failed to get XmlFile flags for XmlFile: %ls", (*ppxfcTail)->wzId); + + // Get the XPath + hr = WcaGetRecordFormattedString(hRec, xfqXPath, &(*ppxfcTail)->pwzElementPath); + ExitOnFailure(hr, "failed to get XPath for XmlFile: %ls", (*ppxfcTail)->wzId); + + // Get the name + hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); + ExitOnFailure(hr, "failed to get Name for XmlFile: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); + ExitOnFailure(hr, "failed to copy name of element"); + + // Get the value + hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); + ExitOnFailure(hr, "failed to get Value for XmlFile: %ls", (*ppxfcTail)->wzId); + hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); + ExitOnFailure(hr, "failed to allocate buffer for value"); + + // Get the component attributes + hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); + ExitOnFailure(hr, "failed to get component attributes for XmlFile: %ls", (*ppxfcTail)->wzId); + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + hr = S_OK; + ExitOnFailure(hr, "failed while looping through all objects to secure"); + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +static HRESULT BeginChangeFile( + __in LPCWSTR pwzFile, + __in XML_FILE_CHANGE* pxfc, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pwzFile && *pwzFile && ppwzCustomActionData); + + HRESULT hr = S_OK; + BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit; + BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH; + LPBYTE pbData = NULL; + DWORD cbData = 0; + + LPWSTR pwzRollbackCustomActionData = NULL; + + if (fIs64Bit) + { + hr = WcaWriteIntegerToCaData((int)xaOpenFilex64, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write 64-bit file indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaOpenFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file indicator to custom action data"); + } + if (fUseXPath) + { + hr = WcaWriteIntegerToCaData((int)xsXPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write XPath selectionlanguage indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xsXSLPattern, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write XSLPattern selectionlanguage indicator to custom action data"); + } + hr = WcaWriteStringToCaData(pwzFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file to custom action data: %ls", pwzFile); + + // If the file already exits, then we have to put it back the way it was on failure + if (FileExistsEx(pwzFile, NULL)) + { + hr = FileRead(&pbData, &cbData, pwzFile); + ExitOnFailure(hr, "failed to read file: %ls", pwzFile); + + // Set up the rollback for this file + hr = WcaWriteIntegerToCaData((int)fIs64Bit, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write component bitness to rollback custom action data"); + + hr = WcaWriteStringToCaData(pwzFile, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file name to rollback custom action data: %ls", pwzFile); + + hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlFileRollback"), pwzRollbackCustomActionData, COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlFileRollback for file: %ls", pwzFile); + + ReleaseStr(pwzRollbackCustomActionData); + } +LExit: + ReleaseMem(pbData); + + return hr; +} + + +static HRESULT WriteChangeData( + __in XML_FILE_CHANGE* pxfc, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pxfc && ppwzCustomActionData); + + HRESULT hr = S_OK; + + hr = WcaWriteStringToCaData(pxfc->pwzElementPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", pxfc->pwzElementPath); + + hr = WcaWriteStringToCaData(pxfc->wzName, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); + + hr = WcaWriteStringToCaData(pxfc->pwzValue, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); + +LExit: + return hr; +} + + +/****************************************************************** + SchedXmlFile - entry point for XmlFile Custom Action + +********************************************************************/ +extern "C" UINT __stdcall SchedXmlFile( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedXmlFile"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzCurrentFile = NULL; + BOOL fCurrentFileChanged = FALSE; + BOOL fCurrentUseXPath = FALSE; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + XML_FILE_CHANGE* pxfcHead = NULL; + XML_FILE_CHANGE* pxfcTail = NULL; + XML_FILE_CHANGE* pxfc = NULL; + XML_FILE_CHANGE* pxfcUninstall = NULL; + + LPWSTR pwzCustomActionData = NULL; + + DWORD cFiles = 0; + + // initialize + hr = WcaInitialize(hInstall, "SchedXmlFile"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ReadXmlFileTable(&pxfcHead, &pxfcTail); + if (S_FALSE == hr) + { + WcaLog(LOGMSG_VERBOSE, "Skipping SchedXmlFile because XmlFile table not present"); + ExitFunction1(hr = S_OK); + } + + MessageExitOnFailure(hr, msierrXmlFileFailedRead, "failed to read XmlFile table"); + + // loop through all the xml configurations + for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) + { + // If this is the first file, a different file, the last file, or the SelectionLanguage property changes... + if (NULL == pwzCurrentFile || 0 != lstrcmpW(pwzCurrentFile, pxfc->wzFile) || NULL == pxfc->pxfcNext || fCurrentUseXPath != ((XMLFILE_USE_XPATH & pxfc->iXmlFlags))) + { + // If this isn't the first file + if (NULL != pwzCurrentFile) + { + // Do the uninstall work for the current file by walking backwards through the list (so the sequence is reversed) + for (pxfcUninstall = ((NULL != pxfc->pxfcNext) ? pxfc->pxfcPrev : pxfc); pxfcUninstall && 0 == lstrcmpW(pwzCurrentFile, pxfcUninstall->wzFile) && fCurrentUseXPath == ((XMLFILE_USE_XPATH & pxfcUninstall->iXmlFlags)); pxfcUninstall = pxfcUninstall->pxfcPrev) + { + // If it's being uninstalled + if (WcaIsUninstalling(pxfcUninstall->isInstalled, pxfcUninstall->isAction)) + { + // Uninstall the change + if (!(XMLFILE_DONT_UNINSTALL & pxfcUninstall->iXmlFlags)) + { + if (!fCurrentFileChanged) + { + hr = BeginChangeFile(pwzCurrentFile, pxfcUninstall, &pwzCustomActionData); + ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); + + fCurrentFileChanged = TRUE; + ++cFiles; + } + if (XMLFILE_CREATE_ELEMENT & pxfcUninstall->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaDeleteElement, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write delete element action indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaDeleteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write delete value action indicator to custom action data"); + } + + if (XMLFILE_PRESERVE_MODIFIED & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xdPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xdDontPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Don't Preserve Date indicator to custom action data"); + } + + hr = WriteChangeData(pxfcUninstall, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write uninstall change data"); + } + } + } + } + + // Remember the file we're currently working on + hr = StrAllocString(&pwzCurrentFile, pxfc->wzFile, 0); + ExitOnFailure(hr, "failed to copy file name"); + fCurrentUseXPath = (XMLFILE_USE_XPATH & pxfc->iXmlFlags); + + // We haven't changed the current file yet + fCurrentFileChanged = FALSE; + } + + // If it's being installed + if (WcaIsInstalling(pxfc->isInstalled, pxfc->isAction)) + { + if (!fCurrentFileChanged) + { + hr = BeginChangeFile(pwzCurrentFile, pxfc, &pwzCustomActionData); + ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); + fCurrentFileChanged = TRUE; + ++cFiles; + } + + // Install the change + if (XMLFILE_CREATE_ELEMENT & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaCreateElement, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write create element action indicator to custom action data"); + } + else if (XMLFILE_DELETE_VALUE & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaDeleteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write delete value action indicator to custom action data"); + } + else if (XMLFILE_BULKWRITE_VALUE & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaBulkWriteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write builkwrite value action indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaWriteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write file indicator to custom action data"); + } + + if (XMLFILE_PRESERVE_MODIFIED & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xdPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xdDontPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Don't Preserve Date indicator to custom action data"); + } + + hr = WriteChangeData(pxfc, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write change data"); + } + } + + // If we looped through all records all is well + if (E_NOMOREITEMS == hr) + hr = S_OK; + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // Schedule the custom action and add to progress bar + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cFiles); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlFile"), pwzCustomActionData, cFiles * COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlFile action"); + } + +LExit: + ReleaseStr(pwzCurrentFile); + ReleaseStr(pwzCustomActionData); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/****************************************************************** + ExecXmlFile - entry point for XmlFile Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlFile( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecXmlFile"); + HRESULT hr = S_OK; + HRESULT hrOpenFailure = S_OK; + UINT er = ERROR_SUCCESS; + + BOOL fIsWow64Process = FALSE; + BOOL fIsFSRedirectDisabled = FALSE; + BOOL fPreserveDate = FALSE; + + int id = IDRETRY; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzFile = NULL; + LPWSTR pwzXPath = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzValue = NULL; + LPWSTR pwz = NULL; + + IXMLDOMDocument* pixd = NULL; + IXMLDOMNode* pixn = NULL; + IXMLDOMNode* pixnNewNode = NULL; + IXMLDOMNodeList* pixNodes = NULL; + IXMLDOMDocument2 *pixdDocument2 = NULL; + + FILETIME ft; + + BSTR bstrProperty = ::SysAllocString(L"SelectionLanguage"); + ExitOnNull(bstrProperty, hr, E_OUTOFMEMORY, "failed SysAllocString"); + VARIANT varValue; + ::VariantInit(&varValue); + varValue.vt = VT_BSTR; + varValue.bstrVal = ::SysAllocString(L"XPath"); + ExitOnNull(varValue.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString"); + eXmlAction xa; + eXmlPreserveDate xd; + eXmlSelectionLanguage xl; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlFile"); + ExitOnFailure(hr, "failed to initialize"); + + hr = XmlInitialize(); + ExitOnFailure(hr, "failed to initialize xml utilities"); + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Initialize the Wow64 API - store the result in fWow64APIPresent + // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases + WcaInitializeWow64(); + fIsWow64Process = WcaIsWow64Process(); + + if (xaOpenFile != xa && xaOpenFilex64 != xa) + ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); + + // loop through all the passed in data + while (pwz && *pwz) + { + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xl); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadStringFromCaData(&pwz, &pwzFile); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + // Default to not preserve the modified date + fPreserveDate = FALSE; + + // Open the file + ReleaseNullObject(pixd); + + if (xaOpenFilex64 == xa) + { + if (!fIsWow64Process) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but the custom action process is not running in WOW."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); + + fIsFSRedirectDisabled = TRUE; + } + + hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); + if (FAILED(hr)) + { + // Ignore the return code for now. If they try to add something, we'll fail the install. If all they do is remove stuff then it doesn't matter. + hrOpenFailure = hr; + hr = S_OK; + } + else + { + hrOpenFailure = S_OK; + } + WcaLog(LOGMSG_VERBOSE, "Configuring Xml File: %ls", pwzFile); + + if (xsXPath == xl) + { + if (vfMsxml30) + { + // If we failed to open the file, don't fail immediately; just skip setting the selection language, and we'll fail later if appropriate + if (SUCCEEDED(hrOpenFailure)) + { + hr = pixd->QueryInterface(XmlUtil_IID_IXMLDOMDocument2, (void**)&pixdDocument2); + ExitOnFailure(hr, "failed in querying IXMLDOMDocument2 interface"); + hr = pixdDocument2->setProperty(bstrProperty, varValue); + ExitOnFailure(hr, "failed in setting SelectionLanguage"); + } + } + else + { + hr = E_NOTIMPL; + ExitTrace(hr, "Error: current MSXML version does not support xpath query."); + ExitFunction(); + } + } + + while (pwz && *pwz) + { + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Break if we need to move on to a different file + if (xaOpenFile == xa || xaOpenFilex64 == xa) + break; + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xd); + ExitOnFailure(hr, "failed to process CustomActionData"); + + if (xdPreserve == xd) + { + fPreserveDate = TRUE; + } + + // Get path, name, and value to be written + hr = WcaReadStringFromCaData(&pwz, &pwzXPath); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // If we failed to open the file and we're adding something to the file, we've got a problem. Otherwise, just continue on since the file's already gone. + if (FAILED(hrOpenFailure)) + { + if (xaCreateElement == xa || xaWriteValue == xa || xaBulkWriteValue == xa) + { + MessageExitOnFailure(hr = hrOpenFailure, msierrXmlFileFailedOpen, "failed to load XML file: %ls", pwzFile); + } + else + { + continue; + } + } + + // Select the node we're about to modify + ReleaseNullObject(pixn); + + if (xaBulkWriteValue == xa) + { + hr = XmlSelectNodes(pixd, pwzXPath, &pixNodes); + if (S_FALSE == hr) + { + hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); + } + + MessageExitOnFailure(hr, msierrXmlFileFailedSelect, "failed to find any nodes: %ls in XML file: %ls", pwzXPath, pwzFile); + for (;;) + { + pixNodes->nextNode(&pixn); + if (NULL == pixn) + break; + + if (pwzName && *pwzName) + { + // We're setting an attribute + hr = XmlSetAttribute(pixn, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + } + else + { + // We're setting the text of the node + hr = XmlSetText(pixn, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzXPath); + } + ReleaseNullObject(pixn); + } + } + else + { + hr = XmlSelectSingleNode(pixd, pwzXPath, &pixn); + if (S_FALSE == hr) + hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); + MessageExitOnFailure(hr, msierrXmlFileFailedSelect, "failed to find node: %ls in XML file: %ls", pwzXPath, pwzFile); + + // Make the modification + if (xaWriteValue == xa) + { + if (pwzName && *pwzName) + { + // We're setting an attribute + hr = XmlSetAttribute(pixn, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + } + else + { + // We're setting the text of the node + hr = XmlSetText(pixn, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzXPath); + } + } + else if (xaCreateElement == xa) + { + hr = XmlCreateChild(pixn, pwzName, &pixnNewNode); + ExitOnFailure(hr, "failed to create child element: %ls", pwzName); + + if (pwzValue && *pwzValue) + { + hr = XmlSetText(pixnNewNode, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for node: %ls", pwzValue, pwzName); + } + + ReleaseNullObject(pixnNewNode); + } + else if (xaDeleteValue == xa) + { + if (pwzName && *pwzName) + { + // Delete the attribute + hr = XmlRemoveAttribute(pixn, pwzName); + ExitOnFailure(hr, "failed to remove attribute: %ls", pwzName); + } + else + { + // Clear the text value for the node + hr = XmlSetText(pixn, L""); + ExitOnFailure(hr, "failed to clear text value"); + } + } + else if (xaDeleteElement == xa) + { + // TODO: This may be a little heavy handed + hr = XmlRemoveChildren(pixn, pwzName); + ExitOnFailure(hr, "failed to delete child node: %ls", pwzName); + } + else + { + ExitOnFailure(hr = E_UNEXPECTED, "Invalid modification specified in custom action data"); + } + } + } + + // Now that we've made all of the changes to this file, save it and move on to the next + if (S_OK == hrOpenFailure) + { + if (fPreserveDate) + { + hr = FileGetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to get modified time of file : %ls", pwzFile); + } + + int iSaveAttempt = 0; + + do + { + hr = XmlSaveDocument(pixd, pwzFile); + if (FAILED(hr)) + { + id = WcaErrorMessage(msierrXmlConfigFailedSave, hr, INSTALLMESSAGE_ERROR | MB_ABORTRETRYIGNORE, 1, pwzFile); + switch (id) + { + case IDABORT: + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + case IDRETRY: + hr = S_FALSE; // hit me, baby, one more time + break; + case IDIGNORE: + hr = S_OK; // pretend everything is okay and bail + break; + case 0: // No UI case, MsiProcessMessage returns 0 + if (STIERR_SHARING_VIOLATION == hr) + { + // Only in case of sharing violation do we retry 30 times, once a second. + if (iSaveAttempt < 30) + { + hr = S_FALSE; + ++iSaveAttempt; + WcaLog(LOGMSG_VERBOSE, "Unable to save changes to XML file: %ls, retry attempt: %x", pwzFile, iSaveAttempt); + Sleep(1000); + } + else + { + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + break; + default: // Unknown error + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + } while (S_FALSE == hr); + + if (fPreserveDate) + { + hr = FileSetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); + } + + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } + } + } + +LExit: + // Make sure we revert FS Redirection if necessary before exiting + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } + WcaFinalizeWow64(); + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzXPath); + ReleaseStr(pwzName); + ReleaseStr(pwzValue); + ReleaseBSTR(bstrProperty); + ReleaseVariant(varValue); + + ReleaseObject(pixdDocument2); + ReleaseObject(pixn); + ReleaseObject(pixd); + ReleaseObject(pixnNewNode); + ReleaseObject(pixNodes); + + XmlUninitialize(); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/****************************************************************** + ExecXmlFileRollback - entry point for XmlFile rollback Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlFileRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecXmlFileRollback"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + int iIs64Bit; + BOOL fIs64Bit = FALSE; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFileName = NULL; + LPBYTE pbData = NULL; + DWORD_PTR cbData = 0; + DWORD cbDataWritten = 0; + + FILETIME ft; + + HANDLE hFile = INVALID_HANDLE_VALUE; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlFileRollback"); + ExitOnFailure(hr, "failed to initialize"); + + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, &iIs64Bit); + ExitOnFailure(hr, "failed to read component bitness from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzFileName); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); + ExitOnFailure(hr, "failed to read file contents from custom action data"); + + fIs64Bit = (BOOL)iIs64Bit; + + if (fIs64Bit) + { + hr = WcaInitializeWow64(); + if (S_FALSE == hr) + { + hr = TYPE_E_DLLFUNCTIONNOTFOUND; + } + ExitOnFailure(hr, "failed to initialize Wow64 API"); + + if (!WcaIsWow64Process()) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but the custom action process is not running in WOW."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); + } + + // Always preserve the modified date on rollback + hr = FileGetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); + + // Open the file + hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, NULL, NULL, TRUNCATE_EXISTING, NULL, NULL); + ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); + + // Write out the old data + if (!::WriteFile(hFile, pbData, (DWORD)cbData, &cbDataWritten, NULL)) + ExitOnLastError(hr, "failed to write to file: %ls", pwzFileName); + + Assert(cbData == cbDataWritten); + + ReleaseFile(hFile); + + // Always preserve the modified date on rollback + hr = FileSetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to set modified date of file %ls.", pwzFileName); + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzFileName); + + ReleaseFile(hFile); + + if (fIs64Bit) + { + WcaRevertWow64FSRedirection(); + WcaFinalizeWow64(); + } + + ReleaseMem(pbData); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + diff --git a/src/ca/caSuffix.h b/src/ca/caSuffix.h new file mode 100644 index 00000000..303a99e9 --- /dev/null +++ b/src/ca/caSuffix.h @@ -0,0 +1,11 @@ +#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. + + +#if defined _WIN64 +#define PLATFORM_DECORATION(f) f L"_64" +#elif defined ARM +#define PLATFORM_DECORATION(f) f L"_ARM" +#else +#define PLATFORM_DECORATION(f) f +#endif diff --git a/src/ca/cost.h b/src/ca/cost.h new file mode 100644 index 00000000..6507e85d --- /dev/null +++ b/src/ca/cost.h @@ -0,0 +1,9 @@ +#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. + + +const UINT COST_SECUREOBJECT = 1000; +const UINT COST_SERVICECONFIG = 1000; +const UINT COST_XMLFILE = 1000; +const UINT COST_CLOSEAPP = 500; +const UINT COST_INTERNETSHORTCUT = 2000; diff --git a/src/ca/exitearlywithsuccess.cpp b/src/ca/exitearlywithsuccess.cpp new file mode 100644 index 00000000..00828329 --- /dev/null +++ b/src/ca/exitearlywithsuccess.cpp @@ -0,0 +1,27 @@ +// 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" + + +/****************************************************************** +WixExitEarlyWithSuccess - entry point for WixExitEarlyWithSuccess + custom action which does nothing except return exit code + ERROR_NO_MORE_ITEMS. The Windows Installer documentation at + http://msdn.microsoft.com/library/aa368072.aspx indicates that + this exit code is not treated as an error. This will cause a + calling application to receive a successful return code if + this custom action executes. This can be useful for backwards + compatibility when an application redistributes an MSI and + a future major upgrade is released for that MSI. It should be + conditioned on a property set by an entry in the Upgrade table + of the MSI that detects newer major upgrades of the same MSI + already installed on the system. It should be scheduled after + the FindRelatedProducts action so that the property will be + set if appropriate. +********************************************************************/ +extern "C" UINT __stdcall WixExitEarlyWithSuccess( + __in MSIHANDLE /*hInstall*/ + ) +{ + return ERROR_NO_MORE_ITEMS; +} diff --git a/src/ca/netshortcuts.cpp b/src/ca/netshortcuts.cpp new file mode 100644 index 00000000..59ef838b --- /dev/null +++ b/src/ca/netshortcuts.cpp @@ -0,0 +1,434 @@ +// 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" + +LPCWSTR vcsShortcutsQuery = + L"SELECT `Component_`, `Directory_`, `Name`, `Target`, `Attributes`, `IconFile`, `IconIndex` " + L"FROM `WixInternetShortcut`"; +enum eShortcutsQuery { esqComponent = 1, esqDirectory, esqFilename, esqTarget, esqAttributes, esqIconFile, esqIconIndex }; +enum eShortcutsAttributes { esaLink = 0, esaURL = 1 }; + +/****************************************************************** + WixSchedInternetShortcuts - entry point + +********************************************************************/ +extern "C" UINT __stdcall WixSchedInternetShortcuts( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + UINT uiCost = 0; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + MSIHANDLE hCreateFolderTable = NULL; + MSIHANDLE hCreateFolderColumns = NULL; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzComponent = NULL; + LPWSTR pwzDirectory = NULL; + LPWSTR pwzFilename = NULL; + LPWSTR pwzTarget = NULL; + LPWSTR pwzShortcutPath = NULL; + int iAttr = 0; + LPWSTR pwzIconFile = NULL; + int iIconIndex = 0; + IUniformResourceLocatorW* piURL = NULL; + IShellLinkW* piShellLink = NULL; + BOOL fInitializedCom = FALSE; + + hr = WcaInitialize(hInstall, "WixSchedInternetShortcuts"); + ExitOnFailure(hr, "failed to initialize WixSchedInternetShortcuts."); + + // anything to do? + if (S_OK != WcaTableExists(L"WixInternetShortcut")) + { + WcaLog(LOGMSG_STANDARD, "WixInternetShortcut table doesn't exist, so there are no Internet shortcuts to process"); + goto LExit; + } + + // check to see if we can create a shortcut - Server Core and others may not have a shell registered. + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_ALL, IID_IUniformResourceLocatorW, (void**)&piURL); + if (S_OK != hr) + { + WcaLog(LOGMSG_STANDARD, "failed to create an instance of IUniformResourceLocatorW, skipping shortcut creation"); + ExitFunction1(hr = S_OK); + } + + hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&piShellLink); + if (S_OK != hr) + { + WcaLog(LOGMSG_STANDARD, "failed to create an instance of IShellLinkW, skipping shortcut creation"); + ExitFunction1(hr = S_OK); + } + + // query and loop through all the shortcuts + hr = WcaOpenExecuteView(vcsShortcutsQuery, &hView); + ExitOnFailure(hr, "failed to open view on WixInternetShortcut table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + // read column values + hr = WcaGetRecordString(hRec, esqComponent, &pwzComponent); + ExitOnFailure(hr, "failed to get shortcut component"); + hr = WcaGetRecordString(hRec, esqDirectory, &pwzDirectory); + ExitOnFailure(hr, "failed to get shortcut directory"); + hr = WcaGetRecordString(hRec, esqFilename, &pwzFilename); + ExitOnFailure(hr, "failed to get shortcut filename"); + hr = WcaGetRecordFormattedString(hRec, esqTarget, &pwzTarget); + ExitOnFailure(hr, "failed to get shortcut target"); + hr = WcaGetRecordInteger(hRec, esqAttributes, &iAttr); + ExitOnFailure(hr, "failed to get shortcut attributes"); + hr = WcaGetRecordFormattedString(hRec, esqIconFile, &pwzIconFile); + ExitOnFailure(hr, "failed to get shortcut icon file"); + hr = WcaGetRecordInteger(hRec, esqIconIndex, &iIconIndex); + ExitOnFailure(hr, "failed to get shortcut icon index"); + + // skip processing this WixInternetShortcut row if the component isn't being configured + WCA_TODO todo = WcaGetComponentToDo(pwzComponent); + if (WCA_TODO_UNKNOWN == todo) + { + WcaLog(LOGMSG_VERBOSE, "Skipping shortcut for null-action component '%ls'", pwzComponent); + continue; + } + + // we need to create the directory where the shortcut is supposed to live; rather + // than doing so in our deferred custom action, use the CreateFolder table to have MSI + // make (and remove) them on our behalf (including the correct cleanup of parent directories). + MSIDBERROR dbError = MSIDBERROR_NOERROR; + WcaLog(LOGMSG_STANDARD, "Adding folder '%ls', component '%ls' to the CreateFolder table", pwzDirectory, pwzComponent); + hr = WcaAddTempRecord(&hCreateFolderTable, &hCreateFolderColumns, L"CreateFolder", &dbError, 0, 2, pwzDirectory, pwzComponent); + if (MSIDBERROR_DUPLICATEKEY == dbError) + { + WcaLog(LOGMSG_STANDARD, "Folder '%ls' already exists in the CreateFolder table; the above error is harmless", pwzDirectory); + hr = S_OK; + } + ExitOnFailure(hr, "Couldn't add temporary CreateFolder row"); + + // only if we're installing/reinstalling do we need to schedule the deferred CA + // (uninstallation is handled via permanent RemoveFile rows and temporary CreateFolder rows) + if (WCA_TODO_INSTALL == todo || WCA_TODO_REINSTALL == todo) + { + // turn the Directory_ id into a path + hr = WcaGetTargetPath(pwzDirectory, &pwzShortcutPath); + ExitOnFailure(hr, "failed to allocate string for shortcut directory"); + + // append the shortcut filename + hr = StrAllocConcat(&pwzShortcutPath, pwzFilename, 0); + ExitOnFailure(hr, "failed to allocate string for shortcut filename"); + + // write the shortcut path and target to custom action data for deferred CAs + hr = WcaWriteStringToCaData(pwzShortcutPath, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write shortcut path to custom action data"); + hr = WcaWriteStringToCaData(pwzTarget, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write shortcut target to custom action data"); + hr = WcaWriteIntegerToCaData(iAttr, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write shortcut attributes to custom action data"); + hr = WcaWriteStringToCaData(pwzIconFile, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write icon file to custom action data"); + hr = WcaWriteIntegerToCaData(iIconIndex, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write icon index to custom action data"); + + uiCost += COST_INTERNETSHORTCUT; + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing WixInternetShortcut table"); + + // if we have any shortcuts to install + if (pwzCustomActionData && *pwzCustomActionData) + { + // add cost to progress bar + hr = WcaProgressMessage(uiCost, TRUE); + ExitOnFailure(hr, "failed to extend progress bar for InternetShortcuts"); + + // provide custom action data to deferred and rollback CAs + hr = WcaSetProperty(PLATFORM_DECORATION(L"WixRollbackInternetShortcuts"), pwzCustomActionData); + ExitOnFailure(hr, "failed to set WixRollbackInternetShortcuts rollback custom action data"); + hr = WcaSetProperty(PLATFORM_DECORATION(L"WixCreateInternetShortcuts"), pwzCustomActionData); + ExitOnFailure(hr, "failed to set WixCreateInternetShortcuts custom action data"); + } + +LExit: + if (hCreateFolderTable) + { + ::MsiCloseHandle(hCreateFolderTable); + } + + if (hCreateFolderColumns) + { + ::MsiCloseHandle(hCreateFolderColumns); + } + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzComponent); + ReleaseStr(pwzDirectory); + ReleaseStr(pwzFilename); + ReleaseStr(pwzTarget); + ReleaseStr(pwzShortcutPath); + ReleaseObject(piShellLink); + ReleaseObject(piURL); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + + +/****************************************************************** + CreateUrl - Creates a shortcut via IUniformResourceLocatorW + +*******************************************************************/ +static HRESULT CreateUrl( + __in_z LPCWSTR wzTarget, + __in_z LPCWSTR wzShortcutPath, + __in_z_opt LPCWSTR wzIconPath, + __in int iconIndex +) +{ + HRESULT hr = S_OK; + IUniformResourceLocatorW* piURL = NULL; + IPersistFile* piPersistFile = NULL; + IPropertySetStorage* piProperties = NULL; + IPropertyStorage* piStorage = NULL; + + // create an internet shortcut object + WcaLog(LOGMSG_STANDARD, "Creating IUniformResourceLocatorW shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + hr = ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_ALL, IID_IUniformResourceLocatorW, (void**)&piURL); + ExitOnFailure(hr, "failed to create an instance of IUniformResourceLocatorW"); + + // set shortcut target + hr = piURL->SetURL(wzTarget, 0); + ExitOnFailure(hr, "failed to set shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + + if (wzIconPath) + { + hr = piURL->QueryInterface(IID_IPropertySetStorage, (void **)&piProperties); + ExitOnFailure(hr, "failed to get IPropertySetStorage for shortcut '%ls'", wzShortcutPath); + + hr = piProperties->Open(FMTID_Intshcut, STGM_WRITE, &piStorage); + ExitOnFailure(hr, "failed to open storage for shortcut '%ls'", wzShortcutPath); + + PROPSPEC ppids[2] = { {PRSPEC_PROPID, PID_IS_ICONINDEX}, {PRSPEC_PROPID, PID_IS_ICONFILE} }; + PROPVARIANT ppvar[2]; + + PropVariantInit(ppvar); + PropVariantInit(ppvar + 1); + + ppvar[0].vt = VT_I4; + ppvar[0].lVal = iconIndex; + ppvar[1].vt = VT_LPWSTR; + ppvar[1].pwszVal = (LPWSTR)wzIconPath; + + hr = piStorage->WriteMultiple(2, ppids, ppvar, 0); + ExitOnFailure(hr, "failed to write icon storage for shortcut '%ls'", wzShortcutPath); + + hr = piStorage->Commit(STGC_DEFAULT); + ExitOnFailure(hr, "failed to commit icon storage for shortcut '%ls'", wzShortcutPath); + } + + // get an IPersistFile and save the shortcut + hr = piURL->QueryInterface(IID_IPersistFile, (void**)&piPersistFile); + ExitOnFailure(hr, "failed to get IPersistFile for shortcut '%ls'", wzShortcutPath); + + hr = piPersistFile->Save(wzShortcutPath, TRUE); + ExitOnFailure(hr, "failed to save shortcut '%ls'", wzShortcutPath); + +LExit: + ReleaseObject(piPersistFile); + ReleaseObject(piURL); + ReleaseObject(piStorage); + ReleaseObject(piProperties); + + return hr; +} + +/****************************************************************** + CreateLink - Creates a shortcut via IShellLinkW + +*******************************************************************/ +static HRESULT CreateLink( + __in_z LPCWSTR wzTarget, + __in_z LPCWSTR wzShortcutPath, + __in_z_opt LPCWSTR wzIconPath, + __in int iconIndex +) +{ + HRESULT hr = S_OK; + IShellLinkW* piShellLink = NULL; + IPersistFile* piPersistFile = NULL; + + // create an internet shortcut object + WcaLog(LOGMSG_STANDARD, "Creating IShellLinkW shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&piShellLink); + ExitOnFailure(hr, "failed to create an instance of IShellLinkW"); + + // set shortcut target + hr = piShellLink->SetPath(wzTarget); + ExitOnFailure(hr, "failed to set shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + + if (wzIconPath) + { + hr = piShellLink->SetIconLocation(wzIconPath, iconIndex); + ExitOnFailure(hr, "failed to set icon for shortcut '%ls'", wzShortcutPath); + } + + // get an IPersistFile and save the shortcut + hr = piShellLink->QueryInterface(IID_IPersistFile, (void**)&piPersistFile); + ExitOnFailure(hr, "failed to get IPersistFile for shortcut '%ls'", wzShortcutPath); + + hr = piPersistFile->Save(wzShortcutPath, TRUE); + ExitOnFailure(hr, "failed to save shortcut '%ls'", wzShortcutPath); + +LExit: + ReleaseObject(piPersistFile); + ReleaseObject(piShellLink); + + return hr; +} + + + +/****************************************************************** + WixCreateInternetShortcuts - entry point for Internet shortcuts + custom action +*******************************************************************/ +extern "C" UINT __stdcall WixCreateInternetShortcuts( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzTarget = NULL; + LPWSTR pwzShortcutPath = NULL; + LPWSTR pwzIconPath = NULL; + BOOL fInitializedCom = FALSE; + int iAttr = 0; + int iIconIndex = 0; + + // initialize + hr = WcaInitialize(hInstall, "WixCreateInternetShortcuts"); + ExitOnFailure(hr, "failed to initialize WixCreateInternetShortcuts"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + // extract the custom action data + hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + // loop through all the custom action data + pwz = pwzCustomActionData; + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); + ExitOnFailure(hr, "failed to read shortcut path from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzTarget); + ExitOnFailure(hr, "failed to read shortcut target from custom action data"); + hr = WcaReadIntegerFromCaData(&pwz, &iAttr); + ExitOnFailure(hr, "failed to read shortcut attributes from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzIconPath); + ExitOnFailure(hr, "failed to read shortcut icon path from custom action data"); + hr = WcaReadIntegerFromCaData(&pwz, &iIconIndex); + ExitOnFailure(hr, "failed to read shortcut icon index from custom action data"); + + if ((iAttr & esaURL) == esaURL) + { + hr = CreateUrl(pwzTarget, pwzShortcutPath, pwzIconPath, iIconIndex); + } + else + { + hr = CreateLink(pwzTarget, pwzShortcutPath, pwzIconPath, iIconIndex); + } + ExitOnFailure(hr, "failed to create Internet shortcut"); + + // tick the progress bar + hr = WcaProgressMessage(COST_INTERNETSHORTCUT, FALSE); + ExitOnFailure(hr, "failed to tick progress bar for shortcut: %ls", pwzShortcutPath); + } + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzTarget); + ReleaseStr(pwzShortcutPath); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er; + return WcaFinalize(er); +} + + + +/****************************************************************** + WixRollbackInternetShortcuts - entry point for Internet shortcuts + custom action (rollback) +*******************************************************************/ +extern "C" UINT __stdcall WixRollbackInternetShortcuts( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzShortcutPath = NULL; + int iAttr = 0; + + // initialize + hr = WcaInitialize(hInstall, "WixRemoveInternetShortcuts"); + ExitOnFailure(hr, "failed to initialize WixRemoveInternetShortcuts"); + + hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + // loop through all the custom action data + pwz = pwzCustomActionData; + while (pwz && *pwz) + { + // extract the custom action data we're interested in + hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); + ExitOnFailure(hr, "failed to read shortcut path from custom action data for rollback"); + + // delete file + hr = FileEnsureDelete(pwzShortcutPath); + ExitOnFailure(hr, "failed to delete file '%ls'", pwzShortcutPath); + + // skip over the shortcut target and attributes + hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); + ExitOnFailure(hr, "failed to skip shortcut target from custom action data for rollback"); + hr = WcaReadIntegerFromCaData(&pwz, &iAttr); + ExitOnFailure(hr, "failed to read shortcut attributes from custom action data"); + } + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzShortcutPath); + + er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er; + return WcaFinalize(er); +} diff --git a/src/ca/precomp.h b/src/ca/precomp.h index 3edad7ed..45984156 100644 --- a/src/ca/precomp.h +++ b/src/ca/precomp.h @@ -2,12 +2,54 @@ // 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. +#if _WIN32_MSI < 150 +#define _WIN32_MSI 150 +#endif + #include #include +#include +#include + +#include + +#include +#include +#include +#include // NetApi32.lib +#include +#include +#include +#include #define MAXUINT USHRT_MAX #include #include "wcautil.h" +#include "wcawow64.h" +#include "wcawrapquery.h" +#include "aclutil.h" +#include "dirutil.h" #include "fileutil.h" +#include "memutil.h" +#include "osutil.h" +#include "pathutil.h" +#include "procutil.h" +#include "shelutil.h" #include "strutil.h" +#include "sczutil.h" +#include "rmutil.h" +#include "userutil.h" +#include "xmlutil.h" +#include "wiutil.h" + +#include "CustomMsiErrors.h" + +#include "sca.h" +#include "scacost.h" +#include "cost.h" +#include "scauser.h" +#include "scasmb.h" +#include "scasmbexec.h" + +#include "caSuffix.h" diff --git a/src/ca/qtexecca.cpp b/src/ca/qtexecca.cpp new file mode 100644 index 00000000..6acad0bb --- /dev/null +++ b/src/ca/qtexecca.cpp @@ -0,0 +1,312 @@ +// 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" + +#define OUTPUT_BUFFER 1024 + +// These old "CA" prefix names are deprecated, and intended to go away in wix 4.0, only staying now for compatibility reasons +const LPCWSTR CAQUIET_TIMEOUT_PROPERTY = L"QtExecCmdTimeout"; +const LPCWSTR CAQUIET_ARGUMENTS_PROPERTY = L"QtExecCmdLine"; +const LPCWSTR CAQUIET64_ARGUMENTS_PROPERTY = L"QtExec64CmdLine"; +// end deprecated section + +// WixCA name quiet commandline argument properties +const LPCWSTR WIX_QUIET_ARGUMENTS_PROPERTY = L"WixQuietExecCmdLine"; +const LPCWSTR WIX_QUIET64_ARGUMENTS_PROPERTY = L"WixQuietExec64CmdLine"; + +// WixCA quiet timeout properties +const LPCWSTR WIX_QUIET_TIMEOUT_PROPERTY = L"WixQuietExecCmdTimeout"; +const LPCWSTR WIX_QUIET64_TIMEOUT_PROPERTY = L"WixQuietExec64CmdTimeout"; + +// WixCA silent commandline argument properties +const LPCWSTR WIX_SILENT_ARGUMENTS_PROPERTY = L"WixSilentExecCmdLine"; +const LPCWSTR WIX_SILENT64_ARGUMENTS_PROPERTY = L"WixSilentExec64CmdLine"; + +// WixCA silent timeout properties +const LPCWSTR WIX_SILENT_TIMEOUT_PROPERTY = L"WixSilentExecCmdTimeout"; +const LPCWSTR WIX_SILENT64_TIMEOUT_PROPERTY = L"WixSilentExec64CmdTimeout"; + +HRESULT BuildCommandLine( + __in LPCWSTR wzProperty, + __out LPWSTR *ppwzCommand + ) +{ + Assert(ppwzCommand); + + HRESULT hr = S_OK; + BOOL fScheduled = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_SCHEDULED); + BOOL fRollback = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_ROLLBACK); + BOOL fCommit = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_COMMIT); + + if (fScheduled || fRollback || fCommit) + { + if (WcaIsPropertySet("CustomActionData")) + { + hr = WcaGetProperty( L"CustomActionData", ppwzCommand); + ExitOnFailure(hr, "Failed to get CustomActionData"); + } + } + else if (WcaIsUnicodePropertySet(wzProperty)) + { + hr = WcaGetFormattedProperty(wzProperty, ppwzCommand); + ExitOnFailure(hr, "Failed to get %ls", wzProperty); + hr = WcaSetProperty(wzProperty, L""); // clear out the property now that we've read it + ExitOnFailure(hr, "Failed to set %ls", wzProperty); + } + + if (!*ppwzCommand) + { + ExitOnFailure(hr = E_INVALIDARG, "Failed to get command line data"); + } + + if (L'"' != **ppwzCommand) + { + WcaLog(LOGMSG_STANDARD, "Command string must begin with quoted application name."); + ExitOnFailure(hr = E_INVALIDARG, "invalid command line property value"); + } + +LExit: + return hr; +} + +#define ONEMINUTE 60000 + +DWORD GetTimeout(LPCWSTR wzPropertyName) +{ + DWORD dwTimeout = ONEMINUTE; + HRESULT hr = S_OK; + + LPWSTR pwzData = NULL; + + if (WcaIsUnicodePropertySet(wzPropertyName)) + { + hr = WcaGetProperty(wzPropertyName, &pwzData); + ExitOnFailure(hr, "Failed to get %ls", wzPropertyName); + + if ((dwTimeout = (DWORD)_wtoi(pwzData)) == 0) + { + dwTimeout = ONEMINUTE; + } + } + +LExit: + ReleaseStr(pwzData); + + return dwTimeout; + +} + +HRESULT ExecCommon( + __in LPCWSTR wzArgumentsProperty, + __in LPCWSTR wzTimeoutProperty, + __in BOOL fLogCommand, + __in BOOL fLogOutput + ) +{ + HRESULT hr = S_OK; + LPWSTR pwzCommand = NULL; + DWORD dwTimeout = 0; + + hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); + ExitOnFailure(hr, "Failed to get Command Line"); + + dwTimeout = GetTimeout(wzTimeoutProperty); + + hr = QuietExec(pwzCommand, dwTimeout, fLogCommand, fLogOutput); + ExitOnFailure(hr, "QuietExec Failed"); + +LExit: + ReleaseStr(pwzCommand); + + return hr; +} + +HRESULT ExecCommon64( + __in LPCWSTR wzArgumentsProperty, + __in LPCWSTR wzTimeoutProperty, + __in BOOL fLogCommand, + __in BOOL fLogOutput + ) +{ + HRESULT hr = S_OK; + LPWSTR pwzCommand = NULL; + DWORD dwTimeout = 0; + BOOL fIsWow64Initialized = FALSE; + BOOL fRedirected = FALSE; + + hr = WcaInitializeWow64(); + if (S_FALSE == hr) + { + hr = TYPE_E_DLLFUNCTIONNOTFOUND; + } + ExitOnFailure(hr, "Failed to intialize WOW64."); + fIsWow64Initialized = TRUE; + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Failed to enable filesystem redirection."); + fRedirected = TRUE; + + hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); + ExitOnFailure(hr, "Failed to get Command Line"); + + dwTimeout = GetTimeout(wzTimeoutProperty); + + hr = QuietExec(pwzCommand, dwTimeout, fLogCommand, fLogOutput); + ExitOnFailure(hr, "QuietExec64 Failed"); + +LExit: + ReleaseStr(pwzCommand); + + if (fRedirected) + { + WcaRevertWow64FSRedirection(); + } + + if (fIsWow64Initialized) + { + WcaFinalizeWow64(); + } + + return hr; +} + +// These two custom actions are deprecated, and should go away in wix v4.0. WixQuietExec replaces this one, +// and is not intended to have any difference in behavior apart from CA name and property names. +extern "C" UINT __stdcall CAQuietExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "CAQuietExec"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon(CAQUIET_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +// 2nd deprecated custom action name, superseded by WixQuietExec64 +extern "C" UINT __stdcall CAQuietExec64( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "CAQuietExec64"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon64(CAQUIET64_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon64 method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixQuietExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQuietExec"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon(WIX_QUIET_ARGUMENTS_PROPERTY, WIX_QUIET_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixQuietExec64( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQuietExec64"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon64(WIX_QUIET64_ARGUMENTS_PROPERTY, WIX_QUIET64_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixSilentExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixSilentExec"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon(WIX_SILENT_ARGUMENTS_PROPERTY, WIX_SILENT_TIMEOUT_PROPERTY, FALSE, FALSE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixSilentExec64( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixSilentExec64"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon64(WIX_SILENT64_ARGUMENTS_PROPERTY, WIX_SILENT64_TIMEOUT_PROPERTY, FALSE, FALSE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} diff --git a/src/ca/sca.h b/src/ca/sca.h new file mode 100644 index 00000000..599122ff --- /dev/null +++ b/src/ca/sca.h @@ -0,0 +1,19 @@ +#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. + +// user creation attributes definitions +enum SCAU_ATTRIBUTES +{ + SCAU_DONT_EXPIRE_PASSWRD = 0x00000001, + SCAU_PASSWD_CANT_CHANGE = 0x00000002, + SCAU_PASSWD_CHANGE_REQD_ON_LOGIN = 0x00000004, + SCAU_DISABLE_ACCOUNT = 0x00000008, + SCAU_FAIL_IF_EXISTS = 0x00000010, + SCAU_UPDATE_IF_EXISTS = 0x00000020, + SCAU_ALLOW_LOGON_AS_SERVICE = 0x00000040, + SCAU_ALLOW_LOGON_AS_BATCH = 0x00000080, + + SCAU_DONT_REMOVE_ON_UNINSTALL = 0x00000100, + SCAU_DONT_CREATE_USER = 0x00000200, + SCAU_NON_VITAL = 0x00000400, +}; \ No newline at end of file diff --git a/src/ca/scacost.h b/src/ca/scacost.h new file mode 100644 index 00000000..5b215035 --- /dev/null +++ b/src/ca/scacost.h @@ -0,0 +1,18 @@ +#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. + + +const UINT COST_PERFMON_REGISTER = 1000; +const UINT COST_PERFMON_UNREGISTER = 1000; + +const UINT COST_SMB_CREATESMB = 10000; +const UINT COST_SMB_DROPSMB = 5000; +const UINT COST_USER_ADD = 10000; +const UINT COST_USER_DELETE = 10000; + +const UINT COST_PERFMONMANIFEST_REGISTER = 1000; +const UINT COST_PERFMONMANIFEST_UNREGISTER = 1000; + +const UINT COST_EVENTMANIFEST_REGISTER = 1000; +const UINT COST_EVENTMANIFEST_UNREGISTER = 1000; + diff --git a/src/ca/scaexec.cpp b/src/ca/scaexec.cpp new file mode 100644 index 00000000..ab9e6599 --- /dev/null +++ b/src/ca/scaexec.cpp @@ -0,0 +1,807 @@ +// 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" + + +/******************************************************************** + * CreateSmb - CUSTOM ACTION ENTRY POINT for creating fileshares + * + * Input: deferred CustomActionData - + * wzFsKey\twzShareDesc\twzFullPath\tfIntegratedAuth\twzUserName\tnPermissions\twzUserName\tnPermissions... + * + * ****************************************************************/ +extern "C" UINT __stdcall CreateSmb(MSIHANDLE hInstall) +{ +//AssertSz(0, "debug CreateSmb"); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFsKey = NULL; + LPWSTR pwzShareDesc = NULL; + LPWSTR pwzDirectory = NULL; + int iAccessMode = 0; + DWORD nExPermissions = 0; + BOOL fIntegratedAuth; + LPWSTR pwzExUser = NULL; + SCA_SMBP ssp = {0}; + DWORD dwExUserPerms = 0; + DWORD dwCounter = 0; + SCA_SMBP_USER_PERMS* pUserPermsList = NULL; + + hr = WcaInitialize(hInstall, "CreateSmb"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty( L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name + ExitOnFailure(hr, "failed to read share name"); + hr = WcaReadStringFromCaData(&pwz, &pwzShareDesc); // share description + ExitOnFailure(hr, "failed to read share name"); + hr = WcaReadStringFromCaData(&pwz, &pwzDirectory); // full path to share + ExitOnFailure(hr, "failed to read share name"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&fIntegratedAuth)); + ExitOnFailure(hr, "failed to read integrated authentication"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwExUserPerms)); + ExitOnFailure(hr, "failed to read count of permissions to set"); + if(dwExUserPerms > 0) + { + pUserPermsList = static_cast(MemAlloc(sizeof(SCA_SMBP_USER_PERMS)*dwExUserPerms, TRUE)); + ExitOnNull(pUserPermsList, hr, E_OUTOFMEMORY, "failed to allocate memory for permissions structure"); + + //Pull out all of the ExUserPerm strings + for (dwCounter = 0; dwCounter < dwExUserPerms; ++dwCounter) + { + hr = WcaReadStringFromCaData(&pwz, &pwzExUser); // user account + ExitOnFailure(hr, "failed to read user account"); + pUserPermsList[dwCounter].wzUser = pwzExUser; + pwzExUser = NULL; + + hr = WcaReadIntegerFromCaData(&pwz, &iAccessMode); + ExitOnFailure(hr, "failed to read access mode"); + pUserPermsList[dwCounter].accessMode = (ACCESS_MODE)iAccessMode; + iAccessMode = 0; + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&nExPermissions)); + ExitOnFailure(hr, "failed to read count of permissions"); + pUserPermsList[dwCounter].nPermissions = nExPermissions; + nExPermissions = 0; + } + } + + ssp.wzKey = pwzFsKey; + ssp.wzDescription = pwzShareDesc; + ssp.wzDirectory = pwzDirectory; + ssp.fUseIntegratedAuth = fIntegratedAuth; + ssp.dwUserPermissionCount = dwExUserPerms; + ssp.pUserPerms = pUserPermsList; + + hr = ScaEnsureSmbExists(&ssp); + MessageExitOnFailure(hr, msierrSMBFailedCreate, "failed to create share: '%ls'", pwzFsKey); + + hr = WcaProgressMessage(COST_SMB_CREATESMB, FALSE); + +LExit: + ReleaseStr(pwzFsKey); + ReleaseStr(pwzShareDesc); + ReleaseStr(pwzDirectory); + ReleaseStr(pwzData); + + if (pUserPermsList) + { + MemFree(pUserPermsList); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + + +/******************************************************************** + DropSmb - CUSTOM ACTION ENTRY POINT for creating fileshares + + Input: deferred CustomActionData - wzFsKey\twzShareDesc\twzFullPath\tnPermissions\tfIntegratedAuth\twzUserName\twzPassword + + * ****************************************************************/ +extern "C" UINT __stdcall DropSmb(MSIHANDLE hInstall) +{ + //AssertSz(0, "debug DropSmb"); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFsKey = NULL; + SCA_SMBP ssp = {0}; + + hr = WcaInitialize(hInstall, "DropSmb"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty( L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name + ExitOnFailure(hr, "failed to read share name"); + + ssp.wzKey = pwzFsKey; + + hr = ScaDropSmb(&ssp); + MessageExitOnFailure(hr, msierrSMBFailedDrop, "failed to delete share: '%ls'", pwzFsKey); + + hr = WcaProgressMessage(COST_SMB_DROPSMB, FALSE); + +LExit: + ReleaseStr(pwzFsKey); + ReleaseStr(pwzData); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +static HRESULT AddUserToGroup( + __in LPWSTR wzUser, + __in LPCWSTR wzUserDomain, + __in LPCWSTR wzGroup, + __in LPCWSTR wzGroupDomain + ) +{ + Assert(wzUser && *wzUser && wzUserDomain && wzGroup && *wzGroup && wzGroupDomain); + + HRESULT hr = S_OK; + IADsGroup *pGroup = NULL; + BSTR bstrUser = NULL; + BSTR bstrGroup = NULL; + LPCWSTR wz = NULL; + LPWSTR pwzUser = NULL; + LOCALGROUP_MEMBERS_INFO_3 lgmi; + + if (*wzGroupDomain) + { + wz = wzGroupDomain; + } + + // Try adding it to the global group first + UINT ui = ::NetGroupAddUser(wz, wzGroup, wzUser); + if (NERR_GroupNotFound == ui) + { + // Try adding it to the local group + if (wzUserDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzUserDomain, wzUser); + ExitOnFailure(hr, "failed to allocate user domain string"); + } + + lgmi.lgrmi3_domainandname = (NULL == pwzUser ? wzUser : pwzUser); + ui = ::NetLocalGroupAddMembers(wz, wzGroup, 3 , reinterpret_cast(&lgmi), 1); + } + hr = HRESULT_FROM_WIN32(ui); + if (HRESULT_FROM_WIN32(ERROR_MEMBER_IN_ALIAS) == hr) // if they're already a member of the group don't report an error + hr = S_OK; + + // + // If we failed, try active directory + // + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to add user: %ls, domain %ls to group: %ls, domain: %ls with error 0x%x. Attempting to use Active Directory", wzUser, wzUserDomain, wzGroup, wzGroupDomain, hr); + + hr = UserCreateADsPath(wzUserDomain, wzUser, &bstrUser); + ExitOnFailure(hr, "failed to create user ADsPath for user: %ls domain: %ls", wzUser, wzUserDomain); + + hr = UserCreateADsPath(wzGroupDomain, wzGroup, &bstrGroup); + ExitOnFailure(hr, "failed to create group ADsPath for group: %ls domain: %ls", wzGroup, wzGroupDomain); + + hr = ::ADsGetObject(bstrGroup,IID_IADsGroup, reinterpret_cast(&pGroup)); + ExitOnFailure(hr, "Failed to get group '%ls'.", reinterpret_cast(bstrGroup) ); + + hr = pGroup->Add(bstrUser); + if ((HRESULT_FROM_WIN32(ERROR_OBJECT_ALREADY_EXISTS) == hr) || (HRESULT_FROM_WIN32(ERROR_MEMBER_IN_ALIAS) == hr)) + hr = S_OK; + + ExitOnFailure(hr, "Failed to add user %ls to group '%ls'.", reinterpret_cast(bstrUser), reinterpret_cast(bstrGroup) ); + } + +LExit: + ReleaseObject(pGroup); + ReleaseBSTR(bstrUser); + ReleaseBSTR(bstrGroup); + + return hr; +} + +static HRESULT RemoveUserFromGroup( + __in LPWSTR wzUser, + __in LPCWSTR wzUserDomain, + __in LPCWSTR wzGroup, + __in LPCWSTR wzGroupDomain + ) +{ + Assert(wzUser && *wzUser && wzUserDomain && wzGroup && *wzGroup && wzGroupDomain); + + HRESULT hr = S_OK; + IADsGroup *pGroup = NULL; + BSTR bstrUser = NULL; + BSTR bstrGroup = NULL; + LPCWSTR wz = NULL; + LPWSTR pwzUser = NULL; + LOCALGROUP_MEMBERS_INFO_3 lgmi; + + if (*wzGroupDomain) + { + wz = wzGroupDomain; + } + + // Try removing it from the global group first + UINT ui = ::NetGroupDelUser(wz, wzGroup, wzUser); + if (NERR_GroupNotFound == ui) + { + // Try removing it from the local group + if (wzUserDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzUserDomain, wzUser); + ExitOnFailure(hr, "failed to allocate user domain string"); + } + + lgmi.lgrmi3_domainandname = (NULL == pwzUser ? wzUser : pwzUser); + ui = ::NetLocalGroupDelMembers(wz, wzGroup, 3 , reinterpret_cast(&lgmi), 1); + } + hr = HRESULT_FROM_WIN32(ui); + + // + // If we failed, try active directory + // + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to remove user: %ls, domain %ls from group: %ls, domain: %ls with error 0x%x. Attempting to use Active Directory", wzUser, wzUserDomain, wzGroup, wzGroupDomain, hr); + + hr = UserCreateADsPath(wzUserDomain, wzUser, &bstrUser); + ExitOnFailure(hr, "failed to create user ADsPath in order to remove user: %ls domain: %ls from a group", wzUser, wzUserDomain); + + hr = UserCreateADsPath(wzGroupDomain, wzGroup, &bstrGroup); + ExitOnFailure(hr, "failed to create group ADsPath in order to remove user from group: %ls domain: %ls", wzGroup, wzGroupDomain); + + hr = ::ADsGetObject(bstrGroup,IID_IADsGroup, reinterpret_cast(&pGroup)); + ExitOnFailure(hr, "Failed to get group '%ls'.", reinterpret_cast(bstrGroup) ); + + hr = pGroup->Remove(bstrUser); + ExitOnFailure(hr, "Failed to remove user %ls from group '%ls'.", reinterpret_cast(bstrUser), reinterpret_cast(bstrGroup) ); + } + +LExit: + ReleaseObject(pGroup); + ReleaseBSTR(bstrUser); + ReleaseBSTR(bstrGroup); + + return hr; +} + + +static HRESULT ModifyUserLocalServiceRight( + __in_opt LPCWSTR wzDomain, + __in LPCWSTR wzName, + __in BOOL fAdd + ) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + + LPWSTR pwzUser = NULL; + PSID psid = NULL; + LSA_HANDLE hPolicy = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes = { 0 }; + LSA_UNICODE_STRING lucPrivilege = { 0 }; + + if (wzDomain && *wzDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); + ExitOnFailure(hr, "Failed to allocate user with domain string"); + } + else + { + hr = StrAllocString(&pwzUser, wzName, 0); + ExitOnFailure(hr, "Failed to allocate string from user name."); + } + + hr = AclGetAccountSid(NULL, pwzUser, &psid); + ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); + + nt = ::LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_ALL_ACCESS, &hPolicy); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to open LSA policy store."); + + lucPrivilege.Buffer = L"SeServiceLogonRight"; + lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); + lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); + + if (fAdd) + { + nt = ::LsaAddAccountRights(hPolicy, psid, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to add 'logon as service' bit to user: %ls", pwzUser); + } + else + { + nt = ::LsaRemoveAccountRights(hPolicy, psid, FALSE, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to remove 'logon as service' bit from user: %ls", pwzUser); + } + +LExit: + if (hPolicy) + { + ::LsaClose(hPolicy); + } + + ReleaseSid(psid); + ReleaseStr(pwzUser); + return hr; +} + + +static HRESULT ModifyUserLocalBatchRight( + __in_opt LPCWSTR wzDomain, + __in LPCWSTR wzName, + __in BOOL fAdd + ) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + + LPWSTR pwzUser = NULL; + PSID psid = NULL; + LSA_HANDLE hPolicy = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes = { 0 }; + LSA_UNICODE_STRING lucPrivilege = { 0 }; + + if (wzDomain && *wzDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); + ExitOnFailure(hr, "Failed to allocate user with domain string"); + } + else + { + hr = StrAllocString(&pwzUser, wzName, 0); + ExitOnFailure(hr, "Failed to allocate string from user name."); + } + + hr = AclGetAccountSid(NULL, pwzUser, &psid); + ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); + + nt = ::LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_ALL_ACCESS, &hPolicy); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to open LSA policy store."); + + lucPrivilege.Buffer = L"SeBatchLogonRight"; + lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); + lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); + + if (fAdd) + { + nt = ::LsaAddAccountRights(hPolicy, psid, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to add 'logon as batch job' bit to user: %ls", pwzUser); + } + else + { + nt = ::LsaRemoveAccountRights(hPolicy, psid, FALSE, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to remove 'logon as batch job' bit from user: %ls", pwzUser); + } + + LExit: + if (hPolicy) + { + ::LsaClose(hPolicy); + } + + ReleaseSid(psid); + ReleaseStr(pwzUser); + return hr; +} + +static void SetUserPasswordAndAttributes( + __in USER_INFO_1* puserInfo, + __in LPWSTR wzPassword, + __in int iAttributes + ) +{ + Assert(puserInfo); + + // Set the User's password + puserInfo->usri1_password = wzPassword; + + // Apply the Attributes + if (SCAU_DONT_EXPIRE_PASSWRD & iAttributes) + { + puserInfo->usri1_flags |= UF_DONT_EXPIRE_PASSWD; + } + else + { + puserInfo->usri1_flags &= ~UF_DONT_EXPIRE_PASSWD; + } + + if (SCAU_PASSWD_CANT_CHANGE & iAttributes) + { + puserInfo->usri1_flags |= UF_PASSWD_CANT_CHANGE; + } + else + { + puserInfo->usri1_flags &= ~UF_PASSWD_CANT_CHANGE; + } + + if (SCAU_DISABLE_ACCOUNT & iAttributes) + { + puserInfo->usri1_flags |= UF_ACCOUNTDISABLE; + } + else + { + puserInfo->usri1_flags &= ~UF_ACCOUNTDISABLE; + } + + if (SCAU_PASSWD_CHANGE_REQD_ON_LOGIN & iAttributes) // TODO: for some reason this doesn't work + { + puserInfo->usri1_flags |= UF_PASSWORD_EXPIRED; + } + else + { + puserInfo->usri1_flags &= ~UF_PASSWORD_EXPIRED; + } +} + + +/******************************************************************** + CreateUser - CUSTOM ACTION ENTRY POINT for creating users + + Input: deferred CustomActionData - UserName\tDomain\tPassword\tAttributes\tGroupName\tDomain\tGroupName\tDomain... + * *****************************************************************/ +extern "C" UINT __stdcall CreateUser( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(0, "Debug CreateUser"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzDomain = NULL; + LPWSTR pwzPassword = NULL; + LPWSTR pwzGroup = NULL; + LPWSTR pwzGroupDomain = NULL; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + int iAttributes = 0; + BOOL fInitializedCom = FALSE; + + USER_INFO_1 userInfo; + USER_INFO_1* puserInfo = NULL; + DWORD dw; + LPCWSTR wz = NULL; + + hr = WcaInitialize(hInstall, "CreateUser"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = WcaGetProperty( L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // + // Read in the CustomActionData + // + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to read user name from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to read domain from custom action data"); + + hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); + ExitOnFailure(hr, "failed to read attributes from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzPassword); + ExitOnFailure(hr, "failed to read password from custom action data"); + + if (!(SCAU_DONT_CREATE_USER & iAttributes)) + { + ::ZeroMemory(&userInfo, sizeof(USER_INFO_1)); + userInfo.usri1_name = pwzName; + userInfo.usri1_priv = USER_PRIV_USER; + userInfo.usri1_flags = UF_SCRIPT; + userInfo.usri1_home_dir = NULL; + userInfo.usri1_comment = NULL; + userInfo.usri1_script_path = NULL; + + SetUserPasswordAndAttributes(&userInfo, pwzPassword, iAttributes); + + // + // Create the User + // + if (pwzDomain && *pwzDomain) + { + er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, NULL, &pDomainControllerInfo ); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo ); + } + if (ERROR_SUCCESS == er) + { + wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + else + { + wz = pwzDomain; + } + } + + er = ::NetUserAdd(wz, 1, reinterpret_cast(&userInfo), &dw); + if (NERR_UserExists == er) + { + if (SCAU_UPDATE_IF_EXISTS & iAttributes) + { + er = ::NetUserGetInfo(wz, pwzName, 1, reinterpret_cast(&puserInfo)); + if (NERR_Success == er) + { + // Change the existing user's password and attributes again then try + // to update user with this new data + SetUserPasswordAndAttributes(puserInfo, pwzPassword, iAttributes); + + er = ::NetUserSetInfo(wz, pwzName, 1, reinterpret_cast(puserInfo), &dw); + } + } + else if (!(SCAU_FAIL_IF_EXISTS & iAttributes)) + { + er = NERR_Success; + } + } + else if (NERR_PasswordTooShort == er || NERR_PasswordTooLong == er) + { + MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrUSRFailedUserCreatePswd, "failed to create user: %ls due to invalid password.", pwzName); + } + MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrUSRFailedUserCreate, "failed to create user: %ls", pwzName); + } + + if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) + { + hr = ModifyUserLocalServiceRight(pwzDomain, pwzName, TRUE); + MessageExitOnFailure(hr, msierrUSRFailedGrantLogonAsService, "Failed to grant logon as service rights to user: %ls", pwzName); + } + + if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) + { + hr = ModifyUserLocalBatchRight(pwzDomain, pwzName, TRUE); + MessageExitOnFailure(hr, msierrUSRFailedGrantLogonAsService, "Failed to grant logon as batch job rights to user: %ls", pwzName); + } + + // + // Add the users to groups + // + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); + ExitOnFailure(hr, "failed to get domain for group: %ls", pwzGroup); + + hr = AddUserToGroup(pwzName, pwzDomain, pwzGroup, pwzGroupDomain); + MessageExitOnFailure(hr, msierrUSRFailedUserGroupAdd, "failed to add user: %ls to group %ls", pwzName, pwzGroup); + } + if (E_NOMOREITEMS == hr) // if there are no more items, all is well + { + hr = S_OK; + } + ExitOnFailure(hr, "failed to get next group in which to include user:%ls", pwzName); + +LExit: + if (puserInfo) + { + ::NetApiBufferFree((LPVOID)puserInfo); + } + + if (pDomainControllerInfo) + { + ::NetApiBufferFree((LPVOID)pDomainControllerInfo); + } + + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzDomain); + ReleaseStr(pwzPassword); + ReleaseStr(pwzGroup); + ReleaseStr(pwzGroupDomain); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + if (SCAU_NON_VITAL & iAttributes) + { + er = ERROR_SUCCESS; + } + else if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + + +/******************************************************************** + RemoveUser - CUSTOM ACTION ENTRY POINT for removing users + + Input: deferred CustomActionData - Name\tDomain + * *****************************************************************/ +extern "C" UINT __stdcall RemoveUser( + MSIHANDLE hInstall + ) +{ + //AssertSz(0, "Debug RemoveAccount"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzDomain= NULL; + LPWSTR pwzGroup = NULL; + LPWSTR pwzGroupDomain = NULL; + int iAttributes = 0; + LPCWSTR wz = NULL; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + BOOL fInitializedCom = FALSE; + + hr = WcaInitialize(hInstall, "RemoveUser"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // + // Read in the CustomActionData + // + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to read name from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to read domain from custom action data"); + + hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); + ExitOnFailure(hr, "failed to read attributes from custom action data"); + + // + // Remove the logon as service privilege. + // + if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) + { + hr = ModifyUserLocalServiceRight(pwzDomain, pwzName, FALSE); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to remove logon as service right from user, continuing..."); + hr = S_OK; + } + } + + if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) + { + hr = ModifyUserLocalBatchRight(pwzDomain, pwzName, FALSE); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to remove logon as batch job right from user, continuing..."); + hr = S_OK; + } + } + + // + // Remove the User Account if the user was created by us. + // + if (!(SCAU_DONT_CREATE_USER & iAttributes)) + { + if (pwzDomain && *pwzDomain) + { + er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, NULL, &pDomainControllerInfo ); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo ); + } + if (ERROR_SUCCESS == er) + { + wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + else + { + wz = pwzDomain; + } + } + + er = ::NetUserDel(wz, pwzName); + if (NERR_UserNotFound == er) + { + er = NERR_Success; + } + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to delete user account: %ls", pwzName); + } + else + { + // + // Remove the user from the groups + // + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); + + if (FAILED(hr)) + { + WcaLogError(hr, "failed to get domain for group: %ls, continuing anyway.", pwzGroup); + } + else + { + hr = RemoveUserFromGroup(pwzName, pwzDomain, pwzGroup, pwzGroupDomain); + if (FAILED(hr)) + { + WcaLogError(hr, "failed to remove user: %ls from group %ls, continuing anyway.", pwzName, pwzGroup); + } + } + } + + if (E_NOMOREITEMS == hr) // if there are no more items, all is well + { + hr = S_OK; + } + + ExitOnFailure(hr, "failed to get next group from which to remove user:%ls", pwzName); + } + +LExit: + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + } + + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzDomain); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} diff --git a/src/ca/scamanifest.cpp b/src/ca/scamanifest.cpp new file mode 100644 index 00000000..58b4054d --- /dev/null +++ b/src/ca/scamanifest.cpp @@ -0,0 +1,377 @@ +// 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" + +LPCWSTR vcsPerfmonManifestQuery = L"SELECT `Component_`, `File`, `ResourceFileDirectory` FROM `PerfmonManifest`"; +LPCWSTR vcsEventManifestQuery = L"SELECT `Component_`, `File` FROM `EventManifest`"; +enum ePerfMonManifestQuery { pfmComponent = 1, pfmFile, pfmResourceFileDir }; +enum eEventManifestQuery { emComponent = 1, emFile}; + +BOOL IsVistaOrAbove() +{ + OSVERSIONINFO osvi; + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + #pragma warning(suppress: 4996) //TODO: use non-deprecated function to check OS version + if (!::GetVersionEx(&osvi)) + { + return false; + } + return osvi.dwMajorVersion >= 6; +} + + +/******************************************************************** + ConfigurePerfmonManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling + Perfmon counter manifest registering + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonManifestRegister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzResourceFilePath = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonManifestReg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because the target system does not support perfmon manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"PerfmonManifest")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because PerfmonManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMonManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMonManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMonManifest"); + if (!WcaIsInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMonManifest"); + + hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); + ExitOnFailure(hr, "failed to get ApplicationIdentity for PerfMonManifest"); + size_t iResourcePath = lstrlenW(pwzResourceFilePath); + if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') + *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' + + hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmonManifest action"); + + if ( *pwzResourceFilePath ) + { + hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + } + else + { + hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + } + + WcaLog(LOGMSG_VERBOSE, "RegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RegisterPerfmonManifest action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMonManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzResourceFilePath); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + ConfigurePerfmonUninstall - CUSTOM ACTION ENTRY POINT for uninstalling + Perfmon counters + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonManifestUnregister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzResourceFilePath = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonManifestUnreg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because the target system does not support perfmon manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (WcaTableExists(L"PerfmonManifest") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because PerfmonManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMonManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMonManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMonManifest"); + if (!WcaIsUninstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMonManifest"); + + hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); + ExitOnFailure(hr, "failed to get ApplicationIdentity for PerfMonManifest"); + size_t iResourcePath = lstrlenW(pwzResourceFilePath); + if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') + *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' + + hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmonManifest action"); + + hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + + WcaLog(LOGMSG_VERBOSE, "UnRegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule UnregisterPerfmonManifest action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMonManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzResourceFilePath); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + +/******************************************************************** + ConfigureEventManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling + Event manifest registering + +********************************************************************/ +extern "C" UINT __stdcall ConfigureEventManifestRegister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigureEventManifestReg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because the target system does not support event manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"EventManifest")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because EventManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on EventManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, emComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for EventManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for EventManifest"); + if (!WcaIsInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for EventManifest"); + + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in EventManifest"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule RollbackRegisterEventManifest action"); + + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in EventManifest"); + WcaLog(LOGMSG_VERBOSE, "RegisterEventManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterEventManifest"), pwzCommand, COST_EVENTMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RegisterEventManifest action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing EventManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + + +/******************************************************************** + ConfigureEventManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling + Event manifest registering + +********************************************************************/ +extern "C" UINT __stdcall ConfigureEventManifestUnregister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigureEventManifestUnreg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because the target system does not support event manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"EventManifest")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because EventManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on EventManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, emComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for EventManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for EventManifest"); + + // nothing to do on an install + // schedule the rollback action when reinstalling to re-register pre-patch manifest + if (!WcaIsUninstalling(isInstalled, isAction) && !WcaIsReInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for EventManifest"); + + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in EventManifest"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RollbackUnregisterEventManifest action"); + + // no need to uninstall on a repair/patch. Register action will re-register and update the manifest. + if (!WcaIsReInstalling(isInstalled, isAction)) + { + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in EventManifest"); + WcaLog(LOGMSG_VERBOSE, "UnregisterEventManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule UnregisterEventManifest action"); + } + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing EventManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + diff --git a/src/ca/scaperf.cpp b/src/ca/scaperf.cpp new file mode 100644 index 00000000..82f458af --- /dev/null +++ b/src/ca/scaperf.cpp @@ -0,0 +1,310 @@ +// 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" + +LPCWSTR vcsPerfCounterDataQuery = L"SELECT `PerformanceCategory`, `Component_`, `Name`, `IniData`, `ConstantData` FROM `PerformanceCategory`"; +enum ePerfCounterDataQuery { pcdqId = 1, pcdqComponent, pcdqName, pcdqIniData, pcdqConstantData }; + +LPCWSTR vcsPerfMonQuery = L"SELECT `Component_`, `File`, `Name` FROM `Perfmon`"; +enum ePerfMonQuery { pmqComponent = 1, pmqFile, pmqName }; + + +static HRESULT ProcessPerformanceCategory( + __in MSIHANDLE hInstall, + __in BOOL fInstall + ); + + +/******************************************************************** + InstallPerfCounterData - CUSTOM ACTION ENTRY POINT for installing + Performance Counters. + +********************************************************************/ +extern "C" UINT __stdcall InstallPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug InstallPerfCounterData{}"); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "InstallPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize InstallPerfCounterData."); + + hr = ProcessPerformanceCategory(hInstall, TRUE); + MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to process PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + UninstallPerfCounterData - CUSTOM ACTION ENTRY POINT for installing + Performance Counters. + +********************************************************************/ +extern "C" UINT __stdcall UninstallPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug UninstallPerfCounterData{}"); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "UninstallPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize UninstallPerfCounterData."); + + hr = ProcessPerformanceCategory(hInstall, FALSE); + MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to process PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + RegisterPerfmon - CUSTOM ACTION ENTRY POINT for installing Perfmon counters + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonInstall( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzName = NULL, pwzFile = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonInstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"Perfmon")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping RegisterPerfmon() because Perfmon table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfMonQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMon table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pmqComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMon"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMon"); + if (!WcaIsInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordString(hRec, pmqName, &pwzName); + ExitOnFailure(hr, "failed to get Name for PerfMon"); + + hr = WcaGetRecordFormattedString(hRec, pmqFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMon"); + + WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonInstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "failed to schedule RegisterPerfmon action"); + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmon action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMon"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzFile); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + ConfigurePerfmonUninstall - CUSTOM ACTION ENTRY POINT for uninstalling + Perfmon counters + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonUninstall( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzName = NULL, pwzFile = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonUninstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (WcaTableExists(L"Perfmon") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping UnregisterPerfmon() because Perfmon table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfMonQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMon table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pmqComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMon"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMon"); + if (!WcaIsUninstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordString(hRec, pmqName, &pwzName); + ExitOnFailure(hr, "failed to get Name for PerfMon"); + + hr = WcaGetRecordFormattedString(hRec, pmqFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMon"); + + WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonUninstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "failed to schedule UnregisterPerfmon action"); + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmon action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMon"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzFile); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + + +static HRESULT ProcessPerformanceCategory( + __in MSIHANDLE hInstall, + __in BOOL fInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzId = NULL; + LPWSTR pwzComponent = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzData = NULL; + INSTALLSTATE isInstalled, isAction; + + LPWSTR pwzCustomActionData = NULL; + + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"PerformanceCategory")) + { + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfCounterDataQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerformanceCategory table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, pcdqId, &pwzId); + ExitOnFailure(hr, "Failed to get id for PerformanceCategory."); + + // Check to see if the Component is being installed or uninstalled + // when we are processing the same. + hr = WcaGetRecordString(hRec, pcdqComponent, &pwzComponent); + ExitOnFailure(hr, "Failed to get Component for PerformanceCategory: %ls", pwzId); + + er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get Component state for PerformanceCategory: %ls", pwzId); + + if ((fInstall && !WcaIsInstalling(isInstalled, isAction)) || + (!fInstall && !WcaIsUninstalling(isInstalled, isAction))) + { + continue; + } + + hr = WcaGetRecordString(hRec, pcdqName, &pwzName); + ExitOnFailure(hr, "Failed to get Name for PerformanceCategory: %ls", pwzId); + hr = WcaWriteStringToCaData(pwzName, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add Name to CustomActionData for PerformanceCategory: %ls", pwzId); + + hr = WcaGetRecordString(hRec, pcdqIniData, &pwzData); + ExitOnFailure(hr, "Failed to get IniData for PerformanceCategory: %ls", pwzId); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add IniData to CustomActionData for PerformanceCategory: %ls", pwzId); + + hr = WcaGetRecordString(hRec, pcdqConstantData, &pwzData); + ExitOnFailure(hr, "Failed to get ConstantData for PerformanceCategory: %ls", pwzId); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add ConstantData to CustomActionData for PerformanceCategory: %ls", pwzId); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerformanceCategory table."); + + // If there was any data built up, schedule it for execution. + if (pwzCustomActionData) + { + if (fInstall) + { + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "Failed to schedule RollbackRegisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "Failed to schedule RegisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + } + else + { + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "Failed to schedule RollbackUnregisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "Failed to schedule UnregisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + } + } + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzComponent); + ReleaseStr(pwzId); + + return hr; +} diff --git a/src/ca/scaperfexec.cpp b/src/ca/scaperfexec.cpp new file mode 100644 index 00000000..bf58c8d0 --- /dev/null +++ b/src/ca/scaperfexec.cpp @@ -0,0 +1,423 @@ +// 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" + +typedef DWORD (STDAPICALLTYPE *PFNPERFCOUNTERTEXTSTRINGS)(LPWSTR lpCommandLine, BOOL bQuietModeArg); + +static HRESULT ExecutePerfCounterData( + __in MSIHANDLE hInstall, + __in BOOL fInstall + ); +static HRESULT CreateDataFile( + __in LPCWSTR wzTempFolder, + __in LPCWSTR wzData, + __in BOOL fIniData, + __out HANDLE *phFile, + __out_opt LPWSTR *ppwzFile + ); + + +/******************************************************************** + RegisterPerfCounterData - CUSTOM ACTION ENTRY POINT for registering + performance counters + + Input: deferred CustomActionData: wzName\twzIniData\twzConstantData\twzName\twzIniData\twzConstantData\t... +*******************************************************************/ +extern "C" UINT __stdcall RegisterPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug RegisterPerfCounterData()"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "RegisterPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize RegisterPerfCounterData."); + + hr = ExecutePerfCounterData(hInstall, TRUE); + MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + UnregisterPerfCounterData - CUSTOM ACTION ENTRY POINT for registering + performance counters + + Input: deferred CustomActionData: wzName\twzIniData\twzConstantData\twzName\twzIniData\twzConstantData\t... +*******************************************************************/ +extern "C" UINT __stdcall UnregisterPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug UnregisterPerfCounterData()"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "UnregisterPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize UnregisterPerfCounterData."); + + hr = ExecutePerfCounterData(hInstall, FALSE); + MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + RegisterPerfmon - CUSTOM ACTION ENTRY POINT for registering + counters + + Input: deferred CustomActionData - + wzFile or wzName +*******************************************************************/ +extern "C" UINT __stdcall RegisterPerfmon( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + LPWSTR pwzData = NULL; + + HMODULE hMod = NULL; + PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; + DWORD_PTR dwRet; + LPWSTR pwzShortPath = NULL; + DWORD_PTR cchShortPath = MAX_PATH; + DWORD_PTR cchShortPathLength = 0; + + LPWSTR pwzCommand = NULL; + + hr = WcaInitialize(hInstall, "RegisterPerfmon"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // do the perfmon registration + if (NULL == hMod) + { + hr = LoadSystemLibrary(L"loadperf.dll", &hMod); + } + ExitOnFailure(hr, "failed to load DLL for PerfMon"); + + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hMod, "LoadPerfCounterTextStringsW"); + ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "failed to get DLL function for PerfMon"); + + hr = StrAlloc(&pwzShortPath, cchShortPath); + ExitOnFailure(hr, "failed to allocate string"); + + WcaLog(LOGMSG_VERBOSE, "Converting DLL path to short format: %ls", pwzData); + cchShortPathLength = ::GetShortPathNameW(pwzData, pwzShortPath, cchShortPath); + if (cchShortPathLength > cchShortPath) + { + cchShortPath = cchShortPathLength + 1; + hr = StrAlloc(&pwzShortPath, cchShortPath); + ExitOnFailure(hr, "failed to allocate string"); + + cchShortPathLength = ::GetShortPathNameW(pwzData, pwzShortPath, cchShortPath); + } + + if (0 == cchShortPathLength) + { + ExitOnLastError(hr, "failed to get short path format of path: %ls", pwzData); + } + + hr = StrAllocFormatted(&pwzCommand, L"lodctr \"%s\"", pwzShortPath); + ExitOnFailure(hr, "failed to format lodctr string"); + + WcaLog(LOGMSG_VERBOSE, "RegisterPerfmon running command: '%ls'", pwzCommand); + dwRet = (*pfnPerfCounterTextString)(pwzCommand, TRUE); + if (dwRet != ERROR_SUCCESS && dwRet != ERROR_ALREADY_EXISTS) + { + hr = HRESULT_FROM_WIN32(dwRet); + MessageExitOnFailure(hr, msierrPERFMONFailedRegisterDLL, "failed to register with PerfMon, DLL: %ls", pwzData); + } + + hr = S_OK; +LExit: + ReleaseStr(pwzData); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +extern "C" UINT __stdcall UnregisterPerfmon( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + LPWSTR pwzData = NULL; + + HMODULE hMod = NULL; + PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; + DWORD dwRet; + WCHAR wz[255]; + + hr = WcaInitialize(hInstall, "UnregisterPerfmon"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // do the perfmon unregistration + hr = E_FAIL; + if (hMod == NULL) + { + hr = LoadSystemLibrary(L"loadperf.dll", &hMod); + } + ExitOnFailure(hr, "failed to load DLL for PerfMon"); + + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hMod, "UnloadPerfCounterTextStringsW"); + ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "failed to get DLL function for PerfMon"); + + hr = ::StringCchPrintfW(wz, countof(wz), L"unlodctr \"%s\"", pwzData); + ExitOnFailure(hr, "Failed to format unlodctr string with: %ls", pwzData); + WcaLog(LOGMSG_VERBOSE, "UnregisterPerfmon running command: '%ls'", wz); + dwRet = (*pfnPerfCounterTextString)(wz, TRUE); + // if the counters aren't registered, then OK to continue + if (dwRet != ERROR_SUCCESS && dwRet != ERROR_FILE_NOT_FOUND && dwRet != ERROR_BADKEY) + { + hr = HRESULT_FROM_WIN32(dwRet); + MessageExitOnFailure(hr, msierrPERFMONFailedUnregisterDLL, "failed to unregsister with PerfMon, DLL: %ls", pwzData); + } + + hr = S_OK; +LExit: + ReleaseStr(pwzData); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +static HRESULT ExecutePerfCounterData( + __in MSIHANDLE /*hInstall*/, + __in BOOL fInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + HMODULE hModule = NULL; + PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString = NULL; + LPCWSTR wzPrefix = NULL; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + + LPWSTR pwzName = NULL; + LPWSTR pwzIniData = NULL; + LPWSTR pwzConstantData = NULL; + LPWSTR pwzTempFolder = NULL; + LPWSTR pwzIniFile = NULL; + LPWSTR pwzExecute = NULL; + + HANDLE hIniData = INVALID_HANDLE_VALUE; + HANDLE hConstantData = INVALID_HANDLE_VALUE; + + // Load the system performance counter helper DLL then get the appropriate + // entrypoint out of it. Fortunately, they have the same signature so we + // can use one function pointer to point to both. + hr = LoadSystemLibrary(L"loadperf.dll", &hModule); + ExitOnFailure(hr, "failed to load DLL for PerfMon"); + + if (fInstall) + { + wzPrefix = L"lodctr"; + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hModule, "LoadPerfCounterTextStringsW"); + } + else + { + wzPrefix = L"unlodctr"; + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hModule, "UnloadPerfCounterTextStringsW"); + } + ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "Failed to get DLL function for PerfMon"); + + // Now get the CustomActionData and execute it. + hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "Failed to get CustomActionData."); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzName))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzIniData); + ExitOnFailure(hr, "Failed to read IniData from custom action data."); + + hr = WcaReadStringFromCaData(&pwz, &pwzConstantData); + ExitOnFailure(hr, "Failed to read ConstantData from custom action data."); + + if (fInstall) + { + hr = PathCreateTempDirectory(NULL, L"WIXPF%03x", 999, &pwzTempFolder); + ExitOnFailure(hr, "Failed to create temp directory."); + + hr = CreateDataFile(pwzTempFolder, pwzIniData, TRUE, &hIniData, &pwzIniFile); + ExitOnFailure(hr, "Failed to create .ini file for performance counter category: %ls", pwzName); + + hr = CreateDataFile(pwzTempFolder, pwzConstantData, FALSE, &hConstantData, NULL); + ExitOnFailure(hr, "Failed to create .h file for performance counter category: %ls", pwzName); + + hr = StrAllocFormatted(&pwzExecute, L"%s \"%s\"", wzPrefix, pwzIniFile); + ExitOnFailure(hr, "Failed to allocate string to execute."); + + // Execute the install. + er = (*pfnPerfCounterTextString)(pwzExecute, TRUE); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to execute install of performance counter category: %ls", pwzName); + + if (INVALID_HANDLE_VALUE != hIniData) + { + ::CloseHandle(hIniData); + hIniData = INVALID_HANDLE_VALUE; + } + + if (INVALID_HANDLE_VALUE != hConstantData) + { + ::CloseHandle(hConstantData); + hConstantData = INVALID_HANDLE_VALUE; + } + + DirEnsureDelete(pwzTempFolder, TRUE, TRUE); + } + else + { + hr = StrAllocFormatted(&pwzExecute, L"%s \"%s\"", wzPrefix, pwzName); + ExitOnFailure(hr, "Failed to allocate string to execute."); + + // Execute the uninstall and if the counter isn't registered then ignore + // the error since it won't hurt anything. + er = (*pfnPerfCounterTextString)(pwzExecute, TRUE); + if (ERROR_FILE_NOT_FOUND == er || ERROR_BADKEY == er) + { + er = ERROR_SUCCESS; + } + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to execute uninstall of performance counter category: %ls", pwzName); + } + } + + if (E_NOMOREITEMS == hr) // If there are no more items, all is well + { + hr = S_OK; + } + ExitOnFailure(hr, "Failed to execute all perf counter data."); + + hr = S_OK; + +LExit: + if (INVALID_HANDLE_VALUE != hIniData) + { + ::CloseHandle(hIniData); + } + + if (INVALID_HANDLE_VALUE != hConstantData) + { + ::CloseHandle(hConstantData); + } + + ReleaseStr(pwzExecute); + ReleaseStr(pwzIniFile); + ReleaseStr(pwzTempFolder); + ReleaseStr(pwzConstantData); + ReleaseStr(pwzIniData); + ReleaseStr(pwzName); + ReleaseStr(pwzCustomActionData); + + if (hModule) + { + ::FreeLibrary(hModule); + } + + return hr; +} + + +static HRESULT CreateDataFile( + __in LPCWSTR wzTempFolder, + __in LPCWSTR wzData, + __in BOOL fIniData, + __out HANDLE *phFile, + __out_opt LPWSTR *ppwzFile + ) +{ + HRESULT hr = S_OK; + HANDLE hFile = INVALID_HANDLE_VALUE; + LPWSTR pwzFile = NULL; + LPSTR pszData = NULL; + DWORD cbData = 0; + DWORD cbWritten = 0; + + // Convert the data to UTF-8 because lodctr/unloctr + // doesn't like unicode. + hr = StrAnsiAllocString(&pszData, wzData, 0, CP_UTF8); + ExitOnFailure(hr, "Failed to covert data to ANSI."); + + cbData = lstrlenA(pszData); + + // Concatenate the paths together, open the file data file + // and dump the data in there. + hr = StrAllocString(&pwzFile, wzTempFolder, 0); + ExitOnFailure(hr, "Failed to copy temp directory name."); + + hr = StrAllocConcat(&pwzFile, L"wixperf", 0); + ExitOnFailure(hr, "Failed to add name of file."); + + hr = StrAllocConcat(&pwzFile, fIniData ? L".ini" : L".h", 0); + ExitOnFailure(hr, "Failed to add extension of file."); + + hFile = ::CreateFileW(pwzFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == hFile) + { + ExitWithLastError(hr, "Failed to open new temp file: %ls", pwzFile); + } + + if (!::WriteFile(hFile, pszData, cbData, &cbWritten, NULL)) + { + ExitWithLastError(hr, "Failed to write data to new temp file: %ls", pwzFile); + } + + if (INVALID_HANDLE_VALUE != hFile) + { + ::CloseHandle(hFile); + hFile = INVALID_HANDLE_VALUE; + } + + // Return the requested values. + *phFile = hFile; + hFile = INVALID_HANDLE_VALUE; + + if (ppwzFile) + { + *ppwzFile = pwzFile; + pwzFile = NULL; + } + +LExit: + if (INVALID_HANDLE_VALUE != hFile) + { + ::CloseHandle(hFile); + } + ReleaseStr(pszData); + ReleaseStr(pwzFile); + + return hr; +} diff --git a/src/ca/scasched.cpp b/src/ca/scasched.cpp new file mode 100644 index 00000000..ba230a9e --- /dev/null +++ b/src/ca/scasched.cpp @@ -0,0 +1,127 @@ +// 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" + + +/******************************************************************** +ConfigureSmb - CUSTOM ACTION ENTRY POINT for installing fileshare settings + +********************************************************************/ +extern "C" UINT __stdcall ConfigureSmbInstall( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + SCA_SMB* pssList = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ConfigureSmbInstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (WcaTableExists(L"FileShare") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no FileShare table"); + ExitFunction1(hr = S_FALSE); + } + + hr = ScaSmbRead(&pssList); + ExitOnFailure(hr, "failed to read FileShare table"); + + hr = ScaSmbInstall(pssList); + ExitOnFailure(hr, "failed to install FileShares"); + +LExit: + if (pssList) + ScaSmbFreeList(pssList); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** +ConfigureSmb - CUSTOM ACTION ENTRY POINT for installing fileshare settings + +********************************************************************/ +extern "C" UINT __stdcall ConfigureSmbUninstall( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + SCA_SMB* pssList = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ConfigureSmbUninstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (WcaTableExists(L"FileShare") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no FileShare table"); + ExitFunction1(hr = S_FALSE); + } + + hr = ScaSmbRead(&pssList); + ExitOnFailure(hr, "failed to read FileShare table"); + + hr = ScaSmbUninstall(pssList); + ExitOnFailure(hr, "failed to uninstall FileShares"); + +LExit: + if (pssList) + ScaSmbFreeList(pssList); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** +ConfigureUsers - CUSTOM ACTION ENTRY POINT for installing users + +********************************************************************/ +extern "C" UINT __stdcall ConfigureUsers( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(0, "Debug ConfigureUsers"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + BOOL fInitializedCom = FALSE; + SCA_USER* psuList = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ConfigureUsers"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = ScaUserRead(&psuList); + ExitOnFailure(hr, "failed to read User table"); + + hr = ScaUserExecute(psuList); + ExitOnFailure(hr, "failed to add/remove User actions"); + +LExit: + if (psuList) + { + ScaUserFreeList(psuList); + } + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} \ No newline at end of file diff --git a/src/ca/scasmb.h b/src/ca/scasmb.h new file mode 100644 index 00000000..7dbeb14d --- /dev/null +++ b/src/ca/scasmb.h @@ -0,0 +1,46 @@ +#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 "scauser.h" + +// structs +// Structure used to hold and extra user/permission pairs from the FileSharePermissions Table +struct SCA_SMB_EX_USER_PERMS +{ + int nPermissions; + ACCESS_MODE accessMode; + SCA_USER scau; + SCA_SMB_EX_USER_PERMS* pExUserPermsNext; +}; + +struct SCA_SMB // hungarian ss +{ + WCHAR wzId[MAX_DARWIN_KEY + 1]; + WCHAR wzShareName[MAX_DARWIN_KEY + 1]; + WCHAR wzDescription[MAX_DARWIN_COLUMN + 1]; + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + WCHAR wzDirectory[MAX_PATH + 1]; + + int nUserPermissionCount; + int nPermissions; + SCA_SMB_EX_USER_PERMS* pExUserPerms; + + INSTALLSTATE isInstalled, isAction; + + BOOL fUseIntegratedAuth; + BOOL fLegacyUserProvided; + struct SCA_USER scau; + + struct SCA_SMB* pssNext; +}; + + +#define RESERVED 0 + +// schedule prototypes +HRESULT ScaSmbRead(SCA_SMB** ppssList); +HRESULT ScaSmbExPermsRead(SCA_SMB* pss); +HRESULT ScaSmbUninstall(SCA_SMB* pssList); +HRESULT ScaSmbInstall(SCA_SMB* pssList); +void ScaSmbFreeList(SCA_SMB* pssList); diff --git a/src/ca/scasmbexec.cpp b/src/ca/scasmbexec.cpp new file mode 100644 index 00000000..ced3aa78 --- /dev/null +++ b/src/ca/scasmbexec.cpp @@ -0,0 +1,316 @@ +// 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" + + +/******************************************************************** + AllocateAcl - allocate an acl and populate it with this user and + permission information user could be user or domain\user + +********************************************************************/ +HRESULT AllocateAcl(SCA_SMBP* pssp, PACL* ppACL) +{ + HRESULT hr = S_OK; + EXPLICIT_ACCESSW* pEA = NULL; + DWORD cEA = 0; + DWORD dwCounter = 0; + + PSID psid = NULL; + LPCWSTR wzUser = NULL; + DWORD nPermissions = 0; + DWORD nErrorReturn = 0; + ACCESS_MODE accessMode = NOT_USED_ACCESS; + + cEA = pssp->dwUserPermissionCount + 1; + if (cEA >= MAXSIZE_T / sizeof(EXPLICIT_ACCESSW)) + { + ExitOnFailure(hr = E_OUTOFMEMORY, "Too many user permissions to allocate: %u", cEA); + } + + pEA = static_cast(MemAlloc(cEA * sizeof(EXPLICIT_ACCESSW), TRUE)); + ExitOnNull(pEA, hr, E_OUTOFMEMORY, "failed to allocate memory for explicit access structure"); + + // figure out how big the psid is + for (dwCounter = 0; dwCounter < pssp->dwUserPermissionCount; ++dwCounter) + { + wzUser = pssp->pUserPerms[dwCounter].wzUser; + nPermissions = pssp->pUserPerms[dwCounter].nPermissions; + accessMode = pssp->pUserPerms[dwCounter].accessMode; + // + // create the appropriate SID + // + + // figure out the right user to put into the access block + if (0 == lstrcmpW(wzUser, L"Everyone")) + { + hr = AclGetWellKnownSid(WinWorldSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"Administrators")) + { + hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"LocalSystem")) + { + hr = AclGetWellKnownSid(WinLocalSystemSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"LocalService")) + { + hr = AclGetWellKnownSid(WinLocalServiceSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"NetworkService")) + { + hr = AclGetWellKnownSid(WinNetworkServiceSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"AuthenticatedUser")) + { + hr = AclGetWellKnownSid(WinAuthenticatedUserSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"Guests")) + { + hr = AclGetWellKnownSid(WinBuiltinGuestsSid, &psid); + } + else if(0 == lstrcmpW(wzUser, L"CREATOR OWNER")) + { + hr = AclGetWellKnownSid(WinCreatorOwnerSid, &psid); + } + else + { + hr = AclGetAccountSid(NULL, wzUser, &psid); + } + ExitOnFailure(hr, "failed to get sid for account: %ls", wzUser); + + // we now have a valid pSid, fill in the EXPLICIT_ACCESS + + /* Permissions options: (see sca.sdh for defined sdl options) + #define GENERIC_READ (0x80000000L) 2147483648 + #define GENERIC_WRITE (0x40000000L) 1073741824 + #define GENERIC_EXECUTE (0x20000000L) 536870912 + #define GENERIC_ALL (0x10000000L) 268435456 + */ + pEA[dwCounter].grfAccessPermissions = nPermissions; + pEA[dwCounter].grfAccessMode = accessMode; + pEA[dwCounter].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; +#pragma prefast(push) +#pragma prefast(disable:25029) + ::BuildTrusteeWithSidW(&(pEA[dwCounter].Trustee), psid); +#pragma prefast(pop) + } + + // create a new ACL that contains the ACE + *ppACL = NULL; +#pragma prefast(push) +#pragma prefast(disable:25029) + nErrorReturn = ::SetEntriesInAclW(dwCounter, pEA, NULL, ppACL); +#pragma prefast(pop) + ExitOnFailure(hr = HRESULT_FROM_WIN32(nErrorReturn), "failed to allocate ACL"); + +LExit: + if (psid) + { + AclFreeSid(psid); + } + + ReleaseMem(pEA); + + return hr; +} + + + +/******************************************************************** + FillShareInfo - fill the NetShareAdd data structure + +********************************************************************/ +void FillShareInfo(SHARE_INFO_502* psi, SCA_SMBP* pssp, PSECURITY_DESCRIPTOR pSD) +{ + psi->shi502_netname = pssp->wzKey; + psi->shi502_type = STYPE_DISKTREE; + psi->shi502_remark = pssp->wzDescription; + psi->shi502_permissions = 0; // not used + psi->shi502_max_uses = 0xFFFFFFFF; + psi->shi502_current_uses = 0; + psi->shi502_path = pssp->wzDirectory; + psi->shi502_passwd = NULL; // not file share perms + psi->shi502_reserved = 0; + psi->shi502_security_descriptor = pSD; +} + + + +/* NET_API_STATUS return codes +NERR_Success = 0 +NERR_DuplicateShare = 2118 +NERR_BufTooSmall = 2123 +NERR_NetNameNotFound = 2310 +NERR_RedirectedPath = 2117 +NERR_UnknownDevDir = 2116 +*/ + +/******************************************************************** + DoesShareExists - Does a share of this name exist on this computer? + +********************************************************************/ +HRESULT DoesShareExist(__in LPWSTR wzShareName) +{ + HRESULT hr = S_OK; + NET_API_STATUS s; + SHARE_INFO_502* psi = NULL; + s = ::NetShareGetInfo(NULL, wzShareName, 502, (BYTE**) &psi); + + switch (s) + { + case NERR_Success: + hr = S_OK; + break; + case NERR_NetNameNotFound: + hr = E_FILENOTFOUND; + break; + default: + WcaLogError(s, "NetShareGetInfo returned an unexpected value.", NULL); + hr = HRESULT_FROM_WIN32(s); + break; + } + + ::NetApiBufferFree(psi); + + return hr; +} + + + +/******************************************************************** + CreateShare - create the file share on this computer + +********************************************************************/ +HRESULT CreateShare(SCA_SMBP* pssp) +{ + if (!pssp || !(pssp->wzKey)) + return E_INVALIDARG; + + HRESULT hr = S_OK; + PACL pACL = NULL; + SHARE_INFO_502 si; + NET_API_STATUS s; + DWORD dwParamErr = 0; + + BOOL fShareExists = SUCCEEDED(DoesShareExist(pssp->wzKey)); + + PSECURITY_DESCRIPTOR pSD = static_cast(MemAlloc(SECURITY_DESCRIPTOR_MIN_LENGTH, TRUE)); + ExitOnNull(pSD, hr, E_OUTOFMEMORY, "Failed to allocate memory for security descriptor"); + +#pragma prefast(push) +#pragma prefast(disable:25029) + if (!::InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) +#pragma prefast(pop) + { + ExitOnLastError(hr, "failed to initialize security descriptor"); + } + + hr = AllocateAcl(pssp, &pACL); + ExitOnFailure(hr, "Failed to allocate ACL for fileshare"); + + if (NULL == pACL) + { + WcaLog(LOGMSG_VERBOSE, "Ignoring NULL DACL."); + } +#pragma prefast(push) +#pragma prefast(disable:25028) // We only call this when pACL isn't NULL, so this call is safe according to the docs + // add the ACL to the security descriptor. + else if (!::SetSecurityDescriptorDacl(pSD, TRUE, pACL, FALSE)) + { + ExitOnLastError(hr, "Failed to set security descriptor"); + } +#pragma prefast(pop) + + // all that is left is to create the share + FillShareInfo(&si, pssp, pSD); + + // Fail if the directory doesn't exist + if (!DirExists(pssp->wzDirectory, NULL)) + ExitOnFailure(hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND), "Can't create a file share on directory that doesn't exist: %ls.", pssp->wzDirectory); + + WcaLog(LOGMSG_VERBOSE, "Creating file share on directory \'%ls\' named \'%ls\'.", pssp->wzDirectory, pssp->wzKey); + + if (!fShareExists) + { + s = ::NetShareAdd(NULL, 502, (BYTE*) &si, &dwParamErr); + WcaLog(LOGMSG_VERBOSE, "Adding a new file share."); + } + else + { + // The share exists. Write our new permissions over the top. + s = ::NetShareSetInfo(NULL, pssp->wzKey, 502, (BYTE*) &si, &dwParamErr); + WcaLog(LOGMSG_VERBOSE, "Setting permissions on existing share."); + } + + if (NERR_Success != s) + { + hr = E_FAIL; + if (!fShareExists && NERR_DuplicateShare == s) + WcaLog(LOGMSG_VERBOSE, "Duplicate error when existence check failed."); + + // error codes listed above. + ExitOnFailure(hr, "Failed to create/modify file share: Err: %d", s); + } + +LExit: + if (pACL) + { + ::LocalFree(pACL); + } + + ReleaseMem(pSD); + + return hr; +} + + +/******************************************************************** + ScaEnsureSmbExists + +********************************************************************/ +HRESULT ScaEnsureSmbExists(SCA_SMBP* pssp) +{ + HRESULT hr = S_OK; + + // create the share + hr = CreateShare(pssp); + + return hr; +} + + +// +// Delete File Shares - real work +// + +/******************************************************************** + ScaDropSmb - delete this file share from this computer + +********************************************************************/ +HRESULT ScaDropSmb(SCA_SMBP* pssp) +{ + HRESULT hr = S_OK; + NET_API_STATUS s; + + hr = DoesShareExist(pssp->wzKey); + + if (E_FILENOTFOUND == hr) + { + WcaLog(LOGMSG_VERBOSE, "Share doesn't exist, share removal skipped. (%ls)", pssp->wzKey); + ExitFunction1(hr = S_OK); + + } + + ExitOnFailure(hr, "Unable to detect share. (%ls)", pssp->wzKey); + + s = ::NetShareDel(NULL, pssp->wzKey, 0); + if (NERR_Success != s) + { + hr = E_FAIL; + ExitOnFailure(hr, "Failed to remove file share: Err: %d", s); + } + +LExit: + return hr; +} diff --git a/src/ca/scasmbexec.h b/src/ca/scasmbexec.h new file mode 100644 index 00000000..e3c8f8bb --- /dev/null +++ b/src/ca/scasmbexec.h @@ -0,0 +1,27 @@ +#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. + + +struct SCA_SMBP_USER_PERMS +{ + DWORD nPermissions; + ACCESS_MODE accessMode; + WCHAR* wzUser; + //Not adding Password because I can't find anywhere that it is used +}; + +struct SCA_SMBP // hungarian ssp +{ + WCHAR* wzKey; + WCHAR* wzDescription; + WCHAR* wzComponent; + WCHAR* wzDirectory; // full path of the dir to share to + + DWORD dwUserPermissionCount; //Count of SCA_SMBP_EX_USER_PERMS structures + SCA_SMBP_USER_PERMS* pUserPerms; + BOOL fUseIntegratedAuth; +}; + + +HRESULT ScaEnsureSmbExists(SCA_SMBP* pssp); +HRESULT ScaDropSmb(SCA_SMBP* pssp); diff --git a/src/ca/scasmbsched.cpp b/src/ca/scasmbsched.cpp new file mode 100644 index 00000000..72536d6d --- /dev/null +++ b/src/ca/scasmbsched.cpp @@ -0,0 +1,639 @@ +// 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" + + +/******************************************************************** + Helper functions to maintain a list of file shares to create / remove + +********************************************************************/ +SCA_SMB* NewSmb() +{ + SCA_SMB* pss = (SCA_SMB*)MemAlloc(sizeof(SCA_SMB), TRUE); + Assert(pss); + return pss; +} + + +SCA_SMB_EX_USER_PERMS* NewExUserPermsSmb() +{ + SCA_SMB_EX_USER_PERMS* pExUserPerms = (SCA_SMB_EX_USER_PERMS*)MemAlloc(sizeof(SCA_SMB_EX_USER_PERMS), TRUE); + Assert(pExUserPerms); + return pExUserPerms; +} + + +SCA_SMB* AddSmbToList(SCA_SMB* pssList, SCA_SMB* pss) +{ + if (pssList) + { + SCA_SMB* pssT = pssList; + while (pssT->pssNext) + { + pssT = pssT->pssNext; + } + + pssT->pssNext = pss; + } + else + { + pssList = pss; + } + + return pssList; +} + + +SCA_SMB_EX_USER_PERMS* AddExUserPermsSmbToList( + SCA_SMB_EX_USER_PERMS* pExUserPermsList, + SCA_SMB_EX_USER_PERMS* pExUserPerms + ) +{ + SCA_SMB_EX_USER_PERMS* pExUserPermsTemp = pExUserPermsList; + if (pExUserPermsList) + { + while (pExUserPermsTemp->pExUserPermsNext) + { + pExUserPermsTemp = pExUserPermsTemp->pExUserPermsNext; + } + + pExUserPermsTemp->pExUserPermsNext = pExUserPerms; + } + else + { + pExUserPermsList = pExUserPerms; + } + + return pExUserPermsList; +} + +void ScaSmbFreeList(SCA_SMB* pssList) +{ + SCA_SMB* pssDelete = pssList; + while (pssList) + { + pssDelete = pssList; + pssList = pssList->pssNext; + + MemFree(pssDelete); + } +} + +void ScaExUserPermsSmbFreeList(SCA_SMB_EX_USER_PERMS* pExUserPermsList) +{ + SCA_SMB_EX_USER_PERMS* pExUserPermsDelete = pExUserPermsList; + while (pExUserPermsList) + { + pExUserPermsDelete = pExUserPermsList; + pExUserPermsList = pExUserPermsList->pExUserPermsNext; + + MemFree(pExUserPermsDelete); + } +} + +// sql query constants +LPCWSTR vcsSmbQuery = L"SELECT `FileShare`, `ShareName`, `Description`, `Directory_`, " + L"`Component_`, `User_`, `Permissions` FROM `FileShare`"; + +enum eSmbQuery { + ssqFileShare = 1, + ssqShareName, + ssqDescription, + ssqDirectory, + ssqComponent, + ssqUser, + ssqPermissions + }; + + +/******************************************************************** + ScaSmbRead - read all of the information from the msi tables and + return a list of file share jobs to be done. + +********************************************************************/ +HRESULT ScaSmbRead(SCA_SMB** ppssList) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + + SCA_SMB* pss = NULL; + BOOL bUserPermissionsTableExists = FALSE; + + if (S_OK != WcaTableExists(L"FileShare")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ScaSmbCreateShare() - FileShare table not present"); + ExitFunction1(hr = S_FALSE); + } + + if (S_OK == WcaTableExists(L"FileSharePermissions")) + { + bUserPermissionsTableExists = TRUE; + } + else + { + WcaLog(LOGMSG_VERBOSE, "No Additional Permissions - FileSharePermissions table not present"); + } + + WcaLog(LOGMSG_VERBOSE, "Reading File Share Tables"); + + // loop through all the fileshares + hr = WcaOpenExecuteView(vcsSmbQuery, &hView); + ExitOnFailure(hr, "Failed to open view on FileShare table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + pss = NewSmb(); + if (!pss) + { + hr = E_OUTOFMEMORY; + break; + } + Assert(pss); + ::ZeroMemory(pss, sizeof(*pss)); + + hr = WcaGetRecordString(hRec, ssqFileShare, &pwzData); + ExitOnFailure(hr, "Failed to get FileShare.FileShare"); + hr = ::StringCchCopyW(pss->wzId, countof(pss->wzId), pwzData); + ExitOnFailure(hr, "Failed to copy ID string to smb object"); + + hr = WcaGetRecordFormattedString(hRec, ssqShareName, &pwzData); + ExitOnFailure(hr, "Failed to get FileShare.ShareName"); + hr = ::StringCchCopyW(pss->wzShareName, countof(pss->wzShareName), pwzData); + ExitOnFailure(hr, "Failed to copy share name string to smb object"); + + hr = WcaGetRecordString(hRec, ssqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get Component for FileShare: '%ls'", pss->wzShareName); + hr = ::StringCchCopyW(pss->wzComponent, countof(pss->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy component string to smb object"); + + hr = WcaGetRecordFormattedString(hRec, ssqDescription, &pwzData); + ExitOnFailure(hr, "Failed to get Share Description for FileShare: '%ls'", pss->wzShareName); + hr = ::StringCchCopyW(pss->wzDescription, countof(pss->wzDescription), pwzData); + ExitOnFailure(hr, "Failed to copy description string to smb object"); + + // get user info from the user table + hr = WcaGetRecordFormattedString(hRec, ssqUser, &pwzData); + ExitOnFailure(hr, "Failed to get User record for FileShare: '%ls'", pss->wzShareName); + + // get component install state + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pss->wzComponent, &pss->isInstalled, &pss->isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get Component state for FileShare"); + + // if a user was specified + if (*pwzData) + { + pss->fUseIntegratedAuth = FALSE; + pss->fLegacyUserProvided = TRUE; + hr = ScaGetUser(pwzData, &pss->scau); + ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); + } + else + { + pss->fLegacyUserProvided = FALSE; + // TODO: figure out whether this is useful still + //pss->fUseIntegratedAuth = TRUE; + // integrated authorization doesn't have a User record + } + + // get the share's directory + hr = WcaGetRecordString(hRec, ssqDirectory, &pwzData); + ExitOnFailure(hr, "Failed to get directory for FileShare: '%ls'", pss->wzShareName); + + WCHAR wzPath[MAX_PATH]; + DWORD dwLen; + dwLen = countof(wzPath); + // review: relevant for file shares? + if (INSTALLSTATE_SOURCE == pss->isAction) + { + er = ::MsiGetSourcePathW(WcaGetInstallHandle(), pwzData, wzPath, &dwLen); + } + else + { + er = ::MsiGetTargetPathW(WcaGetInstallHandle(), pwzData, wzPath, &dwLen); + } + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get Source/TargetPath for Directory"); + + // If the path is to the root of a drive, then it needs a trailing backslash. + // Otherwise, it can't have a trailing backslash. + if (3 < dwLen) + { + if (wzPath[dwLen - 1] == L'\\') + { + wzPath[dwLen - 1] = 0; + } + } + else if (2 == dwLen && wzPath[1] == L':') + { + wzPath[2] = L'\\'; + wzPath[3] = 0; + } + + hr = ::StringCchCopyW(pss->wzDirectory, countof(pss->wzDirectory), wzPath); + ExitOnFailure(hr, "Failed to copy directory string to smb object"); + + hr = WcaGetRecordInteger(hRec, ssqPermissions, &pss->nPermissions); + ExitOnFailure(hr, "Failed to get FileShare.Permissions"); + + // Check to see if additional user & permissions are specified for this share + if (bUserPermissionsTableExists) + { + hr = ScaSmbExPermsRead(pss); + ExitOnFailure(hr, "Failed to get Additional File Share Permissions"); + } + + *ppssList = AddSmbToList(*ppssList, pss); + pss = NULL; // set the smb NULL so it doesn't accidentally get freed below + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing FileShare table"); + +LExit: + // if anything was left over after an error clean it all up + if (pss) + { + ScaSmbFreeList(pss); + } + + ReleaseStr(pwzData); + + return hr; +} + + +/******************************************************************** + RetrieveSMBShareUserPermList - retrieve SMB Share's user permission list + +********************************************************************/ +HRESULT RetrieveFileShareUserPerm(SCA_SMB* pss, SCA_SMB_EX_USER_PERMS** ppExUserPermsList, DWORD *pUserPermsCount) +{ + HRESULT hr = S_OK; + SHARE_INFO_502* psi = NULL; + NET_API_STATUS s; + BOOL bValid, bDaclDefaulted; + PACL acl = NULL; + PEXPLICIT_ACCESSW pEA = NULL; + ULONG nCount = 0; + DWORD er = ERROR_SUCCESS; + PSID pSID = NULL; + DWORD nUserNameSize = MAX_DARWIN_COLUMN; + DWORD nDomainNameSize = MAX_DARWIN_COLUMN; + SID_NAME_USE peUse; + DWORD dwCounter = 0; + SCA_SMB_EX_USER_PERMS* pExUserPermsList = NULL; + DWORD dwUserPermsCount = 0; + + *pUserPermsCount = 0; + s = ::NetShareGetInfo(NULL, pss->wzShareName, 502, (LPBYTE*)&psi); + WcaLog(LOGMSG_VERBOSE, "retrieving permissions on existing file share."); + if (NERR_NetNameNotFound == s) + { + WcaLog(LOGMSG_VERBOSE, "File share has already been removed."); + ExitFunction1(hr = S_OK); + } + else if (NERR_Success != s || psi == NULL) + { + hr = E_FAIL; + ExitOnFailure(hr, "Failed to get share information with return code: %d", s); + } + if (!::GetSecurityDescriptorDacl(psi->shi502_security_descriptor, &bValid, &acl, &bDaclDefaulted) || !bValid) + { + ExitOnLastError(hr, "Failed to get acl from security descriptor"); + } + + er = ::GetExplicitEntriesFromAclW(acl, &nCount, &pEA); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get access entries from acl for file share %ls", pss->wzShareName); + for (dwCounter = 0; dwCounter < nCount; ++dwCounter) + { + if (TRUSTEE_IS_SID == pEA[dwCounter].Trustee.TrusteeForm) + { + SCA_SMB_EX_USER_PERMS* pExUserPerms = NewExUserPermsSmb(); + ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); + pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); + pSID = (PSID)(pEA[dwCounter].Trustee.ptstrName); + if (!::LookupAccountSidW(NULL, pSID, pExUserPerms->scau.wzName, &nUserNameSize, pExUserPerms->scau.wzDomain, &nDomainNameSize, &peUse)) + { + hr = E_FAIL; + ExitOnFailure(hr, "Failed to get account name from SID"); + } + pExUserPerms->nPermissions = pEA[dwCounter].grfAccessPermissions; + pExUserPerms->accessMode = pEA[dwCounter].grfAccessMode; + ++dwUserPermsCount; + nUserNameSize = MAX_DARWIN_COLUMN; + nDomainNameSize = MAX_DARWIN_COLUMN; + } + } + *ppExUserPermsList = pExUserPermsList; + *pUserPermsCount = dwUserPermsCount; + +LExit: + if (psi) + { + ::NetApiBufferFree(psi); + } + + if (pEA) + { + ::LocalFree(pEA); + } + + return hr; +} + + +/******************************************************************** + SchedCreateSmb - schedule one instance of a file share creation + +********************************************************************/ +HRESULT SchedCreateSmb(SCA_SMB* pss) +{ + HRESULT hr = S_OK; + + WCHAR wzDomainUser[255]; // "domain\user" + SCA_SMB_EX_USER_PERMS* pExUserPermsList = NULL; + int nCounter = 0; + WCHAR* pwzRollbackCustomActionData = NULL; + WCHAR* pwzCustomActionData = NULL; + + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDescription, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server name to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDirectory, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add full path instance to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->fUseIntegratedAuth ? L"1" : L"0", &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server name to CustomActionData"); + + if (pss->fLegacyUserProvided) + { + hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount + 1, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); + + hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pss->scau.wzName, pss->scau.wzDomain); + ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); + hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); + + hr = WcaWriteIntegerToCaData(pss->nPermissions, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); + } + else + { + hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); + } + + if (pss->nUserPermissionCount > 0) + { + nCounter = 0; + for (pExUserPermsList = pss->pExUserPerms; pExUserPermsList; pExUserPermsList = pExUserPermsList->pExUserPermsNext) + { + Assert(nCounter < pss->nUserPermissionCount); + + hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pExUserPermsList->scau.wzName, pExUserPermsList->scau.wzDomain); + ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); + hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); + + hr = WcaWriteIntegerToCaData((int)pExUserPermsList->accessMode, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add access mode to CustomActionData"); + + hr = WcaWriteIntegerToCaData(pExUserPermsList->nPermissions, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); + ++nCounter; + } + Assert(nCounter == pss->nUserPermissionCount); + } + + // Schedule the rollback first + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateSmbRollback"), pwzRollbackCustomActionData, COST_SMB_DROPSMB); + ExitOnFailure(hr, "Failed to schedule DropSmb action"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateSmb"), pwzCustomActionData, COST_SMB_CREATESMB); + ExitOnFailure(hr, "Failed to schedule CreateSmb action"); + +LExit: + ReleaseStr(pwzRollbackCustomActionData); + ReleaseStr(pwzCustomActionData); + + if (pExUserPermsList) + { + ScaExUserPermsSmbFreeList(pExUserPermsList); + } + + return hr; +} + + +/******************************************************************** + ScaSmbInstall - for every file share, schedule the create custom action + +********************************************************************/ +HRESULT ScaSmbInstall(SCA_SMB* pssList) +{ + HRESULT hr = S_FALSE; // assume nothing will be done + SCA_SMB* pss = NULL; + + for (pss = pssList; pss; pss = pss->pssNext) + { + // if installing this component + if (WcaIsInstalling(pss->isInstalled, pss->isAction) ) + { + hr = SchedCreateSmb(pss); + ExitOnFailure(hr, "Failed to schedule the creation of the fileshare: %ls", pss->wzShareName); + } + } + +LExit: + return hr; +} + + +/******************************************************************** + SchedDropSmb - schedule one instance of a file share removal + +********************************************************************/ +HRESULT SchedDropSmb(SCA_SMB* pss) +{ + HRESULT hr = S_OK; + + WCHAR* pwzCustomActionData = NULL; + WCHAR* pwzRollbackCustomActionData = NULL; + SCA_SMB_EX_USER_PERMS *pExUserPermsList = NULL; + SCA_SMB_EX_USER_PERMS *pExUserPerm = NULL; + WCHAR wzDomainUser[255]; // "domain\user" + DWORD dwUserPermsCount = 0; + + // roll back DropSmb + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDescription, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add server name to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDirectory, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add full path instance to CustomActionData"); + + hr = WcaWriteStringToCaData(L"1", &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add useintegrated flag to CustomActionData"); + + hr = RetrieveFileShareUserPerm(pss, &pExUserPermsList, &dwUserPermsCount); + ExitOnFailure(hr, "Failed to retrieve SMBShare's user permissions"); + + hr = WcaWriteIntegerToCaData((int)dwUserPermsCount, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); + + for (pExUserPerm = pExUserPermsList; pExUserPerm; pExUserPerm = pExUserPerm->pExUserPermsNext) + { + hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pExUserPerm->scau.wzName, pExUserPerm->scau.wzDomain); + ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); + hr = WcaWriteStringToCaData(wzDomainUser, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); + + hr = WcaWriteIntegerToCaData((int)pExUserPerm->accessMode, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add access mode to CustomActionData"); + + hr = WcaWriteIntegerToCaData(pExUserPerm->nPermissions, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); + } + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"DropSmbRollback"), pwzRollbackCustomActionData, COST_SMB_CREATESMB); + ExitOnFailure(hr, "Failed to schedule DropSmbRollback action"); + + // DropSMB + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"DropSmb"), pwzCustomActionData, COST_SMB_DROPSMB); + ExitOnFailure(hr, "Failed to schedule DropSmb action"); + +LExit: + ReleaseStr(pwzCustomActionData); + + if (pExUserPermsList) + { + ScaExUserPermsSmbFreeList(pExUserPermsList); + } + + return hr; + +} + + +/******************************************************************** + ScaSmbUninstall - for every file share, schedule the drop custom action + +********************************************************************/ +HRESULT ScaSmbUninstall(SCA_SMB* pssList) +{ + HRESULT hr = S_FALSE; // assume nothing will be done + SCA_SMB* pss = NULL; + + for (pss = pssList; pss; pss = pss->pssNext) + { + // if uninstalling this component + if (WcaIsUninstalling(pss->isInstalled, pss->isAction) ) + { + hr = SchedDropSmb(pss); + ExitOnFailure(hr, "Failed to remove file share %ls", pss->wzShareName); + } + } + +LExit: + return hr; +} + +LPCWSTR vcsSmbExUserPermsQuery = L"SELECT `FileShare_`,`User_`,`Permissions` " + L"FROM `FileSharePermissions` WHERE `FileShare_`=?"; + +enum eSmbUserPermsQuery { + ssupqFileShare = 1, + ssupqUser, + ssupqPermissions + +}; + + +/******************************************************************** + ScaSmbExPermsRead - for Every entry in File Permissions table add a + User Name & Permissions structure to the List + +********************************************************************/ +HRESULT ScaSmbExPermsRead(SCA_SMB* pss) +{ + HRESULT hr = S_OK; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + SCA_SMB_EX_USER_PERMS* pExUserPermsList = pss->pExUserPerms; + SCA_SMB_EX_USER_PERMS* pExUserPerms = NULL; + int nCounter = 0; + + hRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hRec, 1, pss->wzId); + ExitOnFailure(hr, "Failed to look up FileShare"); + + hr = WcaOpenView(vcsSmbExUserPermsQuery, &hView); + ExitOnFailure(hr, "Failed to open view on FileSharePermissions table"); + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "Failed to execute view on FileSharePermissions table"); + + // loop through all User/Permissions paris returned + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + pExUserPerms = NewExUserPermsSmb(); + if (!pExUserPerms) + { + hr = E_OUTOFMEMORY; + break; + } + Assert(pExUserPerms); + ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); + + hr = WcaGetRecordString(hRec, ssupqUser, &pwzData); + ExitOnFailure(hr, "Failed to get FileSharePermissions.User"); + hr = ScaGetUser(pwzData, &pExUserPerms->scau); + ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); + + hr = WcaGetRecordInteger(hRec, ssupqPermissions, &pExUserPerms->nPermissions); + ExitOnFailure(hr, "Failed to get FileSharePermissions.Permissions"); + pExUserPerms->accessMode = SET_ACCESS; // we only support SET_ACCESS here + + pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); + ++nCounter; + pExUserPerms = NULL; // set the smb NULL so it doesn't accidentally get freed below + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + pss->pExUserPerms = pExUserPermsList; + pss->nUserPermissionCount = nCounter; + } + ExitOnFailure(hr, "Failure occured while processing FileShare table"); + +LExit: + // if anything was left over after an error clean it all up + if (pExUserPerms) + { + ScaExUserPermsSmbFreeList(pExUserPerms); + } + + ReleaseStr(pwzData); + + return hr; +} diff --git a/src/ca/scauser.cpp b/src/ca/scauser.cpp new file mode 100644 index 00000000..43317bdc --- /dev/null +++ b/src/ca/scauser.cpp @@ -0,0 +1,676 @@ +// 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" + +LPCWSTR vcsUserQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `User` WHERE `User`=?"; +enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword }; + +LPCWSTR vcsGroupQuery = L"SELECT `Group`, `Component_`, `Name`, `Domain` FROM `Group` WHERE `Group`=?"; +enum eGroupQuery { vgqGroup = 1, vgqComponent, vgqName, vgqDomain }; + +LPCWSTR vcsUserGroupQuery = L"SELECT `User_`, `Group_` FROM `UserGroup` WHERE `User_`=?"; +enum eUserGroupQuery { vugqUser = 1, vugqGroup }; + +LPCWSTR vActionableQuery = L"SELECT `User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `User` WHERE `Component_` IS NOT NULL"; +enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain, vaqPassword, vaqAttributes }; + + +static HRESULT AddUserToList( + __inout SCA_USER** ppsuList + ); + +static HRESULT AddGroupToList( + __inout SCA_GROUP** ppsgList + ); + + +HRESULT __stdcall ScaGetUser( + __in LPCWSTR wzUser, + __out SCA_USER* pscau + ) +{ + if (!wzUser || !pscau) + { + return E_INVALIDARG; + } + + HRESULT hr = S_OK; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + + // clear struct and bail right away if no user key was passed to search for + ::ZeroMemory(pscau, sizeof(*pscau)); + if (!*wzUser) + { + ExitFunction1(hr = S_OK); + } + + hRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hRec, 1, wzUser); + ExitOnFailure(hr, "Failed to look up User"); + + hr = WcaOpenView(vcsUserQuery, &hView); + ExitOnFailure(hr, "Failed to open view on User table"); + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "Failed to execute view on User table"); + + hr = WcaFetchSingleRecord(hView, &hRec); + if (S_OK == hr) + { + hr = WcaGetRecordString(hRec, vuqUser, &pwzData); + ExitOnFailure(hr, "Failed to get User.User"); + hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); + ExitOnFailure(hr, "Failed to copy key string to user object"); + + hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get User.Component_"); + hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy component string to user object"); + + hr = WcaGetRecordFormattedString(hRec, vuqName, &pwzData); + ExitOnFailure(hr, "Failed to get User.Name"); + hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); + ExitOnFailure(hr, "Failed to copy name string to user object"); + + hr = WcaGetRecordFormattedString(hRec, vuqDomain, &pwzData); + ExitOnFailure(hr, "Failed to get User.Domain"); + hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); + ExitOnFailure(hr, "Failed to copy domain string to user object"); + + hr = WcaGetRecordFormattedString(hRec, vuqPassword, &pwzData); + ExitOnFailure(hr, "Failed to get User.Password"); + hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); + ExitOnFailure(hr, "Failed to copy password string to user object"); + } + else if (E_NOMOREITEMS == hr) + { + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate User.User='%ls'", wzUser); + hr = E_FAIL; + } + else + { + ExitOnFailure(hr, "Error or found multiple matching User rows"); + } + +LExit: + ReleaseStr(pwzData); + + return hr; +} + +HRESULT __stdcall ScaGetUserDeferred( + __in LPCWSTR wzUser, + __in WCA_WRAPQUERY_HANDLE hUserQuery, + __out SCA_USER* pscau + ) +{ + if (!wzUser || !pscau) + { + return E_INVALIDARG; + } + + HRESULT hr = S_OK; + MSIHANDLE hRec, hRecTest; + + LPWSTR pwzData = NULL; + + // clear struct and bail right away if no user key was passed to search for + ::ZeroMemory(pscau, sizeof(*pscau)); + if (!*wzUser) + { + ExitFunction1(hr = S_OK); + } + + // Reset back to the first record + WcaFetchWrappedReset(hUserQuery); + + hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRec); + if (S_OK == hr) + { + hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRecTest); + if (S_OK == hr) + { + AssertSz(FALSE, "Found multiple matching User rows"); + } + + hr = WcaGetRecordString(hRec, vuqUser, &pwzData); + ExitOnFailure(hr, "Failed to get User.User"); + hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); + ExitOnFailure(hr, "Failed to copy key string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get User.Component_"); + hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy component string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqName, &pwzData); + ExitOnFailure(hr, "Failed to get User.Name"); + hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); + ExitOnFailure(hr, "Failed to copy name string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqDomain, &pwzData); + ExitOnFailure(hr, "Failed to get User.Domain"); + hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); + ExitOnFailure(hr, "Failed to copy domain string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqPassword, &pwzData); + ExitOnFailure(hr, "Failed to get User.Password"); + hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); + ExitOnFailure(hr, "Failed to copy password string to user object (in deferred CA)"); + } + else if (E_NOMOREITEMS == hr) + { + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate User.User='%ls'", wzUser); + hr = E_FAIL; + } + else + { + ExitOnFailure(hr, "Error fetching single User row"); + } + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +HRESULT __stdcall ScaGetGroup( + __in LPCWSTR wzGroup, + __out SCA_GROUP* pscag + ) +{ + if (!wzGroup || !pscag) + { + return E_INVALIDARG; + } + + HRESULT hr = S_OK; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + + hRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hRec, 1, wzGroup); + ExitOnFailure(hr, "Failed to look up Group"); + + hr = WcaOpenView(vcsGroupQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Group table"); + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "Failed to execute view on Group table"); + + hr = WcaFetchSingleRecord(hView, &hRec); + if (S_OK == hr) + { + hr = WcaGetRecordString(hRec, vgqGroup, &pwzData); + ExitOnFailure(hr, "Failed to get Group.Group"); + hr = ::StringCchCopyW(pscag->wzKey, countof(pscag->wzKey), pwzData); + ExitOnFailure(hr, "Failed to copy Group.Group."); + + hr = WcaGetRecordString(hRec, vgqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get Group.Component_"); + hr = ::StringCchCopyW(pscag->wzComponent, countof(pscag->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy Group.Component_."); + + hr = WcaGetRecordFormattedString(hRec, vgqName, &pwzData); + ExitOnFailure(hr, "Failed to get Group.Name"); + hr = ::StringCchCopyW(pscag->wzName, countof(pscag->wzName), pwzData); + ExitOnFailure(hr, "Failed to copy Group.Name."); + + hr = WcaGetRecordFormattedString(hRec, vgqDomain, &pwzData); + ExitOnFailure(hr, "Failed to get Group.Domain"); + hr = ::StringCchCopyW(pscag->wzDomain, countof(pscag->wzDomain), pwzData); + ExitOnFailure(hr, "Failed to copy Group.Domain."); + } + else if (E_NOMOREITEMS == hr) + { + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Group.Group='%ls'", wzGroup); + hr = E_FAIL; + } + else + { + ExitOnFailure(hr, "Error or found multiple matching Group rows"); + } + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +void ScaUserFreeList( + __in SCA_USER* psuList + ) +{ + SCA_USER* psuDelete = psuList; + while (psuList) + { + psuDelete = psuList; + psuList = psuList->psuNext; + + ScaGroupFreeList(psuDelete->psgGroups); + MemFree(psuDelete); + } +} + + +void ScaGroupFreeList( + __in SCA_GROUP* psgList + ) +{ + SCA_GROUP* psgDelete = psgList; + while (psgList) + { + psgDelete = psgList; + psgList = psgList->psgNext; + + MemFree(psgDelete); + } +} + + +HRESULT ScaUserRead( + __out SCA_USER** ppsuList + ) +{ + //Assert(FALSE); + Assert(ppsuList); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PMSIHANDLE hView, hRec, hUserRec, hUserGroupView; + + LPWSTR pwzData = NULL; + + BOOL fUserGroupExists = FALSE; + + SCA_USER *psu = NULL; + + INSTALLSTATE isInstalled, isAction; + + if (S_OK != WcaTableExists(L"User")) + { + WcaLog(LOGMSG_VERBOSE, "User Table does not exist, exiting"); + ExitFunction1(hr = S_FALSE); + } + + if (S_OK == WcaTableExists(L"UserGroup")) + { + fUserGroupExists = TRUE; + } + + // + // loop through all the users + // + hr = WcaOpenExecuteView(vActionableQuery, &hView); + ExitOnFailure(hr, "failed to open view on User table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, vaqComponent, &pwzData); + ExitOnFailure(hr, "failed to get User.Component"); + + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for User"); + + // don't bother if we aren't installing or uninstalling this component + if (WcaIsInstalling(isInstalled, isAction) || WcaIsUninstalling(isInstalled, isAction)) + { + // + // Add the user to the list and populate it's values + // + hr = AddUserToList(ppsuList); + ExitOnFailure(hr, "failed to add user to list"); + + psu = *ppsuList; + + psu->isInstalled = isInstalled; + psu->isAction = isAction; + hr = ::StringCchCopyW(psu->wzComponent, countof(psu->wzComponent), pwzData); + ExitOnFailure(hr, "failed to copy component name: %ls", pwzData); + + hr = WcaGetRecordString(hRec, vaqUser, &pwzData); + ExitOnFailure(hr, "failed to get User.User"); + hr = ::StringCchCopyW(psu->wzKey, countof(psu->wzKey), pwzData); + ExitOnFailure(hr, "failed to copy user key: %ls", pwzData); + + hr = WcaGetRecordFormattedString(hRec, vaqName, &pwzData); + ExitOnFailure(hr, "failed to get User.Name"); + hr = ::StringCchCopyW(psu->wzName, countof(psu->wzName), pwzData); + ExitOnFailure(hr, "failed to copy user name: %ls", pwzData); + + hr = WcaGetRecordFormattedString(hRec, vaqDomain, &pwzData); + ExitOnFailure(hr, "failed to get User.Domain"); + hr = ::StringCchCopyW(psu->wzDomain, countof(psu->wzDomain), pwzData); + ExitOnFailure(hr, "failed to copy user domain: %ls", pwzData); + + hr = WcaGetRecordFormattedString(hRec, vaqPassword, &pwzData); + ExitOnFailure(hr, "failed to get User.Password"); + hr = ::StringCchCopyW(psu->wzPassword, countof(psu->wzPassword), pwzData); + ExitOnFailure(hr, "failed to copy user password"); + + hr = WcaGetRecordInteger(hRec, vaqAttributes, &psu->iAttributes); + ExitOnFailure(hr, "failed to get User.Attributes"); + + // Check if this user is to be added to any groups + if (fUserGroupExists) + { + hUserRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hUserRec, 1, psu->wzKey); + ExitOnFailure(hr, "Failed to create user record for querying UserGroup table"); + + hr = WcaOpenView(vcsUserGroupQuery, &hUserGroupView); + ExitOnFailure(hr, "Failed to open view on UserGroup table for user %ls", psu->wzKey); + hr = WcaExecuteView(hUserGroupView, hUserRec); + ExitOnFailure(hr, "Failed to execute view on UserGroup table for user: %ls", psu->wzKey); + + while (S_OK == (hr = WcaFetchRecord(hUserGroupView, &hRec))) + { + hr = WcaGetRecordString(hRec, vugqGroup, &pwzData); + ExitOnFailure(hr, "failed to get UserGroup.Group"); + + hr = AddGroupToList(&(psu->psgGroups)); + ExitOnFailure(hr, "failed to add group to list"); + + hr = ScaGetGroup(pwzData, psu->psgGroups); + ExitOnFailure(hr, "failed to get information for group: %ls", pwzData); + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed to enumerate selected rows from UserGroup table"); + } + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed to enumerate selected rows from User table"); + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +static HRESULT WriteGroupInfo( + __in SCA_GROUP* psgList, + __in LPWSTR *ppwzActionData + ) +{ + HRESULT hr = S_OK; + + for (SCA_GROUP* psg = psgList; psg; psg = psg->psgNext) + { + hr = WcaWriteStringToCaData(psg->wzName, ppwzActionData); + ExitOnFailure(hr, "failed to add group name to custom action data: %ls", psg->wzName); + + hr = WcaWriteStringToCaData(psg->wzDomain, ppwzActionData); + ExitOnFailure(hr, "failed to add group domain to custom action data: %ls", psg->wzDomain); + } + +LExit: + return hr; +} + + +// Behaves like WriteGroupInfo, but it filters out groups the user is currently a member of, +// because we don't want to rollback those +static HRESULT WriteGroupRollbackInfo( + __in LPCWSTR pwzName, + __in LPCWSTR pwzDomain, + __in SCA_GROUP* psgList, + __in LPWSTR *ppwzActionData + ) +{ + HRESULT hr = S_OK; + BOOL fIsMember = FALSE; + + for (SCA_GROUP* psg = psgList; psg; psg = psg->psgNext) + { + hr = UserCheckIsMember(pwzName, pwzDomain, psg->wzName, psg->wzDomain, &fIsMember); + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to check if user: %ls (domain: %ls) is member of a group while collecting rollback information (error code 0x%x) - continuing", pwzName, pwzDomain, hr); + hr = S_OK; + continue; + } + + // If the user is currently a member, we don't want to undo that on rollback, so skip adding + // this group record to the list of groups to rollback + if (fIsMember) + { + continue; + } + + hr = WcaWriteStringToCaData(psg->wzName, ppwzActionData); + ExitOnFailure(hr, "failed to add group name to custom action data: %ls", psg->wzName); + + hr = WcaWriteStringToCaData(psg->wzDomain, ppwzActionData); + ExitOnFailure(hr, "failed to add group domain to custom action data: %ls", psg->wzDomain); + } + +LExit: + return hr; +} + + +/* **************************************************************** +ScaUserExecute - Schedules user account creation or removal based on +component state. + +******************************************************************/ +HRESULT ScaUserExecute( + __in SCA_USER *psuList + ) +{ + HRESULT hr = S_OK; + DWORD er = 0; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + + USER_INFO_0 *pUserInfo = NULL; + LPWSTR pwzActionData = NULL; + LPWSTR pwzRollbackData = NULL; + + for (SCA_USER *psu = psuList; psu; psu = psu->psuNext) + { + USER_EXISTS ueUserExists = USER_EXISTS_INDETERMINATE; + + // Always put the User Name and Domain plus Attributes on the front of the CustomAction + // data. Sometimes we'll add more data. + Assert(psu->wzName); + hr = WcaWriteStringToCaData(psu->wzName, &pwzActionData); + ExitOnFailure(hr, "Failed to add user name to custom action data: %ls", psu->wzName); + hr = WcaWriteStringToCaData(psu->wzDomain, &pwzActionData); + ExitOnFailure(hr, "Failed to add user domain to custom action data: %ls", psu->wzDomain); + hr = WcaWriteIntegerToCaData(psu->iAttributes, &pwzActionData); + ExitOnFailure(hr, "failed to add user attributes to custom action data for user: %ls", psu->wzKey); + + // Check to see if the user already exists since we have to be very careful when adding + // and removing users. Note: MSDN says that it is safe to call these APIs from any + // user, so we should be safe calling it during immediate mode. + er = ::NetApiBufferAllocate(sizeof(USER_INFO_0), reinterpret_cast(&pUserInfo)); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to allocate memory to check existence of user: %ls", psu->wzName); + + LPCWSTR wzDomain = psu->wzDomain; + if (wzDomain && *wzDomain) + { + er = ::DsGetDcNameW(NULL, wzDomain, NULL, NULL, NULL, &pDomainControllerInfo); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW(NULL, wzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo); + } + if (ERROR_SUCCESS == er) + { + wzDomain = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + } + + er = ::NetUserGetInfo(wzDomain, psu->wzName, 0, reinterpret_cast(pUserInfo)); + if (NERR_Success == er) + { + ueUserExists = USER_EXISTS_YES; + } + else if (NERR_UserNotFound == er) + { + ueUserExists = USER_EXISTS_NO; + } + else + { + ueUserExists = USER_EXISTS_INDETERMINATE; + hr = HRESULT_FROM_WIN32(er); + WcaLog(LOGMSG_VERBOSE, "Failed to check existence of domain: %ls, user: %ls (error code 0x%x) - continuing", wzDomain, psu->wzName, hr); + hr = S_OK; + er = ERROR_SUCCESS; + } + + if (WcaIsInstalling(psu->isInstalled, psu->isAction)) + { + // If the user exists, check to see if we are supposed to fail if user the exists before + // the install. + if (USER_EXISTS_YES == ueUserExists) + { + // Reinstalls will always fail if we don't remove the check for "fail if exists". + if (WcaIsReInstalling(psu->isInstalled, psu->isAction)) + { + psu->iAttributes &= ~SCAU_FAIL_IF_EXISTS; + } + + if ((SCAU_FAIL_IF_EXISTS & (psu->iAttributes)) && !(SCAU_UPDATE_IF_EXISTS & (psu->iAttributes))) + { + hr = HRESULT_FROM_WIN32(NERR_UserExists); + MessageExitOnFailure(hr, msierrUSRFailedUserCreateExists, "Failed to create user: %ls because user already exists.", psu->wzName); + } + } + + // Rollback only if the user already exists, we couldn't determine if the user exists, or we are going to create the user + if ((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists) || !(psu->iAttributes & SCAU_DONT_CREATE_USER)) + { + INT iRollbackUserAttributes = psu->iAttributes; + + // If the user already exists, ensure this is accounted for in rollback + if (USER_EXISTS_YES == ueUserExists) + { + iRollbackUserAttributes |= SCAU_DONT_CREATE_USER; + } + else + { + iRollbackUserAttributes &= ~SCAU_DONT_CREATE_USER; + } + + hr = WcaWriteStringToCaData(psu->wzName, &pwzRollbackData); + ExitOnFailure(hr, "Failed to add user name to rollback custom action data: %ls", psu->wzName); + hr = WcaWriteStringToCaData(psu->wzDomain, &pwzRollbackData); + ExitOnFailure(hr, "Failed to add user domain to rollback custom action data: %ls", psu->wzDomain); + hr = WcaWriteIntegerToCaData(iRollbackUserAttributes, &pwzRollbackData); + ExitOnFailure(hr, "failed to add user attributes to rollback custom action data for user: %ls", psu->wzKey); + + // If the user already exists, add relevant group information to rollback data + if (USER_EXISTS_YES == ueUserExists || USER_EXISTS_INDETERMINATE == ueUserExists) + { + hr = WriteGroupRollbackInfo(psu->wzName, psu->wzDomain, psu->psgGroups, &pwzRollbackData); + ExitOnFailure(hr, "failed to add group information to rollback custom action data"); + } + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateUserRollback"), pwzRollbackData, COST_USER_DELETE); + ExitOnFailure(hr, "failed to schedule CreateUserRollback"); + } + + // + // Schedule the creation now. + // + hr = WcaWriteStringToCaData(psu->wzPassword, &pwzActionData); + ExitOnFailure(hr, "failed to add user password to custom action data for user: %ls", psu->wzKey); + + // Add user's group information to custom action data + hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); + ExitOnFailure(hr, "failed to add group information to custom action data"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateUser"), pwzActionData, COST_USER_ADD); + ExitOnFailure(hr, "failed to schedule CreateUser"); + } + else if (((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists)) && WcaIsUninstalling(psu->isInstalled, psu->isAction) && !(psu->iAttributes & SCAU_DONT_REMOVE_ON_UNINSTALL)) + { + // Add user's group information - this will ensure the user can be removed from any groups they were added to, if the user isn't be deleted + hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); + ExitOnFailure(hr, "failed to add group information to custom action data"); + + // + // Schedule the removal because the user exists and we don't have any flags set + // that say, don't remove the user on uninstall. + // + // Note: We can't rollback the removal of a user which is why RemoveUser is a commit + // CustomAction. + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RemoveUser"), pwzActionData, COST_USER_DELETE); + ExitOnFailure(hr, "failed to schedule RemoveUser"); + } + + ReleaseNullStr(pwzActionData); + ReleaseNullStr(pwzRollbackData); + if (pUserInfo) + { + ::NetApiBufferFree(static_cast(pUserInfo)); + pUserInfo = NULL; + } + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + pDomainControllerInfo = NULL; + } + } + +LExit: + ReleaseStr(pwzActionData); + ReleaseStr(pwzRollbackData); + if (pUserInfo) + { + ::NetApiBufferFree(static_cast(pUserInfo)); + } + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + } + + return hr; +} + + +static HRESULT AddUserToList( + __inout SCA_USER** ppsuList + ) +{ + HRESULT hr = S_OK; + SCA_USER* psu = static_cast(MemAlloc(sizeof(SCA_USER), TRUE)); + ExitOnNull(psu, hr, E_OUTOFMEMORY, "failed to allocate memory for new user list element"); + + psu->psuNext = *ppsuList; + *ppsuList = psu; + +LExit: + return hr; +} + + +static HRESULT AddGroupToList( + __inout SCA_GROUP** ppsgList + ) +{ + HRESULT hr = S_OK; + SCA_GROUP* psg = static_cast(MemAlloc(sizeof(SCA_GROUP), TRUE)); + ExitOnNull(psg, hr, E_OUTOFMEMORY, "failed to allocate memory for new group list element"); + + psg->psgNext = *ppsgList; + *ppsgList = psg; + +LExit: + return hr; +} diff --git a/src/ca/scauser.h b/src/ca/scauser.h new file mode 100644 index 00000000..a5fd5ea8 --- /dev/null +++ b/src/ca/scauser.h @@ -0,0 +1,67 @@ +#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. + + +enum USER_EXISTS +{ + USER_EXISTS_YES, + USER_EXISTS_NO, + USER_EXISTS_INDETERMINATE +}; + +// structs +struct SCA_GROUP +{ + WCHAR wzKey[MAX_DARWIN_KEY + 1]; + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + + WCHAR wzDomain[MAX_DARWIN_COLUMN + 1]; + WCHAR wzName[MAX_DARWIN_COLUMN + 1]; + + SCA_GROUP *psgNext; +}; + +struct SCA_USER +{ + WCHAR wzKey[MAX_DARWIN_KEY + 1]; + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + WCHAR wzDomain[MAX_DARWIN_COLUMN + 1]; + WCHAR wzName[MAX_DARWIN_COLUMN + 1]; + WCHAR wzPassword[MAX_DARWIN_COLUMN + 1]; + INT iAttributes; + + SCA_GROUP *psgGroups; + + SCA_USER *psuNext; +}; + + +// prototypes +HRESULT __stdcall ScaGetUser( + __in LPCWSTR wzUser, + __out SCA_USER* pscau + ); +HRESULT __stdcall ScaGetUserDeferred( + __in LPCWSTR wzUser, + __in WCA_WRAPQUERY_HANDLE hUserQuery, + __out SCA_USER* pscau + ); +HRESULT __stdcall ScaGetGroup( + __in LPCWSTR wzGroup, + __out SCA_GROUP* pscag + ); +void ScaUserFreeList( + __in SCA_USER* psuList + ); +void ScaGroupFreeList( + __in SCA_GROUP* psgList + ); +HRESULT ScaUserRead( + __inout SCA_USER** ppsuList + ); +HRESULT ScaUserExecute( + __in SCA_USER *psuList + ); diff --git a/src/ca/secureobj.cpp b/src/ca/secureobj.cpp new file mode 100644 index 00000000..f6d1406a --- /dev/null +++ b/src/ca/secureobj.cpp @@ -0,0 +1,902 @@ +// 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" + +// structs +LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `SecureObjects`.`SecureObject`, `SecureObjects`.`Table`, `SecureObjects`.`Domain`, `SecureObjects`.`User`, " + L"`SecureObjects`.`Permission`, `SecureObjects`.`Component_`, `Component`.`Attributes` FROM `SecureObjects`,`Component` WHERE " + L"`SecureObjects`.`Component_`=`Component`.`Component`"; +enum eQUERY_SECUREOBJECTS { QSO_SECUREOBJECT = 1, QSO_TABLE, QSO_DOMAIN, QSO_USER, QSO_PERMISSION, QSO_COMPONENT, QSO_COMPATTRIBUTES }; + +LPCWSTR wzQUERY_REGISTRY = L"SELECT `Registry`.`Registry`, `Registry`.`Root`, `Registry`.`Key` FROM `Registry` WHERE `Registry`.`Registry`=?"; +enum eQUERY_OBJECTCOMPONENT { QSOC_REGISTRY = 1, QSOC_REGROOT, QSOC_REGKEY }; + +LPCWSTR wzQUERY_SERVICEINSTALL = L"SELECT `ServiceInstall`.`Name` FROM `ServiceInstall` WHERE `ServiceInstall`.`ServiceInstall`=?"; +enum eQUERY_SECURESERVICEINSTALL { QSSI_NAME = 1 }; + +enum eOBJECTTYPE { OT_UNKNOWN, OT_SERVICE, OT_FOLDER, OT_FILE, OT_REGISTRY }; + +static eOBJECTTYPE EObjectTypeFromString( + __in LPCWSTR pwzTable + ) +{ + if (NULL == pwzTable) + { + return OT_UNKNOWN; + } + + eOBJECTTYPE eType = OT_UNKNOWN; + + // ensure we're looking at a known table + if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) + { + eType = OT_SERVICE; + } + else if (0 == lstrcmpW(L"CreateFolder", pwzTable)) + { + eType = OT_FOLDER; + } + else if (0 == lstrcmpW(L"File", pwzTable)) + { + eType = OT_FILE; + } + else if (0 == lstrcmpW(L"Registry", pwzTable)) + { + eType = OT_REGISTRY; + } + + return eType; +} + +static SE_OBJECT_TYPE SEObjectTypeFromString( + __in LPCWSTR pwzTable + ) +{ + if (NULL == pwzTable) + { + return SE_UNKNOWN_OBJECT_TYPE; + } + + SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; + + if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) + { + objectType = SE_SERVICE; + } + else if (0 == lstrcmpW(L"CreateFolder", pwzTable) || 0 == lstrcmpW(L"File", pwzTable)) + { + objectType = SE_FILE_OBJECT; + } + else if (0 == lstrcmpW(L"Registry", pwzTable)) + { + objectType = SE_REGISTRY_KEY; + } + else + { + // Do nothing; we'll return SE_UNKNOWN_OBJECT_TYPE, and the caller should handle the situation + } + + return objectType; +} + +static HRESULT StoreACLRollbackInfo( + __in LPWSTR pwzObject, + __in LPCWSTR pwzTable + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + PSECURITY_DESCRIPTOR psd = NULL; + SECURITY_DESCRIPTOR_CONTROL sdc = {0}; + DWORD dwRevision = 0; + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzSecurityInfo = NULL; + + Assert(pwzObject && pwzTable); + + SE_OBJECT_TYPE objectType = SEObjectTypeFromString(const_cast (pwzTable)); + + if (SE_UNKNOWN_OBJECT_TYPE != objectType) + { + er = ::GetNamedSecurityInfoW(pwzObject, objectType, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &psd); + if (ERROR_FILE_NOT_FOUND == er || ERROR_PATH_NOT_FOUND == er || ERROR_SERVICE_DOES_NOT_EXIST == HRESULT_CODE(er)) + { + // If the file, path or service doesn't exist yet, skip rollback without a message + hr = HRESULT_FROM_WIN32(er); + ExitFunction(); + } + + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "Unable to schedule rollback for object: %ls", pwzObject); + + //Need to see if DACL is protected so getting Descriptor information + if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) + { + ExitOnLastError(hr, "Unable to schedule rollback for object (failed to get security descriptor control): %ls", pwzObject); + } + + // Convert the security information to a string, and write this to the custom action data + if (!::ConvertSecurityDescriptorToStringSecurityDescriptorW(psd,SDDL_REVISION_1,DACL_SECURITY_INFORMATION,&pwzSecurityInfo,NULL)) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Unable to schedule rollback for object (failed to convert security descriptor to a valid security descriptor string): %ls", pwzObject); + } + + hr = WcaWriteStringToCaData(pwzObject, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add object data to rollback CustomActionData"); + + hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add table name to rollback CustomActionData"); + + hr = WcaWriteStringToCaData(pwzSecurityInfo, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add security info data to rollback CustomActionData"); + + // Write a 1 if DACL is protected, 0 otherwise + if (sdc & SE_DACL_PROTECTED) + { + hr = WcaWriteIntegerToCaData(1,&pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to rollbackCustomActionData"); + } + else + { + hr = WcaWriteIntegerToCaData(0,&pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to rollback CustomActionData"); + } + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecSecureObjectsRollback"), pwzCustomActionData, COST_SECUREOBJECT); + ExitOnFailure(hr, "failed to schedule ExecSecureObjectsRollback for item: %ls of type: %ls", pwzObject, pwzTable); + + ReleaseStr(pwzCustomActionData); + pwzCustomActionData = NULL; + + } + else + { + MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); + } +LExit: + ReleaseStr(pwzCustomActionData); + + if (psd) + { + ::LocalFree(psd); + } + + return hr; +} + +static HRESULT GetTargetPath( + __in eOBJECTTYPE eType, + __in LPCWSTR pwzSecureObject, + __out LPWSTR* ppwzTargetPath + ) +{ + HRESULT hr = S_OK; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRecObject = NULL; + PMSIHANDLE hRec = NULL; + + int iRoot = 0; + int iAllUsers = 0; + LPWSTR pwzKey = NULL; + LPWSTR pwzFormattedString = NULL; + + if (OT_SERVICE == eType) + { + hr = WcaTableExists(L"ServiceInstall"); + if (S_FALSE == hr) + { + hr = E_UNEXPECTED; + } + ExitOnFailure(hr, "failed to open ServiceInstall table to secure object"); + + hr = WcaOpenView(wzQUERY_SERVICEINSTALL, &hView); + ExitOnFailure(hr, "failed to open view on ServiceInstall table"); + + // create a record that stores the object to secure + hRec = MsiCreateRecord(1); + MsiRecordSetStringW(hRec, 1, pwzSecureObject); + + // execute a view looking for the object's ServiceInstall.ServiceInstall row. + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "failed to execute view on ServiceInstall table"); + hr = WcaFetchSingleRecord(hView, &hRecObject); + ExitOnFailure(hr, "failed to fetch ServiceInstall row for secure object"); + + hr = WcaGetRecordFormattedString(hRecObject, QSSI_NAME, ppwzTargetPath); + ExitOnFailure(hr, "failed to get service name for secure object: %ls", pwzSecureObject); + } + else if (OT_FOLDER == eType) + { + hr = WcaGetTargetPath(pwzSecureObject, ppwzTargetPath); + ExitOnFailure(hr, "failed to get target path for directory id: %ls", pwzSecureObject); + } + else if (OT_FILE == eType) + { + hr = StrAllocFormatted(&pwzFormattedString, L"[#%s]", pwzSecureObject); + ExitOnFailure(hr, "failed to create formatted string for securing file object: %ls", pwzSecureObject); + + hr = WcaGetFormattedString(pwzFormattedString, ppwzTargetPath); + ExitOnFailure(hr, "failed to get file path from formatted string: %ls for secure object: %ls", pwzFormattedString, pwzSecureObject); + } + else if (OT_REGISTRY == eType) + { + hr = WcaTableExists(L"Registry"); + if (S_FALSE == hr) + { + hr = E_UNEXPECTED; + } + ExitOnFailure(hr, "failed to open Registry table to secure object"); + + hr = WcaOpenView(wzQUERY_REGISTRY, &hView); + ExitOnFailure(hr, "failed to open view on Registry table"); + + // create a record that stores the object to secure + hRec = MsiCreateRecord(1); + MsiRecordSetStringW(hRec, 1, pwzSecureObject); + + // execute a view looking for the object's Registry row + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "failed to execute view on Registry table"); + hr = WcaFetchSingleRecord(hView, &hRecObject); + ExitOnFailure(hr, "failed to fetch Registry row for secure object"); + + hr = WcaGetRecordInteger(hRecObject, QSOC_REGROOT, &iRoot); + ExitOnFailure(hr, "Failed to get reg key root for secure object: %ls", pwzSecureObject); + + hr = WcaGetRecordFormattedString(hRecObject, QSOC_REGKEY, &pwzKey); + ExitOnFailure(hr, "Failed to get reg key for secure object: %ls", pwzSecureObject); + + // Decode the root value + if (-1 == iRoot) + { + // They didn't specify a root so that means it's either HKCU or HKLM depending on ALLUSERS property + hr = WcaGetIntProperty(L"ALLUSERS", &iAllUsers); + ExitOnFailure(hr, "failed to get value of ALLUSERS property"); + + if (1 == iAllUsers) + { + hr = StrAllocString(ppwzTargetPath, L"MACHINE\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKLM root"); + } + else + { + hr = StrAllocString(ppwzTargetPath, L"CURRENT_USER\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKCU root"); + } + } + else if (msidbRegistryRootClassesRoot == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"CLASSES_ROOT\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKCR root"); + } + else if (msidbRegistryRootCurrentUser == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"CURRENT_USER\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKCU root"); + } + else if (msidbRegistryRootLocalMachine == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"MACHINE\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKLM root"); + } + else if (msidbRegistryRootUsers == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"USERS\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKU root"); + } + else + { + ExitOnFailure(hr = E_UNEXPECTED, "Unknown registry key root specified for secure object: '%ls' root: %d", pwzSecureObject, iRoot); + } + + hr = StrAllocConcat(ppwzTargetPath, pwzKey, 0); + ExitOnFailure(hr, "Failed to concat key: %ls for secure object: %ls", pwzKey, pwzSecureObject); + } + else + { + AssertSz(FALSE, "How did you get here?"); + ExitOnFailure(hr = E_UNEXPECTED, "Unknown secure object type: %d", eType); + } + +LExit: + ReleaseStr(pwzFormattedString); + ReleaseStr(pwzKey); + + return hr; +} + +/****************************************************************** + SchedSecureObjects - entry point for SchedSecureObjects Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence, to schedule ExecSecureObjects +******************************************************************/ +extern "C" UINT __stdcall SchedSecureObjects( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedSecureObjects"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzSecureObject = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzTargetPath = NULL; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + LPWSTR pwzCustomActionData = NULL; + + DWORD cObjects = 0; + eOBJECTTYPE eType = OT_UNKNOWN; + + // + // initialize + // + hr = WcaInitialize(hInstall, "SchedSecureObjects"); + ExitOnFailure(hr, "failed to initialize"); + + // anything to do? + if (S_OK != WcaTableExists(L"SecureObjects")) + { + WcaLog(LOGMSG_STANDARD, "SecureObjects table doesn't exist, so there are no objects to secure."); + ExitFunction(); + } + + // + // loop through all the objects to be secured + // + hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); + ExitOnFailure(hr, "failed to open view on SecureObjects table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); + ExitOnFailure(hr, "failed to get object table"); + + eType = EObjectTypeFromString(pwzTable); + + if (OT_UNKNOWN == eType) + { + ExitOnFailure(hr = E_INVALIDARG, "unknown SecureObject.Table: %ls", pwzTable); + } + + int iCompAttributes = 0; + hr = WcaGetRecordInteger(hRec, QSO_COMPATTRIBUTES, &iCompAttributes); + ExitOnFailure(hr, "failed to get Component attributes for secure object"); + + BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; + + // Only process entries in the SecureObjects table whose components match the bitness of this CA +#ifdef _WIN64 + if (!fIs64Bit) + { + continue; + } +#else + if (fIs64Bit) + { + continue; + } +#endif + + // Get the object to secure + hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzSecureObject); + ExitOnFailure(hr, "failed to get name of object"); + + hr = GetTargetPath(eType, pwzSecureObject, &pwzTargetPath); + ExitOnFailure(hr, "failed to get target path of object '%ls'", pwzSecureObject); + + hr = WcaGetRecordString(hRec, QSO_COMPONENT, &pwzData); + ExitOnFailure(hr, "failed to get Component name for secure object"); + + // + // if we are installing this Component + // + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for Component: %ls", pwzData); + + if (WcaIsInstalling(isInstalled, isAction)) + { + hr = WcaWriteStringToCaData(pwzTargetPath, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + // add the data to the CustomActionData + hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzData); + ExitOnFailure(hr, "failed to get name of object"); + + hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordFormattedString(hRec, QSO_DOMAIN, &pwzData); + ExitOnFailure(hr, "failed to get domain for user to configure object"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordFormattedString(hRec, QSO_USER, &pwzData); + ExitOnFailure(hr, "failed to get user to configure object"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSO_PERMISSION, &pwzData); + ExitOnFailure(hr, "failed to get permission to configure object"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + ++cObjects; + } + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + hr = S_OK; + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // + // schedule the custom action and add to progress bar + // + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cObjects); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecSecureObjects"), pwzCustomActionData, cObjects * COST_SECUREOBJECT); + ExitOnFailure(hr, "failed to schedule ExecSecureObjects action"); + } + +LExit: + ReleaseStr(pwzSecureObject); + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzTable); + ReleaseStr(pwzTargetPath); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +/****************************************************************** + SchedSecureObjectsRollback - entry point for SchedSecureObjectsRollback Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence before SchedSecureObjects +******************************************************************/ +extern "C" UINT __stdcall SchedSecureObjectsRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedSecureObjectsRollback"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzSecureObject = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzTargetPath = NULL; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR pwzCustomActionData = NULL; + + eOBJECTTYPE eType = OT_UNKNOWN; + + // + // initialize + // + hr = WcaInitialize(hInstall, "SchedSecureObjectsRollback"); + ExitOnFailure(hr, "failed to initialize"); + + // + // loop through all the objects to be secured + // + hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); + ExitOnFailure(hr, "failed to open view on SecureObjects table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); + ExitOnFailure(hr, "failed to get object table"); + + eType = EObjectTypeFromString(pwzTable); + + if (OT_UNKNOWN == eType) + { + ExitOnFailure(hr = E_INVALIDARG, "unknown SecureObject.Table: %ls", pwzTable); + } + + int iCompAttributes = 0; + hr = WcaGetRecordInteger(hRec, QSO_COMPATTRIBUTES, &iCompAttributes); + ExitOnFailure(hr, "failed to get Component attributes for secure object"); + + BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; + + // Only process entries in the SecureObjects table whose components match the bitness of this CA +#ifdef _WIN64 + if (!fIs64Bit) + { + continue; + } +#else + if (fIs64Bit) + { + continue; + } +#endif + + // get the object being secured that we are planning to schedule rollback for + hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzSecureObject); + ExitOnFailure(hr, "failed to get name of object"); + + hr = GetTargetPath(eType, pwzSecureObject, &pwzTargetPath); + ExitOnFailure(hr, "failed to get target path of object '%ls' in order to schedule rollback", pwzSecureObject); + + hr = StoreACLRollbackInfo(pwzTargetPath, pwzTable); + if (FAILED(hr)) + { + WcaLog(LOGMSG_STANDARD, "Failed to store ACL rollback information with error 0x%x - continuing", hr); + } + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to schedule rollback for"); + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzSecureObject); + ReleaseStr(pwzTable); + ReleaseStr(pwzTargetPath); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +/****************************************************************** + CaExecSecureObjects - entry point for SecureObjects Custom Action + called as Type 1025 CustomAction (deferred binary DLL) + + NOTE: deferred CustomAction since it modifies the machine + NOTE: CustomActionData == wzObject\twzTable\twzDomain\twzUser\tdwPermissions\twzObject\t... +******************************************************************/ +extern "C" UINT __stdcall ExecSecureObjects( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecSecureObjects"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzObject = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzDomain = NULL; + DWORD dwRevision = 0; + LPWSTR pwzUser = NULL; + DWORD dwPermissions = 0; + LPWSTR pwzAccount = NULL; + PSID psid = NULL; + + EXPLICIT_ACCESSW ea = {0}; + SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; + PSECURITY_DESCRIPTOR psd = NULL; + SECURITY_DESCRIPTOR_CONTROL sdc = {0}; + SECURITY_INFORMATION si = {0}; + PACL pAclExisting = NULL; // doesn't get freed + PACL pAclNew = NULL; + + PMSIHANDLE hActionRec = ::MsiCreateRecord(1); + + // + // initialize + // + hr = WcaInitialize(hInstall, "ExecSecureObjects"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + + // + // loop through all the passed in data + // + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzObject); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadStringFromCaData(&pwz, &pwzTable); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzUser); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwPermissions)); + ExitOnFailure(hr, "failed to processCustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Securing Object: %ls Type: %ls User: %ls", pwzObject, pwzTable, pwzUser); + + // + // create the appropriate SID + // + + // figure out the right user to put into the access block + if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Everyone")) + { + hr = AclGetWellKnownSid(WinWorldSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Administrators")) + { + hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"LocalSystem")) + { + hr = AclGetWellKnownSid(WinLocalSystemSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"LocalService")) + { + hr = AclGetWellKnownSid(WinLocalServiceSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"NetworkService")) + { + hr = AclGetWellKnownSid(WinNetworkServiceSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"AuthenticatedUser")) + { + hr = AclGetWellKnownSid(WinAuthenticatedUserSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Guests")) + { + hr = AclGetWellKnownSid(WinBuiltinGuestsSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"CREATOR OWNER")) + { + hr = AclGetWellKnownSid(WinCreatorOwnerSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"INTERACTIVE")) + { + hr = AclGetWellKnownSid(WinInteractiveSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Users")) + { + hr = AclGetWellKnownSid(WinBuiltinUsersSid, &psid); + } + else + { + hr = StrAllocFormatted(&pwzAccount, L"%s%s%s", pwzDomain, *pwzDomain ? L"\\" : L"", pwzUser); + ExitOnFailure(hr, "failed to build domain user name"); + + hr = AclGetAccountSid(NULL, pwzAccount, &psid); + } + ExitOnFailure(hr, "failed to get sid for account: %ls%ls%ls", pwzDomain, *pwzDomain ? L"\\" : L"", pwzUser); + + // + // build up the explicit access + // + ea.grfAccessMode = SET_ACCESS; + + if (0 == lstrcmpW(L"CreateFolder", pwzTable)) + { + ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; + } + else + { + ea.grfInheritance = NO_INHERITANCE; + } + +#pragma prefast(push) +#pragma prefast(disable:25029) + ::BuildTrusteeWithSidW(&ea.Trustee, psid); +#pragma prefast(pop) + + objectType = SEObjectTypeFromString(const_cast (pwzTable)); + + // always add these permissions for services + // these are basic permissions that are often forgotten + if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) + { + dwPermissions |= SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_INTERROGATE; + } + + ea.grfAccessPermissions = dwPermissions; + + if (SE_UNKNOWN_OBJECT_TYPE != objectType) + { + er = ::GetNamedSecurityInfoW(pwzObject, objectType, DACL_SECURITY_INFORMATION, NULL, NULL, &pAclExisting, NULL, &psd); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get security info for object: %ls", pwzObject); + + //Need to see if DACL is protected so getting Descriptor information + if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) + { + ExitOnLastError(hr, "failed to get security descriptor control for object: %ls", pwzObject); + } + +#pragma prefast(push) +#pragma prefast(disable:25029) + er = ::SetEntriesInAclW(1, &ea, pAclExisting, &pAclNew); +#pragma prefast(pop) + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to add ACLs for object: %ls", pwzObject); + + if (sdc & SE_DACL_PROTECTED) + { + si = DACL_SECURITY_INFORMATION | PROTECTED_DACL_SECURITY_INFORMATION; + } + else + { + si = DACL_SECURITY_INFORMATION; + } + er = ::SetNamedSecurityInfoW(pwzObject, objectType, si, NULL, NULL, pAclNew, NULL); + MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrSecureObjectsFailedSet, "failed to set security info for object: %ls", pwzObject); + } + else + { + MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); + } + + hr = WcaProgressMessage(COST_SECUREOBJECT, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + + objectType = SE_UNKNOWN_OBJECT_TYPE; + } + +LExit: + ReleaseStr(pwzUser); + ReleaseStr(pwzDomain); + ReleaseStr(pwzTable); + ReleaseStr(pwzObject); + ReleaseStr(pwzData); + ReleaseStr(pwzAccount); + + if (pAclNew) + { + ::LocalFree(pAclNew); + } + if (psd) + { + ::LocalFree(psd); + } + if (psid) + { + AclFreeSid(psid); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +extern "C" UINT __stdcall ExecSecureObjectsRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecSecureObjectsRollback"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzObject = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzSecurityInfo = NULL; + + SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; + PSECURITY_DESCRIPTOR psd = NULL; + ULONG psdSize; + SECURITY_DESCRIPTOR_CONTROL sdc = {0}; + SECURITY_INFORMATION si = DACL_SECURITY_INFORMATION; + PACL pDacl = NULL; + BOOL bDaclPresent = false; + BOOL bDaclDefaulted = false; + DWORD dwRevision = 0; + int iProtected; + + // initialize + hr = WcaInitialize(hInstall, "ExecSecureObjectsRollback"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + + hr = WcaReadStringFromCaData(&pwz, &pwzObject); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadStringFromCaData(&pwz, &pwzTable); + ExitOnFailure(hr, "failed to process CustomActionData"); + + objectType = SEObjectTypeFromString(const_cast (pwzTable)); + + if (SE_UNKNOWN_OBJECT_TYPE != objectType) + { + hr = WcaReadStringFromCaData(&pwz, &pwzSecurityInfo); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, &iProtected); + ExitOnFailure(hr, "failed to process CustomActionData"); + + if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(pwzSecurityInfo,SDDL_REVISION_1,&psd,&psdSize)) + { + ExitOnLastError(hr, "failed to convert security descriptor string to a valid security descriptor"); + } + + if (!::GetSecurityDescriptorDacl(psd,&bDaclPresent,&pDacl,&bDaclDefaulted)) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "failed to get security descriptor's DACL - error code: %d",pwzSecurityInfo,GetLastError()); + } + + // The below situation may always be caught by the above if block - the documentation isn't very clear. To be safe, we're going to test for it. + if (!bDaclPresent) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "security descriptor does not contain a DACL"); + } + + //Need to see if DACL is protected so getting Descriptor information + if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) + { + ExitOnLastError(hr, "failed to get security descriptor control for object: %ls", pwzObject); + } + + // Write a 1 if DACL is protected, 0 otherwise + switch (iProtected) + { + case 0: + // Unnecessary to do anything - leave si to the default flags + break; + + case 1: + si = si | PROTECTED_DACL_SECURITY_INFORMATION; + break; + + default: + hr = E_UNEXPECTED; + ExitOnFailure(hr, "unrecognized value in CustomActionData"); + break; + } + + er = ::SetNamedSecurityInfoW(pwzObject, objectType, si, NULL, NULL, pDacl, NULL); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to set security info for object: %ls error code: %d", pwzObject, GetLastError()); + } + else + { + MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); + } + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzObject); + ReleaseStr(pwzTable); + ReleaseStr(pwzSecurityInfo); + + if (psd) + { + ::LocalFree(psd); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ca/serviceconfig.cpp b/src/ca/serviceconfig.cpp new file mode 100644 index 00000000..c2b77035 --- /dev/null +++ b/src/ca/serviceconfig.cpp @@ -0,0 +1,821 @@ +// 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" + +// structs +LPCWSTR wzQUERY_SERVICECONFIG = L"SELECT `ServiceName`, `Component_`, `NewService`, `FirstFailureActionType`, `SecondFailureActionType`, `ThirdFailureActionType`, `ResetPeriodInDays`, `RestartServiceDelayInSeconds`, `ProgramCommandLine`, `RebootMessage` FROM `ServiceConfig`"; +enum eQUERY_SERVICECONFIG { QSC_SERVICENAME = 1, QSC_COMPONENT, QSC_NEWSERVICE, QSC_FIRSTFAILUREACTIONTYPE, QSC_SECONDFAILUREACTIONTYPE, QSC_THIRDFAILUREACTIONTYPE, QSC_RESETPERIODINDAYS, QSC_RESTARTSERVICEDELAYINSECONDS, QSC_PROGRAMCOMMANDLINE, QSC_REBOOTMESSAGE }; + +// consts +LPCWSTR c_wzActionTypeNone = L"none"; +LPCWSTR c_wzActionTypeReboot = L"reboot"; +LPCWSTR c_wzActionTypeRestart = L"restart"; +LPCWSTR c_wzActionTypeRunCommand = L"runCommand"; + +// prototypes +static SC_ACTION_TYPE GetSCActionType( + __in LPCWSTR pwzActionTypeName + ); + +static HRESULT GetSCActionTypeString( + __in SC_ACTION_TYPE type, + __out_ecount(cchActionTypeString) LPWSTR wzActionTypeString, + __in DWORD cchActionTypeString + ); + +static HRESULT GetService( + __in SC_HANDLE hSCM, + __in LPCWSTR wzService, + __in DWORD dwOpenServiceAccess, + __out SC_HANDLE* phService + ); + +static HRESULT ConfigureService( + __in SC_HANDLE hSCM, + __in SC_HANDLE hService, + __in LPCWSTR wzServiceName, + __in DWORD dwRestartServiceDelayInSeconds, + __in LPCWSTR wzFirstFailureActionType, + __in LPCWSTR wzSecondFailureActionType, + __in LPCWSTR wzThirdFailureActionType, + __in DWORD dwResetPeriodInDays, + __in LPWSTR wzRebootMessage, + __in LPWSTR wzProgramCommandLine + ); + + +/****************************************************************** +SchedServiceConfig - entry point for SchedServiceConfig Custom Action + +called as Type 1 CustomAction (binary DLL) from Windows Installer +in InstallExecuteSequence before CaExecServiceConfig +********************************************************************/ +extern "C" UINT __stdcall SchedServiceConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug SchedServiceConfig"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzScriptKey = NULL; + LPWSTR pwzCustomActionData = NULL; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + LPWSTR pwzData = NULL; + int iData = 0; + DWORD cServices = 0; + + // initialize + hr = WcaInitialize(hInstall, "SchedServiceConfig"); + ExitOnFailure(hr, "Failed to initialize."); + + // Get the script key for this CustomAction and put it on the front of the + // CustomActionData of the install action. + hr = WcaCaScriptCreateKey(&pwzScriptKey); + ExitOnFailure(hr, "Failed to get encoding key."); + + hr = WcaWriteStringToCaData(pwzScriptKey, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add encoding key to CustomActionData."); + + // Loop through all the services to be configured. + hr = WcaOpenExecuteView(wzQUERY_SERVICECONFIG, &hView); + ExitOnFailure(hr, "Failed to open view on ServiceConfig table."); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + INSTALLSTATE isInstalled = INSTALLSTATE_UNKNOWN; + INSTALLSTATE isAction = INSTALLSTATE_UNKNOWN; + + // Get component name to check if we are installing it. If so + // then add the table data to the CustomActionData, otherwise + // skip it. + hr = WcaGetRecordString(hRec, QSC_COMPONENT, &pwzData); + ExitOnFailure(hr, "Failed to get component name"); + + hr = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(hr), "Failed to get install state for Component: %ls", pwzData); + + if (WcaIsInstalling(isInstalled, isAction)) + { + // Add the data to the CustomActionData (for install). + hr = WcaGetRecordFormattedString(hRec, QSC_SERVICENAME, &pwzData); + ExitOnFailure(hr, "Failed to get name of service."); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add name to CustomActionData."); + + hr = WcaGetRecordInteger(hRec, QSC_NEWSERVICE, &iData); + ExitOnFailure(hr, "Failed to get ServiceConfig.NewService."); + hr = WcaWriteIntegerToCaData(0 != iData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add NewService data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_FIRSTFAILUREACTIONTYPE, &pwzData); + ExitOnFailure(hr, "failed to get first failure action type"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_SECONDFAILUREACTIONTYPE, &pwzData); + ExitOnFailure(hr, "failed to get second failure action type"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_THIRDFAILUREACTIONTYPE, &pwzData); + ExitOnFailure(hr, "failed to get third failure action type"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordInteger(hRec, QSC_RESETPERIODINDAYS, &iData); + if (S_FALSE == hr) // deal w/ possible null value + { + iData = 0; + } + ExitOnFailure(hr, "failed to get reset period in days between service restart attempts."); + hr = WcaWriteIntegerToCaData(iData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordInteger(hRec, QSC_RESTARTSERVICEDELAYINSECONDS, &iData); + if (S_FALSE == hr) // deal w/ possible null value + { + iData = 0; + } + ExitOnFailure(hr, "failed to get server restart delay value."); + hr = WcaWriteIntegerToCaData(iData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordFormattedString(hRec, QSC_PROGRAMCOMMANDLINE, &pwzData); // null value already dealt w/ properly + ExitOnFailure(hr, "failed to get command line to run on service failure."); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_REBOOTMESSAGE, &pwzData); // null value already dealt w/ properly + ExitOnFailure(hr, "failed to get message to send to users when server reboots due to service failure."); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + ++cServices; + } + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // setup CustomActionData and add to progress bar for download + if (0 < cServices) + { + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackServiceConfig"), pwzScriptKey, cServices * COST_SERVICECONFIG); + ExitOnFailure(hr, "failed to schedule RollbackServiceConfig action"); + + hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecServiceConfig"), pwzCustomActionData, cServices * COST_SERVICECONFIG); + ExitOnFailure(hr, "failed to schedule ExecServiceConfig action"); + } + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzScriptKey); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/****************************************************************** +CaExecServiceConfig - entry point for ServiceConfig Custom Action. + +NOTE: deferred CustomAction since it modifies the machine +NOTE: CustomActionData == wzServiceName\tfNewService\twzFirstFailureActionType\twzSecondFailureActionType\twzThirdFailureActionType\tdwResetPeriodInDays\tdwRestartServiceDelayInSeconds\twzProgramCommandLine\twzRebootMessage\twzServiceName\tfNewService\t... +*******************************************************************/ +extern "C" UINT __stdcall ExecServiceConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug ExecServiceConfig"); + HRESULT hr = S_OK; + DWORD er = 0; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + + LPWSTR pwzScriptKey = NULL; + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + + LPWSTR pwzServiceName = NULL; + BOOL fNewService = FALSE; + LPWSTR pwzFirstFailureActionType = NULL; + LPWSTR pwzSecondFailureActionType = NULL; + LPWSTR pwzThirdFailureActionType = NULL; + LPWSTR pwzProgramCommandLine = NULL; + LPWSTR pwzRebootMessage = NULL; + DWORD dwResetPeriodInDays = 0; + DWORD dwRestartServiceDelayInSeconds = 0; + + LPVOID lpMsgBuf = NULL; + SC_HANDLE hSCM = NULL; + SC_HANDLE hService = NULL; + + DWORD dwRestartDelay = 0; + WCHAR wzActionName[32] = { 0 }; + + DWORD cbExistingServiceConfig = 0; + + SERVICE_FAILURE_ACTIONSW* psfa = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ExecServiceConfig"); + ExitOnFailure(hr, "failed to initialize"); + + // Open the Services Control Manager up front. + hSCM = ::OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (NULL == hSCM) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + ExitOnFailure(hr, "Failed to get handle to SCM. Error: %ls", (LPWSTR)lpMsgBuf); + } + + // First, get the script key out of the CustomActionData and + // use that to create the rollback script for this action. + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + if (!pwzScriptKey) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Failed due to unexpected CustomActionData passed."); + } + ExitOnFailure(hr, "Failed to read encoding key from CustomActionData."); + + hr = WcaCaScriptCreate(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, FALSE, &hRollbackScript); + ExitOnFailure(hr, "Failed to open rollback CustomAction script."); + + // Next, loop through the rest of the CustomActionData, processing + // each service config row in turn. + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzServiceName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&fNewService)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzFirstFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzSecondFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzThirdFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwResetPeriodInDays)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwRestartServiceDelayInSeconds)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzProgramCommandLine); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzRebootMessage); + ExitOnFailure(hr, "failed to process CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Configuring Service: %ls", pwzServiceName); + + // Open the handle with all the permissions we might need: + // SERVICE_QUERY_CONFIG is needed for QueryServiceConfig2(). + // SERVICE_CHANGE_CONFIG is needed for ChangeServiceConfig2(). + // SERVICE_START is required in order to handle SC_ACTION_RESTART action. + hr = GetService(hSCM, pwzServiceName, SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG | SERVICE_START, &hService); + ExitOnFailure(hr, "Failed to get service: %ls", pwzServiceName); + + // If we are configuring a service that existed on the machine, we need to + // read the existing service configuration and write it out to the rollback + // log so rollback can put it back if anything goes wrong. + if (!fNewService) + { + // First, read the existing service config. + if (!::QueryServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, NULL, 0, &cbExistingServiceConfig) && ERROR_INSUFFICIENT_BUFFER != ::GetLastError()) + { + ExitWithLastError(hr, "Failed to get current service config info."); + } + + psfa = static_cast(MemAlloc(cbExistingServiceConfig, TRUE)); + ExitOnNull(psfa, hr, E_OUTOFMEMORY, "failed to allocate memory for service failure actions."); + + if (!::QueryServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)psfa, cbExistingServiceConfig, &cbExistingServiceConfig)) + { + ExitOnLastError(hr, "failed to Query Service."); + } + + // Build up rollback log so we can restore service state if necessary + hr = WcaCaScriptWriteString(hRollbackScript, pwzServiceName); + ExitOnFailure(hr, "Failed to add service name to Rollback Log"); + + // If this service struct is empty, fill in default values + if (3 > psfa->cActions) + { + hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + } + else + { + // psfa actually had actions defined, so use the first three. + for (int i = 0; i < 3; ++i) + { + hr = GetSCActionTypeString(psfa->lpsaActions[i].Type, wzActionName, countof(wzActionName)); + ExitOnFailure(hr, "failed to query SFA object"); + + if (SC_ACTION_RESTART == psfa->lpsaActions[i].Type) + { + dwRestartDelay = psfa->lpsaActions[i].Delay / 1000; + } + + hr = WcaCaScriptWriteString(hRollbackScript, wzActionName); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + } + } + + hr = WcaCaScriptWriteNumber(hRollbackScript, psfa->dwResetPeriod / (24 * 60 * 60)); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaCaScriptWriteNumber(hRollbackScript, dwRestartDelay); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + // Handle the null cases. + if (!psfa->lpCommand) + { + psfa->lpCommand = L""; + } + hr = WcaCaScriptWriteString(hRollbackScript, psfa->lpCommand); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + // Handle the null cases. + if (!psfa->lpRebootMsg) + { + psfa->lpRebootMsg = L""; + } + hr = WcaCaScriptWriteString(hRollbackScript, psfa->lpRebootMsg); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + // Nudge the system to get all our rollback data written to disk. + WcaCaScriptFlush(hRollbackScript); + + ReleaseNullMem(psfa); + } + + hr = ConfigureService(hSCM, hService, pwzServiceName, dwRestartServiceDelayInSeconds, pwzFirstFailureActionType, + pwzSecondFailureActionType, pwzThirdFailureActionType, dwResetPeriodInDays, pwzRebootMessage, pwzProgramCommandLine); + ExitOnFailure(hr, "Failed to configure service: %ls", pwzServiceName); + + hr = WcaProgressMessage(COST_SERVICECONFIG, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + + // Per-service cleanup + ::CloseServiceHandle(hService); + hService = NULL; + dwResetPeriodInDays = 0; + dwRestartServiceDelayInSeconds = 0; + } + +LExit: + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_PRESERVE); + + if (lpMsgBuf) + { + ::LocalFree(lpMsgBuf); + } + + if (hService) + { + ::CloseServiceHandle(hService); + } + + if (hSCM) + { + ::CloseServiceHandle(hSCM); + } + + ReleaseMem(psfa); + + ReleaseStr(pwzRebootMessage); + ReleaseStr(pwzProgramCommandLine); + ReleaseStr(pwzThirdFailureActionType); + ReleaseStr(pwzSecondFailureActionType); + ReleaseStr(pwzFirstFailureActionType); + ReleaseStr(pwzServiceName); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzCustomActionData); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/****************************************************************** +RollbackServiceConfig - entry point for ServiceConfig rollback + Custom Action. + +NOTE: CustomActionScript Data == wzServiceName\twzFirstFailureActionType\twzSecondFailureActionType\twzThirdFailureActionType\tdwResetPeriodInDays\tdwRestartServiceDelayInSeconds\twzProgramCommandLine\twzRebootMessage\twzServiceName\t... +*******************************************************************/ +extern "C" UINT __stdcall RollbackServiceConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug RollbackServiceConfig"); + HRESULT hr = S_OK; + DWORD er = 0; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + + LPWSTR pwzScriptKey = NULL; + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + + LPWSTR pwzServiceName = NULL; + LPWSTR pwzFirstFailureActionType = NULL; + LPWSTR pwzSecondFailureActionType = NULL; + LPWSTR pwzThirdFailureActionType = NULL; + LPWSTR pwzProgramCommandLine = NULL; + LPWSTR pwzRebootMessage = NULL; + DWORD dwResetPeriodInDays = 0; + DWORD dwRestartServiceDelayInSeconds = 0; + + LPVOID lpMsgBuf = NULL; + SC_HANDLE hSCM = NULL; + SC_HANDLE hService = NULL; + + // initialize + hr = WcaInitialize(hInstall, "RollbackServiceConfig"); + ExitOnFailure(hr, "Failed to initialize 'RollbackServiceConfig'."); + + // Open the Services Control Manager up front. + hSCM = ::OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (NULL == hSCM) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + ExitOnFailure(hr, "Failed to get handle to SCM. Error: %ls", (LPWSTR)lpMsgBuf); + + // Make sure we still abort, in case hSCM was NULL but no error was returned from GetLastError + ExitOnNull(hSCM, hr, E_POINTER, "Getting handle to SCM reported success, but no handle was returned."); + } + + // Get the script key from the CustomAction data and use it to open + // the rollback log and read the data over the CustomActionData + // because all of the information is in the script data not the + // CustomActionData. + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + if (!pwzScriptKey) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Failed due to unexpected CustomActionData passed."); + } + ExitOnFailure(hr, "Failed to read encoding key from CustomActionData."); + + hr = WcaCaScriptOpen(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, &hRollbackScript); + ExitOnFailure(hr, "Failed to open rollback CustomAction script."); + + hr = WcaCaScriptReadAsCustomActionData(hRollbackScript, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to read rollback script into CustomAction data."); + + // Loop through the script's CustomActionData, processing each + // service config in turn. + pwz = pwzCustomActionData; + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzServiceName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzFirstFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzSecondFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzThirdFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwResetPeriodInDays)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwRestartServiceDelayInSeconds)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzProgramCommandLine); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzRebootMessage); + ExitOnFailure(hr, "failed to process CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Reconfiguring Service: %ls", pwzServiceName); + + // Open the handle with all the permissions we might need. + // SERVICE_CHANGE_CONFIG is needed for ChangeServiceConfig2(). + // SERVICE_START is required in order to handle SC_ACTION_RESTART action. + hr = GetService(hSCM, pwzServiceName, SERVICE_CHANGE_CONFIG | SERVICE_START, &hService); + ExitOnFailure(hr, "Failed to get service: %ls", pwzServiceName); + + hr = ConfigureService(hSCM, hService, pwzServiceName, dwRestartServiceDelayInSeconds, pwzFirstFailureActionType, + pwzSecondFailureActionType, pwzThirdFailureActionType, dwResetPeriodInDays, pwzRebootMessage, pwzProgramCommandLine); + ExitOnFailure(hr, "Failed to configure service: %ls", pwzServiceName); + + hr = WcaProgressMessage(COST_SERVICECONFIG, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + + // Per-service cleanup + ::CloseServiceHandle(hService); + hService = NULL; + dwResetPeriodInDays = 0; + dwRestartServiceDelayInSeconds = 0; + } + +LExit: + if (lpMsgBuf) // Allocated with FormatString. + { + ::LocalFree(lpMsgBuf); + } + + if (hService) + { + ::CloseServiceHandle(hService); + } + + if (hSCM) + { + ::CloseServiceHandle(hSCM); + } + + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_DELETE); + + ReleaseStr(pwzRebootMessage); + ReleaseStr(pwzProgramCommandLine); + ReleaseStr(pwzThirdFailureActionType); + ReleaseStr(pwzSecondFailureActionType); + ReleaseStr(pwzFirstFailureActionType); + ReleaseStr(pwzServiceName); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzCustomActionData); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/********************************************************** +GetSCActionType - helper function to return the SC_ACTION_TYPE +for a given string matching the allowed set. +REBOOT, RESTART, RUN_COMMAND and NONE +**********************************************************/ +static SC_ACTION_TYPE GetSCActionType( + __in LPCWSTR pwzActionTypeName + ) +{ + SC_ACTION_TYPE actionType; + + // verify that action types are valid. if not, just default to NONE + if (0 == lstrcmpiW(c_wzActionTypeReboot, pwzActionTypeName)) + { + actionType = SC_ACTION_REBOOT; + } + else if (0 == lstrcmpiW(c_wzActionTypeRestart, pwzActionTypeName)) + { + actionType = SC_ACTION_RESTART; + } + else if (0 == lstrcmpiW(c_wzActionTypeRunCommand, pwzActionTypeName)) + { + actionType = SC_ACTION_RUN_COMMAND; + } + else + { + // default to none + actionType = SC_ACTION_NONE; + } + + return actionType; +} + + +static HRESULT GetSCActionTypeString( + __in SC_ACTION_TYPE type, + __out_ecount(cchActionTypeString) LPWSTR wzActionTypeString, + __in DWORD cchActionTypeString + ) +{ + HRESULT hr = S_OK; + + switch (type) + { + case SC_ACTION_REBOOT: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeReboot); + ExitOnFailure(hr, "Failed to copy 'reboot' into action type."); + break; + case SC_ACTION_RESTART: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeRestart); + ExitOnFailure(hr, "Failed to copy 'restart' into action type."); + break; + case SC_ACTION_RUN_COMMAND: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeRunCommand); + ExitOnFailure(hr, "Failed to copy 'runCommand' into action type."); + break; + case SC_ACTION_NONE: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeNone); + ExitOnFailure(hr, "Failed to copy 'none' into action type."); + break; + default: + break; + } + +LExit: + return hr; +} + + +static HRESULT GetService( + __in SC_HANDLE hSCM, + __in LPCWSTR wzService, + __in DWORD dwOpenServiceAccess, + __out SC_HANDLE* phService + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + LPVOID lpMsgBuf = NULL; + + *phService = ::OpenServiceW(hSCM, wzService, dwOpenServiceAccess); + if (NULL == *phService) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + if (ERROR_SERVICE_DOES_NOT_EXIST == er) + { + ExitOnFailure(hr, "Service '%ls' does not exist on this system.", wzService); + } + else + { +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + ExitOnFailure(hr, "Failed to get handle to the service '%ls'. Error: %ls", wzService, (LPWSTR)lpMsgBuf); + } + } + +LExit: + if (lpMsgBuf) // Allocated with FormatString. + { + ::LocalFree(lpMsgBuf); + } + + return hr; +} + + +static HRESULT ConfigureService( + __in SC_HANDLE /*hSCM*/, + __in SC_HANDLE hService, + __in LPCWSTR wzServiceName, + __in DWORD dwRestartServiceDelayInSeconds, + __in LPCWSTR wzFirstFailureActionType, + __in LPCWSTR wzSecondFailureActionType, + __in LPCWSTR wzThirdFailureActionType, + __in DWORD dwResetPeriodInDays, + __in LPWSTR wzRebootMessage, + __in LPWSTR wzProgramCommandLine + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + HANDLE hToken = NULL; + TOKEN_PRIVILEGES priv = { 0 }; + TOKEN_PRIVILEGES* pPrevPriv = NULL; + DWORD cbPrevPriv = 0; + BOOL fAdjustedPrivileges = FALSE; + + SC_ACTION actions[3]; // the UI always shows 3 actions, so we'll always do 3 + SERVICE_FAILURE_ACTIONSW sfa; + LPVOID lpMsgBuf = NULL; + + // Always get the shutdown privilege in case we need to configure service to reboot. + if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + ExitWithLastError(hr, "Failed to get process token."); + } + + priv.PrivilegeCount = 1; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + if (!::LookupPrivilegeValueW(NULL, L"SeShutdownPrivilege", &priv.Privileges[0].Luid)) + { + ExitWithLastError(hr, "Failed to get shutdown privilege LUID."); + } + + cbPrevPriv = sizeof(TOKEN_PRIVILEGES); + pPrevPriv = static_cast(MemAlloc(cbPrevPriv, TRUE)); + ExitOnNull(pPrevPriv, hr, E_OUTOFMEMORY, "Failed to allocate memory for empty previous privileges."); + + if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv)) + { + LPVOID pv = MemReAlloc(pPrevPriv, cbPrevPriv, TRUE); + ExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for previous privileges."); + pPrevPriv = static_cast(pv); + + if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv)) + { + ExitWithLastError(hr, "Failed to get shutdown privilege LUID."); + } + } + + fAdjustedPrivileges = TRUE; + + // build up SC_ACTION array + // TODO: why is delay only respected when SC_ACTION_RESTART is requested? + actions[0].Type = GetSCActionType(wzFirstFailureActionType); + actions[0].Delay = 0; + if (SC_ACTION_RESTART == actions[0].Type) + { + actions[0].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds + } + + actions[1].Type = GetSCActionType(wzSecondFailureActionType); + actions[1].Delay = 0; + if (SC_ACTION_RESTART == actions[1].Type) + { + actions[1].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds + } + + actions[2].Type = GetSCActionType(wzThirdFailureActionType); + actions[2].Delay = 0; + if (SC_ACTION_RESTART == actions[2].Type) + { + actions[2].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds + } + + // build up the SERVICE_FAILURE_ACTIONSW struct + sfa.dwResetPeriod = dwResetPeriodInDays * (24 * 60 * 60); // days to seconds + sfa.lpRebootMsg = wzRebootMessage; + sfa.lpCommand = wzProgramCommandLine; + sfa.cActions = countof(actions); + sfa.lpsaActions = actions; + + // Call ChangeServiceConfig2 to actually set up the failure actions + if (!::ChangeServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPVOID)&sfa)) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + // Check if this is a service that can't be modified. + if (ERROR_CANNOT_DETECT_PROCESS_ABORT == er) + { + WcaLog(LOGMSG_STANDARD, "WARNING: Service \"%ls\" is not configurable on this server and will not be set.", wzServiceName); + } + ExitOnFailure(hr, "Cannot change service configuration. Error: %ls", (LPWSTR)lpMsgBuf); + + if (lpMsgBuf) + { + ::LocalFree(lpMsgBuf); + lpMsgBuf = NULL; + } + } + +LExit: + if (lpMsgBuf) + { + ::LocalFree(lpMsgBuf); + } + + if (fAdjustedPrivileges) + { + ::AdjustTokenPrivileges(hToken, FALSE, pPrevPriv, 0, NULL, NULL); + } + + ReleaseMem(pPrevPriv); + ReleaseHandle(hToken); + + return hr; +} diff --git a/src/ca/shellexecca.cpp b/src/ca/shellexecca.cpp new file mode 100644 index 00000000..ea21d3bd --- /dev/null +++ b/src/ca/shellexecca.cpp @@ -0,0 +1,271 @@ +// 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" + +HRESULT ShellExec( + __in LPCWSTR wzTarget, + __in BOOL fUnelevated + ) +{ + HRESULT hr = S_OK; + LPWSTR sczWorkingDirectory = NULL; + + // a reasonable working directory (not the system32 default from MSI) is the directory where the target lives + hr = PathGetDirectory(wzTarget, &sczWorkingDirectory); + ExitOnFailure(hr, "failed to get directory for target: %ls", wzTarget); + + if (!DirExists(sczWorkingDirectory, NULL)) + { + ReleaseNullStr(sczWorkingDirectory); + } + + if (fUnelevated) + { + hr = ShelExecUnelevated(wzTarget, NULL, NULL, sczWorkingDirectory, SW_SHOWDEFAULT); + ExitOnFailure(hr, "ShelExecUnelevated failed with target %ls", wzTarget); + } + else + { + HINSTANCE hinst = ::ShellExecuteW(NULL, NULL, wzTarget, NULL, sczWorkingDirectory, SW_SHOWDEFAULT); + if (hinst <= HINSTANCE(32)) + { + LONG64 code = reinterpret_cast(hinst); + switch (code) + { + case ERROR_FILE_NOT_FOUND: + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + break; + case ERROR_PATH_NOT_FOUND: + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + break; + case ERROR_BAD_FORMAT: + hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); + break; + case SE_ERR_ASSOCINCOMPLETE: + case SE_ERR_NOASSOC: + hr = HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + break; + case SE_ERR_DDEBUSY: + case SE_ERR_DDEFAIL: + case SE_ERR_DDETIMEOUT: + hr = HRESULT_FROM_WIN32(ERROR_DDE_FAIL); + break; + case SE_ERR_DLLNOTFOUND: + hr = HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND); + break; + case SE_ERR_OOM: + hr = E_OUTOFMEMORY; + break; + case SE_ERR_ACCESSDENIED: + hr = E_ACCESSDENIED; + break; + default: + hr = E_FAIL; + } + + ExitOnFailure(hr, "ShellExec failed with return code %llu.", code); + } + } + + +LExit: + ReleaseStr(sczWorkingDirectory); + return hr; +} + +extern "C" UINT __stdcall WixShellExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + LPWSTR pwzTarget = NULL; + + hr = WcaInitialize(hInstall, "WixShellExec"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetFormattedProperty(L"WixShellExecTarget", &pwzTarget); + ExitOnFailure(hr, "failed to get WixShellExecTarget"); + + WcaLog(LOGMSG_VERBOSE, "WixShellExecTarget is %ls", pwzTarget); + + if (!pwzTarget || !*pwzTarget) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to get WixShellExecTarget"); + } + + hr = ShellExec(pwzTarget, FALSE); + ExitOnFailure(hr, "failed to launch target"); + +LExit: + ReleaseStr(pwzTarget); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixUnelevatedShellExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + LPWSTR pwzTarget = NULL; + + hr = WcaInitialize(hInstall, "WixUnelevatedShellExec"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetFormattedProperty(L"WixUnelevatedShellExecTarget", &pwzTarget); + ExitOnFailure(hr, "failed to get WixUnelevatedShellExecTarget"); + + WcaLog(LOGMSG_VERBOSE, "WixUnelevatedShellExecTarget is %ls", pwzTarget); + + if (!pwzTarget || !*pwzTarget) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to get WixShellExecTarget"); + } + + hr = ShellExec(pwzTarget, TRUE); + ExitOnFailure(hr, "failed to launch target"); + +LExit: + ReleaseStr(pwzTarget); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +// +// ExtractBinary extracts the data from the Binary table row with the given ID into a file. +// +HRESULT ExtractBinary( + __in LPCWSTR wzBinaryId, + __out BYTE** pbData, + __out DWORD* pcbData + ) +{ + HRESULT hr = S_OK; + LPWSTR pwzSql = NULL; + PMSIHANDLE hView; + PMSIHANDLE hRec; + + // make sure we're not horked from the get-go + hr = WcaTableExists(L"Binary"); + if (S_OK != hr) + { + if (SUCCEEDED(hr)) + { + hr = E_UNEXPECTED; + } + ExitOnFailure(hr, "There is no Binary table."); + } + + ExitOnNull(wzBinaryId, hr, E_INVALIDARG, "Binary ID cannot be null"); + ExitOnNull(*wzBinaryId, hr, E_INVALIDARG, "Binary ID cannot be empty string"); + + hr = StrAllocFormatted(&pwzSql, L"SELECT `Data` FROM `Binary` WHERE `Name`=\'%s\'", wzBinaryId); + ExitOnFailure(hr, "Failed to allocate Binary table query."); + + hr = WcaOpenExecuteView(pwzSql, &hView); + ExitOnFailure(hr, "Failed to open view on Binary table"); + + hr = WcaFetchSingleRecord(hView, &hRec); + ExitOnFailure(hr, "Failed to retrieve request from Binary table"); + + hr = WcaGetRecordStream(hRec, 1, pbData, pcbData); + ExitOnFailure(hr, "Failed to read Binary.Data."); + +LExit: + ReleaseStr(pwzSql); + + return hr; +} + +extern "C" UINT __stdcall WixShellExecBinary( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + LPWSTR pwzBinary = NULL; + LPWSTR pwzFilename = NULL; + BYTE* pbData = NULL; + DWORD cbData = 0; + HANDLE hFile = INVALID_HANDLE_VALUE; + +#if 0 + ::MessageBoxA(0, "WixShellExecBinary", "-->> ATTACH HERE", MB_OK); +#endif + + hr = WcaInitialize(hInstall, "WixShellExecBinary"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetFormattedProperty(L"WixShellExecBinaryId", &pwzBinary); + ExitOnFailure(hr, "failed to get WixShellExecBinaryId"); + + WcaLog(LOGMSG_VERBOSE, "WixShellExecBinaryId is %ls", pwzBinary); + + if (!pwzBinary || !*pwzBinary) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to get WixShellExecBinaryId"); + } + + // get temporary path for extracted file + StrAlloc(&pwzFilename, MAX_PATH); + ExitOnFailure(hr, "Failed to allocate temporary path"); + ::GetTempPathW(MAX_PATH, pwzFilename); + hr = ::StringCchCatW(pwzFilename, MAX_PATH, pwzBinary); + ExitOnFailure(hr, "Failed to append filename."); + + // grab the bits + hr = ExtractBinary(pwzBinary, &pbData, &cbData); + ExitOnFailure(hr, "failed to extract binary data"); + + // write 'em to the temp file + hFile = ::CreateFileW(pwzFilename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == hFile) + { + ExitWithLastError(hr, "Failed to open new temp file: %ls", pwzFilename); + } + + DWORD cbWritten = 0; + if (!::WriteFile(hFile, pbData, cbData, &cbWritten, NULL)) + { + ExitWithLastError(hr, "Failed to write data to new temp file: %ls", pwzFilename); + } + + // close it + ::CloseHandle(hFile); + hFile = INVALID_HANDLE_VALUE; + + // and run it + hr = ShellExec(pwzFilename, FALSE); + ExitOnFailure(hr, "failed to launch target: %ls", pwzFilename); + +LExit: + ReleaseStr(pwzBinary); + ReleaseStr(pwzFilename); + ReleaseMem(pbData); + if (INVALID_HANDLE_VALUE != hFile) + { + ::CloseHandle(hFile); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ca/test.cpp b/src/ca/test.cpp new file mode 100644 index 00000000..c4d215f0 --- /dev/null +++ b/src/ca/test.cpp @@ -0,0 +1,269 @@ +// 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" + +#define WIXCA_UITHREAD_CLASS_WINDOW L"WixCaMessageWindow" + +extern HMODULE g_hInstCADLL; + + +// structs + +struct UITHREAD_CONTEXT +{ + HANDLE hInitializedEvent; + HINSTANCE hInstance; + HWND hWnd; +}; + + +// internal function declarations + +static HRESULT CreateMessageWindow( + __out HWND* phWnd + ); + +static void CloseMessageWindow( + __in HWND hWnd + ); + +static DWORD WINAPI ThreadProc( + __in LPVOID pvContext + ); + +static LRESULT CALLBACK WndProc( + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ); + + +/****************************************************************** +WixFailWhenDeferred - entry point for WixFailWhenDeferred + custom action which always fails when running as a deferred + custom action (otherwise it blindly succeeds). It's useful when + testing the rollback of deferred custom actions: Schedule it + immediately after the rollback/deferred CA pair you're testing + and it will fail, causing your rollback CA to get invoked. +********************************************************************/ +extern "C" UINT __stdcall WixFailWhenDeferred( + __in MSIHANDLE hInstall + ) +{ + return ::MsiGetMode(hInstall, MSIRUNMODE_SCHEDULED) ? ERROR_INSTALL_FAILURE : ERROR_SUCCESS; +} + +/****************************************************************** +WixWaitForEvent - entry point for WixWaitForEvent custom action + which waits for either the WixWaitForEventFail or + WixWaitForEventSucceed named auto reset events. Signaling the + WixWaitForEventFail event will return ERROR_INSTALL_FAILURE or + signaling the WixWaitForEventSucceed event will return + ERROR_SUCCESS. Both events are declared in the Global\ namespace. +********************************************************************/ +extern "C" UINT __stdcall WixWaitForEvent( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + HWND hMessageWindow = NULL; + LPCWSTR wzSDDL = L"D:(A;;GA;;;WD)"; + OS_VERSION version = OS_VERSION_UNKNOWN; + DWORD dwServicePack = 0; + PSECURITY_DESCRIPTOR pSD = NULL; + SECURITY_ATTRIBUTES sa = { }; + HANDLE rghEvents[2]; + + hr = WcaInitialize(hInstall, "WixWaitForEvent"); + ExitOnFailure(hr, "Failed to initialize."); + + // Create a window to prevent shutdown requests. + hr = CreateMessageWindow(&hMessageWindow); + ExitOnFailure(hr, "Failed to create message window."); + + // If running on Vista/2008 or newer use integrity enhancements. + OsGetVersion(&version, &dwServicePack); + if (OS_VERSION_VISTA <= version) + { + // Add SACL to allow Everyone to signal from a medium integrity level. + wzSDDL = L"D:(A;;GA;;;WD)S:(ML;;NW;;;ME)"; + } + + // Create the security descriptor and attributes for the events. + if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(wzSDDL, SDDL_REVISION_1, &pSD, NULL)) + { + ExitWithLastError(hr, "Failed to create the security descriptor for the events."); + } + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = FALSE; + + rghEvents[0] = ::CreateEventW(&sa, FALSE, FALSE, L"Global\\WixWaitForEventFail"); + ExitOnNullWithLastError(rghEvents[0], hr, "Failed to create the Global\\WixWaitForEventFail event."); + + rghEvents[1] = ::CreateEventW(&sa, FALSE, FALSE, L"Global\\WixWaitForEventSucceed"); + ExitOnNullWithLastError(rghEvents[1], hr, "Failed to create the Global\\WixWaitForEventSucceed event."); + + // Wait for either of the events to be signaled and handle accordingly. + er = ::WaitForMultipleObjects(countof(rghEvents), rghEvents, FALSE, INFINITE); + switch (er) + { + case WAIT_OBJECT_0 + 0: + er = ERROR_INSTALL_FAILURE; + break; + case WAIT_OBJECT_0 + 1: + er = ERROR_SUCCESS; + break; + default: + ExitOnWin32Error(er, hr, "Unexpected failure."); + } + +LExit: + ReleaseHandle(rghEvents[1]); + ReleaseHandle(rghEvents[0]); + + if (pSD) + { + ::LocalFree(pSD); + } + + if (hMessageWindow) + { + CloseMessageWindow(hMessageWindow); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + + +// internal function definitions + +static HRESULT CreateMessageWindow( + __out HWND* phWnd + ) +{ + HRESULT hr = S_OK; + HANDLE rgWaitHandles[2] = { }; + UITHREAD_CONTEXT context = { }; + + // Create event to signal after the UI thread / window is initialized. + rgWaitHandles[0] = ::CreateEventW(NULL, TRUE, FALSE, NULL); + ExitOnNullWithLastError(rgWaitHandles[0], hr, "Failed to create initialization event."); + + // Pass necessary information to create the window. + context.hInitializedEvent = rgWaitHandles[0]; + context.hInstance = (HINSTANCE)g_hInstCADLL; + + // Create our separate UI thread. + rgWaitHandles[1] = ::CreateThread(NULL, 0, ThreadProc, &context, 0, NULL); + ExitOnNullWithLastError(rgWaitHandles[1], hr, "Failed to create the UI thread."); + + // Wait for either the thread to be initialized or the window to exit / fail prematurely. + ::WaitForMultipleObjects(countof(rgWaitHandles), rgWaitHandles, FALSE, INFINITE); + + // Pass the window back to the caller. + *phWnd = context.hWnd; + +LExit: + ReleaseHandle(rgWaitHandles[1]); + ReleaseHandle(rgWaitHandles[0]); + + return hr; +} + +static void CloseMessageWindow( + __in HWND hWnd + ) +{ + if (::IsWindow(hWnd)) + { + ::PostMessageW(hWnd, WM_CLOSE, 0, 0); + } +} + +static DWORD WINAPI ThreadProc( + __in LPVOID pvContext + ) +{ + HRESULT hr = S_OK; + UITHREAD_CONTEXT* pContext = static_cast(pvContext); + + WNDCLASSW wc = { }; + BOOL fRegistered = TRUE; + HWND hWnd = NULL; + + BOOL fRet = FALSE; + MSG msg = { }; + + wc.lpfnWndProc = WndProc; + wc.hInstance = pContext->hInstance; + wc.lpszClassName = WIXCA_UITHREAD_CLASS_WINDOW; + + if (!::RegisterClassW(&wc)) + { + ExitWithLastError(hr, "Failed to register window."); + } + + fRegistered = TRUE; + + // Create the window to handle reboots without activating it. + hWnd = ::CreateWindowExW(WS_EX_TOOLWINDOW, wc.lpszClassName, NULL, WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, SW_SHOWNA, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, NULL); + ExitOnNullWithLastError(hWnd, hr, "Failed to create window."); + + // Persist the window handle and let the caller know we've initialized. + pContext->hWnd = hWnd; + ::SetEvent(pContext->hInitializedEvent); + + // Pump messages until the window is closed. + while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) + { + if (-1 == fRet) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Unexpected return value from message pump."); + } + else if (!::IsDialogMessageW(msg.hwnd, &msg)) + { + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + } + +LExit: + if (fRegistered) + { + ::UnregisterClassW(WIXCA_UITHREAD_CLASS_WINDOW, pContext->hInstance); + } + + return hr; +} + +static LRESULT CALLBACK WndProc( + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ) +{ + switch (uMsg) + { + case WM_QUERYENDSESSION: + // Prevent the process from being shut down. + WcaLog(LOGMSG_VERBOSE, "Disallowed system request to shut down the custom action server."); + return FALSE; + + case WM_DESTROY: + ::PostQuitMessage(0); + return 0; + } + + return ::DefWindowProcW(hWnd, uMsg, wParam, lParam); +} diff --git a/src/ca/utilca.def b/src/ca/utilca.def index 4b34b3a4..97d5776f 100644 --- a/src/ca/utilca.def +++ b/src/ca/utilca.def @@ -4,4 +4,85 @@ LIBRARY "utilca" EXPORTS - +; BroadcastSettingChange.cpp + WixBroadcastSettingChange + WixBroadcastEnvironmentChange +; checkreboot.cpp + WixCheckRebootRequired +; closeapps.cpp + WixCloseApplications + WixCloseApplicationsDeferred +; exitearlywithsuccess.cpp + WixExitEarlyWithSuccess +; FormatFiles.cpp + WixSchedFormatFiles + WixExecFormatFiles +; osinfo.cpp + WixQueryOsInfo + WixQueryOsDirs + WixQueryOsWellKnownSID + WixQueryOsDriverInfo +; netshortcuts.cpp + WixSchedInternetShortcuts + WixCreateInternetShortcuts + WixRollbackInternetShortcuts +; qtexecca.cpp + CAQuietExec + CAQuietExec64 + WixQuietExec + WixQuietExec64 + WixSilentExec + WixSilentExec64 +; RemoveFoldersEx.cpp + WixRemoveFoldersEx +;scaexec.cpp + RegisterPerfCounterData + UnregisterPerfCounterData + RegisterPerfmon + UnregisterPerfmon + CreateSmb + DropSmb + CreateUser + RemoveUser +;scasched.cpp + ConfigurePerfmonInstall + ConfigurePerfmonUninstall + ConfigureSmbInstall + ConfigureSmbUninstall + ConfigureUsers + InstallPerfCounterData + UninstallPerfCounterData + ConfigurePerfmonManifestRegister + ConfigurePerfmonManifestUnregister + ConfigureEventManifestRegister + ConfigureEventManifestUnregister +; RestartManager.cpp + WixRegisterRestartResources +; secureobj.cpp + SchedSecureObjects + SchedSecureObjectsRollback + ExecSecureObjects + ExecSecureObjectsRollback +; serviceconfig.cpp + SchedServiceConfig + ExecServiceConfig + RollbackServiceConfig +; shellexecca.cpp + WixShellExec + WixShellExecBinary + WixUnelevatedShellExec +; test.cpp + WixFailWhenDeferred + WixWaitForEvent +; TouchFile.cpp + WixTouchFileDuringInstall + WixTouchFileDuringUninstall + WixExecuteTouchFile +; xmlfile.cpp + SchedXmlFile + ExecXmlFile + ExecXmlFileRollback +; xmlconfig.cpp + SchedXmlConfig + ExecXmlConfig + ExecXmlConfigRollback diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index ef04c3ac..e9d74a66 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -38,18 +38,51 @@ - msi.lib + activeds.lib;adsiid.lib;msi.lib;netapi32.lib;shlwapi.lib + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index ac11c788..e77b529b 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs @@ -63,7 +63,7 @@ - + WIXFAILWHENDEFERRED=1 AND VersionNT > 400 @@ -71,7 +71,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -87,7 +87,7 @@ - + NEWERVERSIONDETECTED AND VersionNT > 400 @@ -95,7 +95,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -120,7 +120,7 @@ - + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) @@ -213,7 +213,7 @@ - + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) @@ -318,7 +318,7 @@ - + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) @@ -360,7 +360,7 @@ - + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) @@ -384,47 +384,47 @@ - + - + - + - + - + - + - + - + - + diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index 8328577f..4f76c687 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -31,7 +31,7 @@ - + -- cgit v1.2.3-55-g6feb From 7cd37cc8fe8064654ea4cc80a7ecb6bfffb21f89 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 22 Dec 2018 14:35:43 -0800 Subject: Update to latest Home\repo-template --- .editorconfig | 37 +++++++++++ .gitignore | 72 ++++++++++++++++++---- Util.wixext.v3.ncrunchsolution | 6 ++ appveyor.yml | 6 ++ src/Directory.Build.props | 9 +-- src/Directory.Build.targets | 48 +++++++++++++++ .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 6 +- src/wixext/WixToolset.Util.wixext.csproj | 7 +-- 8 files changed, 162 insertions(+), 29 deletions(-) create mode 100644 .editorconfig create mode 100644 Util.wixext.v3.ncrunchsolution create mode 100644 src/Directory.Build.targets (limited to 'src') diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1d72e683 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,37 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig +# then update all of the repos. + +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.{cs,vb}] +dotnet_sort_system_directives_first = true + +[*.cs] +csharp_indent_case_contents = true : error +csharp_indent_switch_labels = true : error +csharp_new_line_before_open_brace = all +csharp_prefer_braces = true : error +csharp_style_expression_bodied_methods = when_on_single_line : suggestion +csharp_style_expression_bodied_constructors = when_on_single_line : suggestion +csharp_style_expression_bodied_operators = when_on_single_line : suggestion +csharp_style_expression_bodied_properties = when_on_single_line : suggestion +csharp_style_expression_bodied_indexers = when_on_single_line : suggestion +csharp_style_expression_bodied_accessors = when_on_single_line : suggestion +csharp_style_var_elsewhere = true : suggestion +csharp_style_var_for_built_in_types = true : suggestion +csharp_style_var_when_type_is_apparent = true : suggestion +dotnet_style_qualification_for_event = true : error +dotnet_style_qualification_for_field = true : error +dotnet_style_qualification_for_method = true : error +dotnet_style_qualification_for_property = true : error + +[*.targets] +indent_size = 2 diff --git a/.gitignore b/.gitignore index 3c6208a8..3e8a1553 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user *.userosscache @@ -19,16 +20,21 @@ [Rr]eleases/ x64/ x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -# Visual Studio 2015 cache/options directory +# Visual Studio 2015/2017 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ +# Visual Studio 2017 auto generated files +Generated\ Files/ + # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* @@ -49,16 +55,21 @@ BenchmarkDotNet.Artifacts/ project.lock.json project.fragment.lock.json artifacts/ -**/Properties/launchSettings.json +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*_i.h +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -68,6 +79,7 @@ artifacts/ *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log *.vspscc *.vssscc @@ -96,6 +108,9 @@ ipch/ *.vspx *.sap +# Visual Studio Trace Files +*.e2e + # TFS 2012 Local Workspace $tf/ @@ -116,6 +131,10 @@ _TeamCity* # DotCover is a Code Coverage Tool *.dotCover +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + # Visual Studio code coverage results *.coverage *.coveragexml @@ -164,11 +183,11 @@ PublishScripts/ # NuGet Packages *.nupkg # The packages folder can be ignored because of Package Restore -**/packages/* +**/[Pp]ackages/* # except build/, which is used as an MSBuild target. -!**/packages/build/ +!**/[Pp]ackages/build/ # Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config +#!**/[Pp]ackages/repositories.config # NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets @@ -192,7 +211,7 @@ _pkginfo.txt # files ending in .cache can be ignored *.[Cc]ache # but keep track of directories ending in .cache -!*.[Cc]ache/ +!?*.[Cc]ache/ # Others ClientBin/ @@ -205,9 +224,15 @@ ClientBin/ *.publishsettings orleans.codegen.cs +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) #bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ # RIA/Silverlight projects Generated_Code/ @@ -219,6 +244,8 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak # SQL Server files *.mdf @@ -229,6 +256,7 @@ UpgradeLog*.htm *.rdl.data *.bim.layout *.bim_*.settings +*.rptproj.rsuser # Microsoft Fakes FakesAssemblies/ @@ -240,9 +268,6 @@ FakesAssemblies/ .ntvs_analysis.dat node_modules/ -# Typescript v1 declaration files -typings/ - # Visual Studio 6 build log *.plg @@ -271,8 +296,8 @@ paket-files/ .idea/ *.sln.iml -# CodeRush -.cr/ +# CodeRush personal settings +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ @@ -292,4 +317,25 @@ __pycache__/ *.btp.cs *.btm.cs *.odx.cs -*.xsd.cs \ No newline at end of file +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb diff --git a/Util.wixext.v3.ncrunchsolution b/Util.wixext.v3.ncrunchsolution new file mode 100644 index 00000000..10420ac9 --- /dev/null +++ b/Util.wixext.v3.ncrunchsolution @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 0c74d54b..d55322da 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml +# then update all of the repos. + image: Visual Studio 2017 version: 0.0.0.{build} @@ -17,6 +22,7 @@ pull_requests: nuget: disable_publish_on_pr: true +skip_branch_with_pr: true skip_tags: true artifacts: diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9eacf3f5..e853e22d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ @@ -10,20 +10,17 @@ false $(MSBuildProjectName) - $(MSBuildThisFileDirectory)..\build\ + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) $(BaseOutputPath)obj\$(ProjectName)\ $(BaseOutputPath)$(Configuration)\ WiX Toolset Team WiX Toolset Copyright (c) .NET Foundation and contributors. All rights reserved. + MS-RL WiX Toolset - - $(MSBuildThisFileDirectory)..\..\ - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..dac7452a --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,48 @@ + + + + + + + true + $(SolutionPath) + $(NCrunchOriginalSolutionPath) + + + + + + + $([System.IO.File]::ReadAllText($(TheSolutionPath))) + $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) + (?<="[PackageName]", ")(.*)(?=", ") + + + + + + %(Identity) + $(SolutionFileContent.Contains('\%(Identity).csproj')) + + + + + $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) + $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 3639572f..8fe8d640 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -23,11 +23,7 @@ - - - - - + diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index e86a57c1..ed5a6a0f 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -19,11 +19,8 @@ - - - - - + + -- cgit v1.2.3-55-g6feb From 3b1848368ffe8220973b12de2f76fdc8c0114683 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 13 Jan 2019 19:08:11 -0600 Subject: Update to latest Cpp.Build.props for locating latest Win10 SDK. Remove unused Microsoft.VisualStudio.Setup.Configuration.Native package. --- src/Cpp.Build.props | 6 +++++- src/ca/packages.config | 1 - src/ca/precomp.h | 1 - src/ca/utilca.vcxproj | 9 --------- 4 files changed, 5 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 296b36ca..0e00132b 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -8,6 +8,10 @@ $(OutputPath)$(Platform)\ + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + $(DisableSpecificCompilerWarnings) @@ -16,7 +20,7 @@ WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) Use precomp.h - StdCall + StdCall true false -YlprecompDefine diff --git a/src/ca/packages.config b/src/ca/packages.config index b74ff5d0..b87f9ab4 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/src/ca/precomp.h b/src/ca/precomp.h index 45984156..66e2f6b0 100644 --- a/src/ca/precomp.h +++ b/src/ca/precomp.h @@ -23,7 +23,6 @@ #include #define MAXUINT USHRT_MAX -#include #include "wcautil.h" #include "wcawow64.h" diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index e9d74a66..9bff19b0 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -24,19 +24,11 @@ Unicode utilca.def WiX Toolset Util CustomAction - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - - - activeds.lib;adsiid.lib;msi.lib;netapi32.lib;shlwapi.lib @@ -96,7 +88,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - -- cgit v1.2.3-55-g6feb From fbc081741b9923868ebf4aeb98f1e678f5fb6d97 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 9 May 2019 08:57:43 -0700 Subject: Update to latest tools and changes from those tools --- .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 11 +- .../WixToolsetTest.Util.v3.ncrunchproject | 5 + src/wixext/UtilCompiler.cs | 112 +++++++++------------ src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 +- 5 files changed, 64 insertions(+), 70 deletions(-) create mode 100644 src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 8fe8d640..294844ac 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -1,4 +1,4 @@ - + @@ -23,7 +23,10 @@ - + + + + @@ -32,7 +35,7 @@ - - + + diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject new file mode 100644 index 00000000..7b5b2139 --- /dev/null +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 3522d1fb..5adb5289 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -11,6 +11,7 @@ namespace WixToolset.Util using System.Text.RegularExpressions; using System.Xml.Linq; using WixToolset.Data; + using WixToolset.Data.Tuples; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -146,9 +147,9 @@ namespace WixToolset.Util /// Parent element of element to process. /// Element to process. /// Extra information about the context in which this element is being parsed. - public override ComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) + public override IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) { - ComponentKeyPath possibleKeyPath = null; + IComponentKeyPath possibleKeyPath = null; switch (parentElement.Name.LocalName) { @@ -549,7 +550,7 @@ namespace WixToolset.Util /// /// Element to parse. /// Identifier of parent component. - private ComponentKeyPath ParseEventSourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + private IComponentKeyPath ParseEventSourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string sourceName = null; @@ -568,7 +569,7 @@ namespace WixToolset.Util switch (attrib.Name.LocalName) { case "CategoryCount": - categoryCount = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + categoryCount = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; case "CategoryMessageFile": categoryMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -660,31 +661,34 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - int registryRoot = 2; // MsiInterop.MsidbRegistryRootLocalMachine - string eventSourceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\EventLog\{0}\{1}", logName, sourceName); - Identifier id = this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; + Identifier id = this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); if (null != categoryMessageFile) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); } if (CompilerConstants.IntegerNotSet != categoryCount) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); } if (null != parameterMessageFile) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); } if (0 != typesSupported) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); } - return new ComponentKeyPath() { Id = id.Id, Explicit = isKeyPath, Type = ComponentKeyPathType.Registry }; + var componentKeyPath = this.CreateComponentKeyPath(); + componentKeyPath.Id = id.Id; + componentKeyPath.Explicit = isKeyPath; + componentKeyPath.Type = PossibleKeyPathType.Registry; + return componentKeyPath; } /// @@ -720,10 +724,10 @@ namespace WixToolset.Util property = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); break; case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; case "Timeout": - timeout = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + timeout = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; case "Target": target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -789,7 +793,7 @@ namespace WixToolset.Util } break; case "TerminateProcess": - terminateExitCode = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + terminateExitCode = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); attributes |= 0x20; // CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS break; default: @@ -1273,7 +1277,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); } - if (int.MinValue == permission) // just GENERIC_READ, which is MSI_NULL + if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL { this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); } @@ -1427,7 +1431,7 @@ namespace WixToolset.Util iconFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "IconIndex": - iconIndex = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + iconIndex = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -1481,7 +1485,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - CreateWixInternetShortcut(intermediate, section, sourceLineNumbers, componentId, directoryId, id, name, target, shortcutType, iconFile, iconIndex); + this.CreateWixInternetShortcut(section, sourceLineNumbers, componentId, directoryId, id, name, target, shortcutType, iconFile, iconIndex); } } @@ -1495,7 +1499,7 @@ namespace WixToolset.Util /// Identifier of shortcut. /// Name of shortcut without extension. /// Target URL of shortcut. - public void CreateWixInternetShortcut(Intermediate intermediate, IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, string shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) + private void CreateWixInternetShortcut(IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, string shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) { // add the appropriate extension based on type of shortcut name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); @@ -1687,20 +1691,19 @@ namespace WixToolset.Util row.Set(4, sbSymbolicConstants.ToString()); // Set up the application's performance key. - int registryRoot = 2; // HKLM string escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); string linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); string performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, linkageKey, "Export", escapedName, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "-", null, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Library", library, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Open", openEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Collect", collectEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Close", closeEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, registryRoot, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); + this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } // Reference InstallPerfCounterData and UninstallPerfCounterData since nothing will happen without them @@ -2523,7 +2526,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); } - if (int.MinValue == permission) // just GENERIC_READ, which is MSI_NULL + if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL { this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); } @@ -2694,7 +2697,7 @@ namespace WixToolset.Util string variable = null; string condition = null; string after = null; - int root = CompilerConstants.IntegerNotSet; + RegistryRootType? root = null; string key = null; string value = null; YesNoType expand = YesNoType.NotSet; @@ -2715,7 +2718,7 @@ namespace WixToolset.Util this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); break; case "Root": - root = this.ParseHelper.GetAttributeMsidbRegistryRootValue(sourceLineNumbers, attrib, false); + root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); break; case "Key": key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -2764,7 +2767,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); } - if (CompilerConstants.IntegerNotSet == root) + if (!root.HasValue) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); } @@ -2834,7 +2837,7 @@ namespace WixToolset.Util } var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRegistrySearch", id); - row.Set(1, root); + row.Set(1, (int)root); row.Set(2, key); row.Set(3, value); row.Set(4, (int)attributes); @@ -3044,10 +3047,10 @@ namespace WixToolset.Util rebootMessage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "ResetPeriodInDays": - resetPeriod = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + resetPeriod = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; case "RestartServiceDelayInSeconds": - restartServiceDelay = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); + restartServiceDelay = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); break; case "SecondFailureActionType": secondFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -3511,7 +3514,7 @@ namespace WixToolset.Util } break; case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); break; case "Value": value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -3700,7 +3703,7 @@ namespace WixToolset.Util } break; case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); break; case "Value": value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -3874,38 +3877,21 @@ namespace WixToolset.Util /// private class ParsedPerformanceCounter { - string name; - string help; - int type; - string language; - internal ParsedPerformanceCounter(string name, string help, System.Diagnostics.PerformanceCounterType type, int language) { - this.name = name; - this.help = help; - this.type = (int)type; - this.language = language.ToString("D3", CultureInfo.InvariantCulture); + this.Name = name; + this.Help = help; + this.Type = (int)type; + this.Language = language.ToString("D3", CultureInfo.InvariantCulture); } - internal string Name - { - get { return this.name; } - } + internal string Name { get; } - internal string Help - { - get { return this.help; } - } + internal string Help { get; } - internal int Type - { - get { return this.type; } - } + internal int Type { get; } - internal string Language - { - get { return this.language; } - } + internal string Language { get; } } } } diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index f3d424e1..251c740a 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index a55e64fb..3af40366 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From c9546f882bde36d5b525f82280a1e09f81c08845 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 16 Oct 2019 15:40:26 -0400 Subject: Bring extension up to date. --- src/Cpp.Build.props | 2 +- src/ca/packages.config | 4 +- src/ca/utilca.vcxproj | 8 +- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Tuples/FileShareTuple.cs | 4 +- src/wixext/UtilCompiler.cs | 86 +++++++++++----------- src/wixext/tables.xml | 4 +- 7 files changed, 55 insertions(+), 55 deletions(-) (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 0e00132b..44a042c7 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -8,7 +8,7 @@ $(OutputPath)$(Platform)\ - + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) diff --git a/src/ca/packages.config b/src/ca/packages.config index b87f9ab4..4e9403bf 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 9bff19b0..2ec0c706 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -88,7 +88,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 7affe1f4..74cf9769 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -19,7 +19,7 @@ namespace WixToolsetTest.Util var results = build.BuildAndQuery(Build, "FileShare", "FileSharePermissions"); Assert.Equal(new[] { - "FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER\t\t0", + "FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER\t\t", "FileSharePermissions:ExampleFileShare\tEveryone\t1", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs index 043f24bd..5a31b6fa 100644 --- a/src/wixext/Tuples/FileShareTuple.cs +++ b/src/wixext/Tuples/FileShareTuple.cs @@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples set => this.Set((int)FileShareTupleFields.User_, value); } - public int Permissions + public int? Permissions { - get => this.Fields[(int)FileShareTupleFields.Permissions].AsNumber(); + get => this.Fields[(int)FileShareTupleFields.Permissions].AsNullableNumber(); set => this.Set((int)FileShareTupleFields.Permissions, value); } } diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 5adb5289..cc51733a 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -505,7 +505,7 @@ namespace WixToolset.Util break; } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixComponentSearch", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixComponentSearch", id); row.Set(1, guid); row.Set(2, productCode); row.Set(3, (int)attributes); @@ -662,26 +662,26 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; - Identifier id = this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + Identifier id = this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); if (null != categoryMessageFile) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); } if (CompilerConstants.IntegerNotSet != categoryCount) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); } if (null != parameterMessageFile) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); } if (0 != typesSupported) { - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); } var componentKeyPath = this.CreateComponentKeyPath(); @@ -845,7 +845,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixCloseApplication", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixCloseApplication", id); row.Set(1, target); row.Set(2, description); row.Set(3, condition); @@ -1087,7 +1087,7 @@ namespace WixToolset.Util /// private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixFileSearch", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixFileSearch", id); row.Set(1, path); //row.Set(2, minVersion; //row.Set(3, maxVersion; @@ -1108,7 +1108,7 @@ namespace WixToolset.Util /// A condition to test before evaluating the search. private void CreateWixSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string variable, string condition) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixSearch", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixSearch", id); row.Set(1, variable); row.Set(2, condition); } @@ -1122,7 +1122,7 @@ namespace WixToolset.Util /// Further details about the relation between id and parentId. private void CreateWixSearchRelationRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixSearchRelation", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixSearchRelation", id); row.Set(1, parentId); row.Set(2, attributes); } @@ -1217,7 +1217,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "FileShare"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "FileShare"); row.Set(0, id); row.Set(1, name); row.Set(2, componentId); @@ -1286,7 +1286,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "FileSharePermissions"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "FileSharePermissions"); row.Set(0, fileShareId); row.Set(1, user); row.Set(2, permission); @@ -1340,7 +1340,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "Group"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Group"); row.Set(0, id); row.Set(1, componentId); row.Set(2, name); @@ -1383,7 +1383,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "UserGroup"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "UserGroup"); row.Set(0, userId); row.Set(1, groupId); } @@ -1504,7 +1504,7 @@ namespace WixToolset.Util // add the appropriate extension based on type of shortcut name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixInternetShortcut"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixInternetShortcut"); row.Set(0, shortcutId); row.Set(1, componentId); row.Set(2, directoryId); @@ -1530,7 +1530,7 @@ namespace WixToolset.Util this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); // use built-in MSI functionality to remove the shortcuts rather than doing so via CA - row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "RemoveFile"); + row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "RemoveFile"); row.Set(0, shortcutId); row.Set(1, componentId); row.Set(2, this.ParseHelper.IsValidShortFilename(name, false) ? name : String.Concat(this.ParseHelper.CreateShortName(name, true, false, directoryId, name), "|", name)); @@ -1683,7 +1683,7 @@ namespace WixToolset.Util sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); // Add the calculated INI and H strings to the PerformanceCategory table. - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "PerformanceCategory"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "PerformanceCategory"); row.Set(0, id); row.Set(1, componentId); row.Set(2, name); @@ -1695,15 +1695,15 @@ namespace WixToolset.Util string linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); string performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); - this.ParseHelper.CreateRegistryRow(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); + this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } // Reference InstallPerfCounterData and UninstallPerfCounterData since nothing will happen without them @@ -2188,7 +2188,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "Perfmon"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Perfmon"); row.Set(0, componentId); row.Set(1, $"[#{fileId}]"); row.Set(2, name); @@ -2245,7 +2245,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "PerfmonManifest"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "PerfmonManifest"); row.Set(0, componentId); row.Set(1, $"[#{fileId}]"); row.Set(2, resourceFileDirectory); @@ -2319,7 +2319,7 @@ namespace WixToolset.Util break; } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixFormatFiles"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixFormatFiles"); row.Set(0, binaryId); row.Set(1, fileId); @@ -2370,13 +2370,13 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "EventManifest"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "EventManifest"); row.Set(0, componentId); row.Set(1, $"[#{fileId}]"); if (null != messageFile) { - var messageRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + var messageRow = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); messageRow.Set(0, String.Concat("Config_", fileId, "MessageFile")); messageRow.Set(1, $"[#{fileId}]"); messageRow.Set(2, "/*/*/*/*[\\[]@messageFileName[\\]]"); @@ -2387,7 +2387,7 @@ namespace WixToolset.Util } if (null != parameterFile) { - var resourceRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + var resourceRow = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); resourceRow.Set(0, String.Concat("Config_", fileId, "ParameterFile")); resourceRow.Set(1, $"[#{fileId}]"); resourceRow.Set(2, "/*/*/*/*[\\[]@parameterFileName[\\]]"); @@ -2398,7 +2398,7 @@ namespace WixToolset.Util } if (null != resourceFile) { - var resourceRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + var resourceRow = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); resourceRow.Set(0, String.Concat("Config_", fileId, "ResourceFile")); resourceRow.Set(1, $"[#{fileId}]"); resourceRow.Set(2, "/*/*/*/*[\\[]@resourceFileName[\\]]"); @@ -2558,7 +2558,7 @@ namespace WixToolset.Util this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects"); } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "SecureObjects"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "SecureObjects"); row.Set(0, objectId); row.Set(1, tableName); row.Set(2, domain); @@ -2680,7 +2680,7 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixProductSearch", id); row.Set(1, productCode ?? upgradeCode); row.Set(2, (int)attributes); } @@ -2836,7 +2836,7 @@ namespace WixToolset.Util this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRegistrySearch", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRegistrySearch", id); row.Set(1, (int)root); row.Set(2, key); row.Set(3, value); @@ -2919,7 +2919,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRemoveFolderEx", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRemoveFolderEx", id); row.Set(1, componentId); row.Set(2, property); row.Set(3, on); @@ -3004,7 +3004,7 @@ namespace WixToolset.Util this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRegisterRestartResources"); } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixRestartResource", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRestartResource", id); row.Set(1, componentId); row.Set(2, resource); row.Set(3, attributes); @@ -3104,7 +3104,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "ServiceConfig"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "ServiceConfig"); row.Set(0, serviceName); row.Set(1, componentId); row.Set(2, (newService ? 1 : 0)); @@ -3204,7 +3204,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixTouchFile", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixTouchFile", id); row.Set(1, componentId); row.Set(2, path); row.Set(3, attributes); @@ -3428,7 +3428,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "User", id); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "User", id); row.Set(1, componentId); row.Set(2, name); row.Set(3, domain); @@ -3560,7 +3560,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlFile"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); row.Set(0, id); row.Set(1, file); row.Set(2, elementPath); @@ -3798,7 +3798,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "XmlConfig"); + var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlConfig"); row.Set(0, id); row.Set(1, file); row.Set(2, elementId ?? elementPath); diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml index 190b0404..9f491e56 100644 --- a/src/wixext/tables.xml +++ b/src/wixext/tables.xml @@ -57,7 +57,7 @@ + description="Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"/> + description="Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"/> Date: Wed, 23 Oct 2019 21:25:57 -0400 Subject: Use strongly-typed tuple creation... ...especially for tuples shared with WixToolset.Data. Add bundle tests. --- src/FindLocalWix.props | 2 +- .../WixToolsetTest.Util/TestData/.Data/burn.exe | Bin 0 -> 463360 bytes .../TestData/BundleWithSearches/Bundle.en-us.wxl | 10 ++ .../TestData/BundleWithSearches/Bundle.wxs | 35 +++++++ .../BundleWithSearches/data/MsiPackage/Shared.dll | 1 + .../BundleWithSearches/data/MsiPackage/test.txt | 1 + .../TestData/BundleWithSearches/data/fakeba.dll | 1 + .../TestData/BundleWithSearches/data/test.msi | Bin 0 -> 32768 bytes .../WixToolsetTest.Util/UtilExtensionFixture.cs | 67 +++++++++++++ .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 7 ++ src/wixext/UtilCompiler.cs | 104 +++++++-------------- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 +- 13 files changed, 159 insertions(+), 75 deletions(-) create mode 100644 src/test/WixToolsetTest.Util/TestData/.Data/burn.exe create mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll create mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt create mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll create mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi (limited to 'src') diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props index a784e352..1666e4fe 100644 --- a/src/FindLocalWix.props +++ b/src/FindLocalWix.props @@ -3,6 +3,6 @@ - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets + $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets diff --git a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe b/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe new file mode 100644 index 00000000..2a4f423f Binary files /dev/null and b/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe differ diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl new file mode 100644 index 00000000..bc1dee83 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl @@ -0,0 +1,10 @@ + + + + + + ~TestBundle + + diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs new file mode 100644 index 00000000..cafd4255 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll new file mode 100644 index 00000000..0e461ba8 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll @@ -0,0 +1 @@ +This is Shared.dll. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt new file mode 100644 index 00000000..8b986220 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt @@ -0,0 +1 @@ +This is test.txt \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll new file mode 100644 index 00000000..970efdf0 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll @@ -0,0 +1 @@ +This is a fakeba.dll \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi new file mode 100644 index 00000000..0722d60e Binary files /dev/null and b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi differ diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 74cf9769..f2f06af8 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -2,9 +2,12 @@ namespace WixToolsetTest.Util { + using System.IO; using System.Linq; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; + using WixToolset.Data; + using WixToolset.Data.Tuples; using WixToolset.Util; using Xunit; @@ -24,6 +27,70 @@ namespace WixToolsetTest.Util }, results.OrderBy(s => s).ToArray()); } + [Fact] + public void CanBuildBundleWithSearches() + { + var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); + var folder = TestData.Get(@"TestData\BundleWithSearches"); + var rootFolder = TestData.Get(); + var wixext = Path.Combine(rootFolder, "WixToolset.Util.wixext.dll"); + + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var result = WixRunner.Execute(new[] + { + "build", + Path.Combine(folder, "Bundle.wxs"), + "-ext", wixext, + "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), + "-bindpath", Path.Combine(folder, "data"), + "-intermediateFolder", intermediateFolder, + "-burnStub", burnStubPath, + "-o", Path.Combine(baseFolder, @"bin\test.exe") + }); + + result.AssertSuccess(); + + Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe"))); +#if TODO + Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); +#endif + + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); + var section = intermediate.Sections.Single(); + + var searchTuples = section.Tuples.OfType().OrderBy(t => t.Id.Id).ToList(); + Assert.Equal(3, searchTuples.Count); + Assert.Equal("FileSearchId", searchTuples[0].Id.Id); + Assert.Equal("FileSearchVariable", searchTuples[0].Variable); + Assert.Equal("ProductSearchId", searchTuples[1].Id.Id); + Assert.Equal("ProductSearchVariable", searchTuples[1].Variable); + Assert.Equal("1 & 2 < 3", searchTuples[1].Condition); + Assert.Equal("RegistrySearchId", searchTuples[2].Id.Id); + Assert.Equal("RegistrySearchVariable", searchTuples[2].Variable); + + var fileSearchTuple = section.Tuples.OfType().Single(); + Assert.Equal("FileSearchId", fileSearchTuple.Id.Id); + Assert.Equal(@"%windir%\System32\mscoree.dll", fileSearchTuple.Path); + Assert.Equal(WixFileSearchAttributes.Default | WixFileSearchAttributes.WantExists, fileSearchTuple.Attributes); + + var productSearchTuple = section.Tuples.OfType().Single(); + Assert.Equal("ProductSearchId", productSearchTuple.Id.Id); + Assert.Equal("{738D02BF-E231-4370-8209-E9FD4E1BE2A1}", productSearchTuple.Guid); + Assert.Equal(WixProductSearchAttributes.Version | WixProductSearchAttributes.UpgradeCode, productSearchTuple.Attributes); + + var registrySearchTuple = section.Tuples.OfType().Single(); + Assert.Equal("RegistrySearchId", registrySearchTuple.Id.Id); + Assert.Equal(RegistryRootType.LocalMachine, registrySearchTuple.Root); + Assert.Equal(@"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full", registrySearchTuple.Key); + Assert.Equal("Release", registrySearchTuple.Value); + Assert.Equal(WixRegistrySearchAttributes.WantValue | WixRegistrySearchAttributes.Raw, registrySearchTuple.Attributes); + } + } + private static void Build(string[] args) { var result = WixRunner.Execute(args) diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 294844ac..6cf001a2 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -12,6 +12,13 @@ + + + + + + + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index cc51733a..19f4af06 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -34,55 +34,12 @@ namespace WixToolset.Util internal const int UserDontCreateUser = 0x00000200; internal const int UserNonVital = 0x00000400; - [Flags] - internal enum WixFileSearchAttributes - { - Default = 0x001, - MinVersionInclusive = 0x002, - MaxVersionInclusive = 0x004, - MinSizeInclusive = 0x008, - MaxSizeInclusive = 0x010, - MinDateInclusive = 0x020, - MaxDateInclusive = 0x040, - WantVersion = 0x080, - WantExists = 0x100, - IsDirectory = 0x200, - } - internal enum WixRegistrySearchFormat { Raw, Compatible, } - [Flags] - internal enum WixRegistrySearchAttributes - { - Raw = 0x01, - Compatible = 0x02, - ExpandEnvironmentVariables = 0x04, - WantValue = 0x08, - WantExists = 0x10, - Win64 = 0x20, - } - - internal enum WixComponentSearchAttributes - { - KeyPath = 0x1, - State = 0x2, - WantDirectory = 0x4, - } - - [Flags] - internal enum WixProductSearchAttributes - { - Version = 0x01, - Language = 0x02, - State = 0x04, - Assignment = 0x08, - UpgradeCode = 0x10, - } - internal enum WixRestartResourceAttributes { Filename = 1, @@ -505,10 +462,12 @@ namespace WixToolset.Util break; } - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixComponentSearch", id); - row.Set(1, guid); - row.Set(2, productCode); - row.Set(3, (int)attributes); + section.Tuples.Add(new WixComponentSearchTuple(sourceLineNumbers, id) + { + Guid = guid, + ProductCode = productCode, + Attributes = attributes, + }); } } @@ -1087,16 +1046,11 @@ namespace WixToolset.Util /// private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixFileSearch", id); - row.Set(1, path); - //row.Set(2, minVersion; - //row.Set(3, maxVersion; - //row.Set(4, minSize; - //row.Set(5, maxSize; - //row.Set(6, minDate; - //row.Set(7, maxDate; - //row.Set(8, languages; - row.Set(9, (int)attributes); + section.Tuples.Add(new WixFileSearchTuple(sourceLineNumbers, id) + { + Path = path, + Attributes = attributes, + }); } /// @@ -1108,9 +1062,11 @@ namespace WixToolset.Util /// A condition to test before evaluating the search. private void CreateWixSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string variable, string condition) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixSearch", id); - row.Set(1, variable); - row.Set(2, condition); + section.Tuples.Add(new WixSearchTuple(sourceLineNumbers, id) + { + Variable = variable, + Condition = condition, + }); } /// @@ -1122,9 +1078,11 @@ namespace WixToolset.Util /// Further details about the relation between id and parentId. private void CreateWixSearchRelationRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixSearchRelation", id); - row.Set(1, parentId); - row.Set(2, attributes); + section.Tuples.Add(new WixSearchRelationTuple(sourceLineNumbers, id) + { + ParentSearchRef = parentId, + Attributes = attributes, + }); } /// @@ -2680,9 +2638,11 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixProductSearch", id); - row.Set(1, productCode ?? upgradeCode); - row.Set(2, (int)attributes); + section.Tuples.Add(new WixProductSearchTuple(sourceLineNumbers, id) + { + Guid = productCode ?? upgradeCode, + Attributes = attributes, + }); } } @@ -2836,11 +2796,13 @@ namespace WixToolset.Util this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); } - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRegistrySearch", id); - row.Set(1, (int)root); - row.Set(2, key); - row.Set(3, value); - row.Set(4, (int)attributes); + section.Tuples.Add(new WixRegistrySearchTuple(sourceLineNumbers, id) + { + Root = (RegistryRootType)root, + Key = key, + Value = value, + Attributes = attributes, + }); } } diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 251c740a..ba4482d2 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 3af40366..cc68d92c 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From aa9706af2db5b60851355cb0c7284c7030bc9095 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 28 Oct 2019 20:27:44 -0400 Subject: Update to latest Tools. --- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index ba4482d2..1ae2b79f 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index cc68d92c..083fc5b7 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 9af89722446a20f098c30b6abab14d91c4e15161 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 11 Nov 2019 12:41:08 +1000 Subject: Update to latest Tools. --- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 1ae2b79f..aa972e26 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 083fc5b7..260fa86a 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 4fe2491bf3a7f7946d8c4288e12a2539469b6e54 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 21 Jan 2020 19:55:04 -0500 Subject: Update build tools to pick up important fixes. --- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index aa972e26..06184af1 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 260fa86a..f9dbabb8 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 2975b824a86fcb5164d6088a7767aead57bf1009 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 20 Feb 2020 21:23:14 -0500 Subject: Update extension for Data and Extensibility changes. --- src/wixext/UtilWindowsInstallerBackendExtension.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index 0cb09678..2365ed01 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -1,7 +1,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. +// 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.Util { + using System.Collections.Generic; using System.Linq; using System.Xml; using WixToolset.Data.WindowsInstaller; @@ -11,7 +12,7 @@ namespace WixToolset.Util { private static readonly TableDefinition[] Tables = LoadTables(); - protected override TableDefinition[] TableDefinitionsForTuples => Tables; + public override IEnumerable TableDefinitions { get => Tables; } private static TableDefinition[] LoadTables() { -- cgit v1.2.3-55-g6feb From e9d10933bedb8215ec50ca85db272d6647426b31 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 5 Mar 2020 19:48:12 -0500 Subject: Version extension ids. Partial fix for wixtoolset/issues#5933. --- src/ca/CloseApps.cpp | 28 +- src/ca/FormatFiles.cpp | 18 +- src/ca/RemoveFoldersEx.cpp | 14 +- src/ca/RestartManager.cpp | 8 +- src/ca/TouchFile.cpp | 16 +- src/ca/XmlConfig.cpp | 40 +- src/ca/XmlFile.cpp | 40 +- src/ca/caDecor.h | 13 + src/ca/caSuffix.h | 11 - src/ca/netshortcuts.cpp | 16 +- src/ca/precomp.h | 2 +- src/ca/scamanifest.cpp | 76 +-- src/ca/scaperf.cpp | 64 +-- src/ca/scaperfexec.cpp | 4 +- src/ca/scasched.cpp | 16 +- src/ca/scasmb.h | 2 +- src/ca/scasmbsched.cpp | 50 +- src/ca/scauser.cpp | 108 ++-- src/ca/secureobj.cpp | 22 +- src/ca/serviceconfig.cpp | 10 +- src/ca/utilca.vcxproj | 2 +- .../TestData/CloseApplication/Package.en-us.wxl | 11 + .../TestData/CloseApplication/Package.wxs | 24 + .../CloseApplication/PackageComponents.wxs | 11 + .../TestData/CloseApplication/example.txt | 1 + .../TestData/EventManifest/Package.en-us.wxl | 11 + .../TestData/EventManifest/Package.wxs | 22 + .../TestData/EventManifest/PackageComponents.wxs | 13 + .../TestData/EventManifest/example.txt | 1 + .../TestData/InternetShortcut/Package.en-us.wxl | 11 + .../TestData/InternetShortcut/Package.wxs | 22 + .../InternetShortcut/PackageComponents.wxs | 12 + .../TestData/InternetShortcut/example.txt | 1 + .../TestData/PermissionEx/Package.en-us.wxl | 11 + .../TestData/PermissionEx/Package.wxs | 22 + .../TestData/PermissionEx/PackageComponents.wxs | 14 + .../TestData/PermissionEx/example.txt | 1 + .../WixToolsetTest.Util/UtilExtensionFixture.cs | 127 ++++- .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 16 + src/wixext/Tuples/EventManifestTuple.cs | 10 +- src/wixext/Tuples/FileSharePermissionsTuple.cs | 20 +- src/wixext/Tuples/FileShareTuple.cs | 44 +- src/wixext/Tuples/GroupTuple.cs | 10 +- src/wixext/Tuples/PerfmonManifestTuple.cs | 10 +- src/wixext/Tuples/PerfmonTuple.cs | 10 +- src/wixext/Tuples/PerformanceCategoryTuple.cs | 18 +- src/wixext/Tuples/SecureObjectsTuple.cs | 18 +- src/wixext/Tuples/ServiceConfigTuple.cs | 10 +- src/wixext/Tuples/UserGroupTuple.cs | 20 +- src/wixext/Tuples/UserTuple.cs | 18 +- src/wixext/Tuples/WixCloseApplicationTuple.cs | 8 - src/wixext/Tuples/WixFormatFilesTuple.cs | 20 +- src/wixext/Tuples/WixInternetShortcutTuple.cs | 28 +- src/wixext/Tuples/WixRemoveFolderExTuple.cs | 18 +- src/wixext/Tuples/WixRestartResourceTuple.cs | 18 +- src/wixext/Tuples/WixTouchFileTuple.cs | 18 +- src/wixext/Tuples/XmlConfigTuple.cs | 18 +- src/wixext/Tuples/XmlFileTuple.cs | 18 +- src/wixext/UtilCompiler.cs | 599 +++++++++------------ src/wixext/UtilWindowsInstallerBackendExtension.cs | 7 + src/wixext/WixToolset.Util.wixext.csproj | 1 + src/wixext/tables.xml | 86 ++- src/wixlib/UtilExtension.wxs | 181 +++---- src/wixlib/UtilExtension_Platform.wxi | 179 +++--- src/wixlib/caDecor.wxi | 40 ++ src/wixlib/caSuffix.wxi | 28 - src/wixlib/util.wixproj | 2 +- 67 files changed, 1240 insertions(+), 1108 deletions(-) create mode 100644 src/ca/caDecor.h delete mode 100644 src/ca/caSuffix.h create mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt create mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt create mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt create mode 100644 src/wixlib/caDecor.wxi delete mode 100644 src/wixlib/caSuffix.wxi (limited to 'src') diff --git a/src/ca/CloseApps.cpp b/src/ca/CloseApps.cpp index a3f28ed3..63be353c 100644 --- a/src/ca/CloseApps.cpp +++ b/src/ca/CloseApps.cpp @@ -4,10 +4,8 @@ #define DEFAULT_PROCESS_EXIT_WAIT_TIME 5000 -// WixCloseApplication Target Description Condition Attributes Sequence - // structs -LPCWSTR wzQUERY_CLOSEAPPS = L"SELECT `WixCloseApplication`, `Target`, `Description`, `Condition`, `Attributes`, `Property`, `TerminateExitCode`, `Timeout` FROM `WixCloseApplication` ORDER BY `Sequence`"; +LPCWSTR wzQUERY_CLOSEAPPS = L"SELECT `Wix4CloseApplication`, `Target`, `Description`, `Condition`, `Attributes`, `Property`, `TerminateExitCode`, `Timeout` FROM `Wix4CloseApplication` ORDER BY `Sequence`"; enum eQUERY_CLOSEAPPS { QCA_ID = 1, QCA_TARGET, QCA_DESCRIPTION, QCA_CONDITION, QCA_ATTRIBUTES, QCA_PROPERTY, QCA_TERMINATEEXITCODE, QCA_TIMEOUT }; // CloseApplication.Attributes @@ -294,14 +292,14 @@ extern "C" UINT __stdcall WixCloseApplications( // loop through all the objects to be secured // hr = WcaOpenExecuteView(wzQUERY_CLOSEAPPS, &hView); - ExitOnFailure(hr, "failed to open view on WixCloseApplication table"); + ExitOnFailure(hr, "failed to open view on Wix4CloseApplication table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { hr = WcaGetRecordString(hRec, QCA_ID, &pwzId); - ExitOnFailure(hr, "failed to get id from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get id from Wix4CloseApplication table"); hr = WcaGetRecordString(hRec, QCA_CONDITION, &pwzCondition); - ExitOnFailure(hr, "failed to get condition from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get condition from Wix4CloseApplication table"); if (pwzCondition && *pwzCondition) { @@ -309,7 +307,7 @@ extern "C" UINT __stdcall WixCloseApplications( if (MSICONDITION_ERROR == condition) { hr = E_INVALIDARG; - ExitOnFailure(hr, "failed to process condition for WixCloseApplication '%ls'", pwzId); + ExitOnFailure(hr, "failed to process condition for Wix4CloseApplication '%ls'", pwzId); } else if (MSICONDITION_FALSE == condition) { @@ -318,16 +316,16 @@ extern "C" UINT __stdcall WixCloseApplications( } hr = WcaGetRecordFormattedString(hRec, QCA_TARGET, &pwzTarget); - ExitOnFailure(hr, "failed to get target from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get target from Wix4CloseApplication table"); hr = WcaGetRecordFormattedString(hRec, QCA_DESCRIPTION, &pwzDescription); - ExitOnFailure(hr, "failed to get description from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get description from Wix4CloseApplication table"); hr = WcaGetRecordInteger(hRec, QCA_ATTRIBUTES, reinterpret_cast(&dwAttributes)); - ExitOnFailure(hr, "failed to get attributes from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get attributes from Wix4CloseApplication table"); hr = WcaGetRecordFormattedString(hRec, QCA_PROPERTY, &pwzProperty); - ExitOnFailure(hr, "failed to get property from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get property from Wix4CloseApplication table"); hr = WcaGetRecordInteger(hRec, QCA_TERMINATEEXITCODE, reinterpret_cast(&dwTerminateExitCode)); if (S_FALSE == hr) @@ -335,7 +333,7 @@ extern "C" UINT __stdcall WixCloseApplications( dwTerminateExitCode = 0; hr = S_OK; } - ExitOnFailure(hr, "failed to get timeout from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get timeout from Wix4CloseApplication table"); hr = WcaGetRecordInteger(hRec, QCA_TIMEOUT, reinterpret_cast(&dwTimeout)); if (S_FALSE == hr) @@ -343,7 +341,7 @@ extern "C" UINT __stdcall WixCloseApplications( dwTimeout = DEFAULT_PROCESS_EXIT_WAIT_TIME; hr = S_OK; } - ExitOnFailure(hr, "failed to get timeout from WixCloseApplication table"); + ExitOnFailure(hr, "failed to get timeout from Wix4CloseApplication table"); // Before trying any changes to the machine, prompt if requested. if (dwAttributes & CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE) @@ -433,8 +431,8 @@ extern "C" UINT __stdcall WixCloseApplications( { Assert(0 < cCloseApps); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixCloseApplicationsDeferred"), pwzCustomActionData, cCloseApps * COST_CLOSEAPP); - ExitOnFailure(hr, "failed to schedule WixCloseApplicationsDeferred action"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CloseApplicationsDeferred"), pwzCustomActionData, cCloseApps * COST_CLOSEAPP); + ExitOnFailure(hr, "failed to schedule CloseApplicationsDeferred action"); } LExit: diff --git a/src/ca/FormatFiles.cpp b/src/ca/FormatFiles.cpp index 6a816700..464b92d6 100644 --- a/src/ca/FormatFiles.cpp +++ b/src/ca/FormatFiles.cpp @@ -27,9 +27,9 @@ extern "C" UINT __stdcall WixSchedFormatFiles( PSCZ sczRollbackCustomActionData; LPCWSTR wzQuery = - L"SELECT `WixFormatFiles`.`Binary_`, `WixFormatFiles`.`File_`, `File`.`Component_` " - L"FROM `WixFormatFiles`, `File` " - L"WHERE `WixFormatFiles`.`File_` = `File`.`File`"; + L"SELECT `Wix4FormatFile`.`Binary_`, `Wix4FormatFile`.`File_`, `File`.`Component_` " + L"FROM `Wix4FormatFile`, `File` " + L"WHERE `Wix4FormatFile`.`File_` = `File`.`File`"; enum eQuery { eqBinaryKey = 1, eqFileKey, eqComponentKey }; // initialize @@ -38,7 +38,7 @@ extern "C" UINT __stdcall WixSchedFormatFiles( // query and loop through all the files hr = WcaOpenExecuteView(wzQuery, &hView); - ExitOnFailure(hr, "Failed to open view on WixFormatFiles table"); + ExitOnFailure(hr, "Failed to open view on Wix4FormatFile table"); DWORD cFiles = 0; while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) @@ -100,19 +100,19 @@ extern "C" UINT __stdcall WixSchedFormatFiles( { hr = S_OK; } - ExitOnFailure(hr, "Failure occurred while processing WixFormatFiles table"); + ExitOnFailure(hr, "Failure occurred while processing Wix4FormatFile table"); // schedule deferred CAs if there's anything to do if (sczRollbackCustomActionData && *sczRollbackCustomActionData) { - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixRollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); - ExitOnFailure(hr, "Failed to schedule WixRollbackFormatFiles"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); + ExitOnFailure(hr, "Failed to schedule RollbackFormatFiles"); } if (sczExecCustomActionData && *sczExecCustomActionData) { - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); - ExitOnFailure(hr, "Failed to schedule WixExecFormatFiles"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); + ExitOnFailure(hr, "Failed to schedule ExecFormatFiles"); } LExit: diff --git a/src/ca/RemoveFoldersEx.cpp b/src/ca/RemoveFoldersEx.cpp index 194c6662..ce64c2c2 100644 --- a/src/ca/RemoveFoldersEx.cpp +++ b/src/ca/RemoveFoldersEx.cpp @@ -2,7 +2,7 @@ #include "precomp.h" -LPCWSTR vcsRemoveFolderExQuery = L"SELECT `WixRemoveFolderEx`, `Component_`, `Property`, `InstallMode` FROM `WixRemoveFolderEx`"; +LPCWSTR vcsRemoveFolderExQuery = L"SELECT `Wix4RemoveFolderEx`, `Component_`, `Property`, `InstallMode` FROM `Wix4RemoveFolderEx`"; enum eRemoveFolderExQuery { rfqId = 1, rfqComponent, rfqProperty, feqMode }; static HRESULT RecursePath( @@ -81,10 +81,10 @@ static HRESULT RecursePath( // Add the row to remove any files and another row to remove the folder. hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFiles", wzComponent, L"*.*", sczProperty, iMode); - ExitOnFailure(hr, "Failed to add row to remove all files for WixRemoveFolderEx row: %S under path:", wzId, wzPath); + ExitOnFailure(hr, "Failed to add row to remove all files for Wix4RemoveFolderEx row: %S under path:", wzId, wzPath); hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFolder", wzComponent, NULL, sczProperty, iMode); - ExitOnFailure(hr, "Failed to add row to remove folder for WixRemoveFolderEx row: %S under path: %S", wzId, wzPath); + ExitOnFailure(hr, "Failed to add row to remove folder for Wix4RemoveFolderEx row: %S under path: %S", wzId, wzPath); LExit: if (INVALID_HANDLE_VALUE != hFind) @@ -122,15 +122,15 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( ExitOnFailure(hr, "Failed to initialize WixRemoveFoldersEx."); // anything to do? - if (S_OK != WcaTableExists(L"WixRemoveFolderEx")) + if (S_OK != WcaTableExists(L"Wix4RemoveFolderEx")) { - WcaLog(LOGMSG_STANDARD, "WixRemoveFolderEx table doesn't exist, so there are no folders to remove."); + WcaLog(LOGMSG_STANDARD, "Wix4RemoveFolderEx table doesn't exist, so there are no folders to remove."); ExitFunction(); } // query and loop through all the remove folders exceptions hr = WcaOpenExecuteView(vcsRemoveFolderExQuery, &hView); - ExitOnFailure(hr, "Failed to open view on WixRemoveFolderEx table"); + ExitOnFailure(hr, "Failed to open view on Wix4RemoveFolderEx table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { @@ -173,7 +173,7 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( { hr = S_OK; } - ExitOnFailure(hr, "Failure occured while processing WixRemoveFolderEx table"); + ExitOnFailure(hr, "Failure occured while processing Wix4RemoveFolderEx table"); LExit: if (hColumns) diff --git a/src/ca/RestartManager.cpp b/src/ca/RestartManager.cpp index 3cfc07ee..c31819c1 100644 --- a/src/ca/RestartManager.cpp +++ b/src/ca/RestartManager.cpp @@ -18,8 +18,8 @@ enum eRmuResourceType }; LPCWSTR vcsRestartResourceQuery = - L"SELECT `WixRestartResource`.`WixRestartResource`, `WixRestartResource`.`Component_`, `WixRestartResource`.`Resource`, `WixRestartResource`.`Attributes` " - L"FROM `WixRestartResource`"; + L"SELECT `Wix4RestartResource`.`Wix4RestartResource`, `Wix4RestartResource`.`Component_`, `Wix4RestartResource`.`Resource`, `Wix4RestartResource`.`Attributes` " + L"FROM `Wix4RestartResource`"; enum eRestartResourceQuery { rrqRestartResource = 1, rrqComponent, rrqResource, rrqAttributes }; /******************************************************************** @@ -58,9 +58,9 @@ extern "C" UINT __stdcall WixRegisterRestartResources( ExitOnFailure(hr, "Failed to initialize."); // Skip if the table doesn't exist. - if (S_OK != WcaTableExists(L"WixRestartResource")) + if (S_OK != WcaTableExists(L"Wix4RestartResource")) { - WcaLog(LOGMSG_STANDARD, "The RestartResource table does not exist; there are no resources to register with Restart Manager."); + WcaLog(LOGMSG_STANDARD, "The Wix4RestartResource table does not exist; there are no resources to register with Restart Manager."); ExitFunction(); } diff --git a/src/ca/TouchFile.cpp b/src/ca/TouchFile.cpp index 1c40a3eb..e704f922 100644 --- a/src/ca/TouchFile.cpp +++ b/src/ca/TouchFile.cpp @@ -2,7 +2,7 @@ #include "precomp.h" -LPCWSTR vcsTouchFileQuery = L"SELECT `WixTouchFile`, `Component_`, `Path`, `Attributes` FROM `WixTouchFile`"; +LPCWSTR vcsTouchFileQuery = L"SELECT `Wix4TouchFile`, `Component_`, `Path`, `Attributes` FROM `Wix4TouchFile`"; enum TOUCH_FILE_QUERY { tfqId = 1, tfqComponent, tfqPath, tfqTouchFileAttributes }; enum TOUCH_FILE_ATTRIBUTE @@ -134,7 +134,7 @@ static HRESULT ProcessTouchFileTable( LPWSTR sczRollbackData = NULL; LPWSTR sczExecuteData = NULL; - if (S_OK != WcaTableExists(L"WixTouchFile")) + if (S_OK != WcaTableExists(L"Wix4TouchFile")) { ExitFunction(); } @@ -142,7 +142,7 @@ static HRESULT ProcessTouchFileTable( ::GetSystemTimeAsFileTime(&ftModified); hr = WcaOpenExecuteView(vcsTouchFileQuery, &hView); - ExitOnFailure(hr, "Failed to open view on WixTouchFile table"); + ExitOnFailure(hr, "Failed to open view on Wix4TouchFile table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { @@ -181,18 +181,18 @@ static HRESULT ProcessTouchFileTable( { hr = S_OK; } - ExitOnFailure(hr, "Failure occured while processing WixTouchFile table"); + ExitOnFailure(hr, "Failure occured while processing Wix4TouchFile table"); if (sczRollbackData) { - hr = WcaDoDeferredAction(L"WixRollbackTouchFile", sczRollbackData, 0); - ExitOnFailure(hr, "Failed to schedule WixRollbackTouchFile"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackTouchFile"), sczRollbackData, 0); + ExitOnFailure(hr, "Failed to schedule RollbackTouchFile"); } if (sczExecuteData) { - hr = WcaDoDeferredAction(L"WixExecuteTouchFile", sczExecuteData, 0); - ExitOnFailure(hr, "Failed to schedule WixExecuteTouchFile"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecuteTouchFile"), sczExecuteData, 0); + ExitOnFailure(hr, "Failed to schedule ExecuteTouchFile"); } LExit: diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp index c12b2bc2..8c60979d 100644 --- a/src/ca/XmlConfig.cpp +++ b/src/ca/XmlConfig.cpp @@ -30,9 +30,9 @@ enum eXmlPreserveDate }; LPCWSTR vcsXmlConfigQuery = - L"SELECT `XmlConfig`.`XmlConfig`, `XmlConfig`.`File`, `XmlConfig`.`ElementPath`, `XmlConfig`.`VerifyPath`, `XmlConfig`.`Name`, " - L"`XmlConfig`.`Value`, `XmlConfig`.`Flags`, `XmlConfig`.`Component_`, `Component`.`Attributes` " - L"FROM `XmlConfig`,`Component` WHERE `XmlConfig`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; + L"SELECT `Wix4XmlConfig`.`Wix4XmlConfig`, `Wix4XmlConfig`.`File`, `Wix4XmlConfig`.`ElementPath`, `Wix4XmlConfig`.`VerifyPath`, `Wix4XmlConfig`.`Name`, " + L"`Wix4XmlConfig`.`Value`, `Wix4XmlConfig`.`Flags`, `Wix4XmlConfig`.`Component_`, `Component`.`Attributes` " + L"FROM `Wix4XmlConfig`,`Component` WHERE `Wix4XmlConfig`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; enum eXmlConfigQuery { xfqXmlConfig = 1, xfqFile, xfqElementPath, xfqVerifyPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; struct XML_CONFIG_CHANGE @@ -146,7 +146,7 @@ static HRESULT ReadXmlConfigTable( // loop through all the xml configurations hr = WcaOpenExecuteView(vcsXmlConfigQuery, &hView); - ExitOnFailure(hr, "failed to open view on XmlConfig table"); + ExitOnFailure(hr, "failed to open view on Wix4XmlConfig table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { @@ -155,13 +155,13 @@ static HRESULT ReadXmlConfigTable( // Get record Id hr = WcaGetRecordString(hRec, xfqXmlConfig, &pwzData); - ExitOnFailure(hr, "failed to get XmlConfig record Id"); + ExitOnFailure(hr, "failed to get Wix4XmlConfig record Id"); hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); - ExitOnFailure(hr, "failed to copy XmlConfig record Id"); + ExitOnFailure(hr, "failed to copy Wix4XmlConfig record Id"); // Get component name hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); - ExitOnFailure(hr, "failed to get component name for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get component name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); // Get the component's state if (0 < lstrlenW(pwzData)) @@ -175,45 +175,45 @@ static HRESULT ReadXmlConfigTable( // Get the xml file hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); - ExitOnFailure(hr, "failed to get xml file for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get xml file for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); ExitOnFailure(hr, "failed to copy xml file path"); // Figure out if the file is already on the machine or if it's being installed hr = WcaGetRecordString(hRec, xfqFile, &pwzData); - ExitOnFailure(hr, "failed to get xml file for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get xml file for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); if (NULL != wcsstr(pwzData, L"[!") || NULL != wcsstr(pwzData, L"[#")) { (*ppxfcTail)->fInstalledFile = TRUE; } - // Get the XmlConfig table flags + // Get the Wix4XmlConfig table flags hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); - ExitOnFailure(hr, "failed to get XmlConfig flags for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Wix4XmlConfig flags for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); // Get the Element Path hr = WcaGetRecordFormattedString(hRec, xfqElementPath, &(*ppxfcTail)->pwzElementPath); - ExitOnFailure(hr, "failed to get Element Path for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Element Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); // Get the Verify Path hr = WcaGetRecordFormattedString(hRec, xfqVerifyPath, &(*ppxfcTail)->pwzVerifyPath); - ExitOnFailure(hr, "failed to get Verify Path for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Verify Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); // Get the name hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); - ExitOnFailure(hr, "failed to get Name for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); ExitOnFailure(hr, "failed to copy name of element"); // Get the value hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); - ExitOnFailure(hr, "failed to get Value for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Value for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); ExitOnFailure(hr, "failed to allocate buffer for value"); // Get the component attributes hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); - ExitOnFailure(hr, "failed to get component attributes for XmlConfig: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get component attributes for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); } // if we looped through all records all is well @@ -359,7 +359,7 @@ static HRESULT BeginChangeFile( hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlConfigRollback"), pwzRollbackCustomActionData, COST_XMLFILE); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlConfigRollback"), pwzRollbackCustomActionData, COST_XMLFILE); ExitOnFailure(hr, "failed to schedule ExecXmlConfigRollback for file: %ls", pwzFile); ReleaseStr(pwzRollbackCustomActionData); @@ -459,10 +459,10 @@ extern "C" UINT __stdcall SchedXmlConfig( ExitOnFailure(hr, "failed to initialize"); hr = ReadXmlConfigTable(&pxfcHead, &pxfcTail); - MessageExitOnFailure(hr, msierrXmlConfigFailedRead, "failed to read XmlConfig table"); + MessageExitOnFailure(hr, msierrXmlConfigFailedRead, "failed to read Wix4XmlConfig table"); hr = ProcessChanges(&pxfcHead); - ExitOnFailure(hr, "failed to process XmlConfig changes"); + ExitOnFailure(hr, "failed to process Wix4XmlConfig changes"); // loop through all the xml configurations for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) @@ -557,7 +557,7 @@ extern "C" UINT __stdcall SchedXmlConfig( { Assert(0 < cFiles); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlConfig"), pwzCustomActionData, cFiles * COST_XMLFILE); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlConfig"), pwzCustomActionData, cFiles * COST_XMLFILE); ExitOnFailure(hr, "failed to schedule ExecXmlConfig action"); } diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp index fc6f519b..95449126 100644 --- a/src/ca/XmlFile.cpp +++ b/src/ca/XmlFile.cpp @@ -36,9 +36,9 @@ enum eXmlSelectionLanguage }; LPCWSTR vcsXmlFileQuery = - L"SELECT `XmlFile`.`XmlFile`, `XmlFile`.`File`, `XmlFile`.`ElementPath`, `XmlFile`.`Name`, `XmlFile`.`Value`, " - L"`XmlFile`.`Flags`, `XmlFile`.`Component_`, `Component`.`Attributes` " - L"FROM `XmlFile`,`Component` WHERE `XmlFile`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; + L"SELECT `Wix4XmlFile`.`Wix4XmlFile`, `Wix4XmlFile`.`File`, `Wix4XmlFile`.`ElementPath`, `Wix4XmlFile`.`Name`, `Wix4XmlFile`.`Value`, " + L"`Wix4XmlFile`.`Flags`, `Wix4XmlFile`.`Component_`, `Component`.`Attributes` " + L"FROM `Wix4XmlFile`,`Component` WHERE `Wix4XmlFile`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; enum eXmlFileQuery { xfqXmlFile = 1, xfqFile, xfqXPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; struct XML_FILE_CHANGE @@ -130,12 +130,14 @@ static HRESULT ReadXmlFileTable( LPWSTR pwzData = NULL; // check to see if necessary tables are specified - if (S_FALSE == WcaTableExists(L"XmlFile")) + if (S_FALSE == WcaTableExists(L"Wix4XmlFile")) + { ExitFunction1(hr = S_FALSE); + } // loop through all the xml configurations hr = WcaOpenExecuteView(vcsXmlFileQuery, &hView); - ExitOnFailure(hr, "failed to open view on XmlFile table"); + ExitOnFailure(hr, "failed to open view on Wix4XmlFile table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { @@ -144,13 +146,13 @@ static HRESULT ReadXmlFileTable( // Get record Id hr = WcaGetRecordString(hRec, xfqXmlFile, &pwzData); - ExitOnFailure(hr, "failed to get XmlFile record Id"); + ExitOnFailure(hr, "failed to get Wix4XmlFile record Id"); hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); - ExitOnFailure(hr, "failed to copy XmlFile record Id"); + ExitOnFailure(hr, "failed to copy Wix4XmlFile record Id"); // Get component name hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); - ExitOnFailure(hr, "failed to get component name for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get component name for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); // Get the component's state er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); @@ -158,33 +160,33 @@ static HRESULT ReadXmlFileTable( // Get the xml file hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); - ExitOnFailure(hr, "failed to get xml file for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get xml file for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); ExitOnFailure(hr, "failed to copy xml file path"); - // Get the XmlFile table flags + // Get the Wix4XmlFile table flags hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); - ExitOnFailure(hr, "failed to get XmlFile flags for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Wix4XmlFile flags for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); // Get the XPath hr = WcaGetRecordFormattedString(hRec, xfqXPath, &(*ppxfcTail)->pwzElementPath); - ExitOnFailure(hr, "failed to get XPath for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get XPath for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); // Get the name hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); - ExitOnFailure(hr, "failed to get Name for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Name for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); ExitOnFailure(hr, "failed to copy name of element"); // Get the value hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); - ExitOnFailure(hr, "failed to get Value for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get Value for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); ExitOnFailure(hr, "failed to allocate buffer for value"); // Get the component attributes hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); - ExitOnFailure(hr, "failed to get component attributes for XmlFile: %ls", (*ppxfcTail)->wzId); + ExitOnFailure(hr, "failed to get component attributes for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); } // if we looped through all records all is well @@ -254,7 +256,7 @@ static HRESULT BeginChangeFile( hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlFileRollback"), pwzRollbackCustomActionData, COST_XMLFILE); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlFileRollback"), pwzRollbackCustomActionData, COST_XMLFILE); ExitOnFailure(hr, "failed to schedule ExecXmlFileRollback for file: %ls", pwzFile); ReleaseStr(pwzRollbackCustomActionData); @@ -325,11 +327,11 @@ extern "C" UINT __stdcall SchedXmlFile( hr = ReadXmlFileTable(&pxfcHead, &pxfcTail); if (S_FALSE == hr) { - WcaLog(LOGMSG_VERBOSE, "Skipping SchedXmlFile because XmlFile table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping SchedXmlFile because Wix4XmlFile table not present"); ExitFunction1(hr = S_OK); } - MessageExitOnFailure(hr, msierrXmlFileFailedRead, "failed to read XmlFile table"); + MessageExitOnFailure(hr, msierrXmlFileFailedRead, "failed to read Wix4XmlFile table"); // loop through all the xml configurations for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) @@ -454,7 +456,7 @@ extern "C" UINT __stdcall SchedXmlFile( { Assert(0 < cFiles); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecXmlFile"), pwzCustomActionData, cFiles * COST_XMLFILE); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlFile"), pwzCustomActionData, cFiles * COST_XMLFILE); ExitOnFailure(hr, "failed to schedule ExecXmlFile action"); } diff --git a/src/ca/caDecor.h b/src/ca/caDecor.h new file mode 100644 index 00000000..56cfb201 --- /dev/null +++ b/src/ca/caDecor.h @@ -0,0 +1,13 @@ +#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. + + +#if defined(_M_ARM64) +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64" +#elif defined(_M_AMD64) +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64" +#elif defined(_M_ARM) +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM" +#else +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86" +#endif diff --git a/src/ca/caSuffix.h b/src/ca/caSuffix.h deleted file mode 100644 index 303a99e9..00000000 --- a/src/ca/caSuffix.h +++ /dev/null @@ -1,11 +0,0 @@ -#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. - - -#if defined _WIN64 -#define PLATFORM_DECORATION(f) f L"_64" -#elif defined ARM -#define PLATFORM_DECORATION(f) f L"_ARM" -#else -#define PLATFORM_DECORATION(f) f -#endif diff --git a/src/ca/netshortcuts.cpp b/src/ca/netshortcuts.cpp index 59ef838b..6ff129db 100644 --- a/src/ca/netshortcuts.cpp +++ b/src/ca/netshortcuts.cpp @@ -4,7 +4,7 @@ LPCWSTR vcsShortcutsQuery = L"SELECT `Component_`, `Directory_`, `Name`, `Target`, `Attributes`, `IconFile`, `IconIndex` " - L"FROM `WixInternetShortcut`"; + L"FROM `Wix4InternetShortcut`"; enum eShortcutsQuery { esqComponent = 1, esqDirectory, esqFilename, esqTarget, esqAttributes, esqIconFile, esqIconIndex }; enum eShortcutsAttributes { esaLink = 0, esaURL = 1 }; @@ -44,9 +44,9 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts( ExitOnFailure(hr, "failed to initialize WixSchedInternetShortcuts."); // anything to do? - if (S_OK != WcaTableExists(L"WixInternetShortcut")) + if (S_OK != WcaTableExists(L"Wix4InternetShortcut")) { - WcaLog(LOGMSG_STANDARD, "WixInternetShortcut table doesn't exist, so there are no Internet shortcuts to process"); + WcaLog(LOGMSG_STANDARD, "Wix4InternetShortcut table doesn't exist, so there are no Internet shortcuts to process"); goto LExit; } @@ -71,7 +71,7 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts( // query and loop through all the shortcuts hr = WcaOpenExecuteView(vcsShortcutsQuery, &hView); - ExitOnFailure(hr, "failed to open view on WixInternetShortcut table"); + ExitOnFailure(hr, "failed to open view on Wix4InternetShortcut table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { @@ -91,7 +91,7 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts( hr = WcaGetRecordInteger(hRec, esqIconIndex, &iIconIndex); ExitOnFailure(hr, "failed to get shortcut icon index"); - // skip processing this WixInternetShortcut row if the component isn't being configured + // skip processing this Wix4InternetShortcut row if the component isn't being configured WCA_TODO todo = WcaGetComponentToDo(pwzComponent); if (WCA_TODO_UNKNOWN == todo) { @@ -144,7 +144,7 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts( { hr = S_OK; } - ExitOnFailure(hr, "Failure occured while processing WixInternetShortcut table"); + ExitOnFailure(hr, "Failure occured while processing Wix4InternetShortcut table"); // if we have any shortcuts to install if (pwzCustomActionData && *pwzCustomActionData) @@ -154,9 +154,9 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts( ExitOnFailure(hr, "failed to extend progress bar for InternetShortcuts"); // provide custom action data to deferred and rollback CAs - hr = WcaSetProperty(PLATFORM_DECORATION(L"WixRollbackInternetShortcuts"), pwzCustomActionData); + hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"RollbackInternetShortcuts"), pwzCustomActionData); ExitOnFailure(hr, "failed to set WixRollbackInternetShortcuts rollback custom action data"); - hr = WcaSetProperty(PLATFORM_DECORATION(L"WixCreateInternetShortcuts"), pwzCustomActionData); + hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"CreateInternetShortcuts"), pwzCustomActionData); ExitOnFailure(hr, "failed to set WixCreateInternetShortcuts custom action data"); } diff --git a/src/ca/precomp.h b/src/ca/precomp.h index 66e2f6b0..c5d6afe5 100644 --- a/src/ca/precomp.h +++ b/src/ca/precomp.h @@ -51,4 +51,4 @@ #include "scasmb.h" #include "scasmbexec.h" -#include "caSuffix.h" +#include "caDecor.h" diff --git a/src/ca/scamanifest.cpp b/src/ca/scamanifest.cpp index 58b4054d..adb8d3d3 100644 --- a/src/ca/scamanifest.cpp +++ b/src/ca/scamanifest.cpp @@ -2,8 +2,8 @@ #include "precomp.h" -LPCWSTR vcsPerfmonManifestQuery = L"SELECT `Component_`, `File`, `ResourceFileDirectory` FROM `PerfmonManifest`"; -LPCWSTR vcsEventManifestQuery = L"SELECT `Component_`, `File` FROM `EventManifest`"; +LPCWSTR vcsPerfmonManifestQuery = L"SELECT `Component_`, `File`, `ResourceFileDirectory` FROM `Wix4PerfmonManifest`"; +LPCWSTR vcsEventManifestQuery = L"SELECT `Component_`, `File` FROM `Wix4EventManifest`"; enum ePerfMonManifestQuery { pfmComponent = 1, pfmFile, pfmResourceFileDir }; enum eEventManifestQuery { emComponent = 1, emFile}; @@ -46,9 +46,9 @@ extern "C" UINT __stdcall ConfigurePerfmonManifestRegister( ExitFunction1(hr = S_FALSE); } // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"PerfmonManifest")) + if (S_OK != WcaTableExists(L"Wix4PerfmonManifest")) { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because PerfmonManifest table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because Wix4PerfmonManifest table not present"); ExitFunction1(hr = S_FALSE); } @@ -79,7 +79,7 @@ extern "C" UINT __stdcall ConfigurePerfmonManifestRegister( hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmonManifest action"); if ( *pwzResourceFilePath ) @@ -95,7 +95,7 @@ extern "C" UINT __stdcall ConfigurePerfmonManifestRegister( WcaLog(LOGMSG_VERBOSE, "RegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); ExitOnFailure(hr, "failed to schedule RegisterPerfmonManifest action"); } @@ -143,40 +143,40 @@ extern "C" UINT __stdcall ConfigurePerfmonManifestUnregister( ExitFunction1(hr = S_FALSE); } // check to see if necessary tables are specified - if (WcaTableExists(L"PerfmonManifest") != S_OK) + if (WcaTableExists(L"Wix4PerfmonManifest") != S_OK) { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because PerfmonManifest table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because Wix4PerfmonManifest table not present"); ExitFunction1(hr = S_FALSE); } hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on PerfMonManifest table"); + ExitOnFailure(hr, "failed to open view on Wix4PerfmonManifest table"); while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) { // get component install state hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for PerfMonManifest"); + ExitOnFailure(hr, "failed to get Component for Wix4PerfmonManifest"); er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for PerfMonManifest"); + ExitOnFailure(hr, "failed to get Component state for Wix4PerfmonManifest"); if (!WcaIsUninstalling(isInstalled, isAction)) { continue; } hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for PerfMonManifest"); + ExitOnFailure(hr, "failed to get File for Wix4PerfmonManifest"); hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); - ExitOnFailure(hr, "failed to get ApplicationIdentity for PerfMonManifest"); + ExitOnFailure(hr, "failed to get ApplicationIdentity for Wix4PerfmonManifest"); size_t iResourcePath = lstrlenW(pwzResourceFilePath); if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); - ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + ExitOnFailure(hr, "failed to copy string in Wix4PerfmonManifest"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmonManifest action"); hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); @@ -184,7 +184,7 @@ extern "C" UINT __stdcall ConfigurePerfmonManifestUnregister( WcaLog(LOGMSG_VERBOSE, "UnRegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); ExitOnFailure(hr, "failed to schedule UnregisterPerfmonManifest action"); } @@ -231,41 +231,41 @@ extern "C" UINT __stdcall ConfigureEventManifestRegister( ExitFunction1(hr = S_FALSE); } // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"EventManifest")) + if (S_OK != WcaTableExists(L"Wix4EventManifest")) { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because EventManifest table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because Wix4EventManifest table not present"); ExitFunction1(hr = S_FALSE); } hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on EventManifest table"); + ExitOnFailure(hr, "failed to open view on Wix4EventManifest table"); while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) { // get component install state hr = WcaGetRecordString(hRec, emComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for EventManifest"); + ExitOnFailure(hr, "failed to get Component for Wix4EventManifest"); er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for EventManifest"); + ExitOnFailure(hr, "failed to get Component state for Wix4EventManifest"); if (!WcaIsInstalling(isInstalled, isAction)) { continue; } hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for EventManifest"); + ExitOnFailure(hr, "failed to get File for Wix4EventManifest"); hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in EventManifest"); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); ExitOnFailure(hr, "failed to schedule RollbackRegisterEventManifest action"); hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in EventManifest"); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); WcaLog(LOGMSG_VERBOSE, "RegisterEventManifest's CustomActionData: '%ls'", pwzCommand); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterEventManifest"), pwzCommand, COST_EVENTMANIFEST_REGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterEventManifest"), pwzCommand, COST_EVENTMANIFEST_REGISTER); ExitOnFailure(hr, "failed to schedule RegisterEventManifest action"); } @@ -273,7 +273,7 @@ extern "C" UINT __stdcall ConfigureEventManifestRegister( { hr = S_OK; } - ExitOnFailure(hr, "Failure while processing EventManifest"); + ExitOnFailure(hr, "Failure while processing Wix4EventManifest"); hr = S_OK; @@ -313,22 +313,22 @@ extern "C" UINT __stdcall ConfigureEventManifestUnregister( ExitFunction1(hr = S_FALSE); } // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"EventManifest")) + if (S_OK != WcaTableExists(L"Wix4EventManifest")) { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because EventManifest table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because Wix4EventManifest table not present"); ExitFunction1(hr = S_FALSE); } hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on EventManifest table"); + ExitOnFailure(hr, "failed to open view on Wix4EventManifest table"); while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) { // get component install state hr = WcaGetRecordString(hRec, emComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for EventManifest"); + ExitOnFailure(hr, "failed to get Component for Wix4EventManifest"); er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for EventManifest"); + ExitOnFailure(hr, "failed to get Component state for Wix4EventManifest"); // nothing to do on an install // schedule the rollback action when reinstalling to re-register pre-patch manifest @@ -338,22 +338,22 @@ extern "C" UINT __stdcall ConfigureEventManifestUnregister( } hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for EventManifest"); + ExitOnFailure(hr, "failed to get File for Wix4EventManifest"); hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in EventManifest"); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); ExitOnFailure(hr, "failed to schedule RollbackUnregisterEventManifest action"); // no need to uninstall on a repair/patch. Register action will re-register and update the manifest. if (!WcaIsReInstalling(isInstalled, isAction)) { hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in EventManifest"); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); WcaLog(LOGMSG_VERBOSE, "UnregisterEventManifest's CustomActionData: '%ls'", pwzCommand); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); ExitOnFailure(hr, "failed to schedule UnregisterEventManifest action"); } } @@ -362,7 +362,7 @@ extern "C" UINT __stdcall ConfigureEventManifestUnregister( { hr = S_OK; } - ExitOnFailure(hr, "Failure while processing EventManifest"); + ExitOnFailure(hr, "Failure while processing Wix4EventManifest"); hr = S_OK; diff --git a/src/ca/scaperf.cpp b/src/ca/scaperf.cpp index 82f458af..fd301278 100644 --- a/src/ca/scaperf.cpp +++ b/src/ca/scaperf.cpp @@ -2,10 +2,10 @@ #include "precomp.h" -LPCWSTR vcsPerfCounterDataQuery = L"SELECT `PerformanceCategory`, `Component_`, `Name`, `IniData`, `ConstantData` FROM `PerformanceCategory`"; +LPCWSTR vcsPerfCounterDataQuery = L"SELECT `Wix4PerformanceCategory`, `Component_`, `Name`, `IniData`, `ConstantData` FROM `Wix4PerformanceCategory`"; enum ePerfCounterDataQuery { pcdqId = 1, pcdqComponent, pcdqName, pcdqIniData, pcdqConstantData }; -LPCWSTR vcsPerfMonQuery = L"SELECT `Component_`, `File`, `Name` FROM `Perfmon`"; +LPCWSTR vcsPerfMonQuery = L"SELECT `Component_`, `File`, `Name` FROM `Wix4Perfmon`"; enum ePerfMonQuery { pmqComponent = 1, pmqFile, pmqName }; @@ -32,7 +32,7 @@ extern "C" UINT __stdcall InstallPerfCounterData( ExitOnFailure(hr, "Failed to initialize InstallPerfCounterData."); hr = ProcessPerformanceCategory(hInstall, TRUE); - MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to process PerformanceCategory table."); + MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to process Wix4PerformanceCategory table."); LExit: er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; @@ -57,7 +57,7 @@ extern "C" UINT __stdcall UninstallPerfCounterData( ExitOnFailure(hr, "Failed to initialize UninstallPerfCounterData."); hr = ProcessPerformanceCategory(hInstall, FALSE); - MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to process PerformanceCategory table."); + MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to process Wix4PerformanceCategory table."); LExit: er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; @@ -85,9 +85,9 @@ extern "C" UINT __stdcall ConfigurePerfmonInstall( ExitOnFailure(hr, "Failed to initialize"); // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"Perfmon")) + if (S_OK != WcaTableExists(L"Wix4Perfmon")) { - WcaLog(LOGMSG_VERBOSE, "Skipping RegisterPerfmon() because Perfmon table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping RegisterPerfmon() because Wix4Perfmon table not present"); ExitFunction1(hr = S_FALSE); } @@ -113,9 +113,9 @@ extern "C" UINT __stdcall ConfigurePerfmonInstall( ExitOnFailure(hr, "failed to get File for PerfMon"); WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonInstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); ExitOnFailure(hr, "failed to schedule RegisterPerfmon action"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmon action"); } @@ -158,9 +158,9 @@ extern "C" UINT __stdcall ConfigurePerfmonUninstall( ExitOnFailure(hr, "Failed to initialize"); // check to see if necessary tables are specified - if (WcaTableExists(L"Perfmon") != S_OK) + if (WcaTableExists(L"Wix4Perfmon") != S_OK) { - WcaLog(LOGMSG_VERBOSE, "Skipping UnregisterPerfmon() because Perfmon table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping UnregisterPerfmon() because Wix4Perfmon table not present"); ExitFunction1(hr = S_FALSE); } @@ -186,9 +186,9 @@ extern "C" UINT __stdcall ConfigurePerfmonUninstall( ExitOnFailure(hr, "failed to get File for PerfMon"); WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonUninstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); ExitOnFailure(hr, "failed to schedule UnregisterPerfmon action"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmon action"); } @@ -229,26 +229,26 @@ static HRESULT ProcessPerformanceCategory( LPWSTR pwzCustomActionData = NULL; // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"PerformanceCategory")) + if (S_OK != WcaTableExists(L"Wix4PerformanceCategory")) { ExitFunction1(hr = S_FALSE); } hr = WcaOpenExecuteView(vcsPerfCounterDataQuery, &hView); - ExitOnFailure(hr, "failed to open view on PerformanceCategory table"); + ExitOnFailure(hr, "failed to open view on Wix4PerformanceCategory table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { hr = WcaGetRecordString(hRec, pcdqId, &pwzId); - ExitOnFailure(hr, "Failed to get id for PerformanceCategory."); + ExitOnFailure(hr, "Failed to get id for Wix4PerformanceCategory."); // Check to see if the Component is being installed or uninstalled // when we are processing the same. hr = WcaGetRecordString(hRec, pcdqComponent, &pwzComponent); - ExitOnFailure(hr, "Failed to get Component for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to get Component for Wix4PerformanceCategory: %ls", pwzId); er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction); hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to get Component state for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to get Component state for Wix4PerformanceCategory: %ls", pwzId); if ((fInstall && !WcaIsInstalling(isInstalled, isAction)) || (!fInstall && !WcaIsUninstalling(isInstalled, isAction))) @@ -257,45 +257,45 @@ static HRESULT ProcessPerformanceCategory( } hr = WcaGetRecordString(hRec, pcdqName, &pwzName); - ExitOnFailure(hr, "Failed to get Name for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to get Name for Wix4PerformanceCategory: %ls", pwzId); hr = WcaWriteStringToCaData(pwzName, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add Name to CustomActionData for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to add Name to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); hr = WcaGetRecordString(hRec, pcdqIniData, &pwzData); - ExitOnFailure(hr, "Failed to get IniData for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to get IniData for Wix4PerformanceCategory: %ls", pwzId); hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add IniData to CustomActionData for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to add IniData to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); hr = WcaGetRecordString(hRec, pcdqConstantData, &pwzData); - ExitOnFailure(hr, "Failed to get ConstantData for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to get ConstantData for Wix4PerformanceCategory: %ls", pwzId); hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add ConstantData to CustomActionData for PerformanceCategory: %ls", pwzId); + ExitOnFailure(hr, "Failed to add ConstantData to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); } if (hr == E_NOMOREITEMS) { hr = S_OK; } - ExitOnFailure(hr, "Failure while processing PerformanceCategory table."); + ExitOnFailure(hr, "Failure while processing Wix4PerformanceCategory table."); // If there was any data built up, schedule it for execution. if (pwzCustomActionData) { if (fInstall) { - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackRegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); - ExitOnFailure(hr, "Failed to schedule RollbackRegisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "Failed to schedule RollbackRegisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); - ExitOnFailure(hr, "Failed to schedule RegisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "Failed to schedule RegisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); } else { - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackUnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); - ExitOnFailure(hr, "Failed to schedule RollbackUnregisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "Failed to schedule RollbackUnregisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"UnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); - ExitOnFailure(hr, "Failed to schedule UnregisterPerfCounterData action for PerformanceCategory: %ls", pwzId); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "Failed to schedule UnregisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); } } diff --git a/src/ca/scaperfexec.cpp b/src/ca/scaperfexec.cpp index bf58c8d0..04c0648a 100644 --- a/src/ca/scaperfexec.cpp +++ b/src/ca/scaperfexec.cpp @@ -35,7 +35,7 @@ extern "C" UINT __stdcall RegisterPerfCounterData( ExitOnFailure(hr, "Failed to initialize RegisterPerfCounterData."); hr = ExecutePerfCounterData(hInstall, TRUE); - MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute PerformanceCategory table."); + MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); LExit: er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; @@ -61,7 +61,7 @@ extern "C" UINT __stdcall UnregisterPerfCounterData( ExitOnFailure(hr, "Failed to initialize UnregisterPerfCounterData."); hr = ExecutePerfCounterData(hInstall, FALSE); - MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute PerformanceCategory table."); + MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); LExit: er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; diff --git a/src/ca/scasched.cpp b/src/ca/scasched.cpp index ba230a9e..d81b1f14 100644 --- a/src/ca/scasched.cpp +++ b/src/ca/scasched.cpp @@ -21,14 +21,14 @@ extern "C" UINT __stdcall ConfigureSmbInstall( ExitOnFailure(hr, "Failed to initialize"); // check to see if necessary tables are specified - if (WcaTableExists(L"FileShare") != S_OK) + if (WcaTableExists(L"Wix4FileShare") != S_OK) { - WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no FileShare table"); + WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); ExitFunction1(hr = S_FALSE); } hr = ScaSmbRead(&pssList); - ExitOnFailure(hr, "failed to read FileShare table"); + ExitOnFailure(hr, "failed to read Wix4FileShare table"); hr = ScaSmbInstall(pssList); ExitOnFailure(hr, "failed to install FileShares"); @@ -43,7 +43,7 @@ LExit: /******************************************************************** -ConfigureSmb - CUSTOM ACTION ENTRY POINT for installing fileshare settings +ConfigureSmb - CUSTOM ACTION ENTRY POINT for uninstalling fileshare settings ********************************************************************/ extern "C" UINT __stdcall ConfigureSmbUninstall( @@ -60,14 +60,14 @@ extern "C" UINT __stdcall ConfigureSmbUninstall( ExitOnFailure(hr, "Failed to initialize"); // check to see if necessary tables are specified - if (WcaTableExists(L"FileShare") != S_OK) + if (WcaTableExists(L"Wix4FileShare") != S_OK) { - WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no FileShare table"); + WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); ExitFunction1(hr = S_FALSE); } hr = ScaSmbRead(&pssList); - ExitOnFailure(hr, "failed to read FileShare table"); + ExitOnFailure(hr, "failed to read Wix4FileShare table"); hr = ScaSmbUninstall(pssList); ExitOnFailure(hr, "failed to uninstall FileShares"); @@ -106,7 +106,7 @@ extern "C" UINT __stdcall ConfigureUsers( fInitializedCom = TRUE; hr = ScaUserRead(&psuList); - ExitOnFailure(hr, "failed to read User table"); + ExitOnFailure(hr, "failed to read Wix4User table"); hr = ScaUserExecute(psuList); ExitOnFailure(hr, "failed to add/remove User actions"); diff --git a/src/ca/scasmb.h b/src/ca/scasmb.h index 7dbeb14d..f2a4b53c 100644 --- a/src/ca/scasmb.h +++ b/src/ca/scasmb.h @@ -5,7 +5,7 @@ #include "scauser.h" // structs -// Structure used to hold and extra user/permission pairs from the FileSharePermissions Table +// Structure used to hold and extra user/permission pairs from the Wix4FileSharePermissions Table struct SCA_SMB_EX_USER_PERMS { int nPermissions; diff --git a/src/ca/scasmbsched.cpp b/src/ca/scasmbsched.cpp index 72536d6d..e29f7f51 100644 --- a/src/ca/scasmbsched.cpp +++ b/src/ca/scasmbsched.cpp @@ -92,8 +92,8 @@ void ScaExUserPermsSmbFreeList(SCA_SMB_EX_USER_PERMS* pExUserPermsList) } // sql query constants -LPCWSTR vcsSmbQuery = L"SELECT `FileShare`, `ShareName`, `Description`, `Directory_`, " - L"`Component_`, `User_`, `Permissions` FROM `FileShare`"; +LPCWSTR vcsSmbQuery = L"SELECT `Wix4FileShare`, `ShareName`, `Description`, `Directory_`, " + L"`Component_`, `User_`, `Permissions` FROM `Wix4FileShare`"; enum eSmbQuery { ssqFileShare = 1, @@ -122,26 +122,26 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList) SCA_SMB* pss = NULL; BOOL bUserPermissionsTableExists = FALSE; - if (S_OK != WcaTableExists(L"FileShare")) + if (S_OK != WcaTableExists(L"Wix4FileShare")) { - WcaLog(LOGMSG_VERBOSE, "Skipping ScaSmbCreateShare() - FileShare table not present"); + WcaLog(LOGMSG_VERBOSE, "Skipping ScaSmbCreateShare() - Wix4FileShare table not present"); ExitFunction1(hr = S_FALSE); } - if (S_OK == WcaTableExists(L"FileSharePermissions")) + if (S_OK == WcaTableExists(L"Wix4FileSharePermissions")) { bUserPermissionsTableExists = TRUE; } else { - WcaLog(LOGMSG_VERBOSE, "No Additional Permissions - FileSharePermissions table not present"); + WcaLog(LOGMSG_VERBOSE, "No Additional Permissions - Wix4FileSharePermissions table not present"); } WcaLog(LOGMSG_VERBOSE, "Reading File Share Tables"); // loop through all the fileshares hr = WcaOpenExecuteView(vcsSmbQuery, &hView); - ExitOnFailure(hr, "Failed to open view on FileShare table"); + ExitOnFailure(hr, "Failed to open view on Wix4FileShare table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { pss = NewSmb(); @@ -154,33 +154,33 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList) ::ZeroMemory(pss, sizeof(*pss)); hr = WcaGetRecordString(hRec, ssqFileShare, &pwzData); - ExitOnFailure(hr, "Failed to get FileShare.FileShare"); + ExitOnFailure(hr, "Failed to get Wix4FileShare.Wix4FileShare"); hr = ::StringCchCopyW(pss->wzId, countof(pss->wzId), pwzData); ExitOnFailure(hr, "Failed to copy ID string to smb object"); hr = WcaGetRecordFormattedString(hRec, ssqShareName, &pwzData); - ExitOnFailure(hr, "Failed to get FileShare.ShareName"); + ExitOnFailure(hr, "Failed to get Wix4FileShare.ShareName"); hr = ::StringCchCopyW(pss->wzShareName, countof(pss->wzShareName), pwzData); ExitOnFailure(hr, "Failed to copy share name string to smb object"); hr = WcaGetRecordString(hRec, ssqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get Component for FileShare: '%ls'", pss->wzShareName); + ExitOnFailure(hr, "Failed to get Component for Wix4FileShare: '%ls'", pss->wzShareName); hr = ::StringCchCopyW(pss->wzComponent, countof(pss->wzComponent), pwzData); ExitOnFailure(hr, "Failed to copy component string to smb object"); hr = WcaGetRecordFormattedString(hRec, ssqDescription, &pwzData); - ExitOnFailure(hr, "Failed to get Share Description for FileShare: '%ls'", pss->wzShareName); + ExitOnFailure(hr, "Failed to get Share Description for Wix4FileShare: '%ls'", pss->wzShareName); hr = ::StringCchCopyW(pss->wzDescription, countof(pss->wzDescription), pwzData); ExitOnFailure(hr, "Failed to copy description string to smb object"); // get user info from the user table hr = WcaGetRecordFormattedString(hRec, ssqUser, &pwzData); - ExitOnFailure(hr, "Failed to get User record for FileShare: '%ls'", pss->wzShareName); + ExitOnFailure(hr, "Failed to get Wix4User record for Wix4FileShare: '%ls'", pss->wzShareName); // get component install state er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pss->wzComponent, &pss->isInstalled, &pss->isAction); hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to get Component state for FileShare"); + ExitOnFailure(hr, "Failed to get Component state for Wix4FileShare"); // if a user was specified if (*pwzData) @@ -200,7 +200,7 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList) // get the share's directory hr = WcaGetRecordString(hRec, ssqDirectory, &pwzData); - ExitOnFailure(hr, "Failed to get directory for FileShare: '%ls'", pss->wzShareName); + ExitOnFailure(hr, "Failed to get directory for Wix4FileShare: '%ls'", pss->wzShareName); WCHAR wzPath[MAX_PATH]; DWORD dwLen; @@ -236,7 +236,7 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList) ExitOnFailure(hr, "Failed to copy directory string to smb object"); hr = WcaGetRecordInteger(hRec, ssqPermissions, &pss->nPermissions); - ExitOnFailure(hr, "Failed to get FileShare.Permissions"); + ExitOnFailure(hr, "Failed to get Wix4FileShare.Permissions"); // Check to see if additional user & permissions are specified for this share if (bUserPermissionsTableExists) @@ -253,7 +253,7 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList) { hr = S_OK; } - ExitOnFailure(hr, "Failure occured while processing FileShare table"); + ExitOnFailure(hr, "Failure occured while processing Wix4FileShare table"); LExit: // if anything was left over after an error clean it all up @@ -420,10 +420,10 @@ HRESULT SchedCreateSmb(SCA_SMB* pss) } // Schedule the rollback first - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateSmbRollback"), pwzRollbackCustomActionData, COST_SMB_DROPSMB); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateSmbRollback"), pwzRollbackCustomActionData, COST_SMB_DROPSMB); ExitOnFailure(hr, "Failed to schedule DropSmb action"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateSmb"), pwzCustomActionData, COST_SMB_CREATESMB); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateSmb"), pwzCustomActionData, COST_SMB_CREATESMB); ExitOnFailure(hr, "Failed to schedule CreateSmb action"); LExit: @@ -511,14 +511,14 @@ HRESULT SchedDropSmb(SCA_SMB* pss) ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); } - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"DropSmbRollback"), pwzRollbackCustomActionData, COST_SMB_CREATESMB); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"DropSmbRollback"), pwzRollbackCustomActionData, COST_SMB_CREATESMB); ExitOnFailure(hr, "Failed to schedule DropSmbRollback action"); // DropSMB hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"DropSmb"), pwzCustomActionData, COST_SMB_DROPSMB); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"DropSmb"), pwzCustomActionData, COST_SMB_DROPSMB); ExitOnFailure(hr, "Failed to schedule DropSmb action"); LExit: @@ -558,7 +558,7 @@ LExit: } LPCWSTR vcsSmbExUserPermsQuery = L"SELECT `FileShare_`,`User_`,`Permissions` " - L"FROM `FileSharePermissions` WHERE `FileShare_`=?"; + L"FROM `Wix4FileSharePermissions` WHERE `FileShare_`=?"; enum eSmbUserPermsQuery { ssupqFileShare = 1, @@ -588,9 +588,9 @@ HRESULT ScaSmbExPermsRead(SCA_SMB* pss) ExitOnFailure(hr, "Failed to look up FileShare"); hr = WcaOpenView(vcsSmbExUserPermsQuery, &hView); - ExitOnFailure(hr, "Failed to open view on FileSharePermissions table"); + ExitOnFailure(hr, "Failed to open view on Wix4FileSharePermissions table"); hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "Failed to execute view on FileSharePermissions table"); + ExitOnFailure(hr, "Failed to execute view on Wix4FileSharePermissions table"); // loop through all User/Permissions paris returned while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) @@ -605,12 +605,12 @@ HRESULT ScaSmbExPermsRead(SCA_SMB* pss) ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); hr = WcaGetRecordString(hRec, ssupqUser, &pwzData); - ExitOnFailure(hr, "Failed to get FileSharePermissions.User"); + ExitOnFailure(hr, "Failed to get Wix4FileSharePermissions.User"); hr = ScaGetUser(pwzData, &pExUserPerms->scau); ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); hr = WcaGetRecordInteger(hRec, ssupqPermissions, &pExUserPerms->nPermissions); - ExitOnFailure(hr, "Failed to get FileSharePermissions.Permissions"); + ExitOnFailure(hr, "Failed to get Wix4FileSharePermissions.Permissions"); pExUserPerms->accessMode = SET_ACCESS; // we only support SET_ACCESS here pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); diff --git a/src/ca/scauser.cpp b/src/ca/scauser.cpp index 43317bdc..0d87301f 100644 --- a/src/ca/scauser.cpp +++ b/src/ca/scauser.cpp @@ -2,16 +2,16 @@ #include "precomp.h" -LPCWSTR vcsUserQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `User` WHERE `User`=?"; +LPCWSTR vcsUserQuery = L"SELECT `Wix4User`, `Component_`, `Name`, `Domain`, `Password` FROM `Wix4User` WHERE `Wix4User`=?"; enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword }; -LPCWSTR vcsGroupQuery = L"SELECT `Group`, `Component_`, `Name`, `Domain` FROM `Group` WHERE `Group`=?"; +LPCWSTR vcsGroupQuery = L"SELECT `Wix4Group`, `Component_`, `Name`, `Domain` FROM `Wix4Group` WHERE `Wix4Group`=?"; enum eGroupQuery { vgqGroup = 1, vgqComponent, vgqName, vgqDomain }; -LPCWSTR vcsUserGroupQuery = L"SELECT `User_`, `Group_` FROM `UserGroup` WHERE `User_`=?"; +LPCWSTR vcsUserGroupQuery = L"SELECT `Wix4User_`, `Wix4Group_` FROM `Wix4UserGroup` WHERE `Wix4User_`=?"; enum eUserGroupQuery { vugqUser = 1, vugqGroup }; -LPCWSTR vActionableQuery = L"SELECT `User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `User` WHERE `Component_` IS NOT NULL"; +LPCWSTR vActionableQuery = L"SELECT `Wix4User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `Wix4User` WHERE `Component_` IS NOT NULL"; enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain, vaqPassword, vaqAttributes }; @@ -51,46 +51,46 @@ HRESULT __stdcall ScaGetUser( ExitOnFailure(hr, "Failed to look up User"); hr = WcaOpenView(vcsUserQuery, &hView); - ExitOnFailure(hr, "Failed to open view on User table"); + ExitOnFailure(hr, "Failed to open view on Wix4User table"); hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "Failed to execute view on User table"); + ExitOnFailure(hr, "Failed to execute view on Wix4User table"); hr = WcaFetchSingleRecord(hView, &hRec); if (S_OK == hr) { hr = WcaGetRecordString(hRec, vuqUser, &pwzData); - ExitOnFailure(hr, "Failed to get User.User"); + ExitOnFailure(hr, "Failed to get Wix4User.User"); hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); ExitOnFailure(hr, "Failed to copy key string to user object"); hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get User.Component_"); + ExitOnFailure(hr, "Failed to get Wix4User.Component_"); hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); ExitOnFailure(hr, "Failed to copy component string to user object"); hr = WcaGetRecordFormattedString(hRec, vuqName, &pwzData); - ExitOnFailure(hr, "Failed to get User.Name"); + ExitOnFailure(hr, "Failed to get Wix4User.Name"); hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); ExitOnFailure(hr, "Failed to copy name string to user object"); hr = WcaGetRecordFormattedString(hRec, vuqDomain, &pwzData); - ExitOnFailure(hr, "Failed to get User.Domain"); + ExitOnFailure(hr, "Failed to get Wix4User.Domain"); hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); ExitOnFailure(hr, "Failed to copy domain string to user object"); hr = WcaGetRecordFormattedString(hRec, vuqPassword, &pwzData); - ExitOnFailure(hr, "Failed to get User.Password"); + ExitOnFailure(hr, "Failed to get Wix4User.Password"); hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); ExitOnFailure(hr, "Failed to copy password string to user object"); } else if (E_NOMOREITEMS == hr) { - WcaLog(LOGMSG_STANDARD, "Error: Cannot locate User.User='%ls'", wzUser); + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser); hr = E_FAIL; } else { - ExitOnFailure(hr, "Error or found multiple matching User rows"); + ExitOnFailure(hr, "Error or found multiple matching Wix4User rows"); } LExit: @@ -131,42 +131,42 @@ HRESULT __stdcall ScaGetUserDeferred( hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRecTest); if (S_OK == hr) { - AssertSz(FALSE, "Found multiple matching User rows"); + AssertSz(FALSE, "Found multiple matching Wix4User rows"); } hr = WcaGetRecordString(hRec, vuqUser, &pwzData); - ExitOnFailure(hr, "Failed to get User.User"); + ExitOnFailure(hr, "Failed to get Wix4User.User"); hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); ExitOnFailure(hr, "Failed to copy key string to user object (in deferred CA)"); hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get User.Component_"); + ExitOnFailure(hr, "Failed to get Wix4User.Component_"); hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); ExitOnFailure(hr, "Failed to copy component string to user object (in deferred CA)"); hr = WcaGetRecordString(hRec, vuqName, &pwzData); - ExitOnFailure(hr, "Failed to get User.Name"); + ExitOnFailure(hr, "Failed to get Wix4User.Name"); hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); ExitOnFailure(hr, "Failed to copy name string to user object (in deferred CA)"); hr = WcaGetRecordString(hRec, vuqDomain, &pwzData); - ExitOnFailure(hr, "Failed to get User.Domain"); + ExitOnFailure(hr, "Failed to get Wix4User.Domain"); hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); ExitOnFailure(hr, "Failed to copy domain string to user object (in deferred CA)"); hr = WcaGetRecordString(hRec, vuqPassword, &pwzData); - ExitOnFailure(hr, "Failed to get User.Password"); + ExitOnFailure(hr, "Failed to get Wix4User.Password"); hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); ExitOnFailure(hr, "Failed to copy password string to user object (in deferred CA)"); } else if (E_NOMOREITEMS == hr) { - WcaLog(LOGMSG_STANDARD, "Error: Cannot locate User.User='%ls'", wzUser); + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser); hr = E_FAIL; } else { - ExitOnFailure(hr, "Error fetching single User row"); + ExitOnFailure(hr, "Error fetching single Wix4User row"); } LExit: @@ -196,41 +196,41 @@ HRESULT __stdcall ScaGetGroup( ExitOnFailure(hr, "Failed to look up Group"); hr = WcaOpenView(vcsGroupQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Group table"); + ExitOnFailure(hr, "Failed to open view on Wix4Group table"); hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "Failed to execute view on Group table"); + ExitOnFailure(hr, "Failed to execute view on Wix4Group table"); hr = WcaFetchSingleRecord(hView, &hRec); if (S_OK == hr) { hr = WcaGetRecordString(hRec, vgqGroup, &pwzData); - ExitOnFailure(hr, "Failed to get Group.Group"); + ExitOnFailure(hr, "Failed to get Wix4Group.Wix4Group."); hr = ::StringCchCopyW(pscag->wzKey, countof(pscag->wzKey), pwzData); - ExitOnFailure(hr, "Failed to copy Group.Group."); + ExitOnFailure(hr, "Failed to copy Wix4Group.Wix4Group."); hr = WcaGetRecordString(hRec, vgqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get Group.Component_"); + ExitOnFailure(hr, "Failed to get Wix4Group.Component_"); hr = ::StringCchCopyW(pscag->wzComponent, countof(pscag->wzComponent), pwzData); - ExitOnFailure(hr, "Failed to copy Group.Component_."); + ExitOnFailure(hr, "Failed to copy Wix4Group.Component_."); hr = WcaGetRecordFormattedString(hRec, vgqName, &pwzData); - ExitOnFailure(hr, "Failed to get Group.Name"); + ExitOnFailure(hr, "Failed to get Wix4Group.Name"); hr = ::StringCchCopyW(pscag->wzName, countof(pscag->wzName), pwzData); - ExitOnFailure(hr, "Failed to copy Group.Name."); + ExitOnFailure(hr, "Failed to copy Wix4Group.Name."); hr = WcaGetRecordFormattedString(hRec, vgqDomain, &pwzData); - ExitOnFailure(hr, "Failed to get Group.Domain"); + ExitOnFailure(hr, "Failed to get Wix4Group.Domain"); hr = ::StringCchCopyW(pscag->wzDomain, countof(pscag->wzDomain), pwzData); - ExitOnFailure(hr, "Failed to copy Group.Domain."); + ExitOnFailure(hr, "Failed to copy Wix4Group.Domain."); } else if (E_NOMOREITEMS == hr) { - WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Group.Group='%ls'", wzGroup); + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4Group.Wix4Group='%ls'", wzGroup); hr = E_FAIL; } else { - ExitOnFailure(hr, "Error or found multiple matching Group rows"); + ExitOnFailure(hr, "Error or found multiple matching Wix4Group rows"); } LExit: @@ -284,19 +284,19 @@ HRESULT ScaUserRead( LPWSTR pwzData = NULL; - BOOL fUserGroupExists = FALSE; + BOOL fUserGroupExists = FALSE; SCA_USER *psu = NULL; INSTALLSTATE isInstalled, isAction; - if (S_OK != WcaTableExists(L"User")) + if (S_OK != WcaTableExists(L"Wix4User")) { - WcaLog(LOGMSG_VERBOSE, "User Table does not exist, exiting"); + WcaLog(LOGMSG_VERBOSE, "Wix4User Table does not exist, exiting"); ExitFunction1(hr = S_FALSE); } - if (S_OK == WcaTableExists(L"UserGroup")) + if (S_OK == WcaTableExists(L"Wix4UserGroup")) { fUserGroupExists = TRUE; } @@ -305,15 +305,15 @@ HRESULT ScaUserRead( // loop through all the users // hr = WcaOpenExecuteView(vActionableQuery, &hView); - ExitOnFailure(hr, "failed to open view on User table"); + ExitOnFailure(hr, "failed to open view on Wix4User table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { hr = WcaGetRecordString(hRec, vaqComponent, &pwzData); - ExitOnFailure(hr, "failed to get User.Component"); + ExitOnFailure(hr, "failed to get Wix4User.Component"); er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &isInstalled, &isAction); hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for User"); + ExitOnFailure(hr, "failed to get Component state for Wix4User"); // don't bother if we aren't installing or uninstalling this component if (WcaIsInstalling(isInstalled, isAction) || WcaIsUninstalling(isInstalled, isAction)) @@ -332,44 +332,44 @@ HRESULT ScaUserRead( ExitOnFailure(hr, "failed to copy component name: %ls", pwzData); hr = WcaGetRecordString(hRec, vaqUser, &pwzData); - ExitOnFailure(hr, "failed to get User.User"); + ExitOnFailure(hr, "failed to get Wix4User.User"); hr = ::StringCchCopyW(psu->wzKey, countof(psu->wzKey), pwzData); ExitOnFailure(hr, "failed to copy user key: %ls", pwzData); hr = WcaGetRecordFormattedString(hRec, vaqName, &pwzData); - ExitOnFailure(hr, "failed to get User.Name"); + ExitOnFailure(hr, "failed to get Wix4User.Name"); hr = ::StringCchCopyW(psu->wzName, countof(psu->wzName), pwzData); ExitOnFailure(hr, "failed to copy user name: %ls", pwzData); hr = WcaGetRecordFormattedString(hRec, vaqDomain, &pwzData); - ExitOnFailure(hr, "failed to get User.Domain"); + ExitOnFailure(hr, "failed to get Wix4User.Domain"); hr = ::StringCchCopyW(psu->wzDomain, countof(psu->wzDomain), pwzData); ExitOnFailure(hr, "failed to copy user domain: %ls", pwzData); hr = WcaGetRecordFormattedString(hRec, vaqPassword, &pwzData); - ExitOnFailure(hr, "failed to get User.Password"); + ExitOnFailure(hr, "failed to get Wix4User.Password"); hr = ::StringCchCopyW(psu->wzPassword, countof(psu->wzPassword), pwzData); ExitOnFailure(hr, "failed to copy user password"); hr = WcaGetRecordInteger(hRec, vaqAttributes, &psu->iAttributes); - ExitOnFailure(hr, "failed to get User.Attributes"); + ExitOnFailure(hr, "failed to get Wix4User.Attributes"); // Check if this user is to be added to any groups if (fUserGroupExists) { hUserRec = ::MsiCreateRecord(1); hr = WcaSetRecordString(hUserRec, 1, psu->wzKey); - ExitOnFailure(hr, "Failed to create user record for querying UserGroup table"); + ExitOnFailure(hr, "Failed to create user record for querying Wix4UserGroup table"); hr = WcaOpenView(vcsUserGroupQuery, &hUserGroupView); - ExitOnFailure(hr, "Failed to open view on UserGroup table for user %ls", psu->wzKey); + ExitOnFailure(hr, "Failed to open view on Wix4UserGroup table for user %ls", psu->wzKey); hr = WcaExecuteView(hUserGroupView, hUserRec); - ExitOnFailure(hr, "Failed to execute view on UserGroup table for user: %ls", psu->wzKey); + ExitOnFailure(hr, "Failed to execute view on Wix4UserGroup table for user: %ls", psu->wzKey); while (S_OK == (hr = WcaFetchRecord(hUserGroupView, &hRec))) { hr = WcaGetRecordString(hRec, vugqGroup, &pwzData); - ExitOnFailure(hr, "failed to get UserGroup.Group"); + ExitOnFailure(hr, "failed to get Wix4UserGroup.Group"); hr = AddGroupToList(&(psu->psgGroups)); ExitOnFailure(hr, "failed to add group to list"); @@ -382,7 +382,7 @@ HRESULT ScaUserRead( { hr = S_OK; } - ExitOnFailure(hr, "failed to enumerate selected rows from UserGroup table"); + ExitOnFailure(hr, "failed to enumerate selected rows from Wix4UserGroup table"); } } } @@ -391,7 +391,7 @@ HRESULT ScaUserRead( { hr = S_OK; } - ExitOnFailure(hr, "failed to enumerate selected rows from User table"); + ExitOnFailure(hr, "failed to enumerate selected rows from Wix4User table"); LExit: ReleaseStr(pwzData); @@ -581,7 +581,7 @@ HRESULT ScaUserExecute( ExitOnFailure(hr, "failed to add group information to rollback custom action data"); } - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateUserRollback"), pwzRollbackData, COST_USER_DELETE); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUserRollback"), pwzRollbackData, COST_USER_DELETE); ExitOnFailure(hr, "failed to schedule CreateUserRollback"); } @@ -595,7 +595,7 @@ HRESULT ScaUserExecute( hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); ExitOnFailure(hr, "failed to add group information to custom action data"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"CreateUser"), pwzActionData, COST_USER_ADD); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUser"), pwzActionData, COST_USER_ADD); ExitOnFailure(hr, "failed to schedule CreateUser"); } else if (((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists)) && WcaIsUninstalling(psu->isInstalled, psu->isAction) && !(psu->iAttributes & SCAU_DONT_REMOVE_ON_UNINSTALL)) @@ -610,7 +610,7 @@ HRESULT ScaUserExecute( // // Note: We can't rollback the removal of a user which is why RemoveUser is a commit // CustomAction. - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RemoveUser"), pwzActionData, COST_USER_DELETE); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RemoveUser"), pwzActionData, COST_USER_DELETE); ExitOnFailure(hr, "failed to schedule RemoveUser"); } diff --git a/src/ca/secureobj.cpp b/src/ca/secureobj.cpp index f6d1406a..392945d9 100644 --- a/src/ca/secureobj.cpp +++ b/src/ca/secureobj.cpp @@ -3,9 +3,9 @@ #include "precomp.h" // structs -LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `SecureObjects`.`SecureObject`, `SecureObjects`.`Table`, `SecureObjects`.`Domain`, `SecureObjects`.`User`, " - L"`SecureObjects`.`Permission`, `SecureObjects`.`Component_`, `Component`.`Attributes` FROM `SecureObjects`,`Component` WHERE " - L"`SecureObjects`.`Component_`=`Component`.`Component`"; +LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `Wix4SecureObject`.`Wix4SecureObject`, `Wix4SecureObject`.`Table`, `Wix4SecureObject`.`Domain`, `Wix4SecureObject`.`User`, " + L"`Wix4SecureObject`.`Permission`, `Wix4SecureObject`.`Component_`, `Component`.`Attributes` FROM `Wix4SecureObject`,`Component` WHERE " + L"`Wix4SecureObject`.`Component_`=`Component`.`Component`"; enum eQUERY_SECUREOBJECTS { QSO_SECUREOBJECT = 1, QSO_TABLE, QSO_DOMAIN, QSO_USER, QSO_PERMISSION, QSO_COMPONENT, QSO_COMPATTRIBUTES }; LPCWSTR wzQUERY_REGISTRY = L"SELECT `Registry`.`Registry`, `Registry`.`Root`, `Registry`.`Key` FROM `Registry` WHERE `Registry`.`Registry`=?"; @@ -142,7 +142,7 @@ static HRESULT StoreACLRollbackInfo( ExitOnFailure(hr, "failed to add data to rollback CustomActionData"); } - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecSecureObjectsRollback"), pwzCustomActionData, COST_SECUREOBJECT); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecSecureObjectsRollback"), pwzCustomActionData, COST_SECUREOBJECT); ExitOnFailure(hr, "failed to schedule ExecSecureObjectsRollback for item: %ls of type: %ls", pwzObject, pwzTable); ReleaseStr(pwzCustomActionData); @@ -343,9 +343,9 @@ extern "C" UINT __stdcall SchedSecureObjects( ExitOnFailure(hr, "failed to initialize"); // anything to do? - if (S_OK != WcaTableExists(L"SecureObjects")) + if (S_OK != WcaTableExists(L"Wix4SecureObject")) { - WcaLog(LOGMSG_STANDARD, "SecureObjects table doesn't exist, so there are no objects to secure."); + WcaLog(LOGMSG_STANDARD, "Wix4SecureObject table doesn't exist, so there are no objects to secure."); ExitFunction(); } @@ -353,7 +353,7 @@ extern "C" UINT __stdcall SchedSecureObjects( // loop through all the objects to be secured // hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); - ExitOnFailure(hr, "failed to open view on SecureObjects table"); + ExitOnFailure(hr, "failed to open view on Wix4SecureObject table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); @@ -372,7 +372,7 @@ extern "C" UINT __stdcall SchedSecureObjects( BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; - // Only process entries in the SecureObjects table whose components match the bitness of this CA + // Only process entries in the Wix4SecureObject table whose components match the bitness of this CA #ifdef _WIN64 if (!fIs64Bit) { @@ -444,7 +444,7 @@ extern "C" UINT __stdcall SchedSecureObjects( { Assert(0 < cObjects); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecSecureObjects"), pwzCustomActionData, cObjects * COST_SECUREOBJECT); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecSecureObjects"), pwzCustomActionData, cObjects * COST_SECUREOBJECT); ExitOnFailure(hr, "failed to schedule ExecSecureObjects action"); } @@ -497,7 +497,7 @@ extern "C" UINT __stdcall SchedSecureObjectsRollback( // loop through all the objects to be secured // hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); - ExitOnFailure(hr, "failed to open view on SecureObjects table"); + ExitOnFailure(hr, "failed to open view on Wix4SecureObject table"); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); @@ -516,7 +516,7 @@ extern "C" UINT __stdcall SchedSecureObjectsRollback( BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; - // Only process entries in the SecureObjects table whose components match the bitness of this CA + // Only process entries in the Wix4SecureObject table whose components match the bitness of this CA #ifdef _WIN64 if (!fIs64Bit) { diff --git a/src/ca/serviceconfig.cpp b/src/ca/serviceconfig.cpp index c2b77035..04b25ffa 100644 --- a/src/ca/serviceconfig.cpp +++ b/src/ca/serviceconfig.cpp @@ -3,7 +3,7 @@ #include "precomp.h" // structs -LPCWSTR wzQUERY_SERVICECONFIG = L"SELECT `ServiceName`, `Component_`, `NewService`, `FirstFailureActionType`, `SecondFailureActionType`, `ThirdFailureActionType`, `ResetPeriodInDays`, `RestartServiceDelayInSeconds`, `ProgramCommandLine`, `RebootMessage` FROM `ServiceConfig`"; +LPCWSTR wzQUERY_SERVICECONFIG = L"SELECT `ServiceName`, `Component_`, `NewService`, `FirstFailureActionType`, `SecondFailureActionType`, `ThirdFailureActionType`, `ResetPeriodInDays`, `RestartServiceDelayInSeconds`, `ProgramCommandLine`, `RebootMessage` FROM `Wix4ServiceConfig`"; enum eQUERY_SERVICECONFIG { QSC_SERVICENAME = 1, QSC_COMPONENT, QSC_NEWSERVICE, QSC_FIRSTFAILUREACTIONTYPE, QSC_SECONDFAILUREACTIONTYPE, QSC_THIRDFAILUREACTIONTYPE, QSC_RESETPERIODINDAYS, QSC_RESTARTSERVICEDELAYINSECONDS, QSC_PROGRAMCOMMANDLINE, QSC_REBOOTMESSAGE }; // consts @@ -81,7 +81,7 @@ extern "C" UINT __stdcall SchedServiceConfig( // Loop through all the services to be configured. hr = WcaOpenExecuteView(wzQUERY_SERVICECONFIG, &hView); - ExitOnFailure(hr, "Failed to open view on ServiceConfig table."); + ExitOnFailure(hr, "Failed to open view on Wix4ServiceConfig table."); while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) { @@ -106,7 +106,7 @@ extern "C" UINT __stdcall SchedServiceConfig( ExitOnFailure(hr, "Failed to add name to CustomActionData."); hr = WcaGetRecordInteger(hRec, QSC_NEWSERVICE, &iData); - ExitOnFailure(hr, "Failed to get ServiceConfig.NewService."); + ExitOnFailure(hr, "Failed to get Wix4ServiceConfig.NewService."); hr = WcaWriteIntegerToCaData(0 != iData, &pwzCustomActionData); ExitOnFailure(hr, "Failed to add NewService data to CustomActionData"); @@ -167,10 +167,10 @@ extern "C" UINT __stdcall SchedServiceConfig( // setup CustomActionData and add to progress bar for download if (0 < cServices) { - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"RollbackServiceConfig"), pwzScriptKey, cServices * COST_SERVICECONFIG); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackServiceConfig"), pwzScriptKey, cServices * COST_SERVICECONFIG); ExitOnFailure(hr, "failed to schedule RollbackServiceConfig action"); - hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"ExecServiceConfig"), pwzCustomActionData, cServices * COST_SERVICECONFIG); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecServiceConfig"), pwzCustomActionData, cServices * COST_SERVICECONFIG); ExitOnFailure(hr, "failed to schedule ExecServiceConfig action"); } diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 2ec0c706..45a7f278 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -66,7 +66,7 @@ - + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs new file mode 100644 index 00000000..688ce39d --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs new file mode 100644 index 00000000..4f9e6a9d --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt b/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs new file mode 100644 index 00000000..fc1018ae --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs new file mode 100644 index 00000000..75af3f59 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt b/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs new file mode 100644 index 00000000..fc1018ae --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs new file mode 100644 index 00000000..23b172f8 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs new file mode 100644 index 00000000..fc1018ae --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs new file mode 100644 index 00000000..22438a2b --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt b/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index f2f06af8..750098d6 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -19,11 +19,118 @@ namespace WixToolsetTest.Util var folder = TestData.Get(@"TestData\UsingFileShare"); var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(Build, "FileShare", "FileSharePermissions"); + var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); Assert.Equal(new[] { - "FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER\t\t", - "FileSharePermissions:ExampleFileShare\tEveryone\t1", + "Binary:Wix4UtilCA_X86\t[Binary data]", + "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", + "CustomAction:Wix4ConfigureSmbUninstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbUninstall\t", + "CustomAction:Wix4CreateSmb_X86\t11265\tWix4UtilCA_X86\tCreateSmb\t", + "CustomAction:Wix4CreateSmbRollback_X86\t11585\tWix4UtilCA_X86\tDropSmb\t", + "CustomAction:Wix4DropSmb_X86\t11265\tWix4UtilCA_X86\tDropSmb\t", + "CustomAction:Wix4DropSmbRollback_X86\t11585\tWix4UtilCA_X86\tCreateSmb\t", + "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", + "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildUsingFileShareX64() + { + var folder = TestData.Get(@"TestData\UsingFileShare"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); + Assert.Equal(new[] + { + "Binary:Wix4UtilCA_X86\t[Binary data]", + "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", + "CustomAction:Wix4ConfigureSmbUninstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbUninstall\t", + "CustomAction:Wix4CreateSmb_X86\t11265\tWix4UtilCA_X86\tCreateSmb\t", + "CustomAction:Wix4CreateSmbRollback_X86\t11585\tWix4UtilCA_X86\tDropSmb\t", + "CustomAction:Wix4DropSmb_X86\t11265\tWix4UtilCA_X86\tDropSmb\t", + "CustomAction:Wix4DropSmbRollback_X86\t11585\tWix4UtilCA_X86\tCreateSmb\t", + "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", + "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildCloseApplication() + { + var folder = TestData.Get(@"TestData\CloseApplication"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4CloseApplication"); + Assert.Equal(new[] + { + "Binary:Wix4UtilCA_X86\t[Binary data]", + "CustomAction:Wix4CheckRebootRequired_X86\t65\tWix4UtilCA_X86\tWixCheckRebootRequired\t", + "CustomAction:Wix4CloseApplications_X86\t1\tWix4UtilCA_X86\tWixCloseApplications\t", + "CustomAction:Wix4CloseApplicationsDeferred_X86\t3073\tWix4UtilCA_X86\tWixCloseApplicationsDeferred\t", + "Wix4CloseApplication:CloseMyApp\texplorer.exe\t\t\t3\t\tMYAPPISRUNNING\t\t", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildInternetShortcut() + { + var folder = TestData.Get(@"TestData\InternetShortcut"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); + Assert.Equal(new[] + { + "Binary:Wix4UtilCA_X86\t[Binary data]", + "CustomAction:Wix4CreateInternetShortcuts_X86\t3073\tWix4UtilCA_X86\tWixCreateInternetShortcuts\t", + "CustomAction:Wix4RollbackInternetShortcuts_X86\t3329\tWix4UtilCA_X86\tWixRollbackInternetShortcuts\t", + "CustomAction:Wix4SchedInternetShortcuts_X86\t1\tWix4UtilCA_X86\tWixSchedInternetShortcuts\t", + "RemoveFile:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tvtpzs3bw.lnk|WiX Toolset.lnk\tINSTALLFOLDER\t2", + "Wix4InternetShortcut:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tINSTALLFOLDER\tWiX Toolset.lnk\thttps://wixtoolset.org\t0\t\t0", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildWithPermissionEx() + { + var folder = TestData.Get(@"TestData\PermissionEx"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CreateFolder", "CustomAction", "Wix4SecureObject"); + Assert.Equal(new[] + { + "Binary:Wix4UtilCA_X64\t[Binary data]", + "CreateFolder:INSTALLFOLDER\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "CustomAction:Wix4ExecSecureObjects_X64\t11265\tWix4UtilCA_X64\tExecSecureObjects\t", + "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", + "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", + "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", + "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildWithEventManifest() + { + var folder = TestData.Get(@"TestData\EventManifest"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); + Assert.Equal(new[] + { + "Binary:Wix4UtilCA_X86\t[Binary data]", + "CustomAction:Wix4ConfigureEventManifestRegister_X86\t1\tWix4UtilCA_X86\tConfigureEventManifestRegister\t", + "CustomAction:Wix4ConfigureEventManifestUnregister_X86\t1\tWix4UtilCA_X86\tConfigureEventManifestUnregister\t", + "CustomAction:Wix4ExecXmlFile_X86\t11265\tWix4UtilCA_X86\tExecXmlFile\t", + "CustomAction:Wix4ExecXmlFileRollback_X86\t11521\tWix4UtilCA_X86\tExecXmlFileRollback\t", + "CustomAction:Wix4RegisterEventManifest_X86\t3073\tWix4UtilCA_X86\tCAQuietExec\t", + "CustomAction:Wix4RollbackRegisterEventManifest_X86\t3393\tWix4UtilCA_X86\tCAQuietExec\t", + "CustomAction:Wix4RollbackUnregisterEventManifest_X86\t3329\tWix4UtilCA_X86\tCAQuietExec\t", + "CustomAction:Wix4SchedXmlFile_X86\t1\tWix4UtilCA_X86\tSchedXmlFile\t", + "CustomAction:Wix4UnregisterEventManifest_X86\t3137\tWix4UtilCA_X86\tCAQuietExec\t", + "Wix4EventManifest:Manifest.dll\t[#Manifest.dll]", + "Wix4XmlFile:Config_Manifest.dllMessageFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@messageFileName[\\]]\tmessageFileName\t[Manifest.dll]\t4100\tManifest.dll\t", + "Wix4XmlFile:Config_Manifest.dllResourceFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@resourceFileName[\\]]\tresourceFileName\t[Manifest.dll]\t4100\tManifest.dll\t", }, results.OrderBy(s => s).ToArray()); } @@ -93,8 +200,18 @@ namespace WixToolsetTest.Util private static void Build(string[] args) { - var result = WixRunner.Execute(args) - .AssertSuccess(); + var result = WixRunner.Execute(args); + result.AssertSuccess(); + } + + private static void BuildX64(string[] args) + { + var newArgs = args.ToList(); + newArgs.Add("-platform"); + newArgs.Add("x64"); + + var result = WixRunner.Execute(newArgs.ToArray()); + result.AssertSuccess(); } } } diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 6cf001a2..1635287d 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -23,6 +23,22 @@ + + + + + + + + + + + + + + + + diff --git a/src/wixext/Tuples/EventManifestTuple.cs b/src/wixext/Tuples/EventManifestTuple.cs index b74d2d59..364604be 100644 --- a/src/wixext/Tuples/EventManifestTuple.cs +++ b/src/wixext/Tuples/EventManifestTuple.cs @@ -11,7 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.EventManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(EventManifestTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(EventManifestTupleFields.File), IntermediateFieldType.String), }, typeof(EventManifestTuple)); @@ -24,7 +24,7 @@ namespace WixToolset.Util.Tuples public enum EventManifestTupleFields { - Component_, + ComponentRef, File, } @@ -40,10 +40,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[EventManifestTupleFields index] => this.Fields[(int)index]; - public string Component_ + public string ComponentRef { - get => this.Fields[(int)EventManifestTupleFields.Component_].AsString(); - set => this.Set((int)EventManifestTupleFields.Component_, value); + get => this.Fields[(int)EventManifestTupleFields.ComponentRef].AsString(); + set => this.Set((int)EventManifestTupleFields.ComponentRef, value); } public string File diff --git a/src/wixext/Tuples/FileSharePermissionsTuple.cs b/src/wixext/Tuples/FileSharePermissionsTuple.cs index 3f037e0e..1db01b98 100644 --- a/src/wixext/Tuples/FileSharePermissionsTuple.cs +++ b/src/wixext/Tuples/FileSharePermissionsTuple.cs @@ -11,8 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.FileSharePermissions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShare_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.User_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShareRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.UserRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.Permissions), IntermediateFieldType.Number), }, typeof(FileSharePermissionsTuple)); @@ -25,8 +25,8 @@ namespace WixToolset.Util.Tuples public enum FileSharePermissionsTupleFields { - FileShare_, - User_, + FileShareRef, + UserRef, Permissions, } @@ -42,16 +42,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[FileSharePermissionsTupleFields index] => this.Fields[(int)index]; - public string FileShare_ + public string FileShareRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.FileShare_].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.FileShare_, value); + get => this.Fields[(int)FileSharePermissionsTupleFields.FileShareRef].AsString(); + set => this.Set((int)FileSharePermissionsTupleFields.FileShareRef, value); } - public string User_ + public string UserRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.User_].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.User_, value); + get => this.Fields[(int)FileSharePermissionsTupleFields.UserRef].AsString(); + set => this.Set((int)FileSharePermissionsTupleFields.UserRef, value); } public int Permissions diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs index 5a31b6fa..6a04f6af 100644 --- a/src/wixext/Tuples/FileShareTuple.cs +++ b/src/wixext/Tuples/FileShareTuple.cs @@ -11,13 +11,10 @@ namespace WixToolset.Util UtilTupleDefinitionType.FileShare.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileShareTupleFields.FileShare), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileShareTupleFields.ShareName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileShareTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Directory_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.User_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Permissions), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.DirectoryRef), IntermediateFieldType.String), }, typeof(FileShareTuple)); } @@ -29,13 +26,10 @@ namespace WixToolset.Util.Tuples public enum FileShareTupleFields { - FileShare, ShareName, - Component_, + ComponentRef, Description, - Directory_, - User_, - Permissions, + DirectoryRef, } public class FileShareTuple : IntermediateTuple @@ -50,22 +44,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[FileShareTupleFields index] => this.Fields[(int)index]; - public string FileShare - { - get => this.Fields[(int)FileShareTupleFields.FileShare].AsString(); - set => this.Set((int)FileShareTupleFields.FileShare, value); - } - public string ShareName { get => this.Fields[(int)FileShareTupleFields.ShareName].AsString(); set => this.Set((int)FileShareTupleFields.ShareName, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)FileShareTupleFields.Component_].AsString(); - set => this.Set((int)FileShareTupleFields.Component_, value); + get => this.Fields[(int)FileShareTupleFields.ComponentRef].AsString(); + set => this.Set((int)FileShareTupleFields.ComponentRef, value); } public string Description @@ -74,22 +62,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)FileShareTupleFields.Description, value); } - public string Directory_ - { - get => this.Fields[(int)FileShareTupleFields.Directory_].AsString(); - set => this.Set((int)FileShareTupleFields.Directory_, value); - } - - public string User_ - { - get => this.Fields[(int)FileShareTupleFields.User_].AsString(); - set => this.Set((int)FileShareTupleFields.User_, value); - } - - public int? Permissions + public string DirectoryRef { - get => this.Fields[(int)FileShareTupleFields.Permissions].AsNullableNumber(); - set => this.Set((int)FileShareTupleFields.Permissions, value); + get => this.Fields[(int)FileShareTupleFields.DirectoryRef].AsString(); + set => this.Set((int)FileShareTupleFields.DirectoryRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs index 97335714..6061b1f4 100644 --- a/src/wixext/Tuples/GroupTuple.cs +++ b/src/wixext/Tuples/GroupTuple.cs @@ -12,7 +12,7 @@ namespace WixToolset.Util new[] { new IntermediateFieldDefinition(nameof(GroupTupleFields.Group), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String), }, @@ -27,7 +27,7 @@ namespace WixToolset.Util.Tuples public enum GroupTupleFields { Group, - Component_, + ComponentRef, Name, Domain, } @@ -50,10 +50,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)GroupTupleFields.Group, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)GroupTupleFields.Component_].AsString(); - set => this.Set((int)GroupTupleFields.Component_, value); + get => this.Fields[(int)GroupTupleFields.ComponentRef].AsString(); + set => this.Set((int)GroupTupleFields.ComponentRef, value); } public string Name diff --git a/src/wixext/Tuples/PerfmonManifestTuple.cs b/src/wixext/Tuples/PerfmonManifestTuple.cs index 3f6cb8cc..9520105a 100644 --- a/src/wixext/Tuples/PerfmonManifestTuple.cs +++ b/src/wixext/Tuples/PerfmonManifestTuple.cs @@ -11,7 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.PerfmonManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.File), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ResourceFileDirectory), IntermediateFieldType.String), }, @@ -25,7 +25,7 @@ namespace WixToolset.Util.Tuples public enum PerfmonManifestTupleFields { - Component_, + ComponentRef, File, ResourceFileDirectory, } @@ -42,10 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[PerfmonManifestTupleFields index] => this.Fields[(int)index]; - public string Component_ + public string ComponentRef { - get => this.Fields[(int)PerfmonManifestTupleFields.Component_].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.Component_, value); + get => this.Fields[(int)PerfmonManifestTupleFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonManifestTupleFields.ComponentRef, value); } public string File diff --git a/src/wixext/Tuples/PerfmonTuple.cs b/src/wixext/Tuples/PerfmonTuple.cs index 00ea818b..1fb6ef6b 100644 --- a/src/wixext/Tuples/PerfmonTuple.cs +++ b/src/wixext/Tuples/PerfmonTuple.cs @@ -11,7 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.Perfmon.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonTupleFields.File), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Name), IntermediateFieldType.String), }, @@ -25,7 +25,7 @@ namespace WixToolset.Util.Tuples public enum PerfmonTupleFields { - Component_, + ComponentRef, File, Name, } @@ -42,10 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[PerfmonTupleFields index] => this.Fields[(int)index]; - public string Component_ + public string ComponentRef { - get => this.Fields[(int)PerfmonTupleFields.Component_].AsString(); - set => this.Set((int)PerfmonTupleFields.Component_, value); + get => this.Fields[(int)PerfmonTupleFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonTupleFields.ComponentRef, value); } public string File diff --git a/src/wixext/Tuples/PerformanceCategoryTuple.cs b/src/wixext/Tuples/PerformanceCategoryTuple.cs index ec2ba73d..16705466 100644 --- a/src/wixext/Tuples/PerformanceCategoryTuple.cs +++ b/src/wixext/Tuples/PerformanceCategoryTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.PerformanceCategory.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.PerformanceCategory), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.IniData), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ConstantData), IntermediateFieldType.String), @@ -27,8 +26,7 @@ namespace WixToolset.Util.Tuples public enum PerformanceCategoryTupleFields { - PerformanceCategory, - Component_, + ComponentRef, Name, IniData, ConstantData, @@ -46,16 +44,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[PerformanceCategoryTupleFields index] => this.Fields[(int)index]; - public string PerformanceCategory + public string ComponentRef { - get => this.Fields[(int)PerformanceCategoryTupleFields.PerformanceCategory].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.PerformanceCategory, value); - } - - public string Component_ - { - get => this.Fields[(int)PerformanceCategoryTupleFields.Component_].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.Component_, value); + get => this.Fields[(int)PerformanceCategoryTupleFields.ComponentRef].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.ComponentRef, value); } public string Name diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index f54b23d8..920fe7b3 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -11,12 +11,11 @@ namespace WixToolset.Util UtilTupleDefinitionType.SecureObjects.ToString(), new[] { - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Permission), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.ComponentRef), IntermediateFieldType.String), }, typeof(SecureObjectsTuple)); } @@ -28,12 +27,11 @@ namespace WixToolset.Util.Tuples public enum SecureObjectsTupleFields { - SecureObject, Table, Domain, User, Permission, - Component_, + ComponentRef, } public class SecureObjectsTuple : IntermediateTuple @@ -48,12 +46,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; - public string SecureObject - { - get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); - set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); - } - public string Table { get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); @@ -78,10 +70,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)SecureObjectsTupleFields.Permission, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)SecureObjectsTupleFields.Component_].AsString(); - set => this.Set((int)SecureObjectsTupleFields.Component_, value); + get => this.Fields[(int)SecureObjectsTupleFields.ComponentRef].AsString(); + set => this.Set((int)SecureObjectsTupleFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs index 74d96bca..e5fc3992 100644 --- a/src/wixext/Tuples/ServiceConfigTuple.cs +++ b/src/wixext/Tuples/ServiceConfigTuple.cs @@ -12,7 +12,7 @@ namespace WixToolset.Util new[] { new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.NewService), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.FirstFailureActionType), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.SecondFailureActionType), IntermediateFieldType.String), @@ -33,7 +33,7 @@ namespace WixToolset.Util.Tuples public enum ServiceConfigTupleFields { ServiceName, - Component_, + ComponentRef, NewService, FirstFailureActionType, SecondFailureActionType, @@ -62,10 +62,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)ServiceConfigTupleFields.ServiceName, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)ServiceConfigTupleFields.Component_].AsString(); - set => this.Set((int)ServiceConfigTupleFields.Component_, value); + get => this.Fields[(int)ServiceConfigTupleFields.ComponentRef].AsString(); + set => this.Set((int)ServiceConfigTupleFields.ComponentRef, value); } public int NewService diff --git a/src/wixext/Tuples/UserGroupTuple.cs b/src/wixext/Tuples/UserGroupTuple.cs index 0386a26e..30c5e9ff 100644 --- a/src/wixext/Tuples/UserGroupTuple.cs +++ b/src/wixext/Tuples/UserGroupTuple.cs @@ -11,8 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.UserGroup.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.User_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.Group_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupTupleFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupTupleFields.GroupRef), IntermediateFieldType.String), }, typeof(UserGroupTuple)); } @@ -24,8 +24,8 @@ namespace WixToolset.Util.Tuples public enum UserGroupTupleFields { - User_, - Group_, + UserRef, + GroupRef, } public class UserGroupTuple : IntermediateTuple @@ -40,16 +40,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[UserGroupTupleFields index] => this.Fields[(int)index]; - public string User_ + public string UserRef { - get => this.Fields[(int)UserGroupTupleFields.User_].AsString(); - set => this.Set((int)UserGroupTupleFields.User_, value); + get => this.Fields[(int)UserGroupTupleFields.UserRef].AsString(); + set => this.Set((int)UserGroupTupleFields.UserRef, value); } - public string Group_ + public string GroupRef { - get => this.Fields[(int)UserGroupTupleFields.Group_].AsString(); - set => this.Set((int)UserGroupTupleFields.Group_, value); + get => this.Fields[(int)UserGroupTupleFields.GroupRef].AsString(); + set => this.Set((int)UserGroupTupleFields.GroupRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UserTuple.cs b/src/wixext/Tuples/UserTuple.cs index e8c5315c..f11ed78b 100644 --- a/src/wixext/Tuples/UserTuple.cs +++ b/src/wixext/Tuples/UserTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.User.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserTupleFields.User), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(UserTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(UserTupleFields.Domain), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(UserTupleFields.Password), IntermediateFieldType.String), @@ -28,8 +27,7 @@ namespace WixToolset.Util.Tuples public enum UserTupleFields { - User, - Component_, + ComponentRef, Name, Domain, Password, @@ -48,16 +46,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[UserTupleFields index] => this.Fields[(int)index]; - public string User + public string ComponentRef { - get => this.Fields[(int)UserTupleFields.User].AsString(); - set => this.Set((int)UserTupleFields.User, value); - } - - public string Component_ - { - get => this.Fields[(int)UserTupleFields.Component_].AsString(); - set => this.Set((int)UserTupleFields.Component_, value); + get => this.Fields[(int)UserTupleFields.ComponentRef].AsString(); + set => this.Set((int)UserTupleFields.ComponentRef, value); } public string Name diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs index c2095d93..cc91c326 100644 --- a/src/wixext/Tuples/WixCloseApplicationTuple.cs +++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs @@ -11,7 +11,6 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixCloseApplication.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.WixCloseApplication), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Target), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Description), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Condition), IntermediateFieldType.String), @@ -31,7 +30,6 @@ namespace WixToolset.Util.Tuples public enum WixCloseApplicationTupleFields { - WixCloseApplication, Target, Description, Condition, @@ -54,12 +52,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixCloseApplicationTupleFields index] => this.Fields[(int)index]; - public string WixCloseApplication - { - get => this.Fields[(int)WixCloseApplicationTupleFields.WixCloseApplication].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.WixCloseApplication, value); - } - public string Target { get => this.Fields[(int)WixCloseApplicationTupleFields.Target].AsString(); diff --git a/src/wixext/Tuples/WixFormatFilesTuple.cs b/src/wixext/Tuples/WixFormatFilesTuple.cs index 7fc092b0..8e7db0c6 100644 --- a/src/wixext/Tuples/WixFormatFilesTuple.cs +++ b/src/wixext/Tuples/WixFormatFilesTuple.cs @@ -11,8 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixFormatFiles.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.Binary_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.File_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.BinaryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.FileRef), IntermediateFieldType.String), }, typeof(WixFormatFilesTuple)); } @@ -24,8 +24,8 @@ namespace WixToolset.Util.Tuples public enum WixFormatFilesTupleFields { - Binary_, - File_, + BinaryRef, + FileRef, } public class WixFormatFilesTuple : IntermediateTuple @@ -40,16 +40,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixFormatFilesTupleFields index] => this.Fields[(int)index]; - public string Binary_ + public string BinaryRef { - get => this.Fields[(int)WixFormatFilesTupleFields.Binary_].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.Binary_, value); + get => this.Fields[(int)WixFormatFilesTupleFields.BinaryRef].AsString(); + set => this.Set((int)WixFormatFilesTupleFields.BinaryRef, value); } - public string File_ + public string FileRef { - get => this.Fields[(int)WixFormatFilesTupleFields.File_].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.File_, value); + get => this.Fields[(int)WixFormatFilesTupleFields.FileRef].AsString(); + set => this.Set((int)WixFormatFilesTupleFields.FileRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs index 5c29cda6..935d9462 100644 --- a/src/wixext/Tuples/WixInternetShortcutTuple.cs +++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs @@ -11,9 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixInternetShortcut.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.WixInternetShortcut), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Component_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Directory_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.DirectoryRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Target), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Attributes), IntermediateFieldType.Number), @@ -30,9 +29,8 @@ namespace WixToolset.Util.Tuples public enum WixInternetShortcutTupleFields { - WixInternetShortcut, - Component_, - Directory_, + ComponentRef, + DirectoryRef, Name, Target, Attributes, @@ -52,22 +50,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixInternetShortcutTupleFields index] => this.Fields[(int)index]; - public string WixInternetShortcut + public string ComponentRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.WixInternetShortcut].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.WixInternetShortcut, value); + get => this.Fields[(int)WixInternetShortcutTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.ComponentRef, value); } - public string Component_ + public string DirectoryRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.Component_].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Component_, value); - } - - public string Directory_ - { - get => this.Fields[(int)WixInternetShortcutTupleFields.Directory_].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Directory_, value); + get => this.Fields[(int)WixInternetShortcutTupleFields.DirectoryRef].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.DirectoryRef, value); } public string Name diff --git a/src/wixext/Tuples/WixRemoveFolderExTuple.cs b/src/wixext/Tuples/WixRemoveFolderExTuple.cs index 35e22e2d..d43c59c3 100644 --- a/src/wixext/Tuples/WixRemoveFolderExTuple.cs +++ b/src/wixext/Tuples/WixRemoveFolderExTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixRemoveFolderEx.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.WixRemoveFolderEx), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Property), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.InstallMode), IntermediateFieldType.Number), }, @@ -26,8 +25,7 @@ namespace WixToolset.Util.Tuples public enum WixRemoveFolderExTupleFields { - WixRemoveFolderEx, - Component_, + ComponentRef, Property, InstallMode, } @@ -44,16 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixRemoveFolderExTupleFields index] => this.Fields[(int)index]; - public string WixRemoveFolderEx + public string ComponentRef { - get => this.Fields[(int)WixRemoveFolderExTupleFields.WixRemoveFolderEx].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.WixRemoveFolderEx, value); - } - - public string Component_ - { - get => this.Fields[(int)WixRemoveFolderExTupleFields.Component_].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.Component_, value); + get => this.Fields[(int)WixRemoveFolderExTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveFolderExTupleFields.ComponentRef, value); } public string Property diff --git a/src/wixext/Tuples/WixRestartResourceTuple.cs b/src/wixext/Tuples/WixRestartResourceTuple.cs index 828d9d15..92091c3d 100644 --- a/src/wixext/Tuples/WixRestartResourceTuple.cs +++ b/src/wixext/Tuples/WixRestartResourceTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixRestartResource.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.WixRestartResource), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Resource), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Attributes), IntermediateFieldType.Number), }, @@ -26,8 +25,7 @@ namespace WixToolset.Util.Tuples public enum WixRestartResourceTupleFields { - WixRestartResource, - Component_, + ComponentRef, Resource, Attributes, } @@ -44,16 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixRestartResourceTupleFields index] => this.Fields[(int)index]; - public string WixRestartResource + public string ComponentRef { - get => this.Fields[(int)WixRestartResourceTupleFields.WixRestartResource].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.WixRestartResource, value); - } - - public string Component_ - { - get => this.Fields[(int)WixRestartResourceTupleFields.Component_].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.Component_, value); + get => this.Fields[(int)WixRestartResourceTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixRestartResourceTupleFields.ComponentRef, value); } public string Resource diff --git a/src/wixext/Tuples/WixTouchFileTuple.cs b/src/wixext/Tuples/WixTouchFileTuple.cs index f87f396e..0a152dec 100644 --- a/src/wixext/Tuples/WixTouchFileTuple.cs +++ b/src/wixext/Tuples/WixTouchFileTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixTouchFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.WixTouchFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Path), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Attributes), IntermediateFieldType.Number), }, @@ -26,8 +25,7 @@ namespace WixToolset.Util.Tuples public enum WixTouchFileTupleFields { - WixTouchFile, - Component_, + ComponentRef, Path, Attributes, } @@ -44,16 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixTouchFileTupleFields index] => this.Fields[(int)index]; - public string WixTouchFile + public string ComponentRef { - get => this.Fields[(int)WixTouchFileTupleFields.WixTouchFile].AsString(); - set => this.Set((int)WixTouchFileTupleFields.WixTouchFile, value); - } - - public string Component_ - { - get => this.Fields[(int)WixTouchFileTupleFields.Component_].AsString(); - set => this.Set((int)WixTouchFileTupleFields.Component_, value); + get => this.Fields[(int)WixTouchFileTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixTouchFileTupleFields.ComponentRef, value); } public string Path diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs index 093299b2..0eb49cac 100644 --- a/src/wixext/Tuples/XmlConfigTuple.cs +++ b/src/wixext/Tuples/XmlConfigTuple.cs @@ -11,14 +11,13 @@ namespace WixToolset.Util UtilTupleDefinitionType.XmlConfig.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.XmlConfig), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.File), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ElementPath), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.VerifyPath), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Value), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Sequence), IntermediateFieldType.Number), }, typeof(XmlConfigTuple)); @@ -31,14 +30,13 @@ namespace WixToolset.Util.Tuples public enum XmlConfigTupleFields { - XmlConfig, File, ElementPath, VerifyPath, Name, Value, Flags, - Component_, + ComponentRef, Sequence, } @@ -54,12 +52,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[XmlConfigTupleFields index] => this.Fields[(int)index]; - public string XmlConfig - { - get => this.Fields[(int)XmlConfigTupleFields.XmlConfig].AsString(); - set => this.Set((int)XmlConfigTupleFields.XmlConfig, value); - } - public string File { get => this.Fields[(int)XmlConfigTupleFields.File].AsString(); @@ -96,10 +88,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)XmlConfigTupleFields.Flags, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)XmlConfigTupleFields.Component_].AsString(); - set => this.Set((int)XmlConfigTupleFields.Component_, value); + get => this.Fields[(int)XmlConfigTupleFields.ComponentRef].AsString(); + set => this.Set((int)XmlConfigTupleFields.ComponentRef, value); } public int Sequence diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs index 27ea7119..e0b3bbd7 100644 --- a/src/wixext/Tuples/XmlFileTuple.cs +++ b/src/wixext/Tuples/XmlFileTuple.cs @@ -11,13 +11,12 @@ namespace WixToolset.Util UtilTupleDefinitionType.XmlFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.XmlFile), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.File), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ElementPath), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Value), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number), }, typeof(XmlFileTuple)); @@ -30,13 +29,12 @@ namespace WixToolset.Util.Tuples public enum XmlFileTupleFields { - XmlFile, File, ElementPath, Name, Value, Flags, - Component_, + ComponentRef, Sequence, } @@ -52,12 +50,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index]; - public string XmlFile - { - get => this.Fields[(int)XmlFileTupleFields.XmlFile].AsString(); - set => this.Set((int)XmlFileTupleFields.XmlFile, value); - } - public string File { get => this.Fields[(int)XmlFileTupleFields.File].AsString(); @@ -88,10 +80,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)XmlFileTupleFields.Flags, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)XmlFileTupleFields.Component_].AsString(); - set => this.Set((int)XmlFileTupleFields.Component_, value); + get => this.Fields[(int)XmlFileTupleFields.ComponentRef].AsString(); + set => this.Set((int)XmlFileTupleFields.ComponentRef, value); } public int Sequence diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 19f4af06..a8d59ca3 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -14,6 +14,7 @@ namespace WixToolset.Util using WixToolset.Data.Tuples; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; + using WixToolset.Util.Tuples; /// /// The compiler for the WiX Toolset Utility Extension. @@ -790,38 +791,32 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - // Reference CustomAction since nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixCloseApplications_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixCloseApplications"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixCloseApplication", id); - row.Set(1, target); - row.Set(2, description); - row.Set(3, condition); - row.Set(4, attributes); + var tuple = new WixCloseApplicationTuple(sourceLineNumbers, id) + { + Target = target, + Description = description, + Condition = condition, + Attributes = attributes, + Property = property, + }; if (CompilerConstants.IntegerNotSet != sequence) { - row.Set(5, sequence); + tuple.Sequence = sequence; } - row.Set(6, property); if (CompilerConstants.IntegerNotSet != terminateExitCode) { - row.Set(7, terminateExitCode); + tuple.TerminateExitCode = terminateExitCode; } if (CompilerConstants.IntegerNotSet != timeout) { - row.Set(8, timeout * 1000); // make the timeout milliseconds in the table. + tuple.Timeout = timeout * 1000; // make the timeout milliseconds in the table. } + + section.Tuples.Add(tuple); } } @@ -1096,7 +1091,7 @@ namespace WixToolset.Util SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string description = null; string name = null; - string id = null; + Identifier id = null; foreach (XAttribute attrib in element.Attributes()) { @@ -1105,7 +1100,7 @@ namespace WixToolset.Util switch (attrib.Name.LocalName) { case "Id": - id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "Name": name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1159,28 +1154,20 @@ namespace WixToolset.Util } } - // Reference ConfigureSmbInstall and ConfigureSmbUninstall since nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbInstall_ARM"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbUninstall_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbInstall"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureSmbUninstall"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "FileShare"); - row.Set(0, id); - row.Set(1, name); - row.Set(2, componentId); - row.Set(3, description); - row.Set(4, directoryId); + var tuple = new FileShareTuple(sourceLineNumbers, id) + { + ShareName = name, + ComponentRef = componentId, + Description = description, + DirectoryRef = directoryId, + }; + + section.Tuples.Add(tuple); } } @@ -1189,7 +1176,7 @@ namespace WixToolset.Util /// /// Element to parse. /// The identifier of the parent FileShare element. - private void ParseFileSharePermissionElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileShareId) + private void ParseFileSharePermissionElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier fileShareId) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); BitArray bits = new BitArray(32); @@ -1244,10 +1231,14 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "FileSharePermissions"); - row.Set(0, fileShareId); - row.Set(1, user); - row.Set(2, permission); + var tuple = new FileSharePermissionsTuple(sourceLineNumbers) + { + FileShareRef = fileShareId.Id, + UserRef = user, + Permissions = permission, + }; + + section.Tuples.Add(tuple); } } @@ -1259,7 +1250,7 @@ namespace WixToolset.Util private void ParseGroupElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string id = null; + Identifier id = null; string domain = null; string name = null; @@ -1270,7 +1261,7 @@ namespace WixToolset.Util switch (attrib.Name.LocalName) { case "Id": - id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "Name": name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1298,11 +1289,14 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Group"); - row.Set(0, id); - row.Set(1, componentId); - row.Set(2, name); - row.Set(3, domain); + var tuple = new GroupTuple(sourceLineNumbers, id) + { + ComponentRef = componentId, + Name = name, + Domain = domain, + }; + + section.Tuples.Add(tuple); } } @@ -1341,9 +1335,13 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "UserGroup"); - row.Set(0, userId); - row.Set(1, groupId); + var tuple = new UserGroupTuple(sourceLineNumbers) + { + UserRef = userId, + GroupRef = groupId, + }; + + section.Tuples.Add(tuple); } } @@ -1356,7 +1354,7 @@ namespace WixToolset.Util private void ParseInternetShortcutElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string defaultTarget) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string id = null; + Identifier id = null; string name = null; string target = null; string directoryId = null; @@ -1374,7 +1372,7 @@ namespace WixToolset.Util directoryId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); break; case "Id": - id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "Name": name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1457,43 +1455,40 @@ namespace WixToolset.Util /// Identifier of shortcut. /// Name of shortcut without extension. /// Target URL of shortcut. - private void CreateWixInternetShortcut(IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, string shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) + private void CreateWixInternetShortcut(IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, Identifier shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) { // add the appropriate extension based on type of shortcut name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixInternetShortcut"); - row.Set(0, shortcutId); - row.Set(1, componentId); - row.Set(2, directoryId); - row.Set(3, name); - row.Set(4, target); - row.Set(5, (int)type); - row.Set(6, iconFile); - row.Set(7, iconIndex); - - // Reference custom action because nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedInternetShortcuts_ARM"); - } - else + var tuple = new WixInternetShortcutTuple(sourceLineNumbers, shortcutId) { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedInternetShortcuts"); - } + ComponentRef = componentId, + DirectoryRef = directoryId, + Name = name, + Target = target, + Attributes = (int)type, + IconFile = iconFile, + IconIndex = iconIndex, + }; + + section.Tuples.Add(tuple); + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); // use built-in MSI functionality to remove the shortcuts rather than doing so via CA - row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "RemoveFile"); - row.Set(0, shortcutId); - row.Set(1, componentId); - row.Set(2, this.ParseHelper.IsValidShortFilename(name, false) ? name : String.Concat(this.ParseHelper.CreateShortName(name, true, false, directoryId, name), "|", name)); - row.Set(3, directoryId); - row.Set(4, 2); // msidbRemoveFileInstallModeOnRemove + var removeFileTuple = new RemoveFileTuple(sourceLineNumbers, shortcutId) + { + ComponentRef = componentId, + DirProperty = directoryId, + OnUninstall = true, + // TODO: A better way? + FileName = this.ParseHelper.IsValidShortFilename(name, false) ? name : String.Concat(this.ParseHelper.CreateShortName(name, true, false, directoryId, name), "|", name), + }; + + section.Tuples.Add(removeFileTuple); } /// @@ -1504,7 +1499,7 @@ namespace WixToolset.Util private void ParsePerformanceCategoryElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string id = null; + Identifier id = null; string name = null; string help = null; YesNoType multiInstance = YesNoType.No; @@ -1537,7 +1532,7 @@ namespace WixToolset.Util help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "Id": - id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "Library": library = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1569,7 +1564,7 @@ namespace WixToolset.Util if (null == name) { - name = id; + name = id?.Id; } // Process the child counter elements. @@ -1641,12 +1636,15 @@ namespace WixToolset.Util sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); // Add the calculated INI and H strings to the PerformanceCategory table. - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "PerformanceCategory"); - row.Set(0, id); - row.Set(1, componentId); - row.Set(2, name); - row.Set(3, sbIniData.ToString()); - row.Set(4, sbSymbolicConstants.ToString()); + var tuple = new PerformanceCategoryTuple(sourceLineNumbers, id) + { + ComponentRef = componentId, + Name = name, + IniData = sbIniData.ToString(), + ConstantData = sbSymbolicConstants.ToString(), + }; + + section.Tuples.Add(tuple); // Set up the application's performance key. string escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); @@ -1664,19 +1662,8 @@ namespace WixToolset.Util this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } - // Reference InstallPerfCounterData and UninstallPerfCounterData since nothing will happen without them - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CAs are referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "InstallPerfCounterData_ARM"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "UninstallPerfCounterData_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "InstallPerfCounterData"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "UninstallPerfCounterData"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } /// @@ -2146,25 +2133,18 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Perfmon"); - row.Set(0, componentId); - row.Set(1, $"[#{fileId}]"); - row.Set(2, name); - } + var tuple = new PerfmonTuple(sourceLineNumbers) + { + ComponentRef = componentId, + File = $"[#{fileId}]", + Name = name, + }; - // Reference ConfigurePerfmonInstall and ConfigurePerfmonUninstall since nothing will happen without them - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CAs are referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonInstall_ARM"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonUninstall_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonInstall"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonUninstall"); + section.Tuples.Add(tuple); } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } @@ -2203,24 +2183,18 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "PerfmonManifest"); - row.Set(0, componentId); - row.Set(1, $"[#{fileId}]"); - row.Set(2, resourceFileDirectory); - } + var tuple = new PerfmonManifestTuple(sourceLineNumbers) + { + ComponentRef = componentId, + File = $"[#{fileId}]", + ResourceFileDirectory = resourceFileDirectory, + }; - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CAs are referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestRegister_ARM"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestUnregister_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestRegister"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigurePerfmonManifestUnregister"); + section.Tuples.Add(tuple); } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } /// @@ -2263,23 +2237,15 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - switch (this.Context.Platform) + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X64 | CustomActionPlatforms.X86); + + var tuple = new WixFormatFilesTuple(sourceLineNumbers) { - case Platform.X86: - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedFormatFiles"); - break; - case Platform.X64: - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixSchedFormatFiles_x64"); - break; - case Platform.IA64: - case Platform.ARM: - this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); - break; - } + BinaryRef = binaryId, + FileRef = fileId, + }; - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixFormatFiles"); - row.Set(0, binaryId); - row.Set(1, fileId); + section.Tuples.Add(tuple); this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Binary", binaryId); } @@ -2328,71 +2294,62 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "EventManifest"); - row.Set(0, componentId); - row.Set(1, $"[#{fileId}]"); + var tuple = new EventManifestTuple(sourceLineNumbers) + { + ComponentRef = componentId, + File = $"[#{fileId}]", + }; + + section.Tuples.Add(tuple); if (null != messageFile) { - var messageRow = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); - messageRow.Set(0, String.Concat("Config_", fileId, "MessageFile")); - messageRow.Set(1, $"[#{fileId}]"); - messageRow.Set(2, "/*/*/*/*[\\[]@messageFileName[\\]]"); - messageRow.Set(3, "messageFileName"); - messageRow.Set(4, messageFile); - messageRow.Set(5, 4 | 0x00001000); //bulk write | preserve modified date - messageRow.Set(6, componentId); + var xmlTuple = new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) + { + File = $"[#{fileId}]", + ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", + Name = "messageFileName", + Value = messageFile, + Flags = 4 | 0x00001000, //bulk write | preserve modified date + ComponentRef = componentId, + }; + section.Tuples.Add(xmlTuple); } if (null != parameterFile) { - var resourceRow = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); - resourceRow.Set(0, String.Concat("Config_", fileId, "ParameterFile")); - resourceRow.Set(1, $"[#{fileId}]"); - resourceRow.Set(2, "/*/*/*/*[\\[]@parameterFileName[\\]]"); - resourceRow.Set(3, "parameterFileName"); - resourceRow.Set(4, parameterFile); - resourceRow.Set(5, 4 | 0x00001000); //bulk write | preserve modified date - resourceRow.Set(6, componentId); + var xmlTuple = new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) + { + File = $"[#{fileId}]", + ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", + Name = "parameterFileName", + Value = parameterFile, + Flags = 4 | 0x00001000, //bulk write | preserve modified date + ComponentRef = componentId, + }; + section.Tuples.Add(xmlTuple); } if (null != resourceFile) { - var resourceRow = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); - resourceRow.Set(0, String.Concat("Config_", fileId, "ResourceFile")); - resourceRow.Set(1, $"[#{fileId}]"); - resourceRow.Set(2, "/*/*/*/*[\\[]@resourceFileName[\\]]"); - resourceRow.Set(3, "resourceFileName"); - resourceRow.Set(4, resourceFile); - resourceRow.Set(5, 4 | 0x00001000); //bulk write | preserve modified date - resourceRow.Set(6, componentId); + var xmlTuple = new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) + { + File = $"[#{fileId}]", + ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", + Name = "resourceFileName", + Value = resourceFile, + Flags = 4 | 0x00001000, //bulk write | preserve modified date + ComponentRef = componentId, + }; + section.Tuples.Add(xmlTuple); } } - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestRegister_ARM"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestUnregister_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestRegister"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureEventManifestUnregister"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); if (null != messageFile || null != parameterFile || null != resourceFile) { - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } } @@ -2493,36 +2450,18 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - if (win64) - { - if (this.Context.Platform == Platform.IA64) - { - this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, "ia64", element.Name.LocalName)); - } - else - { - // Ensure SchedSecureObjects (x64) is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects_x64"); - } - } - else if (this.Context.Platform == Platform.ARM) - { - // Ensure SchedSecureObjects (arm) is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects_ARM"); - } - else + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); + + var tuple = new SecureObjectsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, objectId)) { - // Ensure SchedSecureObjects (x86) is referenced, to handle this x86 component member - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedSecureObjects"); - } + Table = tableName, + Domain = domain, + User = user, + Permission = permission, + ComponentRef = componentId, + }; - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "SecureObjects"); - row.Set(0, objectId); - row.Set(1, tableName); - row.Set(2, domain); - row.Set(3, user); - row.Set(4, permission); - row.Set(5, componentId); + section.Tuples.Add(tuple); } } @@ -2881,13 +2820,18 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRemoveFolderEx", id); - row.Set(1, componentId); - row.Set(2, property); - row.Set(3, on); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86); + + var tuple = new WixRemoveFolderExTuple(sourceLineNumbers) + { + ComponentRef = componentId, + Property = property, + InstallMode = (int)on, + }; + + section.Tuples.Add(tuple); this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveFile"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRemoveFoldersEx"); } } @@ -2954,22 +2898,16 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - // Add a reference to the WixRegisterRestartResources custom action since nothing will happen without it. - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRegisterRestartResources_ARM"); - } - else + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + + var tuple = new WixRestartResourceTuple(sourceLineNumbers) { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixRegisterRestartResources"); - } + ComponentRef = componentId, + Resource = resource, + Attributes = attributes, + }; - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixRestartResource", id); - row.Set(1, componentId); - row.Set(2, resource); - row.Set(3, attributes); + section.Tuples.Add(tuple); } } @@ -3052,38 +2990,25 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - // Reference SchedServiceConfig since nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedServiceConfig_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedServiceConfig"); - } - if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "ServiceConfig"); - row.Set(0, serviceName); - row.Set(1, componentId); - row.Set(2, (newService ? 1 : 0)); - row.Set(3, firstFailureActionType); - row.Set(4, secondFailureActionType); - row.Set(5, thirdFailureActionType); - if (CompilerConstants.IntegerNotSet != resetPeriod) - { - row.Set(6, resetPeriod); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - if (CompilerConstants.IntegerNotSet != restartServiceDelay) + var tuple = new ServiceConfigTuple(sourceLineNumbers) { - row.Set(7, restartServiceDelay); - } - row.Set(8, programCommandLine); - row.Set(9, rebootMessage); + ServiceName = serviceName, + ComponentRef = componentId, + NewService = newService ? 1 : 0, + FirstFailureActionType = firstFailureActionType, + SecondFailureActionType = secondFailureActionType, + ThirdFailureActionType = thirdFailureActionType, + ResetPeriodInDays = resetPeriod, + RestartServiceDelayInSeconds = restartServiceDelay, + ProgramCommandLine = programCommandLine, + RebootMessage = rebootMessage, + }; + + section.Tuples.Add(tuple); } } @@ -3166,12 +3091,16 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixTouchFile", id); - row.Set(1, componentId); - row.Set(2, path); - row.Set(3, attributes); + var tuple = new WixTouchFileTuple(sourceLineNumbers) + { + ComponentRef = componentId, + Path = path, + Attributes = attributes, + }; + + section.Tuples.Add(tuple); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixTouchFileDuringInstall"); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86); } } @@ -3375,27 +3304,21 @@ namespace WixToolset.Util if (null != componentId) { - // Reference ConfigureIIs since nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureUsers_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureUsers"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "User", id); - row.Set(1, componentId); - row.Set(2, name); - row.Set(3, domain); - row.Set(4, password); - row.Set(5, attributes); + var tuple = new UserTuple(sourceLineNumbers, id) + { + ComponentRef = componentId, + Name = name, + Domain = domain, + Password = password, + Attributes = attributes, + }; + + section.Tuples.Add(tuple); } } @@ -3407,7 +3330,7 @@ namespace WixToolset.Util private void ParseXmlFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string id = null; + Identifier id = null; string file = null; string elementPath = null; string name = null; @@ -3458,7 +3381,7 @@ namespace WixToolset.Util } break; case "Id": - id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "File": file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -3522,31 +3445,23 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlFile"); - row.Set(0, id); - row.Set(1, file); - row.Set(2, elementPath); - row.Set(3, name); - row.Set(4, value); - row.Set(5, flags); - row.Set(6, componentId); + var tuple = new XmlFileTuple(sourceLineNumbers, id) + { + File = file, + ElementPath = elementPath, + Name = name, + Value = value, + Flags = flags, + ComponentRef = componentId, + }; if (-1 != sequence) { - row.Set(7, sequence); + tuple.Sequence = sequence; } + section.Tuples.Add(tuple); } - // Reference SchedXmlFile since nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlFile"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } /// @@ -3558,7 +3473,7 @@ namespace WixToolset.Util private void ParseXmlConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool nested) { SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string id = null; + Identifier id = null; string elementId = null; string elementPath = null; int flags = 0; @@ -3575,7 +3490,7 @@ namespace WixToolset.Util switch (attrib.Name.LocalName) { case "Id": - id = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "Action": if (nested) @@ -3760,32 +3675,24 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var row = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "XmlConfig"); - row.Set(0, id); - row.Set(1, file); - row.Set(2, elementId ?? elementPath); - row.Set(3, verifyPath); - row.Set(4, name); - row.Set(5, value); - row.Set(6, flags); - row.Set(7, componentId); + var tuple = new XmlConfigTuple(sourceLineNumbers, id) + { + File=file, + ElementPath=elementId ??elementPath, + VerifyPath=verifyPath, + Name=name, + Value=value, + Flags=flags, + ComponentRef=componentId, + }; if (CompilerConstants.IntegerNotSet != sequence) { - row.Set(8, sequence); + tuple.Sequence = sequence; } + section.Tuples.Add(tuple); } - // Reference SchedXmlConfig since nothing will happen without it - if (this.Context.Platform == Platform.ARM) - { - // Ensure ARM version of the CA is referenced - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlConfig_ARM"); - } - else - { - // All other supported platforms use x86 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "SchedXmlConfig"); - } + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); } /// diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index 2365ed01..8648cb17 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -5,6 +5,7 @@ namespace WixToolset.Util using System.Collections.Generic; using System.Linq; using System.Xml; + using WixToolset.Data; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; @@ -14,6 +15,12 @@ namespace WixToolset.Util public override IEnumerable TableDefinitions { get => Tables; } + public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) + { + var columnZeroIsId = tuple.Id != null; + return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId); + } + private static TableDefinition[] LoadTables() { using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index ed5a6a0f..3cd7b115 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -19,6 +19,7 @@ + diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml index 9f491e56..b8d4246c 100644 --- a/src/wixext/tables.xml +++ b/src/wixext/tables.xml @@ -3,8 +3,8 @@ - - + @@ -23,8 +23,8 @@ - - + @@ -33,8 +33,8 @@ - - + @@ -43,8 +43,8 @@ - - + @@ -54,21 +54,17 @@ category="text" description="Description string displayed for the file share"/> - - - - + - + - - + @@ -77,8 +73,8 @@ - - + @@ -95,8 +91,8 @@ - - + @@ -107,7 +103,7 @@ - + - + - + - - + + category="text" description="User name half of user account to secure"/> - + - - + + - - + @@ -189,14 +185,14 @@ - - - + + + - - + @@ -213,13 +209,13 @@ - - + + category="formatted" description="The XPATH query for an element to modify or add children to. Can also be a foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row."/> - + + @@ -63,368 +64,358 @@ - + - WIXFAILWHENDEFERRED=1 AND VersionNT > 400 + WIXFAILWHENDEFERRED=1 AND VersionNT > 400 - + - + - + - + - + - NEWERVERSIONDETECTED AND VersionNT > 400 + NEWERVERSIONDETECTED AND VersionNT > 400 - + - + - + - + - + - + - + - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - + - + - + - + - + - + - + - + - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - + - + - + - + - - - - - - - - - - - + - + - + - + - + diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index 4f76c687..0d7fed09 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -3,8 +3,7 @@ - - + - NOT REMOVE~="ALL" AND VersionNT > 400 + NOT REMOVE~="ALL" AND VersionNT > 400 - - - + + + - VersionNT > 400 + VersionNT > 400 - + - + - - - + + + - + - VersionNT > 400 + VersionNT > 400 - - - - - - + + + + + + - VersionNT > 400 - VersionNT > 400 + VersionNT > 400 + VersionNT > 400 - - - - - - + + + + + + - VersionNT > 400 - VersionNT > 400 + VersionNT > 400 + VersionNT > 400 - - - - - - + + + + + + - VersionNT > 400 - VersionNT > 400 + VersionNT > 400 + VersionNT > 400 - - - - - - + + + + + + - VersionNT > 400 - VersionNT > 400 + VersionNT > 400 + VersionNT > 400 - - - - - - + + + + + + - VersionNT > 400 - VersionNT > 400 + VersionNT > 400 + VersionNT > 400 - - - + + + - NOT REMOVE~="ALL" AND VersionNT > 400 + NOT REMOVE~="ALL" AND VersionNT > 400 - - - - + + + + - - + + - - - + + + - VersionNT > 400 + VersionNT > 400 - - - + + + - VersionNT > 400 + VersionNT > 400 - - - + + + - VersionNT > 400 - VersionNT > 400 - VersionNT > 400 + VersionNT > 400 + VersionNT > 400 + VersionNT > 400 @@ -196,29 +195,29 @@ - - - - + + + + - NOT REMOVE~="ALL" AND VersionNT > 400 - VersionNT > 400 + NOT REMOVE~="ALL" AND VersionNT > 400 + VersionNT > 400 - - - + + + - + - + diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi new file mode 100644 index 00000000..1d00df8f --- /dev/null +++ b/src/wixlib/caDecor.wxi @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi deleted file mode 100644 index a56a2393..00000000 --- a/src/wixlib/caSuffix.wxi +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index f9dbabb8..21d96832 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -33,7 +33,7 @@ - + -- cgit v1.2.3-55-g6feb From 00b945dfc182304a7999aa999f4303078beb2e52 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 9 Mar 2020 19:50:20 -0400 Subject: Make the SecureObjectsTuple Id a bit more resilient. --- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/UtilCompiler.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 750098d6..8f33eff5 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -105,7 +105,7 @@ namespace WixToolsetTest.Util "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", - "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index a8d59ca3..6b359591 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2452,7 +2452,8 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); - var tuple = new SecureObjectsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, objectId)) + var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); + var tuple = new SecureObjectsTuple(sourceLineNumbers, id) { Table = tableName, Domain = domain, -- cgit v1.2.3-55-g6feb From d74e3dd4bcc573d0c4b1fb5c36c8bf0115cc21a1 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 28 Mar 2020 17:03:31 +1000 Subject: Add initial WixUtilBundleExtension. --- Util.wixext.sln | 11 ++++++++ src/be/packages.config | 5 ++++ src/be/precomp.cpp | 3 +++ src/be/precomp.h | 25 ++++++++++++++++++ src/be/utilbe.cpp | 19 ++++++++++++++ src/be/utilbe.def | 8 ++++++ src/be/utilbe.vcxproj | 61 ++++++++++++++++++++++++++++++++++++++++++++ src/wixlib/UtilExtension.wxs | 4 +++ src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 8 ++++-- 10 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 src/be/packages.config create mode 100644 src/be/precomp.cpp create mode 100644 src/be/precomp.h create mode 100644 src/be/utilbe.cpp create mode 100644 src/be/utilbe.def create mode 100644 src/be/utilbe.vcxproj (limited to 'src') diff --git a/Util.wixext.sln b/Util.wixext.sln index 39f5646c..86ee4d2a 100644 --- a/Util.wixext.sln +++ b/Util.wixext.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2003 MinimumVisualStudioVersion = 15.0.26124.0 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" @@ -21,6 +23,15 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.Build.0 = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x64.ActiveCfg = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.ActiveCfg = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.Build.0 = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x64.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.Build.0 = Release|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.ActiveCfg = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.Build.0 = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x64.ActiveCfg = Debug|Win32 diff --git a/src/be/packages.config b/src/be/packages.config new file mode 100644 index 00000000..f05546c5 --- /dev/null +++ b/src/be/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/be/precomp.cpp b/src/be/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/be/precomp.cpp @@ -0,0 +1,3 @@ +// 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" diff --git a/src/be/precomp.h b/src/be/precomp.h new file mode 100644 index 00000000..9dc3c468 --- /dev/null +++ b/src/be/precomp.h @@ -0,0 +1,25 @@ +#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. + + +#if _WIN32_MSI < 150 +#define _WIN32_MSI 150 +#endif + +#include +#include +#include +#include + +#include + +#include + +#define MAXUINT USHRT_MAX + +#include "dutil.h" +#include "memutil.h" + +#include "BootstrapperEngine.h" +#include "BundleExtensionEngine.h" +#include "BundleExtension.h" diff --git a/src/be/utilbe.cpp b/src/be/utilbe.cpp new file mode 100644 index 00000000..370669dd --- /dev/null +++ b/src/be/utilbe.cpp @@ -0,0 +1,19 @@ +// 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" + +// function definitions + +extern "C" HRESULT WINAPI BundleExtensionCreate( + __in const BUNDLE_EXTENSION_CREATE_ARGS* /*pArgs*/, + __inout BUNDLE_EXTENSION_CREATE_RESULTS* /*pResults*/ + ) +{ + HRESULT hr = S_OK; + + return hr; +} + +extern "C" void WINAPI BundleExtensionDestroy() +{ +} \ No newline at end of file diff --git a/src/be/utilbe.def b/src/be/utilbe.def new file mode 100644 index 00000000..711b1a5c --- /dev/null +++ b/src/be/utilbe.def @@ -0,0 +1,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. + + +LIBRARY "utilbe" + +EXPORTS + BundleExtensionCreate + BundleExtensionDestroy diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj new file mode 100644 index 00000000..963eac7f --- /dev/null +++ b/src/be/utilbe.vcxproj @@ -0,0 +1,61 @@ + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + {630C1EE7-2517-4A8C-83E3-DA1150308B58} + DynamicLibrary + utilbe + v141 + Unicode + utilbe.def + WiX Toolset Util BundleExtension + + + + + + + msi.lib + + + + + Create + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index 28646ee1..50828416 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs @@ -418,4 +418,8 @@ + + + + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 06184af1..25b4e6a9 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 21d96832..4db3b93d 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -26,6 +26,10 @@ + + utilbe + {630C1EE7-2517-4A8C-83E3-DA1150308B58} + utilca {076018F7-19BD-423A-ABBF-229273DA08D8} @@ -46,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 0afd76e4c5d46f237591d860e7d445e267522187 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 30 Mar 2020 19:46:56 +1000 Subject: Add DetectSHA2Support "search". --- nuget.config | 2 + src/be/UtilBundleExtension.cpp | 87 ++++++ src/be/UtilBundleExtension.h | 16 + src/be/detectsha2support.cpp | 58 ++++ src/be/detectsha2support.h | 8 + src/be/packages.config | 1 + src/be/precomp.h | 23 +- src/be/utilbe.cpp | 28 +- src/be/utilbe.vcxproj | 20 +- src/be/utilsearch.cpp | 137 ++++++++ src/be/utilsearch.h | 52 +++ .../TestData/BundleWithSearches/Bundle.wxs | 5 + .../WixToolsetTest.Util/UtilExtensionFixture.cs | 55 ++-- src/wixext/Tuples/UtilTupleDefinitions.cs | 10 + src/wixext/Tuples/WixDetectSHA2SupportTuple.cs | 33 ++ src/wixext/UtilBinder.cs | 347 --------------------- src/wixext/UtilCompiler.cs | 198 ++++++------ src/wixext/UtilConstants.cs | 2 + src/wixext/UtilErrors.cs | 6 - src/wixext/util.xsd | 24 ++ 20 files changed, 611 insertions(+), 501 deletions(-) create mode 100644 src/be/UtilBundleExtension.cpp create mode 100644 src/be/UtilBundleExtension.h create mode 100644 src/be/detectsha2support.cpp create mode 100644 src/be/detectsha2support.h create mode 100644 src/be/utilsearch.cpp create mode 100644 src/be/utilsearch.h create mode 100644 src/wixext/Tuples/WixDetectSHA2SupportTuple.cs delete mode 100644 src/wixext/UtilBinder.cs (limited to 'src') diff --git a/nuget.config b/nuget.config index aaee3228..80101d94 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,8 @@ + + diff --git a/src/be/UtilBundleExtension.cpp b/src/be/UtilBundleExtension.cpp new file mode 100644 index 00000000..2ac842a5 --- /dev/null +++ b/src/be/UtilBundleExtension.cpp @@ -0,0 +1,87 @@ +// 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" +#include "BextBaseBundleExtension.h" + +class CWixUtilBundleExtension : public CBextBaseBundleExtension +{ +public: // IBundleExtension + virtual STDMETHODIMP Search( + __in LPCWSTR wzId, + __in LPCWSTR wzVariable + ) + { + HRESULT hr = S_OK; + + hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine); + + return hr; + } + +public: //CBextBaseBundleExtension + virtual STDMETHODIMP Initialize( + __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs + ) + { + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNode* pixnBundleExtension = NULL; + + hr = CBextBaseBundleExtension::Initialize(pCreateArgs); + ExitOnFailure(hr, "CBextBaseBundleExtension initialization failed."); + + hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest); + ExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath); + + hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension); + ExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID); + + hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension); + ExitOnFailure(hr, "Failed to parse searches from bundle extension manifest."); + + LExit: + ReleaseObject(pixnBundleExtension); + ReleaseObject(pixdManifest); + + return hr; + } + +public: + CWixUtilBundleExtension( + __in IBundleExtensionEngine* pEngine + ) : CBextBaseBundleExtension(pEngine) + { + m_searches = { }; + } + + ~CWixUtilBundleExtension() + { + UtilSearchUninitialize(&m_searches); + } + +private: + UTIL_SEARCHES m_searches; +}; + +HRESULT UtilBundleExtensionCreate( + __in IBundleExtensionEngine* pEngine, + __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, + __out IBundleExtension** ppBundleExtension + ) +{ + HRESULT hr = S_OK; + CWixUtilBundleExtension* pExtension = NULL; + + pExtension = new CWixUtilBundleExtension(pEngine); + ExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension."); + + hr = pExtension->Initialize(pArgs); + ExitOnFailure(hr, "CWixUtilBundleExtension initialization failed"); + + *ppBundleExtension = pExtension; + pExtension = NULL; + +LExit: + ReleaseObject(pExtension); + return hr; +} diff --git a/src/be/UtilBundleExtension.h b/src/be/UtilBundleExtension.h new file mode 100644 index 00000000..16c5b346 --- /dev/null +++ b/src/be/UtilBundleExtension.h @@ -0,0 +1,16 @@ +#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. + + +// constants + +#define UTIL_BUNDLE_EXTENSION_ID L"WixUtilBundleExtension" + + +// function declarations + +HRESULT UtilBundleExtensionCreate( + __in IBundleExtensionEngine* pEngine, + __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, + __out IBundleExtension** ppBundleExtension + ); diff --git a/src/be/detectsha2support.cpp b/src/be/detectsha2support.cpp new file mode 100644 index 00000000..f1f3637e --- /dev/null +++ b/src/be/detectsha2support.cpp @@ -0,0 +1,58 @@ +// 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" + +// https://gist.github.com/navossoc/7572c7d82243e9f818989e2765e7793a +HRESULT DetectSHA2Support( + __out BOOL* pfSupported + ) +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + FARPROC pfn = NULL; + DWORD er = ERROR_SUCCESS; + + hr = LoadSystemLibrary(L"wintrust.dll", &hModule); + ExitOnFailure(hr, "Failed to load wintrust.dll"); + + pfn = ::GetProcAddress(hModule, "CryptCATAdminAcquireContext2"); + if (pfn) + { + *pfSupported = TRUE; + ExitFunction1(hr = S_OK); + } + + er = ::GetLastError(); + if (er == ERROR_PROC_NOT_FOUND) + { + *pfSupported = FALSE; + ExitFunction1(hr = S_OK); + } + + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to probe for CryptCATAdminAcquireContext2 in wintrust.dll"); + +LExit: + ::FreeLibrary(hModule); + + return hr; +} + +HRESULT UtilPerformDetectSHA2Support( + __in LPCWSTR wzVariable, + __in UTIL_SEARCH* /*pSearch*/, + __in IBundleExtensionEngine* pEngine + ) +{ + HRESULT hr = S_OK; + BOOL fSupported = FALSE; + + hr = DetectSHA2Support(&fSupported); + ExitOnFailure(hr, "DetectSHA2Support failed."); + + hr = pEngine->SetVariableNumeric(wzVariable, fSupported ? 1 : 0); + ExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable); + +LExit: + return hr; +} diff --git a/src/be/detectsha2support.h b/src/be/detectsha2support.h new file mode 100644 index 00000000..7f1f6031 --- /dev/null +++ b/src/be/detectsha2support.h @@ -0,0 +1,8 @@ +#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. + +HRESULT UtilPerformDetectSHA2Support( + __in LPCWSTR wzVariable, + __in UTIL_SEARCH* pSearch, + __in IBundleExtensionEngine* pEngine + ); \ No newline at end of file diff --git a/src/be/packages.config b/src/be/packages.config index f05546c5..ca23641f 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -1,5 +1,6 @@  + \ No newline at end of file diff --git a/src/be/precomp.h b/src/be/precomp.h index 9dc3c468..a4ab7abf 100644 --- a/src/be/precomp.h +++ b/src/be/precomp.h @@ -17,9 +17,20 @@ #define MAXUINT USHRT_MAX -#include "dutil.h" -#include "memutil.h" - -#include "BootstrapperEngine.h" -#include "BundleExtensionEngine.h" -#include "BundleExtension.h" +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include "utilsearch.h" +#include "detectsha2support.h" +#include "UtilBundleExtension.h" diff --git a/src/be/utilbe.cpp b/src/be/utilbe.cpp index 370669dd..d9816dc7 100644 --- a/src/be/utilbe.cpp +++ b/src/be/utilbe.cpp @@ -1,19 +1,41 @@ // 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" +#include "BextBaseBundleExtensionProc.h" + +static IBundleExtension* vpBundleExtension = NULL; // function definitions extern "C" HRESULT WINAPI BundleExtensionCreate( - __in const BUNDLE_EXTENSION_CREATE_ARGS* /*pArgs*/, - __inout BUNDLE_EXTENSION_CREATE_RESULTS* /*pResults*/ + __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, + __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults ) { - HRESULT hr = S_OK; + HRESULT hr = S_OK; + IBundleExtensionEngine* pEngine = NULL; + + hr = XmlInitialize(); + ExitOnFailure(hr, "Failed to initialize XML."); + + hr = BextInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize bext"); + + hr = UtilBundleExtensionCreate(pEngine, pArgs, &vpBundleExtension); + BextExitOnFailure(hr, "Failed to create WixUtilBundleExtension"); + + pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc; + pResults->pvBundleExtensionProcContext = vpBundleExtension; + +LExit: + ReleaseObject(pEngine); return hr; } extern "C" void WINAPI BundleExtensionDestroy() { + BextUninitialize(); + ReleaseNullObject(vpBundleExtension); + XmlUninitialize(); } \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 963eac7f..e64d113e 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -1,10 +1,9 @@ - + - Debug @@ -15,7 +14,6 @@ Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58} DynamicLibrary @@ -25,37 +23,37 @@ utilbe.def WiX Toolset Util BundleExtension - - msi.lib - + Create + + - + + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - + \ No newline at end of file diff --git a/src/be/utilsearch.cpp b/src/be/utilsearch.cpp new file mode 100644 index 00000000..4e9d86a1 --- /dev/null +++ b/src/be/utilsearch.cpp @@ -0,0 +1,137 @@ +// 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" + + +STDMETHODIMP UtilSearchParseFromXml( + __in UTIL_SEARCHES* pSearches, + __in IXMLDOMNode* pixnBundleExtension + ) +{ + HRESULT hr = S_OK; + IXMLDOMNodeList* pixnNodes = NULL; + IXMLDOMNode* pixnNode = NULL; + DWORD cNodes = 0; + BSTR bstrNodeName = NULL; + + // Select Util search nodes. + hr = XmlSelectNodes(pixnBundleExtension, L"WixDetectSHA2Support", &pixnNodes); + ExitOnFailure(hr, "Failed to select Util search nodes."); + + // Get Util search node count. + hr = pixnNodes->get_length((long*)&cNodes); + ExitOnFailure(hr, "Failed to get Util search node count."); + + if (!cNodes) + { + ExitFunction(); + } + + // Allocate memory for searches. + pSearches->rgSearches = (UTIL_SEARCH*)MemAlloc(sizeof(UTIL_SEARCH) * cNodes, TRUE); + ExitOnNull(pSearches->rgSearches, hr, E_OUTOFMEMORY, "Failed to allocate memory for search structs."); + + pSearches->cSearches = cNodes; + + // Parse search elements. + for (DWORD i = 0; i < cNodes; ++i) + { + UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; + + hr = XmlNextElement(pixnNodes, &pixnNode, &bstrNodeName); + ExitOnFailure(hr, "Failed to get next node."); + + // @Id + hr = XmlGetAttributeEx(pixnNode, L"Id", &pSearch->sczId); + ExitOnFailure(hr, "Failed to get @Id."); + + // Read type specific attributes. + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"WixDetectSHA2Support", -1)) + { + pSearch->Type = UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT; + } + else + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Unexpected element name: %ls", bstrNodeName); + } + + // prepare next iteration + ReleaseNullObject(pixnNode); + ReleaseNullBSTR(bstrNodeName); + } + +LExit: + ReleaseBSTR(bstrNodeName); + ReleaseObject(pixnNode); + ReleaseObject(pixnNodes); + + return hr; +} + +void UtilSearchUninitialize( + __in UTIL_SEARCHES* pSearches + ) +{ + if (pSearches->rgSearches) + { + for (DWORD i = 0; i < pSearches->cSearches; ++i) + { + UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; + + ReleaseStr(pSearch->sczId); + } + MemFree(pSearches->rgSearches); + } +} + +STDMETHODIMP UtilSearchExecute( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzSearchId, + __in LPCWSTR wzVariable, + __in IBundleExtensionEngine* pEngine + ) +{ + HRESULT hr = S_OK; + UTIL_SEARCH* pSearch = NULL; + + hr = UtilSearchFindById(pSearches, wzSearchId, &pSearch); + ExitOnFailure(hr, "Search id '%ls' is unknown to the util extension."); + + switch (pSearch->Type) + { + case UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT: + hr = UtilPerformDetectSHA2Support(wzVariable, pSearch, pEngine); + break; + default: + hr = E_UNEXPECTED; + } + +LExit: + return hr; +} + +STDMETHODIMP UtilSearchFindById( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzId, + __out UTIL_SEARCH** ppSearch + ) +{ + HRESULT hr = S_OK; + + for (DWORD i = 0; i < pSearches->cSearches; ++i) + { + UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; + + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1)) + { + *ppSearch = pSearch; + ExitFunction1(hr = S_OK); + } + } + + hr = E_NOTFOUND; + +LExit: + return hr; +} diff --git a/src/be/utilsearch.h b/src/be/utilsearch.h new file mode 100644 index 00000000..1e0ca96d --- /dev/null +++ b/src/be/utilsearch.h @@ -0,0 +1,52 @@ +#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. + + +// constants + +enum UTIL_SEARCH_TYPE +{ + UTIL_SEARCH_TYPE_NONE, + UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT, +}; + + +// structs + +typedef struct _UTIL_SEARCH +{ + LPWSTR sczId; + + UTIL_SEARCH_TYPE Type; +} UTIL_SEARCH; + +typedef struct _UTIL_SEARCHES +{ + UTIL_SEARCH* rgSearches; + DWORD cSearches; +} UTIL_SEARCHES; + + +// function declarations + +STDMETHODIMP UtilSearchParseFromXml( + __in UTIL_SEARCHES* pSearches, + __in IXMLDOMNode* pixnBundleExtension + ); + +void UtilSearchUninitialize( + __in UTIL_SEARCHES* pSearches + ); + +STDMETHODIMP UtilSearchExecute( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzSearchId, + __in LPCWSTR wzVariable, + __in IBundleExtensionEngine* pEngine + ); + +STDMETHODIMP UtilSearchFindById( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzId, + __out UTIL_SEARCH** ppSearch + ); diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs index cafd4255..82646b37 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -7,6 +7,7 @@ + @@ -32,4 +33,8 @@ + + + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 8f33eff5..c5b370ac 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -146,6 +146,9 @@ namespace WixToolsetTest.Util { var baseFolder = fs.GetFolder(); var intermediateFolder = Path.Combine(baseFolder, "obj"); + var bundlePath = Path.Combine(baseFolder, @"bin\test.exe"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); var result = WixRunner.Execute(new[] { @@ -156,45 +159,35 @@ namespace WixToolsetTest.Util "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-burnStub", burnStubPath, - "-o", Path.Combine(baseFolder, @"bin\test.exe") + "-o", bundlePath }); result.AssertSuccess(); - Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe"))); + Assert.True(File.Exists(bundlePath)); #if TODO Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); #endif - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); - var section = intermediate.Sections.Single(); - - var searchTuples = section.Tuples.OfType().OrderBy(t => t.Id.Id).ToList(); - Assert.Equal(3, searchTuples.Count); - Assert.Equal("FileSearchId", searchTuples[0].Id.Id); - Assert.Equal("FileSearchVariable", searchTuples[0].Variable); - Assert.Equal("ProductSearchId", searchTuples[1].Id.Id); - Assert.Equal("ProductSearchVariable", searchTuples[1].Variable); - Assert.Equal("1 & 2 < 3", searchTuples[1].Condition); - Assert.Equal("RegistrySearchId", searchTuples[2].Id.Id); - Assert.Equal("RegistrySearchVariable", searchTuples[2].Variable); - - var fileSearchTuple = section.Tuples.OfType().Single(); - Assert.Equal("FileSearchId", fileSearchTuple.Id.Id); - Assert.Equal(@"%windir%\System32\mscoree.dll", fileSearchTuple.Path); - Assert.Equal(WixFileSearchAttributes.Default | WixFileSearchAttributes.WantExists, fileSearchTuple.Attributes); - - var productSearchTuple = section.Tuples.OfType().Single(); - Assert.Equal("ProductSearchId", productSearchTuple.Id.Id); - Assert.Equal("{738D02BF-E231-4370-8209-E9FD4E1BE2A1}", productSearchTuple.Guid); - Assert.Equal(WixProductSearchAttributes.Version | WixProductSearchAttributes.UpgradeCode, productSearchTuple.Attributes); - - var registrySearchTuple = section.Tuples.OfType().Single(); - Assert.Equal("RegistrySearchId", registrySearchTuple.Id.Id); - Assert.Equal(RegistryRootType.LocalMachine, registrySearchTuple.Root); - Assert.Equal(@"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full", registrySearchTuple.Key); - Assert.Equal("Release", registrySearchTuple.Value); - Assert.Equal(WixRegistrySearchAttributes.WantValue | WixRegistrySearchAttributes.Raw, registrySearchTuple.Attributes); + var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='WixUtilBundleExtension']"); + Assert.Equal(1, bundleExtensionDatas.Count); + Assert.Equal("" + + "" + + "", bundleExtensionDatas[0].GetTestXml()); + + var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); + Assert.Equal(4, utilSearches.Count); + Assert.Equal("", utilSearches[0].GetTestXml()); + Assert.Equal("", utilSearches[1].GetTestXml()); + Assert.Equal("", utilSearches[2].GetTestXml()); + Assert.Equal("", utilSearches[3].GetTestXml()); } } diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs index 00c98337..ece64502 100644 --- a/src/wixext/Tuples/UtilTupleDefinitions.cs +++ b/src/wixext/Tuples/UtilTupleDefinitions.cs @@ -4,6 +4,7 @@ namespace WixToolset.Util { using System; using WixToolset.Data; + using WixToolset.Data.Burn; public enum UtilTupleDefinitionType { @@ -19,6 +20,7 @@ namespace WixToolset.Util User, UserGroup, WixCloseApplication, + WixDetectSHA2Support, WixFormatFiles, WixInternetShortcut, WixRemoveFolderEx, @@ -82,6 +84,9 @@ namespace WixToolset.Util case UtilTupleDefinitionType.WixCloseApplication: return UtilTupleDefinitions.WixCloseApplication; + case UtilTupleDefinitionType.WixDetectSHA2Support: + return UtilTupleDefinitions.WixDetectSHA2Support; + case UtilTupleDefinitionType.WixFormatFiles: return UtilTupleDefinitions.WixFormatFiles; @@ -107,5 +112,10 @@ namespace WixToolset.Util throw new ArgumentOutOfRangeException(nameof(type)); } } + + static UtilTupleDefinitions() + { + WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag); + } } } diff --git a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs new file mode 100644 index 00000000..38b76ff2 --- /dev/null +++ b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs @@ -0,0 +1,33 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Tuples; + + public static partial class UtilTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixDetectSHA2Support = new IntermediateTupleDefinition( + UtilTupleDefinitionType.WixDetectSHA2Support.ToString(), + new IntermediateFieldDefinition[0], + typeof(WixDetectSHA2SupportTuple)); + } +} + +namespace WixToolset.Util.Tuples +{ + using WixToolset.Data; + + public class WixDetectSHA2SupportTuple : IntermediateTuple + { + public WixDetectSHA2SupportTuple() : base(UtilTupleDefinitions.WixDetectSHA2Support, null, null) + { + } + + public WixDetectSHA2SupportTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixDetectSHA2Support, sourceLineNumber, id) + { + } + + public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; + } +} diff --git a/src/wixext/UtilBinder.cs b/src/wixext/UtilBinder.cs deleted file mode 100644 index ef80a876..00000000 --- a/src/wixext/UtilBinder.cs +++ /dev/null @@ -1,347 +0,0 @@ -// 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 -{ -#if TODO_BRINGBACK_FOR_BUNDLES - using System; - using System.Collections.Generic; - using System.Globalization; - using WixToolset.Data; - using WixToolset.Extensibility; - - /// - /// The binder for the WiX Toolset Utility Extension. - /// - public sealed class UtilBinder : BinderExtension - { - // TODO: When WixSearch is supported in Product, etc, we may need to call - // ReorderWixSearch() from each of those initializers. - - // TODO: A general-purpose "reorder this table given these constraints" - // mechanism may end up being helpful. This could be declaratively stated - // in the table definitions, or exposed from the core Wix.dll and called - // as-needed by any extensions. - - /// - /// Called before bundle binding occurs. - /// - public override void Initialize(Output bundle) - { - if (OutputType.Bundle == bundle.Type) - { - this.ReorderWixSearch(bundle); - } - } - - /// - /// Reorders Any WixSearch items. - /// - /// Output containing the tables to process. - private void ReorderWixSearch(Output output) - { - Table wixSearchTable = output.Tables["WixSearch"]; - if (null == wixSearchTable || wixSearchTable.Rows.Count == 0) - { - // nothing to do! - return; - } - - RowDictionary rowDictionary = new RowDictionary(); - foreach (Row row in wixSearchTable.Rows) - { - rowDictionary.AddRow(row); - } - - Constraints constraints = new Constraints(); - Table wixSearchRelationTable = output.Tables["WixSearchRelation"]; - if (null != wixSearchRelationTable && wixSearchRelationTable.Rows.Count > 0) - { - // add relational info to our data... - foreach (Row row in wixSearchRelationTable.Rows) - { - constraints.AddConstraint((string)row[0], (string)row[1]); - } - } - - this.FindCircularReference(constraints); - - if (this.Core.EncounteredError) - { - return; - } - - this.FlattenDependentReferences(constraints); - - // Reorder by topographical sort (http://en.wikipedia.org/wiki/Topological_sorting) - // We use a variation of Kahn (1962) algorithm as described in - // Wikipedia, with the additional criteria that start nodes are sorted - // lexicographically at each step to ensure a deterministic ordering - // based on 'after' dependencies and ID. - TopologicalSort sorter = new TopologicalSort(); - List sortedIds = sorter.Sort(rowDictionary.Keys, constraints); - - // Now, re-write the table with the searches in order... - wixSearchTable.Rows.Clear(); - foreach (string id in sortedIds) - { - wixSearchTable.Rows.Add(rowDictionary[id]); - } - } - - /// - /// A dictionary of Row items, indexed by their first column. - /// - private class RowDictionary : Dictionary - { - public void AddRow(Row row) - { - this.Add((string)row[0], row); - } - - // TODO: Hide other Add methods? - } - - /// - /// A dictionary of constraints, mapping an id to a list of ids. - /// - private class Constraints : Dictionary> - { - public void AddConstraint(string id, string afterId) - { - if (!this.ContainsKey(id)) - { - this.Add(id, new List()); - } - - // TODO: Show warning if a constraint is seen twice? - if (!this[id].Contains(afterId)) - { - this[id].Add(afterId); - } - } - - // TODO: Hide other Add methods? - } - - /// - /// Finds circular references in the constraints. - /// - /// Constraints to check. - /// This is not particularly performant, but it works. - private void FindCircularReference(Constraints constraints) - { - foreach (string id in constraints.Keys) - { - List seenIds = new List(); - string chain = null; - if (FindCircularReference(constraints, id, id, seenIds, out chain)) - { - // We will show a separate message for every ID that's in - // the loop. We could bail after the first one, but then - // we wouldn't catch disjoint loops in a single run. - this.Core.OnMessage(UtilErrors.CircularSearchReference(chain)); - } - } - } - - /// - /// Recursive function that finds circular references in the constraints. - /// - /// Constraints to check. - /// The identifier currently being looking for. (Fixed across a given run.) - /// The idenifier curently being tested. - /// A list of identifiers seen, to ensure each identifier is only expanded once. - /// If a circular reference is found, will contain the chain of references. - /// True if a circular reference is found, false otherwise. - private bool FindCircularReference(Constraints constraints, string checkId, string currentId, List seenIds, out string chain) - { - chain = null; - List afterList = null; - if (constraints.TryGetValue(currentId, out afterList)) - { - foreach (string afterId in afterList) - { - if (afterId == checkId) - { - chain = String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", currentId, afterId); - return true; - } - - if (!seenIds.Contains(afterId)) - { - seenIds.Add(afterId); - if (FindCircularReference(constraints, checkId, afterId, seenIds, out chain)) - { - chain = String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", currentId, chain); - return true; - } - } - } - } - - return false; - } - - /// - /// Flattens any dependency chains to simplify reordering. - /// - /// - private void FlattenDependentReferences(Constraints constraints) - { - foreach (string id in constraints.Keys) - { - List flattenedIds = new List(); - AddDependentReferences(constraints, id, flattenedIds); - List constraintList = constraints[id]; - foreach (string flattenedId in flattenedIds) - { - if (!constraintList.Contains(flattenedId)) - { - constraintList.Add(flattenedId); - } - } - } - } - - /// - /// Adds dependent references to a list. - /// - /// - /// - /// - private void AddDependentReferences(Constraints constraints, string currentId, List seenIds) - { - List afterList = null; - if (constraints.TryGetValue(currentId, out afterList)) - { - foreach (string afterId in afterList) - { - if (!seenIds.Contains(afterId)) - { - seenIds.Add(afterId); - AddDependentReferences(constraints, afterId, seenIds); - } - } - } - } - - /// - /// Reorder by topological sort - /// - /// - /// We use a variation of Kahn (1962) algorithm as described in - /// Wikipedia (http://en.wikipedia.org/wiki/Topological_sorting), with - /// the additional criteria that start nodes are sorted lexicographically - /// at each step to ensure a deterministic ordering based on 'after' - /// dependencies and ID. - /// - private class TopologicalSort - { - private List startIds = new List(); - private Constraints constraints; - - /// - /// Reorder by topological sort - /// - /// The complete list of IDs. - /// Constraints to use. - /// The topologically sorted list of IDs. - internal List Sort(IEnumerable allIds, Constraints constraints) - { - this.startIds.Clear(); - this.CopyConstraints(constraints); - - this.FindInitialStartIds(allIds); - - // We always create a new sortedId list, because we return it - // to the caller and don't know what its lifetime may be. - List sortedIds = new List(); - - while (this.startIds.Count > 0) - { - this.SortStartIds(); - - string currentId = this.startIds[0]; - sortedIds.Add(currentId); - this.startIds.RemoveAt(0); - - this.ResolveConstraint(currentId); - } - - return sortedIds; - } - - /// - /// Copies a Constraints set (to prevent modifying the incoming data). - /// - /// Constraints to copy. - private void CopyConstraints(Constraints constraints) - { - this.constraints = new Constraints(); - foreach (string id in constraints.Keys) - { - foreach (string afterId in constraints[id]) - { - this.constraints.AddConstraint(id, afterId); - } - } - } - - /// - /// Finds initial start IDs. (Those with no constraints.) - /// - /// The complete list of IDs. - private void FindInitialStartIds(IEnumerable allIds) - { - foreach (string id in allIds) - { - if (!this.constraints.ContainsKey(id)) - { - this.startIds.Add(id); - } - } - } - - /// - /// Sorts start IDs. - /// - private void SortStartIds() - { - this.startIds.Sort(); - } - - /// - /// Removes the resolved constraint and updates the list of startIds - /// with any now-valid (all constraints resolved) IDs. - /// - /// The ID to resolve from the set of constraints. - private void ResolveConstraint(string resolvedId) - { - List newStartIds = new List(); - - foreach (string id in constraints.Keys) - { - if (this.constraints[id].Contains(resolvedId)) - { - this.constraints[id].Remove(resolvedId); - - // If we just removed the last constraint for this - // ID, it is now a valid start ID. - if (0 == this.constraints[id].Count) - { - newStartIds.Add(id); - } - } - } - - foreach (string id in newStartIds) - { - this.constraints.Remove(id); - } - - this.startIds.AddRange(newStartIds); - } - } - } -#endif -} diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 6b359591..6e3c2531 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -230,6 +230,8 @@ namespace WixToolset.Util break; case "ComponentSearch": case "ComponentSearchRef": + case "DetectSHA2Support": + case "DetectSHA2SupportRef": case "DirectorySearch": case "DirectorySearchRef": case "FileSearch": @@ -251,6 +253,12 @@ namespace WixToolset.Util case "ComponentSearchRef": this.ParseComponentSearchRefElement(intermediate, section, element); break; + case "DetectSHA2Support": + this.ParseDetectSHA2SupportElement(intermediate, section, element); + break; + case "DetectSHA2SupportRef": + this.ParseDetectSHA2SupportRefElement(intermediate, section, element); + break; case "DirectorySearch": this.ParseDirectorySearchElement(intermediate, section, element); break; @@ -422,11 +430,6 @@ namespace WixToolset.Util } } - if (null == variable) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); - } - if (null == guid) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Guid")); @@ -439,16 +442,10 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + if (!this.Messaging.EncounteredError) { - this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); - if (after != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); - // TODO: We're currently defaulting to "always run after", which we will need to change... - this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); - } - WixComponentSearchAttributes attributes = WixComponentSearchAttributes.KeyPath; switch (result) { @@ -505,6 +502,89 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); } + /// + /// Parses a DetectSHA2Support element. + /// + /// Element to parse. + private void ParseDetectSHA2SupportElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (id == null) + { + id = this.ParseHelper.CreateIdentifier("wds2s", variable, condition, after); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId); + + if (!this.Messaging.EncounteredError) + { + section.Tuples.Add(new WixDetectSHA2SupportTuple(sourceLineNumbers, id)); + } + } + + /// + /// Parses a DetectSHA2SupportRef element + /// + /// Element to parse. + private void ParseDetectSHA2SupportRefElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string refId = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixDetectSHA2Support", refId); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + } + /// /// Parses an event source element. /// @@ -868,11 +948,6 @@ namespace WixToolset.Util } } - if (null == variable) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); - } - if (null == path) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); @@ -885,16 +960,10 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + if (!this.Messaging.EncounteredError) { - this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); - if (after != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); - // TODO: We're currently defaulting to "always run after", which we will need to change... - this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); - } - WixFileSearchAttributes attributes = WixFileSearchAttributes.IsDirectory; switch (result) { @@ -990,11 +1059,6 @@ namespace WixToolset.Util } } - if (null == variable) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Variable")); - } - if (null == path) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Path")); @@ -1007,16 +1071,10 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); + if (!this.Messaging.EncounteredError) { - this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); - if (after != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); - // TODO: We're currently defaulting to "always run after", which we will need to change... - this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); - } - WixFileSearchAttributes attributes = WixFileSearchAttributes.Default; switch (result) { @@ -1048,38 +1106,6 @@ namespace WixToolset.Util }); } - /// - /// Creates a row in the WixSearch table. - /// - /// Source line number for the parent element. - /// Identifier of the search. - /// The Burn variable to store the result into. - /// A condition to test before evaluating the search. - private void CreateWixSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string variable, string condition) - { - section.Tuples.Add(new WixSearchTuple(sourceLineNumbers, id) - { - Variable = variable, - Condition = condition, - }); - } - - /// - /// - /// - /// Source line number for the parent element. - /// Identifier of the search (key into the WixSearch table) - /// Identifier of the search that comes before (key into the WixSearch table) - /// Further details about the relation between id and parentId. - private void CreateWixSearchRelationRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes) - { - section.Tuples.Add(new WixSearchRelationTuple(sourceLineNumbers, id) - { - ParentSearchRef = parentId, - Attributes = attributes, - }); - } - /// /// Parses a file share element. /// @@ -2523,11 +2549,6 @@ namespace WixToolset.Util } } - if (null == variable) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); - } - if (null == upgradeCode && null == productCode) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ProductCode", "UpgradeCode", true)); @@ -2545,16 +2566,10 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + if (!this.Messaging.EncounteredError) { - this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); - if (after != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); - // TODO: We're currently defaulting to "always run after", which we will need to change... - this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); - } - WixProductSearchAttributes attributes = WixProductSearchAttributes.Version; switch (result) { @@ -2662,11 +2677,6 @@ namespace WixToolset.Util } } - if (null == variable) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable")); - } - if (!root.HasValue) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); @@ -2726,16 +2736,10 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + if (!this.Messaging.EncounteredError) { - this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition); - if (after != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after); - // TODO: We're currently defaulting to "always run after", which we will need to change... - this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2); - } - section.Tuples.Add(new WixRegistrySearchTuple(sourceLineNumbers, id) { Root = (RegistryRootType)root, diff --git a/src/wixext/UtilConstants.cs b/src/wixext/UtilConstants.cs index 28ff368f..d9ad460f 100644 --- a/src/wixext/UtilConstants.cs +++ b/src/wixext/UtilConstants.cs @@ -13,5 +13,7 @@ namespace WixToolset.Util internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" }; internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" }; internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" }; + + internal const string UtilBundleExtensionId = "WixUtilBundleExtension"; } } diff --git a/src/wixext/UtilErrors.cs b/src/wixext/UtilErrors.cs index 988b8321..c04f0449 100644 --- a/src/wixext/UtilErrors.cs +++ b/src/wixext/UtilErrors.cs @@ -13,11 +13,6 @@ namespace WixToolset.Util return Message(null, Ids.ArgumentRequiresValue, "The argument '{0}' does not have a value specified and it is required.", argument); } - public static Message CircularSearchReference(string chain) - { - return Message(null, Ids.CircularSearchReference, "A circular reference of search ordering constraints was detected: {0}. Search ordering references must form a directed acyclic graph.", chain); - } - public static Message DirectoryNotFound(string directory) { return Message(null, Ids.DirectoryNotFound, "The directory '{0}' could not be found.", directory); @@ -102,7 +97,6 @@ namespace WixToolset.Util FileNotFound = 5059, PerformanceCategoryNotFound = 5060, UnsupportedPerformanceCounterType = 5061, - CircularSearchReference = 5062, InvalidRegistryObject = 5063, } } diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd index fb8d8032..a8c3d208 100644 --- a/src/wixext/util.xsd +++ b/src/wixext/util.xsd @@ -172,6 +172,30 @@ + + + Detects support for SHA2. + + + + + + + + + + + + References a DetectSHA2Support. + + + + + + + + + Describes a directory search. -- cgit v1.2.3-55-g6feb From 34c1ceb7d1639a3a769ba214dc024b1921af2057 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 3 Apr 2020 12:02:16 +1000 Subject: Update dependencies. --- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Tuples/SecureObjectsTuple.cs | 8 ++++++++ src/wixext/UtilCompiler.cs | 1 + src/wixext/UtilWindowsInstallerBackendExtension.cs | 7 ------- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index c5b370ac..b84e8b2d 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -105,7 +105,7 @@ namespace WixToolsetTest.Util "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", - "Wix4SecureObject:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index 920fe7b3..dd658be1 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -11,6 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.SecureObjects.ToString(), new[] { + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), @@ -27,6 +28,7 @@ namespace WixToolset.Util.Tuples public enum SecureObjectsTupleFields { + SecureObject, Table, Domain, User, @@ -46,6 +48,12 @@ namespace WixToolset.Util.Tuples public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; + public string SecureObject + { + get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); + } + public string Table { get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 6e3c2531..fef9175e 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2481,6 +2481,7 @@ namespace WixToolset.Util var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); var tuple = new SecureObjectsTuple(sourceLineNumbers, id) { + SecureObject = objectId, Table = tableName, Domain = domain, User = user, diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index 8648cb17..2365ed01 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -5,7 +5,6 @@ namespace WixToolset.Util using System.Collections.Generic; using System.Linq; using System.Xml; - using WixToolset.Data; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; @@ -15,12 +14,6 @@ namespace WixToolset.Util public override IEnumerable TableDefinitions { get => Tables; } - public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) - { - var columnZeroIsId = tuple.Id != null; - return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId); - } - private static TableDefinition[] LoadTables() { using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 25b4e6a9..f2e3acd1 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 4db3b93d..4ad0cf8f 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From bee269e29d80e1f4b7df60b92808780f7489183d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 7 Apr 2020 16:00:05 +1000 Subject: Update dependencies. --- appveyor.yml | 2 +- src/Directory.Build.props | 4 +++- src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 6 +++--- src/wixext/WixToolset.Util.wixext.csproj | 1 - src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/appveyor.yml b/appveyor.yml index d55322da..bbf880f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml # then update all of the repos. -image: Visual Studio 2017 +image: Visual Studio 2019 version: 0.0.0.{build} configuration: Release diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e853e22d..a22f4470 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -8,6 +8,7 @@ Debug false + MSB3246 $(MSBuildProjectName) $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) @@ -21,6 +22,7 @@ WiX Toolset - + + diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 1635287d..fcac4644 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -1,9 +1,9 @@ - + - netcoreapp2.1 + netcoreapp3.1 false @@ -57,7 +57,7 @@ - + diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 3cd7b115..ed5a6a0f 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -19,7 +19,6 @@ - diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index f2e3acd1..e1b601f6 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 4ad0cf8f..5b26e901 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 75f30802e00401df576ba351a24b0d26711e900e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 7 Apr 2020 17:48:46 +1000 Subject: Modernize UtilCompiler. --- src/wixext/Tuples/GroupTuple.cs | 8 - src/wixext/UtilCompiler.cs | 505 ++++++++++----------- src/wixext/UtilTableDefinitions.cs | 300 ++++++++++++ src/wixext/UtilWindowsInstallerBackendExtension.cs | 16 +- src/wixext/WixToolset.Util.wixext.csproj | 1 - src/wixext/tables.xml | 238 ---------- 6 files changed, 535 insertions(+), 533 deletions(-) create mode 100644 src/wixext/UtilTableDefinitions.cs delete mode 100644 src/wixext/tables.xml (limited to 'src') diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs index 6061b1f4..2b270103 100644 --- a/src/wixext/Tuples/GroupTuple.cs +++ b/src/wixext/Tuples/GroupTuple.cs @@ -11,7 +11,6 @@ namespace WixToolset.Util UtilTupleDefinitionType.Group.ToString(), new[] { - new IntermediateFieldDefinition(nameof(GroupTupleFields.Group), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String), @@ -26,7 +25,6 @@ namespace WixToolset.Util.Tuples public enum GroupTupleFields { - Group, ComponentRef, Name, Domain, @@ -44,12 +42,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; - public string Group - { - get => this.Fields[(int)GroupTupleFields.Group].AsString(); - set => this.Set((int)GroupTupleFields.Group, value); - } - public string ComponentRef { get => this.Fields[(int)GroupTupleFields.ComponentRef].AsString(); diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index fef9175e..65ca406d 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -112,11 +112,11 @@ namespace WixToolset.Util switch (parentElement.Name.LocalName) { case "CreateFolder": - string createFolderId = context["DirectoryId"]; - string createFolderComponentId = context["ComponentId"]; + var createFolderId = context["DirectoryId"]; + var createFolderComponentId = context["ComponentId"]; // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - bool createFolderWin64 = Boolean.Parse(context["Win64"]); + var createFolderWin64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) { @@ -129,9 +129,9 @@ namespace WixToolset.Util } break; case "Component": - string componentId = context["ComponentId"]; - string directoryId = context["DirectoryId"]; - bool componentWin64 = Boolean.Parse(context["Win64"]); + var componentId = context["ComponentId"]; + var directoryId = context["DirectoryId"]; + var componentWin64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) { @@ -174,11 +174,11 @@ namespace WixToolset.Util } break; case "File": - string fileId = context["FileId"]; - string fileComponentId = context["ComponentId"]; + var fileId = context["FileId"]; + var fileComponentId = context["ComponentId"]; // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - bool fileWin64 = Boolean.Parse(context["Win64"]); + var fileWin64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) { @@ -298,11 +298,11 @@ namespace WixToolset.Util case "Registry": case "RegistryKey": case "RegistryValue": - string registryId = context["RegistryId"]; - string registryComponentId = context["ComponentId"]; + var registryId = context["RegistryId"]; + var registryComponentId = context["ComponentId"]; // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - bool registryWin64 = Boolean.Parse(context["Win64"]); + var registryWin64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) { @@ -315,12 +315,12 @@ namespace WixToolset.Util } break; case "ServiceInstall": - string serviceInstallId = context["ServiceInstallId"]; - string serviceInstallName = context["ServiceInstallName"]; - string serviceInstallComponentId = context["ServiceInstallComponentId"]; + var serviceInstallId = context["ServiceInstallId"]; + var serviceInstallName = context["ServiceInstallName"]; + var serviceInstallComponentId = context["ServiceInstallComponentId"]; // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - bool serviceInstallWin64 = Boolean.Parse(context["Win64"]); + var serviceInstallWin64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) { @@ -381,16 +381,16 @@ namespace WixToolset.Util /// Element to parse. private void ParseComponentSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string variable = null; string condition = null; string after = null; string guid = null; string productCode = null; - Serialize.ComponentSearch.ResultType result = Serialize.ComponentSearch.ResultType.NotSet; + var result = Serialize.ComponentSearch.ResultType.NotSet; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -409,7 +409,7 @@ namespace WixToolset.Util productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); break; case "Result": - string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); if (!Serialize.ComponentSearch.TryParseResultType(resultValue, out result)) { this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, @@ -446,7 +446,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - WixComponentSearchAttributes attributes = WixComponentSearchAttributes.KeyPath; + var attributes = WixComponentSearchAttributes.KeyPath; switch (result) { case Serialize.ComponentSearch.ResultType.directory: @@ -460,7 +460,7 @@ namespace WixToolset.Util break; } - section.Tuples.Add(new WixComponentSearchTuple(sourceLineNumbers, id) + section.AddTuple(new WixComponentSearchTuple(sourceLineNumbers, id) { Guid = guid, ProductCode = productCode, @@ -475,10 +475,10 @@ namespace WixToolset.Util /// Element to parse. private void ParseComponentSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string refId = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -486,7 +486,7 @@ namespace WixToolset.Util { case "Id": refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixComponentSearch", refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixComponentSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -548,7 +548,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.Tuples.Add(new WixDetectSHA2SupportTuple(sourceLineNumbers, id)); + section.AddTuple(new WixDetectSHA2SupportTuple(sourceLineNumbers, id)); } } @@ -559,7 +559,6 @@ namespace WixToolset.Util private void ParseDetectSHA2SupportRefElement(Intermediate intermediate, IntermediateSection section, XElement element) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string refId = null; foreach (var attrib in element.Attributes()) { @@ -568,8 +567,8 @@ namespace WixToolset.Util switch (attrib.Name.LocalName) { case "Id": - refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixDetectSHA2Support", refId); + var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.WixDetectSHA2Support, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -592,17 +591,17 @@ namespace WixToolset.Util /// Identifier of parent component. private IComponentKeyPath ParseEventSourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string sourceName = null; string logName = null; string categoryMessageFile = null; - int categoryCount = CompilerConstants.IntegerNotSet; + var categoryCount = CompilerConstants.IntegerNotSet; string eventMessageFile = null; string parameterMessageFile = null; int typesSupported = 0; - bool isKeyPath = false; + var isKeyPath = false; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -702,7 +701,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; - Identifier id = this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + var id = this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); if (null != categoryMessageFile) { @@ -737,18 +736,18 @@ namespace WixToolset.Util /// Element to parse. private void ParseCloseApplicationElement(Intermediate intermediate, IntermediateSection section, XElement element) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string condition = null; string description = null; string target = null; string property = null; Identifier id = null; int attributes = 2; // default to CLOSEAPP_ATTRIBUTE_REBOOTPROMPT enabled - int sequence = CompilerConstants.IntegerNotSet; - int terminateExitCode = CompilerConstants.IntegerNotSet; - int timeout = CompilerConstants.IntegerNotSet; + var sequence = CompilerConstants.IntegerNotSet; + var terminateExitCode = CompilerConstants.IntegerNotSet; + var timeout = CompilerConstants.IntegerNotSet; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -875,14 +874,14 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new WixCloseApplicationTuple(sourceLineNumbers, id) + var tuple = section.AddTuple(new WixCloseApplicationTuple(sourceLineNumbers, id) { Target = target, Description = description, Condition = condition, Attributes = attributes, Property = property, - }; + }); if (CompilerConstants.IntegerNotSet != sequence) { tuple.Sequence = sequence; @@ -895,8 +894,6 @@ namespace WixToolset.Util { tuple.Timeout = timeout * 1000; // make the timeout milliseconds in the table. } - - section.Tuples.Add(tuple); } } @@ -906,15 +903,15 @@ namespace WixToolset.Util /// Element to parse. private void ParseDirectorySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string variable = null; string condition = null; string after = null; string path = null; - Serialize.DirectorySearch.ResultType result = Serialize.DirectorySearch.ResultType.NotSet; + var result = Serialize.DirectorySearch.ResultType.NotSet; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -964,7 +961,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - WixFileSearchAttributes attributes = WixFileSearchAttributes.IsDirectory; + var attributes = WixFileSearchAttributes.IsDirectory; switch (result) { case Serialize.DirectorySearch.ResultType.exists: @@ -982,8 +979,7 @@ namespace WixToolset.Util /// Element to parse. private void ParseWixSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string refId = null; + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); foreach (XAttribute attrib in node.Attributes()) { @@ -992,8 +988,8 @@ namespace WixToolset.Util switch (attrib.Name.LocalName) { case "Id": - refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", refId); + var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); @@ -1015,15 +1011,15 @@ namespace WixToolset.Util /// Element to parse. private void ParseFileSearchElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); Identifier id = null; string variable = null; string condition = null; string after = null; string path = null; - Serialize.FileSearch.ResultType result = Serialize.FileSearch.ResultType.NotSet; + var result = Serialize.FileSearch.ResultType.NotSet; - foreach (XAttribute attrib in node.Attributes()) + foreach (var attrib in node.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1075,7 +1071,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - WixFileSearchAttributes attributes = WixFileSearchAttributes.Default; + var attributes = WixFileSearchAttributes.Default; switch (result) { case Serialize.FileSearch.ResultType.exists: @@ -1099,7 +1095,7 @@ namespace WixToolset.Util /// private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) { - section.Tuples.Add(new WixFileSearchTuple(sourceLineNumbers, id) + section.AddTuple(new WixFileSearchTuple(sourceLineNumbers, id) { Path = path, Attributes = attributes, @@ -1114,12 +1110,12 @@ namespace WixToolset.Util /// Identifier of referred to directory. private void ParseFileShareElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string directoryId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string description = null; string name = null; Identifier id = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1147,7 +1143,7 @@ namespace WixToolset.Util if (null == id) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + id = this.ParseHelper.CreateIdentifier("ufs", componentId, name); } if (null == name) @@ -1160,7 +1156,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission")); } - foreach (XElement child in element.Elements()) + foreach (var child in element.Elements()) { if (this.Namespace == child.Name.Namespace) { @@ -1185,15 +1181,13 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new FileShareTuple(sourceLineNumbers, id) + section.AddTuple(new FileShareTuple(sourceLineNumbers, id) { ShareName = name, ComponentRef = componentId, Description = description, DirectoryRef = directoryId, - }; - - section.Tuples.Add(tuple); + }); } } @@ -1204,12 +1198,11 @@ namespace WixToolset.Util /// The identifier of the parent FileShare element. private void ParseFileSharePermissionElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier fileShareId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - BitArray bits = new BitArray(32); - int permission = 0; + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var bits = new BitArray(32); string user = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1217,10 +1210,10 @@ namespace WixToolset.Util { case "User": user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "User", user); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.User, user); break; default: - YesNoType attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) { if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) @@ -1241,7 +1234,7 @@ namespace WixToolset.Util } } - permission = this.CreateIntegerFromBitArray(bits); + var permission = this.CreateIntegerFromBitArray(bits); if (null == user) { @@ -1257,14 +1250,12 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new FileSharePermissionsTuple(sourceLineNumbers) + section.AddTuple(new FileSharePermissionsTuple(sourceLineNumbers) { FileShareRef = fileShareId.Id, UserRef = user, Permissions = permission, - }; - - section.Tuples.Add(tuple); + }); } } @@ -1275,12 +1266,12 @@ namespace WixToolset.Util /// Component Id of the parent component of this element. private void ParseGroupElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string domain = null; string name = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1308,21 +1299,19 @@ namespace WixToolset.Util if (null == id) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + id = this.ParseHelper.CreateIdentifier("ugr", componentId, domain, name); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); if (!this.Messaging.EncounteredError) { - var tuple = new GroupTuple(sourceLineNumbers, id) + section.AddTuple(new GroupTuple(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, Domain = domain, - }; - - section.Tuples.Add(tuple); + }); } } @@ -1333,10 +1322,10 @@ namespace WixToolset.Util /// Required user id to be joined to the group. private void ParseGroupRefElement(Intermediate intermediate, IntermediateSection section, XElement element, string userId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string groupId = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1344,7 +1333,7 @@ namespace WixToolset.Util { case "Id": groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Group", groupId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.Group, groupId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -1361,13 +1350,11 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new UserGroupTuple(sourceLineNumbers) + section.AddTuple(new UserGroupTuple(sourceLineNumbers) { UserRef = userId, GroupRef = groupId, - }; - - section.Tuples.Add(tuple); + }); } } @@ -1379,7 +1366,7 @@ namespace WixToolset.Util /// Default directory if none is specified on the InternetShortcut element. private void ParseInternetShortcutElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string defaultTarget) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string name = null; string target = null; @@ -1388,7 +1375,7 @@ namespace WixToolset.Util string iconFile = null; int iconIndex = 0; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1435,7 +1422,7 @@ namespace WixToolset.Util if (null == id) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + id = this.ParseHelper.CreateIdentifier("uis", componentId, directoryId, name, target); } // In theory this can never be the case, since InternetShortcut can only be under @@ -1459,8 +1446,8 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - InternetShortcutType shortcutType = InternetShortcutType.Link; - if (0 == String.Compare(type, "url", StringComparison.OrdinalIgnoreCase)) + var shortcutType = InternetShortcutType.Link; + if (String.Equals(type, "url", StringComparison.OrdinalIgnoreCase)) { shortcutType = InternetShortcutType.Url; } @@ -1486,7 +1473,7 @@ namespace WixToolset.Util // add the appropriate extension based on type of shortcut name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); - var tuple = new WixInternetShortcutTuple(sourceLineNumbers, shortcutId) + section.AddTuple(new WixInternetShortcutTuple(sourceLineNumbers, shortcutId) { ComponentRef = componentId, DirectoryRef = directoryId, @@ -1495,9 +1482,7 @@ namespace WixToolset.Util Attributes = (int)type, IconFile = iconFile, IconIndex = iconIndex, - }; - - section.Tuples.Add(tuple); + }); this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); @@ -1505,16 +1490,14 @@ namespace WixToolset.Util this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); // use built-in MSI functionality to remove the shortcuts rather than doing so via CA - var removeFileTuple = new RemoveFileTuple(sourceLineNumbers, shortcutId) + section.AddTuple(new RemoveFileTuple(sourceLineNumbers, shortcutId) { ComponentRef = componentId, DirProperty = directoryId, OnUninstall = true, // TODO: A better way? FileName = this.ParseHelper.IsValidShortFilename(name, false) ? name : String.Concat(this.ParseHelper.CreateShortName(name, true, false, directoryId, name), "|", name), - }; - - section.Tuples.Add(removeFileTuple); + }); } /// @@ -1524,22 +1507,22 @@ namespace WixToolset.Util /// Identifier of parent component. private void ParsePerformanceCategoryElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string name = null; string help = null; - YesNoType multiInstance = YesNoType.No; + var multiInstance = YesNoType.No; int defaultLanguage = 0x09; // default to "english" - ArrayList parsedPerformanceCounters = new ArrayList(); + var parsedPerformanceCounters = new List(); // default to managed performance counter - string library = "netfxperf.dll"; - string openEntryPoint = "OpenPerformanceData"; - string collectEntryPoint = "CollectPerformanceData"; - string closeEntryPoint = "ClosePerformanceData"; + var library = "netfxperf.dll"; + var openEntryPoint = "OpenPerformanceData"; + var collectEntryPoint = "CollectPerformanceData"; + var closeEntryPoint = "ClosePerformanceData"; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -1583,25 +1566,28 @@ namespace WixToolset.Util } } - if (null == id) + if (null == id && null == name) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Id", "Name")); } - - if (null == name) + else if (null == id) { - name = id?.Id; + id = this.ParseHelper.CreateIdentifier("upc", componentId, name); + } + else if (null == name) + { + name = id.Id; } // Process the child counter elements. - foreach (XElement child in element.Elements()) + foreach (var child in element.Elements()) { if (this.Namespace == child.Name.Namespace) { switch (child.Name.LocalName) { case "PerformanceCounter": - ParsedPerformanceCounter counter = this.ParsePerformanceCounterElement(intermediate, section, child, defaultLanguage); + var counter = this.ParsePerformanceCounterElement(intermediate, section, child, defaultLanguage); if (null != counter) { parsedPerformanceCounters.Add(counter); @@ -1622,10 +1608,10 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { // Calculate the ini and h file content. - string objectName = "OBJECT_1"; - string objectLanguage = defaultLanguage.ToString("D3", CultureInfo.InvariantCulture); + var objectName = "OBJECT_1"; + var objectLanguage = defaultLanguage.ToString("D3", CultureInfo.InvariantCulture); - StringBuilder sbIniData = new StringBuilder(); + var sbIniData = new StringBuilder(); sbIniData.AppendFormat("[info]\r\ndrivername={0}\r\nsymbolfile=wixperf.h\r\n\r\n[objects]\r\n{1}_{2}_NAME=\r\n\r\n[languages]\r\n{2}=LANG{2}\r\n\r\n", name, objectName, objectLanguage); sbIniData.AppendFormat("[text]\r\n{0}_{1}_NAME={2}\r\n", objectName, objectLanguage, name); if (null != help) @@ -1634,15 +1620,15 @@ namespace WixToolset.Util } int symbolConstantsCounter = 0; - StringBuilder sbSymbolicConstants = new StringBuilder(); + var sbSymbolicConstants = new StringBuilder(); sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", objectName, symbolConstantsCounter); - StringBuilder sbCounterNames = new StringBuilder("[~]"); - StringBuilder sbCounterTypes = new StringBuilder("[~]"); + var sbCounterNames = new StringBuilder("[~]"); + var sbCounterTypes = new StringBuilder("[~]"); for (int i = 0; i < parsedPerformanceCounters.Count; ++i) { - ParsedPerformanceCounter counter = (ParsedPerformanceCounter)parsedPerformanceCounters[i]; - string counterName = String.Concat("DEVICE_COUNTER_", i + 1); + var counter = parsedPerformanceCounters[i]; + var counterName = String.Concat("DEVICE_COUNTER_", i + 1); sbIniData.AppendFormat("{0}_{1}_NAME={2}\r\n", counterName, counter.Language, counter.Name); if (null != counter.Help) @@ -1662,20 +1648,18 @@ namespace WixToolset.Util sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); // Add the calculated INI and H strings to the PerformanceCategory table. - var tuple = new PerformanceCategoryTuple(sourceLineNumbers, id) + section.AddTuple(new PerformanceCategoryTuple(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, IniData = sbIniData.ToString(), ConstantData = sbSymbolicConstants.ToString(), - }; - - section.Tuples.Add(tuple); + }); // Set up the application's performance key. - string escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); - string linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); - string performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); + var escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); + var linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); + var performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); @@ -1951,14 +1935,14 @@ namespace WixToolset.Util /// Default language for the performance counter. private ParsedPerformanceCounter ParsePerformanceCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, int defaultLanguage) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); ParsedPerformanceCounter parsedPerformanceCounter = null; string name = null; string help = null; - System.Diagnostics.PerformanceCounterType type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + var type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; int language = defaultLanguage; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2015,7 +1999,7 @@ namespace WixToolset.Util /// Numeric representation of the language as per WinNT.h. private System.Diagnostics.PerformanceCounterType GetPerformanceCounterType(SourceLineNumber sourceLineNumbers, XAttribute attribute) { - System.Diagnostics.PerformanceCounterType type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + var type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; if (String.Empty == attribute.Value) { this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); @@ -2125,12 +2109,12 @@ namespace WixToolset.Util /// Identifier of referenced file. private void ParsePerfCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string name = null; this.Messaging.Write(UtilWarnings.DeprecatedPerfCounterElement(sourceLineNumbers)); - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2159,14 +2143,12 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new PerfmonTuple(sourceLineNumbers) + section.AddTuple(new PerfmonTuple(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", Name = name, - }; - - section.Tuples.Add(tuple); + }); } this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); @@ -2182,10 +2164,10 @@ namespace WixToolset.Util /// Identifier of referenced file. private void ParsePerfCounterManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string resourceFileDirectory = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2209,14 +2191,12 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new PerfmonManifestTuple(sourceLineNumbers) + section.AddTuple(new PerfmonManifestTuple(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", ResourceFileDirectory = resourceFileDirectory, - }; - - section.Tuples.Add(tuple); + }); } this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); @@ -2231,10 +2211,10 @@ namespace WixToolset.Util /// Flag to determine whether the component is 64-bit. private void ParseFormatFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId, bool win64) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string binaryId = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2265,15 +2245,13 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X64 | CustomActionPlatforms.X86); - var tuple = new WixFormatFilesTuple(sourceLineNumbers) + section.AddTuple(new WixFormatFilesTuple(sourceLineNumbers) { BinaryRef = binaryId, FileRef = fileId, - }; - - section.Tuples.Add(tuple); + }); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Binary", binaryId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binaryId); } } @@ -2285,12 +2263,12 @@ namespace WixToolset.Util /// Identifier of referenced file. private void ParseEventManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string messageFile = null; string resourceFile = null; string parameterFile = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2320,17 +2298,15 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new EventManifestTuple(sourceLineNumbers) + section.AddTuple(new EventManifestTuple(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", - }; - - section.Tuples.Add(tuple); + }); if (null != messageFile) { - var xmlTuple = new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) + section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", @@ -2338,12 +2314,11 @@ namespace WixToolset.Util Value = messageFile, Flags = 4 | 0x00001000, //bulk write | preserve modified date ComponentRef = componentId, - }; - section.Tuples.Add(xmlTuple); + }); } if (null != parameterFile) { - var xmlTuple = new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) + section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", @@ -2351,12 +2326,11 @@ namespace WixToolset.Util Value = parameterFile, Flags = 4 | 0x00001000, //bulk write | preserve modified date ComponentRef = componentId, - }; - section.Tuples.Add(xmlTuple); + }); } if (null != resourceFile) { - var xmlTuple = new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) + section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", @@ -2364,8 +2338,7 @@ namespace WixToolset.Util Value = resourceFile, Flags = 4 | 0x00001000, //bulk write | preserve modified date ComponentRef = componentId, - }; - section.Tuples.Add(xmlTuple); + }); } } @@ -2375,7 +2348,7 @@ namespace WixToolset.Util if (null != messageFile || null != parameterFile || null != resourceFile) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.AddReferenceToSchedXmlFile(sourceLineNumbers, section); } } @@ -2389,14 +2362,13 @@ namespace WixToolset.Util /// Name of table that contains objectId. private void ParsePermissionExElement(Intermediate intermediate, IntermediateSection section, XElement element, string objectId, string componentId, bool win64, string tableName) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - BitArray bits = new BitArray(32); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var bits = new BitArray(32); string domain = null; - int permission = 0; string[] specialPermissions = null; string user = null; - PermissionType permissionType = PermissionType.SecureObjects; + var permissionType = PermissionType.SecureObjects; switch (tableName) { @@ -2422,7 +2394,7 @@ namespace WixToolset.Util break; } - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2439,7 +2411,7 @@ namespace WixToolset.Util user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; default: - YesNoType attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) { if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) @@ -2460,7 +2432,7 @@ namespace WixToolset.Util } } - permission = this.CreateIntegerFromBitArray(bits); + var permission = this.CreateIntegerFromBitArray(bits); if (null == user) { @@ -2479,7 +2451,7 @@ namespace WixToolset.Util this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); - var tuple = new SecureObjectsTuple(sourceLineNumbers, id) + section.AddTuple(new SecureObjectsTuple(sourceLineNumbers, id) { SecureObject = objectId, Table = tableName, @@ -2487,9 +2459,7 @@ namespace WixToolset.Util User = user, Permission = permission, ComponentRef = componentId, - }; - - section.Tuples.Add(tuple); + }); } } @@ -2499,7 +2469,7 @@ namespace WixToolset.Util /// Element to parse. private void ParseProductSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string variable = null; string condition = null; @@ -2507,9 +2477,9 @@ namespace WixToolset.Util string productCode = null; string upgradeCode = null; - Serialize.ProductSearch.ResultType result = Serialize.ProductSearch.ResultType.NotSet; + var result = Serialize.ProductSearch.ResultType.NotSet; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2528,7 +2498,7 @@ namespace WixToolset.Util upgradeCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); break; case "Result": - string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); if (!Serialize.ProductSearch.TryParseResultType(resultValue, out result)) { this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, @@ -2571,7 +2541,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - WixProductSearchAttributes attributes = WixProductSearchAttributes.Version; + var attributes = WixProductSearchAttributes.Version; switch (result) { case Serialize.ProductSearch.ResultType.version: @@ -2594,7 +2564,7 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - section.Tuples.Add(new WixProductSearchTuple(sourceLineNumbers, id) + section.AddTuple(new WixProductSearchTuple(sourceLineNumbers, id) { Guid = productCode ?? upgradeCode, Attributes = attributes, @@ -2608,7 +2578,7 @@ namespace WixToolset.Util /// Element to parse. private void ParseRegistrySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string variable = null; string condition = null; @@ -2616,12 +2586,12 @@ namespace WixToolset.Util RegistryRootType? root = null; string key = null; string value = null; - YesNoType expand = YesNoType.NotSet; - YesNoType win64 = YesNoType.NotSet; - Serialize.RegistrySearch.ResultType result = Serialize.RegistrySearch.ResultType.NotSet; - Serialize.RegistrySearch.FormatType format = Serialize.RegistrySearch.FormatType.raw; + var expand = YesNoType.NotSet; + var win64 = YesNoType.NotSet; + var result = Serialize.RegistrySearch.ResultType.NotSet; + var format = Serialize.RegistrySearch.FormatType.raw; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2657,7 +2627,7 @@ namespace WixToolset.Util } break; case "Result": - string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); if (!Serialize.RegistrySearch.TryParseResultType(resultValue, out result)) { this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, @@ -2698,7 +2668,7 @@ namespace WixToolset.Util id = this.ParseHelper.CreateIdentifier("wrs", variable, condition, after, root.ToString(), key, value, result.ToString()); } - WixRegistrySearchAttributes attributes = WixRegistrySearchAttributes.Raw; + var attributes = WixRegistrySearchAttributes.Raw; switch (format) { case Serialize.RegistrySearch.FormatType.raw: @@ -2741,9 +2711,9 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.Tuples.Add(new WixRegistrySearchTuple(sourceLineNumbers, id) + section.AddTuple(new WixRegistrySearchTuple(sourceLineNumbers, id) { - Root = (RegistryRootType)root, + Root = root.Value, Key = key, Value = value, Attributes = attributes, @@ -2758,12 +2728,12 @@ namespace WixToolset.Util /// Identifier of parent component. private void ParseRemoveFolderExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; - int on = (int)WixRemoveFolderExOn.Uninstall; + var on = (int)WixRemoveFolderExOn.Uninstall; string property = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2773,7 +2743,7 @@ namespace WixToolset.Util id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "On": - string onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); if (onValue.Length == 0) { on = CompilerConstants.IllegalInteger; @@ -2828,14 +2798,12 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86); - var tuple = new WixRemoveFolderExTuple(sourceLineNumbers) + section.AddTuple(new WixRemoveFolderExTuple(sourceLineNumbers, id) { ComponentRef = componentId, Property = property, - InstallMode = (int)on, - }; - - section.Tuples.Add(tuple); + InstallMode = on, + }); this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveFile"); } @@ -2848,12 +2816,12 @@ namespace WixToolset.Util /// The identity of the parent component. private void ParseRestartResourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string resource = null; - int attributes = CompilerConstants.IntegerNotSet; + var attributes = CompilerConstants.IntegerNotSet; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -2906,14 +2874,12 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - var tuple = new WixRestartResourceTuple(sourceLineNumbers) + section.AddTuple(new WixRestartResourceTuple(sourceLineNumbers, id) { ComponentRef = componentId, Resource = resource, Attributes = attributes, - }; - - section.Tuples.Add(tuple); + }); } } @@ -2926,18 +2892,18 @@ namespace WixToolset.Util /// Optional name of service private void ParseServiceConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string parentTableName, string parentTableServiceName) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); string firstFailureActionType = null; - bool newService = false; + var newService = false; string programCommandLine = null; string rebootMessage = null; - int resetPeriod = CompilerConstants.IntegerNotSet; - int restartServiceDelay = CompilerConstants.IntegerNotSet; + var resetPeriod = CompilerConstants.IntegerNotSet; + var restartServiceDelay = CompilerConstants.IntegerNotSet; string secondFailureActionType = null; string serviceName = null; string thirdFailureActionType = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -3000,7 +2966,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - var tuple = new ServiceConfigTuple(sourceLineNumbers) + section.AddTuple(new ServiceConfigTuple(sourceLineNumbers) { ServiceName = serviceName, ComponentRef = componentId, @@ -3012,9 +2978,7 @@ namespace WixToolset.Util RestartServiceDelayInSeconds = restartServiceDelay, ProgramCommandLine = programCommandLine, RebootMessage = rebootMessage, - }; - - section.Tuples.Add(tuple); + }); } } @@ -3026,16 +2990,16 @@ namespace WixToolset.Util /// Indicates whether the path is a 64-bit path. private void ParseTouchFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool win64) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string path = null; - YesNoType onInstall = YesNoType.NotSet; - YesNoType onReinstall = YesNoType.NotSet; - YesNoType onUninstall = YesNoType.NotSet; - YesNoType nonvital = YesNoType.NotSet; + var onInstall = YesNoType.NotSet; + var onReinstall = YesNoType.NotSet; + var onUninstall = YesNoType.NotSet; + var nonvital = YesNoType.NotSet; int attributes = 0; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -3097,14 +3061,12 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new WixTouchFileTuple(sourceLineNumbers) + section.AddTuple(new WixTouchFileTuple(sourceLineNumbers, id) { ComponentRef = componentId, Path = path, Attributes = attributes, - }; - - section.Tuples.Add(tuple); + }); this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86); } @@ -3117,14 +3079,14 @@ namespace WixToolset.Util /// Optional identifier of parent component. private void ParseUserElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; int attributes = 0; string domain = null; string name = null; string password = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -3274,7 +3236,7 @@ namespace WixToolset.Util if (null == id) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + id = this.ParseHelper.CreateIdentifier("usr", componentId, name); } if (null == name) @@ -3282,7 +3244,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); } - foreach (XElement child in element.Elements()) + foreach (var child in element.Elements()) { if (this.Namespace == child.Name.Namespace) { @@ -3291,7 +3253,7 @@ namespace WixToolset.Util case "GroupRef": if (null == componentId) { - SourceLineNumber childSourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(child); + var childSourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(child); this.Messaging.Write(UtilErrors.IllegalElementWithoutComponent(childSourceLineNumbers, child.Name.LocalName)); } @@ -3315,16 +3277,14 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new UserTuple(sourceLineNumbers, id) + section.AddTuple(new UserTuple(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, Domain = domain, Password = password, Attributes = attributes, - }; - - section.Tuples.Add(tuple); + }); } } @@ -3335,7 +3295,7 @@ namespace WixToolset.Util /// Identifier of parent component. private void ParseXmlFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string file = null; string elementPath = null; @@ -3344,14 +3304,14 @@ namespace WixToolset.Util int sequence = -1; int flags = 0; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { switch (attrib.Name.LocalName) { case "Action": - string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); switch (actionValue) { case "createElement": @@ -3429,7 +3389,7 @@ namespace WixToolset.Util if (null == id) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + id = this.ParseHelper.CreateIdentifier("uxf", componentId, file, elementPath, name); } if (null == file) @@ -3451,7 +3411,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new XmlFileTuple(sourceLineNumbers, id) + var tuple = section.AddTuple(new XmlFileTuple(sourceLineNumbers, id) { File = file, ElementPath = elementPath, @@ -3459,15 +3419,14 @@ namespace WixToolset.Util Value = value, Flags = flags, ComponentRef = componentId, - }; + }); if (-1 != sequence) { tuple.Sequence = sequence; } - section.Tuples.Add(tuple); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.AddReferenceToSchedXmlFile(sourceLineNumbers, section); } /// @@ -3478,18 +3437,18 @@ namespace WixToolset.Util /// Whether or not the element is nested. private void ParseXmlConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool nested) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string elementId = null; string elementPath = null; int flags = 0; string file = null; string name = null; - int sequence = CompilerConstants.IntegerNotSet; + var sequence = CompilerConstants.IntegerNotSet; string value = null; string verifyPath = null; - foreach (XAttribute attrib in element.Attributes()) + foreach (var attrib in element.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -3539,7 +3498,7 @@ namespace WixToolset.Util } else { - string nodeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var nodeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); switch (nodeValue) { case "element": @@ -3564,7 +3523,7 @@ namespace WixToolset.Util } else { - string onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); switch (onValue) { case "install": @@ -3607,7 +3566,7 @@ namespace WixToolset.Util if (null == id) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); + id = this.ParseHelper.CreateIdentifier("uxc", componentId, file, elementId, elementPath); } if (null == file) @@ -3631,10 +3590,10 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On")); } - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "XmlConfig", elementId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.XmlConfig, elementId); } - string innerText = this.ParseHelper.GetTrimmedInnerText(element); + var innerText = this.ParseHelper.GetTrimmedInnerText(element); if (null != value) { // cannot specify both the value attribute and inner text @@ -3652,7 +3611,7 @@ namespace WixToolset.Util } // find unexpected child elements - foreach (XElement child in element.Elements()) + foreach (var child in element.Elements()) { if (this.Namespace == child.Name.Namespace) { @@ -3681,21 +3640,20 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = new XmlConfigTuple(sourceLineNumbers, id) + var tuple = section.AddTuple(new XmlConfigTuple(sourceLineNumbers, id) { - File=file, - ElementPath=elementId ??elementPath, - VerifyPath=verifyPath, - Name=name, - Value=value, - Flags=flags, - ComponentRef=componentId, - }; + File = file, + ElementPath = elementId ?? elementPath, + VerifyPath = verifyPath, + Name = name, + Value = value, + Flags = flags, + ComponentRef = componentId, + }); if (CompilerConstants.IntegerNotSet != sequence) { tuple.Sequence = sequence; } - section.Tuples.Add(tuple); } this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); @@ -3727,7 +3685,7 @@ namespace WixToolset.Util throw new ArgumentException(String.Format("Can only convert a bit array with 32-bits to integer. Actual number of bits in array: {0}", bits.Length), "bits"); } - int[] intArray = new int[1]; + var intArray = new int[1]; bits.CopyTo(intArray, 0); return intArray[0]; @@ -3735,7 +3693,7 @@ namespace WixToolset.Util private bool TrySetBitFromName(string[] attributeNames, string attributeName, YesNoType attributeValue, BitArray bits, int offset) { - for (int i = 0; i < attributeNames.Length; i++) + for (var i = 0; i < attributeNames.Length; i++) { if (attributeName.Equals(attributeNames[i], StringComparison.Ordinal)) { @@ -3747,6 +3705,11 @@ namespace WixToolset.Util return false; } + private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + } + /// /// Private class that stores the data from a parsed PerformanceCounter element. /// diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs new file mode 100644 index 00000000..78f21ebc --- /dev/null +++ b/src/wixext/UtilTableDefinitions.cs @@ -0,0 +1,300 @@ +// 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.Util +{ + using WixToolset.Data.WindowsInstaller; + + public static class UtilTableDefinitions + { + public static readonly TableDefinition Wix4CloseApplication = new TableDefinition( + "Wix4CloseApplication", + new[] + { + new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Name of executable to ensure is closed.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Description", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Description string displayed to user when executable is in use.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true), + new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the closing.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), + new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Sequence to order the closings by."), + new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Optional property that is set to the number of running instances of the app.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true), + new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."), + new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."), + }, + tupleDefinitionName: UtilTupleDefinitions.WixCloseApplication.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition( + "Wix4RemoveFolderEx", + new[] + { + new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), + }, + tupleDefinitionName: UtilTupleDefinitions.WixRemoveFolderEx.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4RestartResource = new TableDefinition( + "Wix4RestartResource", + new[] + { + new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."), + }, + tupleDefinitionName: UtilTupleDefinitions.WixRestartResource.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4FileShare = new TableDefinition( + "Wix4FileShare", + new[] + { + new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("ShareName", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The actual share name used"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"), + new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column), + }, + tupleDefinitionName: UtilTupleDefinitions.FileShare.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition( + "Wix4FileSharePermissions", + new[] + { + new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"), + }, + tupleDefinitionName: UtilTupleDefinitions.FileSharePermissions.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4Group = new TableDefinition( + "Wix4Group", + new[] + { + new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property), + }, + tupleDefinitionName: UtilTupleDefinitions.Group.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition( + "Wix4InternetShortcut", + new[] + { + new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the shortcut is created in", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name used for shortcut.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "URL target."), + new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attribute flags that control how the shortcut is created."), + new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"), + new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), + }, + tupleDefinitionName: UtilTupleDefinitions.WixInternetShortcut.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition( + "Wix4PerformanceCategory", + new[] + { + new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 80, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name of the performance counter category."), + new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."), + new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."), + }, + tupleDefinitionName: UtilTupleDefinitions.PerformanceCategory.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4Perfmon = new TableDefinition( + "Wix4Perfmon", + new[] + { + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"), + }, + tupleDefinitionName: UtilTupleDefinitions.Perfmon.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition( + "Wix4PerfmonManifest", + new[] + { + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"), + }, + tupleDefinitionName: UtilTupleDefinitions.PerfmonManifest.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4EventManifest = new TableDefinition( + "Wix4EventManifest", + new[] + { + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property), + }, + tupleDefinitionName: UtilTupleDefinitions.EventManifest.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4SecureObject = new TableDefinition( + "Wix4SecureObject", + new[] + { + new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Table SecureObject should be securing"), + new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.Text, description: "Domain half of user account to secure", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("User", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "User name half of user account to secure", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + }, + tupleDefinitionName: UtilTupleDefinitions.SecureObjects.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition( + "Wix4ServiceConfig", + new[] + { + new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state ", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("NewService", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Whether the affected service is being installed or already exists."), + new ColumnDefinition("FirstFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "First failure action type for configured service to take."), + new ColumnDefinition("SecondFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Second failure action type for configured service to take."), + new ColumnDefinition("ThirdFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Third failure action type for configured service to take."), + new ColumnDefinition("ResetPeriodInDays", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, description: "Period after which to reset the failure count for the service."), + new ColumnDefinition("RestartServiceDelayInSeconds", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, description: "Period after which to restart the service after a given failure."), + new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."), + new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."), + }, + tupleDefinitionName: UtilTupleDefinitions.ServiceConfig.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4TouchFile = new TableDefinition( + "Wix4TouchFile", + new[] + { + new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."), + }, + tupleDefinitionName: UtilTupleDefinitions.WixTouchFile.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4User = new TableDefinition( + "Wix4User", + new[] + { + new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "User name", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User domain", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"), + }, + tupleDefinitionName: UtilTupleDefinitions.User.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4UserGroup = new TableDefinition( + "Wix4UserGroup", + new[] + { + new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column), + }, + tupleDefinitionName: UtilTupleDefinitions.UserGroup.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4XmlFile = new TableDefinition( + "Wix4XmlFile", + new[] + { + new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file element to modify.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 70143, description: "Flags"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), + }, + tupleDefinitionName: UtilTupleDefinitions.XmlFile.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4XmlConfig = new TableDefinition( + "Wix4XmlConfig", + new[] + { + new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to. Can also be a foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("VerifyPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query run from ElementPath to verify whether a repair is necessary. Also used to uninstall.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 65536, description: "Element=1,Value=2,Document=4,Create=16,Delete=32,Install=256,Uninstall=512"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), + }, + tupleDefinitionName: UtilTupleDefinitions.XmlConfig.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4FormatFile = new TableDefinition( + "Wix4FormatFile", + new[] + { + new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column), + }, + tupleDefinitionName: UtilTupleDefinitions.WixFormatFiles.Name, + tupleIdIsPrimaryKey: false + ); + + public static readonly TableDefinition[] All = new[] + { + Wix4CloseApplication, + Wix4RemoveFolderEx, + Wix4RestartResource, + Wix4FileShare, + Wix4FileSharePermissions, + Wix4Group, + Wix4InternetShortcut, + Wix4PerformanceCategory, + Wix4Perfmon, + Wix4PerfmonManifest, + Wix4EventManifest, + Wix4SecureObject, + Wix4ServiceConfig, + Wix4TouchFile, + Wix4User, + Wix4UserGroup, + Wix4XmlFile, + Wix4XmlConfig, + Wix4FormatFile, + }; + } +} diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index 2365ed01..f872ec1a 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -3,25 +3,11 @@ namespace WixToolset.Util { using System.Collections.Generic; - using System.Linq; - using System.Xml; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; public class UtilWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension { - private static readonly TableDefinition[] Tables = LoadTables(); - - public override IEnumerable TableDefinitions { get => Tables; } - - private static TableDefinition[] LoadTables() - { - using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) - using (var reader = XmlReader.Create(resourceStream)) - { - var tables = TableDefinitionCollection.Load(reader); - return tables.ToArray(); - } - } + public override IEnumerable TableDefinitions => UtilTableDefinitions.All; } } diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index ed5a6a0f..240fbfb3 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -14,7 +14,6 @@ - diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml deleted file mode 100644 index b8d4246c..00000000 --- a/src/wixext/tables.xml +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-55-g6feb From dbdd133ea6891b55d6c1494055e45eab676f0418 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 13 Apr 2020 18:25:23 +1000 Subject: Update dependencies. --- appveyor.yml | 5 ++++ src/Cpp.Build.props | 18 ------------- src/wixext/Tuples/SecureObjectsTuple.cs | 4 +-- src/wixext/Tuples/ServiceConfigTuple.cs | 8 +++--- src/wixext/Tuples/WixCloseApplicationTuple.cs | 12 ++++----- src/wixext/Tuples/WixInternetShortcutTuple.cs | 4 +-- src/wixext/Tuples/XmlConfigTuple.cs | 4 +-- src/wixext/Tuples/XmlFileTuple.cs | 4 +-- src/wixext/UtilTableDefinitions.cs | 38 +++++++++++++-------------- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 +-- 11 files changed, 45 insertions(+), 58 deletions(-) (limited to 'src') diff --git a/appveyor.yml b/appveyor.yml index bbf880f0..7c686b04 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,11 @@ # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml # then update all of the repos. +branches: + only: + - master + - develop + image: Visual Studio 2019 version: 0.0.0.{build} diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 44a042c7..9b7a1bb5 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -70,12 +70,6 @@ MultiThreadedDebug - - - - MultiThreadedDebugDll - - MinSpace @@ -89,16 +83,4 @@ true - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index dd658be1..3602a5ea 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -72,9 +72,9 @@ namespace WixToolset.Util.Tuples set => this.Set((int)SecureObjectsTupleFields.User, value); } - public int Permission + public int? Permission { - get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNumber(); + get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber(); set => this.Set((int)SecureObjectsTupleFields.Permission, value); } diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs index e5fc3992..714396bc 100644 --- a/src/wixext/Tuples/ServiceConfigTuple.cs +++ b/src/wixext/Tuples/ServiceConfigTuple.cs @@ -92,15 +92,15 @@ namespace WixToolset.Util.Tuples set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value); } - public int ResetPeriodInDays + public int? ResetPeriodInDays { - get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNumber(); + get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber(); set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value); } - public int RestartServiceDelayInSeconds + public int? RestartServiceDelayInSeconds { - get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNumber(); + get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber(); set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value); } diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs index cc91c326..2deebbae 100644 --- a/src/wixext/Tuples/WixCloseApplicationTuple.cs +++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs @@ -76,9 +76,9 @@ namespace WixToolset.Util.Tuples set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value); } - public int Sequence + public int? Sequence { - get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNumber(); + get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNullableNumber(); set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value); } @@ -88,15 +88,15 @@ namespace WixToolset.Util.Tuples set => this.Set((int)WixCloseApplicationTupleFields.Property, value); } - public int TerminateExitCode + public int? TerminateExitCode { - get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNumber(); + get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNullableNumber(); set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value); } - public int Timeout + public int? Timeout { - get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNumber(); + get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNullableNumber(); set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value); } } diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs index 935d9462..b0dff121 100644 --- a/src/wixext/Tuples/WixInternetShortcutTuple.cs +++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs @@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value); } - public int IconIndex + public int? IconIndex { - get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNumber(); + get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNullableNumber(); set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value); } } diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs index 0eb49cac..291a686c 100644 --- a/src/wixext/Tuples/XmlConfigTuple.cs +++ b/src/wixext/Tuples/XmlConfigTuple.cs @@ -94,9 +94,9 @@ namespace WixToolset.Util.Tuples set => this.Set((int)XmlConfigTupleFields.ComponentRef, value); } - public int Sequence + public int? Sequence { - get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNumber(); + get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNullableNumber(); set => this.Set((int)XmlConfigTupleFields.Sequence, value); } } diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs index e0b3bbd7..e44979ca 100644 --- a/src/wixext/Tuples/XmlFileTuple.cs +++ b/src/wixext/Tuples/XmlFileTuple.cs @@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples set => this.Set((int)XmlFileTupleFields.ComponentRef, value); } - public int Sequence + public int? Sequence { - get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNumber(); + get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNullableNumber(); set => this.Set((int)XmlFileTupleFields.Sequence, value); } } diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index 78f21ebc..5e227a05 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -8,6 +8,7 @@ namespace WixToolset.Util { public static readonly TableDefinition Wix4CloseApplication = new TableDefinition( "Wix4CloseApplication", + UtilTupleDefinitions.WixCloseApplication, new[] { new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -20,12 +21,12 @@ namespace WixToolset.Util new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."), new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."), }, - tupleDefinitionName: UtilTupleDefinitions.WixCloseApplication.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition( "Wix4RemoveFolderEx", + UtilTupleDefinitions.WixRemoveFolderEx, new[] { new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), @@ -33,12 +34,12 @@ namespace WixToolset.Util new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), }, - tupleDefinitionName: UtilTupleDefinitions.WixRemoveFolderEx.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4RestartResource = new TableDefinition( "Wix4RestartResource", + UtilTupleDefinitions.WixRestartResource, new[] { new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column), @@ -46,12 +47,12 @@ namespace WixToolset.Util new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."), }, - tupleDefinitionName: UtilTupleDefinitions.WixRestartResource.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FileShare = new TableDefinition( "Wix4FileShare", + UtilTupleDefinitions.FileShare, new[] { new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column), @@ -60,24 +61,24 @@ namespace WixToolset.Util new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"), new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: UtilTupleDefinitions.FileShare.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition( "Wix4FileSharePermissions", + UtilTupleDefinitions.FileSharePermissions, new[] { new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"), }, - tupleDefinitionName: UtilTupleDefinitions.FileSharePermissions.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4Group = new TableDefinition( "Wix4Group", + UtilTupleDefinitions.Group, new[] { new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -85,12 +86,12 @@ namespace WixToolset.Util new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property), }, - tupleDefinitionName: UtilTupleDefinitions.Group.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition( "Wix4InternetShortcut", + UtilTupleDefinitions.WixInternetShortcut, new[] { new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -102,12 +103,12 @@ namespace WixToolset.Util new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"), new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), }, - tupleDefinitionName: UtilTupleDefinitions.WixInternetShortcut.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition( "Wix4PerformanceCategory", + UtilTupleDefinitions.PerformanceCategory, new[] { new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -116,47 +117,47 @@ namespace WixToolset.Util new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."), new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."), }, - tupleDefinitionName: UtilTupleDefinitions.PerformanceCategory.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4Perfmon = new TableDefinition( "Wix4Perfmon", + UtilTupleDefinitions.Perfmon, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"), }, - tupleDefinitionName: UtilTupleDefinitions.Perfmon.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition( "Wix4PerfmonManifest", + UtilTupleDefinitions.PerfmonManifest, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"), }, - tupleDefinitionName: UtilTupleDefinitions.PerfmonManifest.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4EventManifest = new TableDefinition( "Wix4EventManifest", + UtilTupleDefinitions.EventManifest, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property), }, - tupleDefinitionName: UtilTupleDefinitions.EventManifest.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4SecureObject = new TableDefinition( "Wix4SecureObject", + UtilTupleDefinitions.SecureObjects, new[] { new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column), @@ -166,12 +167,12 @@ namespace WixToolset.Util new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: UtilTupleDefinitions.SecureObjects.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition( "Wix4ServiceConfig", + UtilTupleDefinitions.ServiceConfig, new[] { new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"), @@ -185,12 +186,12 @@ namespace WixToolset.Util new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."), new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."), }, - tupleDefinitionName: UtilTupleDefinitions.ServiceConfig.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4TouchFile = new TableDefinition( "Wix4TouchFile", + UtilTupleDefinitions.WixTouchFile, new[] { new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column), @@ -198,12 +199,12 @@ namespace WixToolset.Util new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."), }, - tupleDefinitionName: UtilTupleDefinitions.WixTouchFile.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4User = new TableDefinition( "Wix4User", + UtilTupleDefinitions.User, new[] { new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -213,23 +214,23 @@ namespace WixToolset.Util new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"), }, - tupleDefinitionName: UtilTupleDefinitions.User.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4UserGroup = new TableDefinition( "Wix4UserGroup", + UtilTupleDefinitions.UserGroup, new[] { new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: UtilTupleDefinitions.UserGroup.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4XmlFile = new TableDefinition( "Wix4XmlFile", + UtilTupleDefinitions.XmlFile, new[] { new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -241,12 +242,12 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), }, - tupleDefinitionName: UtilTupleDefinitions.XmlFile.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4XmlConfig = new TableDefinition( "Wix4XmlConfig", + UtilTupleDefinitions.XmlConfig, new[] { new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -259,18 +260,17 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), }, - tupleDefinitionName: UtilTupleDefinitions.XmlConfig.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FormatFile = new TableDefinition( "Wix4FormatFile", + UtilTupleDefinitions.WixFormatFiles, new[] { new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: UtilTupleDefinitions.WixFormatFiles.Name, tupleIdIsPrimaryKey: false ); diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index e1b601f6..1e5a9850 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 5b26e901..5f659529 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 9b07a2c5f885a3b08ffecc485dd8c55616d30a03 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Fri, 24 Apr 2020 16:42:02 -0400 Subject: Update to latest Tools. --- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 1e5a9850..a6dedb6c 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 5f659529..64cc5122 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 23f8f2d3b18f36478e0af9e72ec6fba3a200052d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 8 May 2020 22:06:35 +1000 Subject: Remove heat messages --- src/wixext/UtilErrors.cs | 54 ---------------------------------------------- src/wixext/UtilWarnings.cs | 35 ------------------------------ 2 files changed, 89 deletions(-) (limited to 'src') diff --git a/src/wixext/UtilErrors.cs b/src/wixext/UtilErrors.cs index c04f0449..b9ce1688 100644 --- a/src/wixext/UtilErrors.cs +++ b/src/wixext/UtilErrors.cs @@ -8,31 +8,6 @@ namespace WixToolset.Util public static class UtilErrors { - public static Message ArgumentRequiresValue(string argument) - { - return Message(null, Ids.ArgumentRequiresValue, "The argument '{0}' does not have a value specified and it is required.", argument); - } - - public static Message DirectoryNotFound(string directory) - { - return Message(null, Ids.DirectoryNotFound, "The directory '{0}' could not be found.", directory); - } - - public static Message EmptyDirectory(string directory) - { - return Message(null, Ids.EmptyDirectory, "The directory '{0}' did not contain any files or sub-directories and since empty directories are not being kept, there was nothing to harvest.", directory); - } - - public static Message ErrorTransformingHarvestedWiX(string transform, string message) - { - return Message(null, Ids.ErrorTransformingHarvestedWiX, "Error applying transform {0} to harvested WiX: {1}", transform, message); - } - - public static Message FileNotFound(string file) - { - return Message(null, Ids.FileNotFound, "The file '{0}' cannot be found.", file); - } - public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) { return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); @@ -53,26 +28,6 @@ namespace WixToolset.Util return Message(sourceLineNumbers, Ids.InvalidRegistryObject, "The {0} element has no id and cannot have its permissions set. If you want to set permissions on a 'placeholder' registry key, force its creation by setting the ForceCreateOnInstall attribute to yes.", registryElementName); } - public static Message PerformanceCategoryNotFound(string key) - { - return Message(null, Ids.PerformanceCategoryNotFound, "Performance category '{0}' not found.", key); - } - - public static Message SpacesNotAllowedInArgumentValue(string arg, string value) - { - return Message(null, Ids.SpacesNotAllowedInArgumentValue, "The switch '{0}' does not allow the spaces from the value. Please remove the spaces in from the value: {1}", arg, value); - } - - public static Message UnableToOpenRegistryKey(string key) - { - return Message(null, Ids.UnableToOpenRegistryKey, "Unable to open registry key '{0}'.", key); - } - - public static Message UnsupportedPerformanceCounterType(string key) - { - return Message(null, Ids.UnsupportedPerformanceCounterType, "Unsupported performance counter type '{0}'.", key); - } - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) { return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); @@ -87,16 +42,7 @@ namespace WixToolset.Util { IllegalAttributeWithoutComponent = 5050, IllegalElementWithoutComponent = 5051, - DirectoryNotFound = 5052, - EmptyDirectory = 5053, IllegalFileValueInPerfmonOrManifest = 5054, - ErrorTransformingHarvestedWiX = 5055, - UnableToOpenRegistryKey = 5056, - SpacesNotAllowedInArgumentValue = 5057, - ArgumentRequiresValue = 5058, - FileNotFound = 5059, - PerformanceCategoryNotFound = 5060, - UnsupportedPerformanceCounterType = 5061, InvalidRegistryObject = 5063, } } diff --git a/src/wixext/UtilWarnings.cs b/src/wixext/UtilWarnings.cs index 13dcea4e..b65abe45 100644 --- a/src/wixext/UtilWarnings.cs +++ b/src/wixext/UtilWarnings.cs @@ -8,46 +8,16 @@ namespace WixToolset.Util public static class UtilWarnings { - public static Message AssemblyHarvestFailed(string file, string message) - { - return Message(null, Ids.AssemblyHarvestFailed, "Could not harvest data from a file that was expected to be an assembly: {0}. If this file is not an assembly you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); - } - public static Message DeprecatedPerfCounterElement(SourceLineNumber sourceLineNumbers) { return Message(sourceLineNumbers, Ids.DeprecatedPerfCounterElement, "The PerfCounter element has been deprecated. Please use the PerformanceCounter element instead."); } - public static Message DuplicateDllRegistryEntry(string registryKey, string componentId) - { - return Message(null, Ids.DuplicateDllRegistryEntry, "Ignoring the registry key '{0}', it has already been added to the component '{1}'.", registryKey, componentId); - } - - public static Message DuplicateDllRegistryEntry(string registryKey, string registryKeyValue, string componentId) - { - return Message(null, Ids.DuplicateDllRegistryEntry, "Ignoring the registry key '{0}', it has already been added to the component '{2}'. The registry key value '{1}' will not be harvested.", registryKey, registryKeyValue, componentId); - } - public static Message RequiredAttributeForWindowsXP(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) { return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP. You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName); } - public static Message SelfRegHarvestFailed(string file, string message) - { - return Message(null, Ids.SelfRegHarvestFailed, "Could not harvest data from a file that was expected to be a SelfReg DLL: {0}. If this file does not support SelfReg you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); - } - - public static Message TypeLibLoadFailed(string file, string message) - { - return Message(null, Ids.TypeLibLoadFailed, "Could not load file that was expected to be a type library based off of file extension: {0}. If this file is not a type library you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the load failure: {1}", file, message); - } - - public static Message UnsupportedRegistryType(string registryValue, int regFileLineNumber, string unsupportedType) - { - return Message(null, Ids.UnsupportedRegistryType, "Ignoring the registry value '{0}' found on line {1}, because it is of a type unsupported by Windows Installer ({2}).", registryValue, regFileLineNumber, unsupportedType); - } - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) { return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); @@ -60,13 +30,8 @@ namespace WixToolset.Util public enum Ids { - SelfRegHarvestFailed = 5150, - AssemblyHarvestFailed = 5151, - TypeLibLoadFailed = 5152, DeprecatedPerfCounterElement = 5153, RequiredAttributeForWindowsXP = 5154, - DuplicateDllRegistryEntry = 5156, - UnsupportedRegistryType = 5157, } } } -- cgit v1.2.3-55-g6feb From 242d5201cb75c686f4cb86e521ed0d8c025c563b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 23 May 2020 15:55:31 +1000 Subject: Update dependencies. --- nuget.config | 1 + src/be/packages.config | 6 +++--- src/be/utilbe.vcxproj | 12 ++++++------ src/ca/packages.config | 4 ++-- src/ca/utilca.vcxproj | 8 ++++---- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 1 - src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/nuget.config b/nuget.config index 80101d94..11f88400 100644 --- a/nuget.config +++ b/nuget.config @@ -4,6 +4,7 @@ + diff --git a/src/be/packages.config b/src/be/packages.config index ca23641f..af520a6d 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index e64d113e..2c447196 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -52,8 +52,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index 4e9403bf..59e81af5 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 45a7f278..a2391880 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -88,7 +88,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index b84e8b2d..c8ad24ad 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -158,7 +158,6 @@ namespace WixToolsetTest.Util "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", bundlePath }); diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index a6dedb6c..3124f615 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 64cc5122..e3688adf 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From 6fbe9b0b7e98e63daa89c1347e5388dec9fdc57f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 23 May 2020 15:55:58 +1000 Subject: WIXFEAT:2006,2580,2751 Add Inheritable attribute to PermissionEx. --- src/ca/secureobj.cpp | 25 ++++++++++++++++------ .../WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Tuples/SecureObjectsTuple.cs | 8 +++++++ src/wixext/UtilCompiler.cs | 13 +++++++++++ src/wixext/UtilTableDefinitions.cs | 1 + src/wixext/util.xsd | 5 +++++ 6 files changed, 47 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/ca/secureobj.cpp b/src/ca/secureobj.cpp index 392945d9..72842eb5 100644 --- a/src/ca/secureobj.cpp +++ b/src/ca/secureobj.cpp @@ -3,10 +3,10 @@ #include "precomp.h" // structs -LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `Wix4SecureObject`.`Wix4SecureObject`, `Wix4SecureObject`.`Table`, `Wix4SecureObject`.`Domain`, `Wix4SecureObject`.`User`, " +LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `Wix4SecureObject`.`Wix4SecureObject`, `Wix4SecureObject`.`Table`, `Wix4SecureObject`.`Domain`, `Wix4SecureObject`.`User`, `Wix4SecureObject`.`Attributes`, " L"`Wix4SecureObject`.`Permission`, `Wix4SecureObject`.`Component_`, `Component`.`Attributes` FROM `Wix4SecureObject`,`Component` WHERE " L"`Wix4SecureObject`.`Component_`=`Component`.`Component`"; -enum eQUERY_SECUREOBJECTS { QSO_SECUREOBJECT = 1, QSO_TABLE, QSO_DOMAIN, QSO_USER, QSO_PERMISSION, QSO_COMPONENT, QSO_COMPATTRIBUTES }; +enum eQUERY_SECUREOBJECTS { QSO_SECUREOBJECT = 1, QSO_TABLE, QSO_DOMAIN, QSO_USER, QSO_ATTRIBUTES, QSO_PERMISSION, QSO_COMPONENT, QSO_COMPATTRIBUTES }; LPCWSTR wzQUERY_REGISTRY = L"SELECT `Registry`.`Registry`, `Registry`.`Root`, `Registry`.`Key` FROM `Registry` WHERE `Registry`.`Registry`=?"; enum eQUERY_OBJECTCOMPONENT { QSOC_REGISTRY = 1, QSOC_REGROOT, QSOC_REGKEY }; @@ -16,6 +16,11 @@ enum eQUERY_SECURESERVICEINSTALL { QSSI_NAME = 1 }; enum eOBJECTTYPE { OT_UNKNOWN, OT_SERVICE, OT_FOLDER, OT_FILE, OT_REGISTRY }; +enum eSECURE_OBJECT_ATTRIBUTE +{ + SECURE_OBJECT_ATTRIBUTE_INHERITABLE = 0x1, +}; + static eOBJECTTYPE EObjectTypeFromString( __in LPCWSTR pwzTable ) @@ -335,6 +340,7 @@ extern "C" UINT __stdcall SchedSecureObjects( DWORD cObjects = 0; eOBJECTTYPE eType = OT_UNKNOWN; + DWORD dwAttributes = 0; // // initialize @@ -409,7 +415,6 @@ extern "C" UINT __stdcall SchedSecureObjects( // add the data to the CustomActionData hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzData); ExitOnFailure(hr, "failed to get name of object"); - hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); ExitOnFailure(hr, "failed to add data to CustomActionData"); @@ -423,6 +428,11 @@ extern "C" UINT __stdcall SchedSecureObjects( hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); ExitOnFailure(hr, "failed to add data to CustomActionData"); + hr = WcaGetRecordInteger(hRec, QSO_ATTRIBUTES, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to get attributes to configure object"); + hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + hr = WcaGetRecordString(hRec, QSO_PERMISSION, &pwzData); ExitOnFailure(hr, "failed to get permission to configure object"); hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); @@ -568,7 +578,7 @@ LExit: called as Type 1025 CustomAction (deferred binary DLL) NOTE: deferred CustomAction since it modifies the machine - NOTE: CustomActionData == wzObject\twzTable\twzDomain\twzUser\tdwPermissions\twzObject\t... + NOTE: CustomActionData == wzObject\twzTable\twzDomain\twzUser\tdwAttributes\tdwPermissions\t... ******************************************************************/ extern "C" UINT __stdcall ExecSecureObjects( __in MSIHANDLE hInstall @@ -586,6 +596,7 @@ extern "C" UINT __stdcall ExecSecureObjects( DWORD dwRevision = 0; LPWSTR pwzUser = NULL; DWORD dwPermissions = 0; + DWORD dwAttributes = 0; LPWSTR pwzAccount = NULL; PSID psid = NULL; @@ -626,8 +637,10 @@ extern "C" UINT __stdcall ExecSecureObjects( ExitOnFailure(hr, "failed to process CustomActionData"); hr = WcaReadStringFromCaData(&pwz, &pwzUser); ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to process CustomActionData"); hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwPermissions)); - ExitOnFailure(hr, "failed to processCustomActionData"); + ExitOnFailure(hr, "failed to process CustomActionData"); WcaLog(LOGMSG_VERBOSE, "Securing Object: %ls Type: %ls User: %ls", pwzObject, pwzTable, pwzUser); @@ -690,7 +703,7 @@ extern "C" UINT __stdcall ExecSecureObjects( // ea.grfAccessMode = SET_ACCESS; - if (0 == lstrcmpW(L"CreateFolder", pwzTable)) + if (dwAttributes & SECURE_OBJECT_ATTRIBUTE_INHERITABLE) { ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; } diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index c8ad24ad..fabef160 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -105,7 +105,7 @@ namespace WixToolsetTest.Util "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", - "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index 3602a5ea..95c24979 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -15,6 +15,7 @@ namespace WixToolset.Util new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Attributes), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Permission), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.ComponentRef), IntermediateFieldType.String), }, @@ -32,6 +33,7 @@ namespace WixToolset.Util.Tuples Table, Domain, User, + Attributes, Permission, ComponentRef, } @@ -72,6 +74,12 @@ namespace WixToolset.Util.Tuples set => this.Set((int)SecureObjectsTupleFields.User, value); } + public int Attributes + { + get => this.Fields[(int)SecureObjectsTupleFields.Attributes].AsNumber(); + set => this.Set((int)SecureObjectsTupleFields.Attributes, value); + } + public int? Permission { get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber(); diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 65ca406d..672c3f68 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -49,6 +49,11 @@ namespace WixToolset.Util TypeMask = 0xf, } + internal enum WixPermissionExAttributes + { + Inheritable = 0x01 + } + internal enum WixRemoveFolderExOn { Install = 1, @@ -2367,6 +2372,8 @@ namespace WixToolset.Util string domain = null; string[] specialPermissions = null; string user = null; + var inheritable = YesNoType.NotSet; + int attributes = 0; var permissionType = PermissionType.SecureObjects; @@ -2407,6 +2414,9 @@ namespace WixToolset.Util } domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; + case "Inheritable": + inheritable = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; case "User": user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; @@ -2444,6 +2454,8 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); } + attributes |= inheritable == YesNoType.No ? 0 : (int)WixPermissionExAttributes.Inheritable; // default to inheritable. + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); if (!this.Messaging.EncounteredError) @@ -2457,6 +2469,7 @@ namespace WixToolset.Util Table = tableName, Domain = domain, User = user, + Attributes = attributes, Permission = permission, ComponentRef = componentId, }); diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index 5e227a05..4dfeb4bd 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -164,6 +164,7 @@ namespace WixToolset.Util new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Table SecureObject should be securing"), new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.Text, description: "Domain half of user account to secure", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("User", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "User name half of user account to secure", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), }, diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd index a8c3d208..93cdd4ba 100644 --- a/src/wixext/util.xsd +++ b/src/wixext/util.xsd @@ -775,6 +775,11 @@ + + + Whether the permissions are inheritable. The default is "yes". + + -- cgit v1.2.3-55-g6feb From 27afde67e4bb9ad06f8722a83984a09236516f69 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 23 May 2020 21:52:37 +1000 Subject: Test more usages of PermissionEx. --- .../TestData/PermissionEx/PackageComponents.wxs | 13 ++++++++++++- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 12 +++++------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs index 22438a2b..4b4dd32e 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs @@ -4,10 +4,21 @@ - + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index fabef160..eb4588ec 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -96,16 +96,14 @@ namespace WixToolsetTest.Util var folder = TestData.Get(@"TestData\PermissionEx"); var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(BuildX64, "Binary", "CreateFolder", "CustomAction", "Wix4SecureObject"); + var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); Assert.Equal(new[] { - "Binary:Wix4UtilCA_X64\t[Binary data]", - "CreateFolder:INSTALLFOLDER\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "CustomAction:Wix4ExecSecureObjects_X64\t11265\tWix4UtilCA_X64\tExecSecureObjects\t", - "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", - "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", - "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", + "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:regO7jgNdgqG_TfURLgXPo2jRcxzx8\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } -- cgit v1.2.3-55-g6feb From 3aa4f95a7ac23567efbaebdae57007636e7f6058 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 25 May 2020 21:49:38 -0400 Subject: Support platform-specific CAs (including ARM64). --- appveyor.cmd | 3 + src/ca/XmlConfig.cpp | 19 +- src/ca/XmlFile.cpp | 23 +- src/ca/qtexecca.cpp | 4 + src/ca/scaperfexec.cpp | 6 +- src/ca/utilca.vcxproj | 26 +- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 64 +-- src/wixext/UtilCompiler.cs | 42 +- src/wixlib/UtilExtension.wxs | 93 ---- src/wixlib/UtilExtension_Platform.wxi | 516 ++++++++++++--------- src/wixlib/UtilExtension_arm.wxs | 8 + src/wixlib/UtilExtension_arm64.wxs | 8 + src/wixlib/util.wixproj | 40 ++ 13 files changed, 477 insertions(+), 375 deletions(-) create mode 100644 src/wixlib/UtilExtension_arm.wxs create mode 100644 src/wixlib/UtilExtension_arm64.wxs (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index 3493d585..0dc63d47 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -9,5 +9,8 @@ msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Uti msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj +msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj +dotnet test -c Release --no-build src\test\WixToolsetTest.Util + @popd @endlocal \ No newline at end of file diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp index 8c60979d..afd3dafb 100644 --- a/src/ca/XmlConfig.cpp +++ b/src/ca/XmlConfig.cpp @@ -588,8 +588,9 @@ extern "C" UINT __stdcall ExecXmlConfig( HRESULT hrOpenFailure = S_OK; UINT er = ERROR_SUCCESS; - BOOL fIsWow64Process = FALSE; +#ifndef _WIN64 BOOL fIsFSRedirectDisabled = FALSE; +#endif BOOL fPreserveDate = FALSE; LPWSTR pwzCustomActionData = NULL; @@ -635,10 +636,12 @@ extern "C" UINT __stdcall ExecXmlConfig( hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); ExitOnFailure(hr, "failed to process CustomActionData"); +#ifndef _WIN64 // Initialize the Wow64 API - store the result in fWow64APIPresent // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases WcaInitializeWow64(); - fIsWow64Process = WcaIsWow64Process(); + BOOL fIsWow64Process = WcaIsWow64Process(); +#endif if (xaOpenFile != xa && xaOpenFilex64 != xa) { @@ -657,6 +660,7 @@ extern "C" UINT __stdcall ExecXmlConfig( // Open the file ReleaseNullObject(pixd); +#ifndef _WIN64 if (xaOpenFilex64 == xa) { if (!fIsWow64Process) @@ -670,6 +674,7 @@ extern "C" UINT __stdcall ExecXmlConfig( fIsFSRedirectDisabled = TRUE; } +#endif hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); if (FAILED(hr)) @@ -945,15 +950,18 @@ extern "C" UINT __stdcall ExecXmlConfig( ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); } +#ifndef _WIN64 if (fIsFSRedirectDisabled) { fIsFSRedirectDisabled = FALSE; WcaRevertWow64FSRedirection(); } +#endif } } LExit: +#ifndef _WIN64 // Make sure we revert FS Redirection if necessary before exiting if (fIsFSRedirectDisabled) { @@ -961,6 +969,7 @@ LExit: WcaRevertWow64FSRedirection(); } WcaFinalizeWow64(); +#endif ReleaseStr(pwzCustomActionData); ReleaseStr(pwzData); @@ -1001,7 +1010,9 @@ extern "C" UINT __stdcall ExecXmlConfigRollback( UINT er = ERROR_SUCCESS; int iIs64Bit; +#ifndef _WIN64 BOOL fIs64Bit = FALSE; +#endif LPWSTR pwzCustomActionData = NULL; LPWSTR pwz = NULL; @@ -1035,6 +1046,7 @@ extern "C" UINT __stdcall ExecXmlConfigRollback( hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); ExitOnFailure(hr, "failed to read file contents from custom action data"); +#ifndef _WIN64 fIs64Bit = (BOOL)iIs64Bit; if (fIs64Bit) @@ -1055,6 +1067,7 @@ extern "C" UINT __stdcall ExecXmlConfigRollback( hr = WcaDisableWow64FSRedirection(); ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); } +#endif hr = FileGetTime(pwzFileName, NULL, NULL, &ft); ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); @@ -1082,11 +1095,13 @@ LExit: ReleaseFile(hFile); +#ifndef _WIN64 if (fIs64Bit) { WcaRevertWow64FSRedirection(); WcaFinalizeWow64(); } +#endif ReleaseMem(pbData); diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp index 95449126..71c9a390 100644 --- a/src/ca/XmlFile.cpp +++ b/src/ca/XmlFile.cpp @@ -464,9 +464,7 @@ LExit: ReleaseStr(pwzCurrentFile); ReleaseStr(pwzCustomActionData); - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); + return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); } @@ -483,7 +481,6 @@ extern "C" UINT __stdcall ExecXmlFile( HRESULT hrOpenFailure = S_OK; UINT er = ERROR_SUCCESS; - BOOL fIsWow64Process = FALSE; BOOL fIsFSRedirectDisabled = FALSE; BOOL fPreserveDate = FALSE; @@ -533,10 +530,12 @@ extern "C" UINT __stdcall ExecXmlFile( hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); ExitOnFailure(hr, "failed to process CustomActionData"); +#ifndef _WIN64 // Initialize the Wow64 API - store the result in fWow64APIPresent // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases WcaInitializeWow64(); - fIsWow64Process = WcaIsWow64Process(); + BOOL fIsWow64Process = WcaIsWow64Process(); +#endif if (xaOpenFile != xa && xaOpenFilex64 != xa) ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); @@ -558,6 +557,7 @@ extern "C" UINT __stdcall ExecXmlFile( if (xaOpenFilex64 == xa) { +#ifndef _WIN64 if (!fIsWow64Process) { hr = E_NOTIMPL; @@ -568,6 +568,7 @@ extern "C" UINT __stdcall ExecXmlFile( ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); fIsFSRedirectDisabled = TRUE; +#endif } hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); @@ -810,7 +811,9 @@ LExit: fIsFSRedirectDisabled = FALSE; WcaRevertWow64FSRedirection(); } +#ifndef _WIN64 WcaFinalizeWow64(); +#endif ReleaseStr(pwzCustomActionData); ReleaseStr(pwzData); @@ -829,9 +832,7 @@ LExit: XmlUninitialize(); - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); + return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); } @@ -882,6 +883,7 @@ extern "C" UINT __stdcall ExecXmlFileRollback( hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); ExitOnFailure(hr, "failed to read file contents from custom action data"); +#ifndef _WIN64 fIs64Bit = (BOOL)iIs64Bit; if (fIs64Bit) @@ -902,6 +904,7 @@ extern "C" UINT __stdcall ExecXmlFileRollback( hr = WcaDisableWow64FSRedirection(); ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); } +#endif // Always preserve the modified date on rollback hr = FileGetTime(pwzFileName, NULL, NULL, &ft); @@ -937,8 +940,6 @@ LExit: ReleaseMem(pbData); - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); + return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); } diff --git a/src/ca/qtexecca.cpp b/src/ca/qtexecca.cpp index 6acad0bb..ddcc812f 100644 --- a/src/ca/qtexecca.cpp +++ b/src/ca/qtexecca.cpp @@ -131,6 +131,7 @@ HRESULT ExecCommon64( HRESULT hr = S_OK; LPWSTR pwzCommand = NULL; DWORD dwTimeout = 0; +#ifndef _WIN64 BOOL fIsWow64Initialized = FALSE; BOOL fRedirected = FALSE; @@ -145,6 +146,7 @@ HRESULT ExecCommon64( hr = WcaDisableWow64FSRedirection(); ExitOnFailure(hr, "Failed to enable filesystem redirection."); fRedirected = TRUE; +#endif hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); ExitOnFailure(hr, "Failed to get Command Line"); @@ -157,6 +159,7 @@ HRESULT ExecCommon64( LExit: ReleaseStr(pwzCommand); +#ifndef _WIN64 if (fRedirected) { WcaRevertWow64FSRedirection(); @@ -166,6 +169,7 @@ LExit: { WcaFinalizeWow64(); } +#endif return hr; } diff --git a/src/ca/scaperfexec.cpp b/src/ca/scaperfexec.cpp index 04c0648a..c5425754 100644 --- a/src/ca/scaperfexec.cpp +++ b/src/ca/scaperfexec.cpp @@ -87,10 +87,10 @@ extern "C" UINT __stdcall RegisterPerfmon( HMODULE hMod = NULL; PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; - DWORD_PTR dwRet; + DWORD dwRet; LPWSTR pwzShortPath = NULL; - DWORD_PTR cchShortPath = MAX_PATH; - DWORD_PTR cchShortPathLength = 0; + DWORD cchShortPath = MAX_PATH; + DWORD cchShortPathLength = 0; LPWSTR pwzCommand = NULL; diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index a2391880..38d209b2 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -6,6 +6,30 @@ + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + X64 + + + Release + X64 + Debug Win32 @@ -20,7 +44,7 @@ {076018F7-19BD-423A-ABBF-229273DA08D8} DynamicLibrary utilca - v141 + v142 Unicode utilca.def WiX Toolset Util CustomAction diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index eb4588ec..75e0b14f 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -43,13 +43,13 @@ namespace WixToolsetTest.Util var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); Assert.Equal(new[] { - "Binary:Wix4UtilCA_X86\t[Binary data]", - "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", - "CustomAction:Wix4ConfigureSmbUninstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbUninstall\t", - "CustomAction:Wix4CreateSmb_X86\t11265\tWix4UtilCA_X86\tCreateSmb\t", - "CustomAction:Wix4CreateSmbRollback_X86\t11585\tWix4UtilCA_X86\tDropSmb\t", - "CustomAction:Wix4DropSmb_X86\t11265\tWix4UtilCA_X86\tDropSmb\t", - "CustomAction:Wix4DropSmbRollback_X86\t11585\tWix4UtilCA_X86\tCreateSmb\t", + "Binary:Wix4UtilCA_X64\t[Binary data]", + "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", + "CustomAction:Wix4ConfigureSmbUninstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbUninstall\t", + "CustomAction:Wix4CreateSmb_X64\t11265\tWix4UtilCA_X64\tCreateSmb\t", + "CustomAction:Wix4CreateSmbRollback_X64\t11585\tWix4UtilCA_X64\tDropSmb\t", + "CustomAction:Wix4DropSmb_X64\t11265\tWix4UtilCA_X64\tDropSmb\t", + "CustomAction:Wix4DropSmbRollback_X64\t11585\tWix4UtilCA_X64\tCreateSmb\t", "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", }, results.OrderBy(s => s).ToArray()); @@ -61,13 +61,13 @@ namespace WixToolsetTest.Util var folder = TestData.Get(@"TestData\CloseApplication"); var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4CloseApplication"); + var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); Assert.Equal(new[] { - "Binary:Wix4UtilCA_X86\t[Binary data]", - "CustomAction:Wix4CheckRebootRequired_X86\t65\tWix4UtilCA_X86\tWixCheckRebootRequired\t", - "CustomAction:Wix4CloseApplications_X86\t1\tWix4UtilCA_X86\tWixCloseApplications\t", - "CustomAction:Wix4CloseApplicationsDeferred_X86\t3073\tWix4UtilCA_X86\tWixCloseApplicationsDeferred\t", + "Binary:Wix4UtilCA_A64\t[Binary data]", + "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", + "CustomAction:Wix4CloseApplications_A64\t1\tWix4UtilCA_A64\tWixCloseApplications\t", + "CustomAction:Wix4CloseApplicationsDeferred_A64\t3073\tWix4UtilCA_A64\tWixCloseApplicationsDeferred\t", "Wix4CloseApplication:CloseMyApp\texplorer.exe\t\t\t3\t\tMYAPPISRUNNING\t\t", }, results.OrderBy(s => s).ToArray()); } @@ -81,10 +81,10 @@ namespace WixToolsetTest.Util var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); Assert.Equal(new[] { - "Binary:Wix4UtilCA_X86\t[Binary data]", - "CustomAction:Wix4CreateInternetShortcuts_X86\t3073\tWix4UtilCA_X86\tWixCreateInternetShortcuts\t", - "CustomAction:Wix4RollbackInternetShortcuts_X86\t3329\tWix4UtilCA_X86\tWixRollbackInternetShortcuts\t", - "CustomAction:Wix4SchedInternetShortcuts_X86\t1\tWix4UtilCA_X86\tWixSchedInternetShortcuts\t", + "Binary:Wix4UtilCA_X64\t[Binary data]", + "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", + "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64\tWixRollbackInternetShortcuts\t", + "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64\tWixSchedInternetShortcuts\t", "RemoveFile:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tvtpzs3bw.lnk|WiX Toolset.lnk\tINSTALLFOLDER\t2", "Wix4InternetShortcut:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tINSTALLFOLDER\tWiX Toolset.lnk\thttps://wixtoolset.org\t0\t\t0", }, results.OrderBy(s => s).ToArray()); @@ -113,19 +113,19 @@ namespace WixToolsetTest.Util var folder = TestData.Get(@"TestData\EventManifest"); var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); + var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); Assert.Equal(new[] { - "Binary:Wix4UtilCA_X86\t[Binary data]", - "CustomAction:Wix4ConfigureEventManifestRegister_X86\t1\tWix4UtilCA_X86\tConfigureEventManifestRegister\t", - "CustomAction:Wix4ConfigureEventManifestUnregister_X86\t1\tWix4UtilCA_X86\tConfigureEventManifestUnregister\t", - "CustomAction:Wix4ExecXmlFile_X86\t11265\tWix4UtilCA_X86\tExecXmlFile\t", - "CustomAction:Wix4ExecXmlFileRollback_X86\t11521\tWix4UtilCA_X86\tExecXmlFileRollback\t", - "CustomAction:Wix4RegisterEventManifest_X86\t3073\tWix4UtilCA_X86\tCAQuietExec\t", - "CustomAction:Wix4RollbackRegisterEventManifest_X86\t3393\tWix4UtilCA_X86\tCAQuietExec\t", - "CustomAction:Wix4RollbackUnregisterEventManifest_X86\t3329\tWix4UtilCA_X86\tCAQuietExec\t", - "CustomAction:Wix4SchedXmlFile_X86\t1\tWix4UtilCA_X86\tSchedXmlFile\t", - "CustomAction:Wix4UnregisterEventManifest_X86\t3137\tWix4UtilCA_X86\tCAQuietExec\t", + "Binary:Wix4UtilCA_A64\t[Binary data]", + "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", + "CustomAction:Wix4ConfigureEventManifestUnregister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestUnregister\t", + "CustomAction:Wix4ExecXmlFile_A64\t11265\tWix4UtilCA_A64\tExecXmlFile\t", + "CustomAction:Wix4ExecXmlFileRollback_A64\t11521\tWix4UtilCA_A64\tExecXmlFileRollback\t", + "CustomAction:Wix4RegisterEventManifest_A64\t3073\tWix4UtilCA_A64\tCAQuietExec\t", + "CustomAction:Wix4RollbackRegisterEventManifest_A64\t3393\tWix4UtilCA_A64\tCAQuietExec\t", + "CustomAction:Wix4RollbackUnregisterEventManifest_A64\t3329\tWix4UtilCA_A64\tCAQuietExec\t", + "CustomAction:Wix4SchedXmlFile_A64\t1\tWix4UtilCA_A64\tSchedXmlFile\t", + "CustomAction:Wix4UnregisterEventManifest_A64\t3137\tWix4UtilCA_A64\tCAQuietExec\t", "Wix4EventManifest:Manifest.dll\t[#Manifest.dll]", "Wix4XmlFile:Config_Manifest.dllMessageFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@messageFileName[\\]]\tmessageFileName\t[Manifest.dll]\t4100\tManifest.dll\t", "Wix4XmlFile:Config_Manifest.dllResourceFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@resourceFileName[\\]]\tresourceFileName\t[Manifest.dll]\t4100\tManifest.dll\t", @@ -203,5 +203,15 @@ namespace WixToolsetTest.Util var result = WixRunner.Execute(newArgs.ToArray()); result.AssertSuccess(); } + + private static void BuildARM64(string[] args) + { + var newArgs = args.ToList(); + newArgs.Add("-platform"); + newArgs.Add("arm64"); + + var result = WixRunner.Execute(newArgs.ToArray()); + result.AssertSuccess(); + } } } diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 672c3f68..273a03c7 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -875,7 +875,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); if (!this.Messaging.EncounteredError) { @@ -1181,8 +1181,8 @@ namespace WixToolset.Util } } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); if (!this.Messaging.EncounteredError) { @@ -1489,7 +1489,7 @@ namespace WixToolset.Util IconIndex = iconIndex, }); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); @@ -1677,8 +1677,8 @@ namespace WixToolset.Util this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } /// @@ -2156,8 +2156,8 @@ namespace WixToolset.Util }); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } @@ -2204,8 +2204,8 @@ namespace WixToolset.Util }); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } /// @@ -2248,7 +2248,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X64 | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); section.AddTuple(new WixFormatFilesTuple(sourceLineNumbers) { @@ -2348,8 +2348,8 @@ namespace WixToolset.Util } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); if (null != messageFile || null != parameterFile || null != resourceFile) { @@ -2460,7 +2460,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); section.AddTuple(new SecureObjectsTuple(sourceLineNumbers, id) @@ -2809,7 +2809,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); section.AddTuple(new WixRemoveFolderExTuple(sourceLineNumbers, id) { @@ -2885,7 +2885,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); section.AddTuple(new WixRestartResourceTuple(sourceLineNumbers, id) { @@ -2977,7 +2977,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); section.AddTuple(new ServiceConfigTuple(sourceLineNumbers) { @@ -3081,7 +3081,7 @@ namespace WixToolset.Util Attributes = attributes, }); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } } @@ -3285,7 +3285,7 @@ namespace WixToolset.Util if (null != componentId) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } if (!this.Messaging.EncounteredError) @@ -3669,7 +3669,7 @@ namespace WixToolset.Util } } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } /// @@ -3720,7 +3720,7 @@ namespace WixToolset.Util private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X86); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); } /// diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index 50828416..62d9e37a 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs @@ -63,62 +63,6 @@ - - - - - WIXFAILWHENDEFERRED=1 AND VersionNT > 400 - - - - - - - - - - - - - - - - - - - - - - - - NEWERVERSIONDETECTED AND VersionNT > 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -382,43 +326,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index 0d7fed09..c557e04b 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -3,221 +3,303 @@ - - - - - - - - - - - NOT REMOVE~="ALL" AND VersionNT > 400 - - - - - - - - - - VersionNT > 400 - - - - - - - - - - - - - - - - - - - - - - VersionNT > 400 - - - - - - - - - - - - - - - VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - - - - - VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - - - - - VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - - - VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - - - VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - NOT REMOVE~="ALL" AND VersionNT > 400 - - - - - - - - - - - - - - - - - - - - - - - - VersionNT > 400 - - - - - - - - - - - - VersionNT > 400 - - - - - - - - - - VersionNT > 400 - VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - - - - - - - - NOT REMOVE~="ALL" AND VersionNT > 400 - VersionNT > 400 - - - - - - - - - - - - - - - - + + + + + + + WIXFAILWHENDEFERRED=1 AND VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + + + NEWERVERSIONDETECTED AND VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NOT REMOVE~="ALL" AND VersionNT > 400 + + + + + + + + + + VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 + + + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + NOT REMOVE~="ALL" AND VersionNT > 400 + + + + + + + + + + + + + + + + + + + + + + + + VersionNT > 400 + + + + + + + + + + + + VersionNT > 400 + + + + + + + + + + VersionNT > 400 + VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + NOT REMOVE~="ALL" AND VersionNT > 400 + VersionNT > 400 + + + + + + + + + + + + + + + + diff --git a/src/wixlib/UtilExtension_arm.wxs b/src/wixlib/UtilExtension_arm.wxs new file mode 100644 index 00000000..c3ec27f7 --- /dev/null +++ b/src/wixlib/UtilExtension_arm.wxs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixlib/UtilExtension_arm64.wxs b/src/wixlib/UtilExtension_arm64.wxs new file mode 100644 index 00000000..1d552acf --- /dev/null +++ b/src/wixlib/UtilExtension_arm64.wxs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index e3688adf..720b184b 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -14,6 +14,8 @@ + + @@ -22,9 +24,26 @@ + + + + + x86 + + + x64 + + + arm + + + arm64 + + + utilbe @@ -33,18 +52,38 @@ utilca {076018F7-19BD-423A-ABBF-229273DA08D8} + Platform=ARM + + + utilca + {076018F7-19BD-423A-ABBF-229273DA08D8} + Platform=ARM64 + + + utilca + {076018F7-19BD-423A-ABBF-229273DA08D8} + Platform=x86 + + + utilca + {076018F7-19BD-423A-ABBF-229273DA08D8} + Platform=x64 + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -52,5 +91,6 @@ + -- cgit v1.2.3-55-g6feb From e6819014f41294ea2e465338a821014080e265d1 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 10 Jun 2020 19:13:44 -0700 Subject: Fix typo in CloseApps --- src/ca/CloseApps.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ca/CloseApps.cpp b/src/ca/CloseApps.cpp index 63be353c..d4256c43 100644 --- a/src/ca/CloseApps.cpp +++ b/src/ca/CloseApps.cpp @@ -333,7 +333,7 @@ extern "C" UINT __stdcall WixCloseApplications( dwTerminateExitCode = 0; hr = S_OK; } - ExitOnFailure(hr, "failed to get timeout from Wix4CloseApplication table"); + ExitOnFailure(hr, "failed to get terminate exit-code from Wix4CloseApplication table"); hr = WcaGetRecordInteger(hRec, QCA_TIMEOUT, reinterpret_cast(&dwTimeout)); if (S_FALSE == hr) -- cgit v1.2.3-55-g6feb From cc4ec6c316ca6c318e1605bc6a6315794830486d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 19:25:31 +1000 Subject: Update dependencies. Run tests before packing and don't build twice. --- appveyor.cmd | 4 +--- src/be/packages.config | 4 ++-- src/be/utilbe.vcxproj | 10 +++++----- src/ca/XmlFile.cpp | 4 +--- src/ca/packages.config | 4 ++-- src/ca/utilca.vcxproj | 8 ++++---- src/wixext/WixToolset.Util.wixext.csproj | 1 + src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 11 +++-------- 9 files changed, 20 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index 0dc63d47..eae4e787 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -6,11 +6,9 @@ nuget restore msbuild -p:Configuration=Release -t:Restore msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj +dotnet test -c Release --no-build src\test\WixToolsetTest.Util msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj -msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj -dotnet test -c Release --no-build src\test\WixToolsetTest.Util - @popd @endlocal \ No newline at end of file diff --git a/src/be/packages.config b/src/be/packages.config index af520a6d..e488c85c 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -1,6 +1,6 @@  - + - + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 2c447196..2680fe0f 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -1,9 +1,9 @@ - + - + Debug @@ -18,7 +18,7 @@ {630C1EE7-2517-4A8C-83E3-DA1150308B58} DynamicLibrary utilbe - v141 + v142 Unicode utilbe.def WiX Toolset Util BundleExtension @@ -52,8 +52,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp index 71c9a390..d7cb227e 100644 --- a/src/ca/XmlFile.cpp +++ b/src/ca/XmlFile.cpp @@ -599,9 +599,7 @@ extern "C" UINT __stdcall ExecXmlFile( } else { - hr = E_NOTIMPL; - ExitTrace(hr, "Error: current MSXML version does not support xpath query."); - ExitFunction(); + ExitOnFailure(hr = E_NOTIMPL, "Error: current MSXML version does not support xpath query."); } } diff --git a/src/ca/packages.config b/src/ca/packages.config index 59e81af5..e3dc0e43 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 38d209b2..695750f5 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -112,7 +112,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 240fbfb3..736a404b 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -9,6 +9,7 @@ WiX Toolset Util Extension true build + embedded diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 3124f615..f37af421 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 720b184b..be62632b 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - - + + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -78,18 +78,13 @@ - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb From b4427d968db5f1fdd5fa8a55814483208cdd7312 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 19:25:57 +1000 Subject: Add SourceLink to public projects. Add Nerdbank.GitVersioning to C++ projects. --- src/be/packages.config | 4 ++++ src/be/utilbe.vcxproj | 14 ++++++++++++++ src/ca/packages.config | 4 ++++ src/ca/utilca.vcxproj | 17 +++++++++++++++-- src/wixext/WixToolset.Util.wixext.csproj | 1 + 5 files changed, 38 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/be/packages.config b/src/be/packages.config index e488c85c..a96fa834 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -1,5 +1,9 @@  + + + + diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 2680fe0f..b60fcf9f 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -1,6 +1,9 @@ + + + @@ -48,10 +51,21 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + diff --git a/src/ca/packages.config b/src/ca/packages.config index e3dc0e43..a1d30df0 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -1,5 +1,9 @@  + + + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 695750f5..f353a4e4 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -2,6 +2,9 @@ + + + @@ -107,12 +110,22 @@ - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + - + \ No newline at end of file diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 736a404b..b35e06ec 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -19,6 +19,7 @@ + -- cgit v1.2.3-55-g6feb From 0b32106dc52b6d63c8c3aea093034bc1c379e1fc Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 19:59:24 +1000 Subject: Create symbols package. --- src/wixext/WixToolset.Util.wixext.csproj | 12 ++++++++++-- src/wixext/WixToolset.Util.wixext.nuspec | 29 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/wixext/WixToolset.Util.wixext.nuspec (limited to 'src') diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index b35e06ec..0b362643 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -7,9 +7,10 @@ WixToolset.Util WiX Toolset Utility Extension WiX Toolset Util Extension - true - build embedded + $(MSBuildThisFileName).nuspec + true + Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) @@ -31,4 +32,11 @@ + + + + $(OutputPath)..\ + $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) + + diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec new file mode 100644 index 00000000..fd27390f --- /dev/null +++ b/src/wixext/WixToolset.Util.wixext.nuspec @@ -0,0 +1,29 @@ + + + + $id$ + $version$ + $authors$ + $authors$ + MS-RL + https://github.com/wixtoolset/Util.wixext + false + $title$ + $description$ + $copyright$ + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb From 238d3caad2d0595c6276fdf7565d45466ce0fe72 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 26 Jun 2020 10:16:32 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Tuples/EventManifestTuple.cs | 34 +++--- src/wixext/Tuples/FileSharePermissionsTuple.cs | 40 +++---- src/wixext/Tuples/FileShareTuple.cs | 46 ++++---- src/wixext/Tuples/GroupTuple.cs | 40 +++---- src/wixext/Tuples/PerfmonManifestTuple.cs | 40 +++---- src/wixext/Tuples/PerfmonTuple.cs | 40 +++---- src/wixext/Tuples/PerformanceCategoryTuple.cs | 46 ++++---- src/wixext/Tuples/SecureObjectsTuple.cs | 64 +++++------ src/wixext/Tuples/ServiceConfigTuple.cs | 82 +++++++------- src/wixext/Tuples/UserGroupTuple.cs | 34 +++--- src/wixext/Tuples/UserTuple.cs | 52 ++++----- src/wixext/Tuples/UtilTupleDefinitions.cs | 94 ++++++++-------- src/wixext/Tuples/WixCloseApplicationTuple.cs | 70 ++++++------ src/wixext/Tuples/WixDetectSHA2SupportTuple.cs | 20 ++-- src/wixext/Tuples/WixFormatFilesTuple.cs | 34 +++--- src/wixext/Tuples/WixInternetShortcutTuple.cs | 64 +++++------ src/wixext/Tuples/WixRemoveFolderExTuple.cs | 40 +++---- src/wixext/Tuples/WixRestartResourceTuple.cs | 40 +++---- src/wixext/Tuples/WixTouchFileTuple.cs | 40 +++---- src/wixext/Tuples/XmlConfigTuple.cs | 70 ++++++------ src/wixext/Tuples/XmlFileTuple.cs | 64 +++++------ src/wixext/UtilCompiler.cs | 124 ++++++++++----------- src/wixext/UtilExtensionData.cs | 10 +- src/wixext/UtilTableDefinitions.cs | 76 ++++++------- src/wixext/WixToolset.Util.wixext.csproj | 8 +- 26 files changed, 637 insertions(+), 637 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 75e0b14f..9c83209b 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -7,7 +7,7 @@ namespace WixToolsetTest.Util using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Util; using Xunit; diff --git a/src/wixext/Tuples/EventManifestTuple.cs b/src/wixext/Tuples/EventManifestTuple.cs index 364604be..ccd3c899 100644 --- a/src/wixext/Tuples/EventManifestTuple.cs +++ b/src/wixext/Tuples/EventManifestTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition EventManifest = new IntermediateTupleDefinition( - UtilTupleDefinitionType.EventManifest.ToString(), + public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.EventManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(EventManifestTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(EventManifestTupleFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String), }, - typeof(EventManifestTuple)); + typeof(EventManifestSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum EventManifestTupleFields + public enum EventManifestSymbolFields { ComponentRef, File, } - public class EventManifestTuple : IntermediateTuple + public class EventManifestSymbol : IntermediateSymbol { - public EventManifestTuple() : base(UtilTupleDefinitions.EventManifest, null, null) + public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null) { } - public EventManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.EventManifest, sourceLineNumber, id) + public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id) { } - public IntermediateField this[EventManifestTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)EventManifestTupleFields.ComponentRef].AsString(); - set => this.Set((int)EventManifestTupleFields.ComponentRef, value); + get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)EventManifestSymbolFields.ComponentRef, value); } public string File { - get => this.Fields[(int)EventManifestTupleFields.File].AsString(); - set => this.Set((int)EventManifestTupleFields.File, value); + get => this.Fields[(int)EventManifestSymbolFields.File].AsString(); + set => this.Set((int)EventManifestSymbolFields.File, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/FileSharePermissionsTuple.cs b/src/wixext/Tuples/FileSharePermissionsTuple.cs index 1db01b98..3db92f22 100644 --- a/src/wixext/Tuples/FileSharePermissionsTuple.cs +++ b/src/wixext/Tuples/FileSharePermissionsTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition FileSharePermissions = new IntermediateTupleDefinition( - UtilTupleDefinitionType.FileSharePermissions.ToString(), + public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileSharePermissions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShareRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.Permissions), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number), }, - typeof(FileSharePermissionsTuple)); + typeof(FileSharePermissionsSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum FileSharePermissionsTupleFields + public enum FileSharePermissionsSymbolFields { FileShareRef, UserRef, Permissions, } - public class FileSharePermissionsTuple : IntermediateTuple + public class FileSharePermissionsSymbol : IntermediateSymbol { - public FileSharePermissionsTuple() : base(UtilTupleDefinitions.FileSharePermissions, null, null) + public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null) { } - public FileSharePermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileSharePermissions, sourceLineNumber, id) + public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id) { } - public IntermediateField this[FileSharePermissionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index]; public string FileShareRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.FileShareRef].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.FileShareRef, value); + get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value); } public string UserRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.UserRef].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.UserRef, value); + get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value); } public int Permissions { - get => this.Fields[(int)FileSharePermissionsTupleFields.Permissions].AsNumber(); - set => this.Set((int)FileSharePermissionsTupleFields.Permissions, value); + get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber(); + set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs index 6a04f6af..c956ff42 100644 --- a/src/wixext/Tuples/FileShareTuple.cs +++ b/src/wixext/Tuples/FileShareTuple.cs @@ -3,28 +3,28 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition FileShare = new IntermediateTupleDefinition( - UtilTupleDefinitionType.FileShare.ToString(), + public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileShare.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileShareTupleFields.ShareName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String), }, - typeof(FileShareTuple)); + typeof(FileShareSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum FileShareTupleFields + public enum FileShareSymbolFields { ShareName, ComponentRef, @@ -32,40 +32,40 @@ namespace WixToolset.Util.Tuples DirectoryRef, } - public class FileShareTuple : IntermediateTuple + public class FileShareSymbol : IntermediateSymbol { - public FileShareTuple() : base(UtilTupleDefinitions.FileShare, null, null) + public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null) { } - public FileShareTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileShare, sourceLineNumber, id) + public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id) { } - public IntermediateField this[FileShareTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index]; public string ShareName { - get => this.Fields[(int)FileShareTupleFields.ShareName].AsString(); - set => this.Set((int)FileShareTupleFields.ShareName, value); + get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString(); + set => this.Set((int)FileShareSymbolFields.ShareName, value); } public string ComponentRef { - get => this.Fields[(int)FileShareTupleFields.ComponentRef].AsString(); - set => this.Set((int)FileShareTupleFields.ComponentRef, value); + get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString(); + set => this.Set((int)FileShareSymbolFields.ComponentRef, value); } public string Description { - get => this.Fields[(int)FileShareTupleFields.Description].AsString(); - set => this.Set((int)FileShareTupleFields.Description, value); + get => this.Fields[(int)FileShareSymbolFields.Description].AsString(); + set => this.Set((int)FileShareSymbolFields.Description, value); } public string DirectoryRef { - get => this.Fields[(int)FileShareTupleFields.DirectoryRef].AsString(); - set => this.Set((int)FileShareTupleFields.DirectoryRef, value); + get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)FileShareSymbolFields.DirectoryRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs index 2b270103..b378db44 100644 --- a/src/wixext/Tuples/GroupTuple.cs +++ b/src/wixext/Tuples/GroupTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition Group = new IntermediateTupleDefinition( - UtilTupleDefinitionType.Group.ToString(), + public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Group.ToString(), new[] { - new IntermediateFieldDefinition(nameof(GroupTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String), }, - typeof(GroupTuple)); + typeof(GroupSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum GroupTupleFields + public enum GroupSymbolFields { ComponentRef, Name, Domain, } - public class GroupTuple : IntermediateTuple + public class GroupSymbol : IntermediateSymbol { - public GroupTuple() : base(UtilTupleDefinitions.Group, null, null) + public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null) { } - public GroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Group, sourceLineNumber, id) + public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id) { } - public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)GroupTupleFields.ComponentRef].AsString(); - set => this.Set((int)GroupTupleFields.ComponentRef, value); + get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString(); + set => this.Set((int)GroupSymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)GroupTupleFields.Name].AsString(); - set => this.Set((int)GroupTupleFields.Name, value); + get => this.Fields[(int)GroupSymbolFields.Name].AsString(); + set => this.Set((int)GroupSymbolFields.Name, value); } public string Domain { - get => this.Fields[(int)GroupTupleFields.Domain].AsString(); - set => this.Set((int)GroupTupleFields.Domain, value); + get => this.Fields[(int)GroupSymbolFields.Domain].AsString(); + set => this.Set((int)GroupSymbolFields.Domain, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonManifestTuple.cs b/src/wixext/Tuples/PerfmonManifestTuple.cs index 9520105a..03fef14e 100644 --- a/src/wixext/Tuples/PerfmonManifestTuple.cs +++ b/src/wixext/Tuples/PerfmonManifestTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition PerfmonManifest = new IntermediateTupleDefinition( - UtilTupleDefinitionType.PerfmonManifest.ToString(), + public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerfmonManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ResourceFileDirectory), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String), }, - typeof(PerfmonManifestTuple)); + typeof(PerfmonManifestSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum PerfmonManifestTupleFields + public enum PerfmonManifestSymbolFields { ComponentRef, File, ResourceFileDirectory, } - public class PerfmonManifestTuple : IntermediateTuple + public class PerfmonManifestSymbol : IntermediateSymbol { - public PerfmonManifestTuple() : base(UtilTupleDefinitions.PerfmonManifest, null, null) + public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null) { } - public PerfmonManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerfmonManifest, sourceLineNumber, id) + public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id) { } - public IntermediateField this[PerfmonManifestTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)PerfmonManifestTupleFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.ComponentRef, value); + get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value); } public string File { - get => this.Fields[(int)PerfmonManifestTupleFields.File].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.File, value); + get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.File, value); } public string ResourceFileDirectory { - get => this.Fields[(int)PerfmonManifestTupleFields.ResourceFileDirectory].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.ResourceFileDirectory, value); + get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonTuple.cs b/src/wixext/Tuples/PerfmonTuple.cs index 1fb6ef6b..6784ebd1 100644 --- a/src/wixext/Tuples/PerfmonTuple.cs +++ b/src/wixext/Tuples/PerfmonTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition Perfmon = new IntermediateTupleDefinition( - UtilTupleDefinitionType.Perfmon.ToString(), + public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Perfmon.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String), }, - typeof(PerfmonTuple)); + typeof(PerfmonSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum PerfmonTupleFields + public enum PerfmonSymbolFields { ComponentRef, File, Name, } - public class PerfmonTuple : IntermediateTuple + public class PerfmonSymbol : IntermediateSymbol { - public PerfmonTuple() : base(UtilTupleDefinitions.Perfmon, null, null) + public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null) { } - public PerfmonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Perfmon, sourceLineNumber, id) + public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id) { } - public IntermediateField this[PerfmonTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)PerfmonTupleFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonTupleFields.ComponentRef, value); + get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonSymbolFields.ComponentRef, value); } public string File { - get => this.Fields[(int)PerfmonTupleFields.File].AsString(); - set => this.Set((int)PerfmonTupleFields.File, value); + get => this.Fields[(int)PerfmonSymbolFields.File].AsString(); + set => this.Set((int)PerfmonSymbolFields.File, value); } public string Name { - get => this.Fields[(int)PerfmonTupleFields.Name].AsString(); - set => this.Set((int)PerfmonTupleFields.Name, value); + get => this.Fields[(int)PerfmonSymbolFields.Name].AsString(); + set => this.Set((int)PerfmonSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/PerformanceCategoryTuple.cs b/src/wixext/Tuples/PerformanceCategoryTuple.cs index 16705466..5ecf388c 100644 --- a/src/wixext/Tuples/PerformanceCategoryTuple.cs +++ b/src/wixext/Tuples/PerformanceCategoryTuple.cs @@ -3,28 +3,28 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition PerformanceCategory = new IntermediateTupleDefinition( - UtilTupleDefinitionType.PerformanceCategory.ToString(), + public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerformanceCategory.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.IniData), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ConstantData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String), }, - typeof(PerformanceCategoryTuple)); + typeof(PerformanceCategorySymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum PerformanceCategoryTupleFields + public enum PerformanceCategorySymbolFields { ComponentRef, Name, @@ -32,40 +32,40 @@ namespace WixToolset.Util.Tuples ConstantData, } - public class PerformanceCategoryTuple : IntermediateTuple + public class PerformanceCategorySymbol : IntermediateSymbol { - public PerformanceCategoryTuple() : base(UtilTupleDefinitions.PerformanceCategory, null, null) + public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null) { } - public PerformanceCategoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerformanceCategory, sourceLineNumber, id) + public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id) { } - public IntermediateField this[PerformanceCategoryTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)PerformanceCategoryTupleFields.ComponentRef].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.ComponentRef, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)PerformanceCategoryTupleFields.Name].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.Name, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.Name, value); } public string IniData { - get => this.Fields[(int)PerformanceCategoryTupleFields.IniData].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.IniData, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.IniData, value); } public string ConstantData { - get => this.Fields[(int)PerformanceCategoryTupleFields.ConstantData].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.ConstantData, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index 95c24979..b90df521 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition SecureObjects = new IntermediateTupleDefinition( - UtilTupleDefinitionType.SecureObjects.ToString(), + public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.SecureObjects.ToString(), new[] { - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Permission), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String), }, - typeof(SecureObjectsTuple)); + typeof(SecureObjectsSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum SecureObjectsTupleFields + public enum SecureObjectsSymbolFields { SecureObject, Table, @@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples ComponentRef, } - public class SecureObjectsTuple : IntermediateTuple + public class SecureObjectsSymbol : IntermediateSymbol { - public SecureObjectsTuple() : base(UtilTupleDefinitions.SecureObjects, null, null) + public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) { } - public SecureObjectsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.SecureObjects, sourceLineNumber, id) + public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id) { } - public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index]; public string SecureObject { - get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); - set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); + get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value); } public string Table { - get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); - set => this.Set((int)SecureObjectsTupleFields.Table, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Table, value); } public string Domain { - get => this.Fields[(int)SecureObjectsTupleFields.Domain].AsString(); - set => this.Set((int)SecureObjectsTupleFields.Domain, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Domain, value); } public string User { - get => this.Fields[(int)SecureObjectsTupleFields.User].AsString(); - set => this.Set((int)SecureObjectsTupleFields.User, value); + get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.User, value); } public int Attributes { - get => this.Fields[(int)SecureObjectsTupleFields.Attributes].AsNumber(); - set => this.Set((int)SecureObjectsTupleFields.Attributes, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Attributes, value); } public int? Permission { - get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber(); - set => this.Set((int)SecureObjectsTupleFields.Permission, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Permission, value); } public string ComponentRef { - get => this.Fields[(int)SecureObjectsTupleFields.ComponentRef].AsString(); - set => this.Set((int)SecureObjectsTupleFields.ComponentRef, value); + get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs index 714396bc..3a877f9b 100644 --- a/src/wixext/Tuples/ServiceConfigTuple.cs +++ b/src/wixext/Tuples/ServiceConfigTuple.cs @@ -3,34 +3,34 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition ServiceConfig = new IntermediateTupleDefinition( - UtilTupleDefinitionType.ServiceConfig.ToString(), + public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.ServiceConfig.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.NewService), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.FirstFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.SecondFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ThirdFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ResetPeriodInDays), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ProgramCommandLine), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RebootMessage), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String), }, - typeof(ServiceConfigTuple)); + typeof(ServiceConfigSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum ServiceConfigTupleFields + public enum ServiceConfigSymbolFields { ServiceName, ComponentRef, @@ -44,76 +44,76 @@ namespace WixToolset.Util.Tuples RebootMessage, } - public class ServiceConfigTuple : IntermediateTuple + public class ServiceConfigSymbol : IntermediateSymbol { - public ServiceConfigTuple() : base(UtilTupleDefinitions.ServiceConfig, null, null) + public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null) { } - public ServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.ServiceConfig, sourceLineNumber, id) + public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id) { } - public IntermediateField this[ServiceConfigTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index]; public string ServiceName { - get => this.Fields[(int)ServiceConfigTupleFields.ServiceName].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ServiceName, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value); } public string ComponentRef { - get => this.Fields[(int)ServiceConfigTupleFields.ComponentRef].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ComponentRef, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value); } public int NewService { - get => this.Fields[(int)ServiceConfigTupleFields.NewService].AsNumber(); - set => this.Set((int)ServiceConfigTupleFields.NewService, value); + get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber(); + set => this.Set((int)ServiceConfigSymbolFields.NewService, value); } public string FirstFailureActionType { - get => this.Fields[(int)ServiceConfigTupleFields.FirstFailureActionType].AsString(); - set => this.Set((int)ServiceConfigTupleFields.FirstFailureActionType, value); + get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value); } public string SecondFailureActionType { - get => this.Fields[(int)ServiceConfigTupleFields.SecondFailureActionType].AsString(); - set => this.Set((int)ServiceConfigTupleFields.SecondFailureActionType, value); + get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value); } public string ThirdFailureActionType { - get => this.Fields[(int)ServiceConfigTupleFields.ThirdFailureActionType].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value); } public int? ResetPeriodInDays { - get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber(); - set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value); } public int? RestartServiceDelayInSeconds { - get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber(); - set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value); + get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value); } public string ProgramCommandLine { - get => this.Fields[(int)ServiceConfigTupleFields.ProgramCommandLine].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ProgramCommandLine, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value); } public string RebootMessage { - get => this.Fields[(int)ServiceConfigTupleFields.RebootMessage].AsString(); - set => this.Set((int)ServiceConfigTupleFields.RebootMessage, value); + get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UserGroupTuple.cs b/src/wixext/Tuples/UserGroupTuple.cs index 30c5e9ff..c8f3998e 100644 --- a/src/wixext/Tuples/UserGroupTuple.cs +++ b/src/wixext/Tuples/UserGroupTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition UserGroup = new IntermediateTupleDefinition( - UtilTupleDefinitionType.UserGroup.ToString(), + public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.UserGroup.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.GroupRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String), }, - typeof(UserGroupTuple)); + typeof(UserGroupSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum UserGroupTupleFields + public enum UserGroupSymbolFields { UserRef, GroupRef, } - public class UserGroupTuple : IntermediateTuple + public class UserGroupSymbol : IntermediateSymbol { - public UserGroupTuple() : base(UtilTupleDefinitions.UserGroup, null, null) + public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null) { } - public UserGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.UserGroup, sourceLineNumber, id) + public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id) { } - public IntermediateField this[UserGroupTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index]; public string UserRef { - get => this.Fields[(int)UserGroupTupleFields.UserRef].AsString(); - set => this.Set((int)UserGroupTupleFields.UserRef, value); + get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.UserRef, value); } public string GroupRef { - get => this.Fields[(int)UserGroupTupleFields.GroupRef].AsString(); - set => this.Set((int)UserGroupTupleFields.GroupRef, value); + get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.GroupRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UserTuple.cs b/src/wixext/Tuples/UserTuple.cs index f11ed78b..5f00064b 100644 --- a/src/wixext/Tuples/UserTuple.cs +++ b/src/wixext/Tuples/UserTuple.cs @@ -3,29 +3,29 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition User = new IntermediateTupleDefinition( - UtilTupleDefinitionType.User.ToString(), + public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.User.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Password), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(UserTuple)); + typeof(UserSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum UserTupleFields + public enum UserSymbolFields { ComponentRef, Name, @@ -34,46 +34,46 @@ namespace WixToolset.Util.Tuples Attributes, } - public class UserTuple : IntermediateTuple + public class UserSymbol : IntermediateSymbol { - public UserTuple() : base(UtilTupleDefinitions.User, null, null) + public UserSymbol() : base(UtilSymbolDefinitions.User, null, null) { } - public UserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.User, sourceLineNumber, id) + public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id) { } - public IntermediateField this[UserTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)UserTupleFields.ComponentRef].AsString(); - set => this.Set((int)UserTupleFields.ComponentRef, value); + get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString(); + set => this.Set((int)UserSymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)UserTupleFields.Name].AsString(); - set => this.Set((int)UserTupleFields.Name, value); + get => this.Fields[(int)UserSymbolFields.Name].AsString(); + set => this.Set((int)UserSymbolFields.Name, value); } public string Domain { - get => this.Fields[(int)UserTupleFields.Domain].AsString(); - set => this.Set((int)UserTupleFields.Domain, value); + get => this.Fields[(int)UserSymbolFields.Domain].AsString(); + set => this.Set((int)UserSymbolFields.Domain, value); } public string Password { - get => this.Fields[(int)UserTupleFields.Password].AsString(); - set => this.Set((int)UserTupleFields.Password, value); + get => this.Fields[(int)UserSymbolFields.Password].AsString(); + set => this.Set((int)UserSymbolFields.Password, value); } public int Attributes { - get => this.Fields[(int)UserTupleFields.Attributes].AsNumber(); - set => this.Set((int)UserTupleFields.Attributes, value); + get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber(); + set => this.Set((int)UserSymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs index ece64502..ae9c4c81 100644 --- a/src/wixext/Tuples/UtilTupleDefinitions.cs +++ b/src/wixext/Tuples/UtilTupleDefinitions.cs @@ -6,7 +6,7 @@ namespace WixToolset.Util using WixToolset.Data; using WixToolset.Data.Burn; - public enum UtilTupleDefinitionType + public enum UtilSymbolDefinitionType { EventManifest, FileShare, @@ -30,13 +30,13 @@ namespace WixToolset.Util XmlFile, } - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { public static readonly Version Version = new Version("4.0.0"); - public static IntermediateTupleDefinition ByName(string name) + public static IntermediateSymbolDefinition ByName(string name) { - if (!Enum.TryParse(name, out UtilTupleDefinitionType type)) + if (!Enum.TryParse(name, out UtilSymbolDefinitionType type)) { return null; } @@ -44,78 +44,78 @@ namespace WixToolset.Util return ByType(type); } - public static IntermediateTupleDefinition ByType(UtilTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type) { switch (type) { - case UtilTupleDefinitionType.EventManifest: - return UtilTupleDefinitions.EventManifest; + case UtilSymbolDefinitionType.EventManifest: + return UtilSymbolDefinitions.EventManifest; - case UtilTupleDefinitionType.FileShare: - return UtilTupleDefinitions.FileShare; + case UtilSymbolDefinitionType.FileShare: + return UtilSymbolDefinitions.FileShare; - case UtilTupleDefinitionType.FileSharePermissions: - return UtilTupleDefinitions.FileSharePermissions; + case UtilSymbolDefinitionType.FileSharePermissions: + return UtilSymbolDefinitions.FileSharePermissions; - case UtilTupleDefinitionType.Group: - return UtilTupleDefinitions.Group; + case UtilSymbolDefinitionType.Group: + return UtilSymbolDefinitions.Group; - case UtilTupleDefinitionType.Perfmon: - return UtilTupleDefinitions.Perfmon; + case UtilSymbolDefinitionType.Perfmon: + return UtilSymbolDefinitions.Perfmon; - case UtilTupleDefinitionType.PerfmonManifest: - return UtilTupleDefinitions.PerfmonManifest; + case UtilSymbolDefinitionType.PerfmonManifest: + return UtilSymbolDefinitions.PerfmonManifest; - case UtilTupleDefinitionType.PerformanceCategory: - return UtilTupleDefinitions.PerformanceCategory; + case UtilSymbolDefinitionType.PerformanceCategory: + return UtilSymbolDefinitions.PerformanceCategory; - case UtilTupleDefinitionType.SecureObjects: - return UtilTupleDefinitions.SecureObjects; + case UtilSymbolDefinitionType.SecureObjects: + return UtilSymbolDefinitions.SecureObjects; - case UtilTupleDefinitionType.ServiceConfig: - return UtilTupleDefinitions.ServiceConfig; + case UtilSymbolDefinitionType.ServiceConfig: + return UtilSymbolDefinitions.ServiceConfig; - case UtilTupleDefinitionType.User: - return UtilTupleDefinitions.User; + case UtilSymbolDefinitionType.User: + return UtilSymbolDefinitions.User; - case UtilTupleDefinitionType.UserGroup: - return UtilTupleDefinitions.UserGroup; + case UtilSymbolDefinitionType.UserGroup: + return UtilSymbolDefinitions.UserGroup; - case UtilTupleDefinitionType.WixCloseApplication: - return UtilTupleDefinitions.WixCloseApplication; + case UtilSymbolDefinitionType.WixCloseApplication: + return UtilSymbolDefinitions.WixCloseApplication; - case UtilTupleDefinitionType.WixDetectSHA2Support: - return UtilTupleDefinitions.WixDetectSHA2Support; + case UtilSymbolDefinitionType.WixDetectSHA2Support: + return UtilSymbolDefinitions.WixDetectSHA2Support; - case UtilTupleDefinitionType.WixFormatFiles: - return UtilTupleDefinitions.WixFormatFiles; + case UtilSymbolDefinitionType.WixFormatFiles: + return UtilSymbolDefinitions.WixFormatFiles; - case UtilTupleDefinitionType.WixInternetShortcut: - return UtilTupleDefinitions.WixInternetShortcut; + case UtilSymbolDefinitionType.WixInternetShortcut: + return UtilSymbolDefinitions.WixInternetShortcut; - case UtilTupleDefinitionType.WixRemoveFolderEx: - return UtilTupleDefinitions.WixRemoveFolderEx; + case UtilSymbolDefinitionType.WixRemoveFolderEx: + return UtilSymbolDefinitions.WixRemoveFolderEx; - case UtilTupleDefinitionType.WixRestartResource: - return UtilTupleDefinitions.WixRestartResource; + case UtilSymbolDefinitionType.WixRestartResource: + return UtilSymbolDefinitions.WixRestartResource; - case UtilTupleDefinitionType.WixTouchFile: - return UtilTupleDefinitions.WixTouchFile; + case UtilSymbolDefinitionType.WixTouchFile: + return UtilSymbolDefinitions.WixTouchFile; - case UtilTupleDefinitionType.XmlConfig: - return UtilTupleDefinitions.XmlConfig; + case UtilSymbolDefinitionType.XmlConfig: + return UtilSymbolDefinitions.XmlConfig; - case UtilTupleDefinitionType.XmlFile: - return UtilTupleDefinitions.XmlFile; + case UtilSymbolDefinitionType.XmlFile: + return UtilSymbolDefinitions.XmlFile; default: throw new ArgumentOutOfRangeException(nameof(type)); } } - static UtilTupleDefinitions() + static UtilSymbolDefinitions() { - WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag); + WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); } } } diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs index 2deebbae..0738e3e4 100644 --- a/src/wixext/Tuples/WixCloseApplicationTuple.cs +++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs @@ -3,32 +3,32 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixCloseApplication = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixCloseApplication.ToString(), + public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixCloseApplication.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Sequence), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.TerminateExitCode), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Timeout), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number), }, - typeof(WixCloseApplicationTuple)); + typeof(WixCloseApplicationSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixCloseApplicationTupleFields + public enum WixCloseApplicationSymbolFields { Target, Description, @@ -40,64 +40,64 @@ namespace WixToolset.Util.Tuples Timeout, } - public class WixCloseApplicationTuple : IntermediateTuple + public class WixCloseApplicationSymbol : IntermediateSymbol { - public WixCloseApplicationTuple() : base(UtilTupleDefinitions.WixCloseApplication, null, null) + public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null) { } - public WixCloseApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixCloseApplication, sourceLineNumber, id) + public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id) { } - public IntermediateField this[WixCloseApplicationTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index]; public string Target { - get => this.Fields[(int)WixCloseApplicationTupleFields.Target].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Target, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Target, value); } public string Description { - get => this.Fields[(int)WixCloseApplicationTupleFields.Description].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Description, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Description, value); } public string Condition { - get => this.Fields[(int)WixCloseApplicationTupleFields.Condition].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Condition, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value); } public int Attributes { - get => this.Fields[(int)WixCloseApplicationTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value); } public int? Sequence { - get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value); } public string Property { - get => this.Fields[(int)WixCloseApplicationTupleFields.Property].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Property, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Property, value); } public int? TerminateExitCode { - get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value); } public int? Timeout { - get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs index 38b76ff2..b518ba3b 100644 --- a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs +++ b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixDetectSHA2Support = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixDetectSHA2Support.ToString(), + public static readonly IntermediateSymbolDefinition WixDetectSHA2Support = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixDetectSHA2Support.ToString(), new IntermediateFieldDefinition[0], - typeof(WixDetectSHA2SupportTuple)); + typeof(WixDetectSHA2SupportSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public class WixDetectSHA2SupportTuple : IntermediateTuple + public class WixDetectSHA2SupportSymbol : IntermediateSymbol { - public WixDetectSHA2SupportTuple() : base(UtilTupleDefinitions.WixDetectSHA2Support, null, null) + public WixDetectSHA2SupportSymbol() : base(UtilSymbolDefinitions.WixDetectSHA2Support, null, null) { } - public WixDetectSHA2SupportTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixDetectSHA2Support, sourceLineNumber, id) + public WixDetectSHA2SupportSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixDetectSHA2Support, sourceLineNumber, id) { } - public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; } } diff --git a/src/wixext/Tuples/WixFormatFilesTuple.cs b/src/wixext/Tuples/WixFormatFilesTuple.cs index 8e7db0c6..38a9b8ff 100644 --- a/src/wixext/Tuples/WixFormatFilesTuple.cs +++ b/src/wixext/Tuples/WixFormatFilesTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixFormatFiles = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixFormatFiles.ToString(), + public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixFormatFiles.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.BinaryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.FileRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String), }, - typeof(WixFormatFilesTuple)); + typeof(WixFormatFilesSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixFormatFilesTupleFields + public enum WixFormatFilesSymbolFields { BinaryRef, FileRef, } - public class WixFormatFilesTuple : IntermediateTuple + public class WixFormatFilesSymbol : IntermediateSymbol { - public WixFormatFilesTuple() : base(UtilTupleDefinitions.WixFormatFiles, null, null) + public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null) { } - public WixFormatFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixFormatFiles, sourceLineNumber, id) + public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id) { } - public IntermediateField this[WixFormatFilesTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index]; public string BinaryRef { - get => this.Fields[(int)WixFormatFilesTupleFields.BinaryRef].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.BinaryRef, value); + get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value); } public string FileRef { - get => this.Fields[(int)WixFormatFilesTupleFields.FileRef].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.FileRef, value); + get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs index b0dff121..e8265e02 100644 --- a/src/wixext/Tuples/WixInternetShortcutTuple.cs +++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixInternetShortcut = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixInternetShortcut.ToString(), + public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixInternetShortcut.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.DirectoryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconIndex), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number), }, - typeof(WixInternetShortcutTuple)); + typeof(WixInternetShortcutSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixInternetShortcutTupleFields + public enum WixInternetShortcutSymbolFields { ComponentRef, DirectoryRef, @@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples IconIndex, } - public class WixInternetShortcutTuple : IntermediateTuple + public class WixInternetShortcutSymbol : IntermediateSymbol { - public WixInternetShortcutTuple() : base(UtilTupleDefinitions.WixInternetShortcut, null, null) + public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null) { } - public WixInternetShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixInternetShortcut, sourceLineNumber, id) + public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id) { } - public IntermediateField this[WixInternetShortcutTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.ComponentRef, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value); } public string DirectoryRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.DirectoryRef].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.DirectoryRef, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value); } public string Name { - get => this.Fields[(int)WixInternetShortcutTupleFields.Name].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Name, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Name, value); } public string Target { - get => this.Fields[(int)WixInternetShortcutTupleFields.Target].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Target, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Target, value); } public int Attributes { - get => this.Fields[(int)WixInternetShortcutTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixInternetShortcutTupleFields.Attributes, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value); } public string IconFile { - get => this.Fields[(int)WixInternetShortcutTupleFields.IconFile].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value); } public int? IconIndex { - get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNullableNumber(); - set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixRemoveFolderExTuple.cs b/src/wixext/Tuples/WixRemoveFolderExTuple.cs index d43c59c3..0c50ab8e 100644 --- a/src/wixext/Tuples/WixRemoveFolderExTuple.cs +++ b/src/wixext/Tuples/WixRemoveFolderExTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixRemoveFolderEx = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixRemoveFolderEx.ToString(), + public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.InstallMode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), }, - typeof(WixRemoveFolderExTuple)); + typeof(WixRemoveFolderExSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixRemoveFolderExTupleFields + public enum WixRemoveFolderExSymbolFields { ComponentRef, Property, InstallMode, } - public class WixRemoveFolderExTuple : IntermediateTuple + public class WixRemoveFolderExSymbol : IntermediateSymbol { - public WixRemoveFolderExTuple() : base(UtilTupleDefinitions.WixRemoveFolderEx, null, null) + public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null) { } - public WixRemoveFolderExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRemoveFolderEx, sourceLineNumber, id) + public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id) { } - public IntermediateField this[WixRemoveFolderExTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixRemoveFolderExTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.ComponentRef, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value); } public string Property { - get => this.Fields[(int)WixRemoveFolderExTupleFields.Property].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.Property, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); } public int InstallMode { - get => this.Fields[(int)WixRemoveFolderExTupleFields.InstallMode].AsNumber(); - set => this.Set((int)WixRemoveFolderExTupleFields.InstallMode, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixRestartResourceTuple.cs b/src/wixext/Tuples/WixRestartResourceTuple.cs index 92091c3d..7f76f1b8 100644 --- a/src/wixext/Tuples/WixRestartResourceTuple.cs +++ b/src/wixext/Tuples/WixRestartResourceTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixRestartResource = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixRestartResource.ToString(), + public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRestartResource.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Resource), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(WixRestartResourceTuple)); + typeof(WixRestartResourceSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixRestartResourceTupleFields + public enum WixRestartResourceSymbolFields { ComponentRef, Resource, Attributes, } - public class WixRestartResourceTuple : IntermediateTuple + public class WixRestartResourceSymbol : IntermediateSymbol { - public WixRestartResourceTuple() : base(UtilTupleDefinitions.WixRestartResource, null, null) + public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) { } - public WixRestartResourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRestartResource, sourceLineNumber, id) + public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id) { } - public IntermediateField this[WixRestartResourceTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixRestartResourceTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.ComponentRef, value); + get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value); } public string Resource { - get => this.Fields[(int)WixRestartResourceTupleFields.Resource].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.Resource, value); + get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); } public int Attributes { - get => this.Fields[(int)WixRestartResourceTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixRestartResourceTupleFields.Attributes, value); + get => this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixRestartResourceSymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixTouchFileTuple.cs b/src/wixext/Tuples/WixTouchFileTuple.cs index 0a152dec..447c21ba 100644 --- a/src/wixext/Tuples/WixTouchFileTuple.cs +++ b/src/wixext/Tuples/WixTouchFileTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixTouchFile = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixTouchFile.ToString(), + public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixTouchFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Path), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(WixTouchFileTuple)); + typeof(WixTouchFileSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixTouchFileTupleFields + public enum WixTouchFileSymbolFields { ComponentRef, Path, Attributes, } - public class WixTouchFileTuple : IntermediateTuple + public class WixTouchFileSymbol : IntermediateSymbol { - public WixTouchFileTuple() : base(UtilTupleDefinitions.WixTouchFile, null, null) + public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null) { } - public WixTouchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixTouchFile, sourceLineNumber, id) + public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id) { } - public IntermediateField this[WixTouchFileTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixTouchFileTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixTouchFileTupleFields.ComponentRef, value); + get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value); } public string Path { - get => this.Fields[(int)WixTouchFileTupleFields.Path].AsString(); - set => this.Set((int)WixTouchFileTupleFields.Path, value); + get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.Path, value); } public int Attributes { - get => this.Fields[(int)WixTouchFileTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixTouchFileTupleFields.Attributes, value); + get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixTouchFileSymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs index 291a686c..ca1cf047 100644 --- a/src/wixext/Tuples/XmlConfigTuple.cs +++ b/src/wixext/Tuples/XmlConfigTuple.cs @@ -3,32 +3,32 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition XmlConfig = new IntermediateTupleDefinition( - UtilTupleDefinitionType.XmlConfig.ToString(), + public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlConfig.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.VerifyPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number), }, - typeof(XmlConfigTuple)); + typeof(XmlConfigSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum XmlConfigTupleFields + public enum XmlConfigSymbolFields { File, ElementPath, @@ -40,64 +40,64 @@ namespace WixToolset.Util.Tuples Sequence, } - public class XmlConfigTuple : IntermediateTuple + public class XmlConfigSymbol : IntermediateSymbol { - public XmlConfigTuple() : base(UtilTupleDefinitions.XmlConfig, null, null) + public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null) { } - public XmlConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlConfig, sourceLineNumber, id) + public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id) { } - public IntermediateField this[XmlConfigTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index]; public string File { - get => this.Fields[(int)XmlConfigTupleFields.File].AsString(); - set => this.Set((int)XmlConfigTupleFields.File, value); + get => this.Fields[(int)XmlConfigSymbolFields.File].AsString(); + set => this.Set((int)XmlConfigSymbolFields.File, value); } public string ElementPath { - get => this.Fields[(int)XmlConfigTupleFields.ElementPath].AsString(); - set => this.Set((int)XmlConfigTupleFields.ElementPath, value); + get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ElementPath, value); } public string VerifyPath { - get => this.Fields[(int)XmlConfigTupleFields.VerifyPath].AsString(); - set => this.Set((int)XmlConfigTupleFields.VerifyPath, value); + get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value); } public string Name { - get => this.Fields[(int)XmlConfigTupleFields.Name].AsString(); - set => this.Set((int)XmlConfigTupleFields.Name, value); + get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Name, value); } public string Value { - get => this.Fields[(int)XmlConfigTupleFields.Value].AsString(); - set => this.Set((int)XmlConfigTupleFields.Value, value); + get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Value, value); } public int Flags { - get => this.Fields[(int)XmlConfigTupleFields.Flags].AsNumber(); - set => this.Set((int)XmlConfigTupleFields.Flags, value); + get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlConfigSymbolFields.Flags, value); } public string ComponentRef { - get => this.Fields[(int)XmlConfigTupleFields.ComponentRef].AsString(); - set => this.Set((int)XmlConfigTupleFields.ComponentRef, value); + get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value); } public int? Sequence { - get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlConfigTupleFields.Sequence, value); + get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlConfigSymbolFields.Sequence, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs index e44979ca..7d5d991b 100644 --- a/src/wixext/Tuples/XmlFileTuple.cs +++ b/src/wixext/Tuples/XmlFileTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition XmlFile = new IntermediateTupleDefinition( - UtilTupleDefinitionType.XmlFile.ToString(), + public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number), }, - typeof(XmlFileTuple)); + typeof(XmlFileSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum XmlFileTupleFields + public enum XmlFileSymbolFields { File, ElementPath, @@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples Sequence, } - public class XmlFileTuple : IntermediateTuple + public class XmlFileSymbol : IntermediateSymbol { - public XmlFileTuple() : base(UtilTupleDefinitions.XmlFile, null, null) + public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null) { } - public XmlFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlFile, sourceLineNumber, id) + public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id) { } - public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index]; public string File { - get => this.Fields[(int)XmlFileTupleFields.File].AsString(); - set => this.Set((int)XmlFileTupleFields.File, value); + get => this.Fields[(int)XmlFileSymbolFields.File].AsString(); + set => this.Set((int)XmlFileSymbolFields.File, value); } public string ElementPath { - get => this.Fields[(int)XmlFileTupleFields.ElementPath].AsString(); - set => this.Set((int)XmlFileTupleFields.ElementPath, value); + get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlFileSymbolFields.ElementPath, value); } public string Name { - get => this.Fields[(int)XmlFileTupleFields.Name].AsString(); - set => this.Set((int)XmlFileTupleFields.Name, value); + get => this.Fields[(int)XmlFileSymbolFields.Name].AsString(); + set => this.Set((int)XmlFileSymbolFields.Name, value); } public string Value { - get => this.Fields[(int)XmlFileTupleFields.Value].AsString(); - set => this.Set((int)XmlFileTupleFields.Value, value); + get => this.Fields[(int)XmlFileSymbolFields.Value].AsString(); + set => this.Set((int)XmlFileSymbolFields.Value, value); } public int Flags { - get => this.Fields[(int)XmlFileTupleFields.Flags].AsNumber(); - set => this.Set((int)XmlFileTupleFields.Flags, value); + get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlFileSymbolFields.Flags, value); } public string ComponentRef { - get => this.Fields[(int)XmlFileTupleFields.ComponentRef].AsString(); - set => this.Set((int)XmlFileTupleFields.ComponentRef, value); + get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlFileSymbolFields.ComponentRef, value); } public int? Sequence { - get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlFileTupleFields.Sequence, value); + get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlFileSymbolFields.Sequence, value); } } } \ No newline at end of file diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 273a03c7..f7f37fab 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -11,10 +11,10 @@ namespace WixToolset.Util using System.Text.RegularExpressions; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; /// /// The compiler for the WiX Toolset Utility Extension. @@ -447,7 +447,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -465,7 +465,7 @@ namespace WixToolset.Util break; } - section.AddTuple(new WixComponentSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixComponentSearchSymbol(sourceLineNumbers, id) { Guid = guid, ProductCode = productCode, @@ -491,7 +491,7 @@ namespace WixToolset.Util { case "Id": refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixComponentSearch, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixComponentSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -549,11 +549,11 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId); if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixDetectSHA2SupportTuple(sourceLineNumbers, id)); + section.AddSymbol(new WixDetectSHA2SupportSymbol(sourceLineNumbers, id)); } } @@ -573,7 +573,7 @@ namespace WixToolset.Util { case "Id": var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.WixDetectSHA2Support, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixDetectSHA2Support, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -706,26 +706,26 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; - var id = this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + var id = this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); if (null != categoryMessageFile) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); } if (CompilerConstants.IntegerNotSet != categoryCount) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); } if (null != parameterMessageFile) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); } if (0 != typesSupported) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); } var componentKeyPath = this.CreateComponentKeyPath(); @@ -879,7 +879,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new WixCloseApplicationTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new WixCloseApplicationSymbol(sourceLineNumbers, id) { Target = target, Description = description, @@ -889,15 +889,15 @@ namespace WixToolset.Util }); if (CompilerConstants.IntegerNotSet != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } if (CompilerConstants.IntegerNotSet != terminateExitCode) { - tuple.TerminateExitCode = terminateExitCode; + symbol.TerminateExitCode = terminateExitCode; } if (CompilerConstants.IntegerNotSet != timeout) { - tuple.Timeout = timeout * 1000; // make the timeout milliseconds in the table. + symbol.Timeout = timeout * 1000; // make the timeout milliseconds in the table. } } } @@ -962,7 +962,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -994,7 +994,7 @@ namespace WixToolset.Util { case "Id": var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixSearch, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); @@ -1072,7 +1072,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -1100,7 +1100,7 @@ namespace WixToolset.Util /// private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) { - section.AddTuple(new WixFileSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixFileSearchSymbol(sourceLineNumbers, id) { Path = path, Attributes = attributes, @@ -1186,7 +1186,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new FileShareTuple(sourceLineNumbers, id) + section.AddSymbol(new FileShareSymbol(sourceLineNumbers, id) { ShareName = name, ComponentRef = componentId, @@ -1215,7 +1215,7 @@ namespace WixToolset.Util { case "User": user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.User, user); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.User, user); break; default: var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -1255,7 +1255,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new FileSharePermissionsTuple(sourceLineNumbers) + section.AddSymbol(new FileSharePermissionsSymbol(sourceLineNumbers) { FileShareRef = fileShareId.Id, UserRef = user, @@ -1311,7 +1311,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new GroupTuple(sourceLineNumbers, id) + section.AddSymbol(new GroupSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -1338,7 +1338,7 @@ namespace WixToolset.Util { case "Id": groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.Group, groupId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.Group, groupId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -1355,7 +1355,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new UserGroupTuple(sourceLineNumbers) + section.AddSymbol(new UserGroupSymbol(sourceLineNumbers) { UserRef = userId, GroupRef = groupId, @@ -1478,7 +1478,7 @@ namespace WixToolset.Util // add the appropriate extension based on type of shortcut name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); - section.AddTuple(new WixInternetShortcutTuple(sourceLineNumbers, shortcutId) + section.AddSymbol(new WixInternetShortcutSymbol(sourceLineNumbers, shortcutId) { ComponentRef = componentId, DirectoryRef = directoryId, @@ -1495,7 +1495,7 @@ namespace WixToolset.Util this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); // use built-in MSI functionality to remove the shortcuts rather than doing so via CA - section.AddTuple(new RemoveFileTuple(sourceLineNumbers, shortcutId) + section.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, shortcutId) { ComponentRef = componentId, DirProperty = directoryId, @@ -1653,7 +1653,7 @@ namespace WixToolset.Util sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); // Add the calculated INI and H strings to the PerformanceCategory table. - section.AddTuple(new PerformanceCategoryTuple(sourceLineNumbers, id) + section.AddSymbol(new PerformanceCategorySymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -1666,15 +1666,15 @@ namespace WixToolset.Util var linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); var performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); @@ -2148,7 +2148,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new PerfmonTuple(sourceLineNumbers) + section.AddSymbol(new PerfmonSymbol(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", @@ -2196,7 +2196,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new PerfmonManifestTuple(sourceLineNumbers) + section.AddSymbol(new PerfmonManifestSymbol(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", @@ -2250,13 +2250,13 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new WixFormatFilesTuple(sourceLineNumbers) + section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) { BinaryRef = binaryId, FileRef = fileId, }); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binaryId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryId); } } @@ -2303,7 +2303,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new EventManifestTuple(sourceLineNumbers) + section.AddSymbol(new EventManifestSymbol(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", @@ -2311,7 +2311,7 @@ namespace WixToolset.Util if (null != messageFile) { - section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", @@ -2323,7 +2323,7 @@ namespace WixToolset.Util } if (null != parameterFile) { - section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", @@ -2335,7 +2335,7 @@ namespace WixToolset.Util } if (null != resourceFile) { - section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", @@ -2463,7 +2463,7 @@ namespace WixToolset.Util this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); - section.AddTuple(new SecureObjectsTuple(sourceLineNumbers, id) + section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) { SecureObject = objectId, Table = tableName, @@ -2550,7 +2550,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -2577,7 +2577,7 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - section.AddTuple(new WixProductSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixProductSearchSymbol(sourceLineNumbers, id) { Guid = productCode ?? upgradeCode, Attributes = attributes, @@ -2720,11 +2720,11 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixRegistrySearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixRegistrySearchSymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -2811,7 +2811,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new WixRemoveFolderExTuple(sourceLineNumbers, id) + section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Property = property, @@ -2887,7 +2887,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new WixRestartResourceTuple(sourceLineNumbers, id) + section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Resource = resource, @@ -2979,7 +2979,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new ServiceConfigTuple(sourceLineNumbers) + section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) { ServiceName = serviceName, ComponentRef = componentId, @@ -3074,7 +3074,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixTouchFileTuple(sourceLineNumbers, id) + section.AddSymbol(new WixTouchFileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Path = path, @@ -3290,7 +3290,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new UserTuple(sourceLineNumbers, id) + section.AddSymbol(new UserSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -3424,7 +3424,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new XmlFileTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, id) { File = file, ElementPath = elementPath, @@ -3435,7 +3435,7 @@ namespace WixToolset.Util }); if (-1 != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } } @@ -3603,7 +3603,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On")); } - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.XmlConfig, elementId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId); } var innerText = this.ParseHelper.GetTrimmedInnerText(element); @@ -3653,7 +3653,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new XmlConfigTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id) { File = file, ElementPath = elementId ?? elementPath, @@ -3665,7 +3665,7 @@ namespace WixToolset.Util }); if (CompilerConstants.IntegerNotSet != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } } diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs index 55c9b046..d3ca3358 100644 --- a/src/wixext/UtilExtensionData.cs +++ b/src/wixext/UtilExtensionData.cs @@ -9,15 +9,15 @@ namespace WixToolset.Util { public override string DefaultCulture => "en-US"; - public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = UtilTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = UtilSymbolDefinitions.ByName(name); + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index 4dfeb4bd..ef5bfeec 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -8,7 +8,7 @@ namespace WixToolset.Util { public static readonly TableDefinition Wix4CloseApplication = new TableDefinition( "Wix4CloseApplication", - UtilTupleDefinitions.WixCloseApplication, + UtilSymbolDefinitions.WixCloseApplication, new[] { new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -21,12 +21,12 @@ namespace WixToolset.Util new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."), new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition( "Wix4RemoveFolderEx", - UtilTupleDefinitions.WixRemoveFolderEx, + UtilSymbolDefinitions.WixRemoveFolderEx, new[] { new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), @@ -34,12 +34,12 @@ namespace WixToolset.Util new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4RestartResource = new TableDefinition( "Wix4RestartResource", - UtilTupleDefinitions.WixRestartResource, + UtilSymbolDefinitions.WixRestartResource, new[] { new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column), @@ -47,12 +47,12 @@ namespace WixToolset.Util new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FileShare = new TableDefinition( "Wix4FileShare", - UtilTupleDefinitions.FileShare, + UtilSymbolDefinitions.FileShare, new[] { new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column), @@ -61,24 +61,24 @@ namespace WixToolset.Util new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"), new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition( "Wix4FileSharePermissions", - UtilTupleDefinitions.FileSharePermissions, + UtilSymbolDefinitions.FileSharePermissions, new[] { new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4Group = new TableDefinition( "Wix4Group", - UtilTupleDefinitions.Group, + UtilSymbolDefinitions.Group, new[] { new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -86,12 +86,12 @@ namespace WixToolset.Util new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition( "Wix4InternetShortcut", - UtilTupleDefinitions.WixInternetShortcut, + UtilSymbolDefinitions.WixInternetShortcut, new[] { new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -103,12 +103,12 @@ namespace WixToolset.Util new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"), new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition( "Wix4PerformanceCategory", - UtilTupleDefinitions.PerformanceCategory, + UtilSymbolDefinitions.PerformanceCategory, new[] { new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -117,47 +117,47 @@ namespace WixToolset.Util new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."), new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4Perfmon = new TableDefinition( "Wix4Perfmon", - UtilTupleDefinitions.Perfmon, + UtilSymbolDefinitions.Perfmon, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition( "Wix4PerfmonManifest", - UtilTupleDefinitions.PerfmonManifest, + UtilSymbolDefinitions.PerfmonManifest, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4EventManifest = new TableDefinition( "Wix4EventManifest", - UtilTupleDefinitions.EventManifest, + UtilSymbolDefinitions.EventManifest, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4SecureObject = new TableDefinition( "Wix4SecureObject", - UtilTupleDefinitions.SecureObjects, + UtilSymbolDefinitions.SecureObjects, new[] { new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column), @@ -168,12 +168,12 @@ namespace WixToolset.Util new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition( "Wix4ServiceConfig", - UtilTupleDefinitions.ServiceConfig, + UtilSymbolDefinitions.ServiceConfig, new[] { new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"), @@ -187,12 +187,12 @@ namespace WixToolset.Util new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."), new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4TouchFile = new TableDefinition( "Wix4TouchFile", - UtilTupleDefinitions.WixTouchFile, + UtilSymbolDefinitions.WixTouchFile, new[] { new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column), @@ -200,12 +200,12 @@ namespace WixToolset.Util new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4User = new TableDefinition( "Wix4User", - UtilTupleDefinitions.User, + UtilSymbolDefinitions.User, new[] { new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -215,23 +215,23 @@ namespace WixToolset.Util new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4UserGroup = new TableDefinition( "Wix4UserGroup", - UtilTupleDefinitions.UserGroup, + UtilSymbolDefinitions.UserGroup, new[] { new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4XmlFile = new TableDefinition( "Wix4XmlFile", - UtilTupleDefinitions.XmlFile, + UtilSymbolDefinitions.XmlFile, new[] { new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -243,12 +243,12 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4XmlConfig = new TableDefinition( "Wix4XmlConfig", - UtilTupleDefinitions.XmlConfig, + UtilSymbolDefinitions.XmlConfig, new[] { new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -261,18 +261,18 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FormatFile = new TableDefinition( "Wix4FormatFile", - UtilTupleDefinitions.WixFormatFiles, + UtilSymbolDefinitions.WixFormatFiles, new[] { new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition[] All = new[] diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 0b362643..acadce55 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -20,16 +20,16 @@ - - - + - + + + -- cgit v1.2.3-55-g6feb From 851a26c4af0b2da5c9cf22bc4be0ac3895cb11a8 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 26 Jun 2020 10:37:57 -0700 Subject: The Great Tuple to Symbol File Rename (tm) --- src/wixext/Symbols/EventManifestSymbol.cs | 55 +++++++++++ src/wixext/Symbols/FileSharePermissionsSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/FileShareSymbol.cs | 71 +++++++++++++ src/wixext/Symbols/GroupSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/PerfmonManifestSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/PerfmonSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/PerformanceCategorySymbol.cs | 71 +++++++++++++ src/wixext/Symbols/SecureObjectsSymbol.cs | 95 ++++++++++++++++++ src/wixext/Symbols/ServiceConfigSymbol.cs | 119 ++++++++++++++++++++++ src/wixext/Symbols/UserGroupSymbol.cs | 55 +++++++++++ src/wixext/Symbols/UserSymbol.cs | 79 +++++++++++++++ src/wixext/Symbols/UtilSymbolDefinitions.cs | 121 +++++++++++++++++++++++ src/wixext/Symbols/WixCloseApplicationSymbol.cs | 103 +++++++++++++++++++ src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs | 33 +++++++ src/wixext/Symbols/WixFormatFilesSymbol.cs | 55 +++++++++++ src/wixext/Symbols/WixInternetShortcutSymbol.cs | 95 ++++++++++++++++++ src/wixext/Symbols/WixRemoveFolderExSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/WixRestartResourceSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/WixTouchFileSymbol.cs | 63 ++++++++++++ src/wixext/Symbols/XmlConfigSymbol.cs | 103 +++++++++++++++++++ src/wixext/Symbols/XmlFileSymbol.cs | 95 ++++++++++++++++++ src/wixext/Tuples/EventManifestTuple.cs | 55 ----------- src/wixext/Tuples/FileSharePermissionsTuple.cs | 63 ------------ src/wixext/Tuples/FileShareTuple.cs | 71 ------------- src/wixext/Tuples/GroupTuple.cs | 63 ------------ src/wixext/Tuples/PerfmonManifestTuple.cs | 63 ------------ src/wixext/Tuples/PerfmonTuple.cs | 63 ------------ src/wixext/Tuples/PerformanceCategoryTuple.cs | 71 ------------- src/wixext/Tuples/SecureObjectsTuple.cs | 95 ------------------ src/wixext/Tuples/ServiceConfigTuple.cs | 119 ---------------------- src/wixext/Tuples/UserGroupTuple.cs | 55 ----------- src/wixext/Tuples/UserTuple.cs | 79 --------------- src/wixext/Tuples/UtilTupleDefinitions.cs | 121 ----------------------- src/wixext/Tuples/WixCloseApplicationTuple.cs | 103 ------------------- src/wixext/Tuples/WixDetectSHA2SupportTuple.cs | 33 ------- src/wixext/Tuples/WixFormatFilesTuple.cs | 55 ----------- src/wixext/Tuples/WixInternetShortcutTuple.cs | 95 ------------------ src/wixext/Tuples/WixRemoveFolderExTuple.cs | 63 ------------ src/wixext/Tuples/WixRestartResourceTuple.cs | 63 ------------ src/wixext/Tuples/WixTouchFileTuple.cs | 63 ------------ src/wixext/Tuples/XmlConfigTuple.cs | 103 ------------------- src/wixext/Tuples/XmlFileTuple.cs | 95 ------------------ 42 files changed, 1591 insertions(+), 1591 deletions(-) create mode 100644 src/wixext/Symbols/EventManifestSymbol.cs create mode 100644 src/wixext/Symbols/FileSharePermissionsSymbol.cs create mode 100644 src/wixext/Symbols/FileShareSymbol.cs create mode 100644 src/wixext/Symbols/GroupSymbol.cs create mode 100644 src/wixext/Symbols/PerfmonManifestSymbol.cs create mode 100644 src/wixext/Symbols/PerfmonSymbol.cs create mode 100644 src/wixext/Symbols/PerformanceCategorySymbol.cs create mode 100644 src/wixext/Symbols/SecureObjectsSymbol.cs create mode 100644 src/wixext/Symbols/ServiceConfigSymbol.cs create mode 100644 src/wixext/Symbols/UserGroupSymbol.cs create mode 100644 src/wixext/Symbols/UserSymbol.cs create mode 100644 src/wixext/Symbols/UtilSymbolDefinitions.cs create mode 100644 src/wixext/Symbols/WixCloseApplicationSymbol.cs create mode 100644 src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs create mode 100644 src/wixext/Symbols/WixFormatFilesSymbol.cs create mode 100644 src/wixext/Symbols/WixInternetShortcutSymbol.cs create mode 100644 src/wixext/Symbols/WixRemoveFolderExSymbol.cs create mode 100644 src/wixext/Symbols/WixRestartResourceSymbol.cs create mode 100644 src/wixext/Symbols/WixTouchFileSymbol.cs create mode 100644 src/wixext/Symbols/XmlConfigSymbol.cs create mode 100644 src/wixext/Symbols/XmlFileSymbol.cs delete mode 100644 src/wixext/Tuples/EventManifestTuple.cs delete mode 100644 src/wixext/Tuples/FileSharePermissionsTuple.cs delete mode 100644 src/wixext/Tuples/FileShareTuple.cs delete mode 100644 src/wixext/Tuples/GroupTuple.cs delete mode 100644 src/wixext/Tuples/PerfmonManifestTuple.cs delete mode 100644 src/wixext/Tuples/PerfmonTuple.cs delete mode 100644 src/wixext/Tuples/PerformanceCategoryTuple.cs delete mode 100644 src/wixext/Tuples/SecureObjectsTuple.cs delete mode 100644 src/wixext/Tuples/ServiceConfigTuple.cs delete mode 100644 src/wixext/Tuples/UserGroupTuple.cs delete mode 100644 src/wixext/Tuples/UserTuple.cs delete mode 100644 src/wixext/Tuples/UtilTupleDefinitions.cs delete mode 100644 src/wixext/Tuples/WixCloseApplicationTuple.cs delete mode 100644 src/wixext/Tuples/WixDetectSHA2SupportTuple.cs delete mode 100644 src/wixext/Tuples/WixFormatFilesTuple.cs delete mode 100644 src/wixext/Tuples/WixInternetShortcutTuple.cs delete mode 100644 src/wixext/Tuples/WixRemoveFolderExTuple.cs delete mode 100644 src/wixext/Tuples/WixRestartResourceTuple.cs delete mode 100644 src/wixext/Tuples/WixTouchFileTuple.cs delete mode 100644 src/wixext/Tuples/XmlConfigTuple.cs delete mode 100644 src/wixext/Tuples/XmlFileTuple.cs (limited to 'src') diff --git a/src/wixext/Symbols/EventManifestSymbol.cs b/src/wixext/Symbols/EventManifestSymbol.cs new file mode 100644 index 00000000..ccd3c899 --- /dev/null +++ b/src/wixext/Symbols/EventManifestSymbol.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.EventManifest.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String), + }, + typeof(EventManifestSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum EventManifestSymbolFields + { + ComponentRef, + File, + } + + public class EventManifestSymbol : IntermediateSymbol + { + public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null) + { + } + + public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id) + { + } + + public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)EventManifestSymbolFields.ComponentRef, value); + } + + public string File + { + get => this.Fields[(int)EventManifestSymbolFields.File].AsString(); + set => this.Set((int)EventManifestSymbolFields.File, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/FileSharePermissionsSymbol.cs b/src/wixext/Symbols/FileSharePermissionsSymbol.cs new file mode 100644 index 00000000..3db92f22 --- /dev/null +++ b/src/wixext/Symbols/FileSharePermissionsSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileSharePermissions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number), + }, + typeof(FileSharePermissionsSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum FileSharePermissionsSymbolFields + { + FileShareRef, + UserRef, + Permissions, + } + + public class FileSharePermissionsSymbol : IntermediateSymbol + { + public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null) + { + } + + public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id) + { + } + + public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index]; + + public string FileShareRef + { + get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value); + } + + public string UserRef + { + get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value); + } + + public int Permissions + { + get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber(); + set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/FileShareSymbol.cs b/src/wixext/Symbols/FileShareSymbol.cs new file mode 100644 index 00000000..c956ff42 --- /dev/null +++ b/src/wixext/Symbols/FileShareSymbol.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileShare.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String), + }, + typeof(FileShareSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum FileShareSymbolFields + { + ShareName, + ComponentRef, + Description, + DirectoryRef, + } + + public class FileShareSymbol : IntermediateSymbol + { + public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null) + { + } + + public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id) + { + } + + public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index]; + + public string ShareName + { + get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString(); + set => this.Set((int)FileShareSymbolFields.ShareName, value); + } + + public string ComponentRef + { + get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString(); + set => this.Set((int)FileShareSymbolFields.ComponentRef, value); + } + + public string Description + { + get => this.Fields[(int)FileShareSymbolFields.Description].AsString(); + set => this.Set((int)FileShareSymbolFields.Description, value); + } + + public string DirectoryRef + { + get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)FileShareSymbolFields.DirectoryRef, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/GroupSymbol.cs b/src/wixext/Symbols/GroupSymbol.cs new file mode 100644 index 00000000..b378db44 --- /dev/null +++ b/src/wixext/Symbols/GroupSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Group.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String), + }, + typeof(GroupSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum GroupSymbolFields + { + ComponentRef, + Name, + Domain, + } + + public class GroupSymbol : IntermediateSymbol + { + public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null) + { + } + + public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id) + { + } + + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString(); + set => this.Set((int)GroupSymbolFields.ComponentRef, value); + } + + public string Name + { + get => this.Fields[(int)GroupSymbolFields.Name].AsString(); + set => this.Set((int)GroupSymbolFields.Name, value); + } + + public string Domain + { + get => this.Fields[(int)GroupSymbolFields.Domain].AsString(); + set => this.Set((int)GroupSymbolFields.Domain, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/PerfmonManifestSymbol.cs b/src/wixext/Symbols/PerfmonManifestSymbol.cs new file mode 100644 index 00000000..03fef14e --- /dev/null +++ b/src/wixext/Symbols/PerfmonManifestSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerfmonManifest.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String), + }, + typeof(PerfmonManifestSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum PerfmonManifestSymbolFields + { + ComponentRef, + File, + ResourceFileDirectory, + } + + public class PerfmonManifestSymbol : IntermediateSymbol + { + public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null) + { + } + + public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id) + { + } + + public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value); + } + + public string File + { + get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.File, value); + } + + public string ResourceFileDirectory + { + get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/PerfmonSymbol.cs b/src/wixext/Symbols/PerfmonSymbol.cs new file mode 100644 index 00000000..6784ebd1 --- /dev/null +++ b/src/wixext/Symbols/PerfmonSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Perfmon.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String), + }, + typeof(PerfmonSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum PerfmonSymbolFields + { + ComponentRef, + File, + Name, + } + + public class PerfmonSymbol : IntermediateSymbol + { + public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null) + { + } + + public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id) + { + } + + public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonSymbolFields.ComponentRef, value); + } + + public string File + { + get => this.Fields[(int)PerfmonSymbolFields.File].AsString(); + set => this.Set((int)PerfmonSymbolFields.File, value); + } + + public string Name + { + get => this.Fields[(int)PerfmonSymbolFields.Name].AsString(); + set => this.Set((int)PerfmonSymbolFields.Name, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/PerformanceCategorySymbol.cs b/src/wixext/Symbols/PerformanceCategorySymbol.cs new file mode 100644 index 00000000..5ecf388c --- /dev/null +++ b/src/wixext/Symbols/PerformanceCategorySymbol.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerformanceCategory.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String), + }, + typeof(PerformanceCategorySymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum PerformanceCategorySymbolFields + { + ComponentRef, + Name, + IniData, + ConstantData, + } + + public class PerformanceCategorySymbol : IntermediateSymbol + { + public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null) + { + } + + public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id) + { + } + + public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value); + } + + public string Name + { + get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.Name, value); + } + + public string IniData + { + get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.IniData, value); + } + + public string ConstantData + { + get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/SecureObjectsSymbol.cs b/src/wixext/Symbols/SecureObjectsSymbol.cs new file mode 100644 index 00000000..b90df521 --- /dev/null +++ b/src/wixext/Symbols/SecureObjectsSymbol.cs @@ -0,0 +1,95 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.SecureObjects.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String), + }, + typeof(SecureObjectsSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum SecureObjectsSymbolFields + { + SecureObject, + Table, + Domain, + User, + Attributes, + Permission, + ComponentRef, + } + + public class SecureObjectsSymbol : IntermediateSymbol + { + public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) + { + } + + public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id) + { + } + + public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index]; + + public string SecureObject + { + get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value); + } + + public string Table + { + get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Table, value); + } + + public string Domain + { + get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Domain, value); + } + + public string User + { + get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.User, value); + } + + public int Attributes + { + get => this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Attributes, value); + } + + public int? Permission + { + get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Permission, value); + } + + public string ComponentRef + { + get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/ServiceConfigSymbol.cs b/src/wixext/Symbols/ServiceConfigSymbol.cs new file mode 100644 index 00000000..3a877f9b --- /dev/null +++ b/src/wixext/Symbols/ServiceConfigSymbol.cs @@ -0,0 +1,119 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.ServiceConfig.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String), + }, + typeof(ServiceConfigSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum ServiceConfigSymbolFields + { + ServiceName, + ComponentRef, + NewService, + FirstFailureActionType, + SecondFailureActionType, + ThirdFailureActionType, + ResetPeriodInDays, + RestartServiceDelayInSeconds, + ProgramCommandLine, + RebootMessage, + } + + public class ServiceConfigSymbol : IntermediateSymbol + { + public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null) + { + } + + public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id) + { + } + + public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index]; + + public string ServiceName + { + get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value); + } + + public string ComponentRef + { + get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value); + } + + public int NewService + { + get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber(); + set => this.Set((int)ServiceConfigSymbolFields.NewService, value); + } + + public string FirstFailureActionType + { + get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value); + } + + public string SecondFailureActionType + { + get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value); + } + + public string ThirdFailureActionType + { + get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value); + } + + public int? ResetPeriodInDays + { + get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value); + } + + public int? RestartServiceDelayInSeconds + { + get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value); + } + + public string ProgramCommandLine + { + get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value); + } + + public string RebootMessage + { + get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/UserGroupSymbol.cs b/src/wixext/Symbols/UserGroupSymbol.cs new file mode 100644 index 00000000..c8f3998e --- /dev/null +++ b/src/wixext/Symbols/UserGroupSymbol.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.UserGroup.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String), + }, + typeof(UserGroupSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum UserGroupSymbolFields + { + UserRef, + GroupRef, + } + + public class UserGroupSymbol : IntermediateSymbol + { + public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null) + { + } + + public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id) + { + } + + public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index]; + + public string UserRef + { + get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.UserRef, value); + } + + public string GroupRef + { + get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.GroupRef, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/UserSymbol.cs b/src/wixext/Symbols/UserSymbol.cs new file mode 100644 index 00000000..5f00064b --- /dev/null +++ b/src/wixext/Symbols/UserSymbol.cs @@ -0,0 +1,79 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.User.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number), + }, + typeof(UserSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum UserSymbolFields + { + ComponentRef, + Name, + Domain, + Password, + Attributes, + } + + public class UserSymbol : IntermediateSymbol + { + public UserSymbol() : base(UtilSymbolDefinitions.User, null, null) + { + } + + public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id) + { + } + + public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString(); + set => this.Set((int)UserSymbolFields.ComponentRef, value); + } + + public string Name + { + get => this.Fields[(int)UserSymbolFields.Name].AsString(); + set => this.Set((int)UserSymbolFields.Name, value); + } + + public string Domain + { + get => this.Fields[(int)UserSymbolFields.Domain].AsString(); + set => this.Set((int)UserSymbolFields.Domain, value); + } + + public string Password + { + get => this.Fields[(int)UserSymbolFields.Password].AsString(); + set => this.Set((int)UserSymbolFields.Password, value); + } + + public int Attributes + { + get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber(); + set => this.Set((int)UserSymbolFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/UtilSymbolDefinitions.cs b/src/wixext/Symbols/UtilSymbolDefinitions.cs new file mode 100644 index 00000000..ae9c4c81 --- /dev/null +++ b/src/wixext/Symbols/UtilSymbolDefinitions.cs @@ -0,0 +1,121 @@ +// 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.Util +{ + using System; + using WixToolset.Data; + using WixToolset.Data.Burn; + + public enum UtilSymbolDefinitionType + { + EventManifest, + FileShare, + FileSharePermissions, + Group, + Perfmon, + PerfmonManifest, + PerformanceCategory, + SecureObjects, + ServiceConfig, + User, + UserGroup, + WixCloseApplication, + WixDetectSHA2Support, + WixFormatFiles, + WixInternetShortcut, + WixRemoveFolderEx, + WixRestartResource, + WixTouchFile, + XmlConfig, + XmlFile, + } + + public static partial class UtilSymbolDefinitions + { + public static readonly Version Version = new Version("4.0.0"); + + public static IntermediateSymbolDefinition ByName(string name) + { + if (!Enum.TryParse(name, out UtilSymbolDefinitionType type)) + { + return null; + } + + return ByType(type); + } + + public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type) + { + switch (type) + { + case UtilSymbolDefinitionType.EventManifest: + return UtilSymbolDefinitions.EventManifest; + + case UtilSymbolDefinitionType.FileShare: + return UtilSymbolDefinitions.FileShare; + + case UtilSymbolDefinitionType.FileSharePermissions: + return UtilSymbolDefinitions.FileSharePermissions; + + case UtilSymbolDefinitionType.Group: + return UtilSymbolDefinitions.Group; + + case UtilSymbolDefinitionType.Perfmon: + return UtilSymbolDefinitions.Perfmon; + + case UtilSymbolDefinitionType.PerfmonManifest: + return UtilSymbolDefinitions.PerfmonManifest; + + case UtilSymbolDefinitionType.PerformanceCategory: + return UtilSymbolDefinitions.PerformanceCategory; + + case UtilSymbolDefinitionType.SecureObjects: + return UtilSymbolDefinitions.SecureObjects; + + case UtilSymbolDefinitionType.ServiceConfig: + return UtilSymbolDefinitions.ServiceConfig; + + case UtilSymbolDefinitionType.User: + return UtilSymbolDefinitions.User; + + case UtilSymbolDefinitionType.UserGroup: + return UtilSymbolDefinitions.UserGroup; + + case UtilSymbolDefinitionType.WixCloseApplication: + return UtilSymbolDefinitions.WixCloseApplication; + + case UtilSymbolDefinitionType.WixDetectSHA2Support: + return UtilSymbolDefinitions.WixDetectSHA2Support; + + case UtilSymbolDefinitionType.WixFormatFiles: + return UtilSymbolDefinitions.WixFormatFiles; + + case UtilSymbolDefinitionType.WixInternetShortcut: + return UtilSymbolDefinitions.WixInternetShortcut; + + case UtilSymbolDefinitionType.WixRemoveFolderEx: + return UtilSymbolDefinitions.WixRemoveFolderEx; + + case UtilSymbolDefinitionType.WixRestartResource: + return UtilSymbolDefinitions.WixRestartResource; + + case UtilSymbolDefinitionType.WixTouchFile: + return UtilSymbolDefinitions.WixTouchFile; + + case UtilSymbolDefinitionType.XmlConfig: + return UtilSymbolDefinitions.XmlConfig; + + case UtilSymbolDefinitionType.XmlFile: + return UtilSymbolDefinitions.XmlFile; + + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + } + + static UtilSymbolDefinitions() + { + WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); + } + } +} diff --git a/src/wixext/Symbols/WixCloseApplicationSymbol.cs b/src/wixext/Symbols/WixCloseApplicationSymbol.cs new file mode 100644 index 00000000..0738e3e4 --- /dev/null +++ b/src/wixext/Symbols/WixCloseApplicationSymbol.cs @@ -0,0 +1,103 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixCloseApplication.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number), + }, + typeof(WixCloseApplicationSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixCloseApplicationSymbolFields + { + Target, + Description, + Condition, + Attributes, + Sequence, + Property, + TerminateExitCode, + Timeout, + } + + public class WixCloseApplicationSymbol : IntermediateSymbol + { + public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null) + { + } + + public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id) + { + } + + public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index]; + + public string Target + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Target, value); + } + + public string Description + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Description, value); + } + + public string Condition + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value); + } + + public int Attributes + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value); + } + + public int? Sequence + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value); + } + + public string Property + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Property, value); + } + + public int? TerminateExitCode + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value); + } + + public int? Timeout + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs b/src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs new file mode 100644 index 00000000..b518ba3b --- /dev/null +++ b/src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs @@ -0,0 +1,33 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixDetectSHA2Support = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixDetectSHA2Support.ToString(), + new IntermediateFieldDefinition[0], + typeof(WixDetectSHA2SupportSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public class WixDetectSHA2SupportSymbol : IntermediateSymbol + { + public WixDetectSHA2SupportSymbol() : base(UtilSymbolDefinitions.WixDetectSHA2Support, null, null) + { + } + + public WixDetectSHA2SupportSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixDetectSHA2Support, sourceLineNumber, id) + { + } + + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; + } +} diff --git a/src/wixext/Symbols/WixFormatFilesSymbol.cs b/src/wixext/Symbols/WixFormatFilesSymbol.cs new file mode 100644 index 00000000..38a9b8ff --- /dev/null +++ b/src/wixext/Symbols/WixFormatFilesSymbol.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixFormatFiles.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String), + }, + typeof(WixFormatFilesSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixFormatFilesSymbolFields + { + BinaryRef, + FileRef, + } + + public class WixFormatFilesSymbol : IntermediateSymbol + { + public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null) + { + } + + public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id) + { + } + + public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index]; + + public string BinaryRef + { + get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value); + } + + public string FileRef + { + get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixInternetShortcutSymbol.cs b/src/wixext/Symbols/WixInternetShortcutSymbol.cs new file mode 100644 index 00000000..e8265e02 --- /dev/null +++ b/src/wixext/Symbols/WixInternetShortcutSymbol.cs @@ -0,0 +1,95 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixInternetShortcut.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number), + }, + typeof(WixInternetShortcutSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixInternetShortcutSymbolFields + { + ComponentRef, + DirectoryRef, + Name, + Target, + Attributes, + IconFile, + IconIndex, + } + + public class WixInternetShortcutSymbol : IntermediateSymbol + { + public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null) + { + } + + public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id) + { + } + + public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value); + } + + public string DirectoryRef + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value); + } + + public string Name + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Name, value); + } + + public string Target + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Target, value); + } + + public int Attributes + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value); + } + + public string IconFile + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value); + } + + public int? IconIndex + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs b/src/wixext/Symbols/WixRemoveFolderExSymbol.cs new file mode 100644 index 00000000..0c50ab8e --- /dev/null +++ b/src/wixext/Symbols/WixRemoveFolderExSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), + }, + typeof(WixRemoveFolderExSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixRemoveFolderExSymbolFields + { + ComponentRef, + Property, + InstallMode, + } + + public class WixRemoveFolderExSymbol : IntermediateSymbol + { + public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null) + { + } + + public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value); + } + + public string Property + { + get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); + } + + public int InstallMode + { + get => this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixRestartResourceSymbol.cs b/src/wixext/Symbols/WixRestartResourceSymbol.cs new file mode 100644 index 00000000..7f76f1b8 --- /dev/null +++ b/src/wixext/Symbols/WixRestartResourceSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRestartResource.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number), + }, + typeof(WixRestartResourceSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixRestartResourceSymbolFields + { + ComponentRef, + Resource, + Attributes, + } + + public class WixRestartResourceSymbol : IntermediateSymbol + { + public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) + { + } + + public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value); + } + + public string Resource + { + get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); + } + + public int Attributes + { + get => this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixRestartResourceSymbolFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixTouchFileSymbol.cs b/src/wixext/Symbols/WixTouchFileSymbol.cs new file mode 100644 index 00000000..447c21ba --- /dev/null +++ b/src/wixext/Symbols/WixTouchFileSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixTouchFile.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number), + }, + typeof(WixTouchFileSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixTouchFileSymbolFields + { + ComponentRef, + Path, + Attributes, + } + + public class WixTouchFileSymbol : IntermediateSymbol + { + public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null) + { + } + + public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id) + { + } + + public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value); + } + + public string Path + { + get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.Path, value); + } + + public int Attributes + { + get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixTouchFileSymbolFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/XmlConfigSymbol.cs b/src/wixext/Symbols/XmlConfigSymbol.cs new file mode 100644 index 00000000..ca1cf047 --- /dev/null +++ b/src/wixext/Symbols/XmlConfigSymbol.cs @@ -0,0 +1,103 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlConfig.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number), + }, + typeof(XmlConfigSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum XmlConfigSymbolFields + { + File, + ElementPath, + VerifyPath, + Name, + Value, + Flags, + ComponentRef, + Sequence, + } + + public class XmlConfigSymbol : IntermediateSymbol + { + public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null) + { + } + + public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id) + { + } + + public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index]; + + public string File + { + get => this.Fields[(int)XmlConfigSymbolFields.File].AsString(); + set => this.Set((int)XmlConfigSymbolFields.File, value); + } + + public string ElementPath + { + get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ElementPath, value); + } + + public string VerifyPath + { + get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value); + } + + public string Name + { + get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Name, value); + } + + public string Value + { + get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Value, value); + } + + public int Flags + { + get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlConfigSymbolFields.Flags, value); + } + + public string ComponentRef + { + get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value); + } + + public int? Sequence + { + get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlConfigSymbolFields.Sequence, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/XmlFileSymbol.cs b/src/wixext/Symbols/XmlFileSymbol.cs new file mode 100644 index 00000000..7d5d991b --- /dev/null +++ b/src/wixext/Symbols/XmlFileSymbol.cs @@ -0,0 +1,95 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlFile.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number), + }, + typeof(XmlFileSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum XmlFileSymbolFields + { + File, + ElementPath, + Name, + Value, + Flags, + ComponentRef, + Sequence, + } + + public class XmlFileSymbol : IntermediateSymbol + { + public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null) + { + } + + public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id) + { + } + + public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index]; + + public string File + { + get => this.Fields[(int)XmlFileSymbolFields.File].AsString(); + set => this.Set((int)XmlFileSymbolFields.File, value); + } + + public string ElementPath + { + get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlFileSymbolFields.ElementPath, value); + } + + public string Name + { + get => this.Fields[(int)XmlFileSymbolFields.Name].AsString(); + set => this.Set((int)XmlFileSymbolFields.Name, value); + } + + public string Value + { + get => this.Fields[(int)XmlFileSymbolFields.Value].AsString(); + set => this.Set((int)XmlFileSymbolFields.Value, value); + } + + public int Flags + { + get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlFileSymbolFields.Flags, value); + } + + public string ComponentRef + { + get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlFileSymbolFields.ComponentRef, value); + } + + public int? Sequence + { + get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlFileSymbolFields.Sequence, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/EventManifestTuple.cs b/src/wixext/Tuples/EventManifestTuple.cs deleted file mode 100644 index ccd3c899..00000000 --- a/src/wixext/Tuples/EventManifestTuple.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.EventManifest.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String), - }, - typeof(EventManifestSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum EventManifestSymbolFields - { - ComponentRef, - File, - } - - public class EventManifestSymbol : IntermediateSymbol - { - public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null) - { - } - - public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id) - { - } - - public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString(); - set => this.Set((int)EventManifestSymbolFields.ComponentRef, value); - } - - public string File - { - get => this.Fields[(int)EventManifestSymbolFields.File].AsString(); - set => this.Set((int)EventManifestSymbolFields.File, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/FileSharePermissionsTuple.cs b/src/wixext/Tuples/FileSharePermissionsTuple.cs deleted file mode 100644 index 3db92f22..00000000 --- a/src/wixext/Tuples/FileSharePermissionsTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.FileSharePermissions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number), - }, - typeof(FileSharePermissionsSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum FileSharePermissionsSymbolFields - { - FileShareRef, - UserRef, - Permissions, - } - - public class FileSharePermissionsSymbol : IntermediateSymbol - { - public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null) - { - } - - public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id) - { - } - - public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index]; - - public string FileShareRef - { - get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString(); - set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value); - } - - public string UserRef - { - get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString(); - set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value); - } - - public int Permissions - { - get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber(); - set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs deleted file mode 100644 index c956ff42..00000000 --- a/src/wixext/Tuples/FileShareTuple.cs +++ /dev/null @@ -1,71 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.FileShare.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String), - }, - typeof(FileShareSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum FileShareSymbolFields - { - ShareName, - ComponentRef, - Description, - DirectoryRef, - } - - public class FileShareSymbol : IntermediateSymbol - { - public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null) - { - } - - public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id) - { - } - - public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index]; - - public string ShareName - { - get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString(); - set => this.Set((int)FileShareSymbolFields.ShareName, value); - } - - public string ComponentRef - { - get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString(); - set => this.Set((int)FileShareSymbolFields.ComponentRef, value); - } - - public string Description - { - get => this.Fields[(int)FileShareSymbolFields.Description].AsString(); - set => this.Set((int)FileShareSymbolFields.Description, value); - } - - public string DirectoryRef - { - get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString(); - set => this.Set((int)FileShareSymbolFields.DirectoryRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs deleted file mode 100644 index b378db44..00000000 --- a/src/wixext/Tuples/GroupTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.Group.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String), - }, - typeof(GroupSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum GroupSymbolFields - { - ComponentRef, - Name, - Domain, - } - - public class GroupSymbol : IntermediateSymbol - { - public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null) - { - } - - public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id) - { - } - - public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString(); - set => this.Set((int)GroupSymbolFields.ComponentRef, value); - } - - public string Name - { - get => this.Fields[(int)GroupSymbolFields.Name].AsString(); - set => this.Set((int)GroupSymbolFields.Name, value); - } - - public string Domain - { - get => this.Fields[(int)GroupSymbolFields.Domain].AsString(); - set => this.Set((int)GroupSymbolFields.Domain, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonManifestTuple.cs b/src/wixext/Tuples/PerfmonManifestTuple.cs deleted file mode 100644 index 03fef14e..00000000 --- a/src/wixext/Tuples/PerfmonManifestTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.PerfmonManifest.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String), - }, - typeof(PerfmonManifestSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum PerfmonManifestSymbolFields - { - ComponentRef, - File, - ResourceFileDirectory, - } - - public class PerfmonManifestSymbol : IntermediateSymbol - { - public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null) - { - } - - public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id) - { - } - - public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value); - } - - public string File - { - get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString(); - set => this.Set((int)PerfmonManifestSymbolFields.File, value); - } - - public string ResourceFileDirectory - { - get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString(); - set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonTuple.cs b/src/wixext/Tuples/PerfmonTuple.cs deleted file mode 100644 index 6784ebd1..00000000 --- a/src/wixext/Tuples/PerfmonTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.Perfmon.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String), - }, - typeof(PerfmonSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum PerfmonSymbolFields - { - ComponentRef, - File, - Name, - } - - public class PerfmonSymbol : IntermediateSymbol - { - public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null) - { - } - - public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id) - { - } - - public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonSymbolFields.ComponentRef, value); - } - - public string File - { - get => this.Fields[(int)PerfmonSymbolFields.File].AsString(); - set => this.Set((int)PerfmonSymbolFields.File, value); - } - - public string Name - { - get => this.Fields[(int)PerfmonSymbolFields.Name].AsString(); - set => this.Set((int)PerfmonSymbolFields.Name, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/PerformanceCategoryTuple.cs b/src/wixext/Tuples/PerformanceCategoryTuple.cs deleted file mode 100644 index 5ecf388c..00000000 --- a/src/wixext/Tuples/PerformanceCategoryTuple.cs +++ /dev/null @@ -1,71 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.PerformanceCategory.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String), - }, - typeof(PerformanceCategorySymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum PerformanceCategorySymbolFields - { - ComponentRef, - Name, - IniData, - ConstantData, - } - - public class PerformanceCategorySymbol : IntermediateSymbol - { - public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null) - { - } - - public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id) - { - } - - public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value); - } - - public string Name - { - get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.Name, value); - } - - public string IniData - { - get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.IniData, value); - } - - public string ConstantData - { - get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs deleted file mode 100644 index b90df521..00000000 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ /dev/null @@ -1,95 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.SecureObjects.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String), - }, - typeof(SecureObjectsSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum SecureObjectsSymbolFields - { - SecureObject, - Table, - Domain, - User, - Attributes, - Permission, - ComponentRef, - } - - public class SecureObjectsSymbol : IntermediateSymbol - { - public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) - { - } - - public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id) - { - } - - public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index]; - - public string SecureObject - { - get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value); - } - - public string Table - { - get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.Table, value); - } - - public string Domain - { - get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.Domain, value); - } - - public string User - { - get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.User, value); - } - - public int Attributes - { - get => this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); - set => this.Set((int)SecureObjectsSymbolFields.Attributes, value); - } - - public int? Permission - { - get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber(); - set => this.Set((int)SecureObjectsSymbolFields.Permission, value); - } - - public string ComponentRef - { - get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs deleted file mode 100644 index 3a877f9b..00000000 --- a/src/wixext/Tuples/ServiceConfigTuple.cs +++ /dev/null @@ -1,119 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.ServiceConfig.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String), - }, - typeof(ServiceConfigSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum ServiceConfigSymbolFields - { - ServiceName, - ComponentRef, - NewService, - FirstFailureActionType, - SecondFailureActionType, - ThirdFailureActionType, - ResetPeriodInDays, - RestartServiceDelayInSeconds, - ProgramCommandLine, - RebootMessage, - } - - public class ServiceConfigSymbol : IntermediateSymbol - { - public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null) - { - } - - public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id) - { - } - - public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index]; - - public string ServiceName - { - get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value); - } - - public string ComponentRef - { - get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value); - } - - public int NewService - { - get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber(); - set => this.Set((int)ServiceConfigSymbolFields.NewService, value); - } - - public string FirstFailureActionType - { - get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value); - } - - public string SecondFailureActionType - { - get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value); - } - - public string ThirdFailureActionType - { - get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value); - } - - public int? ResetPeriodInDays - { - get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber(); - set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value); - } - - public int? RestartServiceDelayInSeconds - { - get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber(); - set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value); - } - - public string ProgramCommandLine - { - get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value); - } - - public string RebootMessage - { - get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/UserGroupTuple.cs b/src/wixext/Tuples/UserGroupTuple.cs deleted file mode 100644 index c8f3998e..00000000 --- a/src/wixext/Tuples/UserGroupTuple.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.UserGroup.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String), - }, - typeof(UserGroupSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum UserGroupSymbolFields - { - UserRef, - GroupRef, - } - - public class UserGroupSymbol : IntermediateSymbol - { - public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null) - { - } - - public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id) - { - } - - public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index]; - - public string UserRef - { - get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString(); - set => this.Set((int)UserGroupSymbolFields.UserRef, value); - } - - public string GroupRef - { - get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString(); - set => this.Set((int)UserGroupSymbolFields.GroupRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/UserTuple.cs b/src/wixext/Tuples/UserTuple.cs deleted file mode 100644 index 5f00064b..00000000 --- a/src/wixext/Tuples/UserTuple.cs +++ /dev/null @@ -1,79 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.User.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number), - }, - typeof(UserSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum UserSymbolFields - { - ComponentRef, - Name, - Domain, - Password, - Attributes, - } - - public class UserSymbol : IntermediateSymbol - { - public UserSymbol() : base(UtilSymbolDefinitions.User, null, null) - { - } - - public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id) - { - } - - public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString(); - set => this.Set((int)UserSymbolFields.ComponentRef, value); - } - - public string Name - { - get => this.Fields[(int)UserSymbolFields.Name].AsString(); - set => this.Set((int)UserSymbolFields.Name, value); - } - - public string Domain - { - get => this.Fields[(int)UserSymbolFields.Domain].AsString(); - set => this.Set((int)UserSymbolFields.Domain, value); - } - - public string Password - { - get => this.Fields[(int)UserSymbolFields.Password].AsString(); - set => this.Set((int)UserSymbolFields.Password, value); - } - - public int Attributes - { - get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber(); - set => this.Set((int)UserSymbolFields.Attributes, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs deleted file mode 100644 index ae9c4c81..00000000 --- a/src/wixext/Tuples/UtilTupleDefinitions.cs +++ /dev/null @@ -1,121 +0,0 @@ -// 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.Util -{ - using System; - using WixToolset.Data; - using WixToolset.Data.Burn; - - public enum UtilSymbolDefinitionType - { - EventManifest, - FileShare, - FileSharePermissions, - Group, - Perfmon, - PerfmonManifest, - PerformanceCategory, - SecureObjects, - ServiceConfig, - User, - UserGroup, - WixCloseApplication, - WixDetectSHA2Support, - WixFormatFiles, - WixInternetShortcut, - WixRemoveFolderEx, - WixRestartResource, - WixTouchFile, - XmlConfig, - XmlFile, - } - - public static partial class UtilSymbolDefinitions - { - public static readonly Version Version = new Version("4.0.0"); - - public static IntermediateSymbolDefinition ByName(string name) - { - if (!Enum.TryParse(name, out UtilSymbolDefinitionType type)) - { - return null; - } - - return ByType(type); - } - - public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type) - { - switch (type) - { - case UtilSymbolDefinitionType.EventManifest: - return UtilSymbolDefinitions.EventManifest; - - case UtilSymbolDefinitionType.FileShare: - return UtilSymbolDefinitions.FileShare; - - case UtilSymbolDefinitionType.FileSharePermissions: - return UtilSymbolDefinitions.FileSharePermissions; - - case UtilSymbolDefinitionType.Group: - return UtilSymbolDefinitions.Group; - - case UtilSymbolDefinitionType.Perfmon: - return UtilSymbolDefinitions.Perfmon; - - case UtilSymbolDefinitionType.PerfmonManifest: - return UtilSymbolDefinitions.PerfmonManifest; - - case UtilSymbolDefinitionType.PerformanceCategory: - return UtilSymbolDefinitions.PerformanceCategory; - - case UtilSymbolDefinitionType.SecureObjects: - return UtilSymbolDefinitions.SecureObjects; - - case UtilSymbolDefinitionType.ServiceConfig: - return UtilSymbolDefinitions.ServiceConfig; - - case UtilSymbolDefinitionType.User: - return UtilSymbolDefinitions.User; - - case UtilSymbolDefinitionType.UserGroup: - return UtilSymbolDefinitions.UserGroup; - - case UtilSymbolDefinitionType.WixCloseApplication: - return UtilSymbolDefinitions.WixCloseApplication; - - case UtilSymbolDefinitionType.WixDetectSHA2Support: - return UtilSymbolDefinitions.WixDetectSHA2Support; - - case UtilSymbolDefinitionType.WixFormatFiles: - return UtilSymbolDefinitions.WixFormatFiles; - - case UtilSymbolDefinitionType.WixInternetShortcut: - return UtilSymbolDefinitions.WixInternetShortcut; - - case UtilSymbolDefinitionType.WixRemoveFolderEx: - return UtilSymbolDefinitions.WixRemoveFolderEx; - - case UtilSymbolDefinitionType.WixRestartResource: - return UtilSymbolDefinitions.WixRestartResource; - - case UtilSymbolDefinitionType.WixTouchFile: - return UtilSymbolDefinitions.WixTouchFile; - - case UtilSymbolDefinitionType.XmlConfig: - return UtilSymbolDefinitions.XmlConfig; - - case UtilSymbolDefinitionType.XmlFile: - return UtilSymbolDefinitions.XmlFile; - - default: - throw new ArgumentOutOfRangeException(nameof(type)); - } - } - - static UtilSymbolDefinitions() - { - WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); - } - } -} diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs deleted file mode 100644 index 0738e3e4..00000000 --- a/src/wixext/Tuples/WixCloseApplicationTuple.cs +++ /dev/null @@ -1,103 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixCloseApplication.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number), - }, - typeof(WixCloseApplicationSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixCloseApplicationSymbolFields - { - Target, - Description, - Condition, - Attributes, - Sequence, - Property, - TerminateExitCode, - Timeout, - } - - public class WixCloseApplicationSymbol : IntermediateSymbol - { - public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null) - { - } - - public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id) - { - } - - public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index]; - - public string Target - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Target, value); - } - - public string Description - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Description, value); - } - - public string Condition - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value); - } - - public int Attributes - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value); - } - - public int? Sequence - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value); - } - - public string Property - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Property, value); - } - - public int? TerminateExitCode - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value); - } - - public int? Timeout - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs deleted file mode 100644 index b518ba3b..00000000 --- a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixDetectSHA2Support = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixDetectSHA2Support.ToString(), - new IntermediateFieldDefinition[0], - typeof(WixDetectSHA2SupportSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public class WixDetectSHA2SupportSymbol : IntermediateSymbol - { - public WixDetectSHA2SupportSymbol() : base(UtilSymbolDefinitions.WixDetectSHA2Support, null, null) - { - } - - public WixDetectSHA2SupportSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixDetectSHA2Support, sourceLineNumber, id) - { - } - - public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; - } -} diff --git a/src/wixext/Tuples/WixFormatFilesTuple.cs b/src/wixext/Tuples/WixFormatFilesTuple.cs deleted file mode 100644 index 38a9b8ff..00000000 --- a/src/wixext/Tuples/WixFormatFilesTuple.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixFormatFiles.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String), - }, - typeof(WixFormatFilesSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixFormatFilesSymbolFields - { - BinaryRef, - FileRef, - } - - public class WixFormatFilesSymbol : IntermediateSymbol - { - public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null) - { - } - - public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id) - { - } - - public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index]; - - public string BinaryRef - { - get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString(); - set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value); - } - - public string FileRef - { - get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString(); - set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs deleted file mode 100644 index e8265e02..00000000 --- a/src/wixext/Tuples/WixInternetShortcutTuple.cs +++ /dev/null @@ -1,95 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixInternetShortcut.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number), - }, - typeof(WixInternetShortcutSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixInternetShortcutSymbolFields - { - ComponentRef, - DirectoryRef, - Name, - Target, - Attributes, - IconFile, - IconIndex, - } - - public class WixInternetShortcutSymbol : IntermediateSymbol - { - public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null) - { - } - - public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id) - { - } - - public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value); - } - - public string DirectoryRef - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value); - } - - public string Name - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.Name, value); - } - - public string Target - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.Target, value); - } - - public int Attributes - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value); - } - - public string IconFile - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value); - } - - public int? IconIndex - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber(); - set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixRemoveFolderExTuple.cs b/src/wixext/Tuples/WixRemoveFolderExTuple.cs deleted file mode 100644 index 0c50ab8e..00000000 --- a/src/wixext/Tuples/WixRemoveFolderExTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), - }, - typeof(WixRemoveFolderExSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixRemoveFolderExSymbolFields - { - ComponentRef, - Property, - InstallMode, - } - - public class WixRemoveFolderExSymbol : IntermediateSymbol - { - public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null) - { - } - - public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id) - { - } - - public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value); - } - - public string Property - { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString(); - set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); - } - - public int InstallMode - { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); - set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixRestartResourceTuple.cs b/src/wixext/Tuples/WixRestartResourceTuple.cs deleted file mode 100644 index 7f76f1b8..00000000 --- a/src/wixext/Tuples/WixRestartResourceTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixRestartResource.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number), - }, - typeof(WixRestartResourceSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixRestartResourceSymbolFields - { - ComponentRef, - Resource, - Attributes, - } - - public class WixRestartResourceSymbol : IntermediateSymbol - { - public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) - { - } - - public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id) - { - } - - public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value); - } - - public string Resource - { - get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString(); - set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); - } - - public int Attributes - { - get => this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixRestartResourceSymbolFields.Attributes, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixTouchFileTuple.cs b/src/wixext/Tuples/WixTouchFileTuple.cs deleted file mode 100644 index 447c21ba..00000000 --- a/src/wixext/Tuples/WixTouchFileTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixTouchFile.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number), - }, - typeof(WixTouchFileSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixTouchFileSymbolFields - { - ComponentRef, - Path, - Attributes, - } - - public class WixTouchFileSymbol : IntermediateSymbol - { - public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null) - { - } - - public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id) - { - } - - public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value); - } - - public string Path - { - get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString(); - set => this.Set((int)WixTouchFileSymbolFields.Path, value); - } - - public int Attributes - { - get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixTouchFileSymbolFields.Attributes, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs deleted file mode 100644 index ca1cf047..00000000 --- a/src/wixext/Tuples/XmlConfigTuple.cs +++ /dev/null @@ -1,103 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.XmlConfig.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number), - }, - typeof(XmlConfigSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum XmlConfigSymbolFields - { - File, - ElementPath, - VerifyPath, - Name, - Value, - Flags, - ComponentRef, - Sequence, - } - - public class XmlConfigSymbol : IntermediateSymbol - { - public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null) - { - } - - public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id) - { - } - - public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index]; - - public string File - { - get => this.Fields[(int)XmlConfigSymbolFields.File].AsString(); - set => this.Set((int)XmlConfigSymbolFields.File, value); - } - - public string ElementPath - { - get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); - set => this.Set((int)XmlConfigSymbolFields.ElementPath, value); - } - - public string VerifyPath - { - get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString(); - set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value); - } - - public string Name - { - get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString(); - set => this.Set((int)XmlConfigSymbolFields.Name, value); - } - - public string Value - { - get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString(); - set => this.Set((int)XmlConfigSymbolFields.Value, value); - } - - public int Flags - { - get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber(); - set => this.Set((int)XmlConfigSymbolFields.Flags, value); - } - - public string ComponentRef - { - get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString(); - set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value); - } - - public int? Sequence - { - get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlConfigSymbolFields.Sequence, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs deleted file mode 100644 index 7d5d991b..00000000 --- a/src/wixext/Tuples/XmlFileTuple.cs +++ /dev/null @@ -1,95 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.XmlFile.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number), - }, - typeof(XmlFileSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum XmlFileSymbolFields - { - File, - ElementPath, - Name, - Value, - Flags, - ComponentRef, - Sequence, - } - - public class XmlFileSymbol : IntermediateSymbol - { - public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null) - { - } - - public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id) - { - } - - public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index]; - - public string File - { - get => this.Fields[(int)XmlFileSymbolFields.File].AsString(); - set => this.Set((int)XmlFileSymbolFields.File, value); - } - - public string ElementPath - { - get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString(); - set => this.Set((int)XmlFileSymbolFields.ElementPath, value); - } - - public string Name - { - get => this.Fields[(int)XmlFileSymbolFields.Name].AsString(); - set => this.Set((int)XmlFileSymbolFields.Name, value); - } - - public string Value - { - get => this.Fields[(int)XmlFileSymbolFields.Value].AsString(); - set => this.Set((int)XmlFileSymbolFields.Value, value); - } - - public int Flags - { - get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber(); - set => this.Set((int)XmlFileSymbolFields.Flags, value); - } - - public string ComponentRef - { - get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString(); - set => this.Set((int)XmlFileSymbolFields.ComponentRef, value); - } - - public int? Sequence - { - get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlFileSymbolFields.Sequence, value); - } - } -} \ No newline at end of file -- cgit v1.2.3-55-g6feb From c95213afde7af57af4b2bbaa2d29344accbebf01 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 26 Jun 2020 11:57:56 -0700 Subject: Build wixlib with WixToolset.Sdk --- Util.wixext.sln | 4 +- appveyor.cmd | 12 +++--- global.json | 5 +++ src/FindLocalWix.props | 8 ---- src/wixlib/packages.config | 5 --- src/wixlib/util.wixproj | 93 ++++++++-------------------------------------- 6 files changed, 28 insertions(+), 99 deletions(-) create mode 100644 global.json delete mode 100644 src/FindLocalWix.props delete mode 100644 src/wixlib/packages.config (limited to 'src') diff --git a/Util.wixext.sln b/Util.wixext.sln index 86ee4d2a..36949676 100644 --- a/Util.wixext.sln +++ b/Util.wixext.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2003 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 15.0.26124.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" EndProject diff --git a/appveyor.cmd b/appveyor.cmd index eae4e787..2347f074 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -1,14 +1,14 @@ @setlocal @pushd %~dp0 -nuget restore +nuget restore || exit /b -msbuild -p:Configuration=Release -t:Restore +msbuild -p:Configuration=Release -t:Restore || exit /b -msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj -dotnet test -c Release --no-build src\test\WixToolsetTest.Util +msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b +dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj +msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b @popd -@endlocal \ No newline at end of file +@endlocal diff --git a/global.json b/global.json new file mode 100644 index 00000000..7a995d0a --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "WixToolset.Sdk": "4.0.0-build-0143" + } +} diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/FindLocalWix.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets - - diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config deleted file mode 100644 index f37af421..00000000 --- a/src/wixlib/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index be62632b..82b06c00 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,91 +1,28 @@ - - - - + + - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} - util Library true - true + - - - - - - - - - - - - - - - - - - - - - x86 - - - x64 - - - arm - - - arm64 - + + + + - - utilbe - {630C1EE7-2517-4A8C-83E3-DA1150308B58} - - - utilca - {076018F7-19BD-423A-ABBF-229273DA08D8} - Platform=ARM - - - utilca - {076018F7-19BD-423A-ABBF-229273DA08D8} - Platform=ARM64 - - - utilca - {076018F7-19BD-423A-ABBF-229273DA08D8} - Platform=x86 - - - utilca - {076018F7-19BD-423A-ABBF-229273DA08D8} - Platform=x64 - + + + + + - + - - - + - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - + -- cgit v1.2.3-55-g6feb From cc20def99bbd0b28f19d90aee50d67f674738505 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 26 Jun 2020 14:55:01 -0700 Subject: Remove use of inner text conversions for Util.wixext Also, convert all test code to modern expectation --- .../TestData/BundleWithSearches/Bundle.wxs | 4 +- .../TestData/CloseApplication/Package.wxs | 6 +- .../CloseApplication/PackageComponents.wxs | 4 +- .../TestData/EventManifest/Package.wxs | 6 +- .../TestData/EventManifest/PackageComponents.wxs | 4 +- .../TestData/InternetShortcut/Package.wxs | 6 +- .../InternetShortcut/PackageComponents.wxs | 4 +- .../TestData/PermissionEx/Package.wxs | 6 +- .../TestData/PermissionEx/PackageComponents.wxs | 4 +- .../TestData/UsingFileShare/Package.wxs | 34 ++++---- .../TestData/UsingFileShare/PackageComponents.wxs | 26 +++--- src/wixext/UtilCompiler.cs | 23 +----- src/wixext/util.xsd | 56 ++++++------- src/wixlib/UtilExtension.wxs | 94 ++++++++++------------ src/wixlib/UtilExtension_arm.wxs | 3 +- src/wixlib/UtilExtension_arm64.wxs | 3 +- src/wixlib/UtilExtension_x64.wxs | 3 +- src/wixlib/UtilExtension_x86.wxs | 3 +- 18 files changed, 121 insertions(+), 168 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs index 82646b37..56eba137 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index 688ce39d..ec54a472 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs index 4f9e6a9d..49f29600 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs index fc1018ae..d3130591 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs index 75af3f59..2ec8ce82 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs index fc1018ae..d3130591 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs index 23b172f8..5319d2f7 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs index fc1018ae..d3130591 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -1,7 +1,5 @@ - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs index 4b4dd32e..0634d7d4 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs @@ -1,6 +1,4 @@ - - + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs index 68ff98fd..32d1cba6 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -1,22 +1,20 @@ - - - - + + + - - + + - - - - - + + + + - - - - - - - + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs index c548bc1d..7cedbb30 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs @@ -1,16 +1,14 @@ - - - - + + + - - - - - - - - - + + + + + + + + + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index f7f37fab..acd96e15 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -761,6 +761,9 @@ namespace WixToolset.Util case "Id": id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; case "Description": description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; @@ -870,9 +873,6 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes")); } - // get the condition from the inner text of the element - condition = this.ParseHelper.GetConditionInnerText(element); - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); @@ -3606,23 +3606,6 @@ namespace WixToolset.Util this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId); } - var innerText = this.ParseHelper.GetTrimmedInnerText(element); - if (null != value) - { - // cannot specify both the value attribute and inner text - if (!String.IsNullOrEmpty(innerText)) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, element.Name.LocalName, "Value")); - } - } - else // value attribute not specified - { - if (!String.IsNullOrEmpty(innerText)) - { - value = innerText; - } - } - // find unexpected child elements foreach (var child in element.Elements()) { diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd index 93cdd4ba..bb7a1e39 100644 --- a/src/wixext/util.xsd +++ b/src/wixext/util.xsd @@ -26,12 +26,6 @@ - - - Condition that determines if the application should be closed. Must be blank or evaluate to true - for the application to be scheduled for closing. - - Identifier for the close application (primary key). If the Id is not specified, one will be generated. @@ -42,6 +36,14 @@ Name of the exectuable to be closed. This should only be the file name. + + + + Condition that determines if the application should be closed. Must be blank or evaluate to true + for the application to be scheduled for closing. + + + Description to show if application is running and needs to be closed. @@ -562,7 +564,7 @@ - The name of the shortcut file, which is visible to the user. (The .lnk + The name of the shortcut file, which is visible to the user. (The .lnk extension is added automatically and by default, is not shown to the user.) @@ -571,9 +573,9 @@ URL that should be opened when the user selects the shortcut. Windows - opens the URL in the appropriate handler for the protocol specified - in the URL. Note that this is a formatted field, so you can use - [#fileId] syntax to refer to a file being installed (using the file: + opens the URL in the appropriate handler for the protocol specified + in the URL. Note that this is a formatted field, so you can use + [#fileId] syntax to refer to a file being installed (using the file: protocol). @@ -958,11 +960,11 @@ The custom action that implements RemoveFolderEx does so by writing temporary rows to the RemoveFile table for each subfolder of the root folder you specify. Because it might dramatically affect Windows Installer's - File Costing, + File Costing, the temporary rows must be written before the CostInitialize standard action. Unfortunately, MSI doesn't create properties for the Directory hierarchy in your package until later, in the CostFinalize action. An easy workaround for a typical use case of removing a folder during uninstall is to write the directory - path to the registry and to load it during uninstall. See + path to the registry and to load it during uninstall. See The WiX toolset's "Remember Property" pattern for an example. If you use custom actions to set properties, ensure that they are scheduled before the WixRemoveFoldersEx custom action. @@ -970,8 +972,8 @@ Remove a folder and all contained files and folders if the parent component is selected for installation or removal. - The folder must be specified in the Property attribute as the name of a property that will have a value that resolves - to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used. + The folder must be specified in the Property attribute as the name of a property that will have a value that resolves + to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used. For more details, see the Remarks. @@ -987,8 +989,8 @@ The id of a property that resolves to the full path of the source directory. The property does not have to exist in the installer database at creation time; it could be created at installation time by a custom - action, on the command line, etc. The property value can contain environment variables surrounded by - percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before + action, on the command line, etc. The property value can contain environment variables surrounded by + percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before being evaluated for a full path. @@ -1390,8 +1392,8 @@ - Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions. - + Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions. + @@ -1420,8 +1422,8 @@ - The value to be written. See the Formatted topic for information how to escape square brackets in the value. - + The value to be written. See the Formatted topic for information how to escape square brackets in the value. + @@ -1471,8 +1473,8 @@ - Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language. - + Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language. + @@ -1486,13 +1488,13 @@ - Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions. - + Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions. + - + @@ -1559,8 +1561,8 @@ - The value to be written. See the Formatted topic for information how to escape square brackets in the value. - + The value to be written. See the Formatted topic for information how to escape square brackets in the value. + diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index 62d9e37a..2e9ad272 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs @@ -1,5 +1,4 @@ - - + @@ -8,71 +7,69 @@ - !(loc.msierrUSRFailedUserCreate) - !(loc.msierrUSRFailedUserCreatePswd) - !(loc.msierrUSRFailedUserGroupAdd) - Failed to grant 'logon as service' rights to user. ([2] [3] [4] [5]) - !(loc.msierrUSRFailedUserCreateExists) + + + + + - !(loc.msierrSMBFailedCreate) - !(loc.msierrSMBFailedDrop) + + - - !(loc.msierrInstallPerfCounterData) - !(loc.msierrUninstallPerfCounterData) + + + - - !(loc.msierrPERFMONFailedRegisterDLL) - !(loc.msierrPERFMONFailedUnregisterDLL) + + + - !(loc.msierrSecureObjectsFailedCreateSD) - !(loc.msierrSecureObjectsFailedSet) - !(loc.msierrSecureObjectsUnknownType) + + + - - !(loc.msierrXmlFileFailedRead) - !(loc.msierrXmlFileFailedOpen) - !(loc.msierrXmlFileFailedSelect) - !(loc.msierrXmlFileFailedSave) + + + + + - - !(loc.msierrXmlConfigFailedRead) - !(loc.msierrXmlConfigFailedOpen) - !(loc.msierrXmlConfigFailedSelect) - !(loc.msierrXmlConfigFailedSave) + + + + + - - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + - - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + @@ -159,13 +156,11 @@ - - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + - - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + @@ -266,14 +261,13 @@ - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) + - @@ -305,25 +299,25 @@ - + - - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - + + + - - VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3) - + + + - - + + - - + + diff --git a/src/wixlib/UtilExtension_arm.wxs b/src/wixlib/UtilExtension_arm.wxs index c3ec27f7..8ae19029 100644 --- a/src/wixlib/UtilExtension_arm.wxs +++ b/src/wixlib/UtilExtension_arm.wxs @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/UtilExtension_arm64.wxs b/src/wixlib/UtilExtension_arm64.wxs index 1d552acf..b9dc73b8 100644 --- a/src/wixlib/UtilExtension_arm64.wxs +++ b/src/wixlib/UtilExtension_arm64.wxs @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/UtilExtension_x64.wxs b/src/wixlib/UtilExtension_x64.wxs index e902f97a..40cdf306 100644 --- a/src/wixlib/UtilExtension_x64.wxs +++ b/src/wixlib/UtilExtension_x64.wxs @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/UtilExtension_x86.wxs b/src/wixlib/UtilExtension_x86.wxs index ff4f08c4..bd0fa562 100644 --- a/src/wixlib/UtilExtension_x86.wxs +++ b/src/wixlib/UtilExtension_x86.wxs @@ -1,5 +1,4 @@ - - + -- cgit v1.2.3-55-g6feb From 7f7545f382bb9b885c9bfe894c51e66b443cef25 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 30 Jun 2020 13:57:34 -0400 Subject: Fix bind paths. --- src/wixlib/util.wixproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 82b06c00..a4d7d16f 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -8,9 +8,9 @@ - - - + + + -- cgit v1.2.3-55-g6feb From af43f098d7d7cc0fe21c7d7b0fe991763e9cae07 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 10 Jul 2020 18:01:40 +1000 Subject: Add x64 and ARM64 versions of UtilBundleExtension. --- global.json | 2 +- src/be/UtilBundleExtension.h | 2 +- src/be/beDecor.h | 13 +++++++++++ src/be/precomp.h | 1 + src/be/utilbe.vcxproj | 25 ++++++++++++++++++++++ .../WixToolsetTest.Util/UtilExtensionFixture.cs | 8 +++---- src/wixext/UtilCompiler.cs | 13 +++++++---- src/wixext/UtilConstants.cs | 2 -- src/wixlib/UtilBundleExtension_Platform.wxi | 10 +++++++++ src/wixlib/UtilBundleExtension_arm64.wxs | 7 ++++++ src/wixlib/UtilBundleExtension_x64.wxs | 7 ++++++ src/wixlib/UtilBundleExtension_x86.wxs | 7 ++++++ src/wixlib/util.wixproj | 4 +++- 13 files changed, 88 insertions(+), 13 deletions(-) create mode 100644 src/be/beDecor.h create mode 100644 src/wixlib/UtilBundleExtension_Platform.wxi create mode 100644 src/wixlib/UtilBundleExtension_arm64.wxs create mode 100644 src/wixlib/UtilBundleExtension_x64.wxs create mode 100644 src/wixlib/UtilBundleExtension_x86.wxs (limited to 'src') diff --git a/global.json b/global.json index 7a995d0a..32c1b11f 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0143" + "WixToolset.Sdk": "4.0.0-build-0145" } } diff --git a/src/be/UtilBundleExtension.h b/src/be/UtilBundleExtension.h index 16c5b346..c55d6b85 100644 --- a/src/be/UtilBundleExtension.h +++ b/src/be/UtilBundleExtension.h @@ -4,7 +4,7 @@ // constants -#define UTIL_BUNDLE_EXTENSION_ID L"WixUtilBundleExtension" +#define UTIL_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"UtilBundleExtension") // function declarations diff --git a/src/be/beDecor.h b/src/be/beDecor.h new file mode 100644 index 00000000..2c6a8818 --- /dev/null +++ b/src/be/beDecor.h @@ -0,0 +1,13 @@ +#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. + + +#if defined(_M_ARM64) +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_A64" +#elif defined(_M_AMD64) +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X64" +#elif defined(_M_ARM) +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_ARM" +#else +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X86" +#endif diff --git a/src/be/precomp.h b/src/be/precomp.h index a4ab7abf..76d24c7b 100644 --- a/src/be/precomp.h +++ b/src/be/precomp.h @@ -31,6 +31,7 @@ #include #include +#include "beDecor.h" #include "utilsearch.h" #include "detectsha2support.h" #include "UtilBundleExtension.h" diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index b60fcf9f..3675ccc0 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -8,6 +8,30 @@ + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + X64 + + + Release + X64 + Debug Win32 @@ -41,6 +65,7 @@ + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 9c83209b..aa03d068 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -85,7 +85,7 @@ namespace WixToolsetTest.Util "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64\tWixRollbackInternetShortcuts\t", "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64\tWixSchedInternetShortcuts\t", - "RemoveFile:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tvtpzs3bw.lnk|WiX Toolset.lnk\tINSTALLFOLDER\t2", + "RemoveFile:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tzf9nskwi.lnk|WiX Toolset.lnk\tINSTALLFOLDER\t2", "Wix4InternetShortcut:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tINSTALLFOLDER\tWiX Toolset.lnk\thttps://wixtoolset.org\t0\t\t0", }, results.OrderBy(s => s).ToArray()); } @@ -169,16 +169,16 @@ namespace WixToolsetTest.Util var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='WixUtilBundleExtension']"); + var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']"); Assert.Equal(1, bundleExtensionDatas.Count); - Assert.Equal("" + + Assert.Equal("" + "" + "", bundleExtensionDatas[0].GetTestXml()); var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); Assert.Equal(4, utilSearches.Count); Assert.Equal("", utilSearches[0].GetTestXml()); + "ExtensionId='Wix4UtilBundleExtension_X86' />", utilSearches[0].GetTestXml()); Assert.Equal("", utilSearches[1].GetTestXml()); Assert.Equal(" + + + + + + + + + diff --git a/src/wixlib/UtilBundleExtension_arm64.wxs b/src/wixlib/UtilBundleExtension_arm64.wxs new file mode 100644 index 00000000..b17be031 --- /dev/null +++ b/src/wixlib/UtilBundleExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/UtilBundleExtension_x64.wxs b/src/wixlib/UtilBundleExtension_x64.wxs new file mode 100644 index 00000000..96c85a5b --- /dev/null +++ b/src/wixlib/UtilBundleExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/UtilBundleExtension_x86.wxs b/src/wixlib/UtilBundleExtension_x86.wxs new file mode 100644 index 00000000..3b458687 --- /dev/null +++ b/src/wixlib/UtilBundleExtension_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index a4d7d16f..21fcdb7b 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -14,7 +14,9 @@ - + + + -- cgit v1.2.3-55-g6feb From f866ab77f8fd0790f4d6628f54dcdf0bd66fccb6 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 10 Jul 2020 21:25:44 +1000 Subject: Change the DetectSHA2Support element to WindowsFeatureSearch. This will make it easier to add support for other Windows features in the future. --- src/be/detectsha2support.cpp | 8 +-- src/be/detectsha2support.h | 2 +- src/be/utilsearch.cpp | 33 ++++++++++-- src/be/utilsearch.h | 15 +++++- .../TestData/BundleWithSearches/Bundle.wxs | 6 +-- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Symbols/UtilSymbolDefinitions.cs | 10 ++-- src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs | 33 ------------ .../Symbols/WixWindowsFeatureSearchSymbol.cs | 47 ++++++++++++++++ src/wixext/UtilCompiler.cs | 50 +++++++++++------ src/wixext/util.xsd | 62 +++++++++++++--------- 11 files changed, 176 insertions(+), 92 deletions(-) delete mode 100644 src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs create mode 100644 src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs (limited to 'src') diff --git a/src/be/detectsha2support.cpp b/src/be/detectsha2support.cpp index f1f3637e..90e349cd 100644 --- a/src/be/detectsha2support.cpp +++ b/src/be/detectsha2support.cpp @@ -3,7 +3,7 @@ #include "precomp.h" // https://gist.github.com/navossoc/7572c7d82243e9f818989e2765e7793a -HRESULT DetectSHA2Support( +HRESULT DetectSHA2CodeSigning( __out BOOL* pfSupported ) { @@ -38,7 +38,7 @@ LExit: return hr; } -HRESULT UtilPerformDetectSHA2Support( +HRESULT UtilPerformDetectSHA2CodeSigning( __in LPCWSTR wzVariable, __in UTIL_SEARCH* /*pSearch*/, __in IBundleExtensionEngine* pEngine @@ -47,8 +47,8 @@ HRESULT UtilPerformDetectSHA2Support( HRESULT hr = S_OK; BOOL fSupported = FALSE; - hr = DetectSHA2Support(&fSupported); - ExitOnFailure(hr, "DetectSHA2Support failed."); + hr = DetectSHA2CodeSigning(&fSupported); + ExitOnFailure(hr, "DetectSHA2CodeSigning failed."); hr = pEngine->SetVariableNumeric(wzVariable, fSupported ? 1 : 0); ExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable); diff --git a/src/be/detectsha2support.h b/src/be/detectsha2support.h index 7f1f6031..c38a3d59 100644 --- a/src/be/detectsha2support.h +++ b/src/be/detectsha2support.h @@ -1,7 +1,7 @@ #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. -HRESULT UtilPerformDetectSHA2Support( +HRESULT UtilPerformDetectSHA2CodeSigning( __in LPCWSTR wzVariable, __in UTIL_SEARCH* pSearch, __in IBundleExtensionEngine* pEngine diff --git a/src/be/utilsearch.cpp b/src/be/utilsearch.cpp index 4e9d86a1..7cd2ea09 100644 --- a/src/be/utilsearch.cpp +++ b/src/be/utilsearch.cpp @@ -13,9 +13,10 @@ STDMETHODIMP UtilSearchParseFromXml( IXMLDOMNode* pixnNode = NULL; DWORD cNodes = 0; BSTR bstrNodeName = NULL; + LPWSTR scz = NULL; // Select Util search nodes. - hr = XmlSelectNodes(pixnBundleExtension, L"WixDetectSHA2Support", &pixnNodes); + hr = XmlSelectNodes(pixnBundleExtension, L"WixWindowsFeatureSearch", &pixnNodes); ExitOnFailure(hr, "Failed to select Util search nodes."); // Get Util search node count. @@ -46,9 +47,23 @@ STDMETHODIMP UtilSearchParseFromXml( ExitOnFailure(hr, "Failed to get @Id."); // Read type specific attributes. - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"WixDetectSHA2Support", -1)) + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"WixWindowsFeatureSearch", -1)) { - pSearch->Type = UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT; + pSearch->Type = UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH; + + // @Type + hr = XmlGetAttributeEx(pixnNode, L"Type", &scz); + ExitOnFailure(hr, "Failed to get @Type."); + + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"sha2CodeSigning", -1)) + { + pSearch->WindowsFeatureSearch.type = UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING; + } + else + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "Invalid value for @Type: %ls", scz); + } } else { @@ -62,6 +77,7 @@ STDMETHODIMP UtilSearchParseFromXml( } LExit: + ReleaseStr(scz); ReleaseBSTR(bstrNodeName); ReleaseObject(pixnNode); ReleaseObject(pixnNodes); @@ -100,8 +116,15 @@ STDMETHODIMP UtilSearchExecute( switch (pSearch->Type) { - case UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT: - hr = UtilPerformDetectSHA2Support(wzVariable, pSearch, pEngine); + case UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH: + switch (pSearch->WindowsFeatureSearch.type) + { + case UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING: + hr = UtilPerformDetectSHA2CodeSigning(wzVariable, pSearch, pEngine); + break; + default: + hr = E_UNEXPECTED; + } break; default: hr = E_UNEXPECTED; diff --git a/src/be/utilsearch.h b/src/be/utilsearch.h index 1e0ca96d..deeab1f7 100644 --- a/src/be/utilsearch.h +++ b/src/be/utilsearch.h @@ -7,7 +7,13 @@ enum UTIL_SEARCH_TYPE { UTIL_SEARCH_TYPE_NONE, - UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT, + UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH, +}; + +enum UTIL_WINDOWS_FEATURE_SEARCH_TYPE +{ + UTIL_WINDOWS_FEATURE_SEARCH_TYPE_NONE, + UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING, }; @@ -18,6 +24,13 @@ typedef struct _UTIL_SEARCH LPWSTR sczId; UTIL_SEARCH_TYPE Type; + union + { + struct + { + UTIL_WINDOWS_FEATURE_SEARCH_TYPE type; + } WindowsFeatureSearch; + }; } UTIL_SEARCH; typedef struct _UTIL_SEARCHES diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs index 56eba137..c8f7205f 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -1,11 +1,11 @@ - + - + @@ -33,6 +33,6 @@ - + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index aa03d068..78a9f967 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -172,7 +172,7 @@ namespace WixToolsetTest.Util var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']"); Assert.Equal(1, bundleExtensionDatas.Count); Assert.Equal("" + - "" + + "" + "", bundleExtensionDatas[0].GetTestXml()); var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); diff --git a/src/wixext/Symbols/UtilSymbolDefinitions.cs b/src/wixext/Symbols/UtilSymbolDefinitions.cs index ae9c4c81..5f062676 100644 --- a/src/wixext/Symbols/UtilSymbolDefinitions.cs +++ b/src/wixext/Symbols/UtilSymbolDefinitions.cs @@ -20,12 +20,12 @@ namespace WixToolset.Util User, UserGroup, WixCloseApplication, - WixDetectSHA2Support, WixFormatFiles, WixInternetShortcut, WixRemoveFolderEx, WixRestartResource, WixTouchFile, + WixWindowsFeatureSearch, XmlConfig, XmlFile, } @@ -84,9 +84,6 @@ namespace WixToolset.Util case UtilSymbolDefinitionType.WixCloseApplication: return UtilSymbolDefinitions.WixCloseApplication; - case UtilSymbolDefinitionType.WixDetectSHA2Support: - return UtilSymbolDefinitions.WixDetectSHA2Support; - case UtilSymbolDefinitionType.WixFormatFiles: return UtilSymbolDefinitions.WixFormatFiles; @@ -102,6 +99,9 @@ namespace WixToolset.Util case UtilSymbolDefinitionType.WixTouchFile: return UtilSymbolDefinitions.WixTouchFile; + case UtilSymbolDefinitionType.WixWindowsFeatureSearch: + return UtilSymbolDefinitions.WixWindowsFeatureSearch; + case UtilSymbolDefinitionType.XmlConfig: return UtilSymbolDefinitions.XmlConfig; @@ -115,7 +115,7 @@ namespace WixToolset.Util static UtilSymbolDefinitions() { - WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); + WixWindowsFeatureSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); } } } diff --git a/src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs b/src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs deleted file mode 100644 index b518ba3b..00000000 --- a/src/wixext/Symbols/WixDetectSHA2SupportSymbol.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixDetectSHA2Support = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixDetectSHA2Support.ToString(), - new IntermediateFieldDefinition[0], - typeof(WixDetectSHA2SupportSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public class WixDetectSHA2SupportSymbol : IntermediateSymbol - { - public WixDetectSHA2SupportSymbol() : base(UtilSymbolDefinitions.WixDetectSHA2Support, null, null) - { - } - - public WixDetectSHA2SupportSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixDetectSHA2Support, sourceLineNumber, id) - { - } - - public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; - } -} diff --git a/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs b/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs new file mode 100644 index 00000000..9a43692c --- /dev/null +++ b/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs @@ -0,0 +1,47 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixWindowsFeatureSearch = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixWindowsFeatureSearch.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixWindowsFeatureSearchSymbolFields.Type), IntermediateFieldType.String), + }, + typeof(WixWindowsFeatureSearchSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixWindowsFeatureSearchSymbolFields + { + Type, + } + + public class WixWindowsFeatureSearchSymbol : IntermediateSymbol + { + public WixWindowsFeatureSearchSymbol() : base(UtilSymbolDefinitions.WixWindowsFeatureSearch, null, null) + { + } + + public WixWindowsFeatureSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixWindowsFeatureSearch, sourceLineNumber, id) + { + } + + public IntermediateField this[WixWindowsFeatureSearchSymbolFields index] => this.Fields[(int)index]; + + public string Type + { + get => this.Fields[(int)WixWindowsFeatureSearchSymbolFields.Type].AsString(); + set => this.Set((int)WixWindowsFeatureSearchSymbolFields.Type, value); + } + } +} diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index a5745b6c..79dbbc6d 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -235,8 +235,6 @@ namespace WixToolset.Util break; case "ComponentSearch": case "ComponentSearchRef": - case "DetectSHA2Support": - case "DetectSHA2SupportRef": case "DirectorySearch": case "DirectorySearchRef": case "FileSearch": @@ -245,6 +243,8 @@ namespace WixToolset.Util case "ProductSearchRef": case "RegistrySearch": case "RegistrySearchRef": + case "WindowsFeatureSearch": + case "WindowsFeatureSearchRef": // These will eventually be supported under Module/Product, but are not yet. if (parentElement.Name.LocalName == "Bundle" || parentElement.Name.LocalName == "Fragment") { @@ -258,12 +258,6 @@ namespace WixToolset.Util case "ComponentSearchRef": this.ParseComponentSearchRefElement(intermediate, section, element); break; - case "DetectSHA2Support": - this.ParseDetectSHA2SupportElement(intermediate, section, element); - break; - case "DetectSHA2SupportRef": - this.ParseDetectSHA2SupportRefElement(intermediate, section, element); - break; case "DirectorySearch": this.ParseDirectorySearchElement(intermediate, section, element); break; @@ -288,6 +282,12 @@ namespace WixToolset.Util case "RegistrySearchRef": this.ParseWixSearchRefElement(intermediate, section, element); break; + case "WindowsFeatureSearch": + this.ParseWindowsFeatureSearchElement(intermediate, section, element); + break; + case "WindowsFeatureSearchRef": + this.ParseWindowsFeatureSearchRefElement(intermediate, section, element); + break; } } else @@ -508,16 +508,17 @@ namespace WixToolset.Util } /// - /// Parses a DetectSHA2Support element. + /// Parses a WindowsFeatureSearch element. /// /// Element to parse. - private void ParseDetectSHA2SupportElement(Intermediate intermediate, IntermediateSection section, XElement element) + private void ParseWindowsFeatureSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string variable = null; string condition = null; string after = null; + string feature = null; foreach (var attrib in element.Attributes()) { @@ -531,6 +532,17 @@ namespace WixToolset.Util case "After": this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); break; + case "Feature": + feature = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (feature) + { + case "sha2CodeSigning": + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Feature", feature, "sha2CodeSigning")); + break; + } + break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); break; @@ -544,7 +556,12 @@ namespace WixToolset.Util if (id == null) { - id = this.ParseHelper.CreateIdentifier("wds2s", variable, condition, after); + id = this.ParseHelper.CreateIdentifier("wwfs", variable, condition, after); + } + + if (feature == null) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Feature")); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); @@ -559,15 +576,18 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddSymbol(new WixDetectSHA2SupportSymbol(sourceLineNumbers, id)); + section.AddSymbol(new WixWindowsFeatureSearchSymbol(sourceLineNumbers, id) + { + Type = feature, + }); } } /// - /// Parses a DetectSHA2SupportRef element + /// Parses a WindowsFeatureSearchRef element /// /// Element to parse. - private void ParseDetectSHA2SupportRefElement(Intermediate intermediate, IntermediateSection section, XElement element) + private void ParseWindowsFeatureSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); @@ -579,7 +599,7 @@ namespace WixToolset.Util { case "Id": var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixDetectSHA2Support, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixWindowsFeatureSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd index bb7a1e39..b6f0365b 100644 --- a/src/wixext/util.xsd +++ b/src/wixext/util.xsd @@ -174,30 +174,6 @@ - - - Detects support for SHA2. - - - - - - - - - - - - References a DetectSHA2Support. - - - - - - - - - Describes a directory search. @@ -1389,6 +1365,44 @@ + + + Detects the existence of a Windows feature. + + + + + + + + + + The feature to detect. + + + + + + The oldest OS with this feature is Win7 SP1 with KB3033929. + + + + + + + + + + References a WindowsFeatureSearch. + + + + + + + + + -- cgit v1.2.3-55-g6feb From 3bbca19f75e748242f0966dce7461c0508c208ba Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 10 Jul 2020 22:08:10 +1000 Subject: Remove Win32 pdb path. --- src/wixext/WixToolset.Util.wixext.nuspec | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec index fd27390f..d1308695 100644 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ b/src/wixext/WixToolset.Util.wixext.nuspec @@ -22,7 +22,6 @@ - -- cgit v1.2.3-55-g6feb From a34b060e7b1375be7c8c557a985b484155ff2702 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 12 Jul 2020 22:40:30 -0400 Subject: Add elements to reference platform-specific extension custom actions. --- .../TestData/Queries/Package.en-us.wxl | 11 + .../TestData/Queries/Package.wxs | 26 +++ .../TestData/Queries/PackageComponents.wxs | 9 + .../TestData/Queries/example.txt | 1 + .../WixToolsetTest.Util/UtilExtensionFixture.cs | 18 ++ .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 4 + src/wixext/UtilCompiler.cs | 85 +++++++ src/wixext/util.xsd | 121 ++++++++++ src/wixlib/UtilExtension.wxs | 258 --------------------- src/wixlib/UtilExtension_Platform.wxi | 48 ++++ 10 files changed, 323 insertions(+), 258 deletions(-) create mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/example.txt (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs new file mode 100644 index 00000000..7f6cd7fa --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs new file mode 100644 index 00000000..e2dce4ae --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt b/src/test/WixToolsetTest.Util/TestData/Queries/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/Queries/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 78a9f967..848e4aa2 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -132,6 +132,24 @@ namespace WixToolsetTest.Util }, results.OrderBy(s => s).ToArray()); } + [Fact] + public void CanBuildWithQueries() + { + var folder = TestData.Get(@"TestData\Queries"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); + Assert.Equal(new[] + { + "Binary:Wix4UtilCA_A64\t[Binary data]", + "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", + "CustomAction:Wix4BroadcastSettingChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastSettingChange\t", + "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", + "CustomAction:Wix4QueryOsDriverInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsDriverInfo\t", + "CustomAction:Wix4QueryOsInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsInfo\t", + }, results.OrderBy(s => s).ToArray()); + } + [Fact] public void CanBuildBundleWithSearches() { diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index fcac4644..f2d5c486 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -39,6 +39,10 @@ + + + + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 79dbbc6d..fdc1c9eb 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -233,6 +233,19 @@ namespace WixToolset.Util case "User": this.ParseUserElement(intermediate, section, element, null); break; + case "BroadcastEnvironmentChange": + case "BroadcastSettingChange": + case "CheckRebootRequired": + case "ExitEarlyWithSuccess": + case "FailWhenDeferred": + case "QueryWindowsDirectories": + case "QueryWindowsDriverInfo": + case "QueryWindowsSuiteInfo": + case "QueryWindowsWellKnownSIDs": + case "WaitForEvent": + case "WaitForEventDeferred": + this.AddCustomActionReference(intermediate, section, element, parentElement); + break; case "ComponentSearch": case "ComponentSearchRef": case "DirectorySearch": @@ -340,6 +353,24 @@ namespace WixToolset.Util break; } break; + case "UI": + switch (element.Name.LocalName) + { + case "BroadcastEnvironmentChange": + case "BroadcastSettingChange": + case "CheckRebootRequired": + case "ExitEarlyWithSuccess": + case "FailWhenDeferred": + case "QueryWindowsDirectories": + case "QueryWindowsDriverInfo": + case "QueryWindowsSuiteInfo": + case "QueryWindowsWellKnownSIDs": + case "WaitForEvent": + case "WaitForEventDeferred": + this.AddCustomActionReference(intermediate, section, element, parentElement); + break; + } + break; default: this.ParseHelper.UnexpectedElement(parentElement, element); break; @@ -348,6 +379,60 @@ namespace WixToolset.Util return possibleKeyPath; } + private void AddCustomActionReference(Intermediate intermediate, IntermediateSection section, XElement element, XElement parentElement) + { + // These elements are not supported for bundles. + if (parentElement.Name.LocalName == "Bundle") + { + this.ParseHelper.UnexpectedElement(parentElement, element); + return; + } + + var customAction = element.Name.LocalName; + switch (element.Name.LocalName) + { + case "BroadcastEnvironmentChange": + case "BroadcastSettingChange": + case "CheckRebootRequired": + case "ExitEarlyWithSuccess": + case "FailWhenDeferred": + case "WaitForEvent": + case "WaitForEventDeferred": + //default: customAction = element.Name.LocalName; + break; + case "QueryWindowsDirectories": + customAction = "QueryOsDirs"; + break; + case "QueryWindowsDriverInfo": + customAction = "QueryOsDriverInfo"; + break; + case "QueryWindowsSuiteInfo": + customAction = "QueryOsInfo"; + break; + case "QueryWindowsWellKnownSIDs": + customAction = "QueryOsWellKnownSID"; + break; + } + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + // no attributes today + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + } + /// /// Parses the common search attributes shared across all searches. /// diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd index b6f0365b..133a93fa 100644 --- a/src/wixext/util.xsd +++ b/src/wixext/util.xsd @@ -1586,6 +1586,127 @@ + + + Schedules the BroadcastEnvironmentChange custom action for the current platform. + + + + + + + + + + + Schedules the BroadcastSettingChange custom action for the current platform. + + + + + + + + + + + Schedules the CheckRebootRequired custom action for the current platform. + + + + + + + + + + + Schedules the ExitEarlyWithSuccess custom action for the current platform. + + + + + + + + + + + Schedules the FailWhenDeferred custom action for the current platform. + + + + + + + + + + Schedules the WaitForEvent custom action for the current platform. + + + + + + + + + + + Schedules the WaitForEventDeferred custom action for the current platform. + + + + + + + + + + + Schedules the QueryOsDirs custom action for the current platform. + + + + + + + + + + + Schedules the QueryOsDriverInfo custom action for the current platform. + + + + + + + + + + + Schedules the QueryOsInfo custom action for the current platform. + + + + + + + + + + + Schedules the QueryOsWellKnownSID custom action for the current platform. + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb From c601af4a8b83cbb6a10347d56b4b154f3f08df39 Mon Sep 17 00:00:00 2001 From: William Kent Date: Thu, 16 Jul 2020 20:45:19 -0400 Subject: Fix the immediate problem in wixtoolset/issues#6216 --- src/wixlib/util.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 21fcdb7b..f350c877 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -7,7 +7,7 @@ - + -- cgit v1.2.3-55-g6feb From 8006b25b1a40f1687053dc8d84531f3f609fbe80 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 19 Jul 2020 20:03:37 +1000 Subject: Update dependencies. --- global.json | 5 ++++- nuget.config | 1 - src/be/packages.config | 8 ++++---- src/be/utilbe.vcxproj | 16 ++++++++-------- src/ca/packages.config | 4 ++-- src/ca/utilca.vcxproj | 8 ++++---- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 16 ++++++++-------- src/wixext/WixToolset.Util.wixext.csproj | 2 +- src/wixlib/util.wixproj | 2 +- 9 files changed, 32 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 32c1b11f..41935656 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,8 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0145" + "WixToolset.Sdk": "4.0.0-build-0149" + }, + "sdk": { + "allowPrerelease": false } } diff --git a/nuget.config b/nuget.config index 11f88400..8d711148 100644 --- a/nuget.config +++ b/nuget.config @@ -3,7 +3,6 @@ - diff --git a/src/be/packages.config b/src/be/packages.config index a96fa834..da94bb02 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 3675ccc0..48e577df 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -79,7 +79,7 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -90,9 +90,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index a1d30df0..b8a9b796 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index f353a4e4..29273a8d 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,7 +5,7 @@ - + @@ -113,7 +113,7 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -124,8 +124,8 @@ - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 848e4aa2..0125dcc1 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -20,7 +20,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X86\t[Binary data]", "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", @@ -41,7 +41,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X64\t[Binary data]", "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", @@ -62,7 +62,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_A64\t[Binary data]", "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", @@ -79,7 +79,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X64\t[Binary data]", "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", @@ -97,12 +97,12 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "Wix4SecureObject:regO7jgNdgqG_TfURLgXPo2jRcxzx8\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:regL6DnQ9yJpDJH5OdcVji4YXsdX2c\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } @@ -114,7 +114,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_A64\t[Binary data]", "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", @@ -139,7 +139,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_A64\t[Binary data]", "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index acadce55..022b9bb7 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index f350c877..e937750f 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -24,7 +24,7 @@ - + -- cgit v1.2.3-55-g6feb From 50c45060af62eda85c9180191ff406fb67c49c91 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 7 Aug 2020 19:13:28 -0600 Subject: Update dependencies. --- global.json | 2 +- src/be/packages.config | 6 +++--- src/be/utilbe.vcxproj | 12 ++++++------ src/ca/packages.config | 2 +- src/ca/utilca.vcxproj | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 41935656..4667cc29 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0149" + "WixToolset.Sdk": "4.0.0-build-0150" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config index da94bb02..de622895 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 48e577df..d44a7fd9 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -91,8 +91,8 @@ - - - + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index b8a9b796..d045b6fb 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 29273a8d..747f635a 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,7 +5,7 @@ - + @@ -125,7 +125,7 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From a39f29246cdcd85c70bc172ea8ecc8e9cd3c3c4c Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 26 Aug 2020 16:28:15 -0400 Subject: #ifdef out serialization use --- src/wixext/util.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/wixext/util.cs b/src/wixext/util.cs index 9ebe89a7..7dabb3d1 100644 --- a/src/wixext/util.cs +++ b/src/wixext/util.cs @@ -10,6 +10,7 @@ namespace WixToolset.Util.Serialize { +#if TODO_CONSIDER_DECOMPILER using System; using System.CodeDom.Compiler; using System.Collections; @@ -11458,4 +11459,5 @@ namespace WixToolset.Util.Serialize uninstall, } } +#endif } -- cgit v1.2.3-55-g6feb From 07df3ee2da149531ed665624cb8fbf8ec752d9cd Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 26 Aug 2020 18:43:25 -0400 Subject: Replace serialization and update WixSdk --- global.json | 2 +- src/wixext/UtilCompiler.cs | 209 ++++++++++++++++++--------------------------- 2 files changed, 84 insertions(+), 127 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 4667cc29..efa9830c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0150" + "WixToolset.Sdk": "4.0.0-build-0153" }, "sdk": { "allowPrerelease": false diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index fdc1c9eb..a454951e 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -478,7 +478,7 @@ namespace WixToolset.Util string after = null; string guid = null; string productCode = null; - var result = Serialize.ComponentSearch.ResultType.NotSet; + var attributes = WixComponentSearchAttributes.KeyPath; foreach (var attrib in element.Attributes()) { @@ -499,14 +499,21 @@ namespace WixToolset.Util productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); break; case "Result": - var resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (!Serialize.ComponentSearch.TryParseResultType(resultValue, out result)) + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, - resultValue, - Serialize.ComponentSearch.ResultType.directory.ToString(), - Serialize.ComponentSearch.ResultType.state.ToString(), - Serialize.ComponentSearch.ResultType.keyPath.ToString())); + case "directory": + attributes = WixComponentSearchAttributes.WantDirectory; + break; + case "keyPath": + attributes = WixComponentSearchAttributes.KeyPath; + break; + case "state": + attributes = WixComponentSearchAttributes.State; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "directory", "keyPath", "state")); + break; } break; default: @@ -527,7 +534,7 @@ namespace WixToolset.Util if (null == id) { - id = this.ParseHelper.CreateIdentifier("wcs", variable, condition, after, guid, productCode, result.ToString()); + id = this.ParseHelper.CreateIdentifier("wcs", variable, condition, after, guid, productCode, attributes.ToString()); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); @@ -536,20 +543,6 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var attributes = WixComponentSearchAttributes.KeyPath; - switch (result) - { - case Serialize.ComponentSearch.ResultType.directory: - attributes = WixComponentSearchAttributes.WantDirectory; - break; - case Serialize.ComponentSearch.ResultType.keyPath: - attributes = WixComponentSearchAttributes.KeyPath; - break; - case Serialize.ComponentSearch.ResultType.state: - attributes = WixComponentSearchAttributes.State; - break; - } - section.AddSymbol(new WixComponentSearchSymbol(sourceLineNumbers, id) { Guid = guid, @@ -1025,7 +1018,7 @@ namespace WixToolset.Util string condition = null; string after = null; string path = null; - var result = Serialize.DirectorySearch.ResultType.NotSet; + var attributes = WixFileSearchAttributes.IsDirectory; foreach (var attrib in element.Attributes()) { @@ -1043,11 +1036,15 @@ namespace WixToolset.Util path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); break; case "Result": - string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (!Serialize.DirectorySearch.TryParseResultType(resultValue, out result)) + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, - resultValue, Serialize.DirectorySearch.ResultType.exists.ToString())); + case "exists": + attributes |= WixFileSearchAttributes.WantExists; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists")); + break; } break; default: @@ -1068,7 +1065,7 @@ namespace WixToolset.Util if (null == id) { - id = this.ParseHelper.CreateIdentifier("wds", variable, condition, after, path, result.ToString()); + id = this.ParseHelper.CreateIdentifier("wds", variable, condition, after, path, attributes.ToString()); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); @@ -1077,14 +1074,6 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var attributes = WixFileSearchAttributes.IsDirectory; - switch (result) - { - case Serialize.DirectorySearch.ResultType.exists: - attributes |= WixFileSearchAttributes.WantExists; - break; - } - this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); } } @@ -1133,7 +1122,7 @@ namespace WixToolset.Util string condition = null; string after = null; string path = null; - var result = Serialize.FileSearch.ResultType.NotSet; + var attributes = WixFileSearchAttributes.Default; foreach (var attrib in node.Attributes()) { @@ -1151,13 +1140,18 @@ namespace WixToolset.Util path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); break; case "Result": - string resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (!Serialize.FileSearch.TryParseResultType(resultValue, out result)) + string result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, - resultValue, - Serialize.FileSearch.ResultType.exists.ToString(), - Serialize.FileSearch.ResultType.version.ToString())); + case "exists": + attributes |= WixFileSearchAttributes.WantExists; + break; + case "version": + attributes |= WixFileSearchAttributes.WantVersion; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists", "version")); + break; } break; default: @@ -1178,7 +1172,7 @@ namespace WixToolset.Util if (null == id) { - id = this.ParseHelper.CreateIdentifier("wfs", variable, condition, after, path, result.ToString()); + id = this.ParseHelper.CreateIdentifier("wfs", variable, condition, after, path, attributes.ToString()); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); @@ -1187,17 +1181,6 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var attributes = WixFileSearchAttributes.Default; - switch (result) - { - case Serialize.FileSearch.ResultType.exists: - attributes |= WixFileSearchAttributes.WantExists; - break; - case Serialize.FileSearch.ResultType.version: - attributes |= WixFileSearchAttributes.WantVersion; - break; - } - this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); } } @@ -2599,8 +2582,7 @@ namespace WixToolset.Util string after = null; string productCode = null; string upgradeCode = null; - - var result = Serialize.ProductSearch.ResultType.NotSet; + var attributes = WixProductSearchAttributes.Version; foreach (var attrib in element.Attributes()) { @@ -2621,15 +2603,24 @@ namespace WixToolset.Util upgradeCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); break; case "Result": - var resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (!Serialize.ProductSearch.TryParseResultType(resultValue, out result)) + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, - resultValue, - Serialize.ProductSearch.ResultType.version.ToString(), - Serialize.ProductSearch.ResultType.language.ToString(), - Serialize.ProductSearch.ResultType.state.ToString(), - Serialize.ProductSearch.ResultType.assignment.ToString())); + case "version": + attributes = WixProductSearchAttributes.Version; + break; + case "language": + attributes = WixProductSearchAttributes.Language; + break; + case "state": + attributes = WixProductSearchAttributes.State; + break; + case "assignment": + attributes = WixProductSearchAttributes.Assignment; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "version", "language", "state", "assignment")); + break; } break; default: @@ -2655,7 +2646,7 @@ namespace WixToolset.Util if (null == id) { - id = this.ParseHelper.CreateIdentifier("wps", variable, condition, after, (productCode == null ? upgradeCode : productCode), result.ToString()); + id = this.ParseHelper.CreateIdentifier("wps", variable, condition, after, (productCode == null ? upgradeCode : productCode), attributes.ToString()); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); @@ -2664,23 +2655,6 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var attributes = WixProductSearchAttributes.Version; - switch (result) - { - case Serialize.ProductSearch.ResultType.version: - attributes = WixProductSearchAttributes.Version; - break; - case Serialize.ProductSearch.ResultType.language: - attributes = WixProductSearchAttributes.Language; - break; - case Serialize.ProductSearch.ResultType.state: - attributes = WixProductSearchAttributes.State; - break; - case Serialize.ProductSearch.ResultType.assignment: - attributes = WixProductSearchAttributes.Assignment; - break; - } - // set an additional flag if this is an upgrade code if (null != upgradeCode) { @@ -2711,8 +2685,7 @@ namespace WixToolset.Util string value = null; var expand = YesNoType.NotSet; var win64 = YesNoType.NotSet; - var result = Serialize.RegistrySearch.ResultType.NotSet; - var format = Serialize.RegistrySearch.FormatType.raw; + var attributes = WixRegistrySearchAttributes.Raw | WixRegistrySearchAttributes.WantValue; foreach (var attrib in element.Attributes()) { @@ -2739,22 +2712,33 @@ namespace WixToolset.Util expand = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; case "Format": - string formatValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (!String.IsNullOrEmpty(formatValue)) + string format = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (format) { - if (!Serialize.RegistrySearch.TryParseFormatType(formatValue, out format)) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, - formatValue, Serialize.RegistrySearch.FormatType.raw.ToString(), Serialize.RegistrySearch.FormatType.compatible.ToString())); - } + case "raw": + attributes |= WixRegistrySearchAttributes.Raw; + break; + case "compatible": + attributes |= WixRegistrySearchAttributes.Compatible; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, format, "raw", "compatible")); + break; } break; case "Result": - var resultValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (!Serialize.RegistrySearch.TryParseResultType(resultValue, out result)) + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, - resultValue, Serialize.RegistrySearch.ResultType.exists.ToString(), Serialize.RegistrySearch.ResultType.value.ToString())); + case "exists": + attributes |= WixRegistrySearchAttributes.WantExists; + break; + case "value": + attributes |= WixRegistrySearchAttributes.WantValue; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists", "value")); + break; } break; case "Win64": @@ -2781,43 +2765,16 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); } - if (Serialize.RegistrySearch.ResultType.NotSet == result) - { - result = Serialize.RegistrySearch.ResultType.value; - } - if (null == id) { - id = this.ParseHelper.CreateIdentifier("wrs", variable, condition, after, root.ToString(), key, value, result.ToString()); - } - - var attributes = WixRegistrySearchAttributes.Raw; - switch (format) - { - case Serialize.RegistrySearch.FormatType.raw: - attributes = WixRegistrySearchAttributes.Raw; - break; - case Serialize.RegistrySearch.FormatType.compatible: - attributes = WixRegistrySearchAttributes.Compatible; - break; - } - - switch (result) - { - case Serialize.RegistrySearch.ResultType.exists: - attributes |= WixRegistrySearchAttributes.WantExists; - break; - case Serialize.RegistrySearch.ResultType.value: - attributes |= WixRegistrySearchAttributes.WantValue; - break; + id = this.ParseHelper.CreateIdentifier("wrs", variable, condition, after, root.ToString(), key, value, attributes.ToString()); } if (expand == YesNoType.Yes) { if (0 != (attributes & WixRegistrySearchAttributes.WantExists)) { - this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, - "ExpandEnvironmentVariables", expand.ToString(), "Result", result.ToString())); + this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "ExpandEnvironmentVariables", expand.ToString(), "Result", "exists")); } attributes |= WixRegistrySearchAttributes.ExpandEnvironmentVariables; -- cgit v1.2.3-55-g6feb From a678473353eacdbed7a46edc958bc02b1fdb8fef Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 2 Sep 2020 13:39:12 -0400 Subject: Fix Condition authoring. --- global.json | 2 +- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 8 +-- src/wixlib/UtilExtension_Platform.wxi | 65 +++++++++++----------- 3 files changed, 37 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index efa9830c..c34f8a83 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0153" + "WixToolset.Sdk": "4.0.0-build-0154" }, "sdk": { "allowPrerelease": false diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 0125dcc1..101d71e8 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -121,11 +121,11 @@ namespace WixToolsetTest.Util "CustomAction:Wix4ConfigureEventManifestUnregister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestUnregister\t", "CustomAction:Wix4ExecXmlFile_A64\t11265\tWix4UtilCA_A64\tExecXmlFile\t", "CustomAction:Wix4ExecXmlFileRollback_A64\t11521\tWix4UtilCA_A64\tExecXmlFileRollback\t", - "CustomAction:Wix4RegisterEventManifest_A64\t3073\tWix4UtilCA_A64\tCAQuietExec\t", - "CustomAction:Wix4RollbackRegisterEventManifest_A64\t3393\tWix4UtilCA_A64\tCAQuietExec\t", - "CustomAction:Wix4RollbackUnregisterEventManifest_A64\t3329\tWix4UtilCA_A64\tCAQuietExec\t", + "CustomAction:Wix4RegisterEventManifest_A64\t3073\tWix4UtilCA_A64\tWixQuietExec\t", + "CustomAction:Wix4RollbackRegisterEventManifest_A64\t3393\tWix4UtilCA_A64\tWixQuietExec\t", + "CustomAction:Wix4RollbackUnregisterEventManifest_A64\t3329\tWix4UtilCA_A64\tWixQuietExec\t", "CustomAction:Wix4SchedXmlFile_A64\t1\tWix4UtilCA_A64\tSchedXmlFile\t", - "CustomAction:Wix4UnregisterEventManifest_A64\t3137\tWix4UtilCA_A64\tCAQuietExec\t", + "CustomAction:Wix4UnregisterEventManifest_A64\t3137\tWix4UtilCA_A64\tWixQuietExec\t", "Wix4EventManifest:Manifest.dll\t[#Manifest.dll]", "Wix4XmlFile:Config_Manifest.dllMessageFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@messageFileName[\\]]\tmessageFileName\t[Manifest.dll]\t4100\tManifest.dll\t", "Wix4XmlFile:Config_Manifest.dllResourceFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@resourceFileName[\\]]\tresourceFileName\t[Manifest.dll]\t4100\tManifest.dll\t", diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index 5fb1d0ae..c3a5d1d6 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -1,5 +1,4 @@ - - + @@ -9,7 +8,7 @@ - WIXFAILWHENDEFERRED=1 AND VersionNT > 400 + @@ -33,7 +32,7 @@ - NEWERVERSIONDETECTED AND VersionNT > 400 + @@ -103,7 +102,7 @@ - NOT REMOVE~="ALL" AND VersionNT > 400 + @@ -113,7 +112,7 @@ - VersionNT > 400 + @@ -135,7 +134,7 @@ - VersionNT > 400 + @@ -150,8 +149,8 @@ - VersionNT > 400 - VersionNT > 400 + + @@ -166,8 +165,8 @@ - VersionNT > 400 - VersionNT > 400 + + @@ -182,36 +181,36 @@ - VersionNT > 400 - VersionNT > 400 + + - - - - + + + + - VersionNT > 400 - VersionNT > 400 + + - - - - + + + + - VersionNT > 400 - VersionNT > 400 + + @@ -222,7 +221,7 @@ - NOT REMOVE~="ALL" AND VersionNT > 400 + @@ -246,7 +245,7 @@ - VersionNT > 400 + @@ -258,7 +257,7 @@ - VersionNT > 400 + @@ -268,9 +267,9 @@ - VersionNT > 400 - VersionNT > 400 - VersionNT > 400 + + + @@ -284,8 +283,8 @@ - NOT REMOVE~="ALL" AND VersionNT > 400 - VersionNT > 400 + + -- cgit v1.2.3-55-g6feb From d672d9e0eaee21f354cbeaa177ddf074edeb665d Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 6 Sep 2020 21:24:04 -0400 Subject: Replace BinaryKey with BinaryRef and FileKey with FileRef. --- src/wixext/UtilCompiler.cs | 4 +- src/wixext/WixToolset.Util.wixext.csproj | 1 - src/wixext/WixToolset.Util.wixext.nuspec | 1 - src/wixext/util.cs | 11463 ----------------------------- src/wixext/util.xsd | 1858 ----- 5 files changed, 2 insertions(+), 13325 deletions(-) delete mode 100644 src/wixext/util.cs delete mode 100644 src/wixext/util.xsd (limited to 'src') diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index a454951e..8953cfcd 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2318,7 +2318,7 @@ namespace WixToolset.Util { switch (attrib.Name.LocalName) { - case "BinaryKey": + case "BinaryRef": binaryId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; default: @@ -2336,7 +2336,7 @@ namespace WixToolset.Util if (null == binaryId) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryKey")); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryRef")); } if (!this.Messaging.EncounteredError) diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 022b9bb7..3e4278bd 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -15,7 +15,6 @@ - diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec index d1308695..0db3f613 100644 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ b/src/wixext/WixToolset.Util.wixext.nuspec @@ -18,7 +18,6 @@ - diff --git a/src/wixext/util.cs b/src/wixext/util.cs deleted file mode 100644 index 7dabb3d1..00000000 --- a/src/wixext/util.cs +++ /dev/null @@ -1,11463 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace WixToolset.Util.Serialize -{ -#if TODO_CONSIDER_DECOMPILER - using System; - using System.CodeDom.Compiler; - using System.Collections; - using System.Diagnostics.CodeAnalysis; - using System.Globalization; - using System.Xml; - using WixToolset.Data.Serialize; - - - /// - /// Values of this type will either be "yes" or "no". - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum YesNoType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - no, - - yes, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public class Enums - { - - /// - /// Parses a YesNoType from a string. - /// - public static YesNoType ParseYesNoType(string value) - { - YesNoType parsedValue; - Enums.TryParseYesNoType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a YesNoType from a string. - /// - public static bool TryParseYesNoType(string value, out YesNoType parsedValue) - { - parsedValue = YesNoType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("no" == value)) - { - parsedValue = YesNoType.no; - } - else - { - if (("yes" == value)) - { - parsedValue = YesNoType.yes; - } - else - { - parsedValue = YesNoType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Parses a PerformanceCounterLanguageType from a string. - /// - public static PerformanceCounterLanguageType ParsePerformanceCounterLanguageType(string value) - { - PerformanceCounterLanguageType parsedValue; - Enums.TryParsePerformanceCounterLanguageType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a PerformanceCounterLanguageType from a string. - /// - public static bool TryParsePerformanceCounterLanguageType(string value, out PerformanceCounterLanguageType parsedValue) - { - parsedValue = PerformanceCounterLanguageType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("afrikaans" == value)) - { - parsedValue = PerformanceCounterLanguageType.afrikaans; - } - else - { - if (("albanian" == value)) - { - parsedValue = PerformanceCounterLanguageType.albanian; - } - else - { - if (("arabic" == value)) - { - parsedValue = PerformanceCounterLanguageType.arabic; - } - else - { - if (("armenian" == value)) - { - parsedValue = PerformanceCounterLanguageType.armenian; - } - else - { - if (("assamese" == value)) - { - parsedValue = PerformanceCounterLanguageType.assamese; - } - else - { - if (("azeri" == value)) - { - parsedValue = PerformanceCounterLanguageType.azeri; - } - else - { - if (("basque" == value)) - { - parsedValue = PerformanceCounterLanguageType.basque; - } - else - { - if (("belarusian" == value)) - { - parsedValue = PerformanceCounterLanguageType.belarusian; - } - else - { - if (("bengali" == value)) - { - parsedValue = PerformanceCounterLanguageType.bengali; - } - else - { - if (("bulgarian" == value)) - { - parsedValue = PerformanceCounterLanguageType.bulgarian; - } - else - { - if (("catalan" == value)) - { - parsedValue = PerformanceCounterLanguageType.catalan; - } - else - { - if (("chinese" == value)) - { - parsedValue = PerformanceCounterLanguageType.chinese; - } - else - { - if (("croatian" == value)) - { - parsedValue = PerformanceCounterLanguageType.croatian; - } - else - { - if (("czech" == value)) - { - parsedValue = PerformanceCounterLanguageType.czech; - } - else - { - if (("danish" == value)) - { - parsedValue = PerformanceCounterLanguageType.danish; - } - else - { - if (("divehi" == value)) - { - parsedValue = PerformanceCounterLanguageType.divehi; - } - else - { - if (("dutch" == value)) - { - parsedValue = PerformanceCounterLanguageType.dutch; - } - else - { - if (("english" == value)) - { - parsedValue = PerformanceCounterLanguageType.english; - } - else - { - if (("estonian" == value)) - { - parsedValue = PerformanceCounterLanguageType.estonian; - } - else - { - if (("faeroese" == value)) - { - parsedValue = PerformanceCounterLanguageType.faeroese; - } - else - { - if (("farsi" == value)) - { - parsedValue = PerformanceCounterLanguageType.farsi; - } - else - { - if (("finnish" == value)) - { - parsedValue = PerformanceCounterLanguageType.finnish; - } - else - { - if (("french" == value)) - { - parsedValue = PerformanceCounterLanguageType.french; - } - else - { - if (("galician" == value)) - { - parsedValue = PerformanceCounterLanguageType.galician; - } - else - { - if (("georgian" == value)) - { - parsedValue = PerformanceCounterLanguageType.georgian; - } - else - { - if (("german" == value)) - { - parsedValue = PerformanceCounterLanguageType.german; - } - else - { - if (("greek" == value)) - { - parsedValue = PerformanceCounterLanguageType.greek; - } - else - { - if (("gujarati" == value)) - { - parsedValue = PerformanceCounterLanguageType.gujarati; - } - else - { - if (("hebrew" == value)) - { - parsedValue = PerformanceCounterLanguageType.hebrew; - } - else - { - if (("hindi" == value)) - { - parsedValue = PerformanceCounterLanguageType.hindi; - } - else - { - if (("hungarian" == value)) - { - parsedValue = PerformanceCounterLanguageType.hungarian; - } - else - { - if (("icelandic" == value)) - { - parsedValue = PerformanceCounterLanguageType.icelandic; - } - else - { - if (("indonesian" == value)) - { - parsedValue = PerformanceCounterLanguageType.indonesian; - } - else - { - if (("italian" == value)) - { - parsedValue = PerformanceCounterLanguageType.italian; - } - else - { - if (("japanese" == value)) - { - parsedValue = PerformanceCounterLanguageType.japanese; - } - else - { - if (("kannada" == value)) - { - parsedValue = PerformanceCounterLanguageType.kannada; - } - else - { - if (("kashmiri" == value)) - { - parsedValue = PerformanceCounterLanguageType.kashmiri; - } - else - { - if (("kazak" == value)) - { - parsedValue = PerformanceCounterLanguageType.kazak; - } - else - { - if (("konkani" == value)) - { - parsedValue = PerformanceCounterLanguageType.konkani; - } - else - { - if (("korean" == value)) - { - parsedValue = PerformanceCounterLanguageType.korean; - } - else - { - if (("kyrgyz" == value)) - { - parsedValue = PerformanceCounterLanguageType.kyrgyz; - } - else - { - if (("latvian" == value)) - { - parsedValue = PerformanceCounterLanguageType.latvian; - } - else - { - if (("lithuanian" == value)) - { - parsedValue = PerformanceCounterLanguageType.lithuanian; - } - else - { - if (("macedonian" == value)) - { - parsedValue = PerformanceCounterLanguageType.macedonian; - } - else - { - if (("malay" == value)) - { - parsedValue = PerformanceCounterLanguageType.malay; - } - else - { - if (("malayalam" == value)) - { - parsedValue = PerformanceCounterLanguageType.malayalam; - } - else - { - if (("manipuri" == value)) - { - parsedValue = PerformanceCounterLanguageType.manipuri; - } - else - { - if (("marathi" == value)) - { - parsedValue = PerformanceCounterLanguageType.marathi; - } - else - { - if (("mongolian" == value)) - { - parsedValue = PerformanceCounterLanguageType.mongolian; - } - else - { - if (("nepali" == value)) - { - parsedValue = PerformanceCounterLanguageType.nepali; - } - else - { - if (("norwegian" == value)) - { - parsedValue = PerformanceCounterLanguageType.norwegian; - } - else - { - if (("oriya" == value)) - { - parsedValue = PerformanceCounterLanguageType.oriya; - } - else - { - if (("polish" == value)) - { - parsedValue = PerformanceCounterLanguageType.polish; - } - else - { - if (("portuguese" == value)) - { - parsedValue = PerformanceCounterLanguageType.portuguese; - } - else - { - if (("punjabi" == value)) - { - parsedValue = PerformanceCounterLanguageType.punjabi; - } - else - { - if (("romanian" == value)) - { - parsedValue = PerformanceCounterLanguageType.romanian; - } - else - { - if (("russian" == value)) - { - parsedValue = PerformanceCounterLanguageType.russian; - } - else - { - if (("sanskrit" == value)) - { - parsedValue = PerformanceCounterLanguageType.sanskrit; - } - else - { - if (("serbian" == value)) - { - parsedValue = PerformanceCounterLanguageType.serbian; - } - else - { - if (("sindhi" == value)) - { - parsedValue = PerformanceCounterLanguageType.sindhi; - } - else - { - if (("slovak" == value)) - { - parsedValue = PerformanceCounterLanguageType.slovak; - } - else - { - if (("slovenian" == value)) - { - parsedValue = PerformanceCounterLanguageType.slovenian; - } - else - { - if (("spanish" == value)) - { - parsedValue = PerformanceCounterLanguageType.spanish; - } - else - { - if (("swahili" == value)) - { - parsedValue = PerformanceCounterLanguageType.swahili; - } - else - { - if (("swedish" == value)) - { - parsedValue = PerformanceCounterLanguageType.swedish; - } - else - { - if (("syriac" == value)) - { - parsedValue = PerformanceCounterLanguageType.syriac; - } - else - { - if (("tamil" == value)) - { - parsedValue = PerformanceCounterLanguageType.tamil; - } - else - { - if (("tatar" == value)) - { - parsedValue = PerformanceCounterLanguageType.tatar; - } - else - { - if (("telugu" == value)) - { - parsedValue = PerformanceCounterLanguageType.telugu; - } - else - { - if (("thai" == value)) - { - parsedValue = PerformanceCounterLanguageType.thai; - } - else - { - if (("turkish" == value)) - { - parsedValue = PerformanceCounterLanguageType.turkish; - } - else - { - if (("ukrainian" == value)) - { - parsedValue = PerformanceCounterLanguageType.ukrainian; - } - else - { - if (("urdu" == value)) - { - parsedValue = PerformanceCounterLanguageType.urdu; - } - else - { - if (("uzbek" == value)) - { - parsedValue = PerformanceCounterLanguageType.uzbek; - } - else - { - if (("vietnamese" == value)) - { - parsedValue = PerformanceCounterLanguageType.vietnamese; - } - else - { - parsedValue = PerformanceCounterLanguageType.IllegalValue; - return false; - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - return true; - } - - /// - /// Parses a PerformanceCounterTypesType from a string. - /// - public static PerformanceCounterTypesType ParsePerformanceCounterTypesType(string value) - { - PerformanceCounterTypesType parsedValue; - Enums.TryParsePerformanceCounterTypesType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a PerformanceCounterTypesType from a string. - /// - public static bool TryParsePerformanceCounterTypesType(string value, out PerformanceCounterTypesType parsedValue) - { - parsedValue = PerformanceCounterTypesType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("averageBase" == value)) - { - parsedValue = PerformanceCounterTypesType.averageBase; - } - else - { - if (("averageCount64" == value)) - { - parsedValue = PerformanceCounterTypesType.averageCount64; - } - else - { - if (("averageTimer32" == value)) - { - parsedValue = PerformanceCounterTypesType.averageTimer32; - } - else - { - if (("counterDelta32" == value)) - { - parsedValue = PerformanceCounterTypesType.counterDelta32; - } - else - { - if (("counterTimerInverse" == value)) - { - parsedValue = PerformanceCounterTypesType.counterTimerInverse; - } - else - { - if (("sampleFraction" == value)) - { - parsedValue = PerformanceCounterTypesType.sampleFraction; - } - else - { - if (("timer100Ns" == value)) - { - parsedValue = PerformanceCounterTypesType.timer100Ns; - } - else - { - if (("counterTimer" == value)) - { - parsedValue = PerformanceCounterTypesType.counterTimer; - } - else - { - if (("rawFraction" == value)) - { - parsedValue = PerformanceCounterTypesType.rawFraction; - } - else - { - if (("timer100NsInverse" == value)) - { - parsedValue = PerformanceCounterTypesType.timer100NsInverse; - } - else - { - if (("counterMultiTimer" == value)) - { - parsedValue = PerformanceCounterTypesType.counterMultiTimer; - } - else - { - if (("counterMultiTimer100Ns" == value)) - { - parsedValue = PerformanceCounterTypesType.counterMultiTimer100Ns; - } - else - { - if (("counterMultiTimerInverse" == value)) - { - parsedValue = PerformanceCounterTypesType.counterMultiTimerInverse; - } - else - { - if (("counterMultiTimer100NsInverse" == value)) - { - parsedValue = PerformanceCounterTypesType.counterMultiTimer100NsInverse; - } - else - { - if (("elapsedTime" == value)) - { - parsedValue = PerformanceCounterTypesType.elapsedTime; - } - else - { - if (("sampleBase" == value)) - { - parsedValue = PerformanceCounterTypesType.sampleBase; - } - else - { - if (("rawBase" == value)) - { - parsedValue = PerformanceCounterTypesType.rawBase; - } - else - { - if (("counterMultiBase" == value)) - { - parsedValue = PerformanceCounterTypesType.counterMultiBase; - } - else - { - if (("rateOfCountsPerSecond64" == value)) - { - parsedValue = PerformanceCounterTypesType.rateOfCountsPerSecond64; - } - else - { - if (("rateOfCountsPerSecond32" == value)) - { - parsedValue = PerformanceCounterTypesType.rateOfCountsPerSecond32; - } - else - { - if (("countPerTimeInterval64" == value)) - { - parsedValue = PerformanceCounterTypesType.countPerTimeInterval64; - } - else - { - if (("countPerTimeInterval32" == value)) - { - parsedValue = PerformanceCounterTypesType.countPerTimeInterval32; - } - else - { - if (("sampleCounter" == value)) - { - parsedValue = PerformanceCounterTypesType.sampleCounter; - } - else - { - if (("counterDelta64" == value)) - { - parsedValue = PerformanceCounterTypesType.counterDelta64; - } - else - { - if (("numberOfItems64" == value)) - { - parsedValue = PerformanceCounterTypesType.numberOfItems64; - } - else - { - if (("numberOfItems32" == value)) - { - parsedValue = PerformanceCounterTypesType.numberOfItems32; - } - else - { - if (("numberOfItemsHEX64" == value)) - { - parsedValue = PerformanceCounterTypesType.numberOfItemsHEX64; - } - else - { - if (("numberOfItemsHEX32" == value)) - { - parsedValue = PerformanceCounterTypesType.numberOfItemsHEX32; - } - else - { - parsedValue = PerformanceCounterTypesType.IllegalValue; - return false; - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - return true; - } - } - - /// - /// Enumeration of valid languages for performance counters. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum PerformanceCounterLanguageType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - afrikaans, - - albanian, - - arabic, - - armenian, - - assamese, - - azeri, - - basque, - - belarusian, - - bengali, - - bulgarian, - - catalan, - - chinese, - - croatian, - - czech, - - danish, - - divehi, - - dutch, - - english, - - estonian, - - faeroese, - - farsi, - - finnish, - - french, - - galician, - - georgian, - - german, - - greek, - - gujarati, - - hebrew, - - hindi, - - hungarian, - - icelandic, - - indonesian, - - italian, - - japanese, - - kannada, - - kashmiri, - - kazak, - - konkani, - - korean, - - kyrgyz, - - latvian, - - lithuanian, - - macedonian, - - malay, - - malayalam, - - manipuri, - - marathi, - - mongolian, - - nepali, - - norwegian, - - oriya, - - polish, - - portuguese, - - punjabi, - - romanian, - - russian, - - sanskrit, - - serbian, - - sindhi, - - slovak, - - slovenian, - - spanish, - - swahili, - - swedish, - - syriac, - - tamil, - - tatar, - - telugu, - - thai, - - turkish, - - ukrainian, - - urdu, - - uzbek, - - vietnamese, - } - - /// - /// Enumeration of valid types for performance counters. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum PerformanceCounterTypesType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - averageBase, - - averageCount64, - - averageTimer32, - - counterDelta32, - - counterTimerInverse, - - sampleFraction, - - timer100Ns, - - counterTimer, - - rawFraction, - - timer100NsInverse, - - counterMultiTimer, - - counterMultiTimer100Ns, - - counterMultiTimerInverse, - - counterMultiTimer100NsInverse, - - elapsedTime, - - sampleBase, - - rawBase, - - counterMultiBase, - - rateOfCountsPerSecond64, - - rateOfCountsPerSecond32, - - countPerTimeInterval64, - - countPerTimeInterval32, - - sampleCounter, - - counterDelta64, - - numberOfItems64, - - numberOfItems32, - - numberOfItemsHEX64, - - numberOfItemsHEX32, - } - - /// - /// Closes applications or schedules a reboot if application cannot be closed. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class CloseApplication : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string targetField; - - private bool targetFieldSet; - - private string descriptionField; - - private bool descriptionFieldSet; - - private int sequenceField; - - private bool sequenceFieldSet; - - private YesNoType closeMessageField; - - private bool closeMessageFieldSet; - - private YesNoType endSessionMessageField; - - private bool endSessionMessageFieldSet; - - private YesNoType elevatedCloseMessageField; - - private bool elevatedCloseMessageFieldSet; - - private YesNoType elevatedEndSessionMessageField; - - private bool elevatedEndSessionMessageFieldSet; - - private YesNoType rebootPromptField; - - private bool rebootPromptFieldSet; - - private YesNoType promptToContinueField; - - private bool promptToContinueFieldSet; - - private string propertyField; - - private bool propertyFieldSet; - - private int terminateProcessField; - - private bool terminateProcessFieldSet; - - private int timeoutField; - - private bool timeoutFieldSet; - - private string contentField; - - private bool contentFieldSet; - - private ISchemaElement parentElement; - - /// - /// Identifier for the close application (primary key). If the Id is not specified, one will be generated. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the exectuable to be closed. This should only be the file name. - /// - public string Target - { - get - { - return this.targetField; - } - set - { - this.targetFieldSet = true; - this.targetField = value; - } - } - - /// - /// Description to show if application is running and needs to be closed. - /// - public string Description - { - get - { - return this.descriptionField; - } - set - { - this.descriptionFieldSet = true; - this.descriptionField = value; - } - } - - /// - /// Optionally orders the applications to be closed. - /// - public int Sequence - { - get - { - return this.sequenceField; - } - set - { - this.sequenceFieldSet = true; - this.sequenceField = value; - } - } - - /// - /// Optionally sends a close message to the application. Default is no. - /// - public YesNoType CloseMessage - { - get - { - return this.closeMessageField; - } - set - { - this.closeMessageFieldSet = true; - this.closeMessageField = value; - } - } - - /// - /// Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application. Default is "no". - /// - public YesNoType EndSessionMessage - { - get - { - return this.endSessionMessageField; - } - set - { - this.endSessionMessageFieldSet = true; - this.endSessionMessageField = value; - } - } - - /// - /// Optionally sends a close message to the application from deffered action without impersonation. Default is no. - /// - public YesNoType ElevatedCloseMessage - { - get - { - return this.elevatedCloseMessageField; - } - set - { - this.elevatedCloseMessageFieldSet = true; - this.elevatedCloseMessageField = value; - } - } - - /// - /// Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application from a deffered action without impersonation. Default is "no". - /// - public YesNoType ElevatedEndSessionMessage - { - get - { - return this.elevatedEndSessionMessageField; - } - set - { - this.elevatedEndSessionMessageFieldSet = true; - this.elevatedEndSessionMessageField = value; - } - } - - /// - /// Optionally prompts for reboot if application is still running. The default is "yes". The TerminateProcess attribute must be "no" or not specified if this attribute is "yes". - /// - public YesNoType RebootPrompt - { - get - { - return this.rebootPromptField; - } - set - { - this.rebootPromptFieldSet = true; - this.rebootPromptField = value; - } - } - - /// - /// When this attribute is set to "yes", the user will be prompted when the application is still running. The Description attribute must contain the message to - /// display in the prompt. The prompt occurs before executing any of the other options and gives the options to "Abort", "Retry", or "Ignore". Abort will cancel - /// the install. Retry will attempt the check again and if the application is still running, prompt again. "Ignore" will continue and execute any other options - /// set on the CloseApplication element. The default is "no". - /// - public YesNoType PromptToContinue - { - get - { - return this.promptToContinueField; - } - set - { - this.promptToContinueFieldSet = true; - this.promptToContinueField = value; - } - } - - /// - /// Property to be set if application is still running. Useful for launch conditions or to conditionalize custom UI to ask user to shut down apps. - /// - public string Property - { - get - { - return this.propertyField; - } - set - { - this.propertyFieldSet = true; - this.propertyField = value; - } - } - - /// - /// Attempts to terminates process and return the specified exit code if application is still running after sending any requested close and/or end session messages. - /// If this attribute is specified, the RebootPrompt attribute must be "no". The default is "no". - /// - public int TerminateProcess - { - get - { - return this.terminateProcessField; - } - set - { - this.terminateProcessFieldSet = true; - this.terminateProcessField = value; - } - } - - /// - /// Optional time in seconds to wait for the application to exit after the close and/or end session messages. If the application is still running after the timeout then - /// the RebootPrompt or TerminateProcess attributes will be considered. The default value is "5" seconds. - /// - public int Timeout - { - get - { - return this.timeoutField; - } - set - { - this.timeoutFieldSet = true; - this.timeoutField = value; - } - } - - /// - /// Condition that determines if the application should be closed. Must be blank or evaluate to true - /// for the application to be scheduled for closing. - /// - public string Content - { - get - { - return this.contentField; - } - set - { - this.contentFieldSet = true; - this.contentField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("CloseApplication", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.targetFieldSet) - { - writer.WriteAttributeString("Target", this.targetField); - } - if (this.descriptionFieldSet) - { - writer.WriteAttributeString("Description", this.descriptionField); - } - if (this.sequenceFieldSet) - { - writer.WriteAttributeString("Sequence", this.sequenceField.ToString(CultureInfo.InvariantCulture)); - } - if (this.closeMessageFieldSet) - { - if ((this.closeMessageField == YesNoType.no)) - { - writer.WriteAttributeString("CloseMessage", "no"); - } - if ((this.closeMessageField == YesNoType.yes)) - { - writer.WriteAttributeString("CloseMessage", "yes"); - } - } - if (this.endSessionMessageFieldSet) - { - if ((this.endSessionMessageField == YesNoType.no)) - { - writer.WriteAttributeString("EndSessionMessage", "no"); - } - if ((this.endSessionMessageField == YesNoType.yes)) - { - writer.WriteAttributeString("EndSessionMessage", "yes"); - } - } - if (this.elevatedCloseMessageFieldSet) - { - if ((this.elevatedCloseMessageField == YesNoType.no)) - { - writer.WriteAttributeString("ElevatedCloseMessage", "no"); - } - if ((this.elevatedCloseMessageField == YesNoType.yes)) - { - writer.WriteAttributeString("ElevatedCloseMessage", "yes"); - } - } - if (this.elevatedEndSessionMessageFieldSet) - { - if ((this.elevatedEndSessionMessageField == YesNoType.no)) - { - writer.WriteAttributeString("ElevatedEndSessionMessage", "no"); - } - if ((this.elevatedEndSessionMessageField == YesNoType.yes)) - { - writer.WriteAttributeString("ElevatedEndSessionMessage", "yes"); - } - } - if (this.rebootPromptFieldSet) - { - if ((this.rebootPromptField == YesNoType.no)) - { - writer.WriteAttributeString("RebootPrompt", "no"); - } - if ((this.rebootPromptField == YesNoType.yes)) - { - writer.WriteAttributeString("RebootPrompt", "yes"); - } - } - if (this.promptToContinueFieldSet) - { - if ((this.promptToContinueField == YesNoType.no)) - { - writer.WriteAttributeString("PromptToContinue", "no"); - } - if ((this.promptToContinueField == YesNoType.yes)) - { - writer.WriteAttributeString("PromptToContinue", "yes"); - } - } - if (this.propertyFieldSet) - { - writer.WriteAttributeString("Property", this.propertyField); - } - if (this.terminateProcessFieldSet) - { - writer.WriteAttributeString("TerminateProcess", this.terminateProcessField.ToString(CultureInfo.InvariantCulture)); - } - if (this.timeoutFieldSet) - { - writer.WriteAttributeString("Timeout", this.timeoutField.ToString(CultureInfo.InvariantCulture)); - } - if (this.contentFieldSet) - { - writer.WriteString(this.contentField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Target" == name)) - { - this.targetField = value; - this.targetFieldSet = true; - } - if (("Description" == name)) - { - this.descriptionField = value; - this.descriptionFieldSet = true; - } - if (("Sequence" == name)) - { - this.sequenceField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.sequenceFieldSet = true; - } - if (("CloseMessage" == name)) - { - this.closeMessageField = Enums.ParseYesNoType(value); - this.closeMessageFieldSet = true; - } - if (("EndSessionMessage" == name)) - { - this.endSessionMessageField = Enums.ParseYesNoType(value); - this.endSessionMessageFieldSet = true; - } - if (("ElevatedCloseMessage" == name)) - { - this.elevatedCloseMessageField = Enums.ParseYesNoType(value); - this.elevatedCloseMessageFieldSet = true; - } - if (("ElevatedEndSessionMessage" == name)) - { - this.elevatedEndSessionMessageField = Enums.ParseYesNoType(value); - this.elevatedEndSessionMessageFieldSet = true; - } - if (("RebootPrompt" == name)) - { - this.rebootPromptField = Enums.ParseYesNoType(value); - this.rebootPromptFieldSet = true; - } - if (("PromptToContinue" == name)) - { - this.promptToContinueField = Enums.ParseYesNoType(value); - this.promptToContinueFieldSet = true; - } - if (("Property" == name)) - { - this.propertyField = value; - this.propertyFieldSet = true; - } - if (("TerminateProcess" == name)) - { - this.terminateProcessField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.terminateProcessFieldSet = true; - } - if (("Timeout" == name)) - { - this.timeoutField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.timeoutFieldSet = true; - } - if (("Content" == name)) - { - this.contentField = value; - this.contentFieldSet = true; - } - } - } - - /// - /// Describes a component search. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class ComponentSearch : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string variableField; - - private bool variableFieldSet; - - private string conditionField; - - private bool conditionFieldSet; - - private string afterField; - - private bool afterFieldSet; - - private string guidField; - - private bool guidFieldSet; - - private string productCodeField; - - private bool productCodeFieldSet; - - private ResultType resultField; - - private bool resultFieldSet; - - private ISchemaElement parentElement; - - /// - /// Id of the search for ordering and dependency. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the variable in which to place the result of the search. - /// - public string Variable - { - get - { - return this.variableField; - } - set - { - this.variableFieldSet = true; - this.variableField = value; - } - } - - /// - /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. - /// - public string Condition - { - get - { - return this.conditionField; - } - set - { - this.conditionFieldSet = true; - this.conditionField = value; - } - } - - /// - /// Id of the search that this one should come after. - /// - public string After - { - get - { - return this.afterField; - } - set - { - this.afterFieldSet = true; - this.afterField = value; - } - } - - /// - /// Component to search for. - /// - public string Guid - { - get - { - return this.guidField; - } - set - { - this.guidFieldSet = true; - this.guidField = value; - } - } - - /// - /// Optional ProductCode to determine if the component is installed. - /// - public string ProductCode - { - get - { - return this.productCodeField; - } - set - { - this.productCodeFieldSet = true; - this.productCodeField = value; - } - } - - /// - /// Rather than saving the matching key path into the variable, a ComponentSearch can save an attribute of the component instead. - /// - public ResultType Result - { - get - { - return this.resultField; - } - set - { - this.resultFieldSet = true; - this.resultField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a ResultType from a string. - /// - public static ResultType ParseResultType(string value) - { - ResultType parsedValue; - ComponentSearch.TryParseResultType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ResultType from a string. - /// - public static bool TryParseResultType(string value, out ResultType parsedValue) - { - parsedValue = ResultType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("directory" == value)) - { - parsedValue = ResultType.directory; - } - else - { - if (("state" == value)) - { - parsedValue = ResultType.state; - } - else - { - if (("keyPath" == value)) - { - parsedValue = ResultType.keyPath; - } - else - { - parsedValue = ResultType.IllegalValue; - return false; - } - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("ComponentSearch", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.variableFieldSet) - { - writer.WriteAttributeString("Variable", this.variableField); - } - if (this.conditionFieldSet) - { - writer.WriteAttributeString("Condition", this.conditionField); - } - if (this.afterFieldSet) - { - writer.WriteAttributeString("After", this.afterField); - } - if (this.guidFieldSet) - { - writer.WriteAttributeString("Guid", this.guidField); - } - if (this.productCodeFieldSet) - { - writer.WriteAttributeString("ProductCode", this.productCodeField); - } - if (this.resultFieldSet) - { - if ((this.resultField == ResultType.directory)) - { - writer.WriteAttributeString("Result", "directory"); - } - if ((this.resultField == ResultType.state)) - { - writer.WriteAttributeString("Result", "state"); - } - if ((this.resultField == ResultType.keyPath)) - { - writer.WriteAttributeString("Result", "keyPath"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Variable" == name)) - { - this.variableField = value; - this.variableFieldSet = true; - } - if (("Condition" == name)) - { - this.conditionField = value; - this.conditionFieldSet = true; - } - if (("After" == name)) - { - this.afterField = value; - this.afterFieldSet = true; - } - if (("Guid" == name)) - { - this.guidField = value; - this.guidFieldSet = true; - } - if (("ProductCode" == name)) - { - this.productCodeField = value; - this.productCodeFieldSet = true; - } - if (("Result" == name)) - { - this.resultField = ComponentSearch.ParseResultType(value); - this.resultFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ResultType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Saves the parent directory for the component's file key path; other types of key path are returned unmodified. - /// - directory, - - /// - /// Saves the state of the component: absent (2), locally installed (3), will run from source (4), or installed in default location (either local or from source) (5) - /// - state, - - /// - /// Saves the key path of the component if installed. This is the default. - /// - keyPath, - } - } - - /// - /// References a ComponentSearch. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class ComponentSearchRef : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private ISchemaElement parentElement; - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("ComponentSearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - } - } - - /// - /// Describes a directory search. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class DirectorySearch : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string variableField; - - private bool variableFieldSet; - - private string conditionField; - - private bool conditionFieldSet; - - private string afterField; - - private bool afterFieldSet; - - private string pathField; - - private bool pathFieldSet; - - private ResultType resultField; - - private bool resultFieldSet; - - private ISchemaElement parentElement; - - /// - /// Id of the search for ordering and dependency. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the variable in which to place the result of the search. - /// - public string Variable - { - get - { - return this.variableField; - } - set - { - this.variableFieldSet = true; - this.variableField = value; - } - } - - /// - /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. - /// - public string Condition - { - get - { - return this.conditionField; - } - set - { - this.conditionFieldSet = true; - this.conditionField = value; - } - } - - /// - /// Id of the search that this one should come after. - /// - public string After - { - get - { - return this.afterField; - } - set - { - this.afterFieldSet = true; - this.afterField = value; - } - } - - /// - /// Directory path to search for. - /// - public string Path - { - get - { - return this.pathField; - } - set - { - this.pathFieldSet = true; - this.pathField = value; - } - } - - /// - /// Rather than saving the matching directory path into the variable, a DirectorySearch can save an - /// attribute of the matching directory instead. - /// - public ResultType Result - { - get - { - return this.resultField; - } - set - { - this.resultFieldSet = true; - this.resultField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a ResultType from a string. - /// - public static ResultType ParseResultType(string value) - { - ResultType parsedValue; - DirectorySearch.TryParseResultType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ResultType from a string. - /// - public static bool TryParseResultType(string value, out ResultType parsedValue) - { - parsedValue = ResultType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("exists" == value)) - { - parsedValue = ResultType.exists; - } - else - { - parsedValue = ResultType.IllegalValue; - return false; - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("DirectorySearch", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.variableFieldSet) - { - writer.WriteAttributeString("Variable", this.variableField); - } - if (this.conditionFieldSet) - { - writer.WriteAttributeString("Condition", this.conditionField); - } - if (this.afterFieldSet) - { - writer.WriteAttributeString("After", this.afterField); - } - if (this.pathFieldSet) - { - writer.WriteAttributeString("Path", this.pathField); - } - if (this.resultFieldSet) - { - if ((this.resultField == ResultType.exists)) - { - writer.WriteAttributeString("Result", "exists"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Variable" == name)) - { - this.variableField = value; - this.variableFieldSet = true; - } - if (("Condition" == name)) - { - this.conditionField = value; - this.conditionFieldSet = true; - } - if (("After" == name)) - { - this.afterField = value; - this.afterFieldSet = true; - } - if (("Path" == name)) - { - this.pathField = value; - this.pathFieldSet = true; - } - if (("Result" == name)) - { - this.resultField = DirectorySearch.ParseResultType(value); - this.resultFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ResultType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Saves true if a matching directory is found; false otherwise. - /// - exists, - } - } - - /// - /// References a DirectorySearch. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class DirectorySearchRef : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private ISchemaElement parentElement; - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("DirectorySearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - } - } - - /// - /// Creates an event source. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class EventSource : ISchemaElement, ISetAttributes - { - - private int categoryCountField; - - private bool categoryCountFieldSet; - - private string categoryMessageFileField; - - private bool categoryMessageFileFieldSet; - - private string eventMessageFileField; - - private bool eventMessageFileFieldSet; - - private YesNoType keyPathField; - - private bool keyPathFieldSet; - - private string logField; - - private bool logFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string parameterMessageFileField; - - private bool parameterMessageFileFieldSet; - - private YesNoType supportsErrorsField; - - private bool supportsErrorsFieldSet; - - private YesNoType supportsFailureAuditsField; - - private bool supportsFailureAuditsFieldSet; - - private YesNoType supportsInformationalsField; - - private bool supportsInformationalsFieldSet; - - private YesNoType supportsSuccessAuditsField; - - private bool supportsSuccessAuditsFieldSet; - - private YesNoType supportsWarningsField; - - private bool supportsWarningsFieldSet; - - private ISchemaElement parentElement; - - /// - /// The number of categories in CategoryMessageFile. CategoryMessageFile - /// must be specified too. - /// - public int CategoryCount - { - get - { - return this.categoryCountField; - } - set - { - this.categoryCountFieldSet = true; - this.categoryCountField = value; - } - } - - /// - /// Name of the category message file. CategoryCount must be specified too. - /// Note that this is a formatted field, so you can use [#fileId] syntax to - /// refer to a file being installed. It is also written as a REG_EXPAND_SZ - /// string, so you can use %environment_variable% syntax to refer to a file - /// already present on the user's machine. - /// - public string CategoryMessageFile - { - get - { - return this.categoryMessageFileField; - } - set - { - this.categoryMessageFileFieldSet = true; - this.categoryMessageFileField = value; - } - } - - /// - /// Name of the event message file. - /// Note that this is a formatted field, so you can use [#fileId] syntax to - /// refer to a file being installed. It is also written as a REG_EXPAND_SZ - /// string, so you can use %environment_variable% syntax to refer to a file - /// already present on the user's machine. - /// - public string EventMessageFile - { - get - { - return this.eventMessageFileField; - } - set - { - this.eventMessageFileFieldSet = true; - this.eventMessageFileField = value; - } - } - - /// - /// Marks the EventSource registry as the key path of the component it belongs to. - /// - public YesNoType KeyPath - { - get - { - return this.keyPathField; - } - set - { - this.keyPathFieldSet = true; - this.keyPathField = value; - } - } - - /// - /// Name of the event source's log. - /// - public string Log - { - get - { - return this.logField; - } - set - { - this.logFieldSet = true; - this.logField = value; - } - } - - /// - /// Name of the event source. - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// Name of the parameter message file. - /// Note that this is a formatted field, so you can use [#fileId] syntax to - /// refer to a file being installed. It is also written as a REG_EXPAND_SZ - /// string, so you can use %environment_variable% syntax to refer to a file - /// already present on the user's machine. - /// - public string ParameterMessageFile - { - get - { - return this.parameterMessageFileField; - } - set - { - this.parameterMessageFileFieldSet = true; - this.parameterMessageFileField = value; - } - } - - /// - /// Equivalent to EVENTLOG_ERROR_TYPE. - /// - public YesNoType SupportsErrors - { - get - { - return this.supportsErrorsField; - } - set - { - this.supportsErrorsFieldSet = true; - this.supportsErrorsField = value; - } - } - - /// - /// Equivalent to EVENTLOG_AUDIT_FAILURE. - /// - public YesNoType SupportsFailureAudits - { - get - { - return this.supportsFailureAuditsField; - } - set - { - this.supportsFailureAuditsFieldSet = true; - this.supportsFailureAuditsField = value; - } - } - - /// - /// Equivalent to EVENTLOG_INFORMATION_TYPE. - /// - public YesNoType SupportsInformationals - { - get - { - return this.supportsInformationalsField; - } - set - { - this.supportsInformationalsFieldSet = true; - this.supportsInformationalsField = value; - } - } - - /// - /// Equivalent to EVENTLOG_AUDIT_SUCCESS. - /// - public YesNoType SupportsSuccessAudits - { - get - { - return this.supportsSuccessAuditsField; - } - set - { - this.supportsSuccessAuditsFieldSet = true; - this.supportsSuccessAuditsField = value; - } - } - - /// - /// Equivalent to EVENTLOG_WARNING_TYPE. - /// - public YesNoType SupportsWarnings - { - get - { - return this.supportsWarningsField; - } - set - { - this.supportsWarningsFieldSet = true; - this.supportsWarningsField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("EventSource", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.categoryCountFieldSet) - { - writer.WriteAttributeString("CategoryCount", this.categoryCountField.ToString(CultureInfo.InvariantCulture)); - } - if (this.categoryMessageFileFieldSet) - { - writer.WriteAttributeString("CategoryMessageFile", this.categoryMessageFileField); - } - if (this.eventMessageFileFieldSet) - { - writer.WriteAttributeString("EventMessageFile", this.eventMessageFileField); - } - if (this.keyPathFieldSet) - { - if ((this.keyPathField == YesNoType.no)) - { - writer.WriteAttributeString("KeyPath", "no"); - } - if ((this.keyPathField == YesNoType.yes)) - { - writer.WriteAttributeString("KeyPath", "yes"); - } - } - if (this.logFieldSet) - { - writer.WriteAttributeString("Log", this.logField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.parameterMessageFileFieldSet) - { - writer.WriteAttributeString("ParameterMessageFile", this.parameterMessageFileField); - } - if (this.supportsErrorsFieldSet) - { - if ((this.supportsErrorsField == YesNoType.no)) - { - writer.WriteAttributeString("SupportsErrors", "no"); - } - if ((this.supportsErrorsField == YesNoType.yes)) - { - writer.WriteAttributeString("SupportsErrors", "yes"); - } - } - if (this.supportsFailureAuditsFieldSet) - { - if ((this.supportsFailureAuditsField == YesNoType.no)) - { - writer.WriteAttributeString("SupportsFailureAudits", "no"); - } - if ((this.supportsFailureAuditsField == YesNoType.yes)) - { - writer.WriteAttributeString("SupportsFailureAudits", "yes"); - } - } - if (this.supportsInformationalsFieldSet) - { - if ((this.supportsInformationalsField == YesNoType.no)) - { - writer.WriteAttributeString("SupportsInformationals", "no"); - } - if ((this.supportsInformationalsField == YesNoType.yes)) - { - writer.WriteAttributeString("SupportsInformationals", "yes"); - } - } - if (this.supportsSuccessAuditsFieldSet) - { - if ((this.supportsSuccessAuditsField == YesNoType.no)) - { - writer.WriteAttributeString("SupportsSuccessAudits", "no"); - } - if ((this.supportsSuccessAuditsField == YesNoType.yes)) - { - writer.WriteAttributeString("SupportsSuccessAudits", "yes"); - } - } - if (this.supportsWarningsFieldSet) - { - if ((this.supportsWarningsField == YesNoType.no)) - { - writer.WriteAttributeString("SupportsWarnings", "no"); - } - if ((this.supportsWarningsField == YesNoType.yes)) - { - writer.WriteAttributeString("SupportsWarnings", "yes"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("CategoryCount" == name)) - { - this.categoryCountField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.categoryCountFieldSet = true; - } - if (("CategoryMessageFile" == name)) - { - this.categoryMessageFileField = value; - this.categoryMessageFileFieldSet = true; - } - if (("EventMessageFile" == name)) - { - this.eventMessageFileField = value; - this.eventMessageFileFieldSet = true; - } - if (("KeyPath" == name)) - { - this.keyPathField = Enums.ParseYesNoType(value); - this.keyPathFieldSet = true; - } - if (("Log" == name)) - { - this.logField = value; - this.logFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("ParameterMessageFile" == name)) - { - this.parameterMessageFileField = value; - this.parameterMessageFileFieldSet = true; - } - if (("SupportsErrors" == name)) - { - this.supportsErrorsField = Enums.ParseYesNoType(value); - this.supportsErrorsFieldSet = true; - } - if (("SupportsFailureAudits" == name)) - { - this.supportsFailureAuditsField = Enums.ParseYesNoType(value); - this.supportsFailureAuditsFieldSet = true; - } - if (("SupportsInformationals" == name)) - { - this.supportsInformationalsField = Enums.ParseYesNoType(value); - this.supportsInformationalsFieldSet = true; - } - if (("SupportsSuccessAudits" == name)) - { - this.supportsSuccessAuditsField = Enums.ParseYesNoType(value); - this.supportsSuccessAuditsFieldSet = true; - } - if (("SupportsWarnings" == name)) - { - this.supportsWarningsField = Enums.ParseYesNoType(value); - this.supportsWarningsFieldSet = true; - } - } - } - - /// - /// Describes a file search. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class FileSearch : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string variableField; - - private bool variableFieldSet; - - private string conditionField; - - private bool conditionFieldSet; - - private string afterField; - - private bool afterFieldSet; - - private string pathField; - - private bool pathFieldSet; - - private ResultType resultField; - - private bool resultFieldSet; - - private ISchemaElement parentElement; - - /// - /// Id of the search for ordering and dependency. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the variable in which to place the result of the search. - /// - public string Variable - { - get - { - return this.variableField; - } - set - { - this.variableFieldSet = true; - this.variableField = value; - } - } - - /// - /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. - /// - public string Condition - { - get - { - return this.conditionField; - } - set - { - this.conditionFieldSet = true; - this.conditionField = value; - } - } - - /// - /// Id of the search that this one should come after. - /// - public string After - { - get - { - return this.afterField; - } - set - { - this.afterFieldSet = true; - this.afterField = value; - } - } - - /// - /// File path to search for. - /// - public string Path - { - get - { - return this.pathField; - } - set - { - this.pathFieldSet = true; - this.pathField = value; - } - } - - /// - /// Rather than saving the matching file path into the variable, a FileSearch can save an attribute of the matching file instead. - /// - public ResultType Result - { - get - { - return this.resultField; - } - set - { - this.resultFieldSet = true; - this.resultField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a ResultType from a string. - /// - public static ResultType ParseResultType(string value) - { - ResultType parsedValue; - FileSearch.TryParseResultType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ResultType from a string. - /// - public static bool TryParseResultType(string value, out ResultType parsedValue) - { - parsedValue = ResultType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("exists" == value)) - { - parsedValue = ResultType.exists; - } - else - { - if (("version" == value)) - { - parsedValue = ResultType.version; - } - else - { - parsedValue = ResultType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("FileSearch", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.variableFieldSet) - { - writer.WriteAttributeString("Variable", this.variableField); - } - if (this.conditionFieldSet) - { - writer.WriteAttributeString("Condition", this.conditionField); - } - if (this.afterFieldSet) - { - writer.WriteAttributeString("After", this.afterField); - } - if (this.pathFieldSet) - { - writer.WriteAttributeString("Path", this.pathField); - } - if (this.resultFieldSet) - { - if ((this.resultField == ResultType.exists)) - { - writer.WriteAttributeString("Result", "exists"); - } - if ((this.resultField == ResultType.version)) - { - writer.WriteAttributeString("Result", "version"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Variable" == name)) - { - this.variableField = value; - this.variableFieldSet = true; - } - if (("Condition" == name)) - { - this.conditionField = value; - this.conditionFieldSet = true; - } - if (("After" == name)) - { - this.afterField = value; - this.afterFieldSet = true; - } - if (("Path" == name)) - { - this.pathField = value; - this.pathFieldSet = true; - } - if (("Result" == name)) - { - this.resultField = FileSearch.ParseResultType(value); - this.resultFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ResultType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Saves true if a matching file is found; false otherwise. - /// - exists, - - /// - /// Saves the version information for files that have it (.exe, .dll); zero-version (0.0.0.0) otherwise. - /// - version, - } - } - - /// - /// References a FileSearch. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class FileSearchRef : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private ISchemaElement parentElement; - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("FileSearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - } - } - - /// - /// Creates a file share out of the component's directory. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class FileShare : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes - { - - private ElementCollection children; - - private string idField; - - private bool idFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string descriptionField; - - private bool descriptionFieldSet; - - private ISchemaElement parentElement; - - public FileShare() - { - ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); - childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(FileSharePermission))); - this.children = childCollection0; - } - - public virtual IEnumerable Children - { - get - { - return this.children; - } - } - - [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] - public virtual IEnumerable this[System.Type childType] - { - get - { - return this.children.Filter(childType); - } - } - - /// - /// Identifier for the file share (primary key). - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the file share. - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// Description of the file share. - /// - public string Description - { - get - { - return this.descriptionField; - } - set - { - this.descriptionFieldSet = true; - this.descriptionField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - public virtual void AddChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.AddElement(child); - child.ParentElement = this; - } - - public virtual void RemoveChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.RemoveElement(child); - child.ParentElement = null; - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - ISchemaElement ICreateChildren.CreateChild(string childName) - { - if (String.IsNullOrEmpty(childName)) - { - throw new ArgumentNullException("childName"); - } - ISchemaElement childValue = null; - if (("FileSharePermission" == childName)) - { - childValue = new FileSharePermission(); - } - if ((null == childValue)) - { - throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); - } - return childValue; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("FileShare", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.descriptionFieldSet) - { - writer.WriteAttributeString("Description", this.descriptionField); - } - for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) - { - ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); - childElement.OutputXml(writer); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Description" == name)) - { - this.descriptionField = value; - this.descriptionFieldSet = true; - } - } - } - - /// - /// Sets ACLs on a FileShare. This element has no Id attribute. - /// The table and key are taken from the parent element. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class FileSharePermission : ISchemaElement, ISetAttributes - { - - private string userField; - - private bool userFieldSet; - - private YesNoType readField; - - private bool readFieldSet; - - private YesNoType deleteField; - - private bool deleteFieldSet; - - private YesNoType readPermissionField; - - private bool readPermissionFieldSet; - - private YesNoType changePermissionField; - - private bool changePermissionFieldSet; - - private YesNoType takeOwnershipField; - - private bool takeOwnershipFieldSet; - - private YesNoType readAttributesField; - - private bool readAttributesFieldSet; - - private YesNoType writeAttributesField; - - private bool writeAttributesFieldSet; - - private YesNoType readExtendedAttributesField; - - private bool readExtendedAttributesFieldSet; - - private YesNoType writeExtendedAttributesField; - - private bool writeExtendedAttributesFieldSet; - - private YesNoType synchronizeField; - - private bool synchronizeFieldSet; - - private YesNoType createFileField; - - private bool createFileFieldSet; - - private YesNoType createChildField; - - private bool createChildFieldSet; - - private YesNoType deleteChildField; - - private bool deleteChildFieldSet; - - private YesNoType traverseField; - - private bool traverseFieldSet; - - private YesNoType genericAllField; - - private bool genericAllFieldSet; - - private YesNoType genericExecuteField; - - private bool genericExecuteFieldSet; - - private YesNoType genericWriteField; - - private bool genericWriteFieldSet; - - private YesNoType genericReadField; - - private bool genericReadFieldSet; - - private ISchemaElement parentElement; - - public string User - { - get - { - return this.userField; - } - set - { - this.userFieldSet = true; - this.userField = value; - } - } - - public YesNoType Read - { - get - { - return this.readField; - } - set - { - this.readFieldSet = true; - this.readField = value; - } - } - - public YesNoType Delete - { - get - { - return this.deleteField; - } - set - { - this.deleteFieldSet = true; - this.deleteField = value; - } - } - - public YesNoType ReadPermission - { - get - { - return this.readPermissionField; - } - set - { - this.readPermissionFieldSet = true; - this.readPermissionField = value; - } - } - - public YesNoType ChangePermission - { - get - { - return this.changePermissionField; - } - set - { - this.changePermissionFieldSet = true; - this.changePermissionField = value; - } - } - - public YesNoType TakeOwnership - { - get - { - return this.takeOwnershipField; - } - set - { - this.takeOwnershipFieldSet = true; - this.takeOwnershipField = value; - } - } - - public YesNoType ReadAttributes - { - get - { - return this.readAttributesField; - } - set - { - this.readAttributesFieldSet = true; - this.readAttributesField = value; - } - } - - public YesNoType WriteAttributes - { - get - { - return this.writeAttributesField; - } - set - { - this.writeAttributesFieldSet = true; - this.writeAttributesField = value; - } - } - - public YesNoType ReadExtendedAttributes - { - get - { - return this.readExtendedAttributesField; - } - set - { - this.readExtendedAttributesFieldSet = true; - this.readExtendedAttributesField = value; - } - } - - public YesNoType WriteExtendedAttributes - { - get - { - return this.writeExtendedAttributesField; - } - set - { - this.writeExtendedAttributesFieldSet = true; - this.writeExtendedAttributesField = value; - } - } - - public YesNoType Synchronize - { - get - { - return this.synchronizeField; - } - set - { - this.synchronizeFieldSet = true; - this.synchronizeField = value; - } - } - - /// - /// For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. - /// - public YesNoType CreateFile - { - get - { - return this.createFileField; - } - set - { - this.createFileFieldSet = true; - this.createFileField = value; - } - } - - /// - /// For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. - /// - public YesNoType CreateChild - { - get - { - return this.createChildField; - } - set - { - this.createChildFieldSet = true; - this.createChildField = value; - } - } - - /// - /// For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. - /// - public YesNoType DeleteChild - { - get - { - return this.deleteChildField; - } - set - { - this.deleteChildFieldSet = true; - this.deleteChildField = value; - } - } - - /// - /// For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. - /// - public YesNoType Traverse - { - get - { - return this.traverseField; - } - set - { - this.traverseFieldSet = true; - this.traverseField = value; - } - } - - public YesNoType GenericAll - { - get - { - return this.genericAllField; - } - set - { - this.genericAllFieldSet = true; - this.genericAllField = value; - } - } - - public YesNoType GenericExecute - { - get - { - return this.genericExecuteField; - } - set - { - this.genericExecuteFieldSet = true; - this.genericExecuteField = value; - } - } - - public YesNoType GenericWrite - { - get - { - return this.genericWriteField; - } - set - { - this.genericWriteFieldSet = true; - this.genericWriteField = value; - } - } - - /// - /// specifying this will fail to grant read access - /// - public YesNoType GenericRead - { - get - { - return this.genericReadField; - } - set - { - this.genericReadFieldSet = true; - this.genericReadField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("FileSharePermission", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.userFieldSet) - { - writer.WriteAttributeString("User", this.userField); - } - if (this.readFieldSet) - { - if ((this.readField == YesNoType.no)) - { - writer.WriteAttributeString("Read", "no"); - } - if ((this.readField == YesNoType.yes)) - { - writer.WriteAttributeString("Read", "yes"); - } - } - if (this.deleteFieldSet) - { - if ((this.deleteField == YesNoType.no)) - { - writer.WriteAttributeString("Delete", "no"); - } - if ((this.deleteField == YesNoType.yes)) - { - writer.WriteAttributeString("Delete", "yes"); - } - } - if (this.readPermissionFieldSet) - { - if ((this.readPermissionField == YesNoType.no)) - { - writer.WriteAttributeString("ReadPermission", "no"); - } - if ((this.readPermissionField == YesNoType.yes)) - { - writer.WriteAttributeString("ReadPermission", "yes"); - } - } - if (this.changePermissionFieldSet) - { - if ((this.changePermissionField == YesNoType.no)) - { - writer.WriteAttributeString("ChangePermission", "no"); - } - if ((this.changePermissionField == YesNoType.yes)) - { - writer.WriteAttributeString("ChangePermission", "yes"); - } - } - if (this.takeOwnershipFieldSet) - { - if ((this.takeOwnershipField == YesNoType.no)) - { - writer.WriteAttributeString("TakeOwnership", "no"); - } - if ((this.takeOwnershipField == YesNoType.yes)) - { - writer.WriteAttributeString("TakeOwnership", "yes"); - } - } - if (this.readAttributesFieldSet) - { - if ((this.readAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("ReadAttributes", "no"); - } - if ((this.readAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("ReadAttributes", "yes"); - } - } - if (this.writeAttributesFieldSet) - { - if ((this.writeAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("WriteAttributes", "no"); - } - if ((this.writeAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("WriteAttributes", "yes"); - } - } - if (this.readExtendedAttributesFieldSet) - { - if ((this.readExtendedAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("ReadExtendedAttributes", "no"); - } - if ((this.readExtendedAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("ReadExtendedAttributes", "yes"); - } - } - if (this.writeExtendedAttributesFieldSet) - { - if ((this.writeExtendedAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("WriteExtendedAttributes", "no"); - } - if ((this.writeExtendedAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("WriteExtendedAttributes", "yes"); - } - } - if (this.synchronizeFieldSet) - { - if ((this.synchronizeField == YesNoType.no)) - { - writer.WriteAttributeString("Synchronize", "no"); - } - if ((this.synchronizeField == YesNoType.yes)) - { - writer.WriteAttributeString("Synchronize", "yes"); - } - } - if (this.createFileFieldSet) - { - if ((this.createFileField == YesNoType.no)) - { - writer.WriteAttributeString("CreateFile", "no"); - } - if ((this.createFileField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateFile", "yes"); - } - } - if (this.createChildFieldSet) - { - if ((this.createChildField == YesNoType.no)) - { - writer.WriteAttributeString("CreateChild", "no"); - } - if ((this.createChildField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateChild", "yes"); - } - } - if (this.deleteChildFieldSet) - { - if ((this.deleteChildField == YesNoType.no)) - { - writer.WriteAttributeString("DeleteChild", "no"); - } - if ((this.deleteChildField == YesNoType.yes)) - { - writer.WriteAttributeString("DeleteChild", "yes"); - } - } - if (this.traverseFieldSet) - { - if ((this.traverseField == YesNoType.no)) - { - writer.WriteAttributeString("Traverse", "no"); - } - if ((this.traverseField == YesNoType.yes)) - { - writer.WriteAttributeString("Traverse", "yes"); - } - } - if (this.genericAllFieldSet) - { - if ((this.genericAllField == YesNoType.no)) - { - writer.WriteAttributeString("GenericAll", "no"); - } - if ((this.genericAllField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericAll", "yes"); - } - } - if (this.genericExecuteFieldSet) - { - if ((this.genericExecuteField == YesNoType.no)) - { - writer.WriteAttributeString("GenericExecute", "no"); - } - if ((this.genericExecuteField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericExecute", "yes"); - } - } - if (this.genericWriteFieldSet) - { - if ((this.genericWriteField == YesNoType.no)) - { - writer.WriteAttributeString("GenericWrite", "no"); - } - if ((this.genericWriteField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericWrite", "yes"); - } - } - if (this.genericReadFieldSet) - { - if ((this.genericReadField == YesNoType.no)) - { - writer.WriteAttributeString("GenericRead", "no"); - } - if ((this.genericReadField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericRead", "yes"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("User" == name)) - { - this.userField = value; - this.userFieldSet = true; - } - if (("Read" == name)) - { - this.readField = Enums.ParseYesNoType(value); - this.readFieldSet = true; - } - if (("Delete" == name)) - { - this.deleteField = Enums.ParseYesNoType(value); - this.deleteFieldSet = true; - } - if (("ReadPermission" == name)) - { - this.readPermissionField = Enums.ParseYesNoType(value); - this.readPermissionFieldSet = true; - } - if (("ChangePermission" == name)) - { - this.changePermissionField = Enums.ParseYesNoType(value); - this.changePermissionFieldSet = true; - } - if (("TakeOwnership" == name)) - { - this.takeOwnershipField = Enums.ParseYesNoType(value); - this.takeOwnershipFieldSet = true; - } - if (("ReadAttributes" == name)) - { - this.readAttributesField = Enums.ParseYesNoType(value); - this.readAttributesFieldSet = true; - } - if (("WriteAttributes" == name)) - { - this.writeAttributesField = Enums.ParseYesNoType(value); - this.writeAttributesFieldSet = true; - } - if (("ReadExtendedAttributes" == name)) - { - this.readExtendedAttributesField = Enums.ParseYesNoType(value); - this.readExtendedAttributesFieldSet = true; - } - if (("WriteExtendedAttributes" == name)) - { - this.writeExtendedAttributesField = Enums.ParseYesNoType(value); - this.writeExtendedAttributesFieldSet = true; - } - if (("Synchronize" == name)) - { - this.synchronizeField = Enums.ParseYesNoType(value); - this.synchronizeFieldSet = true; - } - if (("CreateFile" == name)) - { - this.createFileField = Enums.ParseYesNoType(value); - this.createFileFieldSet = true; - } - if (("CreateChild" == name)) - { - this.createChildField = Enums.ParseYesNoType(value); - this.createChildFieldSet = true; - } - if (("DeleteChild" == name)) - { - this.deleteChildField = Enums.ParseYesNoType(value); - this.deleteChildFieldSet = true; - } - if (("Traverse" == name)) - { - this.traverseField = Enums.ParseYesNoType(value); - this.traverseFieldSet = true; - } - if (("GenericAll" == name)) - { - this.genericAllField = Enums.ParseYesNoType(value); - this.genericAllFieldSet = true; - } - if (("GenericExecute" == name)) - { - this.genericExecuteField = Enums.ParseYesNoType(value); - this.genericExecuteFieldSet = true; - } - if (("GenericWrite" == name)) - { - this.genericWriteField = Enums.ParseYesNoType(value); - this.genericWriteFieldSet = true; - } - if (("GenericRead" == name)) - { - this.genericReadField = Enums.ParseYesNoType(value); - this.genericReadFieldSet = true; - } - } - } - - /// - /// Formats a file's contents at install time. The contents are formatted according to the rules of the - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class FormatFile : ISchemaElement, ISetAttributes - { - - private string binaryKeyField; - - private bool binaryKeyFieldSet; - - private ISchemaElement parentElement; - - /// - /// The id of a Binary row that contains a copy of the file. The file in the Binary table overwrites whatever - /// file is installed by the parent component. - /// - public string BinaryKey - { - get - { - return this.binaryKeyField; - } - set - { - this.binaryKeyFieldSet = true; - this.binaryKeyField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("FormatFile", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.binaryKeyFieldSet) - { - writer.WriteAttributeString("BinaryKey", this.binaryKeyField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("BinaryKey" == name)) - { - this.binaryKeyField = value; - this.binaryKeyFieldSet = true; - } - } - } - - /// - /// Finds user groups on the local machine or specified Active Directory domain. The local machine will be - /// searched for the group first then fallback to looking in Active Directory. This element is not capable - /// of creating new groups but can be used to add new or existing users to an existing group. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class Group : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string domainField; - - private bool domainFieldSet; - - private ISchemaElement parentElement; - - /// - /// Unique identifier in your installation package for this group. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// A - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// An optional - /// - public string Domain - { - get - { - return this.domainField; - } - set - { - this.domainFieldSet = true; - this.domainField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("Group", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.domainFieldSet) - { - writer.WriteAttributeString("Domain", this.domainField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Domain" == name)) - { - this.domainField = value; - this.domainFieldSet = true; - } - } - } - - /// - /// Used to join a user to a group - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class GroupRef : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private ISchemaElement parentElement; - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("GroupRef", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - } - } - - /// - /// Creates a shortcut to a URL. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class InternetShortcut : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string directoryField; - - private bool directoryFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string targetField; - - private bool targetFieldSet; - - private TypeType typeField; - - private bool typeFieldSet; - - private string iconFileField; - - private bool iconFileFieldSet; - - private int iconIndexField; - - private bool iconIndexFieldSet; - - private ISchemaElement parentElement; - - /// - /// Unique identifier in your installation package for this Internet shortcut. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Identifier reference to Directory element where shortcut is to be created. This attribute's value defaults to the parent Component directory. - /// - public string Directory - { - get - { - return this.directoryField; - } - set - { - this.directoryFieldSet = true; - this.directoryField = value; - } - } - - /// - /// The name of the shortcut file, which is visible to the user. (The .lnk - /// extension is added automatically and by default, is not shown to the user.) - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// URL that should be opened when the user selects the shortcut. Windows - /// opens the URL in the appropriate handler for the protocol specified - /// in the URL. Note that this is a formatted field, so you can use - /// [#fileId] syntax to refer to a file being installed (using the file: - /// protocol). - /// - public string Target - { - get - { - return this.targetField; - } - set - { - this.targetFieldSet = true; - this.targetField = value; - } - } - - /// - /// Which type of shortcut should be created. - /// - public TypeType Type - { - get - { - return this.typeField; - } - set - { - this.typeFieldSet = true; - this.typeField = value; - } - } - - /// - /// Icon file that should be displayed. Note that this is a formatted field, so you can use - /// [#fileId] syntax to refer to a file being installed (using the file: - /// protocol). - /// - public string IconFile - { - get - { - return this.iconFileField; - } - set - { - this.iconFileFieldSet = true; - this.iconFileField = value; - } - } - - /// - /// Index of the icon being referenced - /// - public int IconIndex - { - get - { - return this.iconIndexField; - } - set - { - this.iconIndexFieldSet = true; - this.iconIndexField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a TypeType from a string. - /// - public static TypeType ParseTypeType(string value) - { - TypeType parsedValue; - InternetShortcut.TryParseTypeType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a TypeType from a string. - /// - public static bool TryParseTypeType(string value, out TypeType parsedValue) - { - parsedValue = TypeType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("url" == value)) - { - parsedValue = TypeType.url; - } - else - { - if (("link" == value)) - { - parsedValue = TypeType.link; - } - else - { - parsedValue = TypeType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("InternetShortcut", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.directoryFieldSet) - { - writer.WriteAttributeString("Directory", this.directoryField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.targetFieldSet) - { - writer.WriteAttributeString("Target", this.targetField); - } - if (this.typeFieldSet) - { - if ((this.typeField == TypeType.url)) - { - writer.WriteAttributeString("Type", "url"); - } - if ((this.typeField == TypeType.link)) - { - writer.WriteAttributeString("Type", "link"); - } - } - if (this.iconFileFieldSet) - { - writer.WriteAttributeString("IconFile", this.iconFileField); - } - if (this.iconIndexFieldSet) - { - writer.WriteAttributeString("IconIndex", this.iconIndexField.ToString(CultureInfo.InvariantCulture)); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Directory" == name)) - { - this.directoryField = value; - this.directoryFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Target" == name)) - { - this.targetField = value; - this.targetFieldSet = true; - } - if (("Type" == name)) - { - this.typeField = InternetShortcut.ParseTypeType(value); - this.typeFieldSet = true; - } - if (("IconFile" == name)) - { - this.iconFileField = value; - this.iconFileFieldSet = true; - } - if (("IconIndex" == name)) - { - this.iconIndexField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.iconIndexFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum TypeType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Creates .url files using IUniformResourceLocatorW. - /// - url, - - /// - /// Creates .lnk files using IShellLinkW (default). - /// - link, - } - } - - /// - /// Used to create performance categories and configure performance counters. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class PerformanceCategory : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes - { - - private ElementCollection children; - - private string idField; - - private bool idFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string helpField; - - private bool helpFieldSet; - - private YesNoType multiInstanceField; - - private bool multiInstanceFieldSet; - - private string libraryField; - - private bool libraryFieldSet; - - private string openField; - - private bool openFieldSet; - - private string closeField; - - private bool closeFieldSet; - - private string collectField; - - private bool collectFieldSet; - - private PerformanceCounterLanguageType defaultLanguageField; - - private bool defaultLanguageFieldSet; - - private ISchemaElement parentElement; - - public PerformanceCategory() - { - ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); - childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(PerformanceCounter))); - this.children = childCollection0; - } - - public virtual IEnumerable Children - { - get - { - return this.children; - } - } - - [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] - public virtual IEnumerable this[System.Type childType] - { - get - { - return this.children.Filter(childType); - } - } - - /// - /// Unique identifier in your installation package for this performance counter category. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name for the performance counter category. If this attribute is not provided the Id attribute is used as the name of the performance counter category. - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// Optional help text for the performance counter category. - /// - public string Help - { - get - { - return this.helpField; - } - set - { - this.helpFieldSet = true; - this.helpField = value; - } - } - - /// - /// Flag that specifies whether the performance counter category is multi or single instanced. Default is single instance. - /// - public YesNoType MultiInstance - { - get - { - return this.multiInstanceField; - } - set - { - this.multiInstanceFieldSet = true; - this.multiInstanceField = value; - } - } - - /// - /// DLL that contains the performance counter. The default is "netfxperf.dll" which should be used for all managed code performance counters. - /// - public string Library - { - get - { - return this.libraryField; - } - set - { - this.libraryFieldSet = true; - this.libraryField = value; - } - } - - /// - /// Function entry point in to the Library DLL called when opening the performance counter. The default is "OpenPerformanceData" which should be used for all managed code performance counters. - /// - public string Open - { - get - { - return this.openField; - } - set - { - this.openFieldSet = true; - this.openField = value; - } - } - - /// - /// Function entry point in to the Library DLL called when closing the performance counter. The default is "ClosePerformanceData" which should be used for all managed code performance counters. - /// - public string Close - { - get - { - return this.closeField; - } - set - { - this.closeFieldSet = true; - this.closeField = value; - } - } - - /// - /// Function entry point in to the Library DLL called when collecting data from the performance counter. The default is "CollectPerformanceData" which should be used for all managed code performance counters. - /// - public string Collect - { - get - { - return this.collectField; - } - set - { - this.collectFieldSet = true; - this.collectField = value; - } - } - - /// - /// Default language for the performance category and contained counters' names and help text. - /// - public PerformanceCounterLanguageType DefaultLanguage - { - get - { - return this.defaultLanguageField; - } - set - { - this.defaultLanguageFieldSet = true; - this.defaultLanguageField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - public virtual void AddChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.AddElement(child); - child.ParentElement = this; - } - - public virtual void RemoveChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.RemoveElement(child); - child.ParentElement = null; - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - ISchemaElement ICreateChildren.CreateChild(string childName) - { - if (String.IsNullOrEmpty(childName)) - { - throw new ArgumentNullException("childName"); - } - ISchemaElement childValue = null; - if (("PerformanceCounter" == childName)) - { - childValue = new PerformanceCounter(); - } - if ((null == childValue)) - { - throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); - } - return childValue; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("PerformanceCategory", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.helpFieldSet) - { - writer.WriteAttributeString("Help", this.helpField); - } - if (this.multiInstanceFieldSet) - { - if ((this.multiInstanceField == YesNoType.no)) - { - writer.WriteAttributeString("MultiInstance", "no"); - } - if ((this.multiInstanceField == YesNoType.yes)) - { - writer.WriteAttributeString("MultiInstance", "yes"); - } - } - if (this.libraryFieldSet) - { - writer.WriteAttributeString("Library", this.libraryField); - } - if (this.openFieldSet) - { - writer.WriteAttributeString("Open", this.openField); - } - if (this.closeFieldSet) - { - writer.WriteAttributeString("Close", this.closeField); - } - if (this.collectFieldSet) - { - writer.WriteAttributeString("Collect", this.collectField); - } - if (this.defaultLanguageFieldSet) - { - if ((this.defaultLanguageField == PerformanceCounterLanguageType.afrikaans)) - { - writer.WriteAttributeString("DefaultLanguage", "afrikaans"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.albanian)) - { - writer.WriteAttributeString("DefaultLanguage", "albanian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.arabic)) - { - writer.WriteAttributeString("DefaultLanguage", "arabic"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.armenian)) - { - writer.WriteAttributeString("DefaultLanguage", "armenian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.assamese)) - { - writer.WriteAttributeString("DefaultLanguage", "assamese"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.azeri)) - { - writer.WriteAttributeString("DefaultLanguage", "azeri"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.basque)) - { - writer.WriteAttributeString("DefaultLanguage", "basque"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.belarusian)) - { - writer.WriteAttributeString("DefaultLanguage", "belarusian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.bengali)) - { - writer.WriteAttributeString("DefaultLanguage", "bengali"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.bulgarian)) - { - writer.WriteAttributeString("DefaultLanguage", "bulgarian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.catalan)) - { - writer.WriteAttributeString("DefaultLanguage", "catalan"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.chinese)) - { - writer.WriteAttributeString("DefaultLanguage", "chinese"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.croatian)) - { - writer.WriteAttributeString("DefaultLanguage", "croatian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.czech)) - { - writer.WriteAttributeString("DefaultLanguage", "czech"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.danish)) - { - writer.WriteAttributeString("DefaultLanguage", "danish"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.divehi)) - { - writer.WriteAttributeString("DefaultLanguage", "divehi"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.dutch)) - { - writer.WriteAttributeString("DefaultLanguage", "dutch"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.english)) - { - writer.WriteAttributeString("DefaultLanguage", "english"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.estonian)) - { - writer.WriteAttributeString("DefaultLanguage", "estonian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.faeroese)) - { - writer.WriteAttributeString("DefaultLanguage", "faeroese"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.farsi)) - { - writer.WriteAttributeString("DefaultLanguage", "farsi"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.finnish)) - { - writer.WriteAttributeString("DefaultLanguage", "finnish"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.french)) - { - writer.WriteAttributeString("DefaultLanguage", "french"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.galician)) - { - writer.WriteAttributeString("DefaultLanguage", "galician"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.georgian)) - { - writer.WriteAttributeString("DefaultLanguage", "georgian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.german)) - { - writer.WriteAttributeString("DefaultLanguage", "german"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.greek)) - { - writer.WriteAttributeString("DefaultLanguage", "greek"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.gujarati)) - { - writer.WriteAttributeString("DefaultLanguage", "gujarati"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.hebrew)) - { - writer.WriteAttributeString("DefaultLanguage", "hebrew"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.hindi)) - { - writer.WriteAttributeString("DefaultLanguage", "hindi"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.hungarian)) - { - writer.WriteAttributeString("DefaultLanguage", "hungarian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.icelandic)) - { - writer.WriteAttributeString("DefaultLanguage", "icelandic"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.indonesian)) - { - writer.WriteAttributeString("DefaultLanguage", "indonesian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.italian)) - { - writer.WriteAttributeString("DefaultLanguage", "italian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.japanese)) - { - writer.WriteAttributeString("DefaultLanguage", "japanese"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.kannada)) - { - writer.WriteAttributeString("DefaultLanguage", "kannada"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.kashmiri)) - { - writer.WriteAttributeString("DefaultLanguage", "kashmiri"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.kazak)) - { - writer.WriteAttributeString("DefaultLanguage", "kazak"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.konkani)) - { - writer.WriteAttributeString("DefaultLanguage", "konkani"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.korean)) - { - writer.WriteAttributeString("DefaultLanguage", "korean"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.kyrgyz)) - { - writer.WriteAttributeString("DefaultLanguage", "kyrgyz"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.latvian)) - { - writer.WriteAttributeString("DefaultLanguage", "latvian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.lithuanian)) - { - writer.WriteAttributeString("DefaultLanguage", "lithuanian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.macedonian)) - { - writer.WriteAttributeString("DefaultLanguage", "macedonian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.malay)) - { - writer.WriteAttributeString("DefaultLanguage", "malay"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.malayalam)) - { - writer.WriteAttributeString("DefaultLanguage", "malayalam"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.manipuri)) - { - writer.WriteAttributeString("DefaultLanguage", "manipuri"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.marathi)) - { - writer.WriteAttributeString("DefaultLanguage", "marathi"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.mongolian)) - { - writer.WriteAttributeString("DefaultLanguage", "mongolian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.nepali)) - { - writer.WriteAttributeString("DefaultLanguage", "nepali"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.norwegian)) - { - writer.WriteAttributeString("DefaultLanguage", "norwegian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.oriya)) - { - writer.WriteAttributeString("DefaultLanguage", "oriya"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.polish)) - { - writer.WriteAttributeString("DefaultLanguage", "polish"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.portuguese)) - { - writer.WriteAttributeString("DefaultLanguage", "portuguese"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.punjabi)) - { - writer.WriteAttributeString("DefaultLanguage", "punjabi"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.romanian)) - { - writer.WriteAttributeString("DefaultLanguage", "romanian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.russian)) - { - writer.WriteAttributeString("DefaultLanguage", "russian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.sanskrit)) - { - writer.WriteAttributeString("DefaultLanguage", "sanskrit"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.serbian)) - { - writer.WriteAttributeString("DefaultLanguage", "serbian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.sindhi)) - { - writer.WriteAttributeString("DefaultLanguage", "sindhi"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.slovak)) - { - writer.WriteAttributeString("DefaultLanguage", "slovak"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.slovenian)) - { - writer.WriteAttributeString("DefaultLanguage", "slovenian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.spanish)) - { - writer.WriteAttributeString("DefaultLanguage", "spanish"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.swahili)) - { - writer.WriteAttributeString("DefaultLanguage", "swahili"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.swedish)) - { - writer.WriteAttributeString("DefaultLanguage", "swedish"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.syriac)) - { - writer.WriteAttributeString("DefaultLanguage", "syriac"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.tamil)) - { - writer.WriteAttributeString("DefaultLanguage", "tamil"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.tatar)) - { - writer.WriteAttributeString("DefaultLanguage", "tatar"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.telugu)) - { - writer.WriteAttributeString("DefaultLanguage", "telugu"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.thai)) - { - writer.WriteAttributeString("DefaultLanguage", "thai"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.turkish)) - { - writer.WriteAttributeString("DefaultLanguage", "turkish"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.ukrainian)) - { - writer.WriteAttributeString("DefaultLanguage", "ukrainian"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.urdu)) - { - writer.WriteAttributeString("DefaultLanguage", "urdu"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.uzbek)) - { - writer.WriteAttributeString("DefaultLanguage", "uzbek"); - } - if ((this.defaultLanguageField == PerformanceCounterLanguageType.vietnamese)) - { - writer.WriteAttributeString("DefaultLanguage", "vietnamese"); - } - } - for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) - { - ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); - childElement.OutputXml(writer); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Help" == name)) - { - this.helpField = value; - this.helpFieldSet = true; - } - if (("MultiInstance" == name)) - { - this.multiInstanceField = Enums.ParseYesNoType(value); - this.multiInstanceFieldSet = true; - } - if (("Library" == name)) - { - this.libraryField = value; - this.libraryFieldSet = true; - } - if (("Open" == name)) - { - this.openField = value; - this.openFieldSet = true; - } - if (("Close" == name)) - { - this.closeField = value; - this.closeFieldSet = true; - } - if (("Collect" == name)) - { - this.collectField = value; - this.collectFieldSet = true; - } - if (("DefaultLanguage" == name)) - { - this.defaultLanguageField = Enums.ParsePerformanceCounterLanguageType(value); - this.defaultLanguageFieldSet = true; - } - } - } - - /// - /// Creates a performance counter in a performance category. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class PerformanceCounter : ISchemaElement, ISetAttributes - { - - private string nameField; - - private bool nameFieldSet; - - private string helpField; - - private bool helpFieldSet; - - private PerformanceCounterTypesType typeField; - - private bool typeFieldSet; - - private PerformanceCounterLanguageType languageField; - - private bool languageFieldSet; - - private ISchemaElement parentElement; - - /// - /// Name for the performance counter. - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// Optional help text for the performance counter. - /// - public string Help - { - get - { - return this.helpField; - } - set - { - this.helpFieldSet = true; - this.helpField = value; - } - } - - /// - /// Type of the performance counter. - /// - public PerformanceCounterTypesType Type - { - get - { - return this.typeField; - } - set - { - this.typeFieldSet = true; - this.typeField = value; - } - } - - /// - /// Language for the peformance counter name and help. The default is to use the parent PerformanceCategory element's DefaultLanguage attribute. - /// - public PerformanceCounterLanguageType Language - { - get - { - return this.languageField; - } - set - { - this.languageFieldSet = true; - this.languageField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("PerformanceCounter", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.helpFieldSet) - { - writer.WriteAttributeString("Help", this.helpField); - } - if (this.typeFieldSet) - { - if ((this.typeField == PerformanceCounterTypesType.averageBase)) - { - writer.WriteAttributeString("Type", "averageBase"); - } - if ((this.typeField == PerformanceCounterTypesType.averageCount64)) - { - writer.WriteAttributeString("Type", "averageCount64"); - } - if ((this.typeField == PerformanceCounterTypesType.averageTimer32)) - { - writer.WriteAttributeString("Type", "averageTimer32"); - } - if ((this.typeField == PerformanceCounterTypesType.counterDelta32)) - { - writer.WriteAttributeString("Type", "counterDelta32"); - } - if ((this.typeField == PerformanceCounterTypesType.counterTimerInverse)) - { - writer.WriteAttributeString("Type", "counterTimerInverse"); - } - if ((this.typeField == PerformanceCounterTypesType.sampleFraction)) - { - writer.WriteAttributeString("Type", "sampleFraction"); - } - if ((this.typeField == PerformanceCounterTypesType.timer100Ns)) - { - writer.WriteAttributeString("Type", "timer100Ns"); - } - if ((this.typeField == PerformanceCounterTypesType.counterTimer)) - { - writer.WriteAttributeString("Type", "counterTimer"); - } - if ((this.typeField == PerformanceCounterTypesType.rawFraction)) - { - writer.WriteAttributeString("Type", "rawFraction"); - } - if ((this.typeField == PerformanceCounterTypesType.timer100NsInverse)) - { - writer.WriteAttributeString("Type", "timer100NsInverse"); - } - if ((this.typeField == PerformanceCounterTypesType.counterMultiTimer)) - { - writer.WriteAttributeString("Type", "counterMultiTimer"); - } - if ((this.typeField == PerformanceCounterTypesType.counterMultiTimer100Ns)) - { - writer.WriteAttributeString("Type", "counterMultiTimer100Ns"); - } - if ((this.typeField == PerformanceCounterTypesType.counterMultiTimerInverse)) - { - writer.WriteAttributeString("Type", "counterMultiTimerInverse"); - } - if ((this.typeField == PerformanceCounterTypesType.counterMultiTimer100NsInverse)) - { - writer.WriteAttributeString("Type", "counterMultiTimer100NsInverse"); - } - if ((this.typeField == PerformanceCounterTypesType.elapsedTime)) - { - writer.WriteAttributeString("Type", "elapsedTime"); - } - if ((this.typeField == PerformanceCounterTypesType.sampleBase)) - { - writer.WriteAttributeString("Type", "sampleBase"); - } - if ((this.typeField == PerformanceCounterTypesType.rawBase)) - { - writer.WriteAttributeString("Type", "rawBase"); - } - if ((this.typeField == PerformanceCounterTypesType.counterMultiBase)) - { - writer.WriteAttributeString("Type", "counterMultiBase"); - } - if ((this.typeField == PerformanceCounterTypesType.rateOfCountsPerSecond64)) - { - writer.WriteAttributeString("Type", "rateOfCountsPerSecond64"); - } - if ((this.typeField == PerformanceCounterTypesType.rateOfCountsPerSecond32)) - { - writer.WriteAttributeString("Type", "rateOfCountsPerSecond32"); - } - if ((this.typeField == PerformanceCounterTypesType.countPerTimeInterval64)) - { - writer.WriteAttributeString("Type", "countPerTimeInterval64"); - } - if ((this.typeField == PerformanceCounterTypesType.countPerTimeInterval32)) - { - writer.WriteAttributeString("Type", "countPerTimeInterval32"); - } - if ((this.typeField == PerformanceCounterTypesType.sampleCounter)) - { - writer.WriteAttributeString("Type", "sampleCounter"); - } - if ((this.typeField == PerformanceCounterTypesType.counterDelta64)) - { - writer.WriteAttributeString("Type", "counterDelta64"); - } - if ((this.typeField == PerformanceCounterTypesType.numberOfItems64)) - { - writer.WriteAttributeString("Type", "numberOfItems64"); - } - if ((this.typeField == PerformanceCounterTypesType.numberOfItems32)) - { - writer.WriteAttributeString("Type", "numberOfItems32"); - } - if ((this.typeField == PerformanceCounterTypesType.numberOfItemsHEX64)) - { - writer.WriteAttributeString("Type", "numberOfItemsHEX64"); - } - if ((this.typeField == PerformanceCounterTypesType.numberOfItemsHEX32)) - { - writer.WriteAttributeString("Type", "numberOfItemsHEX32"); - } - } - if (this.languageFieldSet) - { - if ((this.languageField == PerformanceCounterLanguageType.afrikaans)) - { - writer.WriteAttributeString("Language", "afrikaans"); - } - if ((this.languageField == PerformanceCounterLanguageType.albanian)) - { - writer.WriteAttributeString("Language", "albanian"); - } - if ((this.languageField == PerformanceCounterLanguageType.arabic)) - { - writer.WriteAttributeString("Language", "arabic"); - } - if ((this.languageField == PerformanceCounterLanguageType.armenian)) - { - writer.WriteAttributeString("Language", "armenian"); - } - if ((this.languageField == PerformanceCounterLanguageType.assamese)) - { - writer.WriteAttributeString("Language", "assamese"); - } - if ((this.languageField == PerformanceCounterLanguageType.azeri)) - { - writer.WriteAttributeString("Language", "azeri"); - } - if ((this.languageField == PerformanceCounterLanguageType.basque)) - { - writer.WriteAttributeString("Language", "basque"); - } - if ((this.languageField == PerformanceCounterLanguageType.belarusian)) - { - writer.WriteAttributeString("Language", "belarusian"); - } - if ((this.languageField == PerformanceCounterLanguageType.bengali)) - { - writer.WriteAttributeString("Language", "bengali"); - } - if ((this.languageField == PerformanceCounterLanguageType.bulgarian)) - { - writer.WriteAttributeString("Language", "bulgarian"); - } - if ((this.languageField == PerformanceCounterLanguageType.catalan)) - { - writer.WriteAttributeString("Language", "catalan"); - } - if ((this.languageField == PerformanceCounterLanguageType.chinese)) - { - writer.WriteAttributeString("Language", "chinese"); - } - if ((this.languageField == PerformanceCounterLanguageType.croatian)) - { - writer.WriteAttributeString("Language", "croatian"); - } - if ((this.languageField == PerformanceCounterLanguageType.czech)) - { - writer.WriteAttributeString("Language", "czech"); - } - if ((this.languageField == PerformanceCounterLanguageType.danish)) - { - writer.WriteAttributeString("Language", "danish"); - } - if ((this.languageField == PerformanceCounterLanguageType.divehi)) - { - writer.WriteAttributeString("Language", "divehi"); - } - if ((this.languageField == PerformanceCounterLanguageType.dutch)) - { - writer.WriteAttributeString("Language", "dutch"); - } - if ((this.languageField == PerformanceCounterLanguageType.english)) - { - writer.WriteAttributeString("Language", "english"); - } - if ((this.languageField == PerformanceCounterLanguageType.estonian)) - { - writer.WriteAttributeString("Language", "estonian"); - } - if ((this.languageField == PerformanceCounterLanguageType.faeroese)) - { - writer.WriteAttributeString("Language", "faeroese"); - } - if ((this.languageField == PerformanceCounterLanguageType.farsi)) - { - writer.WriteAttributeString("Language", "farsi"); - } - if ((this.languageField == PerformanceCounterLanguageType.finnish)) - { - writer.WriteAttributeString("Language", "finnish"); - } - if ((this.languageField == PerformanceCounterLanguageType.french)) - { - writer.WriteAttributeString("Language", "french"); - } - if ((this.languageField == PerformanceCounterLanguageType.galician)) - { - writer.WriteAttributeString("Language", "galician"); - } - if ((this.languageField == PerformanceCounterLanguageType.georgian)) - { - writer.WriteAttributeString("Language", "georgian"); - } - if ((this.languageField == PerformanceCounterLanguageType.german)) - { - writer.WriteAttributeString("Language", "german"); - } - if ((this.languageField == PerformanceCounterLanguageType.greek)) - { - writer.WriteAttributeString("Language", "greek"); - } - if ((this.languageField == PerformanceCounterLanguageType.gujarati)) - { - writer.WriteAttributeString("Language", "gujarati"); - } - if ((this.languageField == PerformanceCounterLanguageType.hebrew)) - { - writer.WriteAttributeString("Language", "hebrew"); - } - if ((this.languageField == PerformanceCounterLanguageType.hindi)) - { - writer.WriteAttributeString("Language", "hindi"); - } - if ((this.languageField == PerformanceCounterLanguageType.hungarian)) - { - writer.WriteAttributeString("Language", "hungarian"); - } - if ((this.languageField == PerformanceCounterLanguageType.icelandic)) - { - writer.WriteAttributeString("Language", "icelandic"); - } - if ((this.languageField == PerformanceCounterLanguageType.indonesian)) - { - writer.WriteAttributeString("Language", "indonesian"); - } - if ((this.languageField == PerformanceCounterLanguageType.italian)) - { - writer.WriteAttributeString("Language", "italian"); - } - if ((this.languageField == PerformanceCounterLanguageType.japanese)) - { - writer.WriteAttributeString("Language", "japanese"); - } - if ((this.languageField == PerformanceCounterLanguageType.kannada)) - { - writer.WriteAttributeString("Language", "kannada"); - } - if ((this.languageField == PerformanceCounterLanguageType.kashmiri)) - { - writer.WriteAttributeString("Language", "kashmiri"); - } - if ((this.languageField == PerformanceCounterLanguageType.kazak)) - { - writer.WriteAttributeString("Language", "kazak"); - } - if ((this.languageField == PerformanceCounterLanguageType.konkani)) - { - writer.WriteAttributeString("Language", "konkani"); - } - if ((this.languageField == PerformanceCounterLanguageType.korean)) - { - writer.WriteAttributeString("Language", "korean"); - } - if ((this.languageField == PerformanceCounterLanguageType.kyrgyz)) - { - writer.WriteAttributeString("Language", "kyrgyz"); - } - if ((this.languageField == PerformanceCounterLanguageType.latvian)) - { - writer.WriteAttributeString("Language", "latvian"); - } - if ((this.languageField == PerformanceCounterLanguageType.lithuanian)) - { - writer.WriteAttributeString("Language", "lithuanian"); - } - if ((this.languageField == PerformanceCounterLanguageType.macedonian)) - { - writer.WriteAttributeString("Language", "macedonian"); - } - if ((this.languageField == PerformanceCounterLanguageType.malay)) - { - writer.WriteAttributeString("Language", "malay"); - } - if ((this.languageField == PerformanceCounterLanguageType.malayalam)) - { - writer.WriteAttributeString("Language", "malayalam"); - } - if ((this.languageField == PerformanceCounterLanguageType.manipuri)) - { - writer.WriteAttributeString("Language", "manipuri"); - } - if ((this.languageField == PerformanceCounterLanguageType.marathi)) - { - writer.WriteAttributeString("Language", "marathi"); - } - if ((this.languageField == PerformanceCounterLanguageType.mongolian)) - { - writer.WriteAttributeString("Language", "mongolian"); - } - if ((this.languageField == PerformanceCounterLanguageType.nepali)) - { - writer.WriteAttributeString("Language", "nepali"); - } - if ((this.languageField == PerformanceCounterLanguageType.norwegian)) - { - writer.WriteAttributeString("Language", "norwegian"); - } - if ((this.languageField == PerformanceCounterLanguageType.oriya)) - { - writer.WriteAttributeString("Language", "oriya"); - } - if ((this.languageField == PerformanceCounterLanguageType.polish)) - { - writer.WriteAttributeString("Language", "polish"); - } - if ((this.languageField == PerformanceCounterLanguageType.portuguese)) - { - writer.WriteAttributeString("Language", "portuguese"); - } - if ((this.languageField == PerformanceCounterLanguageType.punjabi)) - { - writer.WriteAttributeString("Language", "punjabi"); - } - if ((this.languageField == PerformanceCounterLanguageType.romanian)) - { - writer.WriteAttributeString("Language", "romanian"); - } - if ((this.languageField == PerformanceCounterLanguageType.russian)) - { - writer.WriteAttributeString("Language", "russian"); - } - if ((this.languageField == PerformanceCounterLanguageType.sanskrit)) - { - writer.WriteAttributeString("Language", "sanskrit"); - } - if ((this.languageField == PerformanceCounterLanguageType.serbian)) - { - writer.WriteAttributeString("Language", "serbian"); - } - if ((this.languageField == PerformanceCounterLanguageType.sindhi)) - { - writer.WriteAttributeString("Language", "sindhi"); - } - if ((this.languageField == PerformanceCounterLanguageType.slovak)) - { - writer.WriteAttributeString("Language", "slovak"); - } - if ((this.languageField == PerformanceCounterLanguageType.slovenian)) - { - writer.WriteAttributeString("Language", "slovenian"); - } - if ((this.languageField == PerformanceCounterLanguageType.spanish)) - { - writer.WriteAttributeString("Language", "spanish"); - } - if ((this.languageField == PerformanceCounterLanguageType.swahili)) - { - writer.WriteAttributeString("Language", "swahili"); - } - if ((this.languageField == PerformanceCounterLanguageType.swedish)) - { - writer.WriteAttributeString("Language", "swedish"); - } - if ((this.languageField == PerformanceCounterLanguageType.syriac)) - { - writer.WriteAttributeString("Language", "syriac"); - } - if ((this.languageField == PerformanceCounterLanguageType.tamil)) - { - writer.WriteAttributeString("Language", "tamil"); - } - if ((this.languageField == PerformanceCounterLanguageType.tatar)) - { - writer.WriteAttributeString("Language", "tatar"); - } - if ((this.languageField == PerformanceCounterLanguageType.telugu)) - { - writer.WriteAttributeString("Language", "telugu"); - } - if ((this.languageField == PerformanceCounterLanguageType.thai)) - { - writer.WriteAttributeString("Language", "thai"); - } - if ((this.languageField == PerformanceCounterLanguageType.turkish)) - { - writer.WriteAttributeString("Language", "turkish"); - } - if ((this.languageField == PerformanceCounterLanguageType.ukrainian)) - { - writer.WriteAttributeString("Language", "ukrainian"); - } - if ((this.languageField == PerformanceCounterLanguageType.urdu)) - { - writer.WriteAttributeString("Language", "urdu"); - } - if ((this.languageField == PerformanceCounterLanguageType.uzbek)) - { - writer.WriteAttributeString("Language", "uzbek"); - } - if ((this.languageField == PerformanceCounterLanguageType.vietnamese)) - { - writer.WriteAttributeString("Language", "vietnamese"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Help" == name)) - { - this.helpField = value; - this.helpFieldSet = true; - } - if (("Type" == name)) - { - this.typeField = Enums.ParsePerformanceCounterTypesType(value); - this.typeFieldSet = true; - } - if (("Language" == name)) - { - this.languageField = Enums.ParsePerformanceCounterLanguageType(value); - this.languageFieldSet = true; - } - } - } - - /// - /// Used to install Perfmon counters. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class PerfCounter : ISchemaElement, ISetAttributes - { - - private string nameField; - - private bool nameFieldSet; - - private ISchemaElement parentElement; - - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("PerfCounter", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - } - } - - /// - /// Used to install Perfmon Counter Manifests. - /// Note that this functionality cannot be used with major upgrades that are scheduled after the InstallExecute, - /// InstallExecuteAgain, or InstallFinalize actions. For more information on major upgrade scheduling, see - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class PerfCounterManifest : ISchemaElement, ISetAttributes - { - - private string resourceFileDirectoryField; - - private bool resourceFileDirectoryFieldSet; - - private ISchemaElement parentElement; - - /// - /// The directory that holds the resource file of the providers in the perfmon counter manifest. Often the resource file path cannot be determined until setup time. Put the directory here and during perfmon manifest registrtion the path will be updated in the registry. If not specified, Perfmon will look for the resource file in the same directory of the perfmon counter manifest file. - /// - public string ResourceFileDirectory - { - get - { - return this.resourceFileDirectoryField; - } - set - { - this.resourceFileDirectoryFieldSet = true; - this.resourceFileDirectoryField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("PerfCounterManifest", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.resourceFileDirectoryFieldSet) - { - writer.WriteAttributeString("ResourceFileDirectory", this.resourceFileDirectoryField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("ResourceFileDirectory" == name)) - { - this.resourceFileDirectoryField = value; - this.resourceFileDirectoryFieldSet = true; - } - } - } - - /// - /// Used to install Event Manifests. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class EventManifest : ISchemaElement, ISetAttributes - { - - private string messageFileField; - - private bool messageFileFieldSet; - - private string parameterFileField; - - private bool parameterFileFieldSet; - - private string resourceFileField; - - private bool resourceFileFieldSet; - - private ISchemaElement parentElement; - - /// - /// The message file (including path) of all the providers in the event manifest. Often the message file path cannot be determined until setup time. Put your MessageFile here and the messageFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. - /// - public string MessageFile - { - get - { - return this.messageFileField; - } - set - { - this.messageFileFieldSet = true; - this.messageFileField = value; - } - } - - /// - /// The parameter file (including path) of all the providers in the event manifest. Often the parameter file path cannot be determined until setup time. Put your ParameterFile here and the parameterFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. - /// - public string ParameterFile - { - get - { - return this.parameterFileField; - } - set - { - this.parameterFileFieldSet = true; - this.parameterFileField = value; - } - } - - /// - /// The resource file (including path) of all the providers in the event manifest. Often the resource file path cannot be determined until setup time. Put your ResourceFile here and the resourceFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. - /// - public string ResourceFile - { - get - { - return this.resourceFileField; - } - set - { - this.resourceFileFieldSet = true; - this.resourceFileField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("EventManifest", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.messageFileFieldSet) - { - writer.WriteAttributeString("MessageFile", this.messageFileField); - } - if (this.parameterFileFieldSet) - { - writer.WriteAttributeString("ParameterFile", this.parameterFileField); - } - if (this.resourceFileFieldSet) - { - writer.WriteAttributeString("ResourceFile", this.resourceFileField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("MessageFile" == name)) - { - this.messageFileField = value; - this.messageFileFieldSet = true; - } - if (("ParameterFile" == name)) - { - this.parameterFileField = value; - this.parameterFileFieldSet = true; - } - if (("ResourceFile" == name)) - { - this.resourceFileField = value; - this.resourceFileFieldSet = true; - } - } - } - - /// - /// Sets ACLs on File, Registry, CreateFolder, or ServiceInstall. When under a Registry element, this cannot be used - /// if the Action attribute's value is remove or removeKeyOnInstall. This element has no Id attribute. - /// The table and key are taken from the parent element. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class PermissionEx : ISchemaElement, ISetAttributes - { - - private string domainField; - - private bool domainFieldSet; - - private string userField; - - private bool userFieldSet; - - private YesNoType readField; - - private bool readFieldSet; - - private YesNoType deleteField; - - private bool deleteFieldSet; - - private YesNoType readPermissionField; - - private bool readPermissionFieldSet; - - private YesNoType changePermissionField; - - private bool changePermissionFieldSet; - - private YesNoType takeOwnershipField; - - private bool takeOwnershipFieldSet; - - private YesNoType readAttributesField; - - private bool readAttributesFieldSet; - - private YesNoType writeAttributesField; - - private bool writeAttributesFieldSet; - - private YesNoType readExtendedAttributesField; - - private bool readExtendedAttributesFieldSet; - - private YesNoType writeExtendedAttributesField; - - private bool writeExtendedAttributesFieldSet; - - private YesNoType synchronizeField; - - private bool synchronizeFieldSet; - - private YesNoType createFileField; - - private bool createFileFieldSet; - - private YesNoType createChildField; - - private bool createChildFieldSet; - - private YesNoType deleteChildField; - - private bool deleteChildFieldSet; - - private YesNoType traverseField; - - private bool traverseFieldSet; - - private YesNoType appendField; - - private bool appendFieldSet; - - private YesNoType executeField; - - private bool executeFieldSet; - - private YesNoType writeField; - - private bool writeFieldSet; - - private YesNoType createSubkeysField; - - private bool createSubkeysFieldSet; - - private YesNoType enumerateSubkeysField; - - private bool enumerateSubkeysFieldSet; - - private YesNoType notifyField; - - private bool notifyFieldSet; - - private YesNoType createLinkField; - - private bool createLinkFieldSet; - - private YesNoType genericAllField; - - private bool genericAllFieldSet; - - private YesNoType genericExecuteField; - - private bool genericExecuteFieldSet; - - private YesNoType genericWriteField; - - private bool genericWriteFieldSet; - - private YesNoType genericReadField; - - private bool genericReadFieldSet; - - private YesNoType serviceQueryConfigField; - - private bool serviceQueryConfigFieldSet; - - private YesNoType serviceChangeConfigField; - - private bool serviceChangeConfigFieldSet; - - private YesNoType serviceQueryStatusField; - - private bool serviceQueryStatusFieldSet; - - private YesNoType serviceEnumerateDependentsField; - - private bool serviceEnumerateDependentsFieldSet; - - private YesNoType serviceStartField; - - private bool serviceStartFieldSet; - - private YesNoType serviceStopField; - - private bool serviceStopFieldSet; - - private YesNoType servicePauseContinueField; - - private bool servicePauseContinueFieldSet; - - private YesNoType serviceInterrogateField; - - private bool serviceInterrogateFieldSet; - - private YesNoType serviceUserDefinedControlField; - - private bool serviceUserDefinedControlFieldSet; - - private ISchemaElement parentElement; - - public string Domain - { - get - { - return this.domainField; - } - set - { - this.domainFieldSet = true; - this.domainField = value; - } - } - - public string User - { - get - { - return this.userField; - } - set - { - this.userFieldSet = true; - this.userField = value; - } - } - - public YesNoType Read - { - get - { - return this.readField; - } - set - { - this.readFieldSet = true; - this.readField = value; - } - } - - public YesNoType Delete - { - get - { - return this.deleteField; - } - set - { - this.deleteFieldSet = true; - this.deleteField = value; - } - } - - public YesNoType ReadPermission - { - get - { - return this.readPermissionField; - } - set - { - this.readPermissionFieldSet = true; - this.readPermissionField = value; - } - } - - public YesNoType ChangePermission - { - get - { - return this.changePermissionField; - } - set - { - this.changePermissionFieldSet = true; - this.changePermissionField = value; - } - } - - public YesNoType TakeOwnership - { - get - { - return this.takeOwnershipField; - } - set - { - this.takeOwnershipFieldSet = true; - this.takeOwnershipField = value; - } - } - - public YesNoType ReadAttributes - { - get - { - return this.readAttributesField; - } - set - { - this.readAttributesFieldSet = true; - this.readAttributesField = value; - } - } - - public YesNoType WriteAttributes - { - get - { - return this.writeAttributesField; - } - set - { - this.writeAttributesFieldSet = true; - this.writeAttributesField = value; - } - } - - public YesNoType ReadExtendedAttributes - { - get - { - return this.readExtendedAttributesField; - } - set - { - this.readExtendedAttributesFieldSet = true; - this.readExtendedAttributesField = value; - } - } - - public YesNoType WriteExtendedAttributes - { - get - { - return this.writeExtendedAttributesField; - } - set - { - this.writeExtendedAttributesFieldSet = true; - this.writeExtendedAttributesField = value; - } - } - - public YesNoType Synchronize - { - get - { - return this.synchronizeField; - } - set - { - this.synchronizeFieldSet = true; - this.synchronizeField = value; - } - } - - /// - /// For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. - /// - public YesNoType CreateFile - { - get - { - return this.createFileField; - } - set - { - this.createFileFieldSet = true; - this.createFileField = value; - } - } - - /// - /// For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. - /// - public YesNoType CreateChild - { - get - { - return this.createChildField; - } - set - { - this.createChildFieldSet = true; - this.createChildField = value; - } - } - - /// - /// For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. - /// - public YesNoType DeleteChild - { - get - { - return this.deleteChildField; - } - set - { - this.deleteChildFieldSet = true; - this.deleteChildField = value; - } - } - - /// - /// For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. - /// - public YesNoType Traverse - { - get - { - return this.traverseField; - } - set - { - this.traverseFieldSet = true; - this.traverseField = value; - } - } - - public YesNoType Append - { - get - { - return this.appendField; - } - set - { - this.appendFieldSet = true; - this.appendField = value; - } - } - - public YesNoType Execute - { - get - { - return this.executeField; - } - set - { - this.executeFieldSet = true; - this.executeField = value; - } - } - - public YesNoType Write - { - get - { - return this.writeField; - } - set - { - this.writeFieldSet = true; - this.writeField = value; - } - } - - public YesNoType CreateSubkeys - { - get - { - return this.createSubkeysField; - } - set - { - this.createSubkeysFieldSet = true; - this.createSubkeysField = value; - } - } - - public YesNoType EnumerateSubkeys - { - get - { - return this.enumerateSubkeysField; - } - set - { - this.enumerateSubkeysFieldSet = true; - this.enumerateSubkeysField = value; - } - } - - public YesNoType Notify - { - get - { - return this.notifyField; - } - set - { - this.notifyFieldSet = true; - this.notifyField = value; - } - } - - public YesNoType CreateLink - { - get - { - return this.createLinkField; - } - set - { - this.createLinkFieldSet = true; - this.createLinkField = value; - } - } - - public YesNoType GenericAll - { - get - { - return this.genericAllField; - } - set - { - this.genericAllFieldSet = true; - this.genericAllField = value; - } - } - - public YesNoType GenericExecute - { - get - { - return this.genericExecuteField; - } - set - { - this.genericExecuteFieldSet = true; - this.genericExecuteField = value; - } - } - - public YesNoType GenericWrite - { - get - { - return this.genericWriteField; - } - set - { - this.genericWriteFieldSet = true; - this.genericWriteField = value; - } - } - - /// - /// specifying this will fail to grant read access - /// - public YesNoType GenericRead - { - get - { - return this.genericReadField; - } - set - { - this.genericReadFieldSet = true; - this.genericReadField = value; - } - } - - /// - /// Required to call the QueryServiceConfig and QueryServiceConfig2 functions to query the service configuration. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceQueryConfig - { - get - { - return this.serviceQueryConfigField; - } - set - { - this.serviceQueryConfigFieldSet = true; - this.serviceQueryConfigField = value; - } - } - - /// - /// Required to call the ChangeServiceConfig or ChangeServiceConfig2 function to change the service configuration. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceChangeConfig - { - get - { - return this.serviceChangeConfigField; - } - set - { - this.serviceChangeConfigFieldSet = true; - this.serviceChangeConfigField = value; - } - } - - /// - /// Required to call the QueryServiceStatus function to ask the service control manager about the status of the service. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceQueryStatus - { - get - { - return this.serviceQueryStatusField; - } - set - { - this.serviceQueryStatusFieldSet = true; - this.serviceQueryStatusField = value; - } - } - - /// - /// Required to call the EnumDependentServices function to enumerate all the services dependent on the service. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceEnumerateDependents - { - get - { - return this.serviceEnumerateDependentsField; - } - set - { - this.serviceEnumerateDependentsFieldSet = true; - this.serviceEnumerateDependentsField = value; - } - } - - /// - /// Required to call the StartService function to start the service. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceStart - { - get - { - return this.serviceStartField; - } - set - { - this.serviceStartFieldSet = true; - this.serviceStartField = value; - } - } - - /// - /// Required to call the ControlService function to stop the service. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceStop - { - get - { - return this.serviceStopField; - } - set - { - this.serviceStopFieldSet = true; - this.serviceStopField = value; - } - } - - /// - /// Required to call the ControlService function to pause or continue the service. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServicePauseContinue - { - get - { - return this.servicePauseContinueField; - } - set - { - this.servicePauseContinueFieldSet = true; - this.servicePauseContinueField = value; - } - } - - /// - /// Required to call the ControlService function to ask the service to report its status immediately. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceInterrogate - { - get - { - return this.serviceInterrogateField; - } - set - { - this.serviceInterrogateFieldSet = true; - this.serviceInterrogateField = value; - } - } - - /// - /// Required to call the ControlService function to specify a user-defined control code. Only valid under a 'ServiceInstall' parent. - /// - public YesNoType ServiceUserDefinedControl - { - get - { - return this.serviceUserDefinedControlField; - } - set - { - this.serviceUserDefinedControlFieldSet = true; - this.serviceUserDefinedControlField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("PermissionEx", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.domainFieldSet) - { - writer.WriteAttributeString("Domain", this.domainField); - } - if (this.userFieldSet) - { - writer.WriteAttributeString("User", this.userField); - } - if (this.readFieldSet) - { - if ((this.readField == YesNoType.no)) - { - writer.WriteAttributeString("Read", "no"); - } - if ((this.readField == YesNoType.yes)) - { - writer.WriteAttributeString("Read", "yes"); - } - } - if (this.deleteFieldSet) - { - if ((this.deleteField == YesNoType.no)) - { - writer.WriteAttributeString("Delete", "no"); - } - if ((this.deleteField == YesNoType.yes)) - { - writer.WriteAttributeString("Delete", "yes"); - } - } - if (this.readPermissionFieldSet) - { - if ((this.readPermissionField == YesNoType.no)) - { - writer.WriteAttributeString("ReadPermission", "no"); - } - if ((this.readPermissionField == YesNoType.yes)) - { - writer.WriteAttributeString("ReadPermission", "yes"); - } - } - if (this.changePermissionFieldSet) - { - if ((this.changePermissionField == YesNoType.no)) - { - writer.WriteAttributeString("ChangePermission", "no"); - } - if ((this.changePermissionField == YesNoType.yes)) - { - writer.WriteAttributeString("ChangePermission", "yes"); - } - } - if (this.takeOwnershipFieldSet) - { - if ((this.takeOwnershipField == YesNoType.no)) - { - writer.WriteAttributeString("TakeOwnership", "no"); - } - if ((this.takeOwnershipField == YesNoType.yes)) - { - writer.WriteAttributeString("TakeOwnership", "yes"); - } - } - if (this.readAttributesFieldSet) - { - if ((this.readAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("ReadAttributes", "no"); - } - if ((this.readAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("ReadAttributes", "yes"); - } - } - if (this.writeAttributesFieldSet) - { - if ((this.writeAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("WriteAttributes", "no"); - } - if ((this.writeAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("WriteAttributes", "yes"); - } - } - if (this.readExtendedAttributesFieldSet) - { - if ((this.readExtendedAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("ReadExtendedAttributes", "no"); - } - if ((this.readExtendedAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("ReadExtendedAttributes", "yes"); - } - } - if (this.writeExtendedAttributesFieldSet) - { - if ((this.writeExtendedAttributesField == YesNoType.no)) - { - writer.WriteAttributeString("WriteExtendedAttributes", "no"); - } - if ((this.writeExtendedAttributesField == YesNoType.yes)) - { - writer.WriteAttributeString("WriteExtendedAttributes", "yes"); - } - } - if (this.synchronizeFieldSet) - { - if ((this.synchronizeField == YesNoType.no)) - { - writer.WriteAttributeString("Synchronize", "no"); - } - if ((this.synchronizeField == YesNoType.yes)) - { - writer.WriteAttributeString("Synchronize", "yes"); - } - } - if (this.createFileFieldSet) - { - if ((this.createFileField == YesNoType.no)) - { - writer.WriteAttributeString("CreateFile", "no"); - } - if ((this.createFileField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateFile", "yes"); - } - } - if (this.createChildFieldSet) - { - if ((this.createChildField == YesNoType.no)) - { - writer.WriteAttributeString("CreateChild", "no"); - } - if ((this.createChildField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateChild", "yes"); - } - } - if (this.deleteChildFieldSet) - { - if ((this.deleteChildField == YesNoType.no)) - { - writer.WriteAttributeString("DeleteChild", "no"); - } - if ((this.deleteChildField == YesNoType.yes)) - { - writer.WriteAttributeString("DeleteChild", "yes"); - } - } - if (this.traverseFieldSet) - { - if ((this.traverseField == YesNoType.no)) - { - writer.WriteAttributeString("Traverse", "no"); - } - if ((this.traverseField == YesNoType.yes)) - { - writer.WriteAttributeString("Traverse", "yes"); - } - } - if (this.appendFieldSet) - { - if ((this.appendField == YesNoType.no)) - { - writer.WriteAttributeString("Append", "no"); - } - if ((this.appendField == YesNoType.yes)) - { - writer.WriteAttributeString("Append", "yes"); - } - } - if (this.executeFieldSet) - { - if ((this.executeField == YesNoType.no)) - { - writer.WriteAttributeString("Execute", "no"); - } - if ((this.executeField == YesNoType.yes)) - { - writer.WriteAttributeString("Execute", "yes"); - } - } - if (this.writeFieldSet) - { - if ((this.writeField == YesNoType.no)) - { - writer.WriteAttributeString("Write", "no"); - } - if ((this.writeField == YesNoType.yes)) - { - writer.WriteAttributeString("Write", "yes"); - } - } - if (this.createSubkeysFieldSet) - { - if ((this.createSubkeysField == YesNoType.no)) - { - writer.WriteAttributeString("CreateSubkeys", "no"); - } - if ((this.createSubkeysField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateSubkeys", "yes"); - } - } - if (this.enumerateSubkeysFieldSet) - { - if ((this.enumerateSubkeysField == YesNoType.no)) - { - writer.WriteAttributeString("EnumerateSubkeys", "no"); - } - if ((this.enumerateSubkeysField == YesNoType.yes)) - { - writer.WriteAttributeString("EnumerateSubkeys", "yes"); - } - } - if (this.notifyFieldSet) - { - if ((this.notifyField == YesNoType.no)) - { - writer.WriteAttributeString("Notify", "no"); - } - if ((this.notifyField == YesNoType.yes)) - { - writer.WriteAttributeString("Notify", "yes"); - } - } - if (this.createLinkFieldSet) - { - if ((this.createLinkField == YesNoType.no)) - { - writer.WriteAttributeString("CreateLink", "no"); - } - if ((this.createLinkField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateLink", "yes"); - } - } - if (this.genericAllFieldSet) - { - if ((this.genericAllField == YesNoType.no)) - { - writer.WriteAttributeString("GenericAll", "no"); - } - if ((this.genericAllField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericAll", "yes"); - } - } - if (this.genericExecuteFieldSet) - { - if ((this.genericExecuteField == YesNoType.no)) - { - writer.WriteAttributeString("GenericExecute", "no"); - } - if ((this.genericExecuteField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericExecute", "yes"); - } - } - if (this.genericWriteFieldSet) - { - if ((this.genericWriteField == YesNoType.no)) - { - writer.WriteAttributeString("GenericWrite", "no"); - } - if ((this.genericWriteField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericWrite", "yes"); - } - } - if (this.genericReadFieldSet) - { - if ((this.genericReadField == YesNoType.no)) - { - writer.WriteAttributeString("GenericRead", "no"); - } - if ((this.genericReadField == YesNoType.yes)) - { - writer.WriteAttributeString("GenericRead", "yes"); - } - } - if (this.serviceQueryConfigFieldSet) - { - if ((this.serviceQueryConfigField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceQueryConfig", "no"); - } - if ((this.serviceQueryConfigField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceQueryConfig", "yes"); - } - } - if (this.serviceChangeConfigFieldSet) - { - if ((this.serviceChangeConfigField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceChangeConfig", "no"); - } - if ((this.serviceChangeConfigField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceChangeConfig", "yes"); - } - } - if (this.serviceQueryStatusFieldSet) - { - if ((this.serviceQueryStatusField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceQueryStatus", "no"); - } - if ((this.serviceQueryStatusField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceQueryStatus", "yes"); - } - } - if (this.serviceEnumerateDependentsFieldSet) - { - if ((this.serviceEnumerateDependentsField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceEnumerateDependents", "no"); - } - if ((this.serviceEnumerateDependentsField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceEnumerateDependents", "yes"); - } - } - if (this.serviceStartFieldSet) - { - if ((this.serviceStartField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceStart", "no"); - } - if ((this.serviceStartField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceStart", "yes"); - } - } - if (this.serviceStopFieldSet) - { - if ((this.serviceStopField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceStop", "no"); - } - if ((this.serviceStopField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceStop", "yes"); - } - } - if (this.servicePauseContinueFieldSet) - { - if ((this.servicePauseContinueField == YesNoType.no)) - { - writer.WriteAttributeString("ServicePauseContinue", "no"); - } - if ((this.servicePauseContinueField == YesNoType.yes)) - { - writer.WriteAttributeString("ServicePauseContinue", "yes"); - } - } - if (this.serviceInterrogateFieldSet) - { - if ((this.serviceInterrogateField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceInterrogate", "no"); - } - if ((this.serviceInterrogateField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceInterrogate", "yes"); - } - } - if (this.serviceUserDefinedControlFieldSet) - { - if ((this.serviceUserDefinedControlField == YesNoType.no)) - { - writer.WriteAttributeString("ServiceUserDefinedControl", "no"); - } - if ((this.serviceUserDefinedControlField == YesNoType.yes)) - { - writer.WriteAttributeString("ServiceUserDefinedControl", "yes"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Domain" == name)) - { - this.domainField = value; - this.domainFieldSet = true; - } - if (("User" == name)) - { - this.userField = value; - this.userFieldSet = true; - } - if (("Read" == name)) - { - this.readField = Enums.ParseYesNoType(value); - this.readFieldSet = true; - } - if (("Delete" == name)) - { - this.deleteField = Enums.ParseYesNoType(value); - this.deleteFieldSet = true; - } - if (("ReadPermission" == name)) - { - this.readPermissionField = Enums.ParseYesNoType(value); - this.readPermissionFieldSet = true; - } - if (("ChangePermission" == name)) - { - this.changePermissionField = Enums.ParseYesNoType(value); - this.changePermissionFieldSet = true; - } - if (("TakeOwnership" == name)) - { - this.takeOwnershipField = Enums.ParseYesNoType(value); - this.takeOwnershipFieldSet = true; - } - if (("ReadAttributes" == name)) - { - this.readAttributesField = Enums.ParseYesNoType(value); - this.readAttributesFieldSet = true; - } - if (("WriteAttributes" == name)) - { - this.writeAttributesField = Enums.ParseYesNoType(value); - this.writeAttributesFieldSet = true; - } - if (("ReadExtendedAttributes" == name)) - { - this.readExtendedAttributesField = Enums.ParseYesNoType(value); - this.readExtendedAttributesFieldSet = true; - } - if (("WriteExtendedAttributes" == name)) - { - this.writeExtendedAttributesField = Enums.ParseYesNoType(value); - this.writeExtendedAttributesFieldSet = true; - } - if (("Synchronize" == name)) - { - this.synchronizeField = Enums.ParseYesNoType(value); - this.synchronizeFieldSet = true; - } - if (("CreateFile" == name)) - { - this.createFileField = Enums.ParseYesNoType(value); - this.createFileFieldSet = true; - } - if (("CreateChild" == name)) - { - this.createChildField = Enums.ParseYesNoType(value); - this.createChildFieldSet = true; - } - if (("DeleteChild" == name)) - { - this.deleteChildField = Enums.ParseYesNoType(value); - this.deleteChildFieldSet = true; - } - if (("Traverse" == name)) - { - this.traverseField = Enums.ParseYesNoType(value); - this.traverseFieldSet = true; - } - if (("Append" == name)) - { - this.appendField = Enums.ParseYesNoType(value); - this.appendFieldSet = true; - } - if (("Execute" == name)) - { - this.executeField = Enums.ParseYesNoType(value); - this.executeFieldSet = true; - } - if (("Write" == name)) - { - this.writeField = Enums.ParseYesNoType(value); - this.writeFieldSet = true; - } - if (("CreateSubkeys" == name)) - { - this.createSubkeysField = Enums.ParseYesNoType(value); - this.createSubkeysFieldSet = true; - } - if (("EnumerateSubkeys" == name)) - { - this.enumerateSubkeysField = Enums.ParseYesNoType(value); - this.enumerateSubkeysFieldSet = true; - } - if (("Notify" == name)) - { - this.notifyField = Enums.ParseYesNoType(value); - this.notifyFieldSet = true; - } - if (("CreateLink" == name)) - { - this.createLinkField = Enums.ParseYesNoType(value); - this.createLinkFieldSet = true; - } - if (("GenericAll" == name)) - { - this.genericAllField = Enums.ParseYesNoType(value); - this.genericAllFieldSet = true; - } - if (("GenericExecute" == name)) - { - this.genericExecuteField = Enums.ParseYesNoType(value); - this.genericExecuteFieldSet = true; - } - if (("GenericWrite" == name)) - { - this.genericWriteField = Enums.ParseYesNoType(value); - this.genericWriteFieldSet = true; - } - if (("GenericRead" == name)) - { - this.genericReadField = Enums.ParseYesNoType(value); - this.genericReadFieldSet = true; - } - if (("ServiceQueryConfig" == name)) - { - this.serviceQueryConfigField = Enums.ParseYesNoType(value); - this.serviceQueryConfigFieldSet = true; - } - if (("ServiceChangeConfig" == name)) - { - this.serviceChangeConfigField = Enums.ParseYesNoType(value); - this.serviceChangeConfigFieldSet = true; - } - if (("ServiceQueryStatus" == name)) - { - this.serviceQueryStatusField = Enums.ParseYesNoType(value); - this.serviceQueryStatusFieldSet = true; - } - if (("ServiceEnumerateDependents" == name)) - { - this.serviceEnumerateDependentsField = Enums.ParseYesNoType(value); - this.serviceEnumerateDependentsFieldSet = true; - } - if (("ServiceStart" == name)) - { - this.serviceStartField = Enums.ParseYesNoType(value); - this.serviceStartFieldSet = true; - } - if (("ServiceStop" == name)) - { - this.serviceStopField = Enums.ParseYesNoType(value); - this.serviceStopFieldSet = true; - } - if (("ServicePauseContinue" == name)) - { - this.servicePauseContinueField = Enums.ParseYesNoType(value); - this.servicePauseContinueFieldSet = true; - } - if (("ServiceInterrogate" == name)) - { - this.serviceInterrogateField = Enums.ParseYesNoType(value); - this.serviceInterrogateFieldSet = true; - } - if (("ServiceUserDefinedControl" == name)) - { - this.serviceUserDefinedControlField = Enums.ParseYesNoType(value); - this.serviceUserDefinedControlFieldSet = true; - } - } - } - - /// - /// Describes a product search. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class ProductSearch : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string variableField; - - private bool variableFieldSet; - - private string conditionField; - - private bool conditionFieldSet; - - private string afterField; - - private bool afterFieldSet; - - private string guidField; - - private bool guidFieldSet; - - private string productCodeField; - - private bool productCodeFieldSet; - - private string upgradeCodeField; - - private bool upgradeCodeFieldSet; - - private ResultType resultField; - - private bool resultFieldSet; - - private ISchemaElement parentElement; - - /// - /// Id of the search for ordering and dependency. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the variable in which to place the result of the search. - /// - public string Variable - { - get - { - return this.variableField; - } - set - { - this.variableFieldSet = true; - this.variableField = value; - } - } - - /// - /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. - /// - public string Condition - { - get - { - return this.conditionField; - } - set - { - this.conditionFieldSet = true; - this.conditionField = value; - } - } - - /// - /// Id of the search that this one should come after. - /// - public string After - { - get - { - return this.afterField; - } - set - { - this.afterFieldSet = true; - this.afterField = value; - } - } - - /// - /// The Guid attribute has been deprecated; use the ProductCode or UpgradeCode attribute instead. If this attribute is used, it is assumed to be a ProductCode. - /// - public string Guid - { - get - { - return this.guidField; - } - set - { - this.guidFieldSet = true; - this.guidField = value; - } - } - - /// - /// The ProductCode to use for the search. This attribute must be omitted if UpgradeCode is specified. - /// - public string ProductCode - { - get - { - return this.productCodeField; - } - set - { - this.productCodeFieldSet = true; - this.productCodeField = value; - } - } - - /// - /// The UpgradeCode to use for the search. This attribute must be omitted if ProductCode is specified. Note that if multiple products are found, the highest versioned product will be used for the result. - /// - public string UpgradeCode - { - get - { - return this.upgradeCodeField; - } - set - { - this.upgradeCodeFieldSet = true; - this.upgradeCodeField = value; - } - } - - /// - /// Rather than saving the product version into the variable, a ProductSearch can save another attribute of the matching product instead. - /// - public ResultType Result - { - get - { - return this.resultField; - } - set - { - this.resultFieldSet = true; - this.resultField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a ResultType from a string. - /// - public static ResultType ParseResultType(string value) - { - ResultType parsedValue; - ProductSearch.TryParseResultType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ResultType from a string. - /// - public static bool TryParseResultType(string value, out ResultType parsedValue) - { - parsedValue = ResultType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("version" == value)) - { - parsedValue = ResultType.version; - } - else - { - if (("language" == value)) - { - parsedValue = ResultType.language; - } - else - { - if (("state" == value)) - { - parsedValue = ResultType.state; - } - else - { - if (("assignment" == value)) - { - parsedValue = ResultType.assignment; - } - else - { - parsedValue = ResultType.IllegalValue; - return false; - } - } - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("ProductSearch", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.variableFieldSet) - { - writer.WriteAttributeString("Variable", this.variableField); - } - if (this.conditionFieldSet) - { - writer.WriteAttributeString("Condition", this.conditionField); - } - if (this.afterFieldSet) - { - writer.WriteAttributeString("After", this.afterField); - } - if (this.guidFieldSet) - { - writer.WriteAttributeString("Guid", this.guidField); - } - if (this.productCodeFieldSet) - { - writer.WriteAttributeString("ProductCode", this.productCodeField); - } - if (this.upgradeCodeFieldSet) - { - writer.WriteAttributeString("UpgradeCode", this.upgradeCodeField); - } - if (this.resultFieldSet) - { - if ((this.resultField == ResultType.version)) - { - writer.WriteAttributeString("Result", "version"); - } - if ((this.resultField == ResultType.language)) - { - writer.WriteAttributeString("Result", "language"); - } - if ((this.resultField == ResultType.state)) - { - writer.WriteAttributeString("Result", "state"); - } - if ((this.resultField == ResultType.assignment)) - { - writer.WriteAttributeString("Result", "assignment"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Variable" == name)) - { - this.variableField = value; - this.variableFieldSet = true; - } - if (("Condition" == name)) - { - this.conditionField = value; - this.conditionFieldSet = true; - } - if (("After" == name)) - { - this.afterField = value; - this.afterFieldSet = true; - } - if (("Guid" == name)) - { - this.guidField = value; - this.guidFieldSet = true; - } - if (("ProductCode" == name)) - { - this.productCodeField = value; - this.productCodeFieldSet = true; - } - if (("UpgradeCode" == name)) - { - this.upgradeCodeField = value; - this.upgradeCodeFieldSet = true; - } - if (("Result" == name)) - { - this.resultField = ProductSearch.ParseResultType(value); - this.resultFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ResultType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Saves the version of a matching product if found; 0.0.0.0 otherwise. This is the default. - /// - version, - - /// - /// Saves the language of a matching product if found; empty otherwise. - /// - language, - - /// - /// Saves the state of the product: advertised (1), absent (2), or locally installed (5). - /// - state, - - /// - /// Saves the assignment type of the product: per-user (0), or per-machine (1). - /// - assignment, - } - } - - /// - /// References a ProductSearch. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class ProductSearchRef : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private ISchemaElement parentElement; - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("ProductSearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - } - } - - /// - /// Remove a folder and all contained files and folders if the parent component is selected for installation or removal. - /// The folder must be specified in the Property attribute as the name of a property that will have a value that resolves - /// to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used. - /// For more details, see the Remarks. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class RemoveFolderEx : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string propertyField; - - private bool propertyFieldSet; - - private OnType onField; - - private bool onFieldSet; - - private ISchemaElement parentElement; - - /// - /// Primary key used to identify this particular entry. If this is not specified, a stable identifier - /// will be generated at compile time based on the other attributes. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// The id of a property that resolves to the full path of the source directory. The property does not have - /// to exist in the installer database at creation time; it could be created at installation time by a custom - /// action, on the command line, etc. The property value can contain environment variables surrounded by - /// percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before - /// being evaluated for a full path. - /// - public string Property - { - get - { - return this.propertyField; - } - set - { - this.propertyFieldSet = true; - this.propertyField = value; - } - } - - /// - /// This value determines when the folder may be removed. - /// - public OnType On - { - get - { - return this.onField; - } - set - { - this.onFieldSet = true; - this.onField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a OnType from a string. - /// - public static OnType ParseOnType(string value) - { - OnType parsedValue; - RemoveFolderEx.TryParseOnType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a OnType from a string. - /// - public static bool TryParseOnType(string value, out OnType parsedValue) - { - parsedValue = OnType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("install" == value)) - { - parsedValue = OnType.install; - } - else - { - if (("uninstall" == value)) - { - parsedValue = OnType.uninstall; - } - else - { - if (("both" == value)) - { - parsedValue = OnType.both; - } - else - { - parsedValue = OnType.IllegalValue; - return false; - } - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("RemoveFolderEx", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.propertyFieldSet) - { - writer.WriteAttributeString("Property", this.propertyField); - } - if (this.onFieldSet) - { - if ((this.onField == OnType.install)) - { - writer.WriteAttributeString("On", "install"); - } - if ((this.onField == OnType.uninstall)) - { - writer.WriteAttributeString("On", "uninstall"); - } - if ((this.onField == OnType.both)) - { - writer.WriteAttributeString("On", "both"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Property" == name)) - { - this.propertyField = value; - this.propertyFieldSet = true; - } - if (("On" == name)) - { - this.onField = RemoveFolderEx.ParseOnType(value); - this.onFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum OnType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Removes the folder only when the parent component is being installed (msiInstallStateLocal or msiInstallStateSource). - /// - install, - - /// - /// Default: Removes the folder only when the parent component is being removed (msiInstallStateAbsent). - /// - uninstall, - - /// - /// Removes the folder when the parent component is being installed or removed. - /// - both, - } - } - - /// - /// Registers a resource with the Restart Manager. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class RestartResource : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string pathField; - - private bool pathFieldSet; - - private string processNameField; - - private bool processNameFieldSet; - - private string serviceNameField; - - private bool serviceNameFieldSet; - - private ISchemaElement parentElement; - - /// - /// The unique identifier for this resource. A unique identifier will - /// be generated automatically if not specified. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// The full path to the process module to register with the Restart Manager. - /// This can be a formatted value that resolves to a full path. - /// - public string Path - { - get - { - return this.pathField; - } - set - { - this.pathFieldSet = true; - this.pathField = value; - } - } - - /// - /// The name of a process to register with the Restart Manager. - /// This can be a formatted value that resolves to a process name. - /// - public string ProcessName - { - get - { - return this.processNameField; - } - set - { - this.processNameFieldSet = true; - this.processNameField = value; - } - } - - /// - /// The name of a Windows service to register with the Restart Manager. - /// This can be a formatted value that resolves to a service name. - /// - public string ServiceName - { - get - { - return this.serviceNameField; - } - set - { - this.serviceNameFieldSet = true; - this.serviceNameField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("RestartResource", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.pathFieldSet) - { - writer.WriteAttributeString("Path", this.pathField); - } - if (this.processNameFieldSet) - { - writer.WriteAttributeString("ProcessName", this.processNameField); - } - if (this.serviceNameFieldSet) - { - writer.WriteAttributeString("ServiceName", this.serviceNameField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Path" == name)) - { - this.pathField = value; - this.pathFieldSet = true; - } - if (("ProcessName" == name)) - { - this.processNameField = value; - this.processNameFieldSet = true; - } - if (("ServiceName" == name)) - { - this.serviceNameField = value; - this.serviceNameFieldSet = true; - } - } - } - - /// - /// Describes a registry search. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class RegistrySearch : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string variableField; - - private bool variableFieldSet; - - private string conditionField; - - private bool conditionFieldSet; - - private string afterField; - - private bool afterFieldSet; - - private RootType rootField; - - private bool rootFieldSet; - - private string keyField; - - private bool keyFieldSet; - - private string valueField; - - private bool valueFieldSet; - - private FormatType formatField; - - private bool formatFieldSet; - - private YesNoType expandEnvironmentVariablesField; - - private bool expandEnvironmentVariablesFieldSet; - - private ResultType resultField; - - private bool resultFieldSet; - - private YesNoType win64Field; - - private bool win64FieldSet; - - private ISchemaElement parentElement; - - /// - /// Id of the search for ordering and dependency. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Name of the variable in which to place the result of the search. - /// - public string Variable - { - get - { - return this.variableField; - } - set - { - this.variableFieldSet = true; - this.variableField = value; - } - } - - /// - /// Condition for evaluating the search. If this evaluates to false, the search is not executed at all. - /// - public string Condition - { - get - { - return this.conditionField; - } - set - { - this.conditionFieldSet = true; - this.conditionField = value; - } - } - - /// - /// Id of the search that this one should come after. - /// - public string After - { - get - { - return this.afterField; - } - set - { - this.afterFieldSet = true; - this.afterField = value; - } - } - - /// - /// Registry root hive to search under. - /// - public RootType Root - { - get - { - return this.rootField; - } - set - { - this.rootFieldSet = true; - this.rootField = value; - } - } - - /// - /// Key to search for. - /// - public string Key - { - get - { - return this.keyField; - } - set - { - this.keyFieldSet = true; - this.keyField = value; - } - } - - /// - /// Optional value to search for under the given Key. - /// - public string Value - { - get - { - return this.valueField; - } - set - { - this.valueFieldSet = true; - this.valueField = value; - } - } - - /// - /// What format to return the value in. - /// - public FormatType Format - { - get - { - return this.formatField; - } - set - { - this.formatFieldSet = true; - this.formatField = value; - } - } - - /// - /// Whether to expand any environment variables in REG_SZ, REG_EXPAND_SZ, or REG_MULTI_SZ values. - /// - public YesNoType ExpandEnvironmentVariables - { - get - { - return this.expandEnvironmentVariablesField; - } - set - { - this.expandEnvironmentVariablesFieldSet = true; - this.expandEnvironmentVariablesField = value; - } - } - - /// - /// Rather than saving the matching registry value into the variable, a RegistrySearch can save an attribute of the matching entry instead. - /// - public ResultType Result - { - get - { - return this.resultField; - } - set - { - this.resultFieldSet = true; - this.resultField = value; - } - } - - /// - /// Instructs the search to look in the 64-bit registry when the value is 'yes'. When the value is 'no', the search looks in the 32-bit registry. The default value is 'no'. - /// - public YesNoType Win64 - { - get - { - return this.win64Field; - } - set - { - this.win64FieldSet = true; - this.win64Field = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a RootType from a string. - /// - public static RootType ParseRootType(string value) - { - RootType parsedValue; - RegistrySearch.TryParseRootType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a RootType from a string. - /// - public static bool TryParseRootType(string value, out RootType parsedValue) - { - parsedValue = RootType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("HKLM" == value)) - { - parsedValue = RootType.HKLM; - } - else - { - if (("HKCU" == value)) - { - parsedValue = RootType.HKCU; - } - else - { - if (("HKCR" == value)) - { - parsedValue = RootType.HKCR; - } - else - { - if (("HKU" == value)) - { - parsedValue = RootType.HKU; - } - else - { - parsedValue = RootType.IllegalValue; - return false; - } - } - } - } - return true; - } - - /// - /// Parses a FormatType from a string. - /// - public static FormatType ParseFormatType(string value) - { - FormatType parsedValue; - RegistrySearch.TryParseFormatType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a FormatType from a string. - /// - public static bool TryParseFormatType(string value, out FormatType parsedValue) - { - parsedValue = FormatType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("raw" == value)) - { - parsedValue = FormatType.raw; - } - else - { - if (("compatible" == value)) - { - parsedValue = FormatType.compatible; - } - else - { - parsedValue = FormatType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Parses a ResultType from a string. - /// - public static ResultType ParseResultType(string value) - { - ResultType parsedValue; - RegistrySearch.TryParseResultType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ResultType from a string. - /// - public static bool TryParseResultType(string value, out ResultType parsedValue) - { - parsedValue = ResultType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("exists" == value)) - { - parsedValue = ResultType.exists; - } - else - { - if (("value" == value)) - { - parsedValue = ResultType.value; - } - else - { - parsedValue = ResultType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("RegistrySearch", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.variableFieldSet) - { - writer.WriteAttributeString("Variable", this.variableField); - } - if (this.conditionFieldSet) - { - writer.WriteAttributeString("Condition", this.conditionField); - } - if (this.afterFieldSet) - { - writer.WriteAttributeString("After", this.afterField); - } - if (this.rootFieldSet) - { - if ((this.rootField == RootType.HKLM)) - { - writer.WriteAttributeString("Root", "HKLM"); - } - if ((this.rootField == RootType.HKCU)) - { - writer.WriteAttributeString("Root", "HKCU"); - } - if ((this.rootField == RootType.HKCR)) - { - writer.WriteAttributeString("Root", "HKCR"); - } - if ((this.rootField == RootType.HKU)) - { - writer.WriteAttributeString("Root", "HKU"); - } - } - if (this.keyFieldSet) - { - writer.WriteAttributeString("Key", this.keyField); - } - if (this.valueFieldSet) - { - writer.WriteAttributeString("Value", this.valueField); - } - if (this.formatFieldSet) - { - if ((this.formatField == FormatType.raw)) - { - writer.WriteAttributeString("Format", "raw"); - } - if ((this.formatField == FormatType.compatible)) - { - writer.WriteAttributeString("Format", "compatible"); - } - } - if (this.expandEnvironmentVariablesFieldSet) - { - if ((this.expandEnvironmentVariablesField == YesNoType.no)) - { - writer.WriteAttributeString("ExpandEnvironmentVariables", "no"); - } - if ((this.expandEnvironmentVariablesField == YesNoType.yes)) - { - writer.WriteAttributeString("ExpandEnvironmentVariables", "yes"); - } - } - if (this.resultFieldSet) - { - if ((this.resultField == ResultType.exists)) - { - writer.WriteAttributeString("Result", "exists"); - } - if ((this.resultField == ResultType.value)) - { - writer.WriteAttributeString("Result", "value"); - } - } - if (this.win64FieldSet) - { - if ((this.win64Field == YesNoType.no)) - { - writer.WriteAttributeString("Win64", "no"); - } - if ((this.win64Field == YesNoType.yes)) - { - writer.WriteAttributeString("Win64", "yes"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Variable" == name)) - { - this.variableField = value; - this.variableFieldSet = true; - } - if (("Condition" == name)) - { - this.conditionField = value; - this.conditionFieldSet = true; - } - if (("After" == name)) - { - this.afterField = value; - this.afterFieldSet = true; - } - if (("Root" == name)) - { - this.rootField = RegistrySearch.ParseRootType(value); - this.rootFieldSet = true; - } - if (("Key" == name)) - { - this.keyField = value; - this.keyFieldSet = true; - } - if (("Value" == name)) - { - this.valueField = value; - this.valueFieldSet = true; - } - if (("Format" == name)) - { - this.formatField = RegistrySearch.ParseFormatType(value); - this.formatFieldSet = true; - } - if (("ExpandEnvironmentVariables" == name)) - { - this.expandEnvironmentVariablesField = Enums.ParseYesNoType(value); - this.expandEnvironmentVariablesFieldSet = true; - } - if (("Result" == name)) - { - this.resultField = RegistrySearch.ParseResultType(value); - this.resultFieldSet = true; - } - if (("Win64" == name)) - { - this.win64Field = Enums.ParseYesNoType(value); - this.win64FieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum RootType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// HKEY_LOCAL_MACHINE - /// - HKLM, - - /// - /// HKEY_CURRENT_USER - /// - HKCU, - - /// - /// HKEY_CLASSES_ROOT - /// - HKCR, - - /// - /// HKEY_USERS - /// - HKU, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum FormatType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Returns the unformatted value directly from the registry. For example, a REG_DWORD value of '1' is returned as '1', not '#1'. - /// - raw, - - /// - /// Returns the value formatted as Windows Installer would. For example, a REG_DWORD value of '1' is returned as '#1', not '1'. - /// - compatible, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ResultType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Saves true if a matching registry entry is found; false otherwise. - /// - exists, - - /// - /// Saves the value of the registry key in the variable. This is the default. - /// - value, - } - } - - /// - /// References a RegistrySearch. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class RegistrySearchRef : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private ISchemaElement parentElement; - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("RegistrySearchRef", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - } - } - - /// - /// Service configuration information for failure actions. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class ServiceConfig : ISchemaElement, ISetAttributes - { - - private string serviceNameField; - - private bool serviceNameFieldSet; - - private FirstFailureActionTypeType firstFailureActionTypeField; - - private bool firstFailureActionTypeFieldSet; - - private SecondFailureActionTypeType secondFailureActionTypeField; - - private bool secondFailureActionTypeFieldSet; - - private ThirdFailureActionTypeType thirdFailureActionTypeField; - - private bool thirdFailureActionTypeFieldSet; - - private int resetPeriodInDaysField; - - private bool resetPeriodInDaysFieldSet; - - private int restartServiceDelayInSecondsField; - - private bool restartServiceDelayInSecondsFieldSet; - - private string programCommandLineField; - - private bool programCommandLineFieldSet; - - private string rebootMessageField; - - private bool rebootMessageFieldSet; - - private ISchemaElement parentElement; - - /// - /// Required if not under a ServiceInstall element. - /// - public string ServiceName - { - get - { - return this.serviceNameField; - } - set - { - this.serviceNameFieldSet = true; - this.serviceNameField = value; - } - } - - /// - /// Action to take on the first failure of the service. - /// - public FirstFailureActionTypeType FirstFailureActionType - { - get - { - return this.firstFailureActionTypeField; - } - set - { - this.firstFailureActionTypeFieldSet = true; - this.firstFailureActionTypeField = value; - } - } - - /// - /// Action to take on the second failure of the service. - /// - public SecondFailureActionTypeType SecondFailureActionType - { - get - { - return this.secondFailureActionTypeField; - } - set - { - this.secondFailureActionTypeFieldSet = true; - this.secondFailureActionTypeField = value; - } - } - - /// - /// Action to take on the third failure of the service. - /// - public ThirdFailureActionTypeType ThirdFailureActionType - { - get - { - return this.thirdFailureActionTypeField; - } - set - { - this.thirdFailureActionTypeFieldSet = true; - this.thirdFailureActionTypeField = value; - } - } - - /// - /// Number of days after which to reset the failure count to zero if there are no failures. - /// - public int ResetPeriodInDays - { - get - { - return this.resetPeriodInDaysField; - } - set - { - this.resetPeriodInDaysFieldSet = true; - this.resetPeriodInDaysField = value; - } - } - - /// - /// If any of the three *ActionType attributes is "restart", this specifies the number of seconds to wait before doing so. - /// - public int RestartServiceDelayInSeconds - { - get - { - return this.restartServiceDelayInSecondsField; - } - set - { - this.restartServiceDelayInSecondsFieldSet = true; - this.restartServiceDelayInSecondsField = value; - } - } - - /// - /// If any of the three *ActionType attributes is "runCommand", this specifies the command to run when doing so. This value is formatted. - /// - public string ProgramCommandLine - { - get - { - return this.programCommandLineField; - } - set - { - this.programCommandLineFieldSet = true; - this.programCommandLineField = value; - } - } - - /// - /// If any of the three *ActionType attributes is "reboot", this specifies the message to broadcast to server users before doing so. - /// - public string RebootMessage - { - get - { - return this.rebootMessageField; - } - set - { - this.rebootMessageFieldSet = true; - this.rebootMessageField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a FirstFailureActionTypeType from a string. - /// - public static FirstFailureActionTypeType ParseFirstFailureActionTypeType(string value) - { - FirstFailureActionTypeType parsedValue; - ServiceConfig.TryParseFirstFailureActionTypeType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a FirstFailureActionTypeType from a string. - /// - public static bool TryParseFirstFailureActionTypeType(string value, out FirstFailureActionTypeType parsedValue) - { - parsedValue = FirstFailureActionTypeType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("none" == value)) - { - parsedValue = FirstFailureActionTypeType.none; - } - else - { - if (("reboot" == value)) - { - parsedValue = FirstFailureActionTypeType.reboot; - } - else - { - if (("restart" == value)) - { - parsedValue = FirstFailureActionTypeType.restart; - } - else - { - if (("runCommand" == value)) - { - parsedValue = FirstFailureActionTypeType.runCommand; - } - else - { - parsedValue = FirstFailureActionTypeType.IllegalValue; - return false; - } - } - } - } - return true; - } - - /// - /// Parses a SecondFailureActionTypeType from a string. - /// - public static SecondFailureActionTypeType ParseSecondFailureActionTypeType(string value) - { - SecondFailureActionTypeType parsedValue; - ServiceConfig.TryParseSecondFailureActionTypeType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a SecondFailureActionTypeType from a string. - /// - public static bool TryParseSecondFailureActionTypeType(string value, out SecondFailureActionTypeType parsedValue) - { - parsedValue = SecondFailureActionTypeType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("none" == value)) - { - parsedValue = SecondFailureActionTypeType.none; - } - else - { - if (("reboot" == value)) - { - parsedValue = SecondFailureActionTypeType.reboot; - } - else - { - if (("restart" == value)) - { - parsedValue = SecondFailureActionTypeType.restart; - } - else - { - if (("runCommand" == value)) - { - parsedValue = SecondFailureActionTypeType.runCommand; - } - else - { - parsedValue = SecondFailureActionTypeType.IllegalValue; - return false; - } - } - } - } - return true; - } - - /// - /// Parses a ThirdFailureActionTypeType from a string. - /// - public static ThirdFailureActionTypeType ParseThirdFailureActionTypeType(string value) - { - ThirdFailureActionTypeType parsedValue; - ServiceConfig.TryParseThirdFailureActionTypeType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ThirdFailureActionTypeType from a string. - /// - public static bool TryParseThirdFailureActionTypeType(string value, out ThirdFailureActionTypeType parsedValue) - { - parsedValue = ThirdFailureActionTypeType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("none" == value)) - { - parsedValue = ThirdFailureActionTypeType.none; - } - else - { - if (("reboot" == value)) - { - parsedValue = ThirdFailureActionTypeType.reboot; - } - else - { - if (("restart" == value)) - { - parsedValue = ThirdFailureActionTypeType.restart; - } - else - { - if (("runCommand" == value)) - { - parsedValue = ThirdFailureActionTypeType.runCommand; - } - else - { - parsedValue = ThirdFailureActionTypeType.IllegalValue; - return false; - } - } - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("ServiceConfig", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.serviceNameFieldSet) - { - writer.WriteAttributeString("ServiceName", this.serviceNameField); - } - if (this.firstFailureActionTypeFieldSet) - { - if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.none)) - { - writer.WriteAttributeString("FirstFailureActionType", "none"); - } - if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.reboot)) - { - writer.WriteAttributeString("FirstFailureActionType", "reboot"); - } - if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.restart)) - { - writer.WriteAttributeString("FirstFailureActionType", "restart"); - } - if ((this.firstFailureActionTypeField == FirstFailureActionTypeType.runCommand)) - { - writer.WriteAttributeString("FirstFailureActionType", "runCommand"); - } - } - if (this.secondFailureActionTypeFieldSet) - { - if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.none)) - { - writer.WriteAttributeString("SecondFailureActionType", "none"); - } - if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.reboot)) - { - writer.WriteAttributeString("SecondFailureActionType", "reboot"); - } - if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.restart)) - { - writer.WriteAttributeString("SecondFailureActionType", "restart"); - } - if ((this.secondFailureActionTypeField == SecondFailureActionTypeType.runCommand)) - { - writer.WriteAttributeString("SecondFailureActionType", "runCommand"); - } - } - if (this.thirdFailureActionTypeFieldSet) - { - if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.none)) - { - writer.WriteAttributeString("ThirdFailureActionType", "none"); - } - if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.reboot)) - { - writer.WriteAttributeString("ThirdFailureActionType", "reboot"); - } - if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.restart)) - { - writer.WriteAttributeString("ThirdFailureActionType", "restart"); - } - if ((this.thirdFailureActionTypeField == ThirdFailureActionTypeType.runCommand)) - { - writer.WriteAttributeString("ThirdFailureActionType", "runCommand"); - } - } - if (this.resetPeriodInDaysFieldSet) - { - writer.WriteAttributeString("ResetPeriodInDays", this.resetPeriodInDaysField.ToString(CultureInfo.InvariantCulture)); - } - if (this.restartServiceDelayInSecondsFieldSet) - { - writer.WriteAttributeString("RestartServiceDelayInSeconds", this.restartServiceDelayInSecondsField.ToString(CultureInfo.InvariantCulture)); - } - if (this.programCommandLineFieldSet) - { - writer.WriteAttributeString("ProgramCommandLine", this.programCommandLineField); - } - if (this.rebootMessageFieldSet) - { - writer.WriteAttributeString("RebootMessage", this.rebootMessageField); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("ServiceName" == name)) - { - this.serviceNameField = value; - this.serviceNameFieldSet = true; - } - if (("FirstFailureActionType" == name)) - { - this.firstFailureActionTypeField = ServiceConfig.ParseFirstFailureActionTypeType(value); - this.firstFailureActionTypeFieldSet = true; - } - if (("SecondFailureActionType" == name)) - { - this.secondFailureActionTypeField = ServiceConfig.ParseSecondFailureActionTypeType(value); - this.secondFailureActionTypeFieldSet = true; - } - if (("ThirdFailureActionType" == name)) - { - this.thirdFailureActionTypeField = ServiceConfig.ParseThirdFailureActionTypeType(value); - this.thirdFailureActionTypeFieldSet = true; - } - if (("ResetPeriodInDays" == name)) - { - this.resetPeriodInDaysField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.resetPeriodInDaysFieldSet = true; - } - if (("RestartServiceDelayInSeconds" == name)) - { - this.restartServiceDelayInSecondsField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.restartServiceDelayInSecondsFieldSet = true; - } - if (("ProgramCommandLine" == name)) - { - this.programCommandLineField = value; - this.programCommandLineFieldSet = true; - } - if (("RebootMessage" == name)) - { - this.rebootMessageField = value; - this.rebootMessageFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum FirstFailureActionTypeType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - none, - - reboot, - - restart, - - runCommand, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum SecondFailureActionTypeType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - none, - - reboot, - - restart, - - runCommand, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ThirdFailureActionTypeType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - none, - - reboot, - - restart, - - runCommand, - } - } - - /// - /// Updates the last modified date/time of a file. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class TouchFile : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string pathField; - - private bool pathFieldSet; - - private YesNoType onInstallField; - - private bool onInstallFieldSet; - - private YesNoType onReinstallField; - - private bool onReinstallFieldSet; - - private YesNoType onUninstallField; - - private bool onUninstallFieldSet; - - private YesNoType nonvitalField; - - private bool nonvitalFieldSet; - - private ISchemaElement parentElement; - - /// - /// Identifier for the touch file operation. If the identifier is not specified it will be generated. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// Path of the file to update. This value is formatted. - /// - public string Path - { - get - { - return this.pathField; - } - set - { - this.pathFieldSet = true; - this.pathField = value; - } - } - - /// - /// Specifies whether or not the modified time of the file should be updated on install. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. - /// - public YesNoType OnInstall - { - get - { - return this.onInstallField; - } - set - { - this.onInstallFieldSet = true; - this.onInstallField = value; - } - } - - /// - /// Specifies whether or not the modified time of the file should be updated on reinstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. - /// - public YesNoType OnReinstall - { - get - { - return this.onReinstallField; - } - set - { - this.onReinstallFieldSet = true; - this.onReinstallField = value; - } - } - - /// - /// Specifies whether or not the modified time of the file should be updated on uninstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'no'. - /// - public YesNoType OnUninstall - { - get - { - return this.onUninstallField; - } - set - { - this.onUninstallFieldSet = true; - this.onUninstallField = value; - } - } - - /// - /// Indicates the installation will succeed even if the modified time of the file cannot be updated. The default is 'no'. - /// - public YesNoType Nonvital - { - get - { - return this.nonvitalField; - } - set - { - this.nonvitalFieldSet = true; - this.nonvitalField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("TouchFile", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.pathFieldSet) - { - writer.WriteAttributeString("Path", this.pathField); - } - if (this.onInstallFieldSet) - { - if ((this.onInstallField == YesNoType.no)) - { - writer.WriteAttributeString("OnInstall", "no"); - } - if ((this.onInstallField == YesNoType.yes)) - { - writer.WriteAttributeString("OnInstall", "yes"); - } - } - if (this.onReinstallFieldSet) - { - if ((this.onReinstallField == YesNoType.no)) - { - writer.WriteAttributeString("OnReinstall", "no"); - } - if ((this.onReinstallField == YesNoType.yes)) - { - writer.WriteAttributeString("OnReinstall", "yes"); - } - } - if (this.onUninstallFieldSet) - { - if ((this.onUninstallField == YesNoType.no)) - { - writer.WriteAttributeString("OnUninstall", "no"); - } - if ((this.onUninstallField == YesNoType.yes)) - { - writer.WriteAttributeString("OnUninstall", "yes"); - } - } - if (this.nonvitalFieldSet) - { - if ((this.nonvitalField == YesNoType.no)) - { - writer.WriteAttributeString("Nonvital", "no"); - } - if ((this.nonvitalField == YesNoType.yes)) - { - writer.WriteAttributeString("Nonvital", "yes"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Path" == name)) - { - this.pathField = value; - this.pathFieldSet = true; - } - if (("OnInstall" == name)) - { - this.onInstallField = Enums.ParseYesNoType(value); - this.onInstallFieldSet = true; - } - if (("OnReinstall" == name)) - { - this.onReinstallField = Enums.ParseYesNoType(value); - this.onReinstallFieldSet = true; - } - if (("OnUninstall" == name)) - { - this.onUninstallField = Enums.ParseYesNoType(value); - this.onUninstallFieldSet = true; - } - if (("Nonvital" == name)) - { - this.nonvitalField = Enums.ParseYesNoType(value); - this.nonvitalFieldSet = true; - } - } - } - - /// - /// User for all kinds of things. When it is not nested under a component it is included in the MSI so it can be referenced by other elements such as the User attribute in the AppPool element. When it is nested under a Component element, the User will be created on install and can also be used for reference. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class User : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes - { - - private ElementCollection children; - - private string idField; - - private bool idFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string domainField; - - private bool domainFieldSet; - - private string passwordField; - - private bool passwordFieldSet; - - private YesNoType passwordNeverExpiresField; - - private bool passwordNeverExpiresFieldSet; - - private YesNoType canNotChangePasswordField; - - private bool canNotChangePasswordFieldSet; - - private YesNoType removeOnUninstallField; - - private bool removeOnUninstallFieldSet; - - private YesNoType failIfExistsField; - - private bool failIfExistsFieldSet; - - private YesNoType logonAsServiceField; - - private bool logonAsServiceFieldSet; - - private YesNoType logonAsBatchJobField; - - private bool logonAsBatchJobFieldSet; - - private YesNoType updateIfExistsField; - - private bool updateIfExistsFieldSet; - - private YesNoType passwordExpiredField; - - private bool passwordExpiredFieldSet; - - private YesNoType disabledField; - - private bool disabledFieldSet; - - private YesNoType createUserField; - - private bool createUserFieldSet; - - private YesNoType vitalField; - - private bool vitalFieldSet; - - private ISchemaElement parentElement; - - public User() - { - ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); - childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(GroupRef))); - this.children = childCollection0; - } - - public virtual IEnumerable Children - { - get - { - return this.children; - } - } - - [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] - public virtual IEnumerable this[System.Type childType] - { - get - { - return this.children.Filter(childType); - } - } - - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// A - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// A - /// - public string Domain - { - get - { - return this.domainField; - } - set - { - this.domainFieldSet = true; - this.domainField = value; - } - } - - /// - /// Usually a Property that is passed in on the command-line to keep it more secure. - /// - public string Password - { - get - { - return this.passwordField; - } - set - { - this.passwordFieldSet = true; - this.passwordField = value; - } - } - - /// - /// The account's password never expires. Equivalent to UF_DONT_EXPIRE_PASSWD. - /// - public YesNoType PasswordNeverExpires - { - get - { - return this.passwordNeverExpiresField; - } - set - { - this.passwordNeverExpiresFieldSet = true; - this.passwordNeverExpiresField = value; - } - } - - /// - /// The user cannot change the account's password. Equivalent to UF_PASSWD_CANT_CHANGE. - /// - public YesNoType CanNotChangePassword - { - get - { - return this.canNotChangePasswordField; - } - set - { - this.canNotChangePasswordFieldSet = true; - this.canNotChangePasswordField = value; - } - } - - /// - /// Indicates whether the user account should be removed or left behind on uninstall. - /// - public YesNoType RemoveOnUninstall - { - get - { - return this.removeOnUninstallField; - } - set - { - this.removeOnUninstallFieldSet = true; - this.removeOnUninstallField = value; - } - } - - /// - /// Indicates if the install should fail if the user already exists. - /// - public YesNoType FailIfExists - { - get - { - return this.failIfExistsField; - } - set - { - this.failIfExistsFieldSet = true; - this.failIfExistsField = value; - } - } - - /// - /// Indicates whether or not the user can logon as a serivce. User creation can be skipped if all that is desired is to set this access right on the user. - /// - public YesNoType LogonAsService - { - get - { - return this.logonAsServiceField; - } - set - { - this.logonAsServiceFieldSet = true; - this.logonAsServiceField = value; - } - } - - /// - /// Indicates whether or not the user can logon as a batch job. User creation can be skipped if all that is desired is to set this access right on the user. - /// - public YesNoType LogonAsBatchJob - { - get - { - return this.logonAsBatchJobField; - } - set - { - this.logonAsBatchJobFieldSet = true; - this.logonAsBatchJobField = value; - } - } - - /// - /// Indicates if the user account properties should be updated if the user already exists. - /// - public YesNoType UpdateIfExists - { - get - { - return this.updateIfExistsField; - } - set - { - this.updateIfExistsFieldSet = true; - this.updateIfExistsField = value; - } - } - - /// - /// Indicates whether the user must change their password on their first login. - /// - public YesNoType PasswordExpired - { - get - { - return this.passwordExpiredField; - } - set - { - this.passwordExpiredFieldSet = true; - this.passwordExpiredField = value; - } - } - - /// - /// The account is disabled. Equivalent to UF_ACCOUNTDISABLE. - /// - public YesNoType Disabled - { - get - { - return this.disabledField; - } - set - { - this.disabledFieldSet = true; - this.disabledField = value; - } - } - - /// - /// Indicates whether or not to create the user. User creation can be skipped if all that is desired is to join a user to groups. - /// - public YesNoType CreateUser - { - get - { - return this.createUserField; - } - set - { - this.createUserFieldSet = true; - this.createUserField = value; - } - } - - /// - /// Indicates whether failure to create the user or add the user to a group fails the installation. The default value is "yes". - /// - public YesNoType Vital - { - get - { - return this.vitalField; - } - set - { - this.vitalFieldSet = true; - this.vitalField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - public virtual void AddChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.AddElement(child); - child.ParentElement = this; - } - - public virtual void RemoveChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.RemoveElement(child); - child.ParentElement = null; - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - ISchemaElement ICreateChildren.CreateChild(string childName) - { - if (String.IsNullOrEmpty(childName)) - { - throw new ArgumentNullException("childName"); - } - ISchemaElement childValue = null; - if (("GroupRef" == childName)) - { - childValue = new GroupRef(); - } - if ((null == childValue)) - { - throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); - } - return childValue; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("User", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.domainFieldSet) - { - writer.WriteAttributeString("Domain", this.domainField); - } - if (this.passwordFieldSet) - { - writer.WriteAttributeString("Password", this.passwordField); - } - if (this.passwordNeverExpiresFieldSet) - { - if ((this.passwordNeverExpiresField == YesNoType.no)) - { - writer.WriteAttributeString("PasswordNeverExpires", "no"); - } - if ((this.passwordNeverExpiresField == YesNoType.yes)) - { - writer.WriteAttributeString("PasswordNeverExpires", "yes"); - } - } - if (this.canNotChangePasswordFieldSet) - { - if ((this.canNotChangePasswordField == YesNoType.no)) - { - writer.WriteAttributeString("CanNotChangePassword", "no"); - } - if ((this.canNotChangePasswordField == YesNoType.yes)) - { - writer.WriteAttributeString("CanNotChangePassword", "yes"); - } - } - if (this.removeOnUninstallFieldSet) - { - if ((this.removeOnUninstallField == YesNoType.no)) - { - writer.WriteAttributeString("RemoveOnUninstall", "no"); - } - if ((this.removeOnUninstallField == YesNoType.yes)) - { - writer.WriteAttributeString("RemoveOnUninstall", "yes"); - } - } - if (this.failIfExistsFieldSet) - { - if ((this.failIfExistsField == YesNoType.no)) - { - writer.WriteAttributeString("FailIfExists", "no"); - } - if ((this.failIfExistsField == YesNoType.yes)) - { - writer.WriteAttributeString("FailIfExists", "yes"); - } - } - if (this.logonAsServiceFieldSet) - { - if ((this.logonAsServiceField == YesNoType.no)) - { - writer.WriteAttributeString("LogonAsService", "no"); - } - if ((this.logonAsServiceField == YesNoType.yes)) - { - writer.WriteAttributeString("LogonAsService", "yes"); - } - } - if (this.logonAsBatchJobFieldSet) - { - if ((this.logonAsBatchJobField == YesNoType.no)) - { - writer.WriteAttributeString("LogonAsBatchJob", "no"); - } - if ((this.logonAsBatchJobField == YesNoType.yes)) - { - writer.WriteAttributeString("LogonAsBatchJob", "yes"); - } - } - if (this.updateIfExistsFieldSet) - { - if ((this.updateIfExistsField == YesNoType.no)) - { - writer.WriteAttributeString("UpdateIfExists", "no"); - } - if ((this.updateIfExistsField == YesNoType.yes)) - { - writer.WriteAttributeString("UpdateIfExists", "yes"); - } - } - if (this.passwordExpiredFieldSet) - { - if ((this.passwordExpiredField == YesNoType.no)) - { - writer.WriteAttributeString("PasswordExpired", "no"); - } - if ((this.passwordExpiredField == YesNoType.yes)) - { - writer.WriteAttributeString("PasswordExpired", "yes"); - } - } - if (this.disabledFieldSet) - { - if ((this.disabledField == YesNoType.no)) - { - writer.WriteAttributeString("Disabled", "no"); - } - if ((this.disabledField == YesNoType.yes)) - { - writer.WriteAttributeString("Disabled", "yes"); - } - } - if (this.createUserFieldSet) - { - if ((this.createUserField == YesNoType.no)) - { - writer.WriteAttributeString("CreateUser", "no"); - } - if ((this.createUserField == YesNoType.yes)) - { - writer.WriteAttributeString("CreateUser", "yes"); - } - } - if (this.vitalFieldSet) - { - if ((this.vitalField == YesNoType.no)) - { - writer.WriteAttributeString("Vital", "no"); - } - if ((this.vitalField == YesNoType.yes)) - { - writer.WriteAttributeString("Vital", "yes"); - } - } - for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) - { - ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); - childElement.OutputXml(writer); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Domain" == name)) - { - this.domainField = value; - this.domainFieldSet = true; - } - if (("Password" == name)) - { - this.passwordField = value; - this.passwordFieldSet = true; - } - if (("PasswordNeverExpires" == name)) - { - this.passwordNeverExpiresField = Enums.ParseYesNoType(value); - this.passwordNeverExpiresFieldSet = true; - } - if (("CanNotChangePassword" == name)) - { - this.canNotChangePasswordField = Enums.ParseYesNoType(value); - this.canNotChangePasswordFieldSet = true; - } - if (("RemoveOnUninstall" == name)) - { - this.removeOnUninstallField = Enums.ParseYesNoType(value); - this.removeOnUninstallFieldSet = true; - } - if (("FailIfExists" == name)) - { - this.failIfExistsField = Enums.ParseYesNoType(value); - this.failIfExistsFieldSet = true; - } - if (("LogonAsService" == name)) - { - this.logonAsServiceField = Enums.ParseYesNoType(value); - this.logonAsServiceFieldSet = true; - } - if (("LogonAsBatchJob" == name)) - { - this.logonAsBatchJobField = Enums.ParseYesNoType(value); - this.logonAsBatchJobFieldSet = true; - } - if (("UpdateIfExists" == name)) - { - this.updateIfExistsField = Enums.ParseYesNoType(value); - this.updateIfExistsFieldSet = true; - } - if (("PasswordExpired" == name)) - { - this.passwordExpiredField = Enums.ParseYesNoType(value); - this.passwordExpiredFieldSet = true; - } - if (("Disabled" == name)) - { - this.disabledField = Enums.ParseYesNoType(value); - this.disabledFieldSet = true; - } - if (("CreateUser" == name)) - { - this.createUserField = Enums.ParseYesNoType(value); - this.createUserFieldSet = true; - } - if (("Vital" == name)) - { - this.vitalField = Enums.ParseYesNoType(value); - this.vitalFieldSet = true; - } - } - } - - /// - /// Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class XmlFile : ISchemaElement, ISetAttributes - { - - private string idField; - - private bool idFieldSet; - - private string elementPathField; - - private bool elementPathFieldSet; - - private string fileField; - - private bool fileFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private string valueField; - - private bool valueFieldSet; - - private ActionType actionField; - - private bool actionFieldSet; - - private YesNoType permanentField; - - private bool permanentFieldSet; - - private YesNoType preserveModifiedDateField; - - private bool preserveModifiedDateFieldSet; - - private int sequenceField; - - private bool sequenceFieldSet; - - private SelectionLanguageType selectionLanguageField; - - private bool selectionLanguageFieldSet; - - private ISchemaElement parentElement; - - /// - /// Identifier for xml file modification. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - /// - /// The XPath of the element to be modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. - /// - public string ElementPath - { - get - { - return this.elementPathField; - } - set - { - this.elementPathFieldSet = true; - this.elementPathField = value; - } - } - - /// - /// Path of the .xml file to configure. - /// - public string File - { - get - { - return this.fileField; - } - set - { - this.fileFieldSet = true; - this.fileField = value; - } - } - - /// - /// Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - /// - /// The value to be written. See the - /// - public string Value - { - get - { - return this.valueField; - } - set - { - this.valueFieldSet = true; - this.valueField = value; - } - } - - /// - /// The type of modification to be made to the XML file when the component is installed. - /// - public ActionType Action - { - get - { - return this.actionField; - } - set - { - this.actionFieldSet = true; - this.actionField = value; - } - } - - /// - /// Specifies whether or not the modification should be removed on uninstall. This has no effect on uninstall if the action was deleteValue. - /// - public YesNoType Permanent - { - get - { - return this.permanentField; - } - set - { - this.permanentFieldSet = true; - this.permanentField = value; - } - } - - /// - /// Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. - /// - public YesNoType PreserveModifiedDate - { - get - { - return this.preserveModifiedDateField; - } - set - { - this.preserveModifiedDateFieldSet = true; - this.preserveModifiedDateField = value; - } - } - - /// - /// Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. - /// - public int Sequence - { - get - { - return this.sequenceField; - } - set - { - this.sequenceFieldSet = true; - this.sequenceField = value; - } - } - - /// - /// Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language. - /// - public SelectionLanguageType SelectionLanguage - { - get - { - return this.selectionLanguageField; - } - set - { - this.selectionLanguageFieldSet = true; - this.selectionLanguageField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - /// - /// Parses a ActionType from a string. - /// - public static ActionType ParseActionType(string value) - { - ActionType parsedValue; - XmlFile.TryParseActionType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ActionType from a string. - /// - public static bool TryParseActionType(string value, out ActionType parsedValue) - { - parsedValue = ActionType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("createElement" == value)) - { - parsedValue = ActionType.createElement; - } - else - { - if (("deleteValue" == value)) - { - parsedValue = ActionType.deleteValue; - } - else - { - if (("setValue" == value)) - { - parsedValue = ActionType.setValue; - } - else - { - if (("bulkSetValue" == value)) - { - parsedValue = ActionType.bulkSetValue; - } - else - { - parsedValue = ActionType.IllegalValue; - return false; - } - } - } - } - return true; - } - - /// - /// Parses a SelectionLanguageType from a string. - /// - public static SelectionLanguageType ParseSelectionLanguageType(string value) - { - SelectionLanguageType parsedValue; - XmlFile.TryParseSelectionLanguageType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a SelectionLanguageType from a string. - /// - public static bool TryParseSelectionLanguageType(string value, out SelectionLanguageType parsedValue) - { - parsedValue = SelectionLanguageType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("XPath" == value)) - { - parsedValue = SelectionLanguageType.XPath; - } - else - { - if (("XSLPattern" == value)) - { - parsedValue = SelectionLanguageType.XSLPattern; - } - else - { - parsedValue = SelectionLanguageType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("XmlFile", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.elementPathFieldSet) - { - writer.WriteAttributeString("ElementPath", this.elementPathField); - } - if (this.fileFieldSet) - { - writer.WriteAttributeString("File", this.fileField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.valueFieldSet) - { - writer.WriteAttributeString("Value", this.valueField); - } - if (this.actionFieldSet) - { - if ((this.actionField == ActionType.createElement)) - { - writer.WriteAttributeString("Action", "createElement"); - } - if ((this.actionField == ActionType.deleteValue)) - { - writer.WriteAttributeString("Action", "deleteValue"); - } - if ((this.actionField == ActionType.setValue)) - { - writer.WriteAttributeString("Action", "setValue"); - } - if ((this.actionField == ActionType.bulkSetValue)) - { - writer.WriteAttributeString("Action", "bulkSetValue"); - } - } - if (this.permanentFieldSet) - { - if ((this.permanentField == YesNoType.no)) - { - writer.WriteAttributeString("Permanent", "no"); - } - if ((this.permanentField == YesNoType.yes)) - { - writer.WriteAttributeString("Permanent", "yes"); - } - } - if (this.preserveModifiedDateFieldSet) - { - if ((this.preserveModifiedDateField == YesNoType.no)) - { - writer.WriteAttributeString("PreserveModifiedDate", "no"); - } - if ((this.preserveModifiedDateField == YesNoType.yes)) - { - writer.WriteAttributeString("PreserveModifiedDate", "yes"); - } - } - if (this.sequenceFieldSet) - { - writer.WriteAttributeString("Sequence", this.sequenceField.ToString(CultureInfo.InvariantCulture)); - } - if (this.selectionLanguageFieldSet) - { - if ((this.selectionLanguageField == SelectionLanguageType.XPath)) - { - writer.WriteAttributeString("SelectionLanguage", "XPath"); - } - if ((this.selectionLanguageField == SelectionLanguageType.XSLPattern)) - { - writer.WriteAttributeString("SelectionLanguage", "XSLPattern"); - } - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("ElementPath" == name)) - { - this.elementPathField = value; - this.elementPathFieldSet = true; - } - if (("File" == name)) - { - this.fileField = value; - this.fileFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Value" == name)) - { - this.valueField = value; - this.valueFieldSet = true; - } - if (("Action" == name)) - { - this.actionField = XmlFile.ParseActionType(value); - this.actionFieldSet = true; - } - if (("Permanent" == name)) - { - this.permanentField = Enums.ParseYesNoType(value); - this.permanentFieldSet = true; - } - if (("PreserveModifiedDate" == name)) - { - this.preserveModifiedDateField = Enums.ParseYesNoType(value); - this.preserveModifiedDateFieldSet = true; - } - if (("Sequence" == name)) - { - this.sequenceField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.sequenceFieldSet = true; - } - if (("SelectionLanguage" == name)) - { - this.selectionLanguageField = XmlFile.ParseSelectionLanguageType(value); - this.selectionLanguageFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ActionType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - /// - /// Creates a new element under the element specified in ElementPath. The Name attribute is required in this case and specifies the name of the new element. The Value attribute is not necessary when createElement is specified as the action. If the Value attribute is set, it will cause the new element's text value to be set. - /// - createElement, - - /// - /// Deletes a value from the element specified in the ElementPath. If Name is specified, the attribute with that name is deleted. If Name is not specified, the text value of the element specified in the ElementPath is deleted. The Value attribute is ignored if deleteValue is the action specified. - /// - deleteValue, - - /// - /// Sets a value in the element specified in the ElementPath. If Name is specified, and attribute with that name is set to the value specified in Value. If Name is not specified, the text value of the element is set. Value is a required attribute if setValue is the action specified. - /// - setValue, - - /// - /// Sets all the values in the elements that match the ElementPath. If Name is specified, attributes with that name are set to the same value specified in Value. If Name is not specified, the text values of the elements are set. Value is a required attribute if setBulkValue is the action specified. - /// - bulkSetValue, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum SelectionLanguageType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - XPath, - - XSLPattern, - } - } - - /// - /// Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions. - /// - [GeneratedCode("XsdGen", "4.0.0.0")] - public class XmlConfig : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes - { - - private ElementCollection children; - - private string idField; - - private bool idFieldSet; - - private ActionType actionField; - - private bool actionFieldSet; - - private string elementIdField; - - private bool elementIdFieldSet; - - private string elementPathField; - - private bool elementPathFieldSet; - - private string fileField; - - private bool fileFieldSet; - - private string nameField; - - private bool nameFieldSet; - - private NodeType nodeField; - - private bool nodeFieldSet; - - private OnType onField; - - private bool onFieldSet; - - private YesNoType preserveModifiedDateField; - - private bool preserveModifiedDateFieldSet; - - private int sequenceField; - - private bool sequenceFieldSet; - - private string valueField; - - private bool valueFieldSet; - - private string verifyPathField; - - private bool verifyPathFieldSet; - - private ISchemaElement parentElement; - - public XmlConfig() - { - ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence); - childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(XmlConfig))); - this.children = childCollection0; - } - - public virtual IEnumerable Children - { - get - { - return this.children; - } - } - - [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")] - public virtual IEnumerable this[System.Type childType] - { - get - { - return this.children.Filter(childType); - } - } - - /// - /// Identifier for xml file modification. - /// - public string Id - { - get - { - return this.idField; - } - set - { - this.idFieldSet = true; - this.idField = value; - } - } - - public ActionType Action - { - get - { - return this.actionField; - } - set - { - this.actionFieldSet = true; - this.actionField = value; - } - } - - /// - /// The Id of another XmlConfig to add attributes to. In this case, the 'ElementPath', 'Action', 'Node', and 'On' attributes must be omitted. - /// - public string ElementId - { - get - { - return this.elementIdField; - } - set - { - this.elementIdFieldSet = true; - this.elementIdField = value; - } - } - - /// - /// The XPath of the parent element being modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. - /// - public string ElementPath - { - get - { - return this.elementPathField; - } - set - { - this.elementPathFieldSet = true; - this.elementPathField = value; - } - } - - /// - /// Path of the .xml file to configure. - /// - public string File - { - get - { - return this.fileField; - } - set - { - this.fileFieldSet = true; - this.fileField = value; - } - } - - /// - /// Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. - /// - public string Name - { - get - { - return this.nameField; - } - set - { - this.nameFieldSet = true; - this.nameField = value; - } - } - - public NodeType Node - { - get - { - return this.nodeField; - } - set - { - this.nodeFieldSet = true; - this.nodeField = value; - } - } - - public OnType On - { - get - { - return this.onField; - } - set - { - this.onFieldSet = true; - this.onField = value; - } - } - - /// - /// Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. - /// - public YesNoType PreserveModifiedDate - { - get - { - return this.preserveModifiedDateField; - } - set - { - this.preserveModifiedDateFieldSet = true; - this.preserveModifiedDateField = value; - } - } - - /// - /// Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. - /// - public int Sequence - { - get - { - return this.sequenceField; - } - set - { - this.sequenceFieldSet = true; - this.sequenceField = value; - } - } - - /// - /// The value to be written. See the - /// - public string Value - { - get - { - return this.valueField; - } - set - { - this.valueFieldSet = true; - this.valueField = value; - } - } - - /// - /// The XPath to the element being modified. This is required for 'delete' actions. For 'create' actions, VerifyPath is used to decide if the element already exists. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. - /// - public string VerifyPath - { - get - { - return this.verifyPathField; - } - set - { - this.verifyPathFieldSet = true; - this.verifyPathField = value; - } - } - - public virtual ISchemaElement ParentElement - { - get - { - return this.parentElement; - } - set - { - this.parentElement = value; - } - } - - public virtual void AddChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.AddElement(child); - child.ParentElement = this; - } - - public virtual void RemoveChild(ISchemaElement child) - { - if ((null == child)) - { - throw new ArgumentNullException("child"); - } - this.children.RemoveElement(child); - child.ParentElement = null; - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - ISchemaElement ICreateChildren.CreateChild(string childName) - { - if (String.IsNullOrEmpty(childName)) - { - throw new ArgumentNullException("childName"); - } - ISchemaElement childValue = null; - if (("XmlConfig" == childName)) - { - childValue = new XmlConfig(); - } - if ((null == childValue)) - { - throw new InvalidOperationException(String.Concat(childName, " is not a valid child name.")); - } - return childValue; - } - - /// - /// Parses a ActionType from a string. - /// - public static ActionType ParseActionType(string value) - { - ActionType parsedValue; - XmlConfig.TryParseActionType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a ActionType from a string. - /// - public static bool TryParseActionType(string value, out ActionType parsedValue) - { - parsedValue = ActionType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("create" == value)) - { - parsedValue = ActionType.create; - } - else - { - if (("delete" == value)) - { - parsedValue = ActionType.delete; - } - else - { - parsedValue = ActionType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Parses a NodeType from a string. - /// - public static NodeType ParseNodeType(string value) - { - NodeType parsedValue; - XmlConfig.TryParseNodeType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a NodeType from a string. - /// - public static bool TryParseNodeType(string value, out NodeType parsedValue) - { - parsedValue = NodeType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("element" == value)) - { - parsedValue = NodeType.element; - } - else - { - if (("value" == value)) - { - parsedValue = NodeType.value; - } - else - { - if (("document" == value)) - { - parsedValue = NodeType.document; - } - else - { - parsedValue = NodeType.IllegalValue; - return false; - } - } - } - return true; - } - - /// - /// Parses a OnType from a string. - /// - public static OnType ParseOnType(string value) - { - OnType parsedValue; - XmlConfig.TryParseOnType(value, out parsedValue); - return parsedValue; - } - - /// - /// Tries to parse a OnType from a string. - /// - public static bool TryParseOnType(string value, out OnType parsedValue) - { - parsedValue = OnType.NotSet; - if (string.IsNullOrEmpty(value)) - { - return false; - } - if (("install" == value)) - { - parsedValue = OnType.install; - } - else - { - if (("uninstall" == value)) - { - parsedValue = OnType.uninstall; - } - else - { - parsedValue = OnType.IllegalValue; - return false; - } - } - return true; - } - - /// - /// Processes this element and all child elements into an XmlWriter. - /// - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - public virtual void OutputXml(XmlWriter writer) - { - if ((null == writer)) - { - throw new ArgumentNullException("writer"); - } - writer.WriteStartElement("XmlConfig", "http://wixtoolset.org/schemas/v4/wxs/util"); - if (this.idFieldSet) - { - writer.WriteAttributeString("Id", this.idField); - } - if (this.actionFieldSet) - { - if ((this.actionField == ActionType.create)) - { - writer.WriteAttributeString("Action", "create"); - } - if ((this.actionField == ActionType.delete)) - { - writer.WriteAttributeString("Action", "delete"); - } - } - if (this.elementIdFieldSet) - { - writer.WriteAttributeString("ElementId", this.elementIdField); - } - if (this.elementPathFieldSet) - { - writer.WriteAttributeString("ElementPath", this.elementPathField); - } - if (this.fileFieldSet) - { - writer.WriteAttributeString("File", this.fileField); - } - if (this.nameFieldSet) - { - writer.WriteAttributeString("Name", this.nameField); - } - if (this.nodeFieldSet) - { - if ((this.nodeField == NodeType.element)) - { - writer.WriteAttributeString("Node", "element"); - } - if ((this.nodeField == NodeType.value)) - { - writer.WriteAttributeString("Node", "value"); - } - if ((this.nodeField == NodeType.document)) - { - writer.WriteAttributeString("Node", "document"); - } - } - if (this.onFieldSet) - { - if ((this.onField == OnType.install)) - { - writer.WriteAttributeString("On", "install"); - } - if ((this.onField == OnType.uninstall)) - { - writer.WriteAttributeString("On", "uninstall"); - } - } - if (this.preserveModifiedDateFieldSet) - { - if ((this.preserveModifiedDateField == YesNoType.no)) - { - writer.WriteAttributeString("PreserveModifiedDate", "no"); - } - if ((this.preserveModifiedDateField == YesNoType.yes)) - { - writer.WriteAttributeString("PreserveModifiedDate", "yes"); - } - } - if (this.sequenceFieldSet) - { - writer.WriteAttributeString("Sequence", this.sequenceField.ToString(CultureInfo.InvariantCulture)); - } - if (this.valueFieldSet) - { - writer.WriteAttributeString("Value", this.valueField); - } - if (this.verifyPathFieldSet) - { - writer.WriteAttributeString("VerifyPath", this.verifyPathField); - } - for (IEnumerator enumerator = this.children.GetEnumerator(); enumerator.MoveNext(); ) - { - ISchemaElement childElement = ((ISchemaElement)(enumerator.Current)); - childElement.OutputXml(writer); - } - writer.WriteEndElement(); - } - - [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - void ISetAttributes.SetAttribute(string name, string value) - { - if (String.IsNullOrEmpty(name)) - { - throw new ArgumentNullException("name"); - } - if (("Id" == name)) - { - this.idField = value; - this.idFieldSet = true; - } - if (("Action" == name)) - { - this.actionField = XmlConfig.ParseActionType(value); - this.actionFieldSet = true; - } - if (("ElementId" == name)) - { - this.elementIdField = value; - this.elementIdFieldSet = true; - } - if (("ElementPath" == name)) - { - this.elementPathField = value; - this.elementPathFieldSet = true; - } - if (("File" == name)) - { - this.fileField = value; - this.fileFieldSet = true; - } - if (("Name" == name)) - { - this.nameField = value; - this.nameFieldSet = true; - } - if (("Node" == name)) - { - this.nodeField = XmlConfig.ParseNodeType(value); - this.nodeFieldSet = true; - } - if (("On" == name)) - { - this.onField = XmlConfig.ParseOnType(value); - this.onFieldSet = true; - } - if (("PreserveModifiedDate" == name)) - { - this.preserveModifiedDateField = Enums.ParseYesNoType(value); - this.preserveModifiedDateFieldSet = true; - } - if (("Sequence" == name)) - { - this.sequenceField = Convert.ToInt32(value, CultureInfo.InvariantCulture); - this.sequenceFieldSet = true; - } - if (("Value" == name)) - { - this.valueField = value; - this.valueFieldSet = true; - } - if (("VerifyPath" == name)) - { - this.verifyPathField = value; - this.verifyPathFieldSet = true; - } - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum ActionType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - create, - - delete, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum NodeType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - element, - - value, - - document, - } - - [GeneratedCode("XsdGen", "4.0.0.0")] - public enum OnType - { - - IllegalValue = int.MaxValue, - - NotSet = -1, - - install, - - uninstall, - } - } -#endif -} diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd deleted file mode 100644 index 133a93fa..00000000 --- a/src/wixext/util.xsd +++ /dev/null @@ -1,1858 +0,0 @@ - - - - - - - - The source code schema for the WiX Toolset Utility Extension. - - - - - - - - - - - Closes applications or schedules a reboot if application cannot be closed. - - - - - - - Identifier for the close application (primary key). If the Id is not specified, one will be generated. - - - - - Name of the exectuable to be closed. This should only be the file name. - - - - - - Condition that determines if the application should be closed. Must be blank or evaluate to true - for the application to be scheduled for closing. - - - - - - Description to show if application is running and needs to be closed. - - - - - Optionally orders the applications to be closed. - - - - - Optionally sends a close message to the application. Default is no. - - - - - Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application. Default is "no". - - - - - Optionally sends a close message to the application from deffered action without impersonation. Default is no. - - - - - Sends WM_QUERYENDSESSION then WM_ENDSESSION messages to the application from a deffered action without impersonation. Default is "no". - - - - - Optionally prompts for reboot if application is still running. The default is "yes". The TerminateProcess attribute must be "no" or not specified if this attribute is "yes". - - - - - - When this attribute is set to "yes", the user will be prompted when the application is still running. The Description attribute must contain the message to - display in the prompt. The prompt occurs before executing any of the other options and gives the options to "Abort", "Retry", or "Ignore". Abort will cancel - the install. Retry will attempt the check again and if the application is still running, prompt again. "Ignore" will continue and execute any other options - set on the CloseApplication element. The default is "no". - - - - - - Property to be set if application is still running. Useful for launch conditions or to conditionalize custom UI to ask user to shut down apps. - - - - - - Attempts to terminates process and return the specified exit code if application is still running after sending any requested close and/or end session messages. - If this attribute is specified, the RebootPrompt attribute must be "no". The default is "no". - - - - - - - Optional time in seconds to wait for the application to exit after the close and/or end session messages. If the application is still running after the timeout then - the RebootPrompt or TerminateProcess attributes will be considered. The default value is "5" seconds. - - - - - - - - - - Describes a component search. - - - - - - - - - - Component to search for. - - - - - Optional ProductCode to determine if the component is installed. - - - - - - Rather than saving the matching key path into the variable, a ComponentSearch can save an attribute of the component instead. - - - - - - - Saves the parent directory for the component's file key path; other types of key path are returned unmodified. - - - - - Saves the state of the component: absent (2), locally installed (3), will run from source (4), or installed in default location (either local or from source) (5) - - - - - Saves the key path of the component if installed. This is the default. - - - - - - - - - - References a ComponentSearch. - - - - - - - - - - - - Describes a directory search. - - - - - - - - - - Directory path to search for. - - - - - - Rather than saving the matching directory path into the variable, a DirectorySearch can save an - attribute of the matching directory instead. - - - - - - - Saves true if a matching directory is found; false otherwise. - - - - - - - - - - References a DirectorySearch. - - - - - - - - - - - - - - - Creates an event source. - - - - - - The number of categories in CategoryMessageFile. CategoryMessageFile - must be specified too. - - - - - - - Name of the category message file. CategoryCount must be specified too. - Note that this is a formatted field, so you can use [#fileId] syntax to - refer to a file being installed. It is also written as a REG_EXPAND_SZ - string, so you can use %environment_variable% syntax to refer to a file - already present on the user's machine. - - - - - - - Name of the event message file. - Note that this is a formatted field, so you can use [#fileId] syntax to - refer to a file being installed. It is also written as a REG_EXPAND_SZ - string, so you can use %environment_variable% syntax to refer to a file - already present on the user's machine. - - - - - - - Marks the EventSource registry as the key path of the component it belongs to. - - - - - - Name of the event source's log. - - - - - Name of the event source. - - - - - - Name of the parameter message file. - Note that this is a formatted field, so you can use [#fileId] syntax to - refer to a file being installed. It is also written as a REG_EXPAND_SZ - string, so you can use %environment_variable% syntax to refer to a file - already present on the user's machine. - - - - - - - Equivalent to EVENTLOG_ERROR_TYPE. - - - - - - - Equivalent to EVENTLOG_AUDIT_FAILURE. - - - - - - - Equivalent to EVENTLOG_INFORMATION_TYPE. - - - - - - - Equivalent to EVENTLOG_AUDIT_SUCCESS. - - - - - - - Equivalent to EVENTLOG_WARNING_TYPE. - - - - - - - - Describes a file search. - - - - - - - - - - File path to search for. - - - - - - Rather than saving the matching file path into the variable, a FileSearch can save an attribute of the matching file instead. - - - - - - - Saves true if a matching file is found; false otherwise. - - - - - Saves the version information for files that have it (.exe, .dll); zero-version (0.0.0.0) otherwise. - - - - - - - - - - References a FileSearch. - - - - - - - - - - - - - - - Creates a file share out of the component's directory. - - - - - - ACL permission - - - - - - Identifier for the file share (primary key). - - - - - Name of the file share. - - - - - Description of the file share. - - - - - - - - Sets ACLs on a FileShare. This element has no Id attribute. - The table and key are taken from the parent element. - - - - - - - - - - - - - - - - - - - - For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. - - - - - For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. - - - - - For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. - - - - - For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. - - - - - - - - - specifying this will fail to grant read access - - - - - - - - - - - Formats a file's contents at install time. The contents are formatted according to the rules of the - Formatted data type. - - - - - - - The id of a Binary row that contains a copy of the file. The file in the Binary table overwrites whatever - file is installed by the parent component. - - - - - - - - - - - - - - Finds user groups on the local machine or specified Active Directory domain. The local machine will be - searched for the group first then fallback to looking in Active Directory. This element is not capable - of creating new groups but can be used to add new or existing users to an existing group. - - - - - - Unique identifier in your installation package for this group. - - - - - A Formatted string that contains the name of the group to be found. - - - - - An optional Formatted string that specifies the domain for the group. - - - - - - - Used to join a user to a group - - - - - - - - - - How To: Create a shortcut to a webpage - - Creates a shortcut to a URL. - - - - - Unique identifier in your installation package for this Internet shortcut. - - - - - Identifier reference to Directory element where shortcut is to be created. This attribute's value defaults to the parent Component directory. - - - - - - The name of the shortcut file, which is visible to the user. (The .lnk - extension is added automatically and by default, is not shown to the user.) - - - - - - - URL that should be opened when the user selects the shortcut. Windows - opens the URL in the appropriate handler for the protocol specified - in the URL. Note that this is a formatted field, so you can use - [#fileId] syntax to refer to a file being installed (using the file: - protocol). - - - - - - Which type of shortcut should be created. - - - - - - Creates .url files using IUniformResourceLocatorW. - - - - - Creates .lnk files using IShellLinkW (default). - - - - - - - - - Icon file that should be displayed. Note that this is a formatted field, so you can use - [#fileId] syntax to refer to a file being installed (using the file: - protocol). - - - - - - - Index of the icon being referenced - - - - - - - - - - - Used to create performance categories and configure performance counters. - - - - - - - - Unique identifier in your installation package for this performance counter category. - - - - - Name for the performance counter category. If this attribute is not provided the Id attribute is used as the name of the performance counter category. - - - - - Optional help text for the performance counter category. - - - - - Flag that specifies whether the performance counter category is multi or single instanced. Default is single instance. - - - - - DLL that contains the performance counter. The default is "netfxperf.dll" which should be used for all managed code performance counters. - - - - - Function entry point in to the Library DLL called when opening the performance counter. The default is "OpenPerformanceData" which should be used for all managed code performance counters. - - - - - Function entry point in to the Library DLL called when closing the performance counter. The default is "ClosePerformanceData" which should be used for all managed code performance counters. - - - - - Function entry point in to the Library DLL called when collecting data from the performance counter. The default is "CollectPerformanceData" which should be used for all managed code performance counters. - - - - - Default language for the performance category and contained counters' names and help text. - - - - - - - Creates a performance counter in a performance category. - - - - - Name for the performance counter. - - - - - Optional help text for the performance counter. - - - - - Type of the performance counter. - - - - - Language for the peformance counter name and help. The default is to use the parent PerformanceCategory element's DefaultLanguage attribute. - - - - - - - - - - - Used to install Perfmon counters. - - - - - - - - - - - - Used to install Perfmon Counter Manifests. - Note that this functionality cannot be used with major upgrades that are scheduled after the InstallExecute, - InstallExecuteAgain, or InstallFinalize actions. For more information on major upgrade scheduling, see - RemoveExistingProducts Action. - - - - - - The directory that holds the resource file of the providers in the perfmon counter manifest. Often the resource file path cannot be determined until setup time. Put the directory here and during perfmon manifest registrtion the path will be updated in the registry. If not specified, Perfmon will look for the resource file in the same directory of the perfmon counter manifest file. - - - - - - - - - - Used to install Event Manifests. - - - - - The message file (including path) of all the providers in the event manifest. Often the message file path cannot be determined until setup time. Put your MessageFile here and the messageFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. - - - - - The parameter file (including path) of all the providers in the event manifest. Often the parameter file path cannot be determined until setup time. Put your ParameterFile here and the parameterFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. - - - - - The resource file (including path) of all the providers in the event manifest. Often the resource file path cannot be determined until setup time. Put your ResourceFile here and the resourceFileName attribute of the all the providers in the manifest will be updated with the path before it is registered. - - - - - - - - Sets ACLs on File, Registry, CreateFolder, or ServiceInstall. When under a Registry element, this cannot be used - if the Action attribute's value is remove or removeKeyOnInstall. This element has no Id attribute. - The table and key are taken from the parent element. - - - - - - - - - - - - - - - Whether the permissions are inheritable. The default is "yes". - - - - - - - - - - - - - - - - - - For a directory, the right to create a file in the directory. Only valid under a 'CreateFolder' parent. - - - - - For a directory, the right to create a subdirectory. Only valid under a 'CreateFolder' parent. - - - - - For a directory, the right to delete a directory and all the files it contains, including read-only files. Only valid under a 'CreateFolder' parent. - - - - - For a directory, the right to traverse the directory. By default, users are assigned the BYPASS_TRAVERSE_CHECKING privilege, which ignores the FILE_TRAVERSE access right. Only valid under a 'CreateFolder' parent. - - - - - - - - - - - - - - - - - - - specifying this will fail to grant read access - - - - - - Required to call the QueryServiceConfig and QueryServiceConfig2 functions to query the service configuration. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the ChangeServiceConfig or ChangeServiceConfig2 function to change the service configuration. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the QueryServiceStatus function to ask the service control manager about the status of the service. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the EnumDependentServices function to enumerate all the services dependent on the service. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the StartService function to start the service. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the ControlService function to stop the service. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the ControlService function to pause or continue the service. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the ControlService function to ask the service to report its status immediately. Only valid under a 'ServiceInstall' parent. - - - - - Required to call the ControlService function to specify a user-defined control code. Only valid under a 'ServiceInstall' parent. - - - - - - - Describes a product search. - - - - - - - - - - The Guid attribute has been deprecated; use the ProductCode or UpgradeCode attribute instead. If this attribute is used, it is assumed to be a ProductCode. - - - - - The ProductCode to use for the search. This attribute must be omitted if UpgradeCode is specified. - - - - - The UpgradeCode to use for the search. This attribute must be omitted if ProductCode is specified. Note that if multiple products are found, the highest versioned product will be used for the result. - - - - - - Rather than saving the product version into the variable, a ProductSearch can save another attribute of the matching product instead. - - - - - - - Saves the version of a matching product if found; 0.0.0.0 otherwise. This is the default. - - - - - Saves the language of a matching product if found; empty otherwise. - - - - - Saves the state of the product: advertised (1), absent (2), or locally installed (5). - - - - - Saves the assignment type of the product: per-user (0), or per-machine (1). - - - - - - - - - - References a ProductSearch. - - - - - - - - - - - - - - - - The custom action that implements RemoveFolderEx does so by writing temporary rows to the RemoveFile table - for each subfolder of the root folder you specify. Because it might dramatically affect Windows Installer's - File Costing, - the temporary rows must be written before the CostInitialize standard action. Unfortunately, MSI doesn't - create properties for the Directory hierarchy in your package until later, in the CostFinalize action. - An easy workaround for a typical use case of removing a folder during uninstall is to write the directory - path to the registry and to load it during uninstall. See - The WiX toolset's "Remember Property" pattern - for an example. - If you use custom actions to set properties, ensure that they are scheduled before the WixRemoveFoldersEx custom action. - - - - Remove a folder and all contained files and folders if the parent component is selected for installation or removal. - The folder must be specified in the Property attribute as the name of a property that will have a value that resolves - to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used. - For more details, see the Remarks. - - - - - - Primary key used to identify this particular entry. If this is not specified, a stable identifier - will be generated at compile time based on the other attributes. - - - - - - The id of a property that resolves to the full path of the source directory. The property does not have - to exist in the installer database at creation time; it could be created at installation time by a custom - action, on the command line, etc. The property value can contain environment variables surrounded by - percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before - being evaluated for a full path. - - - - - - - This value determines when the folder may be removed. - - - - - - - - Removes the folder only when the parent component is being installed (msiInstallStateLocal or msiInstallStateSource). - - - - - - - Default: Removes the folder only when the parent component is being removed (msiInstallStateAbsent). - - - - - - - Removes the folder when the parent component is being installed or removed. - - - - - - - - - - - Registers a resource with the Restart Manager. - - - - - - - - - - - The unique identifier for this resource. A unique identifier will - be generated automatically if not specified. - - - - - The full path to the process module to register with the Restart Manager. - This can be a formatted value that resolves to a full path. - - - - - The name of a process to register with the Restart Manager. - This can be a formatted value that resolves to a process name. - - - - - The name of a Windows service to register with the Restart Manager. - This can be a formatted value that resolves to a service name. - - - - - - - Describes a registry search. - - - - - - - - - - Registry root hive to search under. - - - - - - HKEY_LOCAL_MACHINE - - - - - HKEY_CURRENT_USER - - - - - HKEY_CLASSES_ROOT - - - - - HKEY_USERS - - - - - - - - Key to search for. - - - - - Optional value to search for under the given Key. - - - - - What format to return the value in. - - - - - - Returns the unformatted value directly from the registry. For example, a REG_DWORD value of '1' is returned as '1', not '#1'. - - - - - Returns the value formatted as Windows Installer would. For example, a REG_DWORD value of '1' is returned as '#1', not '1'. - - - - - - - - Whether to expand any environment variables in REG_SZ, REG_EXPAND_SZ, or REG_MULTI_SZ values. - - - - - - Rather than saving the matching registry value into the variable, a RegistrySearch can save an attribute of the matching entry instead. - - - - - - - Saves true if a matching registry entry is found; false otherwise. - - - - - Saves the value of the registry key in the variable. This is the default. - - - - - - - - Instructs the search to look in the 64-bit registry when the value is 'yes'. When the value is 'no', the search looks in the 32-bit registry. The default value is 'no'. - - - - - - - References a RegistrySearch. - - - - - - - - - - - - Service configuration information for failure actions. - - - - - - Nesting a ServiceConfig element under a ServiceInstall element will result in the service being installed to be configured. - Nesting a ServiceConfig element under a component element will result in an already installed service to be configured. If the service does not exist prior to the install of the MSI package, the install will fail. - - - - - - - - Required if not under a ServiceInstall element. - - - - - Action to take on the first failure of the service. - - - - - - - - - - - - - Action to take on the second failure of the service. - - - - - - - - - - - - - Action to take on the third failure of the service. - - - - - - - - - - - - - Number of days after which to reset the failure count to zero if there are no failures. - - - - - If any of the three *ActionType attributes is "restart", this specifies the number of seconds to wait before doing so. - - - - - If any of the three *ActionType attributes is "runCommand", this specifies the command to run when doing so. This value is formatted. - - - - - If any of the three *ActionType attributes is "reboot", this specifies the message to broadcast to server users before doing so. - - - - - - - Updates the last modified date/time of a file. - - - - - - - - Identifier for the touch file operation. If the identifier is not specified it will be generated. - - - - - Path of the file to update. This value is formatted. - - - - - Specifies whether or not the modified time of the file should be updated on install. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. - - - - - Specifies whether or not the modified time of the file should be updated on reinstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'yes'. - - - - - Specifies whether or not the modified time of the file should be updated on uninstall. If the OnInstall, OnReinstall and OnUninstall attributes are all absent the default is 'no'. - - - - - Indicates the installation will succeed even if the modified time of the file cannot be updated. The default is 'no'. - - - - - - - User for all kinds of things. When it is not nested under a component it is included in the MSI so it can be referenced by other elements such as the User attribute in the AppPool element. When it is nested under a Component element, the User will be created on install and can also be used for reference. - - - - - - - - - - - - - - - - - A Formatted string that contains the name of the user account. - - - - - A Formatted string that contains the local machine or Active Directory domain for the user. - - - - - Usually a Property that is passed in on the command-line to keep it more secure. - - - - - The account's password never expires. Equivalent to UF_DONT_EXPIRE_PASSWD. - - - - - The user cannot change the account's password. Equivalent to UF_PASSWD_CANT_CHANGE. - - - - - Indicates whether the user account should be removed or left behind on uninstall. - - - - - Indicates if the install should fail if the user already exists. - - - - - Indicates whether or not the user can logon as a serivce. User creation can be skipped if all that is desired is to set this access right on the user. - - - - - Indicates whether or not the user can logon as a batch job. User creation can be skipped if all that is desired is to set this access right on the user. - - - - - Indicates if the user account properties should be updated if the user already exists. - - - - - Indicates whether the user must change their password on their first login. - - - - - The account is disabled. Equivalent to UF_ACCOUNTDISABLE. - - - - - Indicates whether or not to create the user. User creation can be skipped if all that is desired is to join a user to groups. - - - - - Indicates whether failure to create the user or add the user to a group fails the installation. The default value is "yes". - - - - - - - Detects the existence of a Windows feature. - - - - - - - - - - The feature to detect. - - - - - - The oldest OS with this feature is Win7 SP1 with KB3033929. - - - - - - - - - - References a WindowsFeatureSearch. - - - - - - - - - - - - - Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions. - - - - - - - - - Identifier for xml file modification. - - - - - The XPath of the element to be modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. - - - - - Path of the .xml file to configure. - - - - - Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. - - - - - - The value to be written. See the Formatted topic for information how to escape square brackets in the value. - - - - - - The type of modification to be made to the XML file when the component is installed. - - - - - - Creates a new element under the element specified in ElementPath. The Name attribute is required in this case and specifies the name of the new element. The Value attribute is not necessary when createElement is specified as the action. If the Value attribute is set, it will cause the new element's text value to be set. - - - - - Deletes a value from the element specified in the ElementPath. If Name is specified, the attribute with that name is deleted. If Name is not specified, the text value of the element specified in the ElementPath is deleted. The Value attribute is ignored if deleteValue is the action specified. - - - - - Sets a value in the element specified in the ElementPath. If Name is specified, and attribute with that name is set to the value specified in Value. If Name is not specified, the text value of the element is set. Value is a required attribute if setValue is the action specified. - - - - - Sets all the values in the elements that match the ElementPath. If Name is specified, attributes with that name are set to the same value specified in Value. If Name is not specified, the text values of the elements are set. Value is a required attribute if setBulkValue is the action specified. - - - - - - - - Specifies whether or not the modification should be removed on uninstall. This has no effect on uninstall if the action was deleteValue. - - - - - Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. - - - - - Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. - - - - - - Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language. - - - - - - - - - - - - - - - Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions. - - - - - - - - - - - - Identifier for xml file modification. - - - - - - - - - - - - - The Id of another XmlConfig to add attributes to. In this case, the 'ElementPath', 'Action', 'Node', and 'On' attributes must be omitted. - - - - - The XPath of the parent element being modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. - - - - - Path of the .xml file to configure. - - - - - Name of XML node to set/add to the specified element. Not setting this attribute causes the element's text value to be set. Otherwise this specified the attribute name that is set. - - - - - - - - - - - - - - - - - - - - - - Specifies wheter or not the modification should preserve the modified date. Preserving the modified date will allow the file to be patched if no other modifications have been made. - - - - - Specifies the order in which the modification is to be attempted on the XML file. It is important to ensure that new elements are created before you attempt to add an attribute to them. - - - - - - The value to be written. See the Formatted topic for information how to escape square brackets in the value. - - - - - - The XPath to the element being modified. This is required for 'delete' actions. For 'create' actions, VerifyPath is used to decide if the element already exists. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. In addition, XPaths allow backslashes to be used to escape characters, so if you intend to include literal backslashes, you must escape them as well by doubling them in this attribute. The string is formatted by MSI first, and the result is consumed as the XPath. - - - - - - - Schedules the BroadcastEnvironmentChange custom action for the current platform. - - - - - - - - - - - Schedules the BroadcastSettingChange custom action for the current platform. - - - - - - - - - - - Schedules the CheckRebootRequired custom action for the current platform. - - - - - - - - - - - Schedules the ExitEarlyWithSuccess custom action for the current platform. - - - - - - - - - - - Schedules the FailWhenDeferred custom action for the current platform. - - - - - - - - - - Schedules the WaitForEvent custom action for the current platform. - - - - - - - - - - - Schedules the WaitForEventDeferred custom action for the current platform. - - - - - - - - - - - Schedules the QueryOsDirs custom action for the current platform. - - - - - - - - - - - Schedules the QueryOsDriverInfo custom action for the current platform. - - - - - - - - - - - Schedules the QueryOsInfo custom action for the current platform. - - - - - - - - - - - Schedules the QueryOsWellKnownSID custom action for the current platform. - - - - - - - - - - - - - Id of the search for ordering and dependency. - - - - - Name of the variable in which to place the result of the search. - - - - - Condition for evaluating the search. If this evaluates to false, the search is not executed at all. - - - - - Id of the search that this one should come after. - - - - - - Values of this type will either be "yes" or "no". - - - - - - - - - Enumeration of valid languages for performance counters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Enumeration of valid types for performance counters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-55-g6feb From 25b074404a7069b7ad53ed61d902da436bc62dc7 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 20 Sep 2020 16:20:21 -0400 Subject: Remove 32-bit ARM support. --- src/be/utilbe.vcxproj | 8 ------ src/ca/utilca.vcxproj | 8 ------ src/wixext/UtilCompiler.cs | 44 ++++++++++++++++---------------- src/wixext/WixToolset.Util.wixext.nuspec | 1 - src/wixlib/UtilExtension_arm.wxs | 7 ----- src/wixlib/util.wixproj | 2 -- 6 files changed, 22 insertions(+), 48 deletions(-) delete mode 100644 src/wixlib/UtilExtension_arm.wxs (limited to 'src') diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index d44a7fd9..3a3830e5 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -8,14 +8,6 @@ - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 747f635a..b2b06ee5 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -9,14 +9,6 @@ - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 8953cfcd..4aec9be9 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -430,7 +430,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -979,7 +979,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); if (!this.Messaging.EncounteredError) { @@ -1275,8 +1275,8 @@ namespace WixToolset.Util } } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); if (!this.Messaging.EncounteredError) { @@ -1583,7 +1583,7 @@ namespace WixToolset.Util IconIndex = iconIndex, }); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); @@ -1770,8 +1770,8 @@ namespace WixToolset.Util this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -2249,8 +2249,8 @@ namespace WixToolset.Util }); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } @@ -2297,8 +2297,8 @@ namespace WixToolset.Util }); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -2341,7 +2341,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) { @@ -2441,8 +2441,8 @@ namespace WixToolset.Util } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); if (null != messageFile || null != parameterFile || null != resourceFile) { @@ -2553,7 +2553,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) @@ -2876,7 +2876,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) { @@ -2952,7 +2952,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) { @@ -3044,7 +3044,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) { @@ -3148,7 +3148,7 @@ namespace WixToolset.Util Attributes = attributes, }); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } } @@ -3352,7 +3352,7 @@ namespace WixToolset.Util if (null != componentId) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } if (!this.Messaging.EncounteredError) @@ -3719,7 +3719,7 @@ namespace WixToolset.Util } } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -3770,7 +3770,7 @@ namespace WixToolset.Util private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec index 0db3f613..bf9e6fc2 100644 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ b/src/wixext/WixToolset.Util.wixext.nuspec @@ -19,7 +19,6 @@ - diff --git a/src/wixlib/UtilExtension_arm.wxs b/src/wixlib/UtilExtension_arm.wxs deleted file mode 100644 index 8ae19029..00000000 --- a/src/wixlib/UtilExtension_arm.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index e937750f..5155205d 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -9,7 +9,6 @@ - @@ -17,7 +16,6 @@ - -- cgit v1.2.3-55-g6feb From efd56dab431aea59eadb120bb72277b7336f23f8 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 20 Sep 2020 17:12:56 -0400 Subject: Update to latest authoring/tools. --- global.json | 2 +- src/wixlib/UtilExtension_Platform.wxi | 158 +++++++++++++++++----------------- src/wixlib/caDecor.wxi | 21 +++-- src/wixlib/caerr.wxi | 2 +- src/wixlib/de-de.wxl | 3 +- src/wixlib/en-us.wxl | 3 +- src/wixlib/es-es.wxl | 3 +- src/wixlib/fr-fr.wxl | 3 +- src/wixlib/it-it.wxl | 3 +- src/wixlib/ja-jp.wxl | 3 +- src/wixlib/pt-br.wxl | 3 +- 11 files changed, 98 insertions(+), 106 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index c34f8a83..c74f74d8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0154" + "WixToolset.Sdk": "4.0.0-build-0157" }, "sdk": { "allowPrerelease": false diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index c3a5d1d6..974169ff 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -5,7 +5,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,42 +63,42 @@ - + - + - + - + - + - + - + - + @@ -107,8 +107,8 @@ - - + + @@ -117,7 +117,7 @@ - + @@ -127,11 +127,11 @@ - - - + + + - + @@ -141,12 +141,12 @@ - - - - - - + + + + + + @@ -157,12 +157,12 @@ - - - - - - + + + + + + @@ -173,12 +173,12 @@ - - - - - - + + + + + + @@ -187,12 +187,12 @@ - - - - - - + + + + + + @@ -201,12 +201,12 @@ - - - - - - + + + + + + @@ -215,9 +215,9 @@ - - - + + + @@ -226,10 +226,10 @@ - - - - + + + + @@ -240,9 +240,9 @@ - - - + + + @@ -252,9 +252,9 @@ - - - + + + @@ -262,9 +262,9 @@ - - - + + + @@ -276,10 +276,10 @@ - - - - + + + + @@ -289,9 +289,9 @@ - - - + + + @@ -299,7 +299,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -335,7 +335,7 @@ - + diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi index 1d00df8f..b1711518 100644 --- a/src/wixlib/caDecor.wxi +++ b/src/wixlib/caDecor.wxi @@ -1,40 +1,39 @@ - - + - + - + - + - + - + - + - + - + - + diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi index 141942f2..ff7ec121 100644 --- a/src/wixlib/caerr.wxi +++ b/src/wixlib/caerr.wxi @@ -1,4 +1,4 @@ - + diff --git a/src/wixlib/de-de.wxl b/src/wixlib/de-de.wxl index 47bfaaaa..65785a3b 100644 --- a/src/wixlib/de-de.wxl +++ b/src/wixlib/de-de.wxl @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl index 25ac4d5d..e8b146a4 100644 --- a/src/wixlib/en-us.wxl +++ b/src/wixlib/en-us.wxl @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/es-es.wxl b/src/wixlib/es-es.wxl index 9001d52e..ca5ab8bb 100644 --- a/src/wixlib/es-es.wxl +++ b/src/wixlib/es-es.wxl @@ -1,5 +1,4 @@ - - + La creación del usuario ha fracasado. ([2] [3] [4] [5]) diff --git a/src/wixlib/fr-fr.wxl b/src/wixlib/fr-fr.wxl index 066e7f81..ad34b56a 100644 --- a/src/wixlib/fr-fr.wxl +++ b/src/wixlib/fr-fr.wxl @@ -1,5 +1,4 @@ - - + La création de l'utilisateur a échoué. ([2] [3] [4] [5]) diff --git a/src/wixlib/it-it.wxl b/src/wixlib/it-it.wxl index 35c62fc9..8cea0a14 100644 --- a/src/wixlib/it-it.wxl +++ b/src/wixlib/it-it.wxl @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/ja-jp.wxl b/src/wixlib/ja-jp.wxl index 6206da64..5f5cf40d 100644 --- a/src/wixlib/ja-jp.wxl +++ b/src/wixlib/ja-jp.wxl @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/pt-br.wxl b/src/wixlib/pt-br.wxl index b2af3425..3ca27dda 100644 --- a/src/wixlib/pt-br.wxl +++ b/src/wixlib/pt-br.wxl @@ -1,5 +1,4 @@ - - + -- cgit v1.2.3-55-g6feb From c1f7e431ba09005bcc173bc251882d5761069376 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 27 Sep 2020 22:01:36 -0400 Subject: Modularize IconFile --- src/ca/netshortcuts.cpp | 5 +++- .../TestData/InternetShortcut/Package.ico | Bin 0 -> 83899 bytes .../InternetShortcut/PackageComponents.wxs | 7 +++--- .../InternetShortcutModule/Package.en-us.wxl | 11 ++++++++ .../TestData/InternetShortcutModule/Package.ico | Bin 0 -> 83899 bytes .../TestData/InternetShortcutModule/Package.wxs | 15 +++++++++++ .../InternetShortcutModule/PackageComponents.wxs | 11 ++++++++ .../WixToolsetTest.Util/UtilExtensionFixture.cs | 28 ++++++++++++++++++--- .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 6 ++++- src/wixext/UtilTableDefinitions.cs | 2 +- 10 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs (limited to 'src') diff --git a/src/ca/netshortcuts.cpp b/src/ca/netshortcuts.cpp index 6ff129db..06826264 100644 --- a/src/ca/netshortcuts.cpp +++ b/src/ca/netshortcuts.cpp @@ -219,6 +219,8 @@ static HRESULT CreateUrl( if (wzIconPath) { + WcaLog(LOGMSG_STANDARD, "Adding icon '%ls' index '%d'", wzIconPath, iconIndex); + hr = piURL->QueryInterface(IID_IPropertySetStorage, (void **)&piProperties); ExitOnFailure(hr, "failed to get IPropertySetStorage for shortcut '%ls'", wzShortcutPath); @@ -234,7 +236,7 @@ static HRESULT CreateUrl( ppvar[0].vt = VT_I4; ppvar[0].lVal = iconIndex; ppvar[1].vt = VT_LPWSTR; - ppvar[1].pwszVal = (LPWSTR)wzIconPath; + ppvar[1].pwszVal = const_cast(wzIconPath); hr = piStorage->WriteMultiple(2, ppids, ppvar, 0); ExitOnFailure(hr, "failed to write icon storage for shortcut '%ls'", wzShortcutPath); @@ -285,6 +287,7 @@ static HRESULT CreateLink( if (wzIconPath) { + WcaLog(LOGMSG_STANDARD, "Adding icon '%ls' index '%d'", wzIconPath, iconIndex); hr = piShellLink->SetIconLocation(wzIconPath, iconIndex); ExitOnFailure(hr, "failed to set icon for shortcut '%ls'", wzShortcutPath); } diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico new file mode 100644 index 00000000..53134de7 Binary files /dev/null and b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico differ diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs index 5319d2f7..2a1b4347 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs @@ -1,9 +1,10 @@ - + - - + + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico new file mode 100644 index 00000000..53134de7 Binary files /dev/null and b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico differ diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs new file mode 100644 index 00000000..f38295e7 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs new file mode 100644 index 00000000..2a1b4347 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 101d71e8..a32a7d62 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -73,7 +73,7 @@ namespace WixToolsetTest.Util } [Fact] - public void CanBuildInternetShortcut() + public void CanBuildInternetShortcutInProduct() { var folder = TestData.Get(@"TestData\InternetShortcut"); var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); @@ -85,8 +85,30 @@ namespace WixToolsetTest.Util "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64\tWixRollbackInternetShortcuts\t", "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64\tWixSchedInternetShortcuts\t", - "RemoveFile:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tzf9nskwi.lnk|WiX Toolset.lnk\tINSTALLFOLDER\t2", - "Wix4InternetShortcut:wixshortcut\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tINSTALLFOLDER\tWiX Toolset.lnk\thttps://wixtoolset.org\t0\t\t0", + "RemoveFile:uisdCsU32.1i4Hebrg1N7E194zJQ8Y\tPackage.ico\thoiptxrr.url|WiX Toolset (url).url\tINSTALLFOLDER\t2", + "RemoveFile:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A\tPackage.ico\tjcxd1dwf.lnk|WiX Toolset (link).lnk\tINSTALLFOLDER\t2", + "Wix4InternetShortcut:uisdCsU32.1i4Hebrg1N7E194zJQ8Y\tPackage.ico\tINSTALLFOLDER\tWiX Toolset (url).url\thttps://wixtoolset.org\t1\t[#Package.ico]\t0", + "Wix4InternetShortcut:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A\tPackage.ico\tINSTALLFOLDER\tWiX Toolset (link).lnk\thttps://wixtoolset.org\t0\t[#Package.ico]\t0", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildInternetShortcutInMergeModule() + { + var folder = TestData.Get(@"TestData\InternetShortcutModule"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", + "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixCreateInternetShortcuts\t", + "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRollbackInternetShortcuts\t", + "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixSchedInternetShortcuts\t", + "RemoveFile:uisdCsU32.1i4Hebrg1N7E194zJQ8Y.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\thoiptxrr.url|WiX Toolset (url).url\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\t2", + "RemoveFile:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tjcxd1dwf.lnk|WiX Toolset (link).lnk\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\t2", + "Wix4InternetShortcut:uisdCsU32.1i4Hebrg1N7E194zJQ8Y.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\tWiX Toolset (url).url\thttps://wixtoolset.org\t1\t[#Package.ico.047730A5_30FE_4A62_A520_DA9381B8226A]\t0", + "Wix4InternetShortcut:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\tWiX Toolset (link).lnk\thttps://wixtoolset.org\t0\t[#Package.ico.047730A5_30FE_4A62_A520_DA9381B8226A]\t0", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index f2d5c486..50776c2c 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -27,10 +27,14 @@ - + + + + + diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index ef5bfeec..e5d0850f 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -100,7 +100,7 @@ namespace WixToolset.Util new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name used for shortcut.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "URL target."), new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attribute flags that control how the shortcut is created."), - new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"), + new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Icon file for shortcut", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), }, symbolIdIsPrimaryKey: true -- cgit v1.2.3-55-g6feb From c532140cff9e3f2603a0ca823a410b10d8d8938b Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 26 Oct 2020 21:09:24 -0400 Subject: Update test authoring for Package/SummaryInformation change. --- global.json | 2 +- .../WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | 7 ++----- src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs | 7 ++----- .../WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs | 7 ++----- .../TestData/InternetShortcutModule/Package.wxs | 6 +++--- src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs | 7 ++----- src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs | 8 +++----- src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs | 7 ++----- src/wixext/UtilCompiler.cs | 2 +- 9 files changed, 18 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index cd03153d..33154a9e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0159" + "WixToolset.Sdk": "4.0.0-build-0162" }, "sdk": { "allowPrerelease": false diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index ec54a472..410b151d 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -1,16 +1,13 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs index d3130591..09d2c46e 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs index d3130591..09d2c46e 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs index f38295e7..2a9daa1c 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs index d3130591..09d2c46e 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs index 7f6cd7fa..43365cc3 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs @@ -1,7 +1,5 @@ - - - - + + @@ -12,7 +10,7 @@ - + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs index 32d1cba6..873b137e 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -1,14 +1,11 @@  - - - + - - + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 4aec9be9..68c7a234 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -210,7 +210,7 @@ namespace WixToolset.Util case "Bundle": case "Fragment": case "Module": - case "Product": + case "Package": switch (element.Name.LocalName) { case "CloseApplication": -- cgit v1.2.3-55-g6feb From eaa1a2f53a440ef8e9ffc9e4a2069fc6de54907b Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sat, 31 Oct 2020 21:14:16 -0400 Subject: Strong-name sign WiX assemblies. --- src/CSharp.Build.props | 11 +++++++++++ src/Directory.Build.props | 1 + src/wix.snk | Bin 0 -> 596 bytes 3 files changed, 12 insertions(+) create mode 100644 src/CSharp.Build.props create mode 100644 src/wix.snk (limited to 'src') diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props new file mode 100644 index 00000000..b12f4c6e --- /dev/null +++ b/src/CSharp.Build.props @@ -0,0 +1,11 @@ + + + + + true + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a22f4470..f83cc154 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,6 +22,7 @@ WiX Toolset + diff --git a/src/wix.snk b/src/wix.snk new file mode 100644 index 00000000..3908a66a Binary files /dev/null and b/src/wix.snk differ -- cgit v1.2.3-55-g6feb From 033f7216e5c071fb3cf8f34ac2cf48627972cc2f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 2 Nov 2020 18:27:44 -0600 Subject: Update dependencies. --- global.json | 2 +- src/be/packages.config | 8 ++++---- src/be/utilbe.vcxproj | 16 ++++++++-------- src/ca/packages.config | 6 +++--- src/ca/utilca.vcxproj | 12 ++++++------ src/wixext/WixToolset.Util.wixext.csproj | 2 +- src/wixlib/util.wixproj | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 64522575..81007c2d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0163" + "WixToolset.Sdk": "4.0.0-build-0164" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config index de622895..7d8998ed 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 3a3830e5..a524f228 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -71,7 +71,7 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -82,9 +82,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index d045b6fb..24ab543e 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -3,7 +3,7 @@ - - - + + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index b2b06ee5..76f36cd1 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -105,7 +105,7 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -116,8 +116,8 @@ - - - + + + \ No newline at end of file diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 3e4278bd..c3eff490 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 5155205d..f806087e 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -22,7 +22,7 @@ - + -- cgit v1.2.3-55-g6feb From 81c5b5b271306e505b853ec2df284f276c86bf5a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 8 Dec 2020 14:54:46 -0600 Subject: Update dependencies. Remove platformless BundleExtension. --- global.json | 2 +- src/be/packages.config | 6 +++--- src/be/utilbe.vcxproj | 12 ++++++------ src/ca/packages.config | 2 +- src/ca/utilca.vcxproj | 4 ++-- .../TestData/BundleWithSearches/Bundle.wxs | 6 ++++-- src/wixlib/UtilExtension.wxs | 4 ---- 7 files changed, 17 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 81007c2d..3baefa28 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0164" + "WixToolset.Sdk": "4.0.0-build-0171" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config index 7d8998ed..946d9ce8 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index a524f228..5f146fd8 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index 24ab543e..7251c430 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 76f36cd1..5082f759 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,7 +5,7 @@ - + @@ -117,7 +117,7 @@ - + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs index c8f7205f..3c40b09a 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -1,6 +1,8 @@ - + - + + + diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index fccba7bf..0f445ab4 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs @@ -61,8 +61,4 @@ - - - - -- cgit v1.2.3-55-g6feb From a46b1cf9bd6f7dfca72b238a1bb1c838dde558ae Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 3 Jan 2021 14:55:59 -0600 Subject: Update dependencies. --- Util.wixext.sln | 3 +++ appveyor.cmd | 5 ++--- global.json | 2 +- src/CSharp.Build.props | 2 ++ src/Cpp.Build.props | 8 ++++++++ src/CustomizedNativeRecommendedRules.ruleset | 8 ++++++++ src/Directory.Build.targets | 8 ++++++++ src/wixext/WixToolset.Util.wixext.csproj | 2 +- src/wixlib/util.wixproj | 6 ++++++ 9 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 src/CustomizedNativeRecommendedRules.ruleset (limited to 'src') diff --git a/Util.wixext.sln b/Util.wixext.sln index 36949676..050fd8b3 100644 --- a/Util.wixext.sln +++ b/Util.wixext.sln @@ -29,6 +29,7 @@ Global {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.ActiveCfg = Debug|Win32 {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.Build.0 = Debug|Win32 {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.Build.0 = Release|Win32 {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x64.ActiveCfg = Release|Win32 {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.ActiveCfg = Release|Win32 {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.Build.0 = Release|Win32 @@ -38,6 +39,7 @@ Global {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.ActiveCfg = Release|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.Build.0 = Release|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x64.ActiveCfg = Release|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32 {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32 @@ -47,6 +49,7 @@ Global {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86 diff --git a/appveyor.cmd b/appveyor.cmd index 2347f074..6b666bbd 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -3,12 +3,11 @@ nuget restore || exit /b -msbuild -p:Configuration=Release -t:Restore || exit /b +msbuild -p:Configuration=Release -Restore || exit /b -msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b +msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b @popd @endlocal diff --git a/global.json b/global.json index 3baefa28..6b0e711a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0171" + "WixToolset.Sdk": "4.0.0-build-0176" }, "sdk": { "allowPrerelease": false diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props index b12f4c6e..81d24ad1 100644 --- a/src/CSharp.Build.props +++ b/src/CSharp.Build.props @@ -5,7 +5,9 @@ --> + true true $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 9b7a1bb5..e7bba117 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -6,12 +6,20 @@ Win32 $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ $(OutputPath)$(Platform)\ + + + $(Company) + $(Copyright) $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset + + $(DisableSpecificCompilerWarnings) diff --git a/src/CustomizedNativeRecommendedRules.ruleset b/src/CustomizedNativeRecommendedRules.ruleset new file mode 100644 index 00000000..142b141c --- /dev/null +++ b/src/CustomizedNativeRecommendedRules.ruleset @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index dac7452a..cb988931 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -9,6 +9,11 @@ See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 --> + + false + $(OutputPath)\$(AssemblyName).xml + + true $(SolutionPath) @@ -45,4 +50,7 @@ + + + diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index c3eff490..b90c9035 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -32,7 +32,7 @@ - + $(OutputPath)..\ $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index f806087e..4aeb09f2 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -25,4 +25,10 @@ + + + + + + -- cgit v1.2.3-55-g6feb From 923d3edd21da412b0fd6a09dfd3391913fe18c56 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 9 Jan 2021 01:37:43 -0800 Subject: Modularize XmlConfig/@ElementId and add tests for XmlConfig Fixes wixtoolset/issues#4698 Closes wixtoolset/issues#5447 --- src/ca/XmlConfig.cpp | 101 +++++++++++++-------- .../TestData/XmlConfig/Package.en-us.wxl | 11 +++ .../TestData/XmlConfig/Package.wxs | 27 ++++++ .../TestData/XmlConfigModule/Module.wxs | 34 +++++++ .../TestData/XmlConfigModule/my.xml | 1 + .../WixToolsetTest.Util/UtilExtensionFixture.cs | 27 ++++++ .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 36 +------- src/wixext/Symbols/XmlConfigSymbol.cs | 8 ++ src/wixext/UtilCompiler.cs | 4 +- src/wixext/UtilTableDefinitions.cs | 3 +- 10 files changed, 175 insertions(+), 77 deletions(-) create mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml (limited to 'src') diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp index afd3dafb..0c2fae37 100644 --- a/src/ca/XmlConfig.cpp +++ b/src/ca/XmlConfig.cpp @@ -30,10 +30,10 @@ enum eXmlPreserveDate }; LPCWSTR vcsXmlConfigQuery = - L"SELECT `Wix4XmlConfig`.`Wix4XmlConfig`, `Wix4XmlConfig`.`File`, `Wix4XmlConfig`.`ElementPath`, `Wix4XmlConfig`.`VerifyPath`, `Wix4XmlConfig`.`Name`, " + L"SELECT `Wix4XmlConfig`.`Wix4XmlConfig`, `Wix4XmlConfig`.`File`, `Wix4XmlConfig`.`ElementId`, `Wix4XmlConfig`.`ElementPath`, `Wix4XmlConfig`.`VerifyPath`, `Wix4XmlConfig`.`Name`, " L"`Wix4XmlConfig`.`Value`, `Wix4XmlConfig`.`Flags`, `Wix4XmlConfig`.`Component_`, `Component`.`Attributes` " L"FROM `Wix4XmlConfig`,`Component` WHERE `Wix4XmlConfig`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; -enum eXmlConfigQuery { xfqXmlConfig = 1, xfqFile, xfqElementPath, xfqVerifyPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; +enum eXmlConfigQuery { xfqXmlConfig = 1, xfqFile, xfqElementId, xfqElementPath, xfqVerifyPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; struct XML_CONFIG_CHANGE { @@ -44,6 +44,7 @@ struct XML_CONFIG_CHANGE INSTALLSTATE isAction; WCHAR wzFile[MAX_PATH]; + LPWSTR pwzElementId; LPWSTR pwzElementPath; LPWSTR pwzVerifyPath; WCHAR wzName[MAX_DARWIN_COLUMN]; @@ -72,26 +73,32 @@ static HRESULT FreeXmlConfigChangeList( pxfcDelete = pxfcList; pxfcList = pxfcList->pxfcNext; + if (pxfcDelete->pwzElementId) + { + hr = MemFree(pxfcDelete->pwzElementId); + ExitOnFailure(hr, "failed to free xml config element id in change list item"); + } + if (pxfcDelete->pwzElementPath) { hr = MemFree(pxfcDelete->pwzElementPath); - ExitOnFailure(hr, "failed to free xml file element path in change list item"); + ExitOnFailure(hr, "failed to free xml config element path in change list item"); } if (pxfcDelete->pwzVerifyPath) { hr = MemFree(pxfcDelete->pwzVerifyPath); - ExitOnFailure(hr, "failed to free xml file verify path in change list item"); + ExitOnFailure(hr, "failed to free xml config verify path in change list item"); } if (pxfcDelete->pwzValue) { hr = MemFree(pxfcDelete->pwzValue); - ExitOnFailure(hr, "failed to free xml file value in change list item"); + ExitOnFailure(hr, "failed to free xml config value in change list item"); } hr = MemFree(pxfcDelete); - ExitOnFailure(hr, "failed to free xml file change list item"); + ExitOnFailure(hr, "failed to free xml config change list item"); } LExit: @@ -191,6 +198,10 @@ static HRESULT ReadXmlConfigTable( hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); ExitOnFailure(hr, "failed to get Wix4XmlConfig flags for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + // Get the Element Id + hr = WcaGetRecordFormattedString(hRec, xfqElementId, &(*ppxfcTail)->pwzElementId); + ExitOnFailure(hr, "failed to get Element Id for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + // Get the Element Path hr = WcaGetRecordFormattedString(hRec, xfqElementPath, &(*ppxfcTail)->pwzElementPath); ExitOnFailure(hr, "failed to get Element Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); @@ -259,45 +270,55 @@ static HRESULT ProcessChanges( pxfcCheck = *ppxfcHead; while (pxfcCheck) { - if (0 == lstrcmpW(pxfc->pwzElementPath, pxfcCheck->wzId) && 0 == pxfc->iXmlFlags - && XMLCONFIG_CREATE & pxfcCheck->iXmlFlags && XMLCONFIG_ELEMENT & pxfcCheck->iXmlFlags) + if (pxfc->pwzElementId) { - // We found a match. First, take it out of the current list - if (pxfc->pxfcPrev) + if (0 == lstrcmpW(pxfc->pwzElementId, pxfcCheck->wzId) + && 0 == pxfc->iXmlFlags + && XMLCONFIG_CREATE & pxfcCheck->iXmlFlags + && XMLCONFIG_ELEMENT & pxfcCheck->iXmlFlags) { - pxfc->pxfcPrev->pxfcNext = pxfc->pxfcNext; - } - else // it was the head. Update the head - { - *ppxfcHead = pxfc->pxfcNext; - } + // We found a match. First, take it out of the current list + if (pxfc->pxfcPrev) + { + pxfc->pxfcPrev->pxfcNext = pxfc->pxfcNext; + } + else // it was the head. Update the head + { + *ppxfcHead = pxfc->pxfcNext; + } - if (pxfc->pxfcNext) - { - pxfc->pxfcNext->pxfcPrev = pxfc->pxfcPrev; - } + if (pxfc->pxfcNext) + { + pxfc->pxfcNext->pxfcPrev = pxfc->pxfcPrev; + } - pxfc->pxfcNext = NULL; - pxfc->pxfcPrev = NULL; + pxfc->pxfcNext = NULL; + pxfc->pxfcPrev = NULL; - // Now, add this node to the end of the matched node's additional changes list - if (!pxfcCheck->pxfcAdditionalChanges) - { - pxfcCheck->pxfcAdditionalChanges = pxfc; - pxfcCheck->cAdditionalChanges = 1; + // Now, add this node to the end of the matched node's additional changes list + if (!pxfcCheck->pxfcAdditionalChanges) + { + pxfcCheck->pxfcAdditionalChanges = pxfc; + pxfcCheck->cAdditionalChanges = 1; + } + else + { + pxfcLast = pxfcCheck->pxfcAdditionalChanges; + cAdditionalChanges = 1; + while (pxfcLast->pxfcNext) + { + pxfcLast = pxfcLast->pxfcNext; + ++cAdditionalChanges; + } + pxfcLast->pxfcNext = pxfc; + pxfc->pxfcPrev = pxfcLast; + pxfcCheck->cAdditionalChanges = ++cAdditionalChanges; + } } else { - pxfcLast = pxfcCheck->pxfcAdditionalChanges; - cAdditionalChanges = 1; - while (pxfcLast->pxfcNext) - { - pxfcLast = pxfcLast->pxfcNext; - ++cAdditionalChanges; - } - pxfcLast->pxfcNext = pxfc; - pxfc->pxfcPrev = pxfcLast; - pxfcCheck->cAdditionalChanges = ++cAdditionalChanges; + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "failed to find matching ElementId: %ls", pxfc->pwzElementId); } } @@ -381,9 +402,10 @@ static HRESULT WriteChangeData( HRESULT hr = S_OK; XML_CONFIG_CHANGE* pxfcAdditionalChanges = NULL; + LPCWSTR wzElementPath = pxfc->pwzElementId ? pxfc->pwzElementId : pxfc->pwzElementPath; - hr = WcaWriteStringToCaData(pxfc->pwzElementPath, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", pxfc->pwzElementPath); + hr = WcaWriteStringToCaData(wzElementPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", wzElementPath); hr = WcaWriteStringToCaData(pxfc->pwzVerifyPath, ppwzCustomActionData); ExitOnFailure(hr, "failed to write VerifyPath to custom action data: %ls", pxfc->pwzVerifyPath); @@ -1111,4 +1133,3 @@ LExit: } return WcaFinalize(er); } - diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs new file mode 100644 index 00000000..21f75f8f --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs new file mode 100644 index 00000000..93f5eeb1 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml new file mode 100644 index 00000000..bad25217 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml @@ -0,0 +1 @@ +This is my.xml file. diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index a32a7d62..d9440614 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -172,6 +172,33 @@ namespace WixToolsetTest.Util }, results.OrderBy(s => s).ToArray()); } + [Fact] + public void CanBuildWithXmlConfig() + { + var folder = TestData.Get(@"TestData", "XmlConfig"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Wix4XmlConfig"); + WixAssert.CompareLineByLine(new[] + { + "Wix4XmlConfig:DelElement\t[INSTALLFOLDER]my.xml\t\t//root/sub\txxx\t\t\t289\tDel\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildModuleWithXmlConfig() + { + var folder = TestData.Get(@"TestData", "XmlConfigModule"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Wix4XmlConfig"); + WixAssert.CompareLineByLine(new[] + { + "Wix4XmlConfig:AddElement.047730A5_30FE_4A62_A520_DA9381B8226A\t[my.xml.047730A5_30FE_4A62_A520_DA9381B8226A]\t\t//root/sub\txxx\t\t\t273\tParent.047730A5_30FE_4A62_A520_DA9381B8226A\t1", + "Wix4XmlConfig:ChildElement.047730A5_30FE_4A62_A520_DA9381B8226A\t[my.xml.047730A5_30FE_4A62_A520_DA9381B8226A]\tAddElement.047730A5_30FE_4A62_A520_DA9381B8226A\t\txxx\t\t\t0\tChild.047730A5_30FE_4A62_A520_DA9381B8226A\t1", + }, results.OrderBy(s => s).ToArray()); + } + [Fact] public void CanBuildBundleWithSearches() { diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 50776c2c..e77ecbed 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -12,41 +12,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/wixext/Symbols/XmlConfigSymbol.cs b/src/wixext/Symbols/XmlConfigSymbol.cs index ca1cf047..6503a586 100644 --- a/src/wixext/Symbols/XmlConfigSymbol.cs +++ b/src/wixext/Symbols/XmlConfigSymbol.cs @@ -12,6 +12,7 @@ namespace WixToolset.Util new[] { new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementId), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), @@ -31,6 +32,7 @@ namespace WixToolset.Util.Symbols public enum XmlConfigSymbolFields { File, + ElementId, ElementPath, VerifyPath, Name, @@ -58,6 +60,12 @@ namespace WixToolset.Util.Symbols set => this.Set((int)XmlConfigSymbolFields.File, value); } + public string ElementId + { + get => this.Fields[(int)XmlConfigSymbolFields.ElementId].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ElementId, value); + } + public string ElementPath { get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 68c7a234..7314570e 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -3706,13 +3706,15 @@ namespace WixToolset.Util var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id) { File = file, - ElementPath = elementId ?? elementPath, + ElementId = elementId, + ElementPath = elementPath, VerifyPath = verifyPath, Name = name, Value = value, Flags = flags, ComponentRef = componentId, }); + if (CompilerConstants.IntegerNotSet != sequence) { symbol.Sequence = sequence; diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index e5d0850f..1908915c 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -253,7 +253,8 @@ namespace WixToolset.Util { new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to. Can also be a foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ElementId", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Wix4XmlConfig", keyColumn: 1, description: "A foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to. Must be null if ElementId is provided", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("VerifyPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query run from ElementPath to verify whether a repair is necessary. Also used to uninstall.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), -- cgit v1.2.3-55-g6feb From ee462cad8c0bda4f0b340ac0c03329a362232091 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 4 Feb 2021 21:58:37 -0600 Subject: Update dependencies. --- global.json | 2 +- src/be/packages.config | 4 ++-- src/be/utilbe.vcxproj | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 6b0e711a..f227ec06 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0176" + "WixToolset.Sdk": "4.0.0-build-0186" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config index 946d9ce8..2b96e672 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 5f146fd8..96e0bca6 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,8 +4,8 @@ - - + + @@ -83,8 +83,8 @@ - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From b4a31404325d3fdd95d67fd41eda8e48e3491629 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 9 Feb 2021 21:28:02 -0500 Subject: Update DUtil dependency. --- src/be/packages.config | 2 +- src/be/utilbe.vcxproj | 4 ++-- src/ca/XmlConfig.cpp | 2 +- src/ca/XmlFile.cpp | 2 +- src/ca/packages.config | 4 ++-- src/ca/utilca.vcxproj | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/be/packages.config b/src/be/packages.config index 2b96e672..615279de 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 96e0bca6..f6665932 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -6,7 +6,7 @@ - + Debug @@ -85,6 +85,6 @@ - + \ No newline at end of file diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp index 0c2fae37..959f95b0 100644 --- a/src/ca/XmlConfig.cpp +++ b/src/ca/XmlConfig.cpp @@ -346,7 +346,7 @@ static HRESULT BeginChangeFile( BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; LPBYTE pbData = NULL; - DWORD cbData = 0; + SIZE_T cbData = 0; LPWSTR pwzRollbackCustomActionData = NULL; diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp index d7cb227e..95f18411 100644 --- a/src/ca/XmlFile.cpp +++ b/src/ca/XmlFile.cpp @@ -213,7 +213,7 @@ static HRESULT BeginChangeFile( BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit; BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH; LPBYTE pbData = NULL; - DWORD cbData = 0; + SIZE_T cbData = 0; LPWSTR pwzRollbackCustomActionData = NULL; diff --git a/src/ca/packages.config b/src/ca/packages.config index 7251c430..987359f7 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -4,6 +4,6 @@ - - + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 5082f759..9ff0ec8e 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -117,7 +117,7 @@ - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From bfba90f1714724ab661e43af5cc48bc148bdef70 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 11 Feb 2021 15:22:03 -0800 Subject: Replace Win64 attribute with Bitness attribute --- global.json | 2 +- .../TestData/BundleWithSearches/Bundle.wxs | 14 +++++++++++- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 4 +++- src/wixext/UtilCompiler.cs | 25 +++++++++++++++++----- 4 files changed, 37 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index f227ec06..745a2571 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0186" + "WixToolset.Sdk": "4.0.0-build-0188" }, "sdk": { "allowPrerelease": false diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs index 3c40b09a..7fef0725 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -1,10 +1,11 @@ - + + @@ -26,6 +27,17 @@ Result="value" /> + + + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index d9440614..e1a608d3 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -243,7 +243,7 @@ namespace WixToolsetTest.Util "", bundleExtensionDatas[0].GetTestXml()); var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); - Assert.Equal(4, utilSearches.Count); + Assert.Equal(5, utilSearches.Count); Assert.Equal("", utilSearches[0].GetTestXml()); Assert.Equal("", utilSearches[2].GetTestXml()); Assert.Equal("", utilSearches[3].GetTestXml()); + Assert.Equal("", utilSearches[4].GetTestXml()); } } diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 7314570e..183f286b 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2684,7 +2684,7 @@ namespace WixToolset.Util string key = null; string value = null; var expand = YesNoType.NotSet; - var win64 = YesNoType.NotSet; + var win64 = this.Context.IsCurrentPlatform64Bit; var attributes = WixRegistrySearchAttributes.Raw | WixRegistrySearchAttributes.WantValue; foreach (var attrib in element.Attributes()) @@ -2699,6 +2699,24 @@ namespace WixToolset.Util case "After": this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); break; + case "Bitness": + var bitnessValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (bitnessValue) + { + case "always32": + win64 = false; + break; + case "always64": + win64 = true; + break; + case "default": + case "": + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Name.LocalName, attrib.Name.LocalName, bitnessValue, "default", "always32", "always64")); + break; + } + break; case "Root": root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); break; @@ -2741,9 +2759,6 @@ namespace WixToolset.Util break; } break; - case "Win64": - win64 = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); break; @@ -2780,7 +2795,7 @@ namespace WixToolset.Util attributes |= WixRegistrySearchAttributes.ExpandEnvironmentVariables; } - if (win64 == YesNoType.Yes) + if (win64) { attributes |= WixRegistrySearchAttributes.Win64; } -- cgit v1.2.3-55-g6feb From f5964e66de4c2c320197b7cda23ed9af61288985 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 17 Feb 2021 15:11:23 -0600 Subject: Update dependencies. --- global.json | 2 +- src/be/packages.config | 2 +- src/be/utilbe.vcxproj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 745a2571..a4eb003d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0188" + "WixToolset.Sdk": "4.0.0-build-0189" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config index 615279de..76c0922f 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index f6665932..12258b6a 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -5,7 +5,7 @@ - + @@ -84,7 +84,7 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From b3fdc47eec3baa4a18b5fda707bb975f72d4be42 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 23 Feb 2021 18:12:23 -0500 Subject: Add custom action prefixes. --- src/wixext/UtilCompiler.cs | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 183f286b..2909fbb4 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -430,7 +430,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4" + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -979,7 +979,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); if (!this.Messaging.EncounteredError) { @@ -1275,8 +1275,8 @@ namespace WixToolset.Util } } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); if (!this.Messaging.EncounteredError) { @@ -1583,7 +1583,7 @@ namespace WixToolset.Util IconIndex = iconIndex, }); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); @@ -1770,8 +1770,8 @@ namespace WixToolset.Util this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -2249,8 +2249,8 @@ namespace WixToolset.Util }); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } @@ -2297,8 +2297,8 @@ namespace WixToolset.Util }); } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -2341,7 +2341,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) { @@ -2441,8 +2441,8 @@ namespace WixToolset.Util } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); if (null != messageFile || null != parameterFile || null != resourceFile) { @@ -2553,7 +2553,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) @@ -2891,7 +2891,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) { @@ -2967,7 +2967,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) { @@ -3059,7 +3059,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) { @@ -3163,7 +3163,7 @@ namespace WixToolset.Util Attributes = attributes, }); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } } @@ -3367,7 +3367,7 @@ namespace WixToolset.Util if (null != componentId) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } if (!this.Messaging.EncounteredError) @@ -3736,7 +3736,7 @@ namespace WixToolset.Util } } - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// @@ -3787,7 +3787,7 @@ namespace WixToolset.Util private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } /// -- cgit v1.2.3-55-g6feb From dd7352c2a04e66f325d34cf41d4b8ce3d6c0a815 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 28 Feb 2021 17:06:38 -0800 Subject: Update to latest build process to simplify build of .snupkg --- .gitignore | 43 ++++++++++---- global.json | 2 +- src/CSharp.Build.props | 13 ----- src/Cpp.Build.props | 94 ------------------------------- src/Directory.Build.props | 4 +- src/Directory.Build.targets | 9 +-- src/Directory.csproj.props | 13 +++++ src/Directory.csproj.targets | 26 +++++++++ src/Directory.vcxproj.props | 97 ++++++++++++++++++++++++++++++++ src/wixext/WixToolset.Util.wixext.nuspec | 8 +-- 10 files changed, 176 insertions(+), 133 deletions(-) delete mode 100644 src/CSharp.Build.props delete mode 100644 src/Cpp.Build.props create mode 100644 src/Directory.csproj.props create mode 100644 src/Directory.csproj.targets create mode 100644 src/Directory.vcxproj.props (limited to 'src') diff --git a/.gitignore b/.gitignore index 3e8a1553..1ee53850 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -20,12 +23,14 @@ [Rr]eleases/ x64/ x86/ +[Ww][Ii][Nn]32/ [Aa][Rr][Mm]/ [Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +[Ll]ogs/ # Visual Studio 2015/2017 cache/options directory .vs/ @@ -39,9 +44,10 @@ Generated\ Files/ [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUNIT +# NUnit *.VisualState.xml TestResult.xml +nunit-*.xml # Build Results of an ATL Project [Dd]ebugPS/ @@ -56,6 +62,9 @@ project.lock.json project.fragment.lock.json artifacts/ +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + # StyleCop StyleCopReport.xml @@ -122,9 +131,6 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# JustCode is a .NET coding add-in -.JustCode - # TeamCity is a build add-in _TeamCity* @@ -135,6 +141,11 @@ _TeamCity* .axoCover/* !.axoCover/settings.json +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + # Visual Studio code coverage results *.coverage *.coveragexml @@ -182,6 +193,8 @@ PublishScripts/ # NuGet Packages *.nupkg +# NuGet Symbol Packages +*.snupkg # The packages folder can be ignored because of Package Restore **/[Pp]ackages/* # except build/, which is used as an MSBuild target. @@ -206,6 +219,8 @@ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt *.appx +*.appxbundle +*.appxupload # Visual Studio cache files # files ending in .cache can be ignored @@ -231,8 +246,6 @@ orleans.codegen.cs # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) #bower_components/ -# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true -**/wwwroot/lib/ # RIA/Silverlight projects Generated_Code/ @@ -257,6 +270,9 @@ ServiceFabricBackup/ *.bim.layout *.bim_*.settings *.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl # Microsoft Fakes FakesAssemblies/ @@ -292,10 +308,6 @@ paket-files/ # FAKE - F# Make .fake/ -# JetBrains Rider -.idea/ -*.sln.iml - # CodeRush personal settings .cr/personal @@ -337,5 +349,14 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ -# BeatPulse healthcheck temp database +# BeatPulse healthcheck temp database healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd diff --git a/global.json b/global.json index a4eb003d..1f29eef4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0189" + "WixToolset.Sdk": "4.0.0-build-0191" }, "sdk": { "allowPrerelease": false diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/CSharp.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props deleted file mode 100644 index e7bba117..00000000 --- a/src/Cpp.Build.props +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f83cc154..b3c6287c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,8 +22,6 @@ WiX Toolset - - - + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index cb988931..2fcc765a 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -9,11 +9,6 @@ See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 --> - - false - $(OutputPath)\$(AssemblyName).xml - - true $(SolutionPath) @@ -45,12 +40,12 @@ - + - + diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props new file mode 100644 index 00000000..81d24ad1 --- /dev/null +++ b/src/Directory.csproj.props @@ -0,0 +1,13 @@ + + + + + true + true + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false + + diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets new file mode 100644 index 00000000..c3270426 --- /dev/null +++ b/src/Directory.csproj.targets @@ -0,0 +1,26 @@ + + + + + false + $(OutputPath)\$(AssemblyName).xml + + + + + $(PrivateRepositoryUrl.Replace('.git','')) + + $(MSBuildProjectName).nuspec + $(OutputPath)..\ + $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) + $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) + true + snupkg + + + + diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props new file mode 100644 index 00000000..11778f41 --- /dev/null +++ b/src/Directory.vcxproj.props @@ -0,0 +1,97 @@ + + + + + + Win32 + $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ + $(OutputPath)$(Platform)\ + + + $(Company) + $(Copyright) + + win-x86;win-x64;win-arm64 + native,Version=v0.0 + + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + + + $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset + + + + + $(DisableSpecificCompilerWarnings) + Level4 + $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + Use + precomp.h + StdCall + true + false + -YlprecompDefine + /Zc:threadSafeInit- %(AdditionalOptions) + true + + + $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) + $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) + + + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + + + $(ProjectSubSystem) + $(ProjectModuleDefinitionFile) + $(ResourceOnlyDll) + true + $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) + /IGNORE:4099 %(AdditionalOptions) + + + + + + NoExtensions + + + + + CDecl + + + + + OldStyle + true + true + + + + + Disabled + EnableFastChecks + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + MinSpace + NDEBUG;%(PreprocessorDefinitions) + true + true + MultiThreaded + + + true + true + + + diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec index bf9e6fc2..43d461e7 100644 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ b/src/wixext/WixToolset.Util.wixext.nuspec @@ -3,14 +3,13 @@ $id$ $version$ + $title$ + $description$ $authors$ - $authors$ MS-RL - https://github.com/wixtoolset/Util.wixext false - $title$ - $description$ $copyright$ + $projectUrl$ @@ -20,6 +19,7 @@ + -- cgit v1.2.3-55-g6feb From 8233991b07f09e5a1fdd52c012f55ad40625e2d4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 2 Mar 2021 19:12:22 -0600 Subject: Update dependencies. --- global.json | 2 +- src/be/packages.config | 6 +++--- src/be/utilbe.vcxproj | 12 ++++++------ src/ca/packages.config | 2 +- src/ca/utilca.vcxproj | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 1f29eef4..137c0ebf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0191" + "WixToolset.Sdk": "4.0.0-build-0193" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config index 76c0922f..ff45698b 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 12258b6a..ff50c655 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index 987359f7..9e7a0c36 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 9ff0ec8e..4e7ff495 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,7 +5,7 @@ - + @@ -117,7 +117,7 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 0cce08ec250a53f28c2b349b8d88d3d9ea7def9c Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 2 Mar 2021 09:58:41 -0800 Subject: Use updated AccessModifier enum --- src/wixext/UtilCompiler.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 2909fbb4..f1faf4a8 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2404,7 +2404,7 @@ namespace WixToolset.Util if (null != messageFile) { - section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}MessageFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", @@ -2416,7 +2416,7 @@ namespace WixToolset.Util } if (null != parameterFile) { - section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}ParameterFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", @@ -2428,7 +2428,7 @@ namespace WixToolset.Util } if (null != resourceFile) { - section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}ResourceFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", -- cgit v1.2.3-55-g6feb From f7268b6ba1fbcc25ba321205d2fdea6bd0d39b2b Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 3 Mar 2021 13:14:38 -0800 Subject: Update to latest build infrastructure --- appveyor.cmd | 14 +++++-- global.json | 2 +- src/be/packages.config | 10 ----- src/be/utilbe.vcxproj | 46 +++++++++------------- src/ca/packages.config | 9 ----- src/ca/utilca.vcxproj | 36 +++++------------ .../WixToolsetTest.Util/UtilExtensionFixture.cs | 1 + src/wixext/WixToolset.Util.wixext.csproj | 10 ----- src/wixext/WixToolset.Util.wixext.nuspec | 1 - src/wixlib/util.wixproj | 19 +++------ 10 files changed, 45 insertions(+), 103 deletions(-) delete mode 100644 src/be/packages.config delete mode 100644 src/ca/packages.config (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index 6b666bbd..8322ffae 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -1,13 +1,19 @@ @setlocal @pushd %~dp0 +@set _C=Release +@if /i "%1"=="debug" set _C=Debug -nuget restore || exit /b +:: Restore +msbuild -p:Configuration=%_C% -t:Restore || exit /b -msbuild -p:Configuration=Release -Restore || exit /b +:: Build +msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b +:: Test +dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b -msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b +:: Pack +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b @popd @endlocal diff --git a/global.json b/global.json index 137c0ebf..2e158a40 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0193" + "WixToolset.Sdk": "4.0.0-build-0194" }, "sdk": { "allowPrerelease": false diff --git a/src/be/packages.config b/src/be/packages.config deleted file mode 100644 index ff45698b..00000000 --- a/src/be/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index ff50c655..ad89d8a0 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -1,12 +1,7 @@ - - - - - - - + + Debug @@ -33,6 +28,7 @@ Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58} DynamicLibrary @@ -42,11 +38,14 @@ utilbe.def WiX Toolset Util BundleExtension + + msi.lib + @@ -56,6 +55,7 @@ + @@ -63,28 +63,18 @@ + - + + + + + + + + + - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/ca/packages.config b/src/ca/packages.config deleted file mode 100644 index 9e7a0c36..00000000 --- a/src/ca/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 4e7ff495..c2117f79 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -1,13 +1,7 @@ - - - - - - - + Debug @@ -97,27 +91,15 @@ - + + + + + + + - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index e1a608d3..0761a004 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -268,6 +268,7 @@ namespace WixToolsetTest.Util var newArgs = args.ToList(); newArgs.Add("-platform"); newArgs.Add("x64"); + newArgs.Add("-sw1072"); var result = WixRunner.Execute(newArgs.ToArray()); result.AssertSuccess(); diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index b90c9035..10fc569e 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -8,13 +8,10 @@ WiX Toolset Utility Extension WiX Toolset Util Extension embedded - $(MSBuildThisFileName).nuspec true - Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - @@ -31,11 +28,4 @@ - - - - $(OutputPath)..\ - $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) - - diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec index 43d461e7..ba3eaade 100644 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ b/src/wixext/WixToolset.Util.wixext.nuspec @@ -19,7 +19,6 @@ - diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 4aeb09f2..99dede7d 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -13,22 +13,15 @@ - - - - - - + + + + + + - - - - - - - -- cgit v1.2.3-55-g6feb From b441a16555d8a720b89028bc4cf3684e58864115 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 18 Mar 2021 09:54:00 -0500 Subject: Update dependencies. --- global.json | 2 +- src/be/utilbe.vcxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 2e158a40..7141ee36 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0194" + "WixToolset.Sdk": "4.0.0-build-0200" }, "sdk": { "allowPrerelease": false diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index ad89d8a0..894383d1 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -69,8 +69,8 @@ - - + + -- cgit v1.2.3-55-g6feb From 3d5c85c88fc7440b0e232173a18f80f3363c039a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 19 Mar 2021 12:10:05 -0700 Subject: RemoveFolderEx.Property should be modularized as a Column The value in the column is the name of a Property not a formatted field that can contain properties. Fixes wixtoolset/issues#4449 --- .../TestData/RemoveFolderEx/Module.wxs | 15 +++++++++++++++ .../TestData/RemoveFolderEx/ModuleComponents.wxs | 10 ++++++++++ src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 15 +++++++++++++++ src/wixext/UtilTableDefinitions.cs | 2 +- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs new file mode 100644 index 00000000..39674278 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs new file mode 100644 index 00000000..236d9df0 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 0761a004..3e2a97f9 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -129,6 +129,21 @@ namespace WixToolsetTest.Util }, results.OrderBy(s => s).ToArray()); } + [Fact] + public void CanBuildRemoveFolderExInMergeModule() + { + var folder = TestData.Get(@"TestData\RemoveFolderEx"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4RemoveFolderEx"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", + "CustomAction:Wix4RemoveFoldersEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A WixRemoveFoldersEx\t", + "Wix4RemoveFolderEx:wrfB3e9CDihkNwm06LohylbJcjZ91w.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\tRemoveProp.047730A5_30FE_4A62_A520_DA9381B8226A\t3", + }, results.OrderBy(s => s).ToArray()); + } + [Fact] public void CanBuildWithEventManifest() { diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index 1908915c..eff5aaf6 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -31,7 +31,7 @@ namespace WixToolset.Util { new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), }, symbolIdIsPrimaryKey: true -- cgit v1.2.3-55-g6feb From 4d27a43eb676e48a6ae6213e234f519b6af8c8a7 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 19 Mar 2021 12:10:19 -0700 Subject: Minor test clean up --- .../TestData/InternetShortcutModule/Module.wxs | 15 +++++++++++++++ .../TestData/InternetShortcutModule/ModuleComponents.wxs | 11 +++++++++++ .../TestData/InternetShortcutModule/Package.en-us.wxl | 11 ----------- .../TestData/InternetShortcutModule/Package.wxs | 15 --------------- .../TestData/InternetShortcutModule/PackageComponents.wxs | 11 ----------- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- 6 files changed, 27 insertions(+), 38 deletions(-) create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs new file mode 100644 index 00000000..2a9daa1c --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs new file mode 100644 index 00000000..2a1b4347 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl deleted file mode 100644 index 38c12ac1..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs deleted file mode 100644 index 2a9daa1c..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs deleted file mode 100644 index 2a1b4347..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 3e2a97f9..b2af91b3 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -96,7 +96,7 @@ namespace WixToolsetTest.Util public void CanBuildInternetShortcutInMergeModule() { var folder = TestData.Get(@"TestData\InternetShortcutModule"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); WixAssert.CompareLineByLine(new[] -- cgit v1.2.3-55-g6feb From 0f0f825506753e889938a3e0b6bd5177fbbb43ab Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 6 Apr 2021 20:30:51 -0400 Subject: Update dependencies. --- global.json | 2 +- .../TestData/BundleWithSearches/Bundle.en-us.wxl | 4 +--- .../TestData/CloseApplication/Package.en-us.wxl | 4 +--- .../TestData/CloseApplication/Package.wxs | 8 +++---- .../CloseApplication/PackageComponents.wxs | 2 +- .../TestData/EventManifest/Package.en-us.wxl | 4 +--- .../TestData/EventManifest/Package.wxs | 10 ++++---- .../TestData/InternetShortcut/Package.en-us.wxl | 4 +--- .../TestData/InternetShortcut/Package.wxs | 10 ++++---- .../TestData/InternetShortcutModule/Module.wxs | 10 ++++---- .../TestData/PermissionEx/Package.en-us.wxl | 4 +--- .../TestData/PermissionEx/Package.wxs | 10 ++++---- .../TestData/Queries/Package.en-us.wxl | 4 +--- .../TestData/Queries/Package.wxs | 13 +++++------ .../TestData/Queries/PackageComponents.wxs | 2 +- .../TestData/RemoveFolderEx/Module.wxs | 10 ++++---- .../TestData/UsingFileShare/Package.en-us.wxl | 4 +--- .../TestData/UsingFileShare/Package.wxs | 8 +++---- .../TestData/XmlConfig/Package.en-us.wxl | 4 +--- .../TestData/XmlConfig/Package.wxs | 20 ++++------------ .../TestData/XmlConfigModule/Module.wxs | 27 +++++----------------- 21 files changed, 54 insertions(+), 110 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index a6bc92d7..5eeff69e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0203" + "WixToolset.Sdk": "4.0.0-build-0205" }, "sdk": { "allowPrerelease": false diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl index bc1dee83..f50a5386 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index 410b151d..8e054256 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -10,10 +10,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs index 49f29600..e27b3c43 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs @@ -1,4 +1,4 @@ - + diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs index 09d2c46e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -1,4 +1,4 @@ - + @@ -8,10 +8,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs index 09d2c46e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs @@ -1,4 +1,4 @@ - + @@ -8,10 +8,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs index 2a9daa1c..1355d42e 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs @@ -1,4 +1,4 @@ - + @@ -6,10 +6,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs index 09d2c46e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -1,4 +1,4 @@ - + @@ -8,10 +8,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs index 43365cc3..abf0dbb4 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs @@ -12,13 +12,12 @@ - - + - - + + + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs index e2dce4ae..e27b3c43 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs @@ -1,4 +1,4 @@ - + diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs index 39674278..2c2be584 100644 --- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs +++ b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs @@ -1,4 +1,4 @@ - + @@ -6,10 +6,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs index 873b137e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -8,10 +8,8 @@ - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl @@ -1,6 +1,4 @@ - - - diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs index 21f75f8f..a2002634 100644 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs @@ -1,27 +1,17 @@ - + - + - - + - - - + + diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs index 93f5eeb1..29e8555b 100644 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs @@ -1,34 +1,19 @@ - + - + - + - - + - - - + + -- cgit v1.2.3-55-g6feb From 5184f19621cff955cc1d4544568edde4e2154888 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 8 Apr 2021 07:43:42 -0700 Subject: Update dutil --- src/be/utilbe.vcxproj | 2 +- src/ca/utilca.vcxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 894383d1..42241173 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -71,7 +71,7 @@ - + diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index c2117f79..4fafba68 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -95,7 +95,7 @@ - + -- cgit v1.2.3-55-g6feb From e1c4d762286bcdd58c2fdac4098c9a5846398920 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 11 Apr 2021 12:20:10 -0700 Subject: Move SecureObj attributes to symbol --- src/wixext/Symbols/SecureObjectsSymbol.cs | 14 +++++++++++--- src/wixext/UtilCompiler.cs | 15 +++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/wixext/Symbols/SecureObjectsSymbol.cs b/src/wixext/Symbols/SecureObjectsSymbol.cs index b90df521..25fc6dca 100644 --- a/src/wixext/Symbols/SecureObjectsSymbol.cs +++ b/src/wixext/Symbols/SecureObjectsSymbol.cs @@ -25,6 +25,7 @@ namespace WixToolset.Util namespace WixToolset.Util.Symbols { + using System; using WixToolset.Data; public enum SecureObjectsSymbolFields @@ -38,6 +39,13 @@ namespace WixToolset.Util.Symbols ComponentRef, } + [Flags] + public enum WixPermissionExAttributes + { + None = 0x0, + Inheritable = 0x01 + } + public class SecureObjectsSymbol : IntermediateSymbol { public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) @@ -74,10 +82,10 @@ namespace WixToolset.Util.Symbols set => this.Set((int)SecureObjectsSymbolFields.User, value); } - public int Attributes + public WixPermissionExAttributes Attributes { - get => this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); - set => this.Set((int)SecureObjectsSymbolFields.Attributes, value); + get => (WixPermissionExAttributes)this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Attributes, (int)value); } public int? Permission diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index f1faf4a8..c0312f48 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -49,11 +49,6 @@ namespace WixToolset.Util TypeMask = 0xf, } - internal enum WixPermissionExAttributes - { - Inheritable = 0x01 - } - internal enum WixRemoveFolderExOn { Install = 1, @@ -2465,8 +2460,7 @@ namespace WixToolset.Util string domain = null; string[] specialPermissions = null; string user = null; - var inheritable = YesNoType.NotSet; - int attributes = 0; + var attributes = WixPermissionExAttributes.Inheritable; // default to inheritable. var permissionType = PermissionType.SecureObjects; @@ -2508,7 +2502,10 @@ namespace WixToolset.Util domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "Inheritable": - inheritable = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + if (this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.No) + { + attributes &= ~WixPermissionExAttributes.Inheritable; + } break; case "User": user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -2547,8 +2544,6 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); } - attributes |= inheritable == YesNoType.No ? 0 : (int)WixPermissionExAttributes.Inheritable; // default to inheritable. - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); if (!this.Messaging.EncounteredError) -- cgit v1.2.3-55-g6feb From aea4e48d8408689c5749d154dddcfb99ddfb257b Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 11 Apr 2021 12:20:54 -0700 Subject: Move RestartResource attributes to symbol --- src/wixext/Symbols/WixRestartResourceSymbol.cs | 14 +++++++++++--- src/wixext/UtilCompiler.cs | 22 +++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/wixext/Symbols/WixRestartResourceSymbol.cs b/src/wixext/Symbols/WixRestartResourceSymbol.cs index 7f76f1b8..01b92b63 100644 --- a/src/wixext/Symbols/WixRestartResourceSymbol.cs +++ b/src/wixext/Symbols/WixRestartResourceSymbol.cs @@ -30,6 +30,14 @@ namespace WixToolset.Util.Symbols Attributes, } + public enum WixRestartResourceAttributes + { + Filename = 1, + ProcessName, + ServiceName, + TypeMask = 0xf, + } + public class WixRestartResourceSymbol : IntermediateSymbol { public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) @@ -54,10 +62,10 @@ namespace WixToolset.Util.Symbols set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); } - public int Attributes + public WixRestartResourceAttributes? Attributes { - get => this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixRestartResourceSymbolFields.Attributes, value); + get => (WixRestartResourceAttributes?)this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNullableNumber(); + set => this.Set((int)WixRestartResourceSymbolFields.Attributes, (int?)value); } } } \ No newline at end of file diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index c0312f48..12213e63 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -41,14 +41,6 @@ namespace WixToolset.Util Compatible, } - internal enum WixRestartResourceAttributes - { - Filename = 1, - ProcessName, - ServiceName, - TypeMask = 0xf, - } - internal enum WixRemoveFolderExOn { Install = 1, @@ -2909,7 +2901,7 @@ namespace WixToolset.Util var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; string resource = null; - var attributes = CompilerConstants.IntegerNotSet; + WixRestartResourceAttributes? attributes = null; foreach (var attrib in element.Attributes()) { @@ -2923,17 +2915,17 @@ namespace WixToolset.Util case "Path": resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - attributes = (int)WixRestartResourceAttributes.Filename; + attributes = WixRestartResourceAttributes.Filename; break; case "ProcessName": resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - attributes = (int)WixRestartResourceAttributes.ProcessName; + attributes = WixRestartResourceAttributes.ProcessName; break; case "ServiceName": resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - attributes = (int)WixRestartResourceAttributes.ServiceName; + attributes = WixRestartResourceAttributes.ServiceName; break; default: @@ -2948,14 +2940,14 @@ namespace WixToolset.Util } // Validate the attribute. - if (null == id) + if (id == null) { id = this.ParseHelper.CreateIdentifier("wrr", componentId, resource, attributes.ToString()); } - if (String.IsNullOrEmpty(resource) || CompilerConstants.IntegerNotSet == attributes) + if (!attributes.HasValue) { - this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Path", "ServiceName")); + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Path", "ProcessName", "ServiceName")); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); -- cgit v1.2.3-55-g6feb From 13c4becf524dbd12b92f099320726aa0b59f3bbc Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 11 Apr 2021 12:22:57 -0700 Subject: Add Condition to RemoveFoldersEx --- src/ca/RemoveFoldersEx.cpp | 62 +++++++++++++++++++--- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 4 +- src/wixext/Symbols/WixRemoveFolderExSymbol.cs | 21 ++++++-- src/wixext/UtilCompiler.cs | 28 +++++----- src/wixext/UtilTableDefinitions.cs | 1 + 5 files changed, 87 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/ca/RemoveFoldersEx.cpp b/src/ca/RemoveFoldersEx.cpp index ce64c2c2..cbc7f4bb 100644 --- a/src/ca/RemoveFoldersEx.cpp +++ b/src/ca/RemoveFoldersEx.cpp @@ -2,8 +2,11 @@ #include "precomp.h" -LPCWSTR vcsRemoveFolderExQuery = L"SELECT `Wix4RemoveFolderEx`, `Component_`, `Property`, `InstallMode` FROM `Wix4RemoveFolderEx`"; -enum eRemoveFolderExQuery { rfqId = 1, rfqComponent, rfqProperty, feqMode }; +LPCWSTR vcsRemoveFolderExQuery = + L"SELECT `Wix4RemoveFolderEx`, `Component_`, `Property`, `InstallMode`, `WixRemoveFolderEx`.`Condition`, `Component`.`Attributes`" + L"FROM `Wix4RemoveFolderEx``,`Component` " + L"WHERE `Wix4RemoveFolderEx`.`Component_`=`Component`.`Component`"; +enum eRemoveFolderExQuery { rfqId = 1, rfqComponent, rfqProperty, rfqMode, rfqCondition, rfqComponentAttributes }; static HRESULT RecursePath( __in_z LPCWSTR wzPath, @@ -11,6 +14,7 @@ static HRESULT RecursePath( __in_z LPCWSTR wzComponent, __in_z LPCWSTR wzProperty, __in int iMode, + __in BOOL fDisableWow64Redirection, __inout DWORD* pdwCounter, __inout MSIHANDLE* phTable, __inout MSIHANDLE* phColumns @@ -24,6 +28,12 @@ static HRESULT RecursePath( WIN32_FIND_DATAW wfd; LPWSTR sczNext = NULL; + if (fDisableWow64Redirection) + { + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); + } + // First recurse down to all the child directories. hr = StrAllocFormatted(&sczSearch, L"%s*", wzPath); ExitOnFailure(hr, "Failed to allocate file search string in path: %S", wzPath); @@ -34,7 +44,7 @@ static HRESULT RecursePath( er = ::GetLastError(); if (ERROR_PATH_NOT_FOUND == er) { - WcaLog(LOGMSG_STANDARD, "Search path not found: %ls", sczSearch); + WcaLog(LOGMSG_STANDARD, "Search path not found: %ls; skipping", sczSearch); ExitFunction1(hr = S_FALSE); } else @@ -55,7 +65,8 @@ static HRESULT RecursePath( hr = StrAllocFormatted(&sczNext, L"%s%s\\", wzPath, wfd.cFileName); ExitOnFailure(hr, "Failed to concat filename '%S' to string: %S", wfd.cFileName, wzPath); - hr = RecursePath(sczNext, wzId, wzComponent, wzProperty, iMode, pdwCounter, phTable, phColumns); + // Don't re-disable redirection; if it was necessary, we've already done it. + hr = RecursePath(sczNext, wzId, wzComponent, wzProperty, iMode, FALSE, pdwCounter, phTable, phColumns); ExitOnFailure(hr, "Failed to recurse path: %S", sczNext); } while (::FindNextFileW(hFind, &wfd)); @@ -81,10 +92,10 @@ static HRESULT RecursePath( // Add the row to remove any files and another row to remove the folder. hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFiles", wzComponent, L"*.*", sczProperty, iMode); - ExitOnFailure(hr, "Failed to add row to remove all files for Wix4RemoveFolderEx row: %S under path:", wzId, wzPath); + ExitOnFailure(hr, "Failed to add row to remove all files for Wix4RemoveFolderEx row: %ls under path: %ls", wzId, wzPath); hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFolder", wzComponent, NULL, sczProperty, iMode); - ExitOnFailure(hr, "Failed to add row to remove folder for Wix4RemoveFolderEx row: %S under path: %S", wzId, wzPath); + ExitOnFailure(hr, "Failed to add row to remove folder for Wix4RemoveFolderEx row: %ls under path: %ls", wzId, wzPath); LExit: if (INVALID_HANDLE_VALUE != hFind) @@ -92,6 +103,11 @@ LExit: ::FindClose(hFind); } + if (fDisableWow64Redirection) + { + WcaRevertWow64FSRedirection(); + } + ReleaseStr(sczNext); ReleaseStr(sczProperty); ReleaseStr(sczSearch); @@ -110,9 +126,12 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( LPWSTR sczId = NULL; LPWSTR sczComponent = NULL; LPWSTR sczProperty = NULL; + LPWSTR sczCondition = NULL; LPWSTR sczPath = NULL; LPWSTR sczExpandedPath = NULL; int iMode = 0; + int iComponentAttributes; + BOOL f64BitComponent = FALSE; DWORD dwCounter = 0; DWORD_PTR cchLen = 0; MSIHANDLE hTable = NULL; @@ -121,6 +140,8 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( hr = WcaInitialize(hInstall, "WixRemoveFoldersEx"); ExitOnFailure(hr, "Failed to initialize WixRemoveFoldersEx."); + WcaInitializeWow64(); + // anything to do? if (S_OK != WcaTableExists(L"Wix4RemoveFolderEx")) { @@ -137,18 +158,40 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( hr = WcaGetRecordString(hRec, rfqId, &sczId); ExitOnFailure(hr, "Failed to get remove folder identity."); + hr = WcaGetRecordString(hRec, rfqCondition, &sczCondition); + ExitOnFailure(hr, "Failed to get remove folder condition."); + + if (sczCondition && *sczCondition) + { + MSICONDITION condition = ::MsiEvaluateConditionW(hInstall, sczCondition); + if (MSICONDITION_TRUE == condition) + { + WcaLog(LOGMSG_STANDARD, "True condition for row %S: %S; processing.", sczId, sczCondition); + } + else + { + WcaLog(LOGMSG_STANDARD, "False or invalid condition for row %S: %S; skipping.", sczId, sczCondition); + continue; + } + } + hr = WcaGetRecordString(hRec, rfqComponent, &sczComponent); ExitOnFailure(hr, "Failed to get remove folder component."); hr = WcaGetRecordString(hRec, rfqProperty, &sczProperty); ExitOnFailure(hr, "Failed to get remove folder property."); - hr = WcaGetRecordInteger(hRec, feqMode, &iMode); + hr = WcaGetRecordInteger(hRec, rfqMode, &iMode); ExitOnFailure(hr, "Failed to get remove folder mode"); hr = WcaGetProperty(sczProperty, &sczPath); ExitOnFailure(hr, "Failed to resolve remove folder property: %S for row: %S", sczProperty, sczId); + hr = WcaGetRecordInteger(hRec, rfqComponentAttributes, &iComponentAttributes); + ExitOnFailure(hr, "failed to get component attributes for row: %ls", sczId); + + f64BitComponent = iComponentAttributes & msidbComponentAttributes64bit; + // fail early if the property isn't set as you probably don't want your installers trying to delete SystemFolder // StringCchLengthW succeeds only if the string is zero characters plus 1 for the terminating null hr = ::StringCchLengthW(sczPath, 1, reinterpret_cast(&cchLen)); @@ -164,7 +207,7 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( ExitOnFailure(hr, "Failed to backslash-terminate path: %S", sczExpandedPath); WcaLog(LOGMSG_STANDARD, "Recursing path: %S for row: %S.", sczExpandedPath, sczId); - hr = RecursePath(sczExpandedPath, sczId, sczComponent, sczProperty, iMode, &dwCounter, &hTable, &hColumns); + hr = RecursePath(sczExpandedPath, sczId, sczComponent, sczProperty, iMode, f64BitComponent, &dwCounter, &hTable, &hColumns); ExitOnFailure(hr, "Failed while navigating path: %S for row: %S", sczPath, sczId); } @@ -176,6 +219,8 @@ extern "C" UINT WINAPI WixRemoveFoldersEx( ExitOnFailure(hr, "Failure occured while processing Wix4RemoveFolderEx table"); LExit: + WcaFinalizeWow64(); + if (hColumns) { ::MsiCloseHandle(hColumns); @@ -190,6 +235,7 @@ LExit: ReleaseStr(sczPath); ReleaseStr(sczProperty); ReleaseStr(sczComponent); + ReleaseStr(sczCondition); ReleaseStr(sczId); DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index b2af91b3..9c32ebc2 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -139,8 +139,8 @@ namespace WixToolsetTest.Util WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", - "CustomAction:Wix4RemoveFoldersEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A WixRemoveFoldersEx\t", - "Wix4RemoveFolderEx:wrfB3e9CDihkNwm06LohylbJcjZ91w.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\tRemoveProp.047730A5_30FE_4A62_A520_DA9381B8226A\t3", + "CustomAction:Wix4RemoveFoldersEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRemoveFoldersEx\t", + "Wix4RemoveFolderEx:wrf5qCm1SE.zp8djrlk78l1IYFXsEw.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\tRemoveProp.047730A5_30FE_4A62_A520_DA9381B8226A\t3\t", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs b/src/wixext/Symbols/WixRemoveFolderExSymbol.cs index 0c50ab8e..86352b6c 100644 --- a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs +++ b/src/wixext/Symbols/WixRemoveFolderExSymbol.cs @@ -14,6 +14,7 @@ namespace WixToolset.Util new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Condition), IntermediateFieldType.String), }, typeof(WixRemoveFolderExSymbol)); } @@ -28,6 +29,14 @@ namespace WixToolset.Util.Symbols ComponentRef, Property, InstallMode, + Condition, + } + + public enum WixRemoveFolderExInstallMode + { + Install = 1, + Uninstall = 2, + Both = 3, } public class WixRemoveFolderExSymbol : IntermediateSymbol @@ -54,10 +63,16 @@ namespace WixToolset.Util.Symbols set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); } - public int InstallMode + public WixRemoveFolderExInstallMode InstallMode + { + get => (WixRemoveFolderExInstallMode)this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, (int)value); + } + + public string Condition { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); - set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.Condition].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.Condition, value); } } } \ No newline at end of file diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 12213e63..63f2b469 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -41,13 +41,6 @@ namespace WixToolset.Util Compatible, } - internal enum WixRemoveFolderExOn - { - Install = 1, - Uninstall = 2, - Both = 3, - } - private static readonly Regex FindPropertyBrackets = new Regex(@"\[(?!\\|\])|(? "http://wixtoolset.org/schemas/v4/wxs/util"; @@ -2812,8 +2805,9 @@ namespace WixToolset.Util { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); Identifier id = null; - var on = (int)WixRemoveFolderExOn.Uninstall; + var mode = WixRemoveFolderExInstallMode.Uninstall; string property = null; + string condition = null; foreach (var attrib in element.Attributes()) { @@ -2821,6 +2815,9 @@ namespace WixToolset.Util { switch (attrib.Name.LocalName) { + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; case "Id": id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; @@ -2828,24 +2825,22 @@ namespace WixToolset.Util var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); if (onValue.Length == 0) { - on = CompilerConstants.IllegalInteger; } else { switch (onValue) { case "install": - on = (int)WixRemoveFolderExOn.Install; + mode = WixRemoveFolderExInstallMode.Install; break; case "uninstall": - on = (int)WixRemoveFolderExOn.Uninstall; + mode = WixRemoveFolderExInstallMode.Uninstall; break; case "both": - on = (int)WixRemoveFolderExOn.Both; + mode = WixRemoveFolderExInstallMode.Both; break; default: this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", onValue, "install", "uninstall", "both")); - on = CompilerConstants.IllegalInteger; break; } } @@ -2869,9 +2864,9 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Property")); } - if (null == id) + if (id == null) { - id = this.ParseHelper.CreateIdentifier("wrf", componentId, property, on.ToString(CultureInfo.InvariantCulture.NumberFormat)); + id = this.ParseHelper.CreateIdentifier("wrf", componentId, property, mode.ToString()); } this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); @@ -2884,7 +2879,8 @@ namespace WixToolset.Util { ComponentRef = componentId, Property = property, - InstallMode = on, + InstallMode = mode, + Condition = condition }); this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveFile"); diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index eff5aaf6..fd09367a 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -33,6 +33,7 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), + new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the removing of folders.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), }, symbolIdIsPrimaryKey: true ); -- cgit v1.2.3-55-g6feb From ae7e9817bb10d635e031e51496f2e529595a9cfe Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 11 Apr 2021 12:23:19 -0700 Subject: Add RemoveRegistryKey --- src/ca/RemoveRegistryKeysEx.cpp | 114 +++++++++++++++++++++ src/ca/utilca.def | 2 + src/ca/utilca.vcxproj | 1 + .../TestData/RemoveRegistryKeyEx/Module.wxs | 13 +++ .../RemoveRegistryKeyEx/ModuleComponents.wxs | 10 ++ .../WixToolsetTest.Util/UtilExtensionFixture.cs | 15 +++ src/wixext/Symbols/UtilSymbolDefinitions.cs | 4 + src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs | 86 ++++++++++++++++ src/wixext/UtilCompiler.cs | 103 +++++++++++++++++-- src/wixext/UtilTableDefinitions.cs | 16 +++ src/wixlib/UtilExtension_Platform.wxi | 8 ++ 11 files changed, 366 insertions(+), 6 deletions(-) create mode 100644 src/ca/RemoveRegistryKeysEx.cpp create mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs create mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs create mode 100644 src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs (limited to 'src') diff --git a/src/ca/RemoveRegistryKeysEx.cpp b/src/ca/RemoveRegistryKeysEx.cpp new file mode 100644 index 00000000..478c0779 --- /dev/null +++ b/src/ca/RemoveRegistryKeysEx.cpp @@ -0,0 +1,114 @@ +// 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" + +LPCWSTR vcsRemoveRegistryKeyExQuery = + L"SELECT `Wix4RemoveRegistryKeyEx`, `Component_`, `Root`, `Key`, `InstallMode`, `Condition` FROM `Wix4RemoveRegistryKeyEx`"; +enum eRemoveRegistryKeyExQuery { rrxqId = 1, rrxqComponent, rrxqRoot, rrxqKey, rrxqMode, rrxqCondition }; + +extern "C" UINT WINAPI WixRemoveRegistryKeysEx( + __in MSIHANDLE hInstall +) +{ + //AssertSz(FALSE, "debug WixRemoveRegistryKeyEx"); + + HRESULT hr = S_OK; + PMSIHANDLE hView; + PMSIHANDLE hRec; + LPWSTR sczId = NULL; + LPWSTR sczComponent = NULL; + LPWSTR sczCondition = NULL; + LPWSTR sczKey = NULL; + int iRoot = 0; + int iMode = 0; + MSIHANDLE hTable = NULL; + MSIHANDLE hColumns = NULL; + + hr = WcaInitialize(hInstall, __FUNCTION__); + ExitOnFailure(hr, "Failed to initialize " __FUNCTION__); + + // anything to do? + if (S_OK != WcaTableExists(L"Wix4RemoveRegistryKeyEx")) + { + WcaLog(LOGMSG_STANDARD, "Wix4RemoveRegistryKeyEx table doesn't exist, so there are no registry keys to remove."); + ExitFunction(); + } + + hr = WcaOpenExecuteView(vcsRemoveRegistryKeyExQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4RemoveRegistryKeyEx table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, rrxqId, &sczId); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx identity."); + + hr = WcaGetRecordString(hRec, rrxqCondition, &sczCondition); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx condition."); + + if (sczCondition && *sczCondition) + { + MSICONDITION condition = ::MsiEvaluateConditionW(hInstall, sczCondition); + if (MSICONDITION_TRUE == condition) + { + WcaLog(LOGMSG_STANDARD, "True condition for row %S: %S; processing.", sczId, sczCondition); + } + else + { + WcaLog(LOGMSG_STANDARD, "False or invalid condition for row %S: %S; skipping.", sczId, sczCondition); + continue; + } + } + + hr = WcaGetRecordString(hRec, rrxqComponent, &sczComponent); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx component."); + + hr = WcaGetRecordInteger(hRec, rrxqRoot, &iRoot); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx root."); + + hr = WcaGetRecordString(hRec, rrxqKey, &sczKey); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx key."); + + hr = WcaGetRecordInteger(hRec, rrxqMode, &iMode); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx mode."); + + switch (iMode) + { + case 1: // remove on install + WcaLog(LOGMSG_STANDARD, "Adding RemoveRegistry row: %ls/%d/%ls/-/%ls", sczId, iRoot, sczKey, sczComponent); + hr = WcaAddTempRecord(&hTable, &hColumns, L"RemoveRegistry", NULL, 0, 5, sczId, iRoot, sczKey, L"-", sczComponent); + ExitOnFailure(hr, "Failed to add RemoveRegistry row for remove-on-install Wix4RemoveRegistryKeyEx row: %ls:", sczId); + break; + case 2: // remove on uninstall + WcaLog(LOGMSG_STANDARD, "Adding Registry row: %ls/%d/%ls/-/null/%ls", sczId, iRoot, sczKey, sczComponent); + hr = WcaAddTempRecord(&hTable, &hColumns, L"Registry", NULL, 0, 6, sczId, iRoot, sczKey, L"-", NULL, sczComponent); + ExitOnFailure(hr, "Failed to add Registry row for remove-on-uninstall Wix4RemoveRegistryKeyEx row: %ls:", sczId); + break; + } + } + + // reaching the end of the list is actually a good thing, not an error + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing Wix4RemoveRegistryKeyEx table."); + +LExit: + if (hColumns) + { + ::MsiCloseHandle(hColumns); + } + + if (hTable) + { + ::MsiCloseHandle(hTable); + } + + ReleaseStr(sczKey); + ReleaseStr(sczComponent); + ReleaseStr(sczCondition); + ReleaseStr(sczId); + + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ca/utilca.def b/src/ca/utilca.def index 97d5776f..337c3a68 100644 --- a/src/ca/utilca.def +++ b/src/ca/utilca.def @@ -35,6 +35,8 @@ EXPORTS WixSilentExec64 ; RemoveFoldersEx.cpp WixRemoveFoldersEx +; RemoveRegistryKeysEx.cpp + WixRemoveRegistryKeysEx ;scaexec.cpp RegisterPerfCounterData UnregisterPerfCounterData diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 4fafba68..6a076f2f 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -59,6 +59,7 @@ + diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs new file mode 100644 index 00000000..32b246f4 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs new file mode 100644 index 00000000..0a0c8cb6 --- /dev/null +++ b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 9c32ebc2..883f9794 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -129,6 +129,21 @@ namespace WixToolsetTest.Util }, results.OrderBy(s => s).ToArray()); } + [Fact] + public void CanBuildRemoveRegistryKeyExInMergeModule() + { + var folder = TestData.Get(@"TestData", "RemoveRegistryKeyEx"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveRegistry", "Wix4RemoveRegistryKeyEx"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", + "CustomAction:Wix4RemoveRegistryKeysEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRemoveRegistryKeysEx\t", + "Wix4RemoveRegistryKeyEx:rrxfcDhR4HhE3v3rYiQcNtQjyahQNg.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\t2\tSOFTWARE\\Example\t1\t", + }, results.OrderBy(s => s).ToArray()); + } + [Fact] public void CanBuildRemoveFolderExInMergeModule() { diff --git a/src/wixext/Symbols/UtilSymbolDefinitions.cs b/src/wixext/Symbols/UtilSymbolDefinitions.cs index 5f062676..72091c3b 100644 --- a/src/wixext/Symbols/UtilSymbolDefinitions.cs +++ b/src/wixext/Symbols/UtilSymbolDefinitions.cs @@ -23,6 +23,7 @@ namespace WixToolset.Util WixFormatFiles, WixInternetShortcut, WixRemoveFolderEx, + WixRemoveRegistryKeyEx, WixRestartResource, WixTouchFile, WixWindowsFeatureSearch, @@ -93,6 +94,9 @@ namespace WixToolset.Util case UtilSymbolDefinitionType.WixRemoveFolderEx: return UtilSymbolDefinitions.WixRemoveFolderEx; + case UtilSymbolDefinitionType.WixRemoveRegistryKeyEx: + return UtilSymbolDefinitions.WixRemoveRegistryKeyEx; + case UtilSymbolDefinitionType.WixRestartResource: return UtilSymbolDefinitions.WixRestartResource; diff --git a/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs b/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs new file mode 100644 index 00000000..8e4bd212 --- /dev/null +++ b/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs @@ -0,0 +1,86 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixRemoveRegistryKeyEx = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRemoveRegistryKeyEx.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Root), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Key), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.InstallMode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Condition), IntermediateFieldType.String), + }, + typeof(WixRemoveRegistryKeyExSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + using WixToolset.Data.Symbols; + + public enum WixRemoveRegistryKeyExSymbolFields + { + ComponentRef, + Root, + Key, + InstallMode, + Condition, + } + + public enum WixRemoveRegistryKeyExInstallMode + { + Install = 1, + Uninstall = 2, + } + + public class WixRemoveRegistryKeyExSymbol : IntermediateSymbol + { + public WixRemoveRegistryKeyExSymbol() : base(UtilSymbolDefinitions.WixRemoveRegistryKeyEx, null, null) + { + } + + public WixRemoveRegistryKeyExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveRegistryKeyEx, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRemoveRegistryKeyExSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.ComponentRef, value); + } + + public RegistryRootType Root + { + get => (RegistryRootType)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Root].AsNumber(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Root, (int)value); + } + + public string Key + { + get => (string)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Key]; + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Key, value); + } + + public WixRemoveRegistryKeyExInstallMode InstallMode + { + get => (WixRemoveRegistryKeyExInstallMode)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.InstallMode, (int)value); + } + + public string Condition + { + get => this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Condition].AsString(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Condition, value); + } + } +} diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 63f2b469..45079150 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -35,12 +35,6 @@ namespace WixToolset.Util internal const int UserDontCreateUser = 0x00000200; internal const int UserNonVital = 0x00000400; - internal enum WixRegistrySearchFormat - { - Raw, - Compatible, - } - private static readonly Regex FindPropertyBrackets = new Regex(@"\[(?!\\|\])|(? "http://wixtoolset.org/schemas/v4/wxs/util"; @@ -135,6 +129,9 @@ namespace WixToolset.Util case "RemoveFolderEx": this.ParseRemoveFolderExElement(intermediate, section, element, componentId); break; + case "RemoveRegistryKey": + this.ParseRemoveRegistryKeyExElement(intermediate, section, element, componentId); + break; case "RestartResource": this.ParseRestartResourceElement(intermediate, section, element, componentId); break; @@ -2887,6 +2884,100 @@ namespace WixToolset.Util } } + /// + /// Parses a RemoveRegistryKeyEx element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParseRemoveRegistryKeyExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + var mode = WixRemoveRegistryKeyExInstallMode.Uninstall; + string condition = null; + RegistryRootType? root = null; + string key = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "On": + var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (actionValue) + { + case "": + break; + case "install": + mode = WixRemoveRegistryKeyExInstallMode.Install; + break; + case "uninstall": + mode = WixRemoveRegistryKeyExInstallMode.Uninstall; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", actionValue, "install", "uninstall")); + break; + } + break; + case "Root": + root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); + break; + case "Key": + key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (!root.HasValue) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); + } + + if (key == null) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); + } + + if (id == null) + { + id = this.ParseHelper.CreateIdentifier("rrx", componentId, condition, root.ToString(), key, mode.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "Registry"); + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveRegistry"); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveRegistryKeysEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + section.AddSymbol(new WixRemoveRegistryKeyExSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Root = root.Value, + Key = key, + InstallMode = mode, + Condition = condition + }); + } + } + /// /// Parses a RestartResource element. /// diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index fd09367a..12f423cc 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -38,6 +38,21 @@ namespace WixToolset.Util symbolIdIsPrimaryKey: true ); + public static readonly TableDefinition Wix4RemoveRegistryKeyEx = new TableDefinition( + "Wix4RemoveRegistryKeyEx", + UtilSymbolDefinitions.WixRemoveRegistryKeyEx, + new[] + { + new ColumnDefinition("Wix4RemoveRegistryKeyEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4RemoveRegistryKeyEx row in the package.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Root", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: -1, maxValue: 3, description: "The predefined root key for the registry value, one of rrkEnum."), + new ColumnDefinition("Key", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.RegPath, description: "The key for the registry value.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), + new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression to control whether the registry key is removed.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), + }, + symbolIdIsPrimaryKey: true + ); + public static readonly TableDefinition Wix4RestartResource = new TableDefinition( "Wix4RestartResource", UtilSymbolDefinitions.WixRestartResource, @@ -281,6 +296,7 @@ namespace WixToolset.Util { Wix4CloseApplication, Wix4RemoveFolderEx, + Wix4RemoveRegistryKeyEx, Wix4RestartResource, Wix4FileShare, Wix4FileSharePermissions, diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index 974169ff..d88b2a57 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -44,6 +44,14 @@ + + + + + + + + -- cgit v1.2.3-55-g6feb From 4b3f52f14bce8a032fcc476556cc4d60aa20241b Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 11 Apr 2021 14:15:32 -0700 Subject: Fix rollback of user rights --- src/ca/scaexec.cpp | 433 +++++++++++++++++++++++++++------- src/ca/scauser.cpp | 33 +++ src/ca/utilca.def | 1 + src/wixlib/UtilExtension_Platform.wxi | 2 +- 4 files changed, 389 insertions(+), 80 deletions(-) (limited to 'src') diff --git a/src/ca/scaexec.cpp b/src/ca/scaexec.cpp index ab9e6599..5845c1b4 100644 --- a/src/ca/scaexec.cpp +++ b/src/ca/scaexec.cpp @@ -293,6 +293,110 @@ LExit: } +static HRESULT GetUserHasRight( + __in LSA_HANDLE hPolicy, + __in PSID pUserSid, + __in LPWSTR wzRight, + __out BOOL* fHasRight +) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + LSA_UNICODE_STRING lucPrivilege = { 0 }; + PLSA_ENUMERATION_INFORMATION rgSids = NULL; + ULONG cSids = 0; + *fHasRight = FALSE; + + lucPrivilege.Buffer = wzRight; + lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); + lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); + + nt = ::LsaEnumerateAccountsWithUserRight(hPolicy, &lucPrivilege, reinterpret_cast(&rgSids), &cSids); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to enumerate users for right: %ls", lucPrivilege.Buffer); + + for (DWORD i = 0; i < cSids; ++i) + { + PLSA_ENUMERATION_INFORMATION pInfo = rgSids + i; + if (::EqualSid(pUserSid, pInfo->Sid)) + { + *fHasRight = TRUE; + break; + } + } + +LExit: + if (rgSids) + { + ::LsaFreeMemory(rgSids); + } + + return hr; +} + + +static HRESULT GetExistingUserRightsAssignments( + __in_opt LPCWSTR wzDomain, + __in LPCWSTR wzName, + __inout int* iAttributes +) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + BOOL fHasRight = FALSE; + + LSA_HANDLE hPolicy = NULL; + LSA_OBJECT_ATTRIBUTES objectAttributes = { 0 }; + + LPWSTR pwzUser = NULL; + PSID psid = NULL; + + if (wzDomain && *wzDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); + ExitOnFailure(hr, "Failed to allocate user with domain string"); + } + else + { + hr = StrAllocString(&pwzUser, wzName, 0); + ExitOnFailure(hr, "Failed to allocate string from user name."); + } + + hr = AclGetAccountSid(NULL, pwzUser, &psid); + ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); + + nt = ::LsaOpenPolicy(NULL, &objectAttributes, POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, &hPolicy); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to open LSA policy store"); + + hr = GetUserHasRight(hPolicy, psid, L"SeServiceLogonRight", &fHasRight); + ExitOnFailure(hr, "Failed to check LogonAsService right"); + + if (fHasRight) + { + *iAttributes |= SCAU_ALLOW_LOGON_AS_SERVICE; + } + + hr = GetUserHasRight(hPolicy, psid, L"SeBatchLogonRight", &fHasRight); + ExitOnFailure(hr, "Failed to check LogonAsBatchJob right"); + + if (fHasRight) + { + *iAttributes |= SCAU_ALLOW_LOGON_AS_BATCH; + } + +LExit: + if (hPolicy) + { + ::LsaClose(hPolicy); + } + + ReleaseSid(psid); + ReleaseStr(pwzUser); + return hr; +} + + static HRESULT ModifyUserLocalServiceRight( __in_opt LPCWSTR wzDomain, __in LPCWSTR wzName, @@ -466,6 +570,117 @@ static void SetUserPasswordAndAttributes( } +static HRESULT RemoveUserInternal( + LPWSTR wzGroupCaData, + LPWSTR wzDomain, + LPWSTR wzName, + int iAttributes +) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzGroup = NULL; + LPWSTR pwzGroupDomain = NULL; + LPCWSTR wz = NULL; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + + // + // Remove the logon as service privilege. + // + if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) + { + hr = ModifyUserLocalServiceRight(wzDomain, wzName, FALSE); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to remove logon as service right from user, continuing..."); + hr = S_OK; + } + } + + if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) + { + hr = ModifyUserLocalBatchRight(wzDomain, wzName, FALSE); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to remove logon as batch job right from user, continuing..."); + hr = S_OK; + } + } + + // + // Remove the User Account if the user was created by us. + // + if (!(SCAU_DONT_CREATE_USER & iAttributes)) + { + if (wzDomain && *wzDomain) + { + er = ::DsGetDcNameW(NULL, (LPCWSTR)wzDomain, NULL, NULL, NULL, &pDomainControllerInfo); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW(NULL, (LPCWSTR)wzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo); + } + if (ERROR_SUCCESS == er) + { + wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + else + { + wz = wzDomain; + } + } + + er = ::NetUserDel(wz, wzName); + if (NERR_UserNotFound == er) + { + er = NERR_Success; + } + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to delete user account: %ls", wzName); + } + else + { + // + // Remove the user from the groups + // + pwz = wzGroupCaData; + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); + + if (FAILED(hr)) + { + WcaLogError(hr, "failed to get domain for group: %ls, continuing anyway.", pwzGroup); + } + else + { + hr = RemoveUserFromGroup(wzName, wzDomain, pwzGroup, pwzGroupDomain); + if (FAILED(hr)) + { + WcaLogError(hr, "failed to remove user: %ls from group %ls, continuing anyway.", wzName, pwzGroup); + } + } + } + + if (E_NOMOREITEMS == hr) // if there are no more items, all is well + { + hr = S_OK; + } + + ExitOnFailure(hr, "failed to get next group from which to remove user:%ls", wzName); + } + +LExit: + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + } + + return hr; +} + + /******************************************************************** CreateUser - CUSTOM ACTION ENTRY POINT for creating users @@ -484,6 +699,7 @@ extern "C" UINT __stdcall CreateUser( LPWSTR pwz = NULL; LPWSTR pwzName = NULL; LPWSTR pwzDomain = NULL; + LPWSTR pwzScriptKey = NULL; LPWSTR pwzPassword = NULL; LPWSTR pwzGroup = NULL; LPWSTR pwzGroupDomain = NULL; @@ -491,6 +707,10 @@ extern "C" UINT __stdcall CreateUser( int iAttributes = 0; BOOL fInitializedCom = FALSE; + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + int iOriginalAttributes = 0; + int iRollbackAttributes = 0; + USER_INFO_1 userInfo; USER_INFO_1* puserInfo = NULL; DWORD dw; @@ -521,9 +741,44 @@ extern "C" UINT __stdcall CreateUser( hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); ExitOnFailure(hr, "failed to read attributes from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + ExitOnFailure(hr, "failed to read encoding key from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzPassword); ExitOnFailure(hr, "failed to read password from custom action data"); + // There is no rollback scheduled if the key is empty. + // Best effort to get original configuration and save it in the script so rollback can restore it. + if (*pwzScriptKey) + { + hr = WcaCaScriptCreate(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, FALSE, &hRollbackScript); + ExitOnFailure(hr, "Failed to open rollback CustomAction script."); + + iRollbackAttributes = 0; + hr = GetExistingUserRightsAssignments(pwzDomain, pwzName, &iOriginalAttributes); + if (FAILED(hr)) + { + WcaLogError(hr, "failed to get existing user rights: %ls, continuing anyway.", pwzName); + } + else + { + if (!(SCAU_ALLOW_LOGON_AS_SERVICE & iOriginalAttributes) && (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes)) + { + iRollbackAttributes |= SCAU_ALLOW_LOGON_AS_SERVICE; + } + if (!(SCAU_ALLOW_LOGON_AS_BATCH & iOriginalAttributes) && (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes)) + { + iRollbackAttributes |= SCAU_ALLOW_LOGON_AS_BATCH; + } + } + + hr = WcaCaScriptWriteNumber(hRollbackScript, iRollbackAttributes); + ExitOnFailure(hr, "Failed to add data to rollback script."); + + // Nudge the system to get all our rollback data written to disk. + WcaCaScriptFlush(hRollbackScript); + } + if (!(SCAU_DONT_CREATE_USER & iAttributes)) { ::ZeroMemory(&userInfo, sizeof(USER_INFO_1)); @@ -614,6 +869,8 @@ extern "C" UINT __stdcall CreateUser( ExitOnFailure(hr, "failed to get next group in which to include user:%ls", pwzName); LExit: + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_PRESERVE); + if (puserInfo) { ::NetApiBufferFree((LPVOID)puserInfo); @@ -627,6 +884,7 @@ LExit: ReleaseStr(pwzData); ReleaseStr(pwzName); ReleaseStr(pwzDomain); + ReleaseStr(pwzScriptKey); ReleaseStr(pwzPassword); ReleaseStr(pwzGroup); ReleaseStr(pwzGroupDomain); @@ -650,15 +908,14 @@ LExit: /******************************************************************** - RemoveUser - CUSTOM ACTION ENTRY POINT for removing users + CreateUserRollback - CUSTOM ACTION ENTRY POINT for CreateUser rollback - Input: deferred CustomActionData - Name\tDomain * *****************************************************************/ -extern "C" UINT __stdcall RemoveUser( +extern "C" UINT __stdcall CreateUserRollback( MSIHANDLE hInstall - ) +) { - //AssertSz(0, "Debug RemoveAccount"); + //AssertSz(0, "Debug CreateUserRollback"); HRESULT hr = S_OK; UINT er = ERROR_SUCCESS; @@ -666,15 +923,16 @@ extern "C" UINT __stdcall RemoveUser( LPWSTR pwzData = NULL; LPWSTR pwz = NULL; LPWSTR pwzName = NULL; - LPWSTR pwzDomain= NULL; - LPWSTR pwzGroup = NULL; - LPWSTR pwzGroupDomain = NULL; + LPWSTR pwzDomain = NULL; + LPWSTR pwzScriptKey = NULL; int iAttributes = 0; - LPCWSTR wz = NULL; - PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; BOOL fInitializedCom = FALSE; - hr = WcaInitialize(hInstall, "RemoveUser"); + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + LPWSTR pwzRollbackData = NULL; + int iOriginalAttributes = 0; + + hr = WcaInitialize(hInstall, "CreateUserRollback"); ExitOnFailure(hr, "failed to initialize"); hr = ::CoInitialize(NULL); @@ -690,6 +948,9 @@ extern "C" UINT __stdcall RemoveUser( // Read in the CustomActionData // pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + ExitOnFailure(hr, "failed to read encoding key from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzName); ExitOnFailure(hr, "failed to read name from custom action data"); @@ -699,96 +960,110 @@ extern "C" UINT __stdcall RemoveUser( hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); ExitOnFailure(hr, "failed to read attributes from custom action data"); - // - // Remove the logon as service privilege. - // - if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) + // Best effort to read original configuration from CreateUser. + hr = WcaCaScriptOpen(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, &hRollbackScript); + if (FAILED(hr)) { - hr = ModifyUserLocalServiceRight(pwzDomain, pwzName, FALSE); - if (FAILED(hr)) - { - WcaLogError(hr, "Failed to remove logon as service right from user, continuing..."); - hr = S_OK; - } + WcaLogError(hr, "Failed to open rollback CustomAction script, continuing anyway."); } - - if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) + else { - hr = ModifyUserLocalBatchRight(pwzDomain, pwzName, FALSE); + hr = WcaCaScriptReadAsCustomActionData(hRollbackScript, &pwzRollbackData); if (FAILED(hr)) { - WcaLogError(hr, "Failed to remove logon as batch job right from user, continuing..."); - hr = S_OK; + WcaLogError(hr, "Failed to read rollback script into CustomAction data, continuing anyway."); } - } - - // - // Remove the User Account if the user was created by us. - // - if (!(SCAU_DONT_CREATE_USER & iAttributes)) - { - if (pwzDomain && *pwzDomain) + else { - er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, NULL, &pDomainControllerInfo ); - if (RPC_S_SERVER_UNAVAILABLE == er) - { - // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag - er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo ); - } - if (ERROR_SUCCESS == er) - { - wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix - } - else - { - wz = pwzDomain; - } - } - - er = ::NetUserDel(wz, pwzName); - if (NERR_UserNotFound == er) - { - er = NERR_Success; - } - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to delete user account: %ls", pwzName); - } - else - { - // - // Remove the user from the groups - // - while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) - { - hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); + WcaLog(LOGMSG_TRACEONLY, "Rollback Data: %ls", pwzRollbackData); + pwz = pwzRollbackData; + hr = WcaReadIntegerFromCaData(&pwz, &iOriginalAttributes); if (FAILED(hr)) { - WcaLogError(hr, "failed to get domain for group: %ls, continuing anyway.", pwzGroup); + WcaLogError(hr, "failed to read attributes from rollback data, continuing anyway"); } else { - hr = RemoveUserFromGroup(pwzName, pwzDomain, pwzGroup, pwzGroupDomain); - if (FAILED(hr)) - { - WcaLogError(hr, "failed to remove user: %ls from group %ls, continuing anyway.", pwzName, pwzGroup); - } + iAttributes |= iOriginalAttributes; } } + } - if (E_NOMOREITEMS == hr) // if there are no more items, all is well - { - hr = S_OK; - } + hr = RemoveUserInternal(pwz, pwzDomain, pwzName, iAttributes); + +LExit: + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_DELETE); + + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzDomain); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzRollbackData); - ExitOnFailure(hr, "failed to get next group from which to remove user:%ls", pwzName); + if (fInitializedCom) + { + ::CoUninitialize(); } -LExit: - if (pDomainControllerInfo) + if (FAILED(hr)) { - ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + er = ERROR_INSTALL_FAILURE; } + return WcaFinalize(er); +} + + +/******************************************************************** + RemoveUser - CUSTOM ACTION ENTRY POINT for removing users + + Input: deferred CustomActionData - Name\tDomain + * *****************************************************************/ +extern "C" UINT __stdcall RemoveUser( + MSIHANDLE hInstall +) +{ + //AssertSz(0, "Debug RemoveUser"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzDomain = NULL; + int iAttributes = 0; + BOOL fInitializedCom = FALSE; + + hr = WcaInitialize(hInstall, "RemoveUser"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // + // Read in the CustomActionData + // + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to read name from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to read domain from custom action data"); + + hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); + ExitOnFailure(hr, "failed to read attributes from custom action data"); + + hr = RemoveUserInternal(pwz, pwzDomain, pwzName, iAttributes); + +LExit: ReleaseStr(pwzData); ReleaseStr(pwzName); ReleaseStr(pwzDomain); diff --git a/src/ca/scauser.cpp b/src/ca/scauser.cpp index 0d87301f..b25e9daf 100644 --- a/src/ca/scauser.cpp +++ b/src/ca/scauser.cpp @@ -475,10 +475,19 @@ HRESULT ScaUserExecute( DWORD er = 0; PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + LPWSTR pwzBaseScriptKey = NULL; + DWORD cScriptKey = 0; + USER_INFO_0 *pUserInfo = NULL; + LPWSTR pwzScriptKey = NULL; LPWSTR pwzActionData = NULL; LPWSTR pwzRollbackData = NULL; + // Get the base script key for this CustomAction. + hr = WcaCaScriptCreateKey(&pwzBaseScriptKey); + ExitOnFailure(hr, "Failed to get encoding key."); + + // Loop through all the users to be configured. for (SCA_USER *psu = psuList; psu; psu = psu->psuNext) { USER_EXISTS ueUserExists = USER_EXISTS_INDETERMINATE; @@ -555,6 +564,17 @@ HRESULT ScaUserExecute( // Rollback only if the user already exists, we couldn't determine if the user exists, or we are going to create the user if ((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists) || !(psu->iAttributes & SCAU_DONT_CREATE_USER)) { + ++cScriptKey; + hr = StrAllocFormatted(&pwzScriptKey, L"%ls%u", pwzBaseScriptKey, cScriptKey); + ExitOnFailure(hr, "Failed to create encoding key."); + + // Write the script key to CustomActionData for install and rollback so information can be passed to rollback. + hr = WcaWriteStringToCaData(pwzScriptKey, &pwzActionData); + ExitOnFailure(hr, "Failed to add encoding key to custom action data."); + + hr = WcaWriteStringToCaData(pwzScriptKey, &pwzRollbackData); + ExitOnFailure(hr, "Failed to add encoding key to rollback custom action data."); + INT iRollbackUserAttributes = psu->iAttributes; // If the user already exists, ensure this is accounted for in rollback @@ -567,6 +587,10 @@ HRESULT ScaUserExecute( iRollbackUserAttributes &= ~SCAU_DONT_CREATE_USER; } + // The deferred CA determines when to rollback User Rights Assignments so these should never be set. + iRollbackUserAttributes &= ~SCAU_ALLOW_LOGON_AS_SERVICE; + iRollbackUserAttributes &= ~SCAU_ALLOW_LOGON_AS_BATCH; + hr = WcaWriteStringToCaData(psu->wzName, &pwzRollbackData); ExitOnFailure(hr, "Failed to add user name to rollback custom action data: %ls", psu->wzName); hr = WcaWriteStringToCaData(psu->wzDomain, &pwzRollbackData); @@ -584,6 +608,12 @@ HRESULT ScaUserExecute( hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUserRollback"), pwzRollbackData, COST_USER_DELETE); ExitOnFailure(hr, "failed to schedule CreateUserRollback"); } + else + { + // Write empty script key to CustomActionData since there is no rollback. + hr = WcaWriteStringToCaData(L"", &pwzActionData); + ExitOnFailure(hr, "Failed to add empty encoding key to custom action data."); + } // // Schedule the creation now. @@ -614,6 +644,7 @@ HRESULT ScaUserExecute( ExitOnFailure(hr, "failed to schedule RemoveUser"); } + ReleaseNullStr(pwzScriptKey); ReleaseNullStr(pwzActionData); ReleaseNullStr(pwzRollbackData); if (pUserInfo) @@ -629,6 +660,8 @@ HRESULT ScaUserExecute( } LExit: + ReleaseStr(pwzBaseScriptKey); + ReleaseStr(pwzScriptKey); ReleaseStr(pwzActionData); ReleaseStr(pwzRollbackData); if (pUserInfo) diff --git a/src/ca/utilca.def b/src/ca/utilca.def index 337c3a68..412d86a3 100644 --- a/src/ca/utilca.def +++ b/src/ca/utilca.def @@ -45,6 +45,7 @@ EXPORTS CreateSmb DropSmb CreateUser + CreateUserRollback RemoveUser ;scasched.cpp ConfigurePerfmonInstall diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index d88b2a57..913c01b9 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi @@ -137,7 +137,7 @@ - + -- cgit v1.2.3-55-g6feb From 7b47d078137a2e83e637bdb23ce6eda176a9595f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 15 Apr 2021 18:25:14 -0500 Subject: Update dependencies. --- global.json | 2 +- src/be/utilbe.vcxproj | 6 +++--- src/ca/utilca.vcxproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 6df1b3ab..e30536fb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0206" + "WixToolset.Sdk": "4.0.0-build-0209" }, "sdk": { "allowPrerelease": false diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 42241173..c02b51a5 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -69,9 +69,9 @@ - - - + + + diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 6a076f2f..88f35673 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -96,7 +96,7 @@ - + -- cgit v1.2.3-55-g6feb From 7ec19f5d7cc8b5c75ac4a12969a1feae1f93545e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 19 Apr 2021 23:53:30 -0500 Subject: Use IReadOnlyCollection. --- src/wixext/UtilExtensionFactory.cs | 4 ++-- src/wixext/UtilWindowsInstallerBackendExtension.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wixext/UtilExtensionFactory.cs b/src/wixext/UtilExtensionFactory.cs index 0f87a1ff..08352813 100644 --- a/src/wixext/UtilExtensionFactory.cs +++ b/src/wixext/UtilExtensionFactory.cs @@ -1,4 +1,4 @@ -// 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. +// 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.Util { @@ -8,7 +8,7 @@ namespace WixToolset.Util public class UtilExtensionFactory : BaseExtensionFactory { - protected override IEnumerable ExtensionTypes => new[] + protected override IReadOnlyCollection ExtensionTypes => new[] { typeof(UtilCompiler), typeof(UtilExtensionData), diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index f872ec1a..bca7c700 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -8,6 +8,6 @@ namespace WixToolset.Util public class UtilWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension { - public override IEnumerable TableDefinitions => UtilTableDefinitions.All; + public override IReadOnlyCollection TableDefinitions => UtilTableDefinitions.All; } } -- cgit v1.2.3-55-g6feb From 8a8a25695351ee542f08886a9d0957c78c6af366 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 28 Apr 2021 18:30:00 -0500 Subject: Clean up 32-bit assumptions. --- global.json | 2 +- src/be/utilbe.vcxproj | 6 +++--- src/ca/FormatFiles.cpp | 2 +- src/ca/XmlConfig.cpp | 11 +++-------- src/ca/XmlFile.cpp | 7 ++----- src/ca/utilca.vcxproj | 4 ++-- 6 files changed, 12 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index bd2257b6..697f5687 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0212" + "WixToolset.Sdk": "4.0.0-build-0213" }, "sdk": { "allowPrerelease": false diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index c02b51a5..683b376a 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -69,9 +69,9 @@ - - - + + + diff --git a/src/ca/FormatFiles.cpp b/src/ca/FormatFiles.cpp index 464b92d6..d1533999 100644 --- a/src/ca/FormatFiles.cpp +++ b/src/ca/FormatFiles.cpp @@ -203,7 +203,7 @@ extern "C" UINT __stdcall WixExecFormatFiles( hr = FileGetTime(sczFilePath, NULL, NULL, &filetime); ExitOnFailure(hr, "Failed to get modified time of file : %ls", sczFilePath); - hr = FileWrite(sczFilePath, FILE_ATTRIBUTE_NORMAL, pbData, static_cast(cbData), NULL); + hr = FileWrite(sczFilePath, FILE_ATTRIBUTE_NORMAL, pbData, cbData, NULL); ExitOnFailure(hr, "Failed to write file content: %ls", sczFilePath); hr = FileSetTime(sczFilePath, NULL, NULL, &filetime); diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp index 959f95b0..a1ec9d6f 100644 --- a/src/ca/XmlConfig.cpp +++ b/src/ca/XmlConfig.cpp @@ -171,7 +171,7 @@ static HRESULT ReadXmlConfigTable( ExitOnFailure(hr, "failed to get component name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); // Get the component's state - if (0 < lstrlenW(pwzData)) + if (pwzData && *pwzData) { hr = StringCchCopyW((*ppxfcTail)->wzComponent, countof((*ppxfcTail)->wzComponent), pwzData); ExitOnFailure(hr, "failed to copy component id"); @@ -1041,7 +1041,6 @@ extern "C" UINT __stdcall ExecXmlConfigRollback( LPWSTR pwzFileName = NULL; LPBYTE pbData = NULL; DWORD_PTR cbData = 0; - DWORD cbDataWritten = 0; FILETIME ft; @@ -1099,12 +1098,8 @@ extern "C" UINT __stdcall ExecXmlConfigRollback( ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); // Write out the old data - if (!::WriteFile(hFile, pbData, (DWORD)cbData, &cbDataWritten, NULL)) - { - ExitOnLastError(hr, "failed to write to file: %ls", pwzFileName); - } - - Assert(cbData == cbDataWritten); + hr = FileWriteHandle(hFile, pbData, cbData); + ExitOnFailure(hr, "failed to write to file: %ls", pwzFileName); ReleaseFile(hFile); diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp index 95f18411..04a4ae98 100644 --- a/src/ca/XmlFile.cpp +++ b/src/ca/XmlFile.cpp @@ -854,7 +854,6 @@ extern "C" UINT __stdcall ExecXmlFileRollback( LPWSTR pwzFileName = NULL; LPBYTE pbData = NULL; DWORD_PTR cbData = 0; - DWORD cbDataWritten = 0; FILETIME ft; @@ -913,10 +912,8 @@ extern "C" UINT __stdcall ExecXmlFileRollback( ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); // Write out the old data - if (!::WriteFile(hFile, pbData, (DWORD)cbData, &cbDataWritten, NULL)) - ExitOnLastError(hr, "failed to write to file: %ls", pwzFileName); - - Assert(cbData == cbDataWritten); + hr = FileWriteHandle(hFile, pbData, cbData); + ExitOnFailure(hr, "failed to write to file: %ls", pwzFileName); ReleaseFile(hFile); diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 88f35673..7b64db95 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -96,8 +96,8 @@ - - + + -- cgit v1.2.3-55-g6feb From ff659159e041bf6c083e6b7fcb9b726065a9dd73 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 3 May 2021 09:55:22 -0700 Subject: Move Util.wixext into ext --- .editorconfig | 37 - README.md | 3 - Util.wixext.sln | 87 - Util.wixext.v3.ncrunchsolution | 6 - appveyor.cmd | 19 - appveyor.yml | 40 - global.json | 8 - nuget.config | 18 - src/.editorconfig | 37 + src/CustomizedNativeRecommendedRules.ruleset | 8 - src/Directory.Build.props | 27 - src/Directory.Build.targets | 51 - src/Directory.csproj.props | 13 - src/Directory.csproj.targets | 26 - src/Directory.vcxproj.props | 97 - src/be/UtilBundleExtension.cpp | 87 - src/be/UtilBundleExtension.h | 16 - src/be/beDecor.h | 13 - src/be/detectsha2support.cpp | 58 - src/be/detectsha2support.h | 8 - src/be/precomp.cpp | 3 - src/be/precomp.h | 37 - src/be/utilbe.cpp | 41 - src/be/utilbe.def | 8 - src/be/utilbe.vcxproj | 80 - src/be/utilsearch.cpp | 160 - src/be/utilsearch.h | 65 - src/ca/BroadcastSettingChange.cpp | 45 - src/ca/CheckReboot.cpp | 36 - src/ca/CloseApps.cpp | 568 --- src/ca/CustomMsiErrors.h | 32 - src/ca/FormatFiles.cpp | 221 -- src/ca/OsInfo.cpp | 487 --- src/ca/RemoveFoldersEx.cpp | 243 -- src/ca/RemoveRegistryKeysEx.cpp | 114 - src/ca/RestartManager.cpp | 185 - src/ca/TouchFile.cpp | 308 -- src/ca/XmlConfig.cpp | 1130 ------ src/ca/XmlFile.cpp | 940 ----- src/ca/caDecor.h | 13 - src/ca/cost.h | 9 - src/ca/dllmain.cpp | 26 - src/ca/exitearlywithsuccess.cpp | 27 - src/ca/netshortcuts.cpp | 437 --- src/ca/precomp.h | 54 - src/ca/qtexecca.cpp | 316 -- src/ca/sca.h | 19 - src/ca/scacost.h | 18 - src/ca/scaexec.cpp | 1082 ------ src/ca/scamanifest.cpp | 377 -- src/ca/scaperf.cpp | 310 -- src/ca/scaperfexec.cpp | 423 --- src/ca/scasched.cpp | 127 - src/ca/scasmb.h | 46 - src/ca/scasmbexec.cpp | 316 -- src/ca/scasmbexec.h | 27 - src/ca/scasmbsched.cpp | 639 ---- src/ca/scauser.cpp | 709 ---- src/ca/scauser.h | 67 - src/ca/secureobj.cpp | 915 ----- src/ca/serviceconfig.cpp | 821 ----- src/ca/shellexecca.cpp | 271 -- src/ca/test.cpp | 269 -- src/ca/utilca.cpp | 3 - src/ca/utilca.def | 91 - src/ca/utilca.vcxproj | 106 - .../Util/CustomizedNativeRecommendedRules.ruleset | 8 + src/ext/Util/Directory.Build.props | 27 + src/ext/Util/Directory.Build.targets | 51 + src/ext/Util/Directory.csproj.props | 13 + src/ext/Util/Directory.csproj.targets | 26 + src/ext/Util/Directory.vcxproj.props | 97 + src/ext/Util/README.md | 3 + src/ext/Util/Util.wixext.sln | 87 + src/ext/Util/Util.wixext.v3.ncrunchsolution | 6 + src/ext/Util/appveyor.cmd | 19 + src/ext/Util/appveyor.yml | 40 + src/ext/Util/be/UtilBundleExtension.cpp | 87 + src/ext/Util/be/UtilBundleExtension.h | 16 + src/ext/Util/be/beDecor.h | 13 + src/ext/Util/be/detectsha2support.cpp | 58 + src/ext/Util/be/detectsha2support.h | 8 + src/ext/Util/be/precomp.cpp | 3 + src/ext/Util/be/precomp.h | 37 + src/ext/Util/be/utilbe.cpp | 41 + src/ext/Util/be/utilbe.def | 8 + src/ext/Util/be/utilbe.vcxproj | 80 + src/ext/Util/be/utilsearch.cpp | 160 + src/ext/Util/be/utilsearch.h | 65 + src/ext/Util/ca/BroadcastSettingChange.cpp | 45 + src/ext/Util/ca/CheckReboot.cpp | 36 + src/ext/Util/ca/CloseApps.cpp | 568 +++ src/ext/Util/ca/CustomMsiErrors.h | 32 + src/ext/Util/ca/FormatFiles.cpp | 221 ++ src/ext/Util/ca/OsInfo.cpp | 487 +++ src/ext/Util/ca/RemoveFoldersEx.cpp | 243 ++ src/ext/Util/ca/RemoveRegistryKeysEx.cpp | 114 + src/ext/Util/ca/RestartManager.cpp | 185 + src/ext/Util/ca/TouchFile.cpp | 308 ++ src/ext/Util/ca/XmlConfig.cpp | 1130 ++++++ src/ext/Util/ca/XmlFile.cpp | 940 +++++ src/ext/Util/ca/caDecor.h | 13 + src/ext/Util/ca/cost.h | 9 + src/ext/Util/ca/dllmain.cpp | 26 + src/ext/Util/ca/exitearlywithsuccess.cpp | 27 + src/ext/Util/ca/netshortcuts.cpp | 437 +++ src/ext/Util/ca/precomp.h | 54 + src/ext/Util/ca/qtexecca.cpp | 316 ++ src/ext/Util/ca/sca.h | 19 + src/ext/Util/ca/scacost.h | 18 + src/ext/Util/ca/scaexec.cpp | 1082 ++++++ src/ext/Util/ca/scamanifest.cpp | 377 ++ src/ext/Util/ca/scaperf.cpp | 310 ++ src/ext/Util/ca/scaperfexec.cpp | 423 +++ src/ext/Util/ca/scasched.cpp | 127 + src/ext/Util/ca/scasmb.h | 46 + src/ext/Util/ca/scasmbexec.cpp | 316 ++ src/ext/Util/ca/scasmbexec.h | 27 + src/ext/Util/ca/scasmbsched.cpp | 639 ++++ src/ext/Util/ca/scauser.cpp | 709 ++++ src/ext/Util/ca/scauser.h | 67 + src/ext/Util/ca/secureobj.cpp | 915 +++++ src/ext/Util/ca/serviceconfig.cpp | 821 +++++ src/ext/Util/ca/shellexecca.cpp | 271 ++ src/ext/Util/ca/test.cpp | 269 ++ src/ext/Util/ca/utilca.cpp | 3 + src/ext/Util/ca/utilca.def | 91 + src/ext/Util/ca/utilca.vcxproj | 106 + src/ext/Util/nuget.config | 18 + .../WixToolsetTest.Util/TestData/.Data/burn.exe | Bin 0 -> 463360 bytes .../TestData/BundleWithSearches/Bundle.en-us.wxl | 8 + .../TestData/BundleWithSearches/Bundle.wxs | 52 + .../BundleWithSearches/data/MsiPackage/Shared.dll | 1 + .../BundleWithSearches/data/MsiPackage/test.txt | 1 + .../TestData/BundleWithSearches/data/fakeba.dll | 1 + .../TestData/BundleWithSearches/data/test.msi | Bin 0 -> 32768 bytes .../TestData/CloseApplication/Package.en-us.wxl | 9 + .../TestData/CloseApplication/Package.wxs | 17 + .../CloseApplication/PackageComponents.wxs | 9 + .../TestData/CloseApplication/example.txt | 1 + .../TestData/EventManifest/Package.en-us.wxl | 9 + .../TestData/EventManifest/Package.wxs | 15 + .../TestData/EventManifest/PackageComponents.wxs | 11 + .../TestData/EventManifest/example.txt | 1 + .../TestData/InternetShortcut/Package.en-us.wxl | 9 + .../TestData/InternetShortcut/Package.ico | Bin 0 -> 83899 bytes .../TestData/InternetShortcut/Package.wxs | 15 + .../InternetShortcut/PackageComponents.wxs | 11 + .../TestData/InternetShortcut/example.txt | 1 + .../TestData/InternetShortcutModule/Module.wxs | 13 + .../InternetShortcutModule/ModuleComponents.wxs | 11 + .../TestData/InternetShortcutModule/Package.ico | Bin 0 -> 83899 bytes .../TestData/PermissionEx/Package.en-us.wxl | 9 + .../TestData/PermissionEx/Package.wxs | 15 + .../TestData/PermissionEx/PackageComponents.wxs | 23 + .../TestData/PermissionEx/example.txt | 1 + .../TestData/Queries/Package.en-us.wxl | 9 + .../TestData/Queries/Package.wxs | 23 + .../TestData/Queries/PackageComponents.wxs | 9 + .../TestData/Queries/example.txt | 1 + .../TestData/RemoveFolderEx/Module.wxs | 13 + .../TestData/RemoveFolderEx/ModuleComponents.wxs | 10 + .../TestData/RemoveRegistryKeyEx/Module.wxs | 13 + .../RemoveRegistryKeyEx/ModuleComponents.wxs | 10 + .../TestData/UsingFileShare/Package.en-us.wxl | 9 + .../TestData/UsingFileShare/Package.wxs | 15 + .../TestData/UsingFileShare/PackageComponents.wxs | 14 + .../TestData/UsingFileShare/example.txt | 1 + .../TestData/XmlConfig/Package.en-us.wxl | 9 + .../TestData/XmlConfig/Package.wxs | 17 + .../TestData/XmlConfigModule/Module.wxs | 19 + .../TestData/XmlConfigModule/my.xml | 1 + .../WixToolsetTest.Util/UtilExtensionFixture.cs | 317 ++ .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 38 + .../WixToolsetTest.Util.v3.ncrunchproject | 5 + src/ext/Util/wix.snk | Bin 0 -> 596 bytes src/ext/Util/wixext/PerformanceCounterType.cs | 192 + src/ext/Util/wixext/Symbols/EventManifestSymbol.cs | 55 + .../wixext/Symbols/FileSharePermissionsSymbol.cs | 63 + src/ext/Util/wixext/Symbols/FileShareSymbol.cs | 71 + src/ext/Util/wixext/Symbols/GroupSymbol.cs | 63 + .../Util/wixext/Symbols/PerfmonManifestSymbol.cs | 63 + src/ext/Util/wixext/Symbols/PerfmonSymbol.cs | 63 + .../wixext/Symbols/PerformanceCategorySymbol.cs | 71 + src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs | 103 + src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs | 119 + src/ext/Util/wixext/Symbols/UserGroupSymbol.cs | 55 + src/ext/Util/wixext/Symbols/UserSymbol.cs | 79 + .../Util/wixext/Symbols/UtilSymbolDefinitions.cs | 125 + .../wixext/Symbols/WixCloseApplicationSymbol.cs | 103 + .../Util/wixext/Symbols/WixFormatFilesSymbol.cs | 55 + .../wixext/Symbols/WixInternetShortcutSymbol.cs | 95 + .../Util/wixext/Symbols/WixRemoveFolderExSymbol.cs | 78 + .../wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs | 86 + .../wixext/Symbols/WixRestartResourceSymbol.cs | 71 + src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs | 63 + .../Symbols/WixWindowsFeatureSearchSymbol.cs | 47 + src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs | 111 + src/ext/Util/wixext/Symbols/XmlFileSymbol.cs | 95 + src/ext/Util/wixext/UtilCompiler.cs | 3889 ++++++++++++++++++++ src/ext/Util/wixext/UtilConstants.cs | 17 + src/ext/Util/wixext/UtilDecompiler.cs | 1543 ++++++++ src/ext/Util/wixext/UtilErrors.cs | 49 + src/ext/Util/wixext/UtilExtensionData.cs | 23 + src/ext/Util/wixext/UtilExtensionFactory.cs | 18 + src/ext/Util/wixext/UtilTableDefinitions.cs | 319 ++ src/ext/Util/wixext/UtilWarnings.cs | 37 + .../wixext/UtilWindowsInstallerBackendExtension.cs | 13 + src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 31 + src/ext/Util/wixext/WixToolset.Util.wixext.nuspec | 25 + src/ext/Util/wixext/WixToolset.Util.wixext.targets | 11 + .../WixToolset.Util.wixext.v3.ncrunchproject | 7 + .../Util/wixlib/UtilBundleExtension_Platform.wxi | 10 + src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs | 7 + src/ext/Util/wixlib/UtilBundleExtension_x64.wxs | 7 + src/ext/Util/wixlib/UtilBundleExtension_x86.wxs | 7 + src/ext/Util/wixlib/UtilExtension.wxs | 64 + src/ext/Util/wixlib/UtilExtension_Platform.wxi | 360 ++ src/ext/Util/wixlib/UtilExtension_arm64.wxs | 7 + src/ext/Util/wixlib/UtilExtension_x64.wxs | 7 + src/ext/Util/wixlib/UtilExtension_x86.wxs | 7 + src/ext/Util/wixlib/caDecor.wxi | 39 + src/ext/Util/wixlib/caerr.wxi | 96 + src/ext/Util/wixlib/de-de.wxl | 32 + src/ext/Util/wixlib/en-us.wxl | 32 + src/ext/Util/wixlib/es-es.wxl | 31 + src/ext/Util/wixlib/fr-fr.wxl | 31 + src/ext/Util/wixlib/it-it.wxl | 32 + src/ext/Util/wixlib/ja-jp.wxl | 32 + src/ext/Util/wixlib/pt-br.wxl | 26 + src/ext/Util/wixlib/util.v3.ncrunchproject | 5 + src/ext/Util/wixlib/util.wixproj | 27 + src/ext/global.json | 8 + .../WixToolsetTest.Util/TestData/.Data/burn.exe | Bin 463360 -> 0 bytes .../TestData/BundleWithSearches/Bundle.en-us.wxl | 8 - .../TestData/BundleWithSearches/Bundle.wxs | 52 - .../BundleWithSearches/data/MsiPackage/Shared.dll | 1 - .../BundleWithSearches/data/MsiPackage/test.txt | 1 - .../TestData/BundleWithSearches/data/fakeba.dll | 1 - .../TestData/BundleWithSearches/data/test.msi | Bin 32768 -> 0 bytes .../TestData/CloseApplication/Package.en-us.wxl | 9 - .../TestData/CloseApplication/Package.wxs | 17 - .../CloseApplication/PackageComponents.wxs | 9 - .../TestData/CloseApplication/example.txt | 1 - .../TestData/EventManifest/Package.en-us.wxl | 9 - .../TestData/EventManifest/Package.wxs | 15 - .../TestData/EventManifest/PackageComponents.wxs | 11 - .../TestData/EventManifest/example.txt | 1 - .../TestData/InternetShortcut/Package.en-us.wxl | 9 - .../TestData/InternetShortcut/Package.ico | Bin 83899 -> 0 bytes .../TestData/InternetShortcut/Package.wxs | 15 - .../InternetShortcut/PackageComponents.wxs | 11 - .../TestData/InternetShortcut/example.txt | 1 - .../TestData/InternetShortcutModule/Module.wxs | 13 - .../InternetShortcutModule/ModuleComponents.wxs | 11 - .../TestData/InternetShortcutModule/Package.ico | Bin 83899 -> 0 bytes .../TestData/PermissionEx/Package.en-us.wxl | 9 - .../TestData/PermissionEx/Package.wxs | 15 - .../TestData/PermissionEx/PackageComponents.wxs | 23 - .../TestData/PermissionEx/example.txt | 1 - .../TestData/Queries/Package.en-us.wxl | 9 - .../TestData/Queries/Package.wxs | 23 - .../TestData/Queries/PackageComponents.wxs | 9 - .../TestData/Queries/example.txt | 1 - .../TestData/RemoveFolderEx/Module.wxs | 13 - .../TestData/RemoveFolderEx/ModuleComponents.wxs | 10 - .../TestData/RemoveRegistryKeyEx/Module.wxs | 13 - .../RemoveRegistryKeyEx/ModuleComponents.wxs | 10 - .../TestData/UsingFileShare/Package.en-us.wxl | 9 - .../TestData/UsingFileShare/Package.wxs | 15 - .../TestData/UsingFileShare/PackageComponents.wxs | 14 - .../TestData/UsingFileShare/example.txt | 1 - .../TestData/XmlConfig/Package.en-us.wxl | 9 - .../TestData/XmlConfig/Package.wxs | 17 - .../TestData/XmlConfigModule/Module.wxs | 19 - .../TestData/XmlConfigModule/my.xml | 1 - .../WixToolsetTest.Util/UtilExtensionFixture.cs | 317 -- .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 38 - .../WixToolsetTest.Util.v3.ncrunchproject | 5 - src/version.json | 11 + src/wix.snk | Bin 596 -> 0 bytes src/wixext/PerformanceCounterType.cs | 192 - src/wixext/Symbols/EventManifestSymbol.cs | 55 - src/wixext/Symbols/FileSharePermissionsSymbol.cs | 63 - src/wixext/Symbols/FileShareSymbol.cs | 71 - src/wixext/Symbols/GroupSymbol.cs | 63 - src/wixext/Symbols/PerfmonManifestSymbol.cs | 63 - src/wixext/Symbols/PerfmonSymbol.cs | 63 - src/wixext/Symbols/PerformanceCategorySymbol.cs | 71 - src/wixext/Symbols/SecureObjectsSymbol.cs | 103 - src/wixext/Symbols/ServiceConfigSymbol.cs | 119 - src/wixext/Symbols/UserGroupSymbol.cs | 55 - src/wixext/Symbols/UserSymbol.cs | 79 - src/wixext/Symbols/UtilSymbolDefinitions.cs | 125 - src/wixext/Symbols/WixCloseApplicationSymbol.cs | 103 - src/wixext/Symbols/WixFormatFilesSymbol.cs | 55 - src/wixext/Symbols/WixInternetShortcutSymbol.cs | 95 - src/wixext/Symbols/WixRemoveFolderExSymbol.cs | 78 - src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs | 86 - src/wixext/Symbols/WixRestartResourceSymbol.cs | 71 - src/wixext/Symbols/WixTouchFileSymbol.cs | 63 - .../Symbols/WixWindowsFeatureSearchSymbol.cs | 47 - src/wixext/Symbols/XmlConfigSymbol.cs | 111 - src/wixext/Symbols/XmlFileSymbol.cs | 95 - src/wixext/UtilCompiler.cs | 3889 -------------------- src/wixext/UtilConstants.cs | 17 - src/wixext/UtilDecompiler.cs | 1543 -------- src/wixext/UtilErrors.cs | 49 - src/wixext/UtilExtensionData.cs | 23 - src/wixext/UtilExtensionFactory.cs | 18 - src/wixext/UtilTableDefinitions.cs | 319 -- src/wixext/UtilWarnings.cs | 37 - src/wixext/UtilWindowsInstallerBackendExtension.cs | 13 - src/wixext/WixToolset.Util.wixext.csproj | 31 - src/wixext/WixToolset.Util.wixext.nuspec | 25 - src/wixext/WixToolset.Util.wixext.targets | 11 - .../WixToolset.Util.wixext.v3.ncrunchproject | 7 - src/wixlib/UtilBundleExtension_Platform.wxi | 10 - src/wixlib/UtilBundleExtension_arm64.wxs | 7 - src/wixlib/UtilBundleExtension_x64.wxs | 7 - src/wixlib/UtilBundleExtension_x86.wxs | 7 - src/wixlib/UtilExtension.wxs | 64 - src/wixlib/UtilExtension_Platform.wxi | 360 -- src/wixlib/UtilExtension_arm64.wxs | 7 - src/wixlib/UtilExtension_x64.wxs | 7 - src/wixlib/UtilExtension_x86.wxs | 7 - src/wixlib/caDecor.wxi | 39 - src/wixlib/caerr.wxi | 96 - src/wixlib/de-de.wxl | 32 - src/wixlib/en-us.wxl | 32 - src/wixlib/es-es.wxl | 31 - src/wixlib/fr-fr.wxl | 31 - src/wixlib/it-it.wxl | 32 - src/wixlib/ja-jp.wxl | 32 - src/wixlib/pt-br.wxl | 26 - src/wixlib/util.v3.ncrunchproject | 5 - src/wixlib/util.wixproj | 27 - version.json | 11 - 338 files changed, 22397 insertions(+), 22397 deletions(-) delete mode 100644 .editorconfig delete mode 100644 README.md delete mode 100644 Util.wixext.sln delete mode 100644 Util.wixext.v3.ncrunchsolution delete mode 100644 appveyor.cmd delete mode 100644 appveyor.yml delete mode 100644 global.json delete mode 100644 nuget.config create mode 100644 src/.editorconfig delete mode 100644 src/CustomizedNativeRecommendedRules.ruleset delete mode 100644 src/Directory.Build.props delete mode 100644 src/Directory.Build.targets delete mode 100644 src/Directory.csproj.props delete mode 100644 src/Directory.csproj.targets delete mode 100644 src/Directory.vcxproj.props delete mode 100644 src/be/UtilBundleExtension.cpp delete mode 100644 src/be/UtilBundleExtension.h delete mode 100644 src/be/beDecor.h delete mode 100644 src/be/detectsha2support.cpp delete mode 100644 src/be/detectsha2support.h delete mode 100644 src/be/precomp.cpp delete mode 100644 src/be/precomp.h delete mode 100644 src/be/utilbe.cpp delete mode 100644 src/be/utilbe.def delete mode 100644 src/be/utilbe.vcxproj delete mode 100644 src/be/utilsearch.cpp delete mode 100644 src/be/utilsearch.h delete mode 100644 src/ca/BroadcastSettingChange.cpp delete mode 100644 src/ca/CheckReboot.cpp delete mode 100644 src/ca/CloseApps.cpp delete mode 100644 src/ca/CustomMsiErrors.h delete mode 100644 src/ca/FormatFiles.cpp delete mode 100644 src/ca/OsInfo.cpp delete mode 100644 src/ca/RemoveFoldersEx.cpp delete mode 100644 src/ca/RemoveRegistryKeysEx.cpp delete mode 100644 src/ca/RestartManager.cpp delete mode 100644 src/ca/TouchFile.cpp delete mode 100644 src/ca/XmlConfig.cpp delete mode 100644 src/ca/XmlFile.cpp delete mode 100644 src/ca/caDecor.h delete mode 100644 src/ca/cost.h delete mode 100644 src/ca/dllmain.cpp delete mode 100644 src/ca/exitearlywithsuccess.cpp delete mode 100644 src/ca/netshortcuts.cpp delete mode 100644 src/ca/precomp.h delete mode 100644 src/ca/qtexecca.cpp delete mode 100644 src/ca/sca.h delete mode 100644 src/ca/scacost.h delete mode 100644 src/ca/scaexec.cpp delete mode 100644 src/ca/scamanifest.cpp delete mode 100644 src/ca/scaperf.cpp delete mode 100644 src/ca/scaperfexec.cpp delete mode 100644 src/ca/scasched.cpp delete mode 100644 src/ca/scasmb.h delete mode 100644 src/ca/scasmbexec.cpp delete mode 100644 src/ca/scasmbexec.h delete mode 100644 src/ca/scasmbsched.cpp delete mode 100644 src/ca/scauser.cpp delete mode 100644 src/ca/scauser.h delete mode 100644 src/ca/secureobj.cpp delete mode 100644 src/ca/serviceconfig.cpp delete mode 100644 src/ca/shellexecca.cpp delete mode 100644 src/ca/test.cpp delete mode 100644 src/ca/utilca.cpp delete mode 100644 src/ca/utilca.def delete mode 100644 src/ca/utilca.vcxproj create mode 100644 src/ext/Util/CustomizedNativeRecommendedRules.ruleset create mode 100644 src/ext/Util/Directory.Build.props create mode 100644 src/ext/Util/Directory.Build.targets create mode 100644 src/ext/Util/Directory.csproj.props create mode 100644 src/ext/Util/Directory.csproj.targets create mode 100644 src/ext/Util/Directory.vcxproj.props create mode 100644 src/ext/Util/README.md create mode 100644 src/ext/Util/Util.wixext.sln create mode 100644 src/ext/Util/Util.wixext.v3.ncrunchsolution create mode 100644 src/ext/Util/appveyor.cmd create mode 100644 src/ext/Util/appveyor.yml create mode 100644 src/ext/Util/be/UtilBundleExtension.cpp create mode 100644 src/ext/Util/be/UtilBundleExtension.h create mode 100644 src/ext/Util/be/beDecor.h create mode 100644 src/ext/Util/be/detectsha2support.cpp create mode 100644 src/ext/Util/be/detectsha2support.h create mode 100644 src/ext/Util/be/precomp.cpp create mode 100644 src/ext/Util/be/precomp.h create mode 100644 src/ext/Util/be/utilbe.cpp create mode 100644 src/ext/Util/be/utilbe.def create mode 100644 src/ext/Util/be/utilbe.vcxproj create mode 100644 src/ext/Util/be/utilsearch.cpp create mode 100644 src/ext/Util/be/utilsearch.h create mode 100644 src/ext/Util/ca/BroadcastSettingChange.cpp create mode 100644 src/ext/Util/ca/CheckReboot.cpp create mode 100644 src/ext/Util/ca/CloseApps.cpp create mode 100644 src/ext/Util/ca/CustomMsiErrors.h create mode 100644 src/ext/Util/ca/FormatFiles.cpp create mode 100644 src/ext/Util/ca/OsInfo.cpp create mode 100644 src/ext/Util/ca/RemoveFoldersEx.cpp create mode 100644 src/ext/Util/ca/RemoveRegistryKeysEx.cpp create mode 100644 src/ext/Util/ca/RestartManager.cpp create mode 100644 src/ext/Util/ca/TouchFile.cpp create mode 100644 src/ext/Util/ca/XmlConfig.cpp create mode 100644 src/ext/Util/ca/XmlFile.cpp create mode 100644 src/ext/Util/ca/caDecor.h create mode 100644 src/ext/Util/ca/cost.h create mode 100644 src/ext/Util/ca/dllmain.cpp create mode 100644 src/ext/Util/ca/exitearlywithsuccess.cpp create mode 100644 src/ext/Util/ca/netshortcuts.cpp create mode 100644 src/ext/Util/ca/precomp.h create mode 100644 src/ext/Util/ca/qtexecca.cpp create mode 100644 src/ext/Util/ca/sca.h create mode 100644 src/ext/Util/ca/scacost.h create mode 100644 src/ext/Util/ca/scaexec.cpp create mode 100644 src/ext/Util/ca/scamanifest.cpp create mode 100644 src/ext/Util/ca/scaperf.cpp create mode 100644 src/ext/Util/ca/scaperfexec.cpp create mode 100644 src/ext/Util/ca/scasched.cpp create mode 100644 src/ext/Util/ca/scasmb.h create mode 100644 src/ext/Util/ca/scasmbexec.cpp create mode 100644 src/ext/Util/ca/scasmbexec.h create mode 100644 src/ext/Util/ca/scasmbsched.cpp create mode 100644 src/ext/Util/ca/scauser.cpp create mode 100644 src/ext/Util/ca/scauser.h create mode 100644 src/ext/Util/ca/secureobj.cpp create mode 100644 src/ext/Util/ca/serviceconfig.cpp create mode 100644 src/ext/Util/ca/shellexecca.cpp create mode 100644 src/ext/Util/ca/test.cpp create mode 100644 src/ext/Util/ca/utilca.cpp create mode 100644 src/ext/Util/ca/utilca.def create mode 100644 src/ext/Util/ca/utilca.vcxproj create mode 100644 src/ext/Util/nuget.config create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/.Data/burn.exe create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/example.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/example.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml create mode 100644 src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs create mode 100644 src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj create mode 100644 src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject create mode 100644 src/ext/Util/wix.snk create mode 100644 src/ext/Util/wixext/PerformanceCounterType.cs create mode 100644 src/ext/Util/wixext/Symbols/EventManifestSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/FileSharePermissionsSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/FileShareSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/GroupSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/PerfmonManifestSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/PerfmonSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/PerformanceCategorySymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/UserGroupSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/UserSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs create mode 100644 src/ext/Util/wixext/Symbols/WixCloseApplicationSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixFormatFilesSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixInternetShortcutSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixRemoveFolderExSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixRestartResourceSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs create mode 100644 src/ext/Util/wixext/Symbols/XmlFileSymbol.cs create mode 100644 src/ext/Util/wixext/UtilCompiler.cs create mode 100644 src/ext/Util/wixext/UtilConstants.cs create mode 100644 src/ext/Util/wixext/UtilDecompiler.cs create mode 100644 src/ext/Util/wixext/UtilErrors.cs create mode 100644 src/ext/Util/wixext/UtilExtensionData.cs create mode 100644 src/ext/Util/wixext/UtilExtensionFactory.cs create mode 100644 src/ext/Util/wixext/UtilTableDefinitions.cs create mode 100644 src/ext/Util/wixext/UtilWarnings.cs create mode 100644 src/ext/Util/wixext/UtilWindowsInstallerBackendExtension.cs create mode 100644 src/ext/Util/wixext/WixToolset.Util.wixext.csproj create mode 100644 src/ext/Util/wixext/WixToolset.Util.wixext.nuspec create mode 100644 src/ext/Util/wixext/WixToolset.Util.wixext.targets create mode 100644 src/ext/Util/wixext/WixToolset.Util.wixext.v3.ncrunchproject create mode 100644 src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi create mode 100644 src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs create mode 100644 src/ext/Util/wixlib/UtilBundleExtension_x64.wxs create mode 100644 src/ext/Util/wixlib/UtilBundleExtension_x86.wxs create mode 100644 src/ext/Util/wixlib/UtilExtension.wxs create mode 100644 src/ext/Util/wixlib/UtilExtension_Platform.wxi create mode 100644 src/ext/Util/wixlib/UtilExtension_arm64.wxs create mode 100644 src/ext/Util/wixlib/UtilExtension_x64.wxs create mode 100644 src/ext/Util/wixlib/UtilExtension_x86.wxs create mode 100644 src/ext/Util/wixlib/caDecor.wxi create mode 100644 src/ext/Util/wixlib/caerr.wxi create mode 100644 src/ext/Util/wixlib/de-de.wxl create mode 100644 src/ext/Util/wixlib/en-us.wxl create mode 100644 src/ext/Util/wixlib/es-es.wxl create mode 100644 src/ext/Util/wixlib/fr-fr.wxl create mode 100644 src/ext/Util/wixlib/it-it.wxl create mode 100644 src/ext/Util/wixlib/ja-jp.wxl create mode 100644 src/ext/Util/wixlib/pt-br.wxl create mode 100644 src/ext/Util/wixlib/util.v3.ncrunchproject create mode 100644 src/ext/Util/wixlib/util.wixproj create mode 100644 src/ext/global.json delete mode 100644 src/test/WixToolsetTest.Util/TestData/.Data/burn.exe delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll delete mode 100644 src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/Queries/example.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs delete mode 100644 src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml delete mode 100644 src/test/WixToolsetTest.Util/UtilExtensionFixture.cs delete mode 100644 src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj delete mode 100644 src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject create mode 100644 src/version.json delete mode 100644 src/wix.snk delete mode 100644 src/wixext/PerformanceCounterType.cs delete mode 100644 src/wixext/Symbols/EventManifestSymbol.cs delete mode 100644 src/wixext/Symbols/FileSharePermissionsSymbol.cs delete mode 100644 src/wixext/Symbols/FileShareSymbol.cs delete mode 100644 src/wixext/Symbols/GroupSymbol.cs delete mode 100644 src/wixext/Symbols/PerfmonManifestSymbol.cs delete mode 100644 src/wixext/Symbols/PerfmonSymbol.cs delete mode 100644 src/wixext/Symbols/PerformanceCategorySymbol.cs delete mode 100644 src/wixext/Symbols/SecureObjectsSymbol.cs delete mode 100644 src/wixext/Symbols/ServiceConfigSymbol.cs delete mode 100644 src/wixext/Symbols/UserGroupSymbol.cs delete mode 100644 src/wixext/Symbols/UserSymbol.cs delete mode 100644 src/wixext/Symbols/UtilSymbolDefinitions.cs delete mode 100644 src/wixext/Symbols/WixCloseApplicationSymbol.cs delete mode 100644 src/wixext/Symbols/WixFormatFilesSymbol.cs delete mode 100644 src/wixext/Symbols/WixInternetShortcutSymbol.cs delete mode 100644 src/wixext/Symbols/WixRemoveFolderExSymbol.cs delete mode 100644 src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs delete mode 100644 src/wixext/Symbols/WixRestartResourceSymbol.cs delete mode 100644 src/wixext/Symbols/WixTouchFileSymbol.cs delete mode 100644 src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs delete mode 100644 src/wixext/Symbols/XmlConfigSymbol.cs delete mode 100644 src/wixext/Symbols/XmlFileSymbol.cs delete mode 100644 src/wixext/UtilCompiler.cs delete mode 100644 src/wixext/UtilConstants.cs delete mode 100644 src/wixext/UtilDecompiler.cs delete mode 100644 src/wixext/UtilErrors.cs delete mode 100644 src/wixext/UtilExtensionData.cs delete mode 100644 src/wixext/UtilExtensionFactory.cs delete mode 100644 src/wixext/UtilTableDefinitions.cs delete mode 100644 src/wixext/UtilWarnings.cs delete mode 100644 src/wixext/UtilWindowsInstallerBackendExtension.cs delete mode 100644 src/wixext/WixToolset.Util.wixext.csproj delete mode 100644 src/wixext/WixToolset.Util.wixext.nuspec delete mode 100644 src/wixext/WixToolset.Util.wixext.targets delete mode 100644 src/wixext/WixToolset.Util.wixext.v3.ncrunchproject delete mode 100644 src/wixlib/UtilBundleExtension_Platform.wxi delete mode 100644 src/wixlib/UtilBundleExtension_arm64.wxs delete mode 100644 src/wixlib/UtilBundleExtension_x64.wxs delete mode 100644 src/wixlib/UtilBundleExtension_x86.wxs delete mode 100644 src/wixlib/UtilExtension.wxs delete mode 100644 src/wixlib/UtilExtension_Platform.wxi delete mode 100644 src/wixlib/UtilExtension_arm64.wxs delete mode 100644 src/wixlib/UtilExtension_x64.wxs delete mode 100644 src/wixlib/UtilExtension_x86.wxs delete mode 100644 src/wixlib/caDecor.wxi delete mode 100644 src/wixlib/caerr.wxi delete mode 100644 src/wixlib/de-de.wxl delete mode 100644 src/wixlib/en-us.wxl delete mode 100644 src/wixlib/es-es.wxl delete mode 100644 src/wixlib/fr-fr.wxl delete mode 100644 src/wixlib/it-it.wxl delete mode 100644 src/wixlib/ja-jp.wxl delete mode 100644 src/wixlib/pt-br.wxl delete mode 100644 src/wixlib/util.v3.ncrunchproject delete mode 100644 src/wixlib/util.wixproj delete mode 100644 version.json (limited to 'src') diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 1d72e683..00000000 --- a/.editorconfig +++ /dev/null @@ -1,37 +0,0 @@ -# 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. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig -# then update all of the repos. - -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 4 -trim_trailing_whitespace = true - -[*.{cs,vb}] -dotnet_sort_system_directives_first = true - -[*.cs] -csharp_indent_case_contents = true : error -csharp_indent_switch_labels = true : error -csharp_new_line_before_open_brace = all -csharp_prefer_braces = true : error -csharp_style_expression_bodied_methods = when_on_single_line : suggestion -csharp_style_expression_bodied_constructors = when_on_single_line : suggestion -csharp_style_expression_bodied_operators = when_on_single_line : suggestion -csharp_style_expression_bodied_properties = when_on_single_line : suggestion -csharp_style_expression_bodied_indexers = when_on_single_line : suggestion -csharp_style_expression_bodied_accessors = when_on_single_line : suggestion -csharp_style_var_elsewhere = true : suggestion -csharp_style_var_for_built_in_types = true : suggestion -csharp_style_var_when_type_is_apparent = true : suggestion -dotnet_style_qualification_for_event = true : error -dotnet_style_qualification_for_field = true : error -dotnet_style_qualification_for_method = true : error -dotnet_style_qualification_for_property = true : error - -[*.targets] -indent_size = 2 diff --git a/README.md b/README.md deleted file mode 100644 index 540c539c..00000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Util.wixext -WixToolset.Util.wixext - Utility WiX Toolset Extension - diff --git a/Util.wixext.sln b/Util.wixext.sln deleted file mode 100644 index 050fd8b3..00000000 --- a/Util.wixext.sln +++ /dev/null @@ -1,87 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30204.135 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "src\wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.Build.0 = Debug|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x64.ActiveCfg = Debug|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.ActiveCfg = Debug|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.Build.0 = Debug|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.ActiveCfg = Release|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.Build.0 = Release|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x64.ActiveCfg = Release|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.ActiveCfg = Release|Win32 - {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.Build.0 = Release|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.Build.0 = Debug|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x64.ActiveCfg = Debug|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.ActiveCfg = Release|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.Build.0 = Release|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x64.ActiveCfg = Release|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32 - {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.ActiveCfg = Debug|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.Build.0 = Debug|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86 - {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86 - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x64.ActiveCfg = Debug|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x64.Build.0 = Debug|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x86.ActiveCfg = Debug|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x86.Build.0 = Debug|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x64.ActiveCfg = Release|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x64.Build.0 = Release|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x86.ActiveCfg = Release|Any CPU - {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x86.Build.0 = Release|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x64.Build.0 = Debug|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x86.Build.0 = Debug|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|Any CPU.Build.0 = Release|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x64.ActiveCfg = Release|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x64.Build.0 = Release|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x86.ActiveCfg = Release|Any CPU - {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E4566A6B-47D0-4EA0-989A-D763AC39105D} - EndGlobalSection -EndGlobal diff --git a/Util.wixext.v3.ncrunchsolution b/Util.wixext.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/Util.wixext.v3.ncrunchsolution +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/appveyor.cmd b/appveyor.cmd deleted file mode 100644 index 8322ffae..00000000 --- a/appveyor.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# 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. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/global.json b/global.json deleted file mode 100644 index 697f5687..00000000 --- a/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0213" - }, - "sdk": { - "allowPrerelease": false - } -} diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 8d711148..00000000 --- a/nuget.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/.editorconfig b/src/.editorconfig new file mode 100644 index 00000000..1d72e683 --- /dev/null +++ b/src/.editorconfig @@ -0,0 +1,37 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig +# then update all of the repos. + +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.{cs,vb}] +dotnet_sort_system_directives_first = true + +[*.cs] +csharp_indent_case_contents = true : error +csharp_indent_switch_labels = true : error +csharp_new_line_before_open_brace = all +csharp_prefer_braces = true : error +csharp_style_expression_bodied_methods = when_on_single_line : suggestion +csharp_style_expression_bodied_constructors = when_on_single_line : suggestion +csharp_style_expression_bodied_operators = when_on_single_line : suggestion +csharp_style_expression_bodied_properties = when_on_single_line : suggestion +csharp_style_expression_bodied_indexers = when_on_single_line : suggestion +csharp_style_expression_bodied_accessors = when_on_single_line : suggestion +csharp_style_var_elsewhere = true : suggestion +csharp_style_var_for_built_in_types = true : suggestion +csharp_style_var_when_type_is_apparent = true : suggestion +dotnet_style_qualification_for_event = true : error +dotnet_style_qualification_for_field = true : error +dotnet_style_qualification_for_method = true : error +dotnet_style_qualification_for_property = true : error + +[*.targets] +indent_size = 2 diff --git a/src/CustomizedNativeRecommendedRules.ruleset b/src/CustomizedNativeRecommendedRules.ruleset deleted file mode 100644 index 142b141c..00000000 --- a/src/CustomizedNativeRecommendedRules.ruleset +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index b3c6287c..00000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset - - - - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props deleted file mode 100644 index 11778f41..00000000 --- a/src/Directory.vcxproj.props +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/be/UtilBundleExtension.cpp b/src/be/UtilBundleExtension.cpp deleted file mode 100644 index 2ac842a5..00000000 --- a/src/be/UtilBundleExtension.cpp +++ /dev/null @@ -1,87 +0,0 @@ -// 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" -#include "BextBaseBundleExtension.h" - -class CWixUtilBundleExtension : public CBextBaseBundleExtension -{ -public: // IBundleExtension - virtual STDMETHODIMP Search( - __in LPCWSTR wzId, - __in LPCWSTR wzVariable - ) - { - HRESULT hr = S_OK; - - hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine); - - return hr; - } - -public: //CBextBaseBundleExtension - virtual STDMETHODIMP Initialize( - __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs - ) - { - HRESULT hr = S_OK; - IXMLDOMDocument* pixdManifest = NULL; - IXMLDOMNode* pixnBundleExtension = NULL; - - hr = CBextBaseBundleExtension::Initialize(pCreateArgs); - ExitOnFailure(hr, "CBextBaseBundleExtension initialization failed."); - - hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest); - ExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath); - - hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension); - ExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID); - - hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension); - ExitOnFailure(hr, "Failed to parse searches from bundle extension manifest."); - - LExit: - ReleaseObject(pixnBundleExtension); - ReleaseObject(pixdManifest); - - return hr; - } - -public: - CWixUtilBundleExtension( - __in IBundleExtensionEngine* pEngine - ) : CBextBaseBundleExtension(pEngine) - { - m_searches = { }; - } - - ~CWixUtilBundleExtension() - { - UtilSearchUninitialize(&m_searches); - } - -private: - UTIL_SEARCHES m_searches; -}; - -HRESULT UtilBundleExtensionCreate( - __in IBundleExtensionEngine* pEngine, - __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, - __out IBundleExtension** ppBundleExtension - ) -{ - HRESULT hr = S_OK; - CWixUtilBundleExtension* pExtension = NULL; - - pExtension = new CWixUtilBundleExtension(pEngine); - ExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension."); - - hr = pExtension->Initialize(pArgs); - ExitOnFailure(hr, "CWixUtilBundleExtension initialization failed"); - - *ppBundleExtension = pExtension; - pExtension = NULL; - -LExit: - ReleaseObject(pExtension); - return hr; -} diff --git a/src/be/UtilBundleExtension.h b/src/be/UtilBundleExtension.h deleted file mode 100644 index c55d6b85..00000000 --- a/src/be/UtilBundleExtension.h +++ /dev/null @@ -1,16 +0,0 @@ -#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. - - -// constants - -#define UTIL_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"UtilBundleExtension") - - -// function declarations - -HRESULT UtilBundleExtensionCreate( - __in IBundleExtensionEngine* pEngine, - __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, - __out IBundleExtension** ppBundleExtension - ); diff --git a/src/be/beDecor.h b/src/be/beDecor.h deleted file mode 100644 index 2c6a8818..00000000 --- a/src/be/beDecor.h +++ /dev/null @@ -1,13 +0,0 @@ -#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. - - -#if defined(_M_ARM64) -#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_A64" -#elif defined(_M_AMD64) -#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X64" -#elif defined(_M_ARM) -#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_ARM" -#else -#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X86" -#endif diff --git a/src/be/detectsha2support.cpp b/src/be/detectsha2support.cpp deleted file mode 100644 index 90e349cd..00000000 --- a/src/be/detectsha2support.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// 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" - -// https://gist.github.com/navossoc/7572c7d82243e9f818989e2765e7793a -HRESULT DetectSHA2CodeSigning( - __out BOOL* pfSupported - ) -{ - HRESULT hr = S_OK; - HMODULE hModule = NULL; - FARPROC pfn = NULL; - DWORD er = ERROR_SUCCESS; - - hr = LoadSystemLibrary(L"wintrust.dll", &hModule); - ExitOnFailure(hr, "Failed to load wintrust.dll"); - - pfn = ::GetProcAddress(hModule, "CryptCATAdminAcquireContext2"); - if (pfn) - { - *pfSupported = TRUE; - ExitFunction1(hr = S_OK); - } - - er = ::GetLastError(); - if (er == ERROR_PROC_NOT_FOUND) - { - *pfSupported = FALSE; - ExitFunction1(hr = S_OK); - } - - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to probe for CryptCATAdminAcquireContext2 in wintrust.dll"); - -LExit: - ::FreeLibrary(hModule); - - return hr; -} - -HRESULT UtilPerformDetectSHA2CodeSigning( - __in LPCWSTR wzVariable, - __in UTIL_SEARCH* /*pSearch*/, - __in IBundleExtensionEngine* pEngine - ) -{ - HRESULT hr = S_OK; - BOOL fSupported = FALSE; - - hr = DetectSHA2CodeSigning(&fSupported); - ExitOnFailure(hr, "DetectSHA2CodeSigning failed."); - - hr = pEngine->SetVariableNumeric(wzVariable, fSupported ? 1 : 0); - ExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable); - -LExit: - return hr; -} diff --git a/src/be/detectsha2support.h b/src/be/detectsha2support.h deleted file mode 100644 index c38a3d59..00000000 --- a/src/be/detectsha2support.h +++ /dev/null @@ -1,8 +0,0 @@ -#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. - -HRESULT UtilPerformDetectSHA2CodeSigning( - __in LPCWSTR wzVariable, - __in UTIL_SEARCH* pSearch, - __in IBundleExtensionEngine* pEngine - ); \ No newline at end of file diff --git a/src/be/precomp.cpp b/src/be/precomp.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/be/precomp.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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" diff --git a/src/be/precomp.h b/src/be/precomp.h deleted file mode 100644 index 76d24c7b..00000000 --- a/src/be/precomp.h +++ /dev/null @@ -1,37 +0,0 @@ -#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. - - -#if _WIN32_MSI < 150 -#define _WIN32_MSI 150 -#endif - -#include -#include -#include -#include - -#include - -#include - -#define MAXUINT USHRT_MAX - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include "beDecor.h" -#include "utilsearch.h" -#include "detectsha2support.h" -#include "UtilBundleExtension.h" diff --git a/src/be/utilbe.cpp b/src/be/utilbe.cpp deleted file mode 100644 index d9816dc7..00000000 --- a/src/be/utilbe.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// 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" -#include "BextBaseBundleExtensionProc.h" - -static IBundleExtension* vpBundleExtension = NULL; - -// function definitions - -extern "C" HRESULT WINAPI BundleExtensionCreate( - __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, - __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - IBundleExtensionEngine* pEngine = NULL; - - hr = XmlInitialize(); - ExitOnFailure(hr, "Failed to initialize XML."); - - hr = BextInitializeFromCreateArgs(pArgs, &pEngine); - ExitOnFailure(hr, "Failed to initialize bext"); - - hr = UtilBundleExtensionCreate(pEngine, pArgs, &vpBundleExtension); - BextExitOnFailure(hr, "Failed to create WixUtilBundleExtension"); - - pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc; - pResults->pvBundleExtensionProcContext = vpBundleExtension; - -LExit: - ReleaseObject(pEngine); - - return hr; -} - -extern "C" void WINAPI BundleExtensionDestroy() -{ - BextUninitialize(); - ReleaseNullObject(vpBundleExtension); - XmlUninitialize(); -} \ No newline at end of file diff --git a/src/be/utilbe.def b/src/be/utilbe.def deleted file mode 100644 index 711b1a5c..00000000 --- a/src/be/utilbe.def +++ /dev/null @@ -1,8 +0,0 @@ -; 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 "utilbe" - -EXPORTS - BundleExtensionCreate - BundleExtensionDestroy diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj deleted file mode 100644 index 683b376a..00000000 --- a/src/be/utilbe.vcxproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - X64 - - - Release - X64 - - - Debug - Win32 - - - Release - Win32 - - - - - {630C1EE7-2517-4A8C-83E3-DA1150308B58} - DynamicLibrary - utilbe - v142 - Unicode - utilbe.def - WiX Toolset Util BundleExtension - - - - - - - msi.lib - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/be/utilsearch.cpp b/src/be/utilsearch.cpp deleted file mode 100644 index 7cd2ea09..00000000 --- a/src/be/utilsearch.cpp +++ /dev/null @@ -1,160 +0,0 @@ -// 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" - - -STDMETHODIMP UtilSearchParseFromXml( - __in UTIL_SEARCHES* pSearches, - __in IXMLDOMNode* pixnBundleExtension - ) -{ - HRESULT hr = S_OK; - IXMLDOMNodeList* pixnNodes = NULL; - IXMLDOMNode* pixnNode = NULL; - DWORD cNodes = 0; - BSTR bstrNodeName = NULL; - LPWSTR scz = NULL; - - // Select Util search nodes. - hr = XmlSelectNodes(pixnBundleExtension, L"WixWindowsFeatureSearch", &pixnNodes); - ExitOnFailure(hr, "Failed to select Util search nodes."); - - // Get Util search node count. - hr = pixnNodes->get_length((long*)&cNodes); - ExitOnFailure(hr, "Failed to get Util search node count."); - - if (!cNodes) - { - ExitFunction(); - } - - // Allocate memory for searches. - pSearches->rgSearches = (UTIL_SEARCH*)MemAlloc(sizeof(UTIL_SEARCH) * cNodes, TRUE); - ExitOnNull(pSearches->rgSearches, hr, E_OUTOFMEMORY, "Failed to allocate memory for search structs."); - - pSearches->cSearches = cNodes; - - // Parse search elements. - for (DWORD i = 0; i < cNodes; ++i) - { - UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; - - hr = XmlNextElement(pixnNodes, &pixnNode, &bstrNodeName); - ExitOnFailure(hr, "Failed to get next node."); - - // @Id - hr = XmlGetAttributeEx(pixnNode, L"Id", &pSearch->sczId); - ExitOnFailure(hr, "Failed to get @Id."); - - // Read type specific attributes. - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"WixWindowsFeatureSearch", -1)) - { - pSearch->Type = UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH; - - // @Type - hr = XmlGetAttributeEx(pixnNode, L"Type", &scz); - ExitOnFailure(hr, "Failed to get @Type."); - - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"sha2CodeSigning", -1)) - { - pSearch->WindowsFeatureSearch.type = UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING; - } - else - { - hr = E_INVALIDARG; - ExitOnFailure(hr, "Invalid value for @Type: %ls", scz); - } - } - else - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "Unexpected element name: %ls", bstrNodeName); - } - - // prepare next iteration - ReleaseNullObject(pixnNode); - ReleaseNullBSTR(bstrNodeName); - } - -LExit: - ReleaseStr(scz); - ReleaseBSTR(bstrNodeName); - ReleaseObject(pixnNode); - ReleaseObject(pixnNodes); - - return hr; -} - -void UtilSearchUninitialize( - __in UTIL_SEARCHES* pSearches - ) -{ - if (pSearches->rgSearches) - { - for (DWORD i = 0; i < pSearches->cSearches; ++i) - { - UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; - - ReleaseStr(pSearch->sczId); - } - MemFree(pSearches->rgSearches); - } -} - -STDMETHODIMP UtilSearchExecute( - __in UTIL_SEARCHES* pSearches, - __in LPCWSTR wzSearchId, - __in LPCWSTR wzVariable, - __in IBundleExtensionEngine* pEngine - ) -{ - HRESULT hr = S_OK; - UTIL_SEARCH* pSearch = NULL; - - hr = UtilSearchFindById(pSearches, wzSearchId, &pSearch); - ExitOnFailure(hr, "Search id '%ls' is unknown to the util extension."); - - switch (pSearch->Type) - { - case UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH: - switch (pSearch->WindowsFeatureSearch.type) - { - case UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING: - hr = UtilPerformDetectSHA2CodeSigning(wzVariable, pSearch, pEngine); - break; - default: - hr = E_UNEXPECTED; - } - break; - default: - hr = E_UNEXPECTED; - } - -LExit: - return hr; -} - -STDMETHODIMP UtilSearchFindById( - __in UTIL_SEARCHES* pSearches, - __in LPCWSTR wzId, - __out UTIL_SEARCH** ppSearch - ) -{ - HRESULT hr = S_OK; - - for (DWORD i = 0; i < pSearches->cSearches; ++i) - { - UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; - - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1)) - { - *ppSearch = pSearch; - ExitFunction1(hr = S_OK); - } - } - - hr = E_NOTFOUND; - -LExit: - return hr; -} diff --git a/src/be/utilsearch.h b/src/be/utilsearch.h deleted file mode 100644 index deeab1f7..00000000 --- a/src/be/utilsearch.h +++ /dev/null @@ -1,65 +0,0 @@ -#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. - - -// constants - -enum UTIL_SEARCH_TYPE -{ - UTIL_SEARCH_TYPE_NONE, - UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH, -}; - -enum UTIL_WINDOWS_FEATURE_SEARCH_TYPE -{ - UTIL_WINDOWS_FEATURE_SEARCH_TYPE_NONE, - UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING, -}; - - -// structs - -typedef struct _UTIL_SEARCH -{ - LPWSTR sczId; - - UTIL_SEARCH_TYPE Type; - union - { - struct - { - UTIL_WINDOWS_FEATURE_SEARCH_TYPE type; - } WindowsFeatureSearch; - }; -} UTIL_SEARCH; - -typedef struct _UTIL_SEARCHES -{ - UTIL_SEARCH* rgSearches; - DWORD cSearches; -} UTIL_SEARCHES; - - -// function declarations - -STDMETHODIMP UtilSearchParseFromXml( - __in UTIL_SEARCHES* pSearches, - __in IXMLDOMNode* pixnBundleExtension - ); - -void UtilSearchUninitialize( - __in UTIL_SEARCHES* pSearches - ); - -STDMETHODIMP UtilSearchExecute( - __in UTIL_SEARCHES* pSearches, - __in LPCWSTR wzSearchId, - __in LPCWSTR wzVariable, - __in IBundleExtensionEngine* pEngine - ); - -STDMETHODIMP UtilSearchFindById( - __in UTIL_SEARCHES* pSearches, - __in LPCWSTR wzId, - __out UTIL_SEARCH** ppSearch - ); diff --git a/src/ca/BroadcastSettingChange.cpp b/src/ca/BroadcastSettingChange.cpp deleted file mode 100644 index 2e153ad3..00000000 --- a/src/ca/BroadcastSettingChange.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// 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" - - -/******************************************************************** -WixBroadcastSettingChange - - Send WM_SETTINGCHANGE message to all top-level windows indicating - that unspecified settings have changed. -********************************************************************/ -extern "C" UINT __stdcall WixBroadcastSettingChange( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = WcaInitialize(hInstall, "WixBroadcastSettingChange"); - ExitOnFailure(hr, "failed to initialize WixBroadcastSettingChange"); - - // best effort; ignore failures - ::SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, NULL, SMTO_ABORTIFHUNG, 1000, NULL); - -LExit: - return WcaFinalize(ERROR_SUCCESS); -} - - -/******************************************************************** -WixBroadcastEnvironmentChange - - Send WM_SETTINGCHANGE message to all top-level windows indicating - that environment variables have changed. -********************************************************************/ -extern "C" UINT __stdcall WixBroadcastEnvironmentChange( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = WcaInitialize(hInstall, "WixBroadcastEnvironmentChange"); - ExitOnFailure(hr, "failed to initialize WixBroadcastEnvironmentChange"); - - // best effort; ignore failures - ::SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, reinterpret_cast(L"Environment"), SMTO_ABORTIFHUNG, 1000, NULL); - -LExit: - return WcaFinalize(ERROR_SUCCESS); -} diff --git a/src/ca/CheckReboot.cpp b/src/ca/CheckReboot.cpp deleted file mode 100644 index ce056411..00000000 --- a/src/ca/CheckReboot.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// 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" - - -/******************************************************************** -WixCheckRebootRequired - entry point for WixCheckRebootRequired Custom Action - - called as Type 1 CustomAction (binary DLL) from Windows Installer - in InstallExecuteSequence after InstallFinalize -********************************************************************/ -extern "C" UINT __stdcall WixCheckRebootRequired( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixCheckRebootRequired"); - ExitOnFailure(hr, "failed to initialize"); - - if (WcaDidDeferredActionRequireReboot()) - { - WcaLog(LOGMSG_STANDARD, "Reboot required by deferred CustomAction."); - - er = ::MsiSetMode(hInstall, MSIRUNMODE_REBOOTATEND, TRUE); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to schedule reboot."); - } - -LExit: - - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} diff --git a/src/ca/CloseApps.cpp b/src/ca/CloseApps.cpp deleted file mode 100644 index d4256c43..00000000 --- a/src/ca/CloseApps.cpp +++ /dev/null @@ -1,568 +0,0 @@ -// 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" - -#define DEFAULT_PROCESS_EXIT_WAIT_TIME 5000 - -// structs -LPCWSTR wzQUERY_CLOSEAPPS = L"SELECT `Wix4CloseApplication`, `Target`, `Description`, `Condition`, `Attributes`, `Property`, `TerminateExitCode`, `Timeout` FROM `Wix4CloseApplication` ORDER BY `Sequence`"; -enum eQUERY_CLOSEAPPS { QCA_ID = 1, QCA_TARGET, QCA_DESCRIPTION, QCA_CONDITION, QCA_ATTRIBUTES, QCA_PROPERTY, QCA_TERMINATEEXITCODE, QCA_TIMEOUT }; - -// CloseApplication.Attributes -enum CLOSEAPP_ATTRIBUTES -{ - CLOSEAPP_ATTRIBUTE_NONE = 0x0, - CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE = 0x1, - CLOSEAPP_ATTRIBUTE_REBOOTPROMPT = 0x2, - CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE = 0x4, - CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE = 0x8, - CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE = 0x10, - CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS = 0x20, - CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE = 0x40, -}; - -struct PROCESS_AND_MESSAGE -{ - DWORD dwProcessId; - DWORD dwMessageId; - DWORD dwTimeout; -}; - - -/****************************************************************** - EnumWindowsProc - callback function which sends message if the - current window matches the passed in process ID - -******************************************************************/ -BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) -{ - PROCESS_AND_MESSAGE* pPM = reinterpret_cast(lParam); - DWORD dwProcessId = 0; - DWORD_PTR dwResult = 0; - BOOL fQueryEndSession = WM_QUERYENDSESSION == pPM->dwMessageId; - BOOL fContinueWindowsInProcess = TRUE; // assume we will send message to all top-level windows in a process. - - ::GetWindowThreadProcessId(hwnd, &dwProcessId); - - // check if the process Id is the one we're looking for - if (dwProcessId != pPM->dwProcessId) - { - return TRUE; - } - - WcaLog(LOGMSG_VERBOSE, "Sending message to process id 0x%x", dwProcessId); - - if (::SendMessageTimeoutW(hwnd, pPM->dwMessageId, 0, fQueryEndSession ? ENDSESSION_CLOSEAPP : 0, SMTO_BLOCK, pPM->dwTimeout, &dwResult)) - { - WcaLog(LOGMSG_VERBOSE, "Result 0x%x", dwResult); - - if (fQueryEndSession) - { - // If application said it was okay to close, do that. - if (dwResult) - { - ::SendMessageTimeoutW(hwnd, WM_ENDSESSION, TRUE, ENDSESSION_CLOSEAPP, SMTO_BLOCK, pPM->dwTimeout, &dwResult); - } - else // application said don't try to close it, so don't bother sending messages to any other top-level windows. - { - fContinueWindowsInProcess = FALSE; - } - } - } - else // log result message. - { - WcaLog(LOGMSG_VERBOSE, "Failed to send message id: %u, error: 0x%x", pPM->dwMessageId, ::GetLastError()); - } - - // so we know we succeeded - ::SetLastError(ERROR_SUCCESS); - - return fContinueWindowsInProcess; -} - -/****************************************************************** - PromptToContinue - displays the prompt if the application is still - running. - -******************************************************************/ -static HRESULT PromptToContinue( - __in_z LPCWSTR wzApplication, - __in_z LPCWSTR wzPrompt - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - PMSIHANDLE hRecMessage = NULL; - DWORD *prgProcessIds = NULL; - DWORD cProcessIds = 0; - - hRecMessage = ::MsiCreateRecord(1); - ExitOnNull(hRecMessage, hr, E_OUTOFMEMORY, "Failed to create record for prompt."); - - er = ::MsiRecordSetStringW(hRecMessage, 0, wzPrompt); - ExitOnWin32Error(er, hr, "Failed to set prompt record field string"); - - do - { - hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); - if (SUCCEEDED(hr) && 0 < cProcessIds) - { - er = WcaProcessMessage(static_cast(INSTALLMESSAGE_WARNING | MB_ABORTRETRYIGNORE | MB_DEFBUTTON3 | MB_ICONWARNING), hRecMessage); - if (IDABORT == er) - { - hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); - } - else if (IDRETRY == er) - { - hr = S_FALSE; - } - else if (IDIGNORE == er) - { - hr = S_OK; - } - else - { - ExitOnWin32Error(er, hr, "Unexpected return value from prompt to continue."); - } - } - - ReleaseNullMem(prgProcessIds); - cProcessIds = 0; - } while (S_FALSE == hr); - -LExit: - ReleaseMem(prgProcessIds); - return hr; -} - -/****************************************************************** - SendProcessMessage - helper function to enumerate the top-level - windows and send to all matching a process ID. - -******************************************************************/ -void SendProcessMessage( - __in DWORD dwProcessId, - __in DWORD dwMessageId, - __in DWORD dwTimeout - ) -{ - WcaLog(LOGMSG_VERBOSE, "Attempting to send process id 0x%x message id: %u", dwProcessId, dwMessageId); - - PROCESS_AND_MESSAGE pm = { }; - pm.dwProcessId = dwProcessId; - pm.dwMessageId = dwMessageId; - pm.dwTimeout = dwTimeout; - - if (!::EnumWindows(EnumWindowsProc, reinterpret_cast(&pm))) - { - DWORD dwLastError = ::GetLastError(); - if (ERROR_SUCCESS != dwLastError) - { - WcaLog(LOGMSG_VERBOSE, "CloseApp enumeration error: 0x%x", dwLastError); - } - } -} - -/****************************************************************** - SendApplicationMessage - helper function to iterate through the - processes for the specified application and send all - applicable process Ids a message and give them time to process - the message. - -******************************************************************/ -void SendApplicationMessage( - __in LPCWSTR wzApplication, - __in DWORD dwMessageId, - __in DWORD dwTimeout - ) -{ - DWORD *prgProcessIds = NULL; - DWORD cProcessIds = 0, iProcessId; - HRESULT hr = S_OK; - - WcaLog(LOGMSG_VERBOSE, "Checking App: %ls ", wzApplication); - - hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); - - if (SUCCEEDED(hr) && 0 < cProcessIds) - { - WcaLog(LOGMSG_VERBOSE, "App: %ls found running, %d processes, attempting to send message.", wzApplication, cProcessIds); - - for (iProcessId = 0; iProcessId < cProcessIds; ++iProcessId) - { - SendProcessMessage(prgProcessIds[iProcessId], dwMessageId, dwTimeout); - } - - ProcWaitForIds(prgProcessIds, cProcessIds, dwTimeout); - } - - ReleaseMem(prgProcessIds); -} - -/****************************************************************** - SetRunningProcessProperty - helper function that sets the specified - property if there are any instances of the specified executable - running. Useful to show custom UI to ask for shutdown. -******************************************************************/ -void SetRunningProcessProperty( - __in LPCWSTR wzApplication, - __in LPCWSTR wzProperty - ) -{ - DWORD *prgProcessIds = NULL; - DWORD cProcessIds = 0; - HRESULT hr = S_OK; - - WcaLog(LOGMSG_VERBOSE, "Checking App: %ls ", wzApplication); - - hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); - - if (SUCCEEDED(hr) && 0 < cProcessIds) - { - WcaLog(LOGMSG_VERBOSE, "App: %ls found running, %d processes, setting '%ls' property.", wzApplication, cProcessIds, wzProperty); - WcaSetIntProperty(wzProperty, cProcessIds); - } - - ReleaseMem(prgProcessIds); -} - -/****************************************************************** - TerminateProcesses - helper function that kills the provided set of - process ids such that they return a particular exit code. -******************************************************************/ -void TerminateProcesses( - __in_ecount(cProcessIds) DWORD rgdwProcessIds[], - __in DWORD cProcessIds, - __in DWORD dwExitCode - ) -{ - for (DWORD i = 0; i < cProcessIds; ++i) - { - HANDLE hProcess = ::OpenProcess(PROCESS_TERMINATE, FALSE, rgdwProcessIds[i]); - if (hProcess) - { - ::TerminateProcess(hProcess, dwExitCode); - ::CloseHandle(hProcess); - } - } -} - -/****************************************************************** - WixCloseApplications - entry point for WixCloseApplications Custom Action - - called as Type 1 CustomAction (binary DLL) from Windows Installer - in InstallExecuteSequence before InstallFiles -******************************************************************/ -extern "C" UINT __stdcall WixCloseApplications( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug WixCloseApplications"); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzData = NULL; - LPWSTR pwzId = NULL; - LPWSTR pwzTarget = NULL; - LPWSTR pwzDescription = NULL; - LPWSTR pwzCondition = NULL; - LPWSTR pwzProperty = NULL; - DWORD dwAttributes = 0; - DWORD dwTimeout = 0; - DWORD dwTerminateExitCode = 0; - MSICONDITION condition = MSICONDITION_NONE; - - DWORD cCloseApps = 0; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - MSIHANDLE hListboxTable = NULL; - MSIHANDLE hListboxColumns = NULL; - - LPWSTR pwzCustomActionData = NULL; - //DWORD cchCustomActionData = 0; - - // - // initialize - // - hr = WcaInitialize(hInstall, "WixCloseApplications"); - ExitOnFailure(hr, "failed to initialize"); - - // - // loop through all the objects to be secured - // - hr = WcaOpenExecuteView(wzQUERY_CLOSEAPPS, &hView); - ExitOnFailure(hr, "failed to open view on Wix4CloseApplication table"); - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, QCA_ID, &pwzId); - ExitOnFailure(hr, "failed to get id from Wix4CloseApplication table"); - - hr = WcaGetRecordString(hRec, QCA_CONDITION, &pwzCondition); - ExitOnFailure(hr, "failed to get condition from Wix4CloseApplication table"); - - if (pwzCondition && *pwzCondition) - { - condition = ::MsiEvaluateConditionW(hInstall, pwzCondition); - if (MSICONDITION_ERROR == condition) - { - hr = E_INVALIDARG; - ExitOnFailure(hr, "failed to process condition for Wix4CloseApplication '%ls'", pwzId); - } - else if (MSICONDITION_FALSE == condition) - { - continue; // skip processing this target - } - } - - hr = WcaGetRecordFormattedString(hRec, QCA_TARGET, &pwzTarget); - ExitOnFailure(hr, "failed to get target from Wix4CloseApplication table"); - - hr = WcaGetRecordFormattedString(hRec, QCA_DESCRIPTION, &pwzDescription); - ExitOnFailure(hr, "failed to get description from Wix4CloseApplication table"); - - hr = WcaGetRecordInteger(hRec, QCA_ATTRIBUTES, reinterpret_cast(&dwAttributes)); - ExitOnFailure(hr, "failed to get attributes from Wix4CloseApplication table"); - - hr = WcaGetRecordFormattedString(hRec, QCA_PROPERTY, &pwzProperty); - ExitOnFailure(hr, "failed to get property from Wix4CloseApplication table"); - - hr = WcaGetRecordInteger(hRec, QCA_TERMINATEEXITCODE, reinterpret_cast(&dwTerminateExitCode)); - if (S_FALSE == hr) - { - dwTerminateExitCode = 0; - hr = S_OK; - } - ExitOnFailure(hr, "failed to get terminate exit-code from Wix4CloseApplication table"); - - hr = WcaGetRecordInteger(hRec, QCA_TIMEOUT, reinterpret_cast(&dwTimeout)); - if (S_FALSE == hr) - { - dwTimeout = DEFAULT_PROCESS_EXIT_WAIT_TIME; - hr = S_OK; - } - ExitOnFailure(hr, "failed to get timeout from Wix4CloseApplication table"); - - // Before trying any changes to the machine, prompt if requested. - if (dwAttributes & CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE) - { - hr = PromptToContinue(pwzTarget, pwzDescription ? pwzDescription : L""); - if (HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hr) - { - // Skip error message if user canceled. - ExitFunction(); - } - ExitOnFailure(hr, "Failure while prompting user to continue to close application."); - } - - // - // send WM_CLOSE or WM_QUERYENDSESSION to currently running applications - // - if (dwAttributes & CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE) - { - SendApplicationMessage(pwzTarget, WM_CLOSE, dwTimeout); - } - - if (dwAttributes & CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE) - { - SendApplicationMessage(pwzTarget, WM_QUERYENDSESSION, dwTimeout); - } - - // - // Pass the targets to the deferred action in case the app comes back - // even if we close it now. - // - if (dwAttributes & (CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE | CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE | CLOSEAPP_ATTRIBUTE_REBOOTPROMPT | CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS)) - { - hr = WcaWriteStringToCaData(pwzTarget, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add target data to CustomActionData"); - - hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add attribute data to CustomActionData"); - - hr = WcaWriteIntegerToCaData(dwTimeout, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add timeout data to CustomActionData"); - - hr = WcaWriteIntegerToCaData(dwTerminateExitCode, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add timeout data to CustomActionData"); - } - - if (pwzProperty && *pwzProperty) - { - SetRunningProcessProperty(pwzTarget, pwzProperty); - } - - ++cCloseApps; - } - - // if we looped through all records all is well - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed while looping through all apps to close"); - - // - // Do the UI dance now. - // - /* - - TODO: Do this eventually - - if (cCloseApps) - { - while (TRUE) - { - for (DWORD i = 0; i < cCloseApps; ++i) - { - hr = WcaAddTempRecord(&hListboxTable, &hListboxColumns, L"ListBox", NULL, 0, 4, L"FileInUseProcess", i, target, description); - if (FAILED(hr)) - { - } - } - } - } - */ - - // - // schedule the custom action and add to progress bar - // - if (pwzCustomActionData && *pwzCustomActionData) - { - Assert(0 < cCloseApps); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CloseApplicationsDeferred"), pwzCustomActionData, cCloseApps * COST_CLOSEAPP); - ExitOnFailure(hr, "failed to schedule CloseApplicationsDeferred action"); - } - -LExit: - if (hListboxColumns) - { - ::MsiCloseHandle(hListboxColumns); - } - if (hListboxTable) - { - ::MsiCloseHandle(hListboxTable); - } - - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzData); - ReleaseStr(pwzProperty); - ReleaseStr(pwzCondition); - ReleaseStr(pwzDescription); - ReleaseStr(pwzTarget); - ReleaseStr(pwzId); - - if (FAILED(hr)) - { - er = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hr ? ERROR_INSTALL_USEREXIT : ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - - -/****************************************************************** - WixCloseApplicationsDeferred - entry point for - WixCloseApplicationsDeferred Custom Action - called as Type 1025 CustomAction - (deferred binary DLL) - - NOTE: deferred CustomAction since it modifies the machine - NOTE: CustomActionData == wzTarget\tdwAttributes\tdwTimeout\tdwTerminateExitCode\t... -******************************************************************/ -extern "C" UINT __stdcall WixCloseApplicationsDeferred( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug WixCloseApplicationsDeferred"); - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - LPWSTR pwz = NULL; - LPWSTR pwzData = NULL; - LPWSTR pwzTarget = NULL; - DWORD dwAttributes = 0; - DWORD dwTimeout = 0; - DWORD dwTerminateExitCode = 0; - - DWORD *prgProcessIds = NULL; - DWORD cProcessIds = 0; - - // - // initialize - // - hr = WcaInitialize(hInstall, "WixCloseApplicationsDeferred"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - pwz = pwzData; - - // - // loop through all the passed in data - // - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &pwzTarget); - ExitOnFailure(hr, "failed to process target from CustomActionData"); - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwAttributes)); - ExitOnFailure(hr, "failed to process attributes from CustomActionData"); - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwTimeout)); - ExitOnFailure(hr, "failed to process timeout from CustomActionData"); - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwTerminateExitCode)); - ExitOnFailure(hr, "failed to process terminate exit code from CustomActionData"); - - WcaLog(LOGMSG_VERBOSE, "Checking for App: %ls Attributes: %d", pwzTarget, dwAttributes); - - // - // send WM_CLOSE or WM_QUERYENDSESSION to currently running applications - // - if (dwAttributes & CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE) - { - SendApplicationMessage(pwzTarget, WM_CLOSE, dwTimeout); - } - - if (dwAttributes & CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE) - { - SendApplicationMessage(pwzTarget, WM_QUERYENDSESSION, dwTimeout); - } - - // If we find that an app that we need closed is still runing, require a - // restart or kill the process as directed. - ProcFindAllIdsFromExeName(pwzTarget, &prgProcessIds, &cProcessIds); - if (0 < cProcessIds) - { - if (dwAttributes & CLOSEAPP_ATTRIBUTE_REBOOTPROMPT) - { - WcaLog(LOGMSG_VERBOSE, "App: %ls found running, requiring a reboot.", pwzTarget); - - WcaDeferredActionRequiresReboot(); - } - else if (dwAttributes & CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS) - { - TerminateProcesses(prgProcessIds, cProcessIds, dwTerminateExitCode); - } - } - - hr = WcaProgressMessage(COST_CLOSEAPP, FALSE); - ExitOnFailure(hr, "failed to send progress message"); - } - -LExit: - ReleaseMem(prgProcessIds); - - ReleaseStr(pwzTarget); - ReleaseStr(pwzData); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} diff --git a/src/ca/CustomMsiErrors.h b/src/ca/CustomMsiErrors.h deleted file mode 100644 index 3218b61b..00000000 --- a/src/ca/CustomMsiErrors.h +++ /dev/null @@ -1,32 +0,0 @@ -#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. - - -#define msierrSecureObjectsFailedCreateSD 25520 -#define msierrSecureObjectsFailedSet 25521 -#define msierrSecureObjectsUnknownType 25522 - -#define msierrXmlFileFailedRead 25530 -#define msierrXmlFileFailedOpen 25531 -#define msierrXmlFileFailedSelect 25532 -#define msierrXmlFileFailedSave 25533 - -#define msierrXmlConfigFailedRead 25540 -#define msierrXmlConfigFailedOpen 25541 -#define msierrXmlConfigFailedSelect 25542 -#define msierrXmlConfigFailedSave 25543 - -#define msierrPERFMONFailedRegisterDLL 26251 -#define msierrPERFMONFailedUnregisterDLL 26252 -#define msierrInstallPerfCounterData 26253 -#define msierrUninstallPerfCounterData 26254 - -#define msierrSMBFailedCreate 26301 -#define msierrSMBFailedDrop 26302 -#define msierrUSRFailedUserCreate 26401 -#define msierrUSRFailedUserCreatePswd 26402 -#define msierrUSRFailedUserGroupAdd 26403 -#define msierrUSRFailedUserCreateExists 26404 -#define msierrUSRFailedGrantLogonAsService 26405 - -//Last available is 26450 \ No newline at end of file diff --git a/src/ca/FormatFiles.cpp b/src/ca/FormatFiles.cpp deleted file mode 100644 index d1533999..00000000 --- a/src/ca/FormatFiles.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// 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" - -const UINT COST_FILEFORMATTING = 2000; - - -// -// WixSchedFormatFiles - immediate CA to schedule format files CAs -// -extern "C" UINT __stdcall WixSchedFormatFiles( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - PSCZ sczBinaryKey; - PSCZ sczFileKey; - PSCZ sczComponentKey; - PSCZ sczFormattedFile; - PSCZ sczFilePath; - PMSIHANDLE hView; - PMSIHANDLE hRec; - PSCZ sczFileContent; - PSCZ sczFormattedContent; - PSCZ sczExecCustomActionData; - PSCZ sczRollbackCustomActionData; - - LPCWSTR wzQuery = - L"SELECT `Wix4FormatFile`.`Binary_`, `Wix4FormatFile`.`File_`, `File`.`Component_` " - L"FROM `Wix4FormatFile`, `File` " - L"WHERE `Wix4FormatFile`.`File_` = `File`.`File`"; - enum eQuery { eqBinaryKey = 1, eqFileKey, eqComponentKey }; - - // initialize - hr = WcaInitialize(hInstall, "WixSchedFormatFiles"); - ExitOnFailure(hr, "Failed to initialize for WixSchedFormatFiles."); - - // query and loop through all the files - hr = WcaOpenExecuteView(wzQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4FormatFile table"); - - DWORD cFiles = 0; - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - ++cFiles; - - hr = WcaGetRecordString(hRec, eqBinaryKey, &sczBinaryKey); - ExitOnFailure(hr, "Failed to get Binary table key."); - - hr = WcaGetRecordString(hRec, eqFileKey, &sczFileKey); - ExitOnFailure(hr, "Failed to get File table key."); - - hr = WcaGetRecordString(hRec, eqComponentKey, &sczComponentKey); - ExitOnFailure(hr, "Failed to get Component table key."); - - // we need to know if the component's being installed, uninstalled, or reinstalled - WCA_TODO todo = WcaGetComponentToDo(sczComponentKey); - if (WCA_TODO_INSTALL == todo || WCA_TODO_REINSTALL == todo) - { - // turn the file key into the path to the target file - hr = StrAllocFormatted(&sczFormattedFile, L"[#%ls]", sczFileKey); - ExitOnFailure(hr, "Failed to format file string for file: %ls", sczFileKey); - hr = WcaGetFormattedString(sczFormattedFile, &sczFilePath); - ExitOnFailure(hr, "Failed to get path for file: %ls", sczFileKey); - - // extract binary to string - WCA_ENCODING encoding = WCA_ENCODING_UNKNOWN; - hr = WcaExtractBinaryToString(sczBinaryKey, &sczFileContent, &encoding); - ExitOnFailure(hr, "Failed to extract binary: %ls", sczBinaryKey); - - // format string - hr = WcaGetFormattedString(sczFileContent, &sczFormattedContent); - ExitOnFailure(hr, "Failed to format file content: %ls", sczFileContent); - - // write to deferred custom action data - hr = WcaWriteStringToCaData(sczFilePath, &sczExecCustomActionData); - ExitOnFailure(hr, "Failed to write deferred custom action data for file: %ls", sczFilePath); - - hr = WcaWriteIntegerToCaData(encoding, &sczExecCustomActionData); - ExitOnFailure(hr, "Failed to write deferred custom action data for encoding: %d", encoding); - - hr = WcaWriteStringToCaData(sczFormattedContent, &sczExecCustomActionData); - ExitOnFailure(hr, "Failed to write deferred custom action data for file content: %ls", sczFilePath); - - // write to rollback custom action data - hr = WcaWriteStringToCaData(sczFilePath, &sczRollbackCustomActionData); - ExitOnFailure(hr, "Failed to write rollback custom action data for file: %ls", sczFilePath); - - hr = WcaWriteIntegerToCaData(encoding, &sczRollbackCustomActionData); - ExitOnFailure(hr, "Failed to write deferred custom action data for encoding: %d", encoding); - - hr = WcaWriteStringToCaData(sczFileContent, &sczRollbackCustomActionData); - ExitOnFailure(hr, "Failed to write rollback custom action data for file content: %ls", sczFilePath); - } - } - - // reaching the end of the list is actually a good thing, not an error - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure occurred while processing Wix4FormatFile table"); - - // schedule deferred CAs if there's anything to do - if (sczRollbackCustomActionData && *sczRollbackCustomActionData) - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); - ExitOnFailure(hr, "Failed to schedule RollbackFormatFiles"); - } - - if (sczExecCustomActionData && *sczExecCustomActionData) - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); - ExitOnFailure(hr, "Failed to schedule ExecFormatFiles"); - } - -LExit: - return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); -} - - -// -// WixExecFormatFiles - deferred and rollback CAs to write formatted files -// -extern "C" UINT __stdcall WixExecFormatFiles( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - PSCZ sczCustomActionData; - LPWSTR pwz = NULL; - PSCZ sczFilePath; - PSCZ sczFileContent; - LPSTR psz = NULL; - - // initialize - hr = WcaInitialize(hInstall, "WixExecFormatFiles"); - ExitOnFailure(hr, "Failed to initialize for WixExecFormatFiles."); - - hr = WcaGetProperty(L"CustomActionData", &sczCustomActionData); - ExitOnFailure(hr, "Failed to get CustomActionData."); -#ifdef _DEBUG - WcaLog(LOGMSG_STANDARD, "CustomActionData: %ls", sczCustomActionData); -#endif - - // loop through all the passed in data - pwz = sczCustomActionData; - while (pwz && *pwz) - { - // extract the custom action data - hr = WcaReadStringFromCaData(&pwz, &sczFilePath); - ExitOnFailure(hr, "Failed to read file path from custom action data"); - - WCA_ENCODING encoding = WCA_ENCODING_UNKNOWN; - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&encoding)); - ExitOnFailure(hr, "Failed to read encoding from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &sczFileContent); - ExitOnFailure(hr, "Failed to read file content from custom action data"); - - // re-encode content - LPCBYTE pbData = NULL; - size_t cbData = 0; - switch (encoding) - { - case WCA_ENCODING_UTF_16: - pbData = reinterpret_cast(LPCWSTR(sczFileContent)); - cbData = lstrlenW(sczFileContent) * sizeof(WCHAR); - break; - - case WCA_ENCODING_UTF_8: - hr = StrAnsiAllocString(&psz, sczFileContent, 0, CP_UTF8); - ExitOnFailure(hr, "Failed to convert Unicode to UTF-8."); - pbData = reinterpret_cast(psz); - - hr = ::StringCbLengthA(psz, STRSAFE_MAX_CCH, &cbData); - ExitOnFailure(hr, "Failed to count UTF-8 bytes."); - break; - - case WCA_ENCODING_ANSI: - hr = StrAnsiAllocString(&psz, sczFileContent, 0, CP_ACP); - ExitOnFailure(hr, "Failed to convert Unicode to ANSI."); - pbData = reinterpret_cast(psz); - - hr = ::StringCbLengthA(psz, STRSAFE_MAX_CCH, &cbData); - ExitOnFailure(hr, "Failed to count UTF-8 bytes."); - break; - - default: - break; - } - -#ifdef _DEBUG - WcaLog(LOGMSG_STANDARD, "File: %ls", sczCustomActionData); - WcaLog(LOGMSG_STANDARD, "Content: %ls", sczFileContent); -#endif - - // write file and preserve modified time - FILETIME filetime; - - hr = FileGetTime(sczFilePath, NULL, NULL, &filetime); - ExitOnFailure(hr, "Failed to get modified time of file : %ls", sczFilePath); - - hr = FileWrite(sczFilePath, FILE_ATTRIBUTE_NORMAL, pbData, cbData, NULL); - ExitOnFailure(hr, "Failed to write file content: %ls", sczFilePath); - - hr = FileSetTime(sczFilePath, NULL, NULL, &filetime); - ExitOnFailure(hr, "Failed to set modified time of file : %ls", sczFilePath); - - // Tick the progress bar - hr = WcaProgressMessage(COST_FILEFORMATTING, FALSE); - ExitOnFailure(hr, "Failed to tick progress bar for file: %ls", sczFilePath); - } - -LExit: - ReleaseStr(psz); - - return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); -} diff --git a/src/ca/OsInfo.cpp b/src/ca/OsInfo.cpp deleted file mode 100644 index 4783673e..00000000 --- a/src/ca/OsInfo.cpp +++ /dev/null @@ -1,487 +0,0 @@ -// 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" - -// constants we'll pick up from later SDKs -#define SM_TABLETPC 86 -#define SM_MEDIACENTER 87 -#define SM_STARTER 88 -#define SM_SERVERR2 89 -#define VER_SUITE_WH_SERVER 0x00008000 - -/******************************************************************** -WixQueryOsInfo - entry point for WixQueryOsInfo custom action - - Called as Type 1 custom action (DLL from the Binary table) from - Windows Installer to set properties that identify OS information - and predefined directories -********************************************************************/ -extern "C" UINT __stdcall WixQueryOsInfo( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - OSVERSIONINFOEXW ovix = {0}; - - hr = WcaInitialize(hInstall, "WixQueryOsInfo"); - ExitOnFailure(hr, "WixQueryOsInfo failed to initialize"); - - // identify product suites - ovix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); - #pragma warning(suppress: 4996) //TODO: use osutil - ::GetVersionExW(reinterpret_cast(&ovix)); - - if (VER_SUITE_SMALLBUSINESS == (ovix.wSuiteMask & VER_SUITE_SMALLBUSINESS)) - { - WcaSetIntProperty(L"WIX_SUITE_SMALLBUSINESS", 1); - } - - if (VER_SUITE_ENTERPRISE == (ovix.wSuiteMask & VER_SUITE_ENTERPRISE)) - { - WcaSetIntProperty(L"WIX_SUITE_ENTERPRISE", 1); - } - - if (VER_SUITE_BACKOFFICE == (ovix.wSuiteMask & VER_SUITE_BACKOFFICE)) - { - WcaSetIntProperty(L"WIX_SUITE_BACKOFFICE", 1); - } - - if (VER_SUITE_COMMUNICATIONS == (ovix.wSuiteMask & VER_SUITE_COMMUNICATIONS)) - { - WcaSetIntProperty(L"WIX_SUITE_COMMUNICATIONS", 1); - } - - if (VER_SUITE_TERMINAL == (ovix.wSuiteMask & VER_SUITE_TERMINAL)) - { - WcaSetIntProperty(L"WIX_SUITE_TERMINAL", 1); - } - - if (VER_SUITE_SMALLBUSINESS_RESTRICTED == (ovix.wSuiteMask & VER_SUITE_SMALLBUSINESS_RESTRICTED)) - { - WcaSetIntProperty(L"WIX_SUITE_SMALLBUSINESS_RESTRICTED", 1); - } - - if (VER_SUITE_EMBEDDEDNT == (ovix.wSuiteMask & VER_SUITE_EMBEDDEDNT)) - { - WcaSetIntProperty(L"WIX_SUITE_EMBEDDEDNT", 1); - } - - if (VER_SUITE_DATACENTER == (ovix.wSuiteMask & VER_SUITE_DATACENTER)) - { - WcaSetIntProperty(L"WIX_SUITE_DATACENTER", 1); - } - - if (VER_SUITE_SINGLEUSERTS == (ovix.wSuiteMask & VER_SUITE_SINGLEUSERTS)) - { - WcaSetIntProperty(L"WIX_SUITE_SINGLEUSERTS", 1); - } - - if (VER_SUITE_PERSONAL == (ovix.wSuiteMask & VER_SUITE_PERSONAL)) - { - WcaSetIntProperty(L"WIX_SUITE_PERSONAL", 1); - } - - if (VER_SUITE_BLADE == (ovix.wSuiteMask & VER_SUITE_BLADE)) - { - WcaSetIntProperty(L"WIX_SUITE_BLADE", 1); - } - - if (VER_SUITE_EMBEDDED_RESTRICTED == (ovix.wSuiteMask & VER_SUITE_EMBEDDED_RESTRICTED)) - { - WcaSetIntProperty(L"WIX_SUITE_EMBEDDED_RESTRICTED", 1); - } - - if (VER_SUITE_SECURITY_APPLIANCE == (ovix.wSuiteMask & VER_SUITE_SECURITY_APPLIANCE)) - { - WcaSetIntProperty(L"WIX_SUITE_SECURITY_APPLIANCE", 1); - } - - if (VER_SUITE_STORAGE_SERVER == (ovix.wSuiteMask & VER_SUITE_STORAGE_SERVER)) - { - WcaSetIntProperty(L"WIX_SUITE_STORAGE_SERVER", 1); - } - - if (VER_SUITE_COMPUTE_SERVER == (ovix.wSuiteMask & VER_SUITE_COMPUTE_SERVER)) - { - WcaSetIntProperty(L"WIX_SUITE_COMPUTE_SERVER", 1); - } - - if (VER_SUITE_WH_SERVER == (ovix.wSuiteMask & VER_SUITE_WH_SERVER)) - { - WcaSetIntProperty(L"WIX_SUITE_WH_SERVER", 1); - } - - // only for XP and later - if (5 < ovix.dwMajorVersion || (5 == ovix.dwMajorVersion && 0 < ovix.dwMinorVersion)) - { - if (::GetSystemMetrics(SM_SERVERR2)) - { - WcaSetIntProperty(L"WIX_SUITE_SERVERR2", 1); - } - - if (::GetSystemMetrics(SM_MEDIACENTER)) - { - WcaSetIntProperty(L"WIX_SUITE_MEDIACENTER", 1); - } - - if (::GetSystemMetrics(SM_STARTER)) - { - WcaSetIntProperty(L"WIX_SUITE_STARTER", 1); - } - - if (::GetSystemMetrics(SM_TABLETPC)) - { - WcaSetIntProperty(L"WIX_SUITE_TABLETPC", 1); - } - } - -LExit: - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -/******************************************************************** -WixQueryOsDirs - entry point for WixQueryOsDirs custom action - - Called as Type 1 custom action (DLL from the Binary table) from - Windows Installer to set properties that identify predefined directories -********************************************************************/ -extern "C" UINT __stdcall WixQueryOsDirs( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixQueryOsDirs"); - ExitOnFailure(hr, "WixQueryOsDirs failed to initialize"); - - // get the paths of the CSIDLs that represent real paths and for which MSI - // doesn't yet have standard folder properties - WCHAR path[MAX_PATH]; - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_ADMINTOOLS, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_ADMINTOOLS", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_ALTSTARTUP, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_ALTSTARTUP", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_CDBURN_AREA, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_CDBURN_AREA", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_ADMINTOOLS, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_ADMINTOOLS", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_ALTSTARTUP, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_ALTSTARTUP", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_DOCUMENTS", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_FAVORITES", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_MUSIC, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_MUSIC", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_PICTURES, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_PICTURES", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_VIDEO, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COMMON_VIDEO", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COOKIES, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_COOKIES", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_DESKTOP", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_HISTORY, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_HISTORY", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_INTERNET_CACHE, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_INTERNET_CACHE", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYMUSIC, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_MYMUSIC", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_MYPICTURES", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYVIDEO, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_MYVIDEO", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_NETHOOD, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_NETHOOD", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_PERSONAL", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PRINTHOOD, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_PRINTHOOD", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_PROFILE", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_RECENT", path); - } - - if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_RESOURCES, NULL, SHGFP_TYPE_CURRENT, path)) - { - WcaSetProperty(L"WIX_DIR_RESOURCES", path); - } - -LExit: - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** -SetPropertyWellKnownSID - - Set a property with the localized name of a well known windows SID -********************************************************************/ -static HRESULT SetPropertyWellKnownSID( - __in WELL_KNOWN_SID_TYPE sidType, - __in LPCWSTR wzPropertyName, - __in BOOL fIncludeDomainName - ) -{ - HRESULT hr = S_OK; - PSID psid = NULL; - WCHAR wzRefDomain[MAX_PATH] = {0}; - SID_NAME_USE nameUse; - DWORD refSize = MAX_PATH; - WCHAR wzName[MAX_PATH] = {0}; - LPWSTR pwzPropertyValue = NULL; - DWORD size = MAX_PATH; - - hr = AclGetWellKnownSid(sidType, &psid); - ExitOnFailure(hr, "Failed to get SID; skipping account %ls", wzPropertyName); - - if (!::LookupAccountSidW(NULL, psid, wzName, &size, wzRefDomain, &refSize, &nameUse)) - { - ExitWithLastError(hr, "Failed to look up account for SID; skipping account %ls.", wzPropertyName); - } - - if (fIncludeDomainName) - { - hr = StrAllocFormatted(&pwzPropertyValue, L"%s\\%s", wzRefDomain, wzName); - ExitOnFailure(hr, "Failed to format property value"); - - hr = WcaSetProperty(wzPropertyName, pwzPropertyValue); - ExitOnFailure(hr, "Failed write domain\\name property"); - } - else - { - hr = WcaSetProperty(wzPropertyName, wzName); - ExitOnFailure(hr, "Failed write to name-only property"); - } - -LExit: - if (NULL != psid) - { - ::LocalFree(psid); - } - ReleaseStr(pwzPropertyValue); - return hr; -} - -/******************************************************************** -WixQueryOsWellKnownSID - entry point for WixQueryOsWellKnownSID custom action - - Called as Type 1 custom action (DLL from the Binary table) from - Windows Installer to set properties with the localized names of built-in - Windows Security IDs -********************************************************************/ -extern "C" UINT __stdcall WixQueryOsWellKnownSID( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixQueryOsWellKnownSID"); - ExitOnFailure(hr, "WixQueryOsWellKnownSID failed to initialize"); - - SetPropertyWellKnownSID(WinLocalSystemSid, L"WIX_ACCOUNT_LOCALSYSTEM", TRUE); - SetPropertyWellKnownSID(WinLocalServiceSid, L"WIX_ACCOUNT_LOCALSERVICE", TRUE); - SetPropertyWellKnownSID(WinNetworkServiceSid, L"WIX_ACCOUNT_NETWORKSERVICE", TRUE); - SetPropertyWellKnownSID(WinBuiltinAdministratorsSid, L"WIX_ACCOUNT_ADMINISTRATORS", TRUE); - SetPropertyWellKnownSID(WinBuiltinUsersSid, L"WIX_ACCOUNT_USERS", TRUE); - SetPropertyWellKnownSID(WinBuiltinGuestsSid, L"WIX_ACCOUNT_GUESTS", TRUE); - SetPropertyWellKnownSID(WinBuiltinPerfLoggingUsersSid, L"WIX_ACCOUNT_PERFLOGUSERS", TRUE); - SetPropertyWellKnownSID(WinBuiltinPerfLoggingUsersSid, L"WIX_ACCOUNT_PERFLOGUSERS_NODOMAIN", FALSE); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - - -/******************************************************************** -DetectWDDMDriver - - Set a property if the driver on the machine is a WDDM driver. One - reliable way to detect the presence of a WDDM driver is to try and - use the Direct3DCreate9Ex() function. This method attempts that - then sets the property appropriately. -********************************************************************/ -static HRESULT DetectWDDMDriver() -{ - HRESULT hr = S_OK; - HMODULE hModule = NULL; - - // Manually load the d3d9.dll library. If the library couldn't be loaded then we obviously won't be able - // to try calling the function so just return. - hr = LoadSystemLibrary(L"d3d9.dll", &hModule); - if (E_MODNOTFOUND == hr) - { - TraceError(hr, "Unable to load DirectX APIs, skipping WDDM driver check."); - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to the load the existing DirectX APIs."); - - // Obtain the address of the Direct3DCreate9Ex function. If this fails we know it isn't a WDDM - // driver so just exit. - const void* Direct3DCreate9ExPtr = ::GetProcAddress(hModule, "Direct3DCreate9Ex"); - ExitOnNull(Direct3DCreate9ExPtr, hr, S_OK, "Unable to load Direct3DCreateEx function, so the driver is not a WDDM driver."); - - // At this point we know it's a WDDM driver so set the property. - hr = WcaSetIntProperty(L"WIX_WDDM_DRIVER_PRESENT", 1); - ExitOnFailure(hr, "Failed write property"); - -LExit: - if (NULL != hModule) - { - FreeLibrary(hModule); - } - - return hr; -} - -/******************************************************************** -DetectIsCompositionEnabled - - Set a property based on the return value of DwmIsCompositionEnabled(). -********************************************************************/ -static HRESULT DetectIsCompositionEnabled() -{ - HRESULT hr = S_OK; - HMODULE hModule = NULL; - BOOL compositionState = false; - - // Manually load the d3d9.dll library. If the library can't load it's likely because we are not on a Vista - // OS. Just return ok, and the property won't get set. - hr = LoadSystemLibrary(L"dwmapi.dll", &hModule); - if (E_MODNOTFOUND == hr) - { - TraceError(hr, "Unable to load Vista desktop window manager APIs, skipping Composition Enabled check."); - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to load the existing window manager APIs."); - - // If for some reason we can't get the function pointer that's ok, just return. - typedef HRESULT (WINAPI *DWMISCOMPOSITIONENABLEDPTR)(BOOL*); - DWMISCOMPOSITIONENABLEDPTR DwmIsCompositionEnabledPtr = (DWMISCOMPOSITIONENABLEDPTR)::GetProcAddress(hModule, "DwmIsCompositionEnabled"); - ExitOnNull(hModule, hr, S_OK, "Unable to obtain function information, skipping Composition Enabled check."); - - hr = DwmIsCompositionEnabledPtr(&compositionState); - ExitOnFailure(hr, "Failed to retrieve Composition state"); - - if (compositionState) - { - hr = WcaSetIntProperty(L"WIX_DWM_COMPOSITION_ENABLED", 1); - ExitOnFailure(hr, "Failed write property"); - } - -LExit: - if (NULL != hModule) - { - FreeLibrary(hModule); - } - return hr; -} - -/******************************************************************** -WixQueryOsDriverInfo - entry point for WixQueryOsDriverInfo custom action - - Called as Type 1 custom action (DLL from the Binary table) from - Windows Installer to set properties about drivers installed on - the target machine -********************************************************************/ -extern "C" UINT __stdcall WixQueryOsDriverInfo( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixQueryOsDriverInfo"); - ExitOnFailure(hr, "WixQueryOsDriverInfo failed to initialize"); - - // Detect the WDDM driver status - hr = DetectWDDMDriver(); - ExitOnFailure(hr, "Failed to detect WIX_WDDM_DRIVER_PRESENT"); - - // Detect whether composition is enabled - hr = DetectIsCompositionEnabled(); - ExitOnFailure(hr, "Failed to detect WIX_DWM_COMPOSITION_ENABLED"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} diff --git a/src/ca/RemoveFoldersEx.cpp b/src/ca/RemoveFoldersEx.cpp deleted file mode 100644 index cbc7f4bb..00000000 --- a/src/ca/RemoveFoldersEx.cpp +++ /dev/null @@ -1,243 +0,0 @@ -// 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" - -LPCWSTR vcsRemoveFolderExQuery = - L"SELECT `Wix4RemoveFolderEx`, `Component_`, `Property`, `InstallMode`, `WixRemoveFolderEx`.`Condition`, `Component`.`Attributes`" - L"FROM `Wix4RemoveFolderEx``,`Component` " - L"WHERE `Wix4RemoveFolderEx`.`Component_`=`Component`.`Component`"; -enum eRemoveFolderExQuery { rfqId = 1, rfqComponent, rfqProperty, rfqMode, rfqCondition, rfqComponentAttributes }; - -static HRESULT RecursePath( - __in_z LPCWSTR wzPath, - __in_z LPCWSTR wzId, - __in_z LPCWSTR wzComponent, - __in_z LPCWSTR wzProperty, - __in int iMode, - __in BOOL fDisableWow64Redirection, - __inout DWORD* pdwCounter, - __inout MSIHANDLE* phTable, - __inout MSIHANDLE* phColumns - ) -{ - HRESULT hr = S_OK; - DWORD er; - LPWSTR sczSearch = NULL; - LPWSTR sczProperty = NULL; - HANDLE hFind = INVALID_HANDLE_VALUE; - WIN32_FIND_DATAW wfd; - LPWSTR sczNext = NULL; - - if (fDisableWow64Redirection) - { - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); - } - - // First recurse down to all the child directories. - hr = StrAllocFormatted(&sczSearch, L"%s*", wzPath); - ExitOnFailure(hr, "Failed to allocate file search string in path: %S", wzPath); - - hFind = ::FindFirstFileW(sczSearch, &wfd); - if (INVALID_HANDLE_VALUE == hFind) - { - er = ::GetLastError(); - if (ERROR_PATH_NOT_FOUND == er) - { - WcaLog(LOGMSG_STANDARD, "Search path not found: %ls; skipping", sczSearch); - ExitFunction1(hr = S_FALSE); - } - else - { - hr = HRESULT_FROM_WIN32(er); - } - ExitOnFailure(hr, "Failed to find all files in path: %S", wzPath); - } - - do - { - // Skip files and the dot directories. - if (FILE_ATTRIBUTE_DIRECTORY != (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || L'.' == wfd.cFileName[0] && (L'\0' == wfd.cFileName[1] || (L'.' == wfd.cFileName[1] && L'\0' == wfd.cFileName[2]))) - { - continue; - } - - hr = StrAllocFormatted(&sczNext, L"%s%s\\", wzPath, wfd.cFileName); - ExitOnFailure(hr, "Failed to concat filename '%S' to string: %S", wfd.cFileName, wzPath); - - // Don't re-disable redirection; if it was necessary, we've already done it. - hr = RecursePath(sczNext, wzId, wzComponent, wzProperty, iMode, FALSE, pdwCounter, phTable, phColumns); - ExitOnFailure(hr, "Failed to recurse path: %S", sczNext); - } while (::FindNextFileW(hFind, &wfd)); - - er = ::GetLastError(); - if (ERROR_NO_MORE_FILES == er) - { - hr = S_OK; - } - else - { - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed while looping through files in directory: %S", wzPath); - } - - // Finally, set a property that points at our path. - hr = StrAllocFormatted(&sczProperty, L"_%s_%u", wzProperty, *pdwCounter); - ExitOnFailure(hr, "Failed to allocate Property for RemoveFile table with property: %S.", wzProperty); - - ++(*pdwCounter); - - hr = WcaSetProperty(sczProperty, wzPath); - ExitOnFailure(hr, "Failed to set Property: %S with path: %S", sczProperty, wzPath); - - // Add the row to remove any files and another row to remove the folder. - hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFiles", wzComponent, L"*.*", sczProperty, iMode); - ExitOnFailure(hr, "Failed to add row to remove all files for Wix4RemoveFolderEx row: %ls under path: %ls", wzId, wzPath); - - hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFolder", wzComponent, NULL, sczProperty, iMode); - ExitOnFailure(hr, "Failed to add row to remove folder for Wix4RemoveFolderEx row: %ls under path: %ls", wzId, wzPath); - -LExit: - if (INVALID_HANDLE_VALUE != hFind) - { - ::FindClose(hFind); - } - - if (fDisableWow64Redirection) - { - WcaRevertWow64FSRedirection(); - } - - ReleaseStr(sczNext); - ReleaseStr(sczProperty); - ReleaseStr(sczSearch); - return hr; -} - -extern "C" UINT WINAPI WixRemoveFoldersEx( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug WixRemoveFoldersEx"); - - HRESULT hr = S_OK; - PMSIHANDLE hView; - PMSIHANDLE hRec; - LPWSTR sczId = NULL; - LPWSTR sczComponent = NULL; - LPWSTR sczProperty = NULL; - LPWSTR sczCondition = NULL; - LPWSTR sczPath = NULL; - LPWSTR sczExpandedPath = NULL; - int iMode = 0; - int iComponentAttributes; - BOOL f64BitComponent = FALSE; - DWORD dwCounter = 0; - DWORD_PTR cchLen = 0; - MSIHANDLE hTable = NULL; - MSIHANDLE hColumns = NULL; - - hr = WcaInitialize(hInstall, "WixRemoveFoldersEx"); - ExitOnFailure(hr, "Failed to initialize WixRemoveFoldersEx."); - - WcaInitializeWow64(); - - // anything to do? - if (S_OK != WcaTableExists(L"Wix4RemoveFolderEx")) - { - WcaLog(LOGMSG_STANDARD, "Wix4RemoveFolderEx table doesn't exist, so there are no folders to remove."); - ExitFunction(); - } - - // query and loop through all the remove folders exceptions - hr = WcaOpenExecuteView(vcsRemoveFolderExQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4RemoveFolderEx table"); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, rfqId, &sczId); - ExitOnFailure(hr, "Failed to get remove folder identity."); - - hr = WcaGetRecordString(hRec, rfqCondition, &sczCondition); - ExitOnFailure(hr, "Failed to get remove folder condition."); - - if (sczCondition && *sczCondition) - { - MSICONDITION condition = ::MsiEvaluateConditionW(hInstall, sczCondition); - if (MSICONDITION_TRUE == condition) - { - WcaLog(LOGMSG_STANDARD, "True condition for row %S: %S; processing.", sczId, sczCondition); - } - else - { - WcaLog(LOGMSG_STANDARD, "False or invalid condition for row %S: %S; skipping.", sczId, sczCondition); - continue; - } - } - - hr = WcaGetRecordString(hRec, rfqComponent, &sczComponent); - ExitOnFailure(hr, "Failed to get remove folder component."); - - hr = WcaGetRecordString(hRec, rfqProperty, &sczProperty); - ExitOnFailure(hr, "Failed to get remove folder property."); - - hr = WcaGetRecordInteger(hRec, rfqMode, &iMode); - ExitOnFailure(hr, "Failed to get remove folder mode"); - - hr = WcaGetProperty(sczProperty, &sczPath); - ExitOnFailure(hr, "Failed to resolve remove folder property: %S for row: %S", sczProperty, sczId); - - hr = WcaGetRecordInteger(hRec, rfqComponentAttributes, &iComponentAttributes); - ExitOnFailure(hr, "failed to get component attributes for row: %ls", sczId); - - f64BitComponent = iComponentAttributes & msidbComponentAttributes64bit; - - // fail early if the property isn't set as you probably don't want your installers trying to delete SystemFolder - // StringCchLengthW succeeds only if the string is zero characters plus 1 for the terminating null - hr = ::StringCchLengthW(sczPath, 1, reinterpret_cast(&cchLen)); - if (SUCCEEDED(hr)) - { - ExitOnFailure(hr = E_INVALIDARG, "Missing folder property: %S for row: %S", sczProperty, sczId); - } - - hr = PathExpand(&sczExpandedPath, sczPath, PATH_EXPAND_ENVIRONMENT); - ExitOnFailure(hr, "Failed to expand path: %S for row: %S", sczPath, sczId); - - hr = PathBackslashTerminate(&sczExpandedPath); - ExitOnFailure(hr, "Failed to backslash-terminate path: %S", sczExpandedPath); - - WcaLog(LOGMSG_STANDARD, "Recursing path: %S for row: %S.", sczExpandedPath, sczId); - hr = RecursePath(sczExpandedPath, sczId, sczComponent, sczProperty, iMode, f64BitComponent, &dwCounter, &hTable, &hColumns); - ExitOnFailure(hr, "Failed while navigating path: %S for row: %S", sczPath, sczId); - } - - // reaching the end of the list is actually a good thing, not an error - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure occured while processing Wix4RemoveFolderEx table"); - -LExit: - WcaFinalizeWow64(); - - if (hColumns) - { - ::MsiCloseHandle(hColumns); - } - - if (hTable) - { - ::MsiCloseHandle(hTable); - } - - ReleaseStr(sczExpandedPath); - ReleaseStr(sczPath); - ReleaseStr(sczProperty); - ReleaseStr(sczComponent); - ReleaseStr(sczCondition); - ReleaseStr(sczId); - - DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} diff --git a/src/ca/RemoveRegistryKeysEx.cpp b/src/ca/RemoveRegistryKeysEx.cpp deleted file mode 100644 index 478c0779..00000000 --- a/src/ca/RemoveRegistryKeysEx.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// 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" - -LPCWSTR vcsRemoveRegistryKeyExQuery = - L"SELECT `Wix4RemoveRegistryKeyEx`, `Component_`, `Root`, `Key`, `InstallMode`, `Condition` FROM `Wix4RemoveRegistryKeyEx`"; -enum eRemoveRegistryKeyExQuery { rrxqId = 1, rrxqComponent, rrxqRoot, rrxqKey, rrxqMode, rrxqCondition }; - -extern "C" UINT WINAPI WixRemoveRegistryKeysEx( - __in MSIHANDLE hInstall -) -{ - //AssertSz(FALSE, "debug WixRemoveRegistryKeyEx"); - - HRESULT hr = S_OK; - PMSIHANDLE hView; - PMSIHANDLE hRec; - LPWSTR sczId = NULL; - LPWSTR sczComponent = NULL; - LPWSTR sczCondition = NULL; - LPWSTR sczKey = NULL; - int iRoot = 0; - int iMode = 0; - MSIHANDLE hTable = NULL; - MSIHANDLE hColumns = NULL; - - hr = WcaInitialize(hInstall, __FUNCTION__); - ExitOnFailure(hr, "Failed to initialize " __FUNCTION__); - - // anything to do? - if (S_OK != WcaTableExists(L"Wix4RemoveRegistryKeyEx")) - { - WcaLog(LOGMSG_STANDARD, "Wix4RemoveRegistryKeyEx table doesn't exist, so there are no registry keys to remove."); - ExitFunction(); - } - - hr = WcaOpenExecuteView(vcsRemoveRegistryKeyExQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4RemoveRegistryKeyEx table"); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, rrxqId, &sczId); - ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx identity."); - - hr = WcaGetRecordString(hRec, rrxqCondition, &sczCondition); - ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx condition."); - - if (sczCondition && *sczCondition) - { - MSICONDITION condition = ::MsiEvaluateConditionW(hInstall, sczCondition); - if (MSICONDITION_TRUE == condition) - { - WcaLog(LOGMSG_STANDARD, "True condition for row %S: %S; processing.", sczId, sczCondition); - } - else - { - WcaLog(LOGMSG_STANDARD, "False or invalid condition for row %S: %S; skipping.", sczId, sczCondition); - continue; - } - } - - hr = WcaGetRecordString(hRec, rrxqComponent, &sczComponent); - ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx component."); - - hr = WcaGetRecordInteger(hRec, rrxqRoot, &iRoot); - ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx root."); - - hr = WcaGetRecordString(hRec, rrxqKey, &sczKey); - ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx key."); - - hr = WcaGetRecordInteger(hRec, rrxqMode, &iMode); - ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx mode."); - - switch (iMode) - { - case 1: // remove on install - WcaLog(LOGMSG_STANDARD, "Adding RemoveRegistry row: %ls/%d/%ls/-/%ls", sczId, iRoot, sczKey, sczComponent); - hr = WcaAddTempRecord(&hTable, &hColumns, L"RemoveRegistry", NULL, 0, 5, sczId, iRoot, sczKey, L"-", sczComponent); - ExitOnFailure(hr, "Failed to add RemoveRegistry row for remove-on-install Wix4RemoveRegistryKeyEx row: %ls:", sczId); - break; - case 2: // remove on uninstall - WcaLog(LOGMSG_STANDARD, "Adding Registry row: %ls/%d/%ls/-/null/%ls", sczId, iRoot, sczKey, sczComponent); - hr = WcaAddTempRecord(&hTable, &hColumns, L"Registry", NULL, 0, 6, sczId, iRoot, sczKey, L"-", NULL, sczComponent); - ExitOnFailure(hr, "Failed to add Registry row for remove-on-uninstall Wix4RemoveRegistryKeyEx row: %ls:", sczId); - break; - } - } - - // reaching the end of the list is actually a good thing, not an error - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure occured while processing Wix4RemoveRegistryKeyEx table."); - -LExit: - if (hColumns) - { - ::MsiCloseHandle(hColumns); - } - - if (hTable) - { - ::MsiCloseHandle(hTable); - } - - ReleaseStr(sczKey); - ReleaseStr(sczComponent); - ReleaseStr(sczCondition); - ReleaseStr(sczId); - - DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} diff --git a/src/ca/RestartManager.cpp b/src/ca/RestartManager.cpp deleted file mode 100644 index c31819c1..00000000 --- a/src/ca/RestartManager.cpp +++ /dev/null @@ -1,185 +0,0 @@ -// 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" -#include - -// Include space for the terminating null. -#define CCH_SESSION_KEY CCH_RM_SESSION_KEY + 1 - -enum eRmuResourceType -{ - etInvalid, - etFilename, - etApplication, - etServiceName, - - // Mask types from Attributes. - etTypeMask = 0xf, -}; - -LPCWSTR vcsRestartResourceQuery = - L"SELECT `Wix4RestartResource`.`Wix4RestartResource`, `Wix4RestartResource`.`Component_`, `Wix4RestartResource`.`Resource`, `Wix4RestartResource`.`Attributes` " - L"FROM `Wix4RestartResource`"; -enum eRestartResourceQuery { rrqRestartResource = 1, rrqComponent, rrqResource, rrqAttributes }; - -/******************************************************************** -WixRegisterRestartResources - Immediate CA to register resources with RM. - -Enumerates components before InstallValidate and registers resources -to be restarted by Restart Manager if the component action -is anything other than None. - -Do not disable file system redirection. - -********************************************************************/ -extern "C" UINT __stdcall WixRegisterRestartResources( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - LPWSTR wzSessionKey = NULL; - size_t cchSessionKey = 0; - PRMU_SESSION pSession = NULL; - - LPWSTR wzRestartResource = NULL; - LPWSTR wzComponent = NULL; - LPWSTR wzResource = NULL; - int iAttributes = NULL; - BOOL fIsComponentNull = FALSE; - WCA_TODO todo = WCA_TODO_UNKNOWN; - int iType = etInvalid; - - hr = WcaInitialize(hInstall, "WixRegisterRestartResources"); - ExitOnFailure(hr, "Failed to initialize."); - - // Skip if the table doesn't exist. - if (S_OK != WcaTableExists(L"Wix4RestartResource")) - { - WcaLog(LOGMSG_STANDARD, "The Wix4RestartResource table does not exist; there are no resources to register with Restart Manager."); - ExitFunction(); - } - - // Get the existing Restart Manager session if available. - hr = WcaGetProperty(L"MsiRestartManagerSessionKey", &wzSessionKey); - ExitOnFailure(hr, "Failed to get the MsiRestartManagerSessionKey property."); - - hr = ::StringCchLengthW(wzSessionKey, CCH_SESSION_KEY, &cchSessionKey); - ExitOnFailure(hr, "Failed to get the MsiRestartManagerSessionKey string length."); - - // Skip if the property doesn't exist. - if (0 == cchSessionKey) - { - WcaLog(LOGMSG_STANDARD, "The MsiRestartManagerSessionKey property is not available to join."); - ExitFunction(); - } - - // Join the existing Restart Manager session if supported. - hr = RmuJoinSession(&pSession, wzSessionKey); - if (E_MODNOTFOUND == hr) - { - WcaLog(LOGMSG_STANDARD, "The Restart Manager is not supported on this platform. Skipping."); - ExitFunction1(hr = S_OK); - } - else if (FAILED(hr)) - { - WcaLog(LOGMSG_STANDARD, "Failed to join the existing Restart Manager session %ls.", wzSessionKey); - ExitFunction1(hr = S_OK); - } - - // Loop through each record in the table. - hr = WcaOpenExecuteView(vcsRestartResourceQuery, &hView); - ExitOnFailure(hr, "Failed to open a view on the RestartResource table."); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, rrqRestartResource, &wzRestartResource); - ExitOnFailure(hr, "Failed to get the RestartResource field value."); - - hr = WcaGetRecordString(hRec, rrqComponent, &wzComponent); - ExitOnFailure(hr, "Failed to get the Component_ field value."); - - hr = WcaGetRecordFormattedString(hRec, rrqResource, &wzResource); - ExitOnFailure(hr, "Failed to get the Resource formatted field value."); - - hr = WcaGetRecordInteger(hRec, rrqAttributes, &iAttributes); - ExitOnFailure(hr, "Failed to get the Attributes field value."); - - fIsComponentNull = ::MsiRecordIsNull(hRec, rrqComponent); - todo = WcaGetComponentToDo(wzComponent); - - // Only register resources for components that are null, or being installed, reinstalled, or uninstalled. - if (!fIsComponentNull && WCA_TODO_UNKNOWN == todo) - { - WcaLog(LOGMSG_VERBOSE, "Skipping resource %ls.", wzRestartResource); - continue; - } - - // Get the type from Attributes and add to the Restart Manager. - iType = iAttributes & etTypeMask; - switch (iType) - { - case etFilename: - WcaLog(LOGMSG_VERBOSE, "Registering file name %ls with the Restart Manager.", wzResource); - hr = RmuAddFile(pSession, wzResource); - ExitOnFailure(hr, "Failed to register the file name with the Restart Manager session."); - break; - - case etApplication: - WcaLog(LOGMSG_VERBOSE, "Registering process name %ls with the Restart Manager.", wzResource); - hr = RmuAddProcessesByName(pSession, wzResource); - if (E_NOTFOUND == hr) - { - // ERROR_ACCESS_DENIED was returned when trying to register this process. - // Since other instances may have been registered, log a message and continue the setup rather than failing. - WcaLog(LOGMSG_STANDARD, "The process, %ls, could not be registered with the Restart Manager (probably because the setup is not elevated and the process is in another user context). A reboot may be requested later.", wzResource); - hr = S_OK; - } - else - { - ExitOnFailure(hr, "Failed to register the process name with the Restart Manager session."); - } - break; - - case etServiceName: - WcaLog(LOGMSG_VERBOSE, "Registering service name %ls with the Restart Manager.", wzResource); - hr = RmuAddService(pSession, wzResource); - ExitOnFailure(hr, "Failed to register the service name with the Restart Manager session."); - break; - - default: - WcaLog(LOGMSG_VERBOSE, "The resource type %d for %ls is not supported and will not be registered.", iType, wzRestartResource); - break; - } - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failed while looping through all rows to register resources."); - - // Register the resources and unjoin the session. - hr = RmuEndSession(pSession); - if (FAILED(hr)) - { - WcaLog(LOGMSG_VERBOSE, "Failed to register the resources with the Restart Manager."); - ExitFunction1(hr = S_OK); - } - -LExit: - ReleaseStr(wzRestartResource); - ReleaseStr(wzComponent); - ReleaseStr(wzResource); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} diff --git a/src/ca/TouchFile.cpp b/src/ca/TouchFile.cpp deleted file mode 100644 index e704f922..00000000 --- a/src/ca/TouchFile.cpp +++ /dev/null @@ -1,308 +0,0 @@ -// 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" - -LPCWSTR vcsTouchFileQuery = L"SELECT `Wix4TouchFile`, `Component_`, `Path`, `Attributes` FROM `Wix4TouchFile`"; -enum TOUCH_FILE_QUERY { tfqId = 1, tfqComponent, tfqPath, tfqTouchFileAttributes }; - -enum TOUCH_FILE_ATTRIBUTE -{ - TOUCH_FILE_ATTRIBUTE_ON_INSTALL = 0x01, - TOUCH_FILE_ATTRIBUTE_ON_REINSTALL = 0x02, - TOUCH_FILE_ATTRIBUTE_ON_UNINSTALL = 0x04, - TOUCH_FILE_ATTRIBUTE_64BIT = 0x10, - TOUCH_FILE_ATTRIBUTE_VITAL = 0x20 -}; - - -static BOOL SetExistingFileModifiedTime( - __in_z LPCWSTR wzId, - __in_z LPCWSTR wzPath, - __in BOOL f64Bit, - __in FILETIME* pftModified - ) -{ - HRESULT hr = S_OK; - BOOL fReenableFileSystemRedirection = FALSE; - - if (f64Bit) - { - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Failed to disable 64-bit file system redirection to path: '%ls' for: %ls", wzPath, wzId); - - fReenableFileSystemRedirection = TRUE; - } - - hr = FileSetTime(wzPath, NULL, NULL, pftModified); - -LExit: - if (fReenableFileSystemRedirection) - { - WcaRevertWow64FSRedirection(); - } - - return SUCCEEDED(hr); -} - - -static HRESULT AddDataToCustomActionData( - __deref_inout_z LPWSTR* psczCustomActionData, - __in_z LPCWSTR wzId, - __in_z LPCWSTR wzPath, - __in int iTouchFileAttributes, - __in FILETIME ftModified - ) -{ - HRESULT hr = S_OK; - - hr = WcaWriteStringToCaData(wzId, psczCustomActionData); - ExitOnFailure(hr, "Failed to add touch file identity to custom action data."); - - hr = WcaWriteStringToCaData(wzPath, psczCustomActionData); - ExitOnFailure(hr, "Failed to add touch file path to custom action data."); - - hr = WcaWriteIntegerToCaData(iTouchFileAttributes, psczCustomActionData); - ExitOnFailure(hr, "Failed to add touch file attributes to custom action data."); - - hr = WcaWriteIntegerToCaData(ftModified.dwHighDateTime, psczCustomActionData); - ExitOnFailure(hr, "Failed to add touch file high date/time to custom action data."); - - hr = WcaWriteIntegerToCaData(ftModified.dwLowDateTime, psczCustomActionData); - ExitOnFailure(hr, "Failed to add touch file low date/time to custom action data."); - -LExit: - return hr; -} - - -static BOOL TryGetExistingFileModifiedTime( - __in_z LPCWSTR wzId, - __in_z LPCWSTR wzPath, - __in BOOL f64Bit, - __inout FILETIME* pftModified - ) -{ - HRESULT hr = S_OK; - BOOL fReenableFileSystemRedirection = FALSE; - - if (f64Bit) - { - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Failed to disable 64-bit file system redirection to path: '%ls' for: %ls", wzPath, wzId); - - fReenableFileSystemRedirection = TRUE; - } - - hr = FileGetTime(wzPath, NULL, NULL, pftModified); - if (E_PATHNOTFOUND == hr || E_FILENOTFOUND == hr) - { - // If the file doesn't exist yet there is nothing to rollback (i.e. file will probably be removed during rollback), so - // keep the error code but don't log anything. - } - else if (FAILED(hr)) - { - WcaLog(LOGMSG_STANDARD, "Cannot access modified timestamp for file: '%ls' due to error: 0x%x. Continuing with out rollback for: %ls", wzPath, hr, wzId); - } - -LExit: - if (fReenableFileSystemRedirection) - { - WcaRevertWow64FSRedirection(); - } - - return SUCCEEDED(hr); -} - - -static HRESULT ProcessTouchFileTable( - __in BOOL fInstalling - ) -{ - HRESULT hr = S_OK; - - FILETIME ftModified = {}; - - PMSIHANDLE hView; - PMSIHANDLE hRec; - - LPWSTR sczId = NULL; - LPWSTR sczComponent = NULL; - int iTouchFileAttributes = 0; - LPWSTR sczPath = NULL; - - FILETIME ftRollbackModified = {}; - LPWSTR sczRollbackData = NULL; - LPWSTR sczExecuteData = NULL; - - if (S_OK != WcaTableExists(L"Wix4TouchFile")) - { - ExitFunction(); - } - - ::GetSystemTimeAsFileTime(&ftModified); - - hr = WcaOpenExecuteView(vcsTouchFileQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4TouchFile table"); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, tfqId, &sczId); - ExitOnFailure(hr, "Failed to get touch file identity."); - - hr = WcaGetRecordString(hRec, tfqComponent, &sczComponent); - ExitOnFailure(hr, "Failed to get touch file component for: %ls", sczId); - - hr = WcaGetRecordInteger(hRec, tfqTouchFileAttributes, &iTouchFileAttributes); - ExitOnFailure(hr, "Failed to get touch file attributes for: %ls", sczId); - - WCA_TODO todo = WcaGetComponentToDo(sczComponent); - - BOOL fOnInstall = fInstalling && WCA_TODO_INSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_INSTALL); - BOOL fOnReinstall = fInstalling && WCA_TODO_REINSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_REINSTALL); - BOOL fOnUninstall = !fInstalling && WCA_TODO_UNINSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_UNINSTALL); - - if (fOnInstall || fOnReinstall || fOnUninstall) - { - hr = WcaGetRecordFormattedString(hRec, tfqPath, &sczPath); - ExitOnFailure(hr, "Failed to get touch file path for: %ls", sczId); - - if (TryGetExistingFileModifiedTime(sczId, sczPath, (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_64BIT), &ftRollbackModified)) - { - hr = AddDataToCustomActionData(&sczRollbackData, sczId, sczPath, iTouchFileAttributes, ftRollbackModified); - ExitOnFailure(hr, "Failed to add to rollback custom action data for: %ls", sczId); - } - - hr = AddDataToCustomActionData(&sczExecuteData, sczId, sczPath, iTouchFileAttributes, ftModified); - ExitOnFailure(hr, "Failed to add to execute custom action data for: %ls", sczId); - } - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure occured while processing Wix4TouchFile table"); - - if (sczRollbackData) - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackTouchFile"), sczRollbackData, 0); - ExitOnFailure(hr, "Failed to schedule RollbackTouchFile"); - } - - if (sczExecuteData) - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecuteTouchFile"), sczExecuteData, 0); - ExitOnFailure(hr, "Failed to schedule ExecuteTouchFile"); - } - -LExit: - ReleaseStr(sczExecuteData); - ReleaseStr(sczRollbackData); - ReleaseStr(sczPath); - ReleaseStr(sczComponent); - ReleaseStr(sczId); - - return hr; -} - - -extern "C" UINT WINAPI WixTouchFileDuringInstall( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug WixTouchFileDuringInstall"); - - HRESULT hr = S_OK; - - hr = WcaInitialize(hInstall, "WixTouchFileDuringInstall"); - ExitOnFailure(hr, "Failed to initialize WixTouchFileDuringInstall."); - - hr = ProcessTouchFileTable(TRUE); - -LExit: - DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -extern "C" UINT WINAPI WixTouchFileDuringUninstall( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug WixTouchFileDuringUninstall"); - - HRESULT hr = S_OK; - - hr = WcaInitialize(hInstall, "WixTouchFileDuringUninstall"); - ExitOnFailure(hr, "Failed to initialize WixTouchFileDuringUninstall."); - - hr = ProcessTouchFileTable(FALSE); - -LExit: - DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -extern "C" UINT WINAPI WixExecuteTouchFile( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - - LPWSTR sczData = NULL; - LPWSTR pwz = NULL; - - LPWSTR sczId = NULL; - LPWSTR sczPath = NULL; - int iTouchFileAttributes = 0; - FILETIME ftModified = {}; - - hr = WcaInitialize(hInstall, "WixExecuteTouchFile"); - ExitOnFailure(hr, "Failed to initialize WixExecuteTouchFile."); - - hr = WcaGetProperty(L"CustomActionData", &sczData); - ExitOnFailure(hr, "Failed to get custom action data for WixExecuteTouchFile."); - - pwz = sczData; - - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &sczId); - ExitOnFailure(hr, "Failed to get touch file identity from custom action data."); - - hr = WcaReadStringFromCaData(&pwz, &sczPath); - ExitOnFailure(hr, "Failed to get touch file path from custom action data for: %ls", sczId); - - hr = WcaReadIntegerFromCaData(&pwz, &iTouchFileAttributes); - ExitOnFailure(hr, "Failed to get touch file attributes from custom action data for: %ls", sczId); - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&ftModified.dwHighDateTime)); - ExitOnFailure(hr, "Failed to get touch file high date/time from custom action data for: %ls", sczId); - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&ftModified.dwLowDateTime)); - ExitOnFailure(hr, "Failed to get touch file low date/time from custom action data for: %ls", sczId); - - hr = SetExistingFileModifiedTime(sczId, sczPath, (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_64BIT), &ftModified); - if (FAILED(hr)) - { - if (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_VITAL) - { - ExitOnFailure(hr, "Failed to touch file: '%ls' for: %ls", &sczPath, sczId); - } - else - { - WcaLog(LOGMSG_STANDARD, "Could not touch non-vital file: '%ls' for: %ls with error: 0x%x. Continuing...", sczPath, sczId, hr); - hr = S_OK; - } - } - } - -LExit: - ReleaseStr(sczPath); - ReleaseStr(sczId); - ReleaseStr(sczData); - - DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp deleted file mode 100644 index a1ec9d6f..00000000 --- a/src/ca/XmlConfig.cpp +++ /dev/null @@ -1,1130 +0,0 @@ -// 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" - -#define XMLCONFIG_ELEMENT 0x00000001 -#define XMLCONFIG_VALUE 0x00000002 -#define XMLCONFIG_DOCUMENT 0x00000004 -#define XMLCONFIG_CREATE 0x00000010 -#define XMLCONFIG_DELETE 0x00000020 -#define XMLCONFIG_INSTALL 0x00000100 -#define XMLCONFIG_UNINSTALL 0x00000200 -#define XMLCONFIG_PRESERVE_MODIFIED 0x00001000 - -enum eXmlAction -{ - xaUnknown = 0, - xaOpenFile, - xaOpenFilex64, - xaWriteValue, - xaWriteDocument, - xaDeleteValue, - xaCreateElement, - xaDeleteElement, -}; - -enum eXmlPreserveDate -{ - xdDontPreserve = 0, - xdPreserve -}; - -LPCWSTR vcsXmlConfigQuery = - L"SELECT `Wix4XmlConfig`.`Wix4XmlConfig`, `Wix4XmlConfig`.`File`, `Wix4XmlConfig`.`ElementId`, `Wix4XmlConfig`.`ElementPath`, `Wix4XmlConfig`.`VerifyPath`, `Wix4XmlConfig`.`Name`, " - L"`Wix4XmlConfig`.`Value`, `Wix4XmlConfig`.`Flags`, `Wix4XmlConfig`.`Component_`, `Component`.`Attributes` " - L"FROM `Wix4XmlConfig`,`Component` WHERE `Wix4XmlConfig`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; -enum eXmlConfigQuery { xfqXmlConfig = 1, xfqFile, xfqElementId, xfqElementPath, xfqVerifyPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; - -struct XML_CONFIG_CHANGE -{ - WCHAR wzId[MAX_DARWIN_KEY + 1]; - - WCHAR wzComponent[MAX_DARWIN_KEY + 1]; - INSTALLSTATE isInstalled; - INSTALLSTATE isAction; - - WCHAR wzFile[MAX_PATH]; - LPWSTR pwzElementId; - LPWSTR pwzElementPath; - LPWSTR pwzVerifyPath; - WCHAR wzName[MAX_DARWIN_COLUMN]; - LPWSTR pwzValue; - BOOL fInstalledFile; - - int iXmlFlags; - int iCompAttributes; - - XML_CONFIG_CHANGE* pxfcAdditionalChanges; - int cAdditionalChanges; - - XML_CONFIG_CHANGE* pxfcPrev; - XML_CONFIG_CHANGE* pxfcNext; -}; - -static HRESULT FreeXmlConfigChangeList( - __in_opt XML_CONFIG_CHANGE* pxfcList - ) -{ - HRESULT hr = S_OK; - - XML_CONFIG_CHANGE* pxfcDelete; - while(pxfcList) - { - pxfcDelete = pxfcList; - pxfcList = pxfcList->pxfcNext; - - if (pxfcDelete->pwzElementId) - { - hr = MemFree(pxfcDelete->pwzElementId); - ExitOnFailure(hr, "failed to free xml config element id in change list item"); - } - - if (pxfcDelete->pwzElementPath) - { - hr = MemFree(pxfcDelete->pwzElementPath); - ExitOnFailure(hr, "failed to free xml config element path in change list item"); - } - - if (pxfcDelete->pwzVerifyPath) - { - hr = MemFree(pxfcDelete->pwzVerifyPath); - ExitOnFailure(hr, "failed to free xml config verify path in change list item"); - } - - if (pxfcDelete->pwzValue) - { - hr = MemFree(pxfcDelete->pwzValue); - ExitOnFailure(hr, "failed to free xml config value in change list item"); - } - - hr = MemFree(pxfcDelete); - ExitOnFailure(hr, "failed to free xml config change list item"); - } - -LExit: - return hr; -} - -static HRESULT AddXmlConfigChangeToList( - __inout XML_CONFIG_CHANGE** ppxfcHead, - __inout XML_CONFIG_CHANGE** ppxfcTail - ) -{ - Assert(ppxfcHead && ppxfcTail); - - HRESULT hr = S_OK; - - XML_CONFIG_CHANGE* pxfc = static_cast(MemAlloc(sizeof(XML_CONFIG_CHANGE), TRUE)); - ExitOnNull(pxfc, hr, E_OUTOFMEMORY, "failed to allocate memory for new xml file change list element"); - - // Add it to the end of the list - if (NULL == *ppxfcHead) - { - *ppxfcHead = pxfc; - *ppxfcTail = pxfc; - } - else - { - Assert(*ppxfcTail && (*ppxfcTail)->pxfcNext == NULL); - (*ppxfcTail)->pxfcNext = pxfc; - pxfc->pxfcPrev = *ppxfcTail; - *ppxfcTail = pxfc; - } - -LExit: - return hr; -} - - -static HRESULT ReadXmlConfigTable( - __inout XML_CONFIG_CHANGE** ppxfcHead, - __inout XML_CONFIG_CHANGE** ppxfcTail - ) -{ - Assert(ppxfcHead && ppxfcTail); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - LPWSTR pwzData = NULL; - - // loop through all the xml configurations - hr = WcaOpenExecuteView(vcsXmlConfigQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4XmlConfig table"); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = AddXmlConfigChangeToList(ppxfcHead, ppxfcTail); - ExitOnFailure(hr, "failed to add xml file change to list"); - - // Get record Id - hr = WcaGetRecordString(hRec, xfqXmlConfig, &pwzData); - ExitOnFailure(hr, "failed to get Wix4XmlConfig record Id"); - hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); - ExitOnFailure(hr, "failed to copy Wix4XmlConfig record Id"); - - // Get component name - hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); - ExitOnFailure(hr, "failed to get component name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - - // Get the component's state - if (pwzData && *pwzData) - { - hr = StringCchCopyW((*ppxfcTail)->wzComponent, countof((*ppxfcTail)->wzComponent), pwzData); - ExitOnFailure(hr, "failed to copy component id"); - - er = ::MsiGetComponentStateW(WcaGetInstallHandle(), (*ppxfcTail)->wzComponent, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for component id"); - } - - // Get the xml file - hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); - ExitOnFailure(hr, "failed to get xml file for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); - ExitOnFailure(hr, "failed to copy xml file path"); - - // Figure out if the file is already on the machine or if it's being installed - hr = WcaGetRecordString(hRec, xfqFile, &pwzData); - ExitOnFailure(hr, "failed to get xml file for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - if (NULL != wcsstr(pwzData, L"[!") || NULL != wcsstr(pwzData, L"[#")) - { - (*ppxfcTail)->fInstalledFile = TRUE; - } - - // Get the Wix4XmlConfig table flags - hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); - ExitOnFailure(hr, "failed to get Wix4XmlConfig flags for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - - // Get the Element Id - hr = WcaGetRecordFormattedString(hRec, xfqElementId, &(*ppxfcTail)->pwzElementId); - ExitOnFailure(hr, "failed to get Element Id for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - - // Get the Element Path - hr = WcaGetRecordFormattedString(hRec, xfqElementPath, &(*ppxfcTail)->pwzElementPath); - ExitOnFailure(hr, "failed to get Element Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - - // Get the Verify Path - hr = WcaGetRecordFormattedString(hRec, xfqVerifyPath, &(*ppxfcTail)->pwzVerifyPath); - ExitOnFailure(hr, "failed to get Verify Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - - // Get the name - hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); - ExitOnFailure(hr, "failed to get Name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); - ExitOnFailure(hr, "failed to copy name of element"); - - // Get the value - hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); - ExitOnFailure(hr, "failed to get Value for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); - ExitOnFailure(hr, "failed to allocate buffer for value"); - - // Get the component attributes - hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); - ExitOnFailure(hr, "failed to get component attributes for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); - } - - // if we looped through all records all is well - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed while looping through all objects to secure"); - -LExit: - ReleaseStr(pwzData); - - return hr; -} - -static HRESULT ProcessChanges( - __inout XML_CONFIG_CHANGE** ppxfcHead - ) -{ - Assert(ppxfcHead && *ppxfcHead); - HRESULT hr = S_OK; - - XML_CONFIG_CHANGE* pxfc = NULL; - XML_CONFIG_CHANGE* pxfcNext = NULL; - XML_CONFIG_CHANGE* pxfcCheck = NULL; - int cAdditionalChanges = 0; - XML_CONFIG_CHANGE* pxfcLast = NULL; - - // If there's only one item in the list, none of this matters - if (pxfc && !pxfc->pxfcNext) - { - ExitFunction(); - } - - // Loop through the list - pxfc = *ppxfcHead; - while (pxfc) - { - // Keep track of where our next spot will be since our current node may be moved - pxfcNext = pxfc->pxfcNext; - - // With each node, check to see if it's element path matches the Id of some other node in the list - pxfcCheck = *ppxfcHead; - while (pxfcCheck) - { - if (pxfc->pwzElementId) - { - if (0 == lstrcmpW(pxfc->pwzElementId, pxfcCheck->wzId) - && 0 == pxfc->iXmlFlags - && XMLCONFIG_CREATE & pxfcCheck->iXmlFlags - && XMLCONFIG_ELEMENT & pxfcCheck->iXmlFlags) - { - // We found a match. First, take it out of the current list - if (pxfc->pxfcPrev) - { - pxfc->pxfcPrev->pxfcNext = pxfc->pxfcNext; - } - else // it was the head. Update the head - { - *ppxfcHead = pxfc->pxfcNext; - } - - if (pxfc->pxfcNext) - { - pxfc->pxfcNext->pxfcPrev = pxfc->pxfcPrev; - } - - pxfc->pxfcNext = NULL; - pxfc->pxfcPrev = NULL; - - // Now, add this node to the end of the matched node's additional changes list - if (!pxfcCheck->pxfcAdditionalChanges) - { - pxfcCheck->pxfcAdditionalChanges = pxfc; - pxfcCheck->cAdditionalChanges = 1; - } - else - { - pxfcLast = pxfcCheck->pxfcAdditionalChanges; - cAdditionalChanges = 1; - while (pxfcLast->pxfcNext) - { - pxfcLast = pxfcLast->pxfcNext; - ++cAdditionalChanges; - } - pxfcLast->pxfcNext = pxfc; - pxfc->pxfcPrev = pxfcLast; - pxfcCheck->cAdditionalChanges = ++cAdditionalChanges; - } - } - else - { - hr = E_NOTFOUND; - ExitOnRootFailure(hr, "failed to find matching ElementId: %ls", pxfc->pwzElementId); - } - } - - pxfcCheck = pxfcCheck->pxfcNext; - } - - pxfc = pxfcNext; - } - -LExit: - - return hr; -} - - -static HRESULT BeginChangeFile( - __in LPCWSTR pwzFile, - __in int iCompAttributes, - __inout LPWSTR* ppwzCustomActionData - ) -{ - Assert(pwzFile && *pwzFile && ppwzCustomActionData); - - HRESULT hr = S_OK; - BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; - - LPBYTE pbData = NULL; - SIZE_T cbData = 0; - - LPWSTR pwzRollbackCustomActionData = NULL; - - if (fIs64Bit) - { - hr = WcaWriteIntegerToCaData((int)xaOpenFilex64, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write 64-bit file indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xaOpenFile, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write file indicator to custom action data"); - } - - hr = WcaWriteStringToCaData(pwzFile, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write file to custom action data: %ls", pwzFile); - - // If the file already exits, then we have to put it back the way it was on failure - if (FileExistsEx(pwzFile, NULL)) - { - hr = FileRead(&pbData, &cbData, pwzFile); - ExitOnFailure(hr, "failed to read file: %ls", pwzFile); - - // Set up the rollback for this file - hr = WcaWriteIntegerToCaData((int)fIs64Bit, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to write component bitness to rollback custom action data"); - - hr = WcaWriteStringToCaData(pwzFile, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to write file name to rollback custom action data: %ls", pwzFile); - - hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlConfigRollback"), pwzRollbackCustomActionData, COST_XMLFILE); - ExitOnFailure(hr, "failed to schedule ExecXmlConfigRollback for file: %ls", pwzFile); - - ReleaseStr(pwzRollbackCustomActionData); - } -LExit: - ReleaseMem(pbData); - - return hr; -} - - -static HRESULT WriteChangeData( - __in XML_CONFIG_CHANGE* pxfc, - __in eXmlAction action, - __inout LPWSTR* ppwzCustomActionData - ) -{ - Assert(pxfc && ppwzCustomActionData); - - HRESULT hr = S_OK; - XML_CONFIG_CHANGE* pxfcAdditionalChanges = NULL; - LPCWSTR wzElementPath = pxfc->pwzElementId ? pxfc->pwzElementId : pxfc->pwzElementPath; - - hr = WcaWriteStringToCaData(wzElementPath, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", wzElementPath); - - hr = WcaWriteStringToCaData(pxfc->pwzVerifyPath, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write VerifyPath to custom action data: %ls", pxfc->pwzVerifyPath); - - hr = WcaWriteStringToCaData(pxfc->wzName, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); - - hr = WcaWriteStringToCaData(pxfc->pwzValue, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); - - if (pxfc->iXmlFlags & XMLCONFIG_CREATE && pxfc->iXmlFlags & XMLCONFIG_ELEMENT && xaCreateElement == action && pxfc->pxfcAdditionalChanges) - { - hr = WcaWriteIntegerToCaData(pxfc->cAdditionalChanges, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write additional changes value to custom action data"); - - pxfcAdditionalChanges = pxfc->pxfcAdditionalChanges; - while (pxfcAdditionalChanges) - { - Assert((0 == lstrcmpW(pxfcAdditionalChanges->wzComponent, pxfc->wzComponent)) && 0 == pxfcAdditionalChanges->iXmlFlags && (0 == lstrcmpW(pxfcAdditionalChanges->wzFile, pxfc->wzFile))); - - hr = WcaWriteStringToCaData(pxfcAdditionalChanges->wzName, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); - - hr = WcaWriteStringToCaData(pxfcAdditionalChanges->pwzValue, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); - - pxfcAdditionalChanges = pxfcAdditionalChanges->pxfcNext; - } - } - else - { - hr = WcaWriteIntegerToCaData(0, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write additional changes value to custom action data"); - } - -LExit: - return hr; -} - - -/****************************************************************** - SchedXmlConfig - entry point for XmlConfig Custom Action - -********************************************************************/ -extern "C" UINT __stdcall SchedXmlConfig( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug SchedXmlConfig"); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzCurrentFile = NULL; - BOOL fCurrentFileChanged = FALSE; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - XML_CONFIG_CHANGE* pxfcHead = NULL; - XML_CONFIG_CHANGE* pxfcTail = NULL; // TODO: do we need this any more? - XML_CONFIG_CHANGE* pxfc = NULL; - - eXmlAction xa = xaUnknown; - eXmlPreserveDate xd; - - LPWSTR pwzCustomActionData = NULL; - - DWORD cFiles = 0; - - // initialize - hr = WcaInitialize(hInstall, "SchedXmlConfig"); - ExitOnFailure(hr, "failed to initialize"); - - hr = ReadXmlConfigTable(&pxfcHead, &pxfcTail); - MessageExitOnFailure(hr, msierrXmlConfigFailedRead, "failed to read Wix4XmlConfig table"); - - hr = ProcessChanges(&pxfcHead); - ExitOnFailure(hr, "failed to process Wix4XmlConfig changes"); - - // loop through all the xml configurations - for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) - { - // If this is a different file, or the first file... - if (NULL == pwzCurrentFile || 0 != lstrcmpW(pwzCurrentFile, pxfc->wzFile)) - { - // Remember the file we're currently working on - hr = StrAllocString(&pwzCurrentFile, pxfc->wzFile, 0); - ExitOnFailure(hr, "failed to copy file name"); - - fCurrentFileChanged = TRUE; - } - - // - // Figure out what action to take - // - xa = xaUnknown; - - // If it's being installed or reinstalled or uninstalled and that matches - // what we are doing then calculate the right action. - if ((XMLCONFIG_INSTALL & pxfc->iXmlFlags && (WcaIsInstalling(pxfc->isInstalled, pxfc->isAction) || WcaIsReInstalling(pxfc->isInstalled, pxfc->isAction))) || - (XMLCONFIG_UNINSTALL & pxfc->iXmlFlags && WcaIsUninstalling(pxfc->isInstalled, pxfc->isAction))) - { - if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_ELEMENT & pxfc->iXmlFlags) - { - xa = xaCreateElement; - } - else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_ELEMENT & pxfc->iXmlFlags) - { - xa = xaDeleteElement; - } - else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_VALUE & pxfc->iXmlFlags) - { - xa = xaDeleteValue; - } - else if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_VALUE & pxfc->iXmlFlags) - { - xa = xaWriteValue; - } - else if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_DOCUMENT & pxfc->iXmlFlags) - { - xa = xaWriteDocument; - } - else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_DOCUMENT & pxfc->iXmlFlags) - { - hr = E_INVALIDARG; - ExitOnFailure(hr, "Invalid flag configuration. Cannot delete a fragment node."); - } - } - - if (XMLCONFIG_PRESERVE_MODIFIED & pxfc->iXmlFlags) - { - xd = xdPreserve; - } - else - { - xd= xdDontPreserve; - } - - if (xaUnknown != xa) - { - if (fCurrentFileChanged) - { - hr = BeginChangeFile(pwzCurrentFile, pxfc->iCompAttributes, &pwzCustomActionData); - ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); - - fCurrentFileChanged = FALSE; - ++cFiles; - } - - hr = WcaWriteIntegerToCaData((int)xa, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write action indicator custom action data"); - - hr = WcaWriteIntegerToCaData((int)xd, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); - - hr = WriteChangeData(pxfc, xa, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write change data"); - } - } - - // If we looped through all records all is well - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed while looping through all objects to secure"); - - // Schedule the custom action and add to progress bar - if (pwzCustomActionData && *pwzCustomActionData) - { - Assert(0 < cFiles); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlConfig"), pwzCustomActionData, cFiles * COST_XMLFILE); - ExitOnFailure(hr, "failed to schedule ExecXmlConfig action"); - } - -LExit: - ReleaseStr(pwzCurrentFile); - ReleaseStr(pwzCustomActionData); - - FreeXmlConfigChangeList(pxfcHead); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - - -/****************************************************************** - ExecXmlConfig - entry point for XmlConfig Custom Action - -*******************************************************************/ -extern "C" UINT __stdcall ExecXmlConfig( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug ExecXmlConfig"); - HRESULT hr = S_OK; - HRESULT hrOpenFailure = S_OK; - UINT er = ERROR_SUCCESS; - -#ifndef _WIN64 - BOOL fIsFSRedirectDisabled = FALSE; -#endif - BOOL fPreserveDate = FALSE; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwzData = NULL; - LPWSTR pwzFile = NULL; - LPWSTR pwzElementPath = NULL; - LPWSTR pwzVerifyPath = NULL; - LPWSTR pwzName = NULL; - LPWSTR pwzValue = NULL; - LPWSTR pwz = NULL; - int cAdditionalChanges = 0; - - IXMLDOMDocument* pixd = NULL; - IXMLDOMNode* pixn = NULL; - IXMLDOMNode* pixnVerify = NULL; - IXMLDOMNode* pixnNewNode = NULL; - IXMLDOMNode* pixnRemovedChild = NULL; - - IXMLDOMDocument* pixdNew = NULL; - IXMLDOMElement* pixeNew = NULL; - - FILETIME ft; - - int id = IDRETRY; - - eXmlAction xa; - eXmlPreserveDate xd; - - // initialize - hr = WcaInitialize(hInstall, "ExecXmlConfig"); - ExitOnFailure(hr, "failed to initialize"); - - hr = XmlInitialize(); - ExitOnFailure(hr, "failed to initialize xml utilities"); - - hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); - ExitOnFailure(hr, "failed to process CustomActionData"); - -#ifndef _WIN64 - // Initialize the Wow64 API - store the result in fWow64APIPresent - // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases - WcaInitializeWow64(); - BOOL fIsWow64Process = WcaIsWow64Process(); -#endif - - if (xaOpenFile != xa && xaOpenFilex64 != xa) - { - ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); - } - - // loop through all the passed in data - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &pwzFile); - ExitOnFailure(hr, "failed to read file name from custom action data"); - - // Default to not preserve date, preserve it if any modifications require us to - fPreserveDate = FALSE; - - // Open the file - ReleaseNullObject(pixd); - -#ifndef _WIN64 - if (xaOpenFilex64 == xa) - { - if (!fIsWow64Process) - { - hr = E_NOTIMPL; - ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but the custom action process is not running in WOW."); - } - - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); - - fIsFSRedirectDisabled = TRUE; - } -#endif - - hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); - if (FAILED(hr)) - { - // Ignore the return code for now. If they try to add something, we'll fail the install. If all they do is remove stuff then it doesn't matter. - hrOpenFailure = hr; - hr = S_OK; - } - else - { - hrOpenFailure = S_OK; - } - - WcaLog(LOGMSG_VERBOSE, "Configuring Xml File: %ls", pwzFile); - - while (pwz && *pwz) - { - // If we skip past an element that has additional changes we need to strip them off the stream before - // moving on to the next element. Do that now and then restart the outer loop. - if (cAdditionalChanges > 0) - { - while (cAdditionalChanges > 0) - { - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzValue); - ExitOnFailure(hr, "failed to process CustomActionData"); - - cAdditionalChanges--; - } - continue; - } - - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); - ExitOnFailure(hr, "failed to process CustomActionData"); - - // Break if we need to move on to a different file - if (xaOpenFile == xa || xaOpenFilex64 == xa) - { - break; - } - - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xd); - ExitOnFailure(hr, "failed to process CustomActionData"); - - if (xdPreserve == xd) - { - fPreserveDate = TRUE; - } - - // Get path, name, and value to be written - hr = WcaReadStringFromCaData(&pwz, &pwzElementPath); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzVerifyPath); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzValue); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, &cAdditionalChanges); - ExitOnFailure(hr, "failed to process CustomActionData"); - - // If we failed to open the file and we're adding something to the file, we've got a problem. Otherwise, just continue on since the file's already gone. - if (FAILED(hrOpenFailure)) - { - if (xaCreateElement == xa || xaWriteValue == xa || xaWriteDocument == xa) - { - MessageExitOnFailure(hr = hrOpenFailure, msierrXmlConfigFailedOpen, "failed to load XML file: %ls", pwzFile); - } - else - { - continue; - } - } - - // Select the node we're about to modify - ReleaseNullObject(pixn); - - hr = XmlSelectSingleNode(pixd, pwzElementPath, &pixn); - - // If we failed to find the node that we are going to add to, we've got a problem. Otherwise, just continue since the node's already gone. - if (S_FALSE == hr) - { - if (xaCreateElement == xa || xaWriteValue == xa || xaWriteDocument == xa) - { - hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); - } - else - { - hr = S_OK; - continue; - } - } - - MessageExitOnFailure(hr, msierrXmlConfigFailedSelect, "failed to find node: %ls in XML file: %ls", pwzElementPath, pwzFile); - - // Make the modification - switch (xa) - { - case xaWriteValue: - if (pwzName && *pwzName) - { - // We're setting an attribute - hr = XmlSetAttribute(pixn, pwzName, pwzValue); - ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); - } - else - { - // We're setting the text of the node - hr = XmlSetText(pixn, pwzValue); - ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzElementPath); - } - break; - case xaWriteDocument: - if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) - { - hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); - if (S_OK == hr) - { - // We found the verify path which means we have no further work to do - continue; - } - ExitOnFailure(hr, "failed to query verify path: %ls", pwzVerifyPath); - } - - hr = XmlLoadDocumentEx(pwzValue, XML_LOAD_PRESERVE_WHITESPACE, &pixdNew); - ExitOnFailure(hr, "Failed to load value as document."); - - hr = pixdNew->get_documentElement(&pixeNew); - ExitOnFailure(hr, "Failed to get document element."); - - hr = pixn->appendChild(pixeNew, NULL); - ExitOnFailure(hr, "Failed to append document element on to parent element."); - - ReleaseNullObject(pixeNew); - ReleaseNullObject(pixdNew); - break; - - case xaCreateElement: - if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) - { - hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); - if (S_OK == hr) - { - // We found the verify path which means we have no further work to do - continue; - } - ExitOnFailure(hr, "failed to query verify path: %ls", pwzVerifyPath); - } - - hr = XmlCreateChild(pixn, pwzName, &pixnNewNode); - ExitOnFailure(hr, "failed to create child element: %ls", pwzName); - - if (pwzValue && *pwzValue) - { - hr = XmlSetText(pixnNewNode, pwzValue); - ExitOnFailure(hr, "failed to set text to: %ls for node: %ls", pwzValue, pwzName); - } - - while (cAdditionalChanges > 0) - { - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzValue); - ExitOnFailure(hr, "failed to process CustomActionData"); - - // Set the additional attribute - hr = XmlSetAttribute(pixnNewNode, pwzName, pwzValue); - ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); - - cAdditionalChanges--; - } - - ReleaseNullObject(pixnNewNode); - break; - case xaDeleteValue: - if (pwzName && *pwzName) - { - // Delete the attribute - hr = XmlRemoveAttribute(pixn, pwzName); - ExitOnFailure(hr, "failed to remove attribute: %ls", pwzName); - } - else - { - // Clear the text value for the node - hr = XmlSetText(pixn, L""); - ExitOnFailure(hr, "failed to clear text value"); - } - break; - case xaDeleteElement: - if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) - { - hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); - if (S_OK == hr) - { - hr = pixn->removeChild(pixnVerify, &pixnRemovedChild); - ExitOnFailure(hr, "failed to remove created child element"); - - ReleaseNullObject(pixnRemovedChild); - } - else - { - WcaLog(LOGMSG_VERBOSE, "Failed to select path %ls for deleting. Skipping...", pwzVerifyPath); - hr = S_OK; - } - } - else - { - // TODO: This requires a VerifyPath to delete an element. Should we support not having one? - WcaLog(LOGMSG_VERBOSE, "No VerifyPath specified for delete element of ID: %ls", pwzElementPath); - } - break; - default: - ExitOnFailure(hr = E_UNEXPECTED, "Invalid modification specified in custom action data"); - break; - } - } - - - // Now that we've made all of the changes to this file, save it and move on to the next - if (S_OK == hrOpenFailure) - { - if (fPreserveDate) - { - hr = FileGetTime(pwzFile, NULL, NULL, &ft); - ExitOnFailure(hr, "failed to get modified time of file : %ls", pwzFile); - } - - int iSaveAttempt = 0; - - do - { - hr = XmlSaveDocument(pixd, pwzFile); - if (FAILED(hr)) - { - id = WcaErrorMessage(msierrXmlConfigFailedSave, hr, INSTALLMESSAGE_ERROR | MB_ABORTRETRYIGNORE, 1, pwzFile); - switch (id) - { - case IDABORT: - ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); - case IDRETRY: - hr = S_FALSE; // hit me, baby, one more time - break; - case IDIGNORE: - hr = S_OK; // pretend everything is okay and bail - break; - case 0: // No UI case, MsiProcessMessage returns 0 - if (STIERR_SHARING_VIOLATION == hr) - { - // Only in case of sharing violation do we retry 30 times, once a second. - if (iSaveAttempt < 30) - { - hr = S_FALSE; - ++iSaveAttempt; - WcaLog(LOGMSG_VERBOSE, "Unable to save changes to XML file: %ls, retry attempt: %x", pwzFile, iSaveAttempt); - Sleep(1000); - } - else - { - ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); - } - } - break; - default: // Unknown error - ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); - } - } - } while (S_FALSE == hr); - - if (fPreserveDate) - { - hr = FileSetTime(pwzFile, NULL, NULL, &ft); - ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); - } - -#ifndef _WIN64 - if (fIsFSRedirectDisabled) - { - fIsFSRedirectDisabled = FALSE; - WcaRevertWow64FSRedirection(); - } -#endif - } - } - -LExit: -#ifndef _WIN64 - // Make sure we revert FS Redirection if necessary before exiting - if (fIsFSRedirectDisabled) - { - fIsFSRedirectDisabled = FALSE; - WcaRevertWow64FSRedirection(); - } - WcaFinalizeWow64(); -#endif - - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzData); - ReleaseStr(pwzFile); - ReleaseStr(pwzElementPath); - ReleaseStr(pwzVerifyPath); - ReleaseStr(pwzName); - ReleaseStr(pwzValue); - - ReleaseObject(pixeNew); - ReleaseObject(pixdNew); - - ReleaseObject(pixn); - ReleaseObject(pixd); - ReleaseObject(pixnNewNode); - ReleaseObject(pixnRemovedChild); - - XmlUninitialize(); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - - -/****************************************************************** - ExecXmlConfigRollback - entry point for XmlConfig rollback Custom Action - -*******************************************************************/ -extern "C" UINT __stdcall ExecXmlConfigRollback( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug ExecXmlConfigRollback"); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - int iIs64Bit; -#ifndef _WIN64 - BOOL fIs64Bit = FALSE; -#endif - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzFileName = NULL; - LPBYTE pbData = NULL; - DWORD_PTR cbData = 0; - - FILETIME ft; - - HANDLE hFile = INVALID_HANDLE_VALUE; - - // initialize - hr = WcaInitialize(hInstall, "ExecXmlConfigRollback"); - ExitOnFailure(hr, "failed to initialize"); - - - hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - hr = WcaReadIntegerFromCaData(&pwz, &iIs64Bit); - ExitOnFailure(hr, "failed to read component bitness from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzFileName); - ExitOnFailure(hr, "failed to read file name from custom action data"); - - hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); - ExitOnFailure(hr, "failed to read file contents from custom action data"); - -#ifndef _WIN64 - fIs64Bit = (BOOL)iIs64Bit; - - if (fIs64Bit) - { - hr = WcaInitializeWow64(); - if (S_FALSE == hr) - { - hr = TYPE_E_DLLFUNCTIONNOTFOUND; - } - ExitOnFailure(hr, "failed to initialize Wow64 API"); - - if (!WcaIsWow64Process()) - { - hr = E_NOTIMPL; - ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but the Wow64 API is unavailable."); - } - - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); - } -#endif - - hr = FileGetTime(pwzFileName, NULL, NULL, &ft); - ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); - - // Open the file - hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, NULL, NULL, TRUNCATE_EXISTING, NULL, NULL); - ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); - - // Write out the old data - hr = FileWriteHandle(hFile, pbData, cbData); - ExitOnFailure(hr, "failed to write to file: %ls", pwzFileName); - - ReleaseFile(hFile); - - hr = FileSetTime(pwzFileName, NULL, NULL, &ft); - ExitOnFailure(hr, "Failed to set modified date of file %ls.", pwzFileName); - -LExit: - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzFileName); - - ReleaseFile(hFile); - -#ifndef _WIN64 - if (fIs64Bit) - { - WcaRevertWow64FSRedirection(); - WcaFinalizeWow64(); - } -#endif - - ReleaseMem(pbData); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp deleted file mode 100644 index 04a4ae98..00000000 --- a/src/ca/XmlFile.cpp +++ /dev/null @@ -1,940 +0,0 @@ -// 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" - -#define XMLFILE_CREATE_ELEMENT 0x00000001 -#define XMLFILE_DELETE_VALUE 0x00000002 -#define XMLFILE_BULKWRITE_VALUE 0x00000004 - -#define XMLFILE_DONT_UNINSTALL 0x00010000 -#define XMLFILE_PRESERVE_MODIFIED 0x00001000 -#define XMLFILE_USE_XPATH 0x00000100 - -extern BOOL vfMsxml30; - -enum eXmlAction -{ - xaOpenFile = 1, - xaOpenFilex64, - xaWriteValue, - xaDeleteValue, - xaCreateElement, - xaDeleteElement, - xaBulkWriteValue, -}; - -enum eXmlPreserveDate -{ - xdDontPreserve = 0, - xdPreserve -}; - -enum eXmlSelectionLanguage -{ - xsXSLPattern = 0, - xsXPath = 1, -}; - -LPCWSTR vcsXmlFileQuery = - L"SELECT `Wix4XmlFile`.`Wix4XmlFile`, `Wix4XmlFile`.`File`, `Wix4XmlFile`.`ElementPath`, `Wix4XmlFile`.`Name`, `Wix4XmlFile`.`Value`, " - L"`Wix4XmlFile`.`Flags`, `Wix4XmlFile`.`Component_`, `Component`.`Attributes` " - L"FROM `Wix4XmlFile`,`Component` WHERE `Wix4XmlFile`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; -enum eXmlFileQuery { xfqXmlFile = 1, xfqFile, xfqXPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; - -struct XML_FILE_CHANGE -{ - WCHAR wzId[MAX_DARWIN_KEY]; - - INSTALLSTATE isInstalled; - INSTALLSTATE isAction; - - WCHAR wzFile[MAX_PATH]; - LPWSTR pwzElementPath; - WCHAR wzName[MAX_DARWIN_COLUMN]; - LPWSTR pwzValue; - - int iXmlFlags; - int iCompAttributes; - - XML_FILE_CHANGE* pxfcPrev; - XML_FILE_CHANGE* pxfcNext; -}; - -//static HRESULT FreeXmlFileChangeList( -// __in XML_FILE_CHANGE* pxfcList -// ) -//{ -// HRESULT hr = S_OK; -// -// XML_FILE_CHANGE* pxfcDelete; -// while(pxfcList) -// { -// pxfcDelete = pxfcList; -// pxfcList = pxfcList->pxfcNext; -// -// ReleaseStr(pxfcDelete->pwzElementPath); -// ReleaseStr(pxfcDelete->pwzValue); -// -// hr = MemFree(pxfcDelete); -// ExitOnFailure(hr, "failed to free xml file change list item"); -// } -// -//LExit: -// return hr; -//} - -static HRESULT AddXmlFileChangeToList( - __inout XML_FILE_CHANGE** ppxfcHead, - __inout XML_FILE_CHANGE** ppxfcTail - ) -{ - Assert(ppxfcHead && ppxfcTail); - - HRESULT hr = S_OK; - - XML_FILE_CHANGE* pxfc = static_cast(MemAlloc(sizeof(XML_FILE_CHANGE), TRUE)); - ExitOnNull(pxfc, hr, E_OUTOFMEMORY, "failed to allocate memory for new xml file change list element"); - - // Add it to the end of the list - if (NULL == *ppxfcHead) - { - *ppxfcHead = pxfc; - *ppxfcTail = pxfc; - } - else - { - Assert(*ppxfcTail && (*ppxfcTail)->pxfcNext == NULL); - (*ppxfcTail)->pxfcNext = pxfc; - pxfc->pxfcPrev = *ppxfcTail; - *ppxfcTail = pxfc; - } - -LExit: - return hr; -} - - -static HRESULT ReadXmlFileTable( - __inout XML_FILE_CHANGE** ppxfcHead, - __inout XML_FILE_CHANGE** ppxfcTail - ) -{ - Assert(ppxfcHead && ppxfcTail); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - LPWSTR pwzData = NULL; - - // check to see if necessary tables are specified - if (S_FALSE == WcaTableExists(L"Wix4XmlFile")) - { - ExitFunction1(hr = S_FALSE); - } - - // loop through all the xml configurations - hr = WcaOpenExecuteView(vcsXmlFileQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4XmlFile table"); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = AddXmlFileChangeToList(ppxfcHead, ppxfcTail); - ExitOnFailure(hr, "failed to add xml file change to list"); - - // Get record Id - hr = WcaGetRecordString(hRec, xfqXmlFile, &pwzData); - ExitOnFailure(hr, "failed to get Wix4XmlFile record Id"); - hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); - ExitOnFailure(hr, "failed to copy Wix4XmlFile record Id"); - - // Get component name - hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); - ExitOnFailure(hr, "failed to get component name for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - - // Get the component's state - er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for Component: %ls", pwzData); - - // Get the xml file - hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); - ExitOnFailure(hr, "failed to get xml file for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); - ExitOnFailure(hr, "failed to copy xml file path"); - - // Get the Wix4XmlFile table flags - hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); - ExitOnFailure(hr, "failed to get Wix4XmlFile flags for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - - // Get the XPath - hr = WcaGetRecordFormattedString(hRec, xfqXPath, &(*ppxfcTail)->pwzElementPath); - ExitOnFailure(hr, "failed to get XPath for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - - // Get the name - hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); - ExitOnFailure(hr, "failed to get Name for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); - ExitOnFailure(hr, "failed to copy name of element"); - - // Get the value - hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); - ExitOnFailure(hr, "failed to get Value for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); - ExitOnFailure(hr, "failed to allocate buffer for value"); - - // Get the component attributes - hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); - ExitOnFailure(hr, "failed to get component attributes for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); - } - - // if we looped through all records all is well - if (E_NOMOREITEMS == hr) - hr = S_OK; - ExitOnFailure(hr, "failed while looping through all objects to secure"); - -LExit: - ReleaseStr(pwzData); - - return hr; -} - - -static HRESULT BeginChangeFile( - __in LPCWSTR pwzFile, - __in XML_FILE_CHANGE* pxfc, - __inout LPWSTR* ppwzCustomActionData - ) -{ - Assert(pwzFile && *pwzFile && ppwzCustomActionData); - - HRESULT hr = S_OK; - BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit; - BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH; - LPBYTE pbData = NULL; - SIZE_T cbData = 0; - - LPWSTR pwzRollbackCustomActionData = NULL; - - if (fIs64Bit) - { - hr = WcaWriteIntegerToCaData((int)xaOpenFilex64, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write 64-bit file indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xaOpenFile, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write file indicator to custom action data"); - } - if (fUseXPath) - { - hr = WcaWriteIntegerToCaData((int)xsXPath, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write XPath selectionlanguage indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xsXSLPattern, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write XSLPattern selectionlanguage indicator to custom action data"); - } - hr = WcaWriteStringToCaData(pwzFile, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write file to custom action data: %ls", pwzFile); - - // If the file already exits, then we have to put it back the way it was on failure - if (FileExistsEx(pwzFile, NULL)) - { - hr = FileRead(&pbData, &cbData, pwzFile); - ExitOnFailure(hr, "failed to read file: %ls", pwzFile); - - // Set up the rollback for this file - hr = WcaWriteIntegerToCaData((int)fIs64Bit, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to write component bitness to rollback custom action data"); - - hr = WcaWriteStringToCaData(pwzFile, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to write file name to rollback custom action data: %ls", pwzFile); - - hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlFileRollback"), pwzRollbackCustomActionData, COST_XMLFILE); - ExitOnFailure(hr, "failed to schedule ExecXmlFileRollback for file: %ls", pwzFile); - - ReleaseStr(pwzRollbackCustomActionData); - } -LExit: - ReleaseMem(pbData); - - return hr; -} - - -static HRESULT WriteChangeData( - __in XML_FILE_CHANGE* pxfc, - __inout LPWSTR* ppwzCustomActionData - ) -{ - Assert(pxfc && ppwzCustomActionData); - - HRESULT hr = S_OK; - - hr = WcaWriteStringToCaData(pxfc->pwzElementPath, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", pxfc->pwzElementPath); - - hr = WcaWriteStringToCaData(pxfc->wzName, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); - - hr = WcaWriteStringToCaData(pxfc->pwzValue, ppwzCustomActionData); - ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); - -LExit: - return hr; -} - - -/****************************************************************** - SchedXmlFile - entry point for XmlFile Custom Action - -********************************************************************/ -extern "C" UINT __stdcall SchedXmlFile( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug SchedXmlFile"); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzCurrentFile = NULL; - BOOL fCurrentFileChanged = FALSE; - BOOL fCurrentUseXPath = FALSE; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - XML_FILE_CHANGE* pxfcHead = NULL; - XML_FILE_CHANGE* pxfcTail = NULL; - XML_FILE_CHANGE* pxfc = NULL; - XML_FILE_CHANGE* pxfcUninstall = NULL; - - LPWSTR pwzCustomActionData = NULL; - - DWORD cFiles = 0; - - // initialize - hr = WcaInitialize(hInstall, "SchedXmlFile"); - ExitOnFailure(hr, "failed to initialize"); - - hr = ReadXmlFileTable(&pxfcHead, &pxfcTail); - if (S_FALSE == hr) - { - WcaLog(LOGMSG_VERBOSE, "Skipping SchedXmlFile because Wix4XmlFile table not present"); - ExitFunction1(hr = S_OK); - } - - MessageExitOnFailure(hr, msierrXmlFileFailedRead, "failed to read Wix4XmlFile table"); - - // loop through all the xml configurations - for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) - { - // If this is the first file, a different file, the last file, or the SelectionLanguage property changes... - if (NULL == pwzCurrentFile || 0 != lstrcmpW(pwzCurrentFile, pxfc->wzFile) || NULL == pxfc->pxfcNext || fCurrentUseXPath != ((XMLFILE_USE_XPATH & pxfc->iXmlFlags))) - { - // If this isn't the first file - if (NULL != pwzCurrentFile) - { - // Do the uninstall work for the current file by walking backwards through the list (so the sequence is reversed) - for (pxfcUninstall = ((NULL != pxfc->pxfcNext) ? pxfc->pxfcPrev : pxfc); pxfcUninstall && 0 == lstrcmpW(pwzCurrentFile, pxfcUninstall->wzFile) && fCurrentUseXPath == ((XMLFILE_USE_XPATH & pxfcUninstall->iXmlFlags)); pxfcUninstall = pxfcUninstall->pxfcPrev) - { - // If it's being uninstalled - if (WcaIsUninstalling(pxfcUninstall->isInstalled, pxfcUninstall->isAction)) - { - // Uninstall the change - if (!(XMLFILE_DONT_UNINSTALL & pxfcUninstall->iXmlFlags)) - { - if (!fCurrentFileChanged) - { - hr = BeginChangeFile(pwzCurrentFile, pxfcUninstall, &pwzCustomActionData); - ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); - - fCurrentFileChanged = TRUE; - ++cFiles; - } - if (XMLFILE_CREATE_ELEMENT & pxfcUninstall->iXmlFlags) - { - hr = WcaWriteIntegerToCaData((int)xaDeleteElement, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write delete element action indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xaDeleteValue, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write delete value action indicator to custom action data"); - } - - if (XMLFILE_PRESERVE_MODIFIED & pxfc->iXmlFlags) - { - hr = WcaWriteIntegerToCaData((int)xdPreserve, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xdDontPreserve, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write Don't Preserve Date indicator to custom action data"); - } - - hr = WriteChangeData(pxfcUninstall, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write uninstall change data"); - } - } - } - } - - // Remember the file we're currently working on - hr = StrAllocString(&pwzCurrentFile, pxfc->wzFile, 0); - ExitOnFailure(hr, "failed to copy file name"); - fCurrentUseXPath = (XMLFILE_USE_XPATH & pxfc->iXmlFlags); - - // We haven't changed the current file yet - fCurrentFileChanged = FALSE; - } - - // If it's being installed - if (WcaIsInstalling(pxfc->isInstalled, pxfc->isAction)) - { - if (!fCurrentFileChanged) - { - hr = BeginChangeFile(pwzCurrentFile, pxfc, &pwzCustomActionData); - ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); - fCurrentFileChanged = TRUE; - ++cFiles; - } - - // Install the change - if (XMLFILE_CREATE_ELEMENT & pxfc->iXmlFlags) - { - hr = WcaWriteIntegerToCaData((int)xaCreateElement, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write create element action indicator to custom action data"); - } - else if (XMLFILE_DELETE_VALUE & pxfc->iXmlFlags) - { - hr = WcaWriteIntegerToCaData((int)xaDeleteValue, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write delete value action indicator to custom action data"); - } - else if (XMLFILE_BULKWRITE_VALUE & pxfc->iXmlFlags) - { - hr = WcaWriteIntegerToCaData((int)xaBulkWriteValue, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write builkwrite value action indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xaWriteValue, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write file indicator to custom action data"); - } - - if (XMLFILE_PRESERVE_MODIFIED & pxfc->iXmlFlags) - { - hr = WcaWriteIntegerToCaData((int)xdPreserve, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); - } - else - { - hr = WcaWriteIntegerToCaData((int)xdDontPreserve, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write Don't Preserve Date indicator to custom action data"); - } - - hr = WriteChangeData(pxfc, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write change data"); - } - } - - // If we looped through all records all is well - if (E_NOMOREITEMS == hr) - hr = S_OK; - ExitOnFailure(hr, "failed while looping through all objects to secure"); - - // Schedule the custom action and add to progress bar - if (pwzCustomActionData && *pwzCustomActionData) - { - Assert(0 < cFiles); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlFile"), pwzCustomActionData, cFiles * COST_XMLFILE); - ExitOnFailure(hr, "failed to schedule ExecXmlFile action"); - } - -LExit: - ReleaseStr(pwzCurrentFile); - ReleaseStr(pwzCustomActionData); - - return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); -} - - -/****************************************************************** - ExecXmlFile - entry point for XmlFile Custom Action - -*******************************************************************/ -extern "C" UINT __stdcall ExecXmlFile( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug ExecXmlFile"); - HRESULT hr = S_OK; - HRESULT hrOpenFailure = S_OK; - UINT er = ERROR_SUCCESS; - - BOOL fIsFSRedirectDisabled = FALSE; - BOOL fPreserveDate = FALSE; - - int id = IDRETRY; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwzData = NULL; - LPWSTR pwzFile = NULL; - LPWSTR pwzXPath = NULL; - LPWSTR pwzName = NULL; - LPWSTR pwzValue = NULL; - LPWSTR pwz = NULL; - - IXMLDOMDocument* pixd = NULL; - IXMLDOMNode* pixn = NULL; - IXMLDOMNode* pixnNewNode = NULL; - IXMLDOMNodeList* pixNodes = NULL; - IXMLDOMDocument2 *pixdDocument2 = NULL; - - FILETIME ft; - - BSTR bstrProperty = ::SysAllocString(L"SelectionLanguage"); - ExitOnNull(bstrProperty, hr, E_OUTOFMEMORY, "failed SysAllocString"); - VARIANT varValue; - ::VariantInit(&varValue); - varValue.vt = VT_BSTR; - varValue.bstrVal = ::SysAllocString(L"XPath"); - ExitOnNull(varValue.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString"); - eXmlAction xa; - eXmlPreserveDate xd; - eXmlSelectionLanguage xl; - - // initialize - hr = WcaInitialize(hInstall, "ExecXmlFile"); - ExitOnFailure(hr, "failed to initialize"); - - hr = XmlInitialize(); - ExitOnFailure(hr, "failed to initialize xml utilities"); - - hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); - ExitOnFailure(hr, "failed to process CustomActionData"); - -#ifndef _WIN64 - // Initialize the Wow64 API - store the result in fWow64APIPresent - // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases - WcaInitializeWow64(); - BOOL fIsWow64Process = WcaIsWow64Process(); -#endif - - if (xaOpenFile != xa && xaOpenFilex64 != xa) - ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); - - // loop through all the passed in data - while (pwz && *pwz) - { - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xl); - ExitOnFailure(hr, "failed to process CustomActionData"); - - hr = WcaReadStringFromCaData(&pwz, &pwzFile); - ExitOnFailure(hr, "failed to read file name from custom action data"); - - // Default to not preserve the modified date - fPreserveDate = FALSE; - - // Open the file - ReleaseNullObject(pixd); - - if (xaOpenFilex64 == xa) - { -#ifndef _WIN64 - if (!fIsWow64Process) - { - hr = E_NOTIMPL; - ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but the custom action process is not running in WOW."); - } - - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); - - fIsFSRedirectDisabled = TRUE; -#endif - } - - hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); - if (FAILED(hr)) - { - // Ignore the return code for now. If they try to add something, we'll fail the install. If all they do is remove stuff then it doesn't matter. - hrOpenFailure = hr; - hr = S_OK; - } - else - { - hrOpenFailure = S_OK; - } - WcaLog(LOGMSG_VERBOSE, "Configuring Xml File: %ls", pwzFile); - - if (xsXPath == xl) - { - if (vfMsxml30) - { - // If we failed to open the file, don't fail immediately; just skip setting the selection language, and we'll fail later if appropriate - if (SUCCEEDED(hrOpenFailure)) - { - hr = pixd->QueryInterface(XmlUtil_IID_IXMLDOMDocument2, (void**)&pixdDocument2); - ExitOnFailure(hr, "failed in querying IXMLDOMDocument2 interface"); - hr = pixdDocument2->setProperty(bstrProperty, varValue); - ExitOnFailure(hr, "failed in setting SelectionLanguage"); - } - } - else - { - ExitOnFailure(hr = E_NOTIMPL, "Error: current MSXML version does not support xpath query."); - } - } - - while (pwz && *pwz) - { - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); - ExitOnFailure(hr, "failed to process CustomActionData"); - - // Break if we need to move on to a different file - if (xaOpenFile == xa || xaOpenFilex64 == xa) - break; - - hr = WcaReadIntegerFromCaData(&pwz, (int*) &xd); - ExitOnFailure(hr, "failed to process CustomActionData"); - - if (xdPreserve == xd) - { - fPreserveDate = TRUE; - } - - // Get path, name, and value to be written - hr = WcaReadStringFromCaData(&pwz, &pwzXPath); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzValue); - ExitOnFailure(hr, "failed to process CustomActionData"); - - // If we failed to open the file and we're adding something to the file, we've got a problem. Otherwise, just continue on since the file's already gone. - if (FAILED(hrOpenFailure)) - { - if (xaCreateElement == xa || xaWriteValue == xa || xaBulkWriteValue == xa) - { - MessageExitOnFailure(hr = hrOpenFailure, msierrXmlFileFailedOpen, "failed to load XML file: %ls", pwzFile); - } - else - { - continue; - } - } - - // Select the node we're about to modify - ReleaseNullObject(pixn); - - if (xaBulkWriteValue == xa) - { - hr = XmlSelectNodes(pixd, pwzXPath, &pixNodes); - if (S_FALSE == hr) - { - hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); - } - - MessageExitOnFailure(hr, msierrXmlFileFailedSelect, "failed to find any nodes: %ls in XML file: %ls", pwzXPath, pwzFile); - for (;;) - { - pixNodes->nextNode(&pixn); - if (NULL == pixn) - break; - - if (pwzName && *pwzName) - { - // We're setting an attribute - hr = XmlSetAttribute(pixn, pwzName, pwzValue); - ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); - } - else - { - // We're setting the text of the node - hr = XmlSetText(pixn, pwzValue); - ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzXPath); - } - ReleaseNullObject(pixn); - } - } - else - { - hr = XmlSelectSingleNode(pixd, pwzXPath, &pixn); - if (S_FALSE == hr) - hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); - MessageExitOnFailure(hr, msierrXmlFileFailedSelect, "failed to find node: %ls in XML file: %ls", pwzXPath, pwzFile); - - // Make the modification - if (xaWriteValue == xa) - { - if (pwzName && *pwzName) - { - // We're setting an attribute - hr = XmlSetAttribute(pixn, pwzName, pwzValue); - ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); - } - else - { - // We're setting the text of the node - hr = XmlSetText(pixn, pwzValue); - ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzXPath); - } - } - else if (xaCreateElement == xa) - { - hr = XmlCreateChild(pixn, pwzName, &pixnNewNode); - ExitOnFailure(hr, "failed to create child element: %ls", pwzName); - - if (pwzValue && *pwzValue) - { - hr = XmlSetText(pixnNewNode, pwzValue); - ExitOnFailure(hr, "failed to set text to: %ls for node: %ls", pwzValue, pwzName); - } - - ReleaseNullObject(pixnNewNode); - } - else if (xaDeleteValue == xa) - { - if (pwzName && *pwzName) - { - // Delete the attribute - hr = XmlRemoveAttribute(pixn, pwzName); - ExitOnFailure(hr, "failed to remove attribute: %ls", pwzName); - } - else - { - // Clear the text value for the node - hr = XmlSetText(pixn, L""); - ExitOnFailure(hr, "failed to clear text value"); - } - } - else if (xaDeleteElement == xa) - { - // TODO: This may be a little heavy handed - hr = XmlRemoveChildren(pixn, pwzName); - ExitOnFailure(hr, "failed to delete child node: %ls", pwzName); - } - else - { - ExitOnFailure(hr = E_UNEXPECTED, "Invalid modification specified in custom action data"); - } - } - } - - // Now that we've made all of the changes to this file, save it and move on to the next - if (S_OK == hrOpenFailure) - { - if (fPreserveDate) - { - hr = FileGetTime(pwzFile, NULL, NULL, &ft); - ExitOnFailure(hr, "failed to get modified time of file : %ls", pwzFile); - } - - int iSaveAttempt = 0; - - do - { - hr = XmlSaveDocument(pixd, pwzFile); - if (FAILED(hr)) - { - id = WcaErrorMessage(msierrXmlConfigFailedSave, hr, INSTALLMESSAGE_ERROR | MB_ABORTRETRYIGNORE, 1, pwzFile); - switch (id) - { - case IDABORT: - ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); - case IDRETRY: - hr = S_FALSE; // hit me, baby, one more time - break; - case IDIGNORE: - hr = S_OK; // pretend everything is okay and bail - break; - case 0: // No UI case, MsiProcessMessage returns 0 - if (STIERR_SHARING_VIOLATION == hr) - { - // Only in case of sharing violation do we retry 30 times, once a second. - if (iSaveAttempt < 30) - { - hr = S_FALSE; - ++iSaveAttempt; - WcaLog(LOGMSG_VERBOSE, "Unable to save changes to XML file: %ls, retry attempt: %x", pwzFile, iSaveAttempt); - Sleep(1000); - } - else - { - ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); - } - } - break; - default: // Unknown error - ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); - } - } - } while (S_FALSE == hr); - - if (fPreserveDate) - { - hr = FileSetTime(pwzFile, NULL, NULL, &ft); - ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); - } - - if (fIsFSRedirectDisabled) - { - fIsFSRedirectDisabled = FALSE; - WcaRevertWow64FSRedirection(); - } - } - } - -LExit: - // Make sure we revert FS Redirection if necessary before exiting - if (fIsFSRedirectDisabled) - { - fIsFSRedirectDisabled = FALSE; - WcaRevertWow64FSRedirection(); - } -#ifndef _WIN64 - WcaFinalizeWow64(); -#endif - - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzData); - ReleaseStr(pwzFile); - ReleaseStr(pwzXPath); - ReleaseStr(pwzName); - ReleaseStr(pwzValue); - ReleaseBSTR(bstrProperty); - ReleaseVariant(varValue); - - ReleaseObject(pixdDocument2); - ReleaseObject(pixn); - ReleaseObject(pixd); - ReleaseObject(pixnNewNode); - ReleaseObject(pixNodes); - - XmlUninitialize(); - - return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); -} - - -/****************************************************************** - ExecXmlFileRollback - entry point for XmlFile rollback Custom Action - -*******************************************************************/ -extern "C" UINT __stdcall ExecXmlFileRollback( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug ExecXmlFileRollback"); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - int iIs64Bit; - BOOL fIs64Bit = FALSE; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzFileName = NULL; - LPBYTE pbData = NULL; - DWORD_PTR cbData = 0; - - FILETIME ft; - - HANDLE hFile = INVALID_HANDLE_VALUE; - - // initialize - hr = WcaInitialize(hInstall, "ExecXmlFileRollback"); - ExitOnFailure(hr, "failed to initialize"); - - - hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - hr = WcaReadIntegerFromCaData(&pwz, &iIs64Bit); - ExitOnFailure(hr, "failed to read component bitness from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzFileName); - ExitOnFailure(hr, "failed to read file name from custom action data"); - - hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); - ExitOnFailure(hr, "failed to read file contents from custom action data"); - -#ifndef _WIN64 - fIs64Bit = (BOOL)iIs64Bit; - - if (fIs64Bit) - { - hr = WcaInitializeWow64(); - if (S_FALSE == hr) - { - hr = TYPE_E_DLLFUNCTIONNOTFOUND; - } - ExitOnFailure(hr, "failed to initialize Wow64 API"); - - if (!WcaIsWow64Process()) - { - hr = E_NOTIMPL; - ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but the custom action process is not running in WOW."); - } - - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); - } -#endif - - // Always preserve the modified date on rollback - hr = FileGetTime(pwzFileName, NULL, NULL, &ft); - ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); - - // Open the file - hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, NULL, NULL, TRUNCATE_EXISTING, NULL, NULL); - ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); - - // Write out the old data - hr = FileWriteHandle(hFile, pbData, cbData); - ExitOnFailure(hr, "failed to write to file: %ls", pwzFileName); - - ReleaseFile(hFile); - - // Always preserve the modified date on rollback - hr = FileSetTime(pwzFileName, NULL, NULL, &ft); - ExitOnFailure(hr, "Failed to set modified date of file %ls.", pwzFileName); - -LExit: - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzFileName); - - ReleaseFile(hFile); - - if (fIs64Bit) - { - WcaRevertWow64FSRedirection(); - WcaFinalizeWow64(); - } - - ReleaseMem(pbData); - - return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); -} - diff --git a/src/ca/caDecor.h b/src/ca/caDecor.h deleted file mode 100644 index 56cfb201..00000000 --- a/src/ca/caDecor.h +++ /dev/null @@ -1,13 +0,0 @@ -#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. - - -#if defined(_M_ARM64) -#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64" -#elif defined(_M_AMD64) -#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64" -#elif defined(_M_ARM) -#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM" -#else -#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86" -#endif diff --git a/src/ca/cost.h b/src/ca/cost.h deleted file mode 100644 index 6507e85d..00000000 --- a/src/ca/cost.h +++ /dev/null @@ -1,9 +0,0 @@ -#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. - - -const UINT COST_SECUREOBJECT = 1000; -const UINT COST_SERVICECONFIG = 1000; -const UINT COST_XMLFILE = 1000; -const UINT COST_CLOSEAPP = 500; -const UINT COST_INTERNETSHORTCUT = 2000; diff --git a/src/ca/dllmain.cpp b/src/ca/dllmain.cpp deleted file mode 100644 index 35ae6d1c..00000000 --- a/src/ca/dllmain.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// 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 custom actions - -********************************************************************/ -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/exitearlywithsuccess.cpp b/src/ca/exitearlywithsuccess.cpp deleted file mode 100644 index 00828329..00000000 --- a/src/ca/exitearlywithsuccess.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// 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" - - -/****************************************************************** -WixExitEarlyWithSuccess - entry point for WixExitEarlyWithSuccess - custom action which does nothing except return exit code - ERROR_NO_MORE_ITEMS. The Windows Installer documentation at - http://msdn.microsoft.com/library/aa368072.aspx indicates that - this exit code is not treated as an error. This will cause a - calling application to receive a successful return code if - this custom action executes. This can be useful for backwards - compatibility when an application redistributes an MSI and - a future major upgrade is released for that MSI. It should be - conditioned on a property set by an entry in the Upgrade table - of the MSI that detects newer major upgrades of the same MSI - already installed on the system. It should be scheduled after - the FindRelatedProducts action so that the property will be - set if appropriate. -********************************************************************/ -extern "C" UINT __stdcall WixExitEarlyWithSuccess( - __in MSIHANDLE /*hInstall*/ - ) -{ - return ERROR_NO_MORE_ITEMS; -} diff --git a/src/ca/netshortcuts.cpp b/src/ca/netshortcuts.cpp deleted file mode 100644 index 06826264..00000000 --- a/src/ca/netshortcuts.cpp +++ /dev/null @@ -1,437 +0,0 @@ -// 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" - -LPCWSTR vcsShortcutsQuery = - L"SELECT `Component_`, `Directory_`, `Name`, `Target`, `Attributes`, `IconFile`, `IconIndex` " - L"FROM `Wix4InternetShortcut`"; -enum eShortcutsQuery { esqComponent = 1, esqDirectory, esqFilename, esqTarget, esqAttributes, esqIconFile, esqIconIndex }; -enum eShortcutsAttributes { esaLink = 0, esaURL = 1 }; - -/****************************************************************** - WixSchedInternetShortcuts - entry point - -********************************************************************/ -extern "C" UINT __stdcall WixSchedInternetShortcuts( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - UINT uiCost = 0; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - MSIHANDLE hCreateFolderTable = NULL; - MSIHANDLE hCreateFolderColumns = NULL; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwzComponent = NULL; - LPWSTR pwzDirectory = NULL; - LPWSTR pwzFilename = NULL; - LPWSTR pwzTarget = NULL; - LPWSTR pwzShortcutPath = NULL; - int iAttr = 0; - LPWSTR pwzIconFile = NULL; - int iIconIndex = 0; - IUniformResourceLocatorW* piURL = NULL; - IShellLinkW* piShellLink = NULL; - BOOL fInitializedCom = FALSE; - - hr = WcaInitialize(hInstall, "WixSchedInternetShortcuts"); - ExitOnFailure(hr, "failed to initialize WixSchedInternetShortcuts."); - - // anything to do? - if (S_OK != WcaTableExists(L"Wix4InternetShortcut")) - { - WcaLog(LOGMSG_STANDARD, "Wix4InternetShortcut table doesn't exist, so there are no Internet shortcuts to process"); - goto LExit; - } - - // check to see if we can create a shortcut - Server Core and others may not have a shell registered. - hr = ::CoInitialize(NULL); - ExitOnFailure(hr, "failed to initialize COM"); - fInitializedCom = TRUE; - - hr = ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_ALL, IID_IUniformResourceLocatorW, (void**)&piURL); - if (S_OK != hr) - { - WcaLog(LOGMSG_STANDARD, "failed to create an instance of IUniformResourceLocatorW, skipping shortcut creation"); - ExitFunction1(hr = S_OK); - } - - hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&piShellLink); - if (S_OK != hr) - { - WcaLog(LOGMSG_STANDARD, "failed to create an instance of IShellLinkW, skipping shortcut creation"); - ExitFunction1(hr = S_OK); - } - - // query and loop through all the shortcuts - hr = WcaOpenExecuteView(vcsShortcutsQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4InternetShortcut table"); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - // read column values - hr = WcaGetRecordString(hRec, esqComponent, &pwzComponent); - ExitOnFailure(hr, "failed to get shortcut component"); - hr = WcaGetRecordString(hRec, esqDirectory, &pwzDirectory); - ExitOnFailure(hr, "failed to get shortcut directory"); - hr = WcaGetRecordString(hRec, esqFilename, &pwzFilename); - ExitOnFailure(hr, "failed to get shortcut filename"); - hr = WcaGetRecordFormattedString(hRec, esqTarget, &pwzTarget); - ExitOnFailure(hr, "failed to get shortcut target"); - hr = WcaGetRecordInteger(hRec, esqAttributes, &iAttr); - ExitOnFailure(hr, "failed to get shortcut attributes"); - hr = WcaGetRecordFormattedString(hRec, esqIconFile, &pwzIconFile); - ExitOnFailure(hr, "failed to get shortcut icon file"); - hr = WcaGetRecordInteger(hRec, esqIconIndex, &iIconIndex); - ExitOnFailure(hr, "failed to get shortcut icon index"); - - // skip processing this Wix4InternetShortcut row if the component isn't being configured - WCA_TODO todo = WcaGetComponentToDo(pwzComponent); - if (WCA_TODO_UNKNOWN == todo) - { - WcaLog(LOGMSG_VERBOSE, "Skipping shortcut for null-action component '%ls'", pwzComponent); - continue; - } - - // we need to create the directory where the shortcut is supposed to live; rather - // than doing so in our deferred custom action, use the CreateFolder table to have MSI - // make (and remove) them on our behalf (including the correct cleanup of parent directories). - MSIDBERROR dbError = MSIDBERROR_NOERROR; - WcaLog(LOGMSG_STANDARD, "Adding folder '%ls', component '%ls' to the CreateFolder table", pwzDirectory, pwzComponent); - hr = WcaAddTempRecord(&hCreateFolderTable, &hCreateFolderColumns, L"CreateFolder", &dbError, 0, 2, pwzDirectory, pwzComponent); - if (MSIDBERROR_DUPLICATEKEY == dbError) - { - WcaLog(LOGMSG_STANDARD, "Folder '%ls' already exists in the CreateFolder table; the above error is harmless", pwzDirectory); - hr = S_OK; - } - ExitOnFailure(hr, "Couldn't add temporary CreateFolder row"); - - // only if we're installing/reinstalling do we need to schedule the deferred CA - // (uninstallation is handled via permanent RemoveFile rows and temporary CreateFolder rows) - if (WCA_TODO_INSTALL == todo || WCA_TODO_REINSTALL == todo) - { - // turn the Directory_ id into a path - hr = WcaGetTargetPath(pwzDirectory, &pwzShortcutPath); - ExitOnFailure(hr, "failed to allocate string for shortcut directory"); - - // append the shortcut filename - hr = StrAllocConcat(&pwzShortcutPath, pwzFilename, 0); - ExitOnFailure(hr, "failed to allocate string for shortcut filename"); - - // write the shortcut path and target to custom action data for deferred CAs - hr = WcaWriteStringToCaData(pwzShortcutPath, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write shortcut path to custom action data"); - hr = WcaWriteStringToCaData(pwzTarget, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write shortcut target to custom action data"); - hr = WcaWriteIntegerToCaData(iAttr, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write shortcut attributes to custom action data"); - hr = WcaWriteStringToCaData(pwzIconFile, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write icon file to custom action data"); - hr = WcaWriteIntegerToCaData(iIconIndex, &pwzCustomActionData); - ExitOnFailure(hr, "failed to write icon index to custom action data"); - - uiCost += COST_INTERNETSHORTCUT; - } - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure occured while processing Wix4InternetShortcut table"); - - // if we have any shortcuts to install - if (pwzCustomActionData && *pwzCustomActionData) - { - // add cost to progress bar - hr = WcaProgressMessage(uiCost, TRUE); - ExitOnFailure(hr, "failed to extend progress bar for InternetShortcuts"); - - // provide custom action data to deferred and rollback CAs - hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"RollbackInternetShortcuts"), pwzCustomActionData); - ExitOnFailure(hr, "failed to set WixRollbackInternetShortcuts rollback custom action data"); - hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"CreateInternetShortcuts"), pwzCustomActionData); - ExitOnFailure(hr, "failed to set WixCreateInternetShortcuts custom action data"); - } - -LExit: - if (hCreateFolderTable) - { - ::MsiCloseHandle(hCreateFolderTable); - } - - if (hCreateFolderColumns) - { - ::MsiCloseHandle(hCreateFolderColumns); - } - - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzComponent); - ReleaseStr(pwzDirectory); - ReleaseStr(pwzFilename); - ReleaseStr(pwzTarget); - ReleaseStr(pwzShortcutPath); - ReleaseObject(piShellLink); - ReleaseObject(piURL); - - if (fInitializedCom) - { - ::CoUninitialize(); - } - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - - -/****************************************************************** - CreateUrl - Creates a shortcut via IUniformResourceLocatorW - -*******************************************************************/ -static HRESULT CreateUrl( - __in_z LPCWSTR wzTarget, - __in_z LPCWSTR wzShortcutPath, - __in_z_opt LPCWSTR wzIconPath, - __in int iconIndex -) -{ - HRESULT hr = S_OK; - IUniformResourceLocatorW* piURL = NULL; - IPersistFile* piPersistFile = NULL; - IPropertySetStorage* piProperties = NULL; - IPropertyStorage* piStorage = NULL; - - // create an internet shortcut object - WcaLog(LOGMSG_STANDARD, "Creating IUniformResourceLocatorW shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); - hr = ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_ALL, IID_IUniformResourceLocatorW, (void**)&piURL); - ExitOnFailure(hr, "failed to create an instance of IUniformResourceLocatorW"); - - // set shortcut target - hr = piURL->SetURL(wzTarget, 0); - ExitOnFailure(hr, "failed to set shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); - - if (wzIconPath) - { - WcaLog(LOGMSG_STANDARD, "Adding icon '%ls' index '%d'", wzIconPath, iconIndex); - - hr = piURL->QueryInterface(IID_IPropertySetStorage, (void **)&piProperties); - ExitOnFailure(hr, "failed to get IPropertySetStorage for shortcut '%ls'", wzShortcutPath); - - hr = piProperties->Open(FMTID_Intshcut, STGM_WRITE, &piStorage); - ExitOnFailure(hr, "failed to open storage for shortcut '%ls'", wzShortcutPath); - - PROPSPEC ppids[2] = { {PRSPEC_PROPID, PID_IS_ICONINDEX}, {PRSPEC_PROPID, PID_IS_ICONFILE} }; - PROPVARIANT ppvar[2]; - - PropVariantInit(ppvar); - PropVariantInit(ppvar + 1); - - ppvar[0].vt = VT_I4; - ppvar[0].lVal = iconIndex; - ppvar[1].vt = VT_LPWSTR; - ppvar[1].pwszVal = const_cast(wzIconPath); - - hr = piStorage->WriteMultiple(2, ppids, ppvar, 0); - ExitOnFailure(hr, "failed to write icon storage for shortcut '%ls'", wzShortcutPath); - - hr = piStorage->Commit(STGC_DEFAULT); - ExitOnFailure(hr, "failed to commit icon storage for shortcut '%ls'", wzShortcutPath); - } - - // get an IPersistFile and save the shortcut - hr = piURL->QueryInterface(IID_IPersistFile, (void**)&piPersistFile); - ExitOnFailure(hr, "failed to get IPersistFile for shortcut '%ls'", wzShortcutPath); - - hr = piPersistFile->Save(wzShortcutPath, TRUE); - ExitOnFailure(hr, "failed to save shortcut '%ls'", wzShortcutPath); - -LExit: - ReleaseObject(piPersistFile); - ReleaseObject(piURL); - ReleaseObject(piStorage); - ReleaseObject(piProperties); - - return hr; -} - -/****************************************************************** - CreateLink - Creates a shortcut via IShellLinkW - -*******************************************************************/ -static HRESULT CreateLink( - __in_z LPCWSTR wzTarget, - __in_z LPCWSTR wzShortcutPath, - __in_z_opt LPCWSTR wzIconPath, - __in int iconIndex -) -{ - HRESULT hr = S_OK; - IShellLinkW* piShellLink = NULL; - IPersistFile* piPersistFile = NULL; - - // create an internet shortcut object - WcaLog(LOGMSG_STANDARD, "Creating IShellLinkW shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); - hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&piShellLink); - ExitOnFailure(hr, "failed to create an instance of IShellLinkW"); - - // set shortcut target - hr = piShellLink->SetPath(wzTarget); - ExitOnFailure(hr, "failed to set shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); - - if (wzIconPath) - { - WcaLog(LOGMSG_STANDARD, "Adding icon '%ls' index '%d'", wzIconPath, iconIndex); - hr = piShellLink->SetIconLocation(wzIconPath, iconIndex); - ExitOnFailure(hr, "failed to set icon for shortcut '%ls'", wzShortcutPath); - } - - // get an IPersistFile and save the shortcut - hr = piShellLink->QueryInterface(IID_IPersistFile, (void**)&piPersistFile); - ExitOnFailure(hr, "failed to get IPersistFile for shortcut '%ls'", wzShortcutPath); - - hr = piPersistFile->Save(wzShortcutPath, TRUE); - ExitOnFailure(hr, "failed to save shortcut '%ls'", wzShortcutPath); - -LExit: - ReleaseObject(piPersistFile); - ReleaseObject(piShellLink); - - return hr; -} - - - -/****************************************************************** - WixCreateInternetShortcuts - entry point for Internet shortcuts - custom action -*******************************************************************/ -extern "C" UINT __stdcall WixCreateInternetShortcuts( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwz = NULL; - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwzTarget = NULL; - LPWSTR pwzShortcutPath = NULL; - LPWSTR pwzIconPath = NULL; - BOOL fInitializedCom = FALSE; - int iAttr = 0; - int iIconIndex = 0; - - // initialize - hr = WcaInitialize(hInstall, "WixCreateInternetShortcuts"); - ExitOnFailure(hr, "failed to initialize WixCreateInternetShortcuts"); - - hr = ::CoInitialize(NULL); - ExitOnFailure(hr, "failed to initialize COM"); - fInitializedCom = TRUE; - - // extract the custom action data - hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - // loop through all the custom action data - pwz = pwzCustomActionData; - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); - ExitOnFailure(hr, "failed to read shortcut path from custom action data"); - hr = WcaReadStringFromCaData(&pwz, &pwzTarget); - ExitOnFailure(hr, "failed to read shortcut target from custom action data"); - hr = WcaReadIntegerFromCaData(&pwz, &iAttr); - ExitOnFailure(hr, "failed to read shortcut attributes from custom action data"); - hr = WcaReadStringFromCaData(&pwz, &pwzIconPath); - ExitOnFailure(hr, "failed to read shortcut icon path from custom action data"); - hr = WcaReadIntegerFromCaData(&pwz, &iIconIndex); - ExitOnFailure(hr, "failed to read shortcut icon index from custom action data"); - - if ((iAttr & esaURL) == esaURL) - { - hr = CreateUrl(pwzTarget, pwzShortcutPath, pwzIconPath, iIconIndex); - } - else - { - hr = CreateLink(pwzTarget, pwzShortcutPath, pwzIconPath, iIconIndex); - } - ExitOnFailure(hr, "failed to create Internet shortcut"); - - // tick the progress bar - hr = WcaProgressMessage(COST_INTERNETSHORTCUT, FALSE); - ExitOnFailure(hr, "failed to tick progress bar for shortcut: %ls", pwzShortcutPath); - } - -LExit: - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzTarget); - ReleaseStr(pwzShortcutPath); - - if (fInitializedCom) - { - ::CoUninitialize(); - } - - er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er; - return WcaFinalize(er); -} - - - -/****************************************************************** - WixRollbackInternetShortcuts - entry point for Internet shortcuts - custom action (rollback) -*******************************************************************/ -extern "C" UINT __stdcall WixRollbackInternetShortcuts( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwz = NULL; - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwzShortcutPath = NULL; - int iAttr = 0; - - // initialize - hr = WcaInitialize(hInstall, "WixRemoveInternetShortcuts"); - ExitOnFailure(hr, "failed to initialize WixRemoveInternetShortcuts"); - - hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - // loop through all the custom action data - pwz = pwzCustomActionData; - while (pwz && *pwz) - { - // extract the custom action data we're interested in - hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); - ExitOnFailure(hr, "failed to read shortcut path from custom action data for rollback"); - - // delete file - hr = FileEnsureDelete(pwzShortcutPath); - ExitOnFailure(hr, "failed to delete file '%ls'", pwzShortcutPath); - - // skip over the shortcut target and attributes - hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); - ExitOnFailure(hr, "failed to skip shortcut target from custom action data for rollback"); - hr = WcaReadIntegerFromCaData(&pwz, &iAttr); - ExitOnFailure(hr, "failed to read shortcut attributes from custom action data"); - } - -LExit: - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzShortcutPath); - - er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er; - return WcaFinalize(er); -} diff --git a/src/ca/precomp.h b/src/ca/precomp.h deleted file mode 100644 index c5d6afe5..00000000 --- a/src/ca/precomp.h +++ /dev/null @@ -1,54 +0,0 @@ -#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. - - -#if _WIN32_MSI < 150 -#define _WIN32_MSI 150 -#endif - -#include -#include -#include -#include - -#include - -#include -#include -#include -#include // NetApi32.lib -#include -#include -#include -#include - -#define MAXUINT USHRT_MAX - -#include "wcautil.h" -#include "wcawow64.h" -#include "wcawrapquery.h" -#include "aclutil.h" -#include "dirutil.h" -#include "fileutil.h" -#include "memutil.h" -#include "osutil.h" -#include "pathutil.h" -#include "procutil.h" -#include "shelutil.h" -#include "strutil.h" -#include "sczutil.h" -#include "rmutil.h" -#include "userutil.h" -#include "xmlutil.h" -#include "wiutil.h" - -#include "CustomMsiErrors.h" - -#include "sca.h" -#include "scacost.h" -#include "cost.h" -#include "scauser.h" -#include "scasmb.h" -#include "scasmbexec.h" - -#include "caDecor.h" diff --git a/src/ca/qtexecca.cpp b/src/ca/qtexecca.cpp deleted file mode 100644 index ddcc812f..00000000 --- a/src/ca/qtexecca.cpp +++ /dev/null @@ -1,316 +0,0 @@ -// 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" - -#define OUTPUT_BUFFER 1024 - -// These old "CA" prefix names are deprecated, and intended to go away in wix 4.0, only staying now for compatibility reasons -const LPCWSTR CAQUIET_TIMEOUT_PROPERTY = L"QtExecCmdTimeout"; -const LPCWSTR CAQUIET_ARGUMENTS_PROPERTY = L"QtExecCmdLine"; -const LPCWSTR CAQUIET64_ARGUMENTS_PROPERTY = L"QtExec64CmdLine"; -// end deprecated section - -// WixCA name quiet commandline argument properties -const LPCWSTR WIX_QUIET_ARGUMENTS_PROPERTY = L"WixQuietExecCmdLine"; -const LPCWSTR WIX_QUIET64_ARGUMENTS_PROPERTY = L"WixQuietExec64CmdLine"; - -// WixCA quiet timeout properties -const LPCWSTR WIX_QUIET_TIMEOUT_PROPERTY = L"WixQuietExecCmdTimeout"; -const LPCWSTR WIX_QUIET64_TIMEOUT_PROPERTY = L"WixQuietExec64CmdTimeout"; - -// WixCA silent commandline argument properties -const LPCWSTR WIX_SILENT_ARGUMENTS_PROPERTY = L"WixSilentExecCmdLine"; -const LPCWSTR WIX_SILENT64_ARGUMENTS_PROPERTY = L"WixSilentExec64CmdLine"; - -// WixCA silent timeout properties -const LPCWSTR WIX_SILENT_TIMEOUT_PROPERTY = L"WixSilentExecCmdTimeout"; -const LPCWSTR WIX_SILENT64_TIMEOUT_PROPERTY = L"WixSilentExec64CmdTimeout"; - -HRESULT BuildCommandLine( - __in LPCWSTR wzProperty, - __out LPWSTR *ppwzCommand - ) -{ - Assert(ppwzCommand); - - HRESULT hr = S_OK; - BOOL fScheduled = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_SCHEDULED); - BOOL fRollback = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_ROLLBACK); - BOOL fCommit = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_COMMIT); - - if (fScheduled || fRollback || fCommit) - { - if (WcaIsPropertySet("CustomActionData")) - { - hr = WcaGetProperty( L"CustomActionData", ppwzCommand); - ExitOnFailure(hr, "Failed to get CustomActionData"); - } - } - else if (WcaIsUnicodePropertySet(wzProperty)) - { - hr = WcaGetFormattedProperty(wzProperty, ppwzCommand); - ExitOnFailure(hr, "Failed to get %ls", wzProperty); - hr = WcaSetProperty(wzProperty, L""); // clear out the property now that we've read it - ExitOnFailure(hr, "Failed to set %ls", wzProperty); - } - - if (!*ppwzCommand) - { - ExitOnFailure(hr = E_INVALIDARG, "Failed to get command line data"); - } - - if (L'"' != **ppwzCommand) - { - WcaLog(LOGMSG_STANDARD, "Command string must begin with quoted application name."); - ExitOnFailure(hr = E_INVALIDARG, "invalid command line property value"); - } - -LExit: - return hr; -} - -#define ONEMINUTE 60000 - -DWORD GetTimeout(LPCWSTR wzPropertyName) -{ - DWORD dwTimeout = ONEMINUTE; - HRESULT hr = S_OK; - - LPWSTR pwzData = NULL; - - if (WcaIsUnicodePropertySet(wzPropertyName)) - { - hr = WcaGetProperty(wzPropertyName, &pwzData); - ExitOnFailure(hr, "Failed to get %ls", wzPropertyName); - - if ((dwTimeout = (DWORD)_wtoi(pwzData)) == 0) - { - dwTimeout = ONEMINUTE; - } - } - -LExit: - ReleaseStr(pwzData); - - return dwTimeout; - -} - -HRESULT ExecCommon( - __in LPCWSTR wzArgumentsProperty, - __in LPCWSTR wzTimeoutProperty, - __in BOOL fLogCommand, - __in BOOL fLogOutput - ) -{ - HRESULT hr = S_OK; - LPWSTR pwzCommand = NULL; - DWORD dwTimeout = 0; - - hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); - ExitOnFailure(hr, "Failed to get Command Line"); - - dwTimeout = GetTimeout(wzTimeoutProperty); - - hr = QuietExec(pwzCommand, dwTimeout, fLogCommand, fLogOutput); - ExitOnFailure(hr, "QuietExec Failed"); - -LExit: - ReleaseStr(pwzCommand); - - return hr; -} - -HRESULT ExecCommon64( - __in LPCWSTR wzArgumentsProperty, - __in LPCWSTR wzTimeoutProperty, - __in BOOL fLogCommand, - __in BOOL fLogOutput - ) -{ - HRESULT hr = S_OK; - LPWSTR pwzCommand = NULL; - DWORD dwTimeout = 0; -#ifndef _WIN64 - BOOL fIsWow64Initialized = FALSE; - BOOL fRedirected = FALSE; - - hr = WcaInitializeWow64(); - if (S_FALSE == hr) - { - hr = TYPE_E_DLLFUNCTIONNOTFOUND; - } - ExitOnFailure(hr, "Failed to intialize WOW64."); - fIsWow64Initialized = TRUE; - - hr = WcaDisableWow64FSRedirection(); - ExitOnFailure(hr, "Failed to enable filesystem redirection."); - fRedirected = TRUE; -#endif - - hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); - ExitOnFailure(hr, "Failed to get Command Line"); - - dwTimeout = GetTimeout(wzTimeoutProperty); - - hr = QuietExec(pwzCommand, dwTimeout, fLogCommand, fLogOutput); - ExitOnFailure(hr, "QuietExec64 Failed"); - -LExit: - ReleaseStr(pwzCommand); - -#ifndef _WIN64 - if (fRedirected) - { - WcaRevertWow64FSRedirection(); - } - - if (fIsWow64Initialized) - { - WcaFinalizeWow64(); - } -#endif - - return hr; -} - -// These two custom actions are deprecated, and should go away in wix v4.0. WixQuietExec replaces this one, -// and is not intended to have any difference in behavior apart from CA name and property names. -extern "C" UINT __stdcall CAQuietExec( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "CAQuietExec"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ExecCommon(CAQUIET_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); - ExitOnFailure(hr, "Failed in ExecCommon method"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - -// 2nd deprecated custom action name, superseded by WixQuietExec64 -extern "C" UINT __stdcall CAQuietExec64( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "CAQuietExec64"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ExecCommon64(CAQUIET64_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); - ExitOnFailure(hr, "Failed in ExecCommon64 method"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - -extern "C" UINT __stdcall WixQuietExec( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixQuietExec"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ExecCommon(WIX_QUIET_ARGUMENTS_PROPERTY, WIX_QUIET_TIMEOUT_PROPERTY, TRUE, TRUE); - ExitOnFailure(hr, "Failed in ExecCommon method"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - -extern "C" UINT __stdcall WixQuietExec64( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixQuietExec64"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ExecCommon64(WIX_QUIET64_ARGUMENTS_PROPERTY, WIX_QUIET64_TIMEOUT_PROPERTY, TRUE, TRUE); - ExitOnFailure(hr, "Failed in ExecCommon method"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - -extern "C" UINT __stdcall WixSilentExec( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixSilentExec"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ExecCommon(WIX_SILENT_ARGUMENTS_PROPERTY, WIX_SILENT_TIMEOUT_PROPERTY, FALSE, FALSE); - ExitOnFailure(hr, "Failed in ExecCommon method"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - -extern "C" UINT __stdcall WixSilentExec64( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "WixSilentExec64"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ExecCommon64(WIX_SILENT64_ARGUMENTS_PROPERTY, WIX_SILENT64_TIMEOUT_PROPERTY, FALSE, FALSE); - ExitOnFailure(hr, "Failed in ExecCommon method"); - -LExit: - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} diff --git a/src/ca/sca.h b/src/ca/sca.h deleted file mode 100644 index 599122ff..00000000 --- a/src/ca/sca.h +++ /dev/null @@ -1,19 +0,0 @@ -#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. - -// user creation attributes definitions -enum SCAU_ATTRIBUTES -{ - SCAU_DONT_EXPIRE_PASSWRD = 0x00000001, - SCAU_PASSWD_CANT_CHANGE = 0x00000002, - SCAU_PASSWD_CHANGE_REQD_ON_LOGIN = 0x00000004, - SCAU_DISABLE_ACCOUNT = 0x00000008, - SCAU_FAIL_IF_EXISTS = 0x00000010, - SCAU_UPDATE_IF_EXISTS = 0x00000020, - SCAU_ALLOW_LOGON_AS_SERVICE = 0x00000040, - SCAU_ALLOW_LOGON_AS_BATCH = 0x00000080, - - SCAU_DONT_REMOVE_ON_UNINSTALL = 0x00000100, - SCAU_DONT_CREATE_USER = 0x00000200, - SCAU_NON_VITAL = 0x00000400, -}; \ No newline at end of file diff --git a/src/ca/scacost.h b/src/ca/scacost.h deleted file mode 100644 index 5b215035..00000000 --- a/src/ca/scacost.h +++ /dev/null @@ -1,18 +0,0 @@ -#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. - - -const UINT COST_PERFMON_REGISTER = 1000; -const UINT COST_PERFMON_UNREGISTER = 1000; - -const UINT COST_SMB_CREATESMB = 10000; -const UINT COST_SMB_DROPSMB = 5000; -const UINT COST_USER_ADD = 10000; -const UINT COST_USER_DELETE = 10000; - -const UINT COST_PERFMONMANIFEST_REGISTER = 1000; -const UINT COST_PERFMONMANIFEST_UNREGISTER = 1000; - -const UINT COST_EVENTMANIFEST_REGISTER = 1000; -const UINT COST_EVENTMANIFEST_UNREGISTER = 1000; - diff --git a/src/ca/scaexec.cpp b/src/ca/scaexec.cpp deleted file mode 100644 index 5845c1b4..00000000 --- a/src/ca/scaexec.cpp +++ /dev/null @@ -1,1082 +0,0 @@ -// 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" - - -/******************************************************************** - * CreateSmb - CUSTOM ACTION ENTRY POINT for creating fileshares - * - * Input: deferred CustomActionData - - * wzFsKey\twzShareDesc\twzFullPath\tfIntegratedAuth\twzUserName\tnPermissions\twzUserName\tnPermissions... - * - * ****************************************************************/ -extern "C" UINT __stdcall CreateSmb(MSIHANDLE hInstall) -{ -//AssertSz(0, "debug CreateSmb"); - UINT er = ERROR_SUCCESS; - HRESULT hr = S_OK; - - LPWSTR pwzData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzFsKey = NULL; - LPWSTR pwzShareDesc = NULL; - LPWSTR pwzDirectory = NULL; - int iAccessMode = 0; - DWORD nExPermissions = 0; - BOOL fIntegratedAuth; - LPWSTR pwzExUser = NULL; - SCA_SMBP ssp = {0}; - DWORD dwExUserPerms = 0; - DWORD dwCounter = 0; - SCA_SMBP_USER_PERMS* pUserPermsList = NULL; - - hr = WcaInitialize(hInstall, "CreateSmb"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty( L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - pwz = pwzData; - hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name - ExitOnFailure(hr, "failed to read share name"); - hr = WcaReadStringFromCaData(&pwz, &pwzShareDesc); // share description - ExitOnFailure(hr, "failed to read share name"); - hr = WcaReadStringFromCaData(&pwz, &pwzDirectory); // full path to share - ExitOnFailure(hr, "failed to read share name"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&fIntegratedAuth)); - ExitOnFailure(hr, "failed to read integrated authentication"); - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwExUserPerms)); - ExitOnFailure(hr, "failed to read count of permissions to set"); - if(dwExUserPerms > 0) - { - pUserPermsList = static_cast(MemAlloc(sizeof(SCA_SMBP_USER_PERMS)*dwExUserPerms, TRUE)); - ExitOnNull(pUserPermsList, hr, E_OUTOFMEMORY, "failed to allocate memory for permissions structure"); - - //Pull out all of the ExUserPerm strings - for (dwCounter = 0; dwCounter < dwExUserPerms; ++dwCounter) - { - hr = WcaReadStringFromCaData(&pwz, &pwzExUser); // user account - ExitOnFailure(hr, "failed to read user account"); - pUserPermsList[dwCounter].wzUser = pwzExUser; - pwzExUser = NULL; - - hr = WcaReadIntegerFromCaData(&pwz, &iAccessMode); - ExitOnFailure(hr, "failed to read access mode"); - pUserPermsList[dwCounter].accessMode = (ACCESS_MODE)iAccessMode; - iAccessMode = 0; - - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&nExPermissions)); - ExitOnFailure(hr, "failed to read count of permissions"); - pUserPermsList[dwCounter].nPermissions = nExPermissions; - nExPermissions = 0; - } - } - - ssp.wzKey = pwzFsKey; - ssp.wzDescription = pwzShareDesc; - ssp.wzDirectory = pwzDirectory; - ssp.fUseIntegratedAuth = fIntegratedAuth; - ssp.dwUserPermissionCount = dwExUserPerms; - ssp.pUserPerms = pUserPermsList; - - hr = ScaEnsureSmbExists(&ssp); - MessageExitOnFailure(hr, msierrSMBFailedCreate, "failed to create share: '%ls'", pwzFsKey); - - hr = WcaProgressMessage(COST_SMB_CREATESMB, FALSE); - -LExit: - ReleaseStr(pwzFsKey); - ReleaseStr(pwzShareDesc); - ReleaseStr(pwzDirectory); - ReleaseStr(pwzData); - - if (pUserPermsList) - { - MemFree(pUserPermsList); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - - - -/******************************************************************** - DropSmb - CUSTOM ACTION ENTRY POINT for creating fileshares - - Input: deferred CustomActionData - wzFsKey\twzShareDesc\twzFullPath\tnPermissions\tfIntegratedAuth\twzUserName\twzPassword - - * ****************************************************************/ -extern "C" UINT __stdcall DropSmb(MSIHANDLE hInstall) -{ - //AssertSz(0, "debug DropSmb"); - UINT er = ERROR_SUCCESS; - HRESULT hr = S_OK; - - LPWSTR pwzData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzFsKey = NULL; - SCA_SMBP ssp = {0}; - - hr = WcaInitialize(hInstall, "DropSmb"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty( L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - pwz = pwzData; - hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name - ExitOnFailure(hr, "failed to read share name"); - - ssp.wzKey = pwzFsKey; - - hr = ScaDropSmb(&ssp); - MessageExitOnFailure(hr, msierrSMBFailedDrop, "failed to delete share: '%ls'", pwzFsKey); - - hr = WcaProgressMessage(COST_SMB_DROPSMB, FALSE); - -LExit: - ReleaseStr(pwzFsKey); - ReleaseStr(pwzData); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - - -static HRESULT AddUserToGroup( - __in LPWSTR wzUser, - __in LPCWSTR wzUserDomain, - __in LPCWSTR wzGroup, - __in LPCWSTR wzGroupDomain - ) -{ - Assert(wzUser && *wzUser && wzUserDomain && wzGroup && *wzGroup && wzGroupDomain); - - HRESULT hr = S_OK; - IADsGroup *pGroup = NULL; - BSTR bstrUser = NULL; - BSTR bstrGroup = NULL; - LPCWSTR wz = NULL; - LPWSTR pwzUser = NULL; - LOCALGROUP_MEMBERS_INFO_3 lgmi; - - if (*wzGroupDomain) - { - wz = wzGroupDomain; - } - - // Try adding it to the global group first - UINT ui = ::NetGroupAddUser(wz, wzGroup, wzUser); - if (NERR_GroupNotFound == ui) - { - // Try adding it to the local group - if (wzUserDomain) - { - hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzUserDomain, wzUser); - ExitOnFailure(hr, "failed to allocate user domain string"); - } - - lgmi.lgrmi3_domainandname = (NULL == pwzUser ? wzUser : pwzUser); - ui = ::NetLocalGroupAddMembers(wz, wzGroup, 3 , reinterpret_cast(&lgmi), 1); - } - hr = HRESULT_FROM_WIN32(ui); - if (HRESULT_FROM_WIN32(ERROR_MEMBER_IN_ALIAS) == hr) // if they're already a member of the group don't report an error - hr = S_OK; - - // - // If we failed, try active directory - // - if (FAILED(hr)) - { - WcaLog(LOGMSG_VERBOSE, "Failed to add user: %ls, domain %ls to group: %ls, domain: %ls with error 0x%x. Attempting to use Active Directory", wzUser, wzUserDomain, wzGroup, wzGroupDomain, hr); - - hr = UserCreateADsPath(wzUserDomain, wzUser, &bstrUser); - ExitOnFailure(hr, "failed to create user ADsPath for user: %ls domain: %ls", wzUser, wzUserDomain); - - hr = UserCreateADsPath(wzGroupDomain, wzGroup, &bstrGroup); - ExitOnFailure(hr, "failed to create group ADsPath for group: %ls domain: %ls", wzGroup, wzGroupDomain); - - hr = ::ADsGetObject(bstrGroup,IID_IADsGroup, reinterpret_cast(&pGroup)); - ExitOnFailure(hr, "Failed to get group '%ls'.", reinterpret_cast(bstrGroup) ); - - hr = pGroup->Add(bstrUser); - if ((HRESULT_FROM_WIN32(ERROR_OBJECT_ALREADY_EXISTS) == hr) || (HRESULT_FROM_WIN32(ERROR_MEMBER_IN_ALIAS) == hr)) - hr = S_OK; - - ExitOnFailure(hr, "Failed to add user %ls to group '%ls'.", reinterpret_cast(bstrUser), reinterpret_cast(bstrGroup) ); - } - -LExit: - ReleaseObject(pGroup); - ReleaseBSTR(bstrUser); - ReleaseBSTR(bstrGroup); - - return hr; -} - -static HRESULT RemoveUserFromGroup( - __in LPWSTR wzUser, - __in LPCWSTR wzUserDomain, - __in LPCWSTR wzGroup, - __in LPCWSTR wzGroupDomain - ) -{ - Assert(wzUser && *wzUser && wzUserDomain && wzGroup && *wzGroup && wzGroupDomain); - - HRESULT hr = S_OK; - IADsGroup *pGroup = NULL; - BSTR bstrUser = NULL; - BSTR bstrGroup = NULL; - LPCWSTR wz = NULL; - LPWSTR pwzUser = NULL; - LOCALGROUP_MEMBERS_INFO_3 lgmi; - - if (*wzGroupDomain) - { - wz = wzGroupDomain; - } - - // Try removing it from the global group first - UINT ui = ::NetGroupDelUser(wz, wzGroup, wzUser); - if (NERR_GroupNotFound == ui) - { - // Try removing it from the local group - if (wzUserDomain) - { - hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzUserDomain, wzUser); - ExitOnFailure(hr, "failed to allocate user domain string"); - } - - lgmi.lgrmi3_domainandname = (NULL == pwzUser ? wzUser : pwzUser); - ui = ::NetLocalGroupDelMembers(wz, wzGroup, 3 , reinterpret_cast(&lgmi), 1); - } - hr = HRESULT_FROM_WIN32(ui); - - // - // If we failed, try active directory - // - if (FAILED(hr)) - { - WcaLog(LOGMSG_VERBOSE, "Failed to remove user: %ls, domain %ls from group: %ls, domain: %ls with error 0x%x. Attempting to use Active Directory", wzUser, wzUserDomain, wzGroup, wzGroupDomain, hr); - - hr = UserCreateADsPath(wzUserDomain, wzUser, &bstrUser); - ExitOnFailure(hr, "failed to create user ADsPath in order to remove user: %ls domain: %ls from a group", wzUser, wzUserDomain); - - hr = UserCreateADsPath(wzGroupDomain, wzGroup, &bstrGroup); - ExitOnFailure(hr, "failed to create group ADsPath in order to remove user from group: %ls domain: %ls", wzGroup, wzGroupDomain); - - hr = ::ADsGetObject(bstrGroup,IID_IADsGroup, reinterpret_cast(&pGroup)); - ExitOnFailure(hr, "Failed to get group '%ls'.", reinterpret_cast(bstrGroup) ); - - hr = pGroup->Remove(bstrUser); - ExitOnFailure(hr, "Failed to remove user %ls from group '%ls'.", reinterpret_cast(bstrUser), reinterpret_cast(bstrGroup) ); - } - -LExit: - ReleaseObject(pGroup); - ReleaseBSTR(bstrUser); - ReleaseBSTR(bstrGroup); - - return hr; -} - - -static HRESULT GetUserHasRight( - __in LSA_HANDLE hPolicy, - __in PSID pUserSid, - __in LPWSTR wzRight, - __out BOOL* fHasRight -) -{ - HRESULT hr = S_OK; - NTSTATUS nt = 0; - LSA_UNICODE_STRING lucPrivilege = { 0 }; - PLSA_ENUMERATION_INFORMATION rgSids = NULL; - ULONG cSids = 0; - *fHasRight = FALSE; - - lucPrivilege.Buffer = wzRight; - lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); - lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); - - nt = ::LsaEnumerateAccountsWithUserRight(hPolicy, &lucPrivilege, reinterpret_cast(&rgSids), &cSids); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to enumerate users for right: %ls", lucPrivilege.Buffer); - - for (DWORD i = 0; i < cSids; ++i) - { - PLSA_ENUMERATION_INFORMATION pInfo = rgSids + i; - if (::EqualSid(pUserSid, pInfo->Sid)) - { - *fHasRight = TRUE; - break; - } - } - -LExit: - if (rgSids) - { - ::LsaFreeMemory(rgSids); - } - - return hr; -} - - -static HRESULT GetExistingUserRightsAssignments( - __in_opt LPCWSTR wzDomain, - __in LPCWSTR wzName, - __inout int* iAttributes -) -{ - HRESULT hr = S_OK; - NTSTATUS nt = 0; - BOOL fHasRight = FALSE; - - LSA_HANDLE hPolicy = NULL; - LSA_OBJECT_ATTRIBUTES objectAttributes = { 0 }; - - LPWSTR pwzUser = NULL; - PSID psid = NULL; - - if (wzDomain && *wzDomain) - { - hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); - ExitOnFailure(hr, "Failed to allocate user with domain string"); - } - else - { - hr = StrAllocString(&pwzUser, wzName, 0); - ExitOnFailure(hr, "Failed to allocate string from user name."); - } - - hr = AclGetAccountSid(NULL, pwzUser, &psid); - ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); - - nt = ::LsaOpenPolicy(NULL, &objectAttributes, POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, &hPolicy); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to open LSA policy store"); - - hr = GetUserHasRight(hPolicy, psid, L"SeServiceLogonRight", &fHasRight); - ExitOnFailure(hr, "Failed to check LogonAsService right"); - - if (fHasRight) - { - *iAttributes |= SCAU_ALLOW_LOGON_AS_SERVICE; - } - - hr = GetUserHasRight(hPolicy, psid, L"SeBatchLogonRight", &fHasRight); - ExitOnFailure(hr, "Failed to check LogonAsBatchJob right"); - - if (fHasRight) - { - *iAttributes |= SCAU_ALLOW_LOGON_AS_BATCH; - } - -LExit: - if (hPolicy) - { - ::LsaClose(hPolicy); - } - - ReleaseSid(psid); - ReleaseStr(pwzUser); - return hr; -} - - -static HRESULT ModifyUserLocalServiceRight( - __in_opt LPCWSTR wzDomain, - __in LPCWSTR wzName, - __in BOOL fAdd - ) -{ - HRESULT hr = S_OK; - NTSTATUS nt = 0; - - LPWSTR pwzUser = NULL; - PSID psid = NULL; - LSA_HANDLE hPolicy = NULL; - LSA_OBJECT_ATTRIBUTES ObjectAttributes = { 0 }; - LSA_UNICODE_STRING lucPrivilege = { 0 }; - - if (wzDomain && *wzDomain) - { - hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); - ExitOnFailure(hr, "Failed to allocate user with domain string"); - } - else - { - hr = StrAllocString(&pwzUser, wzName, 0); - ExitOnFailure(hr, "Failed to allocate string from user name."); - } - - hr = AclGetAccountSid(NULL, pwzUser, &psid); - ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); - - nt = ::LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_ALL_ACCESS, &hPolicy); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to open LSA policy store."); - - lucPrivilege.Buffer = L"SeServiceLogonRight"; - lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); - lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); - - if (fAdd) - { - nt = ::LsaAddAccountRights(hPolicy, psid, &lucPrivilege, 1); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to add 'logon as service' bit to user: %ls", pwzUser); - } - else - { - nt = ::LsaRemoveAccountRights(hPolicy, psid, FALSE, &lucPrivilege, 1); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to remove 'logon as service' bit from user: %ls", pwzUser); - } - -LExit: - if (hPolicy) - { - ::LsaClose(hPolicy); - } - - ReleaseSid(psid); - ReleaseStr(pwzUser); - return hr; -} - - -static HRESULT ModifyUserLocalBatchRight( - __in_opt LPCWSTR wzDomain, - __in LPCWSTR wzName, - __in BOOL fAdd - ) -{ - HRESULT hr = S_OK; - NTSTATUS nt = 0; - - LPWSTR pwzUser = NULL; - PSID psid = NULL; - LSA_HANDLE hPolicy = NULL; - LSA_OBJECT_ATTRIBUTES ObjectAttributes = { 0 }; - LSA_UNICODE_STRING lucPrivilege = { 0 }; - - if (wzDomain && *wzDomain) - { - hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); - ExitOnFailure(hr, "Failed to allocate user with domain string"); - } - else - { - hr = StrAllocString(&pwzUser, wzName, 0); - ExitOnFailure(hr, "Failed to allocate string from user name."); - } - - hr = AclGetAccountSid(NULL, pwzUser, &psid); - ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); - - nt = ::LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_ALL_ACCESS, &hPolicy); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to open LSA policy store."); - - lucPrivilege.Buffer = L"SeBatchLogonRight"; - lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); - lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); - - if (fAdd) - { - nt = ::LsaAddAccountRights(hPolicy, psid, &lucPrivilege, 1); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to add 'logon as batch job' bit to user: %ls", pwzUser); - } - else - { - nt = ::LsaRemoveAccountRights(hPolicy, psid, FALSE, &lucPrivilege, 1); - hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); - ExitOnFailure(hr, "Failed to remove 'logon as batch job' bit from user: %ls", pwzUser); - } - - LExit: - if (hPolicy) - { - ::LsaClose(hPolicy); - } - - ReleaseSid(psid); - ReleaseStr(pwzUser); - return hr; -} - -static void SetUserPasswordAndAttributes( - __in USER_INFO_1* puserInfo, - __in LPWSTR wzPassword, - __in int iAttributes - ) -{ - Assert(puserInfo); - - // Set the User's password - puserInfo->usri1_password = wzPassword; - - // Apply the Attributes - if (SCAU_DONT_EXPIRE_PASSWRD & iAttributes) - { - puserInfo->usri1_flags |= UF_DONT_EXPIRE_PASSWD; - } - else - { - puserInfo->usri1_flags &= ~UF_DONT_EXPIRE_PASSWD; - } - - if (SCAU_PASSWD_CANT_CHANGE & iAttributes) - { - puserInfo->usri1_flags |= UF_PASSWD_CANT_CHANGE; - } - else - { - puserInfo->usri1_flags &= ~UF_PASSWD_CANT_CHANGE; - } - - if (SCAU_DISABLE_ACCOUNT & iAttributes) - { - puserInfo->usri1_flags |= UF_ACCOUNTDISABLE; - } - else - { - puserInfo->usri1_flags &= ~UF_ACCOUNTDISABLE; - } - - if (SCAU_PASSWD_CHANGE_REQD_ON_LOGIN & iAttributes) // TODO: for some reason this doesn't work - { - puserInfo->usri1_flags |= UF_PASSWORD_EXPIRED; - } - else - { - puserInfo->usri1_flags &= ~UF_PASSWORD_EXPIRED; - } -} - - -static HRESULT RemoveUserInternal( - LPWSTR wzGroupCaData, - LPWSTR wzDomain, - LPWSTR wzName, - int iAttributes -) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwz = NULL; - LPWSTR pwzGroup = NULL; - LPWSTR pwzGroupDomain = NULL; - LPCWSTR wz = NULL; - PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; - - // - // Remove the logon as service privilege. - // - if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) - { - hr = ModifyUserLocalServiceRight(wzDomain, wzName, FALSE); - if (FAILED(hr)) - { - WcaLogError(hr, "Failed to remove logon as service right from user, continuing..."); - hr = S_OK; - } - } - - if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) - { - hr = ModifyUserLocalBatchRight(wzDomain, wzName, FALSE); - if (FAILED(hr)) - { - WcaLogError(hr, "Failed to remove logon as batch job right from user, continuing..."); - hr = S_OK; - } - } - - // - // Remove the User Account if the user was created by us. - // - if (!(SCAU_DONT_CREATE_USER & iAttributes)) - { - if (wzDomain && *wzDomain) - { - er = ::DsGetDcNameW(NULL, (LPCWSTR)wzDomain, NULL, NULL, NULL, &pDomainControllerInfo); - if (RPC_S_SERVER_UNAVAILABLE == er) - { - // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag - er = ::DsGetDcNameW(NULL, (LPCWSTR)wzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo); - } - if (ERROR_SUCCESS == er) - { - wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix - } - else - { - wz = wzDomain; - } - } - - er = ::NetUserDel(wz, wzName); - if (NERR_UserNotFound == er) - { - er = NERR_Success; - } - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to delete user account: %ls", wzName); - } - else - { - // - // Remove the user from the groups - // - pwz = wzGroupCaData; - while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) - { - hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); - - if (FAILED(hr)) - { - WcaLogError(hr, "failed to get domain for group: %ls, continuing anyway.", pwzGroup); - } - else - { - hr = RemoveUserFromGroup(wzName, wzDomain, pwzGroup, pwzGroupDomain); - if (FAILED(hr)) - { - WcaLogError(hr, "failed to remove user: %ls from group %ls, continuing anyway.", wzName, pwzGroup); - } - } - } - - if (E_NOMOREITEMS == hr) // if there are no more items, all is well - { - hr = S_OK; - } - - ExitOnFailure(hr, "failed to get next group from which to remove user:%ls", wzName); - } - -LExit: - if (pDomainControllerInfo) - { - ::NetApiBufferFree(static_cast(pDomainControllerInfo)); - } - - return hr; -} - - -/******************************************************************** - CreateUser - CUSTOM ACTION ENTRY POINT for creating users - - Input: deferred CustomActionData - UserName\tDomain\tPassword\tAttributes\tGroupName\tDomain\tGroupName\tDomain... - * *****************************************************************/ -extern "C" UINT __stdcall CreateUser( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(0, "Debug CreateUser"); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzName = NULL; - LPWSTR pwzDomain = NULL; - LPWSTR pwzScriptKey = NULL; - LPWSTR pwzPassword = NULL; - LPWSTR pwzGroup = NULL; - LPWSTR pwzGroupDomain = NULL; - PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; - int iAttributes = 0; - BOOL fInitializedCom = FALSE; - - WCA_CASCRIPT_HANDLE hRollbackScript = NULL; - int iOriginalAttributes = 0; - int iRollbackAttributes = 0; - - USER_INFO_1 userInfo; - USER_INFO_1* puserInfo = NULL; - DWORD dw; - LPCWSTR wz = NULL; - - hr = WcaInitialize(hInstall, "CreateUser"); - ExitOnFailure(hr, "failed to initialize"); - - hr = ::CoInitialize(NULL); - ExitOnFailure(hr, "failed to initialize COM"); - fInitializedCom = TRUE; - - hr = WcaGetProperty( L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - // - // Read in the CustomActionData - // - pwz = pwzData; - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to read user name from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzDomain); - ExitOnFailure(hr, "failed to read domain from custom action data"); - - hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); - ExitOnFailure(hr, "failed to read attributes from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); - ExitOnFailure(hr, "failed to read encoding key from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzPassword); - ExitOnFailure(hr, "failed to read password from custom action data"); - - // There is no rollback scheduled if the key is empty. - // Best effort to get original configuration and save it in the script so rollback can restore it. - if (*pwzScriptKey) - { - hr = WcaCaScriptCreate(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, FALSE, &hRollbackScript); - ExitOnFailure(hr, "Failed to open rollback CustomAction script."); - - iRollbackAttributes = 0; - hr = GetExistingUserRightsAssignments(pwzDomain, pwzName, &iOriginalAttributes); - if (FAILED(hr)) - { - WcaLogError(hr, "failed to get existing user rights: %ls, continuing anyway.", pwzName); - } - else - { - if (!(SCAU_ALLOW_LOGON_AS_SERVICE & iOriginalAttributes) && (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes)) - { - iRollbackAttributes |= SCAU_ALLOW_LOGON_AS_SERVICE; - } - if (!(SCAU_ALLOW_LOGON_AS_BATCH & iOriginalAttributes) && (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes)) - { - iRollbackAttributes |= SCAU_ALLOW_LOGON_AS_BATCH; - } - } - - hr = WcaCaScriptWriteNumber(hRollbackScript, iRollbackAttributes); - ExitOnFailure(hr, "Failed to add data to rollback script."); - - // Nudge the system to get all our rollback data written to disk. - WcaCaScriptFlush(hRollbackScript); - } - - if (!(SCAU_DONT_CREATE_USER & iAttributes)) - { - ::ZeroMemory(&userInfo, sizeof(USER_INFO_1)); - userInfo.usri1_name = pwzName; - userInfo.usri1_priv = USER_PRIV_USER; - userInfo.usri1_flags = UF_SCRIPT; - userInfo.usri1_home_dir = NULL; - userInfo.usri1_comment = NULL; - userInfo.usri1_script_path = NULL; - - SetUserPasswordAndAttributes(&userInfo, pwzPassword, iAttributes); - - // - // Create the User - // - if (pwzDomain && *pwzDomain) - { - er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, NULL, &pDomainControllerInfo ); - if (RPC_S_SERVER_UNAVAILABLE == er) - { - // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag - er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo ); - } - if (ERROR_SUCCESS == er) - { - wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix - } - else - { - wz = pwzDomain; - } - } - - er = ::NetUserAdd(wz, 1, reinterpret_cast(&userInfo), &dw); - if (NERR_UserExists == er) - { - if (SCAU_UPDATE_IF_EXISTS & iAttributes) - { - er = ::NetUserGetInfo(wz, pwzName, 1, reinterpret_cast(&puserInfo)); - if (NERR_Success == er) - { - // Change the existing user's password and attributes again then try - // to update user with this new data - SetUserPasswordAndAttributes(puserInfo, pwzPassword, iAttributes); - - er = ::NetUserSetInfo(wz, pwzName, 1, reinterpret_cast(puserInfo), &dw); - } - } - else if (!(SCAU_FAIL_IF_EXISTS & iAttributes)) - { - er = NERR_Success; - } - } - else if (NERR_PasswordTooShort == er || NERR_PasswordTooLong == er) - { - MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrUSRFailedUserCreatePswd, "failed to create user: %ls due to invalid password.", pwzName); - } - MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrUSRFailedUserCreate, "failed to create user: %ls", pwzName); - } - - if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) - { - hr = ModifyUserLocalServiceRight(pwzDomain, pwzName, TRUE); - MessageExitOnFailure(hr, msierrUSRFailedGrantLogonAsService, "Failed to grant logon as service rights to user: %ls", pwzName); - } - - if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) - { - hr = ModifyUserLocalBatchRight(pwzDomain, pwzName, TRUE); - MessageExitOnFailure(hr, msierrUSRFailedGrantLogonAsService, "Failed to grant logon as batch job rights to user: %ls", pwzName); - } - - // - // Add the users to groups - // - while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) - { - hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); - ExitOnFailure(hr, "failed to get domain for group: %ls", pwzGroup); - - hr = AddUserToGroup(pwzName, pwzDomain, pwzGroup, pwzGroupDomain); - MessageExitOnFailure(hr, msierrUSRFailedUserGroupAdd, "failed to add user: %ls to group %ls", pwzName, pwzGroup); - } - if (E_NOMOREITEMS == hr) // if there are no more items, all is well - { - hr = S_OK; - } - ExitOnFailure(hr, "failed to get next group in which to include user:%ls", pwzName); - -LExit: - WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_PRESERVE); - - if (puserInfo) - { - ::NetApiBufferFree((LPVOID)puserInfo); - } - - if (pDomainControllerInfo) - { - ::NetApiBufferFree((LPVOID)pDomainControllerInfo); - } - - ReleaseStr(pwzData); - ReleaseStr(pwzName); - ReleaseStr(pwzDomain); - ReleaseStr(pwzScriptKey); - ReleaseStr(pwzPassword); - ReleaseStr(pwzGroup); - ReleaseStr(pwzGroupDomain); - - if (fInitializedCom) - { - ::CoUninitialize(); - } - - if (SCAU_NON_VITAL & iAttributes) - { - er = ERROR_SUCCESS; - } - else if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - - -/******************************************************************** - CreateUserRollback - CUSTOM ACTION ENTRY POINT for CreateUser rollback - - * *****************************************************************/ -extern "C" UINT __stdcall CreateUserRollback( - MSIHANDLE hInstall -) -{ - //AssertSz(0, "Debug CreateUserRollback"); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzName = NULL; - LPWSTR pwzDomain = NULL; - LPWSTR pwzScriptKey = NULL; - int iAttributes = 0; - BOOL fInitializedCom = FALSE; - - WCA_CASCRIPT_HANDLE hRollbackScript = NULL; - LPWSTR pwzRollbackData = NULL; - int iOriginalAttributes = 0; - - hr = WcaInitialize(hInstall, "CreateUserRollback"); - ExitOnFailure(hr, "failed to initialize"); - - hr = ::CoInitialize(NULL); - ExitOnFailure(hr, "failed to initialize COM"); - fInitializedCom = TRUE; - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - // - // Read in the CustomActionData - // - pwz = pwzData; - hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); - ExitOnFailure(hr, "failed to read encoding key from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to read name from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzDomain); - ExitOnFailure(hr, "failed to read domain from custom action data"); - - hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); - ExitOnFailure(hr, "failed to read attributes from custom action data"); - - // Best effort to read original configuration from CreateUser. - hr = WcaCaScriptOpen(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, &hRollbackScript); - if (FAILED(hr)) - { - WcaLogError(hr, "Failed to open rollback CustomAction script, continuing anyway."); - } - else - { - hr = WcaCaScriptReadAsCustomActionData(hRollbackScript, &pwzRollbackData); - if (FAILED(hr)) - { - WcaLogError(hr, "Failed to read rollback script into CustomAction data, continuing anyway."); - } - else - { - WcaLog(LOGMSG_TRACEONLY, "Rollback Data: %ls", pwzRollbackData); - - pwz = pwzRollbackData; - hr = WcaReadIntegerFromCaData(&pwz, &iOriginalAttributes); - if (FAILED(hr)) - { - WcaLogError(hr, "failed to read attributes from rollback data, continuing anyway"); - } - else - { - iAttributes |= iOriginalAttributes; - } - } - } - - hr = RemoveUserInternal(pwz, pwzDomain, pwzName, iAttributes); - -LExit: - WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_DELETE); - - ReleaseStr(pwzData); - ReleaseStr(pwzName); - ReleaseStr(pwzDomain); - ReleaseStr(pwzScriptKey); - ReleaseStr(pwzRollbackData); - - if (fInitializedCom) - { - ::CoUninitialize(); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - - -/******************************************************************** - RemoveUser - CUSTOM ACTION ENTRY POINT for removing users - - Input: deferred CustomActionData - Name\tDomain - * *****************************************************************/ -extern "C" UINT __stdcall RemoveUser( - MSIHANDLE hInstall -) -{ - //AssertSz(0, "Debug RemoveUser"); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzData = NULL; - LPWSTR pwz = NULL; - LPWSTR pwzName = NULL; - LPWSTR pwzDomain = NULL; - int iAttributes = 0; - BOOL fInitializedCom = FALSE; - - hr = WcaInitialize(hInstall, "RemoveUser"); - ExitOnFailure(hr, "failed to initialize"); - - hr = ::CoInitialize(NULL); - ExitOnFailure(hr, "failed to initialize COM"); - fInitializedCom = TRUE; - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - // - // Read in the CustomActionData - // - pwz = pwzData; - hr = WcaReadStringFromCaData(&pwz, &pwzName); - ExitOnFailure(hr, "failed to read name from custom action data"); - - hr = WcaReadStringFromCaData(&pwz, &pwzDomain); - ExitOnFailure(hr, "failed to read domain from custom action data"); - - hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); - ExitOnFailure(hr, "failed to read attributes from custom action data"); - - hr = RemoveUserInternal(pwz, pwzDomain, pwzName, iAttributes); - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzName); - ReleaseStr(pwzDomain); - - if (fInitializedCom) - { - ::CoUninitialize(); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} diff --git a/src/ca/scamanifest.cpp b/src/ca/scamanifest.cpp deleted file mode 100644 index adb8d3d3..00000000 --- a/src/ca/scamanifest.cpp +++ /dev/null @@ -1,377 +0,0 @@ -// 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" - -LPCWSTR vcsPerfmonManifestQuery = L"SELECT `Component_`, `File`, `ResourceFileDirectory` FROM `Wix4PerfmonManifest`"; -LPCWSTR vcsEventManifestQuery = L"SELECT `Component_`, `File` FROM `Wix4EventManifest`"; -enum ePerfMonManifestQuery { pfmComponent = 1, pfmFile, pfmResourceFileDir }; -enum eEventManifestQuery { emComponent = 1, emFile}; - -BOOL IsVistaOrAbove() -{ - OSVERSIONINFO osvi; - ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - #pragma warning(suppress: 4996) //TODO: use non-deprecated function to check OS version - if (!::GetVersionEx(&osvi)) - { - return false; - } - return osvi.dwMajorVersion >= 6; -} - - -/******************************************************************** - ConfigurePerfmonManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling - Perfmon counter manifest registering - -********************************************************************/ -extern "C" UINT __stdcall ConfigurePerfmonManifestRegister( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzData = NULL, pwzResourceFilePath = NULL, pwzFile = NULL, pwzCommand = NULL; - INSTALLSTATE isInstalled, isAction; - - hr = WcaInitialize(hInstall, "ConfigurePerfmonManifestReg"); - ExitOnFailure(hr, "Failed to initialize"); - - if (!IsVistaOrAbove()) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because the target system does not support perfmon manifest"); - ExitFunction1(hr = S_FALSE); - } - // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"Wix4PerfmonManifest")) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because Wix4PerfmonManifest table not present"); - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on PerfMonManifest table"); - while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) - { - // get component install state - hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for PerfMonManifest"); - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for PerfMonManifest"); - if (!WcaIsInstalling(isInstalled, isAction)) - { - continue; - } - - hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for PerfMonManifest"); - - hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); - ExitOnFailure(hr, "failed to get ApplicationIdentity for PerfMonManifest"); - size_t iResourcePath = lstrlenW(pwzResourceFilePath); - if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') - *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' - - hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); - ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmonManifest action"); - - if ( *pwzResourceFilePath ) - { - hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); - ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); - } - else - { - hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); - } - - WcaLog(LOGMSG_VERBOSE, "RegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); - ExitOnFailure(hr, "failed to schedule RegisterPerfmonManifest action"); - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing PerfMonManifest"); - - hr = S_OK; - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzResourceFilePath); - ReleaseStr(pwzFile); - ReleaseStr(pwzCommand); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** - ConfigurePerfmonUninstall - CUSTOM ACTION ENTRY POINT for uninstalling - Perfmon counters - -********************************************************************/ -extern "C" UINT __stdcall ConfigurePerfmonManifestUnregister( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzData = NULL, pwzResourceFilePath = NULL, pwzFile = NULL, pwzCommand = NULL; - INSTALLSTATE isInstalled, isAction; - - hr = WcaInitialize(hInstall, "ConfigurePerfmonManifestUnreg"); - ExitOnFailure(hr, "Failed to initialize"); - - if (!IsVistaOrAbove()) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because the target system does not support perfmon manifest"); - ExitFunction1(hr = S_FALSE); - } - // check to see if necessary tables are specified - if (WcaTableExists(L"Wix4PerfmonManifest") != S_OK) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because Wix4PerfmonManifest table not present"); - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4PerfmonManifest table"); - while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) - { - // get component install state - hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for Wix4PerfmonManifest"); - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for Wix4PerfmonManifest"); - if (!WcaIsUninstalling(isInstalled, isAction)) - { - continue; - } - - hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for Wix4PerfmonManifest"); - - hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); - ExitOnFailure(hr, "failed to get ApplicationIdentity for Wix4PerfmonManifest"); - size_t iResourcePath = lstrlenW(pwzResourceFilePath); - if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') - *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' - - hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); - ExitOnFailure(hr, "failed to copy string in Wix4PerfmonManifest"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); - ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmonManifest action"); - - hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); - - WcaLog(LOGMSG_VERBOSE, "UnRegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); - ExitOnFailure(hr, "failed to schedule UnregisterPerfmonManifest action"); - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing PerfMonManifest"); - - hr = S_OK; - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzResourceFilePath); - ReleaseStr(pwzFile); - ReleaseStr(pwzCommand); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -/******************************************************************** - ConfigureEventManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling - Event manifest registering - -********************************************************************/ -extern "C" UINT __stdcall ConfigureEventManifestRegister( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzData = NULL, pwzFile = NULL, pwzCommand = NULL; - INSTALLSTATE isInstalled, isAction; - - hr = WcaInitialize(hInstall, "ConfigureEventManifestReg"); - ExitOnFailure(hr, "Failed to initialize"); - - if (!IsVistaOrAbove()) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because the target system does not support event manifest"); - ExitFunction1(hr = S_FALSE); - } - // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"Wix4EventManifest")) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because Wix4EventManifest table not present"); - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4EventManifest table"); - while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) - { - // get component install state - hr = WcaGetRecordString(hRec, emComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for Wix4EventManifest"); - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for Wix4EventManifest"); - if (!WcaIsInstalling(isInstalled, isAction)) - { - continue; - } - - hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for Wix4EventManifest"); - - hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); - ExitOnFailure(hr, "failed to schedule RollbackRegisterEventManifest action"); - - hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); - WcaLog(LOGMSG_VERBOSE, "RegisterEventManifest's CustomActionData: '%ls'", pwzCommand); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterEventManifest"), pwzCommand, COST_EVENTMANIFEST_REGISTER); - ExitOnFailure(hr, "failed to schedule RegisterEventManifest action"); - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing Wix4EventManifest"); - - hr = S_OK; - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzFile); - ReleaseStr(pwzCommand); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - - -/******************************************************************** - ConfigureEventManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling - Event manifest registering - -********************************************************************/ -extern "C" UINT __stdcall ConfigureEventManifestUnregister( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzData = NULL, pwzFile = NULL, pwzCommand = NULL; - INSTALLSTATE isInstalled, isAction; - - hr = WcaInitialize(hInstall, "ConfigureEventManifestUnreg"); - ExitOnFailure(hr, "Failed to initialize"); - - if (!IsVistaOrAbove()) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because the target system does not support event manifest"); - ExitFunction1(hr = S_FALSE); - } - // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"Wix4EventManifest")) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because Wix4EventManifest table not present"); - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4EventManifest table"); - while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) - { - // get component install state - hr = WcaGetRecordString(hRec, emComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for Wix4EventManifest"); - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for Wix4EventManifest"); - - // nothing to do on an install - // schedule the rollback action when reinstalling to re-register pre-patch manifest - if (!WcaIsUninstalling(isInstalled, isAction) && !WcaIsReInstalling(isInstalled, isAction)) - { - continue; - } - - hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for Wix4EventManifest"); - - hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); - ExitOnFailure(hr, "failed to schedule RollbackUnregisterEventManifest action"); - - // no need to uninstall on a repair/patch. Register action will re-register and update the manifest. - if (!WcaIsReInstalling(isInstalled, isAction)) - { - hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); - ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); - WcaLog(LOGMSG_VERBOSE, "UnregisterEventManifest's CustomActionData: '%ls'", pwzCommand); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); - ExitOnFailure(hr, "failed to schedule UnregisterEventManifest action"); - } - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing Wix4EventManifest"); - - hr = S_OK; - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzFile); - ReleaseStr(pwzCommand); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - diff --git a/src/ca/scaperf.cpp b/src/ca/scaperf.cpp deleted file mode 100644 index fd301278..00000000 --- a/src/ca/scaperf.cpp +++ /dev/null @@ -1,310 +0,0 @@ -// 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" - -LPCWSTR vcsPerfCounterDataQuery = L"SELECT `Wix4PerformanceCategory`, `Component_`, `Name`, `IniData`, `ConstantData` FROM `Wix4PerformanceCategory`"; -enum ePerfCounterDataQuery { pcdqId = 1, pcdqComponent, pcdqName, pcdqIniData, pcdqConstantData }; - -LPCWSTR vcsPerfMonQuery = L"SELECT `Component_`, `File`, `Name` FROM `Wix4Perfmon`"; -enum ePerfMonQuery { pmqComponent = 1, pmqFile, pmqName }; - - -static HRESULT ProcessPerformanceCategory( - __in MSIHANDLE hInstall, - __in BOOL fInstall - ); - - -/******************************************************************** - InstallPerfCounterData - CUSTOM ACTION ENTRY POINT for installing - Performance Counters. - -********************************************************************/ -extern "C" UINT __stdcall InstallPerfCounterData( - __in MSIHANDLE hInstall - ) -{ - // AssertSz(FALSE, "debug InstallPerfCounterData{}"); - HRESULT hr; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "InstallPerfCounterData"); - ExitOnFailure(hr, "Failed to initialize InstallPerfCounterData."); - - hr = ProcessPerformanceCategory(hInstall, TRUE); - MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to process Wix4PerformanceCategory table."); - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** - UninstallPerfCounterData - CUSTOM ACTION ENTRY POINT for installing - Performance Counters. - -********************************************************************/ -extern "C" UINT __stdcall UninstallPerfCounterData( - __in MSIHANDLE hInstall - ) -{ - // AssertSz(FALSE, "debug UninstallPerfCounterData{}"); - HRESULT hr; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "UninstallPerfCounterData"); - ExitOnFailure(hr, "Failed to initialize UninstallPerfCounterData."); - - hr = ProcessPerformanceCategory(hInstall, FALSE); - MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to process Wix4PerformanceCategory table."); - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** - RegisterPerfmon - CUSTOM ACTION ENTRY POINT for installing Perfmon counters - -********************************************************************/ -extern "C" UINT __stdcall ConfigurePerfmonInstall( - __in MSIHANDLE hInstall - ) -{ -// Assert(FALSE); - HRESULT hr; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzData = NULL, pwzName = NULL, pwzFile = NULL; - INSTALLSTATE isInstalled, isAction; - - hr = WcaInitialize(hInstall, "ConfigurePerfmonInstall"); - ExitOnFailure(hr, "Failed to initialize"); - - // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"Wix4Perfmon")) - { - WcaLog(LOGMSG_VERBOSE, "Skipping RegisterPerfmon() because Wix4Perfmon table not present"); - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsPerfMonQuery, &hView); - ExitOnFailure(hr, "failed to open view on PerfMon table"); - while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) - { - // get component install state - hr = WcaGetRecordString(hRec, pmqComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for PerfMon"); - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for PerfMon"); - if (!WcaIsInstalling(isInstalled, isAction)) - { - continue; - } - - hr = WcaGetRecordString(hRec, pmqName, &pwzName); - ExitOnFailure(hr, "failed to get Name for PerfMon"); - - hr = WcaGetRecordFormattedString(hRec, pmqFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for PerfMon"); - - WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonInstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); - ExitOnFailure(hr, "failed to schedule RegisterPerfmon action"); - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); - ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmon action"); - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing PerfMon"); - - hr = S_OK; - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzName); - ReleaseStr(pwzFile); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** - ConfigurePerfmonUninstall - CUSTOM ACTION ENTRY POINT for uninstalling - Perfmon counters - -********************************************************************/ -extern "C" UINT __stdcall ConfigurePerfmonUninstall( - __in MSIHANDLE hInstall - ) -{ -// Assert(FALSE); - HRESULT hr; - UINT er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzData = NULL, pwzName = NULL, pwzFile = NULL; - INSTALLSTATE isInstalled, isAction; - - hr = WcaInitialize(hInstall, "ConfigurePerfmonUninstall"); - ExitOnFailure(hr, "Failed to initialize"); - - // check to see if necessary tables are specified - if (WcaTableExists(L"Wix4Perfmon") != S_OK) - { - WcaLog(LOGMSG_VERBOSE, "Skipping UnregisterPerfmon() because Wix4Perfmon table not present"); - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsPerfMonQuery, &hView); - ExitOnFailure(hr, "failed to open view on PerfMon table"); - while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) - { - // get component install state - hr = WcaGetRecordString(hRec, pmqComponent, &pwzData); - ExitOnFailure(hr, "failed to get Component for PerfMon"); - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for PerfMon"); - if (!WcaIsUninstalling(isInstalled, isAction)) - { - continue; - } - - hr = WcaGetRecordString(hRec, pmqName, &pwzName); - ExitOnFailure(hr, "failed to get Name for PerfMon"); - - hr = WcaGetRecordFormattedString(hRec, pmqFile, &pwzFile); - ExitOnFailure(hr, "failed to get File for PerfMon"); - - WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonUninstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); - ExitOnFailure(hr, "failed to schedule UnregisterPerfmon action"); - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); - ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmon action"); - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing PerfMon"); - - hr = S_OK; - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzName); - ReleaseStr(pwzFile); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - - -static HRESULT ProcessPerformanceCategory( - __in MSIHANDLE hInstall, - __in BOOL fInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - PMSIHANDLE hView, hRec; - LPWSTR pwzId = NULL; - LPWSTR pwzComponent = NULL; - LPWSTR pwzName = NULL; - LPWSTR pwzData = NULL; - INSTALLSTATE isInstalled, isAction; - - LPWSTR pwzCustomActionData = NULL; - - // check to see if necessary tables are specified - if (S_OK != WcaTableExists(L"Wix4PerformanceCategory")) - { - ExitFunction1(hr = S_FALSE); - } - - hr = WcaOpenExecuteView(vcsPerfCounterDataQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4PerformanceCategory table"); - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, pcdqId, &pwzId); - ExitOnFailure(hr, "Failed to get id for Wix4PerformanceCategory."); - - // Check to see if the Component is being installed or uninstalled - // when we are processing the same. - hr = WcaGetRecordString(hRec, pcdqComponent, &pwzComponent); - ExitOnFailure(hr, "Failed to get Component for Wix4PerformanceCategory: %ls", pwzId); - - er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to get Component state for Wix4PerformanceCategory: %ls", pwzId); - - if ((fInstall && !WcaIsInstalling(isInstalled, isAction)) || - (!fInstall && !WcaIsUninstalling(isInstalled, isAction))) - { - continue; - } - - hr = WcaGetRecordString(hRec, pcdqName, &pwzName); - ExitOnFailure(hr, "Failed to get Name for Wix4PerformanceCategory: %ls", pwzId); - hr = WcaWriteStringToCaData(pwzName, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add Name to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); - - hr = WcaGetRecordString(hRec, pcdqIniData, &pwzData); - ExitOnFailure(hr, "Failed to get IniData for Wix4PerformanceCategory: %ls", pwzId); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add IniData to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); - - hr = WcaGetRecordString(hRec, pcdqConstantData, &pwzData); - ExitOnFailure(hr, "Failed to get ConstantData for Wix4PerformanceCategory: %ls", pwzId); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add ConstantData to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); - } - - if (hr == E_NOMOREITEMS) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure while processing Wix4PerformanceCategory table."); - - // If there was any data built up, schedule it for execution. - if (pwzCustomActionData) - { - if (fInstall) - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); - ExitOnFailure(hr, "Failed to schedule RollbackRegisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); - ExitOnFailure(hr, "Failed to schedule RegisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); - } - else - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); - ExitOnFailure(hr, "Failed to schedule RollbackUnregisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); - ExitOnFailure(hr, "Failed to schedule UnregisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); - } - } - -LExit: - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzData); - ReleaseStr(pwzName); - ReleaseStr(pwzComponent); - ReleaseStr(pwzId); - - return hr; -} diff --git a/src/ca/scaperfexec.cpp b/src/ca/scaperfexec.cpp deleted file mode 100644 index c5425754..00000000 --- a/src/ca/scaperfexec.cpp +++ /dev/null @@ -1,423 +0,0 @@ -// 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" - -typedef DWORD (STDAPICALLTYPE *PFNPERFCOUNTERTEXTSTRINGS)(LPWSTR lpCommandLine, BOOL bQuietModeArg); - -static HRESULT ExecutePerfCounterData( - __in MSIHANDLE hInstall, - __in BOOL fInstall - ); -static HRESULT CreateDataFile( - __in LPCWSTR wzTempFolder, - __in LPCWSTR wzData, - __in BOOL fIniData, - __out HANDLE *phFile, - __out_opt LPWSTR *ppwzFile - ); - - -/******************************************************************** - RegisterPerfCounterData - CUSTOM ACTION ENTRY POINT for registering - performance counters - - Input: deferred CustomActionData: wzName\twzIniData\twzConstantData\twzName\twzIniData\twzConstantData\t... -*******************************************************************/ -extern "C" UINT __stdcall RegisterPerfCounterData( - __in MSIHANDLE hInstall - ) -{ - // AssertSz(FALSE, "debug RegisterPerfCounterData()"); - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "RegisterPerfCounterData"); - ExitOnFailure(hr, "Failed to initialize RegisterPerfCounterData."); - - hr = ExecutePerfCounterData(hInstall, TRUE); - MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** - UnregisterPerfCounterData - CUSTOM ACTION ENTRY POINT for registering - performance counters - - Input: deferred CustomActionData: wzName\twzIniData\twzConstantData\twzName\twzIniData\twzConstantData\t... -*******************************************************************/ -extern "C" UINT __stdcall UnregisterPerfCounterData( - __in MSIHANDLE hInstall - ) -{ - // AssertSz(FALSE, "debug UnregisterPerfCounterData()"); - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "UnregisterPerfCounterData"); - ExitOnFailure(hr, "Failed to initialize UnregisterPerfCounterData."); - - hr = ExecutePerfCounterData(hInstall, FALSE); - MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** - RegisterPerfmon - CUSTOM ACTION ENTRY POINT for registering - counters - - Input: deferred CustomActionData - - wzFile or wzName -*******************************************************************/ -extern "C" UINT __stdcall RegisterPerfmon( - __in MSIHANDLE hInstall - ) -{ -// Assert(FALSE); - UINT er = ERROR_SUCCESS; - HRESULT hr = S_OK; - LPWSTR pwzData = NULL; - - HMODULE hMod = NULL; - PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; - DWORD dwRet; - LPWSTR pwzShortPath = NULL; - DWORD cchShortPath = MAX_PATH; - DWORD cchShortPathLength = 0; - - LPWSTR pwzCommand = NULL; - - hr = WcaInitialize(hInstall, "RegisterPerfmon"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - // do the perfmon registration - if (NULL == hMod) - { - hr = LoadSystemLibrary(L"loadperf.dll", &hMod); - } - ExitOnFailure(hr, "failed to load DLL for PerfMon"); - - pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hMod, "LoadPerfCounterTextStringsW"); - ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "failed to get DLL function for PerfMon"); - - hr = StrAlloc(&pwzShortPath, cchShortPath); - ExitOnFailure(hr, "failed to allocate string"); - - WcaLog(LOGMSG_VERBOSE, "Converting DLL path to short format: %ls", pwzData); - cchShortPathLength = ::GetShortPathNameW(pwzData, pwzShortPath, cchShortPath); - if (cchShortPathLength > cchShortPath) - { - cchShortPath = cchShortPathLength + 1; - hr = StrAlloc(&pwzShortPath, cchShortPath); - ExitOnFailure(hr, "failed to allocate string"); - - cchShortPathLength = ::GetShortPathNameW(pwzData, pwzShortPath, cchShortPath); - } - - if (0 == cchShortPathLength) - { - ExitOnLastError(hr, "failed to get short path format of path: %ls", pwzData); - } - - hr = StrAllocFormatted(&pwzCommand, L"lodctr \"%s\"", pwzShortPath); - ExitOnFailure(hr, "failed to format lodctr string"); - - WcaLog(LOGMSG_VERBOSE, "RegisterPerfmon running command: '%ls'", pwzCommand); - dwRet = (*pfnPerfCounterTextString)(pwzCommand, TRUE); - if (dwRet != ERROR_SUCCESS && dwRet != ERROR_ALREADY_EXISTS) - { - hr = HRESULT_FROM_WIN32(dwRet); - MessageExitOnFailure(hr, msierrPERFMONFailedRegisterDLL, "failed to register with PerfMon, DLL: %ls", pwzData); - } - - hr = S_OK; -LExit: - ReleaseStr(pwzData); - - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -extern "C" UINT __stdcall UnregisterPerfmon( - __in MSIHANDLE hInstall - ) -{ -// Assert(FALSE); - UINT er = ERROR_SUCCESS; - HRESULT hr = S_OK; - LPWSTR pwzData = NULL; - - HMODULE hMod = NULL; - PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; - DWORD dwRet; - WCHAR wz[255]; - - hr = WcaInitialize(hInstall, "UnregisterPerfmon"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - // do the perfmon unregistration - hr = E_FAIL; - if (hMod == NULL) - { - hr = LoadSystemLibrary(L"loadperf.dll", &hMod); - } - ExitOnFailure(hr, "failed to load DLL for PerfMon"); - - pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hMod, "UnloadPerfCounterTextStringsW"); - ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "failed to get DLL function for PerfMon"); - - hr = ::StringCchPrintfW(wz, countof(wz), L"unlodctr \"%s\"", pwzData); - ExitOnFailure(hr, "Failed to format unlodctr string with: %ls", pwzData); - WcaLog(LOGMSG_VERBOSE, "UnregisterPerfmon running command: '%ls'", wz); - dwRet = (*pfnPerfCounterTextString)(wz, TRUE); - // if the counters aren't registered, then OK to continue - if (dwRet != ERROR_SUCCESS && dwRet != ERROR_FILE_NOT_FOUND && dwRet != ERROR_BADKEY) - { - hr = HRESULT_FROM_WIN32(dwRet); - MessageExitOnFailure(hr, msierrPERFMONFailedUnregisterDLL, "failed to unregsister with PerfMon, DLL: %ls", pwzData); - } - - hr = S_OK; -LExit: - ReleaseStr(pwzData); - - if (FAILED(hr)) - er = ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -static HRESULT ExecutePerfCounterData( - __in MSIHANDLE /*hInstall*/, - __in BOOL fInstall - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - HMODULE hModule = NULL; - PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString = NULL; - LPCWSTR wzPrefix = NULL; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwz = NULL; - - LPWSTR pwzName = NULL; - LPWSTR pwzIniData = NULL; - LPWSTR pwzConstantData = NULL; - LPWSTR pwzTempFolder = NULL; - LPWSTR pwzIniFile = NULL; - LPWSTR pwzExecute = NULL; - - HANDLE hIniData = INVALID_HANDLE_VALUE; - HANDLE hConstantData = INVALID_HANDLE_VALUE; - - // Load the system performance counter helper DLL then get the appropriate - // entrypoint out of it. Fortunately, they have the same signature so we - // can use one function pointer to point to both. - hr = LoadSystemLibrary(L"loadperf.dll", &hModule); - ExitOnFailure(hr, "failed to load DLL for PerfMon"); - - if (fInstall) - { - wzPrefix = L"lodctr"; - pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hModule, "LoadPerfCounterTextStringsW"); - } - else - { - wzPrefix = L"unlodctr"; - pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hModule, "UnloadPerfCounterTextStringsW"); - } - ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "Failed to get DLL function for PerfMon"); - - // Now get the CustomActionData and execute it. - hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "Failed to get CustomActionData."); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzName))) - { - hr = WcaReadStringFromCaData(&pwz, &pwzIniData); - ExitOnFailure(hr, "Failed to read IniData from custom action data."); - - hr = WcaReadStringFromCaData(&pwz, &pwzConstantData); - ExitOnFailure(hr, "Failed to read ConstantData from custom action data."); - - if (fInstall) - { - hr = PathCreateTempDirectory(NULL, L"WIXPF%03x", 999, &pwzTempFolder); - ExitOnFailure(hr, "Failed to create temp directory."); - - hr = CreateDataFile(pwzTempFolder, pwzIniData, TRUE, &hIniData, &pwzIniFile); - ExitOnFailure(hr, "Failed to create .ini file for performance counter category: %ls", pwzName); - - hr = CreateDataFile(pwzTempFolder, pwzConstantData, FALSE, &hConstantData, NULL); - ExitOnFailure(hr, "Failed to create .h file for performance counter category: %ls", pwzName); - - hr = StrAllocFormatted(&pwzExecute, L"%s \"%s\"", wzPrefix, pwzIniFile); - ExitOnFailure(hr, "Failed to allocate string to execute."); - - // Execute the install. - er = (*pfnPerfCounterTextString)(pwzExecute, TRUE); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to execute install of performance counter category: %ls", pwzName); - - if (INVALID_HANDLE_VALUE != hIniData) - { - ::CloseHandle(hIniData); - hIniData = INVALID_HANDLE_VALUE; - } - - if (INVALID_HANDLE_VALUE != hConstantData) - { - ::CloseHandle(hConstantData); - hConstantData = INVALID_HANDLE_VALUE; - } - - DirEnsureDelete(pwzTempFolder, TRUE, TRUE); - } - else - { - hr = StrAllocFormatted(&pwzExecute, L"%s \"%s\"", wzPrefix, pwzName); - ExitOnFailure(hr, "Failed to allocate string to execute."); - - // Execute the uninstall and if the counter isn't registered then ignore - // the error since it won't hurt anything. - er = (*pfnPerfCounterTextString)(pwzExecute, TRUE); - if (ERROR_FILE_NOT_FOUND == er || ERROR_BADKEY == er) - { - er = ERROR_SUCCESS; - } - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to execute uninstall of performance counter category: %ls", pwzName); - } - } - - if (E_NOMOREITEMS == hr) // If there are no more items, all is well - { - hr = S_OK; - } - ExitOnFailure(hr, "Failed to execute all perf counter data."); - - hr = S_OK; - -LExit: - if (INVALID_HANDLE_VALUE != hIniData) - { - ::CloseHandle(hIniData); - } - - if (INVALID_HANDLE_VALUE != hConstantData) - { - ::CloseHandle(hConstantData); - } - - ReleaseStr(pwzExecute); - ReleaseStr(pwzIniFile); - ReleaseStr(pwzTempFolder); - ReleaseStr(pwzConstantData); - ReleaseStr(pwzIniData); - ReleaseStr(pwzName); - ReleaseStr(pwzCustomActionData); - - if (hModule) - { - ::FreeLibrary(hModule); - } - - return hr; -} - - -static HRESULT CreateDataFile( - __in LPCWSTR wzTempFolder, - __in LPCWSTR wzData, - __in BOOL fIniData, - __out HANDLE *phFile, - __out_opt LPWSTR *ppwzFile - ) -{ - HRESULT hr = S_OK; - HANDLE hFile = INVALID_HANDLE_VALUE; - LPWSTR pwzFile = NULL; - LPSTR pszData = NULL; - DWORD cbData = 0; - DWORD cbWritten = 0; - - // Convert the data to UTF-8 because lodctr/unloctr - // doesn't like unicode. - hr = StrAnsiAllocString(&pszData, wzData, 0, CP_UTF8); - ExitOnFailure(hr, "Failed to covert data to ANSI."); - - cbData = lstrlenA(pszData); - - // Concatenate the paths together, open the file data file - // and dump the data in there. - hr = StrAllocString(&pwzFile, wzTempFolder, 0); - ExitOnFailure(hr, "Failed to copy temp directory name."); - - hr = StrAllocConcat(&pwzFile, L"wixperf", 0); - ExitOnFailure(hr, "Failed to add name of file."); - - hr = StrAllocConcat(&pwzFile, fIniData ? L".ini" : L".h", 0); - ExitOnFailure(hr, "Failed to add extension of file."); - - hFile = ::CreateFileW(pwzFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (INVALID_HANDLE_VALUE == hFile) - { - ExitWithLastError(hr, "Failed to open new temp file: %ls", pwzFile); - } - - if (!::WriteFile(hFile, pszData, cbData, &cbWritten, NULL)) - { - ExitWithLastError(hr, "Failed to write data to new temp file: %ls", pwzFile); - } - - if (INVALID_HANDLE_VALUE != hFile) - { - ::CloseHandle(hFile); - hFile = INVALID_HANDLE_VALUE; - } - - // Return the requested values. - *phFile = hFile; - hFile = INVALID_HANDLE_VALUE; - - if (ppwzFile) - { - *ppwzFile = pwzFile; - pwzFile = NULL; - } - -LExit: - if (INVALID_HANDLE_VALUE != hFile) - { - ::CloseHandle(hFile); - } - ReleaseStr(pszData); - ReleaseStr(pwzFile); - - return hr; -} diff --git a/src/ca/scasched.cpp b/src/ca/scasched.cpp deleted file mode 100644 index d81b1f14..00000000 --- a/src/ca/scasched.cpp +++ /dev/null @@ -1,127 +0,0 @@ -// 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" - - -/******************************************************************** -ConfigureSmb - CUSTOM ACTION ENTRY POINT for installing fileshare settings - -********************************************************************/ -extern "C" UINT __stdcall ConfigureSmbInstall( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - SCA_SMB* pssList = NULL; - - // initialize - hr = WcaInitialize(hInstall, "ConfigureSmbInstall"); - ExitOnFailure(hr, "Failed to initialize"); - - // check to see if necessary tables are specified - if (WcaTableExists(L"Wix4FileShare") != S_OK) - { - WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); - ExitFunction1(hr = S_FALSE); - } - - hr = ScaSmbRead(&pssList); - ExitOnFailure(hr, "failed to read Wix4FileShare table"); - - hr = ScaSmbInstall(pssList); - ExitOnFailure(hr, "failed to install FileShares"); - -LExit: - if (pssList) - ScaSmbFreeList(pssList); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** -ConfigureSmb - CUSTOM ACTION ENTRY POINT for uninstalling fileshare settings - -********************************************************************/ -extern "C" UINT __stdcall ConfigureSmbUninstall( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - SCA_SMB* pssList = NULL; - - // initialize - hr = WcaInitialize(hInstall, "ConfigureSmbUninstall"); - ExitOnFailure(hr, "Failed to initialize"); - - // check to see if necessary tables are specified - if (WcaTableExists(L"Wix4FileShare") != S_OK) - { - WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); - ExitFunction1(hr = S_FALSE); - } - - hr = ScaSmbRead(&pssList); - ExitOnFailure(hr, "failed to read Wix4FileShare table"); - - hr = ScaSmbUninstall(pssList); - ExitOnFailure(hr, "failed to uninstall FileShares"); - -LExit: - if (pssList) - ScaSmbFreeList(pssList); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/******************************************************************** -ConfigureUsers - CUSTOM ACTION ENTRY POINT for installing users - -********************************************************************/ -extern "C" UINT __stdcall ConfigureUsers( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(0, "Debug ConfigureUsers"); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - BOOL fInitializedCom = FALSE; - SCA_USER* psuList = NULL; - - // initialize - hr = WcaInitialize(hInstall, "ConfigureUsers"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = ::CoInitialize(NULL); - ExitOnFailure(hr, "failed to initialize COM"); - fInitializedCom = TRUE; - - hr = ScaUserRead(&psuList); - ExitOnFailure(hr, "failed to read Wix4User table"); - - hr = ScaUserExecute(psuList); - ExitOnFailure(hr, "failed to add/remove User actions"); - -LExit: - if (psuList) - { - ScaUserFreeList(psuList); - } - - if (fInitializedCom) - { - ::CoUninitialize(); - } - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} \ No newline at end of file diff --git a/src/ca/scasmb.h b/src/ca/scasmb.h deleted file mode 100644 index f2a4b53c..00000000 --- a/src/ca/scasmb.h +++ /dev/null @@ -1,46 +0,0 @@ -#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 "scauser.h" - -// structs -// Structure used to hold and extra user/permission pairs from the Wix4FileSharePermissions Table -struct SCA_SMB_EX_USER_PERMS -{ - int nPermissions; - ACCESS_MODE accessMode; - SCA_USER scau; - SCA_SMB_EX_USER_PERMS* pExUserPermsNext; -}; - -struct SCA_SMB // hungarian ss -{ - WCHAR wzId[MAX_DARWIN_KEY + 1]; - WCHAR wzShareName[MAX_DARWIN_KEY + 1]; - WCHAR wzDescription[MAX_DARWIN_COLUMN + 1]; - WCHAR wzComponent[MAX_DARWIN_KEY + 1]; - WCHAR wzDirectory[MAX_PATH + 1]; - - int nUserPermissionCount; - int nPermissions; - SCA_SMB_EX_USER_PERMS* pExUserPerms; - - INSTALLSTATE isInstalled, isAction; - - BOOL fUseIntegratedAuth; - BOOL fLegacyUserProvided; - struct SCA_USER scau; - - struct SCA_SMB* pssNext; -}; - - -#define RESERVED 0 - -// schedule prototypes -HRESULT ScaSmbRead(SCA_SMB** ppssList); -HRESULT ScaSmbExPermsRead(SCA_SMB* pss); -HRESULT ScaSmbUninstall(SCA_SMB* pssList); -HRESULT ScaSmbInstall(SCA_SMB* pssList); -void ScaSmbFreeList(SCA_SMB* pssList); diff --git a/src/ca/scasmbexec.cpp b/src/ca/scasmbexec.cpp deleted file mode 100644 index ced3aa78..00000000 --- a/src/ca/scasmbexec.cpp +++ /dev/null @@ -1,316 +0,0 @@ -// 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" - - -/******************************************************************** - AllocateAcl - allocate an acl and populate it with this user and - permission information user could be user or domain\user - -********************************************************************/ -HRESULT AllocateAcl(SCA_SMBP* pssp, PACL* ppACL) -{ - HRESULT hr = S_OK; - EXPLICIT_ACCESSW* pEA = NULL; - DWORD cEA = 0; - DWORD dwCounter = 0; - - PSID psid = NULL; - LPCWSTR wzUser = NULL; - DWORD nPermissions = 0; - DWORD nErrorReturn = 0; - ACCESS_MODE accessMode = NOT_USED_ACCESS; - - cEA = pssp->dwUserPermissionCount + 1; - if (cEA >= MAXSIZE_T / sizeof(EXPLICIT_ACCESSW)) - { - ExitOnFailure(hr = E_OUTOFMEMORY, "Too many user permissions to allocate: %u", cEA); - } - - pEA = static_cast(MemAlloc(cEA * sizeof(EXPLICIT_ACCESSW), TRUE)); - ExitOnNull(pEA, hr, E_OUTOFMEMORY, "failed to allocate memory for explicit access structure"); - - // figure out how big the psid is - for (dwCounter = 0; dwCounter < pssp->dwUserPermissionCount; ++dwCounter) - { - wzUser = pssp->pUserPerms[dwCounter].wzUser; - nPermissions = pssp->pUserPerms[dwCounter].nPermissions; - accessMode = pssp->pUserPerms[dwCounter].accessMode; - // - // create the appropriate SID - // - - // figure out the right user to put into the access block - if (0 == lstrcmpW(wzUser, L"Everyone")) - { - hr = AclGetWellKnownSid(WinWorldSid, &psid); - } - else if (0 == lstrcmpW(wzUser, L"Administrators")) - { - hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &psid); - } - else if (0 == lstrcmpW(wzUser, L"LocalSystem")) - { - hr = AclGetWellKnownSid(WinLocalSystemSid, &psid); - } - else if (0 == lstrcmpW(wzUser, L"LocalService")) - { - hr = AclGetWellKnownSid(WinLocalServiceSid, &psid); - } - else if (0 == lstrcmpW(wzUser, L"NetworkService")) - { - hr = AclGetWellKnownSid(WinNetworkServiceSid, &psid); - } - else if (0 == lstrcmpW(wzUser, L"AuthenticatedUser")) - { - hr = AclGetWellKnownSid(WinAuthenticatedUserSid, &psid); - } - else if (0 == lstrcmpW(wzUser, L"Guests")) - { - hr = AclGetWellKnownSid(WinBuiltinGuestsSid, &psid); - } - else if(0 == lstrcmpW(wzUser, L"CREATOR OWNER")) - { - hr = AclGetWellKnownSid(WinCreatorOwnerSid, &psid); - } - else - { - hr = AclGetAccountSid(NULL, wzUser, &psid); - } - ExitOnFailure(hr, "failed to get sid for account: %ls", wzUser); - - // we now have a valid pSid, fill in the EXPLICIT_ACCESS - - /* Permissions options: (see sca.sdh for defined sdl options) - #define GENERIC_READ (0x80000000L) 2147483648 - #define GENERIC_WRITE (0x40000000L) 1073741824 - #define GENERIC_EXECUTE (0x20000000L) 536870912 - #define GENERIC_ALL (0x10000000L) 268435456 - */ - pEA[dwCounter].grfAccessPermissions = nPermissions; - pEA[dwCounter].grfAccessMode = accessMode; - pEA[dwCounter].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; -#pragma prefast(push) -#pragma prefast(disable:25029) - ::BuildTrusteeWithSidW(&(pEA[dwCounter].Trustee), psid); -#pragma prefast(pop) - } - - // create a new ACL that contains the ACE - *ppACL = NULL; -#pragma prefast(push) -#pragma prefast(disable:25029) - nErrorReturn = ::SetEntriesInAclW(dwCounter, pEA, NULL, ppACL); -#pragma prefast(pop) - ExitOnFailure(hr = HRESULT_FROM_WIN32(nErrorReturn), "failed to allocate ACL"); - -LExit: - if (psid) - { - AclFreeSid(psid); - } - - ReleaseMem(pEA); - - return hr; -} - - - -/******************************************************************** - FillShareInfo - fill the NetShareAdd data structure - -********************************************************************/ -void FillShareInfo(SHARE_INFO_502* psi, SCA_SMBP* pssp, PSECURITY_DESCRIPTOR pSD) -{ - psi->shi502_netname = pssp->wzKey; - psi->shi502_type = STYPE_DISKTREE; - psi->shi502_remark = pssp->wzDescription; - psi->shi502_permissions = 0; // not used - psi->shi502_max_uses = 0xFFFFFFFF; - psi->shi502_current_uses = 0; - psi->shi502_path = pssp->wzDirectory; - psi->shi502_passwd = NULL; // not file share perms - psi->shi502_reserved = 0; - psi->shi502_security_descriptor = pSD; -} - - - -/* NET_API_STATUS return codes -NERR_Success = 0 -NERR_DuplicateShare = 2118 -NERR_BufTooSmall = 2123 -NERR_NetNameNotFound = 2310 -NERR_RedirectedPath = 2117 -NERR_UnknownDevDir = 2116 -*/ - -/******************************************************************** - DoesShareExists - Does a share of this name exist on this computer? - -********************************************************************/ -HRESULT DoesShareExist(__in LPWSTR wzShareName) -{ - HRESULT hr = S_OK; - NET_API_STATUS s; - SHARE_INFO_502* psi = NULL; - s = ::NetShareGetInfo(NULL, wzShareName, 502, (BYTE**) &psi); - - switch (s) - { - case NERR_Success: - hr = S_OK; - break; - case NERR_NetNameNotFound: - hr = E_FILENOTFOUND; - break; - default: - WcaLogError(s, "NetShareGetInfo returned an unexpected value.", NULL); - hr = HRESULT_FROM_WIN32(s); - break; - } - - ::NetApiBufferFree(psi); - - return hr; -} - - - -/******************************************************************** - CreateShare - create the file share on this computer - -********************************************************************/ -HRESULT CreateShare(SCA_SMBP* pssp) -{ - if (!pssp || !(pssp->wzKey)) - return E_INVALIDARG; - - HRESULT hr = S_OK; - PACL pACL = NULL; - SHARE_INFO_502 si; - NET_API_STATUS s; - DWORD dwParamErr = 0; - - BOOL fShareExists = SUCCEEDED(DoesShareExist(pssp->wzKey)); - - PSECURITY_DESCRIPTOR pSD = static_cast(MemAlloc(SECURITY_DESCRIPTOR_MIN_LENGTH, TRUE)); - ExitOnNull(pSD, hr, E_OUTOFMEMORY, "Failed to allocate memory for security descriptor"); - -#pragma prefast(push) -#pragma prefast(disable:25029) - if (!::InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) -#pragma prefast(pop) - { - ExitOnLastError(hr, "failed to initialize security descriptor"); - } - - hr = AllocateAcl(pssp, &pACL); - ExitOnFailure(hr, "Failed to allocate ACL for fileshare"); - - if (NULL == pACL) - { - WcaLog(LOGMSG_VERBOSE, "Ignoring NULL DACL."); - } -#pragma prefast(push) -#pragma prefast(disable:25028) // We only call this when pACL isn't NULL, so this call is safe according to the docs - // add the ACL to the security descriptor. - else if (!::SetSecurityDescriptorDacl(pSD, TRUE, pACL, FALSE)) - { - ExitOnLastError(hr, "Failed to set security descriptor"); - } -#pragma prefast(pop) - - // all that is left is to create the share - FillShareInfo(&si, pssp, pSD); - - // Fail if the directory doesn't exist - if (!DirExists(pssp->wzDirectory, NULL)) - ExitOnFailure(hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND), "Can't create a file share on directory that doesn't exist: %ls.", pssp->wzDirectory); - - WcaLog(LOGMSG_VERBOSE, "Creating file share on directory \'%ls\' named \'%ls\'.", pssp->wzDirectory, pssp->wzKey); - - if (!fShareExists) - { - s = ::NetShareAdd(NULL, 502, (BYTE*) &si, &dwParamErr); - WcaLog(LOGMSG_VERBOSE, "Adding a new file share."); - } - else - { - // The share exists. Write our new permissions over the top. - s = ::NetShareSetInfo(NULL, pssp->wzKey, 502, (BYTE*) &si, &dwParamErr); - WcaLog(LOGMSG_VERBOSE, "Setting permissions on existing share."); - } - - if (NERR_Success != s) - { - hr = E_FAIL; - if (!fShareExists && NERR_DuplicateShare == s) - WcaLog(LOGMSG_VERBOSE, "Duplicate error when existence check failed."); - - // error codes listed above. - ExitOnFailure(hr, "Failed to create/modify file share: Err: %d", s); - } - -LExit: - if (pACL) - { - ::LocalFree(pACL); - } - - ReleaseMem(pSD); - - return hr; -} - - -/******************************************************************** - ScaEnsureSmbExists - -********************************************************************/ -HRESULT ScaEnsureSmbExists(SCA_SMBP* pssp) -{ - HRESULT hr = S_OK; - - // create the share - hr = CreateShare(pssp); - - return hr; -} - - -// -// Delete File Shares - real work -// - -/******************************************************************** - ScaDropSmb - delete this file share from this computer - -********************************************************************/ -HRESULT ScaDropSmb(SCA_SMBP* pssp) -{ - HRESULT hr = S_OK; - NET_API_STATUS s; - - hr = DoesShareExist(pssp->wzKey); - - if (E_FILENOTFOUND == hr) - { - WcaLog(LOGMSG_VERBOSE, "Share doesn't exist, share removal skipped. (%ls)", pssp->wzKey); - ExitFunction1(hr = S_OK); - - } - - ExitOnFailure(hr, "Unable to detect share. (%ls)", pssp->wzKey); - - s = ::NetShareDel(NULL, pssp->wzKey, 0); - if (NERR_Success != s) - { - hr = E_FAIL; - ExitOnFailure(hr, "Failed to remove file share: Err: %d", s); - } - -LExit: - return hr; -} diff --git a/src/ca/scasmbexec.h b/src/ca/scasmbexec.h deleted file mode 100644 index e3c8f8bb..00000000 --- a/src/ca/scasmbexec.h +++ /dev/null @@ -1,27 +0,0 @@ -#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. - - -struct SCA_SMBP_USER_PERMS -{ - DWORD nPermissions; - ACCESS_MODE accessMode; - WCHAR* wzUser; - //Not adding Password because I can't find anywhere that it is used -}; - -struct SCA_SMBP // hungarian ssp -{ - WCHAR* wzKey; - WCHAR* wzDescription; - WCHAR* wzComponent; - WCHAR* wzDirectory; // full path of the dir to share to - - DWORD dwUserPermissionCount; //Count of SCA_SMBP_EX_USER_PERMS structures - SCA_SMBP_USER_PERMS* pUserPerms; - BOOL fUseIntegratedAuth; -}; - - -HRESULT ScaEnsureSmbExists(SCA_SMBP* pssp); -HRESULT ScaDropSmb(SCA_SMBP* pssp); diff --git a/src/ca/scasmbsched.cpp b/src/ca/scasmbsched.cpp deleted file mode 100644 index e29f7f51..00000000 --- a/src/ca/scasmbsched.cpp +++ /dev/null @@ -1,639 +0,0 @@ -// 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" - - -/******************************************************************** - Helper functions to maintain a list of file shares to create / remove - -********************************************************************/ -SCA_SMB* NewSmb() -{ - SCA_SMB* pss = (SCA_SMB*)MemAlloc(sizeof(SCA_SMB), TRUE); - Assert(pss); - return pss; -} - - -SCA_SMB_EX_USER_PERMS* NewExUserPermsSmb() -{ - SCA_SMB_EX_USER_PERMS* pExUserPerms = (SCA_SMB_EX_USER_PERMS*)MemAlloc(sizeof(SCA_SMB_EX_USER_PERMS), TRUE); - Assert(pExUserPerms); - return pExUserPerms; -} - - -SCA_SMB* AddSmbToList(SCA_SMB* pssList, SCA_SMB* pss) -{ - if (pssList) - { - SCA_SMB* pssT = pssList; - while (pssT->pssNext) - { - pssT = pssT->pssNext; - } - - pssT->pssNext = pss; - } - else - { - pssList = pss; - } - - return pssList; -} - - -SCA_SMB_EX_USER_PERMS* AddExUserPermsSmbToList( - SCA_SMB_EX_USER_PERMS* pExUserPermsList, - SCA_SMB_EX_USER_PERMS* pExUserPerms - ) -{ - SCA_SMB_EX_USER_PERMS* pExUserPermsTemp = pExUserPermsList; - if (pExUserPermsList) - { - while (pExUserPermsTemp->pExUserPermsNext) - { - pExUserPermsTemp = pExUserPermsTemp->pExUserPermsNext; - } - - pExUserPermsTemp->pExUserPermsNext = pExUserPerms; - } - else - { - pExUserPermsList = pExUserPerms; - } - - return pExUserPermsList; -} - -void ScaSmbFreeList(SCA_SMB* pssList) -{ - SCA_SMB* pssDelete = pssList; - while (pssList) - { - pssDelete = pssList; - pssList = pssList->pssNext; - - MemFree(pssDelete); - } -} - -void ScaExUserPermsSmbFreeList(SCA_SMB_EX_USER_PERMS* pExUserPermsList) -{ - SCA_SMB_EX_USER_PERMS* pExUserPermsDelete = pExUserPermsList; - while (pExUserPermsList) - { - pExUserPermsDelete = pExUserPermsList; - pExUserPermsList = pExUserPermsList->pExUserPermsNext; - - MemFree(pExUserPermsDelete); - } -} - -// sql query constants -LPCWSTR vcsSmbQuery = L"SELECT `Wix4FileShare`, `ShareName`, `Description`, `Directory_`, " - L"`Component_`, `User_`, `Permissions` FROM `Wix4FileShare`"; - -enum eSmbQuery { - ssqFileShare = 1, - ssqShareName, - ssqDescription, - ssqDirectory, - ssqComponent, - ssqUser, - ssqPermissions - }; - - -/******************************************************************** - ScaSmbRead - read all of the information from the msi tables and - return a list of file share jobs to be done. - -********************************************************************/ -HRESULT ScaSmbRead(SCA_SMB** ppssList) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - PMSIHANDLE hView, hRec; - - LPWSTR pwzData = NULL; - - SCA_SMB* pss = NULL; - BOOL bUserPermissionsTableExists = FALSE; - - if (S_OK != WcaTableExists(L"Wix4FileShare")) - { - WcaLog(LOGMSG_VERBOSE, "Skipping ScaSmbCreateShare() - Wix4FileShare table not present"); - ExitFunction1(hr = S_FALSE); - } - - if (S_OK == WcaTableExists(L"Wix4FileSharePermissions")) - { - bUserPermissionsTableExists = TRUE; - } - else - { - WcaLog(LOGMSG_VERBOSE, "No Additional Permissions - Wix4FileSharePermissions table not present"); - } - - WcaLog(LOGMSG_VERBOSE, "Reading File Share Tables"); - - // loop through all the fileshares - hr = WcaOpenExecuteView(vcsSmbQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4FileShare table"); - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - pss = NewSmb(); - if (!pss) - { - hr = E_OUTOFMEMORY; - break; - } - Assert(pss); - ::ZeroMemory(pss, sizeof(*pss)); - - hr = WcaGetRecordString(hRec, ssqFileShare, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4FileShare.Wix4FileShare"); - hr = ::StringCchCopyW(pss->wzId, countof(pss->wzId), pwzData); - ExitOnFailure(hr, "Failed to copy ID string to smb object"); - - hr = WcaGetRecordFormattedString(hRec, ssqShareName, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4FileShare.ShareName"); - hr = ::StringCchCopyW(pss->wzShareName, countof(pss->wzShareName), pwzData); - ExitOnFailure(hr, "Failed to copy share name string to smb object"); - - hr = WcaGetRecordString(hRec, ssqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get Component for Wix4FileShare: '%ls'", pss->wzShareName); - hr = ::StringCchCopyW(pss->wzComponent, countof(pss->wzComponent), pwzData); - ExitOnFailure(hr, "Failed to copy component string to smb object"); - - hr = WcaGetRecordFormattedString(hRec, ssqDescription, &pwzData); - ExitOnFailure(hr, "Failed to get Share Description for Wix4FileShare: '%ls'", pss->wzShareName); - hr = ::StringCchCopyW(pss->wzDescription, countof(pss->wzDescription), pwzData); - ExitOnFailure(hr, "Failed to copy description string to smb object"); - - // get user info from the user table - hr = WcaGetRecordFormattedString(hRec, ssqUser, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User record for Wix4FileShare: '%ls'", pss->wzShareName); - - // get component install state - er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pss->wzComponent, &pss->isInstalled, &pss->isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to get Component state for Wix4FileShare"); - - // if a user was specified - if (*pwzData) - { - pss->fUseIntegratedAuth = FALSE; - pss->fLegacyUserProvided = TRUE; - hr = ScaGetUser(pwzData, &pss->scau); - ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); - } - else - { - pss->fLegacyUserProvided = FALSE; - // TODO: figure out whether this is useful still - //pss->fUseIntegratedAuth = TRUE; - // integrated authorization doesn't have a User record - } - - // get the share's directory - hr = WcaGetRecordString(hRec, ssqDirectory, &pwzData); - ExitOnFailure(hr, "Failed to get directory for Wix4FileShare: '%ls'", pss->wzShareName); - - WCHAR wzPath[MAX_PATH]; - DWORD dwLen; - dwLen = countof(wzPath); - // review: relevant for file shares? - if (INSTALLSTATE_SOURCE == pss->isAction) - { - er = ::MsiGetSourcePathW(WcaGetInstallHandle(), pwzData, wzPath, &dwLen); - } - else - { - er = ::MsiGetTargetPathW(WcaGetInstallHandle(), pwzData, wzPath, &dwLen); - } - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to get Source/TargetPath for Directory"); - - // If the path is to the root of a drive, then it needs a trailing backslash. - // Otherwise, it can't have a trailing backslash. - if (3 < dwLen) - { - if (wzPath[dwLen - 1] == L'\\') - { - wzPath[dwLen - 1] = 0; - } - } - else if (2 == dwLen && wzPath[1] == L':') - { - wzPath[2] = L'\\'; - wzPath[3] = 0; - } - - hr = ::StringCchCopyW(pss->wzDirectory, countof(pss->wzDirectory), wzPath); - ExitOnFailure(hr, "Failed to copy directory string to smb object"); - - hr = WcaGetRecordInteger(hRec, ssqPermissions, &pss->nPermissions); - ExitOnFailure(hr, "Failed to get Wix4FileShare.Permissions"); - - // Check to see if additional user & permissions are specified for this share - if (bUserPermissionsTableExists) - { - hr = ScaSmbExPermsRead(pss); - ExitOnFailure(hr, "Failed to get Additional File Share Permissions"); - } - - *ppssList = AddSmbToList(*ppssList, pss); - pss = NULL; // set the smb NULL so it doesn't accidentally get freed below - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "Failure occured while processing Wix4FileShare table"); - -LExit: - // if anything was left over after an error clean it all up - if (pss) - { - ScaSmbFreeList(pss); - } - - ReleaseStr(pwzData); - - return hr; -} - - -/******************************************************************** - RetrieveSMBShareUserPermList - retrieve SMB Share's user permission list - -********************************************************************/ -HRESULT RetrieveFileShareUserPerm(SCA_SMB* pss, SCA_SMB_EX_USER_PERMS** ppExUserPermsList, DWORD *pUserPermsCount) -{ - HRESULT hr = S_OK; - SHARE_INFO_502* psi = NULL; - NET_API_STATUS s; - BOOL bValid, bDaclDefaulted; - PACL acl = NULL; - PEXPLICIT_ACCESSW pEA = NULL; - ULONG nCount = 0; - DWORD er = ERROR_SUCCESS; - PSID pSID = NULL; - DWORD nUserNameSize = MAX_DARWIN_COLUMN; - DWORD nDomainNameSize = MAX_DARWIN_COLUMN; - SID_NAME_USE peUse; - DWORD dwCounter = 0; - SCA_SMB_EX_USER_PERMS* pExUserPermsList = NULL; - DWORD dwUserPermsCount = 0; - - *pUserPermsCount = 0; - s = ::NetShareGetInfo(NULL, pss->wzShareName, 502, (LPBYTE*)&psi); - WcaLog(LOGMSG_VERBOSE, "retrieving permissions on existing file share."); - if (NERR_NetNameNotFound == s) - { - WcaLog(LOGMSG_VERBOSE, "File share has already been removed."); - ExitFunction1(hr = S_OK); - } - else if (NERR_Success != s || psi == NULL) - { - hr = E_FAIL; - ExitOnFailure(hr, "Failed to get share information with return code: %d", s); - } - if (!::GetSecurityDescriptorDacl(psi->shi502_security_descriptor, &bValid, &acl, &bDaclDefaulted) || !bValid) - { - ExitOnLastError(hr, "Failed to get acl from security descriptor"); - } - - er = ::GetExplicitEntriesFromAclW(acl, &nCount, &pEA); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to get access entries from acl for file share %ls", pss->wzShareName); - for (dwCounter = 0; dwCounter < nCount; ++dwCounter) - { - if (TRUSTEE_IS_SID == pEA[dwCounter].Trustee.TrusteeForm) - { - SCA_SMB_EX_USER_PERMS* pExUserPerms = NewExUserPermsSmb(); - ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); - pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); - pSID = (PSID)(pEA[dwCounter].Trustee.ptstrName); - if (!::LookupAccountSidW(NULL, pSID, pExUserPerms->scau.wzName, &nUserNameSize, pExUserPerms->scau.wzDomain, &nDomainNameSize, &peUse)) - { - hr = E_FAIL; - ExitOnFailure(hr, "Failed to get account name from SID"); - } - pExUserPerms->nPermissions = pEA[dwCounter].grfAccessPermissions; - pExUserPerms->accessMode = pEA[dwCounter].grfAccessMode; - ++dwUserPermsCount; - nUserNameSize = MAX_DARWIN_COLUMN; - nDomainNameSize = MAX_DARWIN_COLUMN; - } - } - *ppExUserPermsList = pExUserPermsList; - *pUserPermsCount = dwUserPermsCount; - -LExit: - if (psi) - { - ::NetApiBufferFree(psi); - } - - if (pEA) - { - ::LocalFree(pEA); - } - - return hr; -} - - -/******************************************************************** - SchedCreateSmb - schedule one instance of a file share creation - -********************************************************************/ -HRESULT SchedCreateSmb(SCA_SMB* pss) -{ - HRESULT hr = S_OK; - - WCHAR wzDomainUser[255]; // "domain\user" - SCA_SMB_EX_USER_PERMS* pExUserPermsList = NULL; - int nCounter = 0; - WCHAR* pwzRollbackCustomActionData = NULL; - WCHAR* pwzCustomActionData = NULL; - - hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); - - hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); - - hr = WcaWriteStringToCaData(pss->wzDescription, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add server name to CustomActionData"); - - hr = WcaWriteStringToCaData(pss->wzDirectory, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add full path instance to CustomActionData"); - - hr = WcaWriteStringToCaData(pss->fUseIntegratedAuth ? L"1" : L"0", &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add server name to CustomActionData"); - - if (pss->fLegacyUserProvided) - { - hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount + 1, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); - - hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pss->scau.wzName, pss->scau.wzDomain); - ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); - hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); - - hr = WcaWriteIntegerToCaData(pss->nPermissions, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); - } - else - { - hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); - } - - if (pss->nUserPermissionCount > 0) - { - nCounter = 0; - for (pExUserPermsList = pss->pExUserPerms; pExUserPermsList; pExUserPermsList = pExUserPermsList->pExUserPermsNext) - { - Assert(nCounter < pss->nUserPermissionCount); - - hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pExUserPermsList->scau.wzName, pExUserPermsList->scau.wzDomain); - ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); - hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); - - hr = WcaWriteIntegerToCaData((int)pExUserPermsList->accessMode, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add access mode to CustomActionData"); - - hr = WcaWriteIntegerToCaData(pExUserPermsList->nPermissions, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); - ++nCounter; - } - Assert(nCounter == pss->nUserPermissionCount); - } - - // Schedule the rollback first - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateSmbRollback"), pwzRollbackCustomActionData, COST_SMB_DROPSMB); - ExitOnFailure(hr, "Failed to schedule DropSmb action"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateSmb"), pwzCustomActionData, COST_SMB_CREATESMB); - ExitOnFailure(hr, "Failed to schedule CreateSmb action"); - -LExit: - ReleaseStr(pwzRollbackCustomActionData); - ReleaseStr(pwzCustomActionData); - - if (pExUserPermsList) - { - ScaExUserPermsSmbFreeList(pExUserPermsList); - } - - return hr; -} - - -/******************************************************************** - ScaSmbInstall - for every file share, schedule the create custom action - -********************************************************************/ -HRESULT ScaSmbInstall(SCA_SMB* pssList) -{ - HRESULT hr = S_FALSE; // assume nothing will be done - SCA_SMB* pss = NULL; - - for (pss = pssList; pss; pss = pss->pssNext) - { - // if installing this component - if (WcaIsInstalling(pss->isInstalled, pss->isAction) ) - { - hr = SchedCreateSmb(pss); - ExitOnFailure(hr, "Failed to schedule the creation of the fileshare: %ls", pss->wzShareName); - } - } - -LExit: - return hr; -} - - -/******************************************************************** - SchedDropSmb - schedule one instance of a file share removal - -********************************************************************/ -HRESULT SchedDropSmb(SCA_SMB* pss) -{ - HRESULT hr = S_OK; - - WCHAR* pwzCustomActionData = NULL; - WCHAR* pwzRollbackCustomActionData = NULL; - SCA_SMB_EX_USER_PERMS *pExUserPermsList = NULL; - SCA_SMB_EX_USER_PERMS *pExUserPerm = NULL; - WCHAR wzDomainUser[255]; // "domain\user" - DWORD dwUserPermsCount = 0; - - // roll back DropSmb - hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); - - hr = WcaWriteStringToCaData(pss->wzDescription, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add server name to CustomActionData"); - - hr = WcaWriteStringToCaData(pss->wzDirectory, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add full path instance to CustomActionData"); - - hr = WcaWriteStringToCaData(L"1", &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add useintegrated flag to CustomActionData"); - - hr = RetrieveFileShareUserPerm(pss, &pExUserPermsList, &dwUserPermsCount); - ExitOnFailure(hr, "Failed to retrieve SMBShare's user permissions"); - - hr = WcaWriteIntegerToCaData((int)dwUserPermsCount, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); - - for (pExUserPerm = pExUserPermsList; pExUserPerm; pExUserPerm = pExUserPerm->pExUserPermsNext) - { - hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pExUserPerm->scau.wzName, pExUserPerm->scau.wzDomain); - ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); - hr = WcaWriteStringToCaData(wzDomainUser, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); - - hr = WcaWriteIntegerToCaData((int)pExUserPerm->accessMode, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add access mode to CustomActionData"); - - hr = WcaWriteIntegerToCaData(pExUserPerm->nPermissions, &pwzRollbackCustomActionData); - ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); - } - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"DropSmbRollback"), pwzRollbackCustomActionData, COST_SMB_CREATESMB); - ExitOnFailure(hr, "Failed to schedule DropSmbRollback action"); - - // DropSMB - hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"DropSmb"), pwzCustomActionData, COST_SMB_DROPSMB); - ExitOnFailure(hr, "Failed to schedule DropSmb action"); - -LExit: - ReleaseStr(pwzCustomActionData); - - if (pExUserPermsList) - { - ScaExUserPermsSmbFreeList(pExUserPermsList); - } - - return hr; - -} - - -/******************************************************************** - ScaSmbUninstall - for every file share, schedule the drop custom action - -********************************************************************/ -HRESULT ScaSmbUninstall(SCA_SMB* pssList) -{ - HRESULT hr = S_FALSE; // assume nothing will be done - SCA_SMB* pss = NULL; - - for (pss = pssList; pss; pss = pss->pssNext) - { - // if uninstalling this component - if (WcaIsUninstalling(pss->isInstalled, pss->isAction) ) - { - hr = SchedDropSmb(pss); - ExitOnFailure(hr, "Failed to remove file share %ls", pss->wzShareName); - } - } - -LExit: - return hr; -} - -LPCWSTR vcsSmbExUserPermsQuery = L"SELECT `FileShare_`,`User_`,`Permissions` " - L"FROM `Wix4FileSharePermissions` WHERE `FileShare_`=?"; - -enum eSmbUserPermsQuery { - ssupqFileShare = 1, - ssupqUser, - ssupqPermissions - -}; - - -/******************************************************************** - ScaSmbExPermsRead - for Every entry in File Permissions table add a - User Name & Permissions structure to the List - -********************************************************************/ -HRESULT ScaSmbExPermsRead(SCA_SMB* pss) -{ - HRESULT hr = S_OK; - PMSIHANDLE hView, hRec; - - LPWSTR pwzData = NULL; - SCA_SMB_EX_USER_PERMS* pExUserPermsList = pss->pExUserPerms; - SCA_SMB_EX_USER_PERMS* pExUserPerms = NULL; - int nCounter = 0; - - hRec = ::MsiCreateRecord(1); - hr = WcaSetRecordString(hRec, 1, pss->wzId); - ExitOnFailure(hr, "Failed to look up FileShare"); - - hr = WcaOpenView(vcsSmbExUserPermsQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4FileSharePermissions table"); - hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "Failed to execute view on Wix4FileSharePermissions table"); - - // loop through all User/Permissions paris returned - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - pExUserPerms = NewExUserPermsSmb(); - if (!pExUserPerms) - { - hr = E_OUTOFMEMORY; - break; - } - Assert(pExUserPerms); - ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); - - hr = WcaGetRecordString(hRec, ssupqUser, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4FileSharePermissions.User"); - hr = ScaGetUser(pwzData, &pExUserPerms->scau); - ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); - - hr = WcaGetRecordInteger(hRec, ssupqPermissions, &pExUserPerms->nPermissions); - ExitOnFailure(hr, "Failed to get Wix4FileSharePermissions.Permissions"); - pExUserPerms->accessMode = SET_ACCESS; // we only support SET_ACCESS here - - pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); - ++nCounter; - pExUserPerms = NULL; // set the smb NULL so it doesn't accidentally get freed below - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - pss->pExUserPerms = pExUserPermsList; - pss->nUserPermissionCount = nCounter; - } - ExitOnFailure(hr, "Failure occured while processing FileShare table"); - -LExit: - // if anything was left over after an error clean it all up - if (pExUserPerms) - { - ScaExUserPermsSmbFreeList(pExUserPerms); - } - - ReleaseStr(pwzData); - - return hr; -} diff --git a/src/ca/scauser.cpp b/src/ca/scauser.cpp deleted file mode 100644 index b25e9daf..00000000 --- a/src/ca/scauser.cpp +++ /dev/null @@ -1,709 +0,0 @@ -// 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" - -LPCWSTR vcsUserQuery = L"SELECT `Wix4User`, `Component_`, `Name`, `Domain`, `Password` FROM `Wix4User` WHERE `Wix4User`=?"; -enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword }; - -LPCWSTR vcsGroupQuery = L"SELECT `Wix4Group`, `Component_`, `Name`, `Domain` FROM `Wix4Group` WHERE `Wix4Group`=?"; -enum eGroupQuery { vgqGroup = 1, vgqComponent, vgqName, vgqDomain }; - -LPCWSTR vcsUserGroupQuery = L"SELECT `Wix4User_`, `Wix4Group_` FROM `Wix4UserGroup` WHERE `Wix4User_`=?"; -enum eUserGroupQuery { vugqUser = 1, vugqGroup }; - -LPCWSTR vActionableQuery = L"SELECT `Wix4User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `Wix4User` WHERE `Component_` IS NOT NULL"; -enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain, vaqPassword, vaqAttributes }; - - -static HRESULT AddUserToList( - __inout SCA_USER** ppsuList - ); - -static HRESULT AddGroupToList( - __inout SCA_GROUP** ppsgList - ); - - -HRESULT __stdcall ScaGetUser( - __in LPCWSTR wzUser, - __out SCA_USER* pscau - ) -{ - if (!wzUser || !pscau) - { - return E_INVALIDARG; - } - - HRESULT hr = S_OK; - PMSIHANDLE hView, hRec; - - LPWSTR pwzData = NULL; - - // clear struct and bail right away if no user key was passed to search for - ::ZeroMemory(pscau, sizeof(*pscau)); - if (!*wzUser) - { - ExitFunction1(hr = S_OK); - } - - hRec = ::MsiCreateRecord(1); - hr = WcaSetRecordString(hRec, 1, wzUser); - ExitOnFailure(hr, "Failed to look up User"); - - hr = WcaOpenView(vcsUserQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4User table"); - hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "Failed to execute view on Wix4User table"); - - hr = WcaFetchSingleRecord(hView, &hRec); - if (S_OK == hr) - { - hr = WcaGetRecordString(hRec, vuqUser, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.User"); - hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); - ExitOnFailure(hr, "Failed to copy key string to user object"); - - hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Component_"); - hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); - ExitOnFailure(hr, "Failed to copy component string to user object"); - - hr = WcaGetRecordFormattedString(hRec, vuqName, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Name"); - hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); - ExitOnFailure(hr, "Failed to copy name string to user object"); - - hr = WcaGetRecordFormattedString(hRec, vuqDomain, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Domain"); - hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); - ExitOnFailure(hr, "Failed to copy domain string to user object"); - - hr = WcaGetRecordFormattedString(hRec, vuqPassword, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Password"); - hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); - ExitOnFailure(hr, "Failed to copy password string to user object"); - } - else if (E_NOMOREITEMS == hr) - { - WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser); - hr = E_FAIL; - } - else - { - ExitOnFailure(hr, "Error or found multiple matching Wix4User rows"); - } - -LExit: - ReleaseStr(pwzData); - - return hr; -} - -HRESULT __stdcall ScaGetUserDeferred( - __in LPCWSTR wzUser, - __in WCA_WRAPQUERY_HANDLE hUserQuery, - __out SCA_USER* pscau - ) -{ - if (!wzUser || !pscau) - { - return E_INVALIDARG; - } - - HRESULT hr = S_OK; - MSIHANDLE hRec, hRecTest; - - LPWSTR pwzData = NULL; - - // clear struct and bail right away if no user key was passed to search for - ::ZeroMemory(pscau, sizeof(*pscau)); - if (!*wzUser) - { - ExitFunction1(hr = S_OK); - } - - // Reset back to the first record - WcaFetchWrappedReset(hUserQuery); - - hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRec); - if (S_OK == hr) - { - hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRecTest); - if (S_OK == hr) - { - AssertSz(FALSE, "Found multiple matching Wix4User rows"); - } - - hr = WcaGetRecordString(hRec, vuqUser, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.User"); - hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); - ExitOnFailure(hr, "Failed to copy key string to user object (in deferred CA)"); - - hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Component_"); - hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); - ExitOnFailure(hr, "Failed to copy component string to user object (in deferred CA)"); - - hr = WcaGetRecordString(hRec, vuqName, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Name"); - hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); - ExitOnFailure(hr, "Failed to copy name string to user object (in deferred CA)"); - - hr = WcaGetRecordString(hRec, vuqDomain, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Domain"); - hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); - ExitOnFailure(hr, "Failed to copy domain string to user object (in deferred CA)"); - - hr = WcaGetRecordString(hRec, vuqPassword, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4User.Password"); - hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); - ExitOnFailure(hr, "Failed to copy password string to user object (in deferred CA)"); - } - else if (E_NOMOREITEMS == hr) - { - WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser); - hr = E_FAIL; - } - else - { - ExitOnFailure(hr, "Error fetching single Wix4User row"); - } - -LExit: - ReleaseStr(pwzData); - - return hr; -} - - -HRESULT __stdcall ScaGetGroup( - __in LPCWSTR wzGroup, - __out SCA_GROUP* pscag - ) -{ - if (!wzGroup || !pscag) - { - return E_INVALIDARG; - } - - HRESULT hr = S_OK; - PMSIHANDLE hView, hRec; - - LPWSTR pwzData = NULL; - - hRec = ::MsiCreateRecord(1); - hr = WcaSetRecordString(hRec, 1, wzGroup); - ExitOnFailure(hr, "Failed to look up Group"); - - hr = WcaOpenView(vcsGroupQuery, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4Group table"); - hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "Failed to execute view on Wix4Group table"); - - hr = WcaFetchSingleRecord(hView, &hRec); - if (S_OK == hr) - { - hr = WcaGetRecordString(hRec, vgqGroup, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4Group.Wix4Group."); - hr = ::StringCchCopyW(pscag->wzKey, countof(pscag->wzKey), pwzData); - ExitOnFailure(hr, "Failed to copy Wix4Group.Wix4Group."); - - hr = WcaGetRecordString(hRec, vgqComponent, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4Group.Component_"); - hr = ::StringCchCopyW(pscag->wzComponent, countof(pscag->wzComponent), pwzData); - ExitOnFailure(hr, "Failed to copy Wix4Group.Component_."); - - hr = WcaGetRecordFormattedString(hRec, vgqName, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4Group.Name"); - hr = ::StringCchCopyW(pscag->wzName, countof(pscag->wzName), pwzData); - ExitOnFailure(hr, "Failed to copy Wix4Group.Name."); - - hr = WcaGetRecordFormattedString(hRec, vgqDomain, &pwzData); - ExitOnFailure(hr, "Failed to get Wix4Group.Domain"); - hr = ::StringCchCopyW(pscag->wzDomain, countof(pscag->wzDomain), pwzData); - ExitOnFailure(hr, "Failed to copy Wix4Group.Domain."); - } - else if (E_NOMOREITEMS == hr) - { - WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4Group.Wix4Group='%ls'", wzGroup); - hr = E_FAIL; - } - else - { - ExitOnFailure(hr, "Error or found multiple matching Wix4Group rows"); - } - -LExit: - ReleaseStr(pwzData); - - return hr; -} - - -void ScaUserFreeList( - __in SCA_USER* psuList - ) -{ - SCA_USER* psuDelete = psuList; - while (psuList) - { - psuDelete = psuList; - psuList = psuList->psuNext; - - ScaGroupFreeList(psuDelete->psgGroups); - MemFree(psuDelete); - } -} - - -void ScaGroupFreeList( - __in SCA_GROUP* psgList - ) -{ - SCA_GROUP* psgDelete = psgList; - while (psgList) - { - psgDelete = psgList; - psgList = psgList->psgNext; - - MemFree(psgDelete); - } -} - - -HRESULT ScaUserRead( - __out SCA_USER** ppsuList - ) -{ - //Assert(FALSE); - Assert(ppsuList); - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - PMSIHANDLE hView, hRec, hUserRec, hUserGroupView; - - LPWSTR pwzData = NULL; - - BOOL fUserGroupExists = FALSE; - - SCA_USER *psu = NULL; - - INSTALLSTATE isInstalled, isAction; - - if (S_OK != WcaTableExists(L"Wix4User")) - { - WcaLog(LOGMSG_VERBOSE, "Wix4User Table does not exist, exiting"); - ExitFunction1(hr = S_FALSE); - } - - if (S_OK == WcaTableExists(L"Wix4UserGroup")) - { - fUserGroupExists = TRUE; - } - - // - // loop through all the users - // - hr = WcaOpenExecuteView(vActionableQuery, &hView); - ExitOnFailure(hr, "failed to open view on Wix4User table"); - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, vaqComponent, &pwzData); - ExitOnFailure(hr, "failed to get Wix4User.Component"); - - er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &isInstalled, &isAction); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "failed to get Component state for Wix4User"); - - // don't bother if we aren't installing or uninstalling this component - if (WcaIsInstalling(isInstalled, isAction) || WcaIsUninstalling(isInstalled, isAction)) - { - // - // Add the user to the list and populate it's values - // - hr = AddUserToList(ppsuList); - ExitOnFailure(hr, "failed to add user to list"); - - psu = *ppsuList; - - psu->isInstalled = isInstalled; - psu->isAction = isAction; - hr = ::StringCchCopyW(psu->wzComponent, countof(psu->wzComponent), pwzData); - ExitOnFailure(hr, "failed to copy component name: %ls", pwzData); - - hr = WcaGetRecordString(hRec, vaqUser, &pwzData); - ExitOnFailure(hr, "failed to get Wix4User.User"); - hr = ::StringCchCopyW(psu->wzKey, countof(psu->wzKey), pwzData); - ExitOnFailure(hr, "failed to copy user key: %ls", pwzData); - - hr = WcaGetRecordFormattedString(hRec, vaqName, &pwzData); - ExitOnFailure(hr, "failed to get Wix4User.Name"); - hr = ::StringCchCopyW(psu->wzName, countof(psu->wzName), pwzData); - ExitOnFailure(hr, "failed to copy user name: %ls", pwzData); - - hr = WcaGetRecordFormattedString(hRec, vaqDomain, &pwzData); - ExitOnFailure(hr, "failed to get Wix4User.Domain"); - hr = ::StringCchCopyW(psu->wzDomain, countof(psu->wzDomain), pwzData); - ExitOnFailure(hr, "failed to copy user domain: %ls", pwzData); - - hr = WcaGetRecordFormattedString(hRec, vaqPassword, &pwzData); - ExitOnFailure(hr, "failed to get Wix4User.Password"); - hr = ::StringCchCopyW(psu->wzPassword, countof(psu->wzPassword), pwzData); - ExitOnFailure(hr, "failed to copy user password"); - - hr = WcaGetRecordInteger(hRec, vaqAttributes, &psu->iAttributes); - ExitOnFailure(hr, "failed to get Wix4User.Attributes"); - - // Check if this user is to be added to any groups - if (fUserGroupExists) - { - hUserRec = ::MsiCreateRecord(1); - hr = WcaSetRecordString(hUserRec, 1, psu->wzKey); - ExitOnFailure(hr, "Failed to create user record for querying Wix4UserGroup table"); - - hr = WcaOpenView(vcsUserGroupQuery, &hUserGroupView); - ExitOnFailure(hr, "Failed to open view on Wix4UserGroup table for user %ls", psu->wzKey); - hr = WcaExecuteView(hUserGroupView, hUserRec); - ExitOnFailure(hr, "Failed to execute view on Wix4UserGroup table for user: %ls", psu->wzKey); - - while (S_OK == (hr = WcaFetchRecord(hUserGroupView, &hRec))) - { - hr = WcaGetRecordString(hRec, vugqGroup, &pwzData); - ExitOnFailure(hr, "failed to get Wix4UserGroup.Group"); - - hr = AddGroupToList(&(psu->psgGroups)); - ExitOnFailure(hr, "failed to add group to list"); - - hr = ScaGetGroup(pwzData, psu->psgGroups); - ExitOnFailure(hr, "failed to get information for group: %ls", pwzData); - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed to enumerate selected rows from Wix4UserGroup table"); - } - } - } - - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed to enumerate selected rows from Wix4User table"); - -LExit: - ReleaseStr(pwzData); - - return hr; -} - - -static HRESULT WriteGroupInfo( - __in SCA_GROUP* psgList, - __in LPWSTR *ppwzActionData - ) -{ - HRESULT hr = S_OK; - - for (SCA_GROUP* psg = psgList; psg; psg = psg->psgNext) - { - hr = WcaWriteStringToCaData(psg->wzName, ppwzActionData); - ExitOnFailure(hr, "failed to add group name to custom action data: %ls", psg->wzName); - - hr = WcaWriteStringToCaData(psg->wzDomain, ppwzActionData); - ExitOnFailure(hr, "failed to add group domain to custom action data: %ls", psg->wzDomain); - } - -LExit: - return hr; -} - - -// Behaves like WriteGroupInfo, but it filters out groups the user is currently a member of, -// because we don't want to rollback those -static HRESULT WriteGroupRollbackInfo( - __in LPCWSTR pwzName, - __in LPCWSTR pwzDomain, - __in SCA_GROUP* psgList, - __in LPWSTR *ppwzActionData - ) -{ - HRESULT hr = S_OK; - BOOL fIsMember = FALSE; - - for (SCA_GROUP* psg = psgList; psg; psg = psg->psgNext) - { - hr = UserCheckIsMember(pwzName, pwzDomain, psg->wzName, psg->wzDomain, &fIsMember); - if (FAILED(hr)) - { - WcaLog(LOGMSG_VERBOSE, "Failed to check if user: %ls (domain: %ls) is member of a group while collecting rollback information (error code 0x%x) - continuing", pwzName, pwzDomain, hr); - hr = S_OK; - continue; - } - - // If the user is currently a member, we don't want to undo that on rollback, so skip adding - // this group record to the list of groups to rollback - if (fIsMember) - { - continue; - } - - hr = WcaWriteStringToCaData(psg->wzName, ppwzActionData); - ExitOnFailure(hr, "failed to add group name to custom action data: %ls", psg->wzName); - - hr = WcaWriteStringToCaData(psg->wzDomain, ppwzActionData); - ExitOnFailure(hr, "failed to add group domain to custom action data: %ls", psg->wzDomain); - } - -LExit: - return hr; -} - - -/* **************************************************************** -ScaUserExecute - Schedules user account creation or removal based on -component state. - -******************************************************************/ -HRESULT ScaUserExecute( - __in SCA_USER *psuList - ) -{ - HRESULT hr = S_OK; - DWORD er = 0; - PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; - - LPWSTR pwzBaseScriptKey = NULL; - DWORD cScriptKey = 0; - - USER_INFO_0 *pUserInfo = NULL; - LPWSTR pwzScriptKey = NULL; - LPWSTR pwzActionData = NULL; - LPWSTR pwzRollbackData = NULL; - - // Get the base script key for this CustomAction. - hr = WcaCaScriptCreateKey(&pwzBaseScriptKey); - ExitOnFailure(hr, "Failed to get encoding key."); - - // Loop through all the users to be configured. - for (SCA_USER *psu = psuList; psu; psu = psu->psuNext) - { - USER_EXISTS ueUserExists = USER_EXISTS_INDETERMINATE; - - // Always put the User Name and Domain plus Attributes on the front of the CustomAction - // data. Sometimes we'll add more data. - Assert(psu->wzName); - hr = WcaWriteStringToCaData(psu->wzName, &pwzActionData); - ExitOnFailure(hr, "Failed to add user name to custom action data: %ls", psu->wzName); - hr = WcaWriteStringToCaData(psu->wzDomain, &pwzActionData); - ExitOnFailure(hr, "Failed to add user domain to custom action data: %ls", psu->wzDomain); - hr = WcaWriteIntegerToCaData(psu->iAttributes, &pwzActionData); - ExitOnFailure(hr, "failed to add user attributes to custom action data for user: %ls", psu->wzKey); - - // Check to see if the user already exists since we have to be very careful when adding - // and removing users. Note: MSDN says that it is safe to call these APIs from any - // user, so we should be safe calling it during immediate mode. - er = ::NetApiBufferAllocate(sizeof(USER_INFO_0), reinterpret_cast(&pUserInfo)); - hr = HRESULT_FROM_WIN32(er); - ExitOnFailure(hr, "Failed to allocate memory to check existence of user: %ls", psu->wzName); - - LPCWSTR wzDomain = psu->wzDomain; - if (wzDomain && *wzDomain) - { - er = ::DsGetDcNameW(NULL, wzDomain, NULL, NULL, NULL, &pDomainControllerInfo); - if (RPC_S_SERVER_UNAVAILABLE == er) - { - // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag - er = ::DsGetDcNameW(NULL, wzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo); - } - if (ERROR_SUCCESS == er) - { - wzDomain = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix - } - } - - er = ::NetUserGetInfo(wzDomain, psu->wzName, 0, reinterpret_cast(pUserInfo)); - if (NERR_Success == er) - { - ueUserExists = USER_EXISTS_YES; - } - else if (NERR_UserNotFound == er) - { - ueUserExists = USER_EXISTS_NO; - } - else - { - ueUserExists = USER_EXISTS_INDETERMINATE; - hr = HRESULT_FROM_WIN32(er); - WcaLog(LOGMSG_VERBOSE, "Failed to check existence of domain: %ls, user: %ls (error code 0x%x) - continuing", wzDomain, psu->wzName, hr); - hr = S_OK; - er = ERROR_SUCCESS; - } - - if (WcaIsInstalling(psu->isInstalled, psu->isAction)) - { - // If the user exists, check to see if we are supposed to fail if user the exists before - // the install. - if (USER_EXISTS_YES == ueUserExists) - { - // Reinstalls will always fail if we don't remove the check for "fail if exists". - if (WcaIsReInstalling(psu->isInstalled, psu->isAction)) - { - psu->iAttributes &= ~SCAU_FAIL_IF_EXISTS; - } - - if ((SCAU_FAIL_IF_EXISTS & (psu->iAttributes)) && !(SCAU_UPDATE_IF_EXISTS & (psu->iAttributes))) - { - hr = HRESULT_FROM_WIN32(NERR_UserExists); - MessageExitOnFailure(hr, msierrUSRFailedUserCreateExists, "Failed to create user: %ls because user already exists.", psu->wzName); - } - } - - // Rollback only if the user already exists, we couldn't determine if the user exists, or we are going to create the user - if ((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists) || !(psu->iAttributes & SCAU_DONT_CREATE_USER)) - { - ++cScriptKey; - hr = StrAllocFormatted(&pwzScriptKey, L"%ls%u", pwzBaseScriptKey, cScriptKey); - ExitOnFailure(hr, "Failed to create encoding key."); - - // Write the script key to CustomActionData for install and rollback so information can be passed to rollback. - hr = WcaWriteStringToCaData(pwzScriptKey, &pwzActionData); - ExitOnFailure(hr, "Failed to add encoding key to custom action data."); - - hr = WcaWriteStringToCaData(pwzScriptKey, &pwzRollbackData); - ExitOnFailure(hr, "Failed to add encoding key to rollback custom action data."); - - INT iRollbackUserAttributes = psu->iAttributes; - - // If the user already exists, ensure this is accounted for in rollback - if (USER_EXISTS_YES == ueUserExists) - { - iRollbackUserAttributes |= SCAU_DONT_CREATE_USER; - } - else - { - iRollbackUserAttributes &= ~SCAU_DONT_CREATE_USER; - } - - // The deferred CA determines when to rollback User Rights Assignments so these should never be set. - iRollbackUserAttributes &= ~SCAU_ALLOW_LOGON_AS_SERVICE; - iRollbackUserAttributes &= ~SCAU_ALLOW_LOGON_AS_BATCH; - - hr = WcaWriteStringToCaData(psu->wzName, &pwzRollbackData); - ExitOnFailure(hr, "Failed to add user name to rollback custom action data: %ls", psu->wzName); - hr = WcaWriteStringToCaData(psu->wzDomain, &pwzRollbackData); - ExitOnFailure(hr, "Failed to add user domain to rollback custom action data: %ls", psu->wzDomain); - hr = WcaWriteIntegerToCaData(iRollbackUserAttributes, &pwzRollbackData); - ExitOnFailure(hr, "failed to add user attributes to rollback custom action data for user: %ls", psu->wzKey); - - // If the user already exists, add relevant group information to rollback data - if (USER_EXISTS_YES == ueUserExists || USER_EXISTS_INDETERMINATE == ueUserExists) - { - hr = WriteGroupRollbackInfo(psu->wzName, psu->wzDomain, psu->psgGroups, &pwzRollbackData); - ExitOnFailure(hr, "failed to add group information to rollback custom action data"); - } - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUserRollback"), pwzRollbackData, COST_USER_DELETE); - ExitOnFailure(hr, "failed to schedule CreateUserRollback"); - } - else - { - // Write empty script key to CustomActionData since there is no rollback. - hr = WcaWriteStringToCaData(L"", &pwzActionData); - ExitOnFailure(hr, "Failed to add empty encoding key to custom action data."); - } - - // - // Schedule the creation now. - // - hr = WcaWriteStringToCaData(psu->wzPassword, &pwzActionData); - ExitOnFailure(hr, "failed to add user password to custom action data for user: %ls", psu->wzKey); - - // Add user's group information to custom action data - hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); - ExitOnFailure(hr, "failed to add group information to custom action data"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUser"), pwzActionData, COST_USER_ADD); - ExitOnFailure(hr, "failed to schedule CreateUser"); - } - else if (((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists)) && WcaIsUninstalling(psu->isInstalled, psu->isAction) && !(psu->iAttributes & SCAU_DONT_REMOVE_ON_UNINSTALL)) - { - // Add user's group information - this will ensure the user can be removed from any groups they were added to, if the user isn't be deleted - hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); - ExitOnFailure(hr, "failed to add group information to custom action data"); - - // - // Schedule the removal because the user exists and we don't have any flags set - // that say, don't remove the user on uninstall. - // - // Note: We can't rollback the removal of a user which is why RemoveUser is a commit - // CustomAction. - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RemoveUser"), pwzActionData, COST_USER_DELETE); - ExitOnFailure(hr, "failed to schedule RemoveUser"); - } - - ReleaseNullStr(pwzScriptKey); - ReleaseNullStr(pwzActionData); - ReleaseNullStr(pwzRollbackData); - if (pUserInfo) - { - ::NetApiBufferFree(static_cast(pUserInfo)); - pUserInfo = NULL; - } - if (pDomainControllerInfo) - { - ::NetApiBufferFree(static_cast(pDomainControllerInfo)); - pDomainControllerInfo = NULL; - } - } - -LExit: - ReleaseStr(pwzBaseScriptKey); - ReleaseStr(pwzScriptKey); - ReleaseStr(pwzActionData); - ReleaseStr(pwzRollbackData); - if (pUserInfo) - { - ::NetApiBufferFree(static_cast(pUserInfo)); - } - if (pDomainControllerInfo) - { - ::NetApiBufferFree(static_cast(pDomainControllerInfo)); - } - - return hr; -} - - -static HRESULT AddUserToList( - __inout SCA_USER** ppsuList - ) -{ - HRESULT hr = S_OK; - SCA_USER* psu = static_cast(MemAlloc(sizeof(SCA_USER), TRUE)); - ExitOnNull(psu, hr, E_OUTOFMEMORY, "failed to allocate memory for new user list element"); - - psu->psuNext = *ppsuList; - *ppsuList = psu; - -LExit: - return hr; -} - - -static HRESULT AddGroupToList( - __inout SCA_GROUP** ppsgList - ) -{ - HRESULT hr = S_OK; - SCA_GROUP* psg = static_cast(MemAlloc(sizeof(SCA_GROUP), TRUE)); - ExitOnNull(psg, hr, E_OUTOFMEMORY, "failed to allocate memory for new group list element"); - - psg->psgNext = *ppsgList; - *ppsgList = psg; - -LExit: - return hr; -} diff --git a/src/ca/scauser.h b/src/ca/scauser.h deleted file mode 100644 index a5fd5ea8..00000000 --- a/src/ca/scauser.h +++ /dev/null @@ -1,67 +0,0 @@ -#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. - - -enum USER_EXISTS -{ - USER_EXISTS_YES, - USER_EXISTS_NO, - USER_EXISTS_INDETERMINATE -}; - -// structs -struct SCA_GROUP -{ - WCHAR wzKey[MAX_DARWIN_KEY + 1]; - WCHAR wzComponent[MAX_DARWIN_KEY + 1]; - - WCHAR wzDomain[MAX_DARWIN_COLUMN + 1]; - WCHAR wzName[MAX_DARWIN_COLUMN + 1]; - - SCA_GROUP *psgNext; -}; - -struct SCA_USER -{ - WCHAR wzKey[MAX_DARWIN_KEY + 1]; - WCHAR wzComponent[MAX_DARWIN_KEY + 1]; - INSTALLSTATE isInstalled; - INSTALLSTATE isAction; - - WCHAR wzDomain[MAX_DARWIN_COLUMN + 1]; - WCHAR wzName[MAX_DARWIN_COLUMN + 1]; - WCHAR wzPassword[MAX_DARWIN_COLUMN + 1]; - INT iAttributes; - - SCA_GROUP *psgGroups; - - SCA_USER *psuNext; -}; - - -// prototypes -HRESULT __stdcall ScaGetUser( - __in LPCWSTR wzUser, - __out SCA_USER* pscau - ); -HRESULT __stdcall ScaGetUserDeferred( - __in LPCWSTR wzUser, - __in WCA_WRAPQUERY_HANDLE hUserQuery, - __out SCA_USER* pscau - ); -HRESULT __stdcall ScaGetGroup( - __in LPCWSTR wzGroup, - __out SCA_GROUP* pscag - ); -void ScaUserFreeList( - __in SCA_USER* psuList - ); -void ScaGroupFreeList( - __in SCA_GROUP* psgList - ); -HRESULT ScaUserRead( - __inout SCA_USER** ppsuList - ); -HRESULT ScaUserExecute( - __in SCA_USER *psuList - ); diff --git a/src/ca/secureobj.cpp b/src/ca/secureobj.cpp deleted file mode 100644 index 72842eb5..00000000 --- a/src/ca/secureobj.cpp +++ /dev/null @@ -1,915 +0,0 @@ -// 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" - -// structs -LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `Wix4SecureObject`.`Wix4SecureObject`, `Wix4SecureObject`.`Table`, `Wix4SecureObject`.`Domain`, `Wix4SecureObject`.`User`, `Wix4SecureObject`.`Attributes`, " - L"`Wix4SecureObject`.`Permission`, `Wix4SecureObject`.`Component_`, `Component`.`Attributes` FROM `Wix4SecureObject`,`Component` WHERE " - L"`Wix4SecureObject`.`Component_`=`Component`.`Component`"; -enum eQUERY_SECUREOBJECTS { QSO_SECUREOBJECT = 1, QSO_TABLE, QSO_DOMAIN, QSO_USER, QSO_ATTRIBUTES, QSO_PERMISSION, QSO_COMPONENT, QSO_COMPATTRIBUTES }; - -LPCWSTR wzQUERY_REGISTRY = L"SELECT `Registry`.`Registry`, `Registry`.`Root`, `Registry`.`Key` FROM `Registry` WHERE `Registry`.`Registry`=?"; -enum eQUERY_OBJECTCOMPONENT { QSOC_REGISTRY = 1, QSOC_REGROOT, QSOC_REGKEY }; - -LPCWSTR wzQUERY_SERVICEINSTALL = L"SELECT `ServiceInstall`.`Name` FROM `ServiceInstall` WHERE `ServiceInstall`.`ServiceInstall`=?"; -enum eQUERY_SECURESERVICEINSTALL { QSSI_NAME = 1 }; - -enum eOBJECTTYPE { OT_UNKNOWN, OT_SERVICE, OT_FOLDER, OT_FILE, OT_REGISTRY }; - -enum eSECURE_OBJECT_ATTRIBUTE -{ - SECURE_OBJECT_ATTRIBUTE_INHERITABLE = 0x1, -}; - -static eOBJECTTYPE EObjectTypeFromString( - __in LPCWSTR pwzTable - ) -{ - if (NULL == pwzTable) - { - return OT_UNKNOWN; - } - - eOBJECTTYPE eType = OT_UNKNOWN; - - // ensure we're looking at a known table - if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) - { - eType = OT_SERVICE; - } - else if (0 == lstrcmpW(L"CreateFolder", pwzTable)) - { - eType = OT_FOLDER; - } - else if (0 == lstrcmpW(L"File", pwzTable)) - { - eType = OT_FILE; - } - else if (0 == lstrcmpW(L"Registry", pwzTable)) - { - eType = OT_REGISTRY; - } - - return eType; -} - -static SE_OBJECT_TYPE SEObjectTypeFromString( - __in LPCWSTR pwzTable - ) -{ - if (NULL == pwzTable) - { - return SE_UNKNOWN_OBJECT_TYPE; - } - - SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; - - if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) - { - objectType = SE_SERVICE; - } - else if (0 == lstrcmpW(L"CreateFolder", pwzTable) || 0 == lstrcmpW(L"File", pwzTable)) - { - objectType = SE_FILE_OBJECT; - } - else if (0 == lstrcmpW(L"Registry", pwzTable)) - { - objectType = SE_REGISTRY_KEY; - } - else - { - // Do nothing; we'll return SE_UNKNOWN_OBJECT_TYPE, and the caller should handle the situation - } - - return objectType; -} - -static HRESULT StoreACLRollbackInfo( - __in LPWSTR pwzObject, - __in LPCWSTR pwzTable - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - PSECURITY_DESCRIPTOR psd = NULL; - SECURITY_DESCRIPTOR_CONTROL sdc = {0}; - DWORD dwRevision = 0; - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwzSecurityInfo = NULL; - - Assert(pwzObject && pwzTable); - - SE_OBJECT_TYPE objectType = SEObjectTypeFromString(const_cast (pwzTable)); - - if (SE_UNKNOWN_OBJECT_TYPE != objectType) - { - er = ::GetNamedSecurityInfoW(pwzObject, objectType, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &psd); - if (ERROR_FILE_NOT_FOUND == er || ERROR_PATH_NOT_FOUND == er || ERROR_SERVICE_DOES_NOT_EXIST == HRESULT_CODE(er)) - { - // If the file, path or service doesn't exist yet, skip rollback without a message - hr = HRESULT_FROM_WIN32(er); - ExitFunction(); - } - - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "Unable to schedule rollback for object: %ls", pwzObject); - - //Need to see if DACL is protected so getting Descriptor information - if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) - { - ExitOnLastError(hr, "Unable to schedule rollback for object (failed to get security descriptor control): %ls", pwzObject); - } - - // Convert the security information to a string, and write this to the custom action data - if (!::ConvertSecurityDescriptorToStringSecurityDescriptorW(psd,SDDL_REVISION_1,DACL_SECURITY_INFORMATION,&pwzSecurityInfo,NULL)) - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "Unable to schedule rollback for object (failed to convert security descriptor to a valid security descriptor string): %ls", pwzObject); - } - - hr = WcaWriteStringToCaData(pwzObject, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add object data to rollback CustomActionData"); - - hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add table name to rollback CustomActionData"); - - hr = WcaWriteStringToCaData(pwzSecurityInfo, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add security info data to rollback CustomActionData"); - - // Write a 1 if DACL is protected, 0 otherwise - if (sdc & SE_DACL_PROTECTED) - { - hr = WcaWriteIntegerToCaData(1,&pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to rollbackCustomActionData"); - } - else - { - hr = WcaWriteIntegerToCaData(0,&pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to rollback CustomActionData"); - } - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecSecureObjectsRollback"), pwzCustomActionData, COST_SECUREOBJECT); - ExitOnFailure(hr, "failed to schedule ExecSecureObjectsRollback for item: %ls of type: %ls", pwzObject, pwzTable); - - ReleaseStr(pwzCustomActionData); - pwzCustomActionData = NULL; - - } - else - { - MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); - } -LExit: - ReleaseStr(pwzCustomActionData); - - if (psd) - { - ::LocalFree(psd); - } - - return hr; -} - -static HRESULT GetTargetPath( - __in eOBJECTTYPE eType, - __in LPCWSTR pwzSecureObject, - __out LPWSTR* ppwzTargetPath - ) -{ - HRESULT hr = S_OK; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRecObject = NULL; - PMSIHANDLE hRec = NULL; - - int iRoot = 0; - int iAllUsers = 0; - LPWSTR pwzKey = NULL; - LPWSTR pwzFormattedString = NULL; - - if (OT_SERVICE == eType) - { - hr = WcaTableExists(L"ServiceInstall"); - if (S_FALSE == hr) - { - hr = E_UNEXPECTED; - } - ExitOnFailure(hr, "failed to open ServiceInstall table to secure object"); - - hr = WcaOpenView(wzQUERY_SERVICEINSTALL, &hView); - ExitOnFailure(hr, "failed to open view on ServiceInstall table"); - - // create a record that stores the object to secure - hRec = MsiCreateRecord(1); - MsiRecordSetStringW(hRec, 1, pwzSecureObject); - - // execute a view looking for the object's ServiceInstall.ServiceInstall row. - hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "failed to execute view on ServiceInstall table"); - hr = WcaFetchSingleRecord(hView, &hRecObject); - ExitOnFailure(hr, "failed to fetch ServiceInstall row for secure object"); - - hr = WcaGetRecordFormattedString(hRecObject, QSSI_NAME, ppwzTargetPath); - ExitOnFailure(hr, "failed to get service name for secure object: %ls", pwzSecureObject); - } - else if (OT_FOLDER == eType) - { - hr = WcaGetTargetPath(pwzSecureObject, ppwzTargetPath); - ExitOnFailure(hr, "failed to get target path for directory id: %ls", pwzSecureObject); - } - else if (OT_FILE == eType) - { - hr = StrAllocFormatted(&pwzFormattedString, L"[#%s]", pwzSecureObject); - ExitOnFailure(hr, "failed to create formatted string for securing file object: %ls", pwzSecureObject); - - hr = WcaGetFormattedString(pwzFormattedString, ppwzTargetPath); - ExitOnFailure(hr, "failed to get file path from formatted string: %ls for secure object: %ls", pwzFormattedString, pwzSecureObject); - } - else if (OT_REGISTRY == eType) - { - hr = WcaTableExists(L"Registry"); - if (S_FALSE == hr) - { - hr = E_UNEXPECTED; - } - ExitOnFailure(hr, "failed to open Registry table to secure object"); - - hr = WcaOpenView(wzQUERY_REGISTRY, &hView); - ExitOnFailure(hr, "failed to open view on Registry table"); - - // create a record that stores the object to secure - hRec = MsiCreateRecord(1); - MsiRecordSetStringW(hRec, 1, pwzSecureObject); - - // execute a view looking for the object's Registry row - hr = WcaExecuteView(hView, hRec); - ExitOnFailure(hr, "failed to execute view on Registry table"); - hr = WcaFetchSingleRecord(hView, &hRecObject); - ExitOnFailure(hr, "failed to fetch Registry row for secure object"); - - hr = WcaGetRecordInteger(hRecObject, QSOC_REGROOT, &iRoot); - ExitOnFailure(hr, "Failed to get reg key root for secure object: %ls", pwzSecureObject); - - hr = WcaGetRecordFormattedString(hRecObject, QSOC_REGKEY, &pwzKey); - ExitOnFailure(hr, "Failed to get reg key for secure object: %ls", pwzSecureObject); - - // Decode the root value - if (-1 == iRoot) - { - // They didn't specify a root so that means it's either HKCU or HKLM depending on ALLUSERS property - hr = WcaGetIntProperty(L"ALLUSERS", &iAllUsers); - ExitOnFailure(hr, "failed to get value of ALLUSERS property"); - - if (1 == iAllUsers) - { - hr = StrAllocString(ppwzTargetPath, L"MACHINE\\", 0); - ExitOnFailure(hr, "failed to allocate target registry string with HKLM root"); - } - else - { - hr = StrAllocString(ppwzTargetPath, L"CURRENT_USER\\", 0); - ExitOnFailure(hr, "failed to allocate target registry string with HKCU root"); - } - } - else if (msidbRegistryRootClassesRoot == iRoot) - { - hr = StrAllocString(ppwzTargetPath, L"CLASSES_ROOT\\", 0); - ExitOnFailure(hr, "failed to allocate target registry string with HKCR root"); - } - else if (msidbRegistryRootCurrentUser == iRoot) - { - hr = StrAllocString(ppwzTargetPath, L"CURRENT_USER\\", 0); - ExitOnFailure(hr, "failed to allocate target registry string with HKCU root"); - } - else if (msidbRegistryRootLocalMachine == iRoot) - { - hr = StrAllocString(ppwzTargetPath, L"MACHINE\\", 0); - ExitOnFailure(hr, "failed to allocate target registry string with HKLM root"); - } - else if (msidbRegistryRootUsers == iRoot) - { - hr = StrAllocString(ppwzTargetPath, L"USERS\\", 0); - ExitOnFailure(hr, "failed to allocate target registry string with HKU root"); - } - else - { - ExitOnFailure(hr = E_UNEXPECTED, "Unknown registry key root specified for secure object: '%ls' root: %d", pwzSecureObject, iRoot); - } - - hr = StrAllocConcat(ppwzTargetPath, pwzKey, 0); - ExitOnFailure(hr, "Failed to concat key: %ls for secure object: %ls", pwzKey, pwzSecureObject); - } - else - { - AssertSz(FALSE, "How did you get here?"); - ExitOnFailure(hr = E_UNEXPECTED, "Unknown secure object type: %d", eType); - } - -LExit: - ReleaseStr(pwzFormattedString); - ReleaseStr(pwzKey); - - return hr; -} - -/****************************************************************** - SchedSecureObjects - entry point for SchedSecureObjects Custom Action - - called as Type 1 CustomAction (binary DLL) from Windows Installer - in InstallExecuteSequence, to schedule ExecSecureObjects -******************************************************************/ -extern "C" UINT __stdcall SchedSecureObjects( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug SchedSecureObjects"); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzSecureObject = NULL; - LPWSTR pwzData = NULL; - LPWSTR pwzTable = NULL; - LPWSTR pwzTargetPath = NULL; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - INSTALLSTATE isInstalled; - INSTALLSTATE isAction; - - LPWSTR pwzCustomActionData = NULL; - - DWORD cObjects = 0; - eOBJECTTYPE eType = OT_UNKNOWN; - DWORD dwAttributes = 0; - - // - // initialize - // - hr = WcaInitialize(hInstall, "SchedSecureObjects"); - ExitOnFailure(hr, "failed to initialize"); - - // anything to do? - if (S_OK != WcaTableExists(L"Wix4SecureObject")) - { - WcaLog(LOGMSG_STANDARD, "Wix4SecureObject table doesn't exist, so there are no objects to secure."); - ExitFunction(); - } - - // - // loop through all the objects to be secured - // - hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); - ExitOnFailure(hr, "failed to open view on Wix4SecureObject table"); - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); - ExitOnFailure(hr, "failed to get object table"); - - eType = EObjectTypeFromString(pwzTable); - - if (OT_UNKNOWN == eType) - { - ExitOnFailure(hr = E_INVALIDARG, "unknown SecureObject.Table: %ls", pwzTable); - } - - int iCompAttributes = 0; - hr = WcaGetRecordInteger(hRec, QSO_COMPATTRIBUTES, &iCompAttributes); - ExitOnFailure(hr, "failed to get Component attributes for secure object"); - - BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; - - // Only process entries in the Wix4SecureObject table whose components match the bitness of this CA -#ifdef _WIN64 - if (!fIs64Bit) - { - continue; - } -#else - if (fIs64Bit) - { - continue; - } -#endif - - // Get the object to secure - hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzSecureObject); - ExitOnFailure(hr, "failed to get name of object"); - - hr = GetTargetPath(eType, pwzSecureObject, &pwzTargetPath); - ExitOnFailure(hr, "failed to get target path of object '%ls'", pwzSecureObject); - - hr = WcaGetRecordString(hRec, QSO_COMPONENT, &pwzData); - ExitOnFailure(hr, "failed to get Component name for secure object"); - - // - // if we are installing this Component - // - er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for Component: %ls", pwzData); - - if (WcaIsInstalling(isInstalled, isAction)) - { - hr = WcaWriteStringToCaData(pwzTargetPath, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - // add the data to the CustomActionData - hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzData); - ExitOnFailure(hr, "failed to get name of object"); - hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordFormattedString(hRec, QSO_DOMAIN, &pwzData); - ExitOnFailure(hr, "failed to get domain for user to configure object"); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordFormattedString(hRec, QSO_USER, &pwzData); - ExitOnFailure(hr, "failed to get user to configure object"); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordInteger(hRec, QSO_ATTRIBUTES, reinterpret_cast(&dwAttributes)); - ExitOnFailure(hr, "failed to get attributes to configure object"); - hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordString(hRec, QSO_PERMISSION, &pwzData); - ExitOnFailure(hr, "failed to get permission to configure object"); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - ++cObjects; - } - } - - // if we looped through all records all is well - if (E_NOMOREITEMS == hr) - hr = S_OK; - ExitOnFailure(hr, "failed while looping through all objects to secure"); - - // - // schedule the custom action and add to progress bar - // - if (pwzCustomActionData && *pwzCustomActionData) - { - Assert(0 < cObjects); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecSecureObjects"), pwzCustomActionData, cObjects * COST_SECUREOBJECT); - ExitOnFailure(hr, "failed to schedule ExecSecureObjects action"); - } - -LExit: - ReleaseStr(pwzSecureObject); - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzData); - ReleaseStr(pwzTable); - ReleaseStr(pwzTargetPath); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - -/****************************************************************** - SchedSecureObjectsRollback - entry point for SchedSecureObjectsRollback Custom Action - - called as Type 1 CustomAction (binary DLL) from Windows Installer - in InstallExecuteSequence before SchedSecureObjects -******************************************************************/ -extern "C" UINT __stdcall SchedSecureObjectsRollback( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug SchedSecureObjectsRollback"); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzSecureObject = NULL; - LPWSTR pwzTable = NULL; - LPWSTR pwzTargetPath = NULL; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - - LPWSTR pwzCustomActionData = NULL; - - eOBJECTTYPE eType = OT_UNKNOWN; - - // - // initialize - // - hr = WcaInitialize(hInstall, "SchedSecureObjectsRollback"); - ExitOnFailure(hr, "failed to initialize"); - - // - // loop through all the objects to be secured - // - hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); - ExitOnFailure(hr, "failed to open view on Wix4SecureObject table"); - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); - ExitOnFailure(hr, "failed to get object table"); - - eType = EObjectTypeFromString(pwzTable); - - if (OT_UNKNOWN == eType) - { - ExitOnFailure(hr = E_INVALIDARG, "unknown SecureObject.Table: %ls", pwzTable); - } - - int iCompAttributes = 0; - hr = WcaGetRecordInteger(hRec, QSO_COMPATTRIBUTES, &iCompAttributes); - ExitOnFailure(hr, "failed to get Component attributes for secure object"); - - BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; - - // Only process entries in the Wix4SecureObject table whose components match the bitness of this CA -#ifdef _WIN64 - if (!fIs64Bit) - { - continue; - } -#else - if (fIs64Bit) - { - continue; - } -#endif - - // get the object being secured that we are planning to schedule rollback for - hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzSecureObject); - ExitOnFailure(hr, "failed to get name of object"); - - hr = GetTargetPath(eType, pwzSecureObject, &pwzTargetPath); - ExitOnFailure(hr, "failed to get target path of object '%ls' in order to schedule rollback", pwzSecureObject); - - hr = StoreACLRollbackInfo(pwzTargetPath, pwzTable); - if (FAILED(hr)) - { - WcaLog(LOGMSG_STANDARD, "Failed to store ACL rollback information with error 0x%x - continuing", hr); - } - } - - // if we looped through all records all is well - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed while looping through all objects to schedule rollback for"); - -LExit: - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzSecureObject); - ReleaseStr(pwzTable); - ReleaseStr(pwzTargetPath); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - -/****************************************************************** - CaExecSecureObjects - entry point for SecureObjects Custom Action - called as Type 1025 CustomAction (deferred binary DLL) - - NOTE: deferred CustomAction since it modifies the machine - NOTE: CustomActionData == wzObject\twzTable\twzDomain\twzUser\tdwAttributes\tdwPermissions\t... -******************************************************************/ -extern "C" UINT __stdcall ExecSecureObjects( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug ExecSecureObjects"); - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - LPWSTR pwz = NULL; - LPWSTR pwzData = NULL; - LPWSTR pwzObject = NULL; - LPWSTR pwzTable = NULL; - LPWSTR pwzDomain = NULL; - DWORD dwRevision = 0; - LPWSTR pwzUser = NULL; - DWORD dwPermissions = 0; - DWORD dwAttributes = 0; - LPWSTR pwzAccount = NULL; - PSID psid = NULL; - - EXPLICIT_ACCESSW ea = {0}; - SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; - PSECURITY_DESCRIPTOR psd = NULL; - SECURITY_DESCRIPTOR_CONTROL sdc = {0}; - SECURITY_INFORMATION si = {0}; - PACL pAclExisting = NULL; // doesn't get freed - PACL pAclNew = NULL; - - PMSIHANDLE hActionRec = ::MsiCreateRecord(1); - - // - // initialize - // - hr = WcaInitialize(hInstall, "ExecSecureObjects"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - pwz = pwzData; - - // - // loop through all the passed in data - // - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &pwzObject); - ExitOnFailure(hr, "failed to process CustomActionData"); - - hr = WcaReadStringFromCaData(&pwz, &pwzTable); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzDomain); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzUser); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwAttributes)); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwPermissions)); - ExitOnFailure(hr, "failed to process CustomActionData"); - - WcaLog(LOGMSG_VERBOSE, "Securing Object: %ls Type: %ls User: %ls", pwzObject, pwzTable, pwzUser); - - // - // create the appropriate SID - // - - // figure out the right user to put into the access block - if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Everyone")) - { - hr = AclGetWellKnownSid(WinWorldSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Administrators")) - { - hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"LocalSystem")) - { - hr = AclGetWellKnownSid(WinLocalSystemSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"LocalService")) - { - hr = AclGetWellKnownSid(WinLocalServiceSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"NetworkService")) - { - hr = AclGetWellKnownSid(WinNetworkServiceSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"AuthenticatedUser")) - { - hr = AclGetWellKnownSid(WinAuthenticatedUserSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Guests")) - { - hr = AclGetWellKnownSid(WinBuiltinGuestsSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"CREATOR OWNER")) - { - hr = AclGetWellKnownSid(WinCreatorOwnerSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"INTERACTIVE")) - { - hr = AclGetWellKnownSid(WinInteractiveSid, &psid); - } - else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Users")) - { - hr = AclGetWellKnownSid(WinBuiltinUsersSid, &psid); - } - else - { - hr = StrAllocFormatted(&pwzAccount, L"%s%s%s", pwzDomain, *pwzDomain ? L"\\" : L"", pwzUser); - ExitOnFailure(hr, "failed to build domain user name"); - - hr = AclGetAccountSid(NULL, pwzAccount, &psid); - } - ExitOnFailure(hr, "failed to get sid for account: %ls%ls%ls", pwzDomain, *pwzDomain ? L"\\" : L"", pwzUser); - - // - // build up the explicit access - // - ea.grfAccessMode = SET_ACCESS; - - if (dwAttributes & SECURE_OBJECT_ATTRIBUTE_INHERITABLE) - { - ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; - } - else - { - ea.grfInheritance = NO_INHERITANCE; - } - -#pragma prefast(push) -#pragma prefast(disable:25029) - ::BuildTrusteeWithSidW(&ea.Trustee, psid); -#pragma prefast(pop) - - objectType = SEObjectTypeFromString(const_cast (pwzTable)); - - // always add these permissions for services - // these are basic permissions that are often forgotten - if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) - { - dwPermissions |= SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_INTERROGATE; - } - - ea.grfAccessPermissions = dwPermissions; - - if (SE_UNKNOWN_OBJECT_TYPE != objectType) - { - er = ::GetNamedSecurityInfoW(pwzObject, objectType, DACL_SECURITY_INFORMATION, NULL, NULL, &pAclExisting, NULL, &psd); - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get security info for object: %ls", pwzObject); - - //Need to see if DACL is protected so getting Descriptor information - if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) - { - ExitOnLastError(hr, "failed to get security descriptor control for object: %ls", pwzObject); - } - -#pragma prefast(push) -#pragma prefast(disable:25029) - er = ::SetEntriesInAclW(1, &ea, pAclExisting, &pAclNew); -#pragma prefast(pop) - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to add ACLs for object: %ls", pwzObject); - - if (sdc & SE_DACL_PROTECTED) - { - si = DACL_SECURITY_INFORMATION | PROTECTED_DACL_SECURITY_INFORMATION; - } - else - { - si = DACL_SECURITY_INFORMATION; - } - er = ::SetNamedSecurityInfoW(pwzObject, objectType, si, NULL, NULL, pAclNew, NULL); - MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrSecureObjectsFailedSet, "failed to set security info for object: %ls", pwzObject); - } - else - { - MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); - } - - hr = WcaProgressMessage(COST_SECUREOBJECT, FALSE); - ExitOnFailure(hr, "failed to send progress message"); - - objectType = SE_UNKNOWN_OBJECT_TYPE; - } - -LExit: - ReleaseStr(pwzUser); - ReleaseStr(pwzDomain); - ReleaseStr(pwzTable); - ReleaseStr(pwzObject); - ReleaseStr(pwzData); - ReleaseStr(pwzAccount); - - if (pAclNew) - { - ::LocalFree(pAclNew); - } - if (psd) - { - ::LocalFree(psd); - } - if (psid) - { - AclFreeSid(psid); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - -extern "C" UINT __stdcall ExecSecureObjectsRollback( - __in MSIHANDLE hInstall - ) -{ -// AssertSz(FALSE, "debug ExecSecureObjectsRollback"); - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - LPWSTR pwz = NULL; - LPWSTR pwzData = NULL; - LPWSTR pwzObject = NULL; - LPWSTR pwzTable = NULL; - LPWSTR pwzSecurityInfo = NULL; - - SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; - PSECURITY_DESCRIPTOR psd = NULL; - ULONG psdSize; - SECURITY_DESCRIPTOR_CONTROL sdc = {0}; - SECURITY_INFORMATION si = DACL_SECURITY_INFORMATION; - PACL pDacl = NULL; - BOOL bDaclPresent = false; - BOOL bDaclDefaulted = false; - DWORD dwRevision = 0; - int iProtected; - - // initialize - hr = WcaInitialize(hInstall, "ExecSecureObjectsRollback"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetProperty(L"CustomActionData", &pwzData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); - - pwz = pwzData; - - hr = WcaReadStringFromCaData(&pwz, &pwzObject); - ExitOnFailure(hr, "failed to process CustomActionData"); - - hr = WcaReadStringFromCaData(&pwz, &pwzTable); - ExitOnFailure(hr, "failed to process CustomActionData"); - - objectType = SEObjectTypeFromString(const_cast (pwzTable)); - - if (SE_UNKNOWN_OBJECT_TYPE != objectType) - { - hr = WcaReadStringFromCaData(&pwz, &pwzSecurityInfo); - ExitOnFailure(hr, "failed to process CustomActionData"); - - hr = WcaReadIntegerFromCaData(&pwz, &iProtected); - ExitOnFailure(hr, "failed to process CustomActionData"); - - if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(pwzSecurityInfo,SDDL_REVISION_1,&psd,&psdSize)) - { - ExitOnLastError(hr, "failed to convert security descriptor string to a valid security descriptor"); - } - - if (!::GetSecurityDescriptorDacl(psd,&bDaclPresent,&pDacl,&bDaclDefaulted)) - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "failed to get security descriptor's DACL - error code: %d",pwzSecurityInfo,GetLastError()); - } - - // The below situation may always be caught by the above if block - the documentation isn't very clear. To be safe, we're going to test for it. - if (!bDaclPresent) - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "security descriptor does not contain a DACL"); - } - - //Need to see if DACL is protected so getting Descriptor information - if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) - { - ExitOnLastError(hr, "failed to get security descriptor control for object: %ls", pwzObject); - } - - // Write a 1 if DACL is protected, 0 otherwise - switch (iProtected) - { - case 0: - // Unnecessary to do anything - leave si to the default flags - break; - - case 1: - si = si | PROTECTED_DACL_SECURITY_INFORMATION; - break; - - default: - hr = E_UNEXPECTED; - ExitOnFailure(hr, "unrecognized value in CustomActionData"); - break; - } - - er = ::SetNamedSecurityInfoW(pwzObject, objectType, si, NULL, NULL, pDacl, NULL); - ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to set security info for object: %ls error code: %d", pwzObject, GetLastError()); - } - else - { - MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); - } - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzObject); - ReleaseStr(pwzTable); - ReleaseStr(pwzSecurityInfo); - - if (psd) - { - ::LocalFree(psd); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} diff --git a/src/ca/serviceconfig.cpp b/src/ca/serviceconfig.cpp deleted file mode 100644 index 04b25ffa..00000000 --- a/src/ca/serviceconfig.cpp +++ /dev/null @@ -1,821 +0,0 @@ -// 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" - -// structs -LPCWSTR wzQUERY_SERVICECONFIG = L"SELECT `ServiceName`, `Component_`, `NewService`, `FirstFailureActionType`, `SecondFailureActionType`, `ThirdFailureActionType`, `ResetPeriodInDays`, `RestartServiceDelayInSeconds`, `ProgramCommandLine`, `RebootMessage` FROM `Wix4ServiceConfig`"; -enum eQUERY_SERVICECONFIG { QSC_SERVICENAME = 1, QSC_COMPONENT, QSC_NEWSERVICE, QSC_FIRSTFAILUREACTIONTYPE, QSC_SECONDFAILUREACTIONTYPE, QSC_THIRDFAILUREACTIONTYPE, QSC_RESETPERIODINDAYS, QSC_RESTARTSERVICEDELAYINSECONDS, QSC_PROGRAMCOMMANDLINE, QSC_REBOOTMESSAGE }; - -// consts -LPCWSTR c_wzActionTypeNone = L"none"; -LPCWSTR c_wzActionTypeReboot = L"reboot"; -LPCWSTR c_wzActionTypeRestart = L"restart"; -LPCWSTR c_wzActionTypeRunCommand = L"runCommand"; - -// prototypes -static SC_ACTION_TYPE GetSCActionType( - __in LPCWSTR pwzActionTypeName - ); - -static HRESULT GetSCActionTypeString( - __in SC_ACTION_TYPE type, - __out_ecount(cchActionTypeString) LPWSTR wzActionTypeString, - __in DWORD cchActionTypeString - ); - -static HRESULT GetService( - __in SC_HANDLE hSCM, - __in LPCWSTR wzService, - __in DWORD dwOpenServiceAccess, - __out SC_HANDLE* phService - ); - -static HRESULT ConfigureService( - __in SC_HANDLE hSCM, - __in SC_HANDLE hService, - __in LPCWSTR wzServiceName, - __in DWORD dwRestartServiceDelayInSeconds, - __in LPCWSTR wzFirstFailureActionType, - __in LPCWSTR wzSecondFailureActionType, - __in LPCWSTR wzThirdFailureActionType, - __in DWORD dwResetPeriodInDays, - __in LPWSTR wzRebootMessage, - __in LPWSTR wzProgramCommandLine - ); - - -/****************************************************************** -SchedServiceConfig - entry point for SchedServiceConfig Custom Action - -called as Type 1 CustomAction (binary DLL) from Windows Installer -in InstallExecuteSequence before CaExecServiceConfig -********************************************************************/ -extern "C" UINT __stdcall SchedServiceConfig( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug SchedServiceConfig"); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - LPWSTR pwzScriptKey = NULL; - LPWSTR pwzCustomActionData = NULL; - - PMSIHANDLE hView = NULL; - PMSIHANDLE hRec = NULL; - LPWSTR pwzData = NULL; - int iData = 0; - DWORD cServices = 0; - - // initialize - hr = WcaInitialize(hInstall, "SchedServiceConfig"); - ExitOnFailure(hr, "Failed to initialize."); - - // Get the script key for this CustomAction and put it on the front of the - // CustomActionData of the install action. - hr = WcaCaScriptCreateKey(&pwzScriptKey); - ExitOnFailure(hr, "Failed to get encoding key."); - - hr = WcaWriteStringToCaData(pwzScriptKey, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add encoding key to CustomActionData."); - - // Loop through all the services to be configured. - hr = WcaOpenExecuteView(wzQUERY_SERVICECONFIG, &hView); - ExitOnFailure(hr, "Failed to open view on Wix4ServiceConfig table."); - - while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) - { - INSTALLSTATE isInstalled = INSTALLSTATE_UNKNOWN; - INSTALLSTATE isAction = INSTALLSTATE_UNKNOWN; - - // Get component name to check if we are installing it. If so - // then add the table data to the CustomActionData, otherwise - // skip it. - hr = WcaGetRecordString(hRec, QSC_COMPONENT, &pwzData); - ExitOnFailure(hr, "Failed to get component name"); - - hr = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); - ExitOnFailure(hr = HRESULT_FROM_WIN32(hr), "Failed to get install state for Component: %ls", pwzData); - - if (WcaIsInstalling(isInstalled, isAction)) - { - // Add the data to the CustomActionData (for install). - hr = WcaGetRecordFormattedString(hRec, QSC_SERVICENAME, &pwzData); - ExitOnFailure(hr, "Failed to get name of service."); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add name to CustomActionData."); - - hr = WcaGetRecordInteger(hRec, QSC_NEWSERVICE, &iData); - ExitOnFailure(hr, "Failed to get Wix4ServiceConfig.NewService."); - hr = WcaWriteIntegerToCaData(0 != iData, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to add NewService data to CustomActionData"); - - hr = WcaGetRecordString(hRec, QSC_FIRSTFAILUREACTIONTYPE, &pwzData); - ExitOnFailure(hr, "failed to get first failure action type"); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordString(hRec, QSC_SECONDFAILUREACTIONTYPE, &pwzData); - ExitOnFailure(hr, "failed to get second failure action type"); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordString(hRec, QSC_THIRDFAILUREACTIONTYPE, &pwzData); - ExitOnFailure(hr, "failed to get third failure action type"); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordInteger(hRec, QSC_RESETPERIODINDAYS, &iData); - if (S_FALSE == hr) // deal w/ possible null value - { - iData = 0; - } - ExitOnFailure(hr, "failed to get reset period in days between service restart attempts."); - hr = WcaWriteIntegerToCaData(iData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordInteger(hRec, QSC_RESTARTSERVICEDELAYINSECONDS, &iData); - if (S_FALSE == hr) // deal w/ possible null value - { - iData = 0; - } - ExitOnFailure(hr, "failed to get server restart delay value."); - hr = WcaWriteIntegerToCaData(iData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordFormattedString(hRec, QSC_PROGRAMCOMMANDLINE, &pwzData); // null value already dealt w/ properly - ExitOnFailure(hr, "failed to get command line to run on service failure."); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaGetRecordString(hRec, QSC_REBOOTMESSAGE, &pwzData); // null value already dealt w/ properly - ExitOnFailure(hr, "failed to get message to send to users when server reboots due to service failure."); - hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - ++cServices; - } - } - - // if we looped through all records all is well - if (E_NOMOREITEMS == hr) - { - hr = S_OK; - } - ExitOnFailure(hr, "failed while looping through all objects to secure"); - - // setup CustomActionData and add to progress bar for download - if (0 < cServices) - { - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackServiceConfig"), pwzScriptKey, cServices * COST_SERVICECONFIG); - ExitOnFailure(hr, "failed to schedule RollbackServiceConfig action"); - - hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecServiceConfig"), pwzCustomActionData, cServices * COST_SERVICECONFIG); - ExitOnFailure(hr, "failed to schedule ExecServiceConfig action"); - } - -LExit: - ReleaseStr(pwzData); - ReleaseStr(pwzCustomActionData); - ReleaseStr(pwzScriptKey); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/****************************************************************** -CaExecServiceConfig - entry point for ServiceConfig Custom Action. - -NOTE: deferred CustomAction since it modifies the machine -NOTE: CustomActionData == wzServiceName\tfNewService\twzFirstFailureActionType\twzSecondFailureActionType\twzThirdFailureActionType\tdwResetPeriodInDays\tdwRestartServiceDelayInSeconds\twzProgramCommandLine\twzRebootMessage\twzServiceName\tfNewService\t... -*******************************************************************/ -extern "C" UINT __stdcall ExecServiceConfig( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug ExecServiceConfig"); - HRESULT hr = S_OK; - DWORD er = 0; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwz = NULL; - - LPWSTR pwzScriptKey = NULL; - WCA_CASCRIPT_HANDLE hRollbackScript = NULL; - - LPWSTR pwzServiceName = NULL; - BOOL fNewService = FALSE; - LPWSTR pwzFirstFailureActionType = NULL; - LPWSTR pwzSecondFailureActionType = NULL; - LPWSTR pwzThirdFailureActionType = NULL; - LPWSTR pwzProgramCommandLine = NULL; - LPWSTR pwzRebootMessage = NULL; - DWORD dwResetPeriodInDays = 0; - DWORD dwRestartServiceDelayInSeconds = 0; - - LPVOID lpMsgBuf = NULL; - SC_HANDLE hSCM = NULL; - SC_HANDLE hService = NULL; - - DWORD dwRestartDelay = 0; - WCHAR wzActionName[32] = { 0 }; - - DWORD cbExistingServiceConfig = 0; - - SERVICE_FAILURE_ACTIONSW* psfa = NULL; - - // initialize - hr = WcaInitialize(hInstall, "ExecServiceConfig"); - ExitOnFailure(hr, "failed to initialize"); - - // Open the Services Control Manager up front. - hSCM = ::OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); - if (NULL == hSCM) - { - er = ::GetLastError(); - hr = HRESULT_FROM_WIN32(er); - -#pragma prefast(push) -#pragma prefast(disable:25028) - ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); -#pragma prefast(pop) - - ExitOnFailure(hr, "Failed to get handle to SCM. Error: %ls", (LPWSTR)lpMsgBuf); - } - - // First, get the script key out of the CustomActionData and - // use that to create the rollback script for this action. - hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); - if (!pwzScriptKey) - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "Failed due to unexpected CustomActionData passed."); - } - ExitOnFailure(hr, "Failed to read encoding key from CustomActionData."); - - hr = WcaCaScriptCreate(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, FALSE, &hRollbackScript); - ExitOnFailure(hr, "Failed to open rollback CustomAction script."); - - // Next, loop through the rest of the CustomActionData, processing - // each service config row in turn. - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &pwzServiceName); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&fNewService)); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzFirstFailureActionType); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzSecondFailureActionType); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzThirdFailureActionType); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwResetPeriodInDays)); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwRestartServiceDelayInSeconds)); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzProgramCommandLine); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzRebootMessage); - ExitOnFailure(hr, "failed to process CustomActionData"); - - WcaLog(LOGMSG_VERBOSE, "Configuring Service: %ls", pwzServiceName); - - // Open the handle with all the permissions we might need: - // SERVICE_QUERY_CONFIG is needed for QueryServiceConfig2(). - // SERVICE_CHANGE_CONFIG is needed for ChangeServiceConfig2(). - // SERVICE_START is required in order to handle SC_ACTION_RESTART action. - hr = GetService(hSCM, pwzServiceName, SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG | SERVICE_START, &hService); - ExitOnFailure(hr, "Failed to get service: %ls", pwzServiceName); - - // If we are configuring a service that existed on the machine, we need to - // read the existing service configuration and write it out to the rollback - // log so rollback can put it back if anything goes wrong. - if (!fNewService) - { - // First, read the existing service config. - if (!::QueryServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, NULL, 0, &cbExistingServiceConfig) && ERROR_INSUFFICIENT_BUFFER != ::GetLastError()) - { - ExitWithLastError(hr, "Failed to get current service config info."); - } - - psfa = static_cast(MemAlloc(cbExistingServiceConfig, TRUE)); - ExitOnNull(psfa, hr, E_OUTOFMEMORY, "failed to allocate memory for service failure actions."); - - if (!::QueryServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)psfa, cbExistingServiceConfig, &cbExistingServiceConfig)) - { - ExitOnLastError(hr, "failed to Query Service."); - } - - // Build up rollback log so we can restore service state if necessary - hr = WcaCaScriptWriteString(hRollbackScript, pwzServiceName); - ExitOnFailure(hr, "Failed to add service name to Rollback Log"); - - // If this service struct is empty, fill in default values - if (3 > psfa->cActions) - { - hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); - ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); - - hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); - ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); - - hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); - ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); - } - else - { - // psfa actually had actions defined, so use the first three. - for (int i = 0; i < 3; ++i) - { - hr = GetSCActionTypeString(psfa->lpsaActions[i].Type, wzActionName, countof(wzActionName)); - ExitOnFailure(hr, "failed to query SFA object"); - - if (SC_ACTION_RESTART == psfa->lpsaActions[i].Type) - { - dwRestartDelay = psfa->lpsaActions[i].Delay / 1000; - } - - hr = WcaCaScriptWriteString(hRollbackScript, wzActionName); - ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); - } - } - - hr = WcaCaScriptWriteNumber(hRollbackScript, psfa->dwResetPeriod / (24 * 60 * 60)); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - hr = WcaCaScriptWriteNumber(hRollbackScript, dwRestartDelay); - ExitOnFailure(hr, "failed to add data to CustomActionData"); - - // Handle the null cases. - if (!psfa->lpCommand) - { - psfa->lpCommand = L""; - } - hr = WcaCaScriptWriteString(hRollbackScript, psfa->lpCommand); - ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); - - // Handle the null cases. - if (!psfa->lpRebootMsg) - { - psfa->lpRebootMsg = L""; - } - hr = WcaCaScriptWriteString(hRollbackScript, psfa->lpRebootMsg); - ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); - - // Nudge the system to get all our rollback data written to disk. - WcaCaScriptFlush(hRollbackScript); - - ReleaseNullMem(psfa); - } - - hr = ConfigureService(hSCM, hService, pwzServiceName, dwRestartServiceDelayInSeconds, pwzFirstFailureActionType, - pwzSecondFailureActionType, pwzThirdFailureActionType, dwResetPeriodInDays, pwzRebootMessage, pwzProgramCommandLine); - ExitOnFailure(hr, "Failed to configure service: %ls", pwzServiceName); - - hr = WcaProgressMessage(COST_SERVICECONFIG, FALSE); - ExitOnFailure(hr, "failed to send progress message"); - - // Per-service cleanup - ::CloseServiceHandle(hService); - hService = NULL; - dwResetPeriodInDays = 0; - dwRestartServiceDelayInSeconds = 0; - } - -LExit: - WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_PRESERVE); - - if (lpMsgBuf) - { - ::LocalFree(lpMsgBuf); - } - - if (hService) - { - ::CloseServiceHandle(hService); - } - - if (hSCM) - { - ::CloseServiceHandle(hSCM); - } - - ReleaseMem(psfa); - - ReleaseStr(pwzRebootMessage); - ReleaseStr(pwzProgramCommandLine); - ReleaseStr(pwzThirdFailureActionType); - ReleaseStr(pwzSecondFailureActionType); - ReleaseStr(pwzFirstFailureActionType); - ReleaseStr(pwzServiceName); - ReleaseStr(pwzScriptKey); - ReleaseStr(pwzCustomActionData); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/****************************************************************** -RollbackServiceConfig - entry point for ServiceConfig rollback - Custom Action. - -NOTE: CustomActionScript Data == wzServiceName\twzFirstFailureActionType\twzSecondFailureActionType\twzThirdFailureActionType\tdwResetPeriodInDays\tdwRestartServiceDelayInSeconds\twzProgramCommandLine\twzRebootMessage\twzServiceName\t... -*******************************************************************/ -extern "C" UINT __stdcall RollbackServiceConfig( - __in MSIHANDLE hInstall - ) -{ - //AssertSz(FALSE, "debug RollbackServiceConfig"); - HRESULT hr = S_OK; - DWORD er = 0; - - LPWSTR pwzCustomActionData = NULL; - LPWSTR pwz = NULL; - - LPWSTR pwzScriptKey = NULL; - WCA_CASCRIPT_HANDLE hRollbackScript = NULL; - - LPWSTR pwzServiceName = NULL; - LPWSTR pwzFirstFailureActionType = NULL; - LPWSTR pwzSecondFailureActionType = NULL; - LPWSTR pwzThirdFailureActionType = NULL; - LPWSTR pwzProgramCommandLine = NULL; - LPWSTR pwzRebootMessage = NULL; - DWORD dwResetPeriodInDays = 0; - DWORD dwRestartServiceDelayInSeconds = 0; - - LPVOID lpMsgBuf = NULL; - SC_HANDLE hSCM = NULL; - SC_HANDLE hService = NULL; - - // initialize - hr = WcaInitialize(hInstall, "RollbackServiceConfig"); - ExitOnFailure(hr, "Failed to initialize 'RollbackServiceConfig'."); - - // Open the Services Control Manager up front. - hSCM = ::OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); - if (NULL == hSCM) - { - er = ::GetLastError(); - hr = HRESULT_FROM_WIN32(er); - -#pragma prefast(push) -#pragma prefast(disable:25028) - ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); -#pragma prefast(pop) - - ExitOnFailure(hr, "Failed to get handle to SCM. Error: %ls", (LPWSTR)lpMsgBuf); - - // Make sure we still abort, in case hSCM was NULL but no error was returned from GetLastError - ExitOnNull(hSCM, hr, E_POINTER, "Getting handle to SCM reported success, but no handle was returned."); - } - - // Get the script key from the CustomAction data and use it to open - // the rollback log and read the data over the CustomActionData - // because all of the information is in the script data not the - // CustomActionData. - hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); - ExitOnFailure(hr, "failed to get CustomActionData"); - - WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); - - pwz = pwzCustomActionData; - - hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); - if (!pwzScriptKey) - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "Failed due to unexpected CustomActionData passed."); - } - ExitOnFailure(hr, "Failed to read encoding key from CustomActionData."); - - hr = WcaCaScriptOpen(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, &hRollbackScript); - ExitOnFailure(hr, "Failed to open rollback CustomAction script."); - - hr = WcaCaScriptReadAsCustomActionData(hRollbackScript, &pwzCustomActionData); - ExitOnFailure(hr, "Failed to read rollback script into CustomAction data."); - - // Loop through the script's CustomActionData, processing each - // service config in turn. - pwz = pwzCustomActionData; - while (pwz && *pwz) - { - hr = WcaReadStringFromCaData(&pwz, &pwzServiceName); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzFirstFailureActionType); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzSecondFailureActionType); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzThirdFailureActionType); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwResetPeriodInDays)); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwRestartServiceDelayInSeconds)); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzProgramCommandLine); - ExitOnFailure(hr, "failed to process CustomActionData"); - hr = WcaReadStringFromCaData(&pwz, &pwzRebootMessage); - ExitOnFailure(hr, "failed to process CustomActionData"); - - WcaLog(LOGMSG_VERBOSE, "Reconfiguring Service: %ls", pwzServiceName); - - // Open the handle with all the permissions we might need. - // SERVICE_CHANGE_CONFIG is needed for ChangeServiceConfig2(). - // SERVICE_START is required in order to handle SC_ACTION_RESTART action. - hr = GetService(hSCM, pwzServiceName, SERVICE_CHANGE_CONFIG | SERVICE_START, &hService); - ExitOnFailure(hr, "Failed to get service: %ls", pwzServiceName); - - hr = ConfigureService(hSCM, hService, pwzServiceName, dwRestartServiceDelayInSeconds, pwzFirstFailureActionType, - pwzSecondFailureActionType, pwzThirdFailureActionType, dwResetPeriodInDays, pwzRebootMessage, pwzProgramCommandLine); - ExitOnFailure(hr, "Failed to configure service: %ls", pwzServiceName); - - hr = WcaProgressMessage(COST_SERVICECONFIG, FALSE); - ExitOnFailure(hr, "failed to send progress message"); - - // Per-service cleanup - ::CloseServiceHandle(hService); - hService = NULL; - dwResetPeriodInDays = 0; - dwRestartServiceDelayInSeconds = 0; - } - -LExit: - if (lpMsgBuf) // Allocated with FormatString. - { - ::LocalFree(lpMsgBuf); - } - - if (hService) - { - ::CloseServiceHandle(hService); - } - - if (hSCM) - { - ::CloseServiceHandle(hSCM); - } - - WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_DELETE); - - ReleaseStr(pwzRebootMessage); - ReleaseStr(pwzProgramCommandLine); - ReleaseStr(pwzThirdFailureActionType); - ReleaseStr(pwzSecondFailureActionType); - ReleaseStr(pwzFirstFailureActionType); - ReleaseStr(pwzServiceName); - ReleaseStr(pwzScriptKey); - ReleaseStr(pwzCustomActionData); - - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - - -/********************************************************** -GetSCActionType - helper function to return the SC_ACTION_TYPE -for a given string matching the allowed set. -REBOOT, RESTART, RUN_COMMAND and NONE -**********************************************************/ -static SC_ACTION_TYPE GetSCActionType( - __in LPCWSTR pwzActionTypeName - ) -{ - SC_ACTION_TYPE actionType; - - // verify that action types are valid. if not, just default to NONE - if (0 == lstrcmpiW(c_wzActionTypeReboot, pwzActionTypeName)) - { - actionType = SC_ACTION_REBOOT; - } - else if (0 == lstrcmpiW(c_wzActionTypeRestart, pwzActionTypeName)) - { - actionType = SC_ACTION_RESTART; - } - else if (0 == lstrcmpiW(c_wzActionTypeRunCommand, pwzActionTypeName)) - { - actionType = SC_ACTION_RUN_COMMAND; - } - else - { - // default to none - actionType = SC_ACTION_NONE; - } - - return actionType; -} - - -static HRESULT GetSCActionTypeString( - __in SC_ACTION_TYPE type, - __out_ecount(cchActionTypeString) LPWSTR wzActionTypeString, - __in DWORD cchActionTypeString - ) -{ - HRESULT hr = S_OK; - - switch (type) - { - case SC_ACTION_REBOOT: - hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeReboot); - ExitOnFailure(hr, "Failed to copy 'reboot' into action type."); - break; - case SC_ACTION_RESTART: - hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeRestart); - ExitOnFailure(hr, "Failed to copy 'restart' into action type."); - break; - case SC_ACTION_RUN_COMMAND: - hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeRunCommand); - ExitOnFailure(hr, "Failed to copy 'runCommand' into action type."); - break; - case SC_ACTION_NONE: - hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeNone); - ExitOnFailure(hr, "Failed to copy 'none' into action type."); - break; - default: - break; - } - -LExit: - return hr; -} - - -static HRESULT GetService( - __in SC_HANDLE hSCM, - __in LPCWSTR wzService, - __in DWORD dwOpenServiceAccess, - __out SC_HANDLE* phService - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - LPVOID lpMsgBuf = NULL; - - *phService = ::OpenServiceW(hSCM, wzService, dwOpenServiceAccess); - if (NULL == *phService) - { - er = ::GetLastError(); - hr = HRESULT_FROM_WIN32(er); - if (ERROR_SERVICE_DOES_NOT_EXIST == er) - { - ExitOnFailure(hr, "Service '%ls' does not exist on this system.", wzService); - } - else - { -#pragma prefast(push) -#pragma prefast(disable:25028) - ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); -#pragma prefast(pop) - - ExitOnFailure(hr, "Failed to get handle to the service '%ls'. Error: %ls", wzService, (LPWSTR)lpMsgBuf); - } - } - -LExit: - if (lpMsgBuf) // Allocated with FormatString. - { - ::LocalFree(lpMsgBuf); - } - - return hr; -} - - -static HRESULT ConfigureService( - __in SC_HANDLE /*hSCM*/, - __in SC_HANDLE hService, - __in LPCWSTR wzServiceName, - __in DWORD dwRestartServiceDelayInSeconds, - __in LPCWSTR wzFirstFailureActionType, - __in LPCWSTR wzSecondFailureActionType, - __in LPCWSTR wzThirdFailureActionType, - __in DWORD dwResetPeriodInDays, - __in LPWSTR wzRebootMessage, - __in LPWSTR wzProgramCommandLine - ) -{ - HRESULT hr = S_OK; - DWORD er = ERROR_SUCCESS; - - HANDLE hToken = NULL; - TOKEN_PRIVILEGES priv = { 0 }; - TOKEN_PRIVILEGES* pPrevPriv = NULL; - DWORD cbPrevPriv = 0; - BOOL fAdjustedPrivileges = FALSE; - - SC_ACTION actions[3]; // the UI always shows 3 actions, so we'll always do 3 - SERVICE_FAILURE_ACTIONSW sfa; - LPVOID lpMsgBuf = NULL; - - // Always get the shutdown privilege in case we need to configure service to reboot. - if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - ExitWithLastError(hr, "Failed to get process token."); - } - - priv.PrivilegeCount = 1; - priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - if (!::LookupPrivilegeValueW(NULL, L"SeShutdownPrivilege", &priv.Privileges[0].Luid)) - { - ExitWithLastError(hr, "Failed to get shutdown privilege LUID."); - } - - cbPrevPriv = sizeof(TOKEN_PRIVILEGES); - pPrevPriv = static_cast(MemAlloc(cbPrevPriv, TRUE)); - ExitOnNull(pPrevPriv, hr, E_OUTOFMEMORY, "Failed to allocate memory for empty previous privileges."); - - if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv)) - { - LPVOID pv = MemReAlloc(pPrevPriv, cbPrevPriv, TRUE); - ExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for previous privileges."); - pPrevPriv = static_cast(pv); - - if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv)) - { - ExitWithLastError(hr, "Failed to get shutdown privilege LUID."); - } - } - - fAdjustedPrivileges = TRUE; - - // build up SC_ACTION array - // TODO: why is delay only respected when SC_ACTION_RESTART is requested? - actions[0].Type = GetSCActionType(wzFirstFailureActionType); - actions[0].Delay = 0; - if (SC_ACTION_RESTART == actions[0].Type) - { - actions[0].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds - } - - actions[1].Type = GetSCActionType(wzSecondFailureActionType); - actions[1].Delay = 0; - if (SC_ACTION_RESTART == actions[1].Type) - { - actions[1].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds - } - - actions[2].Type = GetSCActionType(wzThirdFailureActionType); - actions[2].Delay = 0; - if (SC_ACTION_RESTART == actions[2].Type) - { - actions[2].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds - } - - // build up the SERVICE_FAILURE_ACTIONSW struct - sfa.dwResetPeriod = dwResetPeriodInDays * (24 * 60 * 60); // days to seconds - sfa.lpRebootMsg = wzRebootMessage; - sfa.lpCommand = wzProgramCommandLine; - sfa.cActions = countof(actions); - sfa.lpsaActions = actions; - - // Call ChangeServiceConfig2 to actually set up the failure actions - if (!::ChangeServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPVOID)&sfa)) - { - er = ::GetLastError(); - hr = HRESULT_FROM_WIN32(er); - -#pragma prefast(push) -#pragma prefast(disable:25028) - ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); -#pragma prefast(pop) - - // Check if this is a service that can't be modified. - if (ERROR_CANNOT_DETECT_PROCESS_ABORT == er) - { - WcaLog(LOGMSG_STANDARD, "WARNING: Service \"%ls\" is not configurable on this server and will not be set.", wzServiceName); - } - ExitOnFailure(hr, "Cannot change service configuration. Error: %ls", (LPWSTR)lpMsgBuf); - - if (lpMsgBuf) - { - ::LocalFree(lpMsgBuf); - lpMsgBuf = NULL; - } - } - -LExit: - if (lpMsgBuf) - { - ::LocalFree(lpMsgBuf); - } - - if (fAdjustedPrivileges) - { - ::AdjustTokenPrivileges(hToken, FALSE, pPrevPriv, 0, NULL, NULL); - } - - ReleaseMem(pPrevPriv); - ReleaseHandle(hToken); - - return hr; -} diff --git a/src/ca/shellexecca.cpp b/src/ca/shellexecca.cpp deleted file mode 100644 index ea21d3bd..00000000 --- a/src/ca/shellexecca.cpp +++ /dev/null @@ -1,271 +0,0 @@ -// 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" - -HRESULT ShellExec( - __in LPCWSTR wzTarget, - __in BOOL fUnelevated - ) -{ - HRESULT hr = S_OK; - LPWSTR sczWorkingDirectory = NULL; - - // a reasonable working directory (not the system32 default from MSI) is the directory where the target lives - hr = PathGetDirectory(wzTarget, &sczWorkingDirectory); - ExitOnFailure(hr, "failed to get directory for target: %ls", wzTarget); - - if (!DirExists(sczWorkingDirectory, NULL)) - { - ReleaseNullStr(sczWorkingDirectory); - } - - if (fUnelevated) - { - hr = ShelExecUnelevated(wzTarget, NULL, NULL, sczWorkingDirectory, SW_SHOWDEFAULT); - ExitOnFailure(hr, "ShelExecUnelevated failed with target %ls", wzTarget); - } - else - { - HINSTANCE hinst = ::ShellExecuteW(NULL, NULL, wzTarget, NULL, sczWorkingDirectory, SW_SHOWDEFAULT); - if (hinst <= HINSTANCE(32)) - { - LONG64 code = reinterpret_cast(hinst); - switch (code) - { - case ERROR_FILE_NOT_FOUND: - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - break; - case ERROR_PATH_NOT_FOUND: - hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); - break; - case ERROR_BAD_FORMAT: - hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); - break; - case SE_ERR_ASSOCINCOMPLETE: - case SE_ERR_NOASSOC: - hr = HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); - break; - case SE_ERR_DDEBUSY: - case SE_ERR_DDEFAIL: - case SE_ERR_DDETIMEOUT: - hr = HRESULT_FROM_WIN32(ERROR_DDE_FAIL); - break; - case SE_ERR_DLLNOTFOUND: - hr = HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND); - break; - case SE_ERR_OOM: - hr = E_OUTOFMEMORY; - break; - case SE_ERR_ACCESSDENIED: - hr = E_ACCESSDENIED; - break; - default: - hr = E_FAIL; - } - - ExitOnFailure(hr, "ShellExec failed with return code %llu.", code); - } - } - - -LExit: - ReleaseStr(sczWorkingDirectory); - return hr; -} - -extern "C" UINT __stdcall WixShellExec( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - LPWSTR pwzTarget = NULL; - - hr = WcaInitialize(hInstall, "WixShellExec"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetFormattedProperty(L"WixShellExecTarget", &pwzTarget); - ExitOnFailure(hr, "failed to get WixShellExecTarget"); - - WcaLog(LOGMSG_VERBOSE, "WixShellExecTarget is %ls", pwzTarget); - - if (!pwzTarget || !*pwzTarget) - { - hr = E_INVALIDARG; - ExitOnFailure(hr, "failed to get WixShellExecTarget"); - } - - hr = ShellExec(pwzTarget, FALSE); - ExitOnFailure(hr, "failed to launch target"); - -LExit: - ReleaseStr(pwzTarget); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - -extern "C" UINT __stdcall WixUnelevatedShellExec( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - LPWSTR pwzTarget = NULL; - - hr = WcaInitialize(hInstall, "WixUnelevatedShellExec"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetFormattedProperty(L"WixUnelevatedShellExecTarget", &pwzTarget); - ExitOnFailure(hr, "failed to get WixUnelevatedShellExecTarget"); - - WcaLog(LOGMSG_VERBOSE, "WixUnelevatedShellExecTarget is %ls", pwzTarget); - - if (!pwzTarget || !*pwzTarget) - { - hr = E_INVALIDARG; - ExitOnFailure(hr, "failed to get WixShellExecTarget"); - } - - hr = ShellExec(pwzTarget, TRUE); - ExitOnFailure(hr, "failed to launch target"); - -LExit: - ReleaseStr(pwzTarget); - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} - -// -// ExtractBinary extracts the data from the Binary table row with the given ID into a file. -// -HRESULT ExtractBinary( - __in LPCWSTR wzBinaryId, - __out BYTE** pbData, - __out DWORD* pcbData - ) -{ - HRESULT hr = S_OK; - LPWSTR pwzSql = NULL; - PMSIHANDLE hView; - PMSIHANDLE hRec; - - // make sure we're not horked from the get-go - hr = WcaTableExists(L"Binary"); - if (S_OK != hr) - { - if (SUCCEEDED(hr)) - { - hr = E_UNEXPECTED; - } - ExitOnFailure(hr, "There is no Binary table."); - } - - ExitOnNull(wzBinaryId, hr, E_INVALIDARG, "Binary ID cannot be null"); - ExitOnNull(*wzBinaryId, hr, E_INVALIDARG, "Binary ID cannot be empty string"); - - hr = StrAllocFormatted(&pwzSql, L"SELECT `Data` FROM `Binary` WHERE `Name`=\'%s\'", wzBinaryId); - ExitOnFailure(hr, "Failed to allocate Binary table query."); - - hr = WcaOpenExecuteView(pwzSql, &hView); - ExitOnFailure(hr, "Failed to open view on Binary table"); - - hr = WcaFetchSingleRecord(hView, &hRec); - ExitOnFailure(hr, "Failed to retrieve request from Binary table"); - - hr = WcaGetRecordStream(hRec, 1, pbData, pcbData); - ExitOnFailure(hr, "Failed to read Binary.Data."); - -LExit: - ReleaseStr(pwzSql); - - return hr; -} - -extern "C" UINT __stdcall WixShellExecBinary( - __in MSIHANDLE hInstall - ) -{ - Assert(hInstall); - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - LPWSTR pwzBinary = NULL; - LPWSTR pwzFilename = NULL; - BYTE* pbData = NULL; - DWORD cbData = 0; - HANDLE hFile = INVALID_HANDLE_VALUE; - -#if 0 - ::MessageBoxA(0, "WixShellExecBinary", "-->> ATTACH HERE", MB_OK); -#endif - - hr = WcaInitialize(hInstall, "WixShellExecBinary"); - ExitOnFailure(hr, "failed to initialize"); - - hr = WcaGetFormattedProperty(L"WixShellExecBinaryId", &pwzBinary); - ExitOnFailure(hr, "failed to get WixShellExecBinaryId"); - - WcaLog(LOGMSG_VERBOSE, "WixShellExecBinaryId is %ls", pwzBinary); - - if (!pwzBinary || !*pwzBinary) - { - hr = E_INVALIDARG; - ExitOnFailure(hr, "failed to get WixShellExecBinaryId"); - } - - // get temporary path for extracted file - StrAlloc(&pwzFilename, MAX_PATH); - ExitOnFailure(hr, "Failed to allocate temporary path"); - ::GetTempPathW(MAX_PATH, pwzFilename); - hr = ::StringCchCatW(pwzFilename, MAX_PATH, pwzBinary); - ExitOnFailure(hr, "Failed to append filename."); - - // grab the bits - hr = ExtractBinary(pwzBinary, &pbData, &cbData); - ExitOnFailure(hr, "failed to extract binary data"); - - // write 'em to the temp file - hFile = ::CreateFileW(pwzFilename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (INVALID_HANDLE_VALUE == hFile) - { - ExitWithLastError(hr, "Failed to open new temp file: %ls", pwzFilename); - } - - DWORD cbWritten = 0; - if (!::WriteFile(hFile, pbData, cbData, &cbWritten, NULL)) - { - ExitWithLastError(hr, "Failed to write data to new temp file: %ls", pwzFilename); - } - - // close it - ::CloseHandle(hFile); - hFile = INVALID_HANDLE_VALUE; - - // and run it - hr = ShellExec(pwzFilename, FALSE); - ExitOnFailure(hr, "failed to launch target: %ls", pwzFilename); - -LExit: - ReleaseStr(pwzBinary); - ReleaseStr(pwzFilename); - ReleaseMem(pbData); - if (INVALID_HANDLE_VALUE != hFile) - { - ::CloseHandle(hFile); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - return WcaFinalize(er); -} diff --git a/src/ca/test.cpp b/src/ca/test.cpp deleted file mode 100644 index c4d215f0..00000000 --- a/src/ca/test.cpp +++ /dev/null @@ -1,269 +0,0 @@ -// 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" - -#define WIXCA_UITHREAD_CLASS_WINDOW L"WixCaMessageWindow" - -extern HMODULE g_hInstCADLL; - - -// structs - -struct UITHREAD_CONTEXT -{ - HANDLE hInitializedEvent; - HINSTANCE hInstance; - HWND hWnd; -}; - - -// internal function declarations - -static HRESULT CreateMessageWindow( - __out HWND* phWnd - ); - -static void CloseMessageWindow( - __in HWND hWnd - ); - -static DWORD WINAPI ThreadProc( - __in LPVOID pvContext - ); - -static LRESULT CALLBACK WndProc( - __in HWND hWnd, - __in UINT uMsg, - __in WPARAM wParam, - __in LPARAM lParam - ); - - -/****************************************************************** -WixFailWhenDeferred - entry point for WixFailWhenDeferred - custom action which always fails when running as a deferred - custom action (otherwise it blindly succeeds). It's useful when - testing the rollback of deferred custom actions: Schedule it - immediately after the rollback/deferred CA pair you're testing - and it will fail, causing your rollback CA to get invoked. -********************************************************************/ -extern "C" UINT __stdcall WixFailWhenDeferred( - __in MSIHANDLE hInstall - ) -{ - return ::MsiGetMode(hInstall, MSIRUNMODE_SCHEDULED) ? ERROR_INSTALL_FAILURE : ERROR_SUCCESS; -} - -/****************************************************************** -WixWaitForEvent - entry point for WixWaitForEvent custom action - which waits for either the WixWaitForEventFail or - WixWaitForEventSucceed named auto reset events. Signaling the - WixWaitForEventFail event will return ERROR_INSTALL_FAILURE or - signaling the WixWaitForEventSucceed event will return - ERROR_SUCCESS. Both events are declared in the Global\ namespace. -********************************************************************/ -extern "C" UINT __stdcall WixWaitForEvent( - __in MSIHANDLE hInstall - ) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - HWND hMessageWindow = NULL; - LPCWSTR wzSDDL = L"D:(A;;GA;;;WD)"; - OS_VERSION version = OS_VERSION_UNKNOWN; - DWORD dwServicePack = 0; - PSECURITY_DESCRIPTOR pSD = NULL; - SECURITY_ATTRIBUTES sa = { }; - HANDLE rghEvents[2]; - - hr = WcaInitialize(hInstall, "WixWaitForEvent"); - ExitOnFailure(hr, "Failed to initialize."); - - // Create a window to prevent shutdown requests. - hr = CreateMessageWindow(&hMessageWindow); - ExitOnFailure(hr, "Failed to create message window."); - - // If running on Vista/2008 or newer use integrity enhancements. - OsGetVersion(&version, &dwServicePack); - if (OS_VERSION_VISTA <= version) - { - // Add SACL to allow Everyone to signal from a medium integrity level. - wzSDDL = L"D:(A;;GA;;;WD)S:(ML;;NW;;;ME)"; - } - - // Create the security descriptor and attributes for the events. - if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(wzSDDL, SDDL_REVISION_1, &pSD, NULL)) - { - ExitWithLastError(hr, "Failed to create the security descriptor for the events."); - } - - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = pSD; - sa.bInheritHandle = FALSE; - - rghEvents[0] = ::CreateEventW(&sa, FALSE, FALSE, L"Global\\WixWaitForEventFail"); - ExitOnNullWithLastError(rghEvents[0], hr, "Failed to create the Global\\WixWaitForEventFail event."); - - rghEvents[1] = ::CreateEventW(&sa, FALSE, FALSE, L"Global\\WixWaitForEventSucceed"); - ExitOnNullWithLastError(rghEvents[1], hr, "Failed to create the Global\\WixWaitForEventSucceed event."); - - // Wait for either of the events to be signaled and handle accordingly. - er = ::WaitForMultipleObjects(countof(rghEvents), rghEvents, FALSE, INFINITE); - switch (er) - { - case WAIT_OBJECT_0 + 0: - er = ERROR_INSTALL_FAILURE; - break; - case WAIT_OBJECT_0 + 1: - er = ERROR_SUCCESS; - break; - default: - ExitOnWin32Error(er, hr, "Unexpected failure."); - } - -LExit: - ReleaseHandle(rghEvents[1]); - ReleaseHandle(rghEvents[0]); - - if (pSD) - { - ::LocalFree(pSD); - } - - if (hMessageWindow) - { - CloseMessageWindow(hMessageWindow); - } - - if (FAILED(hr)) - { - er = ERROR_INSTALL_FAILURE; - } - - return WcaFinalize(er); -} - - -// internal function definitions - -static HRESULT CreateMessageWindow( - __out HWND* phWnd - ) -{ - HRESULT hr = S_OK; - HANDLE rgWaitHandles[2] = { }; - UITHREAD_CONTEXT context = { }; - - // Create event to signal after the UI thread / window is initialized. - rgWaitHandles[0] = ::CreateEventW(NULL, TRUE, FALSE, NULL); - ExitOnNullWithLastError(rgWaitHandles[0], hr, "Failed to create initialization event."); - - // Pass necessary information to create the window. - context.hInitializedEvent = rgWaitHandles[0]; - context.hInstance = (HINSTANCE)g_hInstCADLL; - - // Create our separate UI thread. - rgWaitHandles[1] = ::CreateThread(NULL, 0, ThreadProc, &context, 0, NULL); - ExitOnNullWithLastError(rgWaitHandles[1], hr, "Failed to create the UI thread."); - - // Wait for either the thread to be initialized or the window to exit / fail prematurely. - ::WaitForMultipleObjects(countof(rgWaitHandles), rgWaitHandles, FALSE, INFINITE); - - // Pass the window back to the caller. - *phWnd = context.hWnd; - -LExit: - ReleaseHandle(rgWaitHandles[1]); - ReleaseHandle(rgWaitHandles[0]); - - return hr; -} - -static void CloseMessageWindow( - __in HWND hWnd - ) -{ - if (::IsWindow(hWnd)) - { - ::PostMessageW(hWnd, WM_CLOSE, 0, 0); - } -} - -static DWORD WINAPI ThreadProc( - __in LPVOID pvContext - ) -{ - HRESULT hr = S_OK; - UITHREAD_CONTEXT* pContext = static_cast(pvContext); - - WNDCLASSW wc = { }; - BOOL fRegistered = TRUE; - HWND hWnd = NULL; - - BOOL fRet = FALSE; - MSG msg = { }; - - wc.lpfnWndProc = WndProc; - wc.hInstance = pContext->hInstance; - wc.lpszClassName = WIXCA_UITHREAD_CLASS_WINDOW; - - if (!::RegisterClassW(&wc)) - { - ExitWithLastError(hr, "Failed to register window."); - } - - fRegistered = TRUE; - - // Create the window to handle reboots without activating it. - hWnd = ::CreateWindowExW(WS_EX_TOOLWINDOW, wc.lpszClassName, NULL, WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, SW_SHOWNA, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, NULL); - ExitOnNullWithLastError(hWnd, hr, "Failed to create window."); - - // Persist the window handle and let the caller know we've initialized. - pContext->hWnd = hWnd; - ::SetEvent(pContext->hInitializedEvent); - - // Pump messages until the window is closed. - while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) - { - if (-1 == fRet) - { - hr = E_UNEXPECTED; - ExitOnFailure(hr, "Unexpected return value from message pump."); - } - else if (!::IsDialogMessageW(msg.hwnd, &msg)) - { - ::TranslateMessage(&msg); - ::DispatchMessageW(&msg); - } - } - -LExit: - if (fRegistered) - { - ::UnregisterClassW(WIXCA_UITHREAD_CLASS_WINDOW, pContext->hInstance); - } - - return hr; -} - -static LRESULT CALLBACK WndProc( - __in HWND hWnd, - __in UINT uMsg, - __in WPARAM wParam, - __in LPARAM lParam - ) -{ - switch (uMsg) - { - case WM_QUERYENDSESSION: - // Prevent the process from being shut down. - WcaLog(LOGMSG_VERBOSE, "Disallowed system request to shut down the custom action server."); - return FALSE; - - case WM_DESTROY: - ::PostQuitMessage(0); - return 0; - } - - return ::DefWindowProcW(hWnd, uMsg, wParam, lParam); -} diff --git a/src/ca/utilca.cpp b/src/ca/utilca.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/ca/utilca.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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" diff --git a/src/ca/utilca.def b/src/ca/utilca.def deleted file mode 100644 index 412d86a3..00000000 --- a/src/ca/utilca.def +++ /dev/null @@ -1,91 +0,0 @@ -; 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 "utilca" - -EXPORTS -; BroadcastSettingChange.cpp - WixBroadcastSettingChange - WixBroadcastEnvironmentChange -; checkreboot.cpp - WixCheckRebootRequired -; closeapps.cpp - WixCloseApplications - WixCloseApplicationsDeferred -; exitearlywithsuccess.cpp - WixExitEarlyWithSuccess -; FormatFiles.cpp - WixSchedFormatFiles - WixExecFormatFiles -; osinfo.cpp - WixQueryOsInfo - WixQueryOsDirs - WixQueryOsWellKnownSID - WixQueryOsDriverInfo -; netshortcuts.cpp - WixSchedInternetShortcuts - WixCreateInternetShortcuts - WixRollbackInternetShortcuts -; qtexecca.cpp - CAQuietExec - CAQuietExec64 - WixQuietExec - WixQuietExec64 - WixSilentExec - WixSilentExec64 -; RemoveFoldersEx.cpp - WixRemoveFoldersEx -; RemoveRegistryKeysEx.cpp - WixRemoveRegistryKeysEx -;scaexec.cpp - RegisterPerfCounterData - UnregisterPerfCounterData - RegisterPerfmon - UnregisterPerfmon - CreateSmb - DropSmb - CreateUser - CreateUserRollback - RemoveUser -;scasched.cpp - ConfigurePerfmonInstall - ConfigurePerfmonUninstall - ConfigureSmbInstall - ConfigureSmbUninstall - ConfigureUsers - InstallPerfCounterData - UninstallPerfCounterData - ConfigurePerfmonManifestRegister - ConfigurePerfmonManifestUnregister - ConfigureEventManifestRegister - ConfigureEventManifestUnregister -; RestartManager.cpp - WixRegisterRestartResources -; secureobj.cpp - SchedSecureObjects - SchedSecureObjectsRollback - ExecSecureObjects - ExecSecureObjectsRollback -; serviceconfig.cpp - SchedServiceConfig - ExecServiceConfig - RollbackServiceConfig -; shellexecca.cpp - WixShellExec - WixShellExecBinary - WixUnelevatedShellExec -; test.cpp - WixFailWhenDeferred - WixWaitForEvent -; TouchFile.cpp - WixTouchFileDuringInstall - WixTouchFileDuringUninstall - WixExecuteTouchFile -; xmlfile.cpp - SchedXmlFile - ExecXmlFile - ExecXmlFileRollback -; xmlconfig.cpp - SchedXmlConfig - ExecXmlConfig - ExecXmlConfigRollback diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj deleted file mode 100644 index 7b64db95..00000000 --- a/src/ca/utilca.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - X64 - - - Release - X64 - - - Debug - Win32 - - - Release - Win32 - - - - - {076018F7-19BD-423A-ABBF-229273DA08D8} - DynamicLibrary - utilca - v142 - Unicode - utilca.def - WiX Toolset Util CustomAction - - - - - - - activeds.lib;adsiid.lib;msi.lib;netapi32.lib;shlwapi.lib - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ext/Util/CustomizedNativeRecommendedRules.ruleset b/src/ext/Util/CustomizedNativeRecommendedRules.ruleset new file mode 100644 index 00000000..142b141c --- /dev/null +++ b/src/ext/Util/CustomizedNativeRecommendedRules.ruleset @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/ext/Util/Directory.Build.props b/src/ext/Util/Directory.Build.props new file mode 100644 index 00000000..b3c6287c --- /dev/null +++ b/src/ext/Util/Directory.Build.props @@ -0,0 +1,27 @@ + + + + + + Debug + false + MSB3246 + + $(MSBuildProjectName) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) + $(BaseOutputPath)obj\$(ProjectName)\ + $(BaseOutputPath)$(Configuration)\ + + WiX Toolset Team + WiX Toolset + Copyright (c) .NET Foundation and contributors. All rights reserved. + MS-RL + WiX Toolset + + + + + diff --git a/src/ext/Util/Directory.Build.targets b/src/ext/Util/Directory.Build.targets new file mode 100644 index 00000000..2fcc765a --- /dev/null +++ b/src/ext/Util/Directory.Build.targets @@ -0,0 +1,51 @@ + + + + + + + true + $(SolutionPath) + $(NCrunchOriginalSolutionPath) + + + + + + + $([System.IO.File]::ReadAllText($(TheSolutionPath))) + $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) + (?<="[PackageName]", ")(.*)(?=", ") + + + + + + %(Identity) + $(SolutionFileContent.Contains('\%(Identity).csproj')) + + + + + $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) + $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) + + + + + + + + + + + + + + diff --git a/src/ext/Util/Directory.csproj.props b/src/ext/Util/Directory.csproj.props new file mode 100644 index 00000000..81d24ad1 --- /dev/null +++ b/src/ext/Util/Directory.csproj.props @@ -0,0 +1,13 @@ + + + + + true + true + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false + + diff --git a/src/ext/Util/Directory.csproj.targets b/src/ext/Util/Directory.csproj.targets new file mode 100644 index 00000000..c3270426 --- /dev/null +++ b/src/ext/Util/Directory.csproj.targets @@ -0,0 +1,26 @@ + + + + + false + $(OutputPath)\$(AssemblyName).xml + + + + + $(PrivateRepositoryUrl.Replace('.git','')) + + $(MSBuildProjectName).nuspec + $(OutputPath)..\ + $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) + $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) + true + snupkg + + + + diff --git a/src/ext/Util/Directory.vcxproj.props b/src/ext/Util/Directory.vcxproj.props new file mode 100644 index 00000000..11778f41 --- /dev/null +++ b/src/ext/Util/Directory.vcxproj.props @@ -0,0 +1,97 @@ + + + + + + Win32 + $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ + $(OutputPath)$(Platform)\ + + + $(Company) + $(Copyright) + + win-x86;win-x64;win-arm64 + native,Version=v0.0 + + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + + + $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset + + + + + $(DisableSpecificCompilerWarnings) + Level4 + $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + Use + precomp.h + StdCall + true + false + -YlprecompDefine + /Zc:threadSafeInit- %(AdditionalOptions) + true + + + $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) + $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) + + + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + + + $(ProjectSubSystem) + $(ProjectModuleDefinitionFile) + $(ResourceOnlyDll) + true + $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) + /IGNORE:4099 %(AdditionalOptions) + + + + + + NoExtensions + + + + + CDecl + + + + + OldStyle + true + true + + + + + Disabled + EnableFastChecks + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + MinSpace + NDEBUG;%(PreprocessorDefinitions) + true + true + MultiThreaded + + + true + true + + + diff --git a/src/ext/Util/README.md b/src/ext/Util/README.md new file mode 100644 index 00000000..540c539c --- /dev/null +++ b/src/ext/Util/README.md @@ -0,0 +1,3 @@ +# Util.wixext +WixToolset.Util.wixext - Utility WiX Toolset Extension + diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln new file mode 100644 index 00000000..050fd8b3 --- /dev/null +++ b/src/ext/Util/Util.wixext.sln @@ -0,0 +1,87 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30204.135 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "src\wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.Build.0 = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x64.ActiveCfg = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.ActiveCfg = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.Build.0 = Debug|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.Build.0 = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x64.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.ActiveCfg = Release|Win32 + {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.Build.0 = Release|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.Build.0 = Debug|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x64.ActiveCfg = Debug|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.ActiveCfg = Release|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.Build.0 = Release|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x64.ActiveCfg = Release|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32 + {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.ActiveCfg = Debug|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.Build.0 = Debug|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86 + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x64.ActiveCfg = Debug|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x64.Build.0 = Debug|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x86.ActiveCfg = Debug|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x86.Build.0 = Debug|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|Any CPU.Build.0 = Release|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x64.ActiveCfg = Release|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x64.Build.0 = Release|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x86.ActiveCfg = Release|Any CPU + {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x86.Build.0 = Release|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x64.ActiveCfg = Debug|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x64.Build.0 = Debug|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x86.ActiveCfg = Debug|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x86.Build.0 = Debug|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|Any CPU.Build.0 = Release|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x64.ActiveCfg = Release|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x64.Build.0 = Release|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x86.ActiveCfg = Release|Any CPU + {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E4566A6B-47D0-4EA0-989A-D763AC39105D} + EndGlobalSection +EndGlobal diff --git a/src/ext/Util/Util.wixext.v3.ncrunchsolution b/src/ext/Util/Util.wixext.v3.ncrunchsolution new file mode 100644 index 00000000..10420ac9 --- /dev/null +++ b/src/ext/Util/Util.wixext.v3.ncrunchsolution @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/src/ext/Util/appveyor.cmd b/src/ext/Util/appveyor.cmd new file mode 100644 index 00000000..8322ffae --- /dev/null +++ b/src/ext/Util/appveyor.cmd @@ -0,0 +1,19 @@ +@setlocal +@pushd %~dp0 +@set _C=Release +@if /i "%1"=="debug" set _C=Debug + +:: Restore +msbuild -p:Configuration=%_C% -t:Restore || exit /b + +:: Build +msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b + +:: Pack +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Util/appveyor.yml b/src/ext/Util/appveyor.yml new file mode 100644 index 00000000..7c686b04 --- /dev/null +++ b/src/ext/Util/appveyor.yml @@ -0,0 +1,40 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml +# then update all of the repos. + +branches: + only: + - master + - develop + +image: Visual Studio 2019 + +version: 0.0.0.{build} +configuration: Release + +environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + NUGET_XMLDOC_MODE: skip + +build_script: + - appveyor.cmd + +pull_requests: + do_not_increment_build_number: true + +nuget: + disable_publish_on_pr: true + +skip_branch_with_pr: true +skip_tags: true + +artifacts: +- path: build\Release\**\*.nupkg + name: nuget + +notifications: +- provider: Slack + incoming_webhook: + secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Util/be/UtilBundleExtension.cpp b/src/ext/Util/be/UtilBundleExtension.cpp new file mode 100644 index 00000000..2ac842a5 --- /dev/null +++ b/src/ext/Util/be/UtilBundleExtension.cpp @@ -0,0 +1,87 @@ +// 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" +#include "BextBaseBundleExtension.h" + +class CWixUtilBundleExtension : public CBextBaseBundleExtension +{ +public: // IBundleExtension + virtual STDMETHODIMP Search( + __in LPCWSTR wzId, + __in LPCWSTR wzVariable + ) + { + HRESULT hr = S_OK; + + hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine); + + return hr; + } + +public: //CBextBaseBundleExtension + virtual STDMETHODIMP Initialize( + __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs + ) + { + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNode* pixnBundleExtension = NULL; + + hr = CBextBaseBundleExtension::Initialize(pCreateArgs); + ExitOnFailure(hr, "CBextBaseBundleExtension initialization failed."); + + hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest); + ExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath); + + hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension); + ExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID); + + hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension); + ExitOnFailure(hr, "Failed to parse searches from bundle extension manifest."); + + LExit: + ReleaseObject(pixnBundleExtension); + ReleaseObject(pixdManifest); + + return hr; + } + +public: + CWixUtilBundleExtension( + __in IBundleExtensionEngine* pEngine + ) : CBextBaseBundleExtension(pEngine) + { + m_searches = { }; + } + + ~CWixUtilBundleExtension() + { + UtilSearchUninitialize(&m_searches); + } + +private: + UTIL_SEARCHES m_searches; +}; + +HRESULT UtilBundleExtensionCreate( + __in IBundleExtensionEngine* pEngine, + __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, + __out IBundleExtension** ppBundleExtension + ) +{ + HRESULT hr = S_OK; + CWixUtilBundleExtension* pExtension = NULL; + + pExtension = new CWixUtilBundleExtension(pEngine); + ExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension."); + + hr = pExtension->Initialize(pArgs); + ExitOnFailure(hr, "CWixUtilBundleExtension initialization failed"); + + *ppBundleExtension = pExtension; + pExtension = NULL; + +LExit: + ReleaseObject(pExtension); + return hr; +} diff --git a/src/ext/Util/be/UtilBundleExtension.h b/src/ext/Util/be/UtilBundleExtension.h new file mode 100644 index 00000000..c55d6b85 --- /dev/null +++ b/src/ext/Util/be/UtilBundleExtension.h @@ -0,0 +1,16 @@ +#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. + + +// constants + +#define UTIL_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"UtilBundleExtension") + + +// function declarations + +HRESULT UtilBundleExtensionCreate( + __in IBundleExtensionEngine* pEngine, + __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, + __out IBundleExtension** ppBundleExtension + ); diff --git a/src/ext/Util/be/beDecor.h b/src/ext/Util/be/beDecor.h new file mode 100644 index 00000000..2c6a8818 --- /dev/null +++ b/src/ext/Util/be/beDecor.h @@ -0,0 +1,13 @@ +#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. + + +#if defined(_M_ARM64) +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_A64" +#elif defined(_M_AMD64) +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X64" +#elif defined(_M_ARM) +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_ARM" +#else +#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X86" +#endif diff --git a/src/ext/Util/be/detectsha2support.cpp b/src/ext/Util/be/detectsha2support.cpp new file mode 100644 index 00000000..90e349cd --- /dev/null +++ b/src/ext/Util/be/detectsha2support.cpp @@ -0,0 +1,58 @@ +// 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" + +// https://gist.github.com/navossoc/7572c7d82243e9f818989e2765e7793a +HRESULT DetectSHA2CodeSigning( + __out BOOL* pfSupported + ) +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + FARPROC pfn = NULL; + DWORD er = ERROR_SUCCESS; + + hr = LoadSystemLibrary(L"wintrust.dll", &hModule); + ExitOnFailure(hr, "Failed to load wintrust.dll"); + + pfn = ::GetProcAddress(hModule, "CryptCATAdminAcquireContext2"); + if (pfn) + { + *pfSupported = TRUE; + ExitFunction1(hr = S_OK); + } + + er = ::GetLastError(); + if (er == ERROR_PROC_NOT_FOUND) + { + *pfSupported = FALSE; + ExitFunction1(hr = S_OK); + } + + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to probe for CryptCATAdminAcquireContext2 in wintrust.dll"); + +LExit: + ::FreeLibrary(hModule); + + return hr; +} + +HRESULT UtilPerformDetectSHA2CodeSigning( + __in LPCWSTR wzVariable, + __in UTIL_SEARCH* /*pSearch*/, + __in IBundleExtensionEngine* pEngine + ) +{ + HRESULT hr = S_OK; + BOOL fSupported = FALSE; + + hr = DetectSHA2CodeSigning(&fSupported); + ExitOnFailure(hr, "DetectSHA2CodeSigning failed."); + + hr = pEngine->SetVariableNumeric(wzVariable, fSupported ? 1 : 0); + ExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable); + +LExit: + return hr; +} diff --git a/src/ext/Util/be/detectsha2support.h b/src/ext/Util/be/detectsha2support.h new file mode 100644 index 00000000..c38a3d59 --- /dev/null +++ b/src/ext/Util/be/detectsha2support.h @@ -0,0 +1,8 @@ +#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. + +HRESULT UtilPerformDetectSHA2CodeSigning( + __in LPCWSTR wzVariable, + __in UTIL_SEARCH* pSearch, + __in IBundleExtensionEngine* pEngine + ); \ No newline at end of file diff --git a/src/ext/Util/be/precomp.cpp b/src/ext/Util/be/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ext/Util/be/precomp.cpp @@ -0,0 +1,3 @@ +// 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" diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h new file mode 100644 index 00000000..76d24c7b --- /dev/null +++ b/src/ext/Util/be/precomp.h @@ -0,0 +1,37 @@ +#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. + + +#if _WIN32_MSI < 150 +#define _WIN32_MSI 150 +#endif + +#include +#include +#include +#include + +#include + +#include + +#define MAXUINT USHRT_MAX + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include "beDecor.h" +#include "utilsearch.h" +#include "detectsha2support.h" +#include "UtilBundleExtension.h" diff --git a/src/ext/Util/be/utilbe.cpp b/src/ext/Util/be/utilbe.cpp new file mode 100644 index 00000000..d9816dc7 --- /dev/null +++ b/src/ext/Util/be/utilbe.cpp @@ -0,0 +1,41 @@ +// 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" +#include "BextBaseBundleExtensionProc.h" + +static IBundleExtension* vpBundleExtension = NULL; + +// function definitions + +extern "C" HRESULT WINAPI BundleExtensionCreate( + __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, + __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBundleExtensionEngine* pEngine = NULL; + + hr = XmlInitialize(); + ExitOnFailure(hr, "Failed to initialize XML."); + + hr = BextInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize bext"); + + hr = UtilBundleExtensionCreate(pEngine, pArgs, &vpBundleExtension); + BextExitOnFailure(hr, "Failed to create WixUtilBundleExtension"); + + pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc; + pResults->pvBundleExtensionProcContext = vpBundleExtension; + +LExit: + ReleaseObject(pEngine); + + return hr; +} + +extern "C" void WINAPI BundleExtensionDestroy() +{ + BextUninitialize(); + ReleaseNullObject(vpBundleExtension); + XmlUninitialize(); +} \ No newline at end of file diff --git a/src/ext/Util/be/utilbe.def b/src/ext/Util/be/utilbe.def new file mode 100644 index 00000000..711b1a5c --- /dev/null +++ b/src/ext/Util/be/utilbe.def @@ -0,0 +1,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. + + +LIBRARY "utilbe" + +EXPORTS + BundleExtensionCreate + BundleExtensionDestroy diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj new file mode 100644 index 00000000..683b376a --- /dev/null +++ b/src/ext/Util/be/utilbe.vcxproj @@ -0,0 +1,80 @@ + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + X64 + + + Release + X64 + + + Debug + Win32 + + + Release + Win32 + + + + + {630C1EE7-2517-4A8C-83E3-DA1150308B58} + DynamicLibrary + utilbe + v142 + Unicode + utilbe.def + WiX Toolset Util BundleExtension + + + + + + + msi.lib + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/be/utilsearch.cpp b/src/ext/Util/be/utilsearch.cpp new file mode 100644 index 00000000..7cd2ea09 --- /dev/null +++ b/src/ext/Util/be/utilsearch.cpp @@ -0,0 +1,160 @@ +// 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" + + +STDMETHODIMP UtilSearchParseFromXml( + __in UTIL_SEARCHES* pSearches, + __in IXMLDOMNode* pixnBundleExtension + ) +{ + HRESULT hr = S_OK; + IXMLDOMNodeList* pixnNodes = NULL; + IXMLDOMNode* pixnNode = NULL; + DWORD cNodes = 0; + BSTR bstrNodeName = NULL; + LPWSTR scz = NULL; + + // Select Util search nodes. + hr = XmlSelectNodes(pixnBundleExtension, L"WixWindowsFeatureSearch", &pixnNodes); + ExitOnFailure(hr, "Failed to select Util search nodes."); + + // Get Util search node count. + hr = pixnNodes->get_length((long*)&cNodes); + ExitOnFailure(hr, "Failed to get Util search node count."); + + if (!cNodes) + { + ExitFunction(); + } + + // Allocate memory for searches. + pSearches->rgSearches = (UTIL_SEARCH*)MemAlloc(sizeof(UTIL_SEARCH) * cNodes, TRUE); + ExitOnNull(pSearches->rgSearches, hr, E_OUTOFMEMORY, "Failed to allocate memory for search structs."); + + pSearches->cSearches = cNodes; + + // Parse search elements. + for (DWORD i = 0; i < cNodes; ++i) + { + UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; + + hr = XmlNextElement(pixnNodes, &pixnNode, &bstrNodeName); + ExitOnFailure(hr, "Failed to get next node."); + + // @Id + hr = XmlGetAttributeEx(pixnNode, L"Id", &pSearch->sczId); + ExitOnFailure(hr, "Failed to get @Id."); + + // Read type specific attributes. + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"WixWindowsFeatureSearch", -1)) + { + pSearch->Type = UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH; + + // @Type + hr = XmlGetAttributeEx(pixnNode, L"Type", &scz); + ExitOnFailure(hr, "Failed to get @Type."); + + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"sha2CodeSigning", -1)) + { + pSearch->WindowsFeatureSearch.type = UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING; + } + else + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "Invalid value for @Type: %ls", scz); + } + } + else + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Unexpected element name: %ls", bstrNodeName); + } + + // prepare next iteration + ReleaseNullObject(pixnNode); + ReleaseNullBSTR(bstrNodeName); + } + +LExit: + ReleaseStr(scz); + ReleaseBSTR(bstrNodeName); + ReleaseObject(pixnNode); + ReleaseObject(pixnNodes); + + return hr; +} + +void UtilSearchUninitialize( + __in UTIL_SEARCHES* pSearches + ) +{ + if (pSearches->rgSearches) + { + for (DWORD i = 0; i < pSearches->cSearches; ++i) + { + UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; + + ReleaseStr(pSearch->sczId); + } + MemFree(pSearches->rgSearches); + } +} + +STDMETHODIMP UtilSearchExecute( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzSearchId, + __in LPCWSTR wzVariable, + __in IBundleExtensionEngine* pEngine + ) +{ + HRESULT hr = S_OK; + UTIL_SEARCH* pSearch = NULL; + + hr = UtilSearchFindById(pSearches, wzSearchId, &pSearch); + ExitOnFailure(hr, "Search id '%ls' is unknown to the util extension."); + + switch (pSearch->Type) + { + case UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH: + switch (pSearch->WindowsFeatureSearch.type) + { + case UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING: + hr = UtilPerformDetectSHA2CodeSigning(wzVariable, pSearch, pEngine); + break; + default: + hr = E_UNEXPECTED; + } + break; + default: + hr = E_UNEXPECTED; + } + +LExit: + return hr; +} + +STDMETHODIMP UtilSearchFindById( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzId, + __out UTIL_SEARCH** ppSearch + ) +{ + HRESULT hr = S_OK; + + for (DWORD i = 0; i < pSearches->cSearches; ++i) + { + UTIL_SEARCH* pSearch = &pSearches->rgSearches[i]; + + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1)) + { + *ppSearch = pSearch; + ExitFunction1(hr = S_OK); + } + } + + hr = E_NOTFOUND; + +LExit: + return hr; +} diff --git a/src/ext/Util/be/utilsearch.h b/src/ext/Util/be/utilsearch.h new file mode 100644 index 00000000..deeab1f7 --- /dev/null +++ b/src/ext/Util/be/utilsearch.h @@ -0,0 +1,65 @@ +#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. + + +// constants + +enum UTIL_SEARCH_TYPE +{ + UTIL_SEARCH_TYPE_NONE, + UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH, +}; + +enum UTIL_WINDOWS_FEATURE_SEARCH_TYPE +{ + UTIL_WINDOWS_FEATURE_SEARCH_TYPE_NONE, + UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING, +}; + + +// structs + +typedef struct _UTIL_SEARCH +{ + LPWSTR sczId; + + UTIL_SEARCH_TYPE Type; + union + { + struct + { + UTIL_WINDOWS_FEATURE_SEARCH_TYPE type; + } WindowsFeatureSearch; + }; +} UTIL_SEARCH; + +typedef struct _UTIL_SEARCHES +{ + UTIL_SEARCH* rgSearches; + DWORD cSearches; +} UTIL_SEARCHES; + + +// function declarations + +STDMETHODIMP UtilSearchParseFromXml( + __in UTIL_SEARCHES* pSearches, + __in IXMLDOMNode* pixnBundleExtension + ); + +void UtilSearchUninitialize( + __in UTIL_SEARCHES* pSearches + ); + +STDMETHODIMP UtilSearchExecute( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzSearchId, + __in LPCWSTR wzVariable, + __in IBundleExtensionEngine* pEngine + ); + +STDMETHODIMP UtilSearchFindById( + __in UTIL_SEARCHES* pSearches, + __in LPCWSTR wzId, + __out UTIL_SEARCH** ppSearch + ); diff --git a/src/ext/Util/ca/BroadcastSettingChange.cpp b/src/ext/Util/ca/BroadcastSettingChange.cpp new file mode 100644 index 00000000..2e153ad3 --- /dev/null +++ b/src/ext/Util/ca/BroadcastSettingChange.cpp @@ -0,0 +1,45 @@ +// 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" + + +/******************************************************************** +WixBroadcastSettingChange + + Send WM_SETTINGCHANGE message to all top-level windows indicating + that unspecified settings have changed. +********************************************************************/ +extern "C" UINT __stdcall WixBroadcastSettingChange( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = WcaInitialize(hInstall, "WixBroadcastSettingChange"); + ExitOnFailure(hr, "failed to initialize WixBroadcastSettingChange"); + + // best effort; ignore failures + ::SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, NULL, SMTO_ABORTIFHUNG, 1000, NULL); + +LExit: + return WcaFinalize(ERROR_SUCCESS); +} + + +/******************************************************************** +WixBroadcastEnvironmentChange + + Send WM_SETTINGCHANGE message to all top-level windows indicating + that environment variables have changed. +********************************************************************/ +extern "C" UINT __stdcall WixBroadcastEnvironmentChange( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = WcaInitialize(hInstall, "WixBroadcastEnvironmentChange"); + ExitOnFailure(hr, "failed to initialize WixBroadcastEnvironmentChange"); + + // best effort; ignore failures + ::SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, reinterpret_cast(L"Environment"), SMTO_ABORTIFHUNG, 1000, NULL); + +LExit: + return WcaFinalize(ERROR_SUCCESS); +} diff --git a/src/ext/Util/ca/CheckReboot.cpp b/src/ext/Util/ca/CheckReboot.cpp new file mode 100644 index 00000000..ce056411 --- /dev/null +++ b/src/ext/Util/ca/CheckReboot.cpp @@ -0,0 +1,36 @@ +// 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" + + +/******************************************************************** +WixCheckRebootRequired - entry point for WixCheckRebootRequired Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence after InstallFinalize +********************************************************************/ +extern "C" UINT __stdcall WixCheckRebootRequired( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixCheckRebootRequired"); + ExitOnFailure(hr, "failed to initialize"); + + if (WcaDidDeferredActionRequireReboot()) + { + WcaLog(LOGMSG_STANDARD, "Reboot required by deferred CustomAction."); + + er = ::MsiSetMode(hInstall, MSIRUNMODE_REBOOTATEND, TRUE); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to schedule reboot."); + } + +LExit: + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/CloseApps.cpp b/src/ext/Util/ca/CloseApps.cpp new file mode 100644 index 00000000..d4256c43 --- /dev/null +++ b/src/ext/Util/ca/CloseApps.cpp @@ -0,0 +1,568 @@ +// 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" + +#define DEFAULT_PROCESS_EXIT_WAIT_TIME 5000 + +// structs +LPCWSTR wzQUERY_CLOSEAPPS = L"SELECT `Wix4CloseApplication`, `Target`, `Description`, `Condition`, `Attributes`, `Property`, `TerminateExitCode`, `Timeout` FROM `Wix4CloseApplication` ORDER BY `Sequence`"; +enum eQUERY_CLOSEAPPS { QCA_ID = 1, QCA_TARGET, QCA_DESCRIPTION, QCA_CONDITION, QCA_ATTRIBUTES, QCA_PROPERTY, QCA_TERMINATEEXITCODE, QCA_TIMEOUT }; + +// CloseApplication.Attributes +enum CLOSEAPP_ATTRIBUTES +{ + CLOSEAPP_ATTRIBUTE_NONE = 0x0, + CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE = 0x1, + CLOSEAPP_ATTRIBUTE_REBOOTPROMPT = 0x2, + CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE = 0x4, + CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE = 0x8, + CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE = 0x10, + CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS = 0x20, + CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE = 0x40, +}; + +struct PROCESS_AND_MESSAGE +{ + DWORD dwProcessId; + DWORD dwMessageId; + DWORD dwTimeout; +}; + + +/****************************************************************** + EnumWindowsProc - callback function which sends message if the + current window matches the passed in process ID + +******************************************************************/ +BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + PROCESS_AND_MESSAGE* pPM = reinterpret_cast(lParam); + DWORD dwProcessId = 0; + DWORD_PTR dwResult = 0; + BOOL fQueryEndSession = WM_QUERYENDSESSION == pPM->dwMessageId; + BOOL fContinueWindowsInProcess = TRUE; // assume we will send message to all top-level windows in a process. + + ::GetWindowThreadProcessId(hwnd, &dwProcessId); + + // check if the process Id is the one we're looking for + if (dwProcessId != pPM->dwProcessId) + { + return TRUE; + } + + WcaLog(LOGMSG_VERBOSE, "Sending message to process id 0x%x", dwProcessId); + + if (::SendMessageTimeoutW(hwnd, pPM->dwMessageId, 0, fQueryEndSession ? ENDSESSION_CLOSEAPP : 0, SMTO_BLOCK, pPM->dwTimeout, &dwResult)) + { + WcaLog(LOGMSG_VERBOSE, "Result 0x%x", dwResult); + + if (fQueryEndSession) + { + // If application said it was okay to close, do that. + if (dwResult) + { + ::SendMessageTimeoutW(hwnd, WM_ENDSESSION, TRUE, ENDSESSION_CLOSEAPP, SMTO_BLOCK, pPM->dwTimeout, &dwResult); + } + else // application said don't try to close it, so don't bother sending messages to any other top-level windows. + { + fContinueWindowsInProcess = FALSE; + } + } + } + else // log result message. + { + WcaLog(LOGMSG_VERBOSE, "Failed to send message id: %u, error: 0x%x", pPM->dwMessageId, ::GetLastError()); + } + + // so we know we succeeded + ::SetLastError(ERROR_SUCCESS); + + return fContinueWindowsInProcess; +} + +/****************************************************************** + PromptToContinue - displays the prompt if the application is still + running. + +******************************************************************/ +static HRESULT PromptToContinue( + __in_z LPCWSTR wzApplication, + __in_z LPCWSTR wzPrompt + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PMSIHANDLE hRecMessage = NULL; + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0; + + hRecMessage = ::MsiCreateRecord(1); + ExitOnNull(hRecMessage, hr, E_OUTOFMEMORY, "Failed to create record for prompt."); + + er = ::MsiRecordSetStringW(hRecMessage, 0, wzPrompt); + ExitOnWin32Error(er, hr, "Failed to set prompt record field string"); + + do + { + hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); + if (SUCCEEDED(hr) && 0 < cProcessIds) + { + er = WcaProcessMessage(static_cast(INSTALLMESSAGE_WARNING | MB_ABORTRETRYIGNORE | MB_DEFBUTTON3 | MB_ICONWARNING), hRecMessage); + if (IDABORT == er) + { + hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); + } + else if (IDRETRY == er) + { + hr = S_FALSE; + } + else if (IDIGNORE == er) + { + hr = S_OK; + } + else + { + ExitOnWin32Error(er, hr, "Unexpected return value from prompt to continue."); + } + } + + ReleaseNullMem(prgProcessIds); + cProcessIds = 0; + } while (S_FALSE == hr); + +LExit: + ReleaseMem(prgProcessIds); + return hr; +} + +/****************************************************************** + SendProcessMessage - helper function to enumerate the top-level + windows and send to all matching a process ID. + +******************************************************************/ +void SendProcessMessage( + __in DWORD dwProcessId, + __in DWORD dwMessageId, + __in DWORD dwTimeout + ) +{ + WcaLog(LOGMSG_VERBOSE, "Attempting to send process id 0x%x message id: %u", dwProcessId, dwMessageId); + + PROCESS_AND_MESSAGE pm = { }; + pm.dwProcessId = dwProcessId; + pm.dwMessageId = dwMessageId; + pm.dwTimeout = dwTimeout; + + if (!::EnumWindows(EnumWindowsProc, reinterpret_cast(&pm))) + { + DWORD dwLastError = ::GetLastError(); + if (ERROR_SUCCESS != dwLastError) + { + WcaLog(LOGMSG_VERBOSE, "CloseApp enumeration error: 0x%x", dwLastError); + } + } +} + +/****************************************************************** + SendApplicationMessage - helper function to iterate through the + processes for the specified application and send all + applicable process Ids a message and give them time to process + the message. + +******************************************************************/ +void SendApplicationMessage( + __in LPCWSTR wzApplication, + __in DWORD dwMessageId, + __in DWORD dwTimeout + ) +{ + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0, iProcessId; + HRESULT hr = S_OK; + + WcaLog(LOGMSG_VERBOSE, "Checking App: %ls ", wzApplication); + + hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); + + if (SUCCEEDED(hr) && 0 < cProcessIds) + { + WcaLog(LOGMSG_VERBOSE, "App: %ls found running, %d processes, attempting to send message.", wzApplication, cProcessIds); + + for (iProcessId = 0; iProcessId < cProcessIds; ++iProcessId) + { + SendProcessMessage(prgProcessIds[iProcessId], dwMessageId, dwTimeout); + } + + ProcWaitForIds(prgProcessIds, cProcessIds, dwTimeout); + } + + ReleaseMem(prgProcessIds); +} + +/****************************************************************** + SetRunningProcessProperty - helper function that sets the specified + property if there are any instances of the specified executable + running. Useful to show custom UI to ask for shutdown. +******************************************************************/ +void SetRunningProcessProperty( + __in LPCWSTR wzApplication, + __in LPCWSTR wzProperty + ) +{ + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0; + HRESULT hr = S_OK; + + WcaLog(LOGMSG_VERBOSE, "Checking App: %ls ", wzApplication); + + hr = ProcFindAllIdsFromExeName(wzApplication, &prgProcessIds, &cProcessIds); + + if (SUCCEEDED(hr) && 0 < cProcessIds) + { + WcaLog(LOGMSG_VERBOSE, "App: %ls found running, %d processes, setting '%ls' property.", wzApplication, cProcessIds, wzProperty); + WcaSetIntProperty(wzProperty, cProcessIds); + } + + ReleaseMem(prgProcessIds); +} + +/****************************************************************** + TerminateProcesses - helper function that kills the provided set of + process ids such that they return a particular exit code. +******************************************************************/ +void TerminateProcesses( + __in_ecount(cProcessIds) DWORD rgdwProcessIds[], + __in DWORD cProcessIds, + __in DWORD dwExitCode + ) +{ + for (DWORD i = 0; i < cProcessIds; ++i) + { + HANDLE hProcess = ::OpenProcess(PROCESS_TERMINATE, FALSE, rgdwProcessIds[i]); + if (hProcess) + { + ::TerminateProcess(hProcess, dwExitCode); + ::CloseHandle(hProcess); + } + } +} + +/****************************************************************** + WixCloseApplications - entry point for WixCloseApplications Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence before InstallFiles +******************************************************************/ +extern "C" UINT __stdcall WixCloseApplications( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixCloseApplications"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwzId = NULL; + LPWSTR pwzTarget = NULL; + LPWSTR pwzDescription = NULL; + LPWSTR pwzCondition = NULL; + LPWSTR pwzProperty = NULL; + DWORD dwAttributes = 0; + DWORD dwTimeout = 0; + DWORD dwTerminateExitCode = 0; + MSICONDITION condition = MSICONDITION_NONE; + + DWORD cCloseApps = 0; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + MSIHANDLE hListboxTable = NULL; + MSIHANDLE hListboxColumns = NULL; + + LPWSTR pwzCustomActionData = NULL; + //DWORD cchCustomActionData = 0; + + // + // initialize + // + hr = WcaInitialize(hInstall, "WixCloseApplications"); + ExitOnFailure(hr, "failed to initialize"); + + // + // loop through all the objects to be secured + // + hr = WcaOpenExecuteView(wzQUERY_CLOSEAPPS, &hView); + ExitOnFailure(hr, "failed to open view on Wix4CloseApplication table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, QCA_ID, &pwzId); + ExitOnFailure(hr, "failed to get id from Wix4CloseApplication table"); + + hr = WcaGetRecordString(hRec, QCA_CONDITION, &pwzCondition); + ExitOnFailure(hr, "failed to get condition from Wix4CloseApplication table"); + + if (pwzCondition && *pwzCondition) + { + condition = ::MsiEvaluateConditionW(hInstall, pwzCondition); + if (MSICONDITION_ERROR == condition) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to process condition for Wix4CloseApplication '%ls'", pwzId); + } + else if (MSICONDITION_FALSE == condition) + { + continue; // skip processing this target + } + } + + hr = WcaGetRecordFormattedString(hRec, QCA_TARGET, &pwzTarget); + ExitOnFailure(hr, "failed to get target from Wix4CloseApplication table"); + + hr = WcaGetRecordFormattedString(hRec, QCA_DESCRIPTION, &pwzDescription); + ExitOnFailure(hr, "failed to get description from Wix4CloseApplication table"); + + hr = WcaGetRecordInteger(hRec, QCA_ATTRIBUTES, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to get attributes from Wix4CloseApplication table"); + + hr = WcaGetRecordFormattedString(hRec, QCA_PROPERTY, &pwzProperty); + ExitOnFailure(hr, "failed to get property from Wix4CloseApplication table"); + + hr = WcaGetRecordInteger(hRec, QCA_TERMINATEEXITCODE, reinterpret_cast(&dwTerminateExitCode)); + if (S_FALSE == hr) + { + dwTerminateExitCode = 0; + hr = S_OK; + } + ExitOnFailure(hr, "failed to get terminate exit-code from Wix4CloseApplication table"); + + hr = WcaGetRecordInteger(hRec, QCA_TIMEOUT, reinterpret_cast(&dwTimeout)); + if (S_FALSE == hr) + { + dwTimeout = DEFAULT_PROCESS_EXIT_WAIT_TIME; + hr = S_OK; + } + ExitOnFailure(hr, "failed to get timeout from Wix4CloseApplication table"); + + // Before trying any changes to the machine, prompt if requested. + if (dwAttributes & CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE) + { + hr = PromptToContinue(pwzTarget, pwzDescription ? pwzDescription : L""); + if (HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hr) + { + // Skip error message if user canceled. + ExitFunction(); + } + ExitOnFailure(hr, "Failure while prompting user to continue to close application."); + } + + // + // send WM_CLOSE or WM_QUERYENDSESSION to currently running applications + // + if (dwAttributes & CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_CLOSE, dwTimeout); + } + + if (dwAttributes & CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_QUERYENDSESSION, dwTimeout); + } + + // + // Pass the targets to the deferred action in case the app comes back + // even if we close it now. + // + if (dwAttributes & (CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE | CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE | CLOSEAPP_ATTRIBUTE_REBOOTPROMPT | CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS)) + { + hr = WcaWriteStringToCaData(pwzTarget, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add target data to CustomActionData"); + + hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add attribute data to CustomActionData"); + + hr = WcaWriteIntegerToCaData(dwTimeout, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add timeout data to CustomActionData"); + + hr = WcaWriteIntegerToCaData(dwTerminateExitCode, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add timeout data to CustomActionData"); + } + + if (pwzProperty && *pwzProperty) + { + SetRunningProcessProperty(pwzTarget, pwzProperty); + } + + ++cCloseApps; + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all apps to close"); + + // + // Do the UI dance now. + // + /* + + TODO: Do this eventually + + if (cCloseApps) + { + while (TRUE) + { + for (DWORD i = 0; i < cCloseApps; ++i) + { + hr = WcaAddTempRecord(&hListboxTable, &hListboxColumns, L"ListBox", NULL, 0, 4, L"FileInUseProcess", i, target, description); + if (FAILED(hr)) + { + } + } + } + } + */ + + // + // schedule the custom action and add to progress bar + // + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cCloseApps); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CloseApplicationsDeferred"), pwzCustomActionData, cCloseApps * COST_CLOSEAPP); + ExitOnFailure(hr, "failed to schedule CloseApplicationsDeferred action"); + } + +LExit: + if (hListboxColumns) + { + ::MsiCloseHandle(hListboxColumns); + } + if (hListboxTable) + { + ::MsiCloseHandle(hListboxTable); + } + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzProperty); + ReleaseStr(pwzCondition); + ReleaseStr(pwzDescription); + ReleaseStr(pwzTarget); + ReleaseStr(pwzId); + + if (FAILED(hr)) + { + er = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hr ? ERROR_INSTALL_USEREXIT : ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/****************************************************************** + WixCloseApplicationsDeferred - entry point for + WixCloseApplicationsDeferred Custom Action + called as Type 1025 CustomAction + (deferred binary DLL) + + NOTE: deferred CustomAction since it modifies the machine + NOTE: CustomActionData == wzTarget\tdwAttributes\tdwTimeout\tdwTerminateExitCode\t... +******************************************************************/ +extern "C" UINT __stdcall WixCloseApplicationsDeferred( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixCloseApplicationsDeferred"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzTarget = NULL; + DWORD dwAttributes = 0; + DWORD dwTimeout = 0; + DWORD dwTerminateExitCode = 0; + + DWORD *prgProcessIds = NULL; + DWORD cProcessIds = 0; + + // + // initialize + // + hr = WcaInitialize(hInstall, "WixCloseApplicationsDeferred"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + + // + // loop through all the passed in data + // + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzTarget); + ExitOnFailure(hr, "failed to process target from CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to process attributes from CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwTimeout)); + ExitOnFailure(hr, "failed to process timeout from CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwTerminateExitCode)); + ExitOnFailure(hr, "failed to process terminate exit code from CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Checking for App: %ls Attributes: %d", pwzTarget, dwAttributes); + + // + // send WM_CLOSE or WM_QUERYENDSESSION to currently running applications + // + if (dwAttributes & CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_CLOSE, dwTimeout); + } + + if (dwAttributes & CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE) + { + SendApplicationMessage(pwzTarget, WM_QUERYENDSESSION, dwTimeout); + } + + // If we find that an app that we need closed is still runing, require a + // restart or kill the process as directed. + ProcFindAllIdsFromExeName(pwzTarget, &prgProcessIds, &cProcessIds); + if (0 < cProcessIds) + { + if (dwAttributes & CLOSEAPP_ATTRIBUTE_REBOOTPROMPT) + { + WcaLog(LOGMSG_VERBOSE, "App: %ls found running, requiring a reboot.", pwzTarget); + + WcaDeferredActionRequiresReboot(); + } + else if (dwAttributes & CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS) + { + TerminateProcesses(prgProcessIds, cProcessIds, dwTerminateExitCode); + } + } + + hr = WcaProgressMessage(COST_CLOSEAPP, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + } + +LExit: + ReleaseMem(prgProcessIds); + + ReleaseStr(pwzTarget); + ReleaseStr(pwzData); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/CustomMsiErrors.h b/src/ext/Util/ca/CustomMsiErrors.h new file mode 100644 index 00000000..3218b61b --- /dev/null +++ b/src/ext/Util/ca/CustomMsiErrors.h @@ -0,0 +1,32 @@ +#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. + + +#define msierrSecureObjectsFailedCreateSD 25520 +#define msierrSecureObjectsFailedSet 25521 +#define msierrSecureObjectsUnknownType 25522 + +#define msierrXmlFileFailedRead 25530 +#define msierrXmlFileFailedOpen 25531 +#define msierrXmlFileFailedSelect 25532 +#define msierrXmlFileFailedSave 25533 + +#define msierrXmlConfigFailedRead 25540 +#define msierrXmlConfigFailedOpen 25541 +#define msierrXmlConfigFailedSelect 25542 +#define msierrXmlConfigFailedSave 25543 + +#define msierrPERFMONFailedRegisterDLL 26251 +#define msierrPERFMONFailedUnregisterDLL 26252 +#define msierrInstallPerfCounterData 26253 +#define msierrUninstallPerfCounterData 26254 + +#define msierrSMBFailedCreate 26301 +#define msierrSMBFailedDrop 26302 +#define msierrUSRFailedUserCreate 26401 +#define msierrUSRFailedUserCreatePswd 26402 +#define msierrUSRFailedUserGroupAdd 26403 +#define msierrUSRFailedUserCreateExists 26404 +#define msierrUSRFailedGrantLogonAsService 26405 + +//Last available is 26450 \ No newline at end of file diff --git a/src/ext/Util/ca/FormatFiles.cpp b/src/ext/Util/ca/FormatFiles.cpp new file mode 100644 index 00000000..d1533999 --- /dev/null +++ b/src/ext/Util/ca/FormatFiles.cpp @@ -0,0 +1,221 @@ +// 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" + +const UINT COST_FILEFORMATTING = 2000; + + +// +// WixSchedFormatFiles - immediate CA to schedule format files CAs +// +extern "C" UINT __stdcall WixSchedFormatFiles( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PSCZ sczBinaryKey; + PSCZ sczFileKey; + PSCZ sczComponentKey; + PSCZ sczFormattedFile; + PSCZ sczFilePath; + PMSIHANDLE hView; + PMSIHANDLE hRec; + PSCZ sczFileContent; + PSCZ sczFormattedContent; + PSCZ sczExecCustomActionData; + PSCZ sczRollbackCustomActionData; + + LPCWSTR wzQuery = + L"SELECT `Wix4FormatFile`.`Binary_`, `Wix4FormatFile`.`File_`, `File`.`Component_` " + L"FROM `Wix4FormatFile`, `File` " + L"WHERE `Wix4FormatFile`.`File_` = `File`.`File`"; + enum eQuery { eqBinaryKey = 1, eqFileKey, eqComponentKey }; + + // initialize + hr = WcaInitialize(hInstall, "WixSchedFormatFiles"); + ExitOnFailure(hr, "Failed to initialize for WixSchedFormatFiles."); + + // query and loop through all the files + hr = WcaOpenExecuteView(wzQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4FormatFile table"); + + DWORD cFiles = 0; + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + ++cFiles; + + hr = WcaGetRecordString(hRec, eqBinaryKey, &sczBinaryKey); + ExitOnFailure(hr, "Failed to get Binary table key."); + + hr = WcaGetRecordString(hRec, eqFileKey, &sczFileKey); + ExitOnFailure(hr, "Failed to get File table key."); + + hr = WcaGetRecordString(hRec, eqComponentKey, &sczComponentKey); + ExitOnFailure(hr, "Failed to get Component table key."); + + // we need to know if the component's being installed, uninstalled, or reinstalled + WCA_TODO todo = WcaGetComponentToDo(sczComponentKey); + if (WCA_TODO_INSTALL == todo || WCA_TODO_REINSTALL == todo) + { + // turn the file key into the path to the target file + hr = StrAllocFormatted(&sczFormattedFile, L"[#%ls]", sczFileKey); + ExitOnFailure(hr, "Failed to format file string for file: %ls", sczFileKey); + hr = WcaGetFormattedString(sczFormattedFile, &sczFilePath); + ExitOnFailure(hr, "Failed to get path for file: %ls", sczFileKey); + + // extract binary to string + WCA_ENCODING encoding = WCA_ENCODING_UNKNOWN; + hr = WcaExtractBinaryToString(sczBinaryKey, &sczFileContent, &encoding); + ExitOnFailure(hr, "Failed to extract binary: %ls", sczBinaryKey); + + // format string + hr = WcaGetFormattedString(sczFileContent, &sczFormattedContent); + ExitOnFailure(hr, "Failed to format file content: %ls", sczFileContent); + + // write to deferred custom action data + hr = WcaWriteStringToCaData(sczFilePath, &sczExecCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for file: %ls", sczFilePath); + + hr = WcaWriteIntegerToCaData(encoding, &sczExecCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for encoding: %d", encoding); + + hr = WcaWriteStringToCaData(sczFormattedContent, &sczExecCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for file content: %ls", sczFilePath); + + // write to rollback custom action data + hr = WcaWriteStringToCaData(sczFilePath, &sczRollbackCustomActionData); + ExitOnFailure(hr, "Failed to write rollback custom action data for file: %ls", sczFilePath); + + hr = WcaWriteIntegerToCaData(encoding, &sczRollbackCustomActionData); + ExitOnFailure(hr, "Failed to write deferred custom action data for encoding: %d", encoding); + + hr = WcaWriteStringToCaData(sczFileContent, &sczRollbackCustomActionData); + ExitOnFailure(hr, "Failed to write rollback custom action data for file content: %ls", sczFilePath); + } + } + + // reaching the end of the list is actually a good thing, not an error + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occurred while processing Wix4FormatFile table"); + + // schedule deferred CAs if there's anything to do + if (sczRollbackCustomActionData && *sczRollbackCustomActionData) + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); + ExitOnFailure(hr, "Failed to schedule RollbackFormatFiles"); + } + + if (sczExecCustomActionData && *sczExecCustomActionData) + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); + ExitOnFailure(hr, "Failed to schedule ExecFormatFiles"); + } + +LExit: + return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} + + +// +// WixExecFormatFiles - deferred and rollback CAs to write formatted files +// +extern "C" UINT __stdcall WixExecFormatFiles( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PSCZ sczCustomActionData; + LPWSTR pwz = NULL; + PSCZ sczFilePath; + PSCZ sczFileContent; + LPSTR psz = NULL; + + // initialize + hr = WcaInitialize(hInstall, "WixExecFormatFiles"); + ExitOnFailure(hr, "Failed to initialize for WixExecFormatFiles."); + + hr = WcaGetProperty(L"CustomActionData", &sczCustomActionData); + ExitOnFailure(hr, "Failed to get CustomActionData."); +#ifdef _DEBUG + WcaLog(LOGMSG_STANDARD, "CustomActionData: %ls", sczCustomActionData); +#endif + + // loop through all the passed in data + pwz = sczCustomActionData; + while (pwz && *pwz) + { + // extract the custom action data + hr = WcaReadStringFromCaData(&pwz, &sczFilePath); + ExitOnFailure(hr, "Failed to read file path from custom action data"); + + WCA_ENCODING encoding = WCA_ENCODING_UNKNOWN; + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&encoding)); + ExitOnFailure(hr, "Failed to read encoding from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &sczFileContent); + ExitOnFailure(hr, "Failed to read file content from custom action data"); + + // re-encode content + LPCBYTE pbData = NULL; + size_t cbData = 0; + switch (encoding) + { + case WCA_ENCODING_UTF_16: + pbData = reinterpret_cast(LPCWSTR(sczFileContent)); + cbData = lstrlenW(sczFileContent) * sizeof(WCHAR); + break; + + case WCA_ENCODING_UTF_8: + hr = StrAnsiAllocString(&psz, sczFileContent, 0, CP_UTF8); + ExitOnFailure(hr, "Failed to convert Unicode to UTF-8."); + pbData = reinterpret_cast(psz); + + hr = ::StringCbLengthA(psz, STRSAFE_MAX_CCH, &cbData); + ExitOnFailure(hr, "Failed to count UTF-8 bytes."); + break; + + case WCA_ENCODING_ANSI: + hr = StrAnsiAllocString(&psz, sczFileContent, 0, CP_ACP); + ExitOnFailure(hr, "Failed to convert Unicode to ANSI."); + pbData = reinterpret_cast(psz); + + hr = ::StringCbLengthA(psz, STRSAFE_MAX_CCH, &cbData); + ExitOnFailure(hr, "Failed to count UTF-8 bytes."); + break; + + default: + break; + } + +#ifdef _DEBUG + WcaLog(LOGMSG_STANDARD, "File: %ls", sczCustomActionData); + WcaLog(LOGMSG_STANDARD, "Content: %ls", sczFileContent); +#endif + + // write file and preserve modified time + FILETIME filetime; + + hr = FileGetTime(sczFilePath, NULL, NULL, &filetime); + ExitOnFailure(hr, "Failed to get modified time of file : %ls", sczFilePath); + + hr = FileWrite(sczFilePath, FILE_ATTRIBUTE_NORMAL, pbData, cbData, NULL); + ExitOnFailure(hr, "Failed to write file content: %ls", sczFilePath); + + hr = FileSetTime(sczFilePath, NULL, NULL, &filetime); + ExitOnFailure(hr, "Failed to set modified time of file : %ls", sczFilePath); + + // Tick the progress bar + hr = WcaProgressMessage(COST_FILEFORMATTING, FALSE); + ExitOnFailure(hr, "Failed to tick progress bar for file: %ls", sczFilePath); + } + +LExit: + ReleaseStr(psz); + + return WcaFinalize(er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} diff --git a/src/ext/Util/ca/OsInfo.cpp b/src/ext/Util/ca/OsInfo.cpp new file mode 100644 index 00000000..4783673e --- /dev/null +++ b/src/ext/Util/ca/OsInfo.cpp @@ -0,0 +1,487 @@ +// 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" + +// constants we'll pick up from later SDKs +#define SM_TABLETPC 86 +#define SM_MEDIACENTER 87 +#define SM_STARTER 88 +#define SM_SERVERR2 89 +#define VER_SUITE_WH_SERVER 0x00008000 + +/******************************************************************** +WixQueryOsInfo - entry point for WixQueryOsInfo custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties that identify OS information + and predefined directories +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsInfo( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + OSVERSIONINFOEXW ovix = {0}; + + hr = WcaInitialize(hInstall, "WixQueryOsInfo"); + ExitOnFailure(hr, "WixQueryOsInfo failed to initialize"); + + // identify product suites + ovix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); + #pragma warning(suppress: 4996) //TODO: use osutil + ::GetVersionExW(reinterpret_cast(&ovix)); + + if (VER_SUITE_SMALLBUSINESS == (ovix.wSuiteMask & VER_SUITE_SMALLBUSINESS)) + { + WcaSetIntProperty(L"WIX_SUITE_SMALLBUSINESS", 1); + } + + if (VER_SUITE_ENTERPRISE == (ovix.wSuiteMask & VER_SUITE_ENTERPRISE)) + { + WcaSetIntProperty(L"WIX_SUITE_ENTERPRISE", 1); + } + + if (VER_SUITE_BACKOFFICE == (ovix.wSuiteMask & VER_SUITE_BACKOFFICE)) + { + WcaSetIntProperty(L"WIX_SUITE_BACKOFFICE", 1); + } + + if (VER_SUITE_COMMUNICATIONS == (ovix.wSuiteMask & VER_SUITE_COMMUNICATIONS)) + { + WcaSetIntProperty(L"WIX_SUITE_COMMUNICATIONS", 1); + } + + if (VER_SUITE_TERMINAL == (ovix.wSuiteMask & VER_SUITE_TERMINAL)) + { + WcaSetIntProperty(L"WIX_SUITE_TERMINAL", 1); + } + + if (VER_SUITE_SMALLBUSINESS_RESTRICTED == (ovix.wSuiteMask & VER_SUITE_SMALLBUSINESS_RESTRICTED)) + { + WcaSetIntProperty(L"WIX_SUITE_SMALLBUSINESS_RESTRICTED", 1); + } + + if (VER_SUITE_EMBEDDEDNT == (ovix.wSuiteMask & VER_SUITE_EMBEDDEDNT)) + { + WcaSetIntProperty(L"WIX_SUITE_EMBEDDEDNT", 1); + } + + if (VER_SUITE_DATACENTER == (ovix.wSuiteMask & VER_SUITE_DATACENTER)) + { + WcaSetIntProperty(L"WIX_SUITE_DATACENTER", 1); + } + + if (VER_SUITE_SINGLEUSERTS == (ovix.wSuiteMask & VER_SUITE_SINGLEUSERTS)) + { + WcaSetIntProperty(L"WIX_SUITE_SINGLEUSERTS", 1); + } + + if (VER_SUITE_PERSONAL == (ovix.wSuiteMask & VER_SUITE_PERSONAL)) + { + WcaSetIntProperty(L"WIX_SUITE_PERSONAL", 1); + } + + if (VER_SUITE_BLADE == (ovix.wSuiteMask & VER_SUITE_BLADE)) + { + WcaSetIntProperty(L"WIX_SUITE_BLADE", 1); + } + + if (VER_SUITE_EMBEDDED_RESTRICTED == (ovix.wSuiteMask & VER_SUITE_EMBEDDED_RESTRICTED)) + { + WcaSetIntProperty(L"WIX_SUITE_EMBEDDED_RESTRICTED", 1); + } + + if (VER_SUITE_SECURITY_APPLIANCE == (ovix.wSuiteMask & VER_SUITE_SECURITY_APPLIANCE)) + { + WcaSetIntProperty(L"WIX_SUITE_SECURITY_APPLIANCE", 1); + } + + if (VER_SUITE_STORAGE_SERVER == (ovix.wSuiteMask & VER_SUITE_STORAGE_SERVER)) + { + WcaSetIntProperty(L"WIX_SUITE_STORAGE_SERVER", 1); + } + + if (VER_SUITE_COMPUTE_SERVER == (ovix.wSuiteMask & VER_SUITE_COMPUTE_SERVER)) + { + WcaSetIntProperty(L"WIX_SUITE_COMPUTE_SERVER", 1); + } + + if (VER_SUITE_WH_SERVER == (ovix.wSuiteMask & VER_SUITE_WH_SERVER)) + { + WcaSetIntProperty(L"WIX_SUITE_WH_SERVER", 1); + } + + // only for XP and later + if (5 < ovix.dwMajorVersion || (5 == ovix.dwMajorVersion && 0 < ovix.dwMinorVersion)) + { + if (::GetSystemMetrics(SM_SERVERR2)) + { + WcaSetIntProperty(L"WIX_SUITE_SERVERR2", 1); + } + + if (::GetSystemMetrics(SM_MEDIACENTER)) + { + WcaSetIntProperty(L"WIX_SUITE_MEDIACENTER", 1); + } + + if (::GetSystemMetrics(SM_STARTER)) + { + WcaSetIntProperty(L"WIX_SUITE_STARTER", 1); + } + + if (::GetSystemMetrics(SM_TABLETPC)) + { + WcaSetIntProperty(L"WIX_SUITE_TABLETPC", 1); + } + } + +LExit: + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + +/******************************************************************** +WixQueryOsDirs - entry point for WixQueryOsDirs custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties that identify predefined directories +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsDirs( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQueryOsDirs"); + ExitOnFailure(hr, "WixQueryOsDirs failed to initialize"); + + // get the paths of the CSIDLs that represent real paths and for which MSI + // doesn't yet have standard folder properties + WCHAR path[MAX_PATH]; + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_ADMINTOOLS, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_ADMINTOOLS", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_ALTSTARTUP, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_ALTSTARTUP", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_CDBURN_AREA, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_CDBURN_AREA", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_ADMINTOOLS, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_ADMINTOOLS", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_ALTSTARTUP, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_ALTSTARTUP", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_DOCUMENTS", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_FAVORITES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_MUSIC, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_MUSIC", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_PICTURES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_PICTURES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COMMON_VIDEO, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COMMON_VIDEO", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_COOKIES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_COOKIES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_DESKTOP", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_HISTORY, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_HISTORY", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_INTERNET_CACHE, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_INTERNET_CACHE", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYMUSIC, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_MYMUSIC", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_MYPICTURES", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_MYVIDEO, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_MYVIDEO", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_NETHOOD, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_NETHOOD", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_PERSONAL", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PRINTHOOD, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_PRINTHOOD", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_PROFILE", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_RECENT", path); + } + + if (ERROR_SUCCESS == ::SHGetFolderPathW(NULL, CSIDL_RESOURCES, NULL, SHGFP_TYPE_CURRENT, path)) + { + WcaSetProperty(L"WIX_DIR_RESOURCES", path); + } + +LExit: + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** +SetPropertyWellKnownSID + + Set a property with the localized name of a well known windows SID +********************************************************************/ +static HRESULT SetPropertyWellKnownSID( + __in WELL_KNOWN_SID_TYPE sidType, + __in LPCWSTR wzPropertyName, + __in BOOL fIncludeDomainName + ) +{ + HRESULT hr = S_OK; + PSID psid = NULL; + WCHAR wzRefDomain[MAX_PATH] = {0}; + SID_NAME_USE nameUse; + DWORD refSize = MAX_PATH; + WCHAR wzName[MAX_PATH] = {0}; + LPWSTR pwzPropertyValue = NULL; + DWORD size = MAX_PATH; + + hr = AclGetWellKnownSid(sidType, &psid); + ExitOnFailure(hr, "Failed to get SID; skipping account %ls", wzPropertyName); + + if (!::LookupAccountSidW(NULL, psid, wzName, &size, wzRefDomain, &refSize, &nameUse)) + { + ExitWithLastError(hr, "Failed to look up account for SID; skipping account %ls.", wzPropertyName); + } + + if (fIncludeDomainName) + { + hr = StrAllocFormatted(&pwzPropertyValue, L"%s\\%s", wzRefDomain, wzName); + ExitOnFailure(hr, "Failed to format property value"); + + hr = WcaSetProperty(wzPropertyName, pwzPropertyValue); + ExitOnFailure(hr, "Failed write domain\\name property"); + } + else + { + hr = WcaSetProperty(wzPropertyName, wzName); + ExitOnFailure(hr, "Failed write to name-only property"); + } + +LExit: + if (NULL != psid) + { + ::LocalFree(psid); + } + ReleaseStr(pwzPropertyValue); + return hr; +} + +/******************************************************************** +WixQueryOsWellKnownSID - entry point for WixQueryOsWellKnownSID custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties with the localized names of built-in + Windows Security IDs +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsWellKnownSID( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQueryOsWellKnownSID"); + ExitOnFailure(hr, "WixQueryOsWellKnownSID failed to initialize"); + + SetPropertyWellKnownSID(WinLocalSystemSid, L"WIX_ACCOUNT_LOCALSYSTEM", TRUE); + SetPropertyWellKnownSID(WinLocalServiceSid, L"WIX_ACCOUNT_LOCALSERVICE", TRUE); + SetPropertyWellKnownSID(WinNetworkServiceSid, L"WIX_ACCOUNT_NETWORKSERVICE", TRUE); + SetPropertyWellKnownSID(WinBuiltinAdministratorsSid, L"WIX_ACCOUNT_ADMINISTRATORS", TRUE); + SetPropertyWellKnownSID(WinBuiltinUsersSid, L"WIX_ACCOUNT_USERS", TRUE); + SetPropertyWellKnownSID(WinBuiltinGuestsSid, L"WIX_ACCOUNT_GUESTS", TRUE); + SetPropertyWellKnownSID(WinBuiltinPerfLoggingUsersSid, L"WIX_ACCOUNT_PERFLOGUSERS", TRUE); + SetPropertyWellKnownSID(WinBuiltinPerfLoggingUsersSid, L"WIX_ACCOUNT_PERFLOGUSERS_NODOMAIN", FALSE); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/******************************************************************** +DetectWDDMDriver + + Set a property if the driver on the machine is a WDDM driver. One + reliable way to detect the presence of a WDDM driver is to try and + use the Direct3DCreate9Ex() function. This method attempts that + then sets the property appropriately. +********************************************************************/ +static HRESULT DetectWDDMDriver() +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + + // Manually load the d3d9.dll library. If the library couldn't be loaded then we obviously won't be able + // to try calling the function so just return. + hr = LoadSystemLibrary(L"d3d9.dll", &hModule); + if (E_MODNOTFOUND == hr) + { + TraceError(hr, "Unable to load DirectX APIs, skipping WDDM driver check."); + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to the load the existing DirectX APIs."); + + // Obtain the address of the Direct3DCreate9Ex function. If this fails we know it isn't a WDDM + // driver so just exit. + const void* Direct3DCreate9ExPtr = ::GetProcAddress(hModule, "Direct3DCreate9Ex"); + ExitOnNull(Direct3DCreate9ExPtr, hr, S_OK, "Unable to load Direct3DCreateEx function, so the driver is not a WDDM driver."); + + // At this point we know it's a WDDM driver so set the property. + hr = WcaSetIntProperty(L"WIX_WDDM_DRIVER_PRESENT", 1); + ExitOnFailure(hr, "Failed write property"); + +LExit: + if (NULL != hModule) + { + FreeLibrary(hModule); + } + + return hr; +} + +/******************************************************************** +DetectIsCompositionEnabled + + Set a property based on the return value of DwmIsCompositionEnabled(). +********************************************************************/ +static HRESULT DetectIsCompositionEnabled() +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + BOOL compositionState = false; + + // Manually load the d3d9.dll library. If the library can't load it's likely because we are not on a Vista + // OS. Just return ok, and the property won't get set. + hr = LoadSystemLibrary(L"dwmapi.dll", &hModule); + if (E_MODNOTFOUND == hr) + { + TraceError(hr, "Unable to load Vista desktop window manager APIs, skipping Composition Enabled check."); + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to load the existing window manager APIs."); + + // If for some reason we can't get the function pointer that's ok, just return. + typedef HRESULT (WINAPI *DWMISCOMPOSITIONENABLEDPTR)(BOOL*); + DWMISCOMPOSITIONENABLEDPTR DwmIsCompositionEnabledPtr = (DWMISCOMPOSITIONENABLEDPTR)::GetProcAddress(hModule, "DwmIsCompositionEnabled"); + ExitOnNull(hModule, hr, S_OK, "Unable to obtain function information, skipping Composition Enabled check."); + + hr = DwmIsCompositionEnabledPtr(&compositionState); + ExitOnFailure(hr, "Failed to retrieve Composition state"); + + if (compositionState) + { + hr = WcaSetIntProperty(L"WIX_DWM_COMPOSITION_ENABLED", 1); + ExitOnFailure(hr, "Failed write property"); + } + +LExit: + if (NULL != hModule) + { + FreeLibrary(hModule); + } + return hr; +} + +/******************************************************************** +WixQueryOsDriverInfo - entry point for WixQueryOsDriverInfo custom action + + Called as Type 1 custom action (DLL from the Binary table) from + Windows Installer to set properties about drivers installed on + the target machine +********************************************************************/ +extern "C" UINT __stdcall WixQueryOsDriverInfo( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQueryOsDriverInfo"); + ExitOnFailure(hr, "WixQueryOsDriverInfo failed to initialize"); + + // Detect the WDDM driver status + hr = DetectWDDMDriver(); + ExitOnFailure(hr, "Failed to detect WIX_WDDM_DRIVER_PRESENT"); + + // Detect whether composition is enabled + hr = DetectIsCompositionEnabled(); + ExitOnFailure(hr, "Failed to detect WIX_DWM_COMPOSITION_ENABLED"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/RemoveFoldersEx.cpp b/src/ext/Util/ca/RemoveFoldersEx.cpp new file mode 100644 index 00000000..cbc7f4bb --- /dev/null +++ b/src/ext/Util/ca/RemoveFoldersEx.cpp @@ -0,0 +1,243 @@ +// 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" + +LPCWSTR vcsRemoveFolderExQuery = + L"SELECT `Wix4RemoveFolderEx`, `Component_`, `Property`, `InstallMode`, `WixRemoveFolderEx`.`Condition`, `Component`.`Attributes`" + L"FROM `Wix4RemoveFolderEx``,`Component` " + L"WHERE `Wix4RemoveFolderEx`.`Component_`=`Component`.`Component`"; +enum eRemoveFolderExQuery { rfqId = 1, rfqComponent, rfqProperty, rfqMode, rfqCondition, rfqComponentAttributes }; + +static HRESULT RecursePath( + __in_z LPCWSTR wzPath, + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzComponent, + __in_z LPCWSTR wzProperty, + __in int iMode, + __in BOOL fDisableWow64Redirection, + __inout DWORD* pdwCounter, + __inout MSIHANDLE* phTable, + __inout MSIHANDLE* phColumns + ) +{ + HRESULT hr = S_OK; + DWORD er; + LPWSTR sczSearch = NULL; + LPWSTR sczProperty = NULL; + HANDLE hFind = INVALID_HANDLE_VALUE; + WIN32_FIND_DATAW wfd; + LPWSTR sczNext = NULL; + + if (fDisableWow64Redirection) + { + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); + } + + // First recurse down to all the child directories. + hr = StrAllocFormatted(&sczSearch, L"%s*", wzPath); + ExitOnFailure(hr, "Failed to allocate file search string in path: %S", wzPath); + + hFind = ::FindFirstFileW(sczSearch, &wfd); + if (INVALID_HANDLE_VALUE == hFind) + { + er = ::GetLastError(); + if (ERROR_PATH_NOT_FOUND == er) + { + WcaLog(LOGMSG_STANDARD, "Search path not found: %ls; skipping", sczSearch); + ExitFunction1(hr = S_FALSE); + } + else + { + hr = HRESULT_FROM_WIN32(er); + } + ExitOnFailure(hr, "Failed to find all files in path: %S", wzPath); + } + + do + { + // Skip files and the dot directories. + if (FILE_ATTRIBUTE_DIRECTORY != (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || L'.' == wfd.cFileName[0] && (L'\0' == wfd.cFileName[1] || (L'.' == wfd.cFileName[1] && L'\0' == wfd.cFileName[2]))) + { + continue; + } + + hr = StrAllocFormatted(&sczNext, L"%s%s\\", wzPath, wfd.cFileName); + ExitOnFailure(hr, "Failed to concat filename '%S' to string: %S", wfd.cFileName, wzPath); + + // Don't re-disable redirection; if it was necessary, we've already done it. + hr = RecursePath(sczNext, wzId, wzComponent, wzProperty, iMode, FALSE, pdwCounter, phTable, phColumns); + ExitOnFailure(hr, "Failed to recurse path: %S", sczNext); + } while (::FindNextFileW(hFind, &wfd)); + + er = ::GetLastError(); + if (ERROR_NO_MORE_FILES == er) + { + hr = S_OK; + } + else + { + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed while looping through files in directory: %S", wzPath); + } + + // Finally, set a property that points at our path. + hr = StrAllocFormatted(&sczProperty, L"_%s_%u", wzProperty, *pdwCounter); + ExitOnFailure(hr, "Failed to allocate Property for RemoveFile table with property: %S.", wzProperty); + + ++(*pdwCounter); + + hr = WcaSetProperty(sczProperty, wzPath); + ExitOnFailure(hr, "Failed to set Property: %S with path: %S", sczProperty, wzPath); + + // Add the row to remove any files and another row to remove the folder. + hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFiles", wzComponent, L"*.*", sczProperty, iMode); + ExitOnFailure(hr, "Failed to add row to remove all files for Wix4RemoveFolderEx row: %ls under path: %ls", wzId, wzPath); + + hr = WcaAddTempRecord(phTable, phColumns, L"RemoveFile", NULL, 1, 5, L"RfxFolder", wzComponent, NULL, sczProperty, iMode); + ExitOnFailure(hr, "Failed to add row to remove folder for Wix4RemoveFolderEx row: %ls under path: %ls", wzId, wzPath); + +LExit: + if (INVALID_HANDLE_VALUE != hFind) + { + ::FindClose(hFind); + } + + if (fDisableWow64Redirection) + { + WcaRevertWow64FSRedirection(); + } + + ReleaseStr(sczNext); + ReleaseStr(sczProperty); + ReleaseStr(sczSearch); + return hr; +} + +extern "C" UINT WINAPI WixRemoveFoldersEx( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixRemoveFoldersEx"); + + HRESULT hr = S_OK; + PMSIHANDLE hView; + PMSIHANDLE hRec; + LPWSTR sczId = NULL; + LPWSTR sczComponent = NULL; + LPWSTR sczProperty = NULL; + LPWSTR sczCondition = NULL; + LPWSTR sczPath = NULL; + LPWSTR sczExpandedPath = NULL; + int iMode = 0; + int iComponentAttributes; + BOOL f64BitComponent = FALSE; + DWORD dwCounter = 0; + DWORD_PTR cchLen = 0; + MSIHANDLE hTable = NULL; + MSIHANDLE hColumns = NULL; + + hr = WcaInitialize(hInstall, "WixRemoveFoldersEx"); + ExitOnFailure(hr, "Failed to initialize WixRemoveFoldersEx."); + + WcaInitializeWow64(); + + // anything to do? + if (S_OK != WcaTableExists(L"Wix4RemoveFolderEx")) + { + WcaLog(LOGMSG_STANDARD, "Wix4RemoveFolderEx table doesn't exist, so there are no folders to remove."); + ExitFunction(); + } + + // query and loop through all the remove folders exceptions + hr = WcaOpenExecuteView(vcsRemoveFolderExQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4RemoveFolderEx table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, rfqId, &sczId); + ExitOnFailure(hr, "Failed to get remove folder identity."); + + hr = WcaGetRecordString(hRec, rfqCondition, &sczCondition); + ExitOnFailure(hr, "Failed to get remove folder condition."); + + if (sczCondition && *sczCondition) + { + MSICONDITION condition = ::MsiEvaluateConditionW(hInstall, sczCondition); + if (MSICONDITION_TRUE == condition) + { + WcaLog(LOGMSG_STANDARD, "True condition for row %S: %S; processing.", sczId, sczCondition); + } + else + { + WcaLog(LOGMSG_STANDARD, "False or invalid condition for row %S: %S; skipping.", sczId, sczCondition); + continue; + } + } + + hr = WcaGetRecordString(hRec, rfqComponent, &sczComponent); + ExitOnFailure(hr, "Failed to get remove folder component."); + + hr = WcaGetRecordString(hRec, rfqProperty, &sczProperty); + ExitOnFailure(hr, "Failed to get remove folder property."); + + hr = WcaGetRecordInteger(hRec, rfqMode, &iMode); + ExitOnFailure(hr, "Failed to get remove folder mode"); + + hr = WcaGetProperty(sczProperty, &sczPath); + ExitOnFailure(hr, "Failed to resolve remove folder property: %S for row: %S", sczProperty, sczId); + + hr = WcaGetRecordInteger(hRec, rfqComponentAttributes, &iComponentAttributes); + ExitOnFailure(hr, "failed to get component attributes for row: %ls", sczId); + + f64BitComponent = iComponentAttributes & msidbComponentAttributes64bit; + + // fail early if the property isn't set as you probably don't want your installers trying to delete SystemFolder + // StringCchLengthW succeeds only if the string is zero characters plus 1 for the terminating null + hr = ::StringCchLengthW(sczPath, 1, reinterpret_cast(&cchLen)); + if (SUCCEEDED(hr)) + { + ExitOnFailure(hr = E_INVALIDARG, "Missing folder property: %S for row: %S", sczProperty, sczId); + } + + hr = PathExpand(&sczExpandedPath, sczPath, PATH_EXPAND_ENVIRONMENT); + ExitOnFailure(hr, "Failed to expand path: %S for row: %S", sczPath, sczId); + + hr = PathBackslashTerminate(&sczExpandedPath); + ExitOnFailure(hr, "Failed to backslash-terminate path: %S", sczExpandedPath); + + WcaLog(LOGMSG_STANDARD, "Recursing path: %S for row: %S.", sczExpandedPath, sczId); + hr = RecursePath(sczExpandedPath, sczId, sczComponent, sczProperty, iMode, f64BitComponent, &dwCounter, &hTable, &hColumns); + ExitOnFailure(hr, "Failed while navigating path: %S for row: %S", sczPath, sczId); + } + + // reaching the end of the list is actually a good thing, not an error + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing Wix4RemoveFolderEx table"); + +LExit: + WcaFinalizeWow64(); + + if (hColumns) + { + ::MsiCloseHandle(hColumns); + } + + if (hTable) + { + ::MsiCloseHandle(hTable); + } + + ReleaseStr(sczExpandedPath); + ReleaseStr(sczPath); + ReleaseStr(sczProperty); + ReleaseStr(sczComponent); + ReleaseStr(sczCondition); + ReleaseStr(sczId); + + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/RemoveRegistryKeysEx.cpp b/src/ext/Util/ca/RemoveRegistryKeysEx.cpp new file mode 100644 index 00000000..478c0779 --- /dev/null +++ b/src/ext/Util/ca/RemoveRegistryKeysEx.cpp @@ -0,0 +1,114 @@ +// 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" + +LPCWSTR vcsRemoveRegistryKeyExQuery = + L"SELECT `Wix4RemoveRegistryKeyEx`, `Component_`, `Root`, `Key`, `InstallMode`, `Condition` FROM `Wix4RemoveRegistryKeyEx`"; +enum eRemoveRegistryKeyExQuery { rrxqId = 1, rrxqComponent, rrxqRoot, rrxqKey, rrxqMode, rrxqCondition }; + +extern "C" UINT WINAPI WixRemoveRegistryKeysEx( + __in MSIHANDLE hInstall +) +{ + //AssertSz(FALSE, "debug WixRemoveRegistryKeyEx"); + + HRESULT hr = S_OK; + PMSIHANDLE hView; + PMSIHANDLE hRec; + LPWSTR sczId = NULL; + LPWSTR sczComponent = NULL; + LPWSTR sczCondition = NULL; + LPWSTR sczKey = NULL; + int iRoot = 0; + int iMode = 0; + MSIHANDLE hTable = NULL; + MSIHANDLE hColumns = NULL; + + hr = WcaInitialize(hInstall, __FUNCTION__); + ExitOnFailure(hr, "Failed to initialize " __FUNCTION__); + + // anything to do? + if (S_OK != WcaTableExists(L"Wix4RemoveRegistryKeyEx")) + { + WcaLog(LOGMSG_STANDARD, "Wix4RemoveRegistryKeyEx table doesn't exist, so there are no registry keys to remove."); + ExitFunction(); + } + + hr = WcaOpenExecuteView(vcsRemoveRegistryKeyExQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4RemoveRegistryKeyEx table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, rrxqId, &sczId); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx identity."); + + hr = WcaGetRecordString(hRec, rrxqCondition, &sczCondition); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx condition."); + + if (sczCondition && *sczCondition) + { + MSICONDITION condition = ::MsiEvaluateConditionW(hInstall, sczCondition); + if (MSICONDITION_TRUE == condition) + { + WcaLog(LOGMSG_STANDARD, "True condition for row %S: %S; processing.", sczId, sczCondition); + } + else + { + WcaLog(LOGMSG_STANDARD, "False or invalid condition for row %S: %S; skipping.", sczId, sczCondition); + continue; + } + } + + hr = WcaGetRecordString(hRec, rrxqComponent, &sczComponent); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx component."); + + hr = WcaGetRecordInteger(hRec, rrxqRoot, &iRoot); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx root."); + + hr = WcaGetRecordString(hRec, rrxqKey, &sczKey); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx key."); + + hr = WcaGetRecordInteger(hRec, rrxqMode, &iMode); + ExitOnFailure(hr, "Failed to get Wix4RemoveRegistryKeyEx mode."); + + switch (iMode) + { + case 1: // remove on install + WcaLog(LOGMSG_STANDARD, "Adding RemoveRegistry row: %ls/%d/%ls/-/%ls", sczId, iRoot, sczKey, sczComponent); + hr = WcaAddTempRecord(&hTable, &hColumns, L"RemoveRegistry", NULL, 0, 5, sczId, iRoot, sczKey, L"-", sczComponent); + ExitOnFailure(hr, "Failed to add RemoveRegistry row for remove-on-install Wix4RemoveRegistryKeyEx row: %ls:", sczId); + break; + case 2: // remove on uninstall + WcaLog(LOGMSG_STANDARD, "Adding Registry row: %ls/%d/%ls/-/null/%ls", sczId, iRoot, sczKey, sczComponent); + hr = WcaAddTempRecord(&hTable, &hColumns, L"Registry", NULL, 0, 6, sczId, iRoot, sczKey, L"-", NULL, sczComponent); + ExitOnFailure(hr, "Failed to add Registry row for remove-on-uninstall Wix4RemoveRegistryKeyEx row: %ls:", sczId); + break; + } + } + + // reaching the end of the list is actually a good thing, not an error + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing Wix4RemoveRegistryKeyEx table."); + +LExit: + if (hColumns) + { + ::MsiCloseHandle(hColumns); + } + + if (hTable) + { + ::MsiCloseHandle(hTable); + } + + ReleaseStr(sczKey); + ReleaseStr(sczComponent); + ReleaseStr(sczCondition); + ReleaseStr(sczId); + + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/RestartManager.cpp b/src/ext/Util/ca/RestartManager.cpp new file mode 100644 index 00000000..c31819c1 --- /dev/null +++ b/src/ext/Util/ca/RestartManager.cpp @@ -0,0 +1,185 @@ +// 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" +#include + +// Include space for the terminating null. +#define CCH_SESSION_KEY CCH_RM_SESSION_KEY + 1 + +enum eRmuResourceType +{ + etInvalid, + etFilename, + etApplication, + etServiceName, + + // Mask types from Attributes. + etTypeMask = 0xf, +}; + +LPCWSTR vcsRestartResourceQuery = + L"SELECT `Wix4RestartResource`.`Wix4RestartResource`, `Wix4RestartResource`.`Component_`, `Wix4RestartResource`.`Resource`, `Wix4RestartResource`.`Attributes` " + L"FROM `Wix4RestartResource`"; +enum eRestartResourceQuery { rrqRestartResource = 1, rrqComponent, rrqResource, rrqAttributes }; + +/******************************************************************** +WixRegisterRestartResources - Immediate CA to register resources with RM. + +Enumerates components before InstallValidate and registers resources +to be restarted by Restart Manager if the component action +is anything other than None. + +Do not disable file system redirection. + +********************************************************************/ +extern "C" UINT __stdcall WixRegisterRestartResources( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR wzSessionKey = NULL; + size_t cchSessionKey = 0; + PRMU_SESSION pSession = NULL; + + LPWSTR wzRestartResource = NULL; + LPWSTR wzComponent = NULL; + LPWSTR wzResource = NULL; + int iAttributes = NULL; + BOOL fIsComponentNull = FALSE; + WCA_TODO todo = WCA_TODO_UNKNOWN; + int iType = etInvalid; + + hr = WcaInitialize(hInstall, "WixRegisterRestartResources"); + ExitOnFailure(hr, "Failed to initialize."); + + // Skip if the table doesn't exist. + if (S_OK != WcaTableExists(L"Wix4RestartResource")) + { + WcaLog(LOGMSG_STANDARD, "The Wix4RestartResource table does not exist; there are no resources to register with Restart Manager."); + ExitFunction(); + } + + // Get the existing Restart Manager session if available. + hr = WcaGetProperty(L"MsiRestartManagerSessionKey", &wzSessionKey); + ExitOnFailure(hr, "Failed to get the MsiRestartManagerSessionKey property."); + + hr = ::StringCchLengthW(wzSessionKey, CCH_SESSION_KEY, &cchSessionKey); + ExitOnFailure(hr, "Failed to get the MsiRestartManagerSessionKey string length."); + + // Skip if the property doesn't exist. + if (0 == cchSessionKey) + { + WcaLog(LOGMSG_STANDARD, "The MsiRestartManagerSessionKey property is not available to join."); + ExitFunction(); + } + + // Join the existing Restart Manager session if supported. + hr = RmuJoinSession(&pSession, wzSessionKey); + if (E_MODNOTFOUND == hr) + { + WcaLog(LOGMSG_STANDARD, "The Restart Manager is not supported on this platform. Skipping."); + ExitFunction1(hr = S_OK); + } + else if (FAILED(hr)) + { + WcaLog(LOGMSG_STANDARD, "Failed to join the existing Restart Manager session %ls.", wzSessionKey); + ExitFunction1(hr = S_OK); + } + + // Loop through each record in the table. + hr = WcaOpenExecuteView(vcsRestartResourceQuery, &hView); + ExitOnFailure(hr, "Failed to open a view on the RestartResource table."); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, rrqRestartResource, &wzRestartResource); + ExitOnFailure(hr, "Failed to get the RestartResource field value."); + + hr = WcaGetRecordString(hRec, rrqComponent, &wzComponent); + ExitOnFailure(hr, "Failed to get the Component_ field value."); + + hr = WcaGetRecordFormattedString(hRec, rrqResource, &wzResource); + ExitOnFailure(hr, "Failed to get the Resource formatted field value."); + + hr = WcaGetRecordInteger(hRec, rrqAttributes, &iAttributes); + ExitOnFailure(hr, "Failed to get the Attributes field value."); + + fIsComponentNull = ::MsiRecordIsNull(hRec, rrqComponent); + todo = WcaGetComponentToDo(wzComponent); + + // Only register resources for components that are null, or being installed, reinstalled, or uninstalled. + if (!fIsComponentNull && WCA_TODO_UNKNOWN == todo) + { + WcaLog(LOGMSG_VERBOSE, "Skipping resource %ls.", wzRestartResource); + continue; + } + + // Get the type from Attributes and add to the Restart Manager. + iType = iAttributes & etTypeMask; + switch (iType) + { + case etFilename: + WcaLog(LOGMSG_VERBOSE, "Registering file name %ls with the Restart Manager.", wzResource); + hr = RmuAddFile(pSession, wzResource); + ExitOnFailure(hr, "Failed to register the file name with the Restart Manager session."); + break; + + case etApplication: + WcaLog(LOGMSG_VERBOSE, "Registering process name %ls with the Restart Manager.", wzResource); + hr = RmuAddProcessesByName(pSession, wzResource); + if (E_NOTFOUND == hr) + { + // ERROR_ACCESS_DENIED was returned when trying to register this process. + // Since other instances may have been registered, log a message and continue the setup rather than failing. + WcaLog(LOGMSG_STANDARD, "The process, %ls, could not be registered with the Restart Manager (probably because the setup is not elevated and the process is in another user context). A reboot may be requested later.", wzResource); + hr = S_OK; + } + else + { + ExitOnFailure(hr, "Failed to register the process name with the Restart Manager session."); + } + break; + + case etServiceName: + WcaLog(LOGMSG_VERBOSE, "Registering service name %ls with the Restart Manager.", wzResource); + hr = RmuAddService(pSession, wzResource); + ExitOnFailure(hr, "Failed to register the service name with the Restart Manager session."); + break; + + default: + WcaLog(LOGMSG_VERBOSE, "The resource type %d for %ls is not supported and will not be registered.", iType, wzRestartResource); + break; + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failed while looping through all rows to register resources."); + + // Register the resources and unjoin the session. + hr = RmuEndSession(pSession); + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to register the resources with the Restart Manager."); + ExitFunction1(hr = S_OK); + } + +LExit: + ReleaseStr(wzRestartResource); + ReleaseStr(wzComponent); + ReleaseStr(wzResource); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/TouchFile.cpp b/src/ext/Util/ca/TouchFile.cpp new file mode 100644 index 00000000..e704f922 --- /dev/null +++ b/src/ext/Util/ca/TouchFile.cpp @@ -0,0 +1,308 @@ +// 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" + +LPCWSTR vcsTouchFileQuery = L"SELECT `Wix4TouchFile`, `Component_`, `Path`, `Attributes` FROM `Wix4TouchFile`"; +enum TOUCH_FILE_QUERY { tfqId = 1, tfqComponent, tfqPath, tfqTouchFileAttributes }; + +enum TOUCH_FILE_ATTRIBUTE +{ + TOUCH_FILE_ATTRIBUTE_ON_INSTALL = 0x01, + TOUCH_FILE_ATTRIBUTE_ON_REINSTALL = 0x02, + TOUCH_FILE_ATTRIBUTE_ON_UNINSTALL = 0x04, + TOUCH_FILE_ATTRIBUTE_64BIT = 0x10, + TOUCH_FILE_ATTRIBUTE_VITAL = 0x20 +}; + + +static BOOL SetExistingFileModifiedTime( + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzPath, + __in BOOL f64Bit, + __in FILETIME* pftModified + ) +{ + HRESULT hr = S_OK; + BOOL fReenableFileSystemRedirection = FALSE; + + if (f64Bit) + { + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Failed to disable 64-bit file system redirection to path: '%ls' for: %ls", wzPath, wzId); + + fReenableFileSystemRedirection = TRUE; + } + + hr = FileSetTime(wzPath, NULL, NULL, pftModified); + +LExit: + if (fReenableFileSystemRedirection) + { + WcaRevertWow64FSRedirection(); + } + + return SUCCEEDED(hr); +} + + +static HRESULT AddDataToCustomActionData( + __deref_inout_z LPWSTR* psczCustomActionData, + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzPath, + __in int iTouchFileAttributes, + __in FILETIME ftModified + ) +{ + HRESULT hr = S_OK; + + hr = WcaWriteStringToCaData(wzId, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file identity to custom action data."); + + hr = WcaWriteStringToCaData(wzPath, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file path to custom action data."); + + hr = WcaWriteIntegerToCaData(iTouchFileAttributes, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file attributes to custom action data."); + + hr = WcaWriteIntegerToCaData(ftModified.dwHighDateTime, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file high date/time to custom action data."); + + hr = WcaWriteIntegerToCaData(ftModified.dwLowDateTime, psczCustomActionData); + ExitOnFailure(hr, "Failed to add touch file low date/time to custom action data."); + +LExit: + return hr; +} + + +static BOOL TryGetExistingFileModifiedTime( + __in_z LPCWSTR wzId, + __in_z LPCWSTR wzPath, + __in BOOL f64Bit, + __inout FILETIME* pftModified + ) +{ + HRESULT hr = S_OK; + BOOL fReenableFileSystemRedirection = FALSE; + + if (f64Bit) + { + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Failed to disable 64-bit file system redirection to path: '%ls' for: %ls", wzPath, wzId); + + fReenableFileSystemRedirection = TRUE; + } + + hr = FileGetTime(wzPath, NULL, NULL, pftModified); + if (E_PATHNOTFOUND == hr || E_FILENOTFOUND == hr) + { + // If the file doesn't exist yet there is nothing to rollback (i.e. file will probably be removed during rollback), so + // keep the error code but don't log anything. + } + else if (FAILED(hr)) + { + WcaLog(LOGMSG_STANDARD, "Cannot access modified timestamp for file: '%ls' due to error: 0x%x. Continuing with out rollback for: %ls", wzPath, hr, wzId); + } + +LExit: + if (fReenableFileSystemRedirection) + { + WcaRevertWow64FSRedirection(); + } + + return SUCCEEDED(hr); +} + + +static HRESULT ProcessTouchFileTable( + __in BOOL fInstalling + ) +{ + HRESULT hr = S_OK; + + FILETIME ftModified = {}; + + PMSIHANDLE hView; + PMSIHANDLE hRec; + + LPWSTR sczId = NULL; + LPWSTR sczComponent = NULL; + int iTouchFileAttributes = 0; + LPWSTR sczPath = NULL; + + FILETIME ftRollbackModified = {}; + LPWSTR sczRollbackData = NULL; + LPWSTR sczExecuteData = NULL; + + if (S_OK != WcaTableExists(L"Wix4TouchFile")) + { + ExitFunction(); + } + + ::GetSystemTimeAsFileTime(&ftModified); + + hr = WcaOpenExecuteView(vcsTouchFileQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4TouchFile table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, tfqId, &sczId); + ExitOnFailure(hr, "Failed to get touch file identity."); + + hr = WcaGetRecordString(hRec, tfqComponent, &sczComponent); + ExitOnFailure(hr, "Failed to get touch file component for: %ls", sczId); + + hr = WcaGetRecordInteger(hRec, tfqTouchFileAttributes, &iTouchFileAttributes); + ExitOnFailure(hr, "Failed to get touch file attributes for: %ls", sczId); + + WCA_TODO todo = WcaGetComponentToDo(sczComponent); + + BOOL fOnInstall = fInstalling && WCA_TODO_INSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_INSTALL); + BOOL fOnReinstall = fInstalling && WCA_TODO_REINSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_REINSTALL); + BOOL fOnUninstall = !fInstalling && WCA_TODO_UNINSTALL == todo && (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_ON_UNINSTALL); + + if (fOnInstall || fOnReinstall || fOnUninstall) + { + hr = WcaGetRecordFormattedString(hRec, tfqPath, &sczPath); + ExitOnFailure(hr, "Failed to get touch file path for: %ls", sczId); + + if (TryGetExistingFileModifiedTime(sczId, sczPath, (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_64BIT), &ftRollbackModified)) + { + hr = AddDataToCustomActionData(&sczRollbackData, sczId, sczPath, iTouchFileAttributes, ftRollbackModified); + ExitOnFailure(hr, "Failed to add to rollback custom action data for: %ls", sczId); + } + + hr = AddDataToCustomActionData(&sczExecuteData, sczId, sczPath, iTouchFileAttributes, ftModified); + ExitOnFailure(hr, "Failed to add to execute custom action data for: %ls", sczId); + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing Wix4TouchFile table"); + + if (sczRollbackData) + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackTouchFile"), sczRollbackData, 0); + ExitOnFailure(hr, "Failed to schedule RollbackTouchFile"); + } + + if (sczExecuteData) + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecuteTouchFile"), sczExecuteData, 0); + ExitOnFailure(hr, "Failed to schedule ExecuteTouchFile"); + } + +LExit: + ReleaseStr(sczExecuteData); + ReleaseStr(sczRollbackData); + ReleaseStr(sczPath); + ReleaseStr(sczComponent); + ReleaseStr(sczId); + + return hr; +} + + +extern "C" UINT WINAPI WixTouchFileDuringInstall( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixTouchFileDuringInstall"); + + HRESULT hr = S_OK; + + hr = WcaInitialize(hInstall, "WixTouchFileDuringInstall"); + ExitOnFailure(hr, "Failed to initialize WixTouchFileDuringInstall."); + + hr = ProcessTouchFileTable(TRUE); + +LExit: + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +extern "C" UINT WINAPI WixTouchFileDuringUninstall( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug WixTouchFileDuringUninstall"); + + HRESULT hr = S_OK; + + hr = WcaInitialize(hInstall, "WixTouchFileDuringUninstall"); + ExitOnFailure(hr, "Failed to initialize WixTouchFileDuringUninstall."); + + hr = ProcessTouchFileTable(FALSE); + +LExit: + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +extern "C" UINT WINAPI WixExecuteTouchFile( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + + LPWSTR sczData = NULL; + LPWSTR pwz = NULL; + + LPWSTR sczId = NULL; + LPWSTR sczPath = NULL; + int iTouchFileAttributes = 0; + FILETIME ftModified = {}; + + hr = WcaInitialize(hInstall, "WixExecuteTouchFile"); + ExitOnFailure(hr, "Failed to initialize WixExecuteTouchFile."); + + hr = WcaGetProperty(L"CustomActionData", &sczData); + ExitOnFailure(hr, "Failed to get custom action data for WixExecuteTouchFile."); + + pwz = sczData; + + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &sczId); + ExitOnFailure(hr, "Failed to get touch file identity from custom action data."); + + hr = WcaReadStringFromCaData(&pwz, &sczPath); + ExitOnFailure(hr, "Failed to get touch file path from custom action data for: %ls", sczId); + + hr = WcaReadIntegerFromCaData(&pwz, &iTouchFileAttributes); + ExitOnFailure(hr, "Failed to get touch file attributes from custom action data for: %ls", sczId); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&ftModified.dwHighDateTime)); + ExitOnFailure(hr, "Failed to get touch file high date/time from custom action data for: %ls", sczId); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&ftModified.dwLowDateTime)); + ExitOnFailure(hr, "Failed to get touch file low date/time from custom action data for: %ls", sczId); + + hr = SetExistingFileModifiedTime(sczId, sczPath, (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_64BIT), &ftModified); + if (FAILED(hr)) + { + if (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_VITAL) + { + ExitOnFailure(hr, "Failed to touch file: '%ls' for: %ls", &sczPath, sczId); + } + else + { + WcaLog(LOGMSG_STANDARD, "Could not touch non-vital file: '%ls' for: %ls with error: 0x%x. Continuing...", sczPath, sczId, hr); + hr = S_OK; + } + } + } + +LExit: + ReleaseStr(sczPath); + ReleaseStr(sczId); + ReleaseStr(sczData); + + DWORD er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/XmlConfig.cpp b/src/ext/Util/ca/XmlConfig.cpp new file mode 100644 index 00000000..a1ec9d6f --- /dev/null +++ b/src/ext/Util/ca/XmlConfig.cpp @@ -0,0 +1,1130 @@ +// 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" + +#define XMLCONFIG_ELEMENT 0x00000001 +#define XMLCONFIG_VALUE 0x00000002 +#define XMLCONFIG_DOCUMENT 0x00000004 +#define XMLCONFIG_CREATE 0x00000010 +#define XMLCONFIG_DELETE 0x00000020 +#define XMLCONFIG_INSTALL 0x00000100 +#define XMLCONFIG_UNINSTALL 0x00000200 +#define XMLCONFIG_PRESERVE_MODIFIED 0x00001000 + +enum eXmlAction +{ + xaUnknown = 0, + xaOpenFile, + xaOpenFilex64, + xaWriteValue, + xaWriteDocument, + xaDeleteValue, + xaCreateElement, + xaDeleteElement, +}; + +enum eXmlPreserveDate +{ + xdDontPreserve = 0, + xdPreserve +}; + +LPCWSTR vcsXmlConfigQuery = + L"SELECT `Wix4XmlConfig`.`Wix4XmlConfig`, `Wix4XmlConfig`.`File`, `Wix4XmlConfig`.`ElementId`, `Wix4XmlConfig`.`ElementPath`, `Wix4XmlConfig`.`VerifyPath`, `Wix4XmlConfig`.`Name`, " + L"`Wix4XmlConfig`.`Value`, `Wix4XmlConfig`.`Flags`, `Wix4XmlConfig`.`Component_`, `Component`.`Attributes` " + L"FROM `Wix4XmlConfig`,`Component` WHERE `Wix4XmlConfig`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; +enum eXmlConfigQuery { xfqXmlConfig = 1, xfqFile, xfqElementId, xfqElementPath, xfqVerifyPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; + +struct XML_CONFIG_CHANGE +{ + WCHAR wzId[MAX_DARWIN_KEY + 1]; + + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + WCHAR wzFile[MAX_PATH]; + LPWSTR pwzElementId; + LPWSTR pwzElementPath; + LPWSTR pwzVerifyPath; + WCHAR wzName[MAX_DARWIN_COLUMN]; + LPWSTR pwzValue; + BOOL fInstalledFile; + + int iXmlFlags; + int iCompAttributes; + + XML_CONFIG_CHANGE* pxfcAdditionalChanges; + int cAdditionalChanges; + + XML_CONFIG_CHANGE* pxfcPrev; + XML_CONFIG_CHANGE* pxfcNext; +}; + +static HRESULT FreeXmlConfigChangeList( + __in_opt XML_CONFIG_CHANGE* pxfcList + ) +{ + HRESULT hr = S_OK; + + XML_CONFIG_CHANGE* pxfcDelete; + while(pxfcList) + { + pxfcDelete = pxfcList; + pxfcList = pxfcList->pxfcNext; + + if (pxfcDelete->pwzElementId) + { + hr = MemFree(pxfcDelete->pwzElementId); + ExitOnFailure(hr, "failed to free xml config element id in change list item"); + } + + if (pxfcDelete->pwzElementPath) + { + hr = MemFree(pxfcDelete->pwzElementPath); + ExitOnFailure(hr, "failed to free xml config element path in change list item"); + } + + if (pxfcDelete->pwzVerifyPath) + { + hr = MemFree(pxfcDelete->pwzVerifyPath); + ExitOnFailure(hr, "failed to free xml config verify path in change list item"); + } + + if (pxfcDelete->pwzValue) + { + hr = MemFree(pxfcDelete->pwzValue); + ExitOnFailure(hr, "failed to free xml config value in change list item"); + } + + hr = MemFree(pxfcDelete); + ExitOnFailure(hr, "failed to free xml config change list item"); + } + +LExit: + return hr; +} + +static HRESULT AddXmlConfigChangeToList( + __inout XML_CONFIG_CHANGE** ppxfcHead, + __inout XML_CONFIG_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + + XML_CONFIG_CHANGE* pxfc = static_cast(MemAlloc(sizeof(XML_CONFIG_CHANGE), TRUE)); + ExitOnNull(pxfc, hr, E_OUTOFMEMORY, "failed to allocate memory for new xml file change list element"); + + // Add it to the end of the list + if (NULL == *ppxfcHead) + { + *ppxfcHead = pxfc; + *ppxfcTail = pxfc; + } + else + { + Assert(*ppxfcTail && (*ppxfcTail)->pxfcNext == NULL); + (*ppxfcTail)->pxfcNext = pxfc; + pxfc->pxfcPrev = *ppxfcTail; + *ppxfcTail = pxfc; + } + +LExit: + return hr; +} + + +static HRESULT ReadXmlConfigTable( + __inout XML_CONFIG_CHANGE** ppxfcHead, + __inout XML_CONFIG_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR pwzData = NULL; + + // loop through all the xml configurations + hr = WcaOpenExecuteView(vcsXmlConfigQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4XmlConfig table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = AddXmlConfigChangeToList(ppxfcHead, ppxfcTail); + ExitOnFailure(hr, "failed to add xml file change to list"); + + // Get record Id + hr = WcaGetRecordString(hRec, xfqXmlConfig, &pwzData); + ExitOnFailure(hr, "failed to get Wix4XmlConfig record Id"); + hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); + ExitOnFailure(hr, "failed to copy Wix4XmlConfig record Id"); + + // Get component name + hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); + ExitOnFailure(hr, "failed to get component name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the component's state + if (pwzData && *pwzData) + { + hr = StringCchCopyW((*ppxfcTail)->wzComponent, countof((*ppxfcTail)->wzComponent), pwzData); + ExitOnFailure(hr, "failed to copy component id"); + + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), (*ppxfcTail)->wzComponent, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for component id"); + } + + // Get the xml file + hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); + ExitOnFailure(hr, "failed to get xml file for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); + ExitOnFailure(hr, "failed to copy xml file path"); + + // Figure out if the file is already on the machine or if it's being installed + hr = WcaGetRecordString(hRec, xfqFile, &pwzData); + ExitOnFailure(hr, "failed to get xml file for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + if (NULL != wcsstr(pwzData, L"[!") || NULL != wcsstr(pwzData, L"[#")) + { + (*ppxfcTail)->fInstalledFile = TRUE; + } + + // Get the Wix4XmlConfig table flags + hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); + ExitOnFailure(hr, "failed to get Wix4XmlConfig flags for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the Element Id + hr = WcaGetRecordFormattedString(hRec, xfqElementId, &(*ppxfcTail)->pwzElementId); + ExitOnFailure(hr, "failed to get Element Id for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the Element Path + hr = WcaGetRecordFormattedString(hRec, xfqElementPath, &(*ppxfcTail)->pwzElementPath); + ExitOnFailure(hr, "failed to get Element Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the Verify Path + hr = WcaGetRecordFormattedString(hRec, xfqVerifyPath, &(*ppxfcTail)->pwzVerifyPath); + ExitOnFailure(hr, "failed to get Verify Path for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + + // Get the name + hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); + ExitOnFailure(hr, "failed to get Name for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); + ExitOnFailure(hr, "failed to copy name of element"); + + // Get the value + hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); + ExitOnFailure(hr, "failed to get Value for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); + ExitOnFailure(hr, "failed to allocate buffer for value"); + + // Get the component attributes + hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); + ExitOnFailure(hr, "failed to get component attributes for Wix4XmlConfig: %ls", (*ppxfcTail)->wzId); + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to secure"); + +LExit: + ReleaseStr(pwzData); + + return hr; +} + +static HRESULT ProcessChanges( + __inout XML_CONFIG_CHANGE** ppxfcHead + ) +{ + Assert(ppxfcHead && *ppxfcHead); + HRESULT hr = S_OK; + + XML_CONFIG_CHANGE* pxfc = NULL; + XML_CONFIG_CHANGE* pxfcNext = NULL; + XML_CONFIG_CHANGE* pxfcCheck = NULL; + int cAdditionalChanges = 0; + XML_CONFIG_CHANGE* pxfcLast = NULL; + + // If there's only one item in the list, none of this matters + if (pxfc && !pxfc->pxfcNext) + { + ExitFunction(); + } + + // Loop through the list + pxfc = *ppxfcHead; + while (pxfc) + { + // Keep track of where our next spot will be since our current node may be moved + pxfcNext = pxfc->pxfcNext; + + // With each node, check to see if it's element path matches the Id of some other node in the list + pxfcCheck = *ppxfcHead; + while (pxfcCheck) + { + if (pxfc->pwzElementId) + { + if (0 == lstrcmpW(pxfc->pwzElementId, pxfcCheck->wzId) + && 0 == pxfc->iXmlFlags + && XMLCONFIG_CREATE & pxfcCheck->iXmlFlags + && XMLCONFIG_ELEMENT & pxfcCheck->iXmlFlags) + { + // We found a match. First, take it out of the current list + if (pxfc->pxfcPrev) + { + pxfc->pxfcPrev->pxfcNext = pxfc->pxfcNext; + } + else // it was the head. Update the head + { + *ppxfcHead = pxfc->pxfcNext; + } + + if (pxfc->pxfcNext) + { + pxfc->pxfcNext->pxfcPrev = pxfc->pxfcPrev; + } + + pxfc->pxfcNext = NULL; + pxfc->pxfcPrev = NULL; + + // Now, add this node to the end of the matched node's additional changes list + if (!pxfcCheck->pxfcAdditionalChanges) + { + pxfcCheck->pxfcAdditionalChanges = pxfc; + pxfcCheck->cAdditionalChanges = 1; + } + else + { + pxfcLast = pxfcCheck->pxfcAdditionalChanges; + cAdditionalChanges = 1; + while (pxfcLast->pxfcNext) + { + pxfcLast = pxfcLast->pxfcNext; + ++cAdditionalChanges; + } + pxfcLast->pxfcNext = pxfc; + pxfc->pxfcPrev = pxfcLast; + pxfcCheck->cAdditionalChanges = ++cAdditionalChanges; + } + } + else + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "failed to find matching ElementId: %ls", pxfc->pwzElementId); + } + } + + pxfcCheck = pxfcCheck->pxfcNext; + } + + pxfc = pxfcNext; + } + +LExit: + + return hr; +} + + +static HRESULT BeginChangeFile( + __in LPCWSTR pwzFile, + __in int iCompAttributes, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pwzFile && *pwzFile && ppwzCustomActionData); + + HRESULT hr = S_OK; + BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; + + LPBYTE pbData = NULL; + SIZE_T cbData = 0; + + LPWSTR pwzRollbackCustomActionData = NULL; + + if (fIs64Bit) + { + hr = WcaWriteIntegerToCaData((int)xaOpenFilex64, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write 64-bit file indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaOpenFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file indicator to custom action data"); + } + + hr = WcaWriteStringToCaData(pwzFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file to custom action data: %ls", pwzFile); + + // If the file already exits, then we have to put it back the way it was on failure + if (FileExistsEx(pwzFile, NULL)) + { + hr = FileRead(&pbData, &cbData, pwzFile); + ExitOnFailure(hr, "failed to read file: %ls", pwzFile); + + // Set up the rollback for this file + hr = WcaWriteIntegerToCaData((int)fIs64Bit, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write component bitness to rollback custom action data"); + + hr = WcaWriteStringToCaData(pwzFile, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file name to rollback custom action data: %ls", pwzFile); + + hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlConfigRollback"), pwzRollbackCustomActionData, COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlConfigRollback for file: %ls", pwzFile); + + ReleaseStr(pwzRollbackCustomActionData); + } +LExit: + ReleaseMem(pbData); + + return hr; +} + + +static HRESULT WriteChangeData( + __in XML_CONFIG_CHANGE* pxfc, + __in eXmlAction action, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pxfc && ppwzCustomActionData); + + HRESULT hr = S_OK; + XML_CONFIG_CHANGE* pxfcAdditionalChanges = NULL; + LPCWSTR wzElementPath = pxfc->pwzElementId ? pxfc->pwzElementId : pxfc->pwzElementPath; + + hr = WcaWriteStringToCaData(wzElementPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", wzElementPath); + + hr = WcaWriteStringToCaData(pxfc->pwzVerifyPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write VerifyPath to custom action data: %ls", pxfc->pwzVerifyPath); + + hr = WcaWriteStringToCaData(pxfc->wzName, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); + + hr = WcaWriteStringToCaData(pxfc->pwzValue, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); + + if (pxfc->iXmlFlags & XMLCONFIG_CREATE && pxfc->iXmlFlags & XMLCONFIG_ELEMENT && xaCreateElement == action && pxfc->pxfcAdditionalChanges) + { + hr = WcaWriteIntegerToCaData(pxfc->cAdditionalChanges, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write additional changes value to custom action data"); + + pxfcAdditionalChanges = pxfc->pxfcAdditionalChanges; + while (pxfcAdditionalChanges) + { + Assert((0 == lstrcmpW(pxfcAdditionalChanges->wzComponent, pxfc->wzComponent)) && 0 == pxfcAdditionalChanges->iXmlFlags && (0 == lstrcmpW(pxfcAdditionalChanges->wzFile, pxfc->wzFile))); + + hr = WcaWriteStringToCaData(pxfcAdditionalChanges->wzName, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); + + hr = WcaWriteStringToCaData(pxfcAdditionalChanges->pwzValue, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); + + pxfcAdditionalChanges = pxfcAdditionalChanges->pxfcNext; + } + } + else + { + hr = WcaWriteIntegerToCaData(0, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write additional changes value to custom action data"); + } + +LExit: + return hr; +} + + +/****************************************************************** + SchedXmlConfig - entry point for XmlConfig Custom Action + +********************************************************************/ +extern "C" UINT __stdcall SchedXmlConfig( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedXmlConfig"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzCurrentFile = NULL; + BOOL fCurrentFileChanged = FALSE; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + XML_CONFIG_CHANGE* pxfcHead = NULL; + XML_CONFIG_CHANGE* pxfcTail = NULL; // TODO: do we need this any more? + XML_CONFIG_CHANGE* pxfc = NULL; + + eXmlAction xa = xaUnknown; + eXmlPreserveDate xd; + + LPWSTR pwzCustomActionData = NULL; + + DWORD cFiles = 0; + + // initialize + hr = WcaInitialize(hInstall, "SchedXmlConfig"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ReadXmlConfigTable(&pxfcHead, &pxfcTail); + MessageExitOnFailure(hr, msierrXmlConfigFailedRead, "failed to read Wix4XmlConfig table"); + + hr = ProcessChanges(&pxfcHead); + ExitOnFailure(hr, "failed to process Wix4XmlConfig changes"); + + // loop through all the xml configurations + for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) + { + // If this is a different file, or the first file... + if (NULL == pwzCurrentFile || 0 != lstrcmpW(pwzCurrentFile, pxfc->wzFile)) + { + // Remember the file we're currently working on + hr = StrAllocString(&pwzCurrentFile, pxfc->wzFile, 0); + ExitOnFailure(hr, "failed to copy file name"); + + fCurrentFileChanged = TRUE; + } + + // + // Figure out what action to take + // + xa = xaUnknown; + + // If it's being installed or reinstalled or uninstalled and that matches + // what we are doing then calculate the right action. + if ((XMLCONFIG_INSTALL & pxfc->iXmlFlags && (WcaIsInstalling(pxfc->isInstalled, pxfc->isAction) || WcaIsReInstalling(pxfc->isInstalled, pxfc->isAction))) || + (XMLCONFIG_UNINSTALL & pxfc->iXmlFlags && WcaIsUninstalling(pxfc->isInstalled, pxfc->isAction))) + { + if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_ELEMENT & pxfc->iXmlFlags) + { + xa = xaCreateElement; + } + else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_ELEMENT & pxfc->iXmlFlags) + { + xa = xaDeleteElement; + } + else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_VALUE & pxfc->iXmlFlags) + { + xa = xaDeleteValue; + } + else if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_VALUE & pxfc->iXmlFlags) + { + xa = xaWriteValue; + } + else if (XMLCONFIG_CREATE & pxfc->iXmlFlags && XMLCONFIG_DOCUMENT & pxfc->iXmlFlags) + { + xa = xaWriteDocument; + } + else if (XMLCONFIG_DELETE & pxfc->iXmlFlags && XMLCONFIG_DOCUMENT & pxfc->iXmlFlags) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "Invalid flag configuration. Cannot delete a fragment node."); + } + } + + if (XMLCONFIG_PRESERVE_MODIFIED & pxfc->iXmlFlags) + { + xd = xdPreserve; + } + else + { + xd= xdDontPreserve; + } + + if (xaUnknown != xa) + { + if (fCurrentFileChanged) + { + hr = BeginChangeFile(pwzCurrentFile, pxfc->iCompAttributes, &pwzCustomActionData); + ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); + + fCurrentFileChanged = FALSE; + ++cFiles; + } + + hr = WcaWriteIntegerToCaData((int)xa, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write action indicator custom action data"); + + hr = WcaWriteIntegerToCaData((int)xd, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); + + hr = WriteChangeData(pxfc, xa, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write change data"); + } + } + + // If we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // Schedule the custom action and add to progress bar + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cFiles); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlConfig"), pwzCustomActionData, cFiles * COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlConfig action"); + } + +LExit: + ReleaseStr(pwzCurrentFile); + ReleaseStr(pwzCustomActionData); + + FreeXmlConfigChangeList(pxfcHead); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/****************************************************************** + ExecXmlConfig - entry point for XmlConfig Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug ExecXmlConfig"); + HRESULT hr = S_OK; + HRESULT hrOpenFailure = S_OK; + UINT er = ERROR_SUCCESS; + +#ifndef _WIN64 + BOOL fIsFSRedirectDisabled = FALSE; +#endif + BOOL fPreserveDate = FALSE; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzFile = NULL; + LPWSTR pwzElementPath = NULL; + LPWSTR pwzVerifyPath = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzValue = NULL; + LPWSTR pwz = NULL; + int cAdditionalChanges = 0; + + IXMLDOMDocument* pixd = NULL; + IXMLDOMNode* pixn = NULL; + IXMLDOMNode* pixnVerify = NULL; + IXMLDOMNode* pixnNewNode = NULL; + IXMLDOMNode* pixnRemovedChild = NULL; + + IXMLDOMDocument* pixdNew = NULL; + IXMLDOMElement* pixeNew = NULL; + + FILETIME ft; + + int id = IDRETRY; + + eXmlAction xa; + eXmlPreserveDate xd; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlConfig"); + ExitOnFailure(hr, "failed to initialize"); + + hr = XmlInitialize(); + ExitOnFailure(hr, "failed to initialize xml utilities"); + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + +#ifndef _WIN64 + // Initialize the Wow64 API - store the result in fWow64APIPresent + // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases + WcaInitializeWow64(); + BOOL fIsWow64Process = WcaIsWow64Process(); +#endif + + if (xaOpenFile != xa && xaOpenFilex64 != xa) + { + ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); + } + + // loop through all the passed in data + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzFile); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + // Default to not preserve date, preserve it if any modifications require us to + fPreserveDate = FALSE; + + // Open the file + ReleaseNullObject(pixd); + +#ifndef _WIN64 + if (xaOpenFilex64 == xa) + { + if (!fIsWow64Process) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but the custom action process is not running in WOW."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); + + fIsFSRedirectDisabled = TRUE; + } +#endif + + hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); + if (FAILED(hr)) + { + // Ignore the return code for now. If they try to add something, we'll fail the install. If all they do is remove stuff then it doesn't matter. + hrOpenFailure = hr; + hr = S_OK; + } + else + { + hrOpenFailure = S_OK; + } + + WcaLog(LOGMSG_VERBOSE, "Configuring Xml File: %ls", pwzFile); + + while (pwz && *pwz) + { + // If we skip past an element that has additional changes we need to strip them off the stream before + // moving on to the next element. Do that now and then restart the outer loop. + if (cAdditionalChanges > 0) + { + while (cAdditionalChanges > 0) + { + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + + cAdditionalChanges--; + } + continue; + } + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Break if we need to move on to a different file + if (xaOpenFile == xa || xaOpenFilex64 == xa) + { + break; + } + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xd); + ExitOnFailure(hr, "failed to process CustomActionData"); + + if (xdPreserve == xd) + { + fPreserveDate = TRUE; + } + + // Get path, name, and value to be written + hr = WcaReadStringFromCaData(&pwz, &pwzElementPath); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzVerifyPath); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, &cAdditionalChanges); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // If we failed to open the file and we're adding something to the file, we've got a problem. Otherwise, just continue on since the file's already gone. + if (FAILED(hrOpenFailure)) + { + if (xaCreateElement == xa || xaWriteValue == xa || xaWriteDocument == xa) + { + MessageExitOnFailure(hr = hrOpenFailure, msierrXmlConfigFailedOpen, "failed to load XML file: %ls", pwzFile); + } + else + { + continue; + } + } + + // Select the node we're about to modify + ReleaseNullObject(pixn); + + hr = XmlSelectSingleNode(pixd, pwzElementPath, &pixn); + + // If we failed to find the node that we are going to add to, we've got a problem. Otherwise, just continue since the node's already gone. + if (S_FALSE == hr) + { + if (xaCreateElement == xa || xaWriteValue == xa || xaWriteDocument == xa) + { + hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); + } + else + { + hr = S_OK; + continue; + } + } + + MessageExitOnFailure(hr, msierrXmlConfigFailedSelect, "failed to find node: %ls in XML file: %ls", pwzElementPath, pwzFile); + + // Make the modification + switch (xa) + { + case xaWriteValue: + if (pwzName && *pwzName) + { + // We're setting an attribute + hr = XmlSetAttribute(pixn, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + } + else + { + // We're setting the text of the node + hr = XmlSetText(pixn, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzElementPath); + } + break; + case xaWriteDocument: + if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) + { + hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); + if (S_OK == hr) + { + // We found the verify path which means we have no further work to do + continue; + } + ExitOnFailure(hr, "failed to query verify path: %ls", pwzVerifyPath); + } + + hr = XmlLoadDocumentEx(pwzValue, XML_LOAD_PRESERVE_WHITESPACE, &pixdNew); + ExitOnFailure(hr, "Failed to load value as document."); + + hr = pixdNew->get_documentElement(&pixeNew); + ExitOnFailure(hr, "Failed to get document element."); + + hr = pixn->appendChild(pixeNew, NULL); + ExitOnFailure(hr, "Failed to append document element on to parent element."); + + ReleaseNullObject(pixeNew); + ReleaseNullObject(pixdNew); + break; + + case xaCreateElement: + if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) + { + hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); + if (S_OK == hr) + { + // We found the verify path which means we have no further work to do + continue; + } + ExitOnFailure(hr, "failed to query verify path: %ls", pwzVerifyPath); + } + + hr = XmlCreateChild(pixn, pwzName, &pixnNewNode); + ExitOnFailure(hr, "failed to create child element: %ls", pwzName); + + if (pwzValue && *pwzValue) + { + hr = XmlSetText(pixnNewNode, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for node: %ls", pwzValue, pwzName); + } + + while (cAdditionalChanges > 0) + { + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Set the additional attribute + hr = XmlSetAttribute(pixnNewNode, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + + cAdditionalChanges--; + } + + ReleaseNullObject(pixnNewNode); + break; + case xaDeleteValue: + if (pwzName && *pwzName) + { + // Delete the attribute + hr = XmlRemoveAttribute(pixn, pwzName); + ExitOnFailure(hr, "failed to remove attribute: %ls", pwzName); + } + else + { + // Clear the text value for the node + hr = XmlSetText(pixn, L""); + ExitOnFailure(hr, "failed to clear text value"); + } + break; + case xaDeleteElement: + if (NULL != pwzVerifyPath && 0 != pwzVerifyPath[0]) + { + hr = XmlSelectSingleNode(pixn, pwzVerifyPath, &pixnVerify); + if (S_OK == hr) + { + hr = pixn->removeChild(pixnVerify, &pixnRemovedChild); + ExitOnFailure(hr, "failed to remove created child element"); + + ReleaseNullObject(pixnRemovedChild); + } + else + { + WcaLog(LOGMSG_VERBOSE, "Failed to select path %ls for deleting. Skipping...", pwzVerifyPath); + hr = S_OK; + } + } + else + { + // TODO: This requires a VerifyPath to delete an element. Should we support not having one? + WcaLog(LOGMSG_VERBOSE, "No VerifyPath specified for delete element of ID: %ls", pwzElementPath); + } + break; + default: + ExitOnFailure(hr = E_UNEXPECTED, "Invalid modification specified in custom action data"); + break; + } + } + + + // Now that we've made all of the changes to this file, save it and move on to the next + if (S_OK == hrOpenFailure) + { + if (fPreserveDate) + { + hr = FileGetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to get modified time of file : %ls", pwzFile); + } + + int iSaveAttempt = 0; + + do + { + hr = XmlSaveDocument(pixd, pwzFile); + if (FAILED(hr)) + { + id = WcaErrorMessage(msierrXmlConfigFailedSave, hr, INSTALLMESSAGE_ERROR | MB_ABORTRETRYIGNORE, 1, pwzFile); + switch (id) + { + case IDABORT: + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + case IDRETRY: + hr = S_FALSE; // hit me, baby, one more time + break; + case IDIGNORE: + hr = S_OK; // pretend everything is okay and bail + break; + case 0: // No UI case, MsiProcessMessage returns 0 + if (STIERR_SHARING_VIOLATION == hr) + { + // Only in case of sharing violation do we retry 30 times, once a second. + if (iSaveAttempt < 30) + { + hr = S_FALSE; + ++iSaveAttempt; + WcaLog(LOGMSG_VERBOSE, "Unable to save changes to XML file: %ls, retry attempt: %x", pwzFile, iSaveAttempt); + Sleep(1000); + } + else + { + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + break; + default: // Unknown error + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + } while (S_FALSE == hr); + + if (fPreserveDate) + { + hr = FileSetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); + } + +#ifndef _WIN64 + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } +#endif + } + } + +LExit: +#ifndef _WIN64 + // Make sure we revert FS Redirection if necessary before exiting + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } + WcaFinalizeWow64(); +#endif + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzElementPath); + ReleaseStr(pwzVerifyPath); + ReleaseStr(pwzName); + ReleaseStr(pwzValue); + + ReleaseObject(pixeNew); + ReleaseObject(pixdNew); + + ReleaseObject(pixn); + ReleaseObject(pixd); + ReleaseObject(pixnNewNode); + ReleaseObject(pixnRemovedChild); + + XmlUninitialize(); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +/****************************************************************** + ExecXmlConfigRollback - entry point for XmlConfig rollback Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlConfigRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecXmlConfigRollback"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + int iIs64Bit; +#ifndef _WIN64 + BOOL fIs64Bit = FALSE; +#endif + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFileName = NULL; + LPBYTE pbData = NULL; + DWORD_PTR cbData = 0; + + FILETIME ft; + + HANDLE hFile = INVALID_HANDLE_VALUE; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlConfigRollback"); + ExitOnFailure(hr, "failed to initialize"); + + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, &iIs64Bit); + ExitOnFailure(hr, "failed to read component bitness from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzFileName); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); + ExitOnFailure(hr, "failed to read file contents from custom action data"); + +#ifndef _WIN64 + fIs64Bit = (BOOL)iIs64Bit; + + if (fIs64Bit) + { + hr = WcaInitializeWow64(); + if (S_FALSE == hr) + { + hr = TYPE_E_DLLFUNCTIONNOTFOUND; + } + ExitOnFailure(hr, "failed to initialize Wow64 API"); + + if (!WcaIsWow64Process()) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but the Wow64 API is unavailable."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); + } +#endif + + hr = FileGetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); + + // Open the file + hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, NULL, NULL, TRUNCATE_EXISTING, NULL, NULL); + ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); + + // Write out the old data + hr = FileWriteHandle(hFile, pbData, cbData); + ExitOnFailure(hr, "failed to write to file: %ls", pwzFileName); + + ReleaseFile(hFile); + + hr = FileSetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to set modified date of file %ls.", pwzFileName); + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzFileName); + + ReleaseFile(hFile); + +#ifndef _WIN64 + if (fIs64Bit) + { + WcaRevertWow64FSRedirection(); + WcaFinalizeWow64(); + } +#endif + + ReleaseMem(pbData); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/XmlFile.cpp b/src/ext/Util/ca/XmlFile.cpp new file mode 100644 index 00000000..04a4ae98 --- /dev/null +++ b/src/ext/Util/ca/XmlFile.cpp @@ -0,0 +1,940 @@ +// 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" + +#define XMLFILE_CREATE_ELEMENT 0x00000001 +#define XMLFILE_DELETE_VALUE 0x00000002 +#define XMLFILE_BULKWRITE_VALUE 0x00000004 + +#define XMLFILE_DONT_UNINSTALL 0x00010000 +#define XMLFILE_PRESERVE_MODIFIED 0x00001000 +#define XMLFILE_USE_XPATH 0x00000100 + +extern BOOL vfMsxml30; + +enum eXmlAction +{ + xaOpenFile = 1, + xaOpenFilex64, + xaWriteValue, + xaDeleteValue, + xaCreateElement, + xaDeleteElement, + xaBulkWriteValue, +}; + +enum eXmlPreserveDate +{ + xdDontPreserve = 0, + xdPreserve +}; + +enum eXmlSelectionLanguage +{ + xsXSLPattern = 0, + xsXPath = 1, +}; + +LPCWSTR vcsXmlFileQuery = + L"SELECT `Wix4XmlFile`.`Wix4XmlFile`, `Wix4XmlFile`.`File`, `Wix4XmlFile`.`ElementPath`, `Wix4XmlFile`.`Name`, `Wix4XmlFile`.`Value`, " + L"`Wix4XmlFile`.`Flags`, `Wix4XmlFile`.`Component_`, `Component`.`Attributes` " + L"FROM `Wix4XmlFile`,`Component` WHERE `Wix4XmlFile`.`Component_`=`Component`.`Component` ORDER BY `File`, `Sequence`"; +enum eXmlFileQuery { xfqXmlFile = 1, xfqFile, xfqXPath, xfqName, xfqValue, xfqXmlFlags, xfqComponent, xfqCompAttributes }; + +struct XML_FILE_CHANGE +{ + WCHAR wzId[MAX_DARWIN_KEY]; + + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + WCHAR wzFile[MAX_PATH]; + LPWSTR pwzElementPath; + WCHAR wzName[MAX_DARWIN_COLUMN]; + LPWSTR pwzValue; + + int iXmlFlags; + int iCompAttributes; + + XML_FILE_CHANGE* pxfcPrev; + XML_FILE_CHANGE* pxfcNext; +}; + +//static HRESULT FreeXmlFileChangeList( +// __in XML_FILE_CHANGE* pxfcList +// ) +//{ +// HRESULT hr = S_OK; +// +// XML_FILE_CHANGE* pxfcDelete; +// while(pxfcList) +// { +// pxfcDelete = pxfcList; +// pxfcList = pxfcList->pxfcNext; +// +// ReleaseStr(pxfcDelete->pwzElementPath); +// ReleaseStr(pxfcDelete->pwzValue); +// +// hr = MemFree(pxfcDelete); +// ExitOnFailure(hr, "failed to free xml file change list item"); +// } +// +//LExit: +// return hr; +//} + +static HRESULT AddXmlFileChangeToList( + __inout XML_FILE_CHANGE** ppxfcHead, + __inout XML_FILE_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + + XML_FILE_CHANGE* pxfc = static_cast(MemAlloc(sizeof(XML_FILE_CHANGE), TRUE)); + ExitOnNull(pxfc, hr, E_OUTOFMEMORY, "failed to allocate memory for new xml file change list element"); + + // Add it to the end of the list + if (NULL == *ppxfcHead) + { + *ppxfcHead = pxfc; + *ppxfcTail = pxfc; + } + else + { + Assert(*ppxfcTail && (*ppxfcTail)->pxfcNext == NULL); + (*ppxfcTail)->pxfcNext = pxfc; + pxfc->pxfcPrev = *ppxfcTail; + *ppxfcTail = pxfc; + } + +LExit: + return hr; +} + + +static HRESULT ReadXmlFileTable( + __inout XML_FILE_CHANGE** ppxfcHead, + __inout XML_FILE_CHANGE** ppxfcTail + ) +{ + Assert(ppxfcHead && ppxfcTail); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR pwzData = NULL; + + // check to see if necessary tables are specified + if (S_FALSE == WcaTableExists(L"Wix4XmlFile")) + { + ExitFunction1(hr = S_FALSE); + } + + // loop through all the xml configurations + hr = WcaOpenExecuteView(vcsXmlFileQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4XmlFile table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = AddXmlFileChangeToList(ppxfcHead, ppxfcTail); + ExitOnFailure(hr, "failed to add xml file change to list"); + + // Get record Id + hr = WcaGetRecordString(hRec, xfqXmlFile, &pwzData); + ExitOnFailure(hr, "failed to get Wix4XmlFile record Id"); + hr = StringCchCopyW((*ppxfcTail)->wzId, countof((*ppxfcTail)->wzId), pwzData); + ExitOnFailure(hr, "failed to copy Wix4XmlFile record Id"); + + // Get component name + hr = WcaGetRecordString(hRec, xfqComponent, &pwzData); + ExitOnFailure(hr, "failed to get component name for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + + // Get the component's state + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &(*ppxfcTail)->isInstalled, &(*ppxfcTail)->isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for Component: %ls", pwzData); + + // Get the xml file + hr = WcaGetRecordFormattedString(hRec, xfqFile, &pwzData); + ExitOnFailure(hr, "failed to get xml file for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzFile, countof((*ppxfcTail)->wzFile), pwzData); + ExitOnFailure(hr, "failed to copy xml file path"); + + // Get the Wix4XmlFile table flags + hr = WcaGetRecordInteger(hRec, xfqXmlFlags, &(*ppxfcTail)->iXmlFlags); + ExitOnFailure(hr, "failed to get Wix4XmlFile flags for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + + // Get the XPath + hr = WcaGetRecordFormattedString(hRec, xfqXPath, &(*ppxfcTail)->pwzElementPath); + ExitOnFailure(hr, "failed to get XPath for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + + // Get the name + hr = WcaGetRecordFormattedString(hRec, xfqName, &pwzData); + ExitOnFailure(hr, "failed to get Name for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + hr = StringCchCopyW((*ppxfcTail)->wzName, countof((*ppxfcTail)->wzName), pwzData); + ExitOnFailure(hr, "failed to copy name of element"); + + // Get the value + hr = WcaGetRecordFormattedString(hRec, xfqValue, &pwzData); + ExitOnFailure(hr, "failed to get Value for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + hr = StrAllocString(&(*ppxfcTail)->pwzValue, pwzData, 0); + ExitOnFailure(hr, "failed to allocate buffer for value"); + + // Get the component attributes + hr = WcaGetRecordInteger(hRec, xfqCompAttributes, &(*ppxfcTail)->iCompAttributes); + ExitOnFailure(hr, "failed to get component attributes for Wix4XmlFile: %ls", (*ppxfcTail)->wzId); + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + hr = S_OK; + ExitOnFailure(hr, "failed while looping through all objects to secure"); + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +static HRESULT BeginChangeFile( + __in LPCWSTR pwzFile, + __in XML_FILE_CHANGE* pxfc, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pwzFile && *pwzFile && ppwzCustomActionData); + + HRESULT hr = S_OK; + BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit; + BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH; + LPBYTE pbData = NULL; + SIZE_T cbData = 0; + + LPWSTR pwzRollbackCustomActionData = NULL; + + if (fIs64Bit) + { + hr = WcaWriteIntegerToCaData((int)xaOpenFilex64, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write 64-bit file indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaOpenFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file indicator to custom action data"); + } + if (fUseXPath) + { + hr = WcaWriteIntegerToCaData((int)xsXPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write XPath selectionlanguage indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xsXSLPattern, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write XSLPattern selectionlanguage indicator to custom action data"); + } + hr = WcaWriteStringToCaData(pwzFile, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write file to custom action data: %ls", pwzFile); + + // If the file already exits, then we have to put it back the way it was on failure + if (FileExistsEx(pwzFile, NULL)) + { + hr = FileRead(&pbData, &cbData, pwzFile); + ExitOnFailure(hr, "failed to read file: %ls", pwzFile); + + // Set up the rollback for this file + hr = WcaWriteIntegerToCaData((int)fIs64Bit, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write component bitness to rollback custom action data"); + + hr = WcaWriteStringToCaData(pwzFile, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file name to rollback custom action data: %ls", pwzFile); + + hr = WcaWriteStreamToCaData(pbData, cbData, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to write file contents to rollback custom action data."); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlFileRollback"), pwzRollbackCustomActionData, COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlFileRollback for file: %ls", pwzFile); + + ReleaseStr(pwzRollbackCustomActionData); + } +LExit: + ReleaseMem(pbData); + + return hr; +} + + +static HRESULT WriteChangeData( + __in XML_FILE_CHANGE* pxfc, + __inout LPWSTR* ppwzCustomActionData + ) +{ + Assert(pxfc && ppwzCustomActionData); + + HRESULT hr = S_OK; + + hr = WcaWriteStringToCaData(pxfc->pwzElementPath, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write ElementPath to custom action data: %ls", pxfc->pwzElementPath); + + hr = WcaWriteStringToCaData(pxfc->wzName, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Name to custom action data: %ls", pxfc->wzName); + + hr = WcaWriteStringToCaData(pxfc->pwzValue, ppwzCustomActionData); + ExitOnFailure(hr, "failed to write Value to custom action data: %ls", pxfc->pwzValue); + +LExit: + return hr; +} + + +/****************************************************************** + SchedXmlFile - entry point for XmlFile Custom Action + +********************************************************************/ +extern "C" UINT __stdcall SchedXmlFile( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedXmlFile"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzCurrentFile = NULL; + BOOL fCurrentFileChanged = FALSE; + BOOL fCurrentUseXPath = FALSE; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + XML_FILE_CHANGE* pxfcHead = NULL; + XML_FILE_CHANGE* pxfcTail = NULL; + XML_FILE_CHANGE* pxfc = NULL; + XML_FILE_CHANGE* pxfcUninstall = NULL; + + LPWSTR pwzCustomActionData = NULL; + + DWORD cFiles = 0; + + // initialize + hr = WcaInitialize(hInstall, "SchedXmlFile"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ReadXmlFileTable(&pxfcHead, &pxfcTail); + if (S_FALSE == hr) + { + WcaLog(LOGMSG_VERBOSE, "Skipping SchedXmlFile because Wix4XmlFile table not present"); + ExitFunction1(hr = S_OK); + } + + MessageExitOnFailure(hr, msierrXmlFileFailedRead, "failed to read Wix4XmlFile table"); + + // loop through all the xml configurations + for (pxfc = pxfcHead; pxfc; pxfc = pxfc->pxfcNext) + { + // If this is the first file, a different file, the last file, or the SelectionLanguage property changes... + if (NULL == pwzCurrentFile || 0 != lstrcmpW(pwzCurrentFile, pxfc->wzFile) || NULL == pxfc->pxfcNext || fCurrentUseXPath != ((XMLFILE_USE_XPATH & pxfc->iXmlFlags))) + { + // If this isn't the first file + if (NULL != pwzCurrentFile) + { + // Do the uninstall work for the current file by walking backwards through the list (so the sequence is reversed) + for (pxfcUninstall = ((NULL != pxfc->pxfcNext) ? pxfc->pxfcPrev : pxfc); pxfcUninstall && 0 == lstrcmpW(pwzCurrentFile, pxfcUninstall->wzFile) && fCurrentUseXPath == ((XMLFILE_USE_XPATH & pxfcUninstall->iXmlFlags)); pxfcUninstall = pxfcUninstall->pxfcPrev) + { + // If it's being uninstalled + if (WcaIsUninstalling(pxfcUninstall->isInstalled, pxfcUninstall->isAction)) + { + // Uninstall the change + if (!(XMLFILE_DONT_UNINSTALL & pxfcUninstall->iXmlFlags)) + { + if (!fCurrentFileChanged) + { + hr = BeginChangeFile(pwzCurrentFile, pxfcUninstall, &pwzCustomActionData); + ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); + + fCurrentFileChanged = TRUE; + ++cFiles; + } + if (XMLFILE_CREATE_ELEMENT & pxfcUninstall->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaDeleteElement, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write delete element action indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaDeleteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write delete value action indicator to custom action data"); + } + + if (XMLFILE_PRESERVE_MODIFIED & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xdPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xdDontPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Don't Preserve Date indicator to custom action data"); + } + + hr = WriteChangeData(pxfcUninstall, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write uninstall change data"); + } + } + } + } + + // Remember the file we're currently working on + hr = StrAllocString(&pwzCurrentFile, pxfc->wzFile, 0); + ExitOnFailure(hr, "failed to copy file name"); + fCurrentUseXPath = (XMLFILE_USE_XPATH & pxfc->iXmlFlags); + + // We haven't changed the current file yet + fCurrentFileChanged = FALSE; + } + + // If it's being installed + if (WcaIsInstalling(pxfc->isInstalled, pxfc->isAction)) + { + if (!fCurrentFileChanged) + { + hr = BeginChangeFile(pwzCurrentFile, pxfc, &pwzCustomActionData); + ExitOnFailure(hr, "failed to begin file change for file: %ls", pwzCurrentFile); + fCurrentFileChanged = TRUE; + ++cFiles; + } + + // Install the change + if (XMLFILE_CREATE_ELEMENT & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaCreateElement, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write create element action indicator to custom action data"); + } + else if (XMLFILE_DELETE_VALUE & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaDeleteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write delete value action indicator to custom action data"); + } + else if (XMLFILE_BULKWRITE_VALUE & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xaBulkWriteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write builkwrite value action indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xaWriteValue, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write file indicator to custom action data"); + } + + if (XMLFILE_PRESERVE_MODIFIED & pxfc->iXmlFlags) + { + hr = WcaWriteIntegerToCaData((int)xdPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Preserve Date indicator to custom action data"); + } + else + { + hr = WcaWriteIntegerToCaData((int)xdDontPreserve, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write Don't Preserve Date indicator to custom action data"); + } + + hr = WriteChangeData(pxfc, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write change data"); + } + } + + // If we looped through all records all is well + if (E_NOMOREITEMS == hr) + hr = S_OK; + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // Schedule the custom action and add to progress bar + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cFiles); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecXmlFile"), pwzCustomActionData, cFiles * COST_XMLFILE); + ExitOnFailure(hr, "failed to schedule ExecXmlFile action"); + } + +LExit: + ReleaseStr(pwzCurrentFile); + ReleaseStr(pwzCustomActionData); + + return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} + + +/****************************************************************** + ExecXmlFile - entry point for XmlFile Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlFile( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecXmlFile"); + HRESULT hr = S_OK; + HRESULT hrOpenFailure = S_OK; + UINT er = ERROR_SUCCESS; + + BOOL fIsFSRedirectDisabled = FALSE; + BOOL fPreserveDate = FALSE; + + int id = IDRETRY; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzFile = NULL; + LPWSTR pwzXPath = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzValue = NULL; + LPWSTR pwz = NULL; + + IXMLDOMDocument* pixd = NULL; + IXMLDOMNode* pixn = NULL; + IXMLDOMNode* pixnNewNode = NULL; + IXMLDOMNodeList* pixNodes = NULL; + IXMLDOMDocument2 *pixdDocument2 = NULL; + + FILETIME ft; + + BSTR bstrProperty = ::SysAllocString(L"SelectionLanguage"); + ExitOnNull(bstrProperty, hr, E_OUTOFMEMORY, "failed SysAllocString"); + VARIANT varValue; + ::VariantInit(&varValue); + varValue.vt = VT_BSTR; + varValue.bstrVal = ::SysAllocString(L"XPath"); + ExitOnNull(varValue.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString"); + eXmlAction xa; + eXmlPreserveDate xd; + eXmlSelectionLanguage xl; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlFile"); + ExitOnFailure(hr, "failed to initialize"); + + hr = XmlInitialize(); + ExitOnFailure(hr, "failed to initialize xml utilities"); + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + +#ifndef _WIN64 + // Initialize the Wow64 API - store the result in fWow64APIPresent + // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases + WcaInitializeWow64(); + BOOL fIsWow64Process = WcaIsWow64Process(); +#endif + + if (xaOpenFile != xa && xaOpenFilex64 != xa) + ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data"); + + // loop through all the passed in data + while (pwz && *pwz) + { + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xl); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadStringFromCaData(&pwz, &pwzFile); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + // Default to not preserve the modified date + fPreserveDate = FALSE; + + // Open the file + ReleaseNullObject(pixd); + + if (xaOpenFilex64 == xa) + { +#ifndef _WIN64 + if (!fIsWow64Process) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but the custom action process is not running in WOW."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API."); + + fIsFSRedirectDisabled = TRUE; +#endif + } + + hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd); + if (FAILED(hr)) + { + // Ignore the return code for now. If they try to add something, we'll fail the install. If all they do is remove stuff then it doesn't matter. + hrOpenFailure = hr; + hr = S_OK; + } + else + { + hrOpenFailure = S_OK; + } + WcaLog(LOGMSG_VERBOSE, "Configuring Xml File: %ls", pwzFile); + + if (xsXPath == xl) + { + if (vfMsxml30) + { + // If we failed to open the file, don't fail immediately; just skip setting the selection language, and we'll fail later if appropriate + if (SUCCEEDED(hrOpenFailure)) + { + hr = pixd->QueryInterface(XmlUtil_IID_IXMLDOMDocument2, (void**)&pixdDocument2); + ExitOnFailure(hr, "failed in querying IXMLDOMDocument2 interface"); + hr = pixdDocument2->setProperty(bstrProperty, varValue); + ExitOnFailure(hr, "failed in setting SelectionLanguage"); + } + } + else + { + ExitOnFailure(hr = E_NOTIMPL, "Error: current MSXML version does not support xpath query."); + } + } + + while (pwz && *pwz) + { + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // Break if we need to move on to a different file + if (xaOpenFile == xa || xaOpenFilex64 == xa) + break; + + hr = WcaReadIntegerFromCaData(&pwz, (int*) &xd); + ExitOnFailure(hr, "failed to process CustomActionData"); + + if (xdPreserve == xd) + { + fPreserveDate = TRUE; + } + + // Get path, name, and value to be written + hr = WcaReadStringFromCaData(&pwz, &pwzXPath); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzValue); + ExitOnFailure(hr, "failed to process CustomActionData"); + + // If we failed to open the file and we're adding something to the file, we've got a problem. Otherwise, just continue on since the file's already gone. + if (FAILED(hrOpenFailure)) + { + if (xaCreateElement == xa || xaWriteValue == xa || xaBulkWriteValue == xa) + { + MessageExitOnFailure(hr = hrOpenFailure, msierrXmlFileFailedOpen, "failed to load XML file: %ls", pwzFile); + } + else + { + continue; + } + } + + // Select the node we're about to modify + ReleaseNullObject(pixn); + + if (xaBulkWriteValue == xa) + { + hr = XmlSelectNodes(pixd, pwzXPath, &pixNodes); + if (S_FALSE == hr) + { + hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); + } + + MessageExitOnFailure(hr, msierrXmlFileFailedSelect, "failed to find any nodes: %ls in XML file: %ls", pwzXPath, pwzFile); + for (;;) + { + pixNodes->nextNode(&pixn); + if (NULL == pixn) + break; + + if (pwzName && *pwzName) + { + // We're setting an attribute + hr = XmlSetAttribute(pixn, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + } + else + { + // We're setting the text of the node + hr = XmlSetText(pixn, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzXPath); + } + ReleaseNullObject(pixn); + } + } + else + { + hr = XmlSelectSingleNode(pixd, pwzXPath, &pixn); + if (S_FALSE == hr) + hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND); + MessageExitOnFailure(hr, msierrXmlFileFailedSelect, "failed to find node: %ls in XML file: %ls", pwzXPath, pwzFile); + + // Make the modification + if (xaWriteValue == xa) + { + if (pwzName && *pwzName) + { + // We're setting an attribute + hr = XmlSetAttribute(pixn, pwzName, pwzValue); + ExitOnFailure(hr, "failed to set attribute: %ls to value %ls", pwzName, pwzValue); + } + else + { + // We're setting the text of the node + hr = XmlSetText(pixn, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for element %ls. Make sure that XPath points to an element.", pwzValue, pwzXPath); + } + } + else if (xaCreateElement == xa) + { + hr = XmlCreateChild(pixn, pwzName, &pixnNewNode); + ExitOnFailure(hr, "failed to create child element: %ls", pwzName); + + if (pwzValue && *pwzValue) + { + hr = XmlSetText(pixnNewNode, pwzValue); + ExitOnFailure(hr, "failed to set text to: %ls for node: %ls", pwzValue, pwzName); + } + + ReleaseNullObject(pixnNewNode); + } + else if (xaDeleteValue == xa) + { + if (pwzName && *pwzName) + { + // Delete the attribute + hr = XmlRemoveAttribute(pixn, pwzName); + ExitOnFailure(hr, "failed to remove attribute: %ls", pwzName); + } + else + { + // Clear the text value for the node + hr = XmlSetText(pixn, L""); + ExitOnFailure(hr, "failed to clear text value"); + } + } + else if (xaDeleteElement == xa) + { + // TODO: This may be a little heavy handed + hr = XmlRemoveChildren(pixn, pwzName); + ExitOnFailure(hr, "failed to delete child node: %ls", pwzName); + } + else + { + ExitOnFailure(hr = E_UNEXPECTED, "Invalid modification specified in custom action data"); + } + } + } + + // Now that we've made all of the changes to this file, save it and move on to the next + if (S_OK == hrOpenFailure) + { + if (fPreserveDate) + { + hr = FileGetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to get modified time of file : %ls", pwzFile); + } + + int iSaveAttempt = 0; + + do + { + hr = XmlSaveDocument(pixd, pwzFile); + if (FAILED(hr)) + { + id = WcaErrorMessage(msierrXmlConfigFailedSave, hr, INSTALLMESSAGE_ERROR | MB_ABORTRETRYIGNORE, 1, pwzFile); + switch (id) + { + case IDABORT: + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + case IDRETRY: + hr = S_FALSE; // hit me, baby, one more time + break; + case IDIGNORE: + hr = S_OK; // pretend everything is okay and bail + break; + case 0: // No UI case, MsiProcessMessage returns 0 + if (STIERR_SHARING_VIOLATION == hr) + { + // Only in case of sharing violation do we retry 30 times, once a second. + if (iSaveAttempt < 30) + { + hr = S_FALSE; + ++iSaveAttempt; + WcaLog(LOGMSG_VERBOSE, "Unable to save changes to XML file: %ls, retry attempt: %x", pwzFile, iSaveAttempt); + Sleep(1000); + } + else + { + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + break; + default: // Unknown error + ExitOnFailure(hr, "Failed to save changes to XML file: %ls", pwzFile); + } + } + } while (S_FALSE == hr); + + if (fPreserveDate) + { + hr = FileSetTime(pwzFile, NULL, NULL, &ft); + ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile); + } + + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } + } + } + +LExit: + // Make sure we revert FS Redirection if necessary before exiting + if (fIsFSRedirectDisabled) + { + fIsFSRedirectDisabled = FALSE; + WcaRevertWow64FSRedirection(); + } +#ifndef _WIN64 + WcaFinalizeWow64(); +#endif + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzXPath); + ReleaseStr(pwzName); + ReleaseStr(pwzValue); + ReleaseBSTR(bstrProperty); + ReleaseVariant(varValue); + + ReleaseObject(pixdDocument2); + ReleaseObject(pixn); + ReleaseObject(pixd); + ReleaseObject(pixnNewNode); + ReleaseObject(pixNodes); + + XmlUninitialize(); + + return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} + + +/****************************************************************** + ExecXmlFileRollback - entry point for XmlFile rollback Custom Action + +*******************************************************************/ +extern "C" UINT __stdcall ExecXmlFileRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecXmlFileRollback"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + int iIs64Bit; + BOOL fIs64Bit = FALSE; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFileName = NULL; + LPBYTE pbData = NULL; + DWORD_PTR cbData = 0; + + FILETIME ft; + + HANDLE hFile = INVALID_HANDLE_VALUE; + + // initialize + hr = WcaInitialize(hInstall, "ExecXmlFileRollback"); + ExitOnFailure(hr, "failed to initialize"); + + + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadIntegerFromCaData(&pwz, &iIs64Bit); + ExitOnFailure(hr, "failed to read component bitness from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzFileName); + ExitOnFailure(hr, "failed to read file name from custom action data"); + + hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData); + ExitOnFailure(hr, "failed to read file contents from custom action data"); + +#ifndef _WIN64 + fIs64Bit = (BOOL)iIs64Bit; + + if (fIs64Bit) + { + hr = WcaInitializeWow64(); + if (S_FALSE == hr) + { + hr = TYPE_E_DLLFUNCTIONNOTFOUND; + } + ExitOnFailure(hr, "failed to initialize Wow64 API"); + + if (!WcaIsWow64Process()) + { + hr = E_NOTIMPL; + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but the custom action process is not running in WOW."); + } + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API."); + } +#endif + + // Always preserve the modified date on rollback + hr = FileGetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName); + + // Open the file + hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, NULL, NULL, TRUNCATE_EXISTING, NULL, NULL); + ExitOnInvalidHandleWithLastError(hFile, hr, "failed to open file: %ls", pwzFileName); + + // Write out the old data + hr = FileWriteHandle(hFile, pbData, cbData); + ExitOnFailure(hr, "failed to write to file: %ls", pwzFileName); + + ReleaseFile(hFile); + + // Always preserve the modified date on rollback + hr = FileSetTime(pwzFileName, NULL, NULL, &ft); + ExitOnFailure(hr, "Failed to set modified date of file %ls.", pwzFileName); + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzFileName); + + ReleaseFile(hFile); + + if (fIs64Bit) + { + WcaRevertWow64FSRedirection(); + WcaFinalizeWow64(); + } + + ReleaseMem(pbData); + + return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er); +} + diff --git a/src/ext/Util/ca/caDecor.h b/src/ext/Util/ca/caDecor.h new file mode 100644 index 00000000..da274650 --- /dev/null +++ b/src/ext/Util/ca/caDecor.h @@ -0,0 +1,13 @@ +#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. + + +#if defined(_M_ARM64) +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64" +#elif defined(_M_AMD64) +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64" +#elif defined(_M_ARM) +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM" +#else +#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86" +#endif diff --git a/src/ext/Util/ca/cost.h b/src/ext/Util/ca/cost.h new file mode 100644 index 00000000..6507e85d --- /dev/null +++ b/src/ext/Util/ca/cost.h @@ -0,0 +1,9 @@ +#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. + + +const UINT COST_SECUREOBJECT = 1000; +const UINT COST_SERVICECONFIG = 1000; +const UINT COST_XMLFILE = 1000; +const UINT COST_CLOSEAPP = 500; +const UINT COST_INTERNETSHORTCUT = 2000; diff --git a/src/ext/Util/ca/dllmain.cpp b/src/ext/Util/ca/dllmain.cpp new file mode 100644 index 00000000..35ae6d1c --- /dev/null +++ b/src/ext/Util/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 custom actions + +********************************************************************/ +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/ext/Util/ca/exitearlywithsuccess.cpp b/src/ext/Util/ca/exitearlywithsuccess.cpp new file mode 100644 index 00000000..00828329 --- /dev/null +++ b/src/ext/Util/ca/exitearlywithsuccess.cpp @@ -0,0 +1,27 @@ +// 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" + + +/****************************************************************** +WixExitEarlyWithSuccess - entry point for WixExitEarlyWithSuccess + custom action which does nothing except return exit code + ERROR_NO_MORE_ITEMS. The Windows Installer documentation at + http://msdn.microsoft.com/library/aa368072.aspx indicates that + this exit code is not treated as an error. This will cause a + calling application to receive a successful return code if + this custom action executes. This can be useful for backwards + compatibility when an application redistributes an MSI and + a future major upgrade is released for that MSI. It should be + conditioned on a property set by an entry in the Upgrade table + of the MSI that detects newer major upgrades of the same MSI + already installed on the system. It should be scheduled after + the FindRelatedProducts action so that the property will be + set if appropriate. +********************************************************************/ +extern "C" UINT __stdcall WixExitEarlyWithSuccess( + __in MSIHANDLE /*hInstall*/ + ) +{ + return ERROR_NO_MORE_ITEMS; +} diff --git a/src/ext/Util/ca/netshortcuts.cpp b/src/ext/Util/ca/netshortcuts.cpp new file mode 100644 index 00000000..06826264 --- /dev/null +++ b/src/ext/Util/ca/netshortcuts.cpp @@ -0,0 +1,437 @@ +// 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" + +LPCWSTR vcsShortcutsQuery = + L"SELECT `Component_`, `Directory_`, `Name`, `Target`, `Attributes`, `IconFile`, `IconIndex` " + L"FROM `Wix4InternetShortcut`"; +enum eShortcutsQuery { esqComponent = 1, esqDirectory, esqFilename, esqTarget, esqAttributes, esqIconFile, esqIconIndex }; +enum eShortcutsAttributes { esaLink = 0, esaURL = 1 }; + +/****************************************************************** + WixSchedInternetShortcuts - entry point + +********************************************************************/ +extern "C" UINT __stdcall WixSchedInternetShortcuts( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + UINT uiCost = 0; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + MSIHANDLE hCreateFolderTable = NULL; + MSIHANDLE hCreateFolderColumns = NULL; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzComponent = NULL; + LPWSTR pwzDirectory = NULL; + LPWSTR pwzFilename = NULL; + LPWSTR pwzTarget = NULL; + LPWSTR pwzShortcutPath = NULL; + int iAttr = 0; + LPWSTR pwzIconFile = NULL; + int iIconIndex = 0; + IUniformResourceLocatorW* piURL = NULL; + IShellLinkW* piShellLink = NULL; + BOOL fInitializedCom = FALSE; + + hr = WcaInitialize(hInstall, "WixSchedInternetShortcuts"); + ExitOnFailure(hr, "failed to initialize WixSchedInternetShortcuts."); + + // anything to do? + if (S_OK != WcaTableExists(L"Wix4InternetShortcut")) + { + WcaLog(LOGMSG_STANDARD, "Wix4InternetShortcut table doesn't exist, so there are no Internet shortcuts to process"); + goto LExit; + } + + // check to see if we can create a shortcut - Server Core and others may not have a shell registered. + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_ALL, IID_IUniformResourceLocatorW, (void**)&piURL); + if (S_OK != hr) + { + WcaLog(LOGMSG_STANDARD, "failed to create an instance of IUniformResourceLocatorW, skipping shortcut creation"); + ExitFunction1(hr = S_OK); + } + + hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&piShellLink); + if (S_OK != hr) + { + WcaLog(LOGMSG_STANDARD, "failed to create an instance of IShellLinkW, skipping shortcut creation"); + ExitFunction1(hr = S_OK); + } + + // query and loop through all the shortcuts + hr = WcaOpenExecuteView(vcsShortcutsQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4InternetShortcut table"); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + // read column values + hr = WcaGetRecordString(hRec, esqComponent, &pwzComponent); + ExitOnFailure(hr, "failed to get shortcut component"); + hr = WcaGetRecordString(hRec, esqDirectory, &pwzDirectory); + ExitOnFailure(hr, "failed to get shortcut directory"); + hr = WcaGetRecordString(hRec, esqFilename, &pwzFilename); + ExitOnFailure(hr, "failed to get shortcut filename"); + hr = WcaGetRecordFormattedString(hRec, esqTarget, &pwzTarget); + ExitOnFailure(hr, "failed to get shortcut target"); + hr = WcaGetRecordInteger(hRec, esqAttributes, &iAttr); + ExitOnFailure(hr, "failed to get shortcut attributes"); + hr = WcaGetRecordFormattedString(hRec, esqIconFile, &pwzIconFile); + ExitOnFailure(hr, "failed to get shortcut icon file"); + hr = WcaGetRecordInteger(hRec, esqIconIndex, &iIconIndex); + ExitOnFailure(hr, "failed to get shortcut icon index"); + + // skip processing this Wix4InternetShortcut row if the component isn't being configured + WCA_TODO todo = WcaGetComponentToDo(pwzComponent); + if (WCA_TODO_UNKNOWN == todo) + { + WcaLog(LOGMSG_VERBOSE, "Skipping shortcut for null-action component '%ls'", pwzComponent); + continue; + } + + // we need to create the directory where the shortcut is supposed to live; rather + // than doing so in our deferred custom action, use the CreateFolder table to have MSI + // make (and remove) them on our behalf (including the correct cleanup of parent directories). + MSIDBERROR dbError = MSIDBERROR_NOERROR; + WcaLog(LOGMSG_STANDARD, "Adding folder '%ls', component '%ls' to the CreateFolder table", pwzDirectory, pwzComponent); + hr = WcaAddTempRecord(&hCreateFolderTable, &hCreateFolderColumns, L"CreateFolder", &dbError, 0, 2, pwzDirectory, pwzComponent); + if (MSIDBERROR_DUPLICATEKEY == dbError) + { + WcaLog(LOGMSG_STANDARD, "Folder '%ls' already exists in the CreateFolder table; the above error is harmless", pwzDirectory); + hr = S_OK; + } + ExitOnFailure(hr, "Couldn't add temporary CreateFolder row"); + + // only if we're installing/reinstalling do we need to schedule the deferred CA + // (uninstallation is handled via permanent RemoveFile rows and temporary CreateFolder rows) + if (WCA_TODO_INSTALL == todo || WCA_TODO_REINSTALL == todo) + { + // turn the Directory_ id into a path + hr = WcaGetTargetPath(pwzDirectory, &pwzShortcutPath); + ExitOnFailure(hr, "failed to allocate string for shortcut directory"); + + // append the shortcut filename + hr = StrAllocConcat(&pwzShortcutPath, pwzFilename, 0); + ExitOnFailure(hr, "failed to allocate string for shortcut filename"); + + // write the shortcut path and target to custom action data for deferred CAs + hr = WcaWriteStringToCaData(pwzShortcutPath, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write shortcut path to custom action data"); + hr = WcaWriteStringToCaData(pwzTarget, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write shortcut target to custom action data"); + hr = WcaWriteIntegerToCaData(iAttr, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write shortcut attributes to custom action data"); + hr = WcaWriteStringToCaData(pwzIconFile, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write icon file to custom action data"); + hr = WcaWriteIntegerToCaData(iIconIndex, &pwzCustomActionData); + ExitOnFailure(hr, "failed to write icon index to custom action data"); + + uiCost += COST_INTERNETSHORTCUT; + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing Wix4InternetShortcut table"); + + // if we have any shortcuts to install + if (pwzCustomActionData && *pwzCustomActionData) + { + // add cost to progress bar + hr = WcaProgressMessage(uiCost, TRUE); + ExitOnFailure(hr, "failed to extend progress bar for InternetShortcuts"); + + // provide custom action data to deferred and rollback CAs + hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"RollbackInternetShortcuts"), pwzCustomActionData); + ExitOnFailure(hr, "failed to set WixRollbackInternetShortcuts rollback custom action data"); + hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"CreateInternetShortcuts"), pwzCustomActionData); + ExitOnFailure(hr, "failed to set WixCreateInternetShortcuts custom action data"); + } + +LExit: + if (hCreateFolderTable) + { + ::MsiCloseHandle(hCreateFolderTable); + } + + if (hCreateFolderColumns) + { + ::MsiCloseHandle(hCreateFolderColumns); + } + + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzComponent); + ReleaseStr(pwzDirectory); + ReleaseStr(pwzFilename); + ReleaseStr(pwzTarget); + ReleaseStr(pwzShortcutPath); + ReleaseObject(piShellLink); + ReleaseObject(piURL); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + + +/****************************************************************** + CreateUrl - Creates a shortcut via IUniformResourceLocatorW + +*******************************************************************/ +static HRESULT CreateUrl( + __in_z LPCWSTR wzTarget, + __in_z LPCWSTR wzShortcutPath, + __in_z_opt LPCWSTR wzIconPath, + __in int iconIndex +) +{ + HRESULT hr = S_OK; + IUniformResourceLocatorW* piURL = NULL; + IPersistFile* piPersistFile = NULL; + IPropertySetStorage* piProperties = NULL; + IPropertyStorage* piStorage = NULL; + + // create an internet shortcut object + WcaLog(LOGMSG_STANDARD, "Creating IUniformResourceLocatorW shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + hr = ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_ALL, IID_IUniformResourceLocatorW, (void**)&piURL); + ExitOnFailure(hr, "failed to create an instance of IUniformResourceLocatorW"); + + // set shortcut target + hr = piURL->SetURL(wzTarget, 0); + ExitOnFailure(hr, "failed to set shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + + if (wzIconPath) + { + WcaLog(LOGMSG_STANDARD, "Adding icon '%ls' index '%d'", wzIconPath, iconIndex); + + hr = piURL->QueryInterface(IID_IPropertySetStorage, (void **)&piProperties); + ExitOnFailure(hr, "failed to get IPropertySetStorage for shortcut '%ls'", wzShortcutPath); + + hr = piProperties->Open(FMTID_Intshcut, STGM_WRITE, &piStorage); + ExitOnFailure(hr, "failed to open storage for shortcut '%ls'", wzShortcutPath); + + PROPSPEC ppids[2] = { {PRSPEC_PROPID, PID_IS_ICONINDEX}, {PRSPEC_PROPID, PID_IS_ICONFILE} }; + PROPVARIANT ppvar[2]; + + PropVariantInit(ppvar); + PropVariantInit(ppvar + 1); + + ppvar[0].vt = VT_I4; + ppvar[0].lVal = iconIndex; + ppvar[1].vt = VT_LPWSTR; + ppvar[1].pwszVal = const_cast(wzIconPath); + + hr = piStorage->WriteMultiple(2, ppids, ppvar, 0); + ExitOnFailure(hr, "failed to write icon storage for shortcut '%ls'", wzShortcutPath); + + hr = piStorage->Commit(STGC_DEFAULT); + ExitOnFailure(hr, "failed to commit icon storage for shortcut '%ls'", wzShortcutPath); + } + + // get an IPersistFile and save the shortcut + hr = piURL->QueryInterface(IID_IPersistFile, (void**)&piPersistFile); + ExitOnFailure(hr, "failed to get IPersistFile for shortcut '%ls'", wzShortcutPath); + + hr = piPersistFile->Save(wzShortcutPath, TRUE); + ExitOnFailure(hr, "failed to save shortcut '%ls'", wzShortcutPath); + +LExit: + ReleaseObject(piPersistFile); + ReleaseObject(piURL); + ReleaseObject(piStorage); + ReleaseObject(piProperties); + + return hr; +} + +/****************************************************************** + CreateLink - Creates a shortcut via IShellLinkW + +*******************************************************************/ +static HRESULT CreateLink( + __in_z LPCWSTR wzTarget, + __in_z LPCWSTR wzShortcutPath, + __in_z_opt LPCWSTR wzIconPath, + __in int iconIndex +) +{ + HRESULT hr = S_OK; + IShellLinkW* piShellLink = NULL; + IPersistFile* piPersistFile = NULL; + + // create an internet shortcut object + WcaLog(LOGMSG_STANDARD, "Creating IShellLinkW shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&piShellLink); + ExitOnFailure(hr, "failed to create an instance of IShellLinkW"); + + // set shortcut target + hr = piShellLink->SetPath(wzTarget); + ExitOnFailure(hr, "failed to set shortcut '%ls' target '%ls'", wzShortcutPath, wzTarget); + + if (wzIconPath) + { + WcaLog(LOGMSG_STANDARD, "Adding icon '%ls' index '%d'", wzIconPath, iconIndex); + hr = piShellLink->SetIconLocation(wzIconPath, iconIndex); + ExitOnFailure(hr, "failed to set icon for shortcut '%ls'", wzShortcutPath); + } + + // get an IPersistFile and save the shortcut + hr = piShellLink->QueryInterface(IID_IPersistFile, (void**)&piPersistFile); + ExitOnFailure(hr, "failed to get IPersistFile for shortcut '%ls'", wzShortcutPath); + + hr = piPersistFile->Save(wzShortcutPath, TRUE); + ExitOnFailure(hr, "failed to save shortcut '%ls'", wzShortcutPath); + +LExit: + ReleaseObject(piPersistFile); + ReleaseObject(piShellLink); + + return hr; +} + + + +/****************************************************************** + WixCreateInternetShortcuts - entry point for Internet shortcuts + custom action +*******************************************************************/ +extern "C" UINT __stdcall WixCreateInternetShortcuts( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzTarget = NULL; + LPWSTR pwzShortcutPath = NULL; + LPWSTR pwzIconPath = NULL; + BOOL fInitializedCom = FALSE; + int iAttr = 0; + int iIconIndex = 0; + + // initialize + hr = WcaInitialize(hInstall, "WixCreateInternetShortcuts"); + ExitOnFailure(hr, "failed to initialize WixCreateInternetShortcuts"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + // extract the custom action data + hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + // loop through all the custom action data + pwz = pwzCustomActionData; + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); + ExitOnFailure(hr, "failed to read shortcut path from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzTarget); + ExitOnFailure(hr, "failed to read shortcut target from custom action data"); + hr = WcaReadIntegerFromCaData(&pwz, &iAttr); + ExitOnFailure(hr, "failed to read shortcut attributes from custom action data"); + hr = WcaReadStringFromCaData(&pwz, &pwzIconPath); + ExitOnFailure(hr, "failed to read shortcut icon path from custom action data"); + hr = WcaReadIntegerFromCaData(&pwz, &iIconIndex); + ExitOnFailure(hr, "failed to read shortcut icon index from custom action data"); + + if ((iAttr & esaURL) == esaURL) + { + hr = CreateUrl(pwzTarget, pwzShortcutPath, pwzIconPath, iIconIndex); + } + else + { + hr = CreateLink(pwzTarget, pwzShortcutPath, pwzIconPath, iIconIndex); + } + ExitOnFailure(hr, "failed to create Internet shortcut"); + + // tick the progress bar + hr = WcaProgressMessage(COST_INTERNETSHORTCUT, FALSE); + ExitOnFailure(hr, "failed to tick progress bar for shortcut: %ls", pwzShortcutPath); + } + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzTarget); + ReleaseStr(pwzShortcutPath); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er; + return WcaFinalize(er); +} + + + +/****************************************************************** + WixRollbackInternetShortcuts - entry point for Internet shortcuts + custom action (rollback) +*******************************************************************/ +extern "C" UINT __stdcall WixRollbackInternetShortcuts( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzShortcutPath = NULL; + int iAttr = 0; + + // initialize + hr = WcaInitialize(hInstall, "WixRemoveInternetShortcuts"); + ExitOnFailure(hr, "failed to initialize WixRemoveInternetShortcuts"); + + hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + // loop through all the custom action data + pwz = pwzCustomActionData; + while (pwz && *pwz) + { + // extract the custom action data we're interested in + hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); + ExitOnFailure(hr, "failed to read shortcut path from custom action data for rollback"); + + // delete file + hr = FileEnsureDelete(pwzShortcutPath); + ExitOnFailure(hr, "failed to delete file '%ls'", pwzShortcutPath); + + // skip over the shortcut target and attributes + hr = WcaReadStringFromCaData(&pwz, &pwzShortcutPath); + ExitOnFailure(hr, "failed to skip shortcut target from custom action data for rollback"); + hr = WcaReadIntegerFromCaData(&pwz, &iAttr); + ExitOnFailure(hr, "failed to read shortcut attributes from custom action data"); + } + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzShortcutPath); + + er = FAILED(hr) ? ERROR_INSTALL_FAILURE : er; + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/precomp.h b/src/ext/Util/ca/precomp.h new file mode 100644 index 00000000..c5d6afe5 --- /dev/null +++ b/src/ext/Util/ca/precomp.h @@ -0,0 +1,54 @@ +#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. + + +#if _WIN32_MSI < 150 +#define _WIN32_MSI 150 +#endif + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include // NetApi32.lib +#include +#include +#include +#include + +#define MAXUINT USHRT_MAX + +#include "wcautil.h" +#include "wcawow64.h" +#include "wcawrapquery.h" +#include "aclutil.h" +#include "dirutil.h" +#include "fileutil.h" +#include "memutil.h" +#include "osutil.h" +#include "pathutil.h" +#include "procutil.h" +#include "shelutil.h" +#include "strutil.h" +#include "sczutil.h" +#include "rmutil.h" +#include "userutil.h" +#include "xmlutil.h" +#include "wiutil.h" + +#include "CustomMsiErrors.h" + +#include "sca.h" +#include "scacost.h" +#include "cost.h" +#include "scauser.h" +#include "scasmb.h" +#include "scasmbexec.h" + +#include "caDecor.h" diff --git a/src/ext/Util/ca/qtexecca.cpp b/src/ext/Util/ca/qtexecca.cpp new file mode 100644 index 00000000..ddcc812f --- /dev/null +++ b/src/ext/Util/ca/qtexecca.cpp @@ -0,0 +1,316 @@ +// 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" + +#define OUTPUT_BUFFER 1024 + +// These old "CA" prefix names are deprecated, and intended to go away in wix 4.0, only staying now for compatibility reasons +const LPCWSTR CAQUIET_TIMEOUT_PROPERTY = L"QtExecCmdTimeout"; +const LPCWSTR CAQUIET_ARGUMENTS_PROPERTY = L"QtExecCmdLine"; +const LPCWSTR CAQUIET64_ARGUMENTS_PROPERTY = L"QtExec64CmdLine"; +// end deprecated section + +// WixCA name quiet commandline argument properties +const LPCWSTR WIX_QUIET_ARGUMENTS_PROPERTY = L"WixQuietExecCmdLine"; +const LPCWSTR WIX_QUIET64_ARGUMENTS_PROPERTY = L"WixQuietExec64CmdLine"; + +// WixCA quiet timeout properties +const LPCWSTR WIX_QUIET_TIMEOUT_PROPERTY = L"WixQuietExecCmdTimeout"; +const LPCWSTR WIX_QUIET64_TIMEOUT_PROPERTY = L"WixQuietExec64CmdTimeout"; + +// WixCA silent commandline argument properties +const LPCWSTR WIX_SILENT_ARGUMENTS_PROPERTY = L"WixSilentExecCmdLine"; +const LPCWSTR WIX_SILENT64_ARGUMENTS_PROPERTY = L"WixSilentExec64CmdLine"; + +// WixCA silent timeout properties +const LPCWSTR WIX_SILENT_TIMEOUT_PROPERTY = L"WixSilentExecCmdTimeout"; +const LPCWSTR WIX_SILENT64_TIMEOUT_PROPERTY = L"WixSilentExec64CmdTimeout"; + +HRESULT BuildCommandLine( + __in LPCWSTR wzProperty, + __out LPWSTR *ppwzCommand + ) +{ + Assert(ppwzCommand); + + HRESULT hr = S_OK; + BOOL fScheduled = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_SCHEDULED); + BOOL fRollback = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_ROLLBACK); + BOOL fCommit = ::MsiGetMode(WcaGetInstallHandle(), MSIRUNMODE_COMMIT); + + if (fScheduled || fRollback || fCommit) + { + if (WcaIsPropertySet("CustomActionData")) + { + hr = WcaGetProperty( L"CustomActionData", ppwzCommand); + ExitOnFailure(hr, "Failed to get CustomActionData"); + } + } + else if (WcaIsUnicodePropertySet(wzProperty)) + { + hr = WcaGetFormattedProperty(wzProperty, ppwzCommand); + ExitOnFailure(hr, "Failed to get %ls", wzProperty); + hr = WcaSetProperty(wzProperty, L""); // clear out the property now that we've read it + ExitOnFailure(hr, "Failed to set %ls", wzProperty); + } + + if (!*ppwzCommand) + { + ExitOnFailure(hr = E_INVALIDARG, "Failed to get command line data"); + } + + if (L'"' != **ppwzCommand) + { + WcaLog(LOGMSG_STANDARD, "Command string must begin with quoted application name."); + ExitOnFailure(hr = E_INVALIDARG, "invalid command line property value"); + } + +LExit: + return hr; +} + +#define ONEMINUTE 60000 + +DWORD GetTimeout(LPCWSTR wzPropertyName) +{ + DWORD dwTimeout = ONEMINUTE; + HRESULT hr = S_OK; + + LPWSTR pwzData = NULL; + + if (WcaIsUnicodePropertySet(wzPropertyName)) + { + hr = WcaGetProperty(wzPropertyName, &pwzData); + ExitOnFailure(hr, "Failed to get %ls", wzPropertyName); + + if ((dwTimeout = (DWORD)_wtoi(pwzData)) == 0) + { + dwTimeout = ONEMINUTE; + } + } + +LExit: + ReleaseStr(pwzData); + + return dwTimeout; + +} + +HRESULT ExecCommon( + __in LPCWSTR wzArgumentsProperty, + __in LPCWSTR wzTimeoutProperty, + __in BOOL fLogCommand, + __in BOOL fLogOutput + ) +{ + HRESULT hr = S_OK; + LPWSTR pwzCommand = NULL; + DWORD dwTimeout = 0; + + hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); + ExitOnFailure(hr, "Failed to get Command Line"); + + dwTimeout = GetTimeout(wzTimeoutProperty); + + hr = QuietExec(pwzCommand, dwTimeout, fLogCommand, fLogOutput); + ExitOnFailure(hr, "QuietExec Failed"); + +LExit: + ReleaseStr(pwzCommand); + + return hr; +} + +HRESULT ExecCommon64( + __in LPCWSTR wzArgumentsProperty, + __in LPCWSTR wzTimeoutProperty, + __in BOOL fLogCommand, + __in BOOL fLogOutput + ) +{ + HRESULT hr = S_OK; + LPWSTR pwzCommand = NULL; + DWORD dwTimeout = 0; +#ifndef _WIN64 + BOOL fIsWow64Initialized = FALSE; + BOOL fRedirected = FALSE; + + hr = WcaInitializeWow64(); + if (S_FALSE == hr) + { + hr = TYPE_E_DLLFUNCTIONNOTFOUND; + } + ExitOnFailure(hr, "Failed to intialize WOW64."); + fIsWow64Initialized = TRUE; + + hr = WcaDisableWow64FSRedirection(); + ExitOnFailure(hr, "Failed to enable filesystem redirection."); + fRedirected = TRUE; +#endif + + hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); + ExitOnFailure(hr, "Failed to get Command Line"); + + dwTimeout = GetTimeout(wzTimeoutProperty); + + hr = QuietExec(pwzCommand, dwTimeout, fLogCommand, fLogOutput); + ExitOnFailure(hr, "QuietExec64 Failed"); + +LExit: + ReleaseStr(pwzCommand); + +#ifndef _WIN64 + if (fRedirected) + { + WcaRevertWow64FSRedirection(); + } + + if (fIsWow64Initialized) + { + WcaFinalizeWow64(); + } +#endif + + return hr; +} + +// These two custom actions are deprecated, and should go away in wix v4.0. WixQuietExec replaces this one, +// and is not intended to have any difference in behavior apart from CA name and property names. +extern "C" UINT __stdcall CAQuietExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "CAQuietExec"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon(CAQUIET_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +// 2nd deprecated custom action name, superseded by WixQuietExec64 +extern "C" UINT __stdcall CAQuietExec64( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "CAQuietExec64"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon64(CAQUIET64_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon64 method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixQuietExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQuietExec"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon(WIX_QUIET_ARGUMENTS_PROPERTY, WIX_QUIET_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixQuietExec64( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixQuietExec64"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon64(WIX_QUIET64_ARGUMENTS_PROPERTY, WIX_QUIET64_TIMEOUT_PROPERTY, TRUE, TRUE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixSilentExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixSilentExec"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon(WIX_SILENT_ARGUMENTS_PROPERTY, WIX_SILENT_TIMEOUT_PROPERTY, FALSE, FALSE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixSilentExec64( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "WixSilentExec64"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ExecCommon64(WIX_SILENT64_ARGUMENTS_PROPERTY, WIX_SILENT64_TIMEOUT_PROPERTY, FALSE, FALSE); + ExitOnFailure(hr, "Failed in ExecCommon method"); + +LExit: + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/sca.h b/src/ext/Util/ca/sca.h new file mode 100644 index 00000000..599122ff --- /dev/null +++ b/src/ext/Util/ca/sca.h @@ -0,0 +1,19 @@ +#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. + +// user creation attributes definitions +enum SCAU_ATTRIBUTES +{ + SCAU_DONT_EXPIRE_PASSWRD = 0x00000001, + SCAU_PASSWD_CANT_CHANGE = 0x00000002, + SCAU_PASSWD_CHANGE_REQD_ON_LOGIN = 0x00000004, + SCAU_DISABLE_ACCOUNT = 0x00000008, + SCAU_FAIL_IF_EXISTS = 0x00000010, + SCAU_UPDATE_IF_EXISTS = 0x00000020, + SCAU_ALLOW_LOGON_AS_SERVICE = 0x00000040, + SCAU_ALLOW_LOGON_AS_BATCH = 0x00000080, + + SCAU_DONT_REMOVE_ON_UNINSTALL = 0x00000100, + SCAU_DONT_CREATE_USER = 0x00000200, + SCAU_NON_VITAL = 0x00000400, +}; \ No newline at end of file diff --git a/src/ext/Util/ca/scacost.h b/src/ext/Util/ca/scacost.h new file mode 100644 index 00000000..5b215035 --- /dev/null +++ b/src/ext/Util/ca/scacost.h @@ -0,0 +1,18 @@ +#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. + + +const UINT COST_PERFMON_REGISTER = 1000; +const UINT COST_PERFMON_UNREGISTER = 1000; + +const UINT COST_SMB_CREATESMB = 10000; +const UINT COST_SMB_DROPSMB = 5000; +const UINT COST_USER_ADD = 10000; +const UINT COST_USER_DELETE = 10000; + +const UINT COST_PERFMONMANIFEST_REGISTER = 1000; +const UINT COST_PERFMONMANIFEST_UNREGISTER = 1000; + +const UINT COST_EVENTMANIFEST_REGISTER = 1000; +const UINT COST_EVENTMANIFEST_UNREGISTER = 1000; + diff --git a/src/ext/Util/ca/scaexec.cpp b/src/ext/Util/ca/scaexec.cpp new file mode 100644 index 00000000..5845c1b4 --- /dev/null +++ b/src/ext/Util/ca/scaexec.cpp @@ -0,0 +1,1082 @@ +// 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" + + +/******************************************************************** + * CreateSmb - CUSTOM ACTION ENTRY POINT for creating fileshares + * + * Input: deferred CustomActionData - + * wzFsKey\twzShareDesc\twzFullPath\tfIntegratedAuth\twzUserName\tnPermissions\twzUserName\tnPermissions... + * + * ****************************************************************/ +extern "C" UINT __stdcall CreateSmb(MSIHANDLE hInstall) +{ +//AssertSz(0, "debug CreateSmb"); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFsKey = NULL; + LPWSTR pwzShareDesc = NULL; + LPWSTR pwzDirectory = NULL; + int iAccessMode = 0; + DWORD nExPermissions = 0; + BOOL fIntegratedAuth; + LPWSTR pwzExUser = NULL; + SCA_SMBP ssp = {0}; + DWORD dwExUserPerms = 0; + DWORD dwCounter = 0; + SCA_SMBP_USER_PERMS* pUserPermsList = NULL; + + hr = WcaInitialize(hInstall, "CreateSmb"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty( L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name + ExitOnFailure(hr, "failed to read share name"); + hr = WcaReadStringFromCaData(&pwz, &pwzShareDesc); // share description + ExitOnFailure(hr, "failed to read share name"); + hr = WcaReadStringFromCaData(&pwz, &pwzDirectory); // full path to share + ExitOnFailure(hr, "failed to read share name"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&fIntegratedAuth)); + ExitOnFailure(hr, "failed to read integrated authentication"); + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwExUserPerms)); + ExitOnFailure(hr, "failed to read count of permissions to set"); + if(dwExUserPerms > 0) + { + pUserPermsList = static_cast(MemAlloc(sizeof(SCA_SMBP_USER_PERMS)*dwExUserPerms, TRUE)); + ExitOnNull(pUserPermsList, hr, E_OUTOFMEMORY, "failed to allocate memory for permissions structure"); + + //Pull out all of the ExUserPerm strings + for (dwCounter = 0; dwCounter < dwExUserPerms; ++dwCounter) + { + hr = WcaReadStringFromCaData(&pwz, &pwzExUser); // user account + ExitOnFailure(hr, "failed to read user account"); + pUserPermsList[dwCounter].wzUser = pwzExUser; + pwzExUser = NULL; + + hr = WcaReadIntegerFromCaData(&pwz, &iAccessMode); + ExitOnFailure(hr, "failed to read access mode"); + pUserPermsList[dwCounter].accessMode = (ACCESS_MODE)iAccessMode; + iAccessMode = 0; + + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&nExPermissions)); + ExitOnFailure(hr, "failed to read count of permissions"); + pUserPermsList[dwCounter].nPermissions = nExPermissions; + nExPermissions = 0; + } + } + + ssp.wzKey = pwzFsKey; + ssp.wzDescription = pwzShareDesc; + ssp.wzDirectory = pwzDirectory; + ssp.fUseIntegratedAuth = fIntegratedAuth; + ssp.dwUserPermissionCount = dwExUserPerms; + ssp.pUserPerms = pUserPermsList; + + hr = ScaEnsureSmbExists(&ssp); + MessageExitOnFailure(hr, msierrSMBFailedCreate, "failed to create share: '%ls'", pwzFsKey); + + hr = WcaProgressMessage(COST_SMB_CREATESMB, FALSE); + +LExit: + ReleaseStr(pwzFsKey); + ReleaseStr(pwzShareDesc); + ReleaseStr(pwzDirectory); + ReleaseStr(pwzData); + + if (pUserPermsList) + { + MemFree(pUserPermsList); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + + +/******************************************************************** + DropSmb - CUSTOM ACTION ENTRY POINT for creating fileshares + + Input: deferred CustomActionData - wzFsKey\twzShareDesc\twzFullPath\tnPermissions\tfIntegratedAuth\twzUserName\twzPassword + + * ****************************************************************/ +extern "C" UINT __stdcall DropSmb(MSIHANDLE hInstall) +{ + //AssertSz(0, "debug DropSmb"); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzFsKey = NULL; + SCA_SMBP ssp = {0}; + + hr = WcaInitialize(hInstall, "DropSmb"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty( L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name + ExitOnFailure(hr, "failed to read share name"); + + ssp.wzKey = pwzFsKey; + + hr = ScaDropSmb(&ssp); + MessageExitOnFailure(hr, msierrSMBFailedDrop, "failed to delete share: '%ls'", pwzFsKey); + + hr = WcaProgressMessage(COST_SMB_DROPSMB, FALSE); + +LExit: + ReleaseStr(pwzFsKey); + ReleaseStr(pwzData); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + + +static HRESULT AddUserToGroup( + __in LPWSTR wzUser, + __in LPCWSTR wzUserDomain, + __in LPCWSTR wzGroup, + __in LPCWSTR wzGroupDomain + ) +{ + Assert(wzUser && *wzUser && wzUserDomain && wzGroup && *wzGroup && wzGroupDomain); + + HRESULT hr = S_OK; + IADsGroup *pGroup = NULL; + BSTR bstrUser = NULL; + BSTR bstrGroup = NULL; + LPCWSTR wz = NULL; + LPWSTR pwzUser = NULL; + LOCALGROUP_MEMBERS_INFO_3 lgmi; + + if (*wzGroupDomain) + { + wz = wzGroupDomain; + } + + // Try adding it to the global group first + UINT ui = ::NetGroupAddUser(wz, wzGroup, wzUser); + if (NERR_GroupNotFound == ui) + { + // Try adding it to the local group + if (wzUserDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzUserDomain, wzUser); + ExitOnFailure(hr, "failed to allocate user domain string"); + } + + lgmi.lgrmi3_domainandname = (NULL == pwzUser ? wzUser : pwzUser); + ui = ::NetLocalGroupAddMembers(wz, wzGroup, 3 , reinterpret_cast(&lgmi), 1); + } + hr = HRESULT_FROM_WIN32(ui); + if (HRESULT_FROM_WIN32(ERROR_MEMBER_IN_ALIAS) == hr) // if they're already a member of the group don't report an error + hr = S_OK; + + // + // If we failed, try active directory + // + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to add user: %ls, domain %ls to group: %ls, domain: %ls with error 0x%x. Attempting to use Active Directory", wzUser, wzUserDomain, wzGroup, wzGroupDomain, hr); + + hr = UserCreateADsPath(wzUserDomain, wzUser, &bstrUser); + ExitOnFailure(hr, "failed to create user ADsPath for user: %ls domain: %ls", wzUser, wzUserDomain); + + hr = UserCreateADsPath(wzGroupDomain, wzGroup, &bstrGroup); + ExitOnFailure(hr, "failed to create group ADsPath for group: %ls domain: %ls", wzGroup, wzGroupDomain); + + hr = ::ADsGetObject(bstrGroup,IID_IADsGroup, reinterpret_cast(&pGroup)); + ExitOnFailure(hr, "Failed to get group '%ls'.", reinterpret_cast(bstrGroup) ); + + hr = pGroup->Add(bstrUser); + if ((HRESULT_FROM_WIN32(ERROR_OBJECT_ALREADY_EXISTS) == hr) || (HRESULT_FROM_WIN32(ERROR_MEMBER_IN_ALIAS) == hr)) + hr = S_OK; + + ExitOnFailure(hr, "Failed to add user %ls to group '%ls'.", reinterpret_cast(bstrUser), reinterpret_cast(bstrGroup) ); + } + +LExit: + ReleaseObject(pGroup); + ReleaseBSTR(bstrUser); + ReleaseBSTR(bstrGroup); + + return hr; +} + +static HRESULT RemoveUserFromGroup( + __in LPWSTR wzUser, + __in LPCWSTR wzUserDomain, + __in LPCWSTR wzGroup, + __in LPCWSTR wzGroupDomain + ) +{ + Assert(wzUser && *wzUser && wzUserDomain && wzGroup && *wzGroup && wzGroupDomain); + + HRESULT hr = S_OK; + IADsGroup *pGroup = NULL; + BSTR bstrUser = NULL; + BSTR bstrGroup = NULL; + LPCWSTR wz = NULL; + LPWSTR pwzUser = NULL; + LOCALGROUP_MEMBERS_INFO_3 lgmi; + + if (*wzGroupDomain) + { + wz = wzGroupDomain; + } + + // Try removing it from the global group first + UINT ui = ::NetGroupDelUser(wz, wzGroup, wzUser); + if (NERR_GroupNotFound == ui) + { + // Try removing it from the local group + if (wzUserDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzUserDomain, wzUser); + ExitOnFailure(hr, "failed to allocate user domain string"); + } + + lgmi.lgrmi3_domainandname = (NULL == pwzUser ? wzUser : pwzUser); + ui = ::NetLocalGroupDelMembers(wz, wzGroup, 3 , reinterpret_cast(&lgmi), 1); + } + hr = HRESULT_FROM_WIN32(ui); + + // + // If we failed, try active directory + // + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to remove user: %ls, domain %ls from group: %ls, domain: %ls with error 0x%x. Attempting to use Active Directory", wzUser, wzUserDomain, wzGroup, wzGroupDomain, hr); + + hr = UserCreateADsPath(wzUserDomain, wzUser, &bstrUser); + ExitOnFailure(hr, "failed to create user ADsPath in order to remove user: %ls domain: %ls from a group", wzUser, wzUserDomain); + + hr = UserCreateADsPath(wzGroupDomain, wzGroup, &bstrGroup); + ExitOnFailure(hr, "failed to create group ADsPath in order to remove user from group: %ls domain: %ls", wzGroup, wzGroupDomain); + + hr = ::ADsGetObject(bstrGroup,IID_IADsGroup, reinterpret_cast(&pGroup)); + ExitOnFailure(hr, "Failed to get group '%ls'.", reinterpret_cast(bstrGroup) ); + + hr = pGroup->Remove(bstrUser); + ExitOnFailure(hr, "Failed to remove user %ls from group '%ls'.", reinterpret_cast(bstrUser), reinterpret_cast(bstrGroup) ); + } + +LExit: + ReleaseObject(pGroup); + ReleaseBSTR(bstrUser); + ReleaseBSTR(bstrGroup); + + return hr; +} + + +static HRESULT GetUserHasRight( + __in LSA_HANDLE hPolicy, + __in PSID pUserSid, + __in LPWSTR wzRight, + __out BOOL* fHasRight +) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + LSA_UNICODE_STRING lucPrivilege = { 0 }; + PLSA_ENUMERATION_INFORMATION rgSids = NULL; + ULONG cSids = 0; + *fHasRight = FALSE; + + lucPrivilege.Buffer = wzRight; + lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); + lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); + + nt = ::LsaEnumerateAccountsWithUserRight(hPolicy, &lucPrivilege, reinterpret_cast(&rgSids), &cSids); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to enumerate users for right: %ls", lucPrivilege.Buffer); + + for (DWORD i = 0; i < cSids; ++i) + { + PLSA_ENUMERATION_INFORMATION pInfo = rgSids + i; + if (::EqualSid(pUserSid, pInfo->Sid)) + { + *fHasRight = TRUE; + break; + } + } + +LExit: + if (rgSids) + { + ::LsaFreeMemory(rgSids); + } + + return hr; +} + + +static HRESULT GetExistingUserRightsAssignments( + __in_opt LPCWSTR wzDomain, + __in LPCWSTR wzName, + __inout int* iAttributes +) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + BOOL fHasRight = FALSE; + + LSA_HANDLE hPolicy = NULL; + LSA_OBJECT_ATTRIBUTES objectAttributes = { 0 }; + + LPWSTR pwzUser = NULL; + PSID psid = NULL; + + if (wzDomain && *wzDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); + ExitOnFailure(hr, "Failed to allocate user with domain string"); + } + else + { + hr = StrAllocString(&pwzUser, wzName, 0); + ExitOnFailure(hr, "Failed to allocate string from user name."); + } + + hr = AclGetAccountSid(NULL, pwzUser, &psid); + ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); + + nt = ::LsaOpenPolicy(NULL, &objectAttributes, POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, &hPolicy); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to open LSA policy store"); + + hr = GetUserHasRight(hPolicy, psid, L"SeServiceLogonRight", &fHasRight); + ExitOnFailure(hr, "Failed to check LogonAsService right"); + + if (fHasRight) + { + *iAttributes |= SCAU_ALLOW_LOGON_AS_SERVICE; + } + + hr = GetUserHasRight(hPolicy, psid, L"SeBatchLogonRight", &fHasRight); + ExitOnFailure(hr, "Failed to check LogonAsBatchJob right"); + + if (fHasRight) + { + *iAttributes |= SCAU_ALLOW_LOGON_AS_BATCH; + } + +LExit: + if (hPolicy) + { + ::LsaClose(hPolicy); + } + + ReleaseSid(psid); + ReleaseStr(pwzUser); + return hr; +} + + +static HRESULT ModifyUserLocalServiceRight( + __in_opt LPCWSTR wzDomain, + __in LPCWSTR wzName, + __in BOOL fAdd + ) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + + LPWSTR pwzUser = NULL; + PSID psid = NULL; + LSA_HANDLE hPolicy = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes = { 0 }; + LSA_UNICODE_STRING lucPrivilege = { 0 }; + + if (wzDomain && *wzDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); + ExitOnFailure(hr, "Failed to allocate user with domain string"); + } + else + { + hr = StrAllocString(&pwzUser, wzName, 0); + ExitOnFailure(hr, "Failed to allocate string from user name."); + } + + hr = AclGetAccountSid(NULL, pwzUser, &psid); + ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); + + nt = ::LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_ALL_ACCESS, &hPolicy); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to open LSA policy store."); + + lucPrivilege.Buffer = L"SeServiceLogonRight"; + lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); + lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); + + if (fAdd) + { + nt = ::LsaAddAccountRights(hPolicy, psid, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to add 'logon as service' bit to user: %ls", pwzUser); + } + else + { + nt = ::LsaRemoveAccountRights(hPolicy, psid, FALSE, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to remove 'logon as service' bit from user: %ls", pwzUser); + } + +LExit: + if (hPolicy) + { + ::LsaClose(hPolicy); + } + + ReleaseSid(psid); + ReleaseStr(pwzUser); + return hr; +} + + +static HRESULT ModifyUserLocalBatchRight( + __in_opt LPCWSTR wzDomain, + __in LPCWSTR wzName, + __in BOOL fAdd + ) +{ + HRESULT hr = S_OK; + NTSTATUS nt = 0; + + LPWSTR pwzUser = NULL; + PSID psid = NULL; + LSA_HANDLE hPolicy = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes = { 0 }; + LSA_UNICODE_STRING lucPrivilege = { 0 }; + + if (wzDomain && *wzDomain) + { + hr = StrAllocFormatted(&pwzUser, L"%s\\%s", wzDomain, wzName); + ExitOnFailure(hr, "Failed to allocate user with domain string"); + } + else + { + hr = StrAllocString(&pwzUser, wzName, 0); + ExitOnFailure(hr, "Failed to allocate string from user name."); + } + + hr = AclGetAccountSid(NULL, pwzUser, &psid); + ExitOnFailure(hr, "Failed to get SID for user: %ls", pwzUser); + + nt = ::LsaOpenPolicy(NULL, &ObjectAttributes, POLICY_ALL_ACCESS, &hPolicy); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to open LSA policy store."); + + lucPrivilege.Buffer = L"SeBatchLogonRight"; + lucPrivilege.Length = static_cast(lstrlenW(lucPrivilege.Buffer) * sizeof(WCHAR)); + lucPrivilege.MaximumLength = (lucPrivilege.Length + 1) * sizeof(WCHAR); + + if (fAdd) + { + nt = ::LsaAddAccountRights(hPolicy, psid, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to add 'logon as batch job' bit to user: %ls", pwzUser); + } + else + { + nt = ::LsaRemoveAccountRights(hPolicy, psid, FALSE, &lucPrivilege, 1); + hr = HRESULT_FROM_WIN32(::LsaNtStatusToWinError(nt)); + ExitOnFailure(hr, "Failed to remove 'logon as batch job' bit from user: %ls", pwzUser); + } + + LExit: + if (hPolicy) + { + ::LsaClose(hPolicy); + } + + ReleaseSid(psid); + ReleaseStr(pwzUser); + return hr; +} + +static void SetUserPasswordAndAttributes( + __in USER_INFO_1* puserInfo, + __in LPWSTR wzPassword, + __in int iAttributes + ) +{ + Assert(puserInfo); + + // Set the User's password + puserInfo->usri1_password = wzPassword; + + // Apply the Attributes + if (SCAU_DONT_EXPIRE_PASSWRD & iAttributes) + { + puserInfo->usri1_flags |= UF_DONT_EXPIRE_PASSWD; + } + else + { + puserInfo->usri1_flags &= ~UF_DONT_EXPIRE_PASSWD; + } + + if (SCAU_PASSWD_CANT_CHANGE & iAttributes) + { + puserInfo->usri1_flags |= UF_PASSWD_CANT_CHANGE; + } + else + { + puserInfo->usri1_flags &= ~UF_PASSWD_CANT_CHANGE; + } + + if (SCAU_DISABLE_ACCOUNT & iAttributes) + { + puserInfo->usri1_flags |= UF_ACCOUNTDISABLE; + } + else + { + puserInfo->usri1_flags &= ~UF_ACCOUNTDISABLE; + } + + if (SCAU_PASSWD_CHANGE_REQD_ON_LOGIN & iAttributes) // TODO: for some reason this doesn't work + { + puserInfo->usri1_flags |= UF_PASSWORD_EXPIRED; + } + else + { + puserInfo->usri1_flags &= ~UF_PASSWORD_EXPIRED; + } +} + + +static HRESULT RemoveUserInternal( + LPWSTR wzGroupCaData, + LPWSTR wzDomain, + LPWSTR wzName, + int iAttributes +) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzGroup = NULL; + LPWSTR pwzGroupDomain = NULL; + LPCWSTR wz = NULL; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + + // + // Remove the logon as service privilege. + // + if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) + { + hr = ModifyUserLocalServiceRight(wzDomain, wzName, FALSE); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to remove logon as service right from user, continuing..."); + hr = S_OK; + } + } + + if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) + { + hr = ModifyUserLocalBatchRight(wzDomain, wzName, FALSE); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to remove logon as batch job right from user, continuing..."); + hr = S_OK; + } + } + + // + // Remove the User Account if the user was created by us. + // + if (!(SCAU_DONT_CREATE_USER & iAttributes)) + { + if (wzDomain && *wzDomain) + { + er = ::DsGetDcNameW(NULL, (LPCWSTR)wzDomain, NULL, NULL, NULL, &pDomainControllerInfo); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW(NULL, (LPCWSTR)wzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo); + } + if (ERROR_SUCCESS == er) + { + wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + else + { + wz = wzDomain; + } + } + + er = ::NetUserDel(wz, wzName); + if (NERR_UserNotFound == er) + { + er = NERR_Success; + } + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to delete user account: %ls", wzName); + } + else + { + // + // Remove the user from the groups + // + pwz = wzGroupCaData; + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); + + if (FAILED(hr)) + { + WcaLogError(hr, "failed to get domain for group: %ls, continuing anyway.", pwzGroup); + } + else + { + hr = RemoveUserFromGroup(wzName, wzDomain, pwzGroup, pwzGroupDomain); + if (FAILED(hr)) + { + WcaLogError(hr, "failed to remove user: %ls from group %ls, continuing anyway.", wzName, pwzGroup); + } + } + } + + if (E_NOMOREITEMS == hr) // if there are no more items, all is well + { + hr = S_OK; + } + + ExitOnFailure(hr, "failed to get next group from which to remove user:%ls", wzName); + } + +LExit: + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + } + + return hr; +} + + +/******************************************************************** + CreateUser - CUSTOM ACTION ENTRY POINT for creating users + + Input: deferred CustomActionData - UserName\tDomain\tPassword\tAttributes\tGroupName\tDomain\tGroupName\tDomain... + * *****************************************************************/ +extern "C" UINT __stdcall CreateUser( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(0, "Debug CreateUser"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzDomain = NULL; + LPWSTR pwzScriptKey = NULL; + LPWSTR pwzPassword = NULL; + LPWSTR pwzGroup = NULL; + LPWSTR pwzGroupDomain = NULL; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + int iAttributes = 0; + BOOL fInitializedCom = FALSE; + + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + int iOriginalAttributes = 0; + int iRollbackAttributes = 0; + + USER_INFO_1 userInfo; + USER_INFO_1* puserInfo = NULL; + DWORD dw; + LPCWSTR wz = NULL; + + hr = WcaInitialize(hInstall, "CreateUser"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = WcaGetProperty( L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // + // Read in the CustomActionData + // + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to read user name from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to read domain from custom action data"); + + hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); + ExitOnFailure(hr, "failed to read attributes from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + ExitOnFailure(hr, "failed to read encoding key from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzPassword); + ExitOnFailure(hr, "failed to read password from custom action data"); + + // There is no rollback scheduled if the key is empty. + // Best effort to get original configuration and save it in the script so rollback can restore it. + if (*pwzScriptKey) + { + hr = WcaCaScriptCreate(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, FALSE, &hRollbackScript); + ExitOnFailure(hr, "Failed to open rollback CustomAction script."); + + iRollbackAttributes = 0; + hr = GetExistingUserRightsAssignments(pwzDomain, pwzName, &iOriginalAttributes); + if (FAILED(hr)) + { + WcaLogError(hr, "failed to get existing user rights: %ls, continuing anyway.", pwzName); + } + else + { + if (!(SCAU_ALLOW_LOGON_AS_SERVICE & iOriginalAttributes) && (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes)) + { + iRollbackAttributes |= SCAU_ALLOW_LOGON_AS_SERVICE; + } + if (!(SCAU_ALLOW_LOGON_AS_BATCH & iOriginalAttributes) && (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes)) + { + iRollbackAttributes |= SCAU_ALLOW_LOGON_AS_BATCH; + } + } + + hr = WcaCaScriptWriteNumber(hRollbackScript, iRollbackAttributes); + ExitOnFailure(hr, "Failed to add data to rollback script."); + + // Nudge the system to get all our rollback data written to disk. + WcaCaScriptFlush(hRollbackScript); + } + + if (!(SCAU_DONT_CREATE_USER & iAttributes)) + { + ::ZeroMemory(&userInfo, sizeof(USER_INFO_1)); + userInfo.usri1_name = pwzName; + userInfo.usri1_priv = USER_PRIV_USER; + userInfo.usri1_flags = UF_SCRIPT; + userInfo.usri1_home_dir = NULL; + userInfo.usri1_comment = NULL; + userInfo.usri1_script_path = NULL; + + SetUserPasswordAndAttributes(&userInfo, pwzPassword, iAttributes); + + // + // Create the User + // + if (pwzDomain && *pwzDomain) + { + er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, NULL, &pDomainControllerInfo ); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW( NULL, (LPCWSTR)pwzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo ); + } + if (ERROR_SUCCESS == er) + { + wz = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + else + { + wz = pwzDomain; + } + } + + er = ::NetUserAdd(wz, 1, reinterpret_cast(&userInfo), &dw); + if (NERR_UserExists == er) + { + if (SCAU_UPDATE_IF_EXISTS & iAttributes) + { + er = ::NetUserGetInfo(wz, pwzName, 1, reinterpret_cast(&puserInfo)); + if (NERR_Success == er) + { + // Change the existing user's password and attributes again then try + // to update user with this new data + SetUserPasswordAndAttributes(puserInfo, pwzPassword, iAttributes); + + er = ::NetUserSetInfo(wz, pwzName, 1, reinterpret_cast(puserInfo), &dw); + } + } + else if (!(SCAU_FAIL_IF_EXISTS & iAttributes)) + { + er = NERR_Success; + } + } + else if (NERR_PasswordTooShort == er || NERR_PasswordTooLong == er) + { + MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrUSRFailedUserCreatePswd, "failed to create user: %ls due to invalid password.", pwzName); + } + MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrUSRFailedUserCreate, "failed to create user: %ls", pwzName); + } + + if (SCAU_ALLOW_LOGON_AS_SERVICE & iAttributes) + { + hr = ModifyUserLocalServiceRight(pwzDomain, pwzName, TRUE); + MessageExitOnFailure(hr, msierrUSRFailedGrantLogonAsService, "Failed to grant logon as service rights to user: %ls", pwzName); + } + + if (SCAU_ALLOW_LOGON_AS_BATCH & iAttributes) + { + hr = ModifyUserLocalBatchRight(pwzDomain, pwzName, TRUE); + MessageExitOnFailure(hr, msierrUSRFailedGrantLogonAsService, "Failed to grant logon as batch job rights to user: %ls", pwzName); + } + + // + // Add the users to groups + // + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzGroup))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzGroupDomain); + ExitOnFailure(hr, "failed to get domain for group: %ls", pwzGroup); + + hr = AddUserToGroup(pwzName, pwzDomain, pwzGroup, pwzGroupDomain); + MessageExitOnFailure(hr, msierrUSRFailedUserGroupAdd, "failed to add user: %ls to group %ls", pwzName, pwzGroup); + } + if (E_NOMOREITEMS == hr) // if there are no more items, all is well + { + hr = S_OK; + } + ExitOnFailure(hr, "failed to get next group in which to include user:%ls", pwzName); + +LExit: + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_PRESERVE); + + if (puserInfo) + { + ::NetApiBufferFree((LPVOID)puserInfo); + } + + if (pDomainControllerInfo) + { + ::NetApiBufferFree((LPVOID)pDomainControllerInfo); + } + + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzDomain); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzPassword); + ReleaseStr(pwzGroup); + ReleaseStr(pwzGroupDomain); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + if (SCAU_NON_VITAL & iAttributes) + { + er = ERROR_SUCCESS; + } + else if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + + +/******************************************************************** + CreateUserRollback - CUSTOM ACTION ENTRY POINT for CreateUser rollback + + * *****************************************************************/ +extern "C" UINT __stdcall CreateUserRollback( + MSIHANDLE hInstall +) +{ + //AssertSz(0, "Debug CreateUserRollback"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzDomain = NULL; + LPWSTR pwzScriptKey = NULL; + int iAttributes = 0; + BOOL fInitializedCom = FALSE; + + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + LPWSTR pwzRollbackData = NULL; + int iOriginalAttributes = 0; + + hr = WcaInitialize(hInstall, "CreateUserRollback"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // + // Read in the CustomActionData + // + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + ExitOnFailure(hr, "failed to read encoding key from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to read name from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to read domain from custom action data"); + + hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); + ExitOnFailure(hr, "failed to read attributes from custom action data"); + + // Best effort to read original configuration from CreateUser. + hr = WcaCaScriptOpen(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, &hRollbackScript); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to open rollback CustomAction script, continuing anyway."); + } + else + { + hr = WcaCaScriptReadAsCustomActionData(hRollbackScript, &pwzRollbackData); + if (FAILED(hr)) + { + WcaLogError(hr, "Failed to read rollback script into CustomAction data, continuing anyway."); + } + else + { + WcaLog(LOGMSG_TRACEONLY, "Rollback Data: %ls", pwzRollbackData); + + pwz = pwzRollbackData; + hr = WcaReadIntegerFromCaData(&pwz, &iOriginalAttributes); + if (FAILED(hr)) + { + WcaLogError(hr, "failed to read attributes from rollback data, continuing anyway"); + } + else + { + iAttributes |= iOriginalAttributes; + } + } + } + + hr = RemoveUserInternal(pwz, pwzDomain, pwzName, iAttributes); + +LExit: + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_DELETE); + + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzDomain); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzRollbackData); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + + +/******************************************************************** + RemoveUser - CUSTOM ACTION ENTRY POINT for removing users + + Input: deferred CustomActionData - Name\tDomain + * *****************************************************************/ +extern "C" UINT __stdcall RemoveUser( + MSIHANDLE hInstall +) +{ + //AssertSz(0, "Debug RemoveUser"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzData = NULL; + LPWSTR pwz = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzDomain = NULL; + int iAttributes = 0; + BOOL fInitializedCom = FALSE; + + hr = WcaInitialize(hInstall, "RemoveUser"); + ExitOnFailure(hr, "failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // + // Read in the CustomActionData + // + pwz = pwzData; + hr = WcaReadStringFromCaData(&pwz, &pwzName); + ExitOnFailure(hr, "failed to read name from custom action data"); + + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to read domain from custom action data"); + + hr = WcaReadIntegerFromCaData(&pwz, &iAttributes); + ExitOnFailure(hr, "failed to read attributes from custom action data"); + + hr = RemoveUserInternal(pwz, pwzDomain, pwzName, iAttributes); + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzDomain); + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/scamanifest.cpp b/src/ext/Util/ca/scamanifest.cpp new file mode 100644 index 00000000..adb8d3d3 --- /dev/null +++ b/src/ext/Util/ca/scamanifest.cpp @@ -0,0 +1,377 @@ +// 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" + +LPCWSTR vcsPerfmonManifestQuery = L"SELECT `Component_`, `File`, `ResourceFileDirectory` FROM `Wix4PerfmonManifest`"; +LPCWSTR vcsEventManifestQuery = L"SELECT `Component_`, `File` FROM `Wix4EventManifest`"; +enum ePerfMonManifestQuery { pfmComponent = 1, pfmFile, pfmResourceFileDir }; +enum eEventManifestQuery { emComponent = 1, emFile}; + +BOOL IsVistaOrAbove() +{ + OSVERSIONINFO osvi; + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + #pragma warning(suppress: 4996) //TODO: use non-deprecated function to check OS version + if (!::GetVersionEx(&osvi)) + { + return false; + } + return osvi.dwMajorVersion >= 6; +} + + +/******************************************************************** + ConfigurePerfmonManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling + Perfmon counter manifest registering + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonManifestRegister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzResourceFilePath = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonManifestReg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because the target system does not support perfmon manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"Wix4PerfmonManifest")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestRegister() because Wix4PerfmonManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMonManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMonManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMonManifest"); + if (!WcaIsInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMonManifest"); + + hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); + ExitOnFailure(hr, "failed to get ApplicationIdentity for PerfMonManifest"); + size_t iResourcePath = lstrlenW(pwzResourceFilePath); + if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') + *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' + + hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmonManifest action"); + + if ( *pwzResourceFilePath ) + { + hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + } + else + { + hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + } + + WcaLog(LOGMSG_VERBOSE, "RegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RegisterPerfmonManifest action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMonManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzResourceFilePath); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + ConfigurePerfmonUninstall - CUSTOM ACTION ENTRY POINT for uninstalling + Perfmon counters + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonManifestUnregister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzResourceFilePath = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonManifestUnreg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because the target system does not support perfmon manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (WcaTableExists(L"Wix4PerfmonManifest") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigurePerfmonManifestUnregister() because Wix4PerfmonManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfmonManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4PerfmonManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pfmComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for Wix4PerfmonManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for Wix4PerfmonManifest"); + if (!WcaIsUninstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, pfmFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for Wix4PerfmonManifest"); + + hr = WcaGetRecordFormattedString(hRec, pfmResourceFileDir, &pwzResourceFilePath); + ExitOnFailure(hr, "failed to get ApplicationIdentity for Wix4PerfmonManifest"); + size_t iResourcePath = lstrlenW(pwzResourceFilePath); + if ( iResourcePath > 0 && *(pwzResourceFilePath + iResourcePath -1) == L'\\') + *(pwzResourceFilePath + iResourcePath -1) = 0; //remove the trailing '\' + + hr = StrAllocFormatted(&pwzCommand, L"\"lodctr.exe\" /m:\"%s\" \"%s\"", pwzFile, pwzResourceFilePath); + ExitOnFailure(hr, "failed to copy string in Wix4PerfmonManifest"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmonManifest action"); + + hr = StrAllocFormatted(&pwzCommand, L"\"unlodctr.exe\" /m:\"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in PerfMonManifest"); + + WcaLog(LOGMSG_VERBOSE, "UnRegisterPerfmonManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfmonManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule UnregisterPerfmonManifest action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMonManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzResourceFilePath); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + +/******************************************************************** + ConfigureEventManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling + Event manifest registering + +********************************************************************/ +extern "C" UINT __stdcall ConfigureEventManifestRegister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigureEventManifestReg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because the target system does not support event manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"Wix4EventManifest")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestRegister() because Wix4EventManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4EventManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, emComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for Wix4EventManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for Wix4EventManifest"); + if (!WcaIsInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for Wix4EventManifest"); + + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule RollbackRegisterEventManifest action"); + + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); + WcaLog(LOGMSG_VERBOSE, "RegisterEventManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterEventManifest"), pwzCommand, COST_EVENTMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RegisterEventManifest action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing Wix4EventManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + + +/******************************************************************** + ConfigureEventManifestRegister - CUSTOM ACTION ENTRY POINT for scheduling + Event manifest registering + +********************************************************************/ +extern "C" UINT __stdcall ConfigureEventManifestUnregister( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzFile = NULL, pwzCommand = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigureEventManifestUnreg"); + ExitOnFailure(hr, "Failed to initialize"); + + if (!IsVistaOrAbove()) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because the target system does not support event manifest"); + ExitFunction1(hr = S_FALSE); + } + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"Wix4EventManifest")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ConfigureEventManifestUnregister() because Wix4EventManifest table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsEventManifestQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4EventManifest table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, emComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for Wix4EventManifest"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for Wix4EventManifest"); + + // nothing to do on an install + // schedule the rollback action when reinstalling to re-register pre-patch manifest + if (!WcaIsUninstalling(isInstalled, isAction) && !WcaIsReInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordFormattedString(hRec, emFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for Wix4EventManifest"); + + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" im \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_REGISTER); + ExitOnFailure(hr, "failed to schedule RollbackUnregisterEventManifest action"); + + // no need to uninstall on a repair/patch. Register action will re-register and update the manifest. + if (!WcaIsReInstalling(isInstalled, isAction)) + { + hr = StrAllocFormatted(&pwzCommand, L"\"wevtutil.exe\" um \"%s\"", pwzFile); + ExitOnFailure(hr, "failed to copy string in Wix4EventManifest"); + WcaLog(LOGMSG_VERBOSE, "UnregisterEventManifest's CustomActionData: '%ls'", pwzCommand); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterEventManifest"), pwzCommand, COST_PERFMONMANIFEST_UNREGISTER); + ExitOnFailure(hr, "failed to schedule UnregisterEventManifest action"); + } + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing Wix4EventManifest"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzFile); + ReleaseStr(pwzCommand); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + diff --git a/src/ext/Util/ca/scaperf.cpp b/src/ext/Util/ca/scaperf.cpp new file mode 100644 index 00000000..fd301278 --- /dev/null +++ b/src/ext/Util/ca/scaperf.cpp @@ -0,0 +1,310 @@ +// 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" + +LPCWSTR vcsPerfCounterDataQuery = L"SELECT `Wix4PerformanceCategory`, `Component_`, `Name`, `IniData`, `ConstantData` FROM `Wix4PerformanceCategory`"; +enum ePerfCounterDataQuery { pcdqId = 1, pcdqComponent, pcdqName, pcdqIniData, pcdqConstantData }; + +LPCWSTR vcsPerfMonQuery = L"SELECT `Component_`, `File`, `Name` FROM `Wix4Perfmon`"; +enum ePerfMonQuery { pmqComponent = 1, pmqFile, pmqName }; + + +static HRESULT ProcessPerformanceCategory( + __in MSIHANDLE hInstall, + __in BOOL fInstall + ); + + +/******************************************************************** + InstallPerfCounterData - CUSTOM ACTION ENTRY POINT for installing + Performance Counters. + +********************************************************************/ +extern "C" UINT __stdcall InstallPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug InstallPerfCounterData{}"); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "InstallPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize InstallPerfCounterData."); + + hr = ProcessPerformanceCategory(hInstall, TRUE); + MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to process Wix4PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + UninstallPerfCounterData - CUSTOM ACTION ENTRY POINT for installing + Performance Counters. + +********************************************************************/ +extern "C" UINT __stdcall UninstallPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug UninstallPerfCounterData{}"); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "UninstallPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize UninstallPerfCounterData."); + + hr = ProcessPerformanceCategory(hInstall, FALSE); + MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to process Wix4PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + RegisterPerfmon - CUSTOM ACTION ENTRY POINT for installing Perfmon counters + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonInstall( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzName = NULL, pwzFile = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonInstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"Wix4Perfmon")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping RegisterPerfmon() because Wix4Perfmon table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfMonQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMon table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pmqComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMon"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMon"); + if (!WcaIsInstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordString(hRec, pmqName, &pwzName); + ExitOnFailure(hr, "failed to get Name for PerfMon"); + + hr = WcaGetRecordFormattedString(hRec, pmqFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMon"); + + WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonInstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "failed to schedule RegisterPerfmon action"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "failed to schedule RollbackRegisterPerfmon action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMon"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzFile); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + ConfigurePerfmonUninstall - CUSTOM ACTION ENTRY POINT for uninstalling + Perfmon counters + +********************************************************************/ +extern "C" UINT __stdcall ConfigurePerfmonUninstall( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + HRESULT hr; + UINT er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzData = NULL, pwzName = NULL, pwzFile = NULL; + INSTALLSTATE isInstalled, isAction; + + hr = WcaInitialize(hInstall, "ConfigurePerfmonUninstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (WcaTableExists(L"Wix4Perfmon") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping UnregisterPerfmon() because Wix4Perfmon table not present"); + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfMonQuery, &hView); + ExitOnFailure(hr, "failed to open view on PerfMon table"); + while ((hr = WcaFetchRecord(hView, &hRec)) == S_OK) + { + // get component install state + hr = WcaGetRecordString(hRec, pmqComponent, &pwzData); + ExitOnFailure(hr, "failed to get Component for PerfMon"); + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for PerfMon"); + if (!WcaIsUninstalling(isInstalled, isAction)) + { + continue; + } + + hr = WcaGetRecordString(hRec, pmqName, &pwzName); + ExitOnFailure(hr, "failed to get Name for PerfMon"); + + hr = WcaGetRecordFormattedString(hRec, pmqFile, &pwzFile); + ExitOnFailure(hr, "failed to get File for PerfMon"); + + WcaLog(LOGMSG_VERBOSE, "ConfigurePerfmonUninstall's CustomActionData: '%ls', '%ls'", pwzName, pwzFile); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfmon"), pwzName, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "failed to schedule UnregisterPerfmon action"); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfmon"), pwzFile, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "failed to schedule RollbackUnregisterPerfmon action"); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing PerfMon"); + + hr = S_OK; + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzFile); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + + +static HRESULT ProcessPerformanceCategory( + __in MSIHANDLE hInstall, + __in BOOL fInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + PMSIHANDLE hView, hRec; + LPWSTR pwzId = NULL; + LPWSTR pwzComponent = NULL; + LPWSTR pwzName = NULL; + LPWSTR pwzData = NULL; + INSTALLSTATE isInstalled, isAction; + + LPWSTR pwzCustomActionData = NULL; + + // check to see if necessary tables are specified + if (S_OK != WcaTableExists(L"Wix4PerformanceCategory")) + { + ExitFunction1(hr = S_FALSE); + } + + hr = WcaOpenExecuteView(vcsPerfCounterDataQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4PerformanceCategory table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, pcdqId, &pwzId); + ExitOnFailure(hr, "Failed to get id for Wix4PerformanceCategory."); + + // Check to see if the Component is being installed or uninstalled + // when we are processing the same. + hr = WcaGetRecordString(hRec, pcdqComponent, &pwzComponent); + ExitOnFailure(hr, "Failed to get Component for Wix4PerformanceCategory: %ls", pwzId); + + er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get Component state for Wix4PerformanceCategory: %ls", pwzId); + + if ((fInstall && !WcaIsInstalling(isInstalled, isAction)) || + (!fInstall && !WcaIsUninstalling(isInstalled, isAction))) + { + continue; + } + + hr = WcaGetRecordString(hRec, pcdqName, &pwzName); + ExitOnFailure(hr, "Failed to get Name for Wix4PerformanceCategory: %ls", pwzId); + hr = WcaWriteStringToCaData(pwzName, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add Name to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); + + hr = WcaGetRecordString(hRec, pcdqIniData, &pwzData); + ExitOnFailure(hr, "Failed to get IniData for Wix4PerformanceCategory: %ls", pwzId); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add IniData to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); + + hr = WcaGetRecordString(hRec, pcdqConstantData, &pwzData); + ExitOnFailure(hr, "Failed to get ConstantData for Wix4PerformanceCategory: %ls", pwzId); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add ConstantData to CustomActionData for Wix4PerformanceCategory: %ls", pwzId); + } + + if (hr == E_NOMOREITEMS) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure while processing Wix4PerformanceCategory table."); + + // If there was any data built up, schedule it for execution. + if (pwzCustomActionData) + { + if (fInstall) + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackRegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "Failed to schedule RollbackRegisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RegisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "Failed to schedule RegisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); + } + else + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackUnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_REGISTER); + ExitOnFailure(hr, "Failed to schedule RollbackUnregisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"UnregisterPerfCounterData"), pwzCustomActionData, COST_PERFMON_UNREGISTER); + ExitOnFailure(hr, "Failed to schedule UnregisterPerfCounterData action for Wix4PerformanceCategory: %ls", pwzId); + } + } + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzName); + ReleaseStr(pwzComponent); + ReleaseStr(pwzId); + + return hr; +} diff --git a/src/ext/Util/ca/scaperfexec.cpp b/src/ext/Util/ca/scaperfexec.cpp new file mode 100644 index 00000000..c5425754 --- /dev/null +++ b/src/ext/Util/ca/scaperfexec.cpp @@ -0,0 +1,423 @@ +// 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" + +typedef DWORD (STDAPICALLTYPE *PFNPERFCOUNTERTEXTSTRINGS)(LPWSTR lpCommandLine, BOOL bQuietModeArg); + +static HRESULT ExecutePerfCounterData( + __in MSIHANDLE hInstall, + __in BOOL fInstall + ); +static HRESULT CreateDataFile( + __in LPCWSTR wzTempFolder, + __in LPCWSTR wzData, + __in BOOL fIniData, + __out HANDLE *phFile, + __out_opt LPWSTR *ppwzFile + ); + + +/******************************************************************** + RegisterPerfCounterData - CUSTOM ACTION ENTRY POINT for registering + performance counters + + Input: deferred CustomActionData: wzName\twzIniData\twzConstantData\twzName\twzIniData\twzConstantData\t... +*******************************************************************/ +extern "C" UINT __stdcall RegisterPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug RegisterPerfCounterData()"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "RegisterPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize RegisterPerfCounterData."); + + hr = ExecutePerfCounterData(hInstall, TRUE); + MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + UnregisterPerfCounterData - CUSTOM ACTION ENTRY POINT for registering + performance counters + + Input: deferred CustomActionData: wzName\twzIniData\twzConstantData\twzName\twzIniData\twzConstantData\t... +*******************************************************************/ +extern "C" UINT __stdcall UnregisterPerfCounterData( + __in MSIHANDLE hInstall + ) +{ + // AssertSz(FALSE, "debug UnregisterPerfCounterData()"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + hr = WcaInitialize(hInstall, "UnregisterPerfCounterData"); + ExitOnFailure(hr, "Failed to initialize UnregisterPerfCounterData."); + + hr = ExecutePerfCounterData(hInstall, FALSE); + MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); + +LExit: + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** + RegisterPerfmon - CUSTOM ACTION ENTRY POINT for registering + counters + + Input: deferred CustomActionData - + wzFile or wzName +*******************************************************************/ +extern "C" UINT __stdcall RegisterPerfmon( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + LPWSTR pwzData = NULL; + + HMODULE hMod = NULL; + PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; + DWORD dwRet; + LPWSTR pwzShortPath = NULL; + DWORD cchShortPath = MAX_PATH; + DWORD cchShortPathLength = 0; + + LPWSTR pwzCommand = NULL; + + hr = WcaInitialize(hInstall, "RegisterPerfmon"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // do the perfmon registration + if (NULL == hMod) + { + hr = LoadSystemLibrary(L"loadperf.dll", &hMod); + } + ExitOnFailure(hr, "failed to load DLL for PerfMon"); + + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hMod, "LoadPerfCounterTextStringsW"); + ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "failed to get DLL function for PerfMon"); + + hr = StrAlloc(&pwzShortPath, cchShortPath); + ExitOnFailure(hr, "failed to allocate string"); + + WcaLog(LOGMSG_VERBOSE, "Converting DLL path to short format: %ls", pwzData); + cchShortPathLength = ::GetShortPathNameW(pwzData, pwzShortPath, cchShortPath); + if (cchShortPathLength > cchShortPath) + { + cchShortPath = cchShortPathLength + 1; + hr = StrAlloc(&pwzShortPath, cchShortPath); + ExitOnFailure(hr, "failed to allocate string"); + + cchShortPathLength = ::GetShortPathNameW(pwzData, pwzShortPath, cchShortPath); + } + + if (0 == cchShortPathLength) + { + ExitOnLastError(hr, "failed to get short path format of path: %ls", pwzData); + } + + hr = StrAllocFormatted(&pwzCommand, L"lodctr \"%s\"", pwzShortPath); + ExitOnFailure(hr, "failed to format lodctr string"); + + WcaLog(LOGMSG_VERBOSE, "RegisterPerfmon running command: '%ls'", pwzCommand); + dwRet = (*pfnPerfCounterTextString)(pwzCommand, TRUE); + if (dwRet != ERROR_SUCCESS && dwRet != ERROR_ALREADY_EXISTS) + { + hr = HRESULT_FROM_WIN32(dwRet); + MessageExitOnFailure(hr, msierrPERFMONFailedRegisterDLL, "failed to register with PerfMon, DLL: %ls", pwzData); + } + + hr = S_OK; +LExit: + ReleaseStr(pwzData); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +extern "C" UINT __stdcall UnregisterPerfmon( + __in MSIHANDLE hInstall + ) +{ +// Assert(FALSE); + UINT er = ERROR_SUCCESS; + HRESULT hr = S_OK; + LPWSTR pwzData = NULL; + + HMODULE hMod = NULL; + PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString; + DWORD dwRet; + WCHAR wz[255]; + + hr = WcaInitialize(hInstall, "UnregisterPerfmon"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + // do the perfmon unregistration + hr = E_FAIL; + if (hMod == NULL) + { + hr = LoadSystemLibrary(L"loadperf.dll", &hMod); + } + ExitOnFailure(hr, "failed to load DLL for PerfMon"); + + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hMod, "UnloadPerfCounterTextStringsW"); + ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "failed to get DLL function for PerfMon"); + + hr = ::StringCchPrintfW(wz, countof(wz), L"unlodctr \"%s\"", pwzData); + ExitOnFailure(hr, "Failed to format unlodctr string with: %ls", pwzData); + WcaLog(LOGMSG_VERBOSE, "UnregisterPerfmon running command: '%ls'", wz); + dwRet = (*pfnPerfCounterTextString)(wz, TRUE); + // if the counters aren't registered, then OK to continue + if (dwRet != ERROR_SUCCESS && dwRet != ERROR_FILE_NOT_FOUND && dwRet != ERROR_BADKEY) + { + hr = HRESULT_FROM_WIN32(dwRet); + MessageExitOnFailure(hr, msierrPERFMONFailedUnregisterDLL, "failed to unregsister with PerfMon, DLL: %ls", pwzData); + } + + hr = S_OK; +LExit: + ReleaseStr(pwzData); + + if (FAILED(hr)) + er = ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +static HRESULT ExecutePerfCounterData( + __in MSIHANDLE /*hInstall*/, + __in BOOL fInstall + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + HMODULE hModule = NULL; + PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString = NULL; + LPCWSTR wzPrefix = NULL; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + + LPWSTR pwzName = NULL; + LPWSTR pwzIniData = NULL; + LPWSTR pwzConstantData = NULL; + LPWSTR pwzTempFolder = NULL; + LPWSTR pwzIniFile = NULL; + LPWSTR pwzExecute = NULL; + + HANDLE hIniData = INVALID_HANDLE_VALUE; + HANDLE hConstantData = INVALID_HANDLE_VALUE; + + // Load the system performance counter helper DLL then get the appropriate + // entrypoint out of it. Fortunately, they have the same signature so we + // can use one function pointer to point to both. + hr = LoadSystemLibrary(L"loadperf.dll", &hModule); + ExitOnFailure(hr, "failed to load DLL for PerfMon"); + + if (fInstall) + { + wzPrefix = L"lodctr"; + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hModule, "LoadPerfCounterTextStringsW"); + } + else + { + wzPrefix = L"unlodctr"; + pfnPerfCounterTextString = (PFNPERFCOUNTERTEXTSTRINGS)::GetProcAddress(hModule, "UnloadPerfCounterTextStringsW"); + } + ExitOnNullWithLastError(pfnPerfCounterTextString, hr, "Failed to get DLL function for PerfMon"); + + // Now get the CustomActionData and execute it. + hr = WcaGetProperty(L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "Failed to get CustomActionData."); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + while (S_OK == (hr = WcaReadStringFromCaData(&pwz, &pwzName))) + { + hr = WcaReadStringFromCaData(&pwz, &pwzIniData); + ExitOnFailure(hr, "Failed to read IniData from custom action data."); + + hr = WcaReadStringFromCaData(&pwz, &pwzConstantData); + ExitOnFailure(hr, "Failed to read ConstantData from custom action data."); + + if (fInstall) + { + hr = PathCreateTempDirectory(NULL, L"WIXPF%03x", 999, &pwzTempFolder); + ExitOnFailure(hr, "Failed to create temp directory."); + + hr = CreateDataFile(pwzTempFolder, pwzIniData, TRUE, &hIniData, &pwzIniFile); + ExitOnFailure(hr, "Failed to create .ini file for performance counter category: %ls", pwzName); + + hr = CreateDataFile(pwzTempFolder, pwzConstantData, FALSE, &hConstantData, NULL); + ExitOnFailure(hr, "Failed to create .h file for performance counter category: %ls", pwzName); + + hr = StrAllocFormatted(&pwzExecute, L"%s \"%s\"", wzPrefix, pwzIniFile); + ExitOnFailure(hr, "Failed to allocate string to execute."); + + // Execute the install. + er = (*pfnPerfCounterTextString)(pwzExecute, TRUE); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to execute install of performance counter category: %ls", pwzName); + + if (INVALID_HANDLE_VALUE != hIniData) + { + ::CloseHandle(hIniData); + hIniData = INVALID_HANDLE_VALUE; + } + + if (INVALID_HANDLE_VALUE != hConstantData) + { + ::CloseHandle(hConstantData); + hConstantData = INVALID_HANDLE_VALUE; + } + + DirEnsureDelete(pwzTempFolder, TRUE, TRUE); + } + else + { + hr = StrAllocFormatted(&pwzExecute, L"%s \"%s\"", wzPrefix, pwzName); + ExitOnFailure(hr, "Failed to allocate string to execute."); + + // Execute the uninstall and if the counter isn't registered then ignore + // the error since it won't hurt anything. + er = (*pfnPerfCounterTextString)(pwzExecute, TRUE); + if (ERROR_FILE_NOT_FOUND == er || ERROR_BADKEY == er) + { + er = ERROR_SUCCESS; + } + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to execute uninstall of performance counter category: %ls", pwzName); + } + } + + if (E_NOMOREITEMS == hr) // If there are no more items, all is well + { + hr = S_OK; + } + ExitOnFailure(hr, "Failed to execute all perf counter data."); + + hr = S_OK; + +LExit: + if (INVALID_HANDLE_VALUE != hIniData) + { + ::CloseHandle(hIniData); + } + + if (INVALID_HANDLE_VALUE != hConstantData) + { + ::CloseHandle(hConstantData); + } + + ReleaseStr(pwzExecute); + ReleaseStr(pwzIniFile); + ReleaseStr(pwzTempFolder); + ReleaseStr(pwzConstantData); + ReleaseStr(pwzIniData); + ReleaseStr(pwzName); + ReleaseStr(pwzCustomActionData); + + if (hModule) + { + ::FreeLibrary(hModule); + } + + return hr; +} + + +static HRESULT CreateDataFile( + __in LPCWSTR wzTempFolder, + __in LPCWSTR wzData, + __in BOOL fIniData, + __out HANDLE *phFile, + __out_opt LPWSTR *ppwzFile + ) +{ + HRESULT hr = S_OK; + HANDLE hFile = INVALID_HANDLE_VALUE; + LPWSTR pwzFile = NULL; + LPSTR pszData = NULL; + DWORD cbData = 0; + DWORD cbWritten = 0; + + // Convert the data to UTF-8 because lodctr/unloctr + // doesn't like unicode. + hr = StrAnsiAllocString(&pszData, wzData, 0, CP_UTF8); + ExitOnFailure(hr, "Failed to covert data to ANSI."); + + cbData = lstrlenA(pszData); + + // Concatenate the paths together, open the file data file + // and dump the data in there. + hr = StrAllocString(&pwzFile, wzTempFolder, 0); + ExitOnFailure(hr, "Failed to copy temp directory name."); + + hr = StrAllocConcat(&pwzFile, L"wixperf", 0); + ExitOnFailure(hr, "Failed to add name of file."); + + hr = StrAllocConcat(&pwzFile, fIniData ? L".ini" : L".h", 0); + ExitOnFailure(hr, "Failed to add extension of file."); + + hFile = ::CreateFileW(pwzFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == hFile) + { + ExitWithLastError(hr, "Failed to open new temp file: %ls", pwzFile); + } + + if (!::WriteFile(hFile, pszData, cbData, &cbWritten, NULL)) + { + ExitWithLastError(hr, "Failed to write data to new temp file: %ls", pwzFile); + } + + if (INVALID_HANDLE_VALUE != hFile) + { + ::CloseHandle(hFile); + hFile = INVALID_HANDLE_VALUE; + } + + // Return the requested values. + *phFile = hFile; + hFile = INVALID_HANDLE_VALUE; + + if (ppwzFile) + { + *ppwzFile = pwzFile; + pwzFile = NULL; + } + +LExit: + if (INVALID_HANDLE_VALUE != hFile) + { + ::CloseHandle(hFile); + } + ReleaseStr(pszData); + ReleaseStr(pwzFile); + + return hr; +} diff --git a/src/ext/Util/ca/scasched.cpp b/src/ext/Util/ca/scasched.cpp new file mode 100644 index 00000000..d81b1f14 --- /dev/null +++ b/src/ext/Util/ca/scasched.cpp @@ -0,0 +1,127 @@ +// 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" + + +/******************************************************************** +ConfigureSmb - CUSTOM ACTION ENTRY POINT for installing fileshare settings + +********************************************************************/ +extern "C" UINT __stdcall ConfigureSmbInstall( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + SCA_SMB* pssList = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ConfigureSmbInstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (WcaTableExists(L"Wix4FileShare") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); + ExitFunction1(hr = S_FALSE); + } + + hr = ScaSmbRead(&pssList); + ExitOnFailure(hr, "failed to read Wix4FileShare table"); + + hr = ScaSmbInstall(pssList); + ExitOnFailure(hr, "failed to install FileShares"); + +LExit: + if (pssList) + ScaSmbFreeList(pssList); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** +ConfigureSmb - CUSTOM ACTION ENTRY POINT for uninstalling fileshare settings + +********************************************************************/ +extern "C" UINT __stdcall ConfigureSmbUninstall( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + SCA_SMB* pssList = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ConfigureSmbUninstall"); + ExitOnFailure(hr, "Failed to initialize"); + + // check to see if necessary tables are specified + if (WcaTableExists(L"Wix4FileShare") != S_OK) + { + WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); + ExitFunction1(hr = S_FALSE); + } + + hr = ScaSmbRead(&pssList); + ExitOnFailure(hr, "failed to read Wix4FileShare table"); + + hr = ScaSmbUninstall(pssList); + ExitOnFailure(hr, "failed to uninstall FileShares"); + +LExit: + if (pssList) + ScaSmbFreeList(pssList); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/******************************************************************** +ConfigureUsers - CUSTOM ACTION ENTRY POINT for installing users + +********************************************************************/ +extern "C" UINT __stdcall ConfigureUsers( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(0, "Debug ConfigureUsers"); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + BOOL fInitializedCom = FALSE; + SCA_USER* psuList = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ConfigureUsers"); + ExitOnFailure(hr, "Failed to initialize"); + + hr = ::CoInitialize(NULL); + ExitOnFailure(hr, "failed to initialize COM"); + fInitializedCom = TRUE; + + hr = ScaUserRead(&psuList); + ExitOnFailure(hr, "failed to read Wix4User table"); + + hr = ScaUserExecute(psuList); + ExitOnFailure(hr, "failed to add/remove User actions"); + +LExit: + if (psuList) + { + ScaUserFreeList(psuList); + } + + if (fInitializedCom) + { + ::CoUninitialize(); + } + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} \ No newline at end of file diff --git a/src/ext/Util/ca/scasmb.h b/src/ext/Util/ca/scasmb.h new file mode 100644 index 00000000..f2a4b53c --- /dev/null +++ b/src/ext/Util/ca/scasmb.h @@ -0,0 +1,46 @@ +#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 "scauser.h" + +// structs +// Structure used to hold and extra user/permission pairs from the Wix4FileSharePermissions Table +struct SCA_SMB_EX_USER_PERMS +{ + int nPermissions; + ACCESS_MODE accessMode; + SCA_USER scau; + SCA_SMB_EX_USER_PERMS* pExUserPermsNext; +}; + +struct SCA_SMB // hungarian ss +{ + WCHAR wzId[MAX_DARWIN_KEY + 1]; + WCHAR wzShareName[MAX_DARWIN_KEY + 1]; + WCHAR wzDescription[MAX_DARWIN_COLUMN + 1]; + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + WCHAR wzDirectory[MAX_PATH + 1]; + + int nUserPermissionCount; + int nPermissions; + SCA_SMB_EX_USER_PERMS* pExUserPerms; + + INSTALLSTATE isInstalled, isAction; + + BOOL fUseIntegratedAuth; + BOOL fLegacyUserProvided; + struct SCA_USER scau; + + struct SCA_SMB* pssNext; +}; + + +#define RESERVED 0 + +// schedule prototypes +HRESULT ScaSmbRead(SCA_SMB** ppssList); +HRESULT ScaSmbExPermsRead(SCA_SMB* pss); +HRESULT ScaSmbUninstall(SCA_SMB* pssList); +HRESULT ScaSmbInstall(SCA_SMB* pssList); +void ScaSmbFreeList(SCA_SMB* pssList); diff --git a/src/ext/Util/ca/scasmbexec.cpp b/src/ext/Util/ca/scasmbexec.cpp new file mode 100644 index 00000000..ced3aa78 --- /dev/null +++ b/src/ext/Util/ca/scasmbexec.cpp @@ -0,0 +1,316 @@ +// 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" + + +/******************************************************************** + AllocateAcl - allocate an acl and populate it with this user and + permission information user could be user or domain\user + +********************************************************************/ +HRESULT AllocateAcl(SCA_SMBP* pssp, PACL* ppACL) +{ + HRESULT hr = S_OK; + EXPLICIT_ACCESSW* pEA = NULL; + DWORD cEA = 0; + DWORD dwCounter = 0; + + PSID psid = NULL; + LPCWSTR wzUser = NULL; + DWORD nPermissions = 0; + DWORD nErrorReturn = 0; + ACCESS_MODE accessMode = NOT_USED_ACCESS; + + cEA = pssp->dwUserPermissionCount + 1; + if (cEA >= MAXSIZE_T / sizeof(EXPLICIT_ACCESSW)) + { + ExitOnFailure(hr = E_OUTOFMEMORY, "Too many user permissions to allocate: %u", cEA); + } + + pEA = static_cast(MemAlloc(cEA * sizeof(EXPLICIT_ACCESSW), TRUE)); + ExitOnNull(pEA, hr, E_OUTOFMEMORY, "failed to allocate memory for explicit access structure"); + + // figure out how big the psid is + for (dwCounter = 0; dwCounter < pssp->dwUserPermissionCount; ++dwCounter) + { + wzUser = pssp->pUserPerms[dwCounter].wzUser; + nPermissions = pssp->pUserPerms[dwCounter].nPermissions; + accessMode = pssp->pUserPerms[dwCounter].accessMode; + // + // create the appropriate SID + // + + // figure out the right user to put into the access block + if (0 == lstrcmpW(wzUser, L"Everyone")) + { + hr = AclGetWellKnownSid(WinWorldSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"Administrators")) + { + hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"LocalSystem")) + { + hr = AclGetWellKnownSid(WinLocalSystemSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"LocalService")) + { + hr = AclGetWellKnownSid(WinLocalServiceSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"NetworkService")) + { + hr = AclGetWellKnownSid(WinNetworkServiceSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"AuthenticatedUser")) + { + hr = AclGetWellKnownSid(WinAuthenticatedUserSid, &psid); + } + else if (0 == lstrcmpW(wzUser, L"Guests")) + { + hr = AclGetWellKnownSid(WinBuiltinGuestsSid, &psid); + } + else if(0 == lstrcmpW(wzUser, L"CREATOR OWNER")) + { + hr = AclGetWellKnownSid(WinCreatorOwnerSid, &psid); + } + else + { + hr = AclGetAccountSid(NULL, wzUser, &psid); + } + ExitOnFailure(hr, "failed to get sid for account: %ls", wzUser); + + // we now have a valid pSid, fill in the EXPLICIT_ACCESS + + /* Permissions options: (see sca.sdh for defined sdl options) + #define GENERIC_READ (0x80000000L) 2147483648 + #define GENERIC_WRITE (0x40000000L) 1073741824 + #define GENERIC_EXECUTE (0x20000000L) 536870912 + #define GENERIC_ALL (0x10000000L) 268435456 + */ + pEA[dwCounter].grfAccessPermissions = nPermissions; + pEA[dwCounter].grfAccessMode = accessMode; + pEA[dwCounter].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; +#pragma prefast(push) +#pragma prefast(disable:25029) + ::BuildTrusteeWithSidW(&(pEA[dwCounter].Trustee), psid); +#pragma prefast(pop) + } + + // create a new ACL that contains the ACE + *ppACL = NULL; +#pragma prefast(push) +#pragma prefast(disable:25029) + nErrorReturn = ::SetEntriesInAclW(dwCounter, pEA, NULL, ppACL); +#pragma prefast(pop) + ExitOnFailure(hr = HRESULT_FROM_WIN32(nErrorReturn), "failed to allocate ACL"); + +LExit: + if (psid) + { + AclFreeSid(psid); + } + + ReleaseMem(pEA); + + return hr; +} + + + +/******************************************************************** + FillShareInfo - fill the NetShareAdd data structure + +********************************************************************/ +void FillShareInfo(SHARE_INFO_502* psi, SCA_SMBP* pssp, PSECURITY_DESCRIPTOR pSD) +{ + psi->shi502_netname = pssp->wzKey; + psi->shi502_type = STYPE_DISKTREE; + psi->shi502_remark = pssp->wzDescription; + psi->shi502_permissions = 0; // not used + psi->shi502_max_uses = 0xFFFFFFFF; + psi->shi502_current_uses = 0; + psi->shi502_path = pssp->wzDirectory; + psi->shi502_passwd = NULL; // not file share perms + psi->shi502_reserved = 0; + psi->shi502_security_descriptor = pSD; +} + + + +/* NET_API_STATUS return codes +NERR_Success = 0 +NERR_DuplicateShare = 2118 +NERR_BufTooSmall = 2123 +NERR_NetNameNotFound = 2310 +NERR_RedirectedPath = 2117 +NERR_UnknownDevDir = 2116 +*/ + +/******************************************************************** + DoesShareExists - Does a share of this name exist on this computer? + +********************************************************************/ +HRESULT DoesShareExist(__in LPWSTR wzShareName) +{ + HRESULT hr = S_OK; + NET_API_STATUS s; + SHARE_INFO_502* psi = NULL; + s = ::NetShareGetInfo(NULL, wzShareName, 502, (BYTE**) &psi); + + switch (s) + { + case NERR_Success: + hr = S_OK; + break; + case NERR_NetNameNotFound: + hr = E_FILENOTFOUND; + break; + default: + WcaLogError(s, "NetShareGetInfo returned an unexpected value.", NULL); + hr = HRESULT_FROM_WIN32(s); + break; + } + + ::NetApiBufferFree(psi); + + return hr; +} + + + +/******************************************************************** + CreateShare - create the file share on this computer + +********************************************************************/ +HRESULT CreateShare(SCA_SMBP* pssp) +{ + if (!pssp || !(pssp->wzKey)) + return E_INVALIDARG; + + HRESULT hr = S_OK; + PACL pACL = NULL; + SHARE_INFO_502 si; + NET_API_STATUS s; + DWORD dwParamErr = 0; + + BOOL fShareExists = SUCCEEDED(DoesShareExist(pssp->wzKey)); + + PSECURITY_DESCRIPTOR pSD = static_cast(MemAlloc(SECURITY_DESCRIPTOR_MIN_LENGTH, TRUE)); + ExitOnNull(pSD, hr, E_OUTOFMEMORY, "Failed to allocate memory for security descriptor"); + +#pragma prefast(push) +#pragma prefast(disable:25029) + if (!::InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) +#pragma prefast(pop) + { + ExitOnLastError(hr, "failed to initialize security descriptor"); + } + + hr = AllocateAcl(pssp, &pACL); + ExitOnFailure(hr, "Failed to allocate ACL for fileshare"); + + if (NULL == pACL) + { + WcaLog(LOGMSG_VERBOSE, "Ignoring NULL DACL."); + } +#pragma prefast(push) +#pragma prefast(disable:25028) // We only call this when pACL isn't NULL, so this call is safe according to the docs + // add the ACL to the security descriptor. + else if (!::SetSecurityDescriptorDacl(pSD, TRUE, pACL, FALSE)) + { + ExitOnLastError(hr, "Failed to set security descriptor"); + } +#pragma prefast(pop) + + // all that is left is to create the share + FillShareInfo(&si, pssp, pSD); + + // Fail if the directory doesn't exist + if (!DirExists(pssp->wzDirectory, NULL)) + ExitOnFailure(hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND), "Can't create a file share on directory that doesn't exist: %ls.", pssp->wzDirectory); + + WcaLog(LOGMSG_VERBOSE, "Creating file share on directory \'%ls\' named \'%ls\'.", pssp->wzDirectory, pssp->wzKey); + + if (!fShareExists) + { + s = ::NetShareAdd(NULL, 502, (BYTE*) &si, &dwParamErr); + WcaLog(LOGMSG_VERBOSE, "Adding a new file share."); + } + else + { + // The share exists. Write our new permissions over the top. + s = ::NetShareSetInfo(NULL, pssp->wzKey, 502, (BYTE*) &si, &dwParamErr); + WcaLog(LOGMSG_VERBOSE, "Setting permissions on existing share."); + } + + if (NERR_Success != s) + { + hr = E_FAIL; + if (!fShareExists && NERR_DuplicateShare == s) + WcaLog(LOGMSG_VERBOSE, "Duplicate error when existence check failed."); + + // error codes listed above. + ExitOnFailure(hr, "Failed to create/modify file share: Err: %d", s); + } + +LExit: + if (pACL) + { + ::LocalFree(pACL); + } + + ReleaseMem(pSD); + + return hr; +} + + +/******************************************************************** + ScaEnsureSmbExists + +********************************************************************/ +HRESULT ScaEnsureSmbExists(SCA_SMBP* pssp) +{ + HRESULT hr = S_OK; + + // create the share + hr = CreateShare(pssp); + + return hr; +} + + +// +// Delete File Shares - real work +// + +/******************************************************************** + ScaDropSmb - delete this file share from this computer + +********************************************************************/ +HRESULT ScaDropSmb(SCA_SMBP* pssp) +{ + HRESULT hr = S_OK; + NET_API_STATUS s; + + hr = DoesShareExist(pssp->wzKey); + + if (E_FILENOTFOUND == hr) + { + WcaLog(LOGMSG_VERBOSE, "Share doesn't exist, share removal skipped. (%ls)", pssp->wzKey); + ExitFunction1(hr = S_OK); + + } + + ExitOnFailure(hr, "Unable to detect share. (%ls)", pssp->wzKey); + + s = ::NetShareDel(NULL, pssp->wzKey, 0); + if (NERR_Success != s) + { + hr = E_FAIL; + ExitOnFailure(hr, "Failed to remove file share: Err: %d", s); + } + +LExit: + return hr; +} diff --git a/src/ext/Util/ca/scasmbexec.h b/src/ext/Util/ca/scasmbexec.h new file mode 100644 index 00000000..e3c8f8bb --- /dev/null +++ b/src/ext/Util/ca/scasmbexec.h @@ -0,0 +1,27 @@ +#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. + + +struct SCA_SMBP_USER_PERMS +{ + DWORD nPermissions; + ACCESS_MODE accessMode; + WCHAR* wzUser; + //Not adding Password because I can't find anywhere that it is used +}; + +struct SCA_SMBP // hungarian ssp +{ + WCHAR* wzKey; + WCHAR* wzDescription; + WCHAR* wzComponent; + WCHAR* wzDirectory; // full path of the dir to share to + + DWORD dwUserPermissionCount; //Count of SCA_SMBP_EX_USER_PERMS structures + SCA_SMBP_USER_PERMS* pUserPerms; + BOOL fUseIntegratedAuth; +}; + + +HRESULT ScaEnsureSmbExists(SCA_SMBP* pssp); +HRESULT ScaDropSmb(SCA_SMBP* pssp); diff --git a/src/ext/Util/ca/scasmbsched.cpp b/src/ext/Util/ca/scasmbsched.cpp new file mode 100644 index 00000000..e29f7f51 --- /dev/null +++ b/src/ext/Util/ca/scasmbsched.cpp @@ -0,0 +1,639 @@ +// 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" + + +/******************************************************************** + Helper functions to maintain a list of file shares to create / remove + +********************************************************************/ +SCA_SMB* NewSmb() +{ + SCA_SMB* pss = (SCA_SMB*)MemAlloc(sizeof(SCA_SMB), TRUE); + Assert(pss); + return pss; +} + + +SCA_SMB_EX_USER_PERMS* NewExUserPermsSmb() +{ + SCA_SMB_EX_USER_PERMS* pExUserPerms = (SCA_SMB_EX_USER_PERMS*)MemAlloc(sizeof(SCA_SMB_EX_USER_PERMS), TRUE); + Assert(pExUserPerms); + return pExUserPerms; +} + + +SCA_SMB* AddSmbToList(SCA_SMB* pssList, SCA_SMB* pss) +{ + if (pssList) + { + SCA_SMB* pssT = pssList; + while (pssT->pssNext) + { + pssT = pssT->pssNext; + } + + pssT->pssNext = pss; + } + else + { + pssList = pss; + } + + return pssList; +} + + +SCA_SMB_EX_USER_PERMS* AddExUserPermsSmbToList( + SCA_SMB_EX_USER_PERMS* pExUserPermsList, + SCA_SMB_EX_USER_PERMS* pExUserPerms + ) +{ + SCA_SMB_EX_USER_PERMS* pExUserPermsTemp = pExUserPermsList; + if (pExUserPermsList) + { + while (pExUserPermsTemp->pExUserPermsNext) + { + pExUserPermsTemp = pExUserPermsTemp->pExUserPermsNext; + } + + pExUserPermsTemp->pExUserPermsNext = pExUserPerms; + } + else + { + pExUserPermsList = pExUserPerms; + } + + return pExUserPermsList; +} + +void ScaSmbFreeList(SCA_SMB* pssList) +{ + SCA_SMB* pssDelete = pssList; + while (pssList) + { + pssDelete = pssList; + pssList = pssList->pssNext; + + MemFree(pssDelete); + } +} + +void ScaExUserPermsSmbFreeList(SCA_SMB_EX_USER_PERMS* pExUserPermsList) +{ + SCA_SMB_EX_USER_PERMS* pExUserPermsDelete = pExUserPermsList; + while (pExUserPermsList) + { + pExUserPermsDelete = pExUserPermsList; + pExUserPermsList = pExUserPermsList->pExUserPermsNext; + + MemFree(pExUserPermsDelete); + } +} + +// sql query constants +LPCWSTR vcsSmbQuery = L"SELECT `Wix4FileShare`, `ShareName`, `Description`, `Directory_`, " + L"`Component_`, `User_`, `Permissions` FROM `Wix4FileShare`"; + +enum eSmbQuery { + ssqFileShare = 1, + ssqShareName, + ssqDescription, + ssqDirectory, + ssqComponent, + ssqUser, + ssqPermissions + }; + + +/******************************************************************** + ScaSmbRead - read all of the information from the msi tables and + return a list of file share jobs to be done. + +********************************************************************/ +HRESULT ScaSmbRead(SCA_SMB** ppssList) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + + SCA_SMB* pss = NULL; + BOOL bUserPermissionsTableExists = FALSE; + + if (S_OK != WcaTableExists(L"Wix4FileShare")) + { + WcaLog(LOGMSG_VERBOSE, "Skipping ScaSmbCreateShare() - Wix4FileShare table not present"); + ExitFunction1(hr = S_FALSE); + } + + if (S_OK == WcaTableExists(L"Wix4FileSharePermissions")) + { + bUserPermissionsTableExists = TRUE; + } + else + { + WcaLog(LOGMSG_VERBOSE, "No Additional Permissions - Wix4FileSharePermissions table not present"); + } + + WcaLog(LOGMSG_VERBOSE, "Reading File Share Tables"); + + // loop through all the fileshares + hr = WcaOpenExecuteView(vcsSmbQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4FileShare table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + pss = NewSmb(); + if (!pss) + { + hr = E_OUTOFMEMORY; + break; + } + Assert(pss); + ::ZeroMemory(pss, sizeof(*pss)); + + hr = WcaGetRecordString(hRec, ssqFileShare, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4FileShare.Wix4FileShare"); + hr = ::StringCchCopyW(pss->wzId, countof(pss->wzId), pwzData); + ExitOnFailure(hr, "Failed to copy ID string to smb object"); + + hr = WcaGetRecordFormattedString(hRec, ssqShareName, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4FileShare.ShareName"); + hr = ::StringCchCopyW(pss->wzShareName, countof(pss->wzShareName), pwzData); + ExitOnFailure(hr, "Failed to copy share name string to smb object"); + + hr = WcaGetRecordString(hRec, ssqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get Component for Wix4FileShare: '%ls'", pss->wzShareName); + hr = ::StringCchCopyW(pss->wzComponent, countof(pss->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy component string to smb object"); + + hr = WcaGetRecordFormattedString(hRec, ssqDescription, &pwzData); + ExitOnFailure(hr, "Failed to get Share Description for Wix4FileShare: '%ls'", pss->wzShareName); + hr = ::StringCchCopyW(pss->wzDescription, countof(pss->wzDescription), pwzData); + ExitOnFailure(hr, "Failed to copy description string to smb object"); + + // get user info from the user table + hr = WcaGetRecordFormattedString(hRec, ssqUser, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User record for Wix4FileShare: '%ls'", pss->wzShareName); + + // get component install state + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pss->wzComponent, &pss->isInstalled, &pss->isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get Component state for Wix4FileShare"); + + // if a user was specified + if (*pwzData) + { + pss->fUseIntegratedAuth = FALSE; + pss->fLegacyUserProvided = TRUE; + hr = ScaGetUser(pwzData, &pss->scau); + ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); + } + else + { + pss->fLegacyUserProvided = FALSE; + // TODO: figure out whether this is useful still + //pss->fUseIntegratedAuth = TRUE; + // integrated authorization doesn't have a User record + } + + // get the share's directory + hr = WcaGetRecordString(hRec, ssqDirectory, &pwzData); + ExitOnFailure(hr, "Failed to get directory for Wix4FileShare: '%ls'", pss->wzShareName); + + WCHAR wzPath[MAX_PATH]; + DWORD dwLen; + dwLen = countof(wzPath); + // review: relevant for file shares? + if (INSTALLSTATE_SOURCE == pss->isAction) + { + er = ::MsiGetSourcePathW(WcaGetInstallHandle(), pwzData, wzPath, &dwLen); + } + else + { + er = ::MsiGetTargetPathW(WcaGetInstallHandle(), pwzData, wzPath, &dwLen); + } + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get Source/TargetPath for Directory"); + + // If the path is to the root of a drive, then it needs a trailing backslash. + // Otherwise, it can't have a trailing backslash. + if (3 < dwLen) + { + if (wzPath[dwLen - 1] == L'\\') + { + wzPath[dwLen - 1] = 0; + } + } + else if (2 == dwLen && wzPath[1] == L':') + { + wzPath[2] = L'\\'; + wzPath[3] = 0; + } + + hr = ::StringCchCopyW(pss->wzDirectory, countof(pss->wzDirectory), wzPath); + ExitOnFailure(hr, "Failed to copy directory string to smb object"); + + hr = WcaGetRecordInteger(hRec, ssqPermissions, &pss->nPermissions); + ExitOnFailure(hr, "Failed to get Wix4FileShare.Permissions"); + + // Check to see if additional user & permissions are specified for this share + if (bUserPermissionsTableExists) + { + hr = ScaSmbExPermsRead(pss); + ExitOnFailure(hr, "Failed to get Additional File Share Permissions"); + } + + *ppssList = AddSmbToList(*ppssList, pss); + pss = NULL; // set the smb NULL so it doesn't accidentally get freed below + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "Failure occured while processing Wix4FileShare table"); + +LExit: + // if anything was left over after an error clean it all up + if (pss) + { + ScaSmbFreeList(pss); + } + + ReleaseStr(pwzData); + + return hr; +} + + +/******************************************************************** + RetrieveSMBShareUserPermList - retrieve SMB Share's user permission list + +********************************************************************/ +HRESULT RetrieveFileShareUserPerm(SCA_SMB* pss, SCA_SMB_EX_USER_PERMS** ppExUserPermsList, DWORD *pUserPermsCount) +{ + HRESULT hr = S_OK; + SHARE_INFO_502* psi = NULL; + NET_API_STATUS s; + BOOL bValid, bDaclDefaulted; + PACL acl = NULL; + PEXPLICIT_ACCESSW pEA = NULL; + ULONG nCount = 0; + DWORD er = ERROR_SUCCESS; + PSID pSID = NULL; + DWORD nUserNameSize = MAX_DARWIN_COLUMN; + DWORD nDomainNameSize = MAX_DARWIN_COLUMN; + SID_NAME_USE peUse; + DWORD dwCounter = 0; + SCA_SMB_EX_USER_PERMS* pExUserPermsList = NULL; + DWORD dwUserPermsCount = 0; + + *pUserPermsCount = 0; + s = ::NetShareGetInfo(NULL, pss->wzShareName, 502, (LPBYTE*)&psi); + WcaLog(LOGMSG_VERBOSE, "retrieving permissions on existing file share."); + if (NERR_NetNameNotFound == s) + { + WcaLog(LOGMSG_VERBOSE, "File share has already been removed."); + ExitFunction1(hr = S_OK); + } + else if (NERR_Success != s || psi == NULL) + { + hr = E_FAIL; + ExitOnFailure(hr, "Failed to get share information with return code: %d", s); + } + if (!::GetSecurityDescriptorDacl(psi->shi502_security_descriptor, &bValid, &acl, &bDaclDefaulted) || !bValid) + { + ExitOnLastError(hr, "Failed to get acl from security descriptor"); + } + + er = ::GetExplicitEntriesFromAclW(acl, &nCount, &pEA); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to get access entries from acl for file share %ls", pss->wzShareName); + for (dwCounter = 0; dwCounter < nCount; ++dwCounter) + { + if (TRUSTEE_IS_SID == pEA[dwCounter].Trustee.TrusteeForm) + { + SCA_SMB_EX_USER_PERMS* pExUserPerms = NewExUserPermsSmb(); + ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); + pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); + pSID = (PSID)(pEA[dwCounter].Trustee.ptstrName); + if (!::LookupAccountSidW(NULL, pSID, pExUserPerms->scau.wzName, &nUserNameSize, pExUserPerms->scau.wzDomain, &nDomainNameSize, &peUse)) + { + hr = E_FAIL; + ExitOnFailure(hr, "Failed to get account name from SID"); + } + pExUserPerms->nPermissions = pEA[dwCounter].grfAccessPermissions; + pExUserPerms->accessMode = pEA[dwCounter].grfAccessMode; + ++dwUserPermsCount; + nUserNameSize = MAX_DARWIN_COLUMN; + nDomainNameSize = MAX_DARWIN_COLUMN; + } + } + *ppExUserPermsList = pExUserPermsList; + *pUserPermsCount = dwUserPermsCount; + +LExit: + if (psi) + { + ::NetApiBufferFree(psi); + } + + if (pEA) + { + ::LocalFree(pEA); + } + + return hr; +} + + +/******************************************************************** + SchedCreateSmb - schedule one instance of a file share creation + +********************************************************************/ +HRESULT SchedCreateSmb(SCA_SMB* pss) +{ + HRESULT hr = S_OK; + + WCHAR wzDomainUser[255]; // "domain\user" + SCA_SMB_EX_USER_PERMS* pExUserPermsList = NULL; + int nCounter = 0; + WCHAR* pwzRollbackCustomActionData = NULL; + WCHAR* pwzCustomActionData = NULL; + + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDescription, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server name to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDirectory, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add full path instance to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->fUseIntegratedAuth ? L"1" : L"0", &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server name to CustomActionData"); + + if (pss->fLegacyUserProvided) + { + hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount + 1, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); + + hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pss->scau.wzName, pss->scau.wzDomain); + ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); + hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); + + hr = WcaWriteIntegerToCaData(pss->nPermissions, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); + } + else + { + hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); + } + + if (pss->nUserPermissionCount > 0) + { + nCounter = 0; + for (pExUserPermsList = pss->pExUserPerms; pExUserPermsList; pExUserPermsList = pExUserPermsList->pExUserPermsNext) + { + Assert(nCounter < pss->nUserPermissionCount); + + hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pExUserPermsList->scau.wzName, pExUserPermsList->scau.wzDomain); + ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); + hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); + + hr = WcaWriteIntegerToCaData((int)pExUserPermsList->accessMode, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add access mode to CustomActionData"); + + hr = WcaWriteIntegerToCaData(pExUserPermsList->nPermissions, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); + ++nCounter; + } + Assert(nCounter == pss->nUserPermissionCount); + } + + // Schedule the rollback first + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateSmbRollback"), pwzRollbackCustomActionData, COST_SMB_DROPSMB); + ExitOnFailure(hr, "Failed to schedule DropSmb action"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateSmb"), pwzCustomActionData, COST_SMB_CREATESMB); + ExitOnFailure(hr, "Failed to schedule CreateSmb action"); + +LExit: + ReleaseStr(pwzRollbackCustomActionData); + ReleaseStr(pwzCustomActionData); + + if (pExUserPermsList) + { + ScaExUserPermsSmbFreeList(pExUserPermsList); + } + + return hr; +} + + +/******************************************************************** + ScaSmbInstall - for every file share, schedule the create custom action + +********************************************************************/ +HRESULT ScaSmbInstall(SCA_SMB* pssList) +{ + HRESULT hr = S_FALSE; // assume nothing will be done + SCA_SMB* pss = NULL; + + for (pss = pssList; pss; pss = pss->pssNext) + { + // if installing this component + if (WcaIsInstalling(pss->isInstalled, pss->isAction) ) + { + hr = SchedCreateSmb(pss); + ExitOnFailure(hr, "Failed to schedule the creation of the fileshare: %ls", pss->wzShareName); + } + } + +LExit: + return hr; +} + + +/******************************************************************** + SchedDropSmb - schedule one instance of a file share removal + +********************************************************************/ +HRESULT SchedDropSmb(SCA_SMB* pss) +{ + HRESULT hr = S_OK; + + WCHAR* pwzCustomActionData = NULL; + WCHAR* pwzRollbackCustomActionData = NULL; + SCA_SMB_EX_USER_PERMS *pExUserPermsList = NULL; + SCA_SMB_EX_USER_PERMS *pExUserPerm = NULL; + WCHAR wzDomainUser[255]; // "domain\user" + DWORD dwUserPermsCount = 0; + + // roll back DropSmb + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDescription, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add server name to CustomActionData"); + + hr = WcaWriteStringToCaData(pss->wzDirectory, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add full path instance to CustomActionData"); + + hr = WcaWriteStringToCaData(L"1", &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add useintegrated flag to CustomActionData"); + + hr = RetrieveFileShareUserPerm(pss, &pExUserPermsList, &dwUserPermsCount); + ExitOnFailure(hr, "Failed to retrieve SMBShare's user permissions"); + + hr = WcaWriteIntegerToCaData((int)dwUserPermsCount, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData"); + + for (pExUserPerm = pExUserPermsList; pExUserPerm; pExUserPerm = pExUserPerm->pExUserPermsNext) + { + hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pExUserPerm->scau.wzName, pExUserPerm->scau.wzDomain); + ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData"); + hr = WcaWriteStringToCaData(wzDomainUser, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData"); + + hr = WcaWriteIntegerToCaData((int)pExUserPerm->accessMode, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add access mode to CustomActionData"); + + hr = WcaWriteIntegerToCaData(pExUserPerm->nPermissions, &pwzRollbackCustomActionData); + ExitOnFailure(hr, "Failed to add permissions to CustomActionData"); + } + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"DropSmbRollback"), pwzRollbackCustomActionData, COST_SMB_CREATESMB); + ExitOnFailure(hr, "Failed to schedule DropSmbRollback action"); + + // DropSMB + hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add ShareName to CustomActionData"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"DropSmb"), pwzCustomActionData, COST_SMB_DROPSMB); + ExitOnFailure(hr, "Failed to schedule DropSmb action"); + +LExit: + ReleaseStr(pwzCustomActionData); + + if (pExUserPermsList) + { + ScaExUserPermsSmbFreeList(pExUserPermsList); + } + + return hr; + +} + + +/******************************************************************** + ScaSmbUninstall - for every file share, schedule the drop custom action + +********************************************************************/ +HRESULT ScaSmbUninstall(SCA_SMB* pssList) +{ + HRESULT hr = S_FALSE; // assume nothing will be done + SCA_SMB* pss = NULL; + + for (pss = pssList; pss; pss = pss->pssNext) + { + // if uninstalling this component + if (WcaIsUninstalling(pss->isInstalled, pss->isAction) ) + { + hr = SchedDropSmb(pss); + ExitOnFailure(hr, "Failed to remove file share %ls", pss->wzShareName); + } + } + +LExit: + return hr; +} + +LPCWSTR vcsSmbExUserPermsQuery = L"SELECT `FileShare_`,`User_`,`Permissions` " + L"FROM `Wix4FileSharePermissions` WHERE `FileShare_`=?"; + +enum eSmbUserPermsQuery { + ssupqFileShare = 1, + ssupqUser, + ssupqPermissions + +}; + + +/******************************************************************** + ScaSmbExPermsRead - for Every entry in File Permissions table add a + User Name & Permissions structure to the List + +********************************************************************/ +HRESULT ScaSmbExPermsRead(SCA_SMB* pss) +{ + HRESULT hr = S_OK; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + SCA_SMB_EX_USER_PERMS* pExUserPermsList = pss->pExUserPerms; + SCA_SMB_EX_USER_PERMS* pExUserPerms = NULL; + int nCounter = 0; + + hRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hRec, 1, pss->wzId); + ExitOnFailure(hr, "Failed to look up FileShare"); + + hr = WcaOpenView(vcsSmbExUserPermsQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4FileSharePermissions table"); + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "Failed to execute view on Wix4FileSharePermissions table"); + + // loop through all User/Permissions paris returned + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + pExUserPerms = NewExUserPermsSmb(); + if (!pExUserPerms) + { + hr = E_OUTOFMEMORY; + break; + } + Assert(pExUserPerms); + ::ZeroMemory(pExUserPerms, sizeof(*pExUserPerms)); + + hr = WcaGetRecordString(hRec, ssupqUser, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4FileSharePermissions.User"); + hr = ScaGetUser(pwzData, &pExUserPerms->scau); + ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName); + + hr = WcaGetRecordInteger(hRec, ssupqPermissions, &pExUserPerms->nPermissions); + ExitOnFailure(hr, "Failed to get Wix4FileSharePermissions.Permissions"); + pExUserPerms->accessMode = SET_ACCESS; // we only support SET_ACCESS here + + pExUserPermsList = AddExUserPermsSmbToList(pExUserPermsList, pExUserPerms); + ++nCounter; + pExUserPerms = NULL; // set the smb NULL so it doesn't accidentally get freed below + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + pss->pExUserPerms = pExUserPermsList; + pss->nUserPermissionCount = nCounter; + } + ExitOnFailure(hr, "Failure occured while processing FileShare table"); + +LExit: + // if anything was left over after an error clean it all up + if (pExUserPerms) + { + ScaExUserPermsSmbFreeList(pExUserPerms); + } + + ReleaseStr(pwzData); + + return hr; +} diff --git a/src/ext/Util/ca/scauser.cpp b/src/ext/Util/ca/scauser.cpp new file mode 100644 index 00000000..b25e9daf --- /dev/null +++ b/src/ext/Util/ca/scauser.cpp @@ -0,0 +1,709 @@ +// 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" + +LPCWSTR vcsUserQuery = L"SELECT `Wix4User`, `Component_`, `Name`, `Domain`, `Password` FROM `Wix4User` WHERE `Wix4User`=?"; +enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword }; + +LPCWSTR vcsGroupQuery = L"SELECT `Wix4Group`, `Component_`, `Name`, `Domain` FROM `Wix4Group` WHERE `Wix4Group`=?"; +enum eGroupQuery { vgqGroup = 1, vgqComponent, vgqName, vgqDomain }; + +LPCWSTR vcsUserGroupQuery = L"SELECT `Wix4User_`, `Wix4Group_` FROM `Wix4UserGroup` WHERE `Wix4User_`=?"; +enum eUserGroupQuery { vugqUser = 1, vugqGroup }; + +LPCWSTR vActionableQuery = L"SELECT `Wix4User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `Wix4User` WHERE `Component_` IS NOT NULL"; +enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain, vaqPassword, vaqAttributes }; + + +static HRESULT AddUserToList( + __inout SCA_USER** ppsuList + ); + +static HRESULT AddGroupToList( + __inout SCA_GROUP** ppsgList + ); + + +HRESULT __stdcall ScaGetUser( + __in LPCWSTR wzUser, + __out SCA_USER* pscau + ) +{ + if (!wzUser || !pscau) + { + return E_INVALIDARG; + } + + HRESULT hr = S_OK; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + + // clear struct and bail right away if no user key was passed to search for + ::ZeroMemory(pscau, sizeof(*pscau)); + if (!*wzUser) + { + ExitFunction1(hr = S_OK); + } + + hRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hRec, 1, wzUser); + ExitOnFailure(hr, "Failed to look up User"); + + hr = WcaOpenView(vcsUserQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4User table"); + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "Failed to execute view on Wix4User table"); + + hr = WcaFetchSingleRecord(hView, &hRec); + if (S_OK == hr) + { + hr = WcaGetRecordString(hRec, vuqUser, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.User"); + hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); + ExitOnFailure(hr, "Failed to copy key string to user object"); + + hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Component_"); + hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy component string to user object"); + + hr = WcaGetRecordFormattedString(hRec, vuqName, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Name"); + hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); + ExitOnFailure(hr, "Failed to copy name string to user object"); + + hr = WcaGetRecordFormattedString(hRec, vuqDomain, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Domain"); + hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); + ExitOnFailure(hr, "Failed to copy domain string to user object"); + + hr = WcaGetRecordFormattedString(hRec, vuqPassword, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Password"); + hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); + ExitOnFailure(hr, "Failed to copy password string to user object"); + } + else if (E_NOMOREITEMS == hr) + { + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser); + hr = E_FAIL; + } + else + { + ExitOnFailure(hr, "Error or found multiple matching Wix4User rows"); + } + +LExit: + ReleaseStr(pwzData); + + return hr; +} + +HRESULT __stdcall ScaGetUserDeferred( + __in LPCWSTR wzUser, + __in WCA_WRAPQUERY_HANDLE hUserQuery, + __out SCA_USER* pscau + ) +{ + if (!wzUser || !pscau) + { + return E_INVALIDARG; + } + + HRESULT hr = S_OK; + MSIHANDLE hRec, hRecTest; + + LPWSTR pwzData = NULL; + + // clear struct and bail right away if no user key was passed to search for + ::ZeroMemory(pscau, sizeof(*pscau)); + if (!*wzUser) + { + ExitFunction1(hr = S_OK); + } + + // Reset back to the first record + WcaFetchWrappedReset(hUserQuery); + + hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRec); + if (S_OK == hr) + { + hr = WcaFetchWrappedRecordWhereString(hUserQuery, vuqUser, wzUser, &hRecTest); + if (S_OK == hr) + { + AssertSz(FALSE, "Found multiple matching Wix4User rows"); + } + + hr = WcaGetRecordString(hRec, vuqUser, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.User"); + hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); + ExitOnFailure(hr, "Failed to copy key string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Component_"); + hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy component string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqName, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Name"); + hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); + ExitOnFailure(hr, "Failed to copy name string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqDomain, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Domain"); + hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); + ExitOnFailure(hr, "Failed to copy domain string to user object (in deferred CA)"); + + hr = WcaGetRecordString(hRec, vuqPassword, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4User.Password"); + hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); + ExitOnFailure(hr, "Failed to copy password string to user object (in deferred CA)"); + } + else if (E_NOMOREITEMS == hr) + { + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser); + hr = E_FAIL; + } + else + { + ExitOnFailure(hr, "Error fetching single Wix4User row"); + } + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +HRESULT __stdcall ScaGetGroup( + __in LPCWSTR wzGroup, + __out SCA_GROUP* pscag + ) +{ + if (!wzGroup || !pscag) + { + return E_INVALIDARG; + } + + HRESULT hr = S_OK; + PMSIHANDLE hView, hRec; + + LPWSTR pwzData = NULL; + + hRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hRec, 1, wzGroup); + ExitOnFailure(hr, "Failed to look up Group"); + + hr = WcaOpenView(vcsGroupQuery, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4Group table"); + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "Failed to execute view on Wix4Group table"); + + hr = WcaFetchSingleRecord(hView, &hRec); + if (S_OK == hr) + { + hr = WcaGetRecordString(hRec, vgqGroup, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4Group.Wix4Group."); + hr = ::StringCchCopyW(pscag->wzKey, countof(pscag->wzKey), pwzData); + ExitOnFailure(hr, "Failed to copy Wix4Group.Wix4Group."); + + hr = WcaGetRecordString(hRec, vgqComponent, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4Group.Component_"); + hr = ::StringCchCopyW(pscag->wzComponent, countof(pscag->wzComponent), pwzData); + ExitOnFailure(hr, "Failed to copy Wix4Group.Component_."); + + hr = WcaGetRecordFormattedString(hRec, vgqName, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4Group.Name"); + hr = ::StringCchCopyW(pscag->wzName, countof(pscag->wzName), pwzData); + ExitOnFailure(hr, "Failed to copy Wix4Group.Name."); + + hr = WcaGetRecordFormattedString(hRec, vgqDomain, &pwzData); + ExitOnFailure(hr, "Failed to get Wix4Group.Domain"); + hr = ::StringCchCopyW(pscag->wzDomain, countof(pscag->wzDomain), pwzData); + ExitOnFailure(hr, "Failed to copy Wix4Group.Domain."); + } + else if (E_NOMOREITEMS == hr) + { + WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4Group.Wix4Group='%ls'", wzGroup); + hr = E_FAIL; + } + else + { + ExitOnFailure(hr, "Error or found multiple matching Wix4Group rows"); + } + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +void ScaUserFreeList( + __in SCA_USER* psuList + ) +{ + SCA_USER* psuDelete = psuList; + while (psuList) + { + psuDelete = psuList; + psuList = psuList->psuNext; + + ScaGroupFreeList(psuDelete->psgGroups); + MemFree(psuDelete); + } +} + + +void ScaGroupFreeList( + __in SCA_GROUP* psgList + ) +{ + SCA_GROUP* psgDelete = psgList; + while (psgList) + { + psgDelete = psgList; + psgList = psgList->psgNext; + + MemFree(psgDelete); + } +} + + +HRESULT ScaUserRead( + __out SCA_USER** ppsuList + ) +{ + //Assert(FALSE); + Assert(ppsuList); + + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + PMSIHANDLE hView, hRec, hUserRec, hUserGroupView; + + LPWSTR pwzData = NULL; + + BOOL fUserGroupExists = FALSE; + + SCA_USER *psu = NULL; + + INSTALLSTATE isInstalled, isAction; + + if (S_OK != WcaTableExists(L"Wix4User")) + { + WcaLog(LOGMSG_VERBOSE, "Wix4User Table does not exist, exiting"); + ExitFunction1(hr = S_FALSE); + } + + if (S_OK == WcaTableExists(L"Wix4UserGroup")) + { + fUserGroupExists = TRUE; + } + + // + // loop through all the users + // + hr = WcaOpenExecuteView(vActionableQuery, &hView); + ExitOnFailure(hr, "failed to open view on Wix4User table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, vaqComponent, &pwzData); + ExitOnFailure(hr, "failed to get Wix4User.Component"); + + er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pwzData, &isInstalled, &isAction); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "failed to get Component state for Wix4User"); + + // don't bother if we aren't installing or uninstalling this component + if (WcaIsInstalling(isInstalled, isAction) || WcaIsUninstalling(isInstalled, isAction)) + { + // + // Add the user to the list and populate it's values + // + hr = AddUserToList(ppsuList); + ExitOnFailure(hr, "failed to add user to list"); + + psu = *ppsuList; + + psu->isInstalled = isInstalled; + psu->isAction = isAction; + hr = ::StringCchCopyW(psu->wzComponent, countof(psu->wzComponent), pwzData); + ExitOnFailure(hr, "failed to copy component name: %ls", pwzData); + + hr = WcaGetRecordString(hRec, vaqUser, &pwzData); + ExitOnFailure(hr, "failed to get Wix4User.User"); + hr = ::StringCchCopyW(psu->wzKey, countof(psu->wzKey), pwzData); + ExitOnFailure(hr, "failed to copy user key: %ls", pwzData); + + hr = WcaGetRecordFormattedString(hRec, vaqName, &pwzData); + ExitOnFailure(hr, "failed to get Wix4User.Name"); + hr = ::StringCchCopyW(psu->wzName, countof(psu->wzName), pwzData); + ExitOnFailure(hr, "failed to copy user name: %ls", pwzData); + + hr = WcaGetRecordFormattedString(hRec, vaqDomain, &pwzData); + ExitOnFailure(hr, "failed to get Wix4User.Domain"); + hr = ::StringCchCopyW(psu->wzDomain, countof(psu->wzDomain), pwzData); + ExitOnFailure(hr, "failed to copy user domain: %ls", pwzData); + + hr = WcaGetRecordFormattedString(hRec, vaqPassword, &pwzData); + ExitOnFailure(hr, "failed to get Wix4User.Password"); + hr = ::StringCchCopyW(psu->wzPassword, countof(psu->wzPassword), pwzData); + ExitOnFailure(hr, "failed to copy user password"); + + hr = WcaGetRecordInteger(hRec, vaqAttributes, &psu->iAttributes); + ExitOnFailure(hr, "failed to get Wix4User.Attributes"); + + // Check if this user is to be added to any groups + if (fUserGroupExists) + { + hUserRec = ::MsiCreateRecord(1); + hr = WcaSetRecordString(hUserRec, 1, psu->wzKey); + ExitOnFailure(hr, "Failed to create user record for querying Wix4UserGroup table"); + + hr = WcaOpenView(vcsUserGroupQuery, &hUserGroupView); + ExitOnFailure(hr, "Failed to open view on Wix4UserGroup table for user %ls", psu->wzKey); + hr = WcaExecuteView(hUserGroupView, hUserRec); + ExitOnFailure(hr, "Failed to execute view on Wix4UserGroup table for user: %ls", psu->wzKey); + + while (S_OK == (hr = WcaFetchRecord(hUserGroupView, &hRec))) + { + hr = WcaGetRecordString(hRec, vugqGroup, &pwzData); + ExitOnFailure(hr, "failed to get Wix4UserGroup.Group"); + + hr = AddGroupToList(&(psu->psgGroups)); + ExitOnFailure(hr, "failed to add group to list"); + + hr = ScaGetGroup(pwzData, psu->psgGroups); + ExitOnFailure(hr, "failed to get information for group: %ls", pwzData); + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed to enumerate selected rows from Wix4UserGroup table"); + } + } + } + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed to enumerate selected rows from Wix4User table"); + +LExit: + ReleaseStr(pwzData); + + return hr; +} + + +static HRESULT WriteGroupInfo( + __in SCA_GROUP* psgList, + __in LPWSTR *ppwzActionData + ) +{ + HRESULT hr = S_OK; + + for (SCA_GROUP* psg = psgList; psg; psg = psg->psgNext) + { + hr = WcaWriteStringToCaData(psg->wzName, ppwzActionData); + ExitOnFailure(hr, "failed to add group name to custom action data: %ls", psg->wzName); + + hr = WcaWriteStringToCaData(psg->wzDomain, ppwzActionData); + ExitOnFailure(hr, "failed to add group domain to custom action data: %ls", psg->wzDomain); + } + +LExit: + return hr; +} + + +// Behaves like WriteGroupInfo, but it filters out groups the user is currently a member of, +// because we don't want to rollback those +static HRESULT WriteGroupRollbackInfo( + __in LPCWSTR pwzName, + __in LPCWSTR pwzDomain, + __in SCA_GROUP* psgList, + __in LPWSTR *ppwzActionData + ) +{ + HRESULT hr = S_OK; + BOOL fIsMember = FALSE; + + for (SCA_GROUP* psg = psgList; psg; psg = psg->psgNext) + { + hr = UserCheckIsMember(pwzName, pwzDomain, psg->wzName, psg->wzDomain, &fIsMember); + if (FAILED(hr)) + { + WcaLog(LOGMSG_VERBOSE, "Failed to check if user: %ls (domain: %ls) is member of a group while collecting rollback information (error code 0x%x) - continuing", pwzName, pwzDomain, hr); + hr = S_OK; + continue; + } + + // If the user is currently a member, we don't want to undo that on rollback, so skip adding + // this group record to the list of groups to rollback + if (fIsMember) + { + continue; + } + + hr = WcaWriteStringToCaData(psg->wzName, ppwzActionData); + ExitOnFailure(hr, "failed to add group name to custom action data: %ls", psg->wzName); + + hr = WcaWriteStringToCaData(psg->wzDomain, ppwzActionData); + ExitOnFailure(hr, "failed to add group domain to custom action data: %ls", psg->wzDomain); + } + +LExit: + return hr; +} + + +/* **************************************************************** +ScaUserExecute - Schedules user account creation or removal based on +component state. + +******************************************************************/ +HRESULT ScaUserExecute( + __in SCA_USER *psuList + ) +{ + HRESULT hr = S_OK; + DWORD er = 0; + PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; + + LPWSTR pwzBaseScriptKey = NULL; + DWORD cScriptKey = 0; + + USER_INFO_0 *pUserInfo = NULL; + LPWSTR pwzScriptKey = NULL; + LPWSTR pwzActionData = NULL; + LPWSTR pwzRollbackData = NULL; + + // Get the base script key for this CustomAction. + hr = WcaCaScriptCreateKey(&pwzBaseScriptKey); + ExitOnFailure(hr, "Failed to get encoding key."); + + // Loop through all the users to be configured. + for (SCA_USER *psu = psuList; psu; psu = psu->psuNext) + { + USER_EXISTS ueUserExists = USER_EXISTS_INDETERMINATE; + + // Always put the User Name and Domain plus Attributes on the front of the CustomAction + // data. Sometimes we'll add more data. + Assert(psu->wzName); + hr = WcaWriteStringToCaData(psu->wzName, &pwzActionData); + ExitOnFailure(hr, "Failed to add user name to custom action data: %ls", psu->wzName); + hr = WcaWriteStringToCaData(psu->wzDomain, &pwzActionData); + ExitOnFailure(hr, "Failed to add user domain to custom action data: %ls", psu->wzDomain); + hr = WcaWriteIntegerToCaData(psu->iAttributes, &pwzActionData); + ExitOnFailure(hr, "failed to add user attributes to custom action data for user: %ls", psu->wzKey); + + // Check to see if the user already exists since we have to be very careful when adding + // and removing users. Note: MSDN says that it is safe to call these APIs from any + // user, so we should be safe calling it during immediate mode. + er = ::NetApiBufferAllocate(sizeof(USER_INFO_0), reinterpret_cast(&pUserInfo)); + hr = HRESULT_FROM_WIN32(er); + ExitOnFailure(hr, "Failed to allocate memory to check existence of user: %ls", psu->wzName); + + LPCWSTR wzDomain = psu->wzDomain; + if (wzDomain && *wzDomain) + { + er = ::DsGetDcNameW(NULL, wzDomain, NULL, NULL, NULL, &pDomainControllerInfo); + if (RPC_S_SERVER_UNAVAILABLE == er) + { + // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag + er = ::DsGetDcNameW(NULL, wzDomain, NULL, NULL, DS_FORCE_REDISCOVERY, &pDomainControllerInfo); + } + if (ERROR_SUCCESS == er) + { + wzDomain = pDomainControllerInfo->DomainControllerName + 2; //Add 2 so that we don't get the \\ prefix + } + } + + er = ::NetUserGetInfo(wzDomain, psu->wzName, 0, reinterpret_cast(pUserInfo)); + if (NERR_Success == er) + { + ueUserExists = USER_EXISTS_YES; + } + else if (NERR_UserNotFound == er) + { + ueUserExists = USER_EXISTS_NO; + } + else + { + ueUserExists = USER_EXISTS_INDETERMINATE; + hr = HRESULT_FROM_WIN32(er); + WcaLog(LOGMSG_VERBOSE, "Failed to check existence of domain: %ls, user: %ls (error code 0x%x) - continuing", wzDomain, psu->wzName, hr); + hr = S_OK; + er = ERROR_SUCCESS; + } + + if (WcaIsInstalling(psu->isInstalled, psu->isAction)) + { + // If the user exists, check to see if we are supposed to fail if user the exists before + // the install. + if (USER_EXISTS_YES == ueUserExists) + { + // Reinstalls will always fail if we don't remove the check for "fail if exists". + if (WcaIsReInstalling(psu->isInstalled, psu->isAction)) + { + psu->iAttributes &= ~SCAU_FAIL_IF_EXISTS; + } + + if ((SCAU_FAIL_IF_EXISTS & (psu->iAttributes)) && !(SCAU_UPDATE_IF_EXISTS & (psu->iAttributes))) + { + hr = HRESULT_FROM_WIN32(NERR_UserExists); + MessageExitOnFailure(hr, msierrUSRFailedUserCreateExists, "Failed to create user: %ls because user already exists.", psu->wzName); + } + } + + // Rollback only if the user already exists, we couldn't determine if the user exists, or we are going to create the user + if ((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists) || !(psu->iAttributes & SCAU_DONT_CREATE_USER)) + { + ++cScriptKey; + hr = StrAllocFormatted(&pwzScriptKey, L"%ls%u", pwzBaseScriptKey, cScriptKey); + ExitOnFailure(hr, "Failed to create encoding key."); + + // Write the script key to CustomActionData for install and rollback so information can be passed to rollback. + hr = WcaWriteStringToCaData(pwzScriptKey, &pwzActionData); + ExitOnFailure(hr, "Failed to add encoding key to custom action data."); + + hr = WcaWriteStringToCaData(pwzScriptKey, &pwzRollbackData); + ExitOnFailure(hr, "Failed to add encoding key to rollback custom action data."); + + INT iRollbackUserAttributes = psu->iAttributes; + + // If the user already exists, ensure this is accounted for in rollback + if (USER_EXISTS_YES == ueUserExists) + { + iRollbackUserAttributes |= SCAU_DONT_CREATE_USER; + } + else + { + iRollbackUserAttributes &= ~SCAU_DONT_CREATE_USER; + } + + // The deferred CA determines when to rollback User Rights Assignments so these should never be set. + iRollbackUserAttributes &= ~SCAU_ALLOW_LOGON_AS_SERVICE; + iRollbackUserAttributes &= ~SCAU_ALLOW_LOGON_AS_BATCH; + + hr = WcaWriteStringToCaData(psu->wzName, &pwzRollbackData); + ExitOnFailure(hr, "Failed to add user name to rollback custom action data: %ls", psu->wzName); + hr = WcaWriteStringToCaData(psu->wzDomain, &pwzRollbackData); + ExitOnFailure(hr, "Failed to add user domain to rollback custom action data: %ls", psu->wzDomain); + hr = WcaWriteIntegerToCaData(iRollbackUserAttributes, &pwzRollbackData); + ExitOnFailure(hr, "failed to add user attributes to rollback custom action data for user: %ls", psu->wzKey); + + // If the user already exists, add relevant group information to rollback data + if (USER_EXISTS_YES == ueUserExists || USER_EXISTS_INDETERMINATE == ueUserExists) + { + hr = WriteGroupRollbackInfo(psu->wzName, psu->wzDomain, psu->psgGroups, &pwzRollbackData); + ExitOnFailure(hr, "failed to add group information to rollback custom action data"); + } + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUserRollback"), pwzRollbackData, COST_USER_DELETE); + ExitOnFailure(hr, "failed to schedule CreateUserRollback"); + } + else + { + // Write empty script key to CustomActionData since there is no rollback. + hr = WcaWriteStringToCaData(L"", &pwzActionData); + ExitOnFailure(hr, "Failed to add empty encoding key to custom action data."); + } + + // + // Schedule the creation now. + // + hr = WcaWriteStringToCaData(psu->wzPassword, &pwzActionData); + ExitOnFailure(hr, "failed to add user password to custom action data for user: %ls", psu->wzKey); + + // Add user's group information to custom action data + hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); + ExitOnFailure(hr, "failed to add group information to custom action data"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"CreateUser"), pwzActionData, COST_USER_ADD); + ExitOnFailure(hr, "failed to schedule CreateUser"); + } + else if (((USER_EXISTS_YES == ueUserExists) || (USER_EXISTS_INDETERMINATE == ueUserExists)) && WcaIsUninstalling(psu->isInstalled, psu->isAction) && !(psu->iAttributes & SCAU_DONT_REMOVE_ON_UNINSTALL)) + { + // Add user's group information - this will ensure the user can be removed from any groups they were added to, if the user isn't be deleted + hr = WriteGroupInfo(psu->psgGroups, &pwzActionData); + ExitOnFailure(hr, "failed to add group information to custom action data"); + + // + // Schedule the removal because the user exists and we don't have any flags set + // that say, don't remove the user on uninstall. + // + // Note: We can't rollback the removal of a user which is why RemoveUser is a commit + // CustomAction. + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RemoveUser"), pwzActionData, COST_USER_DELETE); + ExitOnFailure(hr, "failed to schedule RemoveUser"); + } + + ReleaseNullStr(pwzScriptKey); + ReleaseNullStr(pwzActionData); + ReleaseNullStr(pwzRollbackData); + if (pUserInfo) + { + ::NetApiBufferFree(static_cast(pUserInfo)); + pUserInfo = NULL; + } + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + pDomainControllerInfo = NULL; + } + } + +LExit: + ReleaseStr(pwzBaseScriptKey); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzActionData); + ReleaseStr(pwzRollbackData); + if (pUserInfo) + { + ::NetApiBufferFree(static_cast(pUserInfo)); + } + if (pDomainControllerInfo) + { + ::NetApiBufferFree(static_cast(pDomainControllerInfo)); + } + + return hr; +} + + +static HRESULT AddUserToList( + __inout SCA_USER** ppsuList + ) +{ + HRESULT hr = S_OK; + SCA_USER* psu = static_cast(MemAlloc(sizeof(SCA_USER), TRUE)); + ExitOnNull(psu, hr, E_OUTOFMEMORY, "failed to allocate memory for new user list element"); + + psu->psuNext = *ppsuList; + *ppsuList = psu; + +LExit: + return hr; +} + + +static HRESULT AddGroupToList( + __inout SCA_GROUP** ppsgList + ) +{ + HRESULT hr = S_OK; + SCA_GROUP* psg = static_cast(MemAlloc(sizeof(SCA_GROUP), TRUE)); + ExitOnNull(psg, hr, E_OUTOFMEMORY, "failed to allocate memory for new group list element"); + + psg->psgNext = *ppsgList; + *ppsgList = psg; + +LExit: + return hr; +} diff --git a/src/ext/Util/ca/scauser.h b/src/ext/Util/ca/scauser.h new file mode 100644 index 00000000..a5fd5ea8 --- /dev/null +++ b/src/ext/Util/ca/scauser.h @@ -0,0 +1,67 @@ +#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. + + +enum USER_EXISTS +{ + USER_EXISTS_YES, + USER_EXISTS_NO, + USER_EXISTS_INDETERMINATE +}; + +// structs +struct SCA_GROUP +{ + WCHAR wzKey[MAX_DARWIN_KEY + 1]; + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + + WCHAR wzDomain[MAX_DARWIN_COLUMN + 1]; + WCHAR wzName[MAX_DARWIN_COLUMN + 1]; + + SCA_GROUP *psgNext; +}; + +struct SCA_USER +{ + WCHAR wzKey[MAX_DARWIN_KEY + 1]; + WCHAR wzComponent[MAX_DARWIN_KEY + 1]; + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + WCHAR wzDomain[MAX_DARWIN_COLUMN + 1]; + WCHAR wzName[MAX_DARWIN_COLUMN + 1]; + WCHAR wzPassword[MAX_DARWIN_COLUMN + 1]; + INT iAttributes; + + SCA_GROUP *psgGroups; + + SCA_USER *psuNext; +}; + + +// prototypes +HRESULT __stdcall ScaGetUser( + __in LPCWSTR wzUser, + __out SCA_USER* pscau + ); +HRESULT __stdcall ScaGetUserDeferred( + __in LPCWSTR wzUser, + __in WCA_WRAPQUERY_HANDLE hUserQuery, + __out SCA_USER* pscau + ); +HRESULT __stdcall ScaGetGroup( + __in LPCWSTR wzGroup, + __out SCA_GROUP* pscag + ); +void ScaUserFreeList( + __in SCA_USER* psuList + ); +void ScaGroupFreeList( + __in SCA_GROUP* psgList + ); +HRESULT ScaUserRead( + __inout SCA_USER** ppsuList + ); +HRESULT ScaUserExecute( + __in SCA_USER *psuList + ); diff --git a/src/ext/Util/ca/secureobj.cpp b/src/ext/Util/ca/secureobj.cpp new file mode 100644 index 00000000..72842eb5 --- /dev/null +++ b/src/ext/Util/ca/secureobj.cpp @@ -0,0 +1,915 @@ +// 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" + +// structs +LPCWSTR wzQUERY_SECUREOBJECTS = L"SELECT `Wix4SecureObject`.`Wix4SecureObject`, `Wix4SecureObject`.`Table`, `Wix4SecureObject`.`Domain`, `Wix4SecureObject`.`User`, `Wix4SecureObject`.`Attributes`, " + L"`Wix4SecureObject`.`Permission`, `Wix4SecureObject`.`Component_`, `Component`.`Attributes` FROM `Wix4SecureObject`,`Component` WHERE " + L"`Wix4SecureObject`.`Component_`=`Component`.`Component`"; +enum eQUERY_SECUREOBJECTS { QSO_SECUREOBJECT = 1, QSO_TABLE, QSO_DOMAIN, QSO_USER, QSO_ATTRIBUTES, QSO_PERMISSION, QSO_COMPONENT, QSO_COMPATTRIBUTES }; + +LPCWSTR wzQUERY_REGISTRY = L"SELECT `Registry`.`Registry`, `Registry`.`Root`, `Registry`.`Key` FROM `Registry` WHERE `Registry`.`Registry`=?"; +enum eQUERY_OBJECTCOMPONENT { QSOC_REGISTRY = 1, QSOC_REGROOT, QSOC_REGKEY }; + +LPCWSTR wzQUERY_SERVICEINSTALL = L"SELECT `ServiceInstall`.`Name` FROM `ServiceInstall` WHERE `ServiceInstall`.`ServiceInstall`=?"; +enum eQUERY_SECURESERVICEINSTALL { QSSI_NAME = 1 }; + +enum eOBJECTTYPE { OT_UNKNOWN, OT_SERVICE, OT_FOLDER, OT_FILE, OT_REGISTRY }; + +enum eSECURE_OBJECT_ATTRIBUTE +{ + SECURE_OBJECT_ATTRIBUTE_INHERITABLE = 0x1, +}; + +static eOBJECTTYPE EObjectTypeFromString( + __in LPCWSTR pwzTable + ) +{ + if (NULL == pwzTable) + { + return OT_UNKNOWN; + } + + eOBJECTTYPE eType = OT_UNKNOWN; + + // ensure we're looking at a known table + if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) + { + eType = OT_SERVICE; + } + else if (0 == lstrcmpW(L"CreateFolder", pwzTable)) + { + eType = OT_FOLDER; + } + else if (0 == lstrcmpW(L"File", pwzTable)) + { + eType = OT_FILE; + } + else if (0 == lstrcmpW(L"Registry", pwzTable)) + { + eType = OT_REGISTRY; + } + + return eType; +} + +static SE_OBJECT_TYPE SEObjectTypeFromString( + __in LPCWSTR pwzTable + ) +{ + if (NULL == pwzTable) + { + return SE_UNKNOWN_OBJECT_TYPE; + } + + SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; + + if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) + { + objectType = SE_SERVICE; + } + else if (0 == lstrcmpW(L"CreateFolder", pwzTable) || 0 == lstrcmpW(L"File", pwzTable)) + { + objectType = SE_FILE_OBJECT; + } + else if (0 == lstrcmpW(L"Registry", pwzTable)) + { + objectType = SE_REGISTRY_KEY; + } + else + { + // Do nothing; we'll return SE_UNKNOWN_OBJECT_TYPE, and the caller should handle the situation + } + + return objectType; +} + +static HRESULT StoreACLRollbackInfo( + __in LPWSTR pwzObject, + __in LPCWSTR pwzTable + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + PSECURITY_DESCRIPTOR psd = NULL; + SECURITY_DESCRIPTOR_CONTROL sdc = {0}; + DWORD dwRevision = 0; + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwzSecurityInfo = NULL; + + Assert(pwzObject && pwzTable); + + SE_OBJECT_TYPE objectType = SEObjectTypeFromString(const_cast (pwzTable)); + + if (SE_UNKNOWN_OBJECT_TYPE != objectType) + { + er = ::GetNamedSecurityInfoW(pwzObject, objectType, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &psd); + if (ERROR_FILE_NOT_FOUND == er || ERROR_PATH_NOT_FOUND == er || ERROR_SERVICE_DOES_NOT_EXIST == HRESULT_CODE(er)) + { + // If the file, path or service doesn't exist yet, skip rollback without a message + hr = HRESULT_FROM_WIN32(er); + ExitFunction(); + } + + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "Unable to schedule rollback for object: %ls", pwzObject); + + //Need to see if DACL is protected so getting Descriptor information + if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) + { + ExitOnLastError(hr, "Unable to schedule rollback for object (failed to get security descriptor control): %ls", pwzObject); + } + + // Convert the security information to a string, and write this to the custom action data + if (!::ConvertSecurityDescriptorToStringSecurityDescriptorW(psd,SDDL_REVISION_1,DACL_SECURITY_INFORMATION,&pwzSecurityInfo,NULL)) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Unable to schedule rollback for object (failed to convert security descriptor to a valid security descriptor string): %ls", pwzObject); + } + + hr = WcaWriteStringToCaData(pwzObject, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add object data to rollback CustomActionData"); + + hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add table name to rollback CustomActionData"); + + hr = WcaWriteStringToCaData(pwzSecurityInfo, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add security info data to rollback CustomActionData"); + + // Write a 1 if DACL is protected, 0 otherwise + if (sdc & SE_DACL_PROTECTED) + { + hr = WcaWriteIntegerToCaData(1,&pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to rollbackCustomActionData"); + } + else + { + hr = WcaWriteIntegerToCaData(0,&pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to rollback CustomActionData"); + } + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecSecureObjectsRollback"), pwzCustomActionData, COST_SECUREOBJECT); + ExitOnFailure(hr, "failed to schedule ExecSecureObjectsRollback for item: %ls of type: %ls", pwzObject, pwzTable); + + ReleaseStr(pwzCustomActionData); + pwzCustomActionData = NULL; + + } + else + { + MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); + } +LExit: + ReleaseStr(pwzCustomActionData); + + if (psd) + { + ::LocalFree(psd); + } + + return hr; +} + +static HRESULT GetTargetPath( + __in eOBJECTTYPE eType, + __in LPCWSTR pwzSecureObject, + __out LPWSTR* ppwzTargetPath + ) +{ + HRESULT hr = S_OK; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRecObject = NULL; + PMSIHANDLE hRec = NULL; + + int iRoot = 0; + int iAllUsers = 0; + LPWSTR pwzKey = NULL; + LPWSTR pwzFormattedString = NULL; + + if (OT_SERVICE == eType) + { + hr = WcaTableExists(L"ServiceInstall"); + if (S_FALSE == hr) + { + hr = E_UNEXPECTED; + } + ExitOnFailure(hr, "failed to open ServiceInstall table to secure object"); + + hr = WcaOpenView(wzQUERY_SERVICEINSTALL, &hView); + ExitOnFailure(hr, "failed to open view on ServiceInstall table"); + + // create a record that stores the object to secure + hRec = MsiCreateRecord(1); + MsiRecordSetStringW(hRec, 1, pwzSecureObject); + + // execute a view looking for the object's ServiceInstall.ServiceInstall row. + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "failed to execute view on ServiceInstall table"); + hr = WcaFetchSingleRecord(hView, &hRecObject); + ExitOnFailure(hr, "failed to fetch ServiceInstall row for secure object"); + + hr = WcaGetRecordFormattedString(hRecObject, QSSI_NAME, ppwzTargetPath); + ExitOnFailure(hr, "failed to get service name for secure object: %ls", pwzSecureObject); + } + else if (OT_FOLDER == eType) + { + hr = WcaGetTargetPath(pwzSecureObject, ppwzTargetPath); + ExitOnFailure(hr, "failed to get target path for directory id: %ls", pwzSecureObject); + } + else if (OT_FILE == eType) + { + hr = StrAllocFormatted(&pwzFormattedString, L"[#%s]", pwzSecureObject); + ExitOnFailure(hr, "failed to create formatted string for securing file object: %ls", pwzSecureObject); + + hr = WcaGetFormattedString(pwzFormattedString, ppwzTargetPath); + ExitOnFailure(hr, "failed to get file path from formatted string: %ls for secure object: %ls", pwzFormattedString, pwzSecureObject); + } + else if (OT_REGISTRY == eType) + { + hr = WcaTableExists(L"Registry"); + if (S_FALSE == hr) + { + hr = E_UNEXPECTED; + } + ExitOnFailure(hr, "failed to open Registry table to secure object"); + + hr = WcaOpenView(wzQUERY_REGISTRY, &hView); + ExitOnFailure(hr, "failed to open view on Registry table"); + + // create a record that stores the object to secure + hRec = MsiCreateRecord(1); + MsiRecordSetStringW(hRec, 1, pwzSecureObject); + + // execute a view looking for the object's Registry row + hr = WcaExecuteView(hView, hRec); + ExitOnFailure(hr, "failed to execute view on Registry table"); + hr = WcaFetchSingleRecord(hView, &hRecObject); + ExitOnFailure(hr, "failed to fetch Registry row for secure object"); + + hr = WcaGetRecordInteger(hRecObject, QSOC_REGROOT, &iRoot); + ExitOnFailure(hr, "Failed to get reg key root for secure object: %ls", pwzSecureObject); + + hr = WcaGetRecordFormattedString(hRecObject, QSOC_REGKEY, &pwzKey); + ExitOnFailure(hr, "Failed to get reg key for secure object: %ls", pwzSecureObject); + + // Decode the root value + if (-1 == iRoot) + { + // They didn't specify a root so that means it's either HKCU or HKLM depending on ALLUSERS property + hr = WcaGetIntProperty(L"ALLUSERS", &iAllUsers); + ExitOnFailure(hr, "failed to get value of ALLUSERS property"); + + if (1 == iAllUsers) + { + hr = StrAllocString(ppwzTargetPath, L"MACHINE\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKLM root"); + } + else + { + hr = StrAllocString(ppwzTargetPath, L"CURRENT_USER\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKCU root"); + } + } + else if (msidbRegistryRootClassesRoot == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"CLASSES_ROOT\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKCR root"); + } + else if (msidbRegistryRootCurrentUser == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"CURRENT_USER\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKCU root"); + } + else if (msidbRegistryRootLocalMachine == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"MACHINE\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKLM root"); + } + else if (msidbRegistryRootUsers == iRoot) + { + hr = StrAllocString(ppwzTargetPath, L"USERS\\", 0); + ExitOnFailure(hr, "failed to allocate target registry string with HKU root"); + } + else + { + ExitOnFailure(hr = E_UNEXPECTED, "Unknown registry key root specified for secure object: '%ls' root: %d", pwzSecureObject, iRoot); + } + + hr = StrAllocConcat(ppwzTargetPath, pwzKey, 0); + ExitOnFailure(hr, "Failed to concat key: %ls for secure object: %ls", pwzKey, pwzSecureObject); + } + else + { + AssertSz(FALSE, "How did you get here?"); + ExitOnFailure(hr = E_UNEXPECTED, "Unknown secure object type: %d", eType); + } + +LExit: + ReleaseStr(pwzFormattedString); + ReleaseStr(pwzKey); + + return hr; +} + +/****************************************************************** + SchedSecureObjects - entry point for SchedSecureObjects Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence, to schedule ExecSecureObjects +******************************************************************/ +extern "C" UINT __stdcall SchedSecureObjects( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedSecureObjects"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzSecureObject = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzTargetPath = NULL; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + INSTALLSTATE isInstalled; + INSTALLSTATE isAction; + + LPWSTR pwzCustomActionData = NULL; + + DWORD cObjects = 0; + eOBJECTTYPE eType = OT_UNKNOWN; + DWORD dwAttributes = 0; + + // + // initialize + // + hr = WcaInitialize(hInstall, "SchedSecureObjects"); + ExitOnFailure(hr, "failed to initialize"); + + // anything to do? + if (S_OK != WcaTableExists(L"Wix4SecureObject")) + { + WcaLog(LOGMSG_STANDARD, "Wix4SecureObject table doesn't exist, so there are no objects to secure."); + ExitFunction(); + } + + // + // loop through all the objects to be secured + // + hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); + ExitOnFailure(hr, "failed to open view on Wix4SecureObject table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); + ExitOnFailure(hr, "failed to get object table"); + + eType = EObjectTypeFromString(pwzTable); + + if (OT_UNKNOWN == eType) + { + ExitOnFailure(hr = E_INVALIDARG, "unknown SecureObject.Table: %ls", pwzTable); + } + + int iCompAttributes = 0; + hr = WcaGetRecordInteger(hRec, QSO_COMPATTRIBUTES, &iCompAttributes); + ExitOnFailure(hr, "failed to get Component attributes for secure object"); + + BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; + + // Only process entries in the Wix4SecureObject table whose components match the bitness of this CA +#ifdef _WIN64 + if (!fIs64Bit) + { + continue; + } +#else + if (fIs64Bit) + { + continue; + } +#endif + + // Get the object to secure + hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzSecureObject); + ExitOnFailure(hr, "failed to get name of object"); + + hr = GetTargetPath(eType, pwzSecureObject, &pwzTargetPath); + ExitOnFailure(hr, "failed to get target path of object '%ls'", pwzSecureObject); + + hr = WcaGetRecordString(hRec, QSO_COMPONENT, &pwzData); + ExitOnFailure(hr, "failed to get Component name for secure object"); + + // + // if we are installing this Component + // + er = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get install state for Component: %ls", pwzData); + + if (WcaIsInstalling(isInstalled, isAction)) + { + hr = WcaWriteStringToCaData(pwzTargetPath, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + // add the data to the CustomActionData + hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzData); + ExitOnFailure(hr, "failed to get name of object"); + hr = WcaWriteStringToCaData(pwzTable, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordFormattedString(hRec, QSO_DOMAIN, &pwzData); + ExitOnFailure(hr, "failed to get domain for user to configure object"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordFormattedString(hRec, QSO_USER, &pwzData); + ExitOnFailure(hr, "failed to get user to configure object"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordInteger(hRec, QSO_ATTRIBUTES, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to get attributes to configure object"); + hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSO_PERMISSION, &pwzData); + ExitOnFailure(hr, "failed to get permission to configure object"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + ++cObjects; + } + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + hr = S_OK; + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // + // schedule the custom action and add to progress bar + // + if (pwzCustomActionData && *pwzCustomActionData) + { + Assert(0 < cObjects); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecSecureObjects"), pwzCustomActionData, cObjects * COST_SECUREOBJECT); + ExitOnFailure(hr, "failed to schedule ExecSecureObjects action"); + } + +LExit: + ReleaseStr(pwzSecureObject); + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzData); + ReleaseStr(pwzTable); + ReleaseStr(pwzTargetPath); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +/****************************************************************** + SchedSecureObjectsRollback - entry point for SchedSecureObjectsRollback Custom Action + + called as Type 1 CustomAction (binary DLL) from Windows Installer + in InstallExecuteSequence before SchedSecureObjects +******************************************************************/ +extern "C" UINT __stdcall SchedSecureObjectsRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug SchedSecureObjectsRollback"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzSecureObject = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzTargetPath = NULL; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + + LPWSTR pwzCustomActionData = NULL; + + eOBJECTTYPE eType = OT_UNKNOWN; + + // + // initialize + // + hr = WcaInitialize(hInstall, "SchedSecureObjectsRollback"); + ExitOnFailure(hr, "failed to initialize"); + + // + // loop through all the objects to be secured + // + hr = WcaOpenExecuteView(wzQUERY_SECUREOBJECTS, &hView); + ExitOnFailure(hr, "failed to open view on Wix4SecureObject table"); + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + hr = WcaGetRecordString(hRec, QSO_TABLE, &pwzTable); + ExitOnFailure(hr, "failed to get object table"); + + eType = EObjectTypeFromString(pwzTable); + + if (OT_UNKNOWN == eType) + { + ExitOnFailure(hr = E_INVALIDARG, "unknown SecureObject.Table: %ls", pwzTable); + } + + int iCompAttributes = 0; + hr = WcaGetRecordInteger(hRec, QSO_COMPATTRIBUTES, &iCompAttributes); + ExitOnFailure(hr, "failed to get Component attributes for secure object"); + + BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; + + // Only process entries in the Wix4SecureObject table whose components match the bitness of this CA +#ifdef _WIN64 + if (!fIs64Bit) + { + continue; + } +#else + if (fIs64Bit) + { + continue; + } +#endif + + // get the object being secured that we are planning to schedule rollback for + hr = WcaGetRecordString(hRec, QSO_SECUREOBJECT, &pwzSecureObject); + ExitOnFailure(hr, "failed to get name of object"); + + hr = GetTargetPath(eType, pwzSecureObject, &pwzTargetPath); + ExitOnFailure(hr, "failed to get target path of object '%ls' in order to schedule rollback", pwzSecureObject); + + hr = StoreACLRollbackInfo(pwzTargetPath, pwzTable); + if (FAILED(hr)) + { + WcaLog(LOGMSG_STANDARD, "Failed to store ACL rollback information with error 0x%x - continuing", hr); + } + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to schedule rollback for"); + +LExit: + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzSecureObject); + ReleaseStr(pwzTable); + ReleaseStr(pwzTargetPath); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +/****************************************************************** + CaExecSecureObjects - entry point for SecureObjects Custom Action + called as Type 1025 CustomAction (deferred binary DLL) + + NOTE: deferred CustomAction since it modifies the machine + NOTE: CustomActionData == wzObject\twzTable\twzDomain\twzUser\tdwAttributes\tdwPermissions\t... +******************************************************************/ +extern "C" UINT __stdcall ExecSecureObjects( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecSecureObjects"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzObject = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzDomain = NULL; + DWORD dwRevision = 0; + LPWSTR pwzUser = NULL; + DWORD dwPermissions = 0; + DWORD dwAttributes = 0; + LPWSTR pwzAccount = NULL; + PSID psid = NULL; + + EXPLICIT_ACCESSW ea = {0}; + SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; + PSECURITY_DESCRIPTOR psd = NULL; + SECURITY_DESCRIPTOR_CONTROL sdc = {0}; + SECURITY_INFORMATION si = {0}; + PACL pAclExisting = NULL; // doesn't get freed + PACL pAclNew = NULL; + + PMSIHANDLE hActionRec = ::MsiCreateRecord(1); + + // + // initialize + // + hr = WcaInitialize(hInstall, "ExecSecureObjects"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + + // + // loop through all the passed in data + // + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzObject); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadStringFromCaData(&pwz, &pwzTable); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzDomain); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzUser); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwAttributes)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwPermissions)); + ExitOnFailure(hr, "failed to process CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Securing Object: %ls Type: %ls User: %ls", pwzObject, pwzTable, pwzUser); + + // + // create the appropriate SID + // + + // figure out the right user to put into the access block + if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Everyone")) + { + hr = AclGetWellKnownSid(WinWorldSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Administrators")) + { + hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"LocalSystem")) + { + hr = AclGetWellKnownSid(WinLocalSystemSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"LocalService")) + { + hr = AclGetWellKnownSid(WinLocalServiceSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"NetworkService")) + { + hr = AclGetWellKnownSid(WinNetworkServiceSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"AuthenticatedUser")) + { + hr = AclGetWellKnownSid(WinAuthenticatedUserSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Guests")) + { + hr = AclGetWellKnownSid(WinBuiltinGuestsSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"CREATOR OWNER")) + { + hr = AclGetWellKnownSid(WinCreatorOwnerSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"INTERACTIVE")) + { + hr = AclGetWellKnownSid(WinInteractiveSid, &psid); + } + else if (!*pwzDomain && 0 == lstrcmpW(pwzUser, L"Users")) + { + hr = AclGetWellKnownSid(WinBuiltinUsersSid, &psid); + } + else + { + hr = StrAllocFormatted(&pwzAccount, L"%s%s%s", pwzDomain, *pwzDomain ? L"\\" : L"", pwzUser); + ExitOnFailure(hr, "failed to build domain user name"); + + hr = AclGetAccountSid(NULL, pwzAccount, &psid); + } + ExitOnFailure(hr, "failed to get sid for account: %ls%ls%ls", pwzDomain, *pwzDomain ? L"\\" : L"", pwzUser); + + // + // build up the explicit access + // + ea.grfAccessMode = SET_ACCESS; + + if (dwAttributes & SECURE_OBJECT_ATTRIBUTE_INHERITABLE) + { + ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; + } + else + { + ea.grfInheritance = NO_INHERITANCE; + } + +#pragma prefast(push) +#pragma prefast(disable:25029) + ::BuildTrusteeWithSidW(&ea.Trustee, psid); +#pragma prefast(pop) + + objectType = SEObjectTypeFromString(const_cast (pwzTable)); + + // always add these permissions for services + // these are basic permissions that are often forgotten + if (0 == lstrcmpW(L"ServiceInstall", pwzTable)) + { + dwPermissions |= SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_INTERROGATE; + } + + ea.grfAccessPermissions = dwPermissions; + + if (SE_UNKNOWN_OBJECT_TYPE != objectType) + { + er = ::GetNamedSecurityInfoW(pwzObject, objectType, DACL_SECURITY_INFORMATION, NULL, NULL, &pAclExisting, NULL, &psd); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to get security info for object: %ls", pwzObject); + + //Need to see if DACL is protected so getting Descriptor information + if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) + { + ExitOnLastError(hr, "failed to get security descriptor control for object: %ls", pwzObject); + } + +#pragma prefast(push) +#pragma prefast(disable:25029) + er = ::SetEntriesInAclW(1, &ea, pAclExisting, &pAclNew); +#pragma prefast(pop) + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to add ACLs for object: %ls", pwzObject); + + if (sdc & SE_DACL_PROTECTED) + { + si = DACL_SECURITY_INFORMATION | PROTECTED_DACL_SECURITY_INFORMATION; + } + else + { + si = DACL_SECURITY_INFORMATION; + } + er = ::SetNamedSecurityInfoW(pwzObject, objectType, si, NULL, NULL, pAclNew, NULL); + MessageExitOnFailure(hr = HRESULT_FROM_WIN32(er), msierrSecureObjectsFailedSet, "failed to set security info for object: %ls", pwzObject); + } + else + { + MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); + } + + hr = WcaProgressMessage(COST_SECUREOBJECT, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + + objectType = SE_UNKNOWN_OBJECT_TYPE; + } + +LExit: + ReleaseStr(pwzUser); + ReleaseStr(pwzDomain); + ReleaseStr(pwzTable); + ReleaseStr(pwzObject); + ReleaseStr(pwzData); + ReleaseStr(pwzAccount); + + if (pAclNew) + { + ::LocalFree(pAclNew); + } + if (psd) + { + ::LocalFree(psd); + } + if (psid) + { + AclFreeSid(psid); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +extern "C" UINT __stdcall ExecSecureObjectsRollback( + __in MSIHANDLE hInstall + ) +{ +// AssertSz(FALSE, "debug ExecSecureObjectsRollback"); + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + LPWSTR pwz = NULL; + LPWSTR pwzData = NULL; + LPWSTR pwzObject = NULL; + LPWSTR pwzTable = NULL; + LPWSTR pwzSecurityInfo = NULL; + + SE_OBJECT_TYPE objectType = SE_UNKNOWN_OBJECT_TYPE; + PSECURITY_DESCRIPTOR psd = NULL; + ULONG psdSize; + SECURITY_DESCRIPTOR_CONTROL sdc = {0}; + SECURITY_INFORMATION si = DACL_SECURITY_INFORMATION; + PACL pDacl = NULL; + BOOL bDaclPresent = false; + BOOL bDaclDefaulted = false; + DWORD dwRevision = 0; + int iProtected; + + // initialize + hr = WcaInitialize(hInstall, "ExecSecureObjectsRollback"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetProperty(L"CustomActionData", &pwzData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzData); + + pwz = pwzData; + + hr = WcaReadStringFromCaData(&pwz, &pwzObject); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadStringFromCaData(&pwz, &pwzTable); + ExitOnFailure(hr, "failed to process CustomActionData"); + + objectType = SEObjectTypeFromString(const_cast (pwzTable)); + + if (SE_UNKNOWN_OBJECT_TYPE != objectType) + { + hr = WcaReadStringFromCaData(&pwz, &pwzSecurityInfo); + ExitOnFailure(hr, "failed to process CustomActionData"); + + hr = WcaReadIntegerFromCaData(&pwz, &iProtected); + ExitOnFailure(hr, "failed to process CustomActionData"); + + if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(pwzSecurityInfo,SDDL_REVISION_1,&psd,&psdSize)) + { + ExitOnLastError(hr, "failed to convert security descriptor string to a valid security descriptor"); + } + + if (!::GetSecurityDescriptorDacl(psd,&bDaclPresent,&pDacl,&bDaclDefaulted)) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "failed to get security descriptor's DACL - error code: %d",pwzSecurityInfo,GetLastError()); + } + + // The below situation may always be caught by the above if block - the documentation isn't very clear. To be safe, we're going to test for it. + if (!bDaclPresent) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "security descriptor does not contain a DACL"); + } + + //Need to see if DACL is protected so getting Descriptor information + if (!::GetSecurityDescriptorControl(psd, &sdc, &dwRevision)) + { + ExitOnLastError(hr, "failed to get security descriptor control for object: %ls", pwzObject); + } + + // Write a 1 if DACL is protected, 0 otherwise + switch (iProtected) + { + case 0: + // Unnecessary to do anything - leave si to the default flags + break; + + case 1: + si = si | PROTECTED_DACL_SECURITY_INFORMATION; + break; + + default: + hr = E_UNEXPECTED; + ExitOnFailure(hr, "unrecognized value in CustomActionData"); + break; + } + + er = ::SetNamedSecurityInfoW(pwzObject, objectType, si, NULL, NULL, pDacl, NULL); + ExitOnFailure(hr = HRESULT_FROM_WIN32(er), "failed to set security info for object: %ls error code: %d", pwzObject, GetLastError()); + } + else + { + MessageExitOnFailure(hr = E_UNEXPECTED, msierrSecureObjectsUnknownType, "unknown object type: %ls", pwzTable); + } + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzObject); + ReleaseStr(pwzTable); + ReleaseStr(pwzSecurityInfo); + + if (psd) + { + ::LocalFree(psd); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/serviceconfig.cpp b/src/ext/Util/ca/serviceconfig.cpp new file mode 100644 index 00000000..04b25ffa --- /dev/null +++ b/src/ext/Util/ca/serviceconfig.cpp @@ -0,0 +1,821 @@ +// 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" + +// structs +LPCWSTR wzQUERY_SERVICECONFIG = L"SELECT `ServiceName`, `Component_`, `NewService`, `FirstFailureActionType`, `SecondFailureActionType`, `ThirdFailureActionType`, `ResetPeriodInDays`, `RestartServiceDelayInSeconds`, `ProgramCommandLine`, `RebootMessage` FROM `Wix4ServiceConfig`"; +enum eQUERY_SERVICECONFIG { QSC_SERVICENAME = 1, QSC_COMPONENT, QSC_NEWSERVICE, QSC_FIRSTFAILUREACTIONTYPE, QSC_SECONDFAILUREACTIONTYPE, QSC_THIRDFAILUREACTIONTYPE, QSC_RESETPERIODINDAYS, QSC_RESTARTSERVICEDELAYINSECONDS, QSC_PROGRAMCOMMANDLINE, QSC_REBOOTMESSAGE }; + +// consts +LPCWSTR c_wzActionTypeNone = L"none"; +LPCWSTR c_wzActionTypeReboot = L"reboot"; +LPCWSTR c_wzActionTypeRestart = L"restart"; +LPCWSTR c_wzActionTypeRunCommand = L"runCommand"; + +// prototypes +static SC_ACTION_TYPE GetSCActionType( + __in LPCWSTR pwzActionTypeName + ); + +static HRESULT GetSCActionTypeString( + __in SC_ACTION_TYPE type, + __out_ecount(cchActionTypeString) LPWSTR wzActionTypeString, + __in DWORD cchActionTypeString + ); + +static HRESULT GetService( + __in SC_HANDLE hSCM, + __in LPCWSTR wzService, + __in DWORD dwOpenServiceAccess, + __out SC_HANDLE* phService + ); + +static HRESULT ConfigureService( + __in SC_HANDLE hSCM, + __in SC_HANDLE hService, + __in LPCWSTR wzServiceName, + __in DWORD dwRestartServiceDelayInSeconds, + __in LPCWSTR wzFirstFailureActionType, + __in LPCWSTR wzSecondFailureActionType, + __in LPCWSTR wzThirdFailureActionType, + __in DWORD dwResetPeriodInDays, + __in LPWSTR wzRebootMessage, + __in LPWSTR wzProgramCommandLine + ); + + +/****************************************************************** +SchedServiceConfig - entry point for SchedServiceConfig Custom Action + +called as Type 1 CustomAction (binary DLL) from Windows Installer +in InstallExecuteSequence before CaExecServiceConfig +********************************************************************/ +extern "C" UINT __stdcall SchedServiceConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug SchedServiceConfig"); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + + LPWSTR pwzScriptKey = NULL; + LPWSTR pwzCustomActionData = NULL; + + PMSIHANDLE hView = NULL; + PMSIHANDLE hRec = NULL; + LPWSTR pwzData = NULL; + int iData = 0; + DWORD cServices = 0; + + // initialize + hr = WcaInitialize(hInstall, "SchedServiceConfig"); + ExitOnFailure(hr, "Failed to initialize."); + + // Get the script key for this CustomAction and put it on the front of the + // CustomActionData of the install action. + hr = WcaCaScriptCreateKey(&pwzScriptKey); + ExitOnFailure(hr, "Failed to get encoding key."); + + hr = WcaWriteStringToCaData(pwzScriptKey, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add encoding key to CustomActionData."); + + // Loop through all the services to be configured. + hr = WcaOpenExecuteView(wzQUERY_SERVICECONFIG, &hView); + ExitOnFailure(hr, "Failed to open view on Wix4ServiceConfig table."); + + while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) + { + INSTALLSTATE isInstalled = INSTALLSTATE_UNKNOWN; + INSTALLSTATE isAction = INSTALLSTATE_UNKNOWN; + + // Get component name to check if we are installing it. If so + // then add the table data to the CustomActionData, otherwise + // skip it. + hr = WcaGetRecordString(hRec, QSC_COMPONENT, &pwzData); + ExitOnFailure(hr, "Failed to get component name"); + + hr = ::MsiGetComponentStateW(hInstall, pwzData, &isInstalled, &isAction); + ExitOnFailure(hr = HRESULT_FROM_WIN32(hr), "Failed to get install state for Component: %ls", pwzData); + + if (WcaIsInstalling(isInstalled, isAction)) + { + // Add the data to the CustomActionData (for install). + hr = WcaGetRecordFormattedString(hRec, QSC_SERVICENAME, &pwzData); + ExitOnFailure(hr, "Failed to get name of service."); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add name to CustomActionData."); + + hr = WcaGetRecordInteger(hRec, QSC_NEWSERVICE, &iData); + ExitOnFailure(hr, "Failed to get Wix4ServiceConfig.NewService."); + hr = WcaWriteIntegerToCaData(0 != iData, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to add NewService data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_FIRSTFAILUREACTIONTYPE, &pwzData); + ExitOnFailure(hr, "failed to get first failure action type"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_SECONDFAILUREACTIONTYPE, &pwzData); + ExitOnFailure(hr, "failed to get second failure action type"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_THIRDFAILUREACTIONTYPE, &pwzData); + ExitOnFailure(hr, "failed to get third failure action type"); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordInteger(hRec, QSC_RESETPERIODINDAYS, &iData); + if (S_FALSE == hr) // deal w/ possible null value + { + iData = 0; + } + ExitOnFailure(hr, "failed to get reset period in days between service restart attempts."); + hr = WcaWriteIntegerToCaData(iData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordInteger(hRec, QSC_RESTARTSERVICEDELAYINSECONDS, &iData); + if (S_FALSE == hr) // deal w/ possible null value + { + iData = 0; + } + ExitOnFailure(hr, "failed to get server restart delay value."); + hr = WcaWriteIntegerToCaData(iData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordFormattedString(hRec, QSC_PROGRAMCOMMANDLINE, &pwzData); // null value already dealt w/ properly + ExitOnFailure(hr, "failed to get command line to run on service failure."); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaGetRecordString(hRec, QSC_REBOOTMESSAGE, &pwzData); // null value already dealt w/ properly + ExitOnFailure(hr, "failed to get message to send to users when server reboots due to service failure."); + hr = WcaWriteStringToCaData(pwzData, &pwzCustomActionData); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + ++cServices; + } + } + + // if we looped through all records all is well + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + } + ExitOnFailure(hr, "failed while looping through all objects to secure"); + + // setup CustomActionData and add to progress bar for download + if (0 < cServices) + { + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackServiceConfig"), pwzScriptKey, cServices * COST_SERVICECONFIG); + ExitOnFailure(hr, "failed to schedule RollbackServiceConfig action"); + + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecServiceConfig"), pwzCustomActionData, cServices * COST_SERVICECONFIG); + ExitOnFailure(hr, "failed to schedule ExecServiceConfig action"); + } + +LExit: + ReleaseStr(pwzData); + ReleaseStr(pwzCustomActionData); + ReleaseStr(pwzScriptKey); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/****************************************************************** +CaExecServiceConfig - entry point for ServiceConfig Custom Action. + +NOTE: deferred CustomAction since it modifies the machine +NOTE: CustomActionData == wzServiceName\tfNewService\twzFirstFailureActionType\twzSecondFailureActionType\twzThirdFailureActionType\tdwResetPeriodInDays\tdwRestartServiceDelayInSeconds\twzProgramCommandLine\twzRebootMessage\twzServiceName\tfNewService\t... +*******************************************************************/ +extern "C" UINT __stdcall ExecServiceConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug ExecServiceConfig"); + HRESULT hr = S_OK; + DWORD er = 0; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + + LPWSTR pwzScriptKey = NULL; + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + + LPWSTR pwzServiceName = NULL; + BOOL fNewService = FALSE; + LPWSTR pwzFirstFailureActionType = NULL; + LPWSTR pwzSecondFailureActionType = NULL; + LPWSTR pwzThirdFailureActionType = NULL; + LPWSTR pwzProgramCommandLine = NULL; + LPWSTR pwzRebootMessage = NULL; + DWORD dwResetPeriodInDays = 0; + DWORD dwRestartServiceDelayInSeconds = 0; + + LPVOID lpMsgBuf = NULL; + SC_HANDLE hSCM = NULL; + SC_HANDLE hService = NULL; + + DWORD dwRestartDelay = 0; + WCHAR wzActionName[32] = { 0 }; + + DWORD cbExistingServiceConfig = 0; + + SERVICE_FAILURE_ACTIONSW* psfa = NULL; + + // initialize + hr = WcaInitialize(hInstall, "ExecServiceConfig"); + ExitOnFailure(hr, "failed to initialize"); + + // Open the Services Control Manager up front. + hSCM = ::OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (NULL == hSCM) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + ExitOnFailure(hr, "Failed to get handle to SCM. Error: %ls", (LPWSTR)lpMsgBuf); + } + + // First, get the script key out of the CustomActionData and + // use that to create the rollback script for this action. + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + if (!pwzScriptKey) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Failed due to unexpected CustomActionData passed."); + } + ExitOnFailure(hr, "Failed to read encoding key from CustomActionData."); + + hr = WcaCaScriptCreate(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, FALSE, &hRollbackScript); + ExitOnFailure(hr, "Failed to open rollback CustomAction script."); + + // Next, loop through the rest of the CustomActionData, processing + // each service config row in turn. + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzServiceName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&fNewService)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzFirstFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzSecondFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzThirdFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwResetPeriodInDays)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwRestartServiceDelayInSeconds)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzProgramCommandLine); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzRebootMessage); + ExitOnFailure(hr, "failed to process CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Configuring Service: %ls", pwzServiceName); + + // Open the handle with all the permissions we might need: + // SERVICE_QUERY_CONFIG is needed for QueryServiceConfig2(). + // SERVICE_CHANGE_CONFIG is needed for ChangeServiceConfig2(). + // SERVICE_START is required in order to handle SC_ACTION_RESTART action. + hr = GetService(hSCM, pwzServiceName, SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG | SERVICE_START, &hService); + ExitOnFailure(hr, "Failed to get service: %ls", pwzServiceName); + + // If we are configuring a service that existed on the machine, we need to + // read the existing service configuration and write it out to the rollback + // log so rollback can put it back if anything goes wrong. + if (!fNewService) + { + // First, read the existing service config. + if (!::QueryServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, NULL, 0, &cbExistingServiceConfig) && ERROR_INSUFFICIENT_BUFFER != ::GetLastError()) + { + ExitWithLastError(hr, "Failed to get current service config info."); + } + + psfa = static_cast(MemAlloc(cbExistingServiceConfig, TRUE)); + ExitOnNull(psfa, hr, E_OUTOFMEMORY, "failed to allocate memory for service failure actions."); + + if (!::QueryServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)psfa, cbExistingServiceConfig, &cbExistingServiceConfig)) + { + ExitOnLastError(hr, "failed to Query Service."); + } + + // Build up rollback log so we can restore service state if necessary + hr = WcaCaScriptWriteString(hRollbackScript, pwzServiceName); + ExitOnFailure(hr, "Failed to add service name to Rollback Log"); + + // If this service struct is empty, fill in default values + if (3 > psfa->cActions) + { + hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + hr = WcaCaScriptWriteString(hRollbackScript, c_wzActionTypeNone); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + } + else + { + // psfa actually had actions defined, so use the first three. + for (int i = 0; i < 3; ++i) + { + hr = GetSCActionTypeString(psfa->lpsaActions[i].Type, wzActionName, countof(wzActionName)); + ExitOnFailure(hr, "failed to query SFA object"); + + if (SC_ACTION_RESTART == psfa->lpsaActions[i].Type) + { + dwRestartDelay = psfa->lpsaActions[i].Delay / 1000; + } + + hr = WcaCaScriptWriteString(hRollbackScript, wzActionName); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + } + } + + hr = WcaCaScriptWriteNumber(hRollbackScript, psfa->dwResetPeriod / (24 * 60 * 60)); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + hr = WcaCaScriptWriteNumber(hRollbackScript, dwRestartDelay); + ExitOnFailure(hr, "failed to add data to CustomActionData"); + + // Handle the null cases. + if (!psfa->lpCommand) + { + psfa->lpCommand = L""; + } + hr = WcaCaScriptWriteString(hRollbackScript, psfa->lpCommand); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + // Handle the null cases. + if (!psfa->lpRebootMsg) + { + psfa->lpRebootMsg = L""; + } + hr = WcaCaScriptWriteString(hRollbackScript, psfa->lpRebootMsg); + ExitOnFailure(hr, "failed to add data to Rollback CustomActionData"); + + // Nudge the system to get all our rollback data written to disk. + WcaCaScriptFlush(hRollbackScript); + + ReleaseNullMem(psfa); + } + + hr = ConfigureService(hSCM, hService, pwzServiceName, dwRestartServiceDelayInSeconds, pwzFirstFailureActionType, + pwzSecondFailureActionType, pwzThirdFailureActionType, dwResetPeriodInDays, pwzRebootMessage, pwzProgramCommandLine); + ExitOnFailure(hr, "Failed to configure service: %ls", pwzServiceName); + + hr = WcaProgressMessage(COST_SERVICECONFIG, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + + // Per-service cleanup + ::CloseServiceHandle(hService); + hService = NULL; + dwResetPeriodInDays = 0; + dwRestartServiceDelayInSeconds = 0; + } + +LExit: + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_PRESERVE); + + if (lpMsgBuf) + { + ::LocalFree(lpMsgBuf); + } + + if (hService) + { + ::CloseServiceHandle(hService); + } + + if (hSCM) + { + ::CloseServiceHandle(hSCM); + } + + ReleaseMem(psfa); + + ReleaseStr(pwzRebootMessage); + ReleaseStr(pwzProgramCommandLine); + ReleaseStr(pwzThirdFailureActionType); + ReleaseStr(pwzSecondFailureActionType); + ReleaseStr(pwzFirstFailureActionType); + ReleaseStr(pwzServiceName); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzCustomActionData); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/****************************************************************** +RollbackServiceConfig - entry point for ServiceConfig rollback + Custom Action. + +NOTE: CustomActionScript Data == wzServiceName\twzFirstFailureActionType\twzSecondFailureActionType\twzThirdFailureActionType\tdwResetPeriodInDays\tdwRestartServiceDelayInSeconds\twzProgramCommandLine\twzRebootMessage\twzServiceName\t... +*******************************************************************/ +extern "C" UINT __stdcall RollbackServiceConfig( + __in MSIHANDLE hInstall + ) +{ + //AssertSz(FALSE, "debug RollbackServiceConfig"); + HRESULT hr = S_OK; + DWORD er = 0; + + LPWSTR pwzCustomActionData = NULL; + LPWSTR pwz = NULL; + + LPWSTR pwzScriptKey = NULL; + WCA_CASCRIPT_HANDLE hRollbackScript = NULL; + + LPWSTR pwzServiceName = NULL; + LPWSTR pwzFirstFailureActionType = NULL; + LPWSTR pwzSecondFailureActionType = NULL; + LPWSTR pwzThirdFailureActionType = NULL; + LPWSTR pwzProgramCommandLine = NULL; + LPWSTR pwzRebootMessage = NULL; + DWORD dwResetPeriodInDays = 0; + DWORD dwRestartServiceDelayInSeconds = 0; + + LPVOID lpMsgBuf = NULL; + SC_HANDLE hSCM = NULL; + SC_HANDLE hService = NULL; + + // initialize + hr = WcaInitialize(hInstall, "RollbackServiceConfig"); + ExitOnFailure(hr, "Failed to initialize 'RollbackServiceConfig'."); + + // Open the Services Control Manager up front. + hSCM = ::OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (NULL == hSCM) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + ExitOnFailure(hr, "Failed to get handle to SCM. Error: %ls", (LPWSTR)lpMsgBuf); + + // Make sure we still abort, in case hSCM was NULL but no error was returned from GetLastError + ExitOnNull(hSCM, hr, E_POINTER, "Getting handle to SCM reported success, but no handle was returned."); + } + + // Get the script key from the CustomAction data and use it to open + // the rollback log and read the data over the CustomActionData + // because all of the information is in the script data not the + // CustomActionData. + hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData); + ExitOnFailure(hr, "failed to get CustomActionData"); + + WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData); + + pwz = pwzCustomActionData; + + hr = WcaReadStringFromCaData(&pwz, &pwzScriptKey); + if (!pwzScriptKey) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Failed due to unexpected CustomActionData passed."); + } + ExitOnFailure(hr, "Failed to read encoding key from CustomActionData."); + + hr = WcaCaScriptOpen(WCA_ACTION_INSTALL, WCA_CASCRIPT_ROLLBACK, FALSE, pwzScriptKey, &hRollbackScript); + ExitOnFailure(hr, "Failed to open rollback CustomAction script."); + + hr = WcaCaScriptReadAsCustomActionData(hRollbackScript, &pwzCustomActionData); + ExitOnFailure(hr, "Failed to read rollback script into CustomAction data."); + + // Loop through the script's CustomActionData, processing each + // service config in turn. + pwz = pwzCustomActionData; + while (pwz && *pwz) + { + hr = WcaReadStringFromCaData(&pwz, &pwzServiceName); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzFirstFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzSecondFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzThirdFailureActionType); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwResetPeriodInDays)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadIntegerFromCaData(&pwz, reinterpret_cast(&dwRestartServiceDelayInSeconds)); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzProgramCommandLine); + ExitOnFailure(hr, "failed to process CustomActionData"); + hr = WcaReadStringFromCaData(&pwz, &pwzRebootMessage); + ExitOnFailure(hr, "failed to process CustomActionData"); + + WcaLog(LOGMSG_VERBOSE, "Reconfiguring Service: %ls", pwzServiceName); + + // Open the handle with all the permissions we might need. + // SERVICE_CHANGE_CONFIG is needed for ChangeServiceConfig2(). + // SERVICE_START is required in order to handle SC_ACTION_RESTART action. + hr = GetService(hSCM, pwzServiceName, SERVICE_CHANGE_CONFIG | SERVICE_START, &hService); + ExitOnFailure(hr, "Failed to get service: %ls", pwzServiceName); + + hr = ConfigureService(hSCM, hService, pwzServiceName, dwRestartServiceDelayInSeconds, pwzFirstFailureActionType, + pwzSecondFailureActionType, pwzThirdFailureActionType, dwResetPeriodInDays, pwzRebootMessage, pwzProgramCommandLine); + ExitOnFailure(hr, "Failed to configure service: %ls", pwzServiceName); + + hr = WcaProgressMessage(COST_SERVICECONFIG, FALSE); + ExitOnFailure(hr, "failed to send progress message"); + + // Per-service cleanup + ::CloseServiceHandle(hService); + hService = NULL; + dwResetPeriodInDays = 0; + dwRestartServiceDelayInSeconds = 0; + } + +LExit: + if (lpMsgBuf) // Allocated with FormatString. + { + ::LocalFree(lpMsgBuf); + } + + if (hService) + { + ::CloseServiceHandle(hService); + } + + if (hSCM) + { + ::CloseServiceHandle(hSCM); + } + + WcaCaScriptClose(hRollbackScript, WCA_CASCRIPT_CLOSE_DELETE); + + ReleaseStr(pwzRebootMessage); + ReleaseStr(pwzProgramCommandLine); + ReleaseStr(pwzThirdFailureActionType); + ReleaseStr(pwzSecondFailureActionType); + ReleaseStr(pwzFirstFailureActionType); + ReleaseStr(pwzServiceName); + ReleaseStr(pwzScriptKey); + ReleaseStr(pwzCustomActionData); + + er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; + return WcaFinalize(er); +} + + +/********************************************************** +GetSCActionType - helper function to return the SC_ACTION_TYPE +for a given string matching the allowed set. +REBOOT, RESTART, RUN_COMMAND and NONE +**********************************************************/ +static SC_ACTION_TYPE GetSCActionType( + __in LPCWSTR pwzActionTypeName + ) +{ + SC_ACTION_TYPE actionType; + + // verify that action types are valid. if not, just default to NONE + if (0 == lstrcmpiW(c_wzActionTypeReboot, pwzActionTypeName)) + { + actionType = SC_ACTION_REBOOT; + } + else if (0 == lstrcmpiW(c_wzActionTypeRestart, pwzActionTypeName)) + { + actionType = SC_ACTION_RESTART; + } + else if (0 == lstrcmpiW(c_wzActionTypeRunCommand, pwzActionTypeName)) + { + actionType = SC_ACTION_RUN_COMMAND; + } + else + { + // default to none + actionType = SC_ACTION_NONE; + } + + return actionType; +} + + +static HRESULT GetSCActionTypeString( + __in SC_ACTION_TYPE type, + __out_ecount(cchActionTypeString) LPWSTR wzActionTypeString, + __in DWORD cchActionTypeString + ) +{ + HRESULT hr = S_OK; + + switch (type) + { + case SC_ACTION_REBOOT: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeReboot); + ExitOnFailure(hr, "Failed to copy 'reboot' into action type."); + break; + case SC_ACTION_RESTART: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeRestart); + ExitOnFailure(hr, "Failed to copy 'restart' into action type."); + break; + case SC_ACTION_RUN_COMMAND: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeRunCommand); + ExitOnFailure(hr, "Failed to copy 'runCommand' into action type."); + break; + case SC_ACTION_NONE: + hr = StringCchCopyW(wzActionTypeString, cchActionTypeString, c_wzActionTypeNone); + ExitOnFailure(hr, "Failed to copy 'none' into action type."); + break; + default: + break; + } + +LExit: + return hr; +} + + +static HRESULT GetService( + __in SC_HANDLE hSCM, + __in LPCWSTR wzService, + __in DWORD dwOpenServiceAccess, + __out SC_HANDLE* phService + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + LPVOID lpMsgBuf = NULL; + + *phService = ::OpenServiceW(hSCM, wzService, dwOpenServiceAccess); + if (NULL == *phService) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + if (ERROR_SERVICE_DOES_NOT_EXIST == er) + { + ExitOnFailure(hr, "Service '%ls' does not exist on this system.", wzService); + } + else + { +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + ExitOnFailure(hr, "Failed to get handle to the service '%ls'. Error: %ls", wzService, (LPWSTR)lpMsgBuf); + } + } + +LExit: + if (lpMsgBuf) // Allocated with FormatString. + { + ::LocalFree(lpMsgBuf); + } + + return hr; +} + + +static HRESULT ConfigureService( + __in SC_HANDLE /*hSCM*/, + __in SC_HANDLE hService, + __in LPCWSTR wzServiceName, + __in DWORD dwRestartServiceDelayInSeconds, + __in LPCWSTR wzFirstFailureActionType, + __in LPCWSTR wzSecondFailureActionType, + __in LPCWSTR wzThirdFailureActionType, + __in DWORD dwResetPeriodInDays, + __in LPWSTR wzRebootMessage, + __in LPWSTR wzProgramCommandLine + ) +{ + HRESULT hr = S_OK; + DWORD er = ERROR_SUCCESS; + + HANDLE hToken = NULL; + TOKEN_PRIVILEGES priv = { 0 }; + TOKEN_PRIVILEGES* pPrevPriv = NULL; + DWORD cbPrevPriv = 0; + BOOL fAdjustedPrivileges = FALSE; + + SC_ACTION actions[3]; // the UI always shows 3 actions, so we'll always do 3 + SERVICE_FAILURE_ACTIONSW sfa; + LPVOID lpMsgBuf = NULL; + + // Always get the shutdown privilege in case we need to configure service to reboot. + if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + ExitWithLastError(hr, "Failed to get process token."); + } + + priv.PrivilegeCount = 1; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + if (!::LookupPrivilegeValueW(NULL, L"SeShutdownPrivilege", &priv.Privileges[0].Luid)) + { + ExitWithLastError(hr, "Failed to get shutdown privilege LUID."); + } + + cbPrevPriv = sizeof(TOKEN_PRIVILEGES); + pPrevPriv = static_cast(MemAlloc(cbPrevPriv, TRUE)); + ExitOnNull(pPrevPriv, hr, E_OUTOFMEMORY, "Failed to allocate memory for empty previous privileges."); + + if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv)) + { + LPVOID pv = MemReAlloc(pPrevPriv, cbPrevPriv, TRUE); + ExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for previous privileges."); + pPrevPriv = static_cast(pv); + + if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv)) + { + ExitWithLastError(hr, "Failed to get shutdown privilege LUID."); + } + } + + fAdjustedPrivileges = TRUE; + + // build up SC_ACTION array + // TODO: why is delay only respected when SC_ACTION_RESTART is requested? + actions[0].Type = GetSCActionType(wzFirstFailureActionType); + actions[0].Delay = 0; + if (SC_ACTION_RESTART == actions[0].Type) + { + actions[0].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds + } + + actions[1].Type = GetSCActionType(wzSecondFailureActionType); + actions[1].Delay = 0; + if (SC_ACTION_RESTART == actions[1].Type) + { + actions[1].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds + } + + actions[2].Type = GetSCActionType(wzThirdFailureActionType); + actions[2].Delay = 0; + if (SC_ACTION_RESTART == actions[2].Type) + { + actions[2].Delay = dwRestartServiceDelayInSeconds * 1000; // seconds to milliseconds + } + + // build up the SERVICE_FAILURE_ACTIONSW struct + sfa.dwResetPeriod = dwResetPeriodInDays * (24 * 60 * 60); // days to seconds + sfa.lpRebootMsg = wzRebootMessage; + sfa.lpCommand = wzProgramCommandLine; + sfa.cActions = countof(actions); + sfa.lpsaActions = actions; + + // Call ChangeServiceConfig2 to actually set up the failure actions + if (!::ChangeServiceConfig2W(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPVOID)&sfa)) + { + er = ::GetLastError(); + hr = HRESULT_FROM_WIN32(er); + +#pragma prefast(push) +#pragma prefast(disable:25028) + ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, er, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&lpMsgBuf, 0, NULL); +#pragma prefast(pop) + + // Check if this is a service that can't be modified. + if (ERROR_CANNOT_DETECT_PROCESS_ABORT == er) + { + WcaLog(LOGMSG_STANDARD, "WARNING: Service \"%ls\" is not configurable on this server and will not be set.", wzServiceName); + } + ExitOnFailure(hr, "Cannot change service configuration. Error: %ls", (LPWSTR)lpMsgBuf); + + if (lpMsgBuf) + { + ::LocalFree(lpMsgBuf); + lpMsgBuf = NULL; + } + } + +LExit: + if (lpMsgBuf) + { + ::LocalFree(lpMsgBuf); + } + + if (fAdjustedPrivileges) + { + ::AdjustTokenPrivileges(hToken, FALSE, pPrevPriv, 0, NULL, NULL); + } + + ReleaseMem(pPrevPriv); + ReleaseHandle(hToken); + + return hr; +} diff --git a/src/ext/Util/ca/shellexecca.cpp b/src/ext/Util/ca/shellexecca.cpp new file mode 100644 index 00000000..ea21d3bd --- /dev/null +++ b/src/ext/Util/ca/shellexecca.cpp @@ -0,0 +1,271 @@ +// 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" + +HRESULT ShellExec( + __in LPCWSTR wzTarget, + __in BOOL fUnelevated + ) +{ + HRESULT hr = S_OK; + LPWSTR sczWorkingDirectory = NULL; + + // a reasonable working directory (not the system32 default from MSI) is the directory where the target lives + hr = PathGetDirectory(wzTarget, &sczWorkingDirectory); + ExitOnFailure(hr, "failed to get directory for target: %ls", wzTarget); + + if (!DirExists(sczWorkingDirectory, NULL)) + { + ReleaseNullStr(sczWorkingDirectory); + } + + if (fUnelevated) + { + hr = ShelExecUnelevated(wzTarget, NULL, NULL, sczWorkingDirectory, SW_SHOWDEFAULT); + ExitOnFailure(hr, "ShelExecUnelevated failed with target %ls", wzTarget); + } + else + { + HINSTANCE hinst = ::ShellExecuteW(NULL, NULL, wzTarget, NULL, sczWorkingDirectory, SW_SHOWDEFAULT); + if (hinst <= HINSTANCE(32)) + { + LONG64 code = reinterpret_cast(hinst); + switch (code) + { + case ERROR_FILE_NOT_FOUND: + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + break; + case ERROR_PATH_NOT_FOUND: + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + break; + case ERROR_BAD_FORMAT: + hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); + break; + case SE_ERR_ASSOCINCOMPLETE: + case SE_ERR_NOASSOC: + hr = HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + break; + case SE_ERR_DDEBUSY: + case SE_ERR_DDEFAIL: + case SE_ERR_DDETIMEOUT: + hr = HRESULT_FROM_WIN32(ERROR_DDE_FAIL); + break; + case SE_ERR_DLLNOTFOUND: + hr = HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND); + break; + case SE_ERR_OOM: + hr = E_OUTOFMEMORY; + break; + case SE_ERR_ACCESSDENIED: + hr = E_ACCESSDENIED; + break; + default: + hr = E_FAIL; + } + + ExitOnFailure(hr, "ShellExec failed with return code %llu.", code); + } + } + + +LExit: + ReleaseStr(sczWorkingDirectory); + return hr; +} + +extern "C" UINT __stdcall WixShellExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + LPWSTR pwzTarget = NULL; + + hr = WcaInitialize(hInstall, "WixShellExec"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetFormattedProperty(L"WixShellExecTarget", &pwzTarget); + ExitOnFailure(hr, "failed to get WixShellExecTarget"); + + WcaLog(LOGMSG_VERBOSE, "WixShellExecTarget is %ls", pwzTarget); + + if (!pwzTarget || !*pwzTarget) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to get WixShellExecTarget"); + } + + hr = ShellExec(pwzTarget, FALSE); + ExitOnFailure(hr, "failed to launch target"); + +LExit: + ReleaseStr(pwzTarget); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +extern "C" UINT __stdcall WixUnelevatedShellExec( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + LPWSTR pwzTarget = NULL; + + hr = WcaInitialize(hInstall, "WixUnelevatedShellExec"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetFormattedProperty(L"WixUnelevatedShellExecTarget", &pwzTarget); + ExitOnFailure(hr, "failed to get WixUnelevatedShellExecTarget"); + + WcaLog(LOGMSG_VERBOSE, "WixUnelevatedShellExecTarget is %ls", pwzTarget); + + if (!pwzTarget || !*pwzTarget) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to get WixShellExecTarget"); + } + + hr = ShellExec(pwzTarget, TRUE); + ExitOnFailure(hr, "failed to launch target"); + +LExit: + ReleaseStr(pwzTarget); + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} + +// +// ExtractBinary extracts the data from the Binary table row with the given ID into a file. +// +HRESULT ExtractBinary( + __in LPCWSTR wzBinaryId, + __out BYTE** pbData, + __out DWORD* pcbData + ) +{ + HRESULT hr = S_OK; + LPWSTR pwzSql = NULL; + PMSIHANDLE hView; + PMSIHANDLE hRec; + + // make sure we're not horked from the get-go + hr = WcaTableExists(L"Binary"); + if (S_OK != hr) + { + if (SUCCEEDED(hr)) + { + hr = E_UNEXPECTED; + } + ExitOnFailure(hr, "There is no Binary table."); + } + + ExitOnNull(wzBinaryId, hr, E_INVALIDARG, "Binary ID cannot be null"); + ExitOnNull(*wzBinaryId, hr, E_INVALIDARG, "Binary ID cannot be empty string"); + + hr = StrAllocFormatted(&pwzSql, L"SELECT `Data` FROM `Binary` WHERE `Name`=\'%s\'", wzBinaryId); + ExitOnFailure(hr, "Failed to allocate Binary table query."); + + hr = WcaOpenExecuteView(pwzSql, &hView); + ExitOnFailure(hr, "Failed to open view on Binary table"); + + hr = WcaFetchSingleRecord(hView, &hRec); + ExitOnFailure(hr, "Failed to retrieve request from Binary table"); + + hr = WcaGetRecordStream(hRec, 1, pbData, pcbData); + ExitOnFailure(hr, "Failed to read Binary.Data."); + +LExit: + ReleaseStr(pwzSql); + + return hr; +} + +extern "C" UINT __stdcall WixShellExecBinary( + __in MSIHANDLE hInstall + ) +{ + Assert(hInstall); + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + LPWSTR pwzBinary = NULL; + LPWSTR pwzFilename = NULL; + BYTE* pbData = NULL; + DWORD cbData = 0; + HANDLE hFile = INVALID_HANDLE_VALUE; + +#if 0 + ::MessageBoxA(0, "WixShellExecBinary", "-->> ATTACH HERE", MB_OK); +#endif + + hr = WcaInitialize(hInstall, "WixShellExecBinary"); + ExitOnFailure(hr, "failed to initialize"); + + hr = WcaGetFormattedProperty(L"WixShellExecBinaryId", &pwzBinary); + ExitOnFailure(hr, "failed to get WixShellExecBinaryId"); + + WcaLog(LOGMSG_VERBOSE, "WixShellExecBinaryId is %ls", pwzBinary); + + if (!pwzBinary || !*pwzBinary) + { + hr = E_INVALIDARG; + ExitOnFailure(hr, "failed to get WixShellExecBinaryId"); + } + + // get temporary path for extracted file + StrAlloc(&pwzFilename, MAX_PATH); + ExitOnFailure(hr, "Failed to allocate temporary path"); + ::GetTempPathW(MAX_PATH, pwzFilename); + hr = ::StringCchCatW(pwzFilename, MAX_PATH, pwzBinary); + ExitOnFailure(hr, "Failed to append filename."); + + // grab the bits + hr = ExtractBinary(pwzBinary, &pbData, &cbData); + ExitOnFailure(hr, "failed to extract binary data"); + + // write 'em to the temp file + hFile = ::CreateFileW(pwzFilename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == hFile) + { + ExitWithLastError(hr, "Failed to open new temp file: %ls", pwzFilename); + } + + DWORD cbWritten = 0; + if (!::WriteFile(hFile, pbData, cbData, &cbWritten, NULL)) + { + ExitWithLastError(hr, "Failed to write data to new temp file: %ls", pwzFilename); + } + + // close it + ::CloseHandle(hFile); + hFile = INVALID_HANDLE_VALUE; + + // and run it + hr = ShellExec(pwzFilename, FALSE); + ExitOnFailure(hr, "failed to launch target: %ls", pwzFilename); + +LExit: + ReleaseStr(pwzBinary); + ReleaseStr(pwzFilename); + ReleaseMem(pbData); + if (INVALID_HANDLE_VALUE != hFile) + { + ::CloseHandle(hFile); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + return WcaFinalize(er); +} diff --git a/src/ext/Util/ca/test.cpp b/src/ext/Util/ca/test.cpp new file mode 100644 index 00000000..c4d215f0 --- /dev/null +++ b/src/ext/Util/ca/test.cpp @@ -0,0 +1,269 @@ +// 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" + +#define WIXCA_UITHREAD_CLASS_WINDOW L"WixCaMessageWindow" + +extern HMODULE g_hInstCADLL; + + +// structs + +struct UITHREAD_CONTEXT +{ + HANDLE hInitializedEvent; + HINSTANCE hInstance; + HWND hWnd; +}; + + +// internal function declarations + +static HRESULT CreateMessageWindow( + __out HWND* phWnd + ); + +static void CloseMessageWindow( + __in HWND hWnd + ); + +static DWORD WINAPI ThreadProc( + __in LPVOID pvContext + ); + +static LRESULT CALLBACK WndProc( + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ); + + +/****************************************************************** +WixFailWhenDeferred - entry point for WixFailWhenDeferred + custom action which always fails when running as a deferred + custom action (otherwise it blindly succeeds). It's useful when + testing the rollback of deferred custom actions: Schedule it + immediately after the rollback/deferred CA pair you're testing + and it will fail, causing your rollback CA to get invoked. +********************************************************************/ +extern "C" UINT __stdcall WixFailWhenDeferred( + __in MSIHANDLE hInstall + ) +{ + return ::MsiGetMode(hInstall, MSIRUNMODE_SCHEDULED) ? ERROR_INSTALL_FAILURE : ERROR_SUCCESS; +} + +/****************************************************************** +WixWaitForEvent - entry point for WixWaitForEvent custom action + which waits for either the WixWaitForEventFail or + WixWaitForEventSucceed named auto reset events. Signaling the + WixWaitForEventFail event will return ERROR_INSTALL_FAILURE or + signaling the WixWaitForEventSucceed event will return + ERROR_SUCCESS. Both events are declared in the Global\ namespace. +********************************************************************/ +extern "C" UINT __stdcall WixWaitForEvent( + __in MSIHANDLE hInstall + ) +{ + HRESULT hr = S_OK; + UINT er = ERROR_SUCCESS; + HWND hMessageWindow = NULL; + LPCWSTR wzSDDL = L"D:(A;;GA;;;WD)"; + OS_VERSION version = OS_VERSION_UNKNOWN; + DWORD dwServicePack = 0; + PSECURITY_DESCRIPTOR pSD = NULL; + SECURITY_ATTRIBUTES sa = { }; + HANDLE rghEvents[2]; + + hr = WcaInitialize(hInstall, "WixWaitForEvent"); + ExitOnFailure(hr, "Failed to initialize."); + + // Create a window to prevent shutdown requests. + hr = CreateMessageWindow(&hMessageWindow); + ExitOnFailure(hr, "Failed to create message window."); + + // If running on Vista/2008 or newer use integrity enhancements. + OsGetVersion(&version, &dwServicePack); + if (OS_VERSION_VISTA <= version) + { + // Add SACL to allow Everyone to signal from a medium integrity level. + wzSDDL = L"D:(A;;GA;;;WD)S:(ML;;NW;;;ME)"; + } + + // Create the security descriptor and attributes for the events. + if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(wzSDDL, SDDL_REVISION_1, &pSD, NULL)) + { + ExitWithLastError(hr, "Failed to create the security descriptor for the events."); + } + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = FALSE; + + rghEvents[0] = ::CreateEventW(&sa, FALSE, FALSE, L"Global\\WixWaitForEventFail"); + ExitOnNullWithLastError(rghEvents[0], hr, "Failed to create the Global\\WixWaitForEventFail event."); + + rghEvents[1] = ::CreateEventW(&sa, FALSE, FALSE, L"Global\\WixWaitForEventSucceed"); + ExitOnNullWithLastError(rghEvents[1], hr, "Failed to create the Global\\WixWaitForEventSucceed event."); + + // Wait for either of the events to be signaled and handle accordingly. + er = ::WaitForMultipleObjects(countof(rghEvents), rghEvents, FALSE, INFINITE); + switch (er) + { + case WAIT_OBJECT_0 + 0: + er = ERROR_INSTALL_FAILURE; + break; + case WAIT_OBJECT_0 + 1: + er = ERROR_SUCCESS; + break; + default: + ExitOnWin32Error(er, hr, "Unexpected failure."); + } + +LExit: + ReleaseHandle(rghEvents[1]); + ReleaseHandle(rghEvents[0]); + + if (pSD) + { + ::LocalFree(pSD); + } + + if (hMessageWindow) + { + CloseMessageWindow(hMessageWindow); + } + + if (FAILED(hr)) + { + er = ERROR_INSTALL_FAILURE; + } + + return WcaFinalize(er); +} + + +// internal function definitions + +static HRESULT CreateMessageWindow( + __out HWND* phWnd + ) +{ + HRESULT hr = S_OK; + HANDLE rgWaitHandles[2] = { }; + UITHREAD_CONTEXT context = { }; + + // Create event to signal after the UI thread / window is initialized. + rgWaitHandles[0] = ::CreateEventW(NULL, TRUE, FALSE, NULL); + ExitOnNullWithLastError(rgWaitHandles[0], hr, "Failed to create initialization event."); + + // Pass necessary information to create the window. + context.hInitializedEvent = rgWaitHandles[0]; + context.hInstance = (HINSTANCE)g_hInstCADLL; + + // Create our separate UI thread. + rgWaitHandles[1] = ::CreateThread(NULL, 0, ThreadProc, &context, 0, NULL); + ExitOnNullWithLastError(rgWaitHandles[1], hr, "Failed to create the UI thread."); + + // Wait for either the thread to be initialized or the window to exit / fail prematurely. + ::WaitForMultipleObjects(countof(rgWaitHandles), rgWaitHandles, FALSE, INFINITE); + + // Pass the window back to the caller. + *phWnd = context.hWnd; + +LExit: + ReleaseHandle(rgWaitHandles[1]); + ReleaseHandle(rgWaitHandles[0]); + + return hr; +} + +static void CloseMessageWindow( + __in HWND hWnd + ) +{ + if (::IsWindow(hWnd)) + { + ::PostMessageW(hWnd, WM_CLOSE, 0, 0); + } +} + +static DWORD WINAPI ThreadProc( + __in LPVOID pvContext + ) +{ + HRESULT hr = S_OK; + UITHREAD_CONTEXT* pContext = static_cast(pvContext); + + WNDCLASSW wc = { }; + BOOL fRegistered = TRUE; + HWND hWnd = NULL; + + BOOL fRet = FALSE; + MSG msg = { }; + + wc.lpfnWndProc = WndProc; + wc.hInstance = pContext->hInstance; + wc.lpszClassName = WIXCA_UITHREAD_CLASS_WINDOW; + + if (!::RegisterClassW(&wc)) + { + ExitWithLastError(hr, "Failed to register window."); + } + + fRegistered = TRUE; + + // Create the window to handle reboots without activating it. + hWnd = ::CreateWindowExW(WS_EX_TOOLWINDOW, wc.lpszClassName, NULL, WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, SW_SHOWNA, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, NULL); + ExitOnNullWithLastError(hWnd, hr, "Failed to create window."); + + // Persist the window handle and let the caller know we've initialized. + pContext->hWnd = hWnd; + ::SetEvent(pContext->hInitializedEvent); + + // Pump messages until the window is closed. + while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) + { + if (-1 == fRet) + { + hr = E_UNEXPECTED; + ExitOnFailure(hr, "Unexpected return value from message pump."); + } + else if (!::IsDialogMessageW(msg.hwnd, &msg)) + { + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + } + +LExit: + if (fRegistered) + { + ::UnregisterClassW(WIXCA_UITHREAD_CLASS_WINDOW, pContext->hInstance); + } + + return hr; +} + +static LRESULT CALLBACK WndProc( + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ) +{ + switch (uMsg) + { + case WM_QUERYENDSESSION: + // Prevent the process from being shut down. + WcaLog(LOGMSG_VERBOSE, "Disallowed system request to shut down the custom action server."); + return FALSE; + + case WM_DESTROY: + ::PostQuitMessage(0); + return 0; + } + + return ::DefWindowProcW(hWnd, uMsg, wParam, lParam); +} diff --git a/src/ext/Util/ca/utilca.cpp b/src/ext/Util/ca/utilca.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ext/Util/ca/utilca.cpp @@ -0,0 +1,3 @@ +// 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" diff --git a/src/ext/Util/ca/utilca.def b/src/ext/Util/ca/utilca.def new file mode 100644 index 00000000..412d86a3 --- /dev/null +++ b/src/ext/Util/ca/utilca.def @@ -0,0 +1,91 @@ +; 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 "utilca" + +EXPORTS +; BroadcastSettingChange.cpp + WixBroadcastSettingChange + WixBroadcastEnvironmentChange +; checkreboot.cpp + WixCheckRebootRequired +; closeapps.cpp + WixCloseApplications + WixCloseApplicationsDeferred +; exitearlywithsuccess.cpp + WixExitEarlyWithSuccess +; FormatFiles.cpp + WixSchedFormatFiles + WixExecFormatFiles +; osinfo.cpp + WixQueryOsInfo + WixQueryOsDirs + WixQueryOsWellKnownSID + WixQueryOsDriverInfo +; netshortcuts.cpp + WixSchedInternetShortcuts + WixCreateInternetShortcuts + WixRollbackInternetShortcuts +; qtexecca.cpp + CAQuietExec + CAQuietExec64 + WixQuietExec + WixQuietExec64 + WixSilentExec + WixSilentExec64 +; RemoveFoldersEx.cpp + WixRemoveFoldersEx +; RemoveRegistryKeysEx.cpp + WixRemoveRegistryKeysEx +;scaexec.cpp + RegisterPerfCounterData + UnregisterPerfCounterData + RegisterPerfmon + UnregisterPerfmon + CreateSmb + DropSmb + CreateUser + CreateUserRollback + RemoveUser +;scasched.cpp + ConfigurePerfmonInstall + ConfigurePerfmonUninstall + ConfigureSmbInstall + ConfigureSmbUninstall + ConfigureUsers + InstallPerfCounterData + UninstallPerfCounterData + ConfigurePerfmonManifestRegister + ConfigurePerfmonManifestUnregister + ConfigureEventManifestRegister + ConfigureEventManifestUnregister +; RestartManager.cpp + WixRegisterRestartResources +; secureobj.cpp + SchedSecureObjects + SchedSecureObjectsRollback + ExecSecureObjects + ExecSecureObjectsRollback +; serviceconfig.cpp + SchedServiceConfig + ExecServiceConfig + RollbackServiceConfig +; shellexecca.cpp + WixShellExec + WixShellExecBinary + WixUnelevatedShellExec +; test.cpp + WixFailWhenDeferred + WixWaitForEvent +; TouchFile.cpp + WixTouchFileDuringInstall + WixTouchFileDuringUninstall + WixExecuteTouchFile +; xmlfile.cpp + SchedXmlFile + ExecXmlFile + ExecXmlFileRollback +; xmlconfig.cpp + SchedXmlConfig + ExecXmlConfig + ExecXmlConfigRollback diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj new file mode 100644 index 00000000..7b64db95 --- /dev/null +++ b/src/ext/Util/ca/utilca.vcxproj @@ -0,0 +1,106 @@ + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + X64 + + + Release + X64 + + + Debug + Win32 + + + Release + Win32 + + + + + {076018F7-19BD-423A-ABBF-229273DA08D8} + DynamicLibrary + utilca + v142 + Unicode + utilca.def + WiX Toolset Util CustomAction + + + + + + + activeds.lib;adsiid.lib;msi.lib;netapi32.lib;shlwapi.lib + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/nuget.config b/src/ext/Util/nuget.config new file mode 100644 index 00000000..8d711148 --- /dev/null +++ b/src/ext/Util/nuget.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/.Data/burn.exe b/src/ext/Util/test/WixToolsetTest.Util/TestData/.Data/burn.exe new file mode 100644 index 00000000..2a4f423f Binary files /dev/null and b/src/ext/Util/test/WixToolsetTest.Util/TestData/.Data/burn.exe differ diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl new file mode 100644 index 00000000..f50a5386 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl @@ -0,0 +1,8 @@ + + + + ~TestBundle + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs new file mode 100644 index 00000000..7fef0725 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll new file mode 100644 index 00000000..0e461ba8 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll @@ -0,0 +1 @@ +This is Shared.dll. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt new file mode 100644 index 00000000..8b986220 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt @@ -0,0 +1 @@ +This is test.txt \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll new file mode 100644 index 00000000..970efdf0 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll @@ -0,0 +1 @@ +This is a fakeba.dll \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi new file mode 100644 index 00000000..0722d60e Binary files /dev/null and b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi differ diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs new file mode 100644 index 00000000..8e054256 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs new file mode 100644 index 00000000..e27b3c43 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs new file mode 100644 index 00000000..daae573a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs new file mode 100644 index 00000000..2ec8ce82 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico new file mode 100644 index 00000000..53134de7 Binary files /dev/null and b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico differ diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs new file mode 100644 index 00000000..daae573a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs new file mode 100644 index 00000000..2a1b4347 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs new file mode 100644 index 00000000..1355d42e --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs new file mode 100644 index 00000000..2a1b4347 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico new file mode 100644 index 00000000..53134de7 Binary files /dev/null and b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico differ diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs new file mode 100644 index 00000000..daae573a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs new file mode 100644 index 00000000..0634d7d4 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs new file mode 100644 index 00000000..abf0dbb4 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs new file mode 100644 index 00000000..e27b3c43 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs new file mode 100644 index 00000000..2c2be584 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs new file mode 100644 index 00000000..236d9df0 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs new file mode 100644 index 00000000..32b246f4 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs new file mode 100644 index 00000000..0a0c8cb6 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs new file mode 100644 index 00000000..daae573a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs new file mode 100644 index 00000000..7cedbb30 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl new file mode 100644 index 00000000..5301bb1a --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs new file mode 100644 index 00000000..a2002634 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs new file mode 100644 index 00000000..29e8555b --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml new file mode 100644 index 00000000..bad25217 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml @@ -0,0 +1 @@ +This is my.xml file. diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs new file mode 100644 index 00000000..883f9794 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -0,0 +1,317 @@ +// 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 WixToolsetTest.Util +{ + using System.IO; + using System.Linq; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using WixToolset.Data; + using WixToolset.Data.Symbols; + using WixToolset.Util; + using Xunit; + + public class UtilExtensionFixture + { + [Fact] + public void CanBuildUsingFileShare() + { + var folder = TestData.Get(@"TestData\UsingFileShare"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X86\t[Binary data]", + "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", + "CustomAction:Wix4ConfigureSmbUninstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbUninstall\t", + "CustomAction:Wix4CreateSmb_X86\t11265\tWix4UtilCA_X86\tCreateSmb\t", + "CustomAction:Wix4CreateSmbRollback_X86\t11585\tWix4UtilCA_X86\tDropSmb\t", + "CustomAction:Wix4DropSmb_X86\t11265\tWix4UtilCA_X86\tDropSmb\t", + "CustomAction:Wix4DropSmbRollback_X86\t11585\tWix4UtilCA_X86\tCreateSmb\t", + "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", + "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildUsingFileShareX64() + { + var folder = TestData.Get(@"TestData\UsingFileShare"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64\t[Binary data]", + "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", + "CustomAction:Wix4ConfigureSmbUninstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbUninstall\t", + "CustomAction:Wix4CreateSmb_X64\t11265\tWix4UtilCA_X64\tCreateSmb\t", + "CustomAction:Wix4CreateSmbRollback_X64\t11585\tWix4UtilCA_X64\tDropSmb\t", + "CustomAction:Wix4DropSmb_X64\t11265\tWix4UtilCA_X64\tDropSmb\t", + "CustomAction:Wix4DropSmbRollback_X64\t11585\tWix4UtilCA_X64\tCreateSmb\t", + "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", + "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildCloseApplication() + { + var folder = TestData.Get(@"TestData\CloseApplication"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_A64\t[Binary data]", + "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", + "CustomAction:Wix4CloseApplications_A64\t1\tWix4UtilCA_A64\tWixCloseApplications\t", + "CustomAction:Wix4CloseApplicationsDeferred_A64\t3073\tWix4UtilCA_A64\tWixCloseApplicationsDeferred\t", + "Wix4CloseApplication:CloseMyApp\texplorer.exe\t\t\t3\t\tMYAPPISRUNNING\t\t", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildInternetShortcutInProduct() + { + var folder = TestData.Get(@"TestData\InternetShortcut"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64\t[Binary data]", + "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", + "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64\tWixRollbackInternetShortcuts\t", + "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64\tWixSchedInternetShortcuts\t", + "RemoveFile:uisdCsU32.1i4Hebrg1N7E194zJQ8Y\tPackage.ico\thoiptxrr.url|WiX Toolset (url).url\tINSTALLFOLDER\t2", + "RemoveFile:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A\tPackage.ico\tjcxd1dwf.lnk|WiX Toolset (link).lnk\tINSTALLFOLDER\t2", + "Wix4InternetShortcut:uisdCsU32.1i4Hebrg1N7E194zJQ8Y\tPackage.ico\tINSTALLFOLDER\tWiX Toolset (url).url\thttps://wixtoolset.org\t1\t[#Package.ico]\t0", + "Wix4InternetShortcut:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A\tPackage.ico\tINSTALLFOLDER\tWiX Toolset (link).lnk\thttps://wixtoolset.org\t0\t[#Package.ico]\t0", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildInternetShortcutInMergeModule() + { + var folder = TestData.Get(@"TestData\InternetShortcutModule"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", + "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixCreateInternetShortcuts\t", + "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRollbackInternetShortcuts\t", + "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixSchedInternetShortcuts\t", + "RemoveFile:uisdCsU32.1i4Hebrg1N7E194zJQ8Y.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\thoiptxrr.url|WiX Toolset (url).url\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\t2", + "RemoveFile:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tjcxd1dwf.lnk|WiX Toolset (link).lnk\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\t2", + "Wix4InternetShortcut:uisdCsU32.1i4Hebrg1N7E194zJQ8Y.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\tWiX Toolset (url).url\thttps://wixtoolset.org\t1\t[#Package.ico.047730A5_30FE_4A62_A520_DA9381B8226A]\t0", + "Wix4InternetShortcut:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\tWiX Toolset (link).lnk\thttps://wixtoolset.org\t0\t[#Package.ico.047730A5_30FE_4A62_A520_DA9381B8226A]\t0", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildWithPermissionEx() + { + var folder = TestData.Get(@"TestData\PermissionEx"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); + WixAssert.CompareLineByLine(new[] + { + "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:regL6DnQ9yJpDJH5OdcVji4YXsdX2c\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildRemoveRegistryKeyExInMergeModule() + { + var folder = TestData.Get(@"TestData", "RemoveRegistryKeyEx"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveRegistry", "Wix4RemoveRegistryKeyEx"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", + "CustomAction:Wix4RemoveRegistryKeysEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRemoveRegistryKeysEx\t", + "Wix4RemoveRegistryKeyEx:rrxfcDhR4HhE3v3rYiQcNtQjyahQNg.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\t2\tSOFTWARE\\Example\t1\t", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildRemoveFolderExInMergeModule() + { + var folder = TestData.Get(@"TestData\RemoveFolderEx"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); + + var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4RemoveFolderEx"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", + "CustomAction:Wix4RemoveFoldersEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRemoveFoldersEx\t", + "Wix4RemoveFolderEx:wrf5qCm1SE.zp8djrlk78l1IYFXsEw.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\tRemoveProp.047730A5_30FE_4A62_A520_DA9381B8226A\t3\t", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildWithEventManifest() + { + var folder = TestData.Get(@"TestData\EventManifest"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_A64\t[Binary data]", + "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", + "CustomAction:Wix4ConfigureEventManifestUnregister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestUnregister\t", + "CustomAction:Wix4ExecXmlFile_A64\t11265\tWix4UtilCA_A64\tExecXmlFile\t", + "CustomAction:Wix4ExecXmlFileRollback_A64\t11521\tWix4UtilCA_A64\tExecXmlFileRollback\t", + "CustomAction:Wix4RegisterEventManifest_A64\t3073\tWix4UtilCA_A64\tWixQuietExec\t", + "CustomAction:Wix4RollbackRegisterEventManifest_A64\t3393\tWix4UtilCA_A64\tWixQuietExec\t", + "CustomAction:Wix4RollbackUnregisterEventManifest_A64\t3329\tWix4UtilCA_A64\tWixQuietExec\t", + "CustomAction:Wix4SchedXmlFile_A64\t1\tWix4UtilCA_A64\tSchedXmlFile\t", + "CustomAction:Wix4UnregisterEventManifest_A64\t3137\tWix4UtilCA_A64\tWixQuietExec\t", + "Wix4EventManifest:Manifest.dll\t[#Manifest.dll]", + "Wix4XmlFile:Config_Manifest.dllMessageFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@messageFileName[\\]]\tmessageFileName\t[Manifest.dll]\t4100\tManifest.dll\t", + "Wix4XmlFile:Config_Manifest.dllResourceFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@resourceFileName[\\]]\tresourceFileName\t[Manifest.dll]\t4100\tManifest.dll\t", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildWithQueries() + { + var folder = TestData.Get(@"TestData\Queries"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); + WixAssert.CompareLineByLine(new[] + { + "Binary:Wix4UtilCA_A64\t[Binary data]", + "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", + "CustomAction:Wix4BroadcastSettingChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastSettingChange\t", + "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", + "CustomAction:Wix4QueryOsDriverInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsDriverInfo\t", + "CustomAction:Wix4QueryOsInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsInfo\t", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildWithXmlConfig() + { + var folder = TestData.Get(@"TestData", "XmlConfig"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Wix4XmlConfig"); + WixAssert.CompareLineByLine(new[] + { + "Wix4XmlConfig:DelElement\t[INSTALLFOLDER]my.xml\t\t//root/sub\txxx\t\t\t289\tDel\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildModuleWithXmlConfig() + { + var folder = TestData.Get(@"TestData", "XmlConfigModule"); + var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(BuildX64, "Wix4XmlConfig"); + WixAssert.CompareLineByLine(new[] + { + "Wix4XmlConfig:AddElement.047730A5_30FE_4A62_A520_DA9381B8226A\t[my.xml.047730A5_30FE_4A62_A520_DA9381B8226A]\t\t//root/sub\txxx\t\t\t273\tParent.047730A5_30FE_4A62_A520_DA9381B8226A\t1", + "Wix4XmlConfig:ChildElement.047730A5_30FE_4A62_A520_DA9381B8226A\t[my.xml.047730A5_30FE_4A62_A520_DA9381B8226A]\tAddElement.047730A5_30FE_4A62_A520_DA9381B8226A\t\txxx\t\t\t0\tChild.047730A5_30FE_4A62_A520_DA9381B8226A\t1", + }, results.OrderBy(s => s).ToArray()); + } + + [Fact] + public void CanBuildBundleWithSearches() + { + var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); + var folder = TestData.Get(@"TestData\BundleWithSearches"); + var rootFolder = TestData.Get(); + var wixext = Path.Combine(rootFolder, "WixToolset.Util.wixext.dll"); + + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var bundlePath = Path.Combine(baseFolder, @"bin\test.exe"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var result = WixRunner.Execute(new[] + { + "build", + Path.Combine(folder, "Bundle.wxs"), + "-ext", wixext, + "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), + "-bindpath", Path.Combine(folder, "data"), + "-intermediateFolder", intermediateFolder, + "-o", bundlePath + }); + + result.AssertSuccess(); + + Assert.True(File.Exists(bundlePath)); +#if TODO + Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); +#endif + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']"); + Assert.Equal(1, bundleExtensionDatas.Count); + Assert.Equal("" + + "" + + "", bundleExtensionDatas[0].GetTestXml()); + + var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); + Assert.Equal(5, utilSearches.Count); + Assert.Equal("", utilSearches[0].GetTestXml()); + Assert.Equal("", utilSearches[1].GetTestXml()); + Assert.Equal("", utilSearches[2].GetTestXml()); + Assert.Equal("", utilSearches[3].GetTestXml()); + Assert.Equal("", utilSearches[4].GetTestXml()); + } + } + + private static void Build(string[] args) + { + var result = WixRunner.Execute(args); + result.AssertSuccess(); + } + + private static void BuildX64(string[] args) + { + var newArgs = args.ToList(); + newArgs.Add("-platform"); + newArgs.Add("x64"); + newArgs.Add("-sw1072"); + + var result = WixRunner.Execute(newArgs.ToArray()); + result.AssertSuccess(); + } + + private static void BuildARM64(string[] args) + { + var newArgs = args.ToList(); + newArgs.Add("-platform"); + newArgs.Add("arm64"); + + var result = WixRunner.Execute(newArgs.ToArray()); + result.AssertSuccess(); + } + } +} diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj new file mode 100644 index 00000000..e77ecbed --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -0,0 +1,38 @@ + + + + + + netcoreapp3.1 + false + + + + NU1701 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject new file mode 100644 index 00000000..7b5b2139 --- /dev/null +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/src/ext/Util/wix.snk b/src/ext/Util/wix.snk new file mode 100644 index 00000000..3908a66a Binary files /dev/null and b/src/ext/Util/wix.snk differ diff --git a/src/ext/Util/wixext/PerformanceCounterType.cs b/src/ext/Util/wixext/PerformanceCounterType.cs new file mode 100644 index 00000000..1e06efd3 --- /dev/null +++ b/src/ext/Util/wixext/PerformanceCounterType.cs @@ -0,0 +1,192 @@ +// Captured from: C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll + +namespace System.Diagnostics +{ + public enum PerformanceCounterType + { + // + // Summary: + // An instantaneous counter that shows the most recently observed value in hexadecimal + // format. Used, for example, to maintain a simple count of items or operations. + NumberOfItemsHEX32 = 0, + // + // Summary: + // An instantaneous counter that shows the most recently observed value. Used, for + // example, to maintain a simple count of a very large number of items or operations. + // It is the same as NumberOfItemsHEX32 except that it uses larger fields to accommodate + // larger values. + NumberOfItemsHEX64 = 256, + // + // Summary: + // An instantaneous counter that shows the most recently observed value. Used, for + // example, to maintain a simple count of items or operations. + NumberOfItems32 = 65536, + // + // Summary: + // An instantaneous counter that shows the most recently observed value. Used, for + // example, to maintain a simple count of a very large number of items or operations. + // It is the same as NumberOfItems32 except that it uses larger fields to accommodate + // larger values. + NumberOfItems64 = 65792, + // + // Summary: + // A difference counter that shows the change in the measured attribute between + // the two most recent sample intervals. + CounterDelta32 = 4195328, + // + // Summary: + // A difference counter that shows the change in the measured attribute between + // the two most recent sample intervals. It is the same as the CounterDelta32 counter + // type except that is uses larger fields to accomodate larger values. + CounterDelta64 = 4195584, + // + // Summary: + // An average counter that shows the average number of operations completed in one + // second. When a counter of this type samples the data, each sampling interrupt + // returns one or zero. The counter data is the number of ones that were sampled. + // It measures time in units of ticks of the system performance timer. + SampleCounter = 4260864, + // + // Summary: + // An average counter designed to monitor the average length of a queue to a resource + // over time. It shows the difference between the queue lengths observed during + // the last two sample intervals divided by the duration of the interval. This type + // of counter is typically used to track the number of items that are queued or + // waiting. + CountPerTimeInterval32 = 4523008, + // + // Summary: + // An average counter that monitors the average length of a queue to a resource + // over time. Counters of this type display the difference between the queue lengths + // observed during the last two sample intervals, divided by the duration of the + // interval. This counter type is the same as CountPerTimeInterval32 except that + // it uses larger fields to accommodate larger values. This type of counter is typically + // used to track a high-volume or very large number of items that are queued or + // waiting. + CountPerTimeInterval64 = 4523264, + // + // Summary: + // A difference counter that shows the average number of operations completed during + // each second of the sample interval. Counters of this type measure time in ticks + // of the system clock. + RateOfCountsPerSecond32 = 272696320, + // + // Summary: + // A difference counter that shows the average number of operations completed during + // each second of the sample interval. Counters of this type measure time in ticks + // of the system clock. This counter type is the same as the RateOfCountsPerSecond32 + // type, but it uses larger fields to accommodate larger values to track a high-volume + // number of items or operations per second, such as a byte-transmission rate. + RateOfCountsPerSecond64 = 272696576, + // + // Summary: + // An instantaneous percentage counter that shows the ratio of a subset to its set + // as a percentage. For example, it compares the number of bytes in use on a disk + // to the total number of bytes on the disk. Counters of this type display the current + // percentage only, not an average over time. + RawFraction = 537003008, + // + // Summary: + // A percentage counter that shows the average time that a component is active as + // a percentage of the total sample time. + CounterTimer = 541132032, + // + // Summary: + // A percentage counter that shows the active time of a component as a percentage + // of the total elapsed time of the sample interval. It measures time in units of + // 100 nanoseconds (ns). Counters of this type are designed to measure the activity + // of one component at a time. + Timer100Ns = 542180608, + // + // Summary: + // A percentage counter that shows the average ratio of hits to all operations during + // the last two sample intervals. + SampleFraction = 549585920, + // + // Summary: + // A percentage counter that displays the average percentage of active time observed + // during sample interval. The value of these counters is calculated by monitoring + // the percentage of time that the service was inactive and then subtracting that + // value from 100 percent. + CounterTimerInverse = 557909248, + // + // Summary: + // A percentage counter that shows the average percentage of active time observed + // during the sample interval. + Timer100NsInverse = 558957824, + // + // Summary: + // A percentage counter that displays the active time of one or more components + // as a percentage of the total time of the sample interval. Because the numerator + // records the active time of components operating simultaneously, the resulting + // percentage can exceed 100 percent. + CounterMultiTimer = 574686464, + // + // Summary: + // A percentage counter that shows the active time of one or more components as + // a percentage of the total time of the sample interval. It measures time in 100 + // nanosecond (ns) units. + CounterMultiTimer100Ns = 575735040, + // + // Summary: + // A percentage counter that shows the active time of one or more components as + // a percentage of the total time of the sample interval. It derives the active + // time by measuring the time that the components were not active and subtracting + // the result from 100 percent by the number of objects monitored. + CounterMultiTimerInverse = 591463680, + // + // Summary: + // A percentage counter that shows the active time of one or more components as + // a percentage of the total time of the sample interval. Counters of this type + // measure time in 100 nanosecond (ns) units. They derive the active time by measuring + // the time that the components were not active and subtracting the result from + // multiplying 100 percent by the number of objects monitored. + CounterMultiTimer100NsInverse = 592512256, + // + // Summary: + // An average counter that measures the time it takes, on average, to complete a + // process or operation. Counters of this type display a ratio of the total elapsed + // time of the sample interval to the number of processes or operations completed + // during that time. This counter type measures time in ticks of the system clock. + AverageTimer32 = 805438464, + // + // Summary: + // A difference timer that shows the total time between when the component or process + // started and the time when this value is calculated. + ElapsedTime = 807666944, + // + // Summary: + // An average counter that shows how many items are processed, on average, during + // an operation. Counters of this type display a ratio of the items processed to + // the number of operations completed. The ratio is calculated by comparing the + // number of items processed during the last interval to the number of operations + // completed during the last interval. + AverageCount64 = 1073874176, + // + // Summary: + // A base counter that stores the number of sampling interrupts taken and is used + // as a denominator in the sampling fraction. The sampling fraction is the number + // of samples that were 1 (or true) for a sample interrupt. Check that this value + // is greater than zero before using it as the denominator in a calculation of SampleFraction. + SampleBase = 1073939457, + // + // Summary: + // A base counter that is used in the calculation of time or count averages, such + // as AverageTimer32 and AverageCount64. Stores the denominator for calculating + // a counter to present "time per operation" or "count per operation". + AverageBase = 1073939458, + // + // Summary: + // A base counter that stores the denominator of a counter that presents a general + // arithmetic fraction. Check that this value is greater than zero before using + // it as the denominator in a RawFraction value calculation. + RawBase = 1073939459, + // + // Summary: + // A base counter that indicates the number of items sampled. It is used as the + // denominator in the calculations to get an average among the items sampled when + // taking timings of multiple, but similar items. Used with CounterMultiTimer, CounterMultiTimerInverse, + // CounterMultiTimer100Ns, and CounterMultiTimer100NsInverse. + CounterMultiBase = 1107494144 + } +} diff --git a/src/ext/Util/wixext/Symbols/EventManifestSymbol.cs b/src/ext/Util/wixext/Symbols/EventManifestSymbol.cs new file mode 100644 index 00000000..ccd3c899 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/EventManifestSymbol.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.EventManifest.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String), + }, + typeof(EventManifestSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum EventManifestSymbolFields + { + ComponentRef, + File, + } + + public class EventManifestSymbol : IntermediateSymbol + { + public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null) + { + } + + public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id) + { + } + + public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)EventManifestSymbolFields.ComponentRef, value); + } + + public string File + { + get => this.Fields[(int)EventManifestSymbolFields.File].AsString(); + set => this.Set((int)EventManifestSymbolFields.File, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/FileSharePermissionsSymbol.cs b/src/ext/Util/wixext/Symbols/FileSharePermissionsSymbol.cs new file mode 100644 index 00000000..3db92f22 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/FileSharePermissionsSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileSharePermissions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number), + }, + typeof(FileSharePermissionsSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum FileSharePermissionsSymbolFields + { + FileShareRef, + UserRef, + Permissions, + } + + public class FileSharePermissionsSymbol : IntermediateSymbol + { + public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null) + { + } + + public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id) + { + } + + public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index]; + + public string FileShareRef + { + get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value); + } + + public string UserRef + { + get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value); + } + + public int Permissions + { + get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber(); + set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/FileShareSymbol.cs b/src/ext/Util/wixext/Symbols/FileShareSymbol.cs new file mode 100644 index 00000000..c956ff42 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/FileShareSymbol.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileShare.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String), + }, + typeof(FileShareSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum FileShareSymbolFields + { + ShareName, + ComponentRef, + Description, + DirectoryRef, + } + + public class FileShareSymbol : IntermediateSymbol + { + public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null) + { + } + + public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id) + { + } + + public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index]; + + public string ShareName + { + get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString(); + set => this.Set((int)FileShareSymbolFields.ShareName, value); + } + + public string ComponentRef + { + get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString(); + set => this.Set((int)FileShareSymbolFields.ComponentRef, value); + } + + public string Description + { + get => this.Fields[(int)FileShareSymbolFields.Description].AsString(); + set => this.Set((int)FileShareSymbolFields.Description, value); + } + + public string DirectoryRef + { + get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)FileShareSymbolFields.DirectoryRef, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/GroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupSymbol.cs new file mode 100644 index 00000000..b378db44 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/GroupSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Group.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String), + }, + typeof(GroupSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum GroupSymbolFields + { + ComponentRef, + Name, + Domain, + } + + public class GroupSymbol : IntermediateSymbol + { + public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null) + { + } + + public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id) + { + } + + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString(); + set => this.Set((int)GroupSymbolFields.ComponentRef, value); + } + + public string Name + { + get => this.Fields[(int)GroupSymbolFields.Name].AsString(); + set => this.Set((int)GroupSymbolFields.Name, value); + } + + public string Domain + { + get => this.Fields[(int)GroupSymbolFields.Domain].AsString(); + set => this.Set((int)GroupSymbolFields.Domain, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/PerfmonManifestSymbol.cs b/src/ext/Util/wixext/Symbols/PerfmonManifestSymbol.cs new file mode 100644 index 00000000..03fef14e --- /dev/null +++ b/src/ext/Util/wixext/Symbols/PerfmonManifestSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerfmonManifest.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String), + }, + typeof(PerfmonManifestSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum PerfmonManifestSymbolFields + { + ComponentRef, + File, + ResourceFileDirectory, + } + + public class PerfmonManifestSymbol : IntermediateSymbol + { + public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null) + { + } + + public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id) + { + } + + public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value); + } + + public string File + { + get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.File, value); + } + + public string ResourceFileDirectory + { + get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/PerfmonSymbol.cs b/src/ext/Util/wixext/Symbols/PerfmonSymbol.cs new file mode 100644 index 00000000..6784ebd1 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/PerfmonSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Perfmon.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String), + }, + typeof(PerfmonSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum PerfmonSymbolFields + { + ComponentRef, + File, + Name, + } + + public class PerfmonSymbol : IntermediateSymbol + { + public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null) + { + } + + public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id) + { + } + + public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonSymbolFields.ComponentRef, value); + } + + public string File + { + get => this.Fields[(int)PerfmonSymbolFields.File].AsString(); + set => this.Set((int)PerfmonSymbolFields.File, value); + } + + public string Name + { + get => this.Fields[(int)PerfmonSymbolFields.Name].AsString(); + set => this.Set((int)PerfmonSymbolFields.Name, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/PerformanceCategorySymbol.cs b/src/ext/Util/wixext/Symbols/PerformanceCategorySymbol.cs new file mode 100644 index 00000000..5ecf388c --- /dev/null +++ b/src/ext/Util/wixext/Symbols/PerformanceCategorySymbol.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerformanceCategory.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String), + }, + typeof(PerformanceCategorySymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum PerformanceCategorySymbolFields + { + ComponentRef, + Name, + IniData, + ConstantData, + } + + public class PerformanceCategorySymbol : IntermediateSymbol + { + public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null) + { + } + + public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id) + { + } + + public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value); + } + + public string Name + { + get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.Name, value); + } + + public string IniData + { + get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.IniData, value); + } + + public string ConstantData + { + get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs b/src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs new file mode 100644 index 00000000..25fc6dca --- /dev/null +++ b/src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs @@ -0,0 +1,103 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.SecureObjects.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String), + }, + typeof(SecureObjectsSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using System; + using WixToolset.Data; + + public enum SecureObjectsSymbolFields + { + SecureObject, + Table, + Domain, + User, + Attributes, + Permission, + ComponentRef, + } + + [Flags] + public enum WixPermissionExAttributes + { + None = 0x0, + Inheritable = 0x01 + } + + public class SecureObjectsSymbol : IntermediateSymbol + { + public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) + { + } + + public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id) + { + } + + public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index]; + + public string SecureObject + { + get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value); + } + + public string Table + { + get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Table, value); + } + + public string Domain + { + get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Domain, value); + } + + public string User + { + get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.User, value); + } + + public WixPermissionExAttributes Attributes + { + get => (WixPermissionExAttributes)this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Attributes, (int)value); + } + + public int? Permission + { + get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Permission, value); + } + + public string ComponentRef + { + get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs b/src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs new file mode 100644 index 00000000..3a877f9b --- /dev/null +++ b/src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs @@ -0,0 +1,119 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.ServiceConfig.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String), + }, + typeof(ServiceConfigSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum ServiceConfigSymbolFields + { + ServiceName, + ComponentRef, + NewService, + FirstFailureActionType, + SecondFailureActionType, + ThirdFailureActionType, + ResetPeriodInDays, + RestartServiceDelayInSeconds, + ProgramCommandLine, + RebootMessage, + } + + public class ServiceConfigSymbol : IntermediateSymbol + { + public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null) + { + } + + public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id) + { + } + + public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index]; + + public string ServiceName + { + get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value); + } + + public string ComponentRef + { + get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value); + } + + public int NewService + { + get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber(); + set => this.Set((int)ServiceConfigSymbolFields.NewService, value); + } + + public string FirstFailureActionType + { + get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value); + } + + public string SecondFailureActionType + { + get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value); + } + + public string ThirdFailureActionType + { + get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value); + } + + public int? ResetPeriodInDays + { + get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value); + } + + public int? RestartServiceDelayInSeconds + { + get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value); + } + + public string ProgramCommandLine + { + get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value); + } + + public string RebootMessage + { + get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/UserGroupSymbol.cs b/src/ext/Util/wixext/Symbols/UserGroupSymbol.cs new file mode 100644 index 00000000..c8f3998e --- /dev/null +++ b/src/ext/Util/wixext/Symbols/UserGroupSymbol.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.UserGroup.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String), + }, + typeof(UserGroupSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum UserGroupSymbolFields + { + UserRef, + GroupRef, + } + + public class UserGroupSymbol : IntermediateSymbol + { + public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null) + { + } + + public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id) + { + } + + public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index]; + + public string UserRef + { + get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.UserRef, value); + } + + public string GroupRef + { + get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.GroupRef, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/UserSymbol.cs b/src/ext/Util/wixext/Symbols/UserSymbol.cs new file mode 100644 index 00000000..5f00064b --- /dev/null +++ b/src/ext/Util/wixext/Symbols/UserSymbol.cs @@ -0,0 +1,79 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.User.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number), + }, + typeof(UserSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum UserSymbolFields + { + ComponentRef, + Name, + Domain, + Password, + Attributes, + } + + public class UserSymbol : IntermediateSymbol + { + public UserSymbol() : base(UtilSymbolDefinitions.User, null, null) + { + } + + public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id) + { + } + + public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString(); + set => this.Set((int)UserSymbolFields.ComponentRef, value); + } + + public string Name + { + get => this.Fields[(int)UserSymbolFields.Name].AsString(); + set => this.Set((int)UserSymbolFields.Name, value); + } + + public string Domain + { + get => this.Fields[(int)UserSymbolFields.Domain].AsString(); + set => this.Set((int)UserSymbolFields.Domain, value); + } + + public string Password + { + get => this.Fields[(int)UserSymbolFields.Password].AsString(); + set => this.Set((int)UserSymbolFields.Password, value); + } + + public int Attributes + { + get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber(); + set => this.Set((int)UserSymbolFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs new file mode 100644 index 00000000..72091c3b --- /dev/null +++ b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs @@ -0,0 +1,125 @@ +// 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.Util +{ + using System; + using WixToolset.Data; + using WixToolset.Data.Burn; + + public enum UtilSymbolDefinitionType + { + EventManifest, + FileShare, + FileSharePermissions, + Group, + Perfmon, + PerfmonManifest, + PerformanceCategory, + SecureObjects, + ServiceConfig, + User, + UserGroup, + WixCloseApplication, + WixFormatFiles, + WixInternetShortcut, + WixRemoveFolderEx, + WixRemoveRegistryKeyEx, + WixRestartResource, + WixTouchFile, + WixWindowsFeatureSearch, + XmlConfig, + XmlFile, + } + + public static partial class UtilSymbolDefinitions + { + public static readonly Version Version = new Version("4.0.0"); + + public static IntermediateSymbolDefinition ByName(string name) + { + if (!Enum.TryParse(name, out UtilSymbolDefinitionType type)) + { + return null; + } + + return ByType(type); + } + + public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type) + { + switch (type) + { + case UtilSymbolDefinitionType.EventManifest: + return UtilSymbolDefinitions.EventManifest; + + case UtilSymbolDefinitionType.FileShare: + return UtilSymbolDefinitions.FileShare; + + case UtilSymbolDefinitionType.FileSharePermissions: + return UtilSymbolDefinitions.FileSharePermissions; + + case UtilSymbolDefinitionType.Group: + return UtilSymbolDefinitions.Group; + + case UtilSymbolDefinitionType.Perfmon: + return UtilSymbolDefinitions.Perfmon; + + case UtilSymbolDefinitionType.PerfmonManifest: + return UtilSymbolDefinitions.PerfmonManifest; + + case UtilSymbolDefinitionType.PerformanceCategory: + return UtilSymbolDefinitions.PerformanceCategory; + + case UtilSymbolDefinitionType.SecureObjects: + return UtilSymbolDefinitions.SecureObjects; + + case UtilSymbolDefinitionType.ServiceConfig: + return UtilSymbolDefinitions.ServiceConfig; + + case UtilSymbolDefinitionType.User: + return UtilSymbolDefinitions.User; + + case UtilSymbolDefinitionType.UserGroup: + return UtilSymbolDefinitions.UserGroup; + + case UtilSymbolDefinitionType.WixCloseApplication: + return UtilSymbolDefinitions.WixCloseApplication; + + case UtilSymbolDefinitionType.WixFormatFiles: + return UtilSymbolDefinitions.WixFormatFiles; + + case UtilSymbolDefinitionType.WixInternetShortcut: + return UtilSymbolDefinitions.WixInternetShortcut; + + case UtilSymbolDefinitionType.WixRemoveFolderEx: + return UtilSymbolDefinitions.WixRemoveFolderEx; + + case UtilSymbolDefinitionType.WixRemoveRegistryKeyEx: + return UtilSymbolDefinitions.WixRemoveRegistryKeyEx; + + case UtilSymbolDefinitionType.WixRestartResource: + return UtilSymbolDefinitions.WixRestartResource; + + case UtilSymbolDefinitionType.WixTouchFile: + return UtilSymbolDefinitions.WixTouchFile; + + case UtilSymbolDefinitionType.WixWindowsFeatureSearch: + return UtilSymbolDefinitions.WixWindowsFeatureSearch; + + case UtilSymbolDefinitionType.XmlConfig: + return UtilSymbolDefinitions.XmlConfig; + + case UtilSymbolDefinitionType.XmlFile: + return UtilSymbolDefinitions.XmlFile; + + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + } + + static UtilSymbolDefinitions() + { + WixWindowsFeatureSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); + } + } +} diff --git a/src/ext/Util/wixext/Symbols/WixCloseApplicationSymbol.cs b/src/ext/Util/wixext/Symbols/WixCloseApplicationSymbol.cs new file mode 100644 index 00000000..0738e3e4 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixCloseApplicationSymbol.cs @@ -0,0 +1,103 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixCloseApplication.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number), + }, + typeof(WixCloseApplicationSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixCloseApplicationSymbolFields + { + Target, + Description, + Condition, + Attributes, + Sequence, + Property, + TerminateExitCode, + Timeout, + } + + public class WixCloseApplicationSymbol : IntermediateSymbol + { + public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null) + { + } + + public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id) + { + } + + public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index]; + + public string Target + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Target, value); + } + + public string Description + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Description, value); + } + + public string Condition + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value); + } + + public int Attributes + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value); + } + + public int? Sequence + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value); + } + + public string Property + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Property, value); + } + + public int? TerminateExitCode + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value); + } + + public int? Timeout + { + get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/WixFormatFilesSymbol.cs b/src/ext/Util/wixext/Symbols/WixFormatFilesSymbol.cs new file mode 100644 index 00000000..38a9b8ff --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixFormatFilesSymbol.cs @@ -0,0 +1,55 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixFormatFiles.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String), + }, + typeof(WixFormatFilesSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixFormatFilesSymbolFields + { + BinaryRef, + FileRef, + } + + public class WixFormatFilesSymbol : IntermediateSymbol + { + public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null) + { + } + + public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id) + { + } + + public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index]; + + public string BinaryRef + { + get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value); + } + + public string FileRef + { + get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/WixInternetShortcutSymbol.cs b/src/ext/Util/wixext/Symbols/WixInternetShortcutSymbol.cs new file mode 100644 index 00000000..e8265e02 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixInternetShortcutSymbol.cs @@ -0,0 +1,95 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixInternetShortcut.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number), + }, + typeof(WixInternetShortcutSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixInternetShortcutSymbolFields + { + ComponentRef, + DirectoryRef, + Name, + Target, + Attributes, + IconFile, + IconIndex, + } + + public class WixInternetShortcutSymbol : IntermediateSymbol + { + public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null) + { + } + + public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id) + { + } + + public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value); + } + + public string DirectoryRef + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value); + } + + public string Name + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Name, value); + } + + public string Target + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Target, value); + } + + public int Attributes + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value); + } + + public string IconFile + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value); + } + + public int? IconIndex + { + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/WixRemoveFolderExSymbol.cs b/src/ext/Util/wixext/Symbols/WixRemoveFolderExSymbol.cs new file mode 100644 index 00000000..86352b6c --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixRemoveFolderExSymbol.cs @@ -0,0 +1,78 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Condition), IntermediateFieldType.String), + }, + typeof(WixRemoveFolderExSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixRemoveFolderExSymbolFields + { + ComponentRef, + Property, + InstallMode, + Condition, + } + + public enum WixRemoveFolderExInstallMode + { + Install = 1, + Uninstall = 2, + Both = 3, + } + + public class WixRemoveFolderExSymbol : IntermediateSymbol + { + public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null) + { + } + + public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value); + } + + public string Property + { + get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); + } + + public WixRemoveFolderExInstallMode InstallMode + { + get => (WixRemoveFolderExInstallMode)this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, (int)value); + } + + public string Condition + { + get => this.Fields[(int)WixRemoveFolderExSymbolFields.Condition].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.Condition, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs b/src/ext/Util/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs new file mode 100644 index 00000000..8e4bd212 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs @@ -0,0 +1,86 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixRemoveRegistryKeyEx = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRemoveRegistryKeyEx.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Root), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Key), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.InstallMode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Condition), IntermediateFieldType.String), + }, + typeof(WixRemoveRegistryKeyExSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + using WixToolset.Data.Symbols; + + public enum WixRemoveRegistryKeyExSymbolFields + { + ComponentRef, + Root, + Key, + InstallMode, + Condition, + } + + public enum WixRemoveRegistryKeyExInstallMode + { + Install = 1, + Uninstall = 2, + } + + public class WixRemoveRegistryKeyExSymbol : IntermediateSymbol + { + public WixRemoveRegistryKeyExSymbol() : base(UtilSymbolDefinitions.WixRemoveRegistryKeyEx, null, null) + { + } + + public WixRemoveRegistryKeyExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveRegistryKeyEx, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRemoveRegistryKeyExSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.ComponentRef, value); + } + + public RegistryRootType Root + { + get => (RegistryRootType)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Root].AsNumber(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Root, (int)value); + } + + public string Key + { + get => (string)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Key]; + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Key, value); + } + + public WixRemoveRegistryKeyExInstallMode InstallMode + { + get => (WixRemoveRegistryKeyExInstallMode)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.InstallMode, (int)value); + } + + public string Condition + { + get => this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Condition].AsString(); + set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Condition, value); + } + } +} diff --git a/src/ext/Util/wixext/Symbols/WixRestartResourceSymbol.cs b/src/ext/Util/wixext/Symbols/WixRestartResourceSymbol.cs new file mode 100644 index 00000000..01b92b63 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixRestartResourceSymbol.cs @@ -0,0 +1,71 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRestartResource.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number), + }, + typeof(WixRestartResourceSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixRestartResourceSymbolFields + { + ComponentRef, + Resource, + Attributes, + } + + public enum WixRestartResourceAttributes + { + Filename = 1, + ProcessName, + ServiceName, + TypeMask = 0xf, + } + + public class WixRestartResourceSymbol : IntermediateSymbol + { + public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) + { + } + + public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id) + { + } + + public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value); + } + + public string Resource + { + get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); + } + + public WixRestartResourceAttributes? Attributes + { + get => (WixRestartResourceAttributes?)this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNullableNumber(); + set => this.Set((int)WixRestartResourceSymbolFields.Attributes, (int?)value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs b/src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs new file mode 100644 index 00000000..447c21ba --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs @@ -0,0 +1,63 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixTouchFile.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number), + }, + typeof(WixTouchFileSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixTouchFileSymbolFields + { + ComponentRef, + Path, + Attributes, + } + + public class WixTouchFileSymbol : IntermediateSymbol + { + public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null) + { + } + + public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id) + { + } + + public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value); + } + + public string Path + { + get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.Path, value); + } + + public int Attributes + { + get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixTouchFileSymbolFields.Attributes, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs b/src/ext/Util/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs new file mode 100644 index 00000000..9a43692c --- /dev/null +++ b/src/ext/Util/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs @@ -0,0 +1,47 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixWindowsFeatureSearch = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixWindowsFeatureSearch.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixWindowsFeatureSearchSymbolFields.Type), IntermediateFieldType.String), + }, + typeof(WixWindowsFeatureSearchSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum WixWindowsFeatureSearchSymbolFields + { + Type, + } + + public class WixWindowsFeatureSearchSymbol : IntermediateSymbol + { + public WixWindowsFeatureSearchSymbol() : base(UtilSymbolDefinitions.WixWindowsFeatureSearch, null, null) + { + } + + public WixWindowsFeatureSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixWindowsFeatureSearch, sourceLineNumber, id) + { + } + + public IntermediateField this[WixWindowsFeatureSearchSymbolFields index] => this.Fields[(int)index]; + + public string Type + { + get => this.Fields[(int)WixWindowsFeatureSearchSymbolFields.Type].AsString(); + set => this.Set((int)WixWindowsFeatureSearchSymbolFields.Type, value); + } + } +} diff --git a/src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs b/src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs new file mode 100644 index 00000000..6503a586 --- /dev/null +++ b/src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs @@ -0,0 +1,111 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlConfig.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number), + }, + typeof(XmlConfigSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum XmlConfigSymbolFields + { + File, + ElementId, + ElementPath, + VerifyPath, + Name, + Value, + Flags, + ComponentRef, + Sequence, + } + + public class XmlConfigSymbol : IntermediateSymbol + { + public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null) + { + } + + public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id) + { + } + + public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index]; + + public string File + { + get => this.Fields[(int)XmlConfigSymbolFields.File].AsString(); + set => this.Set((int)XmlConfigSymbolFields.File, value); + } + + public string ElementId + { + get => this.Fields[(int)XmlConfigSymbolFields.ElementId].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ElementId, value); + } + + public string ElementPath + { + get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ElementPath, value); + } + + public string VerifyPath + { + get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value); + } + + public string Name + { + get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Name, value); + } + + public string Value + { + get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Value, value); + } + + public int Flags + { + get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlConfigSymbolFields.Flags, value); + } + + public string ComponentRef + { + get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value); + } + + public int? Sequence + { + get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlConfigSymbolFields.Sequence, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/Symbols/XmlFileSymbol.cs b/src/ext/Util/wixext/Symbols/XmlFileSymbol.cs new file mode 100644 index 00000000..7d5d991b --- /dev/null +++ b/src/ext/Util/wixext/Symbols/XmlFileSymbol.cs @@ -0,0 +1,95 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Util.Symbols; + + public static partial class UtilSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlFile.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number), + }, + typeof(XmlFileSymbol)); + } +} + +namespace WixToolset.Util.Symbols +{ + using WixToolset.Data; + + public enum XmlFileSymbolFields + { + File, + ElementPath, + Name, + Value, + Flags, + ComponentRef, + Sequence, + } + + public class XmlFileSymbol : IntermediateSymbol + { + public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null) + { + } + + public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id) + { + } + + public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index]; + + public string File + { + get => this.Fields[(int)XmlFileSymbolFields.File].AsString(); + set => this.Set((int)XmlFileSymbolFields.File, value); + } + + public string ElementPath + { + get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlFileSymbolFields.ElementPath, value); + } + + public string Name + { + get => this.Fields[(int)XmlFileSymbolFields.Name].AsString(); + set => this.Set((int)XmlFileSymbolFields.Name, value); + } + + public string Value + { + get => this.Fields[(int)XmlFileSymbolFields.Value].AsString(); + set => this.Set((int)XmlFileSymbolFields.Value, value); + } + + public int Flags + { + get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlFileSymbolFields.Flags, value); + } + + public string ComponentRef + { + get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlFileSymbolFields.ComponentRef, value); + } + + public int? Sequence + { + get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlFileSymbolFields.Sequence, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs new file mode 100644 index 00000000..45079150 --- /dev/null +++ b/src/ext/Util/wixext/UtilCompiler.cs @@ -0,0 +1,3889 @@ +// 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.Util +{ + using System; + using System.Collections; + using System.Collections.Generic; + using System.Globalization; + using System.Linq; + using System.Text; + using System.Text.RegularExpressions; + using System.Xml.Linq; + using WixToolset.Data; + using WixToolset.Data.Symbols; + using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; + using WixToolset.Util.Symbols; + + /// + /// The compiler for the WiX Toolset Utility Extension. + /// + public sealed class UtilCompiler : BaseCompilerExtension + { + // user creation attributes definitions (from sca.h) + internal const int UserDontExpirePasswrd = 0x00000001; + internal const int UserPasswdCantChange = 0x00000002; + internal const int UserPasswdChangeReqdOnLogin = 0x00000004; + internal const int UserDisableAccount = 0x00000008; + internal const int UserFailIfExists = 0x00000010; + internal const int UserUpdateIfExists = 0x00000020; + internal const int UserLogonAsService = 0x00000040; + internal const int UserLogonAsBatchJob = 0x00000080; + + internal const int UserDontRemoveOnUninstall = 0x00000100; + internal const int UserDontCreateUser = 0x00000200; + internal const int UserNonVital = 0x00000400; + + private static readonly Regex FindPropertyBrackets = new Regex(@"\[(?!\\|\])|(? "http://wixtoolset.org/schemas/v4/wxs/util"; + + /// + /// Types of Internet shortcuts. + /// + public enum InternetShortcutType + { + /// Create a .lnk file. + Link = 0, + + /// Create a .url file. + Url, + } + + /// + /// Types of permission setting methods. + /// + private enum PermissionType + { + /// LockPermissions (normal) type permission setting. + LockPermissions, + + /// FileSharePermissions type permission setting. + FileSharePermissions, + + /// SecureObjects type permission setting. + SecureObjects, + } + + /// + /// Processes an element for the Compiler. + /// + /// Parent element of element to process. + /// Element to process. + /// Extra information about the context in which this element is being parsed. + public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) + { + this.ParsePossibleKeyPathElement(intermediate, section, parentElement, element, context); + } + + /// + /// Processes an element for the Compiler. + /// + /// Source line number for the parent element. + /// Parent element of element to process. + /// Element to process. + /// Extra information about the context in which this element is being parsed. + public override IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) + { + IComponentKeyPath possibleKeyPath = null; + + switch (parentElement.Name.LocalName) + { + case "CreateFolder": + var createFolderId = context["DirectoryId"]; + var createFolderComponentId = context["ComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + var createFolderWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, createFolderId, createFolderComponentId, createFolderWin64, "CreateFolder"); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "Component": + var componentId = context["ComponentId"]; + var directoryId = context["DirectoryId"]; + var componentWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "EventSource": + possibleKeyPath = this.ParseEventSourceElement(intermediate, section, element, componentId); + break; + case "FileShare": + this.ParseFileShareElement(intermediate, section, element, componentId, directoryId); + break; + case "InternetShortcut": + this.ParseInternetShortcutElement(intermediate, section, element, componentId, directoryId); + break; + case "PerformanceCategory": + this.ParsePerformanceCategoryElement(intermediate, section, element, componentId); + break; + case "RemoveFolderEx": + this.ParseRemoveFolderExElement(intermediate, section, element, componentId); + break; + case "RemoveRegistryKey": + this.ParseRemoveRegistryKeyExElement(intermediate, section, element, componentId); + break; + case "RestartResource": + this.ParseRestartResourceElement(intermediate, section, element, componentId); + break; + case "ServiceConfig": + this.ParseServiceConfigElement(intermediate, section, element, componentId, "Component", null); + break; + case "TouchFile": + this.ParseTouchFileElement(intermediate, section, element, componentId, componentWin64); + break; + case "User": + this.ParseUserElement(intermediate, section, element, componentId); + break; + case "XmlFile": + this.ParseXmlFileElement(intermediate, section, element, componentId); + break; + case "XmlConfig": + this.ParseXmlConfigElement(intermediate, section, element, componentId, false); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "File": + var fileId = context["FileId"]; + var fileComponentId = context["ComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + var fileWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PerfCounter": + this.ParsePerfCounterElement(intermediate, section, element, fileComponentId, fileId); + break; + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, fileId, fileComponentId, fileWin64, "File"); + break; + case "PerfCounterManifest": + this.ParsePerfCounterManifestElement(intermediate, section, element, fileComponentId, fileId); + break; + case "EventManifest": + this.ParseEventManifestElement(intermediate, section, element, fileComponentId, fileId); + break; + case "FormatFile": + this.ParseFormatFileElement(intermediate, section, element, fileId, fileWin64); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "Bundle": + case "Fragment": + case "Module": + case "Package": + switch (element.Name.LocalName) + { + case "CloseApplication": + this.ParseCloseApplicationElement(intermediate, section, element); + break; + case "Group": + this.ParseGroupElement(intermediate, section, element, null); + break; + case "RestartResource": + // Currently not supported for Bundles. + if (parentElement.Name.LocalName != "Bundle") + { + this.ParseRestartResourceElement(intermediate, section, element, null); + } + else + { + this.ParseHelper.UnexpectedElement(parentElement, element); + } + break; + case "User": + this.ParseUserElement(intermediate, section, element, null); + break; + case "BroadcastEnvironmentChange": + case "BroadcastSettingChange": + case "CheckRebootRequired": + case "ExitEarlyWithSuccess": + case "FailWhenDeferred": + case "QueryWindowsDirectories": + case "QueryWindowsDriverInfo": + case "QueryWindowsSuiteInfo": + case "QueryWindowsWellKnownSIDs": + case "WaitForEvent": + case "WaitForEventDeferred": + this.AddCustomActionReference(intermediate, section, element, parentElement); + break; + case "ComponentSearch": + case "ComponentSearchRef": + case "DirectorySearch": + case "DirectorySearchRef": + case "FileSearch": + case "FileSearchRef": + case "ProductSearch": + case "ProductSearchRef": + case "RegistrySearch": + case "RegistrySearchRef": + case "WindowsFeatureSearch": + case "WindowsFeatureSearchRef": + // These will eventually be supported under Module/Product, but are not yet. + if (parentElement.Name.LocalName == "Bundle" || parentElement.Name.LocalName == "Fragment") + { + // TODO: When these are supported by all section types, move + // these out of the nested switch and back into the surrounding one. + switch (element.Name.LocalName) + { + case "ComponentSearch": + this.ParseComponentSearchElement(intermediate, section, element); + break; + case "ComponentSearchRef": + this.ParseComponentSearchRefElement(intermediate, section, element); + break; + case "DirectorySearch": + this.ParseDirectorySearchElement(intermediate, section, element); + break; + case "DirectorySearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "FileSearch": + this.ParseFileSearchElement(intermediate, section, element); + break; + case "FileSearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "ProductSearch": + this.ParseProductSearchElement(intermediate, section, element); + break; + case "ProductSearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "RegistrySearch": + this.ParseRegistrySearchElement(intermediate, section, element); + break; + case "RegistrySearchRef": + this.ParseWixSearchRefElement(intermediate, section, element); + break; + case "WindowsFeatureSearch": + this.ParseWindowsFeatureSearchElement(intermediate, section, element); + break; + case "WindowsFeatureSearchRef": + this.ParseWindowsFeatureSearchRefElement(intermediate, section, element); + break; + } + } + else + { + this.ParseHelper.UnexpectedElement(parentElement, element); + } + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "Registry": + case "RegistryKey": + case "RegistryValue": + var registryId = context["RegistryId"]; + var registryComponentId = context["ComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + var registryWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, registryId, registryComponentId, registryWin64, "Registry"); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "ServiceInstall": + var serviceInstallId = context["ServiceInstallId"]; + var serviceInstallName = context["ServiceInstallName"]; + var serviceInstallComponentId = context["ServiceInstallComponentId"]; + + // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown + var serviceInstallWin64 = Boolean.Parse(context["Win64"]); + + switch (element.Name.LocalName) + { + case "PermissionEx": + this.ParsePermissionExElement(intermediate, section, element, serviceInstallId, serviceInstallComponentId, serviceInstallWin64, "ServiceInstall"); + break; + case "ServiceConfig": + this.ParseServiceConfigElement(intermediate, section, element, serviceInstallComponentId, "ServiceInstall", serviceInstallName); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "UI": + switch (element.Name.LocalName) + { + case "BroadcastEnvironmentChange": + case "BroadcastSettingChange": + case "CheckRebootRequired": + case "ExitEarlyWithSuccess": + case "FailWhenDeferred": + case "QueryWindowsDirectories": + case "QueryWindowsDriverInfo": + case "QueryWindowsSuiteInfo": + case "QueryWindowsWellKnownSIDs": + case "WaitForEvent": + case "WaitForEventDeferred": + this.AddCustomActionReference(intermediate, section, element, parentElement); + break; + } + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + + return possibleKeyPath; + } + + private void AddCustomActionReference(Intermediate intermediate, IntermediateSection section, XElement element, XElement parentElement) + { + // These elements are not supported for bundles. + if (parentElement.Name.LocalName == "Bundle") + { + this.ParseHelper.UnexpectedElement(parentElement, element); + return; + } + + var customAction = element.Name.LocalName; + switch (element.Name.LocalName) + { + case "BroadcastEnvironmentChange": + case "BroadcastSettingChange": + case "CheckRebootRequired": + case "ExitEarlyWithSuccess": + case "FailWhenDeferred": + case "WaitForEvent": + case "WaitForEventDeferred": + //default: customAction = element.Name.LocalName; + break; + case "QueryWindowsDirectories": + customAction = "QueryOsDirs"; + break; + case "QueryWindowsDriverInfo": + customAction = "QueryOsDriverInfo"; + break; + case "QueryWindowsSuiteInfo": + customAction = "QueryOsInfo"; + break; + case "QueryWindowsWellKnownSIDs": + customAction = "QueryOsWellKnownSID"; + break; + } + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + // no attributes today + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4" + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + /// + /// Parses the common search attributes shared across all searches. + /// + /// Source line number for the parent element. + /// Attribute to parse. + /// Value of the Id attribute. + /// Value of the Variable attribute. + /// Value of the Condition attribute. + /// Value of the After attribute. + private void ParseCommonSearchAttributes(SourceLineNumber sourceLineNumbers, XAttribute attrib, ref Identifier id, ref string variable, ref string condition, ref string after) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Variable": + variable = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + // TODO: handle standard bundle variables + break; + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "After": + after = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + System.Diagnostics.Debug.Assert(false); + break; + } + } + + /// + /// Parses a ComponentSearch element. + /// + /// Element to parse. + private void ParseComponentSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string guid = null; + string productCode = null; + var attributes = WixComponentSearchAttributes.KeyPath; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Guid": + guid = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); + break; + case "ProductCode": + productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); + break; + case "Result": + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) + { + case "directory": + attributes = WixComponentSearchAttributes.WantDirectory; + break; + case "keyPath": + attributes = WixComponentSearchAttributes.KeyPath; + break; + case "state": + attributes = WixComponentSearchAttributes.State; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "directory", "keyPath", "state")); + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == guid) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Guid")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wcs", variable, condition, after, guid, productCode, attributes.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new WixComponentSearchSymbol(sourceLineNumbers, id) + { + Guid = guid, + ProductCode = productCode, + Attributes = attributes, + }); + } + } + + /// + /// Parses a ComponentSearchRef element + /// + /// Element to parse. + private void ParseComponentSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string refId = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixComponentSearch, refId); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + } + + /// + /// Parses a WindowsFeatureSearch element. + /// + /// Element to parse. + private void ParseWindowsFeatureSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string feature = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Feature": + feature = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (feature) + { + case "sha2CodeSigning": + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Feature", feature, "sha2CodeSigning")); + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (id == null) + { + id = this.ParseHelper.CreateIdentifier("wwfs", variable, condition, after); + } + + if (feature == null) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Feature")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); + if (bundleExtensionId == null) + { + this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); + } + + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new WixWindowsFeatureSearchSymbol(sourceLineNumbers, id) + { + Type = feature, + }); + } + } + + /// + /// Parses a WindowsFeatureSearchRef element + /// + /// Element to parse. + private void ParseWindowsFeatureSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixWindowsFeatureSearch, refId); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + } + + /// + /// Parses an event source element. + /// + /// Element to parse. + /// Identifier of parent component. + private IComponentKeyPath ParseEventSourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string sourceName = null; + string logName = null; + string categoryMessageFile = null; + var categoryCount = CompilerConstants.IntegerNotSet; + string eventMessageFile = null; + string parameterMessageFile = null; + int typesSupported = 0; + var isKeyPath = false; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "CategoryCount": + categoryCount = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + break; + case "CategoryMessageFile": + categoryMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "EventMessageFile": + eventMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "KeyPath": + isKeyPath = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Log": + logName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if ("Security" == logName) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, logName, "Application", "System", "")); + } + break; + case "Name": + sourceName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ParameterMessageFile": + parameterMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "SupportsErrors": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x01; // EVENTLOG_ERROR_TYPE + } + break; + case "SupportsFailureAudits": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x10; // EVENTLOG_AUDIT_FAILURE + } + break; + case "SupportsInformationals": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x04; // EVENTLOG_INFORMATION_TYPE + } + break; + case "SupportsSuccessAudits": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x08; // EVENTLOG_AUDIT_SUCCESS + } + break; + case "SupportsWarnings": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + typesSupported |= 0x02; // EVENTLOG_WARNING_TYPE + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == sourceName) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (null == logName) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "EventLog")); + } + + if (null == eventMessageFile) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "EventMessageFile")); + } + + if (null == categoryMessageFile && 0 < categoryCount) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "CategoryCount", "CategoryMessageFile")); + } + + if (null != categoryMessageFile && CompilerConstants.IntegerNotSet == categoryCount) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "CategoryMessageFile", "CategoryCount")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; + var id = this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + + if (null != categoryMessageFile) + { + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); + } + + if (CompilerConstants.IntegerNotSet != categoryCount) + { + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); + } + + if (null != parameterMessageFile) + { + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); + } + + if (0 != typesSupported) + { + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); + } + + var componentKeyPath = this.CreateComponentKeyPath(); + componentKeyPath.Id = id.Id; + componentKeyPath.Explicit = isKeyPath; + componentKeyPath.Type = PossibleKeyPathType.Registry; + return componentKeyPath; + } + + /// + /// Parses a close application element. + /// + /// Element to parse. + private void ParseCloseApplicationElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string condition = null; + string description = null; + string target = null; + string property = null; + Identifier id = null; + int attributes = 2; // default to CLOSEAPP_ATTRIBUTE_REBOOTPROMPT enabled + var sequence = CompilerConstants.IntegerNotSet; + var terminateExitCode = CompilerConstants.IntegerNotSet; + var timeout = CompilerConstants.IntegerNotSet; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Description": + description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Property": + property = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Sequence": + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + break; + case "Timeout": + timeout = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + break; + case "Target": + target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "CloseMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 1; // CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE + } + else + { + attributes &= ~1; // CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE + } + break; + case "EndSessionMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 8; // CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE + } + else + { + attributes &= ~8; // CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE + } + break; + case "PromptToContinue": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 0x40; // CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE + } + else + { + attributes &= ~0x40; // CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE + } + break; + case "RebootPrompt": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 2; // CLOSEAPP_ATTRIBUTE_REBOOTPROMPT + } + else + { + attributes &= ~2; // CLOSEAPP_ATTRIBUTE_REBOOTPROMPT + } + break; + case "ElevatedCloseMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 4; // CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE + } + else + { + attributes &= ~4; // CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE + } + break; + case "ElevatedEndSessionMessage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= 0x10; // CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE + } + else + { + attributes &= ~0x10; // CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE + } + break; + case "TerminateProcess": + terminateExitCode = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + attributes |= 0x20; // CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == target) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target")); + } + else if (null == id) + { + id = this.ParseHelper.CreateIdentifier("ca", target); + } + + if (String.IsNullOrEmpty(description) && 0x40 == (attributes & 0x40)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithoutOtherAttribute(sourceLineNumbers, element.Name.LocalName, "PromptToContinue", "yes", "Description")); + } + + if (0x22 == (attributes & 0x22)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + if (!this.Messaging.EncounteredError) + { + var symbol = section.AddSymbol(new WixCloseApplicationSymbol(sourceLineNumbers, id) + { + Target = target, + Description = description, + Condition = condition, + Attributes = attributes, + Property = property, + }); + if (CompilerConstants.IntegerNotSet != sequence) + { + symbol.Sequence = sequence; + } + if (CompilerConstants.IntegerNotSet != terminateExitCode) + { + symbol.TerminateExitCode = terminateExitCode; + } + if (CompilerConstants.IntegerNotSet != timeout) + { + symbol.Timeout = timeout * 1000; // make the timeout milliseconds in the table. + } + } + } + + /// + /// Parses a DirectorySearch element. + /// + /// Element to parse. + private void ParseDirectorySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string path = null; + var attributes = WixFileSearchAttributes.IsDirectory; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Path": + path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); + break; + case "Result": + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) + { + case "exists": + attributes |= WixFileSearchAttributes.WantExists; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists")); + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == path) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wds", variable, condition, after, path, attributes.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); + } + } + + /// + /// Parses a DirectorySearchRef, FileSearchRef, ProductSearchRef, and RegistrySearchRef elements + /// + /// Element to parse. + private void ParseWixSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + + foreach (XAttribute attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixSearch, refId); + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + } + + /// + /// Parses a FileSearch element. + /// + /// Element to parse. + private void ParseFileSearchElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string path = null; + var attributes = WixFileSearchAttributes.Default; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Path": + path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); + break; + case "Result": + string result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) + { + case "exists": + attributes |= WixFileSearchAttributes.WantExists; + break; + case "version": + attributes |= WixFileSearchAttributes.WantVersion; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists", "version")); + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + if (null == path) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Path")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wfs", variable, condition, after, path, attributes.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); + + if (!this.Messaging.EncounteredError) + { + this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); + } + } + + /// + /// Creates a row in the WixFileSearch table. + /// + /// Source line number for the parent element. + /// Identifier of the search (key into the WixSearch table) + /// File/directory path to search for. + /// + private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) + { + section.AddSymbol(new WixFileSearchSymbol(sourceLineNumbers, id) + { + Path = path, + Attributes = attributes, + }); + } + + /// + /// Parses a file share element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referred to directory. + private void ParseFileShareElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string directoryId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string description = null; + string name = null; + Identifier id = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Description": + description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("ufs", componentId, name); + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (!element.Elements().Any()) + { + this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission")); + } + + foreach (var child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "FileSharePermission": + this.ParseFileSharePermissionElement(intermediate, section, child, id); + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new FileShareSymbol(sourceLineNumbers, id) + { + ShareName = name, + ComponentRef = componentId, + Description = description, + DirectoryRef = directoryId, + }); + } + } + + /// + /// Parses a FileSharePermission element. + /// + /// Element to parse. + /// The identifier of the parent FileShare element. + private void ParseFileSharePermissionElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier fileShareId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var bits = new BitArray(32); + string user = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "User": + user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.User, user); + break; + default: + var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) + { + if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) + { + if (!this.TrySetBitFromName(UtilConstants.FolderPermissions, attrib.Name.LocalName, attribValue, bits, 0)) + { + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + } + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + var permission = this.CreateIntegerFromBitArray(bits); + + if (null == user) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); + } + + if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL + { + this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new FileSharePermissionsSymbol(sourceLineNumbers) + { + FileShareRef = fileShareId.Id, + UserRef = user, + Permissions = permission, + }); + } + } + + /// + /// Parses a group element. + /// + /// Node to be parsed. + /// Component Id of the parent component of this element. + private void ParseGroupElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string domain = null; + string name = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Domain": + domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("ugr", componentId, domain, name); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new GroupSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Name = name, + Domain = domain, + }); + } + } + + /// + /// Parses a GroupRef element + /// + /// Element to parse. + /// Required user id to be joined to the group. + private void ParseGroupRefElement(Intermediate intermediate, IntermediateSection section, XElement element, string userId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string groupId = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.Group, groupId); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new UserGroupSymbol(sourceLineNumbers) + { + UserRef = userId, + GroupRef = groupId, + }); + } + } + + /// + /// Parses an InternetShortcut element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Default directory if none is specified on the InternetShortcut element. + private void ParseInternetShortcutElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string defaultTarget) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string name = null; + string target = null; + string directoryId = null; + string type = null; + string iconFile = null; + int iconIndex = 0; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Directory": + directoryId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Target": + target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Type": + type = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "IconFile": + iconFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "IconIndex": + iconIndex = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + // If there was no directoryId specified on the InternetShortcut element, default to the one on + // the parent component. + if (null == directoryId) + { + directoryId = defaultTarget; + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("uis", componentId, directoryId, name, target); + } + + // In theory this can never be the case, since InternetShortcut can only be under + // a component element, and if the Directory wasn't specified the default will come + // from the component. However, better safe than sorry, so here's a check to make sure + // it didn't wind up being null after setting it to the defaultTarget. + if (null == directoryId) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Directory")); + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (null == target) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + var shortcutType = InternetShortcutType.Link; + if (String.Equals(type, "url", StringComparison.OrdinalIgnoreCase)) + { + shortcutType = InternetShortcutType.Url; + } + + if (!this.Messaging.EncounteredError) + { + this.CreateWixInternetShortcut(section, sourceLineNumbers, componentId, directoryId, id, name, target, shortcutType, iconFile, iconIndex); + } + } + + /// + /// Creates the rows needed for WixInternetShortcut to work. + /// + /// The CompilerCore object used to create rows. + /// Source line information about the owner element. + /// Identifier of parent component. + /// Identifier of directory containing shortcut. + /// Identifier of shortcut. + /// Name of shortcut without extension. + /// Target URL of shortcut. + private void CreateWixInternetShortcut(IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, Identifier shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) + { + // add the appropriate extension based on type of shortcut + name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); + + section.AddSymbol(new WixInternetShortcutSymbol(sourceLineNumbers, shortcutId) + { + ComponentRef = componentId, + DirectoryRef = directoryId, + Name = name, + Target = target, + Attributes = (int)type, + IconFile = iconFile, + IconIndex = iconIndex, + }); + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); + + // use built-in MSI functionality to remove the shortcuts rather than doing so via CA + section.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, shortcutId) + { + ComponentRef = componentId, + DirPropertyRef = directoryId, + OnUninstall = true, + FileName = name, + }); + } + + /// + /// Parses a performance category element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParsePerformanceCategoryElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string name = null; + string help = null; + var multiInstance = YesNoType.No; + int defaultLanguage = 0x09; // default to "english" + + var parsedPerformanceCounters = new List(); + + // default to managed performance counter + var library = "netfxperf.dll"; + var openEntryPoint = "OpenPerformanceData"; + var collectEntryPoint = "CollectPerformanceData"; + var closeEntryPoint = "ClosePerformanceData"; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Close": + closeEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Collect": + collectEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "DefaultLanguage": + defaultLanguage = this.GetPerformanceCounterLanguage(sourceLineNumbers, attrib); + break; + case "Help": + help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Library": + library = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "MultiInstance": + multiInstance = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Open": + openEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id && null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Id", "Name")); + } + else if (null == id) + { + id = this.ParseHelper.CreateIdentifier("upc", componentId, name); + } + else if (null == name) + { + name = id.Id; + } + + // Process the child counter elements. + foreach (var child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "PerformanceCounter": + var counter = this.ParsePerformanceCounterElement(intermediate, section, child, defaultLanguage); + if (null != counter) + { + parsedPerformanceCounters.Add(counter); + } + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + + if (!this.Messaging.EncounteredError) + { + // Calculate the ini and h file content. + var objectName = "OBJECT_1"; + var objectLanguage = defaultLanguage.ToString("D3", CultureInfo.InvariantCulture); + + var sbIniData = new StringBuilder(); + sbIniData.AppendFormat("[info]\r\ndrivername={0}\r\nsymbolfile=wixperf.h\r\n\r\n[objects]\r\n{1}_{2}_NAME=\r\n\r\n[languages]\r\n{2}=LANG{2}\r\n\r\n", name, objectName, objectLanguage); + sbIniData.AppendFormat("[text]\r\n{0}_{1}_NAME={2}\r\n", objectName, objectLanguage, name); + if (null != help) + { + sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", objectName, objectLanguage, help); + } + + int symbolConstantsCounter = 0; + var sbSymbolicConstants = new StringBuilder(); + sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", objectName, symbolConstantsCounter); + + var sbCounterNames = new StringBuilder("[~]"); + var sbCounterTypes = new StringBuilder("[~]"); + for (int i = 0; i < parsedPerformanceCounters.Count; ++i) + { + var counter = parsedPerformanceCounters[i]; + var counterName = String.Concat("DEVICE_COUNTER_", i + 1); + + sbIniData.AppendFormat("{0}_{1}_NAME={2}\r\n", counterName, counter.Language, counter.Name); + if (null != counter.Help) + { + sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", counterName, counter.Language, counter.Help); + } + + symbolConstantsCounter += 2; + sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", counterName, symbolConstantsCounter); + + sbCounterNames.Append(UtilCompiler.FindPropertyBrackets.Replace(counter.Name, this.EscapeProperties)); + sbCounterNames.Append("[~]"); + sbCounterTypes.Append(counter.Type); + sbCounterTypes.Append("[~]"); + } + + sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); + + // Add the calculated INI and H strings to the PerformanceCategory table. + section.AddSymbol(new PerformanceCategorySymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Name = name, + IniData = sbIniData.ToString(), + ConstantData = sbSymbolicConstants.ToString(), + }); + + // Set up the application's performance key. + var escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); + var linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); + var performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); + + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); + } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + /// + /// Gets the performance counter language as a decimal number. + /// + /// Source line information about the owner element. + /// The attribute containing the value to get. + /// Numeric representation of the language as per WinNT.h. + private int GetPerformanceCounterLanguage(SourceLineNumber sourceLineNumbers, XAttribute attribute) + { + int language = 0; + if (String.Empty == attribute.Value) + { + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + } + else + { + switch (attribute.Value) + { + case "afrikaans": + language = 0x36; + break; + case "albanian": + language = 0x1c; + break; + case "arabic": + language = 0x01; + break; + case "armenian": + language = 0x2b; + break; + case "assamese": + language = 0x4d; + break; + case "azeri": + language = 0x2c; + break; + case "basque": + language = 0x2d; + break; + case "belarusian": + language = 0x23; + break; + case "bengali": + language = 0x45; + break; + case "bulgarian": + language = 0x02; + break; + case "catalan": + language = 0x03; + break; + case "chinese": + language = 0x04; + break; + case "croatian": + language = 0x1a; + break; + case "czech": + language = 0x05; + break; + case "danish": + language = 0x06; + break; + case "divehi": + language = 0x65; + break; + case "dutch": + language = 0x13; + break; + case "piglatin": + case "english": + language = 0x09; + break; + case "estonian": + language = 0x25; + break; + case "faeroese": + language = 0x38; + break; + case "farsi": + language = 0x29; + break; + case "finnish": + language = 0x0b; + break; + case "french": + language = 0x0c; + break; + case "galician": + language = 0x56; + break; + case "georgian": + language = 0x37; + break; + case "german": + language = 0x07; + break; + case "greek": + language = 0x08; + break; + case "gujarati": + language = 0x47; + break; + case "hebrew": + language = 0x0d; + break; + case "hindi": + language = 0x39; + break; + case "hungarian": + language = 0x0e; + break; + case "icelandic": + language = 0x0f; + break; + case "indonesian": + language = 0x21; + break; + case "italian": + language = 0x10; + break; + case "japanese": + language = 0x11; + break; + case "kannada": + language = 0x4b; + break; + case "kashmiri": + language = 0x60; + break; + case "kazak": + language = 0x3f; + break; + case "konkani": + language = 0x57; + break; + case "korean": + language = 0x12; + break; + case "kyrgyz": + language = 0x40; + break; + case "latvian": + language = 0x26; + break; + case "lithuanian": + language = 0x27; + break; + case "macedonian": + language = 0x2f; + break; + case "malay": + language = 0x3e; + break; + case "malayalam": + language = 0x4c; + break; + case "manipuri": + language = 0x58; + break; + case "marathi": + language = 0x4e; + break; + case "mongolian": + language = 0x50; + break; + case "nepali": + language = 0x61; + break; + case "norwegian": + language = 0x14; + break; + case "oriya": + language = 0x48; + break; + case "polish": + language = 0x15; + break; + case "portuguese": + language = 0x16; + break; + case "punjabi": + language = 0x46; + break; + case "romanian": + language = 0x18; + break; + case "russian": + language = 0x19; + break; + case "sanskrit": + language = 0x4f; + break; + case "serbian": + language = 0x1a; + break; + case "sindhi": + language = 0x59; + break; + case "slovak": + language = 0x1b; + break; + case "slovenian": + language = 0x24; + break; + case "spanish": + language = 0x0a; + break; + case "swahili": + language = 0x41; + break; + case "swedish": + language = 0x1d; + break; + case "syriac": + language = 0x5a; + break; + case "tamil": + language = 0x49; + break; + case "tatar": + language = 0x44; + break; + case "telugu": + language = 0x4a; + break; + case "thai": + language = 0x1e; + break; + case "turkish": + language = 0x1f; + break; + case "ukrainian": + language = 0x22; + break; + case "urdu": + language = 0x20; + break; + case "uzbek": + language = 0x43; + break; + case "vietnamese": + language = 0x2a; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + break; + } + } + + return language; + } + + /// + /// Parses a performance counter element. + /// + /// Element to parse. + /// Default language for the performance counter. + private ParsedPerformanceCounter ParsePerformanceCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, int defaultLanguage) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + ParsedPerformanceCounter parsedPerformanceCounter = null; + string name = null; + string help = null; + var type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + int language = defaultLanguage; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Help": + help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Type": + type = this.GetPerformanceCounterType(sourceLineNumbers, attrib); + break; + case "Language": + language = this.GetPerformanceCounterLanguage(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + if (null == help) + { + this.Messaging.Write(UtilWarnings.RequiredAttributeForWindowsXP(sourceLineNumbers, element.Name.LocalName, "Help")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + parsedPerformanceCounter = new ParsedPerformanceCounter(name, help, type, language); + } + + return parsedPerformanceCounter; + } + + /// + /// Gets the performance counter type. + /// + /// Source line information about the owner element. + /// The attribute containing the value to get. + /// Numeric representation of the language as per WinNT.h. + private System.Diagnostics.PerformanceCounterType GetPerformanceCounterType(SourceLineNumber sourceLineNumbers, XAttribute attribute) + { + var type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + if (String.Empty == attribute.Value) + { + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + } + else + { + switch (attribute.Value) + { + case "averageBase": + type = System.Diagnostics.PerformanceCounterType.AverageBase; + break; + case "averageCount64": + type = System.Diagnostics.PerformanceCounterType.AverageCount64; + break; + case "averageTimer32": + type = System.Diagnostics.PerformanceCounterType.AverageTimer32; + break; + case "counterDelta32": + type = System.Diagnostics.PerformanceCounterType.CounterDelta32; + break; + case "counterTimerInverse": + type = System.Diagnostics.PerformanceCounterType.CounterTimerInverse; + break; + case "sampleFraction": + type = System.Diagnostics.PerformanceCounterType.SampleFraction; + break; + case "timer100Ns": + type = System.Diagnostics.PerformanceCounterType.Timer100Ns; + break; + case "counterTimer": + type = System.Diagnostics.PerformanceCounterType.CounterTimer; + break; + case "rawFraction": + type = System.Diagnostics.PerformanceCounterType.RawFraction; + break; + case "timer100NsInverse": + type = System.Diagnostics.PerformanceCounterType.Timer100NsInverse; + break; + case "counterMultiTimer": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer; + break; + case "counterMultiTimer100Ns": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer100Ns; + break; + case "counterMultiTimerInverse": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimerInverse; + break; + case "counterMultiTimer100NsInverse": + type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer100NsInverse; + break; + case "elapsedTime": + type = System.Diagnostics.PerformanceCounterType.ElapsedTime; + break; + case "sampleBase": + type = System.Diagnostics.PerformanceCounterType.SampleBase; + break; + case "rawBase": + type = System.Diagnostics.PerformanceCounterType.RawBase; + break; + case "counterMultiBase": + type = System.Diagnostics.PerformanceCounterType.CounterMultiBase; + break; + case "rateOfCountsPerSecond64": + type = System.Diagnostics.PerformanceCounterType.RateOfCountsPerSecond64; + break; + case "rateOfCountsPerSecond32": + type = System.Diagnostics.PerformanceCounterType.RateOfCountsPerSecond32; + break; + case "countPerTimeInterval64": + type = System.Diagnostics.PerformanceCounterType.CountPerTimeInterval64; + break; + case "countPerTimeInterval32": + type = System.Diagnostics.PerformanceCounterType.CountPerTimeInterval32; + break; + case "sampleCounter": + type = System.Diagnostics.PerformanceCounterType.SampleCounter; + break; + case "counterDelta64": + type = System.Diagnostics.PerformanceCounterType.CounterDelta64; + break; + case "numberOfItems64": + type = System.Diagnostics.PerformanceCounterType.NumberOfItems64; + break; + case "numberOfItems32": + type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; + break; + case "numberOfItemsHEX64": + type = System.Diagnostics.PerformanceCounterType.NumberOfItemsHEX64; + break; + case "numberOfItemsHEX32": + type = System.Diagnostics.PerformanceCounterType.NumberOfItemsHEX32; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); + break; + } + } + + return type; + } + + /// + /// Parses a perf counter element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referenced file. + private void ParsePerfCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string name = null; + + this.Messaging.Write(UtilWarnings.DeprecatedPerfCounterElement(sourceLineNumbers)); + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new PerfmonSymbol(sourceLineNumbers) + { + ComponentRef = componentId, + File = $"[#{fileId}]", + Name = name, + }); + } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + + /// + /// Parses a perf manifest element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referenced file. + private void ParsePerfCounterManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string resourceFileDirectory = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "ResourceFileDirectory": + resourceFileDirectory = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new PerfmonManifestSymbol(sourceLineNumbers) + { + ComponentRef = componentId, + File = $"[#{fileId}]", + ResourceFileDirectory = resourceFileDirectory, + }); + } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + /// + /// Parses a format files element. + /// + /// Element to parse. + /// Identifier of referenced file. + /// Flag to determine whether the component is 64-bit. + private void ParseFormatFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId, bool win64) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string binaryId = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "BinaryRef": + binaryId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (null == binaryId) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryRef")); + } + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) + { + BinaryRef = binaryId, + FileRef = fileId, + }); + + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryId); + } + } + + /// + /// Parses a event manifest element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Identifier of referenced file. + private void ParseEventManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string messageFile = null; + string resourceFile = null; + string parameterFile = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "MessageFile": + messageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ResourceFile": + resourceFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ParameterFile": + parameterFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new EventManifestSymbol(sourceLineNumbers) + { + ComponentRef = componentId, + File = $"[#{fileId}]", + }); + + if (null != messageFile) + { + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}MessageFile")) + { + File = $"[#{fileId}]", + ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", + Name = "messageFileName", + Value = messageFile, + Flags = 4 | 0x00001000, //bulk write | preserve modified date + ComponentRef = componentId, + }); + } + if (null != parameterFile) + { + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}ParameterFile")) + { + File = $"[#{fileId}]", + ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", + Name = "parameterFileName", + Value = parameterFile, + Flags = 4 | 0x00001000, //bulk write | preserve modified date + ComponentRef = componentId, + }); + } + if (null != resourceFile) + { + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}ResourceFile")) + { + File = $"[#{fileId}]", + ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", + Name = "resourceFileName", + Value = resourceFile, + Flags = 4 | 0x00001000, //bulk write | preserve modified date + ComponentRef = componentId, + }); + } + + } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + if (null != messageFile || null != parameterFile || null != resourceFile) + { + this.AddReferenceToSchedXmlFile(sourceLineNumbers, section); + } + } + + /// + /// Parses a PermissionEx element. + /// + /// Element to parse. + /// Identifier of object to be secured. + /// Identifier of component, used to determine install state. + /// Flag to determine whether the component is 64-bit. + /// Name of table that contains objectId. + private void ParsePermissionExElement(Intermediate intermediate, IntermediateSection section, XElement element, string objectId, string componentId, bool win64, string tableName) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + var bits = new BitArray(32); + string domain = null; + string[] specialPermissions = null; + string user = null; + var attributes = WixPermissionExAttributes.Inheritable; // default to inheritable. + + var permissionType = PermissionType.SecureObjects; + + switch (tableName) + { + case "CreateFolder": + specialPermissions = UtilConstants.FolderPermissions; + break; + case "File": + specialPermissions = UtilConstants.FilePermissions; + break; + case "Registry": + specialPermissions = UtilConstants.RegistryPermissions; + if (String.IsNullOrEmpty(objectId)) + { + this.Messaging.Write(UtilErrors.InvalidRegistryObject(sourceLineNumbers, element.Parent.Name.LocalName)); + } + break; + case "ServiceInstall": + specialPermissions = UtilConstants.ServicePermissions; + permissionType = PermissionType.SecureObjects; + break; + default: + this.ParseHelper.UnexpectedElement(element.Parent, element); + break; + } + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Domain": + if (PermissionType.FileSharePermissions == permissionType) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Inheritable": + if (this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.No) + { + attributes &= ~WixPermissionExAttributes.Inheritable; + } + break; + case "User": + user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) + { + if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) + { + if (!this.TrySetBitFromName(specialPermissions, attrib.Name.LocalName, attribValue, bits, 0)) + { + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + } + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + var permission = this.CreateIntegerFromBitArray(bits); + + if (null == user) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); + } + + if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL + { + this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); + section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) + { + SecureObject = objectId, + Table = tableName, + Domain = domain, + User = user, + Attributes = attributes, + Permission = permission, + ComponentRef = componentId, + }); + } + } + + /// + /// Parses a ProductSearch element. + /// + /// Element to parse. + private void ParseProductSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + string productCode = null; + string upgradeCode = null; + var attributes = WixProductSearchAttributes.Version; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "ProductCode": + productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); + break; + case "UpgradeCode": + upgradeCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); + break; + case "Result": + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) + { + case "version": + attributes = WixProductSearchAttributes.Version; + break; + case "language": + attributes = WixProductSearchAttributes.Language; + break; + case "state": + attributes = WixProductSearchAttributes.State; + break; + case "assignment": + attributes = WixProductSearchAttributes.Assignment; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "version", "language", "state", "assignment")); + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == upgradeCode && null == productCode) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ProductCode", "UpgradeCode", true)); + } + + if (null != upgradeCode && null != productCode) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "UpgradeCode", "ProductCode")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wps", variable, condition, after, (productCode == null ? upgradeCode : productCode), attributes.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + + if (!this.Messaging.EncounteredError) + { + // set an additional flag if this is an upgrade code + if (null != upgradeCode) + { + attributes |= WixProductSearchAttributes.UpgradeCode; + } + + section.AddSymbol(new WixProductSearchSymbol(sourceLineNumbers, id) + { + Guid = productCode ?? upgradeCode, + Attributes = attributes, + }); + } + } + + /// + /// Parses a RegistrySearch element. + /// + /// Element to parse. + private void ParseRegistrySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string variable = null; + string condition = null; + string after = null; + RegistryRootType? root = null; + string key = null; + string value = null; + var expand = YesNoType.NotSet; + var win64 = this.Context.IsCurrentPlatform64Bit; + var attributes = WixRegistrySearchAttributes.Raw | WixRegistrySearchAttributes.WantValue; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + case "Variable": + case "Condition": + case "After": + this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); + break; + case "Bitness": + var bitnessValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (bitnessValue) + { + case "always32": + win64 = false; + break; + case "always64": + win64 = true; + break; + case "default": + case "": + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Name.LocalName, attrib.Name.LocalName, bitnessValue, "default", "always32", "always64")); + break; + } + break; + case "Root": + root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); + break; + case "Key": + key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Value": + value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ExpandEnvironmentVariables": + expand = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Format": + string format = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (format) + { + case "raw": + attributes |= WixRegistrySearchAttributes.Raw; + break; + case "compatible": + attributes |= WixRegistrySearchAttributes.Compatible; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, format, "raw", "compatible")); + break; + } + break; + case "Result": + var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (result) + { + case "exists": + attributes |= WixRegistrySearchAttributes.WantExists; + break; + case "value": + attributes |= WixRegistrySearchAttributes.WantValue; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists", "value")); + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (!root.HasValue) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); + } + + if (null == key) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("wrs", variable, condition, after, root.ToString(), key, value, attributes.ToString()); + } + + if (expand == YesNoType.Yes) + { + if (0 != (attributes & WixRegistrySearchAttributes.WantExists)) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "ExpandEnvironmentVariables", expand.ToString(), "Result", "exists")); + } + + attributes |= WixRegistrySearchAttributes.ExpandEnvironmentVariables; + } + + if (win64) + { + attributes |= WixRegistrySearchAttributes.Win64; + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new WixRegistrySearchSymbol(sourceLineNumbers, id) + { + Root = root.Value, + Key = key, + Value = value, + Attributes = attributes, + }); + } + } + + /// + /// Parses a RemoveFolderEx element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParseRemoveFolderExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + var mode = WixRemoveFolderExInstallMode.Uninstall; + string property = null; + string condition = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "On": + var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + if (onValue.Length == 0) + { + } + else + { + switch (onValue) + { + case "install": + mode = WixRemoveFolderExInstallMode.Install; + break; + case "uninstall": + mode = WixRemoveFolderExInstallMode.Uninstall; + break; + case "both": + mode = WixRemoveFolderExInstallMode.Both; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", onValue, "install", "uninstall", "both")); + break; + } + } + break; + case "Property": + property = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (String.IsNullOrEmpty(property)) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Property")); + } + + if (id == null) + { + id = this.ParseHelper.CreateIdentifier("wrf", componentId, property, mode.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Property = property, + InstallMode = mode, + Condition = condition + }); + + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveFile"); + } + } + + /// + /// Parses a RemoveRegistryKeyEx element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParseRemoveRegistryKeyExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + var mode = WixRemoveRegistryKeyExInstallMode.Uninstall; + string condition = null; + RegistryRootType? root = null; + string key = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "On": + var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (actionValue) + { + case "": + break; + case "install": + mode = WixRemoveRegistryKeyExInstallMode.Install; + break; + case "uninstall": + mode = WixRemoveRegistryKeyExInstallMode.Uninstall; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", actionValue, "install", "uninstall")); + break; + } + break; + case "Root": + root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); + break; + case "Key": + key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (!root.HasValue) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); + } + + if (key == null) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); + } + + if (id == null) + { + id = this.ParseHelper.CreateIdentifier("rrx", componentId, condition, root.ToString(), key, mode.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "Registry"); + this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveRegistry"); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveRegistryKeysEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + section.AddSymbol(new WixRemoveRegistryKeyExSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Root = root.Value, + Key = key, + InstallMode = mode, + Condition = condition + }); + } + } + + /// + /// Parses a RestartResource element. + /// + /// The element to parse. + /// The identity of the parent component. + private void ParseRestartResourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string resource = null; + WixRestartResourceAttributes? attributes = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + + case "Path": + resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + attributes = WixRestartResourceAttributes.Filename; + break; + + case "ProcessName": + resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + attributes = WixRestartResourceAttributes.ProcessName; + break; + + case "ServiceName": + resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + attributes = WixRestartResourceAttributes.ServiceName; + break; + + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + // Validate the attribute. + if (id == null) + { + id = this.ParseHelper.CreateIdentifier("wrr", componentId, resource, attributes.ToString()); + } + + if (!attributes.HasValue) + { + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Path", "ProcessName", "ServiceName")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Resource = resource, + Attributes = attributes, + }); + } + } + + /// + /// Parses a service configuration element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Name of parent element. + /// Optional name of service + private void ParseServiceConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string parentTableName, string parentTableServiceName) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + string firstFailureActionType = null; + var newService = false; + string programCommandLine = null; + string rebootMessage = null; + var resetPeriod = CompilerConstants.IntegerNotSet; + var restartServiceDelay = CompilerConstants.IntegerNotSet; + string secondFailureActionType = null; + string serviceName = null; + string thirdFailureActionType = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "FirstFailureActionType": + firstFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ProgramCommandLine": + programCommandLine = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "RebootMessage": + rebootMessage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ResetPeriodInDays": + resetPeriod = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + break; + case "RestartServiceDelayInSeconds": + restartServiceDelay = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); + break; + case "SecondFailureActionType": + secondFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ServiceName": + serviceName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThirdFailureActionType": + thirdFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + // if this element is a child of ServiceInstall then ignore the service name provided. + if ("ServiceInstall" == parentTableName) + { + // TODO: the ServiceName attribute should not be allowed in this case (the overwriting behavior may confuse users) + serviceName = parentTableServiceName; + newService = true; + } + else + { + // not a child of ServiceInstall, so ServiceName must have been provided + if (null == serviceName) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ServiceName")); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + + section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) + { + ServiceName = serviceName, + ComponentRef = componentId, + NewService = newService ? 1 : 0, + FirstFailureActionType = firstFailureActionType, + SecondFailureActionType = secondFailureActionType, + ThirdFailureActionType = thirdFailureActionType, + ResetPeriodInDays = resetPeriod, + RestartServiceDelayInSeconds = restartServiceDelay, + ProgramCommandLine = programCommandLine, + RebootMessage = rebootMessage, + }); + } + } + + /// + /// Parses a touch file element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Indicates whether the path is a 64-bit path. + private void ParseTouchFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool win64) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string path = null; + var onInstall = YesNoType.NotSet; + var onReinstall = YesNoType.NotSet; + var onUninstall = YesNoType.NotSet; + var nonvital = YesNoType.NotSet; + int attributes = 0; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Path": + path = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "OnInstall": + onInstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "OnReinstall": + onReinstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "OnUninstall": + onUninstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Nonvital": + nonvital = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == path) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); + } + + // If none of the scheduling actions are set, default to touching on install and reinstall. + if (YesNoType.NotSet == onInstall && YesNoType.NotSet == onReinstall && YesNoType.NotSet == onUninstall) + { + onInstall = YesNoType.Yes; + onReinstall = YesNoType.Yes; + } + + attributes |= YesNoType.Yes == onInstall ? 0x1 : 0; + attributes |= YesNoType.Yes == onReinstall ? 0x2 : 0; + attributes |= YesNoType.Yes == onUninstall ? 0x4 : 0; + attributes |= win64 ? 0x10 : 0; + attributes |= YesNoType.Yes == nonvital ? 0 : 0x20; + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("tf", path, attributes.ToString()); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new WixTouchFileSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Path = path, + Attributes = attributes, + }); + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + } + + /// + /// Parses an user element. + /// + /// Element to parse. + /// Optional identifier of parent component. + private void ParseUserElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + int attributes = 0; + string domain = null; + string name = null; + string password = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "CanNotChangePassword": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserPasswdCantChange; + } + break; + case "CreateUser": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDontCreateUser; + } + break; + case "Disabled": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDisableAccount; + } + break; + case "Domain": + domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "FailIfExists": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserFailIfExists; + } + break; + case "LogonAsService": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserLogonAsService; + } + break; + case "LogonAsBatchJob": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserLogonAsBatchJob; + } + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Password": + password = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "PasswordExpired": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserPasswdChangeReqdOnLogin; + } + break; + case "PasswordNeverExpires": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDontExpirePasswrd; + } + break; + case "RemoveOnUninstall": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserDontRemoveOnUninstall; + } + break; + case "UpdateIfExists": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserUpdateIfExists; + } + break; + case "Vital": + if (null == componentId) + { + this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); + } + + if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + attributes |= UserNonVital; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("usr", componentId, name); + } + + if (null == name) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); + } + + foreach (var child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "GroupRef": + if (null == componentId) + { + var childSourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(child); + this.Messaging.Write(UtilErrors.IllegalElementWithoutComponent(childSourceLineNumbers, child.Name.LocalName)); + } + + this.ParseGroupRefElement(intermediate, section, child, id.Id); + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + if (null != componentId) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new UserSymbol(sourceLineNumbers, id) + { + ComponentRef = componentId, + Name = name, + Domain = domain, + Password = password, + Attributes = attributes, + }); + } + } + + /// + /// Parses a XmlFile element. + /// + /// Element to parse. + /// Identifier of parent component. + private void ParseXmlFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string file = null; + string elementPath = null; + string name = null; + string value = null; + int sequence = -1; + int flags = 0; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Action": + var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (actionValue) + { + case "createElement": + flags |= 0x00000001; // XMLFILE_CREATE_ELEMENT + break; + case "deleteValue": + flags |= 0x00000002; // XMLFILE_DELETE_VALUE + break; + case "bulkSetValue": + flags |= 0x00000004; // XMLFILE_BULKWRITE_VALUE + break; + case "setValue": + // no flag for set value since it's the default + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Action", actionValue, "createElement", "deleteValue", "setValue", "bulkSetValue")); + break; + } + break; + case "SelectionLanguage": + string selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (selectionLanguage) + { + case "XPath": + flags |= 0x00000100; // XMLFILE_USE_XPATH + break; + case "XSLPattern": + // no flag for since it's the default + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "SelectionLanguage", selectionLanguage, "XPath", "XSLPattern")); + break; + } + break; + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "File": + file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ElementPath": + elementPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Permanent": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + flags |= 0x00010000; // XMLFILE_DONT_UNINSTALL + } + break; + case "Sequence": + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); + break; + case "Value": + value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "PreserveModifiedDate": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + flags |= 0x00001000; // XMLFILE_PRESERVE_MODIFIED + } + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("uxf", componentId, file, elementPath, name); + } + + if (null == file) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File")); + } + + if (null == elementPath) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ElementPath")); + } + + if ((0x00000001 /*XMLFILE_CREATE_ELEMENT*/ & flags) != 0 && null == name) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "Action", "Name")); + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); + + if (!this.Messaging.EncounteredError) + { + var symbol = section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, id) + { + File = file, + ElementPath = elementPath, + Name = name, + Value = value, + Flags = flags, + ComponentRef = componentId, + }); + if (-1 != sequence) + { + symbol.Sequence = sequence; + } + } + + this.AddReferenceToSchedXmlFile(sourceLineNumbers, section); + } + + /// + /// Parses a XmlConfig element. + /// + /// Element to parse. + /// Identifier of parent component. + /// Whether or not the element is nested. + private void ParseXmlConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool nested) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); + Identifier id = null; + string elementId = null; + string elementPath = null; + int flags = 0; + string file = null; + string name = null; + var sequence = CompilerConstants.IntegerNotSet; + string value = null; + string verifyPath = null; + + foreach (var attrib in element.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Id": + id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; + case "Action": + if (nested) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + else + { + string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (actionValue) + { + case "create": + flags |= 0x10; // XMLCONFIG_CREATE + break; + case "delete": + flags |= 0x20; // XMLCONFIG_DELETE + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, actionValue, "create", "delete")); + break; + } + } + break; + case "ElementId": + elementId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ElementPath": + elementPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "File": + file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Name": + name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Node": + if (nested) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + else + { + var nodeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (nodeValue) + { + case "element": + flags |= 0x1; // XMLCONFIG_ELEMENT + break; + case "value": + flags |= 0x2; // XMLCONFIG_VALUE + break; + case "document": + flags |= 0x4; // XMLCONFIG_DOCUMENT + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, nodeValue, "element", "value", "document")); + break; + } + } + break; + case "On": + if (nested) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); + } + else + { + var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (onValue) + { + case "install": + flags |= 0x100; // XMLCONFIG_INSTALL + break; + case "uninstall": + flags |= 0x200; // XMLCONFIG_UNINSTALL + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, onValue, "install", "uninstall")); + break; + } + } + break; + case "PreserveModifiedDate": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) + { + flags |= 0x00001000; // XMLCONFIG_PRESERVE_MODIFIED + } + break; + case "Sequence": + sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); + break; + case "Value": + value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "VerifyPath": + verifyPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(element, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); + } + } + + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("uxc", componentId, file, elementId, elementPath); + } + + if (null == file) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File")); + } + + if (null == elementId && null == elementPath) + { + this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "ElementPath")); + } + else if (null != elementId) + { + if (null != elementPath) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "ElementId", "ElementPath")); + } + + if (0 != flags) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On")); + } + + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId); + } + + // find unexpected child elements + foreach (var child in element.Elements()) + { + if (this.Namespace == child.Name.Namespace) + { + switch (child.Name.LocalName) + { + case "XmlConfig": + if (nested) + { + this.Messaging.Write(ErrorMessages.UnexpectedElement(sourceLineNumbers, element.Name.LocalName, child.Name.LocalName)); + } + else + { + this.ParseXmlConfigElement(intermediate, section, child, componentId, true); + } + break; + default: + this.ParseHelper.UnexpectedElement(element, child); + break; + } + } + else + { + this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); + } + } + + if (!this.Messaging.EncounteredError) + { + var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id) + { + File = file, + ElementId = elementId, + ElementPath = elementPath, + VerifyPath = verifyPath, + Name = name, + Value = value, + Flags = flags, + ComponentRef = componentId, + }); + + if (CompilerConstants.IntegerNotSet != sequence) + { + symbol.Sequence = sequence; + } + } + + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + /// + /// Match evaluator to escape properties in a string. + /// + private string EscapeProperties(Match match) + { + string escape = null; + switch (match.Value) + { + case "[": + escape = @"[\[]"; + break; + case "]": + escape = @"[\]]"; + break; + } + + return escape; + } + + private int CreateIntegerFromBitArray(BitArray bits) + { + if (32 != bits.Length) + { + throw new ArgumentException(String.Format("Can only convert a bit array with 32-bits to integer. Actual number of bits in array: {0}", bits.Length), "bits"); + } + + var intArray = new int[1]; + bits.CopyTo(intArray, 0); + + return intArray[0]; + } + + private bool TrySetBitFromName(string[] attributeNames, string attributeName, YesNoType attributeValue, BitArray bits, int offset) + { + for (var i = 0; i < attributeNames.Length; i++) + { + if (attributeName.Equals(attributeNames[i], StringComparison.Ordinal)) + { + bits.Set(i + offset, YesNoType.Yes == attributeValue); + return true; + } + } + + return false; + } + + private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) + { + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + } + + /// + /// Private class that stores the data from a parsed PerformanceCounter element. + /// + private class ParsedPerformanceCounter + { + internal ParsedPerformanceCounter(string name, string help, System.Diagnostics.PerformanceCounterType type, int language) + { + this.Name = name; + this.Help = help; + this.Type = (int)type; + this.Language = language.ToString("D3", CultureInfo.InvariantCulture); + } + + internal string Name { get; } + + internal string Help { get; } + + internal int Type { get; } + + internal string Language { get; } + } + } +} diff --git a/src/ext/Util/wixext/UtilConstants.cs b/src/ext/Util/wixext/UtilConstants.cs new file mode 100644 index 00000000..28ff368f --- /dev/null +++ b/src/ext/Util/wixext/UtilConstants.cs @@ -0,0 +1,17 @@ +// 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.Util +{ + /// + /// Constants used by Utility Extension. + /// + internal static class UtilConstants + { + internal static readonly string[] FilePermissions = { "Read", "Write", "Append", "ReadExtendedAttributes", "WriteExtendedAttributes", "Execute", null, "ReadAttributes", "WriteAttributes" }; + internal static readonly string[] FolderPermissions = { "Read", "CreateFile", "CreateChild", "ReadExtendedAttributes", "WriteExtendedAttributes", "Traverse", "DeleteChild", "ReadAttributes", "WriteAttributes" }; + internal static readonly string[] GenericPermissions = { "GenericAll", "GenericExecute", "GenericWrite", "GenericRead" }; + internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" }; + internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" }; + internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" }; + } +} diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs new file mode 100644 index 00000000..9ef3390f --- /dev/null +++ b/src/ext/Util/wixext/UtilDecompiler.cs @@ -0,0 +1,1543 @@ +// 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 +{ +#if TODO_CONSIDER_DECOMPILER + using System; + using System.IO; + using System.Text; + using System.Collections; + using System.Diagnostics; + using System.Globalization; + + using Util = WixToolset.Extensions.Serialize.Util; + using WixToolset.Data; + using WixToolset.Extensibility; + using Wix = WixToolset.Data.Serialize; + + /// + /// The decompiler for the WiX Toolset Utility Extension. + /// + public sealed class UtilDecompiler : DecompilerExtension + { + /// + /// Creates a decompiler for Utility Extension. + /// + public UtilDecompiler() + { + this.TableDefinitions = UtilExtensionData.GetExtensionTableDefinitions(); + } + + /// + /// Get the extensions library to be removed. + /// + /// Table definitions for library. + /// Library to remove from decompiled output. + public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions) + { + return UtilExtensionData.GetExtensionLibrary(tableDefinitions); + } + + /// + /// Called at the beginning of the decompilation of a database. + /// + /// The collection of all tables. + public override void Initialize(TableIndexedCollection tables) + { + this.CleanupSecureCustomProperties(tables); + this.CleanupInternetShortcutRemoveFileTables(tables); + } + + /// + /// Decompile the SecureCustomProperties field to PropertyRefs for known extension properties. + /// + /// + /// If we've referenced any of the suite or directory properties, add + /// a PropertyRef to refer to the Property (and associated custom action) + /// from the extension's library. Then remove the property from + /// SecureCustomExtensions property so later decompilation won't create + /// new Property elements. + /// + /// The collection of all tables. + private void CleanupSecureCustomProperties(TableIndexedCollection tables) + { + Table propertyTable = tables["Property"]; + + if (null != propertyTable) + { + foreach (Row row in propertyTable.Rows) + { + if ("SecureCustomProperties" == row[0].ToString()) + { + StringBuilder remainingProperties = new StringBuilder(); + string[] secureCustomProperties = row[1].ToString().Split(';'); + foreach (string property in secureCustomProperties) + { + if (property.StartsWith("WIX_SUITE_", StringComparison.Ordinal) || property.StartsWith("WIX_DIR_", StringComparison.Ordinal) + || property.StartsWith("WIX_ACCOUNT_", StringComparison.Ordinal)) + { + 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; + } + } + } + } + + /// + /// Remove RemoveFile rows that the InternetShortcut compiler extension adds for us. + /// + /// The collection of all tables. + private void CleanupInternetShortcutRemoveFileTables(TableIndexedCollection tables) + { + // index the WixInternetShortcut table + Table wixInternetShortcutTable = tables["WixInternetShortcut"]; + Hashtable wixInternetShortcuts = new Hashtable(); + if (null != wixInternetShortcutTable) + { + foreach (Row row in wixInternetShortcutTable.Rows) + { + wixInternetShortcuts.Add(row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), row); + } + } + + // remove the RemoveFile rows with primary keys that match the WixInternetShortcut table's + Table removeFileTable = tables["RemoveFile"]; + if (null != removeFileTable) + { + for (int i = removeFileTable.Rows.Count - 1; 0 <= i; i--) + { + if (null != wixInternetShortcuts[removeFileTable.Rows[i][0]]) + { + removeFileTable.Rows.RemoveAt(i); + } + } + } + } + + /// + /// Decompiles an extension table. + /// + /// The table to decompile. + public override void DecompileTable(Table table) + { + switch (table.Name) + { + case "WixCloseApplication": + this.DecompileWixCloseApplicationTable(table); + break; + case "WixRemoveFolderEx": + this.DecompileWixRemoveFolderExTable(table); + break; + case "WixRestartResource": + this.DecompileWixRestartResourceTable(table); + break; + case "FileShare": + this.DecompileFileShareTable(table); + break; + case "FileSharePermissions": + this.DecompileFileSharePermissionsTable(table); + break; + case "WixInternetShortcut": + this.DecompileWixInternetShortcutTable(table); + break; + case "Group": + this.DecompileGroupTable(table); + break; + case "Perfmon": + this.DecompilePerfmonTable(table); + break; + case "PerfmonManifest": + this.DecompilePerfmonManifestTable(table); + break; + case "EventManifest": + this.DecompileEventManifestTable(table); + break; + case "SecureObjects": + this.DecompileSecureObjectsTable(table); + break; + case "ServiceConfig": + this.DecompileServiceConfigTable(table); + break; + case "User": + this.DecompileUserTable(table); + break; + case "UserGroup": + this.DecompileUserGroupTable(table); + break; + case "XmlConfig": + this.DecompileXmlConfigTable(table); + break; + case "XmlFile": + // XmlFile decompilation has been moved to FinalizeXmlFileTable function + break; + default: + base.DecompileTable(table); + break; + } + } + + /// + /// Finalize decompilation. + /// + /// The collection of all tables. + public override void Finish(TableIndexedCollection tables) + { + this.FinalizePerfmonTable(tables); + this.FinalizePerfmonManifestTable(tables); + this.FinalizeSecureObjectsTable(tables); + this.FinalizeServiceConfigTable(tables); + this.FinalizeXmlConfigTable(tables); + this.FinalizeXmlFileTable(tables); + this.FinalizeEventManifestTable(tables); + } + + /// + /// Decompile the WixCloseApplication table. + /// + /// The table to decompile. + private void DecompileWixCloseApplicationTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.CloseApplication closeApplication = new Util.CloseApplication(); + + closeApplication.Id = (string)row[0]; + + closeApplication.Target = (string)row[1]; + + if (null != row[2]) + { + closeApplication.Description = (string)row[2]; + } + + if (null != row[3]) + { + closeApplication.Content = (string)row[3]; + } + + // set defaults + closeApplication.CloseMessage = Util.YesNoType.no; + closeApplication.RebootPrompt = Util.YesNoType.yes; + closeApplication.ElevatedCloseMessage = Util.YesNoType.no; + + if (null != row[4]) + { + int attribute = (int)row[4]; + + closeApplication.CloseMessage = (0x1 == (attribute & 0x1)) ? Util.YesNoType.yes : Util.YesNoType.no; + closeApplication.RebootPrompt = (0x2 == (attribute & 0x2)) ? Util.YesNoType.yes : Util.YesNoType.no; + closeApplication.ElevatedCloseMessage = (0x4 == (attribute & 0x4)) ? Util.YesNoType.yes : Util.YesNoType.no; + } + + if (null != row[5]) + { + closeApplication.Sequence = (int)row[5]; + } + + if (null != row[6]) + { + closeApplication.Property = (string)row[6]; + } + + this.Core.RootElement.AddChild(closeApplication); + } + } + + /// + /// Decompile the WixRemoveFolderEx table. + /// + /// The table to decompile. + private void DecompileWixRemoveFolderExTable(Table table) + { + foreach (Row row in table.Rows) + { + // Set the Id even if auto-generated previously. + Util.RemoveFolderEx removeFolder = new Util.RemoveFolderEx(); + removeFolder.Id = (string)row[0]; + removeFolder.Property = (string)row[2]; + + int installMode = (int)row[3]; + switch ((UtilCompiler.WixRemoveFolderExOn)installMode) + { + case UtilCompiler.WixRemoveFolderExOn.Install: + removeFolder.On = Util.RemoveFolderEx.OnType.install; + break; + + case UtilCompiler.WixRemoveFolderExOn.Uninstall: + removeFolder.On = Util.RemoveFolderEx.OnType.uninstall; + break; + + case UtilCompiler.WixRemoveFolderExOn.Both: + removeFolder.On = Util.RemoveFolderEx.OnType.both; + break; + + default: + this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "InstallMode", installMode)); + break; + } + + // Add to the appropriate Component or section element. + string componentId = (string)row[1]; + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", componentId); + if (null != component) + { + component.AddChild(removeFolder); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", componentId, "Component")); + } + } + } + + /// + /// Decompile the WixRestartResource table. + /// + /// The table to decompile. + private void DecompileWixRestartResourceTable(Table table) + { + foreach (Row row in table.Rows) + { + // Set the Id even if auto-generated previously. + Util.RestartResource restartResource = new Util.RestartResource(); + restartResource.Id = (string)row[0]; + + // Determine the resource type and set accordingly. + string resource = (string)row[2]; + int attributes = (int)row[3]; + UtilCompiler.WixRestartResourceAttributes type = (UtilCompiler.WixRestartResourceAttributes)(attributes & (int)UtilCompiler.WixRestartResourceAttributes.TypeMask); + + switch (type) + { + case UtilCompiler.WixRestartResourceAttributes.Filename: + restartResource.Path = resource; + break; + + case UtilCompiler.WixRestartResourceAttributes.ProcessName: + restartResource.ProcessName = resource; + break; + + case UtilCompiler.WixRestartResourceAttributes.ServiceName: + restartResource.ServiceName = resource; + break; + + default: + this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Attributes", attributes)); + break; + } + + // Add to the appropriate Component or section element. + string componentId = (string)row[1]; + if (!String.IsNullOrEmpty(componentId)) + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", componentId); + if (null != component) + { + component.AddChild(restartResource); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", componentId, "Component")); + } + } + else + { + this.Core.RootElement.AddChild(restartResource); + } + } + } + + /// + /// Decompile the FileShare table. + /// + /// The table to decompile. + private void DecompileFileShareTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.FileShare fileShare = new Util.FileShare(); + + fileShare.Id = (string)row[0]; + + fileShare.Name = (string)row[1]; + + if (null != row[3]) + { + fileShare.Description = (string)row[3]; + } + + // the Directory_ column is set by the parent Component + + // the User_ and Permissions columns are deprecated + + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]); + if (null != component) + { + component.AddChild(fileShare); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component")); + } + this.Core.IndexElement(row, fileShare); + } + } + + /// + /// Decompile the FileSharePermissions table. + /// + /// The table to decompile. + private void DecompileFileSharePermissionsTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.FileSharePermission fileSharePermission = new Util.FileSharePermission(); + + fileSharePermission.User = (string)row[1]; + + string[] specialPermissions = UtilConstants.FolderPermissions; + int permissions = (int)row[2]; + for (int i = 0; i < 32; i++) + { + if (0 != ((permissions >> i) & 1)) + { + string name = null; + + if (16 > i && specialPermissions.Length > i) + { + name = specialPermissions[i]; + } + else if (28 > i && UtilConstants.StandardPermissions.Length > (i - 16)) + { + name = UtilConstants.StandardPermissions[i - 16]; + } + else if (0 <= (i - 28) && UtilConstants.GenericPermissions.Length > (i - 28)) + { + name = UtilConstants.GenericPermissions[i - 28]; + } + + if (null == name) + { + this.Core.OnMessage(WixWarnings.UnknownPermission(row.SourceLineNumbers, row.Table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), i)); + } + else + { + switch (name) + { + case "ChangePermission": + fileSharePermission.ChangePermission = Util.YesNoType.yes; + break; + case "CreateChild": + fileSharePermission.CreateChild = Util.YesNoType.yes; + break; + case "CreateFile": + fileSharePermission.CreateFile = Util.YesNoType.yes; + break; + case "Delete": + fileSharePermission.Delete = Util.YesNoType.yes; + break; + case "DeleteChild": + fileSharePermission.DeleteChild = Util.YesNoType.yes; + break; + case "GenericAll": + fileSharePermission.GenericAll = Util.YesNoType.yes; + break; + case "GenericExecute": + fileSharePermission.GenericExecute = Util.YesNoType.yes; + break; + case "GenericRead": + fileSharePermission.GenericRead = Util.YesNoType.yes; + break; + case "GenericWrite": + fileSharePermission.GenericWrite = Util.YesNoType.yes; + break; + case "Read": + fileSharePermission.Read = Util.YesNoType.yes; + break; + case "ReadAttributes": + fileSharePermission.ReadAttributes = Util.YesNoType.yes; + break; + case "ReadExtendedAttributes": + fileSharePermission.ReadExtendedAttributes = Util.YesNoType.yes; + break; + case "ReadPermission": + fileSharePermission.ReadPermission = Util.YesNoType.yes; + break; + case "Synchronize": + fileSharePermission.Synchronize = Util.YesNoType.yes; + break; + case "TakeOwnership": + fileSharePermission.TakeOwnership = Util.YesNoType.yes; + break; + case "Traverse": + fileSharePermission.Traverse = Util.YesNoType.yes; + break; + case "WriteAttributes": + fileSharePermission.WriteAttributes = Util.YesNoType.yes; + break; + case "WriteExtendedAttributes": + fileSharePermission.WriteExtendedAttributes = Util.YesNoType.yes; + break; + default: + Debug.Fail(String.Format("Unknown permission '{0}'.", name)); + break; + } + } + } + } + + Util.FileShare fileShare = (Util.FileShare)this.Core.GetIndexedElement("FileShare", (string)row[0]); + if (null != fileShare) + { + fileShare.AddChild(fileSharePermission); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "FileShare_", (string)row[0], "FileShare")); + } + } + } + + /// + /// Decompile the Group table. + /// + /// The table to decompile. + private void DecompileGroupTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.Group group = new Util.Group(); + + group.Id = (string)row[0]; + + if (null != row[1]) + { + this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Component_", (string)row[1])); + } + + group.Name = (string)row[2]; + + if (null != row[3]) + { + group.Domain = (string)row[3]; + } + + this.Core.RootElement.AddChild(group); + } + } + + /// + /// Decompile the WixInternetShortcut table. + /// + /// The table to decompile. + private void DecompileWixInternetShortcutTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.InternetShortcut internetShortcut = new Util.InternetShortcut(); + internetShortcut.Id = (string)row[0]; + internetShortcut.Directory = (string)row[2]; + // remove .lnk/.url extension because compiler extension adds it back for us + internetShortcut.Name = Path.ChangeExtension((string)row[3], null); + internetShortcut.Target = (string)row[4]; + internetShortcut.IconFile = (string)row[6]; + internetShortcut.IconIndex = (int)row[7]; + + UtilCompiler.InternetShortcutType shortcutType = (UtilCompiler.InternetShortcutType)row[5]; + switch (shortcutType) + { + case UtilCompiler.InternetShortcutType.Link: + internetShortcut.Type = Util.InternetShortcut.TypeType.link; + break; + case UtilCompiler.InternetShortcutType.Url: + internetShortcut.Type = Util.InternetShortcut.TypeType.url; + break; + } + + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); + if (null != component) + { + component.AddChild(internetShortcut); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); + } + + this.Core.IndexElement(row, internetShortcut); + } + } + + /// + /// Decompile the Perfmon table. + /// + /// The table to decompile. + private void DecompilePerfmonTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.PerfCounter perfCounter = new Util.PerfCounter(); + + perfCounter.Name = (string)row[2]; + + this.Core.IndexElement(row, perfCounter); + } + } + + /// + /// Decompile the PerfmonManifest table. + /// + /// The table to decompile. + private void DecompilePerfmonManifestTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.PerfCounterManifest perfCounterManifest = new Util.PerfCounterManifest(); + + perfCounterManifest.ResourceFileDirectory = (string)row[2]; + + this.Core.IndexElement(row, perfCounterManifest); + } + } + + /// + /// Decompile the EventManifest table. + /// + /// The table to decompile. + private void DecompileEventManifestTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.EventManifest eventManifest = new Util.EventManifest(); + this.Core.IndexElement(row, eventManifest); + } + } + + /// + /// Decompile the SecureObjects table. + /// + /// The table to decompile. + private void DecompileSecureObjectsTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.PermissionEx permissionEx = new Util.PermissionEx(); + + string[] specialPermissions; + switch ((string)row[1]) + { + case "CreateFolder": + specialPermissions = UtilConstants.FolderPermissions; + break; + case "File": + specialPermissions = UtilConstants.FilePermissions; + break; + case "Registry": + specialPermissions = UtilConstants.RegistryPermissions; + break; + case "ServiceInstall": + specialPermissions = UtilConstants.ServicePermissions; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, row.Table.Name, row.Fields[1].Column.Name, row[1])); + return; + } + + int permissionBits = (int)row[4]; + for (int i = 0; i < 32; i++) + { + if (0 != ((permissionBits >> i) & 1)) + { + string name = null; + + if (16 > i && specialPermissions.Length > i) + { + name = specialPermissions[i]; + } + else if (28 > i && UtilConstants.StandardPermissions.Length > (i - 16)) + { + name = UtilConstants.StandardPermissions[i - 16]; + } + else if (0 <= (i - 28) && UtilConstants.GenericPermissions.Length > (i - 28)) + { + name = UtilConstants.GenericPermissions[i - 28]; + } + + if (null == name) + { + this.Core.OnMessage(WixWarnings.UnknownPermission(row.SourceLineNumbers, row.Table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), i)); + } + else + { + switch (name) + { + case "Append": + permissionEx.Append = Util.YesNoType.yes; + break; + case "ChangePermission": + permissionEx.ChangePermission = Util.YesNoType.yes; + break; + case "CreateChild": + permissionEx.CreateChild = Util.YesNoType.yes; + break; + case "CreateFile": + permissionEx.CreateFile = Util.YesNoType.yes; + break; + case "CreateLink": + permissionEx.CreateLink = Util.YesNoType.yes; + break; + case "CreateSubkeys": + permissionEx.CreateSubkeys = Util.YesNoType.yes; + break; + case "Delete": + permissionEx.Delete = Util.YesNoType.yes; + break; + case "DeleteChild": + permissionEx.DeleteChild = Util.YesNoType.yes; + break; + case "EnumerateSubkeys": + permissionEx.EnumerateSubkeys = Util.YesNoType.yes; + break; + case "Execute": + permissionEx.Execute = Util.YesNoType.yes; + break; + case "GenericAll": + permissionEx.GenericAll = Util.YesNoType.yes; + break; + case "GenericExecute": + permissionEx.GenericExecute = Util.YesNoType.yes; + break; + case "GenericRead": + permissionEx.GenericRead = Util.YesNoType.yes; + break; + case "GenericWrite": + permissionEx.GenericWrite = Util.YesNoType.yes; + break; + case "Notify": + permissionEx.Notify = Util.YesNoType.yes; + break; + case "Read": + permissionEx.Read = Util.YesNoType.yes; + break; + case "ReadAttributes": + permissionEx.ReadAttributes = Util.YesNoType.yes; + break; + case "ReadExtendedAttributes": + permissionEx.ReadExtendedAttributes = Util.YesNoType.yes; + break; + case "ReadPermission": + permissionEx.ReadPermission = Util.YesNoType.yes; + break; + case "ServiceChangeConfig": + permissionEx.ServiceChangeConfig = Util.YesNoType.yes; + break; + case "ServiceEnumerateDependents": + permissionEx.ServiceEnumerateDependents = Util.YesNoType.yes; + break; + case "ServiceInterrogate": + permissionEx.ServiceInterrogate = Util.YesNoType.yes; + break; + case "ServicePauseContinue": + permissionEx.ServicePauseContinue = Util.YesNoType.yes; + break; + case "ServiceQueryConfig": + permissionEx.ServiceQueryConfig = Util.YesNoType.yes; + break; + case "ServiceQueryStatus": + permissionEx.ServiceQueryStatus = Util.YesNoType.yes; + break; + case "ServiceStart": + permissionEx.ServiceStart = Util.YesNoType.yes; + break; + case "ServiceStop": + permissionEx.ServiceStop = Util.YesNoType.yes; + break; + case "ServiceUserDefinedControl": + permissionEx.ServiceUserDefinedControl = Util.YesNoType.yes; + break; + case "Synchronize": + permissionEx.Synchronize = Util.YesNoType.yes; + break; + case "TakeOwnership": + permissionEx.TakeOwnership = Util.YesNoType.yes; + break; + case "Traverse": + permissionEx.Traverse = Util.YesNoType.yes; + break; + case "Write": + permissionEx.Write = Util.YesNoType.yes; + break; + case "WriteAttributes": + permissionEx.WriteAttributes = Util.YesNoType.yes; + break; + case "WriteExtendedAttributes": + permissionEx.WriteExtendedAttributes = Util.YesNoType.yes; + break; + default: + throw new InvalidOperationException(String.Format("Unknown permission attribute '{0}'.", name)); + } + } + } + } + + if (null != row[2]) + { + permissionEx.Domain = (string)row[2]; + } + + permissionEx.User = (string)row[3]; + + this.Core.IndexElement(row, permissionEx); + } + } + + /// + /// Decompile the ServiceConfig table. + /// + /// The table to decompile. + private void DecompileServiceConfigTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.ServiceConfig serviceConfig = new Util.ServiceConfig(); + + serviceConfig.ServiceName = (string)row[0]; + + switch ((string)row[3]) + { + case "none": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.none; + break; + case "reboot": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.reboot; + break; + case "restart": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.restart; + break; + case "runCommand": + serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.runCommand; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[3].Column.Name, row[3])); + break; + } + + switch ((string)row[4]) + { + case "none": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.none; + break; + case "reboot": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.reboot; + break; + case "restart": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.restart; + break; + case "runCommand": + serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.runCommand; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[4].Column.Name, row[4])); + break; + } + + switch ((string)row[5]) + { + case "none": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.none; + break; + case "reboot": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.reboot; + break; + case "restart": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.restart; + break; + case "runCommand": + serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.runCommand; + break; + default: + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[5].Column.Name, row[5])); + break; + } + + if (null != row[6]) + { + serviceConfig.ResetPeriodInDays = (int)row[6]; + } + + if (null != row[7]) + { + serviceConfig.RestartServiceDelayInSeconds = (int)row[7]; + } + + if (null != row[8]) + { + serviceConfig.ProgramCommandLine = (string)row[8]; + } + + if (null != row[9]) + { + serviceConfig.RebootMessage = (string)row[9]; + } + + this.Core.IndexElement(row, serviceConfig); + } + } + + /// + /// Decompile the User table. + /// + /// The table to decompile. + private void DecompileUserTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.User user = new Util.User(); + + user.Id = (string)row[0]; + + user.Name = (string)row[2]; + + if (null != row[3]) + { + user.Domain = (string)row[3]; + } + + if (null != row[4]) + { + user.Password = (string)row[4]; + } + + if (null != row[5]) + { + int attributes = (int)row[5]; + + if (UtilCompiler.UserDontExpirePasswrd == (attributes & UtilCompiler.UserDontExpirePasswrd)) + { + user.PasswordNeverExpires = Util.YesNoType.yes; + } + + if (UtilCompiler.UserPasswdCantChange == (attributes & UtilCompiler.UserPasswdCantChange)) + { + user.CanNotChangePassword = Util.YesNoType.yes; + } + + if (UtilCompiler.UserPasswdChangeReqdOnLogin == (attributes & UtilCompiler.UserPasswdChangeReqdOnLogin)) + { + user.PasswordExpired = Util.YesNoType.yes; + } + + if (UtilCompiler.UserDisableAccount == (attributes & UtilCompiler.UserDisableAccount)) + { + user.Disabled = Util.YesNoType.yes; + } + + if (UtilCompiler.UserFailIfExists == (attributes & UtilCompiler.UserFailIfExists)) + { + user.FailIfExists = Util.YesNoType.yes; + } + + if (UtilCompiler.UserUpdateIfExists == (attributes & UtilCompiler.UserUpdateIfExists)) + { + user.UpdateIfExists = Util.YesNoType.yes; + } + + if (UtilCompiler.UserLogonAsService == (attributes & UtilCompiler.UserLogonAsService)) + { + user.LogonAsService = Util.YesNoType.yes; + } + + if (UtilCompiler.UserDontRemoveOnUninstall == (attributes & UtilCompiler.UserDontRemoveOnUninstall)) + { + user.RemoveOnUninstall = Util.YesNoType.no; + } + + if (UtilCompiler.UserDontCreateUser == (attributes & UtilCompiler.UserDontCreateUser)) + { + user.CreateUser = Util.YesNoType.no; + } + + if (UtilCompiler.UserNonVital == (attributes & UtilCompiler.UserNonVital)) + { + user.Vital = Util.YesNoType.no; + } + } + + if (null != row[1]) + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); + + if (null != component) + { + component.AddChild(user); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); + } + } + else + { + this.Core.RootElement.AddChild(user); + } + this.Core.IndexElement(row, user); + } + } + + /// + /// Decompile the UserGroup table. + /// + /// The table to decompile. + private void DecompileUserGroupTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.User user = (Util.User)this.Core.GetIndexedElement("User", (string)row[0]); + + if (null != user) + { + Util.GroupRef groupRef = new Util.GroupRef(); + + groupRef.Id = (string)row[1]; + + user.AddChild(groupRef); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Group_", (string)row[0], "Group")); + } + } + } + + /// + /// Decompile the XmlConfig table. + /// + /// The table to decompile. + private void DecompileXmlConfigTable(Table table) + { + foreach (Row row in table.Rows) + { + Util.XmlConfig xmlConfig = new Util.XmlConfig(); + + xmlConfig.Id = (string)row[0]; + + xmlConfig.File = (string)row[1]; + + xmlConfig.ElementPath = (string)row[2]; + + if (null != row[3]) + { + xmlConfig.VerifyPath = (string)row[3]; + } + + if (null != row[4]) + { + xmlConfig.Name = (string)row[4]; + } + + if (null != row[5]) + { + xmlConfig.Value = (string)row[5]; + } + + int flags = (int)row[6]; + + if (0x1 == (flags & 0x1)) + { + xmlConfig.Node = Util.XmlConfig.NodeType.element; + } + else if (0x2 == (flags & 0x2)) + { + xmlConfig.Node = Util.XmlConfig.NodeType.value; + } + else if (0x4 == (flags & 0x4)) + { + xmlConfig.Node = Util.XmlConfig.NodeType.document; + } + + if (0x10 == (flags & 0x10)) + { + xmlConfig.Action = Util.XmlConfig.ActionType.create; + } + else if (0x20 == (flags & 0x20)) + { + xmlConfig.Action = Util.XmlConfig.ActionType.delete; + } + + if (0x100 == (flags & 0x100)) + { + xmlConfig.On = Util.XmlConfig.OnType.install; + } + else if (0x200 == (flags & 0x200)) + { + xmlConfig.On = Util.XmlConfig.OnType.uninstall; + } + + if (0x00001000 == (flags & 0x00001000)) + { + xmlConfig.PreserveModifiedDate = Util.YesNoType.yes; + } + + if (null != row[8]) + { + xmlConfig.Sequence = (int)row[8]; + } + + this.Core.IndexElement(row, xmlConfig); + } + } + + /// + /// Finalize the Perfmon table. + /// + /// The collection of all tables. + /// + /// Since the PerfCounter element nests under a File element, but + /// the Perfmon table does not have a foreign key relationship with + /// the File table (instead it has a formatted string that usually + /// refers to a file row - but doesn't have to), the nesting must + /// be inferred during finalization. + /// + private void FinalizePerfmonTable(TableIndexedCollection tables) + { + Table perfmonTable = tables["Perfmon"]; + + if (null != perfmonTable) + { + foreach (Row row in perfmonTable.Rows) + { + string formattedFile = (string)row[1]; + Util.PerfCounter perfCounter = (Util.PerfCounter)this.Core.GetIndexedElement(row); + + // try to "de-format" the File column's value to determine the proper parent File element + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + + Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); + if (null != file) + { + file.AddChild(perfCounter); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, perfmonTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File", formattedFile, "File")); + } + } + else + { + this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "Perfmon")); + } + } + } + } + + /// + /// Finalize the PerfmonManifest table. + /// + /// The collection of all tables. + private void FinalizePerfmonManifestTable(TableIndexedCollection tables) + { + Table perfmonManifestTable = tables["PerfmonManifest"]; + + if (null != perfmonManifestTable) + { + foreach (Row row in perfmonManifestTable.Rows) + { + string formattedFile = (string)row[1]; + Util.PerfCounterManifest perfCounterManifest = (Util.PerfCounterManifest)this.Core.GetIndexedElement(row); + + // try to "de-format" the File column's value to determine the proper parent File element + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + + Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); + if (null != file) + { + file.AddChild(perfCounterManifest); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, perfCounterManifest.ResourceFileDirectory, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File", formattedFile, "File")); + } + } + else + { + this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "PerfmonManifest")); + } + } + } + } + + /// + /// Finalize the SecureObjects table. + /// + /// The collection of all tables. + /// + /// Nests the PermissionEx elements below their parent elements. There are no declared foreign + /// keys for the parents of the SecureObjects table. + /// + private void FinalizeSecureObjectsTable(TableIndexedCollection tables) + { + Table createFolderTable = tables["CreateFolder"]; + Table secureObjectsTable = tables["SecureObjects"]; + + Hashtable createFolders = new Hashtable(); + + // index the CreateFolder table because the foreign key to this table from the + // LockPermissions table is only part of the primary key of this table + if (null != createFolderTable) + { + foreach (Row row in createFolderTable.Rows) + { + Wix.CreateFolder createFolder = (Wix.CreateFolder)this.Core.GetIndexedElement(row); + string directoryId = (string)row[0]; + + if (!createFolders.Contains(directoryId)) + { + createFolders.Add(directoryId, new ArrayList()); + } + ((ArrayList)createFolders[directoryId]).Add(createFolder); + } + } + + if (null != secureObjectsTable) + { + foreach (Row row in secureObjectsTable.Rows) + { + string id = (string)row[0]; + string table = (string)row[1]; + + Util.PermissionEx permissionEx = (Util.PermissionEx)this.Core.GetIndexedElement(row); + + if ("CreateFolder" == table) + { + ArrayList createFolderElements = (ArrayList)createFolders[id]; + + if (null != createFolderElements) + { + foreach (Wix.CreateFolder createFolder in createFolderElements) + { + createFolder.AddChild(permissionEx); + } + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, "SecureObjects", row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "LockObject", id, table)); + } + } + else + { + Wix.IParentElement parentElement = (Wix.IParentElement)this.Core.GetIndexedElement(table, id); + + if (null != parentElement) + { + parentElement.AddChild(permissionEx); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, "SecureObjects", row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "LockObject", id, table)); + } + } + } + } + } + + /// + /// Finalize the ServiceConfig table. + /// + /// The collection of all tables. + /// + /// Since there is no foreign key from the ServiceName column to the + /// ServiceInstall table, this relationship must be handled late. + /// + private void FinalizeServiceConfigTable(TableIndexedCollection tables) + { + Table serviceConfigTable = tables["ServiceConfig"]; + Table serviceInstallTable = tables["ServiceInstall"]; + + Hashtable serviceInstalls = new Hashtable(); + + // index the ServiceInstall table because the foreign key used by the ServiceConfig + // table is actually the ServiceInstall.Name, not the ServiceInstall.ServiceInstall + // this is unfortunate because the service Name is not guaranteed to be unique, so + // decompiler must assume there could be multiple matches and add the ServiceConfig to each + // TODO: the Component column information should be taken into acount to accurately identify + // the correct column to use + if (null != serviceInstallTable) + { + foreach (Row row in serviceInstallTable.Rows) + { + string name = (string)row[1]; + Wix.ServiceInstall serviceInstall = (Wix.ServiceInstall)this.Core.GetIndexedElement(row); + + if (!serviceInstalls.Contains(name)) + { + serviceInstalls.Add(name, new ArrayList()); + } + + ((ArrayList)serviceInstalls[name]).Add(serviceInstall); + } + } + + if (null != serviceConfigTable) + { + foreach (Row row in serviceConfigTable.Rows) + { + Util.ServiceConfig serviceConfig = (Util.ServiceConfig)this.Core.GetIndexedElement(row); + + if (0 == (int)row[2]) + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); + + if (null != component) + { + component.AddChild(serviceConfig); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, serviceConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); + } + } + else + { + ArrayList serviceInstallElements = (ArrayList)serviceInstalls[row[0]]; + + if (null != serviceInstallElements) + { + foreach (Wix.ServiceInstall serviceInstall in serviceInstallElements) + { + serviceInstall.AddChild(serviceConfig); + } + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, serviceConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ServiceName", (string)row[0], "ServiceInstall")); + } + } + } + } + } + + /// + /// Finalize the XmlConfig table. + /// + /// Collection of all tables. + private void FinalizeXmlConfigTable(TableIndexedCollection tables) + { + Table xmlConfigTable = tables["XmlConfig"]; + + if (null != xmlConfigTable) + { + foreach (Row row in xmlConfigTable.Rows) + { + Util.XmlConfig xmlConfig = (Util.XmlConfig)this.Core.GetIndexedElement(row); + + if (null == row[6] || 0 == (int)row[6]) + { + Util.XmlConfig parentXmlConfig = (Util.XmlConfig)this.Core.GetIndexedElement("XmlConfig", (string)row[2]); + + if (null != parentXmlConfig) + { + parentXmlConfig.AddChild(xmlConfig); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ElementPath", (string)row[2], "XmlConfig")); + } + } + else + { + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[7]); + + if (null != component) + { + component.AddChild(xmlConfig); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[7], "Component")); + } + } + } + } + } + + + /// + /// Finalize the XmlFile table. + /// + /// The collection of all tables. + /// + /// Some of the XmlFile table rows are compiler generated from util:EventManifest node + /// These rows should not be appended to component. + /// + private void FinalizeXmlFileTable(TableIndexedCollection tables) + { + Table xmlFileTable = tables["XmlFile"]; + Table eventManifestTable = tables["EventManifest"]; + + if (null != xmlFileTable) + { + foreach (Row row in xmlFileTable.Rows) + { + bool bManifestGenerated = false; + string xmlFileConfigId = (string)row[0]; + if (null != eventManifestTable) + { + foreach (Row emrow in eventManifestTable.Rows) + { + string formattedFile = (string)emrow[1]; + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + if (String.Equals(String.Concat("Config_", fileId, "ResourceFile"), xmlFileConfigId)) + { + Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(emrow); + if (null != eventManifest) + { + eventManifest.ResourceFile = (string)row[4]; + } + bManifestGenerated = true; + } + + else if (String.Equals(String.Concat("Config_", fileId, "MessageFile"), xmlFileConfigId)) + { + Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(emrow); + if (null != eventManifest) + { + eventManifest.MessageFile = (string)row[4]; + } + bManifestGenerated = true; + } + } + } + } + + if (true == bManifestGenerated) + continue; + + Util.XmlFile xmlFile = new Util.XmlFile(); + + xmlFile.Id = (string)row[0]; + xmlFile.File = (string)row[1]; + xmlFile.ElementPath = (string)row[2]; + + if (null != row[3]) + { + xmlFile.Name = (string)row[3]; + } + + if (null != row[4]) + { + xmlFile.Value = (string)row[4]; + } + + int flags = (int)row[5]; + if (0x1 == (flags & 0x1) && 0x2 == (flags & 0x2)) + { + this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, xmlFileTable.Name, row.Fields[5].Column.Name, row[5])); + } + else if (0x1 == (flags & 0x1)) + { + xmlFile.Action = Util.XmlFile.ActionType.createElement; + } + else if (0x2 == (flags & 0x2)) + { + xmlFile.Action = Util.XmlFile.ActionType.deleteValue; + } + else + { + xmlFile.Action = Util.XmlFile.ActionType.setValue; + } + + if (0x100 == (flags & 0x100)) + { + xmlFile.SelectionLanguage = Util.XmlFile.SelectionLanguageType.XPath; + } + + if (0x00001000 == (flags & 0x00001000)) + { + xmlFile.PreserveModifiedDate = Util.YesNoType.yes; + } + + if (0x00010000 == (flags & 0x00010000)) + { + xmlFile.Permanent = Util.YesNoType.yes; + } + + if (null != row[7]) + { + xmlFile.Sequence = (int)row[7]; + } + + Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[6]); + + if (null != component) + { + component.AddChild(xmlFile); + } + else + { + this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlFileTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[6], "Component")); + } + } + } + } + + /// + /// Finalize the eventManifest table. + /// This function must be called after FinalizeXmlFileTable + /// + /// The collection of all tables. + private void FinalizeEventManifestTable(TableIndexedCollection tables) + { + Table eventManifestTable = tables["EventManifest"]; + + if (null != eventManifestTable) + { + foreach (Row row in eventManifestTable.Rows) + { + string formattedFile = (string)row[1]; + Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(row); + + // try to "de-format" the File column's value to determine the proper parent File element + if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) + && formattedFile.EndsWith("]", StringComparison.Ordinal)) + { + string fileId = formattedFile.Substring(2, formattedFile.Length - 3); + + Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); + if (null != file) + { + file.AddChild(eventManifest); + } + } + else + { + this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "EventManifest")); + } + } + } + } + } +#endif +} diff --git a/src/ext/Util/wixext/UtilErrors.cs b/src/ext/Util/wixext/UtilErrors.cs new file mode 100644 index 00000000..b9ce1688 --- /dev/null +++ b/src/ext/Util/wixext/UtilErrors.cs @@ -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. + +namespace WixToolset.Util +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class UtilErrors + { + public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) + { + return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); + } + + public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName) + { + return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName); + } + + public static Message IllegalFileValueInPerfmonOrManifest(string file, string table) + { + return Message(null, Ids.IllegalFileValueInPerfmonOrManifest, "The value '{0}' in the File column, {1} table is invalid. It should be in the form of '[#file]' or '[!file]'.", file, table); + } + + public static Message InvalidRegistryObject(SourceLineNumber sourceLineNumbers, string registryElementName) + { + return Message(sourceLineNumbers, Ids.InvalidRegistryObject, "The {0} element has no id and cannot have its permissions set. If you want to set permissions on a 'placeholder' registry key, force its creation by setting the ForceCreateOnInstall attribute to yes.", registryElementName); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + IllegalAttributeWithoutComponent = 5050, + IllegalElementWithoutComponent = 5051, + IllegalFileValueInPerfmonOrManifest = 5054, + InvalidRegistryObject = 5063, + } + } +} diff --git a/src/ext/Util/wixext/UtilExtensionData.cs b/src/ext/Util/wixext/UtilExtensionData.cs new file mode 100644 index 00000000..d3ca3358 --- /dev/null +++ b/src/ext/Util/wixext/UtilExtensionData.cs @@ -0,0 +1,23 @@ +// 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.Util +{ + using WixToolset.Data; + using WixToolset.Extensibility; + + public sealed class UtilExtensionData : BaseExtensionData + { + public override string DefaultCulture => "en-US"; + + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) + { + symbolDefinition = UtilSymbolDefinitions.ByName(name); + return symbolDefinition != null; + } + + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) + { + return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", symbolDefinitions); + } + } +} diff --git a/src/ext/Util/wixext/UtilExtensionFactory.cs b/src/ext/Util/wixext/UtilExtensionFactory.cs new file mode 100644 index 00000000..08352813 --- /dev/null +++ b/src/ext/Util/wixext/UtilExtensionFactory.cs @@ -0,0 +1,18 @@ +// 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.Util +{ + using System; + using System.Collections.Generic; + using WixToolset.Extensibility; + + public class UtilExtensionFactory : BaseExtensionFactory + { + protected override IReadOnlyCollection ExtensionTypes => new[] + { + typeof(UtilCompiler), + typeof(UtilExtensionData), + typeof(UtilWindowsInstallerBackendBinderExtension), + }; + } +} diff --git a/src/ext/Util/wixext/UtilTableDefinitions.cs b/src/ext/Util/wixext/UtilTableDefinitions.cs new file mode 100644 index 00000000..12f423cc --- /dev/null +++ b/src/ext/Util/wixext/UtilTableDefinitions.cs @@ -0,0 +1,319 @@ +// 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.Util +{ + using WixToolset.Data.WindowsInstaller; + + public static class UtilTableDefinitions + { + public static readonly TableDefinition Wix4CloseApplication = new TableDefinition( + "Wix4CloseApplication", + UtilSymbolDefinitions.WixCloseApplication, + new[] + { + new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Name of executable to ensure is closed.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Description", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Description string displayed to user when executable is in use.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true), + new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the closing.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), + new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Sequence to order the closings by."), + new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Optional property that is set to the number of running instances of the app.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true), + new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."), + new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition( + "Wix4RemoveFolderEx", + UtilSymbolDefinitions.WixRemoveFolderEx, + new[] + { + new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), + new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the removing of folders.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4RemoveRegistryKeyEx = new TableDefinition( + "Wix4RemoveRegistryKeyEx", + UtilSymbolDefinitions.WixRemoveRegistryKeyEx, + new[] + { + new ColumnDefinition("Wix4RemoveRegistryKeyEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4RemoveRegistryKeyEx row in the package.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Root", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: -1, maxValue: 3, description: "The predefined root key for the registry value, one of rrkEnum."), + new ColumnDefinition("Key", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.RegPath, description: "The key for the registry value.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), + new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression to control whether the registry key is removed.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4RestartResource = new TableDefinition( + "Wix4RestartResource", + UtilSymbolDefinitions.WixRestartResource, + new[] + { + new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4FileShare = new TableDefinition( + "Wix4FileShare", + UtilSymbolDefinitions.FileShare, + new[] + { + new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("ShareName", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The actual share name used"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"), + new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition( + "Wix4FileSharePermissions", + UtilSymbolDefinitions.FileSharePermissions, + new[] + { + new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4Group = new TableDefinition( + "Wix4Group", + UtilSymbolDefinitions.Group, + new[] + { + new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition( + "Wix4InternetShortcut", + UtilSymbolDefinitions.WixInternetShortcut, + new[] + { + new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the shortcut is created in", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name used for shortcut.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "URL target."), + new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attribute flags that control how the shortcut is created."), + new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Icon file for shortcut", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition( + "Wix4PerformanceCategory", + UtilSymbolDefinitions.PerformanceCategory, + new[] + { + new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 80, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name of the performance counter category."), + new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."), + new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4Perfmon = new TableDefinition( + "Wix4Perfmon", + UtilSymbolDefinitions.Perfmon, + new[] + { + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition( + "Wix4PerfmonManifest", + UtilSymbolDefinitions.PerfmonManifest, + new[] + { + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4EventManifest = new TableDefinition( + "Wix4EventManifest", + UtilSymbolDefinitions.EventManifest, + new[] + { + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4SecureObject = new TableDefinition( + "Wix4SecureObject", + UtilSymbolDefinitions.SecureObjects, + new[] + { + new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Table SecureObject should be securing"), + new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.Text, description: "Domain half of user account to secure", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("User", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "User name half of user account to secure", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), + new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition( + "Wix4ServiceConfig", + UtilSymbolDefinitions.ServiceConfig, + new[] + { + new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state ", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("NewService", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Whether the affected service is being installed or already exists."), + new ColumnDefinition("FirstFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "First failure action type for configured service to take."), + new ColumnDefinition("SecondFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Second failure action type for configured service to take."), + new ColumnDefinition("ThirdFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Third failure action type for configured service to take."), + new ColumnDefinition("ResetPeriodInDays", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, description: "Period after which to reset the failure count for the service."), + new ColumnDefinition("RestartServiceDelayInSeconds", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, description: "Period after which to restart the service after a given failure."), + new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."), + new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4TouchFile = new TableDefinition( + "Wix4TouchFile", + UtilSymbolDefinitions.WixTouchFile, + new[] + { + new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4User = new TableDefinition( + "Wix4User", + UtilSymbolDefinitions.User, + new[] + { + new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "User name", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User domain", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4UserGroup = new TableDefinition( + "Wix4UserGroup", + UtilSymbolDefinitions.UserGroup, + new[] + { + new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition Wix4XmlFile = new TableDefinition( + "Wix4XmlFile", + UtilSymbolDefinitions.XmlFile, + new[] + { + new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file element to modify.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 70143, description: "Flags"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4XmlConfig = new TableDefinition( + "Wix4XmlConfig", + UtilSymbolDefinitions.XmlConfig, + new[] + { + new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("ElementId", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Wix4XmlConfig", keyColumn: 1, description: "A foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to. Must be null if ElementId is provided", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("VerifyPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query run from ElementPath to verify whether a repair is necessary. Also used to uninstall.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 65536, description: "Element=1,Value=2,Document=4,Create=16,Delete=32,Install=256,Uninstall=512"), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), + }, + symbolIdIsPrimaryKey: true + ); + + public static readonly TableDefinition Wix4FormatFile = new TableDefinition( + "Wix4FormatFile", + UtilSymbolDefinitions.WixFormatFiles, + new[] + { + new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column), + }, + symbolIdIsPrimaryKey: false + ); + + public static readonly TableDefinition[] All = new[] + { + Wix4CloseApplication, + Wix4RemoveFolderEx, + Wix4RemoveRegistryKeyEx, + Wix4RestartResource, + Wix4FileShare, + Wix4FileSharePermissions, + Wix4Group, + Wix4InternetShortcut, + Wix4PerformanceCategory, + Wix4Perfmon, + Wix4PerfmonManifest, + Wix4EventManifest, + Wix4SecureObject, + Wix4ServiceConfig, + Wix4TouchFile, + Wix4User, + Wix4UserGroup, + Wix4XmlFile, + Wix4XmlConfig, + Wix4FormatFile, + }; + } +} diff --git a/src/ext/Util/wixext/UtilWarnings.cs b/src/ext/Util/wixext/UtilWarnings.cs new file mode 100644 index 00000000..b65abe45 --- /dev/null +++ b/src/ext/Util/wixext/UtilWarnings.cs @@ -0,0 +1,37 @@ +// 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.Util +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class UtilWarnings + { + public static Message DeprecatedPerfCounterElement(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.DeprecatedPerfCounterElement, "The PerfCounter element has been deprecated. Please use the PerformanceCounter element instead."); + } + + public static Message RequiredAttributeForWindowsXP(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) + { + return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP. You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + DeprecatedPerfCounterElement = 5153, + RequiredAttributeForWindowsXP = 5154, + } + } +} diff --git a/src/ext/Util/wixext/UtilWindowsInstallerBackendExtension.cs b/src/ext/Util/wixext/UtilWindowsInstallerBackendExtension.cs new file mode 100644 index 00000000..bca7c700 --- /dev/null +++ b/src/ext/Util/wixext/UtilWindowsInstallerBackendExtension.cs @@ -0,0 +1,13 @@ +// 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.Util +{ + using System.Collections.Generic; + using WixToolset.Data.WindowsInstaller; + using WixToolset.Extensibility; + + public class UtilWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension + { + public override IReadOnlyCollection TableDefinitions => UtilTableDefinitions.All; + } +} diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj new file mode 100644 index 00000000..10fc569e --- /dev/null +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj @@ -0,0 +1,31 @@ + + + + + + netstandard2.0 + WixToolset.Util + WiX Toolset Utility Extension + WiX Toolset Util Extension + embedded + true + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec new file mode 100644 index 00000000..ba3eaade --- /dev/null +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec @@ -0,0 +1,25 @@ + + + + $id$ + $version$ + $title$ + $description$ + $authors$ + MS-RL + false + $copyright$ + $projectUrl$ + + + + + + + + + + + + + diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.targets b/src/ext/Util/wixext/WixToolset.Util.wixext.targets new file mode 100644 index 00000000..64dff429 --- /dev/null +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.targets @@ -0,0 +1,11 @@ + + + + + + $(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll + + + + + diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.v3.ncrunchproject b/src/ext/Util/wixext/WixToolset.Util.wixext.v3.ncrunchproject new file mode 100644 index 00000000..d75e7ab3 --- /dev/null +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.v3.ncrunchproject @@ -0,0 +1,7 @@ + + + + ..\..\build\Debug\util.wixlib + + + \ No newline at end of file diff --git a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi new file mode 100644 index 00000000..379c8f57 --- /dev/null +++ b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs b/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs new file mode 100644 index 00000000..b17be031 --- /dev/null +++ b/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs b/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs new file mode 100644 index 00000000..96c85a5b --- /dev/null +++ b/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs b/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs new file mode 100644 index 00000000..3b458687 --- /dev/null +++ b/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Util/wixlib/UtilExtension.wxs b/src/ext/Util/wixlib/UtilExtension.wxs new file mode 100644 index 00000000..0f445ab4 --- /dev/null +++ b/src/ext/Util/wixlib/UtilExtension.wxs @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi new file mode 100644 index 00000000..913c01b9 --- /dev/null +++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi @@ -0,0 +1,360 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/wixlib/UtilExtension_arm64.wxs b/src/ext/Util/wixlib/UtilExtension_arm64.wxs new file mode 100644 index 00000000..b9dc73b8 --- /dev/null +++ b/src/ext/Util/wixlib/UtilExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Util/wixlib/UtilExtension_x64.wxs b/src/ext/Util/wixlib/UtilExtension_x64.wxs new file mode 100644 index 00000000..40cdf306 --- /dev/null +++ b/src/ext/Util/wixlib/UtilExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Util/wixlib/UtilExtension_x86.wxs b/src/ext/Util/wixlib/UtilExtension_x86.wxs new file mode 100644 index 00000000..bd0fa562 --- /dev/null +++ b/src/ext/Util/wixlib/UtilExtension_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Util/wixlib/caDecor.wxi b/src/ext/Util/wixlib/caDecor.wxi new file mode 100644 index 00000000..b1711518 --- /dev/null +++ b/src/ext/Util/wixlib/caDecor.wxi @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Util/wixlib/caerr.wxi b/src/ext/Util/wixlib/caerr.wxi new file mode 100644 index 00000000..ff7ec121 --- /dev/null +++ b/src/ext/Util/wixlib/caerr.wxi @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Util/wixlib/de-de.wxl b/src/ext/Util/wixlib/de-de.wxl new file mode 100644 index 00000000..65785a3b --- /dev/null +++ b/src/ext/Util/wixlib/de-de.wxl @@ -0,0 +1,32 @@ + + + + + Konnte den Benutzer nicht anlegen. ([2] [3] [4] [5]) + Konnte den Benutzer auf Grund eines falschen Passwortes nicht anlegen. ([2] [3] [4] [5]) + Konnte Benutzer nicht zur Gruppe hinzufügen. ([2] [3] [4] [5]) + Konnte den Benutzer nicht anlegen, da er bereits existierte. ([2] [3] [4] [5]) + + Konnte Netzwerkfreigabe nicht anlegen. ([2] [3] [4] [5]) + Konnte Netzwerkfreigabe nicht entfernen. ([2] [3] [4] [5]) + + Konnte die DLL nicht für PerfMon registrieren. ([2] [3] [4] [5]) + Konnte die DLL nicht für PerfMon deregistrieren. ([2] [3] [4] [5]) + + Konnte die Daten der Leistungsüberwachung (performance counters) nicht installieren. ([2] [3] [4] [5]) + Konnte die Daten der Leistungsüberwachung (performance counters) nicht deinstallieren. ([2] [3] [4] [5]) + + Konnte keinen Security Descriptor für [3]\[4] erstellen, System Fehler: [2] + Konnte keinen Security Descriptor für das Objekt [3] erstellen, System Fehler: [2] + Unbekannter Objekt Typ [3], System Fehler: [2] + + Beim Lesen der XML Dateien trat ein Fehler auf. + Konnte XML Datei [3] nicht öffnen, System Fehler: [2] + Konnte Knoten [3] in der XML Datei [4] nicht finden, System Fehler: [2] + Beim Speichern der Änderungen an der XML Datei [3] trat ein Fehler auf, System Fehler: [2] + + Bei der Konfiguration der XML Dateien trat ein Fehler auf. + Konnte XML Datei [3] nicht öffnen, System Fehler: [2] + Konnte Knoten [3] in der XML Datei [4] nicht finden, System Fehler: [2] + Beim Speichern der Änderungen an der XML Datei [3] trat ein Fehler auf, System Fehler: [2] + diff --git a/src/ext/Util/wixlib/en-us.wxl b/src/ext/Util/wixlib/en-us.wxl new file mode 100644 index 00000000..e8b146a4 --- /dev/null +++ b/src/ext/Util/wixlib/en-us.wxl @@ -0,0 +1,32 @@ + + + + + Failed to create user. ([2] [3] [4] [5]) + Failed to create user due to invalid password. ([2] [3] [4] [5]) + Failed to add user to group. ([2] [3] [4] [5]) + Failed to create user because it already exists. ([2] [3] [4] [5]) + + Failed to create network share. ([2] [3] [4] [5]) + Failed to drop network share. ([2] [3] [4] [5]) + + Failed to register DLL with PerfMon. ([2] [3] [4] [5]) + Failed to unregister DLL with PerfMon. ([2] [3] [4] [5]) + + Failed to install performance counters. ([2] [3] [4] [5]) + Failed to uninstall performance counters. ([2] [3] [4] [5]) + + Failed to create security descriptor for [3]\[4], system error: [2] + Failed to set security descriptor on object [3], system error: [2] + Unknown Object Type [3], system error: [2] + + There was a failure while configuring XML files. + Failed to open XML file [3], system error: [2] + Failed to find node: [3] in XML file: [4], system error: [2] + Failed to save changes to XML file [3], system error: [2] + + There was a failure while configuring XML files. + Failed to open XML file [3], system error: [2] + Failed to find node: [3] in XML file: [4], system error: [2] + Failed to save changes to XML file [3], system error: [2] + diff --git a/src/ext/Util/wixlib/es-es.wxl b/src/ext/Util/wixlib/es-es.wxl new file mode 100644 index 00000000..ca5ab8bb --- /dev/null +++ b/src/ext/Util/wixlib/es-es.wxl @@ -0,0 +1,31 @@ + + + + La creación del usuario ha fracasado. ([2] [3] [4] [5]) + La creación del usuario ha fracasado porque la contraseña es incorrecta. ([2] [3] [4] [5]) + El aditamento del usuario al grupo ha fracasado. ([2] [3] [4] [5]) + La creación del usuario ha fracasado porque ya existe. ([2] [3] [4] [5]) + + La creación de la red compartida ha fracasado. ([2] [3] [4] [5]) + La eliminación de la red compartida ha fracasado. ([2] [3] [4] [5]) + + La inscripción al registro de la DLL con PerfMon ha fracasado. ([2] [3] [4] [5]) + La cancelación de la inscripción al registro de la DLL con PerfMon ha fracasado. ([2] [3] [4] [5]) + + La instalación de los contadores de rendimiento ha fracasado. ([2] [3] [4] [5]) + La desinstalación de los contadores de rendimiento ha fracasado. ([2] [3] [4] [5]) + + La creación de los ACLs ha fracasado por [3]\[4], error del sistema : [2] + El posicionamiento de los ACLs por el objecto [3] ha fracasado, error del sistema: [2] + Tipo de objecto no conocido [3], error del sistema: [2] + + Un problema ha aparecido durante la configuración de los ficheros XML. + Fracaso de la apertura de los ficheros XML [3], error del sistema: [2] + Fracaso de la búsqueda del nodo: [3] en el fichero XML: [4], error del sistema: [2] + Fracaso durante la salvaguardia de las modificaciones en el fichero XML [3], error del sistema: [2] + + Un problema ha aparecido durante la configuración de los ficheros XML. + Fracaso de la apertura de los ficheros XML [3], error del sistema: [2] + Fracaso de la búsqueda del nodo: [3] en el fichero XML: [4], error del sistema: [2] + Fracaso durante la salvaguardia de las modificaciones en el fichero XML [3], error del sistema: [2] + \ No newline at end of file diff --git a/src/ext/Util/wixlib/fr-fr.wxl b/src/ext/Util/wixlib/fr-fr.wxl new file mode 100644 index 00000000..ad34b56a --- /dev/null +++ b/src/ext/Util/wixlib/fr-fr.wxl @@ -0,0 +1,31 @@ + + + + La création de l'utilisateur a échoué. ([2] [3] [4] [5]) + La création de l'utilisateur a échoué car le mot de passe est invalide. ([2] [3] [4] [5]) + L'ajout de l'utilisateur au groupe a échoué. ([2] [3] [4] [5]) + La création de l'utilisateur a échoué car il existe dejà. ([2] [3] [4] [5]) + + La création du partage reseau a échoué. ([2] [3] [4] [5]) + La suppression du partage reseau a échoué. ([2] [3] [4] [5]) + + L'inscription au registre de la DLL avec PerfMon a échoué. ([2] [3] [4] [5]) + La desinscription au registre de la DLL avec PerfMon a échoué. ([2] [3] [4] [5]) + + L'installation des compteurs de performance a échoué. ([2] [3] [4] [5]) + La desinstallation des compteurs de performance a échoué. ([2] [3] [4] [5]) + + La création des ACLs a échoué pour [3]\[4], erreur systeme: [2] + Le positionnement des ACLs pour l'objet [3] a échoué, erreur systeme: [2] + Type d'objet inconnu [3], erreur systeme: [2] + + Un problème est survenu lors de la configuration des fichiers XML. + Echec de l'ouverture des fichiers XML [3], erreur systeme: [2] + Echec de la recherche du noeud: [3] dans le fichier XML: [4], erreur systeme: [2] + Echec lors de la sauvegarde des modifications dans le fichier XML [3], erreur systeme: [2] + + Un problème est survenu lors de la configuration des fichiers XML. + Echec de l'ouverture des fichiers XML [3], erreur systeme: [2] + Echec de la recherche du noeud: [3] dans le fichier XML: [4], erreur systeme: [2] + Echec lors de la sauvegarde des modifications dans le fichier XML [3], erreur systeme: [2] + \ No newline at end of file diff --git a/src/ext/Util/wixlib/it-it.wxl b/src/ext/Util/wixlib/it-it.wxl new file mode 100644 index 00000000..8cea0a14 --- /dev/null +++ b/src/ext/Util/wixlib/it-it.wxl @@ -0,0 +1,32 @@ + + + + + Impossibile creare l'utente. ([2] [3] [4] [5]) + Impossibile creare l'utente perchè la password è errata. ([2] [3] [4] [5]) + Impossibile aggiungere l'utente al gruppo. ([2] [3] [4] [5]) + Impossibile creare l'utente perchè già esistente. ([2] [3] [4] [5]) + + Impossibile creare la risorsa di rete. ([2] [3] [4] [5]) + Impossibile eliminare la risorsa di rete. ([2] [3] [4] [5]) + + Impossibile registrare la DLL con PerfMon. ([2] [3] [4] [5]) + Impossibile rimuovere la registrazione della DLL con PerfMon. ([2] [3] [4] [5]) + + Impossibile installare i contatori delle prestazioni. ([2] [3] [4] [5]) + Impossibile rimuovere i contatori delle prestazioni. ([2] [3] [4] [5]) + + Impossibile creare i descrittori di sicurezza per [3]\[4], errore di sistema: [2] + Impossibile impostare i descrittori di sicurezza sull'oggetto [3], errore di sistema: [2] + Tipo di oggetto sconosciuto [3], errore di sistema: [2] + + Si è verificato un errore durante la configurazione dei file XML. + Impossibile aprire il file XML [3], errore di sistema: [2] + Impossibile trovare il nodo: [3] nel file XML: [4], errore di sistema: [2] + Impossible salvare le modifiche al file XML [3], errore di sistema: [2] + + Si è verificato un errore durante la configurazione dei file XML. + Impossibile aprire il file XML [3], errore di sistema: [2] + Impossibile trovare il nodo: [3] nel file XML: [4], errore di sistema: [2] + Impossibile salvare le modifiche al file XML [3], errore di sitema: [2] + diff --git a/src/ext/Util/wixlib/ja-jp.wxl b/src/ext/Util/wixlib/ja-jp.wxl new file mode 100644 index 00000000..5f5cf40d --- /dev/null +++ b/src/ext/Util/wixlib/ja-jp.wxl @@ -0,0 +1,32 @@ + + + + + ユーザー作成に失敗しました。 ([2] [3] [4] [5]) + パスワードが無効のためユーザー作成に失敗しました。 ([2] [3] [4] [5]) + ユーザーをグループに追加でいませんでした。 ([2] [3] [4] [5]) + ユーザーが既に存在するため作成できませんでした。 ([2] [3] [4] [5]) + + ネットワーク共有の作成に失敗しました。 ([2] [3] [4] [5]) + ネットワーク共有の削除に失敗しました。 ([2] [3] [4] [5]) + + DLL を PerfMon に登録でいませんでした。 ([2] [3] [4] [5]) + DLL を PerfMon より登録解除できませんでした。 ([2] [3] [4] [5]) + + パフォーマンス カウンタをインストールできませんでした。 ([2] [3] [4] [5]) + パフォーマンス カウンタをアンインストールできませんでした。 ([2] [3] [4] [5]) + + [3]\[4] 用セキュリティ ディスクリプターを作成できませんでした、システム エラー： [2] + オブジェクト [3] 上のセキュリティ ディスクリプターを設定できませんでした、システム エラー： [2] + 不明なオブジェクト種別 [3]、システム エラー： [2] + + XML ファイル構成中に失敗しました。 + XML ファイル [3] を開けませんでした、システム エラー： [2] + XML ファイル [4] 内にノード [3] が見つかりませんでした、システム エラー： [2] + XML ファイル [3] へ変更を保存できませんでした、システム エラー： [2] + + XML ファイル構成中に失敗しました。 + XML ファイル [3] を開けませんでした、システム エラー： [2] + XML ファイル [4] 内にノード [3] が見つかりませんでした、システム エラー： [2] + XML ファイル [3] へ変更を保存できませんでした、システム エラー： [2] + diff --git a/src/ext/Util/wixlib/pt-br.wxl b/src/ext/Util/wixlib/pt-br.wxl new file mode 100644 index 00000000..3ca27dda --- /dev/null +++ b/src/ext/Util/wixlib/pt-br.wxl @@ -0,0 +1,26 @@ + + + + + Falha ao criar usuário. ([2] [3] [4] [5]) + Falha ao criar usuário devido a senha inválida. ([2] [3] [4] [5]) + Falha ao adicionar o usuário ao grupo. ([2] [3] [4] [5]) + Falha ao criar o usuário, porque ele já existe. ([2] [3] [4] [5]) + Falha ao criar o compartilhamento de rede. ([2] [3] [4] [5]) + Falha ao cair compartilhamento de rede. ([2] [3] [4] [5]) + Falha ao registrar DLL com PerfMon. ([2] [3] [4] [5]) + Falha ao cancelar o registro de DLL com PerfMon. ([2] [3] [4] [5]) + Falha ao instalar contadores de desempenho. ([2] [3] [4] [5]) + Falha ao desinstalar contadores de desempenho. ([2] [3] [4] [5]) + Falha ao criar o descritor de segurança [3] \ [4], erro do sistema: [2] + Falha ao definir o descritor de segurança sobre o objeto [3], erro do sistema: [2] + Objeto Desconhecido Tipo [3], erro do sistema: [2] + Houve uma falha ao configurar arquivos XML. + Falha ao abrir o arquivo XML [3], erro do sistema: [2] + Falha ao localizar nó: [3] no arquivo XML: [4], erro do sistema: [2] + Falha ao salvar as alterações para o arquivo XML [3], erro do sistema: [2] + Houve uma falha ao configurar arquivos XML. + Falha ao abrir o arquivo XML [3], erro do sistema: [2] + Falha ao localizar nó: [3] no arquivo XML: [4], erro do sistema: [2] + Falha ao salvar as alterações para o arquivo XML [3], erro do sistema: [2] + diff --git a/src/ext/Util/wixlib/util.v3.ncrunchproject b/src/ext/Util/wixlib/util.v3.ncrunchproject new file mode 100644 index 00000000..319cd523 --- /dev/null +++ b/src/ext/Util/wixlib/util.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj new file mode 100644 index 00000000..99dede7d --- /dev/null +++ b/src/ext/Util/wixlib/util.wixproj @@ -0,0 +1,27 @@ + + + + + Library + true + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/global.json b/src/ext/global.json new file mode 100644 index 00000000..697f5687 --- /dev/null +++ b/src/ext/global.json @@ -0,0 +1,8 @@ +{ + "msbuild-sdks": { + "WixToolset.Sdk": "4.0.0-build-0213" + }, + "sdk": { + "allowPrerelease": false + } +} diff --git a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe b/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe deleted file mode 100644 index 2a4f423f..00000000 Binary files a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe and /dev/null differ diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl deleted file mode 100644 index f50a5386..00000000 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl +++ /dev/null @@ -1,8 +0,0 @@ - - - - ~TestBundle - - diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs deleted file mode 100644 index 7fef0725..00000000 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll deleted file mode 100644 index 0e461ba8..00000000 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll +++ /dev/null @@ -1 +0,0 @@ -This is Shared.dll. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt deleted file mode 100644 index 8b986220..00000000 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is test.txt \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll deleted file mode 100644 index 970efdf0..00000000 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll +++ /dev/null @@ -1 +0,0 @@ -This is a fakeba.dll \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi deleted file mode 100644 index 0722d60e..00000000 Binary files a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi and /dev/null differ diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs deleted file mode 100644 index 8e054256..00000000 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs deleted file mode 100644 index e27b3c43..00000000 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt b/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs deleted file mode 100644 index daae573a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs deleted file mode 100644 index 2ec8ce82..00000000 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt b/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico deleted file mode 100644 index 53134de7..00000000 Binary files a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico and /dev/null differ diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs deleted file mode 100644 index daae573a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs deleted file mode 100644 index 2a1b4347..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs deleted file mode 100644 index 1355d42e..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs deleted file mode 100644 index 2a1b4347..00000000 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico deleted file mode 100644 index 53134de7..00000000 Binary files a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico and /dev/null differ diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs deleted file mode 100644 index daae573a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs deleted file mode 100644 index 0634d7d4..00000000 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt b/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs deleted file mode 100644 index abf0dbb4..00000000 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs deleted file mode 100644 index e27b3c43..00000000 --- a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt b/src/test/WixToolsetTest.Util/TestData/Queries/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs deleted file mode 100644 index 2c2be584..00000000 --- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs deleted file mode 100644 index 236d9df0..00000000 --- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs deleted file mode 100644 index 32b246f4..00000000 --- a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs deleted file mode 100644 index 0a0c8cb6..00000000 --- a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs deleted file mode 100644 index daae573a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs deleted file mode 100644 index 7cedbb30..00000000 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs deleted file mode 100644 index a2002634..00000000 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs deleted file mode 100644 index 29e8555b..00000000 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml deleted file mode 100644 index bad25217..00000000 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml +++ /dev/null @@ -1 +0,0 @@ -This is my.xml file. diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs deleted file mode 100644 index 883f9794..00000000 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ /dev/null @@ -1,317 +0,0 @@ -// 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 WixToolsetTest.Util -{ - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using WixToolset.Util; - using Xunit; - - public class UtilExtensionFixture - { - [Fact] - public void CanBuildUsingFileShare() - { - var folder = TestData.Get(@"TestData\UsingFileShare"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_X86\t[Binary data]", - "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", - "CustomAction:Wix4ConfigureSmbUninstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbUninstall\t", - "CustomAction:Wix4CreateSmb_X86\t11265\tWix4UtilCA_X86\tCreateSmb\t", - "CustomAction:Wix4CreateSmbRollback_X86\t11585\tWix4UtilCA_X86\tDropSmb\t", - "CustomAction:Wix4DropSmb_X86\t11265\tWix4UtilCA_X86\tDropSmb\t", - "CustomAction:Wix4DropSmbRollback_X86\t11585\tWix4UtilCA_X86\tCreateSmb\t", - "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", - "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildUsingFileShareX64() - { - var folder = TestData.Get(@"TestData\UsingFileShare"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_X64\t[Binary data]", - "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", - "CustomAction:Wix4ConfigureSmbUninstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbUninstall\t", - "CustomAction:Wix4CreateSmb_X64\t11265\tWix4UtilCA_X64\tCreateSmb\t", - "CustomAction:Wix4CreateSmbRollback_X64\t11585\tWix4UtilCA_X64\tDropSmb\t", - "CustomAction:Wix4DropSmb_X64\t11265\tWix4UtilCA_X64\tDropSmb\t", - "CustomAction:Wix4DropSmbRollback_X64\t11585\tWix4UtilCA_X64\tCreateSmb\t", - "Wix4FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER", - "Wix4FileSharePermissions:ExampleFileShare\tEveryone\t1", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildCloseApplication() - { - var folder = TestData.Get(@"TestData\CloseApplication"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_A64\t[Binary data]", - "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", - "CustomAction:Wix4CloseApplications_A64\t1\tWix4UtilCA_A64\tWixCloseApplications\t", - "CustomAction:Wix4CloseApplicationsDeferred_A64\t3073\tWix4UtilCA_A64\tWixCloseApplicationsDeferred\t", - "Wix4CloseApplication:CloseMyApp\texplorer.exe\t\t\t3\t\tMYAPPISRUNNING\t\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildInternetShortcutInProduct() - { - var folder = TestData.Get(@"TestData\InternetShortcut"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_X64\t[Binary data]", - "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", - "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64\tWixRollbackInternetShortcuts\t", - "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64\tWixSchedInternetShortcuts\t", - "RemoveFile:uisdCsU32.1i4Hebrg1N7E194zJQ8Y\tPackage.ico\thoiptxrr.url|WiX Toolset (url).url\tINSTALLFOLDER\t2", - "RemoveFile:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A\tPackage.ico\tjcxd1dwf.lnk|WiX Toolset (link).lnk\tINSTALLFOLDER\t2", - "Wix4InternetShortcut:uisdCsU32.1i4Hebrg1N7E194zJQ8Y\tPackage.ico\tINSTALLFOLDER\tWiX Toolset (url).url\thttps://wixtoolset.org\t1\t[#Package.ico]\t0", - "Wix4InternetShortcut:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A\tPackage.ico\tINSTALLFOLDER\tWiX Toolset (link).lnk\thttps://wixtoolset.org\t0\t[#Package.ico]\t0", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildInternetShortcutInMergeModule() - { - var folder = TestData.Get(@"TestData\InternetShortcutModule"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); - - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", - "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixCreateInternetShortcuts\t", - "CustomAction:Wix4RollbackInternetShortcuts_X64\t3329\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRollbackInternetShortcuts\t", - "CustomAction:Wix4SchedInternetShortcuts_X64\t1\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixSchedInternetShortcuts\t", - "RemoveFile:uisdCsU32.1i4Hebrg1N7E194zJQ8Y.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\thoiptxrr.url|WiX Toolset (url).url\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\t2", - "RemoveFile:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tjcxd1dwf.lnk|WiX Toolset (link).lnk\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\t2", - "Wix4InternetShortcut:uisdCsU32.1i4Hebrg1N7E194zJQ8Y.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\tWiX Toolset (url).url\thttps://wixtoolset.org\t1\t[#Package.ico.047730A5_30FE_4A62_A520_DA9381B8226A]\t0", - "Wix4InternetShortcut:uisjV.q0ROZZYR3h_lkpbkZtLtPH0A.047730A5_30FE_4A62_A520_DA9381B8226A\tPackage.ico.047730A5_30FE_4A62_A520_DA9381B8226A\tINSTALLFOLDER.047730A5_30FE_4A62_A520_DA9381B8226A\tWiX Toolset (link).lnk\thttps://wixtoolset.org\t0\t[#Package.ico.047730A5_30FE_4A62_A520_DA9381B8226A]\t0", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildWithPermissionEx() - { - var folder = TestData.Get(@"TestData\PermissionEx"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); - WixAssert.CompareLineByLine(new[] - { - "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "Wix4SecureObject:regL6DnQ9yJpDJH5OdcVji4YXsdX2c\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildRemoveRegistryKeyExInMergeModule() - { - var folder = TestData.Get(@"TestData", "RemoveRegistryKeyEx"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); - - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveRegistry", "Wix4RemoveRegistryKeyEx"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", - "CustomAction:Wix4RemoveRegistryKeysEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRemoveRegistryKeysEx\t", - "Wix4RemoveRegistryKeyEx:rrxfcDhR4HhE3v3rYiQcNtQjyahQNg.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\t2\tSOFTWARE\\Example\t1\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildRemoveFolderExInMergeModule() - { - var folder = TestData.Get(@"TestData\RemoveFolderEx"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm"); - - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4RemoveFolderEx"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t[Binary data]", - "CustomAction:Wix4RemoveFoldersEx_X64.047730A5_30FE_4A62_A520_DA9381B8226A\t65\tWix4UtilCA_X64.047730A5_30FE_4A62_A520_DA9381B8226A\tWixRemoveFoldersEx\t", - "Wix4RemoveFolderEx:wrf5qCm1SE.zp8djrlk78l1IYFXsEw.047730A5_30FE_4A62_A520_DA9381B8226A\tfilh4juyUVjoUcWWtcQmd5L07FoON4.047730A5_30FE_4A62_A520_DA9381B8226A\tRemoveProp.047730A5_30FE_4A62_A520_DA9381B8226A\t3\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildWithEventManifest() - { - var folder = TestData.Get(@"TestData\EventManifest"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_A64\t[Binary data]", - "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", - "CustomAction:Wix4ConfigureEventManifestUnregister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestUnregister\t", - "CustomAction:Wix4ExecXmlFile_A64\t11265\tWix4UtilCA_A64\tExecXmlFile\t", - "CustomAction:Wix4ExecXmlFileRollback_A64\t11521\tWix4UtilCA_A64\tExecXmlFileRollback\t", - "CustomAction:Wix4RegisterEventManifest_A64\t3073\tWix4UtilCA_A64\tWixQuietExec\t", - "CustomAction:Wix4RollbackRegisterEventManifest_A64\t3393\tWix4UtilCA_A64\tWixQuietExec\t", - "CustomAction:Wix4RollbackUnregisterEventManifest_A64\t3329\tWix4UtilCA_A64\tWixQuietExec\t", - "CustomAction:Wix4SchedXmlFile_A64\t1\tWix4UtilCA_A64\tSchedXmlFile\t", - "CustomAction:Wix4UnregisterEventManifest_A64\t3137\tWix4UtilCA_A64\tWixQuietExec\t", - "Wix4EventManifest:Manifest.dll\t[#Manifest.dll]", - "Wix4XmlFile:Config_Manifest.dllMessageFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@messageFileName[\\]]\tmessageFileName\t[Manifest.dll]\t4100\tManifest.dll\t", - "Wix4XmlFile:Config_Manifest.dllResourceFile\t[#Manifest.dll]\t/*/*/*/*[\\[]@resourceFileName[\\]]\tresourceFileName\t[Manifest.dll]\t4100\tManifest.dll\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildWithQueries() - { - var folder = TestData.Get(@"TestData\Queries"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); - WixAssert.CompareLineByLine(new[] - { - "Binary:Wix4UtilCA_A64\t[Binary data]", - "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", - "CustomAction:Wix4BroadcastSettingChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastSettingChange\t", - "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", - "CustomAction:Wix4QueryOsDriverInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsDriverInfo\t", - "CustomAction:Wix4QueryOsInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsInfo\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildWithXmlConfig() - { - var folder = TestData.Get(@"TestData", "XmlConfig"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildX64, "Wix4XmlConfig"); - WixAssert.CompareLineByLine(new[] - { - "Wix4XmlConfig:DelElement\t[INSTALLFOLDER]my.xml\t\t//root/sub\txxx\t\t\t289\tDel\t1", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildModuleWithXmlConfig() - { - var folder = TestData.Get(@"TestData", "XmlConfigModule"); - var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildX64, "Wix4XmlConfig"); - WixAssert.CompareLineByLine(new[] - { - "Wix4XmlConfig:AddElement.047730A5_30FE_4A62_A520_DA9381B8226A\t[my.xml.047730A5_30FE_4A62_A520_DA9381B8226A]\t\t//root/sub\txxx\t\t\t273\tParent.047730A5_30FE_4A62_A520_DA9381B8226A\t1", - "Wix4XmlConfig:ChildElement.047730A5_30FE_4A62_A520_DA9381B8226A\t[my.xml.047730A5_30FE_4A62_A520_DA9381B8226A]\tAddElement.047730A5_30FE_4A62_A520_DA9381B8226A\t\txxx\t\t\t0\tChild.047730A5_30FE_4A62_A520_DA9381B8226A\t1", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildBundleWithSearches() - { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); - var folder = TestData.Get(@"TestData\BundleWithSearches"); - var rootFolder = TestData.Get(); - var wixext = Path.Combine(rootFolder, "WixToolset.Util.wixext.dll"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var bundlePath = Path.Combine(baseFolder, @"bin\test.exe"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var result = WixRunner.Execute(new[] - { - "build", - Path.Combine(folder, "Bundle.wxs"), - "-ext", wixext, - "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), - "-bindpath", Path.Combine(folder, "data"), - "-intermediateFolder", intermediateFolder, - "-o", bundlePath - }); - - result.AssertSuccess(); - - Assert.True(File.Exists(bundlePath)); -#if TODO - Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); -#endif - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']"); - Assert.Equal(1, bundleExtensionDatas.Count); - Assert.Equal("" + - "" + - "", bundleExtensionDatas[0].GetTestXml()); - - var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); - Assert.Equal(5, utilSearches.Count); - Assert.Equal("", utilSearches[0].GetTestXml()); - Assert.Equal("", utilSearches[1].GetTestXml()); - Assert.Equal("", utilSearches[2].GetTestXml()); - Assert.Equal("", utilSearches[3].GetTestXml()); - Assert.Equal("", utilSearches[4].GetTestXml()); - } - } - - private static void Build(string[] args) - { - var result = WixRunner.Execute(args); - result.AssertSuccess(); - } - - private static void BuildX64(string[] args) - { - var newArgs = args.ToList(); - newArgs.Add("-platform"); - newArgs.Add("x64"); - newArgs.Add("-sw1072"); - - var result = WixRunner.Execute(newArgs.ToArray()); - result.AssertSuccess(); - } - - private static void BuildARM64(string[] args) - { - var newArgs = args.ToList(); - newArgs.Add("-platform"); - newArgs.Add("arm64"); - - var result = WixRunner.Execute(newArgs.ToArray()); - result.AssertSuccess(); - } - } -} diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj deleted file mode 100644 index e77ecbed..00000000 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - netcoreapp3.1 - false - - - - NU1701 - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject deleted file mode 100644 index 7b5b2139..00000000 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file diff --git a/src/version.json b/src/version.json new file mode 100644 index 00000000..5f857771 --- /dev/null +++ b/src/version.json @@ -0,0 +1,11 @@ +{ + "version": "4.0", + "publicReleaseRefSpec": [ + "^refs/heads/master$" + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} diff --git a/src/wix.snk b/src/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/wix.snk and /dev/null differ diff --git a/src/wixext/PerformanceCounterType.cs b/src/wixext/PerformanceCounterType.cs deleted file mode 100644 index 1e06efd3..00000000 --- a/src/wixext/PerformanceCounterType.cs +++ /dev/null @@ -1,192 +0,0 @@ -// Captured from: C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll - -namespace System.Diagnostics -{ - public enum PerformanceCounterType - { - // - // Summary: - // An instantaneous counter that shows the most recently observed value in hexadecimal - // format. Used, for example, to maintain a simple count of items or operations. - NumberOfItemsHEX32 = 0, - // - // Summary: - // An instantaneous counter that shows the most recently observed value. Used, for - // example, to maintain a simple count of a very large number of items or operations. - // It is the same as NumberOfItemsHEX32 except that it uses larger fields to accommodate - // larger values. - NumberOfItemsHEX64 = 256, - // - // Summary: - // An instantaneous counter that shows the most recently observed value. Used, for - // example, to maintain a simple count of items or operations. - NumberOfItems32 = 65536, - // - // Summary: - // An instantaneous counter that shows the most recently observed value. Used, for - // example, to maintain a simple count of a very large number of items or operations. - // It is the same as NumberOfItems32 except that it uses larger fields to accommodate - // larger values. - NumberOfItems64 = 65792, - // - // Summary: - // A difference counter that shows the change in the measured attribute between - // the two most recent sample intervals. - CounterDelta32 = 4195328, - // - // Summary: - // A difference counter that shows the change in the measured attribute between - // the two most recent sample intervals. It is the same as the CounterDelta32 counter - // type except that is uses larger fields to accomodate larger values. - CounterDelta64 = 4195584, - // - // Summary: - // An average counter that shows the average number of operations completed in one - // second. When a counter of this type samples the data, each sampling interrupt - // returns one or zero. The counter data is the number of ones that were sampled. - // It measures time in units of ticks of the system performance timer. - SampleCounter = 4260864, - // - // Summary: - // An average counter designed to monitor the average length of a queue to a resource - // over time. It shows the difference between the queue lengths observed during - // the last two sample intervals divided by the duration of the interval. This type - // of counter is typically used to track the number of items that are queued or - // waiting. - CountPerTimeInterval32 = 4523008, - // - // Summary: - // An average counter that monitors the average length of a queue to a resource - // over time. Counters of this type display the difference between the queue lengths - // observed during the last two sample intervals, divided by the duration of the - // interval. This counter type is the same as CountPerTimeInterval32 except that - // it uses larger fields to accommodate larger values. This type of counter is typically - // used to track a high-volume or very large number of items that are queued or - // waiting. - CountPerTimeInterval64 = 4523264, - // - // Summary: - // A difference counter that shows the average number of operations completed during - // each second of the sample interval. Counters of this type measure time in ticks - // of the system clock. - RateOfCountsPerSecond32 = 272696320, - // - // Summary: - // A difference counter that shows the average number of operations completed during - // each second of the sample interval. Counters of this type measure time in ticks - // of the system clock. This counter type is the same as the RateOfCountsPerSecond32 - // type, but it uses larger fields to accommodate larger values to track a high-volume - // number of items or operations per second, such as a byte-transmission rate. - RateOfCountsPerSecond64 = 272696576, - // - // Summary: - // An instantaneous percentage counter that shows the ratio of a subset to its set - // as a percentage. For example, it compares the number of bytes in use on a disk - // to the total number of bytes on the disk. Counters of this type display the current - // percentage only, not an average over time. - RawFraction = 537003008, - // - // Summary: - // A percentage counter that shows the average time that a component is active as - // a percentage of the total sample time. - CounterTimer = 541132032, - // - // Summary: - // A percentage counter that shows the active time of a component as a percentage - // of the total elapsed time of the sample interval. It measures time in units of - // 100 nanoseconds (ns). Counters of this type are designed to measure the activity - // of one component at a time. - Timer100Ns = 542180608, - // - // Summary: - // A percentage counter that shows the average ratio of hits to all operations during - // the last two sample intervals. - SampleFraction = 549585920, - // - // Summary: - // A percentage counter that displays the average percentage of active time observed - // during sample interval. The value of these counters is calculated by monitoring - // the percentage of time that the service was inactive and then subtracting that - // value from 100 percent. - CounterTimerInverse = 557909248, - // - // Summary: - // A percentage counter that shows the average percentage of active time observed - // during the sample interval. - Timer100NsInverse = 558957824, - // - // Summary: - // A percentage counter that displays the active time of one or more components - // as a percentage of the total time of the sample interval. Because the numerator - // records the active time of components operating simultaneously, the resulting - // percentage can exceed 100 percent. - CounterMultiTimer = 574686464, - // - // Summary: - // A percentage counter that shows the active time of one or more components as - // a percentage of the total time of the sample interval. It measures time in 100 - // nanosecond (ns) units. - CounterMultiTimer100Ns = 575735040, - // - // Summary: - // A percentage counter that shows the active time of one or more components as - // a percentage of the total time of the sample interval. It derives the active - // time by measuring the time that the components were not active and subtracting - // the result from 100 percent by the number of objects monitored. - CounterMultiTimerInverse = 591463680, - // - // Summary: - // A percentage counter that shows the active time of one or more components as - // a percentage of the total time of the sample interval. Counters of this type - // measure time in 100 nanosecond (ns) units. They derive the active time by measuring - // the time that the components were not active and subtracting the result from - // multiplying 100 percent by the number of objects monitored. - CounterMultiTimer100NsInverse = 592512256, - // - // Summary: - // An average counter that measures the time it takes, on average, to complete a - // process or operation. Counters of this type display a ratio of the total elapsed - // time of the sample interval to the number of processes or operations completed - // during that time. This counter type measures time in ticks of the system clock. - AverageTimer32 = 805438464, - // - // Summary: - // A difference timer that shows the total time between when the component or process - // started and the time when this value is calculated. - ElapsedTime = 807666944, - // - // Summary: - // An average counter that shows how many items are processed, on average, during - // an operation. Counters of this type display a ratio of the items processed to - // the number of operations completed. The ratio is calculated by comparing the - // number of items processed during the last interval to the number of operations - // completed during the last interval. - AverageCount64 = 1073874176, - // - // Summary: - // A base counter that stores the number of sampling interrupts taken and is used - // as a denominator in the sampling fraction. The sampling fraction is the number - // of samples that were 1 (or true) for a sample interrupt. Check that this value - // is greater than zero before using it as the denominator in a calculation of SampleFraction. - SampleBase = 1073939457, - // - // Summary: - // A base counter that is used in the calculation of time or count averages, such - // as AverageTimer32 and AverageCount64. Stores the denominator for calculating - // a counter to present "time per operation" or "count per operation". - AverageBase = 1073939458, - // - // Summary: - // A base counter that stores the denominator of a counter that presents a general - // arithmetic fraction. Check that this value is greater than zero before using - // it as the denominator in a RawFraction value calculation. - RawBase = 1073939459, - // - // Summary: - // A base counter that indicates the number of items sampled. It is used as the - // denominator in the calculations to get an average among the items sampled when - // taking timings of multiple, but similar items. Used with CounterMultiTimer, CounterMultiTimerInverse, - // CounterMultiTimer100Ns, and CounterMultiTimer100NsInverse. - CounterMultiBase = 1107494144 - } -} diff --git a/src/wixext/Symbols/EventManifestSymbol.cs b/src/wixext/Symbols/EventManifestSymbol.cs deleted file mode 100644 index ccd3c899..00000000 --- a/src/wixext/Symbols/EventManifestSymbol.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.EventManifest.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String), - }, - typeof(EventManifestSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum EventManifestSymbolFields - { - ComponentRef, - File, - } - - public class EventManifestSymbol : IntermediateSymbol - { - public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null) - { - } - - public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id) - { - } - - public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString(); - set => this.Set((int)EventManifestSymbolFields.ComponentRef, value); - } - - public string File - { - get => this.Fields[(int)EventManifestSymbolFields.File].AsString(); - set => this.Set((int)EventManifestSymbolFields.File, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/FileSharePermissionsSymbol.cs b/src/wixext/Symbols/FileSharePermissionsSymbol.cs deleted file mode 100644 index 3db92f22..00000000 --- a/src/wixext/Symbols/FileSharePermissionsSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.FileSharePermissions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number), - }, - typeof(FileSharePermissionsSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum FileSharePermissionsSymbolFields - { - FileShareRef, - UserRef, - Permissions, - } - - public class FileSharePermissionsSymbol : IntermediateSymbol - { - public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null) - { - } - - public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id) - { - } - - public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index]; - - public string FileShareRef - { - get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString(); - set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value); - } - - public string UserRef - { - get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString(); - set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value); - } - - public int Permissions - { - get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber(); - set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/FileShareSymbol.cs b/src/wixext/Symbols/FileShareSymbol.cs deleted file mode 100644 index c956ff42..00000000 --- a/src/wixext/Symbols/FileShareSymbol.cs +++ /dev/null @@ -1,71 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.FileShare.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String), - }, - typeof(FileShareSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum FileShareSymbolFields - { - ShareName, - ComponentRef, - Description, - DirectoryRef, - } - - public class FileShareSymbol : IntermediateSymbol - { - public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null) - { - } - - public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id) - { - } - - public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index]; - - public string ShareName - { - get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString(); - set => this.Set((int)FileShareSymbolFields.ShareName, value); - } - - public string ComponentRef - { - get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString(); - set => this.Set((int)FileShareSymbolFields.ComponentRef, value); - } - - public string Description - { - get => this.Fields[(int)FileShareSymbolFields.Description].AsString(); - set => this.Set((int)FileShareSymbolFields.Description, value); - } - - public string DirectoryRef - { - get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString(); - set => this.Set((int)FileShareSymbolFields.DirectoryRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/GroupSymbol.cs b/src/wixext/Symbols/GroupSymbol.cs deleted file mode 100644 index b378db44..00000000 --- a/src/wixext/Symbols/GroupSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.Group.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String), - }, - typeof(GroupSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum GroupSymbolFields - { - ComponentRef, - Name, - Domain, - } - - public class GroupSymbol : IntermediateSymbol - { - public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null) - { - } - - public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id) - { - } - - public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString(); - set => this.Set((int)GroupSymbolFields.ComponentRef, value); - } - - public string Name - { - get => this.Fields[(int)GroupSymbolFields.Name].AsString(); - set => this.Set((int)GroupSymbolFields.Name, value); - } - - public string Domain - { - get => this.Fields[(int)GroupSymbolFields.Domain].AsString(); - set => this.Set((int)GroupSymbolFields.Domain, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/PerfmonManifestSymbol.cs b/src/wixext/Symbols/PerfmonManifestSymbol.cs deleted file mode 100644 index 03fef14e..00000000 --- a/src/wixext/Symbols/PerfmonManifestSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.PerfmonManifest.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String), - }, - typeof(PerfmonManifestSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum PerfmonManifestSymbolFields - { - ComponentRef, - File, - ResourceFileDirectory, - } - - public class PerfmonManifestSymbol : IntermediateSymbol - { - public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null) - { - } - - public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id) - { - } - - public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value); - } - - public string File - { - get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString(); - set => this.Set((int)PerfmonManifestSymbolFields.File, value); - } - - public string ResourceFileDirectory - { - get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString(); - set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/PerfmonSymbol.cs b/src/wixext/Symbols/PerfmonSymbol.cs deleted file mode 100644 index 6784ebd1..00000000 --- a/src/wixext/Symbols/PerfmonSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.Perfmon.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String), - }, - typeof(PerfmonSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum PerfmonSymbolFields - { - ComponentRef, - File, - Name, - } - - public class PerfmonSymbol : IntermediateSymbol - { - public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null) - { - } - - public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id) - { - } - - public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonSymbolFields.ComponentRef, value); - } - - public string File - { - get => this.Fields[(int)PerfmonSymbolFields.File].AsString(); - set => this.Set((int)PerfmonSymbolFields.File, value); - } - - public string Name - { - get => this.Fields[(int)PerfmonSymbolFields.Name].AsString(); - set => this.Set((int)PerfmonSymbolFields.Name, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/PerformanceCategorySymbol.cs b/src/wixext/Symbols/PerformanceCategorySymbol.cs deleted file mode 100644 index 5ecf388c..00000000 --- a/src/wixext/Symbols/PerformanceCategorySymbol.cs +++ /dev/null @@ -1,71 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.PerformanceCategory.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String), - }, - typeof(PerformanceCategorySymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum PerformanceCategorySymbolFields - { - ComponentRef, - Name, - IniData, - ConstantData, - } - - public class PerformanceCategorySymbol : IntermediateSymbol - { - public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null) - { - } - - public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id) - { - } - - public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value); - } - - public string Name - { - get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.Name, value); - } - - public string IniData - { - get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.IniData, value); - } - - public string ConstantData - { - get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString(); - set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/SecureObjectsSymbol.cs b/src/wixext/Symbols/SecureObjectsSymbol.cs deleted file mode 100644 index 25fc6dca..00000000 --- a/src/wixext/Symbols/SecureObjectsSymbol.cs +++ /dev/null @@ -1,103 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.SecureObjects.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String), - }, - typeof(SecureObjectsSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using System; - using WixToolset.Data; - - public enum SecureObjectsSymbolFields - { - SecureObject, - Table, - Domain, - User, - Attributes, - Permission, - ComponentRef, - } - - [Flags] - public enum WixPermissionExAttributes - { - None = 0x0, - Inheritable = 0x01 - } - - public class SecureObjectsSymbol : IntermediateSymbol - { - public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) - { - } - - public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id) - { - } - - public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index]; - - public string SecureObject - { - get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value); - } - - public string Table - { - get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.Table, value); - } - - public string Domain - { - get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.Domain, value); - } - - public string User - { - get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.User, value); - } - - public WixPermissionExAttributes Attributes - { - get => (WixPermissionExAttributes)this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); - set => this.Set((int)SecureObjectsSymbolFields.Attributes, (int)value); - } - - public int? Permission - { - get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber(); - set => this.Set((int)SecureObjectsSymbolFields.Permission, value); - } - - public string ComponentRef - { - get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString(); - set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/ServiceConfigSymbol.cs b/src/wixext/Symbols/ServiceConfigSymbol.cs deleted file mode 100644 index 3a877f9b..00000000 --- a/src/wixext/Symbols/ServiceConfigSymbol.cs +++ /dev/null @@ -1,119 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.ServiceConfig.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String), - }, - typeof(ServiceConfigSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum ServiceConfigSymbolFields - { - ServiceName, - ComponentRef, - NewService, - FirstFailureActionType, - SecondFailureActionType, - ThirdFailureActionType, - ResetPeriodInDays, - RestartServiceDelayInSeconds, - ProgramCommandLine, - RebootMessage, - } - - public class ServiceConfigSymbol : IntermediateSymbol - { - public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null) - { - } - - public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id) - { - } - - public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index]; - - public string ServiceName - { - get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value); - } - - public string ComponentRef - { - get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value); - } - - public int NewService - { - get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber(); - set => this.Set((int)ServiceConfigSymbolFields.NewService, value); - } - - public string FirstFailureActionType - { - get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value); - } - - public string SecondFailureActionType - { - get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value); - } - - public string ThirdFailureActionType - { - get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value); - } - - public int? ResetPeriodInDays - { - get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber(); - set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value); - } - - public int? RestartServiceDelayInSeconds - { - get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber(); - set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value); - } - - public string ProgramCommandLine - { - get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value); - } - - public string RebootMessage - { - get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString(); - set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/UserGroupSymbol.cs b/src/wixext/Symbols/UserGroupSymbol.cs deleted file mode 100644 index c8f3998e..00000000 --- a/src/wixext/Symbols/UserGroupSymbol.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.UserGroup.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String), - }, - typeof(UserGroupSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum UserGroupSymbolFields - { - UserRef, - GroupRef, - } - - public class UserGroupSymbol : IntermediateSymbol - { - public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null) - { - } - - public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id) - { - } - - public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index]; - - public string UserRef - { - get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString(); - set => this.Set((int)UserGroupSymbolFields.UserRef, value); - } - - public string GroupRef - { - get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString(); - set => this.Set((int)UserGroupSymbolFields.GroupRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/UserSymbol.cs b/src/wixext/Symbols/UserSymbol.cs deleted file mode 100644 index 5f00064b..00000000 --- a/src/wixext/Symbols/UserSymbol.cs +++ /dev/null @@ -1,79 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.User.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number), - }, - typeof(UserSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum UserSymbolFields - { - ComponentRef, - Name, - Domain, - Password, - Attributes, - } - - public class UserSymbol : IntermediateSymbol - { - public UserSymbol() : base(UtilSymbolDefinitions.User, null, null) - { - } - - public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id) - { - } - - public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString(); - set => this.Set((int)UserSymbolFields.ComponentRef, value); - } - - public string Name - { - get => this.Fields[(int)UserSymbolFields.Name].AsString(); - set => this.Set((int)UserSymbolFields.Name, value); - } - - public string Domain - { - get => this.Fields[(int)UserSymbolFields.Domain].AsString(); - set => this.Set((int)UserSymbolFields.Domain, value); - } - - public string Password - { - get => this.Fields[(int)UserSymbolFields.Password].AsString(); - set => this.Set((int)UserSymbolFields.Password, value); - } - - public int Attributes - { - get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber(); - set => this.Set((int)UserSymbolFields.Attributes, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/UtilSymbolDefinitions.cs b/src/wixext/Symbols/UtilSymbolDefinitions.cs deleted file mode 100644 index 72091c3b..00000000 --- a/src/wixext/Symbols/UtilSymbolDefinitions.cs +++ /dev/null @@ -1,125 +0,0 @@ -// 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.Util -{ - using System; - using WixToolset.Data; - using WixToolset.Data.Burn; - - public enum UtilSymbolDefinitionType - { - EventManifest, - FileShare, - FileSharePermissions, - Group, - Perfmon, - PerfmonManifest, - PerformanceCategory, - SecureObjects, - ServiceConfig, - User, - UserGroup, - WixCloseApplication, - WixFormatFiles, - WixInternetShortcut, - WixRemoveFolderEx, - WixRemoveRegistryKeyEx, - WixRestartResource, - WixTouchFile, - WixWindowsFeatureSearch, - XmlConfig, - XmlFile, - } - - public static partial class UtilSymbolDefinitions - { - public static readonly Version Version = new Version("4.0.0"); - - public static IntermediateSymbolDefinition ByName(string name) - { - if (!Enum.TryParse(name, out UtilSymbolDefinitionType type)) - { - return null; - } - - return ByType(type); - } - - public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type) - { - switch (type) - { - case UtilSymbolDefinitionType.EventManifest: - return UtilSymbolDefinitions.EventManifest; - - case UtilSymbolDefinitionType.FileShare: - return UtilSymbolDefinitions.FileShare; - - case UtilSymbolDefinitionType.FileSharePermissions: - return UtilSymbolDefinitions.FileSharePermissions; - - case UtilSymbolDefinitionType.Group: - return UtilSymbolDefinitions.Group; - - case UtilSymbolDefinitionType.Perfmon: - return UtilSymbolDefinitions.Perfmon; - - case UtilSymbolDefinitionType.PerfmonManifest: - return UtilSymbolDefinitions.PerfmonManifest; - - case UtilSymbolDefinitionType.PerformanceCategory: - return UtilSymbolDefinitions.PerformanceCategory; - - case UtilSymbolDefinitionType.SecureObjects: - return UtilSymbolDefinitions.SecureObjects; - - case UtilSymbolDefinitionType.ServiceConfig: - return UtilSymbolDefinitions.ServiceConfig; - - case UtilSymbolDefinitionType.User: - return UtilSymbolDefinitions.User; - - case UtilSymbolDefinitionType.UserGroup: - return UtilSymbolDefinitions.UserGroup; - - case UtilSymbolDefinitionType.WixCloseApplication: - return UtilSymbolDefinitions.WixCloseApplication; - - case UtilSymbolDefinitionType.WixFormatFiles: - return UtilSymbolDefinitions.WixFormatFiles; - - case UtilSymbolDefinitionType.WixInternetShortcut: - return UtilSymbolDefinitions.WixInternetShortcut; - - case UtilSymbolDefinitionType.WixRemoveFolderEx: - return UtilSymbolDefinitions.WixRemoveFolderEx; - - case UtilSymbolDefinitionType.WixRemoveRegistryKeyEx: - return UtilSymbolDefinitions.WixRemoveRegistryKeyEx; - - case UtilSymbolDefinitionType.WixRestartResource: - return UtilSymbolDefinitions.WixRestartResource; - - case UtilSymbolDefinitionType.WixTouchFile: - return UtilSymbolDefinitions.WixTouchFile; - - case UtilSymbolDefinitionType.WixWindowsFeatureSearch: - return UtilSymbolDefinitions.WixWindowsFeatureSearch; - - case UtilSymbolDefinitionType.XmlConfig: - return UtilSymbolDefinitions.XmlConfig; - - case UtilSymbolDefinitionType.XmlFile: - return UtilSymbolDefinitions.XmlFile; - - default: - throw new ArgumentOutOfRangeException(nameof(type)); - } - } - - static UtilSymbolDefinitions() - { - WixWindowsFeatureSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); - } - } -} diff --git a/src/wixext/Symbols/WixCloseApplicationSymbol.cs b/src/wixext/Symbols/WixCloseApplicationSymbol.cs deleted file mode 100644 index 0738e3e4..00000000 --- a/src/wixext/Symbols/WixCloseApplicationSymbol.cs +++ /dev/null @@ -1,103 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixCloseApplication.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number), - }, - typeof(WixCloseApplicationSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixCloseApplicationSymbolFields - { - Target, - Description, - Condition, - Attributes, - Sequence, - Property, - TerminateExitCode, - Timeout, - } - - public class WixCloseApplicationSymbol : IntermediateSymbol - { - public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null) - { - } - - public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id) - { - } - - public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index]; - - public string Target - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Target, value); - } - - public string Description - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Description, value); - } - - public string Condition - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value); - } - - public int Attributes - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value); - } - - public int? Sequence - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value); - } - - public string Property - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString(); - set => this.Set((int)WixCloseApplicationSymbolFields.Property, value); - } - - public int? TerminateExitCode - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value); - } - - public int? Timeout - { - get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixFormatFilesSymbol.cs b/src/wixext/Symbols/WixFormatFilesSymbol.cs deleted file mode 100644 index 38a9b8ff..00000000 --- a/src/wixext/Symbols/WixFormatFilesSymbol.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixFormatFiles.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String), - }, - typeof(WixFormatFilesSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixFormatFilesSymbolFields - { - BinaryRef, - FileRef, - } - - public class WixFormatFilesSymbol : IntermediateSymbol - { - public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null) - { - } - - public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id) - { - } - - public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index]; - - public string BinaryRef - { - get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString(); - set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value); - } - - public string FileRef - { - get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString(); - set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixInternetShortcutSymbol.cs b/src/wixext/Symbols/WixInternetShortcutSymbol.cs deleted file mode 100644 index e8265e02..00000000 --- a/src/wixext/Symbols/WixInternetShortcutSymbol.cs +++ /dev/null @@ -1,95 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixInternetShortcut.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number), - }, - typeof(WixInternetShortcutSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixInternetShortcutSymbolFields - { - ComponentRef, - DirectoryRef, - Name, - Target, - Attributes, - IconFile, - IconIndex, - } - - public class WixInternetShortcutSymbol : IntermediateSymbol - { - public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null) - { - } - - public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id) - { - } - - public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value); - } - - public string DirectoryRef - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value); - } - - public string Name - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.Name, value); - } - - public string Target - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.Target, value); - } - - public int Attributes - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value); - } - - public string IconFile - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString(); - set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value); - } - - public int? IconIndex - { - get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber(); - set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs b/src/wixext/Symbols/WixRemoveFolderExSymbol.cs deleted file mode 100644 index 86352b6c..00000000 --- a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs +++ /dev/null @@ -1,78 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Condition), IntermediateFieldType.String), - }, - typeof(WixRemoveFolderExSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixRemoveFolderExSymbolFields - { - ComponentRef, - Property, - InstallMode, - Condition, - } - - public enum WixRemoveFolderExInstallMode - { - Install = 1, - Uninstall = 2, - Both = 3, - } - - public class WixRemoveFolderExSymbol : IntermediateSymbol - { - public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null) - { - } - - public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id) - { - } - - public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value); - } - - public string Property - { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString(); - set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); - } - - public WixRemoveFolderExInstallMode InstallMode - { - get => (WixRemoveFolderExInstallMode)this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); - set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, (int)value); - } - - public string Condition - { - get => this.Fields[(int)WixRemoveFolderExSymbolFields.Condition].AsString(); - set => this.Set((int)WixRemoveFolderExSymbolFields.Condition, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs b/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs deleted file mode 100644 index 8e4bd212..00000000 --- a/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs +++ /dev/null @@ -1,86 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixRemoveRegistryKeyEx = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixRemoveRegistryKeyEx.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Root), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Key), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.InstallMode), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixRemoveRegistryKeyExSymbolFields.Condition), IntermediateFieldType.String), - }, - typeof(WixRemoveRegistryKeyExSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - using WixToolset.Data.Symbols; - - public enum WixRemoveRegistryKeyExSymbolFields - { - ComponentRef, - Root, - Key, - InstallMode, - Condition, - } - - public enum WixRemoveRegistryKeyExInstallMode - { - Install = 1, - Uninstall = 2, - } - - public class WixRemoveRegistryKeyExSymbol : IntermediateSymbol - { - public WixRemoveRegistryKeyExSymbol() : base(UtilSymbolDefinitions.WixRemoveRegistryKeyEx, null, null) - { - } - - public WixRemoveRegistryKeyExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveRegistryKeyEx, sourceLineNumber, id) - { - } - - public IntermediateField this[WixRemoveRegistryKeyExSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.ComponentRef, value); - } - - public RegistryRootType Root - { - get => (RegistryRootType)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Root].AsNumber(); - set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Root, (int)value); - } - - public string Key - { - get => (string)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Key]; - set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Key, value); - } - - public WixRemoveRegistryKeyExInstallMode InstallMode - { - get => (WixRemoveRegistryKeyExInstallMode)this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.InstallMode].AsNumber(); - set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.InstallMode, (int)value); - } - - public string Condition - { - get => this.Fields[(int)WixRemoveRegistryKeyExSymbolFields.Condition].AsString(); - set => this.Set((int)WixRemoveRegistryKeyExSymbolFields.Condition, value); - } - } -} diff --git a/src/wixext/Symbols/WixRestartResourceSymbol.cs b/src/wixext/Symbols/WixRestartResourceSymbol.cs deleted file mode 100644 index 01b92b63..00000000 --- a/src/wixext/Symbols/WixRestartResourceSymbol.cs +++ /dev/null @@ -1,71 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixRestartResource.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number), - }, - typeof(WixRestartResourceSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixRestartResourceSymbolFields - { - ComponentRef, - Resource, - Attributes, - } - - public enum WixRestartResourceAttributes - { - Filename = 1, - ProcessName, - ServiceName, - TypeMask = 0xf, - } - - public class WixRestartResourceSymbol : IntermediateSymbol - { - public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) - { - } - - public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id) - { - } - - public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value); - } - - public string Resource - { - get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString(); - set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); - } - - public WixRestartResourceAttributes? Attributes - { - get => (WixRestartResourceAttributes?)this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNullableNumber(); - set => this.Set((int)WixRestartResourceSymbolFields.Attributes, (int?)value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixTouchFileSymbol.cs b/src/wixext/Symbols/WixTouchFileSymbol.cs deleted file mode 100644 index 447c21ba..00000000 --- a/src/wixext/Symbols/WixTouchFileSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixTouchFile.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number), - }, - typeof(WixTouchFileSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixTouchFileSymbolFields - { - ComponentRef, - Path, - Attributes, - } - - public class WixTouchFileSymbol : IntermediateSymbol - { - public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null) - { - } - - public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id) - { - } - - public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString(); - set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value); - } - - public string Path - { - get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString(); - set => this.Set((int)WixTouchFileSymbolFields.Path, value); - } - - public int Attributes - { - get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber(); - set => this.Set((int)WixTouchFileSymbolFields.Attributes, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs b/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs deleted file mode 100644 index 9a43692c..00000000 --- a/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixWindowsFeatureSearch = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.WixWindowsFeatureSearch.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixWindowsFeatureSearchSymbolFields.Type), IntermediateFieldType.String), - }, - typeof(WixWindowsFeatureSearchSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum WixWindowsFeatureSearchSymbolFields - { - Type, - } - - public class WixWindowsFeatureSearchSymbol : IntermediateSymbol - { - public WixWindowsFeatureSearchSymbol() : base(UtilSymbolDefinitions.WixWindowsFeatureSearch, null, null) - { - } - - public WixWindowsFeatureSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixWindowsFeatureSearch, sourceLineNumber, id) - { - } - - public IntermediateField this[WixWindowsFeatureSearchSymbolFields index] => this.Fields[(int)index]; - - public string Type - { - get => this.Fields[(int)WixWindowsFeatureSearchSymbolFields.Type].AsString(); - set => this.Set((int)WixWindowsFeatureSearchSymbolFields.Type, value); - } - } -} diff --git a/src/wixext/Symbols/XmlConfigSymbol.cs b/src/wixext/Symbols/XmlConfigSymbol.cs deleted file mode 100644 index 6503a586..00000000 --- a/src/wixext/Symbols/XmlConfigSymbol.cs +++ /dev/null @@ -1,111 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.XmlConfig.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number), - }, - typeof(XmlConfigSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum XmlConfigSymbolFields - { - File, - ElementId, - ElementPath, - VerifyPath, - Name, - Value, - Flags, - ComponentRef, - Sequence, - } - - public class XmlConfigSymbol : IntermediateSymbol - { - public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null) - { - } - - public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id) - { - } - - public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index]; - - public string File - { - get => this.Fields[(int)XmlConfigSymbolFields.File].AsString(); - set => this.Set((int)XmlConfigSymbolFields.File, value); - } - - public string ElementId - { - get => this.Fields[(int)XmlConfigSymbolFields.ElementId].AsString(); - set => this.Set((int)XmlConfigSymbolFields.ElementId, value); - } - - public string ElementPath - { - get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); - set => this.Set((int)XmlConfigSymbolFields.ElementPath, value); - } - - public string VerifyPath - { - get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString(); - set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value); - } - - public string Name - { - get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString(); - set => this.Set((int)XmlConfigSymbolFields.Name, value); - } - - public string Value - { - get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString(); - set => this.Set((int)XmlConfigSymbolFields.Value, value); - } - - public int Flags - { - get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber(); - set => this.Set((int)XmlConfigSymbolFields.Flags, value); - } - - public string ComponentRef - { - get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString(); - set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value); - } - - public int? Sequence - { - get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlConfigSymbolFields.Sequence, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/XmlFileSymbol.cs b/src/wixext/Symbols/XmlFileSymbol.cs deleted file mode 100644 index 7d5d991b..00000000 --- a/src/wixext/Symbols/XmlFileSymbol.cs +++ /dev/null @@ -1,95 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Util.Symbols; - - public static partial class UtilSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition( - UtilSymbolDefinitionType.XmlFile.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number), - }, - typeof(XmlFileSymbol)); - } -} - -namespace WixToolset.Util.Symbols -{ - using WixToolset.Data; - - public enum XmlFileSymbolFields - { - File, - ElementPath, - Name, - Value, - Flags, - ComponentRef, - Sequence, - } - - public class XmlFileSymbol : IntermediateSymbol - { - public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null) - { - } - - public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id) - { - } - - public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index]; - - public string File - { - get => this.Fields[(int)XmlFileSymbolFields.File].AsString(); - set => this.Set((int)XmlFileSymbolFields.File, value); - } - - public string ElementPath - { - get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString(); - set => this.Set((int)XmlFileSymbolFields.ElementPath, value); - } - - public string Name - { - get => this.Fields[(int)XmlFileSymbolFields.Name].AsString(); - set => this.Set((int)XmlFileSymbolFields.Name, value); - } - - public string Value - { - get => this.Fields[(int)XmlFileSymbolFields.Value].AsString(); - set => this.Set((int)XmlFileSymbolFields.Value, value); - } - - public int Flags - { - get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber(); - set => this.Set((int)XmlFileSymbolFields.Flags, value); - } - - public string ComponentRef - { - get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString(); - set => this.Set((int)XmlFileSymbolFields.ComponentRef, value); - } - - public int? Sequence - { - get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlFileSymbolFields.Sequence, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs deleted file mode 100644 index 45079150..00000000 --- a/src/wixext/UtilCompiler.cs +++ /dev/null @@ -1,3889 +0,0 @@ -// 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.Util -{ - using System; - using System.Collections; - using System.Collections.Generic; - using System.Globalization; - using System.Linq; - using System.Text; - using System.Text.RegularExpressions; - using System.Xml.Linq; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using WixToolset.Extensibility; - using WixToolset.Extensibility.Data; - using WixToolset.Util.Symbols; - - /// - /// The compiler for the WiX Toolset Utility Extension. - /// - public sealed class UtilCompiler : BaseCompilerExtension - { - // user creation attributes definitions (from sca.h) - internal const int UserDontExpirePasswrd = 0x00000001; - internal const int UserPasswdCantChange = 0x00000002; - internal const int UserPasswdChangeReqdOnLogin = 0x00000004; - internal const int UserDisableAccount = 0x00000008; - internal const int UserFailIfExists = 0x00000010; - internal const int UserUpdateIfExists = 0x00000020; - internal const int UserLogonAsService = 0x00000040; - internal const int UserLogonAsBatchJob = 0x00000080; - - internal const int UserDontRemoveOnUninstall = 0x00000100; - internal const int UserDontCreateUser = 0x00000200; - internal const int UserNonVital = 0x00000400; - - private static readonly Regex FindPropertyBrackets = new Regex(@"\[(?!\\|\])|(? "http://wixtoolset.org/schemas/v4/wxs/util"; - - /// - /// Types of Internet shortcuts. - /// - public enum InternetShortcutType - { - /// Create a .lnk file. - Link = 0, - - /// Create a .url file. - Url, - } - - /// - /// Types of permission setting methods. - /// - private enum PermissionType - { - /// LockPermissions (normal) type permission setting. - LockPermissions, - - /// FileSharePermissions type permission setting. - FileSharePermissions, - - /// SecureObjects type permission setting. - SecureObjects, - } - - /// - /// Processes an element for the Compiler. - /// - /// Parent element of element to process. - /// Element to process. - /// Extra information about the context in which this element is being parsed. - public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) - { - this.ParsePossibleKeyPathElement(intermediate, section, parentElement, element, context); - } - - /// - /// Processes an element for the Compiler. - /// - /// Source line number for the parent element. - /// Parent element of element to process. - /// Element to process. - /// Extra information about the context in which this element is being parsed. - public override IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) - { - IComponentKeyPath possibleKeyPath = null; - - switch (parentElement.Name.LocalName) - { - case "CreateFolder": - var createFolderId = context["DirectoryId"]; - var createFolderComponentId = context["ComponentId"]; - - // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - var createFolderWin64 = Boolean.Parse(context["Win64"]); - - switch (element.Name.LocalName) - { - case "PermissionEx": - this.ParsePermissionExElement(intermediate, section, element, createFolderId, createFolderComponentId, createFolderWin64, "CreateFolder"); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "Component": - var componentId = context["ComponentId"]; - var directoryId = context["DirectoryId"]; - var componentWin64 = Boolean.Parse(context["Win64"]); - - switch (element.Name.LocalName) - { - case "EventSource": - possibleKeyPath = this.ParseEventSourceElement(intermediate, section, element, componentId); - break; - case "FileShare": - this.ParseFileShareElement(intermediate, section, element, componentId, directoryId); - break; - case "InternetShortcut": - this.ParseInternetShortcutElement(intermediate, section, element, componentId, directoryId); - break; - case "PerformanceCategory": - this.ParsePerformanceCategoryElement(intermediate, section, element, componentId); - break; - case "RemoveFolderEx": - this.ParseRemoveFolderExElement(intermediate, section, element, componentId); - break; - case "RemoveRegistryKey": - this.ParseRemoveRegistryKeyExElement(intermediate, section, element, componentId); - break; - case "RestartResource": - this.ParseRestartResourceElement(intermediate, section, element, componentId); - break; - case "ServiceConfig": - this.ParseServiceConfigElement(intermediate, section, element, componentId, "Component", null); - break; - case "TouchFile": - this.ParseTouchFileElement(intermediate, section, element, componentId, componentWin64); - break; - case "User": - this.ParseUserElement(intermediate, section, element, componentId); - break; - case "XmlFile": - this.ParseXmlFileElement(intermediate, section, element, componentId); - break; - case "XmlConfig": - this.ParseXmlConfigElement(intermediate, section, element, componentId, false); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "File": - var fileId = context["FileId"]; - var fileComponentId = context["ComponentId"]; - - // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - var fileWin64 = Boolean.Parse(context["Win64"]); - - switch (element.Name.LocalName) - { - case "PerfCounter": - this.ParsePerfCounterElement(intermediate, section, element, fileComponentId, fileId); - break; - case "PermissionEx": - this.ParsePermissionExElement(intermediate, section, element, fileId, fileComponentId, fileWin64, "File"); - break; - case "PerfCounterManifest": - this.ParsePerfCounterManifestElement(intermediate, section, element, fileComponentId, fileId); - break; - case "EventManifest": - this.ParseEventManifestElement(intermediate, section, element, fileComponentId, fileId); - break; - case "FormatFile": - this.ParseFormatFileElement(intermediate, section, element, fileId, fileWin64); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "Bundle": - case "Fragment": - case "Module": - case "Package": - switch (element.Name.LocalName) - { - case "CloseApplication": - this.ParseCloseApplicationElement(intermediate, section, element); - break; - case "Group": - this.ParseGroupElement(intermediate, section, element, null); - break; - case "RestartResource": - // Currently not supported for Bundles. - if (parentElement.Name.LocalName != "Bundle") - { - this.ParseRestartResourceElement(intermediate, section, element, null); - } - else - { - this.ParseHelper.UnexpectedElement(parentElement, element); - } - break; - case "User": - this.ParseUserElement(intermediate, section, element, null); - break; - case "BroadcastEnvironmentChange": - case "BroadcastSettingChange": - case "CheckRebootRequired": - case "ExitEarlyWithSuccess": - case "FailWhenDeferred": - case "QueryWindowsDirectories": - case "QueryWindowsDriverInfo": - case "QueryWindowsSuiteInfo": - case "QueryWindowsWellKnownSIDs": - case "WaitForEvent": - case "WaitForEventDeferred": - this.AddCustomActionReference(intermediate, section, element, parentElement); - break; - case "ComponentSearch": - case "ComponentSearchRef": - case "DirectorySearch": - case "DirectorySearchRef": - case "FileSearch": - case "FileSearchRef": - case "ProductSearch": - case "ProductSearchRef": - case "RegistrySearch": - case "RegistrySearchRef": - case "WindowsFeatureSearch": - case "WindowsFeatureSearchRef": - // These will eventually be supported under Module/Product, but are not yet. - if (parentElement.Name.LocalName == "Bundle" || parentElement.Name.LocalName == "Fragment") - { - // TODO: When these are supported by all section types, move - // these out of the nested switch and back into the surrounding one. - switch (element.Name.LocalName) - { - case "ComponentSearch": - this.ParseComponentSearchElement(intermediate, section, element); - break; - case "ComponentSearchRef": - this.ParseComponentSearchRefElement(intermediate, section, element); - break; - case "DirectorySearch": - this.ParseDirectorySearchElement(intermediate, section, element); - break; - case "DirectorySearchRef": - this.ParseWixSearchRefElement(intermediate, section, element); - break; - case "FileSearch": - this.ParseFileSearchElement(intermediate, section, element); - break; - case "FileSearchRef": - this.ParseWixSearchRefElement(intermediate, section, element); - break; - case "ProductSearch": - this.ParseProductSearchElement(intermediate, section, element); - break; - case "ProductSearchRef": - this.ParseWixSearchRefElement(intermediate, section, element); - break; - case "RegistrySearch": - this.ParseRegistrySearchElement(intermediate, section, element); - break; - case "RegistrySearchRef": - this.ParseWixSearchRefElement(intermediate, section, element); - break; - case "WindowsFeatureSearch": - this.ParseWindowsFeatureSearchElement(intermediate, section, element); - break; - case "WindowsFeatureSearchRef": - this.ParseWindowsFeatureSearchRefElement(intermediate, section, element); - break; - } - } - else - { - this.ParseHelper.UnexpectedElement(parentElement, element); - } - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "Registry": - case "RegistryKey": - case "RegistryValue": - var registryId = context["RegistryId"]; - var registryComponentId = context["ComponentId"]; - - // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - var registryWin64 = Boolean.Parse(context["Win64"]); - - switch (element.Name.LocalName) - { - case "PermissionEx": - this.ParsePermissionExElement(intermediate, section, element, registryId, registryComponentId, registryWin64, "Registry"); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "ServiceInstall": - var serviceInstallId = context["ServiceInstallId"]; - var serviceInstallName = context["ServiceInstallName"]; - var serviceInstallComponentId = context["ServiceInstallComponentId"]; - - // If this doesn't parse successfully, something really odd is going on, so let the exception get thrown - var serviceInstallWin64 = Boolean.Parse(context["Win64"]); - - switch (element.Name.LocalName) - { - case "PermissionEx": - this.ParsePermissionExElement(intermediate, section, element, serviceInstallId, serviceInstallComponentId, serviceInstallWin64, "ServiceInstall"); - break; - case "ServiceConfig": - this.ParseServiceConfigElement(intermediate, section, element, serviceInstallComponentId, "ServiceInstall", serviceInstallName); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "UI": - switch (element.Name.LocalName) - { - case "BroadcastEnvironmentChange": - case "BroadcastSettingChange": - case "CheckRebootRequired": - case "ExitEarlyWithSuccess": - case "FailWhenDeferred": - case "QueryWindowsDirectories": - case "QueryWindowsDriverInfo": - case "QueryWindowsSuiteInfo": - case "QueryWindowsWellKnownSIDs": - case "WaitForEvent": - case "WaitForEventDeferred": - this.AddCustomActionReference(intermediate, section, element, parentElement); - break; - } - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - - return possibleKeyPath; - } - - private void AddCustomActionReference(Intermediate intermediate, IntermediateSection section, XElement element, XElement parentElement) - { - // These elements are not supported for bundles. - if (parentElement.Name.LocalName == "Bundle") - { - this.ParseHelper.UnexpectedElement(parentElement, element); - return; - } - - var customAction = element.Name.LocalName; - switch (element.Name.LocalName) - { - case "BroadcastEnvironmentChange": - case "BroadcastSettingChange": - case "CheckRebootRequired": - case "ExitEarlyWithSuccess": - case "FailWhenDeferred": - case "WaitForEvent": - case "WaitForEventDeferred": - //default: customAction = element.Name.LocalName; - break; - case "QueryWindowsDirectories": - customAction = "QueryOsDirs"; - break; - case "QueryWindowsDriverInfo": - customAction = "QueryOsDriverInfo"; - break; - case "QueryWindowsSuiteInfo": - customAction = "QueryOsInfo"; - break; - case "QueryWindowsWellKnownSIDs": - customAction = "QueryOsWellKnownSID"; - break; - } - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - // no attributes today - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4" + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - /// - /// Parses the common search attributes shared across all searches. - /// - /// Source line number for the parent element. - /// Attribute to parse. - /// Value of the Id attribute. - /// Value of the Variable attribute. - /// Value of the Condition attribute. - /// Value of the After attribute. - private void ParseCommonSearchAttributes(SourceLineNumber sourceLineNumbers, XAttribute attrib, ref Identifier id, ref string variable, ref string condition, ref string after) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Variable": - variable = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - // TODO: handle standard bundle variables - break; - case "Condition": - condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "After": - after = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - System.Diagnostics.Debug.Assert(false); - break; - } - } - - /// - /// Parses a ComponentSearch element. - /// - /// Element to parse. - private void ParseComponentSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string variable = null; - string condition = null; - string after = null; - string guid = null; - string productCode = null; - var attributes = WixComponentSearchAttributes.KeyPath; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - case "Variable": - case "Condition": - case "After": - this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); - break; - case "Guid": - guid = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); - break; - case "ProductCode": - productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib); - break; - case "Result": - var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (result) - { - case "directory": - attributes = WixComponentSearchAttributes.WantDirectory; - break; - case "keyPath": - attributes = WixComponentSearchAttributes.KeyPath; - break; - case "state": - attributes = WixComponentSearchAttributes.State; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "directory", "keyPath", "state")); - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == guid) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Guid")); - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("wcs", variable, condition, after, guid, productCode, attributes.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new WixComponentSearchSymbol(sourceLineNumbers, id) - { - Guid = guid, - ProductCode = productCode, - Attributes = attributes, - }); - } - } - - /// - /// Parses a ComponentSearchRef element - /// - /// Element to parse. - private void ParseComponentSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string refId = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixComponentSearch, refId); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - } - - /// - /// Parses a WindowsFeatureSearch element. - /// - /// Element to parse. - private void ParseWindowsFeatureSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string variable = null; - string condition = null; - string after = null; - string feature = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - case "Variable": - case "Condition": - case "After": - this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); - break; - case "Feature": - feature = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (feature) - { - case "sha2CodeSigning": - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Feature", feature, "sha2CodeSigning")); - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (id == null) - { - id = this.ParseHelper.CreateIdentifier("wwfs", variable, condition, after); - } - - if (feature == null) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Feature")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); - if (bundleExtensionId == null) - { - this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); - } - - this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new WixWindowsFeatureSearchSymbol(sourceLineNumbers, id) - { - Type = feature, - }); - } - } - - /// - /// Parses a WindowsFeatureSearchRef element - /// - /// Element to parse. - private void ParseWindowsFeatureSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixWindowsFeatureSearch, refId); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - } - - /// - /// Parses an event source element. - /// - /// Element to parse. - /// Identifier of parent component. - private IComponentKeyPath ParseEventSourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string sourceName = null; - string logName = null; - string categoryMessageFile = null; - var categoryCount = CompilerConstants.IntegerNotSet; - string eventMessageFile = null; - string parameterMessageFile = null; - int typesSupported = 0; - var isKeyPath = false; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "CategoryCount": - categoryCount = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - break; - case "CategoryMessageFile": - categoryMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "EventMessageFile": - eventMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "KeyPath": - isKeyPath = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "Log": - logName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if ("Security" == logName) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, logName, "Application", "System", "")); - } - break; - case "Name": - sourceName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ParameterMessageFile": - parameterMessageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "SupportsErrors": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - typesSupported |= 0x01; // EVENTLOG_ERROR_TYPE - } - break; - case "SupportsFailureAudits": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - typesSupported |= 0x10; // EVENTLOG_AUDIT_FAILURE - } - break; - case "SupportsInformationals": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - typesSupported |= 0x04; // EVENTLOG_INFORMATION_TYPE - } - break; - case "SupportsSuccessAudits": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - typesSupported |= 0x08; // EVENTLOG_AUDIT_SUCCESS - } - break; - case "SupportsWarnings": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - typesSupported |= 0x02; // EVENTLOG_WARNING_TYPE - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == sourceName) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); - } - - if (null == logName) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "EventLog")); - } - - if (null == eventMessageFile) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "EventMessageFile")); - } - - if (null == categoryMessageFile && 0 < categoryCount) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "CategoryCount", "CategoryMessageFile")); - } - - if (null != categoryMessageFile && CompilerConstants.IntegerNotSet == categoryCount) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "CategoryMessageFile", "CategoryCount")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; - var id = this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); - - if (null != categoryMessageFile) - { - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); - } - - if (CompilerConstants.IntegerNotSet != categoryCount) - { - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); - } - - if (null != parameterMessageFile) - { - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); - } - - if (0 != typesSupported) - { - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); - } - - var componentKeyPath = this.CreateComponentKeyPath(); - componentKeyPath.Id = id.Id; - componentKeyPath.Explicit = isKeyPath; - componentKeyPath.Type = PossibleKeyPathType.Registry; - return componentKeyPath; - } - - /// - /// Parses a close application element. - /// - /// Element to parse. - private void ParseCloseApplicationElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string condition = null; - string description = null; - string target = null; - string property = null; - Identifier id = null; - int attributes = 2; // default to CLOSEAPP_ATTRIBUTE_REBOOTPROMPT enabled - var sequence = CompilerConstants.IntegerNotSet; - var terminateExitCode = CompilerConstants.IntegerNotSet; - var timeout = CompilerConstants.IntegerNotSet; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Condition": - condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Description": - description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Property": - property = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - break; - case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - break; - case "Timeout": - timeout = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - break; - case "Target": - target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "CloseMessage": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 1; // CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE - } - else - { - attributes &= ~1; // CLOSEAPP_ATTRIBUTE_CLOSEMESSAGE - } - break; - case "EndSessionMessage": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 8; // CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE - } - else - { - attributes &= ~8; // CLOSEAPP_ATTRIBUTE_ENDSESSIONMESSAGE - } - break; - case "PromptToContinue": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x40; // CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE - } - else - { - attributes &= ~0x40; // CLOSEAPP_ATTRIBUTE_PROMPTTOCONTINUE - } - break; - case "RebootPrompt": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 2; // CLOSEAPP_ATTRIBUTE_REBOOTPROMPT - } - else - { - attributes &= ~2; // CLOSEAPP_ATTRIBUTE_REBOOTPROMPT - } - break; - case "ElevatedCloseMessage": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 4; // CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE - } - else - { - attributes &= ~4; // CLOSEAPP_ATTRIBUTE_ELEVATEDCLOSEMESSAGE - } - break; - case "ElevatedEndSessionMessage": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x10; // CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE - } - else - { - attributes &= ~0x10; // CLOSEAPP_ATTRIBUTE_ELEVATEDENDSESSIONMESSAGE - } - break; - case "TerminateProcess": - terminateExitCode = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - attributes |= 0x20; // CLOSEAPP_ATTRIBUTE_TERMINATEPROCESS - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == target) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target")); - } - else if (null == id) - { - id = this.ParseHelper.CreateIdentifier("ca", target); - } - - if (String.IsNullOrEmpty(description) && 0x40 == (attributes & 0x40)) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithoutOtherAttribute(sourceLineNumbers, element.Name.LocalName, "PromptToContinue", "yes", "Description")); - } - - if (0x22 == (attributes & 0x22)) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - if (!this.Messaging.EncounteredError) - { - var symbol = section.AddSymbol(new WixCloseApplicationSymbol(sourceLineNumbers, id) - { - Target = target, - Description = description, - Condition = condition, - Attributes = attributes, - Property = property, - }); - if (CompilerConstants.IntegerNotSet != sequence) - { - symbol.Sequence = sequence; - } - if (CompilerConstants.IntegerNotSet != terminateExitCode) - { - symbol.TerminateExitCode = terminateExitCode; - } - if (CompilerConstants.IntegerNotSet != timeout) - { - symbol.Timeout = timeout * 1000; // make the timeout milliseconds in the table. - } - } - } - - /// - /// Parses a DirectorySearch element. - /// - /// Element to parse. - private void ParseDirectorySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string variable = null; - string condition = null; - string after = null; - string path = null; - var attributes = WixFileSearchAttributes.IsDirectory; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - case "Variable": - case "Condition": - case "After": - this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); - break; - case "Path": - path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); - break; - case "Result": - var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (result) - { - case "exists": - attributes |= WixFileSearchAttributes.WantExists; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists")); - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == path) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("wds", variable, condition, after, path, attributes.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); - - if (!this.Messaging.EncounteredError) - { - this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); - } - } - - /// - /// Parses a DirectorySearchRef, FileSearchRef, ProductSearchRef, and RegistrySearchRef elements - /// - /// Element to parse. - private void ParseWixSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - - foreach (XAttribute attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixSearch, refId); - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - } - - /// - /// Parses a FileSearch element. - /// - /// Element to parse. - private void ParseFileSearchElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - Identifier id = null; - string variable = null; - string condition = null; - string after = null; - string path = null; - var attributes = WixFileSearchAttributes.Default; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - case "Variable": - case "Condition": - case "After": - this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); - break; - case "Path": - path = this.ParseHelper.GetAttributeLongFilename(sourceLineNumbers, attrib, false, true); - break; - case "Result": - string result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (result) - { - case "exists": - attributes |= WixFileSearchAttributes.WantExists; - break; - case "version": - attributes |= WixFileSearchAttributes.WantVersion; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists", "version")); - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - if (null == path) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Path")); - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("wfs", variable, condition, after, path, attributes.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); - - if (!this.Messaging.EncounteredError) - { - this.CreateWixFileSearchRow(section, sourceLineNumbers, id, path, attributes); - } - } - - /// - /// Creates a row in the WixFileSearch table. - /// - /// Source line number for the parent element. - /// Identifier of the search (key into the WixSearch table) - /// File/directory path to search for. - /// - private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) - { - section.AddSymbol(new WixFileSearchSymbol(sourceLineNumbers, id) - { - Path = path, - Attributes = attributes, - }); - } - - /// - /// Parses a file share element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Identifier of referred to directory. - private void ParseFileShareElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string directoryId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string description = null; - string name = null; - Identifier id = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Description": - description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("ufs", componentId, name); - } - - if (null == name) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); - } - - if (!element.Elements().Any()) - { - this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission")); - } - - foreach (var child in element.Elements()) - { - if (this.Namespace == child.Name.Namespace) - { - switch (child.Name.LocalName) - { - case "FileSharePermission": - this.ParseFileSharePermissionElement(intermediate, section, child, id); - break; - default: - this.ParseHelper.UnexpectedElement(element, child); - break; - } - } - else - { - this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); - } - } - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new FileShareSymbol(sourceLineNumbers, id) - { - ShareName = name, - ComponentRef = componentId, - Description = description, - DirectoryRef = directoryId, - }); - } - } - - /// - /// Parses a FileSharePermission element. - /// - /// Element to parse. - /// The identifier of the parent FileShare element. - private void ParseFileSharePermissionElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier fileShareId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - var bits = new BitArray(32); - string user = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "User": - user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.User, user); - break; - default: - var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) - { - if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) - { - if (!this.TrySetBitFromName(UtilConstants.FolderPermissions, attrib.Name.LocalName, attribValue, bits, 0)) - { - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - } - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - var permission = this.CreateIntegerFromBitArray(bits); - - if (null == user) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); - } - - if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL - { - this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new FileSharePermissionsSymbol(sourceLineNumbers) - { - FileShareRef = fileShareId.Id, - UserRef = user, - Permissions = permission, - }); - } - } - - /// - /// Parses a group element. - /// - /// Node to be parsed. - /// Component Id of the parent component of this element. - private void ParseGroupElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string domain = null; - string name = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Domain": - domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("ugr", componentId, domain, name); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new GroupSymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Name = name, - Domain = domain, - }); - } - } - - /// - /// Parses a GroupRef element - /// - /// Element to parse. - /// Required user id to be joined to the group. - private void ParseGroupRefElement(Intermediate intermediate, IntermediateSection section, XElement element, string userId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string groupId = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.Group, groupId); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new UserGroupSymbol(sourceLineNumbers) - { - UserRef = userId, - GroupRef = groupId, - }); - } - } - - /// - /// Parses an InternetShortcut element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Default directory if none is specified on the InternetShortcut element. - private void ParseInternetShortcutElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string defaultTarget) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string name = null; - string target = null; - string directoryId = null; - string type = null; - string iconFile = null; - int iconIndex = 0; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Directory": - directoryId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - break; - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Target": - target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Type": - type = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "IconFile": - iconFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "IconIndex": - iconIndex = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - // If there was no directoryId specified on the InternetShortcut element, default to the one on - // the parent component. - if (null == directoryId) - { - directoryId = defaultTarget; - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("uis", componentId, directoryId, name, target); - } - - // In theory this can never be the case, since InternetShortcut can only be under - // a component element, and if the Directory wasn't specified the default will come - // from the component. However, better safe than sorry, so here's a check to make sure - // it didn't wind up being null after setting it to the defaultTarget. - if (null == directoryId) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Directory")); - } - - if (null == name) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); - } - - if (null == target) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - var shortcutType = InternetShortcutType.Link; - if (String.Equals(type, "url", StringComparison.OrdinalIgnoreCase)) - { - shortcutType = InternetShortcutType.Url; - } - - if (!this.Messaging.EncounteredError) - { - this.CreateWixInternetShortcut(section, sourceLineNumbers, componentId, directoryId, id, name, target, shortcutType, iconFile, iconIndex); - } - } - - /// - /// Creates the rows needed for WixInternetShortcut to work. - /// - /// The CompilerCore object used to create rows. - /// Source line information about the owner element. - /// Identifier of parent component. - /// Identifier of directory containing shortcut. - /// Identifier of shortcut. - /// Name of shortcut without extension. - /// Target URL of shortcut. - private void CreateWixInternetShortcut(IntermediateSection section, SourceLineNumber sourceLineNumbers, string componentId, string directoryId, Identifier shortcutId, string name, string target, InternetShortcutType type, string iconFile, int iconIndex) - { - // add the appropriate extension based on type of shortcut - name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); - - section.AddSymbol(new WixInternetShortcutSymbol(sourceLineNumbers, shortcutId) - { - ComponentRef = componentId, - DirectoryRef = directoryId, - Name = name, - Target = target, - Attributes = (int)type, - IconFile = iconFile, - IconIndex = iconIndex, - }); - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation - this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); - - // use built-in MSI functionality to remove the shortcuts rather than doing so via CA - section.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, shortcutId) - { - ComponentRef = componentId, - DirPropertyRef = directoryId, - OnUninstall = true, - FileName = name, - }); - } - - /// - /// Parses a performance category element. - /// - /// Element to parse. - /// Identifier of parent component. - private void ParsePerformanceCategoryElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string name = null; - string help = null; - var multiInstance = YesNoType.No; - int defaultLanguage = 0x09; // default to "english" - - var parsedPerformanceCounters = new List(); - - // default to managed performance counter - var library = "netfxperf.dll"; - var openEntryPoint = "OpenPerformanceData"; - var collectEntryPoint = "CollectPerformanceData"; - var closeEntryPoint = "ClosePerformanceData"; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Close": - closeEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Collect": - collectEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "DefaultLanguage": - defaultLanguage = this.GetPerformanceCounterLanguage(sourceLineNumbers, attrib); - break; - case "Help": - help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Library": - library = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "MultiInstance": - multiInstance = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Open": - openEntryPoint = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == id && null == name) - { - this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Id", "Name")); - } - else if (null == id) - { - id = this.ParseHelper.CreateIdentifier("upc", componentId, name); - } - else if (null == name) - { - name = id.Id; - } - - // Process the child counter elements. - foreach (var child in element.Elements()) - { - if (this.Namespace == child.Name.Namespace) - { - switch (child.Name.LocalName) - { - case "PerformanceCounter": - var counter = this.ParsePerformanceCounterElement(intermediate, section, child, defaultLanguage); - if (null != counter) - { - parsedPerformanceCounters.Add(counter); - } - break; - default: - this.ParseHelper.UnexpectedElement(element, child); - break; - } - } - else - { - this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); - } - } - - - if (!this.Messaging.EncounteredError) - { - // Calculate the ini and h file content. - var objectName = "OBJECT_1"; - var objectLanguage = defaultLanguage.ToString("D3", CultureInfo.InvariantCulture); - - var sbIniData = new StringBuilder(); - sbIniData.AppendFormat("[info]\r\ndrivername={0}\r\nsymbolfile=wixperf.h\r\n\r\n[objects]\r\n{1}_{2}_NAME=\r\n\r\n[languages]\r\n{2}=LANG{2}\r\n\r\n", name, objectName, objectLanguage); - sbIniData.AppendFormat("[text]\r\n{0}_{1}_NAME={2}\r\n", objectName, objectLanguage, name); - if (null != help) - { - sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", objectName, objectLanguage, help); - } - - int symbolConstantsCounter = 0; - var sbSymbolicConstants = new StringBuilder(); - sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", objectName, symbolConstantsCounter); - - var sbCounterNames = new StringBuilder("[~]"); - var sbCounterTypes = new StringBuilder("[~]"); - for (int i = 0; i < parsedPerformanceCounters.Count; ++i) - { - var counter = parsedPerformanceCounters[i]; - var counterName = String.Concat("DEVICE_COUNTER_", i + 1); - - sbIniData.AppendFormat("{0}_{1}_NAME={2}\r\n", counterName, counter.Language, counter.Name); - if (null != counter.Help) - { - sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", counterName, counter.Language, counter.Help); - } - - symbolConstantsCounter += 2; - sbSymbolicConstants.AppendFormat("#define {0} {1}\r\n", counterName, symbolConstantsCounter); - - sbCounterNames.Append(UtilCompiler.FindPropertyBrackets.Replace(counter.Name, this.EscapeProperties)); - sbCounterNames.Append("[~]"); - sbCounterTypes.Append(counter.Type); - sbCounterTypes.Append("[~]"); - } - - sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); - - // Add the calculated INI and H strings to the PerformanceCategory table. - section.AddSymbol(new PerformanceCategorySymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Name = name, - IniData = sbIniData.ToString(), - ConstantData = sbSymbolicConstants.ToString(), - }); - - // Set up the application's performance key. - var escapedName = UtilCompiler.FindPropertyBrackets.Replace(name, this.EscapeProperties); - var linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); - var performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); - - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); - this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); - } - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - /// - /// Gets the performance counter language as a decimal number. - /// - /// Source line information about the owner element. - /// The attribute containing the value to get. - /// Numeric representation of the language as per WinNT.h. - private int GetPerformanceCounterLanguage(SourceLineNumber sourceLineNumbers, XAttribute attribute) - { - int language = 0; - if (String.Empty == attribute.Value) - { - this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); - } - else - { - switch (attribute.Value) - { - case "afrikaans": - language = 0x36; - break; - case "albanian": - language = 0x1c; - break; - case "arabic": - language = 0x01; - break; - case "armenian": - language = 0x2b; - break; - case "assamese": - language = 0x4d; - break; - case "azeri": - language = 0x2c; - break; - case "basque": - language = 0x2d; - break; - case "belarusian": - language = 0x23; - break; - case "bengali": - language = 0x45; - break; - case "bulgarian": - language = 0x02; - break; - case "catalan": - language = 0x03; - break; - case "chinese": - language = 0x04; - break; - case "croatian": - language = 0x1a; - break; - case "czech": - language = 0x05; - break; - case "danish": - language = 0x06; - break; - case "divehi": - language = 0x65; - break; - case "dutch": - language = 0x13; - break; - case "piglatin": - case "english": - language = 0x09; - break; - case "estonian": - language = 0x25; - break; - case "faeroese": - language = 0x38; - break; - case "farsi": - language = 0x29; - break; - case "finnish": - language = 0x0b; - break; - case "french": - language = 0x0c; - break; - case "galician": - language = 0x56; - break; - case "georgian": - language = 0x37; - break; - case "german": - language = 0x07; - break; - case "greek": - language = 0x08; - break; - case "gujarati": - language = 0x47; - break; - case "hebrew": - language = 0x0d; - break; - case "hindi": - language = 0x39; - break; - case "hungarian": - language = 0x0e; - break; - case "icelandic": - language = 0x0f; - break; - case "indonesian": - language = 0x21; - break; - case "italian": - language = 0x10; - break; - case "japanese": - language = 0x11; - break; - case "kannada": - language = 0x4b; - break; - case "kashmiri": - language = 0x60; - break; - case "kazak": - language = 0x3f; - break; - case "konkani": - language = 0x57; - break; - case "korean": - language = 0x12; - break; - case "kyrgyz": - language = 0x40; - break; - case "latvian": - language = 0x26; - break; - case "lithuanian": - language = 0x27; - break; - case "macedonian": - language = 0x2f; - break; - case "malay": - language = 0x3e; - break; - case "malayalam": - language = 0x4c; - break; - case "manipuri": - language = 0x58; - break; - case "marathi": - language = 0x4e; - break; - case "mongolian": - language = 0x50; - break; - case "nepali": - language = 0x61; - break; - case "norwegian": - language = 0x14; - break; - case "oriya": - language = 0x48; - break; - case "polish": - language = 0x15; - break; - case "portuguese": - language = 0x16; - break; - case "punjabi": - language = 0x46; - break; - case "romanian": - language = 0x18; - break; - case "russian": - language = 0x19; - break; - case "sanskrit": - language = 0x4f; - break; - case "serbian": - language = 0x1a; - break; - case "sindhi": - language = 0x59; - break; - case "slovak": - language = 0x1b; - break; - case "slovenian": - language = 0x24; - break; - case "spanish": - language = 0x0a; - break; - case "swahili": - language = 0x41; - break; - case "swedish": - language = 0x1d; - break; - case "syriac": - language = 0x5a; - break; - case "tamil": - language = 0x49; - break; - case "tatar": - language = 0x44; - break; - case "telugu": - language = 0x4a; - break; - case "thai": - language = 0x1e; - break; - case "turkish": - language = 0x1f; - break; - case "ukrainian": - language = 0x22; - break; - case "urdu": - language = 0x20; - break; - case "uzbek": - language = 0x43; - break; - case "vietnamese": - language = 0x2a; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); - break; - } - } - - return language; - } - - /// - /// Parses a performance counter element. - /// - /// Element to parse. - /// Default language for the performance counter. - private ParsedPerformanceCounter ParsePerformanceCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, int defaultLanguage) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - ParsedPerformanceCounter parsedPerformanceCounter = null; - string name = null; - string help = null; - var type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; - int language = defaultLanguage; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Help": - help = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Type": - type = this.GetPerformanceCounterType(sourceLineNumbers, attrib); - break; - case "Language": - language = this.GetPerformanceCounterLanguage(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == name) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); - } - - if (null == help) - { - this.Messaging.Write(UtilWarnings.RequiredAttributeForWindowsXP(sourceLineNumbers, element.Name.LocalName, "Help")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - parsedPerformanceCounter = new ParsedPerformanceCounter(name, help, type, language); - } - - return parsedPerformanceCounter; - } - - /// - /// Gets the performance counter type. - /// - /// Source line information about the owner element. - /// The attribute containing the value to get. - /// Numeric representation of the language as per WinNT.h. - private System.Diagnostics.PerformanceCounterType GetPerformanceCounterType(SourceLineNumber sourceLineNumbers, XAttribute attribute) - { - var type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; - if (String.Empty == attribute.Value) - { - this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); - } - else - { - switch (attribute.Value) - { - case "averageBase": - type = System.Diagnostics.PerformanceCounterType.AverageBase; - break; - case "averageCount64": - type = System.Diagnostics.PerformanceCounterType.AverageCount64; - break; - case "averageTimer32": - type = System.Diagnostics.PerformanceCounterType.AverageTimer32; - break; - case "counterDelta32": - type = System.Diagnostics.PerformanceCounterType.CounterDelta32; - break; - case "counterTimerInverse": - type = System.Diagnostics.PerformanceCounterType.CounterTimerInverse; - break; - case "sampleFraction": - type = System.Diagnostics.PerformanceCounterType.SampleFraction; - break; - case "timer100Ns": - type = System.Diagnostics.PerformanceCounterType.Timer100Ns; - break; - case "counterTimer": - type = System.Diagnostics.PerformanceCounterType.CounterTimer; - break; - case "rawFraction": - type = System.Diagnostics.PerformanceCounterType.RawFraction; - break; - case "timer100NsInverse": - type = System.Diagnostics.PerformanceCounterType.Timer100NsInverse; - break; - case "counterMultiTimer": - type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer; - break; - case "counterMultiTimer100Ns": - type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer100Ns; - break; - case "counterMultiTimerInverse": - type = System.Diagnostics.PerformanceCounterType.CounterMultiTimerInverse; - break; - case "counterMultiTimer100NsInverse": - type = System.Diagnostics.PerformanceCounterType.CounterMultiTimer100NsInverse; - break; - case "elapsedTime": - type = System.Diagnostics.PerformanceCounterType.ElapsedTime; - break; - case "sampleBase": - type = System.Diagnostics.PerformanceCounterType.SampleBase; - break; - case "rawBase": - type = System.Diagnostics.PerformanceCounterType.RawBase; - break; - case "counterMultiBase": - type = System.Diagnostics.PerformanceCounterType.CounterMultiBase; - break; - case "rateOfCountsPerSecond64": - type = System.Diagnostics.PerformanceCounterType.RateOfCountsPerSecond64; - break; - case "rateOfCountsPerSecond32": - type = System.Diagnostics.PerformanceCounterType.RateOfCountsPerSecond32; - break; - case "countPerTimeInterval64": - type = System.Diagnostics.PerformanceCounterType.CountPerTimeInterval64; - break; - case "countPerTimeInterval32": - type = System.Diagnostics.PerformanceCounterType.CountPerTimeInterval32; - break; - case "sampleCounter": - type = System.Diagnostics.PerformanceCounterType.SampleCounter; - break; - case "counterDelta64": - type = System.Diagnostics.PerformanceCounterType.CounterDelta64; - break; - case "numberOfItems64": - type = System.Diagnostics.PerformanceCounterType.NumberOfItems64; - break; - case "numberOfItems32": - type = System.Diagnostics.PerformanceCounterType.NumberOfItems32; - break; - case "numberOfItemsHEX64": - type = System.Diagnostics.PerformanceCounterType.NumberOfItemsHEX64; - break; - case "numberOfItemsHEX32": - type = System.Diagnostics.PerformanceCounterType.NumberOfItemsHEX32; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalEmptyAttributeValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName)); - break; - } - } - - return type; - } - - /// - /// Parses a perf counter element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Identifier of referenced file. - private void ParsePerfCounterElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string name = null; - - this.Messaging.Write(UtilWarnings.DeprecatedPerfCounterElement(sourceLineNumbers)); - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == name) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new PerfmonSymbol(sourceLineNumbers) - { - ComponentRef = componentId, - File = $"[#{fileId}]", - Name = name, - }); - } - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - - /// - /// Parses a perf manifest element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Identifier of referenced file. - private void ParsePerfCounterManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string resourceFileDirectory = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "ResourceFileDirectory": - resourceFileDirectory = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new PerfmonManifestSymbol(sourceLineNumbers) - { - ComponentRef = componentId, - File = $"[#{fileId}]", - ResourceFileDirectory = resourceFileDirectory, - }); - } - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - /// - /// Parses a format files element. - /// - /// Element to parse. - /// Identifier of referenced file. - /// Flag to determine whether the component is 64-bit. - private void ParseFormatFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId, bool win64) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string binaryId = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "BinaryRef": - binaryId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (null == binaryId) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryRef")); - } - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) - { - BinaryRef = binaryId, - FileRef = fileId, - }); - - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryId); - } - } - - /// - /// Parses a event manifest element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Identifier of referenced file. - private void ParseEventManifestElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string messageFile = null; - string resourceFile = null; - string parameterFile = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "MessageFile": - messageFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ResourceFile": - resourceFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ParameterFile": - parameterFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new EventManifestSymbol(sourceLineNumbers) - { - ComponentRef = componentId, - File = $"[#{fileId}]", - }); - - if (null != messageFile) - { - section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}MessageFile")) - { - File = $"[#{fileId}]", - ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", - Name = "messageFileName", - Value = messageFile, - Flags = 4 | 0x00001000, //bulk write | preserve modified date - ComponentRef = componentId, - }); - } - if (null != parameterFile) - { - section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}ParameterFile")) - { - File = $"[#{fileId}]", - ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", - Name = "parameterFileName", - Value = parameterFile, - Flags = 4 | 0x00001000, //bulk write | preserve modified date - ComponentRef = componentId, - }); - } - if (null != resourceFile) - { - section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, $"Config_{fileId}ResourceFile")) - { - File = $"[#{fileId}]", - ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", - Name = "resourceFileName", - Value = resourceFile, - Flags = 4 | 0x00001000, //bulk write | preserve modified date - ComponentRef = componentId, - }); - } - - } - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - if (null != messageFile || null != parameterFile || null != resourceFile) - { - this.AddReferenceToSchedXmlFile(sourceLineNumbers, section); - } - } - - /// - /// Parses a PermissionEx element. - /// - /// Element to parse. - /// Identifier of object to be secured. - /// Identifier of component, used to determine install state. - /// Flag to determine whether the component is 64-bit. - /// Name of table that contains objectId. - private void ParsePermissionExElement(Intermediate intermediate, IntermediateSection section, XElement element, string objectId, string componentId, bool win64, string tableName) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - var bits = new BitArray(32); - string domain = null; - string[] specialPermissions = null; - string user = null; - var attributes = WixPermissionExAttributes.Inheritable; // default to inheritable. - - var permissionType = PermissionType.SecureObjects; - - switch (tableName) - { - case "CreateFolder": - specialPermissions = UtilConstants.FolderPermissions; - break; - case "File": - specialPermissions = UtilConstants.FilePermissions; - break; - case "Registry": - specialPermissions = UtilConstants.RegistryPermissions; - if (String.IsNullOrEmpty(objectId)) - { - this.Messaging.Write(UtilErrors.InvalidRegistryObject(sourceLineNumbers, element.Parent.Name.LocalName)); - } - break; - case "ServiceInstall": - specialPermissions = UtilConstants.ServicePermissions; - permissionType = PermissionType.SecureObjects; - break; - default: - this.ParseHelper.UnexpectedElement(element.Parent, element); - break; - } - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Domain": - if (PermissionType.FileSharePermissions == permissionType) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); - } - domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Inheritable": - if (this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.No) - { - attributes &= ~WixPermissionExAttributes.Inheritable; - } - break; - case "User": - user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - if (!this.TrySetBitFromName(UtilConstants.StandardPermissions, attrib.Name.LocalName, attribValue, bits, 16)) - { - if (!this.TrySetBitFromName(UtilConstants.GenericPermissions, attrib.Name.LocalName, attribValue, bits, 28)) - { - if (!this.TrySetBitFromName(specialPermissions, attrib.Name.LocalName, attribValue, bits, 0)) - { - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - } - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - var permission = this.CreateIntegerFromBitArray(bits); - - if (null == user) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "User")); - } - - if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL - { - this.Messaging.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); - section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) - { - SecureObject = objectId, - Table = tableName, - Domain = domain, - User = user, - Attributes = attributes, - Permission = permission, - ComponentRef = componentId, - }); - } - } - - /// - /// Parses a ProductSearch element. - /// - /// Element to parse. - private void ParseProductSearchElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string variable = null; - string condition = null; - string after = null; - string productCode = null; - string upgradeCode = null; - var attributes = WixProductSearchAttributes.Version; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - case "Variable": - case "Condition": - case "After": - this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); - break; - case "ProductCode": - productCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); - break; - case "UpgradeCode": - upgradeCode = this.ParseHelper.GetAttributeGuidValue(sourceLineNumbers, attrib, false); - break; - case "Result": - var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (result) - { - case "version": - attributes = WixProductSearchAttributes.Version; - break; - case "language": - attributes = WixProductSearchAttributes.Language; - break; - case "state": - attributes = WixProductSearchAttributes.State; - break; - case "assignment": - attributes = WixProductSearchAttributes.Assignment; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "version", "language", "state", "assignment")); - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == upgradeCode && null == productCode) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ProductCode", "UpgradeCode", true)); - } - - if (null != upgradeCode && null != productCode) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "UpgradeCode", "ProductCode")); - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("wps", variable, condition, after, (productCode == null ? upgradeCode : productCode), attributes.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); - - if (!this.Messaging.EncounteredError) - { - // set an additional flag if this is an upgrade code - if (null != upgradeCode) - { - attributes |= WixProductSearchAttributes.UpgradeCode; - } - - section.AddSymbol(new WixProductSearchSymbol(sourceLineNumbers, id) - { - Guid = productCode ?? upgradeCode, - Attributes = attributes, - }); - } - } - - /// - /// Parses a RegistrySearch element. - /// - /// Element to parse. - private void ParseRegistrySearchElement(Intermediate intermediate, IntermediateSection section, XElement element) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string variable = null; - string condition = null; - string after = null; - RegistryRootType? root = null; - string key = null; - string value = null; - var expand = YesNoType.NotSet; - var win64 = this.Context.IsCurrentPlatform64Bit; - var attributes = WixRegistrySearchAttributes.Raw | WixRegistrySearchAttributes.WantValue; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - case "Variable": - case "Condition": - case "After": - this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after); - break; - case "Bitness": - var bitnessValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (bitnessValue) - { - case "always32": - win64 = false; - break; - case "always64": - win64 = true; - break; - case "default": - case "": - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Name.LocalName, attrib.Name.LocalName, bitnessValue, "default", "always32", "always64")); - break; - } - break; - case "Root": - root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); - break; - case "Key": - key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Value": - value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ExpandEnvironmentVariables": - expand = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "Format": - string format = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (format) - { - case "raw": - attributes |= WixRegistrySearchAttributes.Raw; - break; - case "compatible": - attributes |= WixRegistrySearchAttributes.Compatible; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, format, "raw", "compatible")); - break; - } - break; - case "Result": - var result = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (result) - { - case "exists": - attributes |= WixRegistrySearchAttributes.WantExists; - break; - case "value": - attributes |= WixRegistrySearchAttributes.WantValue; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Parent.Name.LocalName, attrib.Name.LocalName, result, "exists", "value")); - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (!root.HasValue) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); - } - - if (null == key) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("wrs", variable, condition, after, root.ToString(), key, value, attributes.ToString()); - } - - if (expand == YesNoType.Yes) - { - if (0 != (attributes & WixRegistrySearchAttributes.WantExists)) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "ExpandEnvironmentVariables", expand.ToString(), "Result", "exists")); - } - - attributes |= WixRegistrySearchAttributes.ExpandEnvironmentVariables; - } - - if (win64) - { - attributes |= WixRegistrySearchAttributes.Win64; - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new WixRegistrySearchSymbol(sourceLineNumbers, id) - { - Root = root.Value, - Key = key, - Value = value, - Attributes = attributes, - }); - } - } - - /// - /// Parses a RemoveFolderEx element. - /// - /// Element to parse. - /// Identifier of parent component. - private void ParseRemoveFolderExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - var mode = WixRemoveFolderExInstallMode.Uninstall; - string property = null; - string condition = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Condition": - condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "On": - var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - if (onValue.Length == 0) - { - } - else - { - switch (onValue) - { - case "install": - mode = WixRemoveFolderExInstallMode.Install; - break; - case "uninstall": - mode = WixRemoveFolderExInstallMode.Uninstall; - break; - case "both": - mode = WixRemoveFolderExInstallMode.Both; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", onValue, "install", "uninstall", "both")); - break; - } - } - break; - case "Property": - property = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (String.IsNullOrEmpty(property)) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Property")); - } - - if (id == null) - { - id = this.ParseHelper.CreateIdentifier("wrf", componentId, property, mode.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Property = property, - InstallMode = mode, - Condition = condition - }); - - this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveFile"); - } - } - - /// - /// Parses a RemoveRegistryKeyEx element. - /// - /// Element to parse. - /// Identifier of parent component. - private void ParseRemoveRegistryKeyExElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - var mode = WixRemoveRegistryKeyExInstallMode.Uninstall; - string condition = null; - RegistryRootType? root = null; - string key = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Condition": - condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "On": - var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (actionValue) - { - case "": - break; - case "install": - mode = WixRemoveRegistryKeyExInstallMode.Install; - break; - case "uninstall": - mode = WixRemoveRegistryKeyExInstallMode.Uninstall; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "On", actionValue, "install", "uninstall")); - break; - } - break; - case "Root": - root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false); - break; - case "Key": - key = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (!root.HasValue) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); - } - - if (key == null) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Key")); - } - - if (id == null) - { - id = this.ParseHelper.CreateIdentifier("rrx", componentId, condition, root.ToString(), key, mode.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.EnsureTable(section, sourceLineNumbers, "Registry"); - this.ParseHelper.EnsureTable(section, sourceLineNumbers, "RemoveRegistry"); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveRegistryKeysEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - section.AddSymbol(new WixRemoveRegistryKeyExSymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Root = root.Value, - Key = key, - InstallMode = mode, - Condition = condition - }); - } - } - - /// - /// Parses a RestartResource element. - /// - /// The element to parse. - /// The identity of the parent component. - private void ParseRestartResourceElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string resource = null; - WixRestartResourceAttributes? attributes = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - - case "Path": - resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - attributes = WixRestartResourceAttributes.Filename; - break; - - case "ProcessName": - resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - attributes = WixRestartResourceAttributes.ProcessName; - break; - - case "ServiceName": - resource = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - attributes = WixRestartResourceAttributes.ServiceName; - break; - - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - // Validate the attribute. - if (id == null) - { - id = this.ParseHelper.CreateIdentifier("wrr", componentId, resource, attributes.ToString()); - } - - if (!attributes.HasValue) - { - this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "Path", "ProcessName", "ServiceName")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Resource = resource, - Attributes = attributes, - }); - } - } - - /// - /// Parses a service configuration element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Name of parent element. - /// Optional name of service - private void ParseServiceConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string parentTableName, string parentTableServiceName) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - string firstFailureActionType = null; - var newService = false; - string programCommandLine = null; - string rebootMessage = null; - var resetPeriod = CompilerConstants.IntegerNotSet; - var restartServiceDelay = CompilerConstants.IntegerNotSet; - string secondFailureActionType = null; - string serviceName = null; - string thirdFailureActionType = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "FirstFailureActionType": - firstFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ProgramCommandLine": - programCommandLine = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "RebootMessage": - rebootMessage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ResetPeriodInDays": - resetPeriod = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - break; - case "RestartServiceDelayInSeconds": - restartServiceDelay = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); - break; - case "SecondFailureActionType": - secondFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ServiceName": - serviceName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ThirdFailureActionType": - thirdFailureActionType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - // if this element is a child of ServiceInstall then ignore the service name provided. - if ("ServiceInstall" == parentTableName) - { - // TODO: the ServiceName attribute should not be allowed in this case (the overwriting behavior may confuse users) - serviceName = parentTableServiceName; - newService = true; - } - else - { - // not a child of ServiceInstall, so ServiceName must have been provided - if (null == serviceName) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ServiceName")); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - - section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) - { - ServiceName = serviceName, - ComponentRef = componentId, - NewService = newService ? 1 : 0, - FirstFailureActionType = firstFailureActionType, - SecondFailureActionType = secondFailureActionType, - ThirdFailureActionType = thirdFailureActionType, - ResetPeriodInDays = resetPeriod, - RestartServiceDelayInSeconds = restartServiceDelay, - ProgramCommandLine = programCommandLine, - RebootMessage = rebootMessage, - }); - } - } - - /// - /// Parses a touch file element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Indicates whether the path is a 64-bit path. - private void ParseTouchFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool win64) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string path = null; - var onInstall = YesNoType.NotSet; - var onReinstall = YesNoType.NotSet; - var onUninstall = YesNoType.NotSet; - var nonvital = YesNoType.NotSet; - int attributes = 0; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Path": - path = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "OnInstall": - onInstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "OnReinstall": - onReinstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "OnUninstall": - onUninstall = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "Nonvital": - nonvital = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == path) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); - } - - // If none of the scheduling actions are set, default to touching on install and reinstall. - if (YesNoType.NotSet == onInstall && YesNoType.NotSet == onReinstall && YesNoType.NotSet == onUninstall) - { - onInstall = YesNoType.Yes; - onReinstall = YesNoType.Yes; - } - - attributes |= YesNoType.Yes == onInstall ? 0x1 : 0; - attributes |= YesNoType.Yes == onReinstall ? 0x2 : 0; - attributes |= YesNoType.Yes == onUninstall ? 0x4 : 0; - attributes |= win64 ? 0x10 : 0; - attributes |= YesNoType.Yes == nonvital ? 0 : 0x20; - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("tf", path, attributes.ToString()); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new WixTouchFileSymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Path = path, - Attributes = attributes, - }); - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - } - - /// - /// Parses an user element. - /// - /// Element to parse. - /// Optional identifier of parent component. - private void ParseUserElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - int attributes = 0; - string domain = null; - string name = null; - string password = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "CanNotChangePassword": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserPasswdCantChange; - } - break; - case "CreateUser": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserDontCreateUser; - } - break; - case "Disabled": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserDisableAccount; - } - break; - case "Domain": - domain = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "FailIfExists": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserFailIfExists; - } - break; - case "LogonAsService": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserLogonAsService; - } - break; - case "LogonAsBatchJob": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserLogonAsBatchJob; - } - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Password": - password = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "PasswordExpired": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserPasswdChangeReqdOnLogin; - } - break; - case "PasswordNeverExpires": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserDontExpirePasswrd; - } - break; - case "RemoveOnUninstall": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserDontRemoveOnUninstall; - } - break; - case "UpdateIfExists": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserUpdateIfExists; - } - break; - case "Vital": - if (null == componentId) - { - this.Messaging.Write(UtilErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName)); - } - - if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= UserNonVital; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("usr", componentId, name); - } - - if (null == name) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); - } - - foreach (var child in element.Elements()) - { - if (this.Namespace == child.Name.Namespace) - { - switch (child.Name.LocalName) - { - case "GroupRef": - if (null == componentId) - { - var childSourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(child); - this.Messaging.Write(UtilErrors.IllegalElementWithoutComponent(childSourceLineNumbers, child.Name.LocalName)); - } - - this.ParseGroupRefElement(intermediate, section, child, id.Id); - break; - default: - this.ParseHelper.UnexpectedElement(element, child); - break; - } - } - else - { - this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); - } - } - - if (null != componentId) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new UserSymbol(sourceLineNumbers, id) - { - ComponentRef = componentId, - Name = name, - Domain = domain, - Password = password, - Attributes = attributes, - }); - } - } - - /// - /// Parses a XmlFile element. - /// - /// Element to parse. - /// Identifier of parent component. - private void ParseXmlFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string file = null; - string elementPath = null; - string name = null; - string value = null; - int sequence = -1; - int flags = 0; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Action": - var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (actionValue) - { - case "createElement": - flags |= 0x00000001; // XMLFILE_CREATE_ELEMENT - break; - case "deleteValue": - flags |= 0x00000002; // XMLFILE_DELETE_VALUE - break; - case "bulkSetValue": - flags |= 0x00000004; // XMLFILE_BULKWRITE_VALUE - break; - case "setValue": - // no flag for set value since it's the default - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Action", actionValue, "createElement", "deleteValue", "setValue", "bulkSetValue")); - break; - } - break; - case "SelectionLanguage": - string selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (selectionLanguage) - { - case "XPath": - flags |= 0x00000100; // XMLFILE_USE_XPATH - break; - case "XSLPattern": - // no flag for since it's the default - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "SelectionLanguage", selectionLanguage, "XPath", "XSLPattern")); - break; - } - break; - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "File": - file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ElementPath": - elementPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Permanent": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - flags |= 0x00010000; // XMLFILE_DONT_UNINSTALL - } - break; - case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); - break; - case "Value": - value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "PreserveModifiedDate": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - flags |= 0x00001000; // XMLFILE_PRESERVE_MODIFIED - } - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("uxf", componentId, file, elementPath, name); - } - - if (null == file) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File")); - } - - if (null == elementPath) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ElementPath")); - } - - if ((0x00000001 /*XMLFILE_CREATE_ELEMENT*/ & flags) != 0 && null == name) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, element.Name.LocalName, "Action", "Name")); - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - - if (!this.Messaging.EncounteredError) - { - var symbol = section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, id) - { - File = file, - ElementPath = elementPath, - Name = name, - Value = value, - Flags = flags, - ComponentRef = componentId, - }); - if (-1 != sequence) - { - symbol.Sequence = sequence; - } - } - - this.AddReferenceToSchedXmlFile(sourceLineNumbers, section); - } - - /// - /// Parses a XmlConfig element. - /// - /// Element to parse. - /// Identifier of parent component. - /// Whether or not the element is nested. - private void ParseXmlConfigElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, bool nested) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); - Identifier id = null; - string elementId = null; - string elementPath = null; - int flags = 0; - string file = null; - string name = null; - var sequence = CompilerConstants.IntegerNotSet; - string value = null; - string verifyPath = null; - - foreach (var attrib in element.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Id": - id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); - break; - case "Action": - if (nested) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); - } - else - { - string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (actionValue) - { - case "create": - flags |= 0x10; // XMLCONFIG_CREATE - break; - case "delete": - flags |= 0x20; // XMLCONFIG_DELETE - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, actionValue, "create", "delete")); - break; - } - } - break; - case "ElementId": - elementId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ElementPath": - elementPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "File": - file = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Name": - name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Node": - if (nested) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); - } - else - { - var nodeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (nodeValue) - { - case "element": - flags |= 0x1; // XMLCONFIG_ELEMENT - break; - case "value": - flags |= 0x2; // XMLCONFIG_VALUE - break; - case "document": - flags |= 0x4; // XMLCONFIG_DOCUMENT - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, nodeValue, "element", "value", "document")); - break; - } - } - break; - case "On": - if (nested) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); - } - else - { - var onValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (onValue) - { - case "install": - flags |= 0x100; // XMLCONFIG_INSTALL - break; - case "uninstall": - flags |= 0x200; // XMLCONFIG_UNINSTALL - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, onValue, "install", "uninstall")); - break; - } - } - break; - case "PreserveModifiedDate": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - flags |= 0x00001000; // XMLCONFIG_PRESERVE_MODIFIED - } - break; - case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); - break; - case "Value": - value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "VerifyPath": - verifyPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(element, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib); - } - } - - if (null == id) - { - id = this.ParseHelper.CreateIdentifier("uxc", componentId, file, elementId, elementPath); - } - - if (null == file) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File")); - } - - if (null == elementId && null == elementPath) - { - this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "ElementPath")); - } - else if (null != elementId) - { - if (null != elementPath) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "ElementId", "ElementPath")); - } - - if (0 != flags) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On")); - } - - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId); - } - - // find unexpected child elements - foreach (var child in element.Elements()) - { - if (this.Namespace == child.Name.Namespace) - { - switch (child.Name.LocalName) - { - case "XmlConfig": - if (nested) - { - this.Messaging.Write(ErrorMessages.UnexpectedElement(sourceLineNumbers, element.Name.LocalName, child.Name.LocalName)); - } - else - { - this.ParseXmlConfigElement(intermediate, section, child, componentId, true); - } - break; - default: - this.ParseHelper.UnexpectedElement(element, child); - break; - } - } - else - { - this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child); - } - } - - if (!this.Messaging.EncounteredError) - { - var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id) - { - File = file, - ElementId = elementId, - ElementPath = elementPath, - VerifyPath = verifyPath, - Name = name, - Value = value, - Flags = flags, - ComponentRef = componentId, - }); - - if (CompilerConstants.IntegerNotSet != sequence) - { - symbol.Sequence = sequence; - } - } - - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - /// - /// Match evaluator to escape properties in a string. - /// - private string EscapeProperties(Match match) - { - string escape = null; - switch (match.Value) - { - case "[": - escape = @"[\[]"; - break; - case "]": - escape = @"[\]]"; - break; - } - - return escape; - } - - private int CreateIntegerFromBitArray(BitArray bits) - { - if (32 != bits.Length) - { - throw new ArgumentException(String.Format("Can only convert a bit array with 32-bits to integer. Actual number of bits in array: {0}", bits.Length), "bits"); - } - - var intArray = new int[1]; - bits.CopyTo(intArray, 0); - - return intArray[0]; - } - - private bool TrySetBitFromName(string[] attributeNames, string attributeName, YesNoType attributeValue, BitArray bits, int offset) - { - for (var i = 0; i < attributeNames.Length; i++) - { - if (attributeName.Equals(attributeNames[i], StringComparison.Ordinal)) - { - bits.Set(i + offset, YesNoType.Yes == attributeValue); - return true; - } - } - - return false; - } - - private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) - { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - } - - /// - /// Private class that stores the data from a parsed PerformanceCounter element. - /// - private class ParsedPerformanceCounter - { - internal ParsedPerformanceCounter(string name, string help, System.Diagnostics.PerformanceCounterType type, int language) - { - this.Name = name; - this.Help = help; - this.Type = (int)type; - this.Language = language.ToString("D3", CultureInfo.InvariantCulture); - } - - internal string Name { get; } - - internal string Help { get; } - - internal int Type { get; } - - internal string Language { get; } - } - } -} diff --git a/src/wixext/UtilConstants.cs b/src/wixext/UtilConstants.cs deleted file mode 100644 index 28ff368f..00000000 --- a/src/wixext/UtilConstants.cs +++ /dev/null @@ -1,17 +0,0 @@ -// 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.Util -{ - /// - /// Constants used by Utility Extension. - /// - internal static class UtilConstants - { - internal static readonly string[] FilePermissions = { "Read", "Write", "Append", "ReadExtendedAttributes", "WriteExtendedAttributes", "Execute", null, "ReadAttributes", "WriteAttributes" }; - internal static readonly string[] FolderPermissions = { "Read", "CreateFile", "CreateChild", "ReadExtendedAttributes", "WriteExtendedAttributes", "Traverse", "DeleteChild", "ReadAttributes", "WriteAttributes" }; - internal static readonly string[] GenericPermissions = { "GenericAll", "GenericExecute", "GenericWrite", "GenericRead" }; - internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" }; - internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" }; - internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" }; - } -} diff --git a/src/wixext/UtilDecompiler.cs b/src/wixext/UtilDecompiler.cs deleted file mode 100644 index 9ef3390f..00000000 --- a/src/wixext/UtilDecompiler.cs +++ /dev/null @@ -1,1543 +0,0 @@ -// 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 -{ -#if TODO_CONSIDER_DECOMPILER - using System; - using System.IO; - using System.Text; - using System.Collections; - using System.Diagnostics; - using System.Globalization; - - using Util = WixToolset.Extensions.Serialize.Util; - using WixToolset.Data; - using WixToolset.Extensibility; - using Wix = WixToolset.Data.Serialize; - - /// - /// The decompiler for the WiX Toolset Utility Extension. - /// - public sealed class UtilDecompiler : DecompilerExtension - { - /// - /// Creates a decompiler for Utility Extension. - /// - public UtilDecompiler() - { - this.TableDefinitions = UtilExtensionData.GetExtensionTableDefinitions(); - } - - /// - /// Get the extensions library to be removed. - /// - /// Table definitions for library. - /// Library to remove from decompiled output. - public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions) - { - return UtilExtensionData.GetExtensionLibrary(tableDefinitions); - } - - /// - /// Called at the beginning of the decompilation of a database. - /// - /// The collection of all tables. - public override void Initialize(TableIndexedCollection tables) - { - this.CleanupSecureCustomProperties(tables); - this.CleanupInternetShortcutRemoveFileTables(tables); - } - - /// - /// Decompile the SecureCustomProperties field to PropertyRefs for known extension properties. - /// - /// - /// If we've referenced any of the suite or directory properties, add - /// a PropertyRef to refer to the Property (and associated custom action) - /// from the extension's library. Then remove the property from - /// SecureCustomExtensions property so later decompilation won't create - /// new Property elements. - /// - /// The collection of all tables. - private void CleanupSecureCustomProperties(TableIndexedCollection tables) - { - Table propertyTable = tables["Property"]; - - if (null != propertyTable) - { - foreach (Row row in propertyTable.Rows) - { - if ("SecureCustomProperties" == row[0].ToString()) - { - StringBuilder remainingProperties = new StringBuilder(); - string[] secureCustomProperties = row[1].ToString().Split(';'); - foreach (string property in secureCustomProperties) - { - if (property.StartsWith("WIX_SUITE_", StringComparison.Ordinal) || property.StartsWith("WIX_DIR_", StringComparison.Ordinal) - || property.StartsWith("WIX_ACCOUNT_", StringComparison.Ordinal)) - { - 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; - } - } - } - } - - /// - /// Remove RemoveFile rows that the InternetShortcut compiler extension adds for us. - /// - /// The collection of all tables. - private void CleanupInternetShortcutRemoveFileTables(TableIndexedCollection tables) - { - // index the WixInternetShortcut table - Table wixInternetShortcutTable = tables["WixInternetShortcut"]; - Hashtable wixInternetShortcuts = new Hashtable(); - if (null != wixInternetShortcutTable) - { - foreach (Row row in wixInternetShortcutTable.Rows) - { - wixInternetShortcuts.Add(row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), row); - } - } - - // remove the RemoveFile rows with primary keys that match the WixInternetShortcut table's - Table removeFileTable = tables["RemoveFile"]; - if (null != removeFileTable) - { - for (int i = removeFileTable.Rows.Count - 1; 0 <= i; i--) - { - if (null != wixInternetShortcuts[removeFileTable.Rows[i][0]]) - { - removeFileTable.Rows.RemoveAt(i); - } - } - } - } - - /// - /// Decompiles an extension table. - /// - /// The table to decompile. - public override void DecompileTable(Table table) - { - switch (table.Name) - { - case "WixCloseApplication": - this.DecompileWixCloseApplicationTable(table); - break; - case "WixRemoveFolderEx": - this.DecompileWixRemoveFolderExTable(table); - break; - case "WixRestartResource": - this.DecompileWixRestartResourceTable(table); - break; - case "FileShare": - this.DecompileFileShareTable(table); - break; - case "FileSharePermissions": - this.DecompileFileSharePermissionsTable(table); - break; - case "WixInternetShortcut": - this.DecompileWixInternetShortcutTable(table); - break; - case "Group": - this.DecompileGroupTable(table); - break; - case "Perfmon": - this.DecompilePerfmonTable(table); - break; - case "PerfmonManifest": - this.DecompilePerfmonManifestTable(table); - break; - case "EventManifest": - this.DecompileEventManifestTable(table); - break; - case "SecureObjects": - this.DecompileSecureObjectsTable(table); - break; - case "ServiceConfig": - this.DecompileServiceConfigTable(table); - break; - case "User": - this.DecompileUserTable(table); - break; - case "UserGroup": - this.DecompileUserGroupTable(table); - break; - case "XmlConfig": - this.DecompileXmlConfigTable(table); - break; - case "XmlFile": - // XmlFile decompilation has been moved to FinalizeXmlFileTable function - break; - default: - base.DecompileTable(table); - break; - } - } - - /// - /// Finalize decompilation. - /// - /// The collection of all tables. - public override void Finish(TableIndexedCollection tables) - { - this.FinalizePerfmonTable(tables); - this.FinalizePerfmonManifestTable(tables); - this.FinalizeSecureObjectsTable(tables); - this.FinalizeServiceConfigTable(tables); - this.FinalizeXmlConfigTable(tables); - this.FinalizeXmlFileTable(tables); - this.FinalizeEventManifestTable(tables); - } - - /// - /// Decompile the WixCloseApplication table. - /// - /// The table to decompile. - private void DecompileWixCloseApplicationTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.CloseApplication closeApplication = new Util.CloseApplication(); - - closeApplication.Id = (string)row[0]; - - closeApplication.Target = (string)row[1]; - - if (null != row[2]) - { - closeApplication.Description = (string)row[2]; - } - - if (null != row[3]) - { - closeApplication.Content = (string)row[3]; - } - - // set defaults - closeApplication.CloseMessage = Util.YesNoType.no; - closeApplication.RebootPrompt = Util.YesNoType.yes; - closeApplication.ElevatedCloseMessage = Util.YesNoType.no; - - if (null != row[4]) - { - int attribute = (int)row[4]; - - closeApplication.CloseMessage = (0x1 == (attribute & 0x1)) ? Util.YesNoType.yes : Util.YesNoType.no; - closeApplication.RebootPrompt = (0x2 == (attribute & 0x2)) ? Util.YesNoType.yes : Util.YesNoType.no; - closeApplication.ElevatedCloseMessage = (0x4 == (attribute & 0x4)) ? Util.YesNoType.yes : Util.YesNoType.no; - } - - if (null != row[5]) - { - closeApplication.Sequence = (int)row[5]; - } - - if (null != row[6]) - { - closeApplication.Property = (string)row[6]; - } - - this.Core.RootElement.AddChild(closeApplication); - } - } - - /// - /// Decompile the WixRemoveFolderEx table. - /// - /// The table to decompile. - private void DecompileWixRemoveFolderExTable(Table table) - { - foreach (Row row in table.Rows) - { - // Set the Id even if auto-generated previously. - Util.RemoveFolderEx removeFolder = new Util.RemoveFolderEx(); - removeFolder.Id = (string)row[0]; - removeFolder.Property = (string)row[2]; - - int installMode = (int)row[3]; - switch ((UtilCompiler.WixRemoveFolderExOn)installMode) - { - case UtilCompiler.WixRemoveFolderExOn.Install: - removeFolder.On = Util.RemoveFolderEx.OnType.install; - break; - - case UtilCompiler.WixRemoveFolderExOn.Uninstall: - removeFolder.On = Util.RemoveFolderEx.OnType.uninstall; - break; - - case UtilCompiler.WixRemoveFolderExOn.Both: - removeFolder.On = Util.RemoveFolderEx.OnType.both; - break; - - default: - this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "InstallMode", installMode)); - break; - } - - // Add to the appropriate Component or section element. - string componentId = (string)row[1]; - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", componentId); - if (null != component) - { - component.AddChild(removeFolder); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", componentId, "Component")); - } - } - } - - /// - /// Decompile the WixRestartResource table. - /// - /// The table to decompile. - private void DecompileWixRestartResourceTable(Table table) - { - foreach (Row row in table.Rows) - { - // Set the Id even if auto-generated previously. - Util.RestartResource restartResource = new Util.RestartResource(); - restartResource.Id = (string)row[0]; - - // Determine the resource type and set accordingly. - string resource = (string)row[2]; - int attributes = (int)row[3]; - UtilCompiler.WixRestartResourceAttributes type = (UtilCompiler.WixRestartResourceAttributes)(attributes & (int)UtilCompiler.WixRestartResourceAttributes.TypeMask); - - switch (type) - { - case UtilCompiler.WixRestartResourceAttributes.Filename: - restartResource.Path = resource; - break; - - case UtilCompiler.WixRestartResourceAttributes.ProcessName: - restartResource.ProcessName = resource; - break; - - case UtilCompiler.WixRestartResourceAttributes.ServiceName: - restartResource.ServiceName = resource; - break; - - default: - this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Attributes", attributes)); - break; - } - - // Add to the appropriate Component or section element. - string componentId = (string)row[1]; - if (!String.IsNullOrEmpty(componentId)) - { - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", componentId); - if (null != component) - { - component.AddChild(restartResource); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", componentId, "Component")); - } - } - else - { - this.Core.RootElement.AddChild(restartResource); - } - } - } - - /// - /// Decompile the FileShare table. - /// - /// The table to decompile. - private void DecompileFileShareTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.FileShare fileShare = new Util.FileShare(); - - fileShare.Id = (string)row[0]; - - fileShare.Name = (string)row[1]; - - if (null != row[3]) - { - fileShare.Description = (string)row[3]; - } - - // the Directory_ column is set by the parent Component - - // the User_ and Permissions columns are deprecated - - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]); - if (null != component) - { - component.AddChild(fileShare); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component")); - } - this.Core.IndexElement(row, fileShare); - } - } - - /// - /// Decompile the FileSharePermissions table. - /// - /// The table to decompile. - private void DecompileFileSharePermissionsTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.FileSharePermission fileSharePermission = new Util.FileSharePermission(); - - fileSharePermission.User = (string)row[1]; - - string[] specialPermissions = UtilConstants.FolderPermissions; - int permissions = (int)row[2]; - for (int i = 0; i < 32; i++) - { - if (0 != ((permissions >> i) & 1)) - { - string name = null; - - if (16 > i && specialPermissions.Length > i) - { - name = specialPermissions[i]; - } - else if (28 > i && UtilConstants.StandardPermissions.Length > (i - 16)) - { - name = UtilConstants.StandardPermissions[i - 16]; - } - else if (0 <= (i - 28) && UtilConstants.GenericPermissions.Length > (i - 28)) - { - name = UtilConstants.GenericPermissions[i - 28]; - } - - if (null == name) - { - this.Core.OnMessage(WixWarnings.UnknownPermission(row.SourceLineNumbers, row.Table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), i)); - } - else - { - switch (name) - { - case "ChangePermission": - fileSharePermission.ChangePermission = Util.YesNoType.yes; - break; - case "CreateChild": - fileSharePermission.CreateChild = Util.YesNoType.yes; - break; - case "CreateFile": - fileSharePermission.CreateFile = Util.YesNoType.yes; - break; - case "Delete": - fileSharePermission.Delete = Util.YesNoType.yes; - break; - case "DeleteChild": - fileSharePermission.DeleteChild = Util.YesNoType.yes; - break; - case "GenericAll": - fileSharePermission.GenericAll = Util.YesNoType.yes; - break; - case "GenericExecute": - fileSharePermission.GenericExecute = Util.YesNoType.yes; - break; - case "GenericRead": - fileSharePermission.GenericRead = Util.YesNoType.yes; - break; - case "GenericWrite": - fileSharePermission.GenericWrite = Util.YesNoType.yes; - break; - case "Read": - fileSharePermission.Read = Util.YesNoType.yes; - break; - case "ReadAttributes": - fileSharePermission.ReadAttributes = Util.YesNoType.yes; - break; - case "ReadExtendedAttributes": - fileSharePermission.ReadExtendedAttributes = Util.YesNoType.yes; - break; - case "ReadPermission": - fileSharePermission.ReadPermission = Util.YesNoType.yes; - break; - case "Synchronize": - fileSharePermission.Synchronize = Util.YesNoType.yes; - break; - case "TakeOwnership": - fileSharePermission.TakeOwnership = Util.YesNoType.yes; - break; - case "Traverse": - fileSharePermission.Traverse = Util.YesNoType.yes; - break; - case "WriteAttributes": - fileSharePermission.WriteAttributes = Util.YesNoType.yes; - break; - case "WriteExtendedAttributes": - fileSharePermission.WriteExtendedAttributes = Util.YesNoType.yes; - break; - default: - Debug.Fail(String.Format("Unknown permission '{0}'.", name)); - break; - } - } - } - } - - Util.FileShare fileShare = (Util.FileShare)this.Core.GetIndexedElement("FileShare", (string)row[0]); - if (null != fileShare) - { - fileShare.AddChild(fileSharePermission); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "FileShare_", (string)row[0], "FileShare")); - } - } - } - - /// - /// Decompile the Group table. - /// - /// The table to decompile. - private void DecompileGroupTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.Group group = new Util.Group(); - - group.Id = (string)row[0]; - - if (null != row[1]) - { - this.Core.OnMessage(WixWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Component_", (string)row[1])); - } - - group.Name = (string)row[2]; - - if (null != row[3]) - { - group.Domain = (string)row[3]; - } - - this.Core.RootElement.AddChild(group); - } - } - - /// - /// Decompile the WixInternetShortcut table. - /// - /// The table to decompile. - private void DecompileWixInternetShortcutTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.InternetShortcut internetShortcut = new Util.InternetShortcut(); - internetShortcut.Id = (string)row[0]; - internetShortcut.Directory = (string)row[2]; - // remove .lnk/.url extension because compiler extension adds it back for us - internetShortcut.Name = Path.ChangeExtension((string)row[3], null); - internetShortcut.Target = (string)row[4]; - internetShortcut.IconFile = (string)row[6]; - internetShortcut.IconIndex = (int)row[7]; - - UtilCompiler.InternetShortcutType shortcutType = (UtilCompiler.InternetShortcutType)row[5]; - switch (shortcutType) - { - case UtilCompiler.InternetShortcutType.Link: - internetShortcut.Type = Util.InternetShortcut.TypeType.link; - break; - case UtilCompiler.InternetShortcutType.Url: - internetShortcut.Type = Util.InternetShortcut.TypeType.url; - break; - } - - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); - if (null != component) - { - component.AddChild(internetShortcut); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); - } - - this.Core.IndexElement(row, internetShortcut); - } - } - - /// - /// Decompile the Perfmon table. - /// - /// The table to decompile. - private void DecompilePerfmonTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.PerfCounter perfCounter = new Util.PerfCounter(); - - perfCounter.Name = (string)row[2]; - - this.Core.IndexElement(row, perfCounter); - } - } - - /// - /// Decompile the PerfmonManifest table. - /// - /// The table to decompile. - private void DecompilePerfmonManifestTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.PerfCounterManifest perfCounterManifest = new Util.PerfCounterManifest(); - - perfCounterManifest.ResourceFileDirectory = (string)row[2]; - - this.Core.IndexElement(row, perfCounterManifest); - } - } - - /// - /// Decompile the EventManifest table. - /// - /// The table to decompile. - private void DecompileEventManifestTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.EventManifest eventManifest = new Util.EventManifest(); - this.Core.IndexElement(row, eventManifest); - } - } - - /// - /// Decompile the SecureObjects table. - /// - /// The table to decompile. - private void DecompileSecureObjectsTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.PermissionEx permissionEx = new Util.PermissionEx(); - - string[] specialPermissions; - switch ((string)row[1]) - { - case "CreateFolder": - specialPermissions = UtilConstants.FolderPermissions; - break; - case "File": - specialPermissions = UtilConstants.FilePermissions; - break; - case "Registry": - specialPermissions = UtilConstants.RegistryPermissions; - break; - case "ServiceInstall": - specialPermissions = UtilConstants.ServicePermissions; - break; - default: - this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, row.Table.Name, row.Fields[1].Column.Name, row[1])); - return; - } - - int permissionBits = (int)row[4]; - for (int i = 0; i < 32; i++) - { - if (0 != ((permissionBits >> i) & 1)) - { - string name = null; - - if (16 > i && specialPermissions.Length > i) - { - name = specialPermissions[i]; - } - else if (28 > i && UtilConstants.StandardPermissions.Length > (i - 16)) - { - name = UtilConstants.StandardPermissions[i - 16]; - } - else if (0 <= (i - 28) && UtilConstants.GenericPermissions.Length > (i - 28)) - { - name = UtilConstants.GenericPermissions[i - 28]; - } - - if (null == name) - { - this.Core.OnMessage(WixWarnings.UnknownPermission(row.SourceLineNumbers, row.Table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), i)); - } - else - { - switch (name) - { - case "Append": - permissionEx.Append = Util.YesNoType.yes; - break; - case "ChangePermission": - permissionEx.ChangePermission = Util.YesNoType.yes; - break; - case "CreateChild": - permissionEx.CreateChild = Util.YesNoType.yes; - break; - case "CreateFile": - permissionEx.CreateFile = Util.YesNoType.yes; - break; - case "CreateLink": - permissionEx.CreateLink = Util.YesNoType.yes; - break; - case "CreateSubkeys": - permissionEx.CreateSubkeys = Util.YesNoType.yes; - break; - case "Delete": - permissionEx.Delete = Util.YesNoType.yes; - break; - case "DeleteChild": - permissionEx.DeleteChild = Util.YesNoType.yes; - break; - case "EnumerateSubkeys": - permissionEx.EnumerateSubkeys = Util.YesNoType.yes; - break; - case "Execute": - permissionEx.Execute = Util.YesNoType.yes; - break; - case "GenericAll": - permissionEx.GenericAll = Util.YesNoType.yes; - break; - case "GenericExecute": - permissionEx.GenericExecute = Util.YesNoType.yes; - break; - case "GenericRead": - permissionEx.GenericRead = Util.YesNoType.yes; - break; - case "GenericWrite": - permissionEx.GenericWrite = Util.YesNoType.yes; - break; - case "Notify": - permissionEx.Notify = Util.YesNoType.yes; - break; - case "Read": - permissionEx.Read = Util.YesNoType.yes; - break; - case "ReadAttributes": - permissionEx.ReadAttributes = Util.YesNoType.yes; - break; - case "ReadExtendedAttributes": - permissionEx.ReadExtendedAttributes = Util.YesNoType.yes; - break; - case "ReadPermission": - permissionEx.ReadPermission = Util.YesNoType.yes; - break; - case "ServiceChangeConfig": - permissionEx.ServiceChangeConfig = Util.YesNoType.yes; - break; - case "ServiceEnumerateDependents": - permissionEx.ServiceEnumerateDependents = Util.YesNoType.yes; - break; - case "ServiceInterrogate": - permissionEx.ServiceInterrogate = Util.YesNoType.yes; - break; - case "ServicePauseContinue": - permissionEx.ServicePauseContinue = Util.YesNoType.yes; - break; - case "ServiceQueryConfig": - permissionEx.ServiceQueryConfig = Util.YesNoType.yes; - break; - case "ServiceQueryStatus": - permissionEx.ServiceQueryStatus = Util.YesNoType.yes; - break; - case "ServiceStart": - permissionEx.ServiceStart = Util.YesNoType.yes; - break; - case "ServiceStop": - permissionEx.ServiceStop = Util.YesNoType.yes; - break; - case "ServiceUserDefinedControl": - permissionEx.ServiceUserDefinedControl = Util.YesNoType.yes; - break; - case "Synchronize": - permissionEx.Synchronize = Util.YesNoType.yes; - break; - case "TakeOwnership": - permissionEx.TakeOwnership = Util.YesNoType.yes; - break; - case "Traverse": - permissionEx.Traverse = Util.YesNoType.yes; - break; - case "Write": - permissionEx.Write = Util.YesNoType.yes; - break; - case "WriteAttributes": - permissionEx.WriteAttributes = Util.YesNoType.yes; - break; - case "WriteExtendedAttributes": - permissionEx.WriteExtendedAttributes = Util.YesNoType.yes; - break; - default: - throw new InvalidOperationException(String.Format("Unknown permission attribute '{0}'.", name)); - } - } - } - } - - if (null != row[2]) - { - permissionEx.Domain = (string)row[2]; - } - - permissionEx.User = (string)row[3]; - - this.Core.IndexElement(row, permissionEx); - } - } - - /// - /// Decompile the ServiceConfig table. - /// - /// The table to decompile. - private void DecompileServiceConfigTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.ServiceConfig serviceConfig = new Util.ServiceConfig(); - - serviceConfig.ServiceName = (string)row[0]; - - switch ((string)row[3]) - { - case "none": - serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.none; - break; - case "reboot": - serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.reboot; - break; - case "restart": - serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.restart; - break; - case "runCommand": - serviceConfig.FirstFailureActionType = Util.ServiceConfig.FirstFailureActionTypeType.runCommand; - break; - default: - this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[3].Column.Name, row[3])); - break; - } - - switch ((string)row[4]) - { - case "none": - serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.none; - break; - case "reboot": - serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.reboot; - break; - case "restart": - serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.restart; - break; - case "runCommand": - serviceConfig.SecondFailureActionType = Util.ServiceConfig.SecondFailureActionTypeType.runCommand; - break; - default: - this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[4].Column.Name, row[4])); - break; - } - - switch ((string)row[5]) - { - case "none": - serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.none; - break; - case "reboot": - serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.reboot; - break; - case "restart": - serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.restart; - break; - case "runCommand": - serviceConfig.ThirdFailureActionType = Util.ServiceConfig.ThirdFailureActionTypeType.runCommand; - break; - default: - this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[5].Column.Name, row[5])); - break; - } - - if (null != row[6]) - { - serviceConfig.ResetPeriodInDays = (int)row[6]; - } - - if (null != row[7]) - { - serviceConfig.RestartServiceDelayInSeconds = (int)row[7]; - } - - if (null != row[8]) - { - serviceConfig.ProgramCommandLine = (string)row[8]; - } - - if (null != row[9]) - { - serviceConfig.RebootMessage = (string)row[9]; - } - - this.Core.IndexElement(row, serviceConfig); - } - } - - /// - /// Decompile the User table. - /// - /// The table to decompile. - private void DecompileUserTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.User user = new Util.User(); - - user.Id = (string)row[0]; - - user.Name = (string)row[2]; - - if (null != row[3]) - { - user.Domain = (string)row[3]; - } - - if (null != row[4]) - { - user.Password = (string)row[4]; - } - - if (null != row[5]) - { - int attributes = (int)row[5]; - - if (UtilCompiler.UserDontExpirePasswrd == (attributes & UtilCompiler.UserDontExpirePasswrd)) - { - user.PasswordNeverExpires = Util.YesNoType.yes; - } - - if (UtilCompiler.UserPasswdCantChange == (attributes & UtilCompiler.UserPasswdCantChange)) - { - user.CanNotChangePassword = Util.YesNoType.yes; - } - - if (UtilCompiler.UserPasswdChangeReqdOnLogin == (attributes & UtilCompiler.UserPasswdChangeReqdOnLogin)) - { - user.PasswordExpired = Util.YesNoType.yes; - } - - if (UtilCompiler.UserDisableAccount == (attributes & UtilCompiler.UserDisableAccount)) - { - user.Disabled = Util.YesNoType.yes; - } - - if (UtilCompiler.UserFailIfExists == (attributes & UtilCompiler.UserFailIfExists)) - { - user.FailIfExists = Util.YesNoType.yes; - } - - if (UtilCompiler.UserUpdateIfExists == (attributes & UtilCompiler.UserUpdateIfExists)) - { - user.UpdateIfExists = Util.YesNoType.yes; - } - - if (UtilCompiler.UserLogonAsService == (attributes & UtilCompiler.UserLogonAsService)) - { - user.LogonAsService = Util.YesNoType.yes; - } - - if (UtilCompiler.UserDontRemoveOnUninstall == (attributes & UtilCompiler.UserDontRemoveOnUninstall)) - { - user.RemoveOnUninstall = Util.YesNoType.no; - } - - if (UtilCompiler.UserDontCreateUser == (attributes & UtilCompiler.UserDontCreateUser)) - { - user.CreateUser = Util.YesNoType.no; - } - - if (UtilCompiler.UserNonVital == (attributes & UtilCompiler.UserNonVital)) - { - user.Vital = Util.YesNoType.no; - } - } - - if (null != row[1]) - { - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); - - if (null != component) - { - component.AddChild(user); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); - } - } - else - { - this.Core.RootElement.AddChild(user); - } - this.Core.IndexElement(row, user); - } - } - - /// - /// Decompile the UserGroup table. - /// - /// The table to decompile. - private void DecompileUserGroupTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.User user = (Util.User)this.Core.GetIndexedElement("User", (string)row[0]); - - if (null != user) - { - Util.GroupRef groupRef = new Util.GroupRef(); - - groupRef.Id = (string)row[1]; - - user.AddChild(groupRef); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Group_", (string)row[0], "Group")); - } - } - } - - /// - /// Decompile the XmlConfig table. - /// - /// The table to decompile. - private void DecompileXmlConfigTable(Table table) - { - foreach (Row row in table.Rows) - { - Util.XmlConfig xmlConfig = new Util.XmlConfig(); - - xmlConfig.Id = (string)row[0]; - - xmlConfig.File = (string)row[1]; - - xmlConfig.ElementPath = (string)row[2]; - - if (null != row[3]) - { - xmlConfig.VerifyPath = (string)row[3]; - } - - if (null != row[4]) - { - xmlConfig.Name = (string)row[4]; - } - - if (null != row[5]) - { - xmlConfig.Value = (string)row[5]; - } - - int flags = (int)row[6]; - - if (0x1 == (flags & 0x1)) - { - xmlConfig.Node = Util.XmlConfig.NodeType.element; - } - else if (0x2 == (flags & 0x2)) - { - xmlConfig.Node = Util.XmlConfig.NodeType.value; - } - else if (0x4 == (flags & 0x4)) - { - xmlConfig.Node = Util.XmlConfig.NodeType.document; - } - - if (0x10 == (flags & 0x10)) - { - xmlConfig.Action = Util.XmlConfig.ActionType.create; - } - else if (0x20 == (flags & 0x20)) - { - xmlConfig.Action = Util.XmlConfig.ActionType.delete; - } - - if (0x100 == (flags & 0x100)) - { - xmlConfig.On = Util.XmlConfig.OnType.install; - } - else if (0x200 == (flags & 0x200)) - { - xmlConfig.On = Util.XmlConfig.OnType.uninstall; - } - - if (0x00001000 == (flags & 0x00001000)) - { - xmlConfig.PreserveModifiedDate = Util.YesNoType.yes; - } - - if (null != row[8]) - { - xmlConfig.Sequence = (int)row[8]; - } - - this.Core.IndexElement(row, xmlConfig); - } - } - - /// - /// Finalize the Perfmon table. - /// - /// The collection of all tables. - /// - /// Since the PerfCounter element nests under a File element, but - /// the Perfmon table does not have a foreign key relationship with - /// the File table (instead it has a formatted string that usually - /// refers to a file row - but doesn't have to), the nesting must - /// be inferred during finalization. - /// - private void FinalizePerfmonTable(TableIndexedCollection tables) - { - Table perfmonTable = tables["Perfmon"]; - - if (null != perfmonTable) - { - foreach (Row row in perfmonTable.Rows) - { - string formattedFile = (string)row[1]; - Util.PerfCounter perfCounter = (Util.PerfCounter)this.Core.GetIndexedElement(row); - - // try to "de-format" the File column's value to determine the proper parent File element - if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) - && formattedFile.EndsWith("]", StringComparison.Ordinal)) - { - string fileId = formattedFile.Substring(2, formattedFile.Length - 3); - - Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); - if (null != file) - { - file.AddChild(perfCounter); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, perfmonTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File", formattedFile, "File")); - } - } - else - { - this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "Perfmon")); - } - } - } - } - - /// - /// Finalize the PerfmonManifest table. - /// - /// The collection of all tables. - private void FinalizePerfmonManifestTable(TableIndexedCollection tables) - { - Table perfmonManifestTable = tables["PerfmonManifest"]; - - if (null != perfmonManifestTable) - { - foreach (Row row in perfmonManifestTable.Rows) - { - string formattedFile = (string)row[1]; - Util.PerfCounterManifest perfCounterManifest = (Util.PerfCounterManifest)this.Core.GetIndexedElement(row); - - // try to "de-format" the File column's value to determine the proper parent File element - if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) - && formattedFile.EndsWith("]", StringComparison.Ordinal)) - { - string fileId = formattedFile.Substring(2, formattedFile.Length - 3); - - Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); - if (null != file) - { - file.AddChild(perfCounterManifest); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, perfCounterManifest.ResourceFileDirectory, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File", formattedFile, "File")); - } - } - else - { - this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "PerfmonManifest")); - } - } - } - } - - /// - /// Finalize the SecureObjects table. - /// - /// The collection of all tables. - /// - /// Nests the PermissionEx elements below their parent elements. There are no declared foreign - /// keys for the parents of the SecureObjects table. - /// - private void FinalizeSecureObjectsTable(TableIndexedCollection tables) - { - Table createFolderTable = tables["CreateFolder"]; - Table secureObjectsTable = tables["SecureObjects"]; - - Hashtable createFolders = new Hashtable(); - - // index the CreateFolder table because the foreign key to this table from the - // LockPermissions table is only part of the primary key of this table - if (null != createFolderTable) - { - foreach (Row row in createFolderTable.Rows) - { - Wix.CreateFolder createFolder = (Wix.CreateFolder)this.Core.GetIndexedElement(row); - string directoryId = (string)row[0]; - - if (!createFolders.Contains(directoryId)) - { - createFolders.Add(directoryId, new ArrayList()); - } - ((ArrayList)createFolders[directoryId]).Add(createFolder); - } - } - - if (null != secureObjectsTable) - { - foreach (Row row in secureObjectsTable.Rows) - { - string id = (string)row[0]; - string table = (string)row[1]; - - Util.PermissionEx permissionEx = (Util.PermissionEx)this.Core.GetIndexedElement(row); - - if ("CreateFolder" == table) - { - ArrayList createFolderElements = (ArrayList)createFolders[id]; - - if (null != createFolderElements) - { - foreach (Wix.CreateFolder createFolder in createFolderElements) - { - createFolder.AddChild(permissionEx); - } - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, "SecureObjects", row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "LockObject", id, table)); - } - } - else - { - Wix.IParentElement parentElement = (Wix.IParentElement)this.Core.GetIndexedElement(table, id); - - if (null != parentElement) - { - parentElement.AddChild(permissionEx); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, "SecureObjects", row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "LockObject", id, table)); - } - } - } - } - } - - /// - /// Finalize the ServiceConfig table. - /// - /// The collection of all tables. - /// - /// Since there is no foreign key from the ServiceName column to the - /// ServiceInstall table, this relationship must be handled late. - /// - private void FinalizeServiceConfigTable(TableIndexedCollection tables) - { - Table serviceConfigTable = tables["ServiceConfig"]; - Table serviceInstallTable = tables["ServiceInstall"]; - - Hashtable serviceInstalls = new Hashtable(); - - // index the ServiceInstall table because the foreign key used by the ServiceConfig - // table is actually the ServiceInstall.Name, not the ServiceInstall.ServiceInstall - // this is unfortunate because the service Name is not guaranteed to be unique, so - // decompiler must assume there could be multiple matches and add the ServiceConfig to each - // TODO: the Component column information should be taken into acount to accurately identify - // the correct column to use - if (null != serviceInstallTable) - { - foreach (Row row in serviceInstallTable.Rows) - { - string name = (string)row[1]; - Wix.ServiceInstall serviceInstall = (Wix.ServiceInstall)this.Core.GetIndexedElement(row); - - if (!serviceInstalls.Contains(name)) - { - serviceInstalls.Add(name, new ArrayList()); - } - - ((ArrayList)serviceInstalls[name]).Add(serviceInstall); - } - } - - if (null != serviceConfigTable) - { - foreach (Row row in serviceConfigTable.Rows) - { - Util.ServiceConfig serviceConfig = (Util.ServiceConfig)this.Core.GetIndexedElement(row); - - if (0 == (int)row[2]) - { - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]); - - if (null != component) - { - component.AddChild(serviceConfig); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, serviceConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component")); - } - } - else - { - ArrayList serviceInstallElements = (ArrayList)serviceInstalls[row[0]]; - - if (null != serviceInstallElements) - { - foreach (Wix.ServiceInstall serviceInstall in serviceInstallElements) - { - serviceInstall.AddChild(serviceConfig); - } - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, serviceConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ServiceName", (string)row[0], "ServiceInstall")); - } - } - } - } - } - - /// - /// Finalize the XmlConfig table. - /// - /// Collection of all tables. - private void FinalizeXmlConfigTable(TableIndexedCollection tables) - { - Table xmlConfigTable = tables["XmlConfig"]; - - if (null != xmlConfigTable) - { - foreach (Row row in xmlConfigTable.Rows) - { - Util.XmlConfig xmlConfig = (Util.XmlConfig)this.Core.GetIndexedElement(row); - - if (null == row[6] || 0 == (int)row[6]) - { - Util.XmlConfig parentXmlConfig = (Util.XmlConfig)this.Core.GetIndexedElement("XmlConfig", (string)row[2]); - - if (null != parentXmlConfig) - { - parentXmlConfig.AddChild(xmlConfig); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ElementPath", (string)row[2], "XmlConfig")); - } - } - else - { - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[7]); - - if (null != component) - { - component.AddChild(xmlConfig); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlConfigTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[7], "Component")); - } - } - } - } - } - - - /// - /// Finalize the XmlFile table. - /// - /// The collection of all tables. - /// - /// Some of the XmlFile table rows are compiler generated from util:EventManifest node - /// These rows should not be appended to component. - /// - private void FinalizeXmlFileTable(TableIndexedCollection tables) - { - Table xmlFileTable = tables["XmlFile"]; - Table eventManifestTable = tables["EventManifest"]; - - if (null != xmlFileTable) - { - foreach (Row row in xmlFileTable.Rows) - { - bool bManifestGenerated = false; - string xmlFileConfigId = (string)row[0]; - if (null != eventManifestTable) - { - foreach (Row emrow in eventManifestTable.Rows) - { - string formattedFile = (string)emrow[1]; - if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) - && formattedFile.EndsWith("]", StringComparison.Ordinal)) - { - string fileId = formattedFile.Substring(2, formattedFile.Length - 3); - if (String.Equals(String.Concat("Config_", fileId, "ResourceFile"), xmlFileConfigId)) - { - Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(emrow); - if (null != eventManifest) - { - eventManifest.ResourceFile = (string)row[4]; - } - bManifestGenerated = true; - } - - else if (String.Equals(String.Concat("Config_", fileId, "MessageFile"), xmlFileConfigId)) - { - Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(emrow); - if (null != eventManifest) - { - eventManifest.MessageFile = (string)row[4]; - } - bManifestGenerated = true; - } - } - } - } - - if (true == bManifestGenerated) - continue; - - Util.XmlFile xmlFile = new Util.XmlFile(); - - xmlFile.Id = (string)row[0]; - xmlFile.File = (string)row[1]; - xmlFile.ElementPath = (string)row[2]; - - if (null != row[3]) - { - xmlFile.Name = (string)row[3]; - } - - if (null != row[4]) - { - xmlFile.Value = (string)row[4]; - } - - int flags = (int)row[5]; - if (0x1 == (flags & 0x1) && 0x2 == (flags & 0x2)) - { - this.Core.OnMessage(WixWarnings.IllegalColumnValue(row.SourceLineNumbers, xmlFileTable.Name, row.Fields[5].Column.Name, row[5])); - } - else if (0x1 == (flags & 0x1)) - { - xmlFile.Action = Util.XmlFile.ActionType.createElement; - } - else if (0x2 == (flags & 0x2)) - { - xmlFile.Action = Util.XmlFile.ActionType.deleteValue; - } - else - { - xmlFile.Action = Util.XmlFile.ActionType.setValue; - } - - if (0x100 == (flags & 0x100)) - { - xmlFile.SelectionLanguage = Util.XmlFile.SelectionLanguageType.XPath; - } - - if (0x00001000 == (flags & 0x00001000)) - { - xmlFile.PreserveModifiedDate = Util.YesNoType.yes; - } - - if (0x00010000 == (flags & 0x00010000)) - { - xmlFile.Permanent = Util.YesNoType.yes; - } - - if (null != row[7]) - { - xmlFile.Sequence = (int)row[7]; - } - - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[6]); - - if (null != component) - { - component.AddChild(xmlFile); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, xmlFileTable.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[6], "Component")); - } - } - } - } - - /// - /// Finalize the eventManifest table. - /// This function must be called after FinalizeXmlFileTable - /// - /// The collection of all tables. - private void FinalizeEventManifestTable(TableIndexedCollection tables) - { - Table eventManifestTable = tables["EventManifest"]; - - if (null != eventManifestTable) - { - foreach (Row row in eventManifestTable.Rows) - { - string formattedFile = (string)row[1]; - Util.EventManifest eventManifest = (Util.EventManifest)this.Core.GetIndexedElement(row); - - // try to "de-format" the File column's value to determine the proper parent File element - if ((formattedFile.StartsWith("[#", StringComparison.Ordinal) || formattedFile.StartsWith("[!", StringComparison.Ordinal)) - && formattedFile.EndsWith("]", StringComparison.Ordinal)) - { - string fileId = formattedFile.Substring(2, formattedFile.Length - 3); - - Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", fileId); - if (null != file) - { - file.AddChild(eventManifest); - } - } - else - { - this.Core.OnMessage(UtilErrors.IllegalFileValueInPerfmonOrManifest(formattedFile, "EventManifest")); - } - } - } - } - } -#endif -} diff --git a/src/wixext/UtilErrors.cs b/src/wixext/UtilErrors.cs deleted file mode 100644 index b9ce1688..00000000 --- a/src/wixext/UtilErrors.cs +++ /dev/null @@ -1,49 +0,0 @@ -// 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.Util -{ - using System; - using System.Resources; - using WixToolset.Data; - - public static class UtilErrors - { - public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) - { - return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); - } - - public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName) - { - return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName); - } - - public static Message IllegalFileValueInPerfmonOrManifest(string file, string table) - { - return Message(null, Ids.IllegalFileValueInPerfmonOrManifest, "The value '{0}' in the File column, {1} table is invalid. It should be in the form of '[#file]' or '[!file]'.", file, table); - } - - public static Message InvalidRegistryObject(SourceLineNumber sourceLineNumbers, string registryElementName) - { - return Message(sourceLineNumbers, Ids.InvalidRegistryObject, "The {0} element has no id and cannot have its permissions set. If you want to set permissions on a 'placeholder' registry key, force its creation by setting the ForceCreateOnInstall attribute to yes.", registryElementName); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args); - } - - public enum Ids - { - IllegalAttributeWithoutComponent = 5050, - IllegalElementWithoutComponent = 5051, - IllegalFileValueInPerfmonOrManifest = 5054, - InvalidRegistryObject = 5063, - } - } -} diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs deleted file mode 100644 index d3ca3358..00000000 --- a/src/wixext/UtilExtensionData.cs +++ /dev/null @@ -1,23 +0,0 @@ -// 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.Util -{ - using WixToolset.Data; - using WixToolset.Extensibility; - - public sealed class UtilExtensionData : BaseExtensionData - { - public override string DefaultCulture => "en-US"; - - public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) - { - symbolDefinition = UtilSymbolDefinitions.ByName(name); - return symbolDefinition != null; - } - - public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) - { - return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", symbolDefinitions); - } - } -} diff --git a/src/wixext/UtilExtensionFactory.cs b/src/wixext/UtilExtensionFactory.cs deleted file mode 100644 index 08352813..00000000 --- a/src/wixext/UtilExtensionFactory.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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.Util -{ - using System; - using System.Collections.Generic; - using WixToolset.Extensibility; - - public class UtilExtensionFactory : BaseExtensionFactory - { - protected override IReadOnlyCollection ExtensionTypes => new[] - { - typeof(UtilCompiler), - typeof(UtilExtensionData), - typeof(UtilWindowsInstallerBackendBinderExtension), - }; - } -} diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs deleted file mode 100644 index 12f423cc..00000000 --- a/src/wixext/UtilTableDefinitions.cs +++ /dev/null @@ -1,319 +0,0 @@ -// 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.Util -{ - using WixToolset.Data.WindowsInstaller; - - public static class UtilTableDefinitions - { - public static readonly TableDefinition Wix4CloseApplication = new TableDefinition( - "Wix4CloseApplication", - UtilSymbolDefinitions.WixCloseApplication, - new[] - { - new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Name of executable to ensure is closed.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Description", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Description string displayed to user when executable is in use.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true), - new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the closing.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), - new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), - new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Sequence to order the closings by."), - new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Optional property that is set to the number of running instances of the app.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true), - new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."), - new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition( - "Wix4RemoveFolderEx", - UtilSymbolDefinitions.WixRemoveFolderEx, - new[] - { - new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), - new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the removing of folders.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4RemoveRegistryKeyEx = new TableDefinition( - "Wix4RemoveRegistryKeyEx", - UtilSymbolDefinitions.WixRemoveRegistryKeyEx, - new[] - { - new ColumnDefinition("Wix4RemoveRegistryKeyEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4RemoveRegistryKeyEx row in the package.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Root", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: -1, maxValue: 3, description: "The predefined root key for the registry value, one of rrkEnum."), - new ColumnDefinition("Key", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.RegPath, description: "The key for the registry value.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), - new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression to control whether the registry key is removed.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4RestartResource = new TableDefinition( - "Wix4RestartResource", - UtilSymbolDefinitions.WixRestartResource, - new[] - { - new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4FileShare = new TableDefinition( - "Wix4FileShare", - UtilSymbolDefinitions.FileShare, - new[] - { - new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("ShareName", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The actual share name used"), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"), - new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition( - "Wix4FileSharePermissions", - UtilSymbolDefinitions.FileSharePermissions, - new[] - { - new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4Group = new TableDefinition( - "Wix4Group", - UtilSymbolDefinitions.Group, - new[] - { - new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition( - "Wix4InternetShortcut", - UtilSymbolDefinitions.WixInternetShortcut, - new[] - { - new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the shortcut is created in", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name used for shortcut.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Target", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "URL target."), - new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attribute flags that control how the shortcut is created."), - new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Icon file for shortcut", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition( - "Wix4PerformanceCategory", - UtilSymbolDefinitions.PerformanceCategory, - new[] - { - new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Name", ColumnType.String, 80, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Name of the performance counter category."), - new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."), - new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4Perfmon = new TableDefinition( - "Wix4Perfmon", - UtilSymbolDefinitions.Perfmon, - new[] - { - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition( - "Wix4PerfmonManifest", - UtilSymbolDefinitions.PerfmonManifest, - new[] - { - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4EventManifest = new TableDefinition( - "Wix4EventManifest", - UtilSymbolDefinitions.EventManifest, - new[] - { - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4SecureObject = new TableDefinition( - "Wix4SecureObject", - UtilSymbolDefinitions.SecureObjects, - new[] - { - new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Table SecureObject should be securing"), - new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.Text, description: "Domain half of user account to secure", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("User", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "User name half of user account to secure", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), - new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition( - "Wix4ServiceConfig", - UtilSymbolDefinitions.ServiceConfig, - new[] - { - new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state ", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("NewService", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Whether the affected service is being installed or already exists."), - new ColumnDefinition("FirstFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "First failure action type for configured service to take."), - new ColumnDefinition("SecondFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Second failure action type for configured service to take."), - new ColumnDefinition("ThirdFailureActionType", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Third failure action type for configured service to take."), - new ColumnDefinition("ResetPeriodInDays", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, description: "Period after which to reset the failure count for the service."), - new ColumnDefinition("RestartServiceDelayInSeconds", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, description: "Period after which to restart the service after a given failure."), - new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."), - new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4TouchFile = new TableDefinition( - "Wix4TouchFile", - UtilSymbolDefinitions.WixTouchFile, - new[] - { - new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4User = new TableDefinition( - "Wix4User", - UtilSymbolDefinitions.User, - new[] - { - new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "Component", keyColumn: 1, description: "Foreign key, Component used to determine install state", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "User name", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User domain", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4UserGroup = new TableDefinition( - "Wix4UserGroup", - UtilSymbolDefinitions.UserGroup, - new[] - { - new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition Wix4XmlFile = new TableDefinition( - "Wix4XmlFile", - UtilSymbolDefinitions.XmlFile, - new[] - { - new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file element to modify.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 70143, description: "Flags"), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4XmlConfig = new TableDefinition( - "Wix4XmlConfig", - UtilSymbolDefinitions.XmlConfig, - new[] - { - new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("ElementId", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Wix4XmlConfig", keyColumn: 1, description: "A foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to. Must be null if ElementId is provided", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("VerifyPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query run from ElementPath to verify whether a repair is necessary. Also used to uninstall.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property), - new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 65536, description: "Element=1,Value=2,Document=4,Create=16,Delete=32,Install=256,Uninstall=512"), - new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), - }, - symbolIdIsPrimaryKey: true - ); - - public static readonly TableDefinition Wix4FormatFile = new TableDefinition( - "Wix4FormatFile", - UtilSymbolDefinitions.WixFormatFiles, - new[] - { - new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition[] All = new[] - { - Wix4CloseApplication, - Wix4RemoveFolderEx, - Wix4RemoveRegistryKeyEx, - Wix4RestartResource, - Wix4FileShare, - Wix4FileSharePermissions, - Wix4Group, - Wix4InternetShortcut, - Wix4PerformanceCategory, - Wix4Perfmon, - Wix4PerfmonManifest, - Wix4EventManifest, - Wix4SecureObject, - Wix4ServiceConfig, - Wix4TouchFile, - Wix4User, - Wix4UserGroup, - Wix4XmlFile, - Wix4XmlConfig, - Wix4FormatFile, - }; - } -} diff --git a/src/wixext/UtilWarnings.cs b/src/wixext/UtilWarnings.cs deleted file mode 100644 index b65abe45..00000000 --- a/src/wixext/UtilWarnings.cs +++ /dev/null @@ -1,37 +0,0 @@ -// 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.Util -{ - using System; - using System.Resources; - using WixToolset.Data; - - public static class UtilWarnings - { - public static Message DeprecatedPerfCounterElement(SourceLineNumber sourceLineNumbers) - { - return Message(sourceLineNumbers, Ids.DeprecatedPerfCounterElement, "The PerfCounter element has been deprecated. Please use the PerformanceCounter element instead."); - } - - public static Message RequiredAttributeForWindowsXP(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) - { - return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP. You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args); - } - - public enum Ids - { - DeprecatedPerfCounterElement = 5153, - RequiredAttributeForWindowsXP = 5154, - } - } -} diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs deleted file mode 100644 index bca7c700..00000000 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ /dev/null @@ -1,13 +0,0 @@ -// 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.Util -{ - using System.Collections.Generic; - using WixToolset.Data.WindowsInstaller; - using WixToolset.Extensibility; - - public class UtilWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension - { - public override IReadOnlyCollection TableDefinitions => UtilTableDefinitions.All; - } -} diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj deleted file mode 100644 index 10fc569e..00000000 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - netstandard2.0 - WixToolset.Util - WiX Toolset Utility Extension - WiX Toolset Util Extension - embedded - true - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec deleted file mode 100644 index ba3eaade..00000000 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - $id$ - $version$ - $title$ - $description$ - $authors$ - MS-RL - false - $copyright$ - $projectUrl$ - - - - - - - - - - - - - diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets deleted file mode 100644 index 64dff429..00000000 --- a/src/wixext/WixToolset.Util.wixext.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll - - - - - diff --git a/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject b/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject deleted file mode 100644 index d75e7ab3..00000000 --- a/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject +++ /dev/null @@ -1,7 +0,0 @@ - - - - ..\..\build\Debug\util.wixlib - - - \ No newline at end of file diff --git a/src/wixlib/UtilBundleExtension_Platform.wxi b/src/wixlib/UtilBundleExtension_Platform.wxi deleted file mode 100644 index 379c8f57..00000000 --- a/src/wixlib/UtilBundleExtension_Platform.wxi +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/wixlib/UtilBundleExtension_arm64.wxs b/src/wixlib/UtilBundleExtension_arm64.wxs deleted file mode 100644 index b17be031..00000000 --- a/src/wixlib/UtilBundleExtension_arm64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/UtilBundleExtension_x64.wxs b/src/wixlib/UtilBundleExtension_x64.wxs deleted file mode 100644 index 96c85a5b..00000000 --- a/src/wixlib/UtilBundleExtension_x64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/UtilBundleExtension_x86.wxs b/src/wixlib/UtilBundleExtension_x86.wxs deleted file mode 100644 index 3b458687..00000000 --- a/src/wixlib/UtilBundleExtension_x86.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs deleted file mode 100644 index 0f445ab4..00000000 --- a/src/wixlib/UtilExtension.wxs +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi deleted file mode 100644 index 913c01b9..00000000 --- a/src/wixlib/UtilExtension_Platform.wxi +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/UtilExtension_arm64.wxs b/src/wixlib/UtilExtension_arm64.wxs deleted file mode 100644 index b9dc73b8..00000000 --- a/src/wixlib/UtilExtension_arm64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/UtilExtension_x64.wxs b/src/wixlib/UtilExtension_x64.wxs deleted file mode 100644 index 40cdf306..00000000 --- a/src/wixlib/UtilExtension_x64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/UtilExtension_x86.wxs b/src/wixlib/UtilExtension_x86.wxs deleted file mode 100644 index bd0fa562..00000000 --- a/src/wixlib/UtilExtension_x86.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi deleted file mode 100644 index b1711518..00000000 --- a/src/wixlib/caDecor.wxi +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi deleted file mode 100644 index ff7ec121..00000000 --- a/src/wixlib/caerr.wxi +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/wixlib/de-de.wxl b/src/wixlib/de-de.wxl deleted file mode 100644 index 65785a3b..00000000 --- a/src/wixlib/de-de.wxl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Konnte den Benutzer nicht anlegen. ([2] [3] [4] [5]) - Konnte den Benutzer auf Grund eines falschen Passwortes nicht anlegen. ([2] [3] [4] [5]) - Konnte Benutzer nicht zur Gruppe hinzufügen. ([2] [3] [4] [5]) - Konnte den Benutzer nicht anlegen, da er bereits existierte. ([2] [3] [4] [5]) - - Konnte Netzwerkfreigabe nicht anlegen. ([2] [3] [4] [5]) - Konnte Netzwerkfreigabe nicht entfernen. ([2] [3] [4] [5]) - - Konnte die DLL nicht für PerfMon registrieren. ([2] [3] [4] [5]) - Konnte die DLL nicht für PerfMon deregistrieren. ([2] [3] [4] [5]) - - Konnte die Daten der Leistungsüberwachung (performance counters) nicht installieren. ([2] [3] [4] [5]) - Konnte die Daten der Leistungsüberwachung (performance counters) nicht deinstallieren. ([2] [3] [4] [5]) - - Konnte keinen Security Descriptor für [3]\[4] erstellen, System Fehler: [2] - Konnte keinen Security Descriptor für das Objekt [3] erstellen, System Fehler: [2] - Unbekannter Objekt Typ [3], System Fehler: [2] - - Beim Lesen der XML Dateien trat ein Fehler auf. - Konnte XML Datei [3] nicht öffnen, System Fehler: [2] - Konnte Knoten [3] in der XML Datei [4] nicht finden, System Fehler: [2] - Beim Speichern der Änderungen an der XML Datei [3] trat ein Fehler auf, System Fehler: [2] - - Bei der Konfiguration der XML Dateien trat ein Fehler auf. - Konnte XML Datei [3] nicht öffnen, System Fehler: [2] - Konnte Knoten [3] in der XML Datei [4] nicht finden, System Fehler: [2] - Beim Speichern der Änderungen an der XML Datei [3] trat ein Fehler auf, System Fehler: [2] - diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl deleted file mode 100644 index e8b146a4..00000000 --- a/src/wixlib/en-us.wxl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Failed to create user. ([2] [3] [4] [5]) - Failed to create user due to invalid password. ([2] [3] [4] [5]) - Failed to add user to group. ([2] [3] [4] [5]) - Failed to create user because it already exists. ([2] [3] [4] [5]) - - Failed to create network share. ([2] [3] [4] [5]) - Failed to drop network share. ([2] [3] [4] [5]) - - Failed to register DLL with PerfMon. ([2] [3] [4] [5]) - Failed to unregister DLL with PerfMon. ([2] [3] [4] [5]) - - Failed to install performance counters. ([2] [3] [4] [5]) - Failed to uninstall performance counters. ([2] [3] [4] [5]) - - Failed to create security descriptor for [3]\[4], system error: [2] - Failed to set security descriptor on object [3], system error: [2] - Unknown Object Type [3], system error: [2] - - There was a failure while configuring XML files. - Failed to open XML file [3], system error: [2] - Failed to find node: [3] in XML file: [4], system error: [2] - Failed to save changes to XML file [3], system error: [2] - - There was a failure while configuring XML files. - Failed to open XML file [3], system error: [2] - Failed to find node: [3] in XML file: [4], system error: [2] - Failed to save changes to XML file [3], system error: [2] - diff --git a/src/wixlib/es-es.wxl b/src/wixlib/es-es.wxl deleted file mode 100644 index ca5ab8bb..00000000 --- a/src/wixlib/es-es.wxl +++ /dev/null @@ -1,31 +0,0 @@ - - - - La creación del usuario ha fracasado. ([2] [3] [4] [5]) - La creación del usuario ha fracasado porque la contraseña es incorrecta. ([2] [3] [4] [5]) - El aditamento del usuario al grupo ha fracasado. ([2] [3] [4] [5]) - La creación del usuario ha fracasado porque ya existe. ([2] [3] [4] [5]) - - La creación de la red compartida ha fracasado. ([2] [3] [4] [5]) - La eliminación de la red compartida ha fracasado. ([2] [3] [4] [5]) - - La inscripción al registro de la DLL con PerfMon ha fracasado. ([2] [3] [4] [5]) - La cancelación de la inscripción al registro de la DLL con PerfMon ha fracasado. ([2] [3] [4] [5]) - - La instalación de los contadores de rendimiento ha fracasado. ([2] [3] [4] [5]) - La desinstalación de los contadores de rendimiento ha fracasado. ([2] [3] [4] [5]) - - La creación de los ACLs ha fracasado por [3]\[4], error del sistema : [2] - El posicionamiento de los ACLs por el objecto [3] ha fracasado, error del sistema: [2] - Tipo de objecto no conocido [3], error del sistema: [2] - - Un problema ha aparecido durante la configuración de los ficheros XML. - Fracaso de la apertura de los ficheros XML [3], error del sistema: [2] - Fracaso de la búsqueda del nodo: [3] en el fichero XML: [4], error del sistema: [2] - Fracaso durante la salvaguardia de las modificaciones en el fichero XML [3], error del sistema: [2] - - Un problema ha aparecido durante la configuración de los ficheros XML. - Fracaso de la apertura de los ficheros XML [3], error del sistema: [2] - Fracaso de la búsqueda del nodo: [3] en el fichero XML: [4], error del sistema: [2] - Fracaso durante la salvaguardia de las modificaciones en el fichero XML [3], error del sistema: [2] - \ No newline at end of file diff --git a/src/wixlib/fr-fr.wxl b/src/wixlib/fr-fr.wxl deleted file mode 100644 index ad34b56a..00000000 --- a/src/wixlib/fr-fr.wxl +++ /dev/null @@ -1,31 +0,0 @@ - - - - La création de l'utilisateur a échoué. ([2] [3] [4] [5]) - La création de l'utilisateur a échoué car le mot de passe est invalide. ([2] [3] [4] [5]) - L'ajout de l'utilisateur au groupe a échoué. ([2] [3] [4] [5]) - La création de l'utilisateur a échoué car il existe dejà. ([2] [3] [4] [5]) - - La création du partage reseau a échoué. ([2] [3] [4] [5]) - La suppression du partage reseau a échoué. ([2] [3] [4] [5]) - - L'inscription au registre de la DLL avec PerfMon a échoué. ([2] [3] [4] [5]) - La desinscription au registre de la DLL avec PerfMon a échoué. ([2] [3] [4] [5]) - - L'installation des compteurs de performance a échoué. ([2] [3] [4] [5]) - La desinstallation des compteurs de performance a échoué. ([2] [3] [4] [5]) - - La création des ACLs a échoué pour [3]\[4], erreur systeme: [2] - Le positionnement des ACLs pour l'objet [3] a échoué, erreur systeme: [2] - Type d'objet inconnu [3], erreur systeme: [2] - - Un problème est survenu lors de la configuration des fichiers XML. - Echec de l'ouverture des fichiers XML [3], erreur systeme: [2] - Echec de la recherche du noeud: [3] dans le fichier XML: [4], erreur systeme: [2] - Echec lors de la sauvegarde des modifications dans le fichier XML [3], erreur systeme: [2] - - Un problème est survenu lors de la configuration des fichiers XML. - Echec de l'ouverture des fichiers XML [3], erreur systeme: [2] - Echec de la recherche du noeud: [3] dans le fichier XML: [4], erreur systeme: [2] - Echec lors de la sauvegarde des modifications dans le fichier XML [3], erreur systeme: [2] - \ No newline at end of file diff --git a/src/wixlib/it-it.wxl b/src/wixlib/it-it.wxl deleted file mode 100644 index 8cea0a14..00000000 --- a/src/wixlib/it-it.wxl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Impossibile creare l'utente. ([2] [3] [4] [5]) - Impossibile creare l'utente perchè la password è errata. ([2] [3] [4] [5]) - Impossibile aggiungere l'utente al gruppo. ([2] [3] [4] [5]) - Impossibile creare l'utente perchè già esistente. ([2] [3] [4] [5]) - - Impossibile creare la risorsa di rete. ([2] [3] [4] [5]) - Impossibile eliminare la risorsa di rete. ([2] [3] [4] [5]) - - Impossibile registrare la DLL con PerfMon. ([2] [3] [4] [5]) - Impossibile rimuovere la registrazione della DLL con PerfMon. ([2] [3] [4] [5]) - - Impossibile installare i contatori delle prestazioni. ([2] [3] [4] [5]) - Impossibile rimuovere i contatori delle prestazioni. ([2] [3] [4] [5]) - - Impossibile creare i descrittori di sicurezza per [3]\[4], errore di sistema: [2] - Impossibile impostare i descrittori di sicurezza sull'oggetto [3], errore di sistema: [2] - Tipo di oggetto sconosciuto [3], errore di sistema: [2] - - Si è verificato un errore durante la configurazione dei file XML. - Impossibile aprire il file XML [3], errore di sistema: [2] - Impossibile trovare il nodo: [3] nel file XML: [4], errore di sistema: [2] - Impossible salvare le modifiche al file XML [3], errore di sistema: [2] - - Si è verificato un errore durante la configurazione dei file XML. - Impossibile aprire il file XML [3], errore di sistema: [2] - Impossibile trovare il nodo: [3] nel file XML: [4], errore di sistema: [2] - Impossibile salvare le modifiche al file XML [3], errore di sitema: [2] - diff --git a/src/wixlib/ja-jp.wxl b/src/wixlib/ja-jp.wxl deleted file mode 100644 index 5f5cf40d..00000000 --- a/src/wixlib/ja-jp.wxl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - ユーザー作成に失敗しました。 ([2] [3] [4] [5]) - パスワードが無効のためユーザー作成に失敗しました。 ([2] [3] [4] [5]) - ユーザーをグループに追加でいませんでした。 ([2] [3] [4] [5]) - ユーザーが既に存在するため作成できませんでした。 ([2] [3] [4] [5]) - - ネットワーク共有の作成に失敗しました。 ([2] [3] [4] [5]) - ネットワーク共有の削除に失敗しました。 ([2] [3] [4] [5]) - - DLL を PerfMon に登録でいませんでした。 ([2] [3] [4] [5]) - DLL を PerfMon より登録解除できませんでした。 ([2] [3] [4] [5]) - - パフォーマンス カウンタをインストールできませんでした。 ([2] [3] [4] [5]) - パフォーマンス カウンタをアンインストールできませんでした。 ([2] [3] [4] [5]) - - [3]\[4] 用セキュリティ ディスクリプターを作成できませんでした、システム エラー： [2] - オブジェクト [3] 上のセキュリティ ディスクリプターを設定できませんでした、システム エラー： [2] - 不明なオブジェクト種別 [3]、システム エラー： [2] - - XML ファイル構成中に失敗しました。 - XML ファイル [3] を開けませんでした、システム エラー： [2] - XML ファイル [4] 内にノード [3] が見つかりませんでした、システム エラー： [2] - XML ファイル [3] へ変更を保存できませんでした、システム エラー： [2] - - XML ファイル構成中に失敗しました。 - XML ファイル [3] を開けませんでした、システム エラー： [2] - XML ファイル [4] 内にノード [3] が見つかりませんでした、システム エラー： [2] - XML ファイル [3] へ変更を保存できませんでした、システム エラー： [2] - diff --git a/src/wixlib/pt-br.wxl b/src/wixlib/pt-br.wxl deleted file mode 100644 index 3ca27dda..00000000 --- a/src/wixlib/pt-br.wxl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Falha ao criar usuário. ([2] [3] [4] [5]) - Falha ao criar usuário devido a senha inválida. ([2] [3] [4] [5]) - Falha ao adicionar o usuário ao grupo. ([2] [3] [4] [5]) - Falha ao criar o usuário, porque ele já existe. ([2] [3] [4] [5]) - Falha ao criar o compartilhamento de rede. ([2] [3] [4] [5]) - Falha ao cair compartilhamento de rede. ([2] [3] [4] [5]) - Falha ao registrar DLL com PerfMon. ([2] [3] [4] [5]) - Falha ao cancelar o registro de DLL com PerfMon. ([2] [3] [4] [5]) - Falha ao instalar contadores de desempenho. ([2] [3] [4] [5]) - Falha ao desinstalar contadores de desempenho. ([2] [3] [4] [5]) - Falha ao criar o descritor de segurança [3] \ [4], erro do sistema: [2] - Falha ao definir o descritor de segurança sobre o objeto [3], erro do sistema: [2] - Objeto Desconhecido Tipo [3], erro do sistema: [2] - Houve uma falha ao configurar arquivos XML. - Falha ao abrir o arquivo XML [3], erro do sistema: [2] - Falha ao localizar nó: [3] no arquivo XML: [4], erro do sistema: [2] - Falha ao salvar as alterações para o arquivo XML [3], erro do sistema: [2] - Houve uma falha ao configurar arquivos XML. - Falha ao abrir o arquivo XML [3], erro do sistema: [2] - Falha ao localizar nó: [3] no arquivo XML: [4], erro do sistema: [2] - Falha ao salvar as alterações para o arquivo XML [3], erro do sistema: [2] - diff --git a/src/wixlib/util.v3.ncrunchproject b/src/wixlib/util.v3.ncrunchproject deleted file mode 100644 index 319cd523..00000000 --- a/src/wixlib/util.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj deleted file mode 100644 index 99dede7d..00000000 --- a/src/wixlib/util.wixproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Library - true - - - - - - - - - - - - - - - - - - - - - diff --git a/version.json b/version.json deleted file mode 100644 index 5f857771..00000000 --- a/version.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "4.0", - "publicReleaseRefSpec": [ - "^refs/heads/master$" - ], - "cloudBuild": { - "buildNumber": { - "enabled": true - } - } -} -- cgit v1.2.3-55-g6feb