Paul Vriens : shell32/tests: Fix a test failure on Vista.
Alexandre Julliard
julliard at winehq.org
Thu Jun 18 09:11:34 CDT 2009
Module: wine
Branch: master
Commit: 29c51bdb0494c91a3e09dadfc840f92c9c80bd86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c51bdb0494c91a3e09dadfc840f92c9c80bd86
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Jun 18 10:29:33 2009 +0200
shell32/tests: Fix a test failure on Vista.
---
dlls/shell32/tests/shlfolder.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 7900966..58bac8f 100644
--- 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");
}
More information about the wine-cvs
mailing list