msi: Don't extract files for assemblies which are already installed.

6a0801a4 · Hans Leidekker · Alexandre Julliard · 65581e0e · 6a0801a4
Commit 6a0801a4 authored Jan 11, 2011 by Hans Leidekker Committed by Alexandre Julliard Jan 11, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

files.c dlls/msi/files.c +2 -1

No files found.
--- 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;