Paul Vriens : shell32/tests: Fix some test failures on Vista and higher.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a4477bac28b0265cab4cbc6fe94e69d345b2ef7d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a4477bac28b0265cab4cbc6fe9...

Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com>
Date:   Thu Jun 18 18:20:18 2009 +0200

shell32/tests: Fix some test failures 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 afb2840..7487376 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -274,13 +274,15 @@ static void test_EnumObjects(IShellFolder *iFolder)
     for (i = 0; i < 5; i++)
     {
         SFGAOF flags;
+#define SFGAO_VISTA SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY
         /* Native returns all flags no matter what we ask for */
         flags = SFGAO_CANCOPY;
         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]) ||
-           flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */
+           flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR) || /* Win9x, NT4 */
+           flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */
            "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]);
 
         flags = SFGAO_testfor;