msvcrt[1/2]: don't test codepage 20932

Mikolaj Zalewski mikolajz at google.com
Wed Aug 22 21:17:43 CDT 2007


  On some systems we obtain a different set of lead/tail bytes, so it
seems it is configuration-dependent. There are even some differences
in CP1250 and CP1252 - I will try to look into it.
-------------- next part --------------
From 45fa4da5772b909deb6b2b74fb33a260ad6d7c96 Mon Sep 17 00:00:00 2001
From: Mikolaj Zalewski <mikolaj at zalewski.pl>
Date: Wed, 22 Aug 2007 18:41:32 -0700
Subject: [PATCH] msvcrt: don't test codepage 20932
---
 dlls/msvcrt/mbcs.c         |    2 +-
 dlls/msvcrt/tests/string.c |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 0452089..53fd8a3 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -50,7 +50,7 @@ static struct cp_extra_info_t g_cpextrai
     {936, {0x40, 0xfe, 0, 0}},
     {949, {0x41, 0xfe, 0, 0}},
     {950, {0x40, 0x7e, 0xa1, 0xfe, 0, 0}},
-    {20932, {1, 255, 0, 0}},
+    {20932, {1, 255, 0, 0}},  /* seems to give different results on different systems */
     {0, {1, 255, 0, 0}}       /* match all with FIXME */
 };
 
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index d400823..698a3af 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -143,12 +143,9 @@ static int result_cp_949_mbctype[] = { 0
   0,1 };
 static int result_cp_950_mbctype[] = { 0x0,65, 0x8,1, 0x18,26, 0x8,6, 0x28,26, 0x8,4,
   0x0,2, 0x4,32, 0xc,94, 0,1 };
-static int result_cp_20932_mbctype[] = { 0x0,2, 0x8,64, 0x18,26, 0x8,6, 0x28,26, 0x8,19,
-  0xc,1, 0x8,18, 0xc,94, 0,1 };
 
 static int todo_none[] = { -2 };
 static int todo_cp_932[] = { 254, -2 };
-static int todo_cp_20932[] = { 143, -2 };
 
 void test_cp_table(int cp, int *result, int *todo)
 {
@@ -197,7 +194,6 @@ static void test_mbcp(void)
     test_codepage(936);
     test_codepage(949);
     test_codepage(950);
-    test_codepage_todo(20932, todo_cp_20932);
 
     _setmbcp(936);
     ok(__mb_cur_max == mb_orig_max, "__mb_cur_max shouldn't be updated (is %d != %d)\n", __mb_cur_max, mb_orig_max);
-- 
1.4.1


More information about the wine-patches mailing list