shell32/tests: NT4 has not interface Folder2.
Alexander Morozov
amorozov at etersoft.ru
Fri Feb 4 06:46:40 CST 2011
This patch should fix test failure on some NT4:
http://test.winehq.org/data/745a50c9dbb03d37db58ff53136e93f00943bc0d/nt4_fg-winnt4-ie550/shell32:shelldispatch.html
-------------- next part --------------
From dbc97a4a08d6637c06b4de1f8b2781f54cdf67ec Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov at etersoft.ru>
Date: Fri, 4 Feb 2011 15:32:06 +0300
Subject: [PATCH] shell32/tests: NT4 has not interface Folder2.
---
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);
--
1.7.3.5
More information about the wine-patches
mailing list