tests - kernel - locale - Accept differing date format in Win NT and Win 95

Jakob Eriksson jakov at vmlinux.org
Mon Feb 28 19:40:47 CST 2005


Accept (shorter) date format in Win NT and Win 95


-------------- next part --------------
Index: dlls/kernel/tests/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/locale.c,v
retrieving revision 1.34
diff -u -r1.34 locale.c
--- dlls/kernel/tests/locale.c	9 Dec 2004 14:07:59 -0000	1.34
+++ dlls/kernel/tests/locale.c	1 Mar 2005 00:34:59 -0000
@@ -353,7 +353,9 @@
 
   STRINGSA("ddd',' MMM dd ''''yy","5/4/2002"); /* Default to DATE_SHORTDATE */
   ret = GetDateFormat(lcid, NUO, &curtime, NULL, buffer, COUNTOF(buffer));
-  EXPECT_VALID; EXPECT_LENA; EXPECT_EQA;
+  EXPECT_VALID; EXPECT_LENA;
+  if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0)
+	  ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer);
 
   STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */
   ret = GetDateFormat(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer));


More information about the wine-patches mailing list