From 6705201337fdbef640e882b4dae55e4142fc8b85 Mon Sep 17 00:00:00 2001 From: Gunnar Dalsnes Date: Tue, 1 Feb 2005 17:53:55 +0000 Subject: [PATCH] RtlCreateUnicodeString->RtlpCreateUnicodeString svn path=/trunk/; revision=13383 --- reactos/ntoskrnl/cm/import.c | 8 ++++---- reactos/ntoskrnl/cm/ntfunc.c | 3 +-- reactos/ntoskrnl/cm/regfile.c | 6 +++--- reactos/ntoskrnl/cm/registry.c | 8 ++++---- reactos/ntoskrnl/cm/regobj.c | 8 ++++---- reactos/ntoskrnl/dbg/kdb_symbols.c | 4 ++-- reactos/ntoskrnl/ex/event.c | 2 +- reactos/ntoskrnl/ex/evtpair.c | 2 +- reactos/ntoskrnl/ex/mutant.c | 2 +- reactos/ntoskrnl/ex/profile.c | 2 +- reactos/ntoskrnl/ex/sem.c | 2 +- reactos/ntoskrnl/ex/timer.c | 2 +- reactos/ntoskrnl/ex/win32k.c | 6 +++--- reactos/ntoskrnl/io/create.c | 8 ++++---- reactos/ntoskrnl/io/driver.c | 5 ++--- reactos/ntoskrnl/io/iocomp.c | 4 ++-- reactos/ntoskrnl/ob/namespc.c | 2 +- reactos/ntoskrnl/ob/object.c | 2 +- reactos/ntoskrnl/rtl/atom.c | 4 ++-- reactos/ntoskrnl/se/token.c | 4 ++-- 20 files changed, 41 insertions(+), 43 deletions(-) diff --git a/reactos/ntoskrnl/cm/import.c b/reactos/ntoskrnl/cm/import.c index 16b23ceb3c7..f0be6f834e3 100644 --- a/reactos/ntoskrnl/cm/import.c +++ b/reactos/ntoskrnl/cm/import.c @@ -196,12 +196,12 @@ CmImportSystemHive(PCHAR ChunkBase, } /* Set the hive filename */ - RtlCreateUnicodeString (&RegistryHive->HiveFileName, - SYSTEM_REG_FILE); + RtlpCreateUnicodeString (&RegistryHive->HiveFileName, + SYSTEM_REG_FILE, NonPagedPool); /* Set the log filename */ - RtlCreateUnicodeString (&RegistryHive->LogFileName, - SYSTEM_LOG_FILE); + RtlpCreateUnicodeString (&RegistryHive->LogFileName, + SYSTEM_LOG_FILE, NonPagedPool); return TRUE; } diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c index 2c7bab080c6..141c0728e7b 100644 --- a/reactos/ntoskrnl/cm/ntfunc.c +++ b/reactos/ntoskrnl/cm/ntfunc.c @@ -200,8 +200,7 @@ NtCreateKey(OUT PHANDLE KeyHandle, } else { - RtlCreateUnicodeString(&KeyObject->Name, - Start); + RtlpCreateUnicodeString(&KeyObject->Name, Start, NonPagedPool); RtlFreeUnicodeString(&RemainingPath); } diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c index 5479ec93992..eb340933fdb 100644 --- a/reactos/ntoskrnl/cm/regfile.c +++ b/reactos/ntoskrnl/cm/regfile.c @@ -863,11 +863,11 @@ CmiInitNonVolatileRegistryHive (PREGISTRY_HIVE RegistryHive, RegistryHive, Filename); /* Duplicate Filename */ - Status = RtlCreateUnicodeString(&RegistryHive->HiveFileName, - Filename); + Status = RtlpCreateUnicodeString(&RegistryHive->HiveFileName, + Filename, NonPagedPool); if (!NT_SUCCESS(Status)) { - DPRINT("RtlCreateUnicodeString() failed (Status %lx)\n", Status); + DPRINT("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); return(Status); } diff --git a/reactos/ntoskrnl/cm/registry.c b/reactos/ntoskrnl/cm/registry.c index 7223fef3a24..87dad05bc73 100644 --- a/reactos/ntoskrnl/cm/registry.c +++ b/reactos/ntoskrnl/cm/registry.c @@ -315,7 +315,7 @@ CmInitializeRegistry(VOID) RootKey->NumberOfSubKeys = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0; - Status = RtlCreateUnicodeString(&RootKey->Name, L"Registry"); + Status = RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); ASSERT(NT_SUCCESS(Status)); #if 0 @@ -662,12 +662,12 @@ CmiConnectHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, DPRINT ("SubName %S\n", SubName); - Status = RtlCreateUnicodeString(&NewKey->Name, - SubName); + Status = RtlpCreateUnicodeString(&NewKey->Name, + SubName, NonPagedPool); RtlFreeUnicodeString(&RemainingPath); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlCreateUnicodeString() failed (Status %lx)\n", Status); + DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); if (NewKey->SubKeys != NULL) { ExFreePool (NewKey->SubKeys); diff --git a/reactos/ntoskrnl/cm/regobj.c b/reactos/ntoskrnl/cm/regobj.c index 0f6542aab78..0bb1984e724 100644 --- a/reactos/ntoskrnl/cm/regobj.c +++ b/reactos/ntoskrnl/cm/regobj.c @@ -160,8 +160,8 @@ CmiObjectParse(PVOID ParsedObject, FoundObject->KeyCell = SubKeyCell; FoundObject->KeyCellOffset = BlockOffset; FoundObject->RegistryHive = ParsedKey->RegistryHive; - RtlCreateUnicodeString(&FoundObject->Name, - KeyName.Buffer); + RtlpCreateUnicodeString(&FoundObject->Name, + KeyName.Buffer, NonPagedPool); CmiAddKeyToList(ParsedKey, FoundObject); DPRINT("Created object 0x%x\n", FoundObject); } @@ -248,8 +248,8 @@ CmiObjectCreate(PVOID ObjectBody, Start = RemainingPath; if(*Start == L'\\') Start++; - RtlCreateUnicodeString(&KeyObject->Name, - Start); + RtlpCreateUnicodeString(&KeyObject->Name, + Start, NonPagedPool); } else { diff --git a/reactos/ntoskrnl/dbg/kdb_symbols.c b/reactos/ntoskrnl/dbg/kdb_symbols.c index 381b2d37192..d01e3791d1f 100644 --- a/reactos/ntoskrnl/dbg/kdb_symbols.c +++ b/reactos/ntoskrnl/dbg/kdb_symbols.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -715,7 +715,7 @@ KdbpSymAddCachedFile(IN PUNICODE_STRING FileName, RtlZeroMemory(CacheEntry, sizeof (IMAGE_SYMBOL_INFO_CACHE)); /* fill entry */ - RtlCreateUnicodeString(&CacheEntry->FileName, FileName->Buffer); + RtlpCreateUnicodeString(&CacheEntry->FileName, FileName->Buffer, NonPagedPool); ASSERT(CacheEntry->FileName.Buffer); CacheEntry->RefCount = 1; CacheEntry->FileBuffer = SymbolInfo->FileBuffer; diff --git a/reactos/ntoskrnl/ex/event.c b/reactos/ntoskrnl/ex/event.c index 386f15b0945..352d1af5238 100644 --- a/reactos/ntoskrnl/ex/event.c +++ b/reactos/ntoskrnl/ex/event.c @@ -54,7 +54,7 @@ ExpInitializeEventImplementation(VOID) { ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExEventObjectType->TypeName, L"Event"); + RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); ExEventObjectType->PeakObjects = 0; diff --git a/reactos/ntoskrnl/ex/evtpair.c b/reactos/ntoskrnl/ex/evtpair.c index 2c3a9d4c475..ada376adbdf 100644 --- a/reactos/ntoskrnl/ex/evtpair.c +++ b/reactos/ntoskrnl/ex/evtpair.c @@ -60,7 +60,7 @@ ExpInitializeEventPairImplementation(VOID) { ExEventPairObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair"); + RtlpCreateUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair", NonPagedPool); ExEventPairObjectType->Tag = TAG('E', 'v', 'P', 'a'); ExEventPairObjectType->PeakObjects = 0; ExEventPairObjectType->PeakHandles = 0; diff --git a/reactos/ntoskrnl/ex/mutant.c b/reactos/ntoskrnl/ex/mutant.c index 137da181826..0852e0075ab 100644 --- a/reactos/ntoskrnl/ex/mutant.c +++ b/reactos/ntoskrnl/ex/mutant.c @@ -65,7 +65,7 @@ ExpInitializeMutantImplementation(VOID) { ExMutantObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExMutantObjectType->TypeName, L"Mutant"); + RtlpCreateUnicodeString(&ExMutantObjectType->TypeName, L"Mutant", NonPagedPool); ExMutantObjectType->Tag = TAG('M', 'T', 'N', 'T'); ExMutantObjectType->PeakObjects = 0; diff --git a/reactos/ntoskrnl/ex/profile.c b/reactos/ntoskrnl/ex/profile.c index 822ef1894ac..645dfcb8ccd 100644 --- a/reactos/ntoskrnl/ex/profile.c +++ b/reactos/ntoskrnl/ex/profile.c @@ -68,7 +68,7 @@ ExpInitializeProfileImplementation(VOID) ExProfileObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile"); + RtlpCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile", NonPagedPool); ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); ExProfileObjectType->PeakObjects = 0; diff --git a/reactos/ntoskrnl/ex/sem.c b/reactos/ntoskrnl/ex/sem.c index 6ca1ebe01db..5a27391365c 100644 --- a/reactos/ntoskrnl/ex/sem.c +++ b/reactos/ntoskrnl/ex/sem.c @@ -53,7 +53,7 @@ ExpInitializeSemaphoreImplementation(VOID) { ExSemaphoreObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore"); + RtlpCreateUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore", NonPagedPool); ExSemaphoreObjectType->Tag = TAG('S', 'E', 'M', 'T'); ExSemaphoreObjectType->PeakObjects = 0; diff --git a/reactos/ntoskrnl/ex/timer.c b/reactos/ntoskrnl/ex/timer.c index 91fa92655ff..3deeff2518c 100644 --- a/reactos/ntoskrnl/ex/timer.c +++ b/reactos/ntoskrnl/ex/timer.c @@ -119,7 +119,7 @@ ExpInitializeTimerImplementation(VOID) ASSERT(!ExTimerType) ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExTimerType->TypeName, L"Timer"); + RtlpCreateUnicodeString(&ExTimerType->TypeName, L"Timer", NonPagedPool); ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); ExTimerType->PeakObjects = 0; diff --git a/reactos/ntoskrnl/ex/win32k.c b/reactos/ntoskrnl/ex/win32k.c index c93ce37f042..4cdc21622d8 100644 --- a/reactos/ntoskrnl/ex/win32k.c +++ b/reactos/ntoskrnl/ex/win32k.c @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -84,7 +84,7 @@ ExpWinStaObjectCreate(PVOID ObjectBody, DPRINT("Creating window station (0x%X) Name (%wZ)\n", WinSta, &UnicodeString); - Status = RtlCreateUnicodeString(&WinSta->Name, UnicodeString.Buffer); + Status = RtlpCreateUnicodeString(&WinSta->Name, UnicodeString.Buffer, NonPagedPool); if (!NT_SUCCESS(Status)) { return Status; @@ -247,7 +247,7 @@ ExpDesktopObjectCreate(PVOID ObjectBody, &Desktop->ListEntry, &Desktop->WindowStation->Lock); - return RtlCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer); + return RtlpCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer, NonPagedPool); } VOID STDCALL diff --git a/reactos/ntoskrnl/io/create.c b/reactos/ntoskrnl/io/create.c index 568db171cc4..2595918670f 100644 --- a/reactos/ntoskrnl/io/create.c +++ b/reactos/ntoskrnl/io/create.c @@ -147,8 +147,8 @@ IopCreateFile(PVOID ObjectBody, DeviceObject = DeviceObject->Vpb->DeviceObject; DPRINT("FsDeviceObject %lx\n", DeviceObject); } - RtlCreateUnicodeString(&(FileObject->FileName), - RemainingPath); + RtlpCreateUnicodeString(&(FileObject->FileName), + RemainingPath, NonPagedPool); } } else @@ -165,8 +165,8 @@ IopCreateFile(PVOID ObjectBody, FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - RtlCreateUnicodeString(&(FileObject->FileName), - RemainingPath); + RtlpCreateUnicodeString(&(FileObject->FileName), + RemainingPath, NonPagedPool); } DPRINT("FileObject->FileName %wZ\n", diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c index ea19a8c2c02..eb3e4accf39 100644 --- a/reactos/ntoskrnl/io/driver.c +++ b/reactos/ntoskrnl/io/driver.c @@ -794,8 +794,7 @@ IopCreateGroupListEntry(PWSTR ValueName, RtlZeroMemory(Group, sizeof(SERVICE_GROUP)); - if (!RtlCreateUnicodeString(&Group->GroupName, - (PWSTR)ValueData)) + if (!RtlpCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData, NonPagedPool)) { ExFreePool(Group); return(STATUS_INSUFFICIENT_RESOURCES); @@ -1864,7 +1863,7 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName) Start = DriverServiceName->Buffer; else Start++; - RtlCreateUnicodeString(&DeviceNode->ServiceName, Start); + RtlpCreateUnicodeString(&DeviceNode->ServiceName, Start, NonPagedPool); /* * Initialize the driver module diff --git a/reactos/ntoskrnl/io/iocomp.c b/reactos/ntoskrnl/io/iocomp.c index 5e18411ded3..61f3ee90fcd 100644 --- a/reactos/ntoskrnl/io/iocomp.c +++ b/reactos/ntoskrnl/io/iocomp.c @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -119,7 +119,7 @@ IopInitIoCompletionImplementation(VOID) { ExIoCompletionType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion"); + RtlpCreateUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion", NonPagedPool); ExIoCompletionType->Tag = IOC_TAG; ExIoCompletionType->PeakObjects = 0; diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c index 2308f3cc564..fc179d003ac 100644 --- a/reactos/ntoskrnl/ob/namespc.c +++ b/reactos/ntoskrnl/ob/namespc.c @@ -195,7 +195,7 @@ ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent, { KIRQL oldlvl; - RtlCreateUnicodeString(&Header->Name, Name); + RtlpCreateUnicodeString(&Header->Name, Name, NonPagedPool); Header->Parent = Parent; KeAcquireSpinLock(&Parent->Lock, &oldlvl); diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c index 96c3d3b8924..a0023bc827a 100644 --- a/reactos/ntoskrnl/ob/object.c +++ b/reactos/ntoskrnl/ob/object.c @@ -439,7 +439,7 @@ ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes, } if (current) - RtlCreateUnicodeString (RemainingPath, current); + RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); RtlFreeUnicodeString (&PathString); *ReturnedObject = CurrentObject; diff --git a/reactos/ntoskrnl/rtl/atom.c b/reactos/ntoskrnl/rtl/atom.c index 6ab15b3d1db..d3f897fe3ed 100644 --- a/reactos/ntoskrnl/rtl/atom.c +++ b/reactos/ntoskrnl/rtl/atom.c @@ -377,8 +377,8 @@ RtlAddAtomToAtomTable(IN PRTL_ATOM_TABLE AtomTable, } InsertTailList(&AtomTable->Slot[Hash], &Entry->List); - RtlCreateUnicodeString (&Entry->Name, - AtomName); + RtlpCreateUnicodeString (&Entry->Name, + AtomName, NonPagedPool); Entry->RefCount = 1; Entry->Locked = FALSE; diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c index e120e814cff..048e8dfc332 100644 --- a/reactos/ntoskrnl/se/token.c +++ b/reactos/ntoskrnl/se/token.c @@ -547,8 +547,8 @@ SepInitializeTokenImplementation(VOID) SepTokenObjectType->Create = NULL; SepTokenObjectType->DuplicationNotify = NULL; - RtlCreateUnicodeString(&SepTokenObjectType->TypeName, - L"Token"); + RtlpCreateUnicodeString(&SepTokenObjectType->TypeName, + L"Token", NonPagedPool); ObpCreateTypeObject (SepTokenObjectType); }