diff options
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/inc/butil.h')
-rw-r--r-- | src/libs/dutil/WixToolset.DUtil/inc/butil.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/butil.h b/src/libs/dutil/WixToolset.DUtil/inc/butil.h index 5d390344..567d59d9 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/butil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/butil.h | |||
@@ -31,7 +31,7 @@ typedef enum _BUNDLE_RELATION_TYPE | |||
31 | 31 | ||
32 | typedef struct _BUNDLE_QUERY_RELATED_BUNDLE_RESULT | 32 | typedef struct _BUNDLE_QUERY_RELATED_BUNDLE_RESULT |
33 | { | 33 | { |
34 | LPCWSTR wzBundleId; | 34 | LPCWSTR wzBundleCode; |
35 | BUNDLE_INSTALL_CONTEXT installContext; | 35 | BUNDLE_INSTALL_CONTEXT installContext; |
36 | REG_KEY_BITNESS regBitness; | 36 | REG_KEY_BITNESS regBitness; |
37 | HKEY hkBundle; | 37 | HKEY hkBundle; |
@@ -61,7 +61,7 @@ RETURNS: | |||
61 | All other returns are unexpected returns from other dutil methods. | 61 | All other returns are unexpected returns from other dutil methods. |
62 | ********************************************************************/ | 62 | ********************************************************************/ |
63 | HRESULT DAPI BundleGetBundleInfo( | 63 | HRESULT DAPI BundleGetBundleInfo( |
64 | __in_z LPCWSTR wzBundleId, | 64 | __in_z LPCWSTR wzBundleCode, |
65 | __in_z LPCWSTR wzAttribute, | 65 | __in_z LPCWSTR wzAttribute, |
66 | __deref_out_z LPWSTR* psczValue | 66 | __deref_out_z LPWSTR* psczValue |
67 | ); | 67 | ); |
@@ -84,7 +84,7 @@ RETURNS: | |||
84 | All other returns are unexpected returns from other dutil methods. | 84 | All other returns are unexpected returns from other dutil methods. |
85 | ********************************************************************/ | 85 | ********************************************************************/ |
86 | HRESULT DAPI BundleGetBundleInfoFixed( | 86 | HRESULT DAPI BundleGetBundleInfoFixed( |
87 | __in_z LPCWSTR wzBundleId, | 87 | __in_z LPCWSTR wzBundleCode, |
88 | __in_z LPCWSTR wzAttribute, | 88 | __in_z LPCWSTR wzAttribute, |
89 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, | 89 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, |
90 | __inout SIZE_T* pcchValue | 90 | __inout SIZE_T* pcchValue |
@@ -109,15 +109,16 @@ HRESULT DAPI BundleEnumRelatedBundle( | |||
109 | __in BUNDLE_INSTALL_CONTEXT context, | 109 | __in BUNDLE_INSTALL_CONTEXT context, |
110 | __in REG_KEY_BITNESS kbKeyBitness, | 110 | __in REG_KEY_BITNESS kbKeyBitness, |
111 | __inout PDWORD pdwStartIndex, | 111 | __inout PDWORD pdwStartIndex, |
112 | __deref_out_z LPWSTR* psczBundleId | 112 | __deref_out_z LPWSTR* psczBundleCode |
113 | ); | 113 | ); |
114 | 114 | ||
115 | /******************************************************************** | 115 | /******************************************************************** |
116 | BundleEnumRelatedBundleFixed - Queries the bundle installation metadata for installs with the given upgrade code | 116 | BundleEnumRelatedBundleFixed - Queries the bundle installation metadata for installs with the given upgrade code |
117 | Enumerate 32-bit and 64-bit in two passes. | 117 | Enumerate 32-bit and 64-bit in two passes. |
118 | 118 | ||
119 | NOTE: lpBundleIdBuff is a buffer to receive the bundle GUID. This buffer must be 39 characters long. | 119 | NOTE: wzBundleCode is a buffer to receive the bundle GUID. This buffer must be 39 characters long. |
120 | The first 38 characters are for the GUID, and the last character is for the terminating null character. | 120 | The first 38 characters are for the GUID, and the last character is for the terminating null character. |
121 | |||
121 | RETURNS: | 122 | RETURNS: |
122 | E_INVALIDARG | 123 | E_INVALIDARG |
123 | An invalid parameter was passed to the function. | 124 | An invalid parameter was passed to the function. |
@@ -133,7 +134,7 @@ HRESULT DAPI BundleEnumRelatedBundleFixed( | |||
133 | __in BUNDLE_INSTALL_CONTEXT context, | 134 | __in BUNDLE_INSTALL_CONTEXT context, |
134 | __in REG_KEY_BITNESS kbKeyBitness, | 135 | __in REG_KEY_BITNESS kbKeyBitness, |
135 | __inout PDWORD pdwStartIndex, | 136 | __inout PDWORD pdwStartIndex, |
136 | __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleId | 137 | __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleCode |
137 | ); | 138 | ); |
138 | 139 | ||
139 | /******************************************************************** | 140 | /******************************************************************** |
@@ -155,7 +156,7 @@ RETURNS: | |||
155 | All other returns are unexpected returns from other dutil methods. | 156 | All other returns are unexpected returns from other dutil methods. |
156 | ********************************************************************/ | 157 | ********************************************************************/ |
157 | HRESULT DAPI BundleGetBundleVariable( | 158 | HRESULT DAPI BundleGetBundleVariable( |
158 | __in_z LPCWSTR wzBundleId, | 159 | __in_z LPCWSTR wzBundleCode, |
159 | __in_z LPCWSTR wzVariable, | 160 | __in_z LPCWSTR wzVariable, |
160 | __deref_out_z LPWSTR* psczValue | 161 | __deref_out_z LPWSTR* psczValue |
161 | ); | 162 | ); |
@@ -180,7 +181,7 @@ RETURNS: | |||
180 | All other returns are unexpected returns from other dutil methods. | 181 | All other returns are unexpected returns from other dutil methods. |
181 | ********************************************************************/ | 182 | ********************************************************************/ |
182 | HRESULT DAPI BundleGetBundleVariableFixed( | 183 | HRESULT DAPI BundleGetBundleVariableFixed( |
183 | __in_z LPCWSTR wzBundleId, | 184 | __in_z LPCWSTR wzBundleCode, |
184 | __in_z LPCWSTR wzVariable, | 185 | __in_z LPCWSTR wzVariable, |
185 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, | 186 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, |
186 | __inout SIZE_T* pcchValue | 187 | __inout SIZE_T* pcchValue |