Hans Leidekker : msi: Don' t resolve child folders if the parent path is unmodified.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e8bdbf879a70a0b0bae35ebb95b7c3e223117abd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e8bdbf879a70a0b0bae35ebb95...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Wed May 11 11:25:40 2011 +0200

msi: Don't resolve child folders if the parent path is unmodified.

---

 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;