Skip to content

W
wine-cw
Commit cfd32a51 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

shell32/tests: Fix some test failures on Win9x and NT4.

parent d2837cb9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/shell32/tests/shlfolder.c
View file @ cfd32a51
...@@ -263,13 +263,17 @@ static void test_EnumObjects(IShellFolder *iFolder) ...@@ -263,13 +263,17 @@ static void test_EnumObjects(IShellFolder *iFolder)
hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags);
flags &= SFGAO_testfor; flags &= SFGAO_testfor;
ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); 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; flags = SFGAO_testfor;
hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags);
flags &= SFGAO_testfor; flags &= SFGAO_testfor;
ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); 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++) for (i=0;i<5;i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment