Hans Leidekker : msi: Reset file attributes before removing a file.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue Feb  1 12:27:09 2011 +0100

msi: Reset file attributes before removing a file.

---

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

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 1205690..a044ec7 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -1048,9 +1048,11 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
         }
 
         TRACE("removing %s\n", debugstr_w(file->File) );
+
+        SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL );
         if (!DeleteFileW( file->TargetPath ))
         {
-            WARN("failed to delete %s\n",  debugstr_w(file->TargetPath));
+            WARN("failed to delete %s (%u)\n",  debugstr_w(file->TargetPath), GetLastError());
         }
         /* FIXME: check persistence for each directory */
         else if (r && (dir = strdupW( file->TargetPath )))