Merge pull request #2 from zooba/wix

Update Wix to v3.11

LICENSE.TXT

@@ -0,0 +1,28 @@
+Copyright (c) .NET Foundation and contributors.
+This software is released under the Microsoft Reciprocal License (MS-RL) (the "License"); you may not use the software except in compliance with the License.
+
+The text of the Microsoft Reciprocal License (MS-RL) can be found online at:
+ http://opensource.org/licenses/ms-rl
+
+
+Microsoft Reciprocal License (MS-RL)
+
+This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+
+1. Definitions
+ The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
+ A "contribution" is the original software, or any additions or changes to the software.
+ A "contributor" is any person that distributes its contribution under this license.
+ "Licensed patents" are a contributor's patent claims that read directly on its contribution.
+
+2. Grant of Rights
+ (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+ (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+
+3. Conditions and Limitations
+ (A) Reciprocal Grants- For any file you distribute that contains code from the software (in source code or binary format), you must provide recipients the source code to that file along with a copy of this license, which license will govern that file. You may license other files that are entirely your own work and do not contain code from the software under any terms you choose.
+ (B) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+ (C) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
+ (D) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
+ (E) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
+ (F) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

doc/bal.xsd

@@ -190,6 +190,19 @@
         </xs:annotation>
     </xs:attribute>
 
+    <xs:attribute name="UseUILanguages" type="YesNoType">
+        <xs:annotation>
+            <xs:documentation>
+                When set to "yes", causes WixStdBA/Prereq BA to use the user's control panel language settings. Otherwise, the previous API (which uses locale instead of language) is used to maintain compatiblity with previous versions of WiX.
+                On Vista and newer platforms, this value set to "yes" will search all specified user languages, including fallback languages, in order.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="BootstrapperApplication" />
+                <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="BootstrapperApplicationRef" />
+            </xs:appinfo>
+        </xs:annotation>
+    </xs:attribute>
+
     <xs:element name="WixManagedBootstrapperApplicationHost">
         <xs:annotation>
             <xs:documentation>

doc/thmutil.xsd

@@ -285,6 +285,24 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:element name="Combobox">
+        <xs:annotation>
+            <xs:documentation>Defines a combobox.</xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/thmutil/2010" ref="Page" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/thmutil/2010" ref="Theme" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+             </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
     <xs:element name="Editbox">
         <xs:annotation>
             <xs:documentation>Defines an edit box.</xs:documentation>
@@ -616,6 +634,7 @@
             <xs:element ref="Billboard" />
             <xs:element ref="Button" />
             <xs:element ref="Checkbox" />
+            <xs:element ref="Combobox" />
             <xs:element ref="Editbox" />
             <xs:element ref="Hyperlink" />
             <xs:element ref="Hypertext" />

doc/util.xsd

@@ -547,6 +547,22 @@
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
+      <xs:attribute name="IconFile" type="xs:string" use="optional">
+        <xs:annotation>
+          <xs:documentation>
+            Icon file that should be displayed. Note that this is a formatted field, so you can use
+            [#fileId] syntax to refer to a file being installed (using the file:
+            protocol).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="IconIndex" type="xs:integer" use="optional">
+        <xs:annotation>
+          <xs:documentation>
+            Index of the icon being referenced
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>
   <xs:element name="PerformanceCategory">

doc/wix.xsd

@@ -384,9 +384,17 @@
       </xs:attribute>
       <xs:attribute name="Name" type="xs:string">
         <xs:annotation>
-          <xs:documentation>The relative destination path and file name for the bootstrapper application DLL. The default is the source file name. Use this attribute to rename the bootstrapper application DLL or extract it into a subfolder.</xs:documentation>
+          <xs:documentation>The relative destination path and file name for the bootstrapper application DLL. The default is the source file name. Use this attribute to rename the bootstrapper application DLL or extract it into a subfolder. The use of '..' directories is not allowed.</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.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:anyAttribute>
     </xs:complexType>
   </xs:element>
   <xs:element name="BootstrapperApplicationRef">
@@ -867,6 +875,7 @@
             The destination path and file name for this chain payload. Use this attribute to rename the
             chain entry point or extract it into a subfolder. The default value is the file name from the
             SourceFile attribute, if provided. At a minimum, the Name or SourceFile attribute must be specified.
+            The use of '..' directories is not allowed.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
@@ -1061,7 +1070,7 @@
     <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:documentation>The name of the MSI property to set. Burn controls the follow MSI properties so they cannot be set with MsiProperty: ACTION, ALLUSERS, REBOOT, REINSTALL, REINSTALLMODE</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Value" type="xs:string" use="required">
@@ -1293,7 +1302,7 @@
       </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:documentation>The destination path and file name for this payload. The default is the source file name. The use of '..' directories is not allowed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="DownloadUrl" type="xs:string">
@@ -10759,7 +10768,7 @@
       </xs:choice>
       <xs:attribute name="Id" type="xs:string" use="required">
         <xs:annotation>
-          <xs:documentation>The Id cannot by longer than 55 characters.  In order to prevent errors in cases where the Id is modularized, it should not be longer than 18 characters.</xs:documentation>
+          <xs:documentation>The Id cannot be longer than 55 characters.  In order to prevent errors in cases where the Id is modularized, it should not be longer than 18 characters.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="SourceFile" type="xs:string">
@@ -10805,7 +10814,7 @@
     <xs:complexType>
       <xs:attribute name="Id" type="xs:string" use="required">
         <xs:annotation>
-          <xs:documentation>The Id cannot by longer than 55 characters.  In order to prevent errors in cases where the Id is modularized, it should not be longer than 18 characters.</xs:documentation>
+          <xs:documentation>The Id cannot be longer than 55 characters.  In order to prevent errors in cases where the Id is modularized, it should not be longer than 18 characters.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="SourceFile" type="xs:string">

sdk/BootstrapperCore.xml

@@ -2527,6 +2527,11 @@
             The error came while trying to authenticate with an HTTP proxy.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.Bootstrapper.ErrorType.Apply">
+            <summary>
+            The error occurred during apply.
+            </summary>
+        </member>
         <member name="F:Microsoft.Tools.WindowsInstallerXml.Bootstrapper.RelatedOperation.Downgrade">
             <summary>
             The related bundle or package will be downgraded.
@@ -2799,5 +2804,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.Compression.Cab.xml

@@ -486,5 +486,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.Compression.Zip.xml

@@ -543,5 +543,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.Compression.xml

@@ -1957,5 +1957,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.Resources.xml

@@ -532,5 +532,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml

@@ -455,5 +455,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.WindowsInstaller.Package.xml

@@ -720,5 +720,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/Microsoft.Deployment.WindowsInstaller.xml

@@ -7405,5 +7405,10 @@
             Telemetry URL format for the distribution.
             </summary>
         </member>
+        <member name="F:Microsoft.Tools.WindowsInstallerXml.WixDistribution.VSExtensionsLandingUrl">
+            <summary>
+            VS Extensions Landing page Url for the distribution.
+            </summary>
+        </member>
     </members>
 </doc>

sdk/inc/BalBaseBootstrapperApplication.h

@@ -603,8 +603,8 @@ protected:
     virtual BOOL PromptCancel(
         __in HWND hWnd,
         __in BOOL fForceCancel,
-        __in_z LPCWSTR wzMessage,
-        __in_z LPCWSTR wzCaption
+        __in_z_opt LPCWSTR wzMessage,
+        __in_z_opt LPCWSTR wzCaption
         )
     {
         ::EnterCriticalSection(&m_csCanceled);
@@ -677,14 +677,16 @@ protected:
         ReleaseNullObject(m_pEngine);
     }
 
+protected:
+    CRITICAL_SECTION m_csCanceled;
+    BOOL m_fCanceled;
+
 private:
     long m_cReferences;
     BOOTSTRAPPER_DISPLAY m_display;
     BOOTSTRAPPER_RESTART m_restart;
     IBootstrapperEngine* m_pEngine;
 
-    CRITICAL_SECTION m_csCanceled;
-    BOOL m_fCanceled;
     BOOL m_fApplying;
     BOOL m_fRollingBack;
 

sdk/inc/IBootstrapperEngine.h

@@ -171,8 +171,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
         __in_z LPCWSTR wzPackageOrContainerId,
         __in_z_opt LPCWSTR wzPayloadId,
         __in_z LPCWSTR wzUrl,
-        __in_z_opt LPWSTR wzUser,
-        __in_z_opt LPWSTR wzPassword
+        __in_z_opt LPCWSTR wzUser,
+        __in_z_opt LPCWSTR wzPassword
         ) = 0;
 
     STDMETHOD(SetVariableNumeric)(

sdk/inc/locutil.h

@@ -49,6 +49,18 @@ HRESULT DAPI LocProbeForFile(
     __inout LPWSTR* psczPath
     );
 
+/********************************************************************
+ LocProbeForFileEx - Searches for a localization file on disk.
+ useUILanguage should be set to TRUE.
+*******************************************************************/
+extern "C" HRESULT DAPI LocProbeForFileEx(
+    __in_z LPCWSTR wzBasePath,
+    __in_z LPCWSTR wzLocFileName,
+    __in_z_opt LPCWSTR wzLanguage,
+    __inout LPWSTR* psczPath,
+    __in BOOL useUILanguage
+    );
+
 /********************************************************************
  LocLoadFromFile - Loads a localization file
 

sdk/inc/strutil.h

@@ -95,6 +95,11 @@ HRESULT __cdecl StrAllocFormatted(
     __in __format_string LPCWSTR wzFormat,
     ...
     );
+HRESULT __cdecl StrAllocConcatFormatted(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
 HRESULT __cdecl StrAllocFormattedSecure(
     __deref_out_z LPWSTR* ppwz,
     __in __format_string LPCWSTR wzFormat,

sdk/inc/thmutil.h

@@ -30,6 +30,7 @@ typedef enum THEME_CONTROL_TYPE
     THEME_CONTROL_TYPE_LISTVIEW,
     THEME_CONTROL_TYPE_TREEVIEW,
     THEME_CONTROL_TYPE_TAB,
+    THEME_CONTROL_TYPE_COMBOBOX,
 } THEME_CONTROL_TYPE;