diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-15 13:19:28 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-30 15:00:45 -0600 |
commit | c7bd5d0b0f676e09d036432ee1afb9bf5dcc4fb5 (patch) | |
tree | 2b04a7b2baf24c3ea55a082d2f3a6e25d7375b6e /src/burn/engine/userexperience.cpp | |
parent | 9e2cda60e3852660f235beb5e0af1c746d0045e6 (diff) | |
download | wix-c7bd5d0b0f676e09d036432ee1afb9bf5dcc4fb5.tar.gz wix-c7bd5d0b0f676e09d036432ee1afb9bf5dcc4fb5.tar.bz2 wix-c7bd5d0b0f676e09d036432ee1afb9bf5dcc4fb5.zip |
Always pass through the return value for FilesInUse messages.
Diffstat (limited to 'src/burn/engine/userexperience.cpp')
-rw-r--r-- | src/burn/engine/userexperience.cpp | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/src/burn/engine/userexperience.cpp b/src/burn/engine/userexperience.cpp index 7cc6f049..ee22a318 100644 --- a/src/burn/engine/userexperience.cpp +++ b/src/burn/engine/userexperience.cpp | |||
@@ -2607,54 +2607,6 @@ static int FilterResult( | |||
2607 | } | 2607 | } |
2608 | break; | 2608 | break; |
2609 | 2609 | ||
2610 | case BURN_MB_MSI_FILES_IN_USE: | ||
2611 | // https://docs.microsoft.com/en-us/windows/win32/msi/installvalidate-action | ||
2612 | if (IDRETRY == nResult || IDTRYAGAIN == nResult) | ||
2613 | { | ||
2614 | nResult = IDRETRY; | ||
2615 | } | ||
2616 | else if (IDCANCEL == nResult || IDABORT == nResult) | ||
2617 | { | ||
2618 | nResult = IDCANCEL; | ||
2619 | } | ||
2620 | else if (IDCONTINUE == nResult || IDIGNORE == nResult) | ||
2621 | { | ||
2622 | nResult = IDIGNORE; | ||
2623 | } | ||
2624 | else | ||
2625 | { | ||
2626 | nResult = IDNOACTION; | ||
2627 | } | ||
2628 | break; | ||
2629 | |||
2630 | case BURN_MB_MSI_RM_FILES_IN_USE: | ||
2631 | // https://docs.microsoft.com/en-us/windows/win32/msi/using-restart-manager-with-an-external-ui- | ||
2632 | if (IDOK == nResult || IDYES == nResult) | ||
2633 | { | ||
2634 | nResult = IDOK; | ||
2635 | } | ||
2636 | else if (IDCONTINUE == nResult || IDIGNORE == nResult) | ||
2637 | { | ||
2638 | nResult = IDIGNORE; | ||
2639 | } | ||
2640 | else if (IDNO == nResult) | ||
2641 | { | ||
2642 | nResult = IDNO; | ||
2643 | } | ||
2644 | else if (IDCANCEL == nResult || IDABORT == nResult) | ||
2645 | { | ||
2646 | nResult = IDCANCEL; | ||
2647 | } | ||
2648 | else if (IDRETRY == nResult || IDTRYAGAIN == nResult) | ||
2649 | { | ||
2650 | nResult = IDRETRY; | ||
2651 | } | ||
2652 | else | ||
2653 | { | ||
2654 | nResult = IDNOACTION; | ||
2655 | } | ||
2656 | break; | ||
2657 | |||
2658 | case BURN_MB_RETRYTRYAGAIN: // custom return code. | 2610 | case BURN_MB_RETRYTRYAGAIN: // custom return code. |
2659 | if (IDRETRY != nResult && IDTRYAGAIN != nResult) | 2611 | if (IDRETRY != nResult && IDTRYAGAIN != nResult) |
2660 | { | 2612 | { |
@@ -2662,26 +2614,6 @@ static int FilterResult( | |||
2662 | } | 2614 | } |
2663 | break; | 2615 | break; |
2664 | 2616 | ||
2665 | case BURN_MB_NETFX_FILES_IN_USE: | ||
2666 | // https://docs.microsoft.com/en-us/dotnet/framework/deployment/how-to-get-progress-from-the-dotnet-installer | ||
2667 | if (IDOK == nResult || IDYES == nResult) | ||
2668 | { | ||
2669 | nResult = IDYES; | ||
2670 | } | ||
2671 | else if (IDRETRY == nResult || IDTRYAGAIN == nResult) | ||
2672 | { | ||
2673 | nResult = IDRETRY; | ||
2674 | } | ||
2675 | else if (IDCANCEL == nResult || IDABORT == nResult) | ||
2676 | { | ||
2677 | nResult = IDCANCEL; | ||
2678 | } | ||
2679 | else | ||
2680 | { | ||
2681 | nResult = IDNO; | ||
2682 | } | ||
2683 | break; | ||
2684 | |||
2685 | default: | 2617 | default: |
2686 | AssertSz(FALSE, "Unknown allowed results."); | 2618 | AssertSz(FALSE, "Unknown allowed results."); |
2687 | break; | 2619 | break; |