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

[Alexandre Julliard]

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

Author: Rob Shearman <robertshearman(a)gmail.com>
Date:   Thu Feb  5 16:22:30 2009 +0000

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.

---

 dlls/ole32/tests/ole2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c
index 42b8fa6..2c5ed47 100644
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -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",
                     fmtetc.cfFormat, fmtetc.tymed, hr);
             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",
                     fmtetc.cfFormat, fmtetc.tymed, hr);
             else