Module: wine Branch: master Commit: 396eea60061839b954a133e12d00e8372d8a3de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=396eea60061839b954a133e12d...
Author: James Hawkins jhawkins@codeweavers.com Date: Tue Jul 22 00:55:59 2008 -0500
msi: Determine the source path based on the short/long file names bit of the Word Count summary property.
---
dlls/msi/helpers.c | 2 + dlls/msi/tests/package.c | 48 ++++++++++++++------------------------------- 2 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 620a8da..aba3bd9 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -327,6 +327,8 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source,
if (package->WordCount & msidbSumInfoSourceTypeCompressed) path = get_source_root( package ); + else if (package->WordCount & msidbSumInfoSourceTypeSFN) + path = build_directory_name( 3, p, f->SourceShortPath, NULL ); else path = build_directory_name( 3, p, f->SourceLongPath, NULL );
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 78c7675..3eca228 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5918,11 +5918,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
CreateDirectoryA("short", NULL);
@@ -5931,11 +5928,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
CreateDirectoryA("long", NULL);
@@ -5944,11 +5938,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "one"); @@ -5959,7 +5950,7 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd); @@ -5971,11 +5962,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir3", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "five"); @@ -5986,11 +5974,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir4", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "seven"); @@ -6001,7 +5986,7 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir5", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd); @@ -6013,11 +5998,8 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir6", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "eleven"); @@ -6028,7 +6010,7 @@ static void test_shortlongsource(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir7", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); + ok(!lstrcmpA(path, subsrc), "Expected "%s", got "%s"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size);
MsiCloseHandle(hpkg);