Hans Leidekker : msi: Don't attempt to patch files from disabled components .

Alexandre Julliard julliard at winehq.org
Wed Feb 27 14:41:58 CST 2013


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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Feb 27 12:31:13 2013 +0100

msi: Don't attempt to patch files from disabled components.

---

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

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 96584df..d53da91 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -466,7 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
         if (temp_folder[0] == '\0')
             GetTempPathW(MAX_PATH, temp_folder);
 
-        if (!(p = get_next_filepatch(package, file))) return FALSE;
+        if (!(p = get_next_filepatch(package, file)) || !p->File->Component->Enabled)
+            return FALSE;
 
         GetTempFileNameW(temp_folder, NULL, 0, patch_path);
 




More information about the wine-cvs mailing list