Hans Leidekker : msi: Don' t try to ready media for files from a previous installation or files that will be skipped .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ef765cb4e2d5976f43c9f6eb6f1850ce2f37a23
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ef765cb4e2d5976f43c9f6eb6...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue Jan 10 16:55:40 2012 +0100

msi: Don't try to ready media for files from a previous installation or files that will be skipped.

---

 dlls/msi/files.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index f755d92..909f71f 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -331,6 +331,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
         if (!file->Component->Enabled) continue;
 
         if (file->state != msifs_hashmatch &&
+            file->state != msifs_skipped &&
+            (file->state != msifs_present || !msi_get_property_int( package->db, szInstalled, 0 )) &&
             (rc = ready_media( package, file->IsCompressed, mi )))
         {
             ERR("Failed to ready media for %s\n", debugstr_w(file->File));