James Hawkins : msi: Fix the add_feature_entry helper function.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 6330f14da9d3a7519cb59e14a37f128d77f6dee4
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=6330f14da9d3a7519cb59e14...

Author: James Hawkins 
Date:   Mon Jul 31 13:55:24 2006 -0700

msi: Fix the add_feature_entry helper function.

---

dlls/msi/tests/package.c |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index ecc333d..24f4332 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -117,7 +117,7 @@ static UINT add_component_entry( MSIHAND
 static UINT add_feature_entry( MSIHANDLE hdb, char *values )
 {
     char insert[] = "INSERT INTO `Feature` (`Feature`, `Feature_Parent`, "
-                    "`Display`, `Level`, `Attributes`) VALUES( %s )";
+                    "`Title`, `Description`, `Display`, `Level`, `Directory_`, `Attributes`) VALUES( %s )";
     char *query;
     UINT sz, r;

@@ -1294,7 +1294,7 @@ static void test_states(void)
     ok( r == ERROR_SUCCESS, "cannot create Component table: %d\n", r );

/* msidbFeatureAttributesFavorLocal */
-    r = add_feature_entry( hdb, "'one', '', 2, 1, 0" );
+    r = add_feature_entry( hdb, "'one', '', '', '', 2, 1, '', 0" );
     ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r );

/* msidbFeatureAttributesFavorLocal:msidbComponentAttributesLocalOnly */
@@ -1310,7 +1310,7 @@ static void test_states(void)
     ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r );

/* msidbFeatureAttributesFavorSource */
-    r = add_feature_entry( hdb, "'two', '', 2, 1, 1" );
+    r = add_feature_entry( hdb, "'two', '', '', '', 2, 1, '', 1" );
     ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r );

/* msidbFeatureAttributesFavorSource:msidbComponentAttributesLocalOnly */
@@ -1326,7 +1326,7 @@ static void test_states(void)
     ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r );

/* msidbFeatureAttributesFavorSource */
-    r = add_feature_entry( hdb, "'three', '', 2, 1, 1" );
+    r = add_feature_entry( hdb, "'three', '', '', '', 2, 1, '', 1" );
     ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r );

/* msidbFeatureAttributesFavorSource:msidbComponentAttributesSourceOnly */
@@ -1669,20 +1669,14 @@ static void test_states(void)
     r = MsiGetFeatureState(hpkg, "one", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
-    todo_wine
-    {
-        ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action);
-    }
+    ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action);

state = 0xdeadbee;
     action = 0xdeadbee;
     r = MsiGetFeatureState(hpkg, "two", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
-    todo_wine
-    {
-        ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action);
-    }
+    ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action);

state = 0xdeadbee;
     action = 0xdeadbee;
@@ -1706,7 +1700,10 @@ static void test_states(void)
     r = MsiGetComponentState(hpkg, "beta", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
-    ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action);
+    todo_wine
+    {
+        ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action);
+    }

state = 0xdeadbee;
     action = 0xdeadbee;