Commit 3e76eacb authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

shlwapi: Fix a few failing tests in Vista.

parent 6b20075b
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment