Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed RtlCompareUnicodeString and RtlCompareString (said stuff were equal when it was not) by ripping from wine

Browse source 
svn path=/trunk/; revision=17601
This commit is contained in:
Gunnar Dalsnes 2005-09-01 21:09:07 +00:00
parent 5fb5193c82
commit bec034b146
1 changed files with 43 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

182
reactos/lib/rtl/unicode.c
View file

@ -237,47 +237,28 @@ RtlCharToInteger(
LONG LONG
STDCALL STDCALL
RtlCompareString( RtlCompareString(
IN PSTRING String1, IN PSTRING s1,
IN PSTRING String2, IN PSTRING s2,
IN BOOLEAN CaseInsensitive) IN BOOLEAN CaseInsensitive)
{ {
ULONG len1, len2; unsigned int len;
PCHAR s1, s2; LONG ret = 0;
CHAR c1, c2; LPCSTR p1, p2;
if (String1 && String2) len = min(s1->Length, s2->Length);
p1 = s1->Buffer;
p2 = s2->Buffer;
if (CaseInsensitive)
{ {
len1 = String1->Length; while (!ret && len--) ret = RtlUpperChar(*p1++) - RtlUpperChar(*p2++);
len2 = String2->Length;
s1 = String1->Buffer;
s2 = String2->Buffer;
if (s1 && s2)
{
if (CaseInsensitive)
{
for(;;)
{
c1 = len1-- ? RtlUpperChar (*s1++) : 0;
c2 = len2-- ? RtlUpperChar (*s2++) : 0;
if (!c1 || !c2 || c1 != c2)
return c1 - c2;
}
}
else
{
for(;;)
{
c1 = len1-- ? *s1++ : 0;
c2 = len2-- ? *s2++ : 0;
if (!c1 || !c2 || c1 != c2)
return c1 - c2;
}
}
}
} }
else
return 0; {
while (!ret && len--) ret = *p1++ - *p2++;
}
if (!ret) ret = s1->Length - s2->Length;
return ret;
} }
@ -290,40 +271,12 @@ RtlCompareString(
BOOLEAN BOOLEAN
STDCALL STDCALL
RtlEqualString( RtlEqualString(
IN PSTRING String1, IN PSTRING s1,
IN PSTRING String2, IN PSTRING s2,
IN BOOLEAN CaseInsensitive) IN BOOLEAN CaseInsensitive)
{ {
ULONG i; if (s1->Length != s2->Length) return FALSE;
CHAR c1, c2; return !RtlCompareString(s1, s2, CaseInsensitive );
PCHAR p1, p2;
if (String1->Length != String2->Length)
return FALSE;
p1 = String1->Buffer;
p2 = String2->Buffer;
for (i = 0; i < String1->Length; i++)
{
if (CaseInsensitive == TRUE)
{
c1 = RtlUpperChar (*p1);
c2 = RtlUpperChar (*p2);
}
else
{
c1 = *p1;
c2 = *p2;
}
if (c1 != c2)
return FALSE;
p1++;
p2++;
}
return TRUE;
} }
@ -336,41 +289,12 @@ RtlEqualString(
BOOLEAN BOOLEAN
STDCALL STDCALL
RtlEqualUnicodeString( RtlEqualUnicodeString(
IN CONST UNICODE_STRING *String1, IN CONST UNICODE_STRING *s1,
IN CONST UNICODE_STRING *String2, IN CONST UNICODE_STRING *s2,
IN BOOLEAN CaseInsensitive) IN BOOLEAN CaseInsensitive)
{ {
ULONG i; if (s1->Length != s2->Length) return FALSE;
WCHAR wc1, wc2; return !RtlCompareUnicodeString((PUNICODE_STRING)s1, (PUNICODE_STRING)s2, CaseInsensitive );
PWCHAR pw1, pw2;
if (String1->Length != String2->Length)
return FALSE;
pw1 = String1->Buffer;
pw2 = String2->Buffer;
for (i = 0; i < String1->Length / sizeof(WCHAR); i++)
{
if (CaseInsensitive == TRUE)
{
wc1 = RtlUpcaseUnicodeChar (*pw1);
wc2 = RtlUpcaseUnicodeChar (*pw2);
}
else
{
wc1 = *pw1;
wc2 = *pw2;
}
if (wc1 != wc2)
return FALSE;
pw1++;
pw2++;
}
return TRUE;
} }
@ -1983,58 +1907,38 @@ RtlUnicodeStringToAnsiSize(
} }
/* /*
* @implemented * @implemented
*/ */
LONG LONG
STDCALL STDCALL
RtlCompareUnicodeString( RtlCompareUnicodeString(
IN PUNICODE_STRING String1, IN PUNICODE_STRING s1,
IN PUNICODE_STRING String2, IN PUNICODE_STRING s2,
IN BOOLEAN CaseInsensitive) IN BOOLEAN CaseInsensitive)
{ {
ULONG len1, len2; unsigned int len;
PWCHAR s1, s2; LONG ret = 0;
WCHAR c1, c2; LPCWSTR p1, p2;
if (String1 && String2) len = min(s1->Length, s2->Length) / sizeof(WCHAR);
p1 = s1->Buffer;
p2 = s2->Buffer;
if (CaseInsensitive)
{ {
len1 = String1->Length / sizeof(WCHAR); while (!ret && len--) ret = RtlUpcaseUnicodeChar(*p1++) - RtlUpcaseUnicodeChar(*p2++);
len2 = String2->Length / sizeof(WCHAR);
s1 = String1->Buffer;
s2 = String2->Buffer;
if (s1 && s2)
{
if (CaseInsensitive)
{
while (1)
{
c1 = len1-- ? RtlUpcaseUnicodeChar (*s1++) : 0;
c2 = len2-- ? RtlUpcaseUnicodeChar (*s2++) : 0;
if (!c1 || !c2 || c1 != c2)
return c1 - c2;
}
}
else
{
while (1)
{
c1 = len1-- ? *s1++ : 0;
c2 = len2-- ? *s2++ : 0;
if (!c1 || !c2 || c1 != c2)
return c1 - c2;
}
}
}
} }
else
return 0; {
while (!ret && len--) ret = *p1++ - *p2++;
}
if (!ret) ret = s1->Length - s2->Length;
return ret;
} }
/* /*
* @implemented * @implemented
*/ */