From c7bd5d0b0f676e09d036432ee1afb9bf5dcc4fb5 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 15 Dec 2021 13:19:28 -0600 Subject: Always pass through the return value for FilesInUse messages. --- src/burn/engine/userexperience.cpp | 68 -------------------------------------- 1 file changed, 68 deletions(-) (limited to 'src/burn/engine/userexperience.cpp') 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( } break; - case BURN_MB_MSI_FILES_IN_USE: - // https://docs.microsoft.com/en-us/windows/win32/msi/installvalidate-action - if (IDRETRY == nResult || IDTRYAGAIN == nResult) - { - nResult = IDRETRY; - } - else if (IDCANCEL == nResult || IDABORT == nResult) - { - nResult = IDCANCEL; - } - else if (IDCONTINUE == nResult || IDIGNORE == nResult) - { - nResult = IDIGNORE; - } - else - { - nResult = IDNOACTION; - } - break; - - case BURN_MB_MSI_RM_FILES_IN_USE: - // https://docs.microsoft.com/en-us/windows/win32/msi/using-restart-manager-with-an-external-ui- - if (IDOK == nResult || IDYES == nResult) - { - nResult = IDOK; - } - else if (IDCONTINUE == nResult || IDIGNORE == nResult) - { - nResult = IDIGNORE; - } - else if (IDNO == nResult) - { - nResult = IDNO; - } - else if (IDCANCEL == nResult || IDABORT == nResult) - { - nResult = IDCANCEL; - } - else if (IDRETRY == nResult || IDTRYAGAIN == nResult) - { - nResult = IDRETRY; - } - else - { - nResult = IDNOACTION; - } - break; - case BURN_MB_RETRYTRYAGAIN: // custom return code. if (IDRETRY != nResult && IDTRYAGAIN != nResult) { @@ -2662,26 +2614,6 @@ static int FilterResult( } break; - case BURN_MB_NETFX_FILES_IN_USE: - // https://docs.microsoft.com/en-us/dotnet/framework/deployment/how-to-get-progress-from-the-dotnet-installer - if (IDOK == nResult || IDYES == nResult) - { - nResult = IDYES; - } - else if (IDRETRY == nResult || IDTRYAGAIN == nResult) - { - nResult = IDRETRY; - } - else if (IDCANCEL == nResult || IDABORT == nResult) - { - nResult = IDCANCEL; - } - else - { - nResult = IDNO; - } - break; - default: AssertSz(FALSE, "Unknown allowed results."); break; -- cgit v1.2.3-55-g6feb