Piotr Caban : msi: Only mark non-registered features as absent if we haven 't done anything with them.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b052fc3c893a0fa946c1dd6065047f4b5538cbe0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b052fc3c893a0fa946c1dd606...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Wed Apr 18 17:59:18 2018 +0200

msi: Only mark non-registered features as absent if we haven't done anything with them.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msi/action.c        | 2 ++
 dlls/msi/tests/package.c | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 71e45e8..67dfbe4 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -4931,6 +4931,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
         MSIRECORD *uirow;
 
         if (feature->Level <= 0) continue;
+        if (feature->Action == INSTALLSTATE_UNKNOWN &&
+                feature->Installed != INSTALLSTATE_ABSENT) continue;
 
         if (feature->Action != INSTALLSTATE_LOCAL &&
             feature->Action != INSTALLSTATE_SOURCE &&
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index b85a3a8..e3a0894 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -3704,9 +3704,12 @@ static void test_states(void)
     add_custom_action_entry( hdb, "'ConditionCheck6', 19, '', 'Condition check failed (6)'" );
     add_custom_action_entry( hdb, "'ConditionCheck7', 19, '', 'Condition check failed (7)'" );
     add_custom_action_entry( hdb, "'ConditionCheck8', 19, '', 'Condition check failed (8)'" );
+    add_custom_action_entry( hdb,
+            "'VBFeatureRequest', 38, '', 'Session.FeatureRequestState(\"three\") = 3'" );
 
     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, "'VBFeatureRequest', 'NOT REMOVE', '1001'" );
     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'" );
@@ -3773,6 +3776,8 @@ static void test_states(void)
     ok(state == INSTALLSTATE_SOURCE, "state = %d\n", state);
     state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "two");
     ok(state == INSTALLSTATE_ABSENT, "state = %d\n", state);
+    state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "three");
+    ok(state == INSTALLSTATE_LOCAL, "state = %d\n", state);
 
     /* uninstall the product */
     r = MsiInstallProductA(msifile4, "REMOVE=ALL");