From: Hans Leidekker Subject: [4/6] msi: Check the component enabled flag earlier. Message-Id: <1427290388.3059.13.camel@codeweavers.com> Date: Wed, 25 Mar 2015 14:33:08 +0100 --- dlls/msi/files.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 531ce38..36e91ca 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -72,7 +72,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil DWORD size; comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) { TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; @@ -353,7 +353,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) rc = ERROR_FUNCTION_FAILED; goto done; } - if (!file->Component->Enabled) continue; if (file->state != msifs_hashmatch && file->state != msifs_skipped &&