Hans Leidekker : msi: Skip files from the original media if a patch is applied.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 25 10:13:23 CDT 2015
Module: wine
Branch: master
Commit: 19e51936e0d7c37e201b45a1fbce007ca4808f86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e51936e0d7c37e201b45a1fbce007ca4808f86
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Mar 25 14:33:26 2015 +0100
msi: Skip files from the original media if a patch is applied.
---
dlls/msi/files.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 36e91ca..4337d51 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -77,6 +77,11 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil
TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File));
return msifs_skipped;
}
+ if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID)
+ {
+ TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File));
+ return msifs_skipped;
+ }
if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) ||
GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES)
{
More information about the wine-cvs
mailing list