aboutsummaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-08-25 15:08:34 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-08-26 10:03:37 -0500
commit4f5de06073ad664f60ac775da5de8c0fa1de4923 (patch)
tree62e6d71d1e0039bdabecd785d07f9f10d023771e /src/libs
parenta37208d9a26ec7886870cc17f0726676a285bf7f (diff)
downloadwix-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/libs')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/wiutil.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/wiutil.cpp b/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
index 5f81cf3a..4ed0e2c5 100644
--- a/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
@@ -1034,6 +1034,14 @@ static DWORD CheckForRestartErrorCode(
1034 *pRestart = WIU_RESTART_INITIATED; 1034 *pRestart = WIU_RESTART_INITIATED;
1035 dwErrorCode = ERROR_SUCCESS; 1035 dwErrorCode = ERROR_SUCCESS;
1036 break; 1036 break;
1037
1038 case ERROR_FAIL_REBOOT_REQUIRED:
1039 *pRestart = WIU_RESTART_REQUIRED;
1040 break;
1041
1042 case ERROR_FAIL_REBOOT_INITIATED:
1043 *pRestart = WIU_RESTART_INITIATED;
1044 break;
1037 } 1045 }
1038 1046
1039 return dwErrorCode; 1047 return dwErrorCode;