Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL][ADVAPI32_APITEST] RtlIsTextUnicode: Don't change weight unless lead-byte flag (#5396)

Browse source 
- Fix the garbled characters (a.k.a. mojibake) in some Japanese text files.
- weight will remain 3 unless IS_TEXT_UNICODE_DBCS_LEADBYTE flag is set.
- Strengthen advapi32_apitest IsTextUnicode testcase.
CORE-19016
This commit is contained in:
Katayama Hirofumi MZ 2023-07-05 12:01:42 +09:00 committed by GitHub
parent 7fafeb6390
commit 17e9dcc922
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/rostests/apitests/advapi32/IsTextUnicode.c
View file

@ -4,6 +4,7 @@
* PURPOSE: Tests for (Rtl)IsTextUnicode.
* PROGRAMMERS: Hermes Belusca-Maito
* Dmitry Chapyshev
* Katayama Hirofumi MZ
*/
#include "precomp.h"
@ -128,6 +129,9 @@ START_TEST(IsTextUnicode)
};
const char japanese_with_lead[] = "ABC" "\x83\x40" "D";
const char japanese_sjis[] = "\x93\xFA\x96\x7B\x8C\xEA\x31\x32\x33\x93\xFA\x96\x7B\x8C\xEA";
const char japanese_utf8[] = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\x31\x32\x33\xE6\x97\xA5"
"\xE6\x9C\xAC\xE8\xAA\x9E";
const char simplfied_chinese_with_lead[] = "ABC" "\xC5\xC5" "D";
const char korean_with_lead[] = "ABC" "\xBF\xAD" "D";
const char traditional_chinese_with_lead[] = "ABC" "\xB1\xC1" "D";
@ -149,8 +153,30 @@ START_TEST(IsTextUnicode)
SetupLocale(932, 932, -1);
Result = IS_TEXT_UNICODE_DBCS_LEADBYTE;
ok(!IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n");
ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE);
ok_int(IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), FALSE);
ok_int(Result, IS_TEXT_UNICODE_DBCS_LEADBYTE);
ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, NULL), FALSE);
Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS;
ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, &Result), FALSE);
ok_int(Result, 0);
Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS |
IS_TEXT_UNICODE_DBCS_LEADBYTE;
ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, &Result), FALSE);
ok_int(Result, (IS_TEXT_UNICODE_DBCS_LEADBYTE | IS_TEXT_UNICODE_REVERSE_STATISTICS));
ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, NULL), FALSE);
Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS;
ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, &Result), FALSE);
ok_int(Result, 0);
Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS |
IS_TEXT_UNICODE_DBCS_LEADBYTE;
ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, &Result), FALSE);
ok_int(Result, (IS_TEXT_UNICODE_DBCS_LEADBYTE | IS_TEXT_UNICODE_STATISTICS));
/* Simplified Chinese */
SetupLocale(936, 936, -1);

5
sdk/lib/rtl/unicode.c
View file

@ -1356,7 +1356,7 @@ RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf)
}
}
if (NlsMbCodePageTag)
if (NlsMbCodePageTag && pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE))
{
for (i = 0; i < len; i++)
{
@ -1378,8 +1378,7 @@ RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf)
else
weight = 1;
if (pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE))
out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE;
out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE;
}
}