diff options
author | Bob Arnson <bob@firegiant.com> | 2021-02-09 21:21:24 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2021-02-09 21:24:23 -0500 |
commit | cacae742b21e42c6c7a1cd7c9ddd102264ac0782 (patch) | |
tree | 84dfc44249e0a53d44aa27bc6cdd5a4711743197 /src | |
parent | 665654b4f553c567b11aab3b4d65635b083a5a9e (diff) | |
download | wix-cacae742b21e42c6c7a1cd7c9ddd102264ac0782.tar.gz wix-cacae742b21e42c6c7a1cd7c9ddd102264ac0782.tar.bz2 wix-cacae742b21e42c6c7a1cd7c9ddd102264ac0782.zip |
Update DUtil dependency.
Diffstat (limited to 'src')
-rw-r--r-- | src/wcautil/inc/wcautil.h | 4 | ||||
-rw-r--r-- | src/wcautil/packages.config | 2 | ||||
-rw-r--r-- | src/wcautil/wcautil.vcxproj | 4 | ||||
-rw-r--r-- | src/wcautil/wcawrap.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/wcautil/inc/wcautil.h b/src/wcautil/inc/wcautil.h index 982173f4..4d036a9d 100644 --- a/src/wcautil/inc/wcautil.h +++ b/src/wcautil/inc/wcautil.h | |||
@@ -232,7 +232,7 @@ HRESULT WIXAPI WcaGetRecordFormattedString( | |||
232 | 232 | ||
233 | HRESULT WIXAPI WcaAllocStream( | 233 | HRESULT WIXAPI WcaAllocStream( |
234 | __deref_out_bcount_part(cbData, 0) BYTE** ppbData, | 234 | __deref_out_bcount_part(cbData, 0) BYTE** ppbData, |
235 | __in DWORD cbData | 235 | __in SIZE_T cbData |
236 | ); | 236 | ); |
237 | HRESULT WIXAPI WcaFreeStream( | 237 | HRESULT WIXAPI WcaFreeStream( |
238 | __in BYTE* pbData | 238 | __in BYTE* pbData |
@@ -287,7 +287,7 @@ HRESULT WIXAPI WcaWriteIntegerToCaData( | |||
287 | ); | 287 | ); |
288 | HRESULT WIXAPI WcaWriteStreamToCaData( | 288 | HRESULT WIXAPI WcaWriteStreamToCaData( |
289 | __in_bcount(cbData) const BYTE* pbData, | 289 | __in_bcount(cbData) const BYTE* pbData, |
290 | __in DWORD cbData, | 290 | __in SIZE_T cbData, |
291 | __deref_inout_z_opt LPWSTR* ppwzCustomActionData | 291 | __deref_inout_z_opt LPWSTR* ppwzCustomActionData |
292 | ); | 292 | ); |
293 | 293 | ||
diff --git a/src/wcautil/packages.config b/src/wcautil/packages.config index 924b5e93..aee0138c 100644 --- a/src/wcautil/packages.config +++ b/src/wcautil/packages.config | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> |
4 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> | 4 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> |
5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj index 27ed9ac7..c5b60b4a 100644 --- a/src/wcautil/wcautil.vcxproj +++ b/src/wcautil/wcautil.vcxproj | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" /> |
5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
6 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
7 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
@@ -89,6 +89,6 @@ | |||
89 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 89 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
90 | </PropertyGroup> | 90 | </PropertyGroup> |
91 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | 91 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> |
92 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> | 92 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" /> |
93 | </Target> | 93 | </Target> |
94 | </Project> \ No newline at end of file | 94 | </Project> \ No newline at end of file |
diff --git a/src/wcautil/wcawrap.cpp b/src/wcautil/wcawrap.cpp index 625489c1..7c210069 100644 --- a/src/wcautil/wcawrap.cpp +++ b/src/wcautil/wcawrap.cpp | |||
@@ -1000,7 +1000,7 @@ NOTE: Use WcaFreeStream() to release the byte stream | |||
1000 | ********************************************************************/ | 1000 | ********************************************************************/ |
1001 | extern "C" HRESULT WIXAPI WcaAllocStream( | 1001 | extern "C" HRESULT WIXAPI WcaAllocStream( |
1002 | __deref_out_bcount_part(cbData, 0) BYTE** ppbData, | 1002 | __deref_out_bcount_part(cbData, 0) BYTE** ppbData, |
1003 | __in DWORD cbData | 1003 | __in SIZE_T cbData |
1004 | ) | 1004 | ) |
1005 | { | 1005 | { |
1006 | Assert(ppbData); | 1006 | Assert(ppbData); |
@@ -1379,7 +1379,7 @@ feed a deferred CustomAction | |||
1379 | ********************************************************************/ | 1379 | ********************************************************************/ |
1380 | extern "C" HRESULT WIXAPI WcaWriteStreamToCaData( | 1380 | extern "C" HRESULT WIXAPI WcaWriteStreamToCaData( |
1381 | __in_bcount(cbData) const BYTE* pbData, | 1381 | __in_bcount(cbData) const BYTE* pbData, |
1382 | __in DWORD cbData, | 1382 | __in SIZE_T cbData, |
1383 | __deref_inout_z_opt LPWSTR* ppwzCustomActionData | 1383 | __deref_inout_z_opt LPWSTR* ppwzCustomActionData |
1384 | ) | 1384 | ) |
1385 | { | 1385 | { |