shell32/tests: Fix a test failure on Vista.

29c51bdb · Paul Vriens · Alexandre Julliard · c05e6d8f · 29c51bdb
Commit 29c51bdb authored Jun 18, 2009 by Paul Vriens Committed by Alexandre Julliard Jun 18, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

shlfolder.c dlls/shell32/tests/shlfolder.c +2 -1

No files found.
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -469,7 +469,8 @@ static void test_GetDisplayName(void)
    }
    /* WinXP and up store the filenames as both ANSI and UNICODE in the pidls */
    if (pidlLast->mkid.cb >= 76) {
-        ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName),
+        ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) ||
+            (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)), /* Vista */
            "Filename should be stored as wchar-string at this position!\n");
    }