Nikolay Sivov : shell32/tests: Fix tests failures on win2k.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jun 5 06:46:10 CDT 2015
Module: wine
Branch: master
Commit: d5d49464d30582c904c199be21975562be3366c8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d49464d30582c904c199be21975562be3366c8
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Jun 4 20:28:50 2015 +0300
shell32/tests: Fix tests failures on win2k.
---
dlls/shell32/tests/shelldispatch.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 22eabf5..1f27cfa 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -451,7 +451,7 @@ if (0) /* crashes on pre-vista */ {
disp = (void*)0xdeadbeef;
hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IShellFolderViewDual, (void**)&disp);
- ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
+ ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL) /* win2k */, "got 0x%08x\n", hr);
ok(disp == NULL, "got %p\n", disp);
IShellView_Release(view);
@@ -704,14 +704,14 @@ static void test_ParseName(void)
item = (void*)0xdeadbeef;
hr = Folder_ParseName(folder, NULL, &item);
- ok(hr == S_FALSE, "got 0x%08x\n", hr);
+ ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr);
ok(item == NULL, "got %p\n", item);
/* empty name */
str = SysAllocStringLen(NULL, 0);
item = (void*)0xdeadbeef;
hr = Folder_ParseName(folder, str, &item);
- ok(hr == S_FALSE, "got 0x%08x\n", hr);
+ ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr);
ok(item == NULL, "got %p\n", item);
SysFreeString(str);
@@ -719,7 +719,7 @@ static void test_ParseName(void)
str = SysAllocString(cadabraW);
item = (void*)0xdeadbeef;
hr = Folder_ParseName(folder, str, &item);
- ok(hr == S_FALSE, "got 0x%08x\n", hr);
+ ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr);
ok(item == NULL, "got %p\n", item);
SysFreeString(str);
More information about the wine-cvs
mailing list