4.48 beta

19 files changed, 259 insertions, 142 deletions

diff --git a/CPP/7zip/Bundles/Alone/Alone.dsp b/CPP/7zip/Bundles/Alone/Alone.dsp
index f7ceb6b8..6250c0bd 100755
--- a/CPP/7zip/Bundles/Alone/Alone.dsp
+++ b/CPP/7zip/Bundles/Alone/Alone.dsp
@@ -237,14 +237,6 @@ SOURCE=.\StdAfx.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\Common\AlignedBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\AlignedBuffer.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\AutoPtr.h
 # End Source File
 # Begin Source File
@@ -277,10 +269,6 @@ SOURCE=..\..\..\Common\DynamicBuffer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Exception.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\IntToString.cpp
 # End Source File
 # Begin Source File
@@ -301,6 +289,10 @@ SOURCE=..\..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyException.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyGuidDef.h
 # End Source File
 # Begin Source File
@@ -309,10 +301,26 @@ SOURCE=..\..\..\Common\MyInitGuid.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyString.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyUnknown.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyWindows.cpp
 # End Source File
 # Begin Source File
@@ -353,14 +361,6 @@ SOURCE=..\..\..\Common\StdOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\String.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
@@ -389,14 +389,6 @@ SOURCE=..\..\..\Common\UTFConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Vector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
@@ -501,6 +493,14 @@ SOURCE=..\..\..\Windows\Synchronization.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Windows\System.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Windows\System.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Windows\Thread.h
 # End Source File
 # Begin Source File
@@ -613,6 +613,14 @@ SOURCE=..\..\Common\MethodId.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Common\MethodProps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MethodProps.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\MSBFDecoder.h
 # End Source File
 # Begin Source File
@@ -683,6 +691,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 "Compress"
 
@@ -1705,19 +1721,19 @@ SOURCE=..\..\Archive\Common\CoderMixer2MT.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer2ST.cpp
+SOURCE=..\..\Archive\Common\DummyOutStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer2ST.h
+SOURCE=..\..\Archive\Common\DummyOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.cpp
+SOURCE=..\..\Archive\Common\HandlerOut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.h
+SOURCE=..\..\Archive\Common\HandlerOut.h
 # End Source File
 # Begin Source File
 
diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile
index eeec13a2..ee881a01 100755
--- a/CPP/7zip/Bundles/Alone/makefile
+++ b/CPP/7zip/Bundles/Alone/makefile
@@ -29,11 +29,11 @@ COMMON_OBJS = \
   $O\NewHandler.obj \
   $O\StdInStream.obj \
   $O\StdOutStream.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
   $O\UTFConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -46,7 +46,8 @@ WIN_OBJS = \
   $O\MemoryLock.obj \
   $O\PropVariant.obj \
   $O\PropVariantConversions.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -61,6 +62,7 @@ WIN_OBJS = \
   $O\LSBFEncoder.obj \
   $O\MemBlocks.obj \
   $O\MethodId.obj \
+  $O\MethodProps.obj \
   $O\OffsetStream.obj \
   $O\OutBuffer.obj \
   $O\OutMemStream.obj \
@@ -69,6 +71,7 @@ WIN_OBJS = \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveCommandLine.obj \
@@ -96,6 +99,7 @@ AR_COMMON_OBJS = \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
   $O\DummyOutStream.obj \
+  $O\HandlerOut.obj \
   $O\InStreamWithCRC.obj \
   $O\ItemNameUtils.obj \
   $O\MultiStream.obj \
diff --git a/CPP/7zip/Bundles/Alone7z/Alone.dsp b/CPP/7zip/Bundles/Alone7z/Alone.dsp
index e0c46273..b9f389bb 100755
--- a/CPP/7zip/Bundles/Alone7z/Alone.dsp
+++ b/CPP/7zip/Bundles/Alone7z/Alone.dsp
@@ -237,14 +237,6 @@ SOURCE=.\StdAfx.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\Common\AlignedBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\AlignedBuffer.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\AutoPtr.h
 # End Source File
 # Begin Source File
@@ -277,10 +269,6 @@ SOURCE=..\..\..\Common\DynamicBuffer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Exception.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\IntToString.cpp
 # End Source File
 # Begin Source File
@@ -301,6 +289,10 @@ SOURCE=..\..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyException.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyGuidDef.h
 # End Source File
 # Begin Source File
@@ -309,10 +301,26 @@ SOURCE=..\..\..\Common\MyInitGuid.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyString.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyUnknown.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyWindows.cpp
 # End Source File
 # Begin Source File
@@ -353,14 +361,6 @@ SOURCE=..\..\..\Common\StdOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\String.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
@@ -389,14 +389,6 @@ SOURCE=..\..\..\Common\UTFConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Vector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
@@ -501,6 +493,14 @@ SOURCE=..\..\..\Windows\Synchronization.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Windows\System.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Windows\System.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Windows\Thread.h
 # End Source File
 # Begin Source File
@@ -609,6 +609,14 @@ SOURCE=..\..\Common\MethodId.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Common\MethodProps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MethodProps.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\MSBFDecoder.h
 # End Source File
 # Begin Source File
@@ -679,6 +687,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 "Compress"
 
@@ -1054,19 +1070,19 @@ SOURCE=..\..\Archive\Common\CoderMixer2MT.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer2ST.cpp
+SOURCE=..\..\Archive\Common\DummyOutStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer2ST.h
+SOURCE=..\..\Archive\Common\DummyOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.cpp
+SOURCE=..\..\Archive\Common\HandlerOut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.h
+SOURCE=..\..\Archive\Common\HandlerOut.h
 # End Source File
 # Begin Source File
 
@@ -1199,6 +1215,10 @@ SOURCE=..\..\UI\Common\OpenArchive.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\UI\Common\Property.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\UI\Common\PropIDUtils.cpp
 # End Source File
 # Begin Source File
diff --git a/CPP/7zip/Bundles/Alone7z/makefile b/CPP/7zip/Bundles/Alone7z/makefile
index 4ae28d39..1feb1fbd 100755
--- a/CPP/7zip/Bundles/Alone7z/makefile
+++ b/CPP/7zip/Bundles/Alone7z/makefile
@@ -30,11 +30,11 @@ COMMON_OBJS = \
   $O\NewHandler.obj \
   $O\StdInStream.obj \
   $O\StdOutStream.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
   $O\UTFConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -47,7 +47,8 @@ WIN_OBJS = \
   $O\MemoryLock.obj \
   $O\PropVariant.obj \
   $O\PropVariantConversions.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -59,12 +60,14 @@ WIN_OBJS = \
   $O\LimitedStreams.obj \
   $O\LockedStream.obj \
   $O\MethodId.obj \
+  $O\MethodProps.obj \
   $O\OffsetStream.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveCommandLine.obj \
@@ -92,6 +95,7 @@ AR_COMMON_OBJS = \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
   $O\DummyOutStream.obj \
+  $O\HandlerOut.obj \
   $O\InStreamWithCRC.obj \
   $O\ItemNameUtils.obj \
   $O\MultiStream.obj \
diff --git a/CPP/7zip/Bundles/Format7z/makefile b/CPP/7zip/Bundles/Format7z/makefile
index f74602ae..e690dd3a 100755
--- a/CPP/7zip/Bundles/Format7z/makefile
+++ b/CPP/7zip/Bundles/Format7z/makefile
@@ -12,10 +12,10 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -23,7 +23,8 @@ WIN_OBJS = \
   $O\FileFind.obj \
   $O\FileIO.obj \
   $O\PropVariant.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -34,11 +35,13 @@ WIN_OBJS = \
   $O\LockedStream.obj \
   $O\LSBFDecoder.obj \
   $O\MethodId.obj \
+  $O\MethodProps.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 AR_OBJS = \
   $O\ArchiveExports.obj \
@@ -48,6 +51,7 @@ AR_COMMON_OBJS = \
   $O\CoderMixer2.obj \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
+  $O\HandlerOut.obj \
   $O\InStreamWithCRC.obj \
   $O\ItemNameUtils.obj \
   $O\OutStreamWithCRC.obj \
@@ -134,6 +138,8 @@ AES_ORIG_OBJS = \
   $O\aestab.obj \
 
 CRYPTO_HASH_OBJS = \
+  $O\RandGen.obj \
+  $O\Sha1.obj \
   $O\Sha256.obj \
 
 C_OBJS = \
diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile
index 5926949f..a2362869 100755
--- a/CPP/7zip/Bundles/Format7zExtract/makefile
+++ b/CPP/7zip/Bundles/Format7zExtract/makefile
@@ -10,10 +10,10 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -21,7 +21,8 @@ WIN_OBJS = \
   $O\FileFind.obj \
   $O\FileIO.obj \
   $O\PropVariant.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -37,6 +38,7 @@ WIN_OBJS = \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 AR_OBJS = \
   $O\ArchiveExports.obj \
