ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Test and fix _mbsnextc.

This commit is contained in:
Mikolaj Zalewski 2007-08-19 22:34:12 -07:00 committed by Alexandre Julliard
parent ba43c67f8f
commit 545f446bf3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcrt/mbcs.c
View File

@ -282,9 +282,9 @@ int CDECL _getmbcp(void)
*/
unsigned int CDECL _mbsnextc(const unsigned char* str)
{
if(MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(*str))
if(_ismbblead(*str))
return *str << 8 | str[1];
return *str; /* ASCII CP or SB char */
return *str;
}
/*********************************************************************

10
dlls/msvcrt/tests/string.c
View File

@ -25,6 +25,8 @@
#include <stdlib.h>
#include <mbctype.h>
#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); }
static void* (*pmemcpy)(void *, const void *, size_t n);
static int* (*pmemcmp)(void *, const void *, size_t n);
@ -163,6 +165,7 @@ static void test_mbcp(void)
{
int mb_orig_max = __mb_cur_max;
int curr_mbcp = _getmbcp();
unsigned char *mbstring = (unsigned char *)"\xb0\xb1\xb2 \xb3\xb4 \xb5"; /* incorrect string */
/* some two single-byte code pages*/
test_codepage(1252);
@ -182,6 +185,13 @@ static void test_mbcp(void)
ok(_ismbblead(0x123420) == FALSE, "0x123420 should not be a lead byte\n");
ok(_ismbbtrail('\xb0'), "\xa0 should be a trail byte\n");
ok(_ismbbtrail(' ') == FALSE, "' ' should not be a trail byte\n");
/* _mbsnextc */
expect_eq(_mbsnextc(mbstring), 0xb0b1, int, "%x");
expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */
expect_eq(_mbsnextc(&mbstring[3]), 0x20, int, "%x"); /* single char */
_setmbcp(curr_mbcp);
}