locale test bug fix patch

Robert Reif reif at earthlink.net
Thu Jun 3 06:23:01 CDT 2004


I got the test for failure on NT wrong in my last patch.
The function returns 0 on error and sets last error to ERROR_INVALID_FLAGS.
-------------- next part --------------
Index: dlls/kernel/tests/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/locale.c,v
retrieving revision 1.29
diff -u -r1.29 locale.c
--- dlls/kernel/tests/locale.c	30 May 2004 03:11:24 -0000	1.29
+++ dlls/kernel/tests/locale.c	3 Jun 2004 11:17:09 -0000
@@ -1469,7 +1469,7 @@
   SetLastError(0);
   ret = pFoldStringA(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
   /* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
-  if (ret != ERROR_INVALID_FLAGS) {
+  if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) {
     EXPECT_LEN(sizeof(ligatures_dst)); EXPECT_VALID;
     ok(strcmp(dst, ligatures_dst) == 0,
        "MAP_EXPAND_LIGATURES: Expected '%s', got '%s'\n", ligatures_dst, dst);
@@ -1856,7 +1856,7 @@
   SetLastError(0);
   ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
   /* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
-  if (ret != ERROR_INVALID_FLAGS) {
+  if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) {
     EXPECT_LEN(sizeof(ligatures_dst)/sizeof(ligatures_dst[0])); EXPECT_VALID;
     ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)),
        "MAP_EXPAND_LIGATURES: Expanded incorrectly\n");


More information about the wine-patches mailing list