Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-30 03:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Part of patch contributed by Gunnar Andr� Dalsnes.

Browse source 
svn path=/trunk/; revision=3640
This commit is contained in:
Robert Dickenson 2002-10-20 03:13:51 +00:00
parent 4add2cf6f0
commit db067a2011
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/ntoskrnl/rtl/unicode.c
View file

@ -1,4 +1,4 @@
/* $Id: unicode.c,v 1.23 2002/09/08 10:23:42 chorns Exp $ /* $Id: unicode.c,v 1.24 2002/10/20 03:13:51 robd Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -990,7 +990,7 @@ RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString)
UnicodeString->Buffer, UnicodeString->Buffer,
UnicodeString->Length); UnicodeString->Length);
return(Size); return(Size+1);
} }
@ -1002,8 +1002,9 @@ RtlUnicodeStringToAnsiString(IN OUT PANSI_STRING DestinationString,
NTSTATUS Status; NTSTATUS Status;
ULONG Length; ULONG Length;
if (NlsMbCodePageTag == TRUE) if (NlsMbCodePageTag == TRUE){
Length = RtlUnicodeStringToAnsiSize (SourceString); Length = RtlUnicodeStringToAnsiSize (SourceString); Length--;
}
else else
Length = SourceString->Length / sizeof(WCHAR); Length = SourceString->Length / sizeof(WCHAR);
@ -1055,7 +1056,7 @@ RtlUnicodeStringToCountedOemString(IN OUT POEM_STRING DestinationString,
ULONG Size; ULONG Size;
if (NlsMbOemCodePageTag == TRUE) if (NlsMbOemCodePageTag == TRUE)
Length = RtlUnicodeStringToAnsiSize (SourceString) + 1; Length = RtlUnicodeStringToAnsiSize (SourceString)/* + 1*/;
else else
Length = SourceString->Length / sizeof(WCHAR) + 1; Length = SourceString->Length / sizeof(WCHAR) + 1;
@ -1202,7 +1203,7 @@ RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
RtlUnicodeToMultiByteSize(&Size, RtlUnicodeToMultiByteSize(&Size,
UnicodeString->Buffer, UnicodeString->Buffer,
UnicodeString->Length); UnicodeString->Length);
return(Size); return(Size+1);
} }
@ -1214,8 +1215,9 @@ RtlUnicodeStringToOemString(IN OUT POEM_STRING DestinationString,
NTSTATUS Status; NTSTATUS Status;
ULONG Length; ULONG Length;
if (NlsMbOemCodePageTag == TRUE) if (NlsMbOemCodePageTag == TRUE){
Length = RtlUnicodeStringToAnsiSize (SourceString); Length = RtlUnicodeStringToAnsiSize (SourceString); Length--;
}
else else
Length = SourceString->Length / sizeof(WCHAR); Length = SourceString->Length / sizeof(WCHAR);
@ -1319,8 +1321,9 @@ RtlUpcaseUnicodeStringToAnsiString(IN OUT PANSI_STRING DestinationString,
NTSTATUS Status; NTSTATUS Status;
ULONG Length; ULONG Length;
if (NlsMbCodePageTag == TRUE) if (NlsMbCodePageTag == TRUE){
Length = RtlUnicodeStringToAnsiSize(SourceString); Length = RtlUnicodeStringToAnsiSize(SourceString); Length--;
}
else else
Length = SourceString->Length / sizeof(WCHAR); Length = SourceString->Length / sizeof(WCHAR);
@ -1372,7 +1375,7 @@ RtlUpcaseUnicodeStringToCountedOemString(IN OUT POEM_STRING DestinationString,
ULONG Size; ULONG Size;
if (NlsMbCodePageTag == TRUE) if (NlsMbCodePageTag == TRUE)
Length = RtlUnicodeStringToAnsiSize (SourceString) + 1; Length = RtlUnicodeStringToAnsiSize (SourceString)/* + 1*/;
else else
Length = SourceString->Length / sizeof(WCHAR) + 1; Length = SourceString->Length / sizeof(WCHAR) + 1;
@ -1431,8 +1434,9 @@ RtlUpcaseUnicodeStringToOemString(IN OUT POEM_STRING DestinationString,
NTSTATUS Status; NTSTATUS Status;
ULONG Length; ULONG Length;
if (NlsMbOemCodePageTag == TRUE) if (NlsMbOemCodePageTag == TRUE) {
Length = RtlUnicodeStringToOemSize(SourceString); Length = RtlUnicodeStringToOemSize(SourceString); Length--;
}
else else
Length = SourceString->Length / sizeof(WCHAR); Length = SourceString->Length / sizeof(WCHAR);