Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update WiX to 3.5.2519.0.

  • Loading branch information...
commit 6010f775efcb44d02509ce1c74c5e11cd0a888a0 1 parent 72aae54
@jdhardy jdhardy authored
Showing with 4,507 additions and 5,077 deletions.
  1. BIN  Util/Wix35/BlankFile.zip
  2. BIN  Util/Wix35/CustomActionCPP_2005.zip
  3. BIN  Util/Wix35/CustomActionCPP_2008.zip
  4. BIN  Util/Wix35/IncludeFile.zip
  5. BIN  Util/Wix35/LocalizationFile.zip
  6. BIN  Util/Wix35/LuxTasks.dll
  7. BIN  Util/Wix35/Microsoft.Deployment.WindowsInstaller.dll
  8. BIN  Util/Wix35/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll
  9. BIN  Util/Wix35/SetupBuilder.dll
  10. BIN  Util/Wix35/TextFile.zip
  11. BIN  Util/Wix35/WixComPlusExtension.dll
  12. BIN  Util/Wix35/WixCop.exe
  13. BIN  Util/Wix35/WixDifxAppExtension.dll
  14. BIN  Util/Wix35/WixDirectXExtension.dll
  15. BIN  Util/Wix35/WixFirewallExtension.dll
  16. BIN  Util/Wix35/WixGamingExtension.dll
  17. BIN  Util/Wix35/WixIIsExtension.dll
  18. BIN  Util/Wix35/WixLibrary.zip
  19. BIN  Util/Wix35/WixLuxExtension.dll
  20. BIN  Util/Wix35/WixMergeModule.zip
  21. BIN  Util/Wix35/WixMsmqExtension.dll
  22. BIN  Util/Wix35/WixNetFxExtension.dll
  23. BIN  Util/Wix35/WixPSExtension.dll
  24. BIN  Util/Wix35/WixProject.zip
  25. BIN  Util/Wix35/WixSqlExtension.dll
  26. BIN  Util/Wix35/WixTasks.dll
  27. BIN  Util/Wix35/WixUIExtension.dll
  28. BIN  Util/Wix35/WixUtilExtension.dll
  29. BIN  Util/Wix35/WixVSExtension.dll
  30. 0  Util/Wix35/candle
  31. BIN  Util/Wix35/candle.exe
  32. BIN  Util/Wix35/dark.exe
  33. BIN  Util/Wix35/difxapp_ia64.wixlib
  34. BIN  Util/Wix35/difxapp_x64.wixlib
  35. BIN  Util/Wix35/difxapp_x86.wixlib
  36. BIN  Util/Wix35/doc/DTF.chm
  37. BIN  Util/Wix35/doc/DTFAPI.chm
  38. +1 −1  Util/Wix35/doc/difxapp.xsd
  39. +1 −1  Util/Wix35/doc/firewall.xsd
  40. +1 −1  Util/Wix35/doc/gaming.xsd
  41. +25 −2 Util/Wix35/doc/iis.xsd
  42. +1 −1  Util/Wix35/doc/lux.xsd
  43. +1 −1  Util/Wix35/doc/msmq.xsd
  44. +1 −1  Util/Wix35/doc/netfx.xsd
  45. +1 −1  Util/Wix35/doc/ps.xsd
  46. +1 −1  Util/Wix35/doc/sql.xsd
  47. +1,038 −1,349 Util/Wix35/doc/util.xsd
  48. +1 −1  Util/Wix35/doc/vs.xsd
  49. BIN  Util/Wix35/doc/wix.chm
  50. +59 −483 Util/Wix35/doc/wix.xsd
  51. +1 −1  Util/Wix35/doc/wixloc.xsd
  52. BIN  Util/Wix35/heat.exe
  53. BIN  Util/Wix35/insignia.exe
  54. BIN  Util/Wix35/light.exe
  55. BIN  Util/Wix35/lit.exe
  56. BIN  Util/Wix35/lux.exe
  57. BIN  Util/Wix35/melt.exe
  58. BIN  Util/Wix35/nit.exe
  59. BIN  Util/Wix35/pyro.exe
  60. BIN  Util/Wix35/sconce2005.dll
  61. BIN  Util/Wix35/sconce2008.dll
  62. BIN  Util/Wix35/sconce2010.dll
  63. BIN  Util/Wix35/sdk/DocCompiler.exe
  64. BIN  Util/Wix35/sdk/MakeSfxCA.exe
  65. +10 −0 Util/Wix35/sdk/MakeSfxCA.exe.config
  66. BIN  Util/Wix35/sdk/Microsoft.Deployment.Compression.Cab.dll
  67. BIN  Util/Wix35/sdk/Microsoft.Deployment.Compression.Zip.dll
  68. BIN  Util/Wix35/sdk/Microsoft.Deployment.Compression.dll
  69. BIN  Util/Wix35/sdk/Microsoft.Deployment.Resources.dll
  70. BIN  Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll
  71. BIN  Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll
  72. BIN  Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.dll
  73. +115 −7 Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.xml
  74. BIN  Util/Wix35/sdk/MsgGen.exe
  75. BIN  Util/Wix35/sdk/XsdGen.exe
  76. BIN  Util/Wix35/sdk/XsdStitch.exe
  77. +0 −186 Util/Wix35/sdk/inc/IBurnCore.h
  78. +0 −236 Util/Wix35/sdk/inc/IBurnUserExperience.h
  79. +16 −16 Util/Wix35/sdk/inc/aclutil.h
  80. +1 −1  Util/Wix35/sdk/inc/apuputil.h
  81. +1 −1  Util/Wix35/sdk/inc/atomutil.h
  82. +1 −1  Util/Wix35/sdk/inc/buffutil.h
  83. +1 −1  Util/Wix35/sdk/inc/cabcutil.h
  84. +1 −1  Util/Wix35/sdk/inc/cabutil.h
  85. +1 −1  Util/Wix35/sdk/inc/certutil.h
  86. +1 −1  Util/Wix35/sdk/inc/conutil.h
  87. +49 −0 Util/Wix35/sdk/inc/cryputil.h
  88. +1 −1  Util/Wix35/sdk/inc/dictutil.h
  89. +1 −1  Util/Wix35/sdk/inc/dirutil.h
  90. +11 −12 Util/Wix35/sdk/inc/dutil.h
  91. +212 −0 Util/Wix35/sdk/inc/eseutil.h
  92. +1 −1  Util/Wix35/sdk/inc/fileutil.h
  93. +1 −1  Util/Wix35/sdk/inc/gdiputil.h
  94. +1 −1  Util/Wix35/sdk/inc/inetutil.h
  95. +1 −1  Util/Wix35/sdk/inc/jsonutil.h
  96. +1 −1  Util/Wix35/sdk/inc/locutil.h
  97. +1 −1  Util/Wix35/sdk/inc/logutil.h
  98. +8 −1 Util/Wix35/sdk/inc/memutil.h
  99. +1 −1  Util/Wix35/sdk/inc/metautil.h
  100. +1 −1  Util/Wix35/sdk/inc/osutil.h
  101. +1 −1  Util/Wix35/sdk/inc/pathutil.h
  102. +1 −1  Util/Wix35/sdk/inc/perfutil.h
  103. +1 −1  Util/Wix35/sdk/inc/procutil.h
  104. +32 −0 Util/Wix35/sdk/inc/regutil.h
  105. +1 −1  Util/Wix35/sdk/inc/resrutil.h
  106. +1 −1  Util/Wix35/sdk/inc/reswutil.h
  107. +1 −1  Util/Wix35/sdk/inc/rexutil.h
  108. +1 −1  Util/Wix35/sdk/inc/rssutil.h
  109. +1 −1  Util/Wix35/sdk/inc/shelutil.h
  110. +1 −1  Util/Wix35/sdk/inc/sqlutil.h
  111. +14 −1 Util/Wix35/sdk/inc/strutil.h
  112. +1 −1  Util/Wix35/sdk/inc/thmutil.h
  113. +1 −1  Util/Wix35/sdk/inc/timeutil.h
  114. +1 −1  Util/Wix35/sdk/inc/uriutil.h
  115. +1 −1  Util/Wix35/sdk/inc/userutil.h
  116. +7 −1 Util/Wix35/sdk/inc/wcautil.h
  117. +1 −1  Util/Wix35/sdk/inc/wcawow64.h
  118. +1 −1  Util/Wix35/sdk/inc/wcawrapquery.h
  119. +1 −1  Util/Wix35/sdk/inc/wiutil.h
  120. +1 −1  Util/Wix35/sdk/inc/xmlutil.h
  121. BIN  Util/Wix35/sdk/lib/dutil_2005.lib
  122. BIN  Util/Wix35/sdk/lib/dutil_2005_ia64.lib
  123. BIN  Util/Wix35/sdk/lib/dutil_2005_x64.lib
  124. BIN  Util/Wix35/sdk/lib/{dutil.lib → dutil_2008.lib}
  125. BIN  Util/Wix35/sdk/lib/{dutil_ia64.lib → dutil_2008_ia64.lib}
  126. BIN  Util/Wix35/sdk/lib/{dutil_x64.lib → dutil_2008_x64.lib}
  127. BIN  Util/Wix35/sdk/lib/dutil_2010.lib
  128. BIN  Util/Wix35/sdk/lib/dutil_2010_ia64.lib
  129. BIN  Util/Wix35/sdk/lib/dutil_2010_x64.lib
  130. BIN  Util/Wix35/sdk/lib/wcautil_2005.lib
  131. BIN  Util/Wix35/sdk/lib/wcautil_2005_ia64.lib
  132. BIN  Util/Wix35/sdk/lib/wcautil_2005_x64.lib
  133. BIN  Util/Wix35/sdk/lib/{wcautil.lib → wcautil_2008.lib}
  134. BIN  Util/Wix35/sdk/lib/{wcautil_ia64.lib → wcautil_2008_ia64.lib}
  135. BIN  Util/Wix35/sdk/lib/{wcautil_x64.lib → wcautil_2008_x64.lib}
  136. BIN  Util/Wix35/sdk/lib/wcautil_2010.lib
  137. BIN  Util/Wix35/sdk/lib/wcautil_2010_ia64.lib
  138. BIN  Util/Wix35/sdk/lib/wcautil_2010_x64.lib
  139. +4 −4 Util/Wix35/sdk/wix.ca.targets
  140. BIN  Util/Wix35/sdk/x64/sfxca.dll
  141. BIN  Util/Wix35/sdk/x86/sfxca.dll
  142. BIN  Util/Wix35/setup.exe
  143. BIN  Util/Wix35/setupbld.exe
  144. BIN  Util/Wix35/smoke.exe
  145. BIN  Util/Wix35/torch.exe
  146. BIN  Util/Wix35/votive2005.dll
  147. BIN  Util/Wix35/votive2008.dll
  148. BIN  Util/Wix35/votive2010.dll
  149. BIN  Util/Wix35/wconsole.dll
  150. BIN  Util/Wix35/winterop.dll
  151. BIN  Util/Wix35/wix.dll
  152. +11 −2,598 Util/Wix35/wix.targets
  153. +2,709 −0 Util/Wix35/wix200x.targets
  154. +143 −137 Util/Wix35/wix2010.targets
  155. BIN  Util/Wix35/wui.dll
