1 files changed, 15 insertions, 1 deletions

diff --git a/src/test/DUtilUnitTest/MemUtilTest.cpp b/src/test/DUtilUnitTest/MemUtilTest.cpp
index 2621da6d..09692bfb 100644
--- a/src/test/DUtilUnitTest/MemUtilTest.cpp
+++ b/src/test/DUtilUnitTest/MemUtilTest.cpp
@@ -27,6 +27,8 @@ namespace DutilTests
             ArrayValue *rgValues = NULL;
             DWORD cValues = 0;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
@@ -101,7 +103,7 @@ namespace DutilTests
             }
 
         LExit:
-            return;
+            DutilUninitialize();
         }
 
         [Fact]
@@ -111,6 +113,8 @@ namespace DutilTests
             ArrayValue *rgValues = NULL;
             DWORD cValues = 0;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5);
@@ -180,6 +184,7 @@ namespace DutilTests
             finally
             {
                 ReleaseMem(rgValues);
+                DutilUninitialize();
             }
         }
 
@@ -190,6 +195,8 @@ namespace DutilTests
             ArrayValue *rgValues = NULL;
             DWORD cValues = 0;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10);
@@ -252,6 +259,7 @@ namespace DutilTests
             finally
             {
                 ReleaseMem(rgValues);
+                DutilUninitialize();
             }
         }
 
@@ -262,6 +270,8 @@ namespace DutilTests
             ArrayValue *rgValues = NULL;
             DWORD cValues = 0;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10);
@@ -326,6 +336,7 @@ namespace DutilTests
             finally
             {
                 ReleaseMem(rgValues);
+                DutilUninitialize();
             }
         }
 
@@ -336,6 +347,8 @@ namespace DutilTests
             ArrayValue *rgValues = NULL;
             DWORD cValues = 0;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10);
@@ -424,6 +437,7 @@ namespace DutilTests
             finally
             {
                 ReleaseMem(rgValues);
+                DutilUninitialize();
             }
         }