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

f9d48e7b · Huw Davies · Alexandre Julliard · 508d6db8 · f9d48e7b
Commit f9d48e7b authored Apr 22, 2009 by Huw Davies Committed by Alexandre Julliard Apr 22, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 7 deletions

clipboard.c dlls/ole32/tests/clipboard.c +12 -7

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