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/utilsearch.h | |
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/utilsearch.h')
-rw-r--r-- | src/be/utilsearch.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/be/utilsearch.h b/src/be/utilsearch.h index 1e0ca96d..deeab1f7 100644 --- a/src/be/utilsearch.h +++ b/src/be/utilsearch.h | |||
@@ -7,7 +7,13 @@ | |||
7 | enum UTIL_SEARCH_TYPE | 7 | enum UTIL_SEARCH_TYPE |
8 | { | 8 | { |
9 | UTIL_SEARCH_TYPE_NONE, | 9 | UTIL_SEARCH_TYPE_NONE, |
10 | UTIL_SEARCH_TYPE_DETECT_SHA2_SUPPORT, | 10 | UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH, |
11 | }; | ||
12 | |||
13 | enum UTIL_WINDOWS_FEATURE_SEARCH_TYPE | ||
14 | { | ||
15 | UTIL_WINDOWS_FEATURE_SEARCH_TYPE_NONE, | ||
16 | UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING, | ||
11 | }; | 17 | }; |
12 | 18 | ||
13 | 19 | ||
@@ -18,6 +24,13 @@ typedef struct _UTIL_SEARCH | |||
18 | LPWSTR sczId; | 24 | LPWSTR sczId; |
19 | 25 | ||
20 | UTIL_SEARCH_TYPE Type; | 26 | UTIL_SEARCH_TYPE Type; |
27 | union | ||
28 | { | ||
29 | struct | ||
30 | { | ||
31 | UTIL_WINDOWS_FEATURE_SEARCH_TYPE type; | ||
32 | } WindowsFeatureSearch; | ||
33 | }; | ||
21 | } UTIL_SEARCH; | 34 | } UTIL_SEARCH; |
22 | 35 | ||
23 | typedef struct _UTIL_SEARCHES | 36 | typedef struct _UTIL_SEARCHES |