diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-08-25 15:08:34 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-08-26 10:03:37 -0500 |
| commit | 4f5de06073ad664f60ac775da5de8c0fa1de4923 (patch) | |
| tree | 62e6d71d1e0039bdabecd785d07f9f10d023771e /src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | |
| parent | a37208d9a26ec7886870cc17f0726676a285bf7f (diff) | |
| download | wix-4f5de06073ad664f60ac775da5de8c0fa1de4923.tar.gz wix-4f5de06073ad664f60ac775da5de8c0fa1de4923.tar.bz2 wix-4f5de06073ad664f60ac775da5de8c0fa1de4923.zip | |
Process and return the failed version of reboot exit codes in Burn.
(ERROR_FAIL_REBOOT_REQUIRED and ERROR_FAIL_REBOOT_INITIATED)
Fixes 6762
Diffstat (limited to 'src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp')
| -rw-r--r-- | src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index d57d78a6..8c4b0b35 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | |||
| @@ -2684,11 +2684,11 @@ private: | |||
| 2684 | 2684 | ||
| 2685 | if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == pThis->m_restartResult) | 2685 | if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == pThis->m_restartResult) |
| 2686 | { | 2686 | { |
| 2687 | dwQuit = ERROR_SUCCESS_REBOOT_INITIATED; | 2687 | dwQuit = SUCCEEDED(hr) ? ERROR_SUCCESS_REBOOT_INITIATED : ERROR_FAIL_REBOOT_INITIATED; |
| 2688 | } | 2688 | } |
| 2689 | else if (BOOTSTRAPPER_APPLY_RESTART_REQUIRED == pThis->m_restartResult) | 2689 | else if (BOOTSTRAPPER_APPLY_RESTART_REQUIRED == pThis->m_restartResult) |
| 2690 | { | 2690 | { |
| 2691 | dwQuit = ERROR_SUCCESS_REBOOT_REQUIRED; | 2691 | dwQuit = SUCCEEDED(hr) ? ERROR_SUCCESS_REBOOT_REQUIRED : ERROR_FAIL_REBOOT_REQUIRED; |
| 2692 | } | 2692 | } |
| 2693 | else if (SEVERITY_ERROR == HRESULT_SEVERITY(hr) && FACILITY_WIN32 == HRESULT_FACILITY(hr)) | 2693 | else if (SEVERITY_ERROR == HRESULT_SEVERITY(hr) && FACILITY_WIN32 == HRESULT_FACILITY(hr)) |
| 2694 | { | 2694 | { |