msi: Improve feature action value evaluation in conditions.

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

msi: Improve feature action value evaluation in conditions.
b141a145 · Piotr Caban · Alexandre Julliard · 41365ce7 · b141a145 · b141a145
Commit b141a145 authored Oct 20, 2017 by Piotr Caban Committed by Alexandre Julliard Oct 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

cond.y dlls/msi/cond.y +6 -3

package.c dlls/msi/tests/package.c +2 -0

No files found.
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -318,11 +318,14 @@ value_i:
  | COND_AMPER identifier
        {
            COND_input* cond = (COND_input*) info;
-            INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
+            INSTALLSTATE install, action;
      
-            MSI_GetFeatureStateW(cond->package, $2, &install, &action );
-            if (action == INSTALLSTATE_UNKNOWN)
+            if (MSI_GetFeatureStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS)
+            {
+                FIXME("condition may be evaluated incorrectly\n");
+                /* we should return empty string in this case */
                $$ = MSICONDITION_FALSE;
+            }
            else
                $$ = action;


--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2069,6 +2069,8 @@ static void test_condition(void)
    /* feature doesn't exist */
    r = MsiEvaluateConditionA(hpkg, "&nofeature");
    ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
+    r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\"");
+    todo_wine ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);

    MsiSetPropertyA(hpkg, "A", "2");
    MsiSetPropertyA(hpkg, "X", "50");