View
BIN  Util/Wix35/BlankFile.zip
Binary file not shown
View
BIN  Util/Wix35/CustomActionCPP_2005.zip
Binary file not shown
View
BIN  Util/Wix35/CustomActionCPP_2008.zip
Binary file not shown
View
BIN  Util/Wix35/IncludeFile.zip
Binary file not shown
View
BIN  Util/Wix35/LocalizationFile.zip
Binary file not shown
View
BIN  Util/Wix35/LuxTasks.dll
Binary file not shown
View
BIN  Util/Wix35/Microsoft.Deployment.WindowsInstaller.dll
Binary file not shown
View
BIN  Util/Wix35/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll
Binary file not shown
View
BIN  Util/Wix35/SetupBuilder.dll
Binary file not shown
View
BIN  Util/Wix35/TextFile.zip
Binary file not shown
View
BIN  Util/Wix35/WixComPlusExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixCop.exe
Binary file not shown
View
BIN  Util/Wix35/WixDifxAppExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixDirectXExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixFirewallExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixGamingExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixIIsExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixLibrary.zip
Binary file not shown
View
BIN  Util/Wix35/WixLuxExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixMergeModule.zip
Binary file not shown
View
BIN  Util/Wix35/WixMsmqExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixNetFxExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixPSExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixProject.zip
Binary file not shown
View
BIN  Util/Wix35/WixSqlExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixTasks.dll
Binary file not shown
View
BIN  Util/Wix35/WixUIExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixUtilExtension.dll
Binary file not shown
View
BIN  Util/Wix35/WixVSExtension.dll
Binary file not shown
View
0  Util/Wix35/candle
No changes.
View
BIN  Util/Wix35/candle.exe
Binary file not shown
View
BIN  Util/Wix35/dark.exe
Binary file not shown
View
BIN  Util/Wix35/difxapp_ia64.wixlib
Binary file not shown
View
BIN  Util/Wix35/difxapp_x64.wixlib
Binary file not shown
View
BIN  Util/Wix35/difxapp_x86.wixlib
Binary file not shown
View
BIN  Util/Wix35/doc/DTF.chm
Binary file not shown
View
BIN  Util/Wix35/doc/DTFAPI.chm
Binary file not shown
View
2  Util/Wix35/doc/difxapp.xsd
@@ -10,7 +10,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2  Util/Wix35/doc/firewall.xsd
@@ -9,7 +9,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2  Util/Wix35/doc/gaming.xsd
@@ -9,7 +9,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
27 Util/Wix35/doc/iis.xsd
@@ -10,7 +10,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
@@ -407,6 +407,29 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="ManagedPipelineMode">
+ <xs:annotation>
+ <xs:documentation>Specifies the request-processing mode that is used to process requests for managed content. Only available on IIS7, ignored on IIS6.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="classic"/>
+ <xs:enumeration value="integrated"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="ManagedRuntimeVersion">
+ <xs:annotation>
+ <xs:documentation>Specifies the .NET Framework version to be used by the application pool. Only available on IIS7, ignored on IIS6.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="v1.1"/>
+ <xs:enumeration value="v2.0"/>
+ <xs:enumeration value="v4.0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:complexType>
</xs:element>
@@ -712,7 +735,7 @@
</xs:attribute>
<xs:attribute name="ScriptTimeout" type="xs:integer">
<xs:annotation>
- <xs:documentation>Sets the timeout value for executing ASP scripts.</xs:documentation>
+ <xs:documentation>Sets the timeout value in seconds for executing ASP scripts.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ServerDebugging" type="YesNoDefaultType">
View
2  Util/Wix35/doc/lux.xsd
@@ -9,7 +9,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2  Util/Wix35/doc/msmq.xsd
@@ -10,7 +10,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2  Util/Wix35/doc/netfx.xsd
@@ -9,7 +9,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2  Util/Wix35/doc/ps.xsd
@@ -10,7 +10,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2  Util/Wix35/doc/sql.xsd
@@ -10,7 +10,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
2,387 Util/Wix35/doc/util.xsd
1,038 additions, 1,349 deletions not shown
View
2  Util/Wix35/doc/vs.xsd
@@ -8,7 +8,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
BIN  Util/Wix35/doc/wix.chm
Binary file not shown
View
542 Util/Wix35/doc/wix.xsd
@@ -9,7 +9,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
@@ -25,7 +25,7 @@
<xs:element name="Wix">
<xs:annotation><xs:documentation>
This is the top-level container element for every wxs file. Among the possible children,
- the Bundle, Product, Module, Patch, and PatchCreation elements are analogous to the main function in a C program.
+ the Product, Module, Patch, and PatchCreation elements are analogous to the main function in a C program.
There can only be one of these present when linking occurs. Product compiles into an msi file,
Module compiles into an msm file, PatchCreation compiles into a pcp file. The Fragment element
is an atomic unit which ultimately links into either a Product, Module, or PatchCreation. The
@@ -35,7 +35,6 @@
<xs:choice minOccurs="0">
<xs:sequence>
<xs:choice minOccurs="0">
- <xs:element ref="Bundle"/>
<xs:element ref="Product"/>
<xs:element ref="Module"/>
<xs:element ref="Patch"/>
@@ -68,468 +67,10 @@
</xs:complexType>
</xs:element>
- <xs:element name="Bundle">
- <xs:annotation>
- <xs:documentation>The root element for creating bundled packages.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="UX" minOccurs="1" maxOccurs="1"/>
- <xs:element ref="Chain" minOccurs="1" maxOccurs="1"/>
- <xs:element ref="Container"/>
- <xs:element ref="ContainerRef"/>
- <xs:element ref="LayoutDirectory"/>
- <xs:element ref="LayoutDirectoryRef"/>
- <xs:element ref="Variable"/>
- <xs:any namespace="##other" processContents="lax">
- <xs:annotation>
- <xs:documentation>
- Extensibility point in the WiX XML Schema. Schema extensions can register additional
- elements at this point in the schema.
- </xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="UX">
- <xs:annotation>
- <xs:documentation>Contains all the relevant information about the setup UI.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="Payload"/>
- <xs:element ref="PayloadGroupRef"/>
- </xs:choice>
- <xs:attribute name="SourceFile" type="xs:string">
- <xs:annotation>
- <xs:documentation>The entry point of the UX.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Name" type="xs:string">
- <xs:annotation>
- <xs:documentation>The destination path and file name for this UX payload. The default is the source file name. Use this attribute to rename the UX entry point or extract it into a subfolder.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Chain">
- <xs:annotation>
- <xs:documentation>Contains the chain of packages to install.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="MsiPackage"/>
- <xs:element ref="MspPackage"/>
- <xs:element ref="MsuPackage"/>
- <xs:element ref="ExePackage"/>
- <xs:element ref="PackageGroupRef"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="MsiPackage">
- <xs:annotation>
- <xs:documentation>Describes a single msi package to install.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Chain" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="PackageGroup" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="MsiProperty"/>
- <xs:element ref="Payload"/>
- <xs:element ref="PayloadGroupRef"/>
- <xs:any namespace="##other" processContents="lax">
- <xs:annotation>
- <xs:documentation>
- Extensibility point in the WiX XML Schema. Schema extensions can register additional
- elements at this point in the schema. The extension's
- <html:code><html:nobr>CompilerExtension.ParseElement()</html:nobr></html:code>
- method will be called with the package identifier as the first value in
- <html:code>contextValues</html:code>.
- </xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:choice>
- <xs:attributeGroup ref="ChainPackageCommonAttributes" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="MspPackage">
- <xs:annotation>
- <xs:documentation>Describes a single msp package to install.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Chain" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="PackageGroup" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="Payload"/>
- <xs:element ref="PayloadGroupRef"/>
- <xs:any namespace="##other" processContents="lax">
- <xs:annotation>
- <xs:documentation>
- Extensibility point in the WiX XML Schema. Schema extensions can register additional
- elements at this point in the schema. The extension's
- <html:code><html:nobr>CompilerExtension.ParseElement()</html:nobr></html:code>
- method will be called with the package identifier as the first value in
- <html:code>contextValues</html:code>.
- </xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:choice>
- <xs:attributeGroup ref="ChainPackageCommonAttributes" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="MsuPackage">
- <xs:annotation>
- <xs:documentation>Describes a single msu package to install.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Chain" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="PackageGroup" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="Payload"/>
- <xs:element ref="PayloadGroupRef"/>
- <xs:any namespace="##other" processContents="lax">
- <xs:annotation>
- <xs:documentation>
- Extensibility point in the WiX XML Schema. Schema extensions can register additional
- elements at this point in the schema. The extension's
- <html:code><html:nobr>CompilerExtension.ParseElement()</html:nobr></html:code>
- method will be called with the package identifier as the first value in
- <html:code>contextValues</html:code>.
- </xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:choice>
- <xs:attributeGroup ref="ChainPackageCommonAttributes" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="ExePackage">
- <xs:annotation>
- <xs:documentation>Describes a single exe package to install.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Chain" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="PackageGroup" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="Payload"/>
- <xs:element ref="PayloadGroupRef"/>
- <xs:any namespace="##other" processContents="lax">
- <xs:annotation>
- <xs:documentation>
- Extensibility point in the WiX XML Schema. Schema extensions can register additional
- elements at this point in the schema. The extension's
- <html:code><html:nobr>CompilerExtension.ParseElement()</html:nobr></html:code>
- method will be called with the package identifier as the first value in
- <html:code>contextValues</html:code>.
- </xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:choice>
- <xs:attributeGroup ref="ChainPackageCommonAttributes" />
- <xs:attribute name="InstallCommand" type="xs:string">
- <xs:annotation>
- <xs:documentation>The command-line arguments to specify to indicate an install.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="RepairCommand" type="xs:string">
- <xs:annotation>
- <xs:documentation>The command-line arguments to specify to indicate a repair.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="UninstallCommand" type="xs:string">
- <xs:annotation>
- <xs:documentation>The command-line arguments to specify to indicate an uninstall.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:attributeGroup name="ChainPackageCommonAttributes">
- <xs:attribute name="SourceFile" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Location of the package.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Name" type="xs:string">
- <xs:annotation>
- <xs:documentation>The destination path and file name for this chain payload. The default is the source file name. Use this attribute to rename the chain entry point or extract it into a subfolder.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="DownloadUrl" type="xs:string">
- <xs:annotation>
- <xs:documentation>The URL to use to download the package.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Id" type="xs:string">
- <xs:annotation>
- <xs:documentation>Identifier for this package, for ordering and cross-referencing.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="After" type="xs:string">
- <xs:annotation>
- <xs:documentation>The identifier of another package that this one should be installed after.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="InstallCondition" type="xs:string">
- <xs:annotation>
- <xs:documentation>A condition to evaluate before installing the package. The package will only be installed if the condition evaluates to true.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Cache" type="YesNoType">
- <xs:annotation>
- <xs:documentation>Whether to cache the package.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="CacheId" type="xs:string">
- <xs:annotation>
- <xs:documentation>The identifier to use when caching the package.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Vital" type="YesNoType">
- <xs:annotation>
- <xs:documentation>Whether the package should be considered "vital".</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:anyAttribute namespace="##other" processContents="lax">
- <xs:annotation>
- <xs:documentation>
- Extensibility point in the WiX XML Schema. Schema extensions can register additional
- attributes at this point in the schema. The extension's
- <html:code><html:nobr>CompilerExtension.ParseAttribute()</html:nobr></html:code>
- method will be called with the package identifier in
- <html:code><html:nobr>contextValues["PackageId"]</html:nobr></html:code>.
- </xs:documentation>
- </xs:annotation>
- </xs:anyAttribute>
- </xs:attributeGroup>
-
- <xs:element name="PackageGroup">
- <xs:annotation>
- <xs:documentation>Describes a package group to a bootstrapper.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="MsiPackage"/>
- <xs:element ref="MspPackage"/>
- <xs:element ref="MsuPackage"/>
- <xs:element ref="ExePackage"/>
- <xs:element ref="PackageGroupRef"/>
- </xs:choice>
- <xs:attribute name="Id" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Identifier for package group.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="PackageGroupRef">
- <xs:annotation>
- <xs:documentation>Create a reference to PackageGroup element that exists inside a Bundle or Fragment element.</xs:documentation>
- <xs:appinfo>
- <xse:seeAlso ref="PackageGroup"/>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Chain" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="PackageGroup" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="Id" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The identifier of the PackageGroup element to reference.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="After" type="xs:string">
- <xs:annotation>
- <xs:documentation>The identifier of a package that this group should be installed after.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="MsiProperty">
- <xs:annotation>
- <xs:documentation>Allows an MSI property to be set based on the value of a burn engine expression.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="MsiPackage" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="Name" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The name of the MSI property to set.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Value" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The value to set the property to. This string is evaluated by the burn engine and can be as simple as a burn engine variable reference or as complex as a full expression.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Variable">
- <xs:annotation>
- <xs:documentation>Describes a burn engine variable to define.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="Name" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The name for the variable.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Value" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Starting value for the variable.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Type">
- <xs:annotation>
- <xs:documentation>Type of the variable, inferred from the value if not specified.</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="string" />
- <xs:enumeration value="numeric" />
- <xs:enumeration value="version" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Container">
- <xs:annotation>
- <xs:documentation>Representation of a file that contains one or more files.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="Payload"/>
- </xs:choice>
- <xs:attribute name="Name" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The destination path and file name for this container.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="ContainerRef">
- <xs:annotation>
- <xs:documentation>Create a reference to an existing Container element.</xs:documentation>
- <xs:appinfo>
- <xse:seeAlso ref="Container"/>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="Id" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The identifier of Container element to reference.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Payload">
- <xs:annotation>
- <xs:documentation>Describes a payload to a bootstrapper.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="UX" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Container"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="SourceFile" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Location of the source file.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Name" type="xs:string">
- <xs:annotation>
- <xs:documentation>The destination path and file name for this payload. The default is the source file name.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="DownloadUrl" type="xs:string">
- <xs:annotation>
- <xs:documentation>The URL to use to download the package.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="PayloadGroup">
- <xs:annotation>
- <xs:documentation>Describes a payload group to a bootstrapper.</xs:documentation>
- <xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="Payload"/>
- <xs:element ref="PayloadGroupRef"/>
- </xs:choice>
- <xs:attribute name="Id" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Identifier for payload group.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="PayloadGroupRef">
- <xs:annotation>
- <xs:documentation>Create a reference to PayloadGroup element that exists inside a Bundle or Fragment element.</xs:documentation>
- <xs:appinfo>
- <xse:seeAlso ref="PayloadGroup"/>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="UX" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="PayloadGroup" />
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="Id" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The identifier of the PayloadGroup element to reference.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
<xs:element name="LayoutDirectory">
<xs:annotation>
<xs:documentation>Representation of layout directory.</xs:documentation>
<xs:appinfo>
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Module" />
@@ -563,7 +104,6 @@
<xs:appinfo>
<xse:seeAlso ref="LayoutDirectory"/>
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="LayoutDirectory" />
- <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Bundle" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Module" />
@@ -587,7 +127,7 @@
<xs:element name="LayoutFile">
<xs:annotation>
- <xs:documentation>Describes the payload to a bootstrapper.</xs:documentation>
+ <xs:documentation>Describes the file to copy into the final layout.</xs:documentation>
<xs:appinfo>
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="LayoutDirectory" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="LayoutDirectoryRef"/>
@@ -960,7 +500,6 @@
<xs:element ref="Component"/>
<xs:element ref="ComponentGroup"/>
<xs:element ref="Condition"/>
- <xs:element ref="Container"/>
<xs:element ref="CustomAction"/>
<xs:element ref="CustomActionRef"/>
<xs:element ref="CustomTable"/>
@@ -977,11 +516,9 @@
<xs:element ref="LayoutDirectory"/>
<xs:element ref="LayoutDirectoryRef"/>
<xs:element ref="Media"/>
- <xs:element ref="PackageGroup"/>
<xs:element ref="PackageCertificates"/>
<xs:element ref="PatchCertificates"/>
<xs:element ref="PatchFamily"/>
- <xs:element ref="PayloadGroup"/>
<xs:element ref="Property"/>
<xs:element ref="PropertyRef"/>
<xs:element ref="SetDirectory"/>
@@ -2508,7 +2045,7 @@
<xse:msiRef table="Signature" href="http://msdn.microsoft.com/library/aa371853.aspx"/>
<xse:howtoRef href="check_the_version_number.htm">How To: Check the version number of a file during installation</xse:howtoRef>
<xse:remarks>
- <html:a>When the parent DirectorySearch/@Depth attribute is greater than 1, the FileSearch/@Id attribute must be absent or the same as the parent DirectorySearch/@Id attribute value, unless the parent DirectorySearch/@AssignToProperty attribute value is 'yes'.</html:a>
+ <html:a>When the parent DirectorySearch/@Depth attribute is greater than 0, the FileSearch/@Id attribute must be absent or the same as the parent DirectorySearch/@Id attribute value, unless the parent DirectorySearch/@AssignToProperty attribute value is 'yes'.</html:a>
</xse:remarks>
</xs:appinfo>
<xs:documentation>Searches for file and assigns to fullpath value of parent Property</xs:documentation>
@@ -3855,6 +3392,8 @@
<xs:annotation>
<xs:documentation>
Creates the key, if absent, when the parent component is installed then remove the key with all its values and subkeys when the parent component is uninstalled.
+ Note that this value is useful only if your program creates additional values or subkeys under this key and you want an uninstall to remove them. MSI already
+ removes all values and subkeys that it creates, so this option just adds additional overhead to uninstall.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
@@ -6245,8 +5784,13 @@
<xs:annotation>
<xs:documentation>
If this attribute's value is set to 'yes', then the Directory of this Component is used
- as the KeyPath. To set a Registry key or File as the KeyPath of a component, set the
- KeyPath attribute to 'yes' on one of those child elements.
+ as the KeyPath. To set a Registry value or File as the KeyPath of a component, set the
+ KeyPath attribute to 'yes' on one of those child elements. If KeyPath is not set to 'yes' for the
+ Component or for a child Registry value or File, WiX will look at the child elements under the
+ Component in sequential order and try to automatically select one of them as a key path. Allowing
+ WiX to automatically select a key path can be dangerous because adding or removing child elements
+ under the Component can inadvertantly cause the key path to change, which can lead to
+ installation problems.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -6795,7 +6339,7 @@
<xs:annotation><xs:documentation>The installer sets the REMOVE property to features specified in this column. The features to be removed can be determined at run time. The Formatted string entered in this field must evaluate to a comma-delimited list of feature names. For example: [Feature1],[Feature2],[Feature3]. No features are removed if the field contains formatted text that evaluates to an empty string. The installer sets REMOVE=ALL only if the Remove field is empty.</xs:documentation></xs:annotation>
</xs:attribute>
<xs:attribute name="Property" type="xs:string" use="required">
- <xs:annotation><xs:documentation>When the FindRelatedProducts action detects a related product installed on the system, it appends the product code to the property specified in this field. Windows Installer documentation for the <html:a href="http://msdn2.microsoft.com/library/aa372379.aspx" target="_blank">Upgrade table</html:a> states that the property specified in this field must be a public property and must be added to the <html:a href="http://msdn2.microsoft.com/library/aa371571.aspx" target="_blank">SecureCustomProperties</html:a> property. WiX automatically appends the property specified in this field to the SecureCustomProperties property when creating an MSI. Each UpgradeVersion must have a unique Property value. After the FindRelatedProducts action is run, the value of this property is a list product codes, separated by semicolons (;), detected on the system.</xs:documentation></xs:annotation>
+ <xs:annotation><xs:documentation>When the FindRelatedProducts action detects a related product installed on the system, it appends the product code to the property specified in this field. Windows Installer documentation for the <html:a href="http://msdn2.microsoft.com/library/aa372379.aspx" target="_blank">Upgrade table</html:a> states that the property specified in this field must be a public property and must be added to the <html:a href="http://msdn2.microsoft.com/library/aa371571.aspx" target="_blank">SecureCustomProperties</html:a> property. WiX automatically appends the property specified in this field to the SecureCustomProperties property when creating an MSI. Each UpgradeVersion must have a unique Property value. After the FindRelatedProducts action is run, the value of this property is a list of product codes, separated by semicolons (;), detected on the system.</xs:documentation></xs:annotation>
</xs:attribute>
<xs:attribute name="MigrateFeatures" type="YesNoType">
<xs:annotation><xs:documentation>Set to "yes" to migrate feature states from upgraded products by enabling the logic in the MigrateFeatureStates action.</xs:documentation></xs:annotation>
@@ -8855,6 +8399,9 @@
<xs:element ref="InstallFiles">
<xs:annotation><xs:documentation>Copies files specified in the File table from the source directory to the destination directory.</xs:documentation></xs:annotation>
</xs:element>
+ <xs:element ref="PatchFiles">
+ <xs:annotation><xs:documentation>Queries the Patch table to determine which patches are to be applied.</xs:documentation></xs:annotation>
+ </xs:element>
<xs:element ref="InstallFinalize">
<xs:annotation><xs:documentation>Marks the end of a sequence of actions that change the system.</xs:documentation></xs:annotation>
</xs:element>
@@ -9043,7 +8590,7 @@
<xs:attribute name="BinarySource" type="xs:string">
<xs:annotation>
<xs:documentation>
- Reference to the Binary element that contains the chainer executeable. Mutually exclusive with
+ Reference to the Binary element that contains the chainer executable. Mutually exclusive with
the FileSource and PropertySource attributes.
</xs:documentation>
</xs:annotation>
@@ -9051,7 +8598,7 @@
<xs:attribute name="FileSource" type="xs:string">
<xs:annotation>
<xs:documentation>
- Reference to the File element that is the chainer executeable. Mutually exclusive with
+ Reference to the File element that is the chainer executable. Mutually exclusive with
the BinarySource and PropertySource attributes.
</xs:documentation>
</xs:annotation>
@@ -9059,7 +8606,7 @@
<xs:attribute name="PropertySource" type="xs:string">
<xs:annotation>
<xs:documentation>
- Reference to a Property that resolves to the full path to the chainer executeable. Mutually exclusive with
+ Reference to a Property that resolves to the full path to the chainer executable. Mutually exclusive with
the BinarySource and FileSource attributes.
</xs:documentation>
</xs:annotation>
@@ -10388,24 +9935,53 @@
Simplifies authoring for major upgrades, including support for preventing downgrades.
The parent Product element must have valid UpgradeCode and Version attributes.
+
+ When the FindRelatedProducts action detects a related product installed on the system,
+ it appends the product code to the property named WIX_UPGRADE_DETECTED. After the
+ FindRelatedProducts action is run, the value of the WIX_UPGRADE_DETECTED property is a
+ list of product codes, separated by semicolons (;), detected on the system.
</xs:documentation>
<xs:appinfo>
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
</xs:appinfo>
</xs:annotation>
<xs:complexType>
- <xs:attribute name="AllowDowngrades" type="YesNoType">
- <xs:annotation>
- <xs:documentation>
- When set to no (the default), products with lower version numbers are blocked from
- installing when a product with a higher version is installed; the DowngradeErrorMessage
- attribute must also be specified.
+ <xs:attribute name="AllowDowngrades" type="YesNoType">
+ <xs:annotation>
+ <xs:documentation>
+ When set to no (the default), products with lower version numbers are blocked from
+ installing when a product with a higher version is installed; the DowngradeErrorMessage
+ attribute must also be specified.
- When set to yes, any version can be installed over any other version.
- </xs:documentation>
- </xs:annotation>
+ When set to yes, any version can be installed over any other version.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="AllowSameVersionUpgrades" type="YesNoType">
+ <xs:annotation>
+ <xs:documentation>
+ When set to no (the default), installing a product with the same version and upgrade code
+ (but different product code) is allowed and treated by MSI as two products. When set to yes,
+ WiX sets the msidbUpgradeAttributesVersionMaxInclusive attribute, which tells MSI to treat
+ a product with the same version as a major upgrade.
+
+ This is useful when two product versions differ only in the fourth version field. MSI
+ specifically ignores that field when comparing product versions, so two products that
+ differ only in the fourth version field are the same product and need this attribute set to
+ yes to be detected.
+
+ Note that because MSI ignores the fourth product version field, setting this attribute to
+ yes also allows downgrades when the first three product version fields are identical.
+ For example, product version 1.0.0.1 will "upgrade" 1.0.0.2998 because they're seen as the
+ same version (1.0.0). That could reintroduce serious bugs so the safest choice is to change
+ the first three version fields and omit this attribute to get the default of no.
+
+ This attribute cannot be "yes" when AllowDowngrades is also "yes" -- AllowDowngrades
+ already allows two products with the same version number to upgrade each other.
+ </xs:documentation>
+ </xs:annotation>
</xs:attribute>
- <xs:attribute name="Disallow" type="YesNoType">
+ <xs:attribute name="Disallow" type="YesNoType">
<xs:annotation>
<xs:documentation>
When set to yes, products with higer version numbers are blocked from
View
2  Util/Wix35/doc/wixloc.xsd
@@ -9,7 +9,7 @@
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
- Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
View
BIN  Util/Wix35/heat.exe
Binary file not shown
View
BIN  Util/Wix35/insignia.exe
Binary file not shown
View
BIN  Util/Wix35/light.exe
Binary file not shown
View
BIN  Util/Wix35/lit.exe
Binary file not shown
View
BIN  Util/Wix35/lux.exe
Binary file not shown
View
BIN  Util/Wix35/melt.exe
Binary file not shown
View
BIN  Util/Wix35/nit.exe
Binary file not shown
View
BIN  Util/Wix35/pyro.exe
Binary file not shown
View
BIN  Util/Wix35/sconce2005.dll
Binary file not shown
View
BIN  Util/Wix35/sconce2008.dll
Binary file not shown
View
BIN  Util/Wix35/sconce2010.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/DocCompiler.exe
Binary file not shown
View
BIN  Util/Wix35/sdk/MakeSfxCA.exe
Binary file not shown
View
10 Util/Wix35/sdk/MakeSfxCA.exe.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+-->
+<configuration>
+ <startup useLegacyV2RuntimeActivationPolicy="true">
+ <supportedRuntime version="v4.0" />
+ <supportedRuntime version="v2.0.50727" />
+ </startup>
+</configuration>
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.Compression.Cab.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.Compression.Zip.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.Compression.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.Resources.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll
Binary file not shown
View
BIN  Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.dll
Binary file not shown
View
122 Util/Wix35/sdk/Microsoft.Deployment.WindowsInstaller.xml
@@ -841,9 +841,9 @@
</member>
<member name="P:Microsoft.Deployment.WindowsInstaller.ColumnInfo.DBType">
<summary>
- Gets the type of the column as a System.Data.DbType. This is one of the following: Int16, Int32, String, or Binary
+ Gets the type of the column as an integer that can be cast to a System.Data.DbType. This is one of the following: Int16, Int32, String, or Binary
</summary>
- <value>equivalent DbType of the column</value>
+ <value>equivalent DbType of the column as an integer</value>
</member>
<member name="P:Microsoft.Deployment.WindowsInstaller.ColumnInfo.Size">
<summary>
@@ -2672,7 +2672,7 @@
<member name="T:Microsoft.Deployment.WindowsInstaller.MessageResult">
<summary>
Specifies a return status value for message handlers. These values are returned by
- <see cref="M:Microsoft.Deployment.WindowsInstaller.Session.Message(Microsoft.Deployment.WindowsInstaller.InstallMessage,Microsoft.Deployment.WindowsInstaller.Record)"/>, <see cref="T:Microsoft.Deployment.WindowsInstaller.ExternalUIHandler"/>, and <see cref="M:Microsoft.Deployment.WindowsInstaller.IEmbeddedUI.ProcessMessage(Microsoft.Deployment.WindowsInstaller.InstallMessage,Microsoft.Deployment.WindowsInstaller.Record,System.Windows.Forms.MessageBoxButtons,System.Windows.Forms.MessageBoxIcon,System.Windows.Forms.MessageBoxDefaultButton)"/>.
+ <see cref="M:Microsoft.Deployment.WindowsInstaller.Session.Message(Microsoft.Deployment.WindowsInstaller.InstallMessage,Microsoft.Deployment.WindowsInstaller.Record)"/>, <see cref="T:Microsoft.Deployment.WindowsInstaller.ExternalUIHandler"/>, and <see cref="M:Microsoft.Deployment.WindowsInstaller.IEmbeddedUI.ProcessMessage(Microsoft.Deployment.WindowsInstaller.InstallMessage,Microsoft.Deployment.WindowsInstaller.Record,Microsoft.Deployment.WindowsInstaller.MessageButtons,Microsoft.Deployment.WindowsInstaller.MessageIcon,Microsoft.Deployment.WindowsInstaller.MessageDefaultButton)"/>.
</summary>
</member>
<member name="F:Microsoft.Deployment.WindowsInstaller.MessageResult.Error">
@@ -2702,6 +2702,114 @@
<member name="F:Microsoft.Deployment.WindowsInstaller.MessageResult.No">
<summary>IDNO</summary>
</member>
+ <member name="T:Microsoft.Deployment.WindowsInstaller.MessageButtons">
+ <summary>
+ Specifies constants defining which buttons to display for a message. This can be cast to
+ the MessageBoxButtons enum in System.Windows.Forms and System.Windows.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageButtons.OK">
+ <summary>
+ The message contains an OK button.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageButtons.OKCancel">
+ <summary>
+ The message contains OK and Cancel buttons.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageButtons.AbortRetryIgnore">
+ <summary>
+ The message contains Abort, Retry, and Ignore buttons.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageButtons.YesNoCancel">
+ <summary>
+ The message contains Yes, No, and Cancel buttons.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageButtons.YesNo">
+ <summary>
+ The message contains Yes and No buttons.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageButtons.RetryCancel">
+ <summary>
+ The message contains Retry and Cancel buttons.
+ </summary>
+ </member>
+ <member name="T:Microsoft.Deployment.WindowsInstaller.MessageIcon">
+ <summary>
+ Specifies constants defining which information to display. This can be cast to
+ the MessageBoxIcon enum in System.Windows.Forms and System.Windows.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.None">
+ <summary>
+ The message contain no symbols.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Error">
+ <summary>
+ The message contains a symbol consisting of white X in a circle with a red background.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Hand">
+ <summary>
+ The message contains a symbol consisting of a white X in a circle with a red background.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Stop">
+ <summary>
+ The message contains a symbol consisting of white X in a circle with a red background.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Question">
+ <summary>
+ The message contains a symbol consisting of a question mark in a circle.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Exclamation">
+ <summary>
+ The message contains a symbol consisting of an exclamation point in a triangle with a yellow background.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Warning">
+ <summary>
+ The message contains a symbol consisting of an exclamation point in a triangle with a yellow background.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Information">
+ <summary>
+ The message contains a symbol consisting of a lowercase letter i in a circle.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageIcon.Asterisk">
+ <summary>
+ The message contains a symbol consisting of a lowercase letter i in a circle.
+ </summary>
+ </member>
+ <member name="T:Microsoft.Deployment.WindowsInstaller.MessageDefaultButton">
+ <summary>
+ Specifies constants defining the default button on a message. This can be cast to
+ the MessageBoxDefaultButton enum in System.Windows.Forms and System.Windows.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageDefaultButton.Button1">
+ <summary>
+ The first button on the message is the default button.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageDefaultButton.Button2">
+ <summary>
+ The second button on the message is the default button.
+ </summary>
+ </member>
+ <member name="F:Microsoft.Deployment.WindowsInstaller.MessageDefaultButton.Button3">
+ <summary>
+ The third button on the message is the default button.
+ </summary>
+ </member>
<member name="T:Microsoft.Deployment.WindowsInstaller.PatchStates">
<summary>
Specifies the different patch states for <see cref="M:Microsoft.Deployment.WindowsInstaller.PatchInstallation.GetPatches(System.String,System.String,System.String,Microsoft.Deployment.WindowsInstaller.UserContexts,Microsoft.Deployment.WindowsInstaller.PatchStates)"/>.
@@ -4339,13 +4447,13 @@
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/initializeembeddedui.asp">InitializeEmbeddedUI</a>
</p></remarks>
</member>
- <member name="M:Microsoft.Deployment.WindowsInstaller.IEmbeddedUI.ProcessMessage(Microsoft.Deployment.WindowsInstaller.InstallMessage,Microsoft.Deployment.WindowsInstaller.Record,System.Windows.Forms.MessageBoxButtons,System.Windows.Forms.MessageBoxIcon,System.Windows.Forms.MessageBoxDefaultButton)">
+ <member name="M:Microsoft.Deployment.WindowsInstaller.IEmbeddedUI.ProcessMessage(Microsoft.Deployment.WindowsInstaller.InstallMessage,Microsoft.Deployment.WindowsInstaller.Record,Microsoft.Deployment.WindowsInstaller.MessageButtons,Microsoft.Deployment.WindowsInstaller.MessageIcon,Microsoft.Deployment.WindowsInstaller.MessageDefaultButton)">
<summary>
Processes information and progress messages sent to the user interface.
</summary>
<param name="messageType">Message type.</param>
<param name="messageRecord">Record that contains message data.</param>
- <param name="buttons">Message box buttons.</param>
+ <param name="buttons">Message buttons.</param>
<param name="icon">Message box icon.</param>
<param name="defaultButton">Message box default button.</param>
<returns>Result of processing the message.</returns>
@@ -5683,7 +5791,7 @@
<returns>The result of the condition evaluation</returns>
<exception cref="T:Microsoft.Deployment.WindowsInstaller.InvalidHandleException">the Session handle is invalid</exception>
<exception cref="T:System.ArgumentNullException">the condition is null or empty</exception>
- <exception cref="T:System.Data.SyntaxErrorException">the conditional expression is invalid</exception>
+ <exception cref="T:System.InvalidOperationException">the conditional expression is invalid</exception>
<remarks><p>
Win32 MSI API:
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msievaluatecondition.asp">MsiEvaluateCondition</a>
@@ -5698,7 +5806,7 @@
<param name="defaultValue">value to return if the condition is empty</param>
<returns>The result of the condition evaluation</returns>
<exception cref="T:Microsoft.Deployment.WindowsInstaller.InvalidHandleException">the Session handle is invalid</exception>
- <exception cref="T:System.Data.SyntaxErrorException">the conditional expression is invalid</exception>
+ <exception cref="T:System.InvalidOperationException">the conditional expression is invalid</exception>
<remarks><p>
Win32 MSI API:
<a href="http://msdn.microsoft.com/library/en-us/msi/setup/msievaluatecondition.asp">MsiEvaluateCondition</a>
View
BIN  Util/Wix35/sdk/MsgGen.exe
Binary file not shown
View
BIN  Util/Wix35/sdk/XsdGen.exe
Binary file not shown
View
BIN  Util/Wix35/sdk/XsdStitch.exe
Binary file not shown
View
186 Util/Wix35/sdk/inc/IBurnCore.h
@@ -1,186 +0,0 @@
-//-------------------------------------------------------------------------------------------------
-// <copyright file="IBurnCore.h" company="Microsoft">
-// Copyright (c) Microsoft Corporation. All rights reserved.
-//
-// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
-// which can be found in the file CPL.TXT at the root of this distribution.
-// By using this software in any fashion, you are agreeing to be bound by
-// the terms of this license.
-//
-// You must not remove this notice, or any other, from this software.
-// </copyright>
-//
-// <summary>
-// IBurnCore, implemented by engine(core) and used by Burn UX
-// </summary>
-//-------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#define IDERROR -1
-#define IDNOACTION 0
-
-enum BURN_ACTION
-{
- BURN_ACTION_UNKNOWN,
- BURN_ACTION_HELP,
- BURN_ACTION_UNINSTALL,
- BURN_ACTION_INSTALL,
- BURN_ACTION_MODIFY,
- BURN_ACTION_REPAIR,
-};
-
-enum ACTION_STATE
-{
- ACTION_STATE_NONE,
- ACTION_STATE_UNINSTALL,
- ACTION_STATE_INSTALL,
- ACTION_STATE_ADMIN_INSTALL,
- ACTION_STATE_MAINTENANCE,
- ACTION_STATE_RECACHE,
- ACTION_STATE_MINOR_UPGRADE,
- ACTION_STATE_MAJOR_UPGRADE,
- ACTION_STATE_PATCH,
-};
-
-enum PACKAGE_STATE
-{
- PACKAGE_STATE_UNKNOWN,
- PACKAGE_STATE_ABSENT,
- PACKAGE_STATE_CACHED,
- PACKAGE_STATE_PRESENT,
-};
-
-enum REQUEST_STATE
-{
- REQUEST_STATE_NONE,
- REQUEST_STATE_ABSENT,
- REQUEST_STATE_CACHE,
- REQUEST_STATE_PRESENT,
- REQUEST_STATE_REPAIR,
-};
-
-enum BURN_LOG_LEVEL
-{
- BURN_LOG_LEVEL_NONE, // turns off report (only valid for XXXSetLevel())
- BURN_LOG_LEVEL_STANDARD, // written if reporting is on
- BURN_LOG_LEVEL_VERBOSE, // written only if verbose reporting is on
- BURN_LOG_LEVEL_DEBUG, // reporting useful when debugging code
- BURN_LOG_LEVEL_ERROR, // always gets reported, but can never be specified
-};
-
-
-DECLARE_INTERFACE_IID_(IBurnCore, IUnknown, "6480D616-27A0-44D7-905B-81512C29C2FB")
-{
- STDMETHOD(GetPackageCount)(
- __out DWORD* pcPackages
- ) = 0;
-
- STDMETHOD(GetCommandLineParameters)(
- __out_ecount_opt(*pcchCommandLine) LPWSTR psczCommandLine,
- __inout DWORD* pcchCommandLine
- ) = 0;
-
- STDMETHOD(GetVariableNumeric)(
- __in_z LPCWSTR wzVariable,
- __out LONGLONG* pllValue
- ) = 0;
-
- STDMETHOD(GetVariableString)(
- __in_z LPCWSTR wzVariable,
- __out_ecount_opt(*pcchValue) LPWSTR wzValue,
- __inout DWORD* pcchValue
- ) = 0;
-
- STDMETHOD(GetVariableVersion)(
- __in_z LPCWSTR wzVariable,
- __out DWORD64* pqwValue
- ) = 0;
-
- STDMETHOD(OpenStore)(
- __in_z LPCWSTR wzBundleId
- ) = 0;
-
- STDMETHOD(GetPriorVariableNumeric)(
- __in_z LPCWSTR wzVariable,
- __out LONGLONG* pllValue
- ) = 0;
-
- STDMETHOD(GetPriorVariableString)(
- __in_z LPCWSTR wzVariable,
- __out_ecount_opt(*pcchValue) LPWSTR wzValue,
- __inout DWORD* pcchValue
- ) = 0;
-
- STDMETHOD(GetPriorVariableVersion)(
- __in_z LPCWSTR wzVariable,
- __out DWORD64* pqwValue
- ) = 0;
-
- STDMETHOD_(void, CloseStore)(
- ) = 0;
-
- STDMETHOD(SetVariableNumeric)(
- __in_z LPCWSTR wzVariable,
- __in LONGLONG llValue
- ) = 0;
-
- STDMETHOD(SetVariableString)(
- __in_z LPCWSTR wzVariable,
- __in_z LPCWSTR wzValue
- ) = 0;
-
- STDMETHOD(SetVariableVersion)(
- __in_z LPCWSTR wzVariable,
- __in DWORD64 qwValue
- ) = 0;
-
- STDMETHOD(FormatString)(
- __in_z LPCWSTR wzIn,
- __out_ecount_opt(*pcchOut) LPWSTR wzOut,
- __inout DWORD* pcchOut
- ) = 0;
-
- STDMETHOD(EscapeString)(
- __in_z LPCWSTR wzIn,
- __out_ecount_opt(*pcchOut) LPWSTR wzOut,
- __inout DWORD* pcchOut
- ) = 0;
-
- STDMETHOD(EvaluateCondition)(
- __in_z LPCWSTR wzCondition,
- __out BOOL* pf
- ) = 0;
-
- STDMETHOD(Log)(
- __in BURN_LOG_LEVEL level,
- __in_z LPCWSTR wzMessage
- ) = 0;
-
- STDMETHOD(Elevate)(
- __in_opt HWND hwndParent
- ) = 0;
-
- STDMETHOD(Detect)() = 0;
-
- STDMETHOD(Plan)(
- __in BURN_ACTION action
- ) = 0;
-
- STDMETHOD(Apply)(
- __in_opt HWND hwndParent
- ) = 0;
-
- STDMETHOD(Suspend)() = 0;
-
- STDMETHOD(Reboot)() = 0;
-
- STDMETHOD(Shutdown)(
- __in DWORD dwExitCode
- ) = 0;
-
- STDMETHOD(SetSource)(
- __in LPCWSTR wzSourcePath
- ) = 0;
-}; //struct IBurnCore
View
236 Util/Wix35/sdk/inc/IBurnUserExperience.h
@@ -1,236 +0,0 @@
-//-------------------------------------------------------------------------------------------------
-// <copyright file="IBurnUserExperience.h" company="Microsoft">
-// Copyright (c) Microsoft Corporation. All rights reserved.
-//
-// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
-// which can be found in the file CPL.TXT at the root of this distribution.
-// By using this software in any fashion, you are agreeing to be bound by
-// the terms of this license.
-//
-// You must not remove this notice, or any other, from this software.
-// </copyright>
-//
-// <summary>
-// IBurnUserExperience, implemented by Burn UX and used by Burn engine/core.
-// </summary>
-//-------------------------------------------------------------------------------------------------
-
-#pragma once
-
-
-enum BURN_DISPLAY
-{
- BURN_DISPLAY_UNKNOWN,
- BURN_DISPLAY_NONE,
- BURN_DISPLAY_PASSIVE,
- BURN_DISPLAY_FULL,
-};
-
-
-enum BURN_RESTART
-{
- BURN_RESTART_UNKNOWN,
- BURN_RESTART_NEVER,
- BURN_RESTART_PROMPT,
- BURN_RESTART_AUTOMATIC,
- BURN_RESTART_ALWAYS,
-};
-
-
-enum BURN_RESUME_TYPE
-{
- BURN_RESUME_TYPE_NONE,
- BURN_RESUME_TYPE_INVALID, // resume information is present but invalid
- BURN_RESUME_TYPE_UNEXPECTED, // relaunched after an unexpected interruption
- BURN_RESUME_TYPE_REBOOT_PENDING, // reboot has not taken place yet
- BURN_RESUME_TYPE_REBOOT, // relaunched after reboot
- BURN_RESUME_TYPE_SUSPEND, // relaunched after suspend
- BURN_RESUME_TYPE_ARP, // launched from ARP
-};
-
-
-struct BURN_COMMAND
-{
- BURN_ACTION action;
- BURN_DISPLAY display;
- BURN_RESTART restart;
-
- BOOL fResumed;
-};
-
-
-DECLARE_INTERFACE_IID_(IBurnUserExperience, IUnknown, "53C31D56-49C0-426B-AB06-099D717C67FE")
-{
- STDMETHOD(Initialize)(
- __in IBurnCore* pCore,
- __in int nCmdShow,
- __in BURN_RESUME_TYPE resumeType
- ) = 0;
-
- STDMETHOD_(void, Uninitialize)() = 0;
-
- STDMETHOD_(int, OnDetectBegin)(
- __in DWORD cPackages
- ) = 0;
-
- STDMETHOD_(int, OnDetectPriorBundle)(
- __in_z LPCWSTR wzBundleId
- ) = 0;
-
- STDMETHOD_(int, OnDetectPackageBegin)(
- __in_z LPCWSTR wzPackageId
- ) = 0;
-
- STDMETHOD_(void, OnDetectPackageComplete)(
- __in LPCWSTR wzPackageId,
- __in HRESULT hrStatus,
- __in PACKAGE_STATE state
- ) = 0;
-
- STDMETHOD_(void, OnDetectComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, OnPlanBegin)(
- __in DWORD cPackages
- ) = 0;
-
- STDMETHOD_(int, OnPlanPriorBundle)(
- __in_z LPCWSTR wzBundleId,
- __inout_z REQUEST_STATE* pRequestedState
- ) = 0;
-
- STDMETHOD_(int, OnPlanPackageBegin)(
- __in_z LPCWSTR wzPackageId,
- __inout_z REQUEST_STATE* pRequestedState
- ) = 0;
-
- STDMETHOD_(void, OnPlanPackageComplete)(
- __in LPCWSTR wzPackageId,
- __in HRESULT hrStatus,
- __in PACKAGE_STATE state,
- __in REQUEST_STATE requested,
- __in ACTION_STATE execute,
- __in ACTION_STATE rollback
- ) = 0;
-
- STDMETHOD_(void, OnPlanComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, OnApplyBegin)() = 0;
-
- STDMETHOD_(int, OnRegisterBegin)() = 0;
-
- STDMETHOD_(void, OnRegisterComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(void, OnUnregisterBegin)() = 0;
-
- STDMETHOD_(void, OnUnregisterComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, OnCacheBegin)() = 0;
-
- STDMETHOD_(void, OnCacheComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, OnExecuteBegin)(
- __in DWORD cExecutingPackages
- ) = 0;
-
- STDMETHOD_(int, OnExecutePackageBegin)(
- __in LPCWSTR wzPackageId,
- __in BOOL fExecute
- ) = 0;
-
- STDMETHOD_(int, OnError)(
- __in LPCWSTR wzPackageId,
- __in DWORD dwCode,
- __in_z LPCWSTR wzError,
- __in DWORD dwUIHint
- ) = 0;
-
- STDMETHOD_(int, OnProgress)(
- __in DWORD dwProgressPercentage,
- __in DWORD dwOverallPercentage
- ) = 0;
-
- STDMETHOD_(int, OnExecuteMsiMessage)(
- __in_z LPCWSTR wzPackageId,
- __in INSTALLMESSAGE mt,
- __in UINT uiFlags,
- __in_z LPCWSTR wzMessage
- ) = 0;
-
- STDMETHOD_(int, OnExecuteMsiFilesInUse)(
- __in_z LPCWSTR wzPackageId,
- __in DWORD cFiles,
- __in LPCWSTR* rgwzFiles
- ) = 0;
-
- STDMETHOD_(void, OnExecutePackageComplete)(
- __in LPCWSTR wzPackageId,
- __in HRESULT hrExitCode
- ) = 0;
-
- STDMETHOD_(void, OnExecuteComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(BOOL, OnRestartRequired)() = 0;
-
- STDMETHOD_(void, OnApplyComplete)(
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, ResolveSource)(
- __in LPCWSTR wzPackageId ,
- __in LPCWSTR wzPackageOrContainerPath
- ) = 0;
-
- STDMETHOD_(BOOL, CanPackagesBeDownloaded)(void) = 0;
-
- STDMETHOD_(int, OnCachePackageBegin)(
- __in LPCWSTR wzPackageId,
- __in DWORD64 dw64PackageCacheSize
- ) = 0;
-
- STDMETHOD_(void, OnCachePackageComplete)(
- __in LPCWSTR wzPackageId,
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, OnDownloadPayloadBegin)(
- __in LPCWSTR wzPayloadId,
- __in LPCWSTR wzPayloadFileName
- ) = 0;
-
- STDMETHOD_(void, OnDownloadPayloadComplete)(
- __in LPCWSTR wzPayloadId,
- __in LPCWSTR wzPayloadFileName,
- __in HRESULT hrStatus
- ) = 0;
-
- STDMETHOD_(int, OnDownloadProgress)(
- __in DWORD dwProgressPercentage,
- __in DWORD dwOverallPercentage
- ) = 0;
-
- STDMETHOD_(int, OnExecuteProgress)(
- __in DWORD dwProgressPercentage,
- __in DWORD dwOverallPercentage
- ) = 0;
-
-}; //struct IBurnUserExperience
-
-
-extern "C" typedef HRESULT (WINAPI *PFN_CREATE_USER_EXPERIENCE)(
- __in BURN_COMMAND* pCommand,
- __out IBurnUserExperience** ppUX
- );
-extern "C" typedef void (WINAPI *PFN_DESTROY_USER_EXPERIENCE)();
View
32 Util/Wix35/sdk/inc/aclutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
@@ -52,7 +52,7 @@ struct ACL_ACE
// functions
HRESULT DAPI AclCheckAccess(
__in HANDLE hToken,
- ACL_ACCESS* paa
+ __in ACL_ACCESS* paa
);
HRESULT DAPI AclCheckAdministratorAccess(
__in HANDLE hToken
@@ -63,17 +63,17 @@ HRESULT DAPI AclCheckLocalSystemAccess(
HRESULT DAPI AclGetWellKnownSid(
__in WELL_KNOWN_SID_TYPE wkst,
- __out PSID* ppsid
+ __deref_out PSID* ppsid
);
HRESULT DAPI AclGetAccountSid(
__in_opt LPCWSTR wzSystem,
__in_z LPCWSTR wzAccount,
- __out PSID* ppsid
+ __deref_out PSID* ppsid
);
HRESULT DAPI AclGetAccountSidString(
__in_z LPCWSTR wzSystem,
__in_z LPCWSTR wzAccount,
- __out LPWSTR* ppwzSid
+ __deref_out_z LPWSTR* ppwzSid
);
HRESULT DAPI AclCreateDacl(
@@ -81,7 +81,7 @@ HRESULT DAPI AclCreateDacl(
__in DWORD cDeny,
__in_ecount(cAllow) ACL_ACE rgaaAllow[],
__in DWORD cAllow,
- __out ACL** ppAcl
+ __deref_out ACL** ppAcl
);
HRESULT DAPI AclAddToDacl(
__in ACL* pAcl,
@@ -89,40 +89,40 @@ HRESULT DAPI AclAddToDacl(
__in DWORD cDeny,
__in_ecount_opt(cAllow) const ACL_ACE rgaaAllow[],
__in DWORD cAllow,
- __out ACL** ppAclNew
+ __deref_out ACL** ppAclNew
);
HRESULT DAPI AclMergeDacls(
__in const ACL* pAcl1,
__in const ACL* pAcl2,
- __out ACL** ppAclNew
+ __deref_out ACL** ppAclNew
);
HRESULT DAPI AclCreateDaclOld(
__in_ecount(cAclAccesses) ACL_ACCESS* paa,
__in DWORD cAclAccesses,
- __out ACL** ppAcl
+ __deref_out ACL** ppAcl
);
HRESULT DAPI AclCreateSecurityDescriptor(
__in_ecount(cAclAccesses) ACL_ACCESS* paa,
__in DWORD cAclAccesses,
- __out SECURITY_DESCRIPTOR** ppsd
+ __deref_out SECURITY_DESCRIPTOR** ppsd
);
HRESULT DAPI AclCreateSecurityDescriptorFromDacl(
__in ACL* pACL,
- __out SECURITY_DESCRIPTOR** ppsd
+ __deref_out SECURITY_DESCRIPTOR** ppsd
);
HRESULT __cdecl AclCreateSecurityDescriptorFromString(
- __out SECURITY_DESCRIPTOR** ppsd,
- __in_z LPCWSTR wzSddlFormat,
+ __deref_out SECURITY_DESCRIPTOR** ppsd,
+ __in_z __format_string LPCWSTR wzSddlFormat,
...
);
HRESULT DAPI AclDuplicateSecurityDescriptor(
__in SECURITY_DESCRIPTOR* psd,
- __out SECURITY_DESCRIPTOR** ppsd
+ __deref_out SECURITY_DESCRIPTOR** ppsd
);
HRESULT DAPI AclGetSecurityDescriptor(
__in_z LPCWSTR wzObject,
__in SE_OBJECT_TYPE sot,
- __out SECURITY_DESCRIPTOR** ppsd
+ __deref_out SECURITY_DESCRIPTOR** ppsd
);
HRESULT DAPI AclFreeSid(
@@ -137,7 +137,7 @@ HRESULT DAPI AclFreeSecurityDescriptor(
HRESULT DAPI AclAddAdminToSecurityDescriptor(
__in SECURITY_DESCRIPTOR* pSecurity,
- __out SECURITY_DESCRIPTOR** ppSecurityNew
+ __deref_out SECURITY_DESCRIPTOR** ppSecurityNew
);
#ifdef __cplusplus
}
View
2  Util/Wix35/sdk/inc/apuputil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/atomutil.h
@@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/buffutil.h
@@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/cabcutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/cabutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/certutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/conutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
49 Util/Wix35/sdk/inc/cryputil.h
@@ -0,0 +1,49 @@
+//-------------------------------------------------------------------------------------------------
+// <copyright file="cryputil.h" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//
+// The use and distribution terms for this software are covered by the
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+// which can be found in the file CPL.TXT at the root of this distribution.
+// By using this software in any fashion, you are agreeing to be bound by
+// the terms of this license.
+//
+// You must not remove this notice, or any other, from this software.
+// </copyright>
+//
+// <summary>
+// Cryptography helper functions.
+// </summary>
+//-------------------------------------------------------------------------------------------------
+
+#pragma once
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+// function declarations
+
+HRESULT CrypHashFile(
+ __in_z LPCWSTR wzFilePath,
+ __in DWORD dwProvType,
+ __in ALG_ID algid,
+ __out_bcount(cbHash) BYTE* pbHash,
+ __in DWORD cbHash,
+ __out_opt DWORD64* pqwBytesHashed
+ );
+
+HRESULT CrypHashFileHandle(
+ __in HANDLE hFile,
+ __in DWORD dwProvType,
+ __in ALG_ID algid,
+ __out_bcount(cbHash) BYTE* pbHash,
+ __in DWORD cbHash,
+ __out_opt DWORD64* pqwBytesHashed
+ );
+
+#ifdef __cplusplus
+}
+#endif
View
2  Util/Wix35/sdk/inc/dictutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
2  Util/Wix35/sdk/inc/dirutil.h
@@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
View
23 Util/Wix35/sdk/inc/dutil.h
@@ -4,7 +4,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
-// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
@@ -35,23 +35,18 @@ enum REPORT_LEVEL
};
// asserts and traces
-#ifdef DEBUG
-
-typedef BOOL (DAPI *DUTIL_ASSERTDISPLAYFUNCTION)(LPCSTR sz);
+typedef BOOL (DAPI *DUTIL_ASSERTDISPLAYFUNCTION)(__in_z LPCSTR sz);
extern "C" void DAPI Dutil_SetAssertModule(__in HMODULE hAssertModule);
extern "C" void DAPI Dutil_SetAssertDisplayFunction(__in DUTIL_ASSERTDISPLAYFUNCTION pfn);
-extern "C" void DAPI Dutil_Assert(const CHAR* szFile, int iLine);
-extern "C" void DAPI Dutil_AssertSz(const CHAR* szFile, int iLine, const CHAR *szMsg);
+extern "C" void DAPI Dutil_Assert(__in_z LPCSTR szFile, __in int iLine);
+extern "C" void DAPI Dutil_AssertSz(__in_z LPCSTR szFile, __in int iLine, __in_z LPCSTR szMsg);
extern "C" void DAPI Dutil_TraceSetLevel(__in REPORT_LEVEL ll, __in BOOL fTraceFilenames);
extern "C" REPORT_LEVEL DAPI Dutil_TraceGetLevel();
-extern "C" void __cdecl Dutil_Trace(__in LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in LPCSTR szMessage, ...);
-extern "C" void __cdecl Dutil_TraceError(__in LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in HRESULT hr, __in LPCSTR szMessage, ...);
-
-#endif
-
-extern "C" void DAPI Dutil_RootFailure(__in LPCSTR szFile, __in int iLine, __in HRESULT hrError);
+extern "C" void __cdecl Dutil_Trace(__in_z LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in_z __format_string LPCSTR szMessage, ...);
+extern "C" void __cdecl Dutil_TraceError(__in_z LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in HRESULT hr, __in_z __format_string LPCSTR szMessage, ...);
+extern "C" void DAPI Dutil_RootFailure(__in_z LPCSTR szFile, __in int iLine, __in HRESULT hrError);
#ifdef DEBUG
@@ -207,7 +202,11 @@ typedef const BYTE* LPCBYTE;
#define E_MOREDATA HRESULT_FROM_WIN32(ERROR_MORE_DATA)
#define E_NOMOREITEMS HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS)
#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)
+#define E_MODNOTFOUND HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)
#define AddRefAndRelease(x) { x->AddRef(); x->Release(); }
#define MAKEQWORDVERSION(mj, mi, b, r) (((DWORD64)MAKELONG(r, b)) | (((DWORD64)MAKELONG(mi, mj)) << 32))
+
+// other functions
+extern "C" HRESULT DAPI LoadSystemLibrary(__in_z LPCWSTR wzModuleName, __out HMODULE *phModule);
View
212 Util/Wix35/sdk/inc/eseutil.h
@@ -0,0 +1,212 @@
+#pragma once
+//-------------------------------------------------------------------------------------------------
+// <copyright file="eseutil.h" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//
+// The use and distribution terms for this software are covered by the
+// Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+// which can be found in the file CPL.TXT at the root of this distribution.
+// By using this software in any fashion, you are agreeing to be bound by
+// the terms of this license.
+//
+// You must not remove this notice, or any other, from this software.
+// </copyright>
+//
+// <summary>
+// Header for Extensible Storage Engine (Jetblue) helper functions.
+// </summary>
+//-------------------------------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct COLUMN_SCHEMA
+{
+ JET_COLUMNID jcColumn;
+ LPCWSTR pszName;
+ JET_COLTYP jcColumnType;
+ BOOL fKey; // If this column is part of the key of the table
+ BOOL fFixed;
+ BOOL fNullable;
+ BOOL fAutoIncrement;
+};
+
+struct TABLE_SCHEMA
+{
+ JET_TABLEID jtTable;
+ LPCWSTR pszName;
+ DWORD dwColumns;