shell32/tests: Fix some test failures on Win9x and NT4.
This commit is contained in:
parent
d2837cb94d
commit
cfd32a5119
|
@ -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++)
|
||||||
|
|
Loading…
Reference in New Issue