From 6ca346d8d433cbbb459c2d6ff22cf56b4e8146cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 30 Aug 2009 19:20:30 +0000 Subject: [PATCH] Use memory wrappers instead of ExAllocatePool/ExFreePool directly svn path=/trunk/; revision=42974 --- reactos/ntoskrnl/config/cmalloc.c | 16 ++++++++-------- reactos/ntoskrnl/config/cmindex.c | 18 +++++++++--------- reactos/ntoskrnl/config/cmkcbncb.c | 26 +++++++++++++------------- reactos/ntoskrnl/config/cmvalche.c | 2 +- reactos/ntoskrnl/config/cmvalue.c | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/reactos/ntoskrnl/config/cmalloc.c b/reactos/ntoskrnl/config/cmalloc.c index bb1c2655028..37da97ea44b 100644 --- a/reactos/ntoskrnl/config/cmalloc.c +++ b/reactos/ntoskrnl/config/cmalloc.c @@ -62,7 +62,7 @@ CmpFreeKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) if (!Kcb->PrivateAlloc) { /* Free it from the pool */ - ExFreePoolWithTag(Kcb, TAG_CM); + CmpFree(Kcb, 0); return; } @@ -98,7 +98,7 @@ CmpFreeKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) } /* Free the page */ - ExFreePoolWithTag(AllocPage, TAG_CM); + CmpFree(AllocPage, 0); } /* Release the lock */ @@ -151,7 +151,7 @@ SearchKcbList: } /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + AllocPage = CmpAllocate(PAGE_SIZE, TRUE, TAG_CM); if (AllocPage) { /* Set default entries */ @@ -178,9 +178,9 @@ SearchKcbList: } /* Allocate a KCB only */ - CurrentKcb = ExAllocatePoolWithTag(PagedPool, - sizeof(CM_KEY_CONTROL_BLOCK), - TAG_CM); + CurrentKcb = CmpAllocate(sizeof(CM_KEY_CONTROL_BLOCK), + TRUE, + TAG_CM); if (CurrentKcb) { /* Set it up */ @@ -231,7 +231,7 @@ SearchList: } /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + AllocPage = CmpAllocate(PAGE_SIZE, TRUE, TAG_CM); if (AllocPage) { /* Set default entries */ @@ -295,7 +295,7 @@ CmpFreeDelayItem(PVOID Entry) } /* Now free the page */ - ExFreePoolWithTag(AllocPage, TAG_CM); + CmpFree(AllocPage, 0); } /* Release the lock */ diff --git a/reactos/ntoskrnl/config/cmindex.c b/reactos/ntoskrnl/config/cmindex.c index a698af9476d..e48977523b7 100644 --- a/reactos/ntoskrnl/config/cmindex.c +++ b/reactos/ntoskrnl/config/cmindex.c @@ -821,9 +821,9 @@ CmpMarkIndexDirty(IN PHHIVE Hive, SearchName.Length = CmpCompressedNameSize(Node->Name, Node->NameLength); SearchName.MaximumLength = SearchName.Length; - SearchName.Buffer = ExAllocatePoolWithTag(PagedPool, - SearchName.Length, - TAG_CM); + SearchName.Buffer = CmpAllocate(SearchName.Length, + TRUE, + TAG_CM); if (!SearchName.Buffer) { /* Fail */ @@ -917,7 +917,7 @@ CmpMarkIndexDirty(IN PHHIVE Hive, if (Child != HCELL_NIL) { /* We found it, free the name now */ - if (IsCompressed) ExFreePool(SearchName.Buffer); + if (IsCompressed) CmpFree(SearchName.Buffer, 0); /* Release the parent key */ HvReleaseCell(Hive, ParentKey); @@ -942,7 +942,7 @@ Quickie: if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); /* Free the search name and return failure */ - if (IsCompressed) ExFreePool(SearchName.Buffer); + if (IsCompressed) CmpFree(SearchName.Buffer, 0); return FALSE; } @@ -1758,9 +1758,9 @@ CmpRemoveSubKey(IN PHHIVE Hive, if (SearchName.MaximumLength > sizeof(Buffer)) { /* Allocate one */ - SearchName.Buffer = ExAllocatePoolWithTag(PagedPool, - SearchName.Length, - TAG_CM); + SearchName.Buffer = CmpAllocate(SearchName.Length, + TRUE, + TAG_CM); if (!SearchName.Buffer) return FALSE; } else @@ -1899,7 +1899,7 @@ Exit: if ((IsCompressed) && (SearchName.MaximumLength > sizeof(Buffer))) { /* Free the buffer we allocated */ - ExFreePool(SearchName.Buffer); + CmpFree(SearchName.Buffer, 0); } /* Return the result */ diff --git a/reactos/ntoskrnl/config/cmkcbncb.c b/reactos/ntoskrnl/config/cmkcbncb.c index c062ca0e3e7..1ec66fc5df6 100644 --- a/reactos/ntoskrnl/config/cmkcbncb.c +++ b/reactos/ntoskrnl/config/cmkcbncb.c @@ -32,7 +32,7 @@ CmpInitializeCache(VOID) Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); /* Allocate it */ - CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + CmpCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpCacheTable) { /* Take the system down */ @@ -53,7 +53,7 @@ CmpInitializeCache(VOID) Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); /* Now allocate the name cache table */ - CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + CmpNameCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpNameCacheTable) { /* Take the system down */ @@ -249,7 +249,7 @@ CmpGetNameControlBlock(IN PUNICODE_STRING NodeName) { /* Allocate one */ NcbSize = FIELD_OFFSET(CM_NAME_CONTROL_BLOCK, Name) + Length; - Ncb = ExAllocatePoolWithTag(PagedPool, NcbSize, TAG_CM); + Ncb = CmpAllocate(NcbSize, TRUE, TAG_CM); if (!Ncb) { /* Release the lock and fail */ @@ -343,7 +343,7 @@ CmpDereferenceNameControlBlockWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) } /* Found it, now free it */ - ExFreePool(Ncb); + CmpFree(Ncb, 0); } /* Release the lock */ @@ -446,12 +446,12 @@ CmpCleanUpKcbValueCache(IN PCM_KEY_CONTROL_BLOCK Kcb) if (CMP_IS_CELL_CACHED(CachedList[i])) { /* Free it */ - ExFreePool((PVOID)CMP_GET_CACHED_CELL(CachedList[i])); + CmpFree((PVOID)CMP_GET_CACHED_CELL(CachedList[i]), 0); } } /* Now free the list */ - ExFreePool((PVOID)CMP_GET_CACHED_CELL(Kcb->ValueCache.ValueList)); + CmpFree((PVOID)CMP_GET_CACHED_CELL(Kcb->ValueCache.ValueList), 0); Kcb->ValueCache.ValueList = HCELL_NIL; } else if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) @@ -490,7 +490,7 @@ CmpCleanUpKcbCacheWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, CmpDereferenceNameControlBlockWithLock(Kcb->NameBlock); /* Check if we have an index hint block and free it */ - if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) ExFreePool(Kcb->IndexHint); + if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) CmpFree(Kcb->IndexHint, 0); /* Check if we were already deleted */ Parent = Kcb->ParentKcb; @@ -529,7 +529,7 @@ CmpCleanUpSubKeyInfo(IN PCM_KEY_CONTROL_BLOCK Kcb) if (Kcb->ExtFlags & (CM_KCB_SUBKEY_HINT)) { /* Kill it */ - ExFreePool(Kcb->IndexHint); + CmpFree(Kcb->IndexHint, 0); } /* Remove subkey flags */ @@ -931,9 +931,9 @@ CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) } /* Allocate the unicode string now */ - KeyName = ExAllocatePoolWithTag(PagedPool, - NameLength + sizeof(UNICODE_STRING), - TAG_CM); + KeyName = CmpAllocate(NameLength + sizeof(UNICODE_STRING), + TRUE, + TAG_CM); if (!KeyName) return NULL; @@ -954,7 +954,7 @@ CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST) { /* Failure */ - ExFreePool(KeyName); + CmpFree(KeyName, 0); return NULL; } @@ -967,7 +967,7 @@ CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) if (!KeyNode) { /* Failure */ - ExFreePool(KeyName); + CmpFree(KeyName, 0); return NULL; } } diff --git a/reactos/ntoskrnl/config/cmvalche.c b/reactos/ntoskrnl/config/cmvalche.c index 52297a3c582..8f598573937 100644 --- a/reactos/ntoskrnl/config/cmvalche.c +++ b/reactos/ntoskrnl/config/cmvalche.c @@ -797,7 +797,7 @@ Quickie: if (ValueCellToRelease) HvReleaseCell(Kcb->KeyHive, ValueCellToRelease); /* Free the buffer */ - if (BufferAllocated) ExFreePool(Buffer); + if (BufferAllocated) CmpFree(Buffer, 0); /* Free the cell */ if (CellToRelease) HvReleaseCell(Kcb->KeyHive, CellToRelease); diff --git a/reactos/ntoskrnl/config/cmvalue.c b/reactos/ntoskrnl/config/cmvalue.c index 5ccd8372bfc..0c401e67863 100644 --- a/reactos/ntoskrnl/config/cmvalue.c +++ b/reactos/ntoskrnl/config/cmvalue.c @@ -188,7 +188,7 @@ CmpValueToData(IN PHHIVE Hive, if (BufferAllocated) { /* Free the buffer and bugcheck */ - ExFreePool(Buffer); + CmpFree(Buffer, 0); KeBugCheckEx(REGISTRY_ERROR, 8, 0, (ULONG_PTR)Hive, (ULONG_PTR)Value); }