Ge van Geldorp : shell32/tests: Fix tests on Vista+.

[Alexandre Julliard]

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

Author: Ge van Geldorp <ggeldorp at vmware.com>
Date:   Wed Sep  2 12:16:01 2009 +0200

shell32/tests: Fix tests on Vista+.

---

 dlls/shell32/tests/shelllink.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index 15a93db..c28c715 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -651,16 +651,12 @@ static void test_load_save(void)
 static void test_datalink(void)
 {
     static const WCHAR lnk[] = {
-      ':',':','{','9','d','b','1','1','8','6','f','-','4','0','d','f','-','1',
+      ':',':','{','9','d','b','1','1','8','6','e','-','4','0','d','f','-','1',
       '1','d','1','-','a','a','8','c','-','0','0','c','0','4','f','b','6','7',
-      '8','6','3','}',':','{','0','0','0','1','0','4','0','9','-','7','8','E',
-      '1','-','1','1','D','2','-','B','6','0','F','-','0','0','6','0','9','7',
-      'C','9','9','8','E','7','}',':',':','{','9','d','b','1','1','8','6','e',
-      '-','4','0','d','f','-','1','1','d','1','-','a','a','8','c','-','0','0',
-      'c','0','4','f','b','6','7','8','6','3','}',':','2','6',',','!','!','g',
-      'x','s','f','(','N','g',']','q','F','`','H','{','L','s','A','C','C','E',
-      'S','S','F','i','l','e','s','>','p','l','T',']','j','I','{','j','f','(',
-      '=','1','&','L','[','-','8','1','-',']',':',':',0 };
+      '8','6','3','}',':','2','6',',','!','!','g','x','s','f','(','N','g',']',
+      'q','F','`','H','{','L','s','A','C','C','E','S','S','F','i','l','e','s',
+      '>','p','l','T',']','j','I','{','j','f','(','=','1','&','L','[','-','8',
+      '1','-',']',':',':',0 };
     static const WCHAR comp[] = {
       '2','6',',','!','!','g','x','s','f','(','N','g',']','q','F','`','H','{',
       'L','s','A','C','C','E','S','S','F','i','l','e','s','>','p','l','T',']',
@@ -715,7 +711,8 @@ static void test_datalink(void)
     flags = 0;
     r = IShellLinkDataList_GetFlags( dl, &flags );
     ok( r == S_OK, "GetFlags failed\n");
-    ok( flags == (SLDF_HAS_DARWINID|SLDF_HAS_LOGO3ID),
+    /* SLDF_HAS_LOGO3ID is no longer supported on Vista+, filter it out */
+    ok( (flags & (~ SLDF_HAS_LOGO3ID)) == SLDF_HAS_DARWINID,
         "GetFlags returned wrong flags\n");
 
     dar = NULL;