Piotr Caban : msi: Add install test with no arguments on already installed product.
Alexandre Julliard
julliard at winehq.org
Tue Oct 24 02:40:04 CDT 2017
Module: wine
Branch: master
Commit: 599622d58325cba28d39d5a508cbb87cf50bec38
URL: http://source.winehq.org/git/wine.git/?a=commit;h=599622d58325cba28d39d5a508cbb87cf50bec38
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Oct 23 12:17:21 2017 +0200
msi: Add install test with no arguments on already installed product.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/tests/package.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index ab3bb15..1411c1e 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -3058,10 +3058,13 @@ static void test_states(void)
{'w','i','n','e','t','e','s','t','3','-','p','a','c','k','a','g','e','.','m','s','i',0};
static const WCHAR msifile4W[] =
{'w','i','n','e','t','e','s','t','4','-','p','a','c','k','a','g','e','.','m','s','i',0};
+ char msi_cache_file[MAX_PATH];
+ DWORD cache_file_name_len;
INSTALLSTATE state;
MSIHANDLE hpkg;
UINT r;
MSIHANDLE hdb;
+ BOOL is_broken;
if (is_process_limited())
{
@@ -3582,7 +3585,8 @@ static void test_states(void)
/* reinstall the product */
r = MsiInstallProductA(msifile3, "REINSTALL=ALL");
- ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE) /* win2k3 */, "Expected ERROR_SUCCESS, got %d\n", r);
+ is_broken = (r == ERROR_INSTALL_FAILURE);
+ ok(r == ERROR_SUCCESS || broken(is_broken) /* win2k3 */, "Expected ERROR_SUCCESS, got %d\n", r);
state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five");
ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state);
@@ -3671,6 +3675,40 @@ static void test_states(void)
state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "two");
ok(state == INSTALLSTATE_ABSENT, "state = %d\n", state);
+ /* no arguments test */
+ cache_file_name_len = sizeof(msi_cache_file);
+ r = MsiGetProductInfoA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}",
+ INSTALLPROPERTY_LOCALPACKAGEA, msi_cache_file, &cache_file_name_len);
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ r = MsiOpenDatabaseA(msi_cache_file, (const char*)MSIDBOPEN_DIRECT, &hdb);
+ ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r);
+
+ create_custom_action_table( hdb );
+ add_custom_action_entry( hdb, "'ConditionCheck1', 19, '', 'Condition check failed (1)'" );
+ add_custom_action_entry( hdb, "'ConditionCheck2', 19, '', 'Condition check failed (2)'" );
+ add_custom_action_entry( hdb, "'ConditionCheck3', 19, '', 'Condition check failed (3)'" );
+ add_custom_action_entry( hdb, "'ConditionCheck4', 19, '', 'Condition check failed (4)'" );
+ add_custom_action_entry( hdb, "'ConditionCheck5', 19, '', 'Condition check failed (5)'" );
+ add_custom_action_entry( hdb, "'ConditionCheck6', 19, '', 'Condition check failed (6)'" );
+
+ add_install_execute_sequence_entry( hdb, "'ConditionCheck1', 'REINSTALL', '798'" );
+ add_install_execute_sequence_entry( hdb, "'ConditionCheck2', 'NOT REMOVE AND Preselected', '799'" );
+ add_install_execute_sequence_entry( hdb, "'ConditionCheck3', 'REINSTALL', '6598'" );
+ add_install_execute_sequence_entry( hdb, "'ConditionCheck4', 'NOT REMOVE AND Preselected', '6599'" );
+ add_install_execute_sequence_entry( hdb, "'ConditionCheck5', 'REINSTALL', '6601'" );
+ add_install_execute_sequence_entry( hdb, "'ConditionCheck6', 'NOT REMOVE AND Preselected', '6602'" );
+ r = MsiDatabaseCommit(hdb);
+ ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed: %d\n", r);
+ MsiCloseHandle(hdb);
+
+ r = MsiInstallProductA(msifile, "");
+ ok(r == ERROR_SUCCESS || (is_broken && r == ERROR_INSTALL_FAILURE) /* win2k3 */,
+ "Expected ERROR_SUCCESS, got %d\n", r);
+ state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "one");
+ ok(state == INSTALLSTATE_SOURCE, "state = %d\n", state);
+ state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "two");
+ ok(state == INSTALLSTATE_ABSENT, "state = %d\n", state);
+
/* uninstall the product */
r = MsiInstallProductA(msifile4, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
More information about the wine-cvs
mailing list