diff --git a/WebsitePanel.Installer/Sources/VersionInfo.cs b/WebsitePanel.Installer/Sources/VersionInfo.cs index ee7d4a52..23565f5c 100644 --- a/WebsitePanel.Installer/Sources/VersionInfo.cs +++ b/WebsitePanel.Installer/Sources/VersionInfo.cs @@ -1,7 +1,7 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.269 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -10,7 +10,6 @@ using System; using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe index 38767608..c70bbb84 100644 Binary files a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe and b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe differ diff --git a/WebsitePanel/Sources/VersionInfo.cs b/WebsitePanel/Sources/VersionInfo.cs index ee7d4a52..23565f5c 100644 --- a/WebsitePanel/Sources/VersionInfo.cs +++ b/WebsitePanel/Sources/VersionInfo.cs @@ -1,7 +1,7 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.269 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -10,7 +10,6 @@ using System; using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/WebsitePanel/Sources/VersionInfo.vb b/WebsitePanel/Sources/VersionInfo.vb index ded96cbd..2dc3bbba 100644 --- a/WebsitePanel/Sources/VersionInfo.vb +++ b/WebsitePanel/Sources/VersionInfo.vb @@ -1,7 +1,7 @@ -'------------------------------------------------------------------------------ +'------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.17929 +' Runtime Version:4.0.30319.269 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -13,7 +13,6 @@ Option Explicit On Imports System Imports System.Reflection -Imports System.Resources Imports System.Runtime.CompilerServices Imports System.Runtime.InteropServices - - - - - - - diff --git a/tools/WIX/WixUtilExtension.dll b/tools/WIX/WixUtilExtension.dll index dc2635f2..c81c4c72 100644 Binary files a/tools/WIX/WixUtilExtension.dll and b/tools/WIX/WixUtilExtension.dll differ diff --git a/tools/WIX/WixVSExtension.dll b/tools/WIX/WixVSExtension.dll index 56212076..7e3fc469 100644 Binary files a/tools/WIX/WixVSExtension.dll and b/tools/WIX/WixVSExtension.dll differ diff --git a/tools/WIX/candle.exe b/tools/WIX/candle.exe index 0b09aede..279e85cb 100644 Binary files a/tools/WIX/candle.exe and b/tools/WIX/candle.exe differ diff --git a/tools/WIX/dark.exe b/tools/WIX/dark.exe index ac087675..6cedfcbc 100644 Binary files a/tools/WIX/dark.exe and b/tools/WIX/dark.exe differ diff --git a/tools/WIX/difxapp_x64.wixlib b/tools/WIX/difxapp_x64.wixlib index 9e6950fe..840f7449 100644 Binary files a/tools/WIX/difxapp_x64.wixlib and b/tools/WIX/difxapp_x64.wixlib differ diff --git a/tools/WIX/difxapp_x86.wixlib b/tools/WIX/difxapp_x86.wixlib index 56538702..c7caf413 100644 Binary files a/tools/WIX/difxapp_x86.wixlib and b/tools/WIX/difxapp_x86.wixlib differ diff --git a/tools/WIX/doc/DTF.chm b/tools/WIX/doc/DTF.chm deleted file mode 100644 index d8d949ca..00000000 Binary files a/tools/WIX/doc/DTF.chm and /dev/null differ diff --git a/tools/WIX/doc/DTFAPI.chm b/tools/WIX/doc/DTFAPI.chm deleted file mode 100644 index ea31cd83..00000000 Binary files a/tools/WIX/doc/DTFAPI.chm and /dev/null differ diff --git a/tools/WIX/doc/Dependency.xsd b/tools/WIX/doc/Dependency.xsd new file mode 100644 index 00000000..08f490e2 --- /dev/null +++ b/tools/WIX/doc/Dependency.xsd @@ -0,0 +1,226 @@ + + + + + + The source code schema for the Windows Installer XML Toolset Dependency Extension. + + + + + + Describes the information for this product or feature that serves as a dependency of other products or features. + + + + + + + + + + This element is required for any product, feature, or bundle that will use the Dependency feature to properly reference count + other products or features. It should be authored into a component that is always installed and removed with the + product or features that contain it. This guarantees that product dependencies are not removed before those products that + depend on them. + + + The @Key attribute should identify a version range for your product that you guarantee will be backward compatible. + This key is designed to persist throughout compatible upgrades so that dependent products do not have to be reinstalled + and will not prevent your product from being upgraded. If this attribute is not authored, the value is the ProductCode + and will not automatically support upgrades. + + + By default this uses the Product/@Id attribute value, which may be automatically generated. + + + How To: Author product dependencies + + + + + + + + + + + Dependency provider identity. If this attribute is not specified, an identifier will be generated automatically. + + + + + + + Optional unique registry key name that identifies a product version range on which other products can depend. + This attribute is required in package authoring, but optional for components. + + + + + + + The version of the package. For MSI packages, the ProductVersion will be used by default + and this attribute should not be specified. + + + + + + + Optional display name of the package. For MSI packages, the ProductName will be used by default. + + + + + + + + + Describes a dependency on a provider for the current component or package. + + + + + + + + + This element declares a dependency on any product that uses the Provides element. If that product is uninstalled + before a product that requires it, the uninstall will err or warn the user that other products are installed + which depend on that product. This behavior can be modified by changing the attribute values on the Requires element. + + + If you do not nest this element under a Provides element, you must specify the @Id attribute + so that it can be referenced by a RequiresRef element nested under a Provides element. + + + + How To: Author product dependencies + + + + + + + Dependency requirement identity. If this attribute is not specified, an identifier will be generated automatically. + If this element is not authored under a Provides element, this attribute is required. + + + + + + + The unique registry key name for the dependency provider to require during installation of this product. + + + + + + + The minimum version of the dependency provider required to be installed. The default is unbound. + + + + + + + The maximum version of the dependency provider required to be installed. The default is unbound. + + + + + + + Set to "yes" to make the range of dependency provider versions required include the value specified in Minimum. + + + + + + + Set to "yes" to make the range of dependency provider versions required include the value specified in Maximum. + + + + + + + + + References existing authoring for a dependency on a provider for the current component or package. + + + + + This element references a dependency on any product that uses the Provides element. If that product is uninstalled + before a product that requires it, the uninstall will err or warn the user that other products are installed + which depend on that product. This behavior can be modified by changing the attribute values on the Requires element. + + + + How To: Author product dependencies + + + + + + + The identifier of the Requires element to reference. + + + + + + + + + Optional attribute to explicitly author the provider key for the entire bundle. + + + + + + This provider key is designed to persist throughout compatible upgrades so that dependent bundles do not have to be reinstalled + and will not prevent your product from being upgraded. If this attribute is not authored, the value is the + automatically-generated bundle ID and will not automatically support upgrades. + + + Only a single provider key is supported for bundles. To author that your bundle provides additional features via + packages, author different provider keys for your packages. + + + + + + + + + + Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534. + This can also be a preprocessor, binder, or WiX variable. + + + + + + + + + + Values of this type will either be "yes" or "no". + + + + + + + + diff --git a/tools/WIX/doc/IsolatedApp.xsd b/tools/WIX/doc/IsolatedApp.xsd new file mode 100644 index 00000000..5bfa958a --- /dev/null +++ b/tools/WIX/doc/IsolatedApp.xsd @@ -0,0 +1,242 @@ + + + + + + Schema for describing Isolated Applications. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Values of this type will look like: "01234567-89AB-CDEF-0123-456789ABCDEF" or "{01234567-89AB-CDEF-0123-456789ABCDEF}". + + + + + + + Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534. + + + + + diff --git a/tools/WIX/doc/OfficeAddin.xsd b/tools/WIX/doc/OfficeAddin.xsd new file mode 100644 index 00000000..e01d648d --- /dev/null +++ b/tools/WIX/doc/OfficeAddin.xsd @@ -0,0 +1,262 @@ + + + + + + Schema for describing Office Addins. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Values of this type will look like: "01234567-89AB-CDEF-0123-456789ABCDEF" or "{01234567-89AB-CDEF-0123-456789ABCDEF}". + + + + + + + Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534. + + + + + diff --git a/tools/WIX/doc/complus.xsd b/tools/WIX/doc/complus.xsd new file mode 100644 index 00000000..2db210d0 --- /dev/null +++ b/tools/WIX/doc/complus.xsd @@ -0,0 +1,949 @@ + + + + + + The source code schema for the Windows Installer XML Toolset COM+ Extension. + + + + + + + + + + + + + + + Defines a COM+ partition. If this element is a child of a + Component element, the partition will be created in association with this + component. If the element is a child of any of the Fragment, Module or Product + elements it is considered to be a locater, referencing an existing partition. + + + + + + + + + + + + + Identifier for the element. + + + + + Id for the partition. This attribute can be omitted, in + which case an id will be generated on install. If the element is a locater, + this attribute can be omitted if a value is provided for the Name attribute. + + + + + Name of the partition. This attribute can be omitted if + the element is a locater, and a value is provided for the PartitionId + attribute. + + + + + + + + + + + + + + + + + + Defines a COM+ partition role. Partition roles can not be + created; this element can only be used as a locater to reference an existing + role. + + + + + + + + + + + + Identifier for the element. + + + + + The id of a ComPlusPartition element representing the partition + the role belongs to. + + + + + Name of the partition role. + + + + + + + + + + + + This element represents a user membership in a partition + role. When the parent component of this element is installed, the user will be + added to the associated partition role. + + + + + + Identifier for the element. + + + + + The id of a ComPlusPartitionRole element representing the + partition the user should be added to. + + + + + Foreign key into the User table. + + + + + + + + + + + + This element represents a security group membership in a + partition role. When the parent component of this element is installed, the + security group will be added to the associated partition role. + + + + + + Identifier for the element. + + + + + The id of a ComPlusPartitionRole element representing the + partition the user should be added to. + + + + + Foreign key into the Group table. + + + + + + + + + + + + Represents a default partition definition for a user. When + the parent component of this element is installed, the default partition of the + user will be set to the referenced partition. + + + + + + Identifier for the element. + + + + + The id of a ComPlusPartition element representing the + partition that will be the default partition for the user. + + + + + Foreign key into the User table. + + + + + + + + + + + + + + + Defines a COM+ application. If this element is a descendent + of a Component element, the application will be created in association with + this component. If the element is a child of any of the Fragment, Module or + Product elements it is considered to be a locater, referencing an existing + application. + + If the element is a child of a ComPlusPartition element, + or have its Partition attribute set, the application will be installed under + the referenced partition. + + + + + + + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusPartition + element, this attribute can be provided with the id of a ComPlusPartition + element representing the partition the application belongs to. + + + + + Id for the application. This attribute can be omitted, in + which case an id will be generated on install. If the element is a locater, + this attribute can be omitted if a value is provided for the Name attribute. + + + + + Name of the application. This attribute can be omitted if + the element is a locater, and a value is provided for the PartitionId + attribute. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines an application role. If this element is a descendent + of a Component element, the application role will be created in association + with this component. If the element is a child of any of the Fragment, Module + or Product elements it is considered to be a locater, referencing an existing + application role. + + + + + + + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusApplication + element, this attribute should be provided with the id of a + ComPlusApplication element representing the application the role belongs to. + + + + + Name of the application role. + + + + + + + + + + + + + This element represents a user membership in an + application role. When the parent component of this element is installed, the + user will be added to the associated application role. This element must be a descendent + of a Component element; it can not be a child of a ComPlusApplicationRole + locater element. To reference a locater element use the ApplicationRole + attribute. + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusApplicationRole + element, this attribute should be provided with the id of a + ComPlusApplicationRole element representing the application role the user is + to be added to. + + + + + Foreign key into the User table. + + + + + + + + + + + + This element represents a security group membership in an + application role. When the parent component of this element is installed, the + user will be added to the associated application role. This element must be a + descendent of a Component element; it can not be a child of a + ComPlusApplicationRole locater element. To reference a locater element use the + ApplicationRole attribute. + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusApplicationRole + element, this attribute should be provided with the id of a + ComPlusApplicationRole element representing the application role the user is + to be added to. + + + + + Foreign key into the Group table. + + + + + + + + + Represents a DLL or assembly to be registered with COM+. If + this element is a child of a ComPlusApplication element, the assembly will be + registered in this application. Other ways the Application attribute must be + set to an application. The element must be a descendent of a Component element, + it can not be a child of a ComPlusApplication locator element. + + + + + + When installing a native assembly, all components + contained in the assembly must be represented as ComPlusComponent elements + under this element. Any component not listed will not be removed during + uninstall. + + + + The fields DllPath, TlbPath and PSDllPath are formatted + fields that should contain file paths to there respective file types. A typical + value for DllPath for example, should be something like “[#MyAssembly_dll]”, + where “MyAssembly_dll” is the key of the dll file in the File table. + + + + Warning: The assembly name provided in the AssemblyName + attribute must be a fully specified assembly name, if a partial name is + provided a random assembly matching the partial name will be selected. + + + + + + + + + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusApplication + element, this attribute should be provided with the id of a ComPlusApplication + element representing the application the assembly is to be registered in. + This attribute can be omitted for a .NET assembly even if the application is + not a child of a ComPlusApplication element. + + + + + The name of the assembly used to identify the assembly in + the GAC. This attribute can be provided only if DllPathFromGAC is set to + “yes”. + + + + + The path to locate the assembly DLL during registration. + This attribute should be provided if DllPathFromGAC is not set to “yes”. + + + + + An optional path to an external type lib for the assembly. + This attribute must be provided if the Type attribute is set to “.net”. + + + + + An optional path to an external proxy/stub DLL for the assembly. + + + + + + + + + + + + + + + Indicates that the assembly is to be installed as an event + class DLL. This attribute is only valid for native assemblies. The assembly + will be installed with the COM+ catalog’s InstallEventClass() function. + + + + + Indicates that the DLL path should be extracted from the + GAC instead for being provided in the DllPath attribute. If this attribute is + set to “yes”, the name of the assembly can be provided using the AssemblyName + attribute. Or, if this AssemblyName attribute is missing, the name will be + extracted from the MsiAssemblyName table using the id of the parent Component + element. + + + + + Indicates that the assembly should be installed in the + commit custom action instead of the normal deferred custom action. This is + necessary when installing .NET assemblies to the GAC in the same + installation, as the assemblies are not visible in the GAC until after the + InstallFinalize action has run. + + + + + + + + + Defines a dependency between two assemblies. This element + affects the order in which assembles are registered. Any assemblies referenced + by this element are guarantied to be registered before, and unregistered after, + the assembly referenced by the parent ComPlusAssembly element. + + + + It is only necessary to explicitly specify dependencies between + assemblies contained in the same package (MSI or MSM). Assemblies merged in to a + package from a merge module will always be installed before any assemblies + specified in the base package. Assemblies merged in from different merge + modules are sequenced using the ModuleDependency MSI table. It is not possible + to have cross dependencies between merge modules or have an assembly in a merge + module depend on an assembly in the base package. + + + + + + + Reference to the id of the assembly required by the parent + ComPlusAssembly element. + + + + + + + + Represents a COM+ component in an assembly. + + + + + + + + + + + + Identifier for the element. + + + + + CLSID of the component. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Represents a role assignment to a COM+ component. + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusComponent + element, this attribute should be provided with the id of a ComPlusComponent + element representing the component the role is to be added to. + + + + + Id of the ComPlusApplicationRole element representing the + role that shall be granted access to the component. + + + + + + + + Represents an interface for a COM+ component. + + + + + + + + + + + Identifier for the element. + + + + + IID of the interface. + + + + + + + + + + + + + + Represents a role assignment to an interface. + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusInterface + element, this attribute should be provided with the id of a ComPlusInterface + element representing the interface the role is to be added to. + + + + + Id of the ComPlusApplicationRole element representing the + role that shall be granted access to the interface. + + + + + + + + + Represents a method for an interface. + + + + + + + + + + Identifier for the element. + + + + + + + Dispatch id of the method. If this attribute is not set a + value must be provided for the Name attribute. + + + + + + + Name of the method. If this attribute is not set a value + must be provided for the Index attribute. + + + + + + + + + + + + + + + Represents a role assignment to a COM+ method. + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusMethod element, + this attribute should be provided with the id of a ComPlusMethod element + representing the method the role is to be added to. + + + + + Id of the ComPlusApplicationRole element representing the + role that shall be granted access to the method. + + + + + + + + + + + + Defines an event subscription for a COM+ component. + + + + + + Identifier for the element. + + + + + If the element is not a child of a ComPlusComponent + element, this attribute should be provided with the id of a ComPlusComponent + element representing the component the subscription is to be created for. + + + + + Id of the subscription. If a value is not provided for + this attribute, an id will be generated during installation. + + + + + Name of the subscription. + + + + + CLSID of the event class for the subscription. If a value + for this attribute is not provided, a value for the PublisherID attribute + must be provided. + + + + + Publisher id for the subscription. If a value for this + attribute is not provided, a value for the EventCLSID attribute must be + provided. + + + + + + + + + + + + + + + + + + + Values of this type will either be "yes" or "no". + + + + + + + + + + Values of this type will look like: "01234567-89AB-CDEF-0123-456789ABCDEF". + + + + + + + diff --git a/tools/WIX/doc/wix.chm b/tools/WIX/doc/wix.chm index 9ca63d21..7edfaacf 100644 Binary files a/tools/WIX/doc/wix.chm and b/tools/WIX/doc/wix.chm differ diff --git a/tools/WIX/doc/wix.xsd b/tools/WIX/doc/wix.xsd index 60c6abaa..e16d0d40 100644 --- a/tools/WIX/doc/wix.xsd +++ b/tools/WIX/doc/wix.xsd @@ -74,7 +74,6 @@ - @@ -82,6 +81,7 @@ + @@ -1368,12 +1368,33 @@ + + + Defines the update for a Bundle. + + + + + + + + + + The absolute path or URL to check for an update bundle. Currently the engine provides this value + in the IBootstrapperApplication::OnDetectUpdateBegin() and otherwise ignores the value. In the + future the engine will be able to acquire an update bundle from the location and determine if it + is newer than the current executing bundle. + + + + + - The Product element is analogous to the main function in a C program. When linking, only one Product section - can be given to the linker to produce a successful result. Using this element creates an msi file. - + The Product element is analogous to the main function in a C program. When linking, only one Product section + can be given to the linker to produce a successful result. Using this element creates an msi file. + You can specify any valid Windows code page by integer like 1252, or by web name like Windows-1252. See Code Pages for more information. diff --git a/tools/WIX/heat.exe b/tools/WIX/heat.exe index 34cd8993..43198075 100644 Binary files a/tools/WIX/heat.exe and b/tools/WIX/heat.exe differ diff --git a/tools/WIX/insignia.exe b/tools/WIX/insignia.exe index 5f22d3c2..37deb2b2 100644 Binary files a/tools/WIX/insignia.exe and b/tools/WIX/insignia.exe differ diff --git a/tools/WIX/light.exe b/tools/WIX/light.exe index dd50ecb7..9f5602d6 100644 Binary files a/tools/WIX/light.exe and b/tools/WIX/light.exe differ diff --git a/tools/WIX/lit.exe b/tools/WIX/lit.exe index 022c0b27..c8c7219a 100644 Binary files a/tools/WIX/lit.exe and b/tools/WIX/lit.exe differ diff --git a/tools/WIX/lux.exe b/tools/WIX/lux.exe deleted file mode 100644 index 2f02b56b..00000000 Binary files a/tools/WIX/lux.exe and /dev/null differ diff --git a/tools/WIX/lux.exe.config b/tools/WIX/lux.exe.config deleted file mode 100644 index e25ce445..00000000 --- a/tools/WIX/lux.exe.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/tools/WIX/lux.targets b/tools/WIX/lux.targets deleted file mode 100644 index c276e0d7..00000000 --- a/tools/WIX/lux.targets +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - Compile;_ScanForUnitTests;_GenerateTestConsumer;Link - $(BuildTestPackageDependsOn) - - - - - - - - - - - - - - - - - - - - - $(OutputName)_test - ICE71;$(SuppressIces) - true - - - - - - - - - - - - - - - - - - - - diff --git a/tools/WIX/melt.exe b/tools/WIX/melt.exe index 33e4565d..8019cb60 100644 Binary files a/tools/WIX/melt.exe and b/tools/WIX/melt.exe differ diff --git a/tools/WIX/nit.exe b/tools/WIX/nit.exe deleted file mode 100644 index 07718619..00000000 Binary files a/tools/WIX/nit.exe and /dev/null differ diff --git a/tools/WIX/nit.exe.config b/tools/WIX/nit.exe.config deleted file mode 100644 index 955ba10b..00000000 --- a/tools/WIX/nit.exe.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/tools/WIX/pyro.exe b/tools/WIX/pyro.exe index 61aa2b98..603240dd 100644 Binary files a/tools/WIX/pyro.exe and b/tools/WIX/pyro.exe differ diff --git a/tools/WIX/retina.exe b/tools/WIX/retina.exe index 229f48c8..59602298 100644 Binary files a/tools/WIX/retina.exe and b/tools/WIX/retina.exe differ diff --git a/tools/WIX/sconce2005.dll b/tools/WIX/sconce2005.dll deleted file mode 100644 index 5164fe00..00000000 Binary files a/tools/WIX/sconce2005.dll and /dev/null differ diff --git a/tools/WIX/sconce2008.dll b/tools/WIX/sconce2008.dll deleted file mode 100644 index b8c17248..00000000 Binary files a/tools/WIX/sconce2008.dll and /dev/null differ diff --git a/tools/WIX/sconce2010.dll b/tools/WIX/sconce2010.dll deleted file mode 100644 index a51468f8..00000000 Binary files a/tools/WIX/sconce2010.dll and /dev/null differ diff --git a/tools/WIX/sdk/BootstrapperCore.dll b/tools/WIX/sdk/BootstrapperCore.dll index c832d738..ebe3de46 100644 Binary files a/tools/WIX/sdk/BootstrapperCore.dll and b/tools/WIX/sdk/BootstrapperCore.dll differ diff --git a/tools/WIX/sdk/DocCompiler.exe b/tools/WIX/sdk/DocCompiler.exe index 04fcee64..43779fe6 100644 Binary files a/tools/WIX/sdk/DocCompiler.exe and b/tools/WIX/sdk/DocCompiler.exe differ diff --git a/tools/WIX/sdk/MakeSfxCA.exe b/tools/WIX/sdk/MakeSfxCA.exe index 51ba6cae..edc5fc2b 100644 Binary files a/tools/WIX/sdk/MakeSfxCA.exe and b/tools/WIX/sdk/MakeSfxCA.exe differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.Compression.Cab.dll b/tools/WIX/sdk/Microsoft.Deployment.Compression.Cab.dll index de031a7d..f5de31ad 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.Compression.Cab.dll and b/tools/WIX/sdk/Microsoft.Deployment.Compression.Cab.dll differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.Compression.Zip.dll b/tools/WIX/sdk/Microsoft.Deployment.Compression.Zip.dll index c6bf5845..6de59f49 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.Compression.Zip.dll and b/tools/WIX/sdk/Microsoft.Deployment.Compression.Zip.dll differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.Compression.dll b/tools/WIX/sdk/Microsoft.Deployment.Compression.dll index 12022ab9..24445732 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.Compression.dll and b/tools/WIX/sdk/Microsoft.Deployment.Compression.dll differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.Resources.dll b/tools/WIX/sdk/Microsoft.Deployment.Resources.dll index d7e90081..17a9d340 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.Resources.dll and b/tools/WIX/sdk/Microsoft.Deployment.Resources.dll differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll b/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll index d435b2df..231d8589 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll and b/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll b/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll index 19c78c3d..d509c647 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll and b/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll differ diff --git a/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.dll b/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.dll index f72f7081..0a7d1e99 100644 Binary files a/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.dll and b/tools/WIX/sdk/Microsoft.Deployment.WindowsInstaller.dll differ diff --git a/tools/WIX/sdk/MsgGen.exe b/tools/WIX/sdk/MsgGen.exe index 0e6630fe..e5092560 100644 Binary files a/tools/WIX/sdk/MsgGen.exe and b/tools/WIX/sdk/MsgGen.exe differ diff --git a/tools/WIX/sdk/XsdGen.exe b/tools/WIX/sdk/XsdGen.exe index 2ac3541f..525f4318 100644 Binary files a/tools/WIX/sdk/XsdGen.exe and b/tools/WIX/sdk/XsdGen.exe differ diff --git a/tools/WIX/sdk/XsdStitch.exe b/tools/WIX/sdk/XsdStitch.exe index 645da57f..363058aa 100644 Binary files a/tools/WIX/sdk/XsdStitch.exe and b/tools/WIX/sdk/XsdStitch.exe differ diff --git a/tools/WIX/sdk/inc/BalBaseBootstrapperApplication.h b/tools/WIX/sdk/inc/BalBaseBootstrapperApplication.h index 6413e0c3..48304984 100644 --- a/tools/WIX/sdk/inc/BalBaseBootstrapperApplication.h +++ b/tools/WIX/sdk/inc/BalBaseBootstrapperApplication.h @@ -91,12 +91,40 @@ public: // IBurnUserExperience } virtual STDMETHODIMP_(int) OnDetectBegin( + __in BOOL /*fInstalled*/, __in DWORD /*cPackages*/ ) { return CheckCanceled() ? IDCANCEL : IDNOACTION; } + virtual STDMETHODIMP_(int) OnDetectForwardCompatibleBundle( + __in_z LPCWSTR /*wzBundleId*/, + __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/, + __in_z LPCWSTR /*wzBundleTag*/, + __in BOOL /*fPerMachine*/, + __in DWORD64 /*dw64Version*/, + __in int nRecommendation + ) + { + return CheckCanceled() ? IDCANCEL : nRecommendation; + } + + virtual STDMETHODIMP_(int) OnDetectUpdateBegin( + __in_z LPCWSTR /*wzUpdateLocation*/, + __in int nRecommendation + ) + { + return CheckCanceled() ? IDCANCEL : nRecommendation; + } + + virtual STDMETHODIMP_(void) OnDetectUpdateComplete( + __in HRESULT /*hrStatus*/, + __in_z_opt LPCWSTR /*wzUpdateLocation*/ + ) + { + } + virtual STDMETHODIMP_(int) OnDetectPriorBundle( __in_z LPCWSTR /*wzBundleId*/ ) @@ -113,6 +141,7 @@ public: // IBurnUserExperience virtual STDMETHODIMP_(int) OnDetectRelatedBundle( __in_z LPCWSTR /*wzBundleId*/, + __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/, __in_z LPCWSTR /*wzBundleTag*/, __in BOOL /*fPerMachine*/, __in DWORD64 /*dw64Version*/, diff --git a/tools/WIX/sdk/inc/IBootstrapperApplication.h b/tools/WIX/sdk/inc/IBootstrapperApplication.h index d2b57e8d..55ab50ab 100644 --- a/tools/WIX/sdk/inc/IBootstrapperApplication.h +++ b/tools/WIX/sdk/inc/IBootstrapperApplication.h @@ -53,6 +53,7 @@ enum BOOTSTRAPPER_ERROR_TYPE BOOTSTRAPPER_ERROR_TYPE_EXE_PACKAGE, // error came from an exe package. BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_SERVER, // error occurred trying to authenticate with HTTP server. BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_PROXY, // error occurred trying to authenticate with HTTP proxy. + BOOTSTRAPPER_ERROR_TYPE_APPLY, // error occurred during apply. }; @@ -92,6 +93,7 @@ enum BOOTSTRAPPER_RELATION_TYPE BOOTSTRAPPER_RELATION_ADDON, BOOTSTRAPPER_RELATION_PATCH, BOOTSTRAPPER_RELATION_DEPENDENT, + BOOTSTRAPPER_RELATION_UPDATE, }; @@ -109,6 +111,7 @@ struct BOOTSTRAPPER_COMMAND // If this was run from a related bundle, specifies the relation type BOOTSTRAPPER_RELATION_TYPE relationType; + BOOL fPassthrough; LPWSTR wzLayoutDirectory; }; @@ -141,7 +144,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A // All other return codes allow the shutdown to commence. STDMETHOD_(int, OnSystemShutdown)( __in DWORD dwEndSession, - __in int nRecommdendation + __in int nRecommendation ) = 0; // OnDetectBegin - called when the engine begins detection. @@ -151,9 +154,49 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A // // IDNOACTION instructs the engine to continue. STDMETHOD_(int, OnDetectBegin)( + __in BOOL fInstalled, __in DWORD cPackages ) = 0; + // OnDetectForwardCompatibleBundle - called when the engine detects a forward compatible bundle. + // + // Return: + // IDOK instructs the engine to use the forward compatible bundle. + // + // IDCANCEL instructs the engine to stop detection. + // + // IDNOACTION instructs the engine to not use the forward compatible bundle. + STDMETHOD_(int, OnDetectForwardCompatibleBundle)( + __in_z LPCWSTR wzBundleId, + __in BOOTSTRAPPER_RELATION_TYPE relationType, + __in_z LPCWSTR wzBundleTag, + __in BOOL fPerMachine, + __in DWORD64 dw64Version, + __in int nRecommendation + ) = 0; + + // OnDetectUpdateBegin - called when the engine begins detection for bundle update. + // + // Return: + // IDOK instructs the engine to attempt update detection. + // + // IDCANCEL instructs the engine to stop detection. + // + // IDNOACTION instructs the engine to skip update detection. + STDMETHOD_(int, OnDetectUpdateBegin)( + __in_z LPCWSTR wzUpdateLocation, + __in int nRecommendation + ) = 0; + + // OnDetectUpdateComplete - called when the engine completes detection for bundle update. + // + // Remarks: + // wzUpdateLocation is null if no update was available. + STDMETHOD_(void, OnDetectUpdateComplete)( + __in HRESULT hrStatus, + __in_z_opt LPCWSTR wzUpdateLocation + ) = 0; + // OnDetectRelatedBundle - called when the engine detects a related bundle. // // Return: @@ -162,6 +205,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A // IDNOACTION instructs the engine to continue. STDMETHOD_(int, OnDetectRelatedBundle)( __in_z LPCWSTR wzBundleId, + __in BOOTSTRAPPER_RELATION_TYPE relationType, __in_z LPCWSTR wzBundleTag, __in BOOL fPerMachine, __in DWORD64 dw64Version, diff --git a/tools/WIX/sdk/inc/IBootstrapperEngine.h b/tools/WIX/sdk/inc/IBootstrapperEngine.h index ae45a0c0..4c2a4191 100644 --- a/tools/WIX/sdk/inc/IBootstrapperEngine.h +++ b/tools/WIX/sdk/inc/IBootstrapperEngine.h @@ -30,6 +30,8 @@ enum BOOTSTRAPPER_ACTION BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_ACTION_MODIFY, BOOTSTRAPPER_ACTION_REPAIR, + BOOTSTRAPPER_ACTION_UPDATE_REPLACE, + BOOTSTRAPPER_ACTION_UPDATE_REPLACE_EMBEDDED, }; enum BOOTSTRAPPER_ACTION_STATE @@ -94,6 +96,12 @@ enum BOOTSTRAPPER_LOG_LEVEL BOOTSTRAPPER_LOG_LEVEL_ERROR, // always gets reported, but can never be specified }; +enum BOOTSTRAPPER_UPDATE_HASH_TYPE +{ + BOOTSTRAPPER_UPDATE_HASH_TYPE_NONE, + BOOTSTRAPPER_UPDATE_HASH_TYPE_SHA1, +}; + DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-81512C29C2FB") { @@ -152,6 +160,15 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8 __out int* pnResult ) = 0; + STDMETHOD(SetUpdate)( + __in_z_opt LPCWSTR wzLocalSource, + __in_z_opt LPCWSTR wzDownloadSource, + __in DWORD64 qwSize, + __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType, + __in_bcount_opt(cbHash) BYTE* rgbHash, + __in DWORD cbHash + ) = 0; + STDMETHOD(SetLocalSource)( __in_z LPCWSTR wzPackageOrContainerId, __in_z_opt LPCWSTR wzPayloadId, diff --git a/tools/WIX/sdk/inc/balinfo.h b/tools/WIX/sdk/inc/balinfo.h index 5e2c058c..337b2287 100644 --- a/tools/WIX/sdk/inc/balinfo.h +++ b/tools/WIX/sdk/inc/balinfo.h @@ -47,6 +47,7 @@ typedef struct _BAL_INFO_PACKAGES typedef struct _BAL_INFO_BUNDLE { + BOOL fPerMachine; LPWSTR sczName; LPWSTR sczLogVariable; BAL_INFO_PACKAGES packages; diff --git a/tools/WIX/sdk/inc/balutil.h b/tools/WIX/sdk/inc/balutil.h index 7e6aa76d..6412ff1d 100644 --- a/tools/WIX/sdk/inc/balutil.h +++ b/tools/WIX/sdk/inc/balutil.h @@ -67,6 +67,16 @@ DAPI_(HRESULT) BalFormatString( __inout LPWSTR* psczOut ); +/******************************************************************* +BalGetNumericVariable - gets a number from a variable in the engine. + + Note: Returns E_NOTFOUND if variable does not exist. +********************************************************************/ +DAPI_(HRESULT) BalGetNumericVariable( + __in_z LPCWSTR wzVariable, + __out LONGLONG* pllValue + ); + /******************************************************************* BalStringVariableExists - checks if a string variable exists in the engine. diff --git a/tools/WIX/sdk/inc/custommsierrors.h b/tools/WIX/sdk/inc/custommsierrors.h new file mode 100644 index 00000000..2f3871e4 --- /dev/null +++ b/tools/WIX/sdk/inc/custommsierrors.h @@ -0,0 +1,153 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +//------------------------------------------------------------------------------------------------- + +//--------------------------------------------------------------------------- +// Indexes for custom errors in the MSI +// +// Note: Custom Errors must be in the range 25000-30000, all other error +// codes are reserved for the Windows Installer as standard error ranges +// NEVER reuse an error number or you're likely to break the builds. +//--------------------------------------------------------------------------- + +// Instructions: +// 1. add the index to this file +// 2. define the error table row +// 3. #include CustomMsiErrors to refer to the index +// 4. Import Misc\CustomErrors { MYDEFINE=1 }; with your errorgroup under MYDEFINE + + +//--------------------------------------------------------------------------- +// GLOBAL 25501-25600 +#define GLOBAL_ERROR_BASE 25501 + +#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 msierrFirewallCannotConnect 25580 + +//--------------------------------------------------------------------------- +// Server CustomAction Errors +// SERVER range: 26001-26100 +#define SERVER_ERROR_BASE 26000 + +#define msierrIISCannotConnect 26001 +#define msierrIISFailedReadWebSite 26002 +#define msierrIISFailedReadWebDirs 26003 +#define msierrIISFailedReadVDirs 26004 +#define msierrIISFailedReadFilters 26005 +#define msierrIISFailedReadAppPool 26006 +#define msierrIISFailedReadMimeMap 26007 +#define msierrIISFailedReadProp 26008 +#define msierrIISFailedReadWebSvcExt 26009 +#define msierrIISFailedReadWebError 26010 +#define msierrIISFailedReadHttpHeader 26011 + +#define msierrIISFailedSchedTransaction 26031 +#define msierrIISFailedSchedInstallWebs 26032 +#define msierrIISFailedSchedInstallWebDirs 26033 +#define msierrIISFailedSchedInstallVDirs 26034 +#define msierrIISFailedSchedInstallFilters 26035 +#define msierrIISFailedSchedInstallAppPool 26036 +#define msierrIISFailedSchedInstallProp 26037 +#define msierrIISFailedSchedInstallWebSvcExt 26038 + +#define msierrIISFailedSchedUninstallWebs 26051 +#define msierrIISFailedSchedUninstallWebDirs 26052 +#define msierrIISFailedSchedUninstallVDirs 26053 +#define msierrIISFailedSchedUninstallFilters 26054 +#define msierrIISFailedSchedUninstallAppPool 26055 +#define msierrIISFailedSchedUninstallProp 26056 +#define msierrIISFailedSchedUninstallWebSvcExt 26057 + +#define msierrIISFailedStartTransaction 26101 +#define msierrIISFailedOpenKey 26102 +#define msierrIISFailedCreateKey 26103 +#define msierrIISFailedWriteData 26104 +#define msierrIISFailedCreateApp 26105 +#define msierrIISFailedDeleteKey 26106 +#define msierrIISFailedDeleteApp 26107 +#define msierrIISFailedDeleteValue 26108 +#define msierrIISFailedCommitInUse 26109 + +#define msierrSQLFailedCreateDatabase 26201 +#define msierrSQLFailedDropDatabase 26202 +#define msierrSQLFailedConnectDatabase 26203 +#define msierrSQLFailedExecString 26204 +#define msierrSQLDatabaseAlreadyExists 26205 + +#define msierrPERFMONFailedRegisterDLL 26251 +#define msierrPERFMONFailedUnregisterDLL 26252 +#define msierrInstallPerfCounterData 26253 +#define msierrUninstallPerfCounterData 26254 + +#define msierrSMBFailedCreate 26301 +#define msierrSMBFailedDrop 26302 + +#define msierrCERTFailedOpen 26351 +#define msierrCERTFailedAdd 26352 + +#define msierrUSRFailedUserCreate 26401 +#define msierrUSRFailedUserCreatePswd 26402 +#define msierrUSRFailedUserGroupAdd 26403 +#define msierrUSRFailedUserCreateExists 26404 +#define msierrUSRFailedGrantLogonAsService 26405 + +#define msierrDependencyMissingDependencies 26451 +#define msierrDependencyHasDependents 26452 + +//-------------------------------------------------------------------------- +// Managed code CustomAction Errors +// MANAGED range: 27000-27100 +#define MANAGED_ERROR_BASE 27000 + +#define msierrDotNetRuntimeRequired 27000 +//--------------------------------------------------------------------------- +// Public CustomAction Errors +// PUBLIC range: 28001-28100 +#define PUBLIC_ERROR_BASE 28000 + +#define msierrComPlusCannotConnect 28001 +#define msierrComPlusPartitionReadFailed 28002 +#define msierrComPlusPartitionRoleReadFailed 28003 +#define msierrComPlusUserInPartitionRoleReadFailed 28004 +#define msierrComPlusPartitionUserReadFailed 28005 +#define msierrComPlusApplicationReadFailed 28006 +#define msierrComPlusApplicationRoleReadFailed 28007 +#define msierrComPlusUserInApplicationRoleReadFailed 28008 +#define msierrComPlusAssembliesReadFailed 28009 +#define msierrComPlusSubscriptionReadFailed 28010 +#define msierrComPlusPartitionDependency 28011 +#define msierrComPlusPartitionNotFound 28012 +#define msierrComPlusPartitionIdConflict 28013 +#define msierrComPlusPartitionNameConflict 28014 +#define msierrComPlusApplicationDependency 28015 +#define msierrComPlusApplicationNotFound 28016 +#define msierrComPlusApplicationIdConflict 28017 +#define msierrComPlusApplicationNameConflict 28018 +#define msierrComPlusApplicationRoleDependency 28019 +#define msierrComPlusApplicationRoleNotFound 28020 +#define msierrComPlusApplicationRoleConflict 28021 +#define msierrComPlusAssemblyDependency 28022 +#define msierrComPlusSubscriptionIdConflict 28023 +#define msierrComPlusSubscriptionNameConflict 28024 +#define msierrComPlusFailedLookupNames 28025 + +#define msierrMsmqCannotConnect 28101 diff --git a/tools/WIX/sdk/inc/deputil.h b/tools/WIX/sdk/inc/deputil.h index d9bdfe42..bc2464c5 100644 --- a/tools/WIX/sdk/inc/deputil.h +++ b/tools/WIX/sdk/inc/deputil.h @@ -23,10 +23,23 @@ typedef struct _DEPENDENCY { LPWSTR sczKey; LPWSTR sczName; - } DEPENDENCY; +/*************************************************************************** + DepGetProviderInformation - gets the various pieces of data registered + with a dependency. + + Note: Returns E_NOTFOUND if the dependency was not found. +***************************************************************************/ +DAPI_(HRESULT) DepGetProviderInformation( + __in HKEY hkHive, + __in_z LPCWSTR wzProviderKey, + __deref_out_z_opt LPWSTR* psczId, + __deref_out_z_opt LPWSTR* psczName, + __out_opt DWORD64* pqwVersion + ); + /*************************************************************************** DepCheckDependency - Checks that the dependency is registered and within the proper version range. @@ -67,9 +80,22 @@ DAPI_(HRESULT) DepRegisterDependency( __in_z LPCWSTR wzProviderKey, __in_z LPCWSTR wzVersion, __in_z LPCWSTR wzDisplayName, + __in_z_opt LPCWSTR wzId, __in int iAttributes ); +/*************************************************************************** + DepDependentExists - Determines if a dependent is registered. + + Note: Returns S_OK if dependent is registered. + Returns E_FILENOTFOUND if dependent is not registered +***************************************************************************/ +DAPI_(HRESULT) DepDependentExists( + __in HKEY hkHive, + __in_z LPCWSTR wzDependencyProviderKey, + __in_z LPCWSTR wzProviderKey + ); + /*************************************************************************** DepRegisterDependent - Registers a dependent under the dependency provider. diff --git a/tools/WIX/sdk/inc/dictutil.h b/tools/WIX/sdk/inc/dictutil.h index 8e8619e6..3b954214 100644 --- a/tools/WIX/sdk/inc/dictutil.h +++ b/tools/WIX/sdk/inc/dictutil.h @@ -42,6 +42,17 @@ HRESULT DAPI DictCreateStringList( __in DWORD dwNumExpectedItems, __in DICT_FLAG dfFlags ); +HRESULT DAPI DictCreateStringListFromArray( + __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle, + __in_ecount(cStringArray) const LPCWSTR* rgwzStringArray, + __in const DWORD cStringArray, + __in DICT_FLAG dfFlags + ); +HRESULT DAPI DictCompareStringListToArray( + __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdStringList, + __in_ecount(cStringArray) const LPCWSTR* rgwzStringArray, + __in const DWORD cStringArray + ); HRESULT DAPI DictAddKey( __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle, __in_z LPCWSTR szString diff --git a/tools/WIX/sdk/inc/dutil.h b/tools/WIX/sdk/inc/dutil.h index 2d799199..2c7b33a9 100644 --- a/tools/WIX/sdk/inc/dutil.h +++ b/tools/WIX/sdk/inc/dutil.h @@ -23,6 +23,7 @@ enum REPORT_LEVEL { REPORT_NONE, // turns off report (only valid for XXXSetLevel()) + REPORT_WARNING, // written if want only warnings or reporting is on in general REPORT_STANDARD, // written if reporting is on REPORT_VERBOSE, // written only if verbose reporting is on REPORT_DEBUG, // reporting useful when debugging code diff --git a/tools/WIX/sdk/inc/iis7util.h b/tools/WIX/sdk/inc/iis7util.h new file mode 100644 index 00000000..b3915ba4 --- /dev/null +++ b/tools/WIX/sdk/inc/iis7util.h @@ -0,0 +1,232 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// IIS7 helper functions. +// +//------------------------------------------------------------------------------------------------- + + +#ifdef __cplusplus +extern "C" { +#endif + +// IIS Config schema names +#define IIS_CONFIG_ADD L"add" +#define IIS_CONFIG_ALLOWED L"allowed" +#define IIS_CONFIG_APPHOST_ROOT L"MACHINE/WEBROOT/APPHOST" +#define IIS_CONFIG_APPLICATION L"application" +#define IIS_CONFIG_APPPOOL L"applicationPool" +#define IIS_CONFIG_APPPOOL_AUTO L"autoStart" +#define IIS_CONFIG_APPPOOL_SECTION L"system.applicationHost/applicationPools" +#define IIS_CONFIG_AUTOSTART L"serverAutoStart" +#define IIS_CONFIG_BINDING L"binding" +#define IIS_CONFIG_BINDINGINFO L"bindingInformation" +#define IIS_CONFIG_BINDINGS L"bindings" +#define IIS_CONFIG_DESC L"description" +#define IIS_CONFIG_EXECUTABLE L"scriptProcessor" +#define IIS_CONFIG_ENABLED L"enabled" +#define IIS_CONFIG_ENABLE32 L"enable32BitAppOnWin64" +#define IIS_CONFIG_FILEEXT L"fileExtension" +#define IIS_CONFIG_FILTER L"filter" +#define IIS_CONFIG_GROUPID L"groupId" +#define IIS_CONFIG_HEADERS L"customHeaders" +#define IIS_CONFIG_HTTPERRORS_SECTION L"system.webServer/httpErrors" +#define IIS_CONFIG_ID L"id" +#define IIS_CONFIG_ISAPI_SECTION L"system.webServer/isapiFilters" +#define IIS_CONFIG_HTTPPROTO_SECTION L"system.webServer/httpProtocol" +#define IIS_CONFIG_LOG_SECTION L"system.applicationHost/log" +#define IIS_CONFIG_LOG_UTF8 L"logInUTF8" +#define IIS_CONFIG_LIMITS L"limits" +#define IIS_CONFIG_PIPELINEMODE L"managedPipelineMode" +#define IIS_CONFIG_MANAGEDRUNTIMEVERSION L"managedRuntimeVersion" +#define IIS_CONFIG_WEBLOG L"logFile" +#define IIS_CONFIG_LOGFORMAT L"logFormat" +#define IIS_CONFIG_MIMEMAP L"mimeMap" +#define IIS_CONFIG_MIMETYPE L"mimeType" +#define IIS_CONFIG_MODULES L"modules" +#define IIS_CONFIG_NAME L"name" +#define IIS_CONFIG_PATH L"path" +#define IIS_CONFIG_PHYSPATH L"physicalPath" +#define IIS_CONFIG_PROTOCOL L"protocol" +#define IIS_CONFIG_RESTRICTION_SECTION L"system.webServer/security/isapiCgiRestriction" +#define IIS_CONFIG_SITE L"site" +#define IIS_CONFIG_SITE_ID L"id" +#define IIS_CONFIG_SITES_SECTION L"system.applicationHost/sites" +#define IIS_CONFIG_CONNECTTIMEOUT L"connectionTimeout" +#define IIS_CONFIG_VDIR L"virtualDirectory" +#define IIS_CONFIG_VALUE L"value" +#define IIS_CONFIG_VERBS L"verb" +#define IIS_CONFIG_WEBLIMITS_SECTION L"system.applicationHost/webLimits" +#define IIS_CONFIG_WEBLIMITS_MAXBAND L"maxGlobalBandwidth" +#define IIS_CONFIG_TRUE L"true" +#define IIS_CONFIG_FALSE L"false" +#define IIS_CONFIG_ERROR L"error" +#define IIS_CONFIG_STATUSCODE L"statusCode" +#define IIS_CONFIG_SUBSTATUS L"subStatusCode" +#define IIS_CONFIG_LANGPATH L"prefixLanguageFilePath" +#define IIS_CONFIG_RESPMODE L"responseMode" +#define IIS_CONFIG_CLEAR L"clear" +#define IIS_CONFIG_RECYCLING L"recycling" +#define IIS_CONFIG_PEROIDRESTART L"periodicRestart" +#define IIS_CONFIG_TIME L"time" +#define IIS_CONFIG_REQUESTS L"requests" +#define IIS_CONFIG_SCHEDULE L"schedule" +#define IIS_CONFIG_MEMORY L"memory" +#define IIS_CONFIG_PRIVMEMORY L"privateMemory" +#define IIS_CONFIG_PROCESSMODEL L"processModel" +#define IIS_CONFIG_IDLETIMEOUT L"idleTimeout" +#define IIS_CONFIG_QUEUELENGTH L"queueLength" +#define IIS_CONFIG_IDENITITYTYPE L"identityType" +#define IIS_CONFIG_LOCALSYSTEM L"LocalSystem" +#define IIS_CONFIG_LOCALSERVICE L"LocalService" +#define IIS_CONFIG_NETWORKSERVICE L"NetworkService" +#define IIS_CONFIG_SPECIFICUSER L"SpecificUser" +#define IIS_CONFIG_USERNAME L"userName" +#define IIS_CONFIG_PASSWORD L"password" +#define IIS_CONFIG_CPU L"cpu" +#define IIS_CONFIG_LIMIT L"limit" +#define IIS_CONFIG_CPU_ACTION L"action" +#define IIS_CONFIG_KILLW3WP L"KillW3wp" +#define IIS_CONFIG_NOACTION L"NoAction" +#define IIS_CONFIG_RESETINTERVAL L"resetInterval" +#define IIS_CONFIG_MAXWRKPROCESSES L"maxProcesses" +#define IIS_CONFIG_HANDLERS_SECTION L"system.webServer/handlers" +#define IIS_CONFIG_DEFAULTDOC_SECTION L"system.webServer/defaultDocument" +#define IIS_CONFIG_ASP_SECTION L"system.webServer/asp" +#define IIS_CONFIG_SCRIPTERROR L"scriptErrorSentToBrowser" +#define IIS_CONFIG_STATICCONTENT_SECTION L"system.webServer/staticContent" +#define IIS_CONFIG_HTTPEXPIRES L"httpExpires" +#define IIS_CONFIG_MAXAGE L"cacheControlMaxAge" +#define IIS_CONFIG_CLIENTCACHE L"clientCache" +#define IIS_CONFIG_CACHECONTROLMODE L"cacheControlMode" +#define IIS_CONFIG_USEMAXAGE L"UseMaxAge" +#define IIS_CONFIG_USEEXPIRES L"UseExpires" +#define IIS_CONFIG_CACHECUST L"cacheControlCustom" +#define IIS_CONFIG_ASP_SECTION L"system.webServer/asp" +#define IIS_CONFIG_SESSION L"session" +#define IIS_CONFIG_ALLOWSTATE L"allowSessionState" +#define IIS_CONFIG_TIMEOUT L"timeout" +#define IIS_CONFIG_BUFFERING L"bufferingOn" +#define IIS_CONFIG_PARENTPATHS L"enableParentPaths" +#define IIS_CONFIG_SCRIPTLANG L"scriptLanguage" +#define IIS_CONFIG_SCRIPTTIMEOUT L"scriptTimeout" +#define IIS_CONFIG_LIMITS L"limits" +#define IIS_CONFIG_ALLOWDEBUG L"appAllowDebugging" +#define IIS_CONFIG_ALLOWCLIENTDEBUG L"appAllowClientDebug" +#define IIS_CONFIG_CERTIFICATEHASH L"certificateHash" +#define IIS_CONFIG_CERTIFICATESTORENAME L"certificateStoreName" +#define IIS_CONFIG_HTTPLOGGING_SECTION L"system.webServer/httpLogging" +#define IIS_CONFIG_DONTLOG L"dontLog" + +typedef BOOL (CALLBACK* ENUMAPHOSTELEMENTPROC)(IAppHostElement*, LPVOID); +typedef BOOL (CALLBACK* VARIANTCOMPARATORPROC)(VARIANT*, VARIANT*); + +HRESULT DAPI Iis7PutPropertyVariant( + __in IAppHostElement *pElement, + __in LPCWSTR wzPropName, + __in VARIANT vtPut + ); + +HRESULT DAPI Iis7PutPropertyInteger( + __in IAppHostElement *pElement, + __in LPCWSTR wzPropName, + __in DWORD dValue + ); + +HRESULT DAPI Iis7PutPropertyString( + __in IAppHostElement *pElement, + __in LPCWSTR wzPropName, + __in LPCWSTR wzString + ); + +HRESULT DAPI Iis7PutPropertyBool( + __in IAppHostElement *pElement, + __in LPCWSTR wzPropName, + __in BOOL fValue); + +HRESULT DAPI Iis7GetPropertyVariant( + __in IAppHostElement *pElement, + __in LPCWSTR wzPropName, + __in VARIANT* vtGet + ); + +HRESULT DAPI Iis7GetPropertyString( + __in IAppHostElement *pElement, + __in LPCWSTR wzPropName, + __in LPWSTR* psczGet + ); + +struct IIS7_APPHOSTELEMENTCOMPARISON +{ + LPCWSTR sczElementName; + LPCWSTR sczAttributeName; + VARIANT* pvAttributeValue; + VARIANTCOMPARATORPROC pComparator; +}; + +BOOL DAPI Iis7IsMatchingAppHostElement( + __in IAppHostElement *pElement, + __in IIS7_APPHOSTELEMENTCOMPARISON* pComparison + ); + +HRESULT DAPI Iis7FindAppHostElementString( + __in IAppHostElementCollection *pCollection, + __in LPCWSTR wzElementName, + __in LPCWSTR wzAttributeName, + __in LPCWSTR wzAttributeValue, + __out IAppHostElement** ppElement, + __out DWORD* pdwIndex + ); + +HRESULT DAPI Iis7FindAppHostElementPath( + __in IAppHostElementCollection *pCollection, + __in LPCWSTR wzElementName, + __in LPCWSTR wzAttributeName, + __in LPCWSTR wzAttributeValue, + __out IAppHostElement** ppElement, + __out DWORD* pdwIndex + ); + +HRESULT DAPI Iis7FindAppHostElementInteger( + __in IAppHostElementCollection *pCollection, + __in LPCWSTR wzElementName, + __in LPCWSTR wzAttributeName, + __in DWORD dwAttributeValue, + __out IAppHostElement** ppElement, + __out DWORD* pdwIndex + ); + +HRESULT DAPI Iis7FindAppHostElementVariant( + __in IAppHostElementCollection *pCollection, + __in LPCWSTR wzElementName, + __in LPCWSTR wzAttributeName, + __in VARIANT* pvAttributeValue, + __out IAppHostElement** ppElement, + __out DWORD* pdwIndex + ); + +HRESULT DAPI Iis7EnumAppHostElements( + __in IAppHostElementCollection *pCollection, + __in ENUMAPHOSTELEMENTPROC pCallback, + __in LPVOID pContext, + __out IAppHostElement** ppElement, + __out DWORD* pdwIndex + ); + +HRESULT DAPI Iis7FindAppHostMethod( + __in IAppHostMethodCollection *pCollection, + __in LPCWSTR wzMethodName, + __out IAppHostMethod** ppMethod, + __out DWORD* pdwIndex + ); + +#ifdef __cplusplus +} +#endif diff --git a/tools/WIX/sdk/inc/iniutil.h b/tools/WIX/sdk/inc/iniutil.h new file mode 100644 index 00000000..58877896 --- /dev/null +++ b/tools/WIX/sdk/inc/iniutil.h @@ -0,0 +1,83 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// Ini/cfg file helper functions. +// +//------------------------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { +#endif + +#define ReleaseIni(ih) if (ih) { IniUninitialize(ih); } +#define ReleaseNullIni(ih) if (ih) { IniUninitialize(ih); ih = NULL; } + +typedef void* INI_HANDLE; +typedef const void* C_INI_HANDLE; + +extern const int INI_HANDLE_BYTES; + +struct INI_VALUE +{ + LPCWSTR wzName; + LPCWSTR wzValue; + + DWORD dwLineNumber; +}; + +HRESULT DAPI IniInitialize( + __out_bcount(INI_HANDLE_BYTES) INI_HANDLE* piHandle + ); +void DAPI IniUninitialize( + __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle + ); +HRESULT DAPI IniSetOpenTag( + __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in_z_opt LPCWSTR wzOpenTagPrefix, + __in_z_opt LPCWSTR wzOpenTagPostfix + ); +HRESULT DAPI IniSetValueStyle( + __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in_z_opt LPCWSTR wzValuePrefix, + __in_z_opt LPCWSTR wzValueSeparator + ); +HRESULT DAPI IniSetCommentStyle( + __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in_z_opt LPCWSTR wzLinePrefix + ); +HRESULT DAPI IniParse( + __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in LPCWSTR wzPath, + __out_opt FILE_ENCODING *pfeEncodingFound + ); +HRESULT DAPI IniGetValueList( + __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __deref_out_ecount_opt(pcValues) INI_VALUE** prgivValues, + __out DWORD *pcValues + ); +HRESULT DAPI IniGetValue( + __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in LPCWSTR wzValueName, + __deref_out_z LPWSTR* psczValue + ); +HRESULT DAPI IniSetValue( + __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in LPCWSTR wzValueName, + __in_z_opt LPCWSTR wzValue + ); +HRESULT DAPI IniWriteFile( + __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle, + __in_z_opt LPCWSTR wzPath, + __in FILE_ENCODING feOverrideEncoding + ); + +#ifdef __cplusplus +} +#endif diff --git a/tools/WIX/sdk/inc/logutil.h b/tools/WIX/sdk/inc/logutil.h index b15ba7b9..2761fea2 100644 --- a/tools/WIX/sdk/inc/logutil.h +++ b/tools/WIX/sdk/inc/logutil.h @@ -76,9 +76,9 @@ void DAPI LogUninitialize( BOOL DAPI LogIsOpen(); HRESULT DAPI LogSetSpecialParams( - __in_z LPCWSTR wzSpecialBeginLine, - __in_z LPCWSTR wzSpecialAfterTimeStamp, - __in_z LPCWSTR wzSpecialEndLine + __in_z_opt LPCWSTR wzSpecialBeginLine, + __in_z_opt LPCWSTR wzSpecialAfterTimeStamp, + __in_z_opt LPCWSTR wzSpecialEndLine ); REPORT_LEVEL DAPI LogSetLevel( diff --git a/tools/WIX/sdk/inc/polcutil.h b/tools/WIX/sdk/inc/polcutil.h new file mode 100644 index 00000000..1f6bb412 --- /dev/null +++ b/tools/WIX/sdk/inc/polcutil.h @@ -0,0 +1,47 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// Header for Policy utility functions. +// +//------------------------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { +#endif + +/******************************************************************** +PolcReadNumber - reads a number from policy. + +NOTE: S_FALSE returned if policy not set. +NOTE: out is set to default on S_FALSE or any error. +********************************************************************/ +HRESULT DAPI PolcReadNumber( + __in_z LPCWSTR wzPolicyPath, + __in_z LPCWSTR wzPolicyName, + __in DWORD dwDefault, + __out DWORD* pdw + ); + +/******************************************************************** +PolcReadString - reads a string from policy. + +NOTE: S_FALSE returned if policy not set. +NOTE: out is set to default on S_FALSE or any error. +********************************************************************/ +HRESULT DAPI PolcReadString( + __in_z LPCWSTR wzPolicyPath, + __in_z LPCWSTR wzPolicyName, + __in_z_opt LPCWSTR wzDefault, + __deref_out_z LPWSTR* pscz + ); + +#ifdef __cplusplus +} +#endif diff --git a/tools/WIX/sdk/inc/rmutil.h b/tools/WIX/sdk/inc/rmutil.h new file mode 100644 index 00000000..6728a2c2 --- /dev/null +++ b/tools/WIX/sdk/inc/rmutil.h @@ -0,0 +1,56 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// Header for Restart Manager utility functions. +// +//------------------------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _RMU_SESSION *PRMU_SESSION; + +HRESULT DAPI RmuJoinSession( + __out PRMU_SESSION *ppSession, + __in_z LPCWSTR wzSessionKey + ); + +HRESULT DAPI RmuAddFile( + __in PRMU_SESSION pSession, + __in_z LPCWSTR wzPath + ); + +HRESULT DAPI RmuAddProcessById( + __in PRMU_SESSION pSession, + __in DWORD dwProcessId + ); + +HRESULT DAPI RmuAddProcessesByName( + __in PRMU_SESSION pSession, + __in_z LPCWSTR wzProcessName + ); + +HRESULT DAPI RmuAddService( + __in PRMU_SESSION pSession, + __in_z LPCWSTR wzServiceName + ); + +HRESULT DAPI RmuRegisterResources( + __in PRMU_SESSION pSession + ); + +HRESULT DAPI RmuEndSession( + __in PRMU_SESSION pSession + ); + +#ifdef __cplusplus +} +#endif diff --git a/tools/WIX/sdk/inc/srputil.h b/tools/WIX/sdk/inc/srputil.h new file mode 100644 index 00000000..27c4694a --- /dev/null +++ b/tools/WIX/sdk/inc/srputil.h @@ -0,0 +1,57 @@ +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// System restore point helper functions. +// +//------------------------------------------------------------------------------------------------- + +#pragma once + + +#ifdef __cplusplus +extern "C" { +#endif + + +enum SRP_ACTION +{ + SRP_ACTION_UNKNOWN, + SRP_ACTION_UNINSTALL, + SRP_ACTION_INSTALL, + SRP_ACTION_MODIFY, +}; + + +/******************************************************************** + SrpInitialize - initializes system restore point functionality. + +*******************************************************************/ +DAPI_(HRESULT) SrpInitialize( + __in BOOL fInitializeComSecurity + ); + +/******************************************************************** + SrpUninitialize - uninitializes system restore point functionality. + +*******************************************************************/ +DAPI_(void) SrpUninitialize(); + +/******************************************************************** + SrpCreateRestorePoint - creates a system restore point. + +*******************************************************************/ +DAPI_(HRESULT) SrpCreateRestorePoint( + __in_z LPCWSTR wzApplicationName, + __in SRP_ACTION action + ); + +#ifdef __cplusplus +} +#endif + diff --git a/tools/WIX/sdk/inc/svcutil.h b/tools/WIX/sdk/inc/svcutil.h new file mode 100644 index 00000000..f35c6f5b --- /dev/null +++ b/tools/WIX/sdk/inc/svcutil.h @@ -0,0 +1,31 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// Header for Windows service helper functions. +// +//------------------------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { +#endif + + +#define ReleaseServiceHandle(h) if (h) { ::CloseServiceHandle(h); h = NULL; } + + +HRESULT DAPI SvcQueryConfig( + __in SC_HANDLE sch, + __out QUERY_SERVICE_CONFIGW** ppConfig + ); + + +#ifdef __cplusplus +} +#endif diff --git a/tools/WIX/sdk/inc/thmutil.h b/tools/WIX/sdk/inc/thmutil.h index f85bdf3d..85c08c64 100644 --- a/tools/WIX/sdk/inc/thmutil.h +++ b/tools/WIX/sdk/inc/thmutil.h @@ -375,6 +375,16 @@ DAPI_(BOOL) ThemeControlEnabled( __in DWORD dwControl ); +/******************************************************************** + ThemeControlElevates - sets/removes the shield icon on a control. + + *******************************************************************/ +DAPI_(void) ThemeControlElevates( + __in THEME* pTheme, + __in DWORD dwControl, + __in BOOL fElevates + ); + /******************************************************************** ThemeShowControl - shows/hides a control. diff --git a/tools/WIX/sdk/inc/wcalog.h b/tools/WIX/sdk/inc/wcalog.h new file mode 100644 index 00000000..be5e6594 --- /dev/null +++ b/tools/WIX/sdk/inc/wcalog.h @@ -0,0 +1,24 @@ +#pragma once +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// Private header for internal logging functions +// +//------------------------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WIXAPI IsVerboseLogging(); +HRESULT WIXAPI SetVerboseLoggingAtom(BOOL bValue); + +#ifdef __cplusplus +} +#endif diff --git a/tools/WIX/sdk/inc/wuautil.h b/tools/WIX/sdk/inc/wuautil.h new file mode 100644 index 00000000..832e69e8 --- /dev/null +++ b/tools/WIX/sdk/inc/wuautil.h @@ -0,0 +1,31 @@ +//------------------------------------------------------------------------------------------------- +// +// Copyright (c) 2004, Outercurve Foundation. +// This software is released under Microsoft Reciprocal License (MS-RL). +// The license and further copyright text can be found in the file +// LICENSE.TXT at the root directory of the distribution. +// +// +// +// Header for Windows Update Agent helpers. +// +//------------------------------------------------------------------------------------------------- + +#pragma once + + +#if defined(__cplusplus) +extern "C" { +#endif + +HRESULT DAPI WuaPauseAutomaticUpdates(); + +HRESULT DAPI WuaResumeAutomaticUpdates(); + +HRESULT DAPI WuaRestartRequired( + __out BOOL* pfRestartRequired + ); + +#if defined(__cplusplus) +} +#endif \ No newline at end of file diff --git a/tools/WIX/sdk/lib/balutil_2005.lib b/tools/WIX/sdk/lib/balutil_2005.lib deleted file mode 100644 index 4c98a648..00000000 Binary files a/tools/WIX/sdk/lib/balutil_2005.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/balutil_2008.lib b/tools/WIX/sdk/lib/balutil_2008.lib deleted file mode 100644 index dd6ba407..00000000 Binary files a/tools/WIX/sdk/lib/balutil_2008.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/balutil_2010.lib b/tools/WIX/sdk/lib/balutil_2010.lib deleted file mode 100644 index 9c4d780a..00000000 Binary files a/tools/WIX/sdk/lib/balutil_2010.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/balutil_2012.lib b/tools/WIX/sdk/lib/balutil_2012.lib deleted file mode 100644 index 1a066b7f..00000000 Binary files a/tools/WIX/sdk/lib/balutil_2012.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/deputil_2005.lib b/tools/WIX/sdk/lib/deputil_2005.lib deleted file mode 100644 index 65bb4dc6..00000000 Binary files a/tools/WIX/sdk/lib/deputil_2005.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/deputil_2008.lib b/tools/WIX/sdk/lib/deputil_2008.lib deleted file mode 100644 index e6fc8db2..00000000 Binary files a/tools/WIX/sdk/lib/deputil_2008.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/deputil_2010.lib b/tools/WIX/sdk/lib/deputil_2010.lib deleted file mode 100644 index 80cdd2e9..00000000 Binary files a/tools/WIX/sdk/lib/deputil_2010.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/deputil_2012.lib b/tools/WIX/sdk/lib/deputil_2012.lib deleted file mode 100644 index 2bcfd16d..00000000 Binary files a/tools/WIX/sdk/lib/deputil_2012.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2005.lib b/tools/WIX/sdk/lib/dutil_2005.lib deleted file mode 100644 index d0b05596..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2005.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2005_x64.lib b/tools/WIX/sdk/lib/dutil_2005_x64.lib deleted file mode 100644 index 6bc27e7a..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2005_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2008.lib b/tools/WIX/sdk/lib/dutil_2008.lib deleted file mode 100644 index 8296cf1a..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2008.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2008_x64.lib b/tools/WIX/sdk/lib/dutil_2008_x64.lib deleted file mode 100644 index 8ce9c0b4..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2008_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2010.lib b/tools/WIX/sdk/lib/dutil_2010.lib deleted file mode 100644 index 6ba51d85..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2010.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2010_x64.lib b/tools/WIX/sdk/lib/dutil_2010_x64.lib deleted file mode 100644 index dcd6a6a2..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2010_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2012.lib b/tools/WIX/sdk/lib/dutil_2012.lib deleted file mode 100644 index e913ce69..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2012.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/dutil_2012_x64.lib b/tools/WIX/sdk/lib/dutil_2012_x64.lib deleted file mode 100644 index d296d841..00000000 Binary files a/tools/WIX/sdk/lib/dutil_2012_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2005.lib b/tools/WIX/sdk/lib/wcautil_2005.lib deleted file mode 100644 index dc38c22d..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2005.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2005_x64.lib b/tools/WIX/sdk/lib/wcautil_2005_x64.lib deleted file mode 100644 index 47c09551..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2005_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2008.lib b/tools/WIX/sdk/lib/wcautil_2008.lib deleted file mode 100644 index a63fe9e0..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2008.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2008_x64.lib b/tools/WIX/sdk/lib/wcautil_2008_x64.lib deleted file mode 100644 index d859d723..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2008_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2010.lib b/tools/WIX/sdk/lib/wcautil_2010.lib deleted file mode 100644 index c201e88f..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2010.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2010_x64.lib b/tools/WIX/sdk/lib/wcautil_2010_x64.lib deleted file mode 100644 index 236859b5..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2010_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2012.lib b/tools/WIX/sdk/lib/wcautil_2012.lib deleted file mode 100644 index 08486c42..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2012.lib and /dev/null differ diff --git a/tools/WIX/sdk/lib/wcautil_2012_x64.lib b/tools/WIX/sdk/lib/wcautil_2012_x64.lib deleted file mode 100644 index 5af9df76..00000000 Binary files a/tools/WIX/sdk/lib/wcautil_2012_x64.lib and /dev/null differ diff --git a/tools/WIX/sdk/vs2008/lib/x64/deputil.lib b/tools/WIX/sdk/vs2008/lib/x64/deputil.lib new file mode 100644 index 00000000..d4402e03 Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x64/deputil.lib differ diff --git a/tools/WIX/sdk/vs2008/lib/x64/dutil.lib b/tools/WIX/sdk/vs2008/lib/x64/dutil.lib new file mode 100644 index 00000000..5ff038dd Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x64/dutil.lib differ diff --git a/tools/WIX/sdk/vs2008/lib/x64/wcautil.lib b/tools/WIX/sdk/vs2008/lib/x64/wcautil.lib new file mode 100644 index 00000000..7dc79292 Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x64/wcautil.lib differ diff --git a/tools/WIX/sdk/vs2008/lib/x86/balutil.lib b/tools/WIX/sdk/vs2008/lib/x86/balutil.lib new file mode 100644 index 00000000..ebfbe74c Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x86/balutil.lib differ diff --git a/tools/WIX/sdk/vs2008/lib/x86/deputil.lib b/tools/WIX/sdk/vs2008/lib/x86/deputil.lib new file mode 100644 index 00000000..97d1ceea Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x86/deputil.lib differ diff --git a/tools/WIX/sdk/vs2008/lib/x86/dutil.lib b/tools/WIX/sdk/vs2008/lib/x86/dutil.lib new file mode 100644 index 00000000..eb94c101 Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x86/dutil.lib differ diff --git a/tools/WIX/sdk/vs2008/lib/x86/wcautil.lib b/tools/WIX/sdk/vs2008/lib/x86/wcautil.lib new file mode 100644 index 00000000..9c666732 Binary files /dev/null and b/tools/WIX/sdk/vs2008/lib/x86/wcautil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x64/deputil.lib b/tools/WIX/sdk/vs2010/lib/x64/deputil.lib new file mode 100644 index 00000000..2b2a5e5e Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x64/deputil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x64/dutil.lib b/tools/WIX/sdk/vs2010/lib/x64/dutil.lib new file mode 100644 index 00000000..16ee7c97 Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x64/dutil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x64/wcautil.lib b/tools/WIX/sdk/vs2010/lib/x64/wcautil.lib new file mode 100644 index 00000000..ba9b15c5 Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x64/wcautil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x86/balutil.lib b/tools/WIX/sdk/vs2010/lib/x86/balutil.lib new file mode 100644 index 00000000..d1bd34f4 Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x86/balutil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x86/deputil.lib b/tools/WIX/sdk/vs2010/lib/x86/deputil.lib new file mode 100644 index 00000000..2ad0ec73 Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x86/deputil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x86/dutil.lib b/tools/WIX/sdk/vs2010/lib/x86/dutil.lib new file mode 100644 index 00000000..c4bce3e2 Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x86/dutil.lib differ diff --git a/tools/WIX/sdk/vs2010/lib/x86/wcautil.lib b/tools/WIX/sdk/vs2010/lib/x86/wcautil.lib new file mode 100644 index 00000000..a155c0a7 Binary files /dev/null and b/tools/WIX/sdk/vs2010/lib/x86/wcautil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x64/deputil.lib b/tools/WIX/sdk/vs2012/lib/x64/deputil.lib new file mode 100644 index 00000000..17a21493 Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x64/deputil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x64/dutil.lib b/tools/WIX/sdk/vs2012/lib/x64/dutil.lib new file mode 100644 index 00000000..f41eec0e Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x64/dutil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x64/wcautil.lib b/tools/WIX/sdk/vs2012/lib/x64/wcautil.lib new file mode 100644 index 00000000..a44fe864 Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x64/wcautil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x86/balutil.lib b/tools/WIX/sdk/vs2012/lib/x86/balutil.lib new file mode 100644 index 00000000..7ec26c84 Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x86/balutil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x86/deputil.lib b/tools/WIX/sdk/vs2012/lib/x86/deputil.lib new file mode 100644 index 00000000..34f657b0 Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x86/deputil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x86/dutil.lib b/tools/WIX/sdk/vs2012/lib/x86/dutil.lib new file mode 100644 index 00000000..18e90eb3 Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x86/dutil.lib differ diff --git a/tools/WIX/sdk/vs2012/lib/x86/wcautil.lib b/tools/WIX/sdk/vs2012/lib/x86/wcautil.lib new file mode 100644 index 00000000..27c521a4 Binary files /dev/null and b/tools/WIX/sdk/vs2012/lib/x86/wcautil.lib differ diff --git a/tools/WIX/sdk/wix.ca.targets b/tools/WIX/sdk/wix.ca.targets index 4ffd9937..c2a65ec3 100644 --- a/tools/WIX/sdk/wix.ca.targets +++ b/tools/WIX/sdk/wix.ca.targets @@ -23,9 +23,9 @@ $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.ca.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.6\bin\WixTasks.dll + $(MSBuildExtensionsPath32)\..\WiX Toolset v3.7\bin\WixTasks.dll $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix.ca.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.6\bin\WixTasks.dll + $(MSBuildExtensionsPath)\..\WiX Toolset v3.7\bin\WixTasks.dll $(TargetName).CA$(TargetExt) @@ -43,8 +43,8 @@ ================================================================================================== --> - SOFTWARE\Microsoft\Windows Installer XML\3.6 - SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.6 + SOFTWARE\Microsoft\Windows Installer XML\3.7 + SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.7 @@ -120,11 +120,11 @@ + Items to include in the CA package: + - Reference assemblies marked CopyLocal + - Project items of type Content + - Additional items in the CustomActionContents property + --> @@ -133,7 +133,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/tools/WIX/sdk/x64/sfxca.dll b/tools/WIX/sdk/x64/sfxca.dll index e580e6da..ace77c33 100644 Binary files a/tools/WIX/sdk/x64/sfxca.dll and b/tools/WIX/sdk/x64/sfxca.dll differ diff --git a/tools/WIX/sdk/x86/sfxca.dll b/tools/WIX/sdk/x86/sfxca.dll index 949cbc8d..c645e508 100644 Binary files a/tools/WIX/sdk/x86/sfxca.dll and b/tools/WIX/sdk/x86/sfxca.dll differ diff --git a/tools/WIX/setup.exe b/tools/WIX/setup.exe index 76b4e980..e56a6110 100644 Binary files a/tools/WIX/setup.exe and b/tools/WIX/setup.exe differ diff --git a/tools/WIX/setupbld.exe b/tools/WIX/setupbld.exe index 3a70d962..30b78559 100644 Binary files a/tools/WIX/setupbld.exe and b/tools/WIX/setupbld.exe differ diff --git a/tools/WIX/shine.exe b/tools/WIX/shine.exe index b600d62a..2235e8ba 100644 Binary files a/tools/WIX/shine.exe and b/tools/WIX/shine.exe differ diff --git a/tools/WIX/smoke.exe b/tools/WIX/smoke.exe index cbbd3e02..f5dff98a 100644 Binary files a/tools/WIX/smoke.exe and b/tools/WIX/smoke.exe differ diff --git a/tools/WIX/thmviewer.exe b/tools/WIX/thmviewer.exe index f1939dae..25f2c832 100644 Binary files a/tools/WIX/thmviewer.exe and b/tools/WIX/thmviewer.exe differ diff --git a/tools/WIX/torch.exe b/tools/WIX/torch.exe index 1cf43af6..293dcbd0 100644 Binary files a/tools/WIX/torch.exe and b/tools/WIX/torch.exe differ diff --git a/tools/WIX/votive2005.dll b/tools/WIX/votive2005.dll deleted file mode 100644 index 7cde9654..00000000 Binary files a/tools/WIX/votive2005.dll and /dev/null differ diff --git a/tools/WIX/votive2008.dll b/tools/WIX/votive2008.dll deleted file mode 100644 index 0633275f..00000000 Binary files a/tools/WIX/votive2008.dll and /dev/null differ diff --git a/tools/WIX/votive2010.dll b/tools/WIX/votive2010.dll deleted file mode 100644 index 281976ee..00000000 Binary files a/tools/WIX/votive2010.dll and /dev/null differ diff --git a/tools/WIX/wconsole.dll b/tools/WIX/wconsole.dll index 3b80723a..fc2783ce 100644 Binary files a/tools/WIX/wconsole.dll and b/tools/WIX/wconsole.dll differ diff --git a/tools/WIX/winterop.dll b/tools/WIX/winterop.dll index fe6e479c..f881023d 100644 Binary files a/tools/WIX/winterop.dll and b/tools/WIX/winterop.dll differ diff --git a/tools/WIX/wix.dll b/tools/WIX/wix.dll index 844a0c2d..84827b86 100644 Binary files a/tools/WIX/wix.dll and b/tools/WIX/wix.dll differ diff --git a/tools/WIX/wix200x.targets b/tools/WIX/wix200x.targets index 2aadfe39..60347014 100644 --- a/tools/WIX/wix200x.targets +++ b/tools/WIX/wix200x.targets @@ -63,13 +63,13 @@ $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.6\bin\WixTasks.dll + $(MSBuildExtensionsPath32)\..\WiX Toolset v3.7\bin\WixTasks.dll $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.6\bin\WixTasks.dll + $(MSBuildExtensionsPath)\..\WiX Toolset v3.7\bin\WixTasks.dll $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.6\bin\LuxTasks.dll + $(MSBuildExtensionsPath32)\..\WiX Toolset v3.7\bin\LuxTasks.dll $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.6\bin\LuxTasks.dll + $(MSBuildExtensionsPath)\..\WiX Toolset v3.7\bin\LuxTasks.dll @@ -490,8 +490,8 @@ ================================================================================================== --> - SOFTWARE\Microsoft\Windows Installer XML\3.6 - SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.6 + SOFTWARE\Microsoft\Windows Installer XML\3.7 + SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.7 diff --git a/tools/WIX/wix2010.targets b/tools/WIX/wix2010.targets index 9fd74f78..08527d0f 100644 --- a/tools/WIX/wix2010.targets +++ b/tools/WIX/wix2010.targets @@ -45,8 +45,8 @@ InitialTargets="_CheckForInvalidConfigurationAndPlatform; _CheckRequiredProperties"> - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.6@InstallRoot) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.6@InstallRoot) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.7@InstallRoot) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.7@InstallRoot)