Update RtlIsTextUnicode, ntdll rtlstr winetest failure down by 10, one remaining

svn path=/trunk/; revision=38051
This commit is contained in:
Gregor Schneider 2008-12-13 21:22:07 +00:00
parent 681e0e0b24
commit d7b72f79a2

View file

@ -15,6 +15,8 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#include <wine/unicode.h>
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
extern BOOLEAN NlsMbCodePageTag; extern BOOLEAN NlsMbCodePageTag;
@ -1059,6 +1061,8 @@ BOOLEAN
NTAPI NTAPI
RtlIsTextUnicode( PVOID buf, INT len, INT *pf ) RtlIsTextUnicode( PVOID buf, INT len, INT *pf )
{ {
static const WCHAR std_control_chars[] = {'\r','\n','\t',' ',0x3000,0};
static const WCHAR byterev_control_chars[] = {0x0d00,0x0a00,0x0900,0x2000,0};
const WCHAR *s = buf; const WCHAR *s = buf;
int i; int i;
unsigned int flags = ~0U, out_flags = 0; unsigned int flags = ~0U, out_flags = 0;
@ -1118,6 +1122,30 @@ RtlIsTextUnicode( PVOID buf, INT len, INT *pf )
} }
} }
if (flags & IS_TEXT_UNICODE_CONTROLS)
{
for (i = 0; i < len; i++)
{
if (strchrW(std_control_chars, s[i]))
{
out_flags |= IS_TEXT_UNICODE_CONTROLS;
break;
}
}
}
if (flags & IS_TEXT_UNICODE_REVERSE_CONTROLS)
{
for (i = 0; i < len; i++)
{
if (strchrW(byterev_control_chars, s[i]))
{
out_flags |= IS_TEXT_UNICODE_REVERSE_CONTROLS;
break;
}
}
}
if (pf) if (pf)
{ {
out_flags &= *pf; out_flags &= *pf;