Hans Leidekker : msi: Honor msidbComponentAttributesNeverOverwrite.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Fri Nov 12 15:05:35 2010 +0100

msi: Honor msidbComponentAttributesNeverOverwrite.

---

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

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 47aa74f..b3a6176 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -227,6 +227,14 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
         if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite)
             continue;

+        if (file->state == msifs_overwrite &&
+            (file->Component->Attributes & msidbComponentAttributesNeverOverwrite))
+        {
+            TRACE("not overwriting %s\n", debugstr_w(file->TargetPath));
+            file->state = msifs_skipped;
+            continue;
+        }
+
         if (file->Sequence > mi->last_sequence || mi->is_continuous ||
             (file->IsCompressed && !mi->is_extracted))
         {