shell32/tests: Fix some test failures on Windows 7.

This commit is contained in:
Paul Vriens 2009-11-25 11:15:48 +01:00 committed by Alexandre Julliard
parent 489b73dd9e
commit 1da30597e4
1 changed files with 4 additions and 2 deletions

View File

@ -472,7 +472,8 @@ static void test_GetDisplayName(void)
/* WinXP and up store the filenames as both ANSI and UNICODE in the pidls */ /* WinXP and up store the filenames as both ANSI and UNICODE in the pidls */
if (pidlLast->mkid.cb >= 76) { 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 */ (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)) || /* Vista */
(pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)), /* Win7 */
"Filename should be stored as wchar-string at this position!\n"); "Filename should be stored as wchar-string at this position!\n");
} }
@ -1529,7 +1530,8 @@ static void test_ITEMIDLIST_format(void) {
"Last write time should match last access time!\n"); "Last write time should match last access time!\n");
ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) ||
!lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)), /* Vista */ !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */
!lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 26)), /* Win7 */
"The filename should be stored in unicode at this position!\n"); "The filename should be stored in unicode at this position!\n");
} }
} }