Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 05:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Revert so call "Fixes" introduced in 18941 because they are bugs which I had to fix in 18002 and adding back bugs isn't really a good idea.

Browse source 
svn path=/trunk/; revision=18942
This commit is contained in:
Alex Ionescu 2005-11-01 23:37:26 +00:00
parent 3cda2939fe
commit f9d8fe961d
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -357,6 +357,7 @@ RtlFreeAnsiString(IN PANSI_STRING AnsiString)
if (AnsiString->Buffer) if (AnsiString->Buffer)
{ {
RtlpFreeStringMemory(AnsiString->Buffer, TAG_ASTR); RtlpFreeStringMemory(AnsiString->Buffer, TAG_ASTR);
RtlZeroMemory(AnsiString, sizeof(ANSI_STRING));
} }
} }
@ -369,10 +370,7 @@ RtlFreeOemString(IN POEM_STRING OemString)
{ {
PAGED_CODE_RTL(); PAGED_CODE_RTL();
if (OemString->Buffer) if (OemString->Buffer) RtlpFreeStringMemory(OemString->Buffer, TAG_OSTR);
{
RtlpFreeStringMemory(OemString->Buffer, TAG_OSTR);
}
} }
/* /*
@ -387,6 +385,7 @@ RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString)
if (UnicodeString->Buffer) if (UnicodeString->Buffer)
{ {
RtlpFreeStringMemory(UnicodeString->Buffer, TAG_ASTR); RtlpFreeStringMemory(UnicodeString->Buffer, TAG_ASTR);
RtlZeroMemory(UnicodeString, sizeof(UNICODE_STRING));
} }
} }
@ -485,7 +484,7 @@ RtlInitUnicodeStringEx(OUT PUNICODE_STRING DestinationString,
if(SourceString) if(SourceString)
{ {
DestSize = wcslen(SourceString) * sizeof(WCHAR); DestSize = wcslen(SourceString) * sizeof(WCHAR);
if (DestSize > 0xFFFE) return STATUS_NAME_TOO_LONG; if (DestSize >= 0xFFFC) return STATUS_NAME_TOO_LONG;
DestinationString->Length = (USHORT)DestSize; DestinationString->Length = (USHORT)DestSize;
DestinationString->MaximumLength = (USHORT)DestSize + sizeof(WCHAR); DestinationString->MaximumLength = (USHORT)DestSize + sizeof(WCHAR);
} }
@ -1944,8 +1943,6 @@ RtlCreateUnicodeString(
PAGED_CODE_RTL(); PAGED_CODE_RTL();
Length = (wcslen(Source) + 1) * sizeof(WCHAR); Length = (wcslen(Source) + 1) * sizeof(WCHAR);
if (Length > 0xFFFE) return FALSE;
UniDest->Buffer = RtlpAllocateStringMemory(Length, TAG_USTR); UniDest->Buffer = RtlpAllocateStringMemory(Length, TAG_USTR);
if (UniDest->Buffer == NULL) return FALSE; if (UniDest->Buffer == NULL) return FALSE;