4.48 beta

CPP/7zip/UI/Agent/Agent.cpp

@@ -49,6 +49,8 @@ void CAgentFolder::LoadFolder(CProxyFolder *folder)
 
 STDMETHODIMP CAgentFolder::LoadItems()
 {
+  if (!_agentSpec->_archiveLink.IsOpen)
+    return E_FAIL;
   _items.Clear();
   if (_flatMode)
     LoadFolder(_proxyFolderItem);

CPP/7zip/UI/Agent/AgentProxy.h

@@ -3,7 +3,7 @@
 #ifndef __AGENT_PROXY_H
 #define __AGENT_PROXY_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "../../Archive/IArchive.h"
 

CPP/7zip/UI/Client7z/Client7z.dsp

@@ -167,6 +167,22 @@ SOURCE=..\..\..\Common\IntToString.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\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -175,14 +191,6 @@ SOURCE=..\..\..\Common\NewHandler.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
@@ -191,14 +199,6 @@ SOURCE=..\..\..\Common\StringConvert.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

CPP/7zip/UI/Client7z/makefile

@@ -8,10 +8,10 @@ CONSOLE_OBJS = \
 COMMON_OBJS = \
   $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 = \

CPP/7zip/UI/Common/ArchiveCommandLine.cpp

@@ -24,6 +24,14 @@
 #include "SortUtils.h"
 #include "EnumDirItems.h"
 
+#if _MSC_VER >= 1400
+#define MY_isatty_fileno(x) _isatty(_fileno(x))
+#else
+#define MY_isatty_fileno(x) isatty(fileno(x))
+#endif
+
+#define MY_IS_TERMINAL(x) (MY_isatty_fileno(x) != 0); 
+
 using namespace NCommandLineParser;
 using namespace NWindows;
 using namespace NFile;
@@ -681,9 +689,9 @@ void CArchiveCommandLineParser::Parse1(const UStringVector &commandStrings,
     ThrowUserErrorException();
   }
 
-  options.IsInTerminal = (isatty(fileno(stdin)) != 0);
-  options.IsStdOutTerminal = (isatty(fileno(stdout)) != 0);
-  options.IsStdErrTerminal = (isatty(fileno(stderr)) != 0);
+  options.IsInTerminal = MY_IS_TERMINAL(stdin);
+  options.IsStdOutTerminal = MY_IS_TERMINAL(stdout);
+  options.IsStdErrTerminal = MY_IS_TERMINAL(stderr);
   options.StdOutMode = parser[NKey::kStdOut].ThereIs;
   options.EnableHeaders = !parser[NKey::kDisableHeaders].ThereIs;
   options.HelpMode = parser[NKey::kHelp1].ThereIs || parser[NKey::kHelp2].ThereIs  || parser[NKey::kHelp3].ThereIs;

CPP/7zip/UI/Common/ArchiveExtractCallback.h

@@ -6,7 +6,7 @@
 #include "../../Archive/IArchive.h"
 #include "IFileExtractCallback.h"
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/MyCom.h"
 
 #include "../../Common/FileStreams.h"

CPP/7zip/UI/Common/ArchiveName.h

@@ -3,7 +3,7 @@
 #ifndef __ARCHIVENAME_H
 #define __ARCHIVENAME_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 UString CreateArchiveName(const UString &srcName, bool fromPrev, bool keepName);
 

CPP/7zip/UI/Common/ArchiveOpenCallback.cpp

@@ -15,6 +15,8 @@ using namespace NWindows;
 STDMETHODIMP COpenCallbackImp::SetTotal(const UInt64 *files, const UInt64 *bytes)
 {
   COM_TRY_BEGIN
+  if (!Callback)
+    return S_OK;
   return Callback->SetTotal(files, bytes);
   COM_TRY_END
 }
@@ -22,6 +24,8 @@ STDMETHODIMP COpenCallbackImp::SetTotal(const UInt64 *files, const UInt64 *bytes
 STDMETHODIMP COpenCallbackImp::SetCompleted(const UInt64 *files, const UInt64 *bytes)
 {
   COM_TRY_BEGIN
+  if (!Callback)
+    return S_OK;
   return Callback->SetTotal(files, bytes);
   COM_TRY_END
 }
@@ -96,7 +100,10 @@ STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
   COM_TRY_BEGIN
   if (_subArchiveMode)
     return S_FALSE;
-  RINOK(Callback->CheckBreak());
+  if (Callback)
+  {
+    RINOK(Callback->CheckBreak());
+  }
   *inStream = NULL;
   UString fullPath = _folderPrefix + name;
   if (!NFile::NFind::FindFile(fullPath, _fileInfo))
@@ -120,6 +127,8 @@ STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
 STDMETHODIMP COpenCallbackImp::CryptoGetTextPassword(BSTR *password)
 {
   COM_TRY_BEGIN
+  if (!Callback)
+    return E_NOTIMPL;
   return Callback->CryptoGetTextPassword(password);
   COM_TRY_END
 }

CPP/7zip/UI/Common/ArchiveOpenCallback.h

@@ -3,7 +3,7 @@
 #ifndef __ARCHIVE_OPEN_CALLBACK_H
 #define __ARCHIVE_OPEN_CALLBACK_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/MyCom.h"
 #include "Windows/FileFind.h"
 
@@ -75,6 +75,8 @@ private:
 public:
   UStringVector FileNames;
   IOpenCallbackUI *Callback;
+
+  COpenCallbackImp(): Callback(NULL) {}
   void Init(const UString &folderPrefix,  const UString &fileName)
   {
     _folderPrefix = folderPrefix;

CPP/7zip/UI/Common/CompressCall.h

@@ -3,7 +3,7 @@
 #ifndef __COMPRESSCALL_H
 #define __COMPRESSCALL_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Windows/Synchronization.h"
 
 HRESULT MyCreateProcess(const UString &params,

CPP/7zip/UI/Common/DefaultName.h

@@ -3,7 +3,7 @@
 #ifndef __DEFAULTNAME_H
 #define __DEFAULTNAME_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 UString GetDefaultName2(const UString &fileName, 
     const UString &extension, const UString &addSubExtension);

CPP/7zip/UI/Common/DirItem.h

@@ -3,7 +3,7 @@
 #ifndef __DIR_ITEM_H
 #define __DIR_ITEM_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/Types.h"
 
 struct CDirItem

CPP/7zip/UI/Common/ExtractingFilePath.h

@@ -3,7 +3,7 @@
 #ifndef __EXTRACTINGFILEPATH_H
 #define __EXTRACTINGFILEPATH_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 UString GetCorrectFileName(const UString &path);
 UString GetCorrectPath(const UString &path);

CPP/7zip/UI/Common/IFileExtractCallback.h

@@ -3,7 +3,7 @@
 #ifndef __IFILEEXTRACTCALLBACK_H
 #define __IFILEEXTRACTCALLBACK_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 namespace NOverwriteAnswer
 {

CPP/7zip/UI/Common/LoadCodecs.h

@@ -5,7 +5,7 @@
 
 #include "../../../Common/Types.h"
 #include "../../../Common/MyCom.h"
-#include "../../../Common/String.h"
+#include "../../../Common/MyString.h"
 #include "../../../Common/Buffer.h"
 #include "../../ICoder.h"
 

CPP/7zip/UI/Common/OpenArchive.cpp

@@ -81,12 +81,12 @@ HRESULT IsArchiveItemAnti(IInArchive *archive, UInt32 index, bool &result)
 // Static-SFX (for Linux) can be big.
 const UInt64 kMaxCheckStartPosition = 1 << 22;
 
-HRESULT ReOpenArchive(IInArchive *archive, const UString &fileName)
+HRESULT ReOpenArchive(IInArchive *archive, const UString &fileName, IArchiveOpenCallback *openArchiveCallback)
 {
   CInFileStream *inStreamSpec = new CInFileStream;
   CMyComPtr<IInStream> inStream(inStreamSpec);
   inStreamSpec->Open(fileName);
-  return archive->Open(inStream, &kMaxCheckStartPosition, NULL);
+  return archive->Open(inStream, &kMaxCheckStartPosition, openArchiveCallback);
 }
 
 #ifndef _SFX
@@ -305,13 +305,11 @@ HRESULT OpenArchive(
   return S_OK;
 }
 
-HRESULT MyOpenArchive(
-    CCodecs *codecs, 
-    const UString &archiveName,
-    IInArchive **archive, UString &defaultItemName, IOpenCallbackUI *openCallbackUI)
+static void SetCallback(const UString &archiveName,
+    IOpenCallbackUI *openCallbackUI, CMyComPtr<IArchiveOpenCallback> &openCallback)
 {
   COpenCallbackImp *openCallbackSpec = new COpenCallbackImp;
-  CMyComPtr<IArchiveOpenCallback> openCallback = openCallbackSpec;
+  openCallback = openCallbackSpec;
   openCallbackSpec->Callback = openCallbackUI;
 
   UString fullName;
@@ -320,7 +318,15 @@ HRESULT MyOpenArchive(
   openCallbackSpec->Init(
       fullName.Left(fileNamePartStartIndex), 
       fullName.Mid(fileNamePartStartIndex));
+}
 
+HRESULT MyOpenArchive(
+    CCodecs *codecs, 
+    const UString &archiveName,
+    IInArchive **archive, UString &defaultItemName, IOpenCallbackUI *openCallbackUI)
+{
+  CMyComPtr<IArchiveOpenCallback> openCallback;
+  SetCallback(archiveName, openCallbackUI, openCallback);
   int formatInfo;
   return OpenArchive(codecs, archiveName, archive, formatInfo, defaultItemName, openCallback);
 }
@@ -367,11 +373,13 @@ HRESULT CArchiveLink::Close()
     RINOK(Archive1->Close());
   if (Archive0 != 0)
     RINOK(Archive0->Close());
+  IsOpen = false;
   return S_OK;
 }
 
 void CArchiveLink::Release()
 {
+  IsOpen = false;
   Archive1.Release();
   Archive0.Release();
 }
@@ -382,11 +390,13 @@ HRESULT OpenArchive(
     CArchiveLink &archiveLink,
     IArchiveOpenCallback *openCallback)
 {
-  return OpenArchive(codecs, archiveName, 
+  HRESULT res = OpenArchive(codecs, archiveName, 
     &archiveLink.Archive0, &archiveLink.Archive1, 
     archiveLink.FormatIndex0, archiveLink.FormatIndex1, 
     archiveLink.DefaultItemName0, archiveLink.DefaultItemName1, 
     openCallback);
+  archiveLink.IsOpen = (res == S_OK);
+  return res;
 }
 
 HRESULT MyOpenArchive(CCodecs *codecs,
@@ -394,18 +404,27 @@ HRESULT MyOpenArchive(CCodecs *codecs,
     CArchiveLink &archiveLink,
     IOpenCallbackUI *openCallbackUI)
 {
-  return MyOpenArchive(codecs, archiveName,
+  HRESULT res = MyOpenArchive(codecs, archiveName,
     &archiveLink.Archive0, &archiveLink.Archive1, 
     archiveLink.DefaultItemName0, archiveLink.DefaultItemName1, 
     archiveLink.VolumePaths,
     openCallbackUI);
+  archiveLink.IsOpen = (res == S_OK);
+  return res;
 }
 
 HRESULT ReOpenArchive(CCodecs *codecs, CArchiveLink &archiveLink, const UString &fileName)
 {
   if (archiveLink.GetNumLevels() > 1)
     return E_NOTIMPL;
+
   if (archiveLink.GetNumLevels() == 0)
     return MyOpenArchive(codecs, fileName, archiveLink, 0);
-  return ReOpenArchive(archiveLink.GetArchive(), fileName);
+
+  CMyComPtr<IArchiveOpenCallback> openCallback;
+  SetCallback(fileName, NULL, openCallback);
+
+  HRESULT res = ReOpenArchive(archiveLink.GetArchive(), fileName, openCallback);
+  archiveLink.IsOpen = (res == S_OK);
+  return res;
 }

CPP/7zip/UI/Common/OpenArchive.h

@@ -3,7 +3,7 @@
 #ifndef __OPENARCHIVE_H
 #define __OPENARCHIVE_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Windows/FileFind.h"
 
 #include "../../Archive/IArchive.h"
@@ -51,7 +51,7 @@ HRESULT OpenArchive(
     IArchiveOpenCallback *openArchiveCallback);
 
 
-HRESULT ReOpenArchive(IInArchive *archive, const UString &fileName);
+HRESULT ReOpenArchive(IInArchive *archive, const UString &fileName, IArchiveOpenCallback *openArchiveCallback);
 
 HRESULT MyOpenArchive(
     CCodecs *codecs,
@@ -94,6 +94,9 @@ struct CArchiveLink
     return result;
   }
 
+  bool IsOpen;
+
+  CArchiveLink(): IsOpen(false) {};
 
   IInArchive *GetArchive() { return Archive1 != 0 ? Archive1: Archive0; }
   UString GetDefaultItemName()  { return Archive1 != 0 ? DefaultItemName1: DefaultItemName0; }

CPP/7zip/UI/Common/PropIDUtils.cpp

@@ -32,8 +32,7 @@ static void ConvertUInt32ToHex(UInt32 value, wchar_t *s)
   s[8] = L'\0';
 }
 
-UString ConvertPropertyToString(const PROPVARIANT &propVariant, 
-    PROPID propID, bool full)
+UString ConvertPropertyToString(const PROPVARIANT &propVariant, PROPID propID, bool full)
 {
   switch(propID)
   {

CPP/7zip/UI/Common/PropIDUtils.h

@@ -3,9 +3,8 @@
 #ifndef __PROPIDUTILS_H
 #define __PROPIDUTILS_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
-UString ConvertPropertyToString(const PROPVARIANT &aPropVariant, 
-    PROPID aPropID, bool aFull = true);
+UString ConvertPropertyToString(const PROPVARIANT &propVariant, PROPID propID, bool full = true);
 
 #endif

CPP/7zip/UI/Common/Property.h

@@ -3,7 +3,7 @@
 #ifndef __PROPERTY_H
 #define __PROPERTY_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 struct CProperty
 {

CPP/7zip/UI/Common/SetProperties.cpp

@@ -5,7 +5,7 @@
 #include "SetProperties.h"
 
 #include "Windows/PropVariant.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/StringToInt.h"
 #include "Common/MyCom.h"
 

CPP/7zip/UI/Common/SortUtils.cpp

@@ -77,4 +77,4 @@ void SortStrings(const UStringVector &src, UStringVector &dest)
   for (int i = 0; i < indices.Size(); i++)
     dest.Add(src[indices[i]]);
 }
-*/
+*/

CPP/7zip/UI/Common/SortUtils.h

@@ -3,7 +3,7 @@
 #ifndef __SORTUTLS_H
 #define __SORTUTLS_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 void SortStringsToIndices(const UStringVector &strings, CIntVector &indices);
 // void SortStrings(const UStringVector &src, UStringVector &dest);

CPP/7zip/UI/Common/TempFiles.h

@@ -3,7 +3,7 @@
 #ifndef __TEMPFILES_H
 #define __TEMPFILES_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 class CTempFiles
 {

CPP/7zip/UI/Common/UpdateCallback.h

@@ -4,7 +4,7 @@
 #define __UPDATECALLBACK_H
 
 #include "Common/MyCom.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "../../IPassword.h"
 

CPP/7zip/UI/Common/ZipRegistry.h

@@ -3,7 +3,7 @@
 #ifndef __ZIPREGISTRY_H
 #define __ZIPREGISTRY_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/Types.h"
 #include "ExtractMode.h"
 

CPP/7zip/UI/Console/Console.dsp

@@ -308,6 +308,14 @@ SOURCE=..\..\..\Windows\Registry.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\Time.h
 # End Source File
 # End Group
@@ -364,6 +372,22 @@ SOURCE=..\..\..\Common\MyCom.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\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -388,14 +412,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
@@ -420,14 +436,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

CPP/7zip/UI/Console/ExtractCallbackConsole.h

@@ -3,7 +3,7 @@
 #ifndef __EXTRACTCALLBACKCONSOLE_H
 #define __EXTRACTCALLBACKCONSOLE_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/StdOutStream.h"
 #include "../../Common/FileStreams.h"
 #include "../../IPassword.h"

CPP/7zip/UI/Console/Main.cpp

@@ -5,7 +5,7 @@
 #include "Common/MyInitGuid.h"
 
 #include "Common/CommandLineParser.h"
-#include "Common/Exception.h"
+#include "Common/MyException.h"
 #include "Common/IntToString.h"
 #include "Common/ListFileUtils.h"
 #include "Common/StdInStream.h"

CPP/7zip/UI/Console/MainAr.cpp

@@ -8,7 +8,7 @@
 
 #include "Common/StdOutStream.h"
 #include "Common/NewHandler.h"
-#include "Common/Exception.h"
+#include "Common/MyException.h"
 #include "Common/StringConvert.h"
 
 #include "../Common/ExitCode.h"

CPP/7zip/UI/Console/PercentPrinter.cpp

@@ -3,7 +3,7 @@
 #include "StdAfx.h"
 
 #include "Common/IntToString.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "PercentPrinter.h"
 

CPP/7zip/UI/Console/UpdateCallbackConsole.h

@@ -3,7 +3,7 @@
 #ifndef __UPDATECALLBACKCONSOLE_H
 #define __UPDATECALLBACKCONSOLE_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/StdOutStream.h"
 #include "PercentPrinter.h"
 #include "../Common/Update.h"

CPP/7zip/UI/Console/makefile

@@ -28,11 +28,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,6 +46,7 @@ WIN_OBJS = \
   $O\PropVariant.obj \
   $O\PropVariantConversions.obj \
   $O\Registry.obj \
+  $O\System.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\FilePathAutoRename.obj \

CPP/7zip/UI/Explorer/ContextMenu.h

@@ -7,7 +7,7 @@
 DEFINE_GUID(CLSID_CZipContextMenu, 
 0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00);
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "../../FileManager/PluginInterface.h"
 #include "../../FileManager/MyCom2.h"

CPP/7zip/UI/Explorer/Explorer.dsp

@@ -569,6 +569,22 @@ SOURCE=..\..\..\Common\MyCom.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\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -593,14 +609,6 @@ SOURCE=..\..\..\Common\StdInStream.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
@@ -637,14 +645,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

CPP/7zip/UI/Explorer/MyMessages.cpp

@@ -3,8 +3,6 @@
 #include "StdAfx.h"
 
 #include "MyMessages.h"
-#include "Common/String.h"
-#include "Common/StringConvert.h"
 
 #include "Windows/Error.h"
 #include "Windows/ResourceString.h"

CPP/7zip/UI/Explorer/MyMessages.h

@@ -3,7 +3,7 @@
 #ifndef __MYMESSAGES_H
 #define __MYMESSAGES_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 void MyMessageBox(HWND window, LPCWSTR message);
 

CPP/7zip/UI/Explorer/makefile

@@ -21,12 +21,12 @@ COMMON_OBJS = \
   $O\NewHandler.obj \
   $O\Random.obj \
   $O\StdInStream.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
   $O\TextConfig.obj \
   $O\UTFConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \

CPP/7zip/UI/Far/ExtractEngine.h

@@ -4,7 +4,7 @@
 #define __EXTRACTENGINE_H
 
 #include "Common/MyCom.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "../../IPassword.h"
 #include "../Agent/IFolderArchive.h"

CPP/7zip/UI/Far/Far.dsp

@@ -126,6 +126,22 @@ SOURCE=..\..\..\Common\IntToString.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\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -134,14 +150,6 @@ SOURCE=..\..\..\Common\NewHandler.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
@@ -150,14 +158,6 @@ SOURCE=..\..\..\Common\StringConvert.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

CPP/7zip/UI/Far/FarUtils.h

@@ -4,8 +4,6 @@
 #define __FARUTILS_H
 
 #include "FarPlugin.h"
-#include "Common/String.h"
-#include "Common/Vector.h"
 #include "Windows/Registry.h"
 
 namespace NFar {

CPP/7zip/UI/Far/OverwriteDialog.cpp

@@ -6,7 +6,6 @@
 
 #include "OverwriteDialog.h"
 
-#include "Common/String.h"
 #include "Common/StringConvert.h"
 
 #include "Windows/FileName.h"

CPP/7zip/UI/Far/OverwriteDialog.h

@@ -3,7 +3,7 @@
 #ifndef OVERWRITEDIALOG_H
 #define OVERWRITEDIALOG_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 namespace NOverwriteDialog {
 

CPP/7zip/UI/Far/ProgressBox.h

@@ -3,7 +3,7 @@
 #ifndef __PROGRESSBOX_H
 #define __PROGRESSBOX_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/Types.h"
 
 class CMessageBox

CPP/7zip/UI/Far/UpdateCallback100.h

@@ -3,7 +3,6 @@
 #ifndef __UPDATECALLBACK100_H
 #define __UPDATECALLBACK100_H
 
-#include "Common/String.h"
 #include "Common/MyCom.h"
 
 #include "../Agent/IFolderArchive.h"

CPP/7zip/UI/Far/makefile

@@ -22,10 +22,10 @@ FAR_OBJS = \
 COMMON_OBJS = \
   $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 = \

CPP/7zip/UI/GUI/GUI.cpp

@@ -12,7 +12,7 @@ extern "C"
 #include "Common/NewHandler.h"
 #include "Common/StringConvert.h"
 #include "Common/CommandLineParser.h"
-#include "Common/Exception.h"
+#include "Common/MyException.h"
 
 #include "Windows/COM.h"
 #include "Windows/FileMapping.h"

CPP/7zip/UI/GUI/GUI.dsp

@@ -735,6 +735,22 @@ SOURCE=..\..\..\Common\ListFileUtils.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\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -751,14 +767,6 @@ SOURCE=..\..\..\Common\StdInStream.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
@@ -791,14 +799,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
@@ -959,6 +959,10 @@ 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

CPP/7zip/UI/GUI/Resource/BenchmarkDialog/BenchmarkDialog.cpp

@@ -4,7 +4,7 @@
 
 #include "Common/IntToString.h"
 #include "Common/StringToInt.h"
-#include "Common/Exception.h"
+#include "Common/MyException.h"
 #include "Windows/Thread.h"
 #include "Windows/Error.h"
 #include "Windows/System.h"

CPP/7zip/UI/GUI/makefile

@@ -26,12 +26,12 @@ COMMON_OBJS = \
   $O\ListFileUtils.obj \
   $O\NewHandler.obj \
   $O\StdInStream.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
   $O\TextConfig.obj \
   $O\UTFConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
@@ -49,6 +49,7 @@ WIN_OBJS = \
   $O\ResourceString.obj \
   $O\Shell.obj \
   $O\Synchronization.obj \
+  $O\System.obj \
   $O\Window.obj \
 
 WIN_CTRL_OBJS = \