James Hawkins : msi: A feature' s requested action does not depend on its installed state.
Alexandre Julliard
julliard at winehq.org
Thu Nov 1 07:39:47 CDT 2007
Module: wine
Branch: master
Commit: 07c3f4411e5e1658c579e8bb36cf2b90160011ba
URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c3f4411e5e1658c579e8bb36cf2b90160011ba
Author: James Hawkins <truiken at gmail.com>
Date: Thu Nov 1 03:15:22 2007 -0500
msi: A feature's requested action does not depend on its installed state.
---
dlls/msi/helpers.c | 3 ---
dlls/msi/tests/install.c | 10 ++--------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c
index d314699..172f516 100644
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -831,9 +831,6 @@ BOOL ACTION_VerifyFeatureForAction( const MSIFEATURE* feature, INSTALLSTATE chec
if (!feature)
return FALSE;
- if (feature->Installed == check)
- return FALSE;
-
if (feature->ActionRequest == check)
return TRUE;
else
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 6ac44f1..a9c9a0f 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2189,16 +2189,10 @@ static void test_publish(void)
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature");
- todo_wine
- {
- ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- }
+ ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo");
- todo_wine
- {
- ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
- }
+ ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
"{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);
More information about the wine-cvs
mailing list