msi: Add error handling when retriving component/feature state/action in condition.

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: Add error handling when retriving component/feature state/action in condition.
9ce8592b · Piotr Caban · Alexandre Julliard · dcd92a16 · 9ce8592b · 9ce8592b
Commit 9ce8592b authored Oct 24, 2017 by Piotr Caban Committed by Alexandre Julliard Oct 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 39 additions and 15 deletions

cond.y dlls/msi/cond.y +32 -14

package.c dlls/msi/tests/package.c +7 -1

No files found.
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -321,9 +321,16 @@ value:
            COND_input* cond = (COND_input*) info;
            INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-            MSI_GetComponentStateW(cond->package, $2, &install, &action );
+            if(MSI_GetComponentStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS)
-            $$.type = VALUE_INTEGER;
+            {
-            $$.u.integer = action;
+                $$.type = VALUE_LITERAL;
+                $$.u.string = NULL;
+            }
+            else
+            {
+                $$.type = VALUE_INTEGER;
+                $$.u.integer = action;
+            }
            cond_free( $2 );
        }
  | COND_QUESTION identifier
@@ -331,9 +338,16 @@ value:
            COND_input* cond = (COND_input*) info;
            INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-            MSI_GetComponentStateW(cond->package, $2, &install, &action );\
+            if(MSI_GetComponentStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS)
-            $$.type = VALUE_INTEGER;
+            {
-            $$.u.integer = install;
+                $$.type = VALUE_LITERAL;
+                $$.u.string = NULL;
+            }
+            else
+            {
+                $$.type = VALUE_INTEGER;
+                $$.u.integer = install;
+            }
            cond_free( $2 );
        }
  | COND_AMPER identifier
@@ -343,17 +357,14 @@ value:
            if (MSI_GetFeatureStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS)
            {
-                FIXME("condition may be evaluated incorrectly\n");
+                $$.type = VALUE_LITERAL;
-                /* we should return empty string in this case */
+                $$.u.string = NULL;
-                $$.type = VALUE_INTEGER;
-                $$.u.integer = MSICONDITION_FALSE;
            }
            else
            {
                $$.type = VALUE_INTEGER;
                $$.u.integer = action;
            }
            cond_free( $2 );
        }
  | COND_EXCLAM identifier
@@ -361,9 +372,16 @@ value:
            COND_input* cond = (COND_input*) info;
            INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-            MSI_GetFeatureStateW(cond->package, $2, &install, &action );
+            if(MSI_GetFeatureStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS)
-            $$.type = VALUE_INTEGER;
+            {
-            $$.u.integer = install;
+                $$.type = VALUE_LITERAL;
+                $$.u.string = NULL;
+            }
+            else
+            {
+                $$.type = VALUE_INTEGER;
+                $$.u.integer = install;
+            }
            cond_free( $2 );
        }
    ;

--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2070,7 +2070,13 @@ static void test_condition(void)
    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);
+    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=\"\"");
+    ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
+    MsiEvaluateConditionA(hpkg, "?nocomponent=\"\"");
+    ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
    MsiSetPropertyA(hpkg, "A", "2");
    MsiSetPropertyA(hpkg, "X", "50");