msi: Fix condition evaluation when comparing literal and integer.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45445Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Fix condition evaluation when comparing literal and integer.
7837ae20 · Piotr Caban · Alexandre Julliard · 414fe80a · 7837ae20 · 7837ae20
Commit 7837ae20 authored Jul 13, 2018 by Piotr Caban Committed by Alexandre Julliard Jul 16, 2018
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

cond.y dlls/msi/cond.y +1 -1

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

No files found.
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -218,7 +218,7 @@ boolean_factor:
            }
            else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL)
            {
-                $$ = FALSE;
+                $$ = ($2 == COND_NE || $2 == COND_INE );
            }
            else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */
            {

--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2097,6 +2097,10 @@ static void test_condition(void)
    ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
    r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\"");
    ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
+    r = MsiEvaluateConditionA(hpkg, "&nofeature<>3");
+    ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
+    r = MsiEvaluateConditionA(hpkg, "\"\"<>3");
+    ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
    r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\"");
    ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
    MsiEvaluateConditionA(hpkg, "$nocomponent=\"\"");