diff options
Diffstat (limited to 'src/api/burn')
6 files changed, 10 insertions, 16 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h index cdb01330..941e4241 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h | |||
@@ -381,8 +381,7 @@ typedef struct _BAENGINE_SETUPDATE_ARGS | |||
381 | LPCWSTR wzDownloadSource; | 381 | LPCWSTR wzDownloadSource; |
382 | DWORD64 qwSize; | 382 | DWORD64 qwSize; |
383 | BOOTSTRAPPER_UPDATE_HASH_TYPE hashType; | 383 | BOOTSTRAPPER_UPDATE_HASH_TYPE hashType; |
384 | BYTE* rgbHash; | 384 | LPCWSTR wzHash; |
385 | DWORD cbHash; | ||
386 | } BAENGINE_SETUPDATE_ARGS; | 385 | } BAENGINE_SETUPDATE_ARGS; |
387 | 386 | ||
388 | typedef struct _BAENGINE_SETUPDATE_RESULTS | 387 | typedef struct _BAENGINE_SETUPDATE_RESULTS |
diff --git a/src/api/burn/WixToolset.Mba.Core/Engine.cs b/src/api/burn/WixToolset.Mba.Core/Engine.cs index 5ebada36..e7ab533b 100644 --- a/src/api/burn/WixToolset.Mba.Core/Engine.cs +++ b/src/api/burn/WixToolset.Mba.Core/Engine.cs | |||
@@ -240,9 +240,9 @@ namespace WixToolset.Mba.Core | |||
240 | } | 240 | } |
241 | 241 | ||
242 | /// <inheritdoc/> | 242 | /// <inheritdoc/> |
243 | public void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, byte[] hash) | 243 | public void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, string hash) |
244 | { | 244 | { |
245 | this.engine.SetUpdate(localSource, downloadSource, size, hashType, hash, null == hash ? 0 : hash.Length); | 245 | this.engine.SetUpdate(localSource, downloadSource, size, hashType, hash); |
246 | } | 246 | } |
247 | 247 | ||
248 | /// <inheritdoc/> | 248 | /// <inheritdoc/> |
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs index fdc9c3f6..408c9955 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | |||
@@ -123,21 +123,19 @@ namespace WixToolset.Mba.Core | |||
123 | ); | 123 | ); |
124 | 124 | ||
125 | /// <summary> | 125 | /// <summary> |
126 | /// See <see cref="IEngine.SetUpdate(string, string, long, UpdateHashType, byte[])"/>. | 126 | /// See <see cref="IEngine.SetUpdate(string, string, long, UpdateHashType, string)"/>. |
127 | /// </summary> | 127 | /// </summary> |
128 | /// <param name="wzLocalSource"></param> | 128 | /// <param name="wzLocalSource"></param> |
129 | /// <param name="wzDownloadSource"></param> | 129 | /// <param name="wzDownloadSource"></param> |
130 | /// <param name="qwValue"></param> | 130 | /// <param name="qwValue"></param> |
131 | /// <param name="hashType"></param> | 131 | /// <param name="hashType"></param> |
132 | /// <param name="rgbHash"></param> | 132 | /// <param name="wzHash"></param> |
133 | /// <param name="cbHash"></param> | ||
134 | void SetUpdate( | 133 | void SetUpdate( |
135 | [MarshalAs(UnmanagedType.LPWStr)] string wzLocalSource, | 134 | [MarshalAs(UnmanagedType.LPWStr)] string wzLocalSource, |
136 | [MarshalAs(UnmanagedType.LPWStr)] string wzDownloadSource, | 135 | [MarshalAs(UnmanagedType.LPWStr)] string wzDownloadSource, |
137 | [MarshalAs(UnmanagedType.U8)] long qwValue, | 136 | [MarshalAs(UnmanagedType.U8)] long qwValue, |
138 | [MarshalAs(UnmanagedType.U4)] UpdateHashType hashType, | 137 | [MarshalAs(UnmanagedType.U4)] UpdateHashType hashType, |
139 | [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=4)] byte[] rgbHash, | 138 | [MarshalAs(UnmanagedType.LPWStr)] string wzHash |
140 | [MarshalAs(UnmanagedType.U4)] int cbHash | ||
141 | ); | 139 | ); |
142 | 140 | ||
143 | /// <summary> | 141 | /// <summary> |
diff --git a/src/api/burn/WixToolset.Mba.Core/IEngine.cs b/src/api/burn/WixToolset.Mba.Core/IEngine.cs index 3e636961..2b9a90e0 100644 --- a/src/api/burn/WixToolset.Mba.Core/IEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IEngine.cs | |||
@@ -142,7 +142,7 @@ namespace WixToolset.Mba.Core | |||
142 | /// <param name="size">Size of the expected update.</param> | 142 | /// <param name="size">Size of the expected update.</param> |
143 | /// <param name="hashType">Type of the hash expected on the update.</param> | 143 | /// <param name="hashType">Type of the hash expected on the update.</param> |
144 | /// <param name="hash">Optional hash expected for the update.</param> | 144 | /// <param name="hash">Optional hash expected for the update.</param> |
145 | void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, byte[] hash); | 145 | void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, string hash); |
146 | 146 | ||
147 | /// <summary> | 147 | /// <summary> |
148 | /// Sets the URL to the update feed. | 148 | /// Sets the URL to the update feed. |
diff --git a/src/api/burn/balutil/BalBootstrapperEngine.cpp b/src/api/burn/balutil/BalBootstrapperEngine.cpp index 301b88a5..898a8a15 100644 --- a/src/api/burn/balutil/BalBootstrapperEngine.cpp +++ b/src/api/burn/balutil/BalBootstrapperEngine.cpp | |||
@@ -312,8 +312,7 @@ public: // IBootstrapperEngine | |||
312 | __in_z_opt LPCWSTR wzDownloadSource, | 312 | __in_z_opt LPCWSTR wzDownloadSource, |
313 | __in DWORD64 qwSize, | 313 | __in DWORD64 qwSize, |
314 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType, | 314 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType, |
315 | __in_bcount_opt(cbHash) BYTE* rgbHash, | 315 | __in_z_opt LPCWSTR wzHash |
316 | __in DWORD cbHash | ||
317 | ) | 316 | ) |
318 | { | 317 | { |
319 | BAENGINE_SETUPDATE_ARGS args = { }; | 318 | BAENGINE_SETUPDATE_ARGS args = { }; |
@@ -324,8 +323,7 @@ public: // IBootstrapperEngine | |||
324 | args.wzDownloadSource = wzDownloadSource; | 323 | args.wzDownloadSource = wzDownloadSource; |
325 | args.qwSize = qwSize; | 324 | args.qwSize = qwSize; |
326 | args.hashType = hashType; | 325 | args.hashType = hashType; |
327 | args.rgbHash = rgbHash; | 326 | args.wzHash = wzHash; |
328 | args.cbHash = cbHash; | ||
329 | 327 | ||
330 | results.cbSize = sizeof(results); | 328 | results.cbSize = sizeof(results); |
331 | 329 | ||
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h index ccb07f4f..2a108223 100644 --- a/src/api/burn/balutil/inc/IBootstrapperEngine.h +++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h | |||
@@ -65,8 +65,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8 | |||
65 | __in_z_opt LPCWSTR wzDownloadSource, | 65 | __in_z_opt LPCWSTR wzDownloadSource, |
66 | __in DWORD64 qwSize, | 66 | __in DWORD64 qwSize, |
67 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType, | 67 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType, |
68 | __in_bcount_opt(cbHash) BYTE* rgbHash, | 68 | __in_z_opt LPCWSTR wzHash |
69 | __in DWORD cbHash | ||
70 | ) = 0; | 69 | ) = 0; |
71 | 70 | ||
72 | STDMETHOD(SetLocalSource)( | 71 | STDMETHOD(SetLocalSource)( |