4.48 beta

4 files changed, 23 insertions, 16 deletions

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 \