Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed some type casts to get correct index values into the nls tables.

Browse source 
svn path=/trunk/; revision=6277
This commit is contained in:
Hartmut Birr 2003-10-11 17:23:52 +00:00
parent a7d3c209b1
commit 056d573329
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/ntoskrnl/rtl/nls.c
View file

@ -1,4 +1,4 @@
/* $Id: nls.c,v 1.20 2003/08/10 10:09:51 ekohl Exp $ /* $Id: nls.c,v 1.21 2003/10/11 17:23:52 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -217,7 +217,7 @@ RtlCustomCPToUnicodeN(IN PCPTABLEINFO CustomCP,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
*UnicodeString = CustomCP->MultiByteTable[(unsigned int)*CustomString]; *UnicodeString = CustomCP->MultiByteTable[(UCHAR)*CustomString];
UnicodeString++; UnicodeString++;
CustomString++; CustomString++;
} }
@ -373,7 +373,7 @@ RtlMultiByteToUnicodeN(PWCHAR UnicodeString,
*ResultSize = Size * sizeof(WCHAR); *ResultSize = Size * sizeof(WCHAR);
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
UnicodeString[i] = NlsAnsiToUnicodeTable[(unsigned int)MbString[i]]; UnicodeString[i] = NlsAnsiToUnicodeTable[(UCHAR)MbString[i]];
} }
else else
{ {
@ -446,7 +446,7 @@ RtlOemToUnicodeN(PWCHAR UnicodeString,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
*UnicodeString = NlsOemToUnicodeTable[(unsigned int)*OemString]; *UnicodeString = NlsOemToUnicodeTable[(UCHAR)*OemString];
UnicodeString++; UnicodeString++;
OemString++; OemString++;
} }
@ -517,7 +517,7 @@ RtlUnicodeToCustomCPN(IN PCPTABLEINFO CustomCP,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
*CustomString = ((PCHAR)CustomCP->WideCharTable)[(unsigned int)*UnicodeString]; *CustomString = ((PCHAR)CustomCP->WideCharTable)[(USHORT)*UnicodeString];
CustomString++; CustomString++;
UnicodeString++; UnicodeString++;
} }
@ -559,7 +559,7 @@ RtlUnicodeToMultiByteN(PCHAR MbString,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
*MbString = NlsUnicodeToAnsiTable[(unsigned int)*UnicodeString]; *MbString = NlsUnicodeToAnsiTable[(USHORT)*UnicodeString];
MbString++; MbString++;
UnicodeString++; UnicodeString++;
} }
@ -597,7 +597,7 @@ RtlUnicodeToMultiByteSize(PULONG MbSize,
MbLength = 0; MbLength = 0;
while (UnicodeLength > 0) while (UnicodeLength > 0)
{ {
if (NlsLeadByteInfo[*UnicodeString] & 0xff00) if (NlsLeadByteInfo[(USHORT)*UnicodeString] & 0xff00)
MbLength++; MbLength++;
MbLength++; MbLength++;
@ -638,7 +638,7 @@ RtlUnicodeToOemN(PCHAR OemString,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
*OemString = NlsUnicodeToOemTable[(unsigned int)*UnicodeString]; *OemString = NlsUnicodeToOemTable[(USHORT)*UnicodeString];
OemString++; OemString++;
UnicodeString++; UnicodeString++;
} }
@ -709,7 +709,7 @@ RtlUpcaseUnicodeToCustomCPN(IN PCPTABLEINFO CustomCP,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
wc = RtlUpcaseUnicodeChar(*UnicodeString); wc = RtlUpcaseUnicodeChar(*UnicodeString);
*CustomString = ((PCHAR)CustomCP->WideCharTable)[(unsigned int)wc]; *CustomString = ((PCHAR)CustomCP->WideCharTable)[(USHORT)wc];
CustomString++; CustomString++;
UnicodeString++; UnicodeString++;
} }
@ -752,7 +752,7 @@ RtlUpcaseUnicodeToMultiByteN(PCHAR MbString,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
wc = RtlUpcaseUnicodeChar(*UnicodeString); wc = RtlUpcaseUnicodeChar(*UnicodeString);
*MbString = NlsUnicodeToAnsiTable[(unsigned int)wc]; *MbString = NlsUnicodeToAnsiTable[(USHORT)wc];
MbString++; MbString++;
UnicodeString++; UnicodeString++;
} }
@ -795,7 +795,7 @@ RtlUpcaseUnicodeToOemN(PCHAR OemString,
for (i = 0; i < Size; i++) for (i = 0; i < Size; i++)
{ {
wc = RtlUpcaseUnicodeChar(*UnicodeString); wc = RtlUpcaseUnicodeChar(*UnicodeString);
*OemString = NlsUnicodeToOemTable[(unsigned int)wc]; *OemString = NlsUnicodeToOemTable[(USHORT)wc];
OemString++; OemString++;
UnicodeString++; UnicodeString++;
} }
@ -824,13 +824,13 @@ RtlUpperChar (IN CHAR Source)
/* single-byte code page */ /* single-byte code page */
/* ansi->unicode */ /* ansi->unicode */
Unicode = NlsAnsiToUnicodeTable[(unsigned int)Source]; Unicode = NlsAnsiToUnicodeTable[(UCHAR)Source];
/* upcase conversion */ /* upcase conversion */
Unicode = RtlUpcaseUnicodeChar (Unicode); Unicode = RtlUpcaseUnicodeChar (Unicode);
/* unicode -> ansi */ /* unicode -> ansi */
Destination = NlsUnicodeToAnsiTable[(unsigned int)Unicode]; Destination = NlsUnicodeToAnsiTable[(USHORT)Unicode];
} }
else else
{ {