Paul Vriens : shell32/tests: Fix some test failures on Win9x and NT4.
Alexandre Julliard
julliard at winehq.org
Fri Apr 24 10:00:11 CDT 2009
Module: wine
Branch: master
Commit: cfd32a511936d19da4a8270ed5e3a8e2dc002793
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd32a511936d19da4a8270ed5e3a8e2dc002793
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Fri Apr 24 09:07:23 2009 +0200
shell32/tests: Fix some test failures on Win9x and NT4.
---
dlls/shell32/tests/shlfolder.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 6a32ccf..3720340 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -263,13 +263,17 @@ static void test_EnumObjects(IShellFolder *iFolder)
hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags);
flags &= SFGAO_testfor;
ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr);
- ok(flags == (attrs[i]), "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]);
+ ok(flags == (attrs[i]) ||
+ flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */
+ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]);
flags = SFGAO_testfor;
hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags);
flags &= SFGAO_testfor;
ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr);
- ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]);
+ ok(flags == attrs[i] ||
+ flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */
+ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]);
}
for (i=0;i<5;i++)
More information about the wine-cvs
mailing list