1 files changed, 12 insertions, 4 deletions

diff --git a/src/test/DUtilUnitTest/StrUtilTest.cpp b/src/test/DUtilUnitTest/StrUtilTest.cpp
index 7c35b7c0..94fee280 100644
--- a/src/test/DUtilUnitTest/StrUtilTest.cpp
+++ b/src/test/DUtilUnitTest/StrUtilTest.cpp
@@ -86,6 +86,8 @@ namespace DutilTests
             HRESULT hr = S_OK;
             LPWSTR sczOutput = NULL;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = StrTrimWhitespace(&sczOutput, wzInput);
@@ -103,7 +105,7 @@ namespace DutilTests
             }
 
         LExit:
-            return;
+            DutilUninitialize();
         }
 
         void TestTrimAnsi(LPCSTR szInput, LPCSTR szExpectedResult)
@@ -111,6 +113,8 @@ namespace DutilTests
             HRESULT hr = S_OK;
             LPSTR sczOutput = NULL;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = StrAnsiTrimWhitespace(&sczOutput, szInput);
@@ -128,7 +132,7 @@ namespace DutilTests
             }
 
         LExit:
-            return;
+            DutilUninitialize();
         }
 
         void TestStrAllocStringAnsi(LPCSTR szSource, DWORD cchSource, LPCWSTR wzExpectedResult)
@@ -136,6 +140,8 @@ namespace DutilTests
             HRESULT hr = S_OK;
             LPWSTR sczOutput = NULL;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = StrAllocStringAnsi(&sczOutput, szSource, cchSource, CP_UTF8);
@@ -153,7 +159,7 @@ namespace DutilTests
             }
 
         LExit:
-            return;
+            DutilUninitialize();
         }
 
         void TestStrAnsiAllocString(LPWSTR wzSource, DWORD cchSource, LPCSTR szExpectedResult)
@@ -161,6 +167,8 @@ namespace DutilTests
             HRESULT hr = S_OK;
             LPSTR sczOutput = NULL;
 
+            DutilInitialize(&DutilTestTraceError);
+
             try
             {
                 hr = StrAnsiAllocString(&sczOutput, wzSource, cchSource, CP_UTF8);
@@ -178,7 +186,7 @@ namespace DutilTests
             }
 
         LExit:
-            return;
+            DutilUninitialize();
         }
     };
 }