mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libwinpr-crt: add proper unicode uppercasing

Browse Source
This commit is contained in:
Marc-André Moreau 2014-03-03 21:26:13 -05:00
parent fb2428309c
commit c484dc630c
3 changed files with 1088 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1041
winpr/libwinpr/crt/casing.c Normal file
View File

File diff suppressed because it is too large Load Diff

36
winpr/libwinpr/crt/string.c
View File

@ -30,6 +30,8 @@
#ifndef _WIN32
#include "casing.c"
char* _strdup(const char* strSource)
{
char* strDestination;
@ -213,25 +215,10 @@ DWORD CharUpperBuffA(LPSTR lpsz, DWORD cchLength)
DWORD CharUpperBuffW(LPWSTR lpsz, DWORD cchLength)
{
DWORD i;
unsigned char* p;
unsigned int wc, uwc;
p = (unsigned char*) lpsz;
for (i = 0; i < cchLength; i++)
{
wc = (unsigned int) (*p);
wc += (unsigned int) (*(p + 1)) << 8;
uwc = towupper(wc);
if (uwc != wc)
{
*p = uwc & 0xFF;
*(p + 1) = (uwc >> 8) & 0xFF;
}
p += 2;
lpsz[i] = WINPR_TOUPPERW(lpsz[i]);
}
return cchLength;
@ -297,25 +284,10 @@ DWORD CharLowerBuffA(LPSTR lpsz, DWORD cchLength)
DWORD CharLowerBuffW(LPWSTR lpsz, DWORD cchLength)
{
DWORD i;
unsigned char* p;
unsigned int wc, uwc;
p = (unsigned char*) lpsz;
for (i = 0; i < cchLength; i++)
{
wc = (unsigned int) (*p);
wc += (unsigned int) (*(p + 1)) << 8;
uwc = towlower(wc);
if (uwc != wc)
{
*p = uwc & 0xFF;
*(p + 1) = (uwc >> 8) & 0xFF;
}
p += 2;
lpsz[i] = WINPR_TOLOWERW(lpsz[i]);
}
return cchLength;

43
winpr/libwinpr/crt/test/TestUnicodeConversion.c
View File

@ -78,6 +78,14 @@ static BYTE ch_HowAreYou_UTF16[] = "\x60\x4F\x7D\x59\x17\x54\x00\x00";
static int ch_HowAreYou_cchWideChar = 4;
static int ch_HowAreYou_cbMultiByte = 10;
/* Uppercasing */
static BYTE ru_Administrator_lower[] =
"\xd0\x90\xd0\xb4\xd0\xbc\xd0\xb8\xd0\xbd\xd0\xb8\xd1\x81\xd1\x82\xd1\x80\xd0\xb0\xd1\x82\xd0\xbe\xd1\x80\x00";
static BYTE ru_Administrator_upper[] =
"\xd0\x90\xd0\x94\xd0\x9c\xd0\x98\xd0\x9d\xd0\x98\xd0\xa1\xd0\xa2\xd0\xa0\xd0\x90\xd0\xa2\xd0\x9e\xd0\xa0\x00";
void string_hexdump(BYTE* data, int length)
{
BYTE* p = data;
@ -242,6 +250,35 @@ int convert_utf16_to_utf8(BYTE* lpWideCharStr, BYTE* expected_lpMultiByteStr, in
return length;
}
int test_unicode_uppercasing(BYTE* lower, BYTE* upper)
{
WCHAR* lowerW = NULL;
int lowerLength;
WCHAR* upperW = NULL;
int upperLength;
lowerLength = ConvertToUnicode(CP_UTF8, 0, (LPSTR) lower, -1, &lowerW, 0);
upperLength = ConvertToUnicode(CP_UTF8, 0, (LPSTR) upper, -1, &upperW, 0);
CharUpperBuffW(lowerW, lowerLength);
if (_wcscmp(lowerW, upperW) != 0)
{
printf("Lowercase String:\n");
string_hexdump((BYTE*) lowerW, lowerLength * 2);
printf("Uppercase String:\n");
string_hexdump((BYTE*) upperW, upperLength * 2);
return -1;
}
free(lowerW);
free(upperW);
return 0;
}
int TestUnicodeConversion(int argc, char* argv[])
{
/* Letters */
@ -324,5 +361,11 @@ int TestUnicodeConversion(int argc, char* argv[])
if (convert_utf16_to_utf8(ch_HowAreYou_UTF16, ch_HowAreYou_UTF8, ch_HowAreYou_cbMultiByte) < 1)
return -1;
/* Uppercasing */
printf("Uppercasing\n");
test_unicode_uppercasing(ru_Administrator_lower, ru_Administrator_upper);
return 0;
}