3 files changed, 24 insertions, 15 deletions
diff --git a/CPP/7zip/Bundles/SFXCon/Main.cpp b/CPP/7zip/Bundles/SFXCon/Main.cpp
index c3122cd1..9084d9d7 100755
--- a/CPP/7zip/Bundles/SFXCon/Main.cpp
+++ b/CPP/7zip/Bundles/SFXCon/Main.cpp
@@ -9,7 +9,7 @@
 #include "Common/Wildcard.h"
 #include "Common/StringConvert.h"
 #include "Common/MyCom.h"
-#include "Common/Exception.h"
+#include "Common/MyException.h"
 
 #include "Windows/FileDir.h"
 #include "Windows/FileName.h"
diff --git a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
index abf7f22c..163b9298 100755
--- a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
+++ b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
@@ -512,51 +512,51 @@ SOURCE=..\..\..\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\NewHandler.cpp
+SOURCE=..\..\..\Common\MyString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\NewHandler.h
+SOURCE=..\..\..\Common\MyString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StdInStream.cpp
+SOURCE=..\..\..\Common\MyVector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StdInStream.h
+SOURCE=..\..\..\Common\MyVector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StdOutStream.cpp
+SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StdOutStream.h
+SOURCE=..\..\..\Common\NewHandler.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.cpp
+SOURCE=..\..\..\Common\StdInStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.h
+SOURCE=..\..\..\Common\StdInStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.cpp
+SOURCE=..\..\..\Common\StdOutStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.h
+SOURCE=..\..\..\Common\StdOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.cpp
+SOURCE=..\..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.h
+SOURCE=..\..\..\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
@@ -674,6 +674,14 @@ SOURCE=..\..\Common\StreamUtils.cpp
 
 SOURCE=..\..\Common\StreamUtils.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\VirtThread.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\VirtThread.h
+# End Source File
 # End Group
 # Begin Group "UI"
 
diff --git a/CPP/7zip/Bundles/SFXCon/makefile b/CPP/7zip/Bundles/SFXCon/makefile
index 33bd52c4..b6c13088 100755
--- a/CPP/7zip/Bundles/SFXCon/makefile
+++ b/CPP/7zip/Bundles/SFXCon/makefile
@@ -23,9 +23,9 @@ COMMON_OBJS = \
   $O\NewHandler.obj \
   $O\StdInStream.obj \
   $O\StdOutStream.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -51,6 +51,7 @@ WIN_OBJS = \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveExtractCallback.obj \