[2/2] msi: Don't resolve child folders if the parent path is unmodified.
Hans Leidekker
hans at codeweavers.com
Wed May 11 04:25:40 CDT 2011
Fixes http://bugs.winehq.org/show_bug.cgi?id=27111
---
dlls/msi/action.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 669881c..32cea4e 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -3018,6 +3018,12 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa
path = msi_build_directory_name( 3, parent->ResolvedTarget, folder->TargetDefault, NULL );
}
msi_clean_path( path );
+ if (folder->ResolvedTarget && !strcmpiW( path, folder->ResolvedTarget ))
+ {
+ TRACE("%s already resolved to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget));
+ msi_free( path );
+ return;
+ }
msi_set_property( package->db, folder->Directory, path );
msi_free( folder->ResolvedTarget );
folder->ResolvedTarget = path;
--
1.7.4.1
More information about the wine-patches
mailing list