Module: wine
Branch: master
Commit: cca34925574f0f0dcbb27392a0aa8232cd78a1e6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca34925574f0f0dcbb27392a…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com>
Date: Thu Jun 18 10:45:44 2009 +0200
shell32/tests: Fix a test failure on Vista and higher.
---
dlls/shell32/tests/shlfolder.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index c25c4a9..255d019 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -962,7 +962,9 @@ static void test_SHGetPathFromIDList(void)
wszPath[1] = '\0';
result = pSHGetPathFromIDListW(pidlMyComputer, wszPath);
ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n");
- ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDListW shouldn't set last error! Last error: %u\n", GetLastError());
+ ok (GetLastError()==0xdeadbeef ||
+ GetLastError()==ERROR_SUCCESS, /* Vista and higher */
+ "Unexpected last error from SHGetPathFromIDListW: %u\n", GetLastError());
ok (!wszPath[0], "Expected empty path\n");
if (result) {
IShellFolder_Release(psfDesktop);
Module: wine
Branch: master
Commit: 29c51bdb0494c91a3e09dadfc840f92c9c80bd86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c51bdb0494c91a3e09dadfc…
Author: Paul Vriens <Paul.Vriens.Wine(a)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");
}