Skip to content

W
wine-winehq
Commit 40660894 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

ole32: Fix an ole2 test failure on Win9x and NT4.

The combination of CF_BITMAP and TYMED_GLOBAL isn't accepted on newer versions of Windows, so mark it as broken.
parent 029c3fbb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
dlls/ole32/tests/ole2.c
View file @ 40660894
...@@ -1167,7 +1167,8 @@ static void test_data_cache(void) ...@@ -1167,7 +1167,8 @@ static void test_data_cache(void)
ok(hr == S_OK, "IOleCache_Cache cfFormat = %d, tymed = %d should have returned S_OK instead of 0x%08x\n", ok(hr == S_OK, "IOleCache_Cache cfFormat = %d, tymed = %d should have returned S_OK instead of 0x%08x\n",
fmtetc.cfFormat, fmtetc.tymed, hr); fmtetc.cfFormat, fmtetc.tymed, hr);
else if (fmtetc.tymed == TYMED_HGLOBAL) else if (fmtetc.tymed == TYMED_HGLOBAL)
ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED, ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED ||
broken(hr == S_OK && fmtetc.cfFormat == CF_BITMAP) /* Win9x & NT4 */,
"IOleCache_Cache cfFormat = %d, tymed = %d should have returned CACHE_S_FORMATETC_NOTSUPPORTED instead of 0x%08x\n", "IOleCache_Cache cfFormat = %d, tymed = %d should have returned CACHE_S_FORMATETC_NOTSUPPORTED instead of 0x%08x\n",
fmtetc.cfFormat, fmtetc.tymed, hr); fmtetc.cfFormat, fmtetc.tymed, hr);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment