msi: Don't rebuild the target path for files from global assembly components.
This commit is contained in:
parent
b112d77126
commit
19a2d144b5
|
@ -549,16 +549,16 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *package, LPCWSTR szFolder,
|
||||||
LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
|
LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
|
||||||
{
|
{
|
||||||
MSICOMPONENT *comp = file->Component;
|
MSICOMPONENT *comp = file->Component;
|
||||||
LPWSTR p;
|
LPWSTR dir;
|
||||||
|
|
||||||
if (!comp)
|
if (!comp->Enabled || (comp->assembly && !comp->assembly->application))
|
||||||
continue;
|
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);
|
msi_free(file->TargetPath);
|
||||||
|
|
||||||
file->TargetPath = build_directory_name(2, p, file->FileName);
|
file->TargetPath = build_directory_name(2, dir, file->FileName);
|
||||||
msi_free(p);
|
msi_free(dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
msi_free(path);
|
msi_free(path);
|
||||||
|
|
Loading…
Reference in New Issue