Hans Leidekker : msi: Don' t extract files for assemblies which are already installed.
Alexandre Julliard
julliard at winehq.org
Tue Jan 11 10:08:28 CST 2011
Module: wine
Branch: master
Commit: 6a0801a40ac45b260d75cff0d77add6373d94ed3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0801a40ac45b260d75cff0d77add6373d94ed3
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue Jan 11 10:28:50 2011 +0100
msi: Don't extract files for assemblies which are already installed.
---
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 182e027..9d0e01a 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -68,7 +68,8 @@ static void schedule_install_files(MSIPACKAGE *package)
{
MSICOMPONENT *comp = file->Component;
- if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled)
+ if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled ||
+ (comp->assembly && comp->assembly->installed))
{
TRACE("File %s is not scheduled for install\n", debugstr_w(file->File));
file->state = msifs_skipped;
More information about the wine-cvs
mailing list