Patch by Thomas Faber: Fix nt version of mbstowcs.

See issue #5983 for more details.

svn path=/trunk/; revision=51003
This commit is contained in:
Timo Kreuzer 2011-03-09 15:29:13 +00:00
parent c6d8f7de70
commit 031e55222a

View file

@ -4,26 +4,35 @@
#include <ndk/rtlfuncs.h>
#include <string.h>
WCHAR NTAPI RtlAnsiCharToUnicodeChar(IN OUT PUCHAR *AnsiChar);
#undef MB_CUR_MAX
#define MB_CUR_MAX 2
/*
* @implemented
*/
int mbtowc (wchar_t *wchar, const char *mbchar, size_t count)
{
NTSTATUS Status;
ULONG Size;
UCHAR mbarr[MB_CUR_MAX] = { 0 };
PUCHAR mbs = mbarr;
WCHAR wc;
if (mbchar == NULL)
return 0;
if (wchar == NULL)
return 0;
Status = RtlMultiByteToUnicodeN (wchar,
sizeof(WCHAR),
&Size,
mbchar,
count);
if (!NT_SUCCESS(Status))
memcpy(mbarr, mbchar, min(count, sizeof mbarr));
wc = RtlAnsiCharToUnicodeChar(&mbs);
if (wc == L' ' && mbarr[0] != ' ')
return -1;
return (int)Size;
*wchar = wc;
return mbs - mbarr;
}
/*