From f88a3c569e446cde3b4ec5e0987d5171487ed26b Mon Sep 17 00:00:00 2001
From: Paul Vriens <paul.vriens.wine@gmail.com>
Date: Tue, 24 Jun 2008 19:01:33 +0200
Subject: [PATCH] shlwapi/tests: Fix a test on Vista.

---
 dlls/shlwapi/tests/path.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index b2d2a9ea7b1..6f55395d4c6 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -537,9 +537,13 @@ static void test_PathCombineA(void)
     SetLastError(0xdeadbeef);
     lstrcpyA(dest, "control");
     str = PathCombineA(dest, "relative\\dir", "\\one\\two\\three\\");
-    ok(str == dest, "Expected str == dest, got %p\n", str);
-    ok(!lstrcmp(str, "one\\two\\three\\"), "Expected one\\two\\three\\, got %s\n", str);
     ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());
+    /* Vista fails which probably makes sense as PathCombineA expects an absolute dir */
+    if (str)
+    {
+        ok(str == dest, "Expected str == dest, got %p\n", str);
+        ok(!lstrcmp(str, "one\\two\\three\\"), "Expected one\\two\\three\\, got %s\n", str);
+    }
 
     /* try forward slashes */
     SetLastError(0xdeadbeef);