diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-15 10:48:06 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-30 15:00:45 -0600 |
commit | 9e2cda60e3852660f235beb5e0af1c746d0045e6 (patch) | |
tree | 8fca357e80bf638750fe900c4803a081e16adee8 /src/burn/engine/netfxchainer.cpp | |
parent | 07599b27596af68f0917c1afc6a748af3a3cda2f (diff) | |
download | wix-9e2cda60e3852660f235beb5e0af1c746d0045e6.tar.gz wix-9e2cda60e3852660f235beb5e0af1c746d0045e6.tar.bz2 wix-9e2cda60e3852660f235beb5e0af1c746d0045e6.zip |
FilesInUse messages are too different to unify in the Burn engine.
Fixes #6348
Diffstat (limited to 'src/burn/engine/netfxchainer.cpp')
-rw-r--r-- | src/burn/engine/netfxchainer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/burn/engine/netfxchainer.cpp b/src/burn/engine/netfxchainer.cpp index 4e7a7720..af4f03f5 100644 --- a/src/burn/engine/netfxchainer.cpp +++ b/src/burn/engine/netfxchainer.cpp | |||
@@ -233,8 +233,8 @@ static HRESULT OnNetFxFilesInUse( | |||
233 | } | 233 | } |
234 | 234 | ||
235 | // send message | 235 | // send message |
236 | message.type = GENERIC_EXECUTE_MESSAGE_FILES_IN_USE; | 236 | message.type = GENERIC_EXECUTE_MESSAGE_NETFX_FILES_IN_USE; |
237 | message.dwAllowedResults = MB_ABORTRETRYIGNORE; | 237 | message.dwUIHint = MB_ABORTRETRYIGNORE; |
238 | message.filesInUse.cFiles = cFiles; | 238 | message.filesInUse.cFiles = cFiles; |
239 | message.filesInUse.rgwzFiles = (LPCWSTR*)rgwzFiles; | 239 | message.filesInUse.rgwzFiles = (LPCWSTR*)rgwzFiles; |
240 | dwResponse = (DWORD)pfnMessageHandler(&message, pvContext); | 240 | dwResponse = (DWORD)pfnMessageHandler(&message, pvContext); |
@@ -259,7 +259,7 @@ static HRESULT OnNetFxProgress( | |||
259 | 259 | ||
260 | // send message | 260 | // send message |
261 | message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS; | 261 | message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS; |
262 | message.dwAllowedResults = MB_OKCANCEL; | 262 | message.dwUIHint = MB_OKCANCEL; |
263 | message.progress.dwPercentage = 100 * (DWORD)bProgress / BYTE_MAX; | 263 | message.progress.dwPercentage = 100 * (DWORD)bProgress / BYTE_MAX; |
264 | dwResponse = (DWORD)pfnMessageHandler(&message, pvContext); | 264 | dwResponse = (DWORD)pfnMessageHandler(&message, pvContext); |
265 | 265 | ||
@@ -283,7 +283,7 @@ static HRESULT OnNetFxError( | |||
283 | 283 | ||
284 | // send message | 284 | // send message |
285 | message.type = GENERIC_EXECUTE_MESSAGE_ERROR; | 285 | message.type = GENERIC_EXECUTE_MESSAGE_ERROR; |
286 | message.dwAllowedResults = MB_OK; | 286 | message.dwUIHint = MB_OK; |
287 | message.error.dwErrorCode = hrError; | 287 | message.error.dwErrorCode = hrError; |
288 | message.error.wzMessage = NULL; | 288 | message.error.wzMessage = NULL; |
289 | dwResponse = (DWORD)pfnMessageHandler(&message, pvContext); | 289 | dwResponse = (DWORD)pfnMessageHandler(&message, pvContext); |