Huw Davies : ole32/tests: win9x and winme don't have CF_UNICODETEXT.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Wed Apr 22 10:25:59 2009 +0100

ole32/tests: win9x and winme don't have CF_UNICODETEXT.

---

dlls/ole32/tests/clipboard.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c
index 65af5bd..fd4a4e0 100644
--- a/dlls/ole32/tests/clipboard.c
+++ b/dlls/ole32/tests/clipboard.c
@@ -1285,14 +1285,19 @@ static void test_nonole_clipboard(void)

hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL);
     ok(hr == S_OK, "got %08x\n", hr);
-    ok(fmt.cfFormat == CF_UNICODETEXT, "cf %04x\n", fmt.cfFormat);
-    ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd);
-    ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);
-    ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex);
-    ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed);
+    ok(fmt.cfFormat == CF_UNICODETEXT ||
+       broken(fmt.cfFormat == CF_METAFILEPICT), /* win9x and winme don't have CF_UNICODETEXT */
+       "cf %04x\n", fmt.cfFormat);
+    if(fmt.cfFormat == CF_UNICODETEXT)
+    {
+        ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd);
+        ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);
+        ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex);
+        ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed);

-    hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL);
-    ok(hr == S_OK, "got %08x\n", hr);
+        hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL);
+        ok(hr == S_OK, "got %08x\n", hr);
+    }
     ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat);
     ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd);
     ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);