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

kernelbase: Use a helper to get character C1 type. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-05-17 14:28:17 +03:00 committed by Alexandre Julliard
parent f010569c3d
commit 3dedcf82f7
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/kernelbase/string.c
View File

@ -28,6 +28,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(string);
static WORD get_char_type(WCHAR ch)
{
WORD type = 0;
GetStringTypeW(CT_CTYPE1, &ch, 1, &type);
return type;
}
DWORD WINAPI StrCmpCA(const char *str, const char *cmp)
{
return lstrcmpA(str, cmp);
@ -60,30 +67,22 @@ DWORD WINAPI StrCmpNICW(const WCHAR *str, const WCHAR *cmp, DWORD len)
BOOL WINAPI IsCharBlankW(WCHAR wc)
{
WORD type;
return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_BLANK);
return !!(get_char_type(wc) & C1_BLANK);
}
BOOL WINAPI IsCharCntrlW(WCHAR wc)
{
WORD type;
return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_CNTRL);
return !!(get_char_type(wc) & C1_CNTRL);
}
BOOL WINAPI IsCharDigitW(WCHAR wc)
{
WORD type;
return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_DIGIT);
return !!(get_char_type(wc) & C1_DIGIT);
}
BOOL WINAPI IsCharPunctW(WCHAR wc)
{
WORD type;
return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_PUNCT);
return !!(get_char_type(wc) & C1_PUNCT);
}
BOOL WINAPI IsCharSpaceA(CHAR c)
@ -94,16 +93,12 @@ BOOL WINAPI IsCharSpaceA(CHAR c)
BOOL WINAPI IsCharSpaceW(WCHAR wc)
{
WORD type;
return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_SPACE);
return !!(get_char_type(wc) & C1_SPACE);
}
BOOL WINAPI IsCharXDigitW(WCHAR wc)
{
WORD type;
return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_XDIGIT);
return !!(get_char_type(wc) & C1_XDIGIT);
}
WCHAR * WINAPI StrChrW(const WCHAR *str, WCHAR ch)