From: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> --- dlls/msi/custom.c | 2 +- dlls/msi/tests/action.c | 88 ++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.c | 16 +++++++ dlls/msi/tests/custom.spec | 2 + 4 files changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ab25d1e848c..7b0e9fed87e 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -557,7 +557,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) { ERR( "Custom action (%s:%s) caused an exception: %#lx\n", debugstr_w(dll), debugstr_a(proc), GetExceptionCode() ); - r = ERROR_SUCCESS; + r = ERROR_INSTALL_FAILURE; } __ENDTRY; } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 82d950ce466..dc2d9ac83bb 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1970,6 +1970,31 @@ static const char rep_install_exec_seq_dat[] = "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; +static const char exception_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "page_fault\tPAGEFAULT AND NOT REMOVE\t601\n" + "raise_exception\tEXCEPTION AND NOT REMOVE\t602\n" + "RegisterProduct\t\t700\n" + "PublishFeatures\t\t800\n" + "PublishProduct\t\t900\n" + "UnpublishFeatures\t\t1000\n" + "InstallFinalize\t\t1100\n"; + +static const char exception_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "page_fault\t65\tcustom.dll\tpage_fault\n" + "raise_exception\t65\tcustom.dll\traise_exception\n"; + static const msi_table env_tables[] = { ADD_TABLE(component), @@ -2371,6 +2396,19 @@ static const msi_table rep_tables[] = ADD_TABLE(media) }; +static const msi_table exception_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(exception_install_exec_seq), + ADD_TABLE(exception_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6541,6 +6579,54 @@ error: DeleteFileA(msifile); } +static void test_page_fault(void) +{ + UINT r; + + if (!is_process_elevated()) + { + skip("Process is limited\n"); + return; + } + + create_database(msifile, exception_tables, ARRAY_SIZE(exception_tables)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "PAGEFAULT=1"); + 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); +} + +static void test_raise_exception(void) +{ + UINT r; + + if (!is_process_elevated()) + { + skip("Process is limited\n"); + return; + } + + create_database(msifile, exception_tables, ARRAY_SIZE(exception_tables)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "EXCEPTION=1"); + 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); +} + static HANDLE get_admin_token(void) { TOKEN_ELEVATION_TYPE type; @@ -6647,6 +6733,8 @@ START_TEST(action) test_register_mime_info(); test_publish_assemblies(); test_remove_existing_products(); + test_page_fault(); + test_raise_exception(); DeleteFileA(log_file); SetCurrentDirectoryA(prev_path); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 8c5e7e4bbd0..5e4687fa789 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1411,6 +1411,22 @@ UINT WINAPI async2(MSIHANDLE hinst) return ERROR_SUCCESS; } +UINT WINAPI page_fault(MSIHANDLE hinst) +{ + UINT *p = NULL; + + *(volatile UINT *)p = 0xdeadbeef; + + return ERROR_SUCCESS; +} + +UINT WINAPI raise_exception(MSIHANDLE hinst) +{ + RaiseException(0xdeadbeef, 0, 0, NULL); + + return ERROR_SUCCESS; +} + static BOOL pf_exists(const char *file) { char path[MAX_PATH]; diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 5d78377a799..4f3f1cb298a 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -60,3 +60,5 @@ @ stdcall tl_absent(long) @ stdcall wrv_present(long) @ stdcall wrv_absent(long) +@ stdcall page_fault(long) +@ stdcall raise_exception(long) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11017