Merge branch 'UpdateVibraniumAvstream' of https://github.com/JoelCorley/Windows-driver-samples into UpdateVibraniumAvstream

9 files changed, 19 insertions, 69 deletions

diff --git a/avstream/avscamera/sys/AvsCamera.cpp b/avstream/avscamera/sys/AvsCamera.cpp
index 3563b3dd..3c51323f 100644
--- a/avstream/avscamera/sys/AvsCamera.cpp
+++ b/avstream/avscamera/sys/AvsCamera.cpp
@@ -29,13 +29,7 @@ PVOID operator new
     POOL_TYPE       poolType
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType,iSize,'wNCK');
-
-    if (result) {
-        RtlZeroMemory(result,iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType,iSize,'wNCK');
 }
 
 PVOID operator new
@@ -48,13 +42,7 @@ PVOID operator new
     ULONG           tag
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType,iSize,tag);
-
-    if (result) {
-        RtlZeroMemory(result,iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType,iSize,tag);
 }
 
 PVOID 
@@ -67,14 +55,7 @@ operator new[](
     ULONG           tag
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType, iSize, tag);
-
-    if (result)
-    {
-        RtlZeroMemory(result, iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType, iSize, tag);
 }
 
 /*++
diff --git a/avstream/avscamera/sys/Capture.cpp b/avstream/avscamera/sys/Capture.cpp
index aadaca4e..25e6a5f8 100644
--- a/avstream/avscamera/sys/Capture.cpp
+++ b/avstream/avscamera/sys/Capture.cpp
@@ -266,7 +266,7 @@ Return Value:
                (m_Pin->ConnectionFormat))->ImageInfoHeader);
 
         m_VideoInfoHeader = reinterpret_cast <PKS_VIDEOINFOHEADER> (
-            ExAllocatePoolWithTag (
+            ExAllocatePoolZero (
                 NonPagedPoolNx,
                 max(sizeof(KS_VIDEOINFOHEADER), ConnectionHeader->biSize + KS_SIZE_PREHEADER),
                 AVSHWS_POOLTAG
@@ -308,7 +308,7 @@ Return Value:
                 VideoInfoHeader);
 
         m_VideoInfoHeader = reinterpret_cast <PKS_VIDEOINFOHEADER> (
-            ExAllocatePoolWithTag (
+            ExAllocatePoolZero (
                 NonPagedPoolNx,
                 max(sizeof(KS_VIDEOINFOHEADER), KS_SIZE_VIDEOHEADER (ConnectionHeader)),
                 AVSHWS_POOLTAG
@@ -339,7 +339,7 @@ Return Value:
                 VideoInfoHeader2);
 
         m_VideoInfoHeader = reinterpret_cast <PKS_VIDEOINFOHEADER> (
-            ExAllocatePoolWithTag(
+            ExAllocatePoolZero(
                 NonPagedPoolNx,
                 max(sizeof(KS_VIDEOINFOHEADER), ConnectionHeader->bmiHeader.biSize + KS_SIZE_PREHEADER),
                 AVSHWS_POOLTAG
diff --git a/avstream/avshws/capture.cpp b/avstream/avshws/capture.cpp
index d68ce1da..13ddbfc0 100644
--- a/avstream/avshws/capture.cpp
+++ b/avstream/avshws/capture.cpp
@@ -265,7 +265,7 @@ Return Value:
             VideoInfoHeader);
 
     m_VideoInfoHeader = reinterpret_cast <PKS_VIDEOINFOHEADER> (
-        ExAllocatePoolWithTag (
+        ExAllocatePoolZero (
             NonPagedPoolNx,
             KS_SIZE_VIDEOHEADER (ConnectionHeader),
             AVSHWS_POOLTAG
diff --git a/avstream/avshws/device.cpp b/avstream/avshws/device.cpp
index 44fc9704..b0a7fb23 100644
--- a/avstream/avshws/device.cpp
+++ b/avstream/avshws/device.cpp
@@ -31,13 +31,7 @@ PVOID operator new
     POOL_TYPE       poolType
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType,iSize,'wNCK');
-
-    if (result) {
-        RtlZeroMemory(result,iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType,iSize,'wNCK');
 }
 
 PVOID operator new
@@ -50,13 +44,7 @@ PVOID operator new
     ULONG           tag
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType,iSize,tag);
-
-    if (result) {
-        RtlZeroMemory(result,iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType,iSize,tag);
 }
 
 PVOID 
@@ -69,14 +57,7 @@ operator new[](
     ULONG           tag
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType, iSize, tag);
-
-    if (result)
-    {
-        RtlZeroMemory(result, iSize);
-    }
-
-    return result;
+    return ExAllocatePoolWZero(poolType, iSize, tag);
 }
 
 /*++
diff --git a/avstream/avshws/hwsim.cpp b/avstream/avshws/hwsim.cpp
index 1e813bc2..46d6be62 100644
--- a/avstream/avshws/hwsim.cpp
+++ b/avstream/avshws/hwsim.cpp
@@ -219,7 +219,7 @@ Return Value:
     // Allocate a scratch buffer for the synthesizer.
     //
     m_SynthesisBuffer = reinterpret_cast <PUCHAR> (
-        ExAllocatePoolWithTag (
+        ExAllocatePoolZero (
             NonPagedPoolNx,
             m_ImageSize,
             AVSHWS_POOLTAG
diff --git a/avstream/avssamp/Filter.cpp b/avstream/avssamp/Filter.cpp
index 524d6ad8..b3b70c30 100644
--- a/avstream/avssamp/Filter.cpp
+++ b/avstream/avssamp/Filter.cpp
@@ -268,17 +268,17 @@ Return Value:
     //
     PKSDATARANGE_AUDIO DataRangeAudio = 
         reinterpret_cast <PKSDATARANGE_AUDIO> (
-            ExAllocatePoolWithTag (PagedPool, sizeof (KSDATARANGE_AUDIO), AVSSMP_POOLTAG)
+            ExAllocatePoolZero (PagedPool, sizeof (KSDATARANGE_AUDIO), AVSSMP_POOLTAG)
             );
 
     PKSDATARANGE_AUDIO *DataRanges =
         reinterpret_cast <PKSDATARANGE_AUDIO *> (
-            ExAllocatePoolWithTag (PagedPool, sizeof (PKSDATARANGE_AUDIO), AVSSMP_POOLTAG)
+            ExAllocatePoolZero (PagedPool, sizeof (PKSDATARANGE_AUDIO), AVSSMP_POOLTAG)
             );
 
     PKSALLOCATOR_FRAMING_EX Framing =
         reinterpret_cast <PKSALLOCATOR_FRAMING_EX> (
-            ExAllocatePoolWithTag (PagedPool, sizeof (KSALLOCATOR_FRAMING_EX), AVSSMP_POOLTAG)
+            ExAllocatePoolZero (PagedPool, sizeof (KSALLOCATOR_FRAMING_EX), AVSSMP_POOLTAG)
             );
 
     if (DataRangeAudio && DataRanges && Framing) {
diff --git a/avstream/avssamp/avssamp.cpp b/avstream/avssamp/avssamp.cpp
index 68741c9e..1ba03089 100644
--- a/avstream/avssamp/avssamp.cpp
+++ b/avstream/avssamp/avssamp.cpp
@@ -38,13 +38,7 @@ PVOID operator new
     POOL_TYPE       poolType
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType,iSize,'wNCK');
-
-    if (result) {
-        RtlZeroMemory(result,iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType,iSize,'wNCK');
 }
 
 PVOID operator new
@@ -57,13 +51,7 @@ PVOID operator new
     ULONG           tag
 )
 {
-    PVOID result = ExAllocatePoolWithTag(poolType,iSize,tag);
-
-    if (result) {
-        RtlZeroMemory(result,iSize);
-    }
-
-    return result;
+    return ExAllocatePoolZero(poolType,iSize,tag);
 }
 
 /*++
diff --git a/avstream/avssamp/video.cpp b/avstream/avssamp/video.cpp
index d18dc95d..1be9b56e 100644
--- a/avstream/avssamp/video.cpp
+++ b/avstream/avssamp/video.cpp
@@ -210,7 +210,7 @@ Return Value:
             VideoInfoHeader);
 
     m_VideoInfoHeader = reinterpret_cast <PKS_VIDEOINFOHEADER> (
-        ExAllocatePoolWithTag (
+        ExAllocatePoolZero (
             NonPagedPool,
             KS_SIZE_VIDEOHEADER (ConnectionHeader),
             AVSSMP_POOLTAG
@@ -864,7 +864,7 @@ Return Value:
     if (FromState == KSSTATE_STOP) {
 
         m_SynthesisBuffer = reinterpret_cast <PUCHAR> (
-            ExAllocatePoolWithTag (
+            ExAllocatePoolZero (
                 NonPagedPool, 
                 m_VideoInfoHeader -> bmiHeader.biSizeImage,
                 AVSSMP_POOLTAG
diff --git a/avstream/avssamp/wave.cpp b/avstream/avssamp/wave.cpp
index 7af2f60a..de110e69 100644
--- a/avstream/avssamp/wave.cpp
+++ b/avstream/avssamp/wave.cpp
@@ -319,7 +319,7 @@ Return Value:
     //
     if (NT_SUCCESS (Status)) {
         m_WaveData = reinterpret_cast <PUCHAR> (
-            ExAllocatePoolWithTag (NonPagedPool, DataBlockSize, AVSSMP_POOLTAG)
+            ExAllocatePoolZero (NonPagedPool, DataBlockSize, AVSSMP_POOLTAG)
             );
 
         if (!m_WaveData) {