shlwapi: Fix a few failing tests in Vista.

This commit is contained in:
James Hawkins 2008-09-02 01:09:59 -05:00 committed by Alexandre Julliard
parent 6b20075b1f
commit 3e76eacbfd
1 changed files with 9 additions and 3 deletions

View File

@ -891,7 +891,9 @@ static void test_PathCanonicalizeA(void)
res = PathCanonicalizeA(dest, "C:\\one/.\\two\\..");
ok(res, "Expected success\n");
ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());
ok(!lstrcmp(dest, "C:\\one/."), "Expected C:\\one/., got %s\n", dest);
ok(!lstrcmp(dest, "C:\\one/.") ||
!lstrcmp(dest, "C:\\one/"), /* Vista */
"Expected \"C:\\one/.\" or \"C:\\one/\", got \"%s\"\n", dest);
/* try forward slashes with change dirs
* NOTE: if there is a forward slash in between two backslashes,
@ -1013,7 +1015,9 @@ static void test_PathBuildRootA(void)
lstrcpy(path, "aaaaaaaaa");
root = PathBuildRootA(path, -1);
ok(root == path, "Expected root == path, got %p\n", root);
ok(!lstrcmp(path, "aaaaaaaaa"), "Expected aaaaaaaaa, got %s\n", path);
ok(!lstrcmp(path, "aaaaaaaaa") ||
lstrlenA(path) == 0, /* Vista */
"Expected aaaaaaaaa or empty string, got %s\n", path);
ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());
/* test a drive number greater than 25 */
@ -1021,7 +1025,9 @@ static void test_PathBuildRootA(void)
lstrcpy(path, "aaaaaaaaa");
root = PathBuildRootA(path, 26);
ok(root == path, "Expected root == path, got %p\n", root);
ok(!lstrcmp(path, "aaaaaaaaa"), "Expected aaaaaaaaa, got %s\n", path);
ok(!lstrcmp(path, "aaaaaaaaa") ||
lstrlenA(path) == 0, /* Vista */
"Expected aaaaaaaaa or empty string, got %s\n", path);
ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());
/* length of path is less than 4 */