commit 4751ff2b44273701b17bf83a8107e4d07360929b
author Robert Reif <reif@earthlink.net> Sun May 30 03:11:24 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun May 30 03:11:24 2004 +0000
tree fd0c585dd6e2bca001885e0bd3ceb04a7727e876
parent 08183bdbfd9696fa12f3ea9ea2a7433ac715ecd0

NT 4.0 doesn't support MAP_EXPAND_LIGATURES so skip test if it returns
ERROR_INVALID_FLAGS.

dlls/kernel/tests/locale.c

diff --git a/dlls/kernel/tests/locale.c b/dlls/kernel/tests/locale.c
index 5c044a9..57002b3 100644
--- a/dlls/kernel/tests/locale.c
+++ b/dlls/kernel/tests/locale.c
@@ -1468,20 +1468,23 @@
   /* MAP_EXPAND_LIGATURES */
   SetLastError(0);
   ret = pFoldStringA(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
-  EXPECT_LEN(sizeof(ligatures_dst)); EXPECT_VALID;
-  ok(strcmp(dst, ligatures_dst) == 0,
-     "MAP_EXPAND_LIGATURES: Expected '%s', got '%s'\n", ligatures_dst, dst);
-  for (i = 1; i < 256; i++)
-  {
-    if (!strchr(ligatures_src, i))
+  /* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
+  if (ret != 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);
+    for (i = 1; i < 256; i++)
     {
-      src[0] = i;
-      src[1] = '\0';
-      SetLastError(0);
-      ret = pFoldStringA(MAP_EXPAND_LIGATURES, src, -1, dst, 256);
-      EXPECT_LEN(2); EXPECT_VALID;
-      ok(dst[0] == src[0],
-         "MAP_EXPAND_LIGATURES: Expected '%s', got '%s'\n", src, dst);
+      if (!strchr(ligatures_src, i))
+      {
+        src[0] = i;
+        src[1] = '\0';
+        SetLastError(0);
+        ret = pFoldStringA(MAP_EXPAND_LIGATURES, src, -1, dst, 256);
+        EXPECT_LEN(2); EXPECT_VALID;
+        ok(dst[0] == src[0],
+           "MAP_EXPAND_LIGATURES: Expected '%s', got '%s'\n", src, dst);
+      }
     }
   }
 
@@ -1852,21 +1855,24 @@
   /* MAP_EXPAND_LIGATURES */
   SetLastError(0);
   ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
-  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");
-  for (i = 1; i <= 0xffff; i++)
-  {
-    if (!strchrW(ligatures_src, i))
+  /* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
+  if (ret != 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");
+    for (i = 1; i <= 0xffff; i++)
     {
-      src[0] = i;
-      src[1] = '\0';
-      SetLastError(0);
-      ret = pFoldStringW(MAP_EXPAND_LIGATURES, src, -1, dst, 256);
-      EXPECT_LEN(2); EXPECT_VALID;
-      ok(dst[0] == src[0],
-         "MAP_EXPAND_LIGATURES: 0x%02x : Expected 0x%02x, got 0x%02x\n",
-         i, src[0], dst[0]);
+      if (!strchrW(ligatures_src, i))
+      {
+        src[0] = i;
+        src[1] = '\0';
+        SetLastError(0);
+        ret = pFoldStringW(MAP_EXPAND_LIGATURES, src, -1, dst, 256);
+        EXPECT_LEN(2); EXPECT_VALID;
+        ok(dst[0] == src[0],
+           "MAP_EXPAND_LIGATURES: 0x%02x : Expected 0x%02x, got 0x%02x\n",
+           i, src[0], dst[0]);
+      }
     }
   }