From 4e25188a2a1fde07f252e1cf3965390d00e45d0c Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Wed, 22 Nov 2006 15:13:32 +0900 Subject: [PATCH] msi: Treat the SourceDir folder the same as TargetDir. --- dlls/msi/helpers.c | 5 ++++- dlls/msi/tests/package.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index e0ec6e69779..b2968f1c264 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -231,12 +231,15 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, if (!name) return NULL; + if (!lstrcmpW(name,cszSourceDir)) + name = cszTargetDir; + f = get_loaded_folder( package, name ); if (!f) return NULL; /* special resolving for Target and Source root dir */ - if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) + if (!strcmpW(name,cszTargetDir)) { if (!f->ResolvedTarget && !f->Property) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d731ad28dc7..68ef1729fe3 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2939,10 +2939,8 @@ static void test_prop_path(void) sz = sizeof buffer; buffer[0] = 0; r = MsiGetSourcePath(hpkg, "SourceDir", buffer, &sz ); - todo_wine { ok( r == ERROR_SUCCESS, "failed to get source path\n"); ok( !lstrcmpi(cwd, buffer), "SourceDir (%s) should be current dir (%s)\n", buffer, cwd); - } sz = sizeof buffer; buffer[0] = 0; -- 2.11.4.GIT