[2/2] msi: Don't reset the target path for files from assembly components.
Hans Leidekker
hans at codeweavers.com
Fri Nov 12 06:07:18 CST 2010
See http://bugs.winehq.org/show_bug.cgi?id=25120
---
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..27083d3 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)
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);
--
1.7.1
More information about the wine-patches
mailing list