From: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> --- dlls/msi/custom.c | 6 ++---- dlls/msi/tests/action.c | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 7b0e9fed87e..d83cbe72be0 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -354,8 +354,7 @@ static UINT wait_process_handle(MSIPACKAGE* package, UINT type, msi_dialog_check_messages(ProcessHandle); - if (!(type & msidbCustomActionTypeContinue)) - rc = custom_get_process_return(ProcessHandle); + rc = custom_get_process_return(ProcessHandle); CloseHandle(ProcessHandle); } @@ -411,8 +410,7 @@ static UINT wait_thread_handle( custom_action_info *info ) msi_dialog_check_messages( info->handle ); - if (!(info->type & msidbCustomActionTypeContinue)) - rc = custom_get_thread_return( info->package, info->handle ); + rc = custom_get_thread_return( info->package, info->handle ); free_custom_action_data( info ); } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index dc2d9ac83bb..93e5868b319 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -6597,7 +6597,6 @@ static void test_page_fault(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) skip("Not enough rights to perform tests\n"); else - todo_wine ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); DeleteFileA(msifile); @@ -6621,7 +6620,6 @@ static void test_raise_exception(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) skip("Not enough rights to perform tests\n"); else - todo_wine ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); DeleteFileA(msifile); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11017