aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Iis/ca
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-26 11:31:05 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 11:14:01 -0700
commitdf016066100df955d5ff98811e113fb2b1bd4b8a (patch)
treea27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/Iis/ca
parentdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff)
downloadwix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip
Implement integrated build process
Diffstat (limited to 'src/ext/Iis/ca')
-rw-r--r--src/ext/Iis/ca/iisca.vcxproj34
-rw-r--r--src/ext/Iis/ca/packages.config5
-rw-r--r--src/ext/Iis/ca/precomp.h2
-rw-r--r--src/ext/Iis/ca/scacert.cpp6
4 files changed, 24 insertions, 23 deletions
diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj
index eb1174be..d99ef4ab 100644
--- a/src/ext/Iis/ca/iisca.vcxproj
+++ b/src/ext/Iis/ca/iisca.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.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" />
5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
6 6
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
@@ -40,14 +40,14 @@
40 <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile> 40 <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile>
41 <Description>WiX Toolset Iis CustomAction</Description> 41 <Description>WiX Toolset Iis CustomAction</Description>
42 </PropertyGroup> 42 </PropertyGroup>
43 43
44 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 44 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 46
47 <PropertyGroup> 47 <PropertyGroup>
48 <ProjectAdditionalLinkLibraries>crypt32.lib;msi.lib;Ws2_32.lib</ProjectAdditionalLinkLibraries> 48 <ProjectAdditionalLinkLibraries>crypt32.lib;msi.lib;Ws2_32.lib</ProjectAdditionalLinkLibraries>
49 </PropertyGroup> 49 </PropertyGroup>
50 50
51 <ItemGroup> 51 <ItemGroup>
52 <ClCompile Include="dllmain.cpp"> 52 <ClCompile Include="dllmain.cpp">
53 <PrecompiledHeader>Create</PrecompiledHeader> 53 <PrecompiledHeader>Create</PrecompiledHeader>
@@ -91,6 +91,9 @@
91 <ClCompile Include="scawebprop7.cpp" /> 91 <ClCompile Include="scawebprop7.cpp" />
92 <ClCompile Include="scawebsvcext.cpp" /> 92 <ClCompile Include="scawebsvcext.cpp" />
93 <ClCompile Include="scawebsvcext7.cpp" /> 93 <ClCompile Include="scawebsvcext7.cpp" />
94 </ItemGroup>
95
96 <ItemGroup>
94 <ClInclude Include="caSuffix.h" /> 97 <ClInclude Include="caSuffix.h" />
95 <ClInclude Include="CustomMsiErrors.h" /> 98 <ClInclude Include="CustomMsiErrors.h" />
96 <ClInclude Include="precomp.h" /> 99 <ClInclude Include="precomp.h" />
@@ -131,17 +134,18 @@
131 <ClInclude Include="scawebprop7.h" /> 134 <ClInclude Include="scawebprop7.h" />
132 <ClInclude Include="scawebsvcext.h" /> 135 <ClInclude Include="scawebsvcext.h" />
133 <ClInclude Include="scawebsvcext7.h" /> 136 <ClInclude Include="scawebsvcext7.h" />
134 <None Include="packages.config" /> 137 </ItemGroup>
138
139 <ItemGroup>
135 <None Include="iisca.def" /> 140 <None Include="iisca.def" />
136 </ItemGroup> 141 </ItemGroup>
137 142
143 <ItemGroup>
144 <PackageReference Include="WixToolset.Dutil" />
145 <PackageReference Include="WixToolset.WcaUtil" />
146 <PackageReference Include="Microsoft.SourceLink.GitHub" />
147 <PackageReference Include="GitInfo" />
148 </ItemGroup>
149
138 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 150 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
139 151</Project>
140 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
141 <PropertyGroup>
142 <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>
143 </PropertyGroup>
144 <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'))" />
145 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
146 </Target>
147</Project> \ No newline at end of file
diff --git a/src/ext/Iis/ca/packages.config b/src/ext/Iis/ca/packages.config
deleted file mode 100644
index e3dc0e43..00000000
--- a/src/ext/Iis/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
5</packages> \ No newline at end of file
diff --git a/src/ext/Iis/ca/precomp.h b/src/ext/Iis/ca/precomp.h
index 85ee0890..106ab884 100644
--- a/src/ext/Iis/ca/precomp.h
+++ b/src/ext/Iis/ca/precomp.h
@@ -17,8 +17,6 @@
17#include <ComAdmin.h> 17#include <ComAdmin.h>
18#include <ahadmin.h> // IIS 7 config 18#include <ahadmin.h> // IIS 7 config
19 19
20#define MAXUINT USHRT_MAX
21
22#include "wcautil.h" 20#include "wcautil.h"
23#include "wcawow64.h" 21#include "wcawow64.h"
24#include "wcawrapquery.h" 22#include "wcawrapquery.h"
diff --git a/src/ext/Iis/ca/scacert.cpp b/src/ext/Iis/ca/scacert.cpp
index 5eae905a..0bb87f9f 100644
--- a/src/ext/Iis/ca/scacert.cpp
+++ b/src/ext/Iis/ca/scacert.cpp
@@ -552,8 +552,12 @@ static HRESULT ReadCertificateFile(
552 // If we have a PFX blob, get the first certificate out of the PFX and use that instead of the PFX. 552 // If we have a PFX blob, get the first certificate out of the PFX and use that instead of the PFX.
553 if (dwContentType & CERT_QUERY_CONTENT_PFX) 553 if (dwContentType & CERT_QUERY_CONTENT_PFX)
554 { 554 {
555 hr = FileRead(&pbData, &cbData, wzPath); 555 SIZE_T size = 0;
556
557 hr = FileRead(&pbData, &size, wzPath);
556 ExitOnFailure(hr, "Failed to read PFX file: %ls", wzPath); 558 ExitOnFailure(hr, "Failed to read PFX file: %ls", wzPath);
559
560 cbData = (DWORD)size;
557 } 561 }
558 else 562 else
559 { 563 {
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 11:04:21 +0000