--- truecrypt/platform/platformtest.cpp	2018/04/24 16:48:44	1.1.1.1
+++ truecrypt/platform/platformtest.cpp	2018/04/24 16:58:15	1.1.1.4
@@ -1,7 +1,7 @@
 /*
  Copyright (c) 2008 TrueCrypt Foundation. All rights reserved.
 
- Governed by the TrueCrypt License 2.4 the full text of which is contained
+ Governed by the TrueCrypt License 2.6 the full text of which is contained
  in the file License.txt included in TrueCrypt binary and source code
  distribution packages.
 */
@@ -16,6 +16,7 @@
 #include "Serializable.h"
 #include "SharedPtr.h"
 #include "StringConverter.h"
+#include "SyncEvent.h"
 #include "Thread.h"
 
 namespace TrueCrypt
@@ -44,6 +45,20 @@ namespace TrueCrypt
 		string str = "string test";
 		wstring wstr = L"wstring test";
 
+		string convStr = "test";
+		StringConverter::ToSingle (wstr, convStr);
+		if (convStr != "wstring test")
+			throw TestFailed (SRC_POS);
+
+		StringConverter::Erase (convStr);
+		if (convStr != "            ")
+			throw TestFailed (SRC_POS);
+
+		wstring wEraseTest = L"erase test";
+		StringConverter::Erase (wEraseTest);
+		if (wEraseTest != L"          ")
+			throw TestFailed (SRC_POS);
+
 		list <string> stringList;
 		stringList.push_back (str + "1");
 		stringList.push_back (str + "2");
@@ -143,7 +158,14 @@ namespace TrueCrypt
 		}
 	}
 	
-	// shared_ptr, Mutex, ScopeLock, Thread
+	// shared_ptr, Mutex, ScopeLock, SyncEvent, Thread
+	static struct 
+	{
+		shared_ptr <int> SharedIntPtr;
+		Mutex IntMutex;
+		SyncEvent ExitAllowedEvent;
+	} ThreadTestData;
+
 	void PlatformTest::ThreadTest ()
 	{
 		Mutex mutex;
@@ -151,35 +173,58 @@ namespace TrueCrypt
 		mutex.Unlock();
 
 		const int maxThreads = 3;
-		make_shared_auto (int, SharedIntPtr);
-		*SharedIntPtr = 0;
+		ThreadTestData.SharedIntPtr.reset (new int (0));
 
 		for (int i = 0; i < maxThreads; i++)
 		{
 			Thread t;
-			t.Start (&ThreadTestProc, (void *)&SharedIntPtr);
+			t.Start (&ThreadTestProc, (void *) &ThreadTestData);
 		}
 
 		for (int i = 0; i < 50; i++)
 		{
-			if (SharedIntPtr.use_count() == 1 && *SharedIntPtr == maxThreads)
-				break;
+			{
+				ScopeLock sl (ThreadTestData.IntMutex);
+				if (*ThreadTestData.SharedIntPtr == maxThreads)
+					break;
+			}
 
 			Thread::Sleep(100);
 		}
 
-		if (SharedIntPtr.use_count() != 1 || *SharedIntPtr != maxThreads)
+		if (*ThreadTestData.SharedIntPtr != maxThreads)
+			throw TestFailed (SRC_POS);
+
+		for (int i = 0; i < 60000; i++)
+		{
+			ThreadTestData.ExitAllowedEvent.Signal();
+			Thread::Sleep(1);
+
+			ScopeLock sl (ThreadTestData.IntMutex);
+			if (*ThreadTestData.SharedIntPtr == 0)
+				break;
+		}
+
+		if (*ThreadTestData.SharedIntPtr != 0)
 			throw TestFailed (SRC_POS);
 	}
 
-	TC_THREAD_PROC PlatformTest::ThreadTestProc (void *param)
+	TC_THREAD_PROC PlatformTest::ThreadTestProc (void *arg)
 	{
-		static Mutex mutex;
-		shared_ptr <int> sharedIntPtr = *(shared_ptr <int> *) param;
+		
+		if (arg != (void *) &ThreadTestData)
+			return 0;
+
+		{
+			ScopeLock sl (ThreadTestData.IntMutex);
+			++(*ThreadTestData.SharedIntPtr);
+		}
+
+		ThreadTestData.ExitAllowedEvent.Wait();
 
 		{
-			ScopeLock sl (mutex);
-			(*sharedIntPtr)++;
+			ScopeLock sl (ThreadTestData.IntMutex);
+			--(*ThreadTestData.SharedIntPtr);
 		}
 
 		return 0;
@@ -270,7 +315,7 @@ namespace TrueCrypt
 		// shared_ptr, make_shared, StringConverter, foreach
 		list <shared_ptr <uint64> > numList;
 		
-		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeULL))));
+		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber ((uint64) 0xFFFFffffFFFFfffeULL))));
 		numList.push_front (make_shared <uint64> (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));
 		numList.push_front (make_shared <uint64> (3));