Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 04:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

forgot to change some memory allocator calls

Browse source 
added RtlpDuplicateUnicodeString

svn path=/trunk/; revision=9783
This commit is contained in:
Gunnar Dalsnes 2004-06-20 23:35:14 +00:00
parent da670920b9
commit 3b854207b7
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1136,7 +1136,6 @@ RtlOemStringToCountedUnicodeString(
/* /*
* private * private
* *
* NOTES * NOTES
* Same as RtlOemStringToUnicodeString but doesn't write terminating null * Same as RtlOemStringToUnicodeString but doesn't write terminating null
* A partial copy is NOT performed if the dest buffer is too small! * A partial copy is NOT performed if the dest buffer is too small!
@ -1191,12 +1190,11 @@ RtlpOemStringToCountedUnicodeString(
} }
//FIXME: sjekk returnverdi og returtype. Wine koflikter mht. returtype for EqualString og EqualComputer---
/* /*
* @implemented * @implemented
* *
* RETURNS * RETURNS
* 0 if the names are equal, non-zero otherwise. * TRUE if the names are equal, FALSE if not
* *
* NOTES * NOTES
* The comparison is case insensitive. * The comparison is case insensitive.
@ -1215,7 +1213,7 @@ RtlEqualComputerName(
{ {
if (NT_SUCCESS(RtlUpcaseUnicodeStringToOemString( &OemString2, ComputerName2, TRUE ))) if (NT_SUCCESS(RtlUpcaseUnicodeStringToOemString( &OemString2, ComputerName2, TRUE )))
{ {
Result = RtlEqualString( &OemString1, &OemString2, FALSE ); Result = RtlEqualString( &OemString1, &OemString2, TRUE );
RtlFreeOemString( &OemString2 ); RtlFreeOemString( &OemString2 );
} }
RtlFreeOemString( &OemString1 ); RtlFreeOemString( &OemString1 );
@ -1224,12 +1222,11 @@ RtlEqualComputerName(
return Result; return Result;
} }
//FIXME: sjekk returnverdi og returtype. Wine koflikter mht. returtype for EqualString og EqualComputer---
/* /*
* @implemented * @implemented
* *
* RETURNS * RETURNS
* 0 if the names are equal, non-zero otherwise. * TRUE if the names are equal, FALSE if not
* *
* NOTES * NOTES
* The comparison is case insensitive. * The comparison is case insensitive.
@ -2469,12 +2466,33 @@ RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
/* /*
* @implemented * @implemented
*
* NOTES
* See RtlpDuplicateUnicodeString
*/ */
NTSTATUS STDCALL NTSTATUS STDCALL
RtlDuplicateUnicodeString( RtlDuplicateUnicodeString(
INT AddNull, INT AddNull,
IN PUNICODE_STRING SourceString, IN PUNICODE_STRING SourceString,
PUNICODE_STRING DestinationString) PUNICODE_STRING DestinationString)
{
return RtlpDuplicateUnicodeString(
AddNull,
SourceString,
DestinationString,
NonPagedPool);
}
/*
* @implemented
*/
NTSTATUS STDCALL
RtlpDuplicateUnicodeString(
INT AddNull,
IN PUNICODE_STRING SourceString,
PUNICODE_STRING DestinationString,
POOL_TYPE PoolType)
{ {
if (SourceString == NULL || DestinationString == NULL) if (SourceString == NULL || DestinationString == NULL)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
@ -2493,7 +2511,7 @@ RtlDuplicateUnicodeString(
if (AddNull) if (AddNull)
DestMaxLength += sizeof(UNICODE_NULL); DestMaxLength += sizeof(UNICODE_NULL);
DestinationString->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DestMaxLength); DestinationString->Buffer = ExAllocatePool(PoolType, DestMaxLength);
if (DestinationString->Buffer == NULL) if (DestinationString->Buffer == NULL)
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;