James Hawkins : shell32: Fix a test that fails in win2k.

Alexandre Julliard julliard at winehq.org
Tue Jul 1 08:27:48 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Tue Jul  1 00:48:38 2008 -0500

shell32: Fix a test that fails in win2k.

---

 dlls/shell32/tests/shfldr_special.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c
index 9e64d30..ef2f0fd 100644
--- a/dlls/shell32/tests/shfldr_special.c
+++ b/dlls/shell32/tests/shfldr_special.c
@@ -43,6 +43,7 @@ static void test_parse_for_entire_network(void)
     LPITEMIDLIST pidl;
     DWORD attr = ~0;
     DWORD expected_attr;
+    DWORD alter_attr;
 
     hr = SHGetDesktopFolder(&psfDesktop);
     ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr);
@@ -52,8 +53,11 @@ static void test_parse_for_entire_network(void)
     todo_wine
     ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten);
     expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_STORAGEANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK;
+    alter_attr = (expected_attr & (~SFGAO_STORAGEANCESTOR)) | SFGAO_STREAM;
     todo_wine
-    ok(attr == expected_attr, "attr should be 0x%x, not 0x%x\n", expected_attr, attr);
+    ok(attr == expected_attr ||
+       attr == alter_attr, /* win2k */
+       "attr should be 0x%x or 0x%x, not 0x%x\n", expected_attr, alter_attr, attr);
 
     ILFree(pidl);
 }




More information about the wine-cvs mailing list