James Hawkins : msi: Don't remove a misc file if the action is unknown.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 472b991958b3c426765ee76f96cba7194db5281d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=472b991958b3c426765ee76f96...

Author: James Hawkins 
Date:   Thu Aug 21 02:18:40 2008 -0500

msi: Don't remove a misc file if the action is unknown.

---

dlls/msi/files.c         |    3 +++
 dlls/msi/tests/install.c |    5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 945390e..0d9cd11 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -439,6 +439,9 @@ static BOOL verify_comp_for_removal(MSICOMPONENT *comp, UINT install_mode)
 {
     INSTALLSTATE request = comp->ActionRequest;

+    if (request == INSTALLSTATE_UNKNOWN)
+        return FALSE;
+
     if (install_mode == msidbRemoveFileInstallModeOnInstall &&
         (request == INSTALLSTATE_LOCAL || request == INSTALLSTATE_SOURCE))
         return TRUE;
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 6774cfb..40fabf8 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -4317,10 +4317,7 @@ static void test_removefiles(void)
     ok(delete_pf("msitest\attoparsec", TRUE), "File deleted\n");
     ok(!delete_pf("msitest\storeys", TRUE), "File not deleted\n");
     ok(!delete_pf("msitest\block", TRUE), "File not deleted\n");
-    todo_wine
-    {
-        ok(delete_pf("msitest\siriometer", TRUE), "File deleted\n");
-    }
+    ok(delete_pf("msitest\siriometer", TRUE), "File deleted\n");
     ok(pf_exists("msitest\cabout"), "Directory deleted\n");
     ok(pf_exists("msitest"), "Directory deleted\n");