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

Hans Leidekker hans at codeweavers.com
Tue Jan 10 09:55:40 CST 2012


---
 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));
-- 
1.7.7.3






More information about the wine-patches mailing list