summaryrefslogtreecommitdiff
path: root/src/ext/Util/be/detectsha2support.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-10-06 16:37:14 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-10-10 11:40:02 -0500
commit21a0685ef69e9d634600622b19ea970c6f58ef03 (patch)
tree5d37e316803f06d97d4aefd3df8ab45f3f7e7257 /src/ext/Util/be/detectsha2support.cpp
parent3c11c1389f67824fb1f368cedacbaf566645e56f (diff)
downloadwix-21a0685ef69e9d634600622b19ea970c6f58ef03.tar.gz
wix-21a0685ef69e9d634600622b19ea970c6f58ef03.tar.bz2
wix-21a0685ef69e9d634600622b19ea970c6f58ef03.zip
Add Netfx bundle extension and netfx:DotNetCoreSearch.
Remove built-in .NET Core packages since they update too quickly. Fixes 6257
Diffstat (limited to 'src/ext/Util/be/detectsha2support.cpp')
-rw-r--r--src/ext/Util/be/detectsha2support.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/Util/be/detectsha2support.cpp b/src/ext/Util/be/detectsha2support.cpp
index 90e349cd..4abfc63c 100644
--- a/src/ext/Util/be/detectsha2support.cpp
+++ b/src/ext/Util/be/detectsha2support.cpp
@@ -13,7 +13,7 @@ HRESULT DetectSHA2CodeSigning(
13 DWORD er = ERROR_SUCCESS; 13 DWORD er = ERROR_SUCCESS;
14 14
15 hr = LoadSystemLibrary(L"wintrust.dll", &hModule); 15 hr = LoadSystemLibrary(L"wintrust.dll", &hModule);
16 ExitOnFailure(hr, "Failed to load wintrust.dll"); 16 BextExitOnFailure(hr, "Failed to load wintrust.dll");
17 17
18 pfn = ::GetProcAddress(hModule, "CryptCATAdminAcquireContext2"); 18 pfn = ::GetProcAddress(hModule, "CryptCATAdminAcquireContext2");
19 if (pfn) 19 if (pfn)
@@ -30,7 +30,7 @@ HRESULT DetectSHA2CodeSigning(
30 } 30 }
31 31
32 hr = HRESULT_FROM_WIN32(er); 32 hr = HRESULT_FROM_WIN32(er);
33 ExitOnFailure(hr, "Failed to probe for CryptCATAdminAcquireContext2 in wintrust.dll"); 33 BextExitOnFailure(hr, "Failed to probe for CryptCATAdminAcquireContext2 in wintrust.dll");
34 34
35LExit: 35LExit:
36 ::FreeLibrary(hModule); 36 ::FreeLibrary(hModule);
@@ -48,10 +48,10 @@ HRESULT UtilPerformDetectSHA2CodeSigning(
48 BOOL fSupported = FALSE; 48 BOOL fSupported = FALSE;
49 49
50 hr = DetectSHA2CodeSigning(&fSupported); 50 hr = DetectSHA2CodeSigning(&fSupported);
51 ExitOnFailure(hr, "DetectSHA2CodeSigning failed."); 51 BextExitOnFailure(hr, "DetectSHA2CodeSigning failed.");
52 52
53 hr = pEngine->SetVariableNumeric(wzVariable, fSupported ? 1 : 0); 53 hr = pEngine->SetVariableNumeric(wzVariable, fSupported ? 1 : 0);
54 ExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable); 54 BextExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable);
55 55
56LExit: 56LExit:
57 return hr; 57 return hr;