Alexander Morozov : shell32/tests: NT4 doesn't have the Folder2 interface.

Alexandre Julliard julliard at winehq.org
Fri Feb 4 09:37:17 CST 2011


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

Author: Alexander Morozov <amorozov at etersoft.ru>
Date:   Fri Feb  4 15:32:06 2011 +0300

shell32/tests: NT4 doesn't have the Folder2 interface.

---

 dlls/shell32/tests/shelldispatch.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 2652afe..0200e86 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -174,7 +174,9 @@ static void test_namespace(void)
     if (r == S_OK)
     {
         r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2);
-        ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r);
+        ok(r == S_OK ||
+         broken(r == E_NOINTERFACE), /* NT4 */
+         "Folder::QueryInterface failed: %08x\n", r);
         if (r == S_OK)
         {
             r = Folder2_get_Self(folder2, &item);
@@ -229,7 +231,9 @@ static void test_namespace(void)
             SysFreeString(title);
         }
         r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2);
-        ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r);
+        ok(r == S_OK ||
+         broken(r == E_NOINTERFACE), /* NT4 */
+         "Folder::QueryInterface failed: %08x\n", r);
         if (r == S_OK)
         {
             r = Folder2_get_Self(folder2, &item);
@@ -273,7 +277,9 @@ static void test_namespace(void)
                 SysFreeString(title);
             }
             r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2);
-            ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r);
+            ok(r == S_OK ||
+             broken(r == E_NOINTERFACE), /* NT4 */
+             "Folder::QueryInterface failed: %08x\n", r);
             if (r == S_OK)
             {
                 r = Folder2_get_Self(folder2, &item);




More information about the wine-cvs mailing list