aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Util/ca
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Util/ca')
-rw-r--r--src/ext/Util/ca/OsInfo.cpp1
-rw-r--r--src/ext/Util/ca/caDecor.h13
-rw-r--r--src/ext/Util/ca/precomp.h2
-rw-r--r--src/ext/Util/ca/utilca.vcxproj1
4 files changed, 2 insertions, 15 deletions
diff --git a/src/ext/Util/ca/OsInfo.cpp b/src/ext/Util/ca/OsInfo.cpp
index 005407af..593e3b0c 100644
--- a/src/ext/Util/ca/OsInfo.cpp
+++ b/src/ext/Util/ca/OsInfo.cpp
@@ -330,6 +330,7 @@ LExit:
330 { 330 {
331 ::LocalFree(psid); 331 ::LocalFree(psid);
332 } 332 }
333
333 ReleaseStr(pwzPropertyValue); 334 ReleaseStr(pwzPropertyValue);
334 return hr; 335 return hr;
335} 336}
diff --git a/src/ext/Util/ca/caDecor.h b/src/ext/Util/ca/caDecor.h
deleted file mode 100644
index da274650..00000000
--- a/src/ext/Util/ca/caDecor.h
+++ /dev/null
@@ -1,13 +0,0 @@
1#pragma once
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
4
5#if defined(_M_ARM64)
6#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"
7#elif defined(_M_AMD64)
8#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"
9#elif defined(_M_ARM)
10#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"
11#else
12#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"
13#endif
diff --git a/src/ext/Util/ca/precomp.h b/src/ext/Util/ca/precomp.h
index 98e61e1a..efde32a6 100644
--- a/src/ext/Util/ca/precomp.h
+++ b/src/ext/Util/ca/precomp.h
@@ -51,4 +51,4 @@
51#include "scasmb.h" 51#include "scasmb.h"
52#include "scasmbexec.h" 52#include "scasmbexec.h"
53 53
54#include "caDecor.h" 54#include "..\..\caDecor.h"
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj
index 8fe26942..758f075c 100644
--- a/src/ext/Util/ca/utilca.vcxproj
+++ b/src/ext/Util/ca/utilca.vcxproj
@@ -79,7 +79,6 @@
79 </ItemGroup> 79 </ItemGroup>
80 80
81 <ItemGroup> 81 <ItemGroup>
82 <ClInclude Include="caDecor.h" />
83 <ClInclude Include="cost.h" /> 82 <ClInclude Include="cost.h" />
84 <ClInclude Include="CustomMsiErrors.h" /> 83 <ClInclude Include="CustomMsiErrors.h" />
85 <ClInclude Include="precomp.h" /> 84 <ClInclude Include="precomp.h" />