diff --git a/CPP/7zip/Bundles/Format7zExtractR/makefile b/CPP/7zip/Bundles/Format7zExtractR/makefile
index e2c1b838..0632e718 100755
--- a/CPP/7zip/Bundles/Format7zExtractR/makefile
+++ b/CPP/7zip/Bundles/Format7zExtractR/makefile
@@ -10,10 +10,10 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -21,7 +21,8 @@ WIN_OBJS = \
   $O\FileFind.obj \
   $O\FileIO.obj \
   $O\PropVariant.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -31,11 +32,13 @@ WIN_OBJS = \
   $O\LimitedStreams.obj \
   $O\LockedStream.obj \
   $O\MethodId.obj \
+  $O\MethodProps.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 AR_OBJS = \
   $O\ArchiveExports.obj \
@@ -45,6 +48,7 @@ AR_COMMON_OBJS = \
   $O\CoderMixer2.obj \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
+  $O\HandlerOut.obj \
   $O\ItemNameUtils.obj \
   $O\OutStreamWithCRC.obj \
   $O\ParseProperties.obj \
diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
index 7a4bafb2..66ae5d92 100755
--- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp
+++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
@@ -142,47 +142,51 @@ SOURCE=..\..\..\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\NewHandler.cpp
+SOURCE=..\..\..\Common\MyException.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.cpp
+SOURCE=..\..\..\Common\MyString.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.h
+SOURCE=..\..\..\Common\MyString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.cpp
+SOURCE=..\..\..\Common\MyVector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.h
+SOURCE=..\..\..\Common\MyVector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringToInt.cpp
+SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringToInt.h
+SOURCE=..\..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\UTFConvert.cpp
+SOURCE=..\..\..\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\UTFConvert.h
+SOURCE=..\..\..\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\StringToInt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.cpp
+SOURCE=..\..\..\Common\UTFConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.h
+SOURCE=..\..\..\Common\UTFConvert.h
 # End Source File
 # Begin Source File
 
@@ -238,6 +242,14 @@ SOURCE=..\..\..\Windows\Synchronization.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Windows\System.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Windows\System.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Windows\Thread.h
 # End Source File
 # End Group
@@ -1160,6 +1172,14 @@ SOURCE=..\..\Common\MethodId.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Common\MethodProps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MethodProps.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\OffsetStream.cpp
 # End Source File
 # Begin Source File
@@ -1230,6 +1250,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 "C"
 
@@ -1411,7 +1439,7 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
 
 !IF  "$(CFG)" == "7z - Win32 Release"
 
-# ADD CPP /O2
+# ADD CPP /O2 /FAs
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "7z - Win32 Debug"
@@ -1826,19 +1854,19 @@ SOURCE=..\..\Archive\Common\CoderMixer2MT.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp
+SOURCE=..\..\Archive\Common\DummyOutStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CrossThreadProgress.h
+SOURCE=..\..\Archive\Common\DummyOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.cpp
+SOURCE=..\..\Archive\Common\HandlerOut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.h
+SOURCE=..\..\Archive\Common\HandlerOut.h
 # End Source File
 # Begin Source File
 
diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile
index 52554f24..d3e9d8c7 100755
--- a/CPP/7zip/Bundles/Format7zF/makefile
+++ b/CPP/7zip/Bundles/Format7zF/makefile
@@ -12,10 +12,10 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\UTFConvert.obj \
   $O\Wildcard.obj \
 
@@ -24,7 +24,8 @@ WIN_OBJS = \
   $O\FileFind.obj \
   $O\FileIO.obj \
   $O\PropVariant.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\InBuffer.obj \
@@ -36,6 +37,7 @@ WIN_OBJS = \
   $O\LSBFDecoder.obj \
   $O\LSBFEncoder.obj \
   $O\MethodId.obj \
+  $O\MethodProps.obj \
   $O\MemBlocks.obj \
   $O\OffsetStream.obj \
   $O\OutBuffer.obj \
@@ -45,6 +47,7 @@ WIN_OBJS = \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 AR_OBJS = \
   $O\ArchiveExports.obj \
@@ -59,6 +62,7 @@ AR_COMMON_OBJS = \
   $O\ItemNameUtils.obj \
   $O\MultiStream.obj \
   $O\OutStreamWithCRC.obj \
+  $O\HandlerOut.obj \
   $O\ParseProperties.obj \
 
 
diff --git a/CPP/7zip/Bundles/Format7zR/makefile b/CPP/7zip/Bundles/Format7zR/makefile
index 3175e7f2..972c6eb1 100755
--- a/CPP/7zip/Bundles/Format7zR/makefile
+++ b/CPP/7zip/Bundles/Format7zR/makefile
@@ -10,10 +10,10 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -21,7 +21,8 @@ WIN_OBJS = \
   $O\FileFind.obj \
   $O\FileIO.obj \
   $O\PropVariant.obj \
-  $O\Synchronization.obj
+  $O\Synchronization.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -31,11 +32,13 @@ WIN_OBJS = \
   $O\LimitedStreams.obj \
   $O\LockedStream.obj \
   $O\MethodId.obj \
+  $O\MethodProps.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 AR_OBJS = \
   $O\ArchiveExports.obj \
@@ -45,6 +48,7 @@ AR_COMMON_OBJS = \
   $O\CoderMixer2.obj \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
+  $O\HandlerOut.obj \
   $O\InStreamWithCRC.obj \
   $O\ItemNameUtils.obj \
   $O\OutStreamWithCRC.obj \
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 \
diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractCallback.h b/CPP/7zip/Bundles/SFXSetup/ExtractCallback.h
index f3880890..b85dce42 100755
--- a/CPP/7zip/Bundles/SFXSetup/ExtractCallback.h
+++ b/CPP/7zip/Bundles/SFXSetup/ExtractCallback.h
@@ -5,7 +5,6 @@
 
 #include "resource.h"
 
-#include "Common/String.h"
 #include "Windows/ResourceString.h"
 
 #include "../../Archive/IArchive.h"
diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h
index a042270b..e2f7518b 100755
--- a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h
+++ b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h
@@ -3,7 +3,6 @@
 #ifndef __EXTRACTENGINE_H
 #define __EXTRACTENGINE_H
 
-#include "Common/String.h"
 #include "../../UI/GUI/OpenCallbackGUI.h"
 #include "../../UI/Common/LoadCodecs.h"
 
diff --git a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
index b09dce22..528275fd 100755
--- a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
+++ b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
@@ -341,51 +341,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\String.cpp
+SOURCE=..\..\..\Common\MyVector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.h
+SOURCE=..\..\..\Common\MyVector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.cpp
+SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.h
+SOURCE=..\..\..\Common\NewHandler.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\TextConfig.cpp
+SOURCE=..\..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\TextConfig.h
+SOURCE=..\..\..\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\UTFConvert.cpp
+SOURCE=..\..\..\Common\TextConfig.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\UTFConvert.h
+SOURCE=..\..\..\Common\TextConfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.cpp
+SOURCE=..\..\..\Common\UTFConvert.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Vector.h
+SOURCE=..\..\..\Common\UTFConvert.h
 # End Source File
 # Begin Source File
 
@@ -583,6 +583,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/SFXSetup/makefile b/CPP/7zip/Bundles/SFXSetup/makefile
index a93d0379..e773ba41 100755
--- a/CPP/7zip/Bundles/SFXSetup/makefile
+++ b/CPP/7zip/Bundles/SFXSetup/makefile
@@ -20,11 +20,11 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\TextConfig.obj \
   $O\UTFConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -54,6 +54,7 @@ WIN_CTRL_OBJS = \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveOpenCallback.obj \
diff --git a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
index 06c0020e..23bdf2de 100755
--- a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
+++ b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
@@ -550,6 +550,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 "File Manager"
 
@@ -712,35 +720,35 @@ 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\String.cpp
+SOURCE=..\..\..\Common\MyVector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\String.h
+SOURCE=..\..\..\Common\MyVector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.cpp
+SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\StringConvert.h
+SOURCE=..\..\..\Common\NewHandler.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
 
diff --git a/CPP/7zip/Bundles/SFXWin/makefile b/CPP/7zip/Bundles/SFXWin/makefile
index a7e52be2..aab98921 100755
--- a/CPP/7zip/Bundles/SFXWin/makefile
+++ b/CPP/7zip/Bundles/SFXWin/makefile
@@ -19,9 +19,9 @@ COMMON_OBJS = \
   $O\CommandLineParser.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -54,6 +54,7 @@ WIN_CTRL_OBJS = \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\VirtThread.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveExtractCallback.obj \