Huw Davies : user32/tests: Fix tests on win9x.

Alexandre Julliard julliard at winehq.org
Tue Apr 21 11:45:45 CDT 2009


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Tue Apr 21 10:38:52 2009 +0100

user32/tests: Fix tests on win9x.

---

 dlls/user32/tests/clipboard.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c
index 51aa852..e2ba2f9 100644
--- a/dlls/user32/tests/clipboard.c
+++ b/dlls/user32/tests/clipboard.c
@@ -244,9 +244,12 @@ static void test_synthesized(void)
     ok(cf == CF_OEMTEXT, "cf %08x\n", cf);
 
     cf = EnumClipboardFormats(cf);
-    ok(cf == CF_UNICODETEXT, "cf %08x\n", cf);
+    ok(cf == CF_UNICODETEXT ||
+       broken(cf == CF_METAFILEPICT), /* win9x and winME has no CF_UNICODETEXT */
+       "cf %08x\n", cf);
 
-    cf = EnumClipboardFormats(cf);
+    if(cf == CF_UNICODETEXT)
+        cf = EnumClipboardFormats(cf);
     ok(cf == CF_METAFILEPICT, "cf %08x\n", cf);
 
     cf = EnumClipboardFormats(cf);




More information about the wine-cvs mailing list