ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Don't rebuild the target path for files from global assembly components.

This commit is contained in:
Hans Leidekker 2010-11-12 15:05:55 +01:00 committed by Alexandre Julliard
parent b112d77126
commit 19a2d144b5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msi/install.c
View File

@ -549,16 +549,16 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *package, LPCWSTR szFolder,
LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
{
MSICOMPONENT *comp = file->Component;
LPWSTR p;
LPWSTR dir;
if (!comp)
if (!comp->Enabled || (comp->assembly && !comp->assembly->application))
continue;
p = resolve_folder(package, comp->Directory, FALSE, FALSE, FALSE, NULL);
dir = resolve_folder(package, comp->Directory, FALSE, FALSE, FALSE, NULL);
msi_free(file->TargetPath);
file->TargetPath = build_directory_name(2, p, file->FileName);
msi_free(p);
file->TargetPath = build_directory_name(2, dir, file->FileName);
msi_free(dir);
}
}
msi_free(path);