Hans Leidekker : msi: Don' t rebuild the target path for files from global assembly components.
Alexandre Julliard
julliard at winehq.org
Fri Nov 12 11:22:38 CST 2010
Module: wine
Branch: master
Commit: 19a2d144b563f23dacfb127b94948b0f0f89b003
URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a2d144b563f23dacfb127b94948b0f0f89b003
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Nov 12 15:05:55 2010 +0100
msi: Don't rebuild the target path for files from global assembly components.
---
dlls/msi/install.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 9463a52..1579a5e 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -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);
More information about the wine-cvs
mailing list