Hans Leidekker : msi: Revert 3cd55cc916ad8d74710f435845d8f970161f77fe.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5871ad6d00224b025a755ecdb486f77a3d6b6a25
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5871ad6d00224b025a755ecdb4...

Author: Hans Leidekker 
Date:   Wed Nov  3 15:06:19 2010 +0100

msi: Revert 3cd55cc916ad8d74710f435845d8f970161f77fe.

It breaks the Office 2003 installer.

---

dlls/msi/action.c        |    4 ----
 dlls/msi/tests/package.c |   10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index f56fcf7..2b41b25 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -212,10 +212,6 @@ void msi_feature_set_state( MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTA
         feature->ActionRequest = state;
         feature->Action = state;
     }
-    if (feature->Attributes & msidbFeatureAttributesUIDisallowAbsent)
-    {
-        feature->Action = INSTALLSTATE_UNKNOWN;
-    }
 }

void msi_component_set_state( MSIPACKAGE *package, MSICOMPONENT *comp, INSTALLSTATE state )
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index d19a10a..7e236e4 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -5581,7 +5581,7 @@ static void test_states(void)
     r = MsiGetFeatureState(hpkg, "eleven", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
-    ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);
+    todo_wine ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);

state = 0xdeadbee;
     action = 0xdeadbee;
@@ -6534,7 +6534,7 @@ static void test_states(void)
     r = MsiGetFeatureState(hpkg, "eleven", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
-    ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);
+    todo_wine ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);

state = 0xdeadbee;
     action = 0xdeadbee;
@@ -7483,7 +7483,7 @@ static void test_states(void)
     r = MsiGetFeatureState(hpkg, "eleven", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
-    ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);
+    todo_wine ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);

state = 0xdeadbee;
     action = 0xdeadbee;
@@ -9711,7 +9711,7 @@ static void test_featureparents(void)
     r = MsiGetFeatureState(hpkg, "lyra", &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;
@@ -9839,7 +9839,7 @@ static void test_featureparents(void)
     r = MsiGetFeatureState(hpkg, "lyra", &state, &action);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
     ok( state == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", state);
-    todo_wine ok( action == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", action);
+    ok( action == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", action);

state = 0xdeadbee;
     action = 0xdeadbee;