diff --git a/LICENSE.TXT b/LICENSE.TXT new file mode 100644 index 0000000..d4d316e --- /dev/null +++ b/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. diff --git a/LuxTasks.dll b/LuxTasks.dll index cd18634..75a31df 100644 Binary files a/LuxTasks.dll and b/LuxTasks.dll differ diff --git a/Microsoft.Deployment.Compression.Cab.dll b/Microsoft.Deployment.Compression.Cab.dll index d7610d6..113c025 100644 Binary files a/Microsoft.Deployment.Compression.Cab.dll and b/Microsoft.Deployment.Compression.Cab.dll differ diff --git a/Microsoft.Deployment.Compression.dll b/Microsoft.Deployment.Compression.dll index 7fa4a49..337dc1b 100644 Binary files a/Microsoft.Deployment.Compression.dll and b/Microsoft.Deployment.Compression.dll differ diff --git a/Microsoft.Deployment.Resources.dll b/Microsoft.Deployment.Resources.dll index a2ea12d..1d07c94 100644 Binary files a/Microsoft.Deployment.Resources.dll and b/Microsoft.Deployment.Resources.dll differ diff --git a/Microsoft.Deployment.WindowsInstaller.Package.dll b/Microsoft.Deployment.WindowsInstaller.Package.dll index cd3243b..bb51cc2 100644 Binary files a/Microsoft.Deployment.WindowsInstaller.Package.dll and b/Microsoft.Deployment.WindowsInstaller.Package.dll differ diff --git a/Microsoft.Deployment.WindowsInstaller.dll b/Microsoft.Deployment.WindowsInstaller.dll index 3647261..7f33414 100644 Binary files a/Microsoft.Deployment.WindowsInstaller.dll and b/Microsoft.Deployment.WindowsInstaller.dll differ diff --git a/ThmViewer.exe b/ThmViewer.exe index 7d14b9b..27bf1fb 100644 Binary files a/ThmViewer.exe and b/ThmViewer.exe differ diff --git a/WixBalExtension.dll b/WixBalExtension.dll index 834e00b..f11ae44 100644 Binary files a/WixBalExtension.dll and b/WixBalExtension.dll differ diff --git a/WixComPlusExtension.dll b/WixComPlusExtension.dll index a80f612..f22a8a2 100644 Binary files a/WixComPlusExtension.dll and b/WixComPlusExtension.dll differ diff --git a/WixCop.exe b/WixCop.exe index 48936ac..ec67d6f 100644 Binary files a/WixCop.exe and b/WixCop.exe differ diff --git a/WixDependencyExtension.dll b/WixDependencyExtension.dll index 561c60a..c196814 100644 Binary files a/WixDependencyExtension.dll and b/WixDependencyExtension.dll differ diff --git a/WixDifxAppExtension.dll b/WixDifxAppExtension.dll index cfd8afd..a848852 100644 Binary files a/WixDifxAppExtension.dll and b/WixDifxAppExtension.dll differ diff --git a/WixDirectXExtension.dll b/WixDirectXExtension.dll index d5b8bf0..c37daea 100644 Binary files a/WixDirectXExtension.dll and b/WixDirectXExtension.dll differ diff --git a/WixFirewallExtension.dll b/WixFirewallExtension.dll index 7250323..c2027e4 100644 Binary files a/WixFirewallExtension.dll and b/WixFirewallExtension.dll differ diff --git a/WixGamingExtension.dll b/WixGamingExtension.dll index 5b5fda1..15a20b4 100644 Binary files a/WixGamingExtension.dll and b/WixGamingExtension.dll differ diff --git a/WixHttpExtension.dll b/WixHttpExtension.dll index ec724d1..b0c8838 100644 Binary files a/WixHttpExtension.dll and b/WixHttpExtension.dll differ diff --git a/WixIIsExtension.dll b/WixIIsExtension.dll index 1d80b01..574ac50 100644 Binary files a/WixIIsExtension.dll and b/WixIIsExtension.dll differ diff --git a/WixLuxExtension.dll b/WixLuxExtension.dll index 71eaaed..bf85b4e 100644 Binary files a/WixLuxExtension.dll and b/WixLuxExtension.dll differ diff --git a/WixMsmqExtension.dll b/WixMsmqExtension.dll index 7447afd..3dcd513 100644 Binary files a/WixMsmqExtension.dll and b/WixMsmqExtension.dll differ diff --git a/WixNetFxExtension.dll b/WixNetFxExtension.dll index b37db0c..f72e1fe 100644 Binary files a/WixNetFxExtension.dll and b/WixNetFxExtension.dll differ diff --git a/WixPSExtension.dll b/WixPSExtension.dll index b3150f5..dfd596f 100644 Binary files a/WixPSExtension.dll and b/WixPSExtension.dll differ diff --git a/WixSqlExtension.dll b/WixSqlExtension.dll index b61b27e..b68ec6e 100644 Binary files a/WixSqlExtension.dll and b/WixSqlExtension.dll differ diff --git a/WixTagExtension.dll b/WixTagExtension.dll index 48c0a51..c52d92f 100644 Binary files a/WixTagExtension.dll and b/WixTagExtension.dll differ diff --git a/WixTasks.dll b/WixTasks.dll index 35e737b..dc7a836 100644 Binary files a/WixTasks.dll and b/WixTasks.dll differ diff --git a/WixUIExtension.dll b/WixUIExtension.dll index a0601b8..5fed9eb 100644 Binary files a/WixUIExtension.dll and b/WixUIExtension.dll differ diff --git a/WixUtilExtension.dll b/WixUtilExtension.dll index 3649ca1..30f0234 100644 Binary files a/WixUtilExtension.dll and b/WixUtilExtension.dll differ diff --git a/WixVSExtension.MSBuild12.dll b/WixVSExtension.MSBuild12.dll index e0c4520..472c6b5 100644 Binary files a/WixVSExtension.MSBuild12.dll and b/WixVSExtension.MSBuild12.dll differ diff --git a/WixVSExtension.MSBuild14.dll b/WixVSExtension.MSBuild14.dll index 062dac3..9b8ecb5 100644 Binary files a/WixVSExtension.MSBuild14.dll and b/WixVSExtension.MSBuild14.dll differ diff --git a/WixVSExtension.dll b/WixVSExtension.dll index 5e25ad0..ce67ee3 100644 Binary files a/WixVSExtension.dll and b/WixVSExtension.dll differ diff --git a/candle.exe b/candle.exe index c042091..2e7a577 100644 Binary files a/candle.exe and b/candle.exe differ diff --git a/dark.exe b/dark.exe index 0d750d2..12e9a61 100644 Binary files a/dark.exe and b/dark.exe differ diff --git a/difxapp_x64.wixlib b/difxapp_x64.wixlib index 4ac2e07..76b6d14 100644 Binary files a/difxapp_x64.wixlib and b/difxapp_x64.wixlib differ diff --git a/difxapp_x86.wixlib b/difxapp_x86.wixlib index 9d6fc8b..e3d7bf9 100644 Binary files a/difxapp_x86.wixlib and b/difxapp_x86.wixlib differ diff --git a/doc/DTF.chm b/doc/DTF.chm index 8dae0b5..9b1d540 100644 Binary files a/doc/DTF.chm and b/doc/DTF.chm differ diff --git a/doc/DTFAPI.chm b/doc/DTFAPI.chm index 57f1276..4847c90 100644 Binary files a/doc/DTFAPI.chm and b/doc/DTFAPI.chm differ diff --git a/doc/WiX.chm b/doc/WiX.chm index 19f973b..d126941 100644 Binary files a/doc/WiX.chm and b/doc/WiX.chm differ diff --git a/doc/bal.xsd b/doc/bal.xsd index 4e113d7..56d0e35 100644 --- a/doc/bal.xsd +++ b/doc/bal.xsd @@ -190,6 +190,19 @@ + + + + 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. + + + + + + + + diff --git a/doc/thmutil.xsd b/doc/thmutil.xsd index 2c09d52..8b0a516 100644 --- a/doc/thmutil.xsd +++ b/doc/thmutil.xsd @@ -285,6 +285,24 @@ + + + Defines a combobox. + + + + + + + + + + Numeric identifier to the Font element that serves as the font for the control. + + + + + Defines an edit box. @@ -616,6 +634,7 @@ + diff --git a/doc/util.xsd b/doc/util.xsd index 3212797..da19ac8 100644 --- a/doc/util.xsd +++ b/doc/util.xsd @@ -547,6 +547,22 @@ + + + + Icon file that should be displayed. Note that this is a formatted field, so you can use + [#fileId] syntax to refer to a file being installed (using the file: + protocol). + + + + + + + Index of the icon being referenced + + + diff --git a/doc/wix.xsd b/doc/wix.xsd index a5dcd8d..82542eb 100644 --- a/doc/wix.xsd +++ b/doc/wix.xsd @@ -384,9 +384,17 @@ - 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 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. + + + + Extensibility point in the WiX XML Schema. Schema extensions can register additional + attributes at this point in the schema. + + + @@ -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. @@ -1061,7 +1070,7 @@ - The name of the MSI property to set. + 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 @@ -1293,7 +1302,7 @@ - The destination path and file name for this payload. The default is the source file name. + The destination path and file name for this payload. The default is the source file name. The use of '..' directories is not allowed. @@ -10759,7 +10768,7 @@ - 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. + 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. @@ -10805,7 +10814,7 @@ - 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. + 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. diff --git a/heat.exe b/heat.exe index 2d86a53..373d07a 100644 Binary files a/heat.exe and b/heat.exe differ diff --git a/insignia.exe b/insignia.exe index c0aaa4e..8d5d1cb 100644 Binary files a/insignia.exe and b/insignia.exe differ diff --git a/light.exe b/light.exe index d07a712..c56167c 100644 Binary files a/light.exe and b/light.exe differ diff --git a/lit.exe b/lit.exe index df20c52..ad8294b 100644 Binary files a/lit.exe and b/lit.exe differ diff --git a/lux.exe b/lux.exe index 93bb042..6c12a21 100644 Binary files a/lux.exe and b/lux.exe differ diff --git a/melt.exe b/melt.exe index 48753a1..8b07b70 100644 Binary files a/melt.exe and b/melt.exe differ diff --git a/nit.exe b/nit.exe index 02e8d26..67d8660 100644 Binary files a/nit.exe and b/nit.exe differ diff --git a/pyro.exe b/pyro.exe index 0e13ffa..f623690 100644 Binary files a/pyro.exe and b/pyro.exe differ diff --git a/retina.exe b/retina.exe index d890f9e..e6d3893 100644 Binary files a/retina.exe and b/retina.exe differ diff --git a/sdk/BootstrapperCore.dll b/sdk/BootstrapperCore.dll index 07667b3..00601cf 100644 Binary files a/sdk/BootstrapperCore.dll and b/sdk/BootstrapperCore.dll differ diff --git a/sdk/BootstrapperCore.xml b/sdk/BootstrapperCore.xml index 364bd58..14d6e8f 100644 --- a/sdk/BootstrapperCore.xml +++ b/sdk/BootstrapperCore.xml @@ -2527,6 +2527,11 @@ The error came while trying to authenticate with an HTTP proxy. + + + The error occurred during apply. + + The related bundle or package will be downgraded. @@ -2799,5 +2804,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/DocCompiler.exe b/sdk/DocCompiler.exe index 6c746f8..832ccec 100644 Binary files a/sdk/DocCompiler.exe and b/sdk/DocCompiler.exe differ diff --git a/sdk/MakeSfxCA.exe b/sdk/MakeSfxCA.exe index 6d7085e..d4a7276 100644 Binary files a/sdk/MakeSfxCA.exe and b/sdk/MakeSfxCA.exe differ diff --git a/sdk/Microsoft.Deployment.Compression.Cab.dll b/sdk/Microsoft.Deployment.Compression.Cab.dll index d7610d6..113c025 100644 Binary files a/sdk/Microsoft.Deployment.Compression.Cab.dll and b/sdk/Microsoft.Deployment.Compression.Cab.dll differ diff --git a/sdk/Microsoft.Deployment.Compression.Cab.xml b/sdk/Microsoft.Deployment.Compression.Cab.xml index 70d65b6..40d6233 100644 --- a/sdk/Microsoft.Deployment.Compression.Cab.xml +++ b/sdk/Microsoft.Deployment.Compression.Cab.xml @@ -486,5 +486,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/Microsoft.Deployment.Compression.Zip.dll b/sdk/Microsoft.Deployment.Compression.Zip.dll index fd1e4b4..2d2ea17 100644 Binary files a/sdk/Microsoft.Deployment.Compression.Zip.dll and b/sdk/Microsoft.Deployment.Compression.Zip.dll differ diff --git a/sdk/Microsoft.Deployment.Compression.Zip.xml b/sdk/Microsoft.Deployment.Compression.Zip.xml index f18a1c6..cd2a1ea 100644 --- a/sdk/Microsoft.Deployment.Compression.Zip.xml +++ b/sdk/Microsoft.Deployment.Compression.Zip.xml @@ -543,5 +543,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/Microsoft.Deployment.Compression.dll b/sdk/Microsoft.Deployment.Compression.dll index 7fa4a49..337dc1b 100644 Binary files a/sdk/Microsoft.Deployment.Compression.dll and b/sdk/Microsoft.Deployment.Compression.dll differ diff --git a/sdk/Microsoft.Deployment.Compression.xml b/sdk/Microsoft.Deployment.Compression.xml index 4a54671..6874281 100644 --- a/sdk/Microsoft.Deployment.Compression.xml +++ b/sdk/Microsoft.Deployment.Compression.xml @@ -1957,5 +1957,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/Microsoft.Deployment.Resources.dll b/sdk/Microsoft.Deployment.Resources.dll index a2ea12d..1d07c94 100644 Binary files a/sdk/Microsoft.Deployment.Resources.dll and b/sdk/Microsoft.Deployment.Resources.dll differ diff --git a/sdk/Microsoft.Deployment.Resources.xml b/sdk/Microsoft.Deployment.Resources.xml index d065356..cec9e6e 100644 --- a/sdk/Microsoft.Deployment.Resources.xml +++ b/sdk/Microsoft.Deployment.Resources.xml @@ -532,5 +532,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll b/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll index 620f36c..e294ed3 100644 Binary files a/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll and b/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll differ diff --git a/sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml b/sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml index 09f5760..197861f 100644 --- a/sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml +++ b/sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml @@ -455,5 +455,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll b/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll index cd3243b..bb51cc2 100644 Binary files a/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll and b/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll differ diff --git a/sdk/Microsoft.Deployment.WindowsInstaller.Package.xml b/sdk/Microsoft.Deployment.WindowsInstaller.Package.xml index 91db8aa..86b6105 100644 --- a/sdk/Microsoft.Deployment.WindowsInstaller.Package.xml +++ b/sdk/Microsoft.Deployment.WindowsInstaller.Package.xml @@ -720,5 +720,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/Microsoft.Deployment.WindowsInstaller.dll b/sdk/Microsoft.Deployment.WindowsInstaller.dll index 3647261..7f33414 100644 Binary files a/sdk/Microsoft.Deployment.WindowsInstaller.dll and b/sdk/Microsoft.Deployment.WindowsInstaller.dll differ diff --git a/sdk/Microsoft.Deployment.WindowsInstaller.xml b/sdk/Microsoft.Deployment.WindowsInstaller.xml index 73dd762..61b7863 100644 --- a/sdk/Microsoft.Deployment.WindowsInstaller.xml +++ b/sdk/Microsoft.Deployment.WindowsInstaller.xml @@ -7405,5 +7405,10 @@ Telemetry URL format for the distribution. + + + VS Extensions Landing page Url for the distribution. + + diff --git a/sdk/MsgGen.exe b/sdk/MsgGen.exe index 2c35b8c..ca41888 100644 Binary files a/sdk/MsgGen.exe and b/sdk/MsgGen.exe differ diff --git a/sdk/XsdGen.exe b/sdk/XsdGen.exe index a96cf1c..e91489d 100644 Binary files a/sdk/XsdGen.exe and b/sdk/XsdGen.exe differ diff --git a/sdk/XsdStitch.exe b/sdk/XsdStitch.exe index acc7039..d1548b1 100644 Binary files a/sdk/XsdStitch.exe and b/sdk/XsdStitch.exe differ diff --git a/sdk/inc/BalBaseBootstrapperApplication.h b/sdk/inc/BalBaseBootstrapperApplication.h index 8005847..82688d3 100644 --- a/sdk/inc/BalBaseBootstrapperApplication.h +++ b/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; diff --git a/sdk/inc/IBootstrapperEngine.h b/sdk/inc/IBootstrapperEngine.h index aca1ff2..782828b 100644 --- a/sdk/inc/IBootstrapperEngine.h +++ b/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)( diff --git a/sdk/inc/locutil.h b/sdk/inc/locutil.h index 3d033e6..c6711d6 100644 --- a/sdk/inc/locutil.h +++ b/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 diff --git a/sdk/inc/strutil.h b/sdk/inc/strutil.h index 32e5b8b..3ef48c5 100644 --- a/sdk/inc/strutil.h +++ b/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, diff --git a/sdk/inc/thmutil.h b/sdk/inc/thmutil.h index 65c3b48..01c6f7a 100644 --- a/sdk/inc/thmutil.h +++ b/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; diff --git a/sdk/vs2010/lib/x64/deputil.lib b/sdk/vs2010/lib/x64/deputil.lib index cd05e94..77407ba 100644 Binary files a/sdk/vs2010/lib/x64/deputil.lib and b/sdk/vs2010/lib/x64/deputil.lib differ diff --git a/sdk/vs2010/lib/x64/dutil.lib b/sdk/vs2010/lib/x64/dutil.lib index f3ce1db..69344fb 100644 Binary files a/sdk/vs2010/lib/x64/dutil.lib and b/sdk/vs2010/lib/x64/dutil.lib differ diff --git a/sdk/vs2010/lib/x64/wcautil.lib b/sdk/vs2010/lib/x64/wcautil.lib index 7772c79..e4d7402 100644 Binary files a/sdk/vs2010/lib/x64/wcautil.lib and b/sdk/vs2010/lib/x64/wcautil.lib differ diff --git a/sdk/vs2010/lib/x86/balutil.lib b/sdk/vs2010/lib/x86/balutil.lib index 295d2c2..234b5a2 100644 Binary files a/sdk/vs2010/lib/x86/balutil.lib and b/sdk/vs2010/lib/x86/balutil.lib differ diff --git a/sdk/vs2010/lib/x86/deputil.lib b/sdk/vs2010/lib/x86/deputil.lib index 261d419..27cd06a 100644 Binary files a/sdk/vs2010/lib/x86/deputil.lib and b/sdk/vs2010/lib/x86/deputil.lib differ diff --git a/sdk/vs2010/lib/x86/dutil.lib b/sdk/vs2010/lib/x86/dutil.lib index 4d85466..d8375a9 100644 Binary files a/sdk/vs2010/lib/x86/dutil.lib and b/sdk/vs2010/lib/x86/dutil.lib differ diff --git a/sdk/vs2010/lib/x86/wcautil.lib b/sdk/vs2010/lib/x86/wcautil.lib index b27b223..798eb5e 100644 Binary files a/sdk/vs2010/lib/x86/wcautil.lib and b/sdk/vs2010/lib/x86/wcautil.lib differ diff --git a/sdk/vs2012/lib/x64/deputil.lib b/sdk/vs2012/lib/x64/deputil.lib index 3191ef4..918e9f9 100644 Binary files a/sdk/vs2012/lib/x64/deputil.lib and b/sdk/vs2012/lib/x64/deputil.lib differ diff --git a/sdk/vs2012/lib/x64/dutil.lib b/sdk/vs2012/lib/x64/dutil.lib index 52e4471..5b86ec5 100644 Binary files a/sdk/vs2012/lib/x64/dutil.lib and b/sdk/vs2012/lib/x64/dutil.lib differ diff --git a/sdk/vs2012/lib/x64/wcautil.lib b/sdk/vs2012/lib/x64/wcautil.lib index 55d0d15..5217f29 100644 Binary files a/sdk/vs2012/lib/x64/wcautil.lib and b/sdk/vs2012/lib/x64/wcautil.lib differ diff --git a/sdk/vs2012/lib/x86/balutil.lib b/sdk/vs2012/lib/x86/balutil.lib index 060ee5b..11f379e 100644 Binary files a/sdk/vs2012/lib/x86/balutil.lib and b/sdk/vs2012/lib/x86/balutil.lib differ diff --git a/sdk/vs2012/lib/x86/deputil.lib b/sdk/vs2012/lib/x86/deputil.lib index 8459a62..eb38c72 100644 Binary files a/sdk/vs2012/lib/x86/deputil.lib and b/sdk/vs2012/lib/x86/deputil.lib differ diff --git a/sdk/vs2012/lib/x86/dutil.lib b/sdk/vs2012/lib/x86/dutil.lib index be5dff2..d1a5a87 100644 Binary files a/sdk/vs2012/lib/x86/dutil.lib and b/sdk/vs2012/lib/x86/dutil.lib differ diff --git a/sdk/vs2012/lib/x86/wcautil.lib b/sdk/vs2012/lib/x86/wcautil.lib index 1fea96e..39ad528 100644 Binary files a/sdk/vs2012/lib/x86/wcautil.lib and b/sdk/vs2012/lib/x86/wcautil.lib differ diff --git a/sdk/vs2013/lib/x64/deputil.lib b/sdk/vs2013/lib/x64/deputil.lib index b35049b..9203606 100644 Binary files a/sdk/vs2013/lib/x64/deputil.lib and b/sdk/vs2013/lib/x64/deputil.lib differ diff --git a/sdk/vs2013/lib/x64/dutil.lib b/sdk/vs2013/lib/x64/dutil.lib index 2c7954a..00a838d 100644 Binary files a/sdk/vs2013/lib/x64/dutil.lib and b/sdk/vs2013/lib/x64/dutil.lib differ diff --git a/sdk/vs2013/lib/x64/wcautil.lib b/sdk/vs2013/lib/x64/wcautil.lib index 8400128..10abfa6 100644 Binary files a/sdk/vs2013/lib/x64/wcautil.lib and b/sdk/vs2013/lib/x64/wcautil.lib differ diff --git a/sdk/vs2013/lib/x86/balutil.lib b/sdk/vs2013/lib/x86/balutil.lib index 8cc2469..8e98cc5 100644 Binary files a/sdk/vs2013/lib/x86/balutil.lib and b/sdk/vs2013/lib/x86/balutil.lib differ diff --git a/sdk/vs2013/lib/x86/deputil.lib b/sdk/vs2013/lib/x86/deputil.lib index 2f031c5..aa52fa4 100644 Binary files a/sdk/vs2013/lib/x86/deputil.lib and b/sdk/vs2013/lib/x86/deputil.lib differ diff --git a/sdk/vs2013/lib/x86/dutil.lib b/sdk/vs2013/lib/x86/dutil.lib index 4f7ae66..bbd9ae2 100644 Binary files a/sdk/vs2013/lib/x86/dutil.lib and b/sdk/vs2013/lib/x86/dutil.lib differ diff --git a/sdk/vs2013/lib/x86/wcautil.lib b/sdk/vs2013/lib/x86/wcautil.lib index 066fe96..d253c81 100644 Binary files a/sdk/vs2013/lib/x86/wcautil.lib and b/sdk/vs2013/lib/x86/wcautil.lib differ diff --git a/sdk/vs2015/lib/x64/deputil.lib b/sdk/vs2015/lib/x64/deputil.lib index 6cd3ba9..dc0f31f 100644 Binary files a/sdk/vs2015/lib/x64/deputil.lib and b/sdk/vs2015/lib/x64/deputil.lib differ diff --git a/sdk/vs2015/lib/x64/dutil.lib b/sdk/vs2015/lib/x64/dutil.lib index 781d195..0408691 100644 Binary files a/sdk/vs2015/lib/x64/dutil.lib and b/sdk/vs2015/lib/x64/dutil.lib differ diff --git a/sdk/vs2015/lib/x64/wcautil.lib b/sdk/vs2015/lib/x64/wcautil.lib index ce2f0e2..3c6101d 100644 Binary files a/sdk/vs2015/lib/x64/wcautil.lib and b/sdk/vs2015/lib/x64/wcautil.lib differ diff --git a/sdk/vs2015/lib/x86/balutil.lib b/sdk/vs2015/lib/x86/balutil.lib index 983ab11..0232d8f 100644 Binary files a/sdk/vs2015/lib/x86/balutil.lib and b/sdk/vs2015/lib/x86/balutil.lib differ diff --git a/sdk/vs2015/lib/x86/deputil.lib b/sdk/vs2015/lib/x86/deputil.lib index 3a9c6b0..829911f 100644 Binary files a/sdk/vs2015/lib/x86/deputil.lib and b/sdk/vs2015/lib/x86/deputil.lib differ diff --git a/sdk/vs2015/lib/x86/dutil.lib b/sdk/vs2015/lib/x86/dutil.lib index a53059c..86663a5 100644 Binary files a/sdk/vs2015/lib/x86/dutil.lib and b/sdk/vs2015/lib/x86/dutil.lib differ diff --git a/sdk/vs2015/lib/x86/wcautil.lib b/sdk/vs2015/lib/x86/wcautil.lib index 848600c..df00489 100644 Binary files a/sdk/vs2015/lib/x86/wcautil.lib and b/sdk/vs2015/lib/x86/wcautil.lib differ diff --git a/sdk/vs2017/lib/x64/deputil.lib b/sdk/vs2017/lib/x64/deputil.lib new file mode 100644 index 0000000..c291ede Binary files /dev/null and b/sdk/vs2017/lib/x64/deputil.lib differ diff --git a/sdk/vs2017/lib/x64/dutil.lib b/sdk/vs2017/lib/x64/dutil.lib new file mode 100644 index 0000000..748468b Binary files /dev/null and b/sdk/vs2017/lib/x64/dutil.lib differ diff --git a/sdk/vs2017/lib/x64/wcautil.lib b/sdk/vs2017/lib/x64/wcautil.lib new file mode 100644 index 0000000..ff727e8 Binary files /dev/null and b/sdk/vs2017/lib/x64/wcautil.lib differ diff --git a/sdk/vs2017/lib/x86/balutil.lib b/sdk/vs2017/lib/x86/balutil.lib new file mode 100644 index 0000000..9ae4fb4 Binary files /dev/null and b/sdk/vs2017/lib/x86/balutil.lib differ diff --git a/sdk/vs2017/lib/x86/deputil.lib b/sdk/vs2017/lib/x86/deputil.lib new file mode 100644 index 0000000..879e0a9 Binary files /dev/null and b/sdk/vs2017/lib/x86/deputil.lib differ diff --git a/sdk/vs2017/lib/x86/dutil.lib b/sdk/vs2017/lib/x86/dutil.lib new file mode 100644 index 0000000..44eda03 Binary files /dev/null and b/sdk/vs2017/lib/x86/dutil.lib differ diff --git a/sdk/vs2017/lib/x86/wcautil.lib b/sdk/vs2017/lib/x86/wcautil.lib new file mode 100644 index 0000000..87f1f04 Binary files /dev/null and b/sdk/vs2017/lib/x86/wcautil.lib differ diff --git a/sdk/wix.ca.targets b/sdk/wix.ca.targets index cd13fd0..4afcd0e 100644 --- a/sdk/wix.ca.targets +++ b/sdk/wix.ca.targets @@ -9,10 +9,13 @@ - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.ca.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.10\bin\WixTasks.dll - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix.ca.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.10\bin\WixTasks.dll + true + + $(MSBuildExtensionsPath32)\..\WiX Toolset v3.11\bin\WixTasks.dll + $(MSBuildExtensionsPath)\..\WiX Toolset v3.11\bin\WixTasks.dll + + $(MSBuildProgramFiles32)\WiX Toolset v3.11\bin\WixTasks.dll + $(TargetName).CA$(TargetExt) @@ -30,8 +33,8 @@ ================================================================================================== --> - SOFTWARE\Microsoft\Windows Installer XML\3.10 - SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10 + SOFTWARE\Microsoft\Windows Installer XML\3.11 + SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.11 @@ -112,6 +115,25 @@ + + + + + + + + + + + + + + + + + + + true + + VS2010 + VS2012 + VS2012 + VS2013 + VS2013 + VS2015 + VS2015 + VS2017 + VS2017 + + VS2015 + + + + + diff --git a/sdk/x64/sfxca.dll b/sdk/x64/sfxca.dll index 0ef0f79..d3e1215 100644 Binary files a/sdk/x64/sfxca.dll and b/sdk/x64/sfxca.dll differ diff --git a/sdk/x86/sfxca.dll b/sdk/x86/sfxca.dll index 246b1f4..a94a18e 100644 Binary files a/sdk/x86/sfxca.dll and b/sdk/x86/sfxca.dll differ diff --git a/shine.exe b/shine.exe index 385c125..7983b16 100644 Binary files a/shine.exe and b/shine.exe differ diff --git a/smoke.exe b/smoke.exe index b80aa97..b6133b1 100644 Binary files a/smoke.exe and b/smoke.exe differ diff --git a/torch.exe b/torch.exe index 599f2b1..04cafe2 100644 Binary files a/torch.exe and b/torch.exe differ diff --git a/wconsole.dll b/wconsole.dll index 8c6853e..ac7a86c 100644 Binary files a/wconsole.dll and b/wconsole.dll differ diff --git a/winterop.dll b/winterop.dll index 65a5899..2f1b4da 100644 Binary files a/winterop.dll and b/winterop.dll differ diff --git a/wix.dll b/wix.dll index 135ab2f..492a029 100644 Binary files a/wix.dll and b/wix.dll differ diff --git a/wix.targets b/wix.targets index 4f2383b..debd85b 100644 --- a/wix.targets +++ b/wix.targets @@ -4,13 +4,15 @@ - + + true + - wix2010.targets diff --git a/wix200x.targets b/wix200x.targets index e28b708..607c658 100644 --- a/wix200x.targets +++ b/wix200x.targets @@ -26,13 +26,13 @@ $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.10\bin\WixTasks.dll + $(MSBuildExtensionsPath32)\..\WiX Toolset v3.11\bin\WixTasks.dll $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.10\bin\WixTasks.dll + $(MSBuildExtensionsPath)\..\WiX Toolset v3.11\bin\WixTasks.dll $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.10\bin\LuxTasks.dll + $(MSBuildExtensionsPath32)\..\WiX Toolset v3.11\bin\LuxTasks.dll $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.10\bin\LuxTasks.dll + $(MSBuildExtensionsPath)\..\WiX Toolset v3.11\bin\LuxTasks.dll @@ -453,8 +453,8 @@ ================================================================================================== --> - SOFTWARE\Microsoft\Windows Installer XML\3.10 - SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10 + SOFTWARE\Microsoft\Windows Installer XML\3.11 + SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.11 @@ -2460,6 +2460,7 @@ ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)" AdditionalOptions="$(LinkerAdditionalOptions)" AllowIdenticalRows="$(AllowIdenticalRows)" + AllowDuplicateDirectoryIds="$(AllowDuplicateDirectoryIds)" AllowUnresolvedReferences="$(AllowUnresolvedReferences)" AdditionalCub="$(AdditionalCub)" BackwardsCompatibleGuidGeneration="$(BackwardsCompatibleGuidGeneration)" diff --git a/wix2010.targets b/wix2010.targets index 63303b2..39b9a48 100644 --- a/wix2010.targets +++ b/wix2010.targets @@ -8,8 +8,8 @@ InitialTargets="_CheckForInvalidConfigurationAndPlatform; _CheckRequiredProperties"> - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.11@InstallRoot) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.11@InstallRoot) + diff --git a/x86/burn.exe b/x86/burn.exe index c529178..7c19630 100644 Binary files a/x86/burn.exe and b/x86/burn.exe differ