ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Set all folders' source paths to the root directory if the source type is compressed.

This commit is contained in:
James Hawkins 2008-07-22 00:55:26 -05:00 committed by Alexandre Julliard
parent 7538f9ac19
commit ede4a3b598
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/helpers.c
View File

@ -325,7 +325,9 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source,
{ {
path = NULL; path = NULL;
if (f->SourceLongPath) if (package->WordCount & msidbSumInfoSourceTypeCompressed)
path = get_source_root( package );
else
path = build_directory_name( 3, p, f->SourceLongPath, NULL ); path = build_directory_name( 3, p, f->SourceLongPath, NULL );
TRACE("source -> %s\n", debugstr_w(path)); TRACE("source -> %s\n", debugstr_w(path));

14
dlls/msi/tests/package.c
View File

@ -5676,22 +5676,16 @@ static void test_MsiGetSourcePath(void)
lstrcpyA(path, "kiwi"); lstrcpyA(path, "kiwi");
r = MsiGetSourcePath(hpkg, "SubDir", path, &size); r = MsiGetSourcePath(hpkg, "SubDir", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
todo_wine ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
{ ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
}
/* try SubDir2 after CostFinalize */ /* try SubDir2 after CostFinalize */
size = MAX_PATH; size = MAX_PATH;
lstrcpyA(path, "kiwi"); lstrcpyA(path, "kiwi");
r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); r = MsiGetSourcePath(hpkg, "SubDir2", path, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
todo_wine ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
{ ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);
ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size);
}
MsiCloseHandle(hpkg); MsiCloseHandle(hpkg);
DeleteFile(msifile); DeleteFile(msifile);