From 5778c65af08b68ef4cce309212926dfcebc73d89 Mon Sep 17 00:00:00 2001 From: David Spruill Date: Thu, 8 Jan 2026 17:39:13 -0500 Subject: [PATCH 1/2] Correct a buggy sample --- video/KMDOD/bdd.hxx | 12 +++--------- video/KMDOD/bdd_ddi.cxx | 2 +- video/KMDOD/blthw.cxx | 2 +- video/KMDOD/memory.cxx | 14 ++++---------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/video/KMDOD/bdd.hxx b/video/KMDOD/bdd.hxx index 61c40e034..7ea38b349 100644 --- a/video/KMDOD/bdd.hxx +++ b/video/KMDOD/bdd.hxx @@ -626,18 +626,12 @@ IsEdidChecksumValid(_In_reads_bytes_(EDID_V1_BLOCK_SIZE) const BYTE* pEdid); // Memory handling // -// Defaulting the value of PoolType means that any call to new Foo() +// Requiring POOL_FLAGS means that any call to new Foo() // will raise a compiler error for being ambiguous. This is to help keep // any calls to allocate memory from accidentally NOT going through // these functions. -_When_((PoolType & NonPagedPoolMustSucceed) != 0, - __drv_reportError("Must succeed pool allocations are forbidden. " - "Allocation failures cause a system crash")) -void* __cdecl operator new(size_t Size, POOL_TYPE PoolType = PagedPool); -_When_((PoolType & NonPagedPoolMustSucceed) != 0, - __drv_reportError("Must succeed pool allocations are forbidden. " - "Allocation failures cause a system crash")) -void* __cdecl operator new[](size_t Size, POOL_TYPE PoolType = PagedPool); +void* __cdecl operator new(size_t Size, POOL_FLAGS Flags); +void* __cdecl operator new[](size_t Size, POOL_FLAGS Flags); void __cdecl operator delete(void* pObject); void __cdecl operator delete(void* pObject, size_t s); void __cdecl operator delete[](void* pObject); diff --git a/video/KMDOD/bdd_ddi.cxx b/video/KMDOD/bdd_ddi.cxx index 5a53a3be6..924758c55 100644 --- a/video/KMDOD/bdd_ddi.cxx +++ b/video/KMDOD/bdd_ddi.cxx @@ -103,7 +103,7 @@ BddDdiAddDevice( } *ppDeviceContext = NULL; - BASIC_DISPLAY_DRIVER* pBDD = new(NonPagedPoolNx) BASIC_DISPLAY_DRIVER(pPhysicalDeviceObject); + BASIC_DISPLAY_DRIVER* pBDD = new(POOL_FLAG_NON_PAGED) BASIC_DISPLAY_DRIVER(pPhysicalDeviceObject); if (pBDD == NULL) { BDD_LOG_LOW_RESOURCE0("pBDD failed to be allocated"); diff --git a/video/KMDOD/blthw.cxx b/video/KMDOD/blthw.cxx index 2e6d2e5d8..b2f824927 100644 --- a/video/KMDOD/blthw.cxx +++ b/video/KMDOD/blthw.cxx @@ -282,7 +282,7 @@ BDD_HWBLT::ExecutePresentDisplayOnly( SIZE_T size = sizeof(DoPresentMemory) + sizeMoves + sizeRects; DoPresentMemory* ctx = reinterpret_cast - (new (PagedPool) BYTE[size]); + (new (POOL_FLAG_PAGED) BYTE[size]); if (!ctx) { diff --git a/video/KMDOD/memory.cxx b/video/KMDOD/memory.cxx index aae795dfb..73dabcf8b 100644 --- a/video/KMDOD/memory.cxx +++ b/video/KMDOD/memory.cxx @@ -14,16 +14,13 @@ // // New and delete operators // -_When_((PoolType & NonPagedPoolMustSucceed) != 0, - __drv_reportError("Must succeed pool allocations are forbidden. " - "Allocation failures cause a system crash")) -void* __cdecl operator new(size_t Size, POOL_TYPE PoolType) +void* __cdecl operator new(size_t Size, POOL_FLAGS Flags) { PAGED_CODE(); Size = (Size != 0) ? Size : 1; - void* pObject = ExAllocatePoolWithTag(PoolType, Size, BDDTAG); + void* pObject = ExAllocatePool2(Flags, Size, BDDTAG); #if DBG if (pObject != NULL) @@ -35,16 +32,13 @@ void* __cdecl operator new(size_t Size, POOL_TYPE PoolType) return pObject; } -_When_((PoolType & NonPagedPoolMustSucceed) != 0, - __drv_reportError("Must succeed pool allocations are forbidden. " - "Allocation failures cause a system crash")) -void* __cdecl operator new[](size_t Size, POOL_TYPE PoolType) +void* __cdecl operator new[](size_t Size, POOL_FLAGS Flags) { PAGED_CODE(); Size = (Size != 0) ? Size : 1; - void* pObject = ExAllocatePoolWithTag(PoolType, Size, BDDTAG); + void* pObject = ExAllocatePool2(Flags, Size, BDDTAG); #if DBG if (pObject != NULL) From f88e4fbbd4d2671e5cd77e4f60be7a235326797e Mon Sep 17 00:00:00 2001 From: David Spruill Date: Thu, 8 Jan 2026 17:48:46 -0500 Subject: [PATCH 2/2] Restore the default parameter entries on the new calls to cause compiler errors for ambiguous allocations --- video/KMDOD/bdd.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/video/KMDOD/bdd.hxx b/video/KMDOD/bdd.hxx index 7ea38b349..5bfcb6f41 100644 --- a/video/KMDOD/bdd.hxx +++ b/video/KMDOD/bdd.hxx @@ -626,12 +626,12 @@ IsEdidChecksumValid(_In_reads_bytes_(EDID_V1_BLOCK_SIZE) const BYTE* pEdid); // Memory handling // -// Requiring POOL_FLAGS means that any call to new Foo() +// Defaulting the value of Flags means that any call to new Foo() // will raise a compiler error for being ambiguous. This is to help keep // any calls to allocate memory from accidentally NOT going through // these functions. -void* __cdecl operator new(size_t Size, POOL_FLAGS Flags); -void* __cdecl operator new[](size_t Size, POOL_FLAGS Flags); +void* __cdecl operator new(size_t Size, POOL_FLAGS Flags = POOL_FLAG_PAGED); +void* __cdecl operator new[](size_t Size, POOL_FLAGS Flags = POOL_FLAG_PAGED); void __cdecl operator delete(void* pObject); void __cdecl operator delete(void* pObject, size_t s); void __cdecl operator delete[](void* pObject);