diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-10 21:25:44 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-07-10 22:10:26 +1000 |
| commit | f866ab77f8fd0790f4d6628f54dcdf0bd66fccb6 (patch) | |
| tree | b3705d3655e678003d4fce590e7c5cb1c836778e /src/be/detectsha2support.cpp | |
| parent | af43f098d7d7cc0fe21c7d7b0fe991763e9cae07 (diff) | |
| download | wix-f866ab77f8fd0790f4d6628f54dcdf0bd66fccb6.tar.gz wix-f866ab77f8fd0790f4d6628f54dcdf0bd66fccb6.tar.bz2 wix-f866ab77f8fd0790f4d6628f54dcdf0bd66fccb6.zip | |
Change the DetectSHA2Support element to WindowsFeatureSearch. This will make it easier to add support for other Windows features in the future.
Diffstat (limited to 'src/be/detectsha2support.cpp')
| -rw-r--r-- | src/be/detectsha2support.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/be/detectsha2support.cpp b/src/be/detectsha2support.cpp index f1f3637e..90e349cd 100644 --- a/src/be/detectsha2support.cpp +++ b/src/be/detectsha2support.cpp | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include "precomp.h" | 3 | #include "precomp.h" |
| 4 | 4 | ||
| 5 | // https://gist.github.com/navossoc/7572c7d82243e9f818989e2765e7793a | 5 | // https://gist.github.com/navossoc/7572c7d82243e9f818989e2765e7793a |
| 6 | HRESULT DetectSHA2Support( | 6 | HRESULT DetectSHA2CodeSigning( |
| 7 | __out BOOL* pfSupported | 7 | __out BOOL* pfSupported |
| 8 | ) | 8 | ) |
| 9 | { | 9 | { |
| @@ -38,7 +38,7 @@ LExit: | |||
| 38 | return hr; | 38 | return hr; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | HRESULT UtilPerformDetectSHA2Support( | 41 | HRESULT UtilPerformDetectSHA2CodeSigning( |
| 42 | __in LPCWSTR wzVariable, | 42 | __in LPCWSTR wzVariable, |
| 43 | __in UTIL_SEARCH* /*pSearch*/, | 43 | __in UTIL_SEARCH* /*pSearch*/, |
| 44 | __in IBundleExtensionEngine* pEngine | 44 | __in IBundleExtensionEngine* pEngine |
| @@ -47,8 +47,8 @@ HRESULT UtilPerformDetectSHA2Support( | |||
| 47 | HRESULT hr = S_OK; | 47 | HRESULT hr = S_OK; |
| 48 | BOOL fSupported = FALSE; | 48 | BOOL fSupported = FALSE; |
| 49 | 49 | ||
| 50 | hr = DetectSHA2Support(&fSupported); | 50 | hr = DetectSHA2CodeSigning(&fSupported); |
| 51 | ExitOnFailure(hr, "DetectSHA2Support failed."); | 51 | ExitOnFailure(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 | ExitOnFailure(hr, "Failed to set variable '%ls'", wzVariable); |
