msi: Support NULL value in INSERT query.

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: Support NULL value in INSERT query.
63ccdfea · Piotr Caban · Alexandre Julliard · b052fc3c · 63ccdfea · 63ccdfea
Commit 63ccdfea authored Apr 18, 2018 by Piotr Caban Committed by Alexandre Julliard Apr 19, 2018
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

sql.y dlls/msi/sql.y +8 -1

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

No files found.
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -658,6 +658,12 @@ const_val:
            if( !$$ )
                YYABORT;
        }
+   | TK_NULL
+        {
+            $$ = EXPR_sval( info, NULL );
+            if ( !$$ )
+                YYABORT;
+        }
    ;
 column_val:
@@ -921,7 +927,8 @@ static struct expr * EXPR_sval( void *info, const struct sql_str *str )
    if( e )
    {
        e->type = EXPR_SVAL;
-        if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS )
+        if( !str) e->u.sval = NULL;
+        else if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS )
            return NULL; /* e will be freed by query destructor */
    }
    return e;

--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -3705,7 +3705,7 @@ static void test_states(void)
    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'" );
+            "'VBFeatureRequest', 38, NULL, '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'" );