Fix kernel/format_msg test

Francois Gouget fgouget at free.fr
Wed Dec 18 21:33:49 CST 2002


Changelog:

 * dlls/kernel/tests/format_msg.c

   On Win9x "hi\n" gives us "hi\r\n"


Index: dlls/kernel/tests/format_msg.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/format_msg.c,v
retrieving revision 1.2
diff -u -r1.2 format_msg.c
--- dlls/kernel/tests/format_msg.c	18 Dec 2002 20:52:00 -0000	1.2
+++ dlls/kernel/tests/format_msg.c	19 Dec 2002 03:29:20 -0000
@@ -195,8 +195,8 @@
     /* line feed */
     r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0,
         0, out, sizeof out/sizeof (CHAR));
-    ok(!strcmp("hi ", out),"failed out=[%s]",out);
-    ok(r==3,"failed: r=%ld",r);
+    ok(!strcmp("hi ", out) || !strcmp("hi\r\n", out),"failed out=[%s]",out);
+    ok(r==3 || r==4,"failed: r=%ld",r);

     /* carriage return line feed */
     r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0,



-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
           If it stinks, it's chemistry. If it moves, it's biology.
                  If it does not work, It's computer science.




More information about the wine-patches mailing list