James Hawkins : shlwapi: Fix a few failing tests in Vista.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3e76eacbfd6f892dc557c90e28c61f6da4052c50
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3e76eacbfd6f892dc557c90e28...

Author: James Hawkins 
Date:   Tue Sep  2 01:09:59 2008 -0500

shlwapi: Fix a few failing tests in Vista.

---

dlls/shlwapi/tests/path.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index d84ca7a..0fc092d 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -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 */