4.53 beta

17 files changed, 72 insertions, 389 deletions

diff --git a/CPP/7zip/UI/Explorer/ContextMenu.cpp b/CPP/7zip/UI/Explorer/ContextMenu.cpp
index 53f778cc..06210412 100755
--- a/CPP/7zip/UI/Explorer/ContextMenu.cpp
+++ b/CPP/7zip/UI/Explorer/ContextMenu.cpp
@@ -19,14 +19,14 @@
 #include "Windows/Menu.h"
 #include "Windows/ResourceString.h"
 
-#include "../../FileManager/FormatUtils.h"
-#include "../../FileManager/ProgramLocation.h"
+#include "../FileManager/FormatUtils.h"
+#include "../FileManager/ProgramLocation.h"
 
 #include "../Common/ZipRegistry.h"
 #include "../Common/ArchiveName.h"
 
 #ifdef LANG        
-#include "../../FileManager/LangUtils.h"
+#include "../FileManager/LangUtils.h"
 #endif
 
 #include "resource.h"
@@ -37,7 +37,7 @@
 // #include "CompressEngine.h"
 #include "MyMessages.h"
 
-#include "../Resource/Extract/resource.h"
+#include "../GUI/ExtractRes.h"
 #include "../Common/CompressCall.h"
 
 using namespace NWindows;
@@ -311,7 +311,7 @@ static UString GetReducedString(const UString &s)
 
 static const wchar_t *kExtractExludeExtensions[] = 
 {
-  L"txt", L"htm", L"html", L"xml", L"doc", L"xls",
+  L"txt", L"htm", L"html", L"xml",
   L"bmp", L"gif", L"jpeg", L"jpg"
 };
 
diff --git a/CPP/7zip/UI/Explorer/ContextMenu.h b/CPP/7zip/UI/Explorer/ContextMenu.h
index 9ab80dfd..88b33178 100755
--- a/CPP/7zip/UI/Explorer/ContextMenu.h
+++ b/CPP/7zip/UI/Explorer/ContextMenu.h
@@ -9,8 +9,8 @@ DEFINE_GUID(CLSID_CZipContextMenu,
 
 #include "Common/MyString.h"
 
-#include "../../FileManager/PluginInterface.h"
-#include "../../FileManager/MyCom2.h"
+#include "../FileManager/PluginInterface.h"
+#include "../FileManager/MyCom2.h"
 
 
 class CZipContextMenu: 
diff --git a/CPP/7zip/UI/Explorer/DllExports.cpp b/CPP/7zip/UI/Explorer/DllExports.cpp
index fb7daf04..6072e92a 100755
--- a/CPP/7zip/UI/Explorer/DllExports.cpp
+++ b/CPP/7zip/UI/Explorer/DllExports.cpp
@@ -20,9 +20,8 @@
 #include "Windows/DLL.h"
 #include "Windows/Registry.h"
 
-#include "../../IPassword.h"
-#include "../../FileManager/LangUtils.h"
-#include "../Agent/Agent.h"
+#include "../FileManager/LangUtils.h"
+#include "../FileManager/IFolder.h"
 
 #include "ContextMenu.h"
 #include "OptionsDialog.h"
@@ -51,7 +50,6 @@ public:
   CShellExtClassFactory() { InterlockedIncrement(&g_DllRefCount); }
   ~CShellExtClassFactory() { InterlockedDecrement(&g_DllRefCount); }
 
-
   MY_UNKNOWN_IMP1_MT(IClassFactory)
   
   STDMETHODIMP CreateInstance(LPUNKNOWN, REFIID, void**);
@@ -258,16 +256,6 @@ STDAPI CreateObject(
   LoadLangOneTime();
   COM_TRY_BEGIN
   *outObject = 0;
-  if (*classID == CLSID_CAgentArchiveHandler)
-  {
-    if (*interfaceID == IID_IFolderManager)
-    {
-      CMyComPtr<IFolderManager> manager = new CArchiveFolderManager;
-      *outObject = manager.Detach();
-      return S_OK;
-    }
-    return E_NOINTERFACE;
-  }
   if (*classID == CLSID_CSevenZipOptions)
   {
     if (*interfaceID == IID_IPluginOptions)
@@ -291,13 +279,6 @@ STDAPI GetPluginProperty(PROPID propID, PROPVARIANT *value)
       if ((value->bstrVal = ::SysAllocString(L"7-Zip")) != 0)
         value->vt = VT_BSTR;
       return S_OK;
-    case NPlugin::kClassID:
-    {
-      if ((value->bstrVal = ::SysAllocStringByteLen(
-          (const char *)&CLSID_CAgentArchiveHandler, sizeof(GUID))) != 0)
-        value->vt = VT_BSTR;
-      return S_OK;
-    }
     case NPlugin::kOptionsClassID:
     {
       if ((value->bstrVal = ::SysAllocStringByteLen(
@@ -305,11 +286,6 @@ STDAPI GetPluginProperty(PROPID propID, PROPVARIANT *value)
         value->vt = VT_BSTR;
       return S_OK;
     }
-    /*
-    case NArchive::kType:
-      propVariant = UINT32(0);
-      break;
-    */
   }
   return S_OK;
 }
diff --git a/CPP/7zip/UI/Explorer/Explorer.dsp b/CPP/7zip/UI/Explorer/Explorer.dsp
index 586d9aae..2f9252c7 100755
--- a/CPP/7zip/UI/Explorer/Explorer.dsp
+++ b/CPP/7zip/UI/Explorer/Explorer.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /Yu"StdAfx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -99,7 +99,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /D "_MBCS" /Yu"StdAfx.h" /FD /c
-# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /Yu"StdAfx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -128,7 +128,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c
-# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "EXPLORER_EXPORTS" /D "LANG" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -182,14 +182,6 @@ SOURCE=.\StdAfx.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\Common\ArchiveExtractCallback.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\ArchiveExtractCallback.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\Common\ArchiveName.cpp
 # End Source File
 # Begin Source File
@@ -198,14 +190,6 @@ SOURCE=..\Common\ArchiveName.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\Common\ArchiveOpenCallback.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\ArchiveOpenCallback.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\Common\CompressCall.cpp
 # End Source File
 # Begin Source File
@@ -214,106 +198,6 @@ SOURCE=..\Common\CompressCall.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\Common\DefaultName.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\DefaultName.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\EnumDirItems.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\EnumDirItems.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\ExtractingFilePath.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\ExtractingFilePath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\HandlerLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\LoadCodecs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\LoadCodecs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\OpenArchive.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\OpenArchive.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\PropIDUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\PropIDUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\SortUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\SortUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdateAction.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdateAction.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdateCallback.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdateCallback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdatePair.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdatePair.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdateProduce.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\UpdateProduce.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\WorkDir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\WorkDir.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\Common\ZipRegistry.cpp
 # End Source File
 # Begin Source File
@@ -344,85 +228,29 @@ SOURCE=.\MyMessages.h
 # Begin Group "Dialogs"
 
 # PROP Default_Filter ""
-# Begin Group "Options"
-
-# PROP Default_Filter ""
-# Begin Group "SystemPage"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\SystemPage\SystemPage.cpp
+SOURCE=.\FoldersPage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\SystemPage\SystemPage.h
-# End Source File
-# End Group
-# Begin Group "FoldersPage"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\FoldersPage\FoldersPage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FoldersPage\FoldersPage.h
-# End Source File
-# End Group
-# End Group
-# End Group
-# Begin Group "Agent"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\Agent\Agent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\Agent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\AgentOut.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\AgentProxy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\AgentProxy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\ArchiveFolder.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\ArchiveFolderOpen.cpp
+SOURCE=.\FoldersPage.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\Agent\ArchiveFolderOut.cpp
+SOURCE=.\FoldersPageRes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\Agent\IFileExtractCallback.h
+SOURCE=.\SystemPage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\Agent\IFolderArchive.h
+SOURCE=.\SystemPage.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\Agent\UpdateCallbackAgent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Agent\UpdateCallbackAgent.h
+SOURCE=.\SystemPageRes.h
 # End Source File
 # End Group
 # Begin Group "FileManager"
@@ -430,87 +258,47 @@ SOURCE=..\Agent\UpdateCallbackAgent.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\FileManager\FormatUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\FormatUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\HelpUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\HelpUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\IFolder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\LangUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\LangUtils.h
+SOURCE=..\FileManager\FormatUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\FileManager\ProgramLocation.cpp
+SOURCE=..\FileManager\FormatUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\FileManager\ProgramLocation.h
+SOURCE=..\FileManager\HelpUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\FileManager\RegistryUtils.cpp
+SOURCE=..\FileManager\HelpUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\FileManager\RegistryUtils.h
+SOURCE=..\FileManager\IFolder.h
 # End Source File
-# End Group
-# Begin Group "7-zip common"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Common\FilePathAutoRename.cpp
+SOURCE=..\FileManager\LangUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\FilePathAutoRename.h
+SOURCE=..\FileManager\LangUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\FileStreams.cpp
+SOURCE=..\FileManager\ProgramLocation.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\FileStreams.h
+SOURCE=..\FileManager\ProgramLocation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\StreamUtils.cpp
+SOURCE=..\FileManager\RegistryUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\StreamUtils.h
-# End Source File
-# End Group
-# Begin Group "Compress"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Compress\Copy\CopyCoder.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Compress\Copy\CopyCoder.h
+SOURCE=..\FileManager\RegistryUtils.h
 # End Source File
 # End Group
 # Begin Group "C"
@@ -518,24 +306,6 @@ SOURCE=..\..\Compress\Copy\CopyCoder.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Alloc.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Sort.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Sort.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\Threads.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -745,22 +515,6 @@ SOURCE=..\..\..\Windows\Menu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\PropVariant.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\PropVariant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\PropVariantConversions.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\PropVariantConversions.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\Registry.cpp
 # End Source File
 # Begin Source File
diff --git a/CPP/7zip/UI/Explorer/FoldersPage/FoldersPage.cpp b/CPP/7zip/UI/Explorer/FoldersPage.cpp
index 776813d8..b3470390 100755
--- a/CPP/7zip/UI/Explorer/FoldersPage/FoldersPage.cpp
+++ b/CPP/7zip/UI/Explorer/FoldersPage.cpp
@@ -2,7 +2,7 @@
 
 #include "StdAfx.h"
 
-#include "resource.h"
+#include "FoldersPageRes.h"
 #include "FoldersPage.h"
 
 #include "Common/StringConvert.h"
@@ -10,10 +10,10 @@
 #include "Windows/Shell.h"
 #include "Windows/ResourceString.h"
 
-#include "../../../FileManager/HelpUtils.h"
-#include "../../Common/ZipRegistry.h"
+#include "../Common/ZipRegistry.h"
 
-#include "../../../FileManager/LangUtils.h"
+#include "../FileManager/HelpUtils.h"
+#include "../FileManager/LangUtils.h"
 
 using namespace NWindows;
 
diff --git a/CPP/7zip/UI/Explorer/FoldersPage/FoldersPage.h b/CPP/7zip/UI/Explorer/FoldersPage.h
index 97950fc6..be8a362f 100755
--- a/CPP/7zip/UI/Explorer/FoldersPage/FoldersPage.h
+++ b/CPP/7zip/UI/Explorer/FoldersPage.h
@@ -5,7 +5,7 @@
 
 #include "Windows/Control/PropertyPage.h"
 
-#include "../../Common/ZipRegistry.h"
+#include "../Common/ZipRegistry.h"
 
 class CFoldersPage : public NWindows::NControl::CPropertyPage
 {
diff --git a/CPP/7zip/UI/Explorer/FoldersPage/resource.rc b/CPP/7zip/UI/Explorer/FoldersPage.rc
index 96b2c9d3..cb9694a6 100755
--- a/CPP/7zip/UI/Explorer/FoldersPage/resource.rc
+++ b/CPP/7zip/UI/Explorer/FoldersPage.rc
@@ -1,5 +1,5 @@
-#include "resource.h"
-#include "../../../GuiCommon.rc"
+#include "FoldersPageRes.h"
+#include "../../GuiCommon.rc"
 
 #define xSize2 196
 #define ySize2 140
diff --git a/CPP/7zip/UI/Explorer/FoldersPage/resource.h b/CPP/7zip/UI/Explorer/FoldersPageRes.h
index 3052409b..3052409b 100755
--- a/CPP/7zip/UI/Explorer/FoldersPage/resource.h
+++ b/CPP/7zip/UI/Explorer/FoldersPageRes.h
diff --git a/CPP/7zip/UI/Explorer/MyMessages.cpp b/CPP/7zip/UI/Explorer/MyMessages.cpp
index a29581be..58ab1f85 100755
--- a/CPP/7zip/UI/Explorer/MyMessages.cpp
+++ b/CPP/7zip/UI/Explorer/MyMessages.cpp
@@ -8,7 +8,7 @@
 #include "Windows/ResourceString.h"
 
 #ifdef LANG        
-#include "../../FileManager/LangUtils.h"
+#include "../FileManager/LangUtils.h"
 #endif
 
 using namespace NWindows;
diff --git a/CPP/7zip/UI/Explorer/OptionsDialog.cpp b/CPP/7zip/UI/Explorer/OptionsDialog.cpp
index b7831afd..4b2d3b51 100755
--- a/CPP/7zip/UI/Explorer/OptionsDialog.cpp
+++ b/CPP/7zip/UI/Explorer/OptionsDialog.cpp
@@ -9,11 +9,11 @@
 #include "Common/StringConvert.h"
 #include "Windows/Control/PropertyPage.h"
 
-#include "../../FileManager/LangUtils.h"
-#include "FoldersPage/FoldersPage.h"
-#include "FoldersPage/resource.h"
-#include "SystemPage/SystemPage.h"
-#include "SystemPage/resource.h"
+#include "../FileManager/LangUtils.h"
+#include "FoldersPage.h"
+#include "FoldersPageRes.h"
+#include "SystemPage.h"
+#include "SystemPageRes.h"
 
 using namespace NWindows;
 
diff --git a/CPP/7zip/UI/Explorer/OptionsDialog.h b/CPP/7zip/UI/Explorer/OptionsDialog.h
index 7e85d357..affa4329 100755
--- a/CPP/7zip/UI/Explorer/OptionsDialog.h
+++ b/CPP/7zip/UI/Explorer/OptionsDialog.h
@@ -3,7 +3,7 @@
 #ifndef __SEVENZIP_OPTIONSDIALOG_H
 #define __SEVENZIP_OPTIONSDIALOG_H
 
-#include "../../FileManager/PluginInterface.h"
+#include "../FileManager/PluginInterface.h"
 #include "Common/MyCom.h"
 
 // {23170F69-40C1-278D-1000-000100020000}
diff --git a/CPP/7zip/UI/Explorer/SystemPage/SystemPage.cpp b/CPP/7zip/UI/Explorer/SystemPage.cpp
index cc2f974d..dd60b6d5 100755
--- a/CPP/7zip/UI/Explorer/SystemPage/SystemPage.cpp
+++ b/CPP/7zip/UI/Explorer/SystemPage.cpp
@@ -1,22 +1,23 @@
 // SystemPage.cpp
 
 #include "StdAfx.h"
+
 #include "resource.h"
-#include "../resource.h"
+#include "SystemPageRes.h"
+#include "SystemPage.h"
 
 #include "Common/StringConvert.h"
 #include "Windows/Defs.h"
 #include "Windows/Control/ListView.h"
 
-#include "SystemPage.h"
+#include "../Common/ZipRegistry.h"
 
-#include "../../Common/ZipRegistry.h"
-#include "../RegistryContextMenu.h"
-#include "../ContextMenuFlags.h"
+#include "../FileManager/HelpUtils.h"
+#include "../FileManager/LangUtils.h"
+#include "../FileManager/FormatUtils.h"
 
-#include "../../../FileManager/HelpUtils.h"
-#include "../../../FileManager/LangUtils.h"
-#include "../../../FileManager/FormatUtils.h"
+#include "RegistryContextMenu.h"
+#include "ContextMenuFlags.h"
 
 using namespace NContextMenuFlags;
 
@@ -32,8 +33,8 @@ static LPCWSTR kSystemTopic = L"fm/plugins/7-zip/options.htm#system";
 struct CContextMenuItem
 {
   int ControlID;
-  UINT32 LangID;
-  UINT32 Flag;
+  UInt32 LangID;
+  UInt32 Flag;
 };
 
 static CContextMenuItem kMenuItems[] = 
@@ -50,7 +51,7 @@ static CContextMenuItem kMenuItems[] =
   { IDS_CONTEXT_COMPRESS_TO, 0x0200010F,  kCompressTo7z },
   { IDS_CONTEXT_COMPRESS_TO_EMAIL, 0x02000113, kCompressTo7zEmail},
   { IDS_CONTEXT_COMPRESS_TO, 0x0200010F,  kCompressToZip },
-  { IDS_CONTEXT_COMPRESS_TO_EMAIL, 0x02000113, kCompressToZipEmail},
+  { IDS_CONTEXT_COMPRESS_TO_EMAIL, 0x02000113, kCompressToZipEmail}
 };
 
 const int kNumMenuItems = sizeof(kMenuItems) / sizeof(kMenuItems[0]);
@@ -65,7 +66,7 @@ bool CSystemPage::OnInit()
 
   CheckButton(IDC_SYSTEM_CASCADED_MENU, ReadCascadedMenu());
 
-  UINT32 contextMenuFlags;
+  UInt32 contextMenuFlags;
   if (!ReadContextMenuStatus(contextMenuFlags))
     contextMenuFlags = NContextMenuFlags::GetDefaultFlags();
 
@@ -76,7 +77,7 @@ bool CSystemPage::OnInit()
       NRegistryAssociations::CheckContextMenuHandler());
   */
 
-  UINT32 newFlags = LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT;
+  UInt32 newFlags = LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT;
   m_ListView.SetExtendedListViewStyle(newFlags, newFlags);
 
   UString s; //  = TEXT("Items"); // LangLoadString(IDS_PROPERTY_EXTENSION, 0x02000205);
@@ -154,7 +155,7 @@ LONG CSystemPage::OnApply()
   }
   SaveCascadedMenu(IsButtonCheckedBool(IDC_SYSTEM_CASCADED_MENU));
 
-  UINT32 flags = 0;
+  UInt32 flags = 0;
   for (int i = 0; i < kNumMenuItems; i++)
     if (m_ListView.GetCheckState(i))
       flags |= kMenuItems[i].Flag;
@@ -181,7 +182,7 @@ bool CSystemPage::OnButtonClicked(int buttonID, HWND buttonHWND)
 
 }
 
-bool CSystemPage::OnNotify(UINT aControlID, LPNMHDR lParam) 
+bool CSystemPage::OnNotify(UINT controlID, LPNMHDR lParam) 
 { 
   if (lParam->hwndFrom == HWND(m_ListView))
   {
@@ -191,7 +192,7 @@ bool CSystemPage::OnNotify(UINT aControlID, LPNMHDR lParam)
         return OnItemChanged((const NMLISTVIEW *)lParam);
     }
   } 
-  return CPropertyPage::OnNotify(aControlID, lParam); 
+  return CPropertyPage::OnNotify(controlID, lParam); 
 }
 
 
diff --git a/CPP/7zip/UI/Explorer/SystemPage/SystemPage.h b/CPP/7zip/UI/Explorer/SystemPage.h
index 75130189..75fdeb2b 100755
--- a/CPP/7zip/UI/Explorer/SystemPage/SystemPage.h
+++ b/CPP/7zip/UI/Explorer/SystemPage.h
@@ -6,7 +6,7 @@
 #include "Windows/Control/PropertyPage.h"
 #include "Windows/Control/ListView.h"
 
-#include "../../Common/LoadCodecs.h"
+#include "../Common/LoadCodecs.h"
 
 class CSystemPage: public NWindows::NControl::CPropertyPage
 {
@@ -16,10 +16,10 @@ class CSystemPage: public NWindows::NControl::CPropertyPage
 public:
   virtual bool OnInit();
   virtual void OnNotifyHelp();
-  virtual bool OnNotify(UINT aControlID, LPNMHDR lParam);
+  virtual bool OnNotify(UINT controlID, LPNMHDR lParam);
   virtual bool OnItemChanged(const NMLISTVIEW *info);
   virtual LONG OnApply();
-  virtual bool OnButtonClicked(int aButtonID, HWND aButtonHWND);
+  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
 };
 
 #endif
diff --git a/CPP/7zip/UI/Explorer/SystemPage/resource.rc b/CPP/7zip/UI/Explorer/SystemPage.rc
index fdfed433..a3b36409 100755
--- a/CPP/7zip/UI/Explorer/SystemPage/resource.rc
+++ b/CPP/7zip/UI/Explorer/SystemPage.rc
@@ -1,5 +1,5 @@
-#include "resource.h"
-#include "../../../GuiCommon.rc"
+#include "SystemPageRes.h"
+#include "../../GuiCommon.rc"
 
 #define xSize2 196
 #define ySize2 164
diff --git a/CPP/7zip/UI/Explorer/SystemPage/resource.h b/CPP/7zip/UI/Explorer/SystemPageRes.h
index b125849c..b125849c 100755
--- a/CPP/7zip/UI/Explorer/SystemPage/resource.h
+++ b/CPP/7zip/UI/Explorer/SystemPageRes.h
diff --git a/CPP/7zip/UI/Explorer/makefile b/CPP/7zip/UI/Explorer/makefile
index f208988b..d2203b2c 100755
--- a/CPP/7zip/UI/Explorer/makefile
+++ b/CPP/7zip/UI/Explorer/makefile
@@ -1,11 +1,9 @@
 PROG = 7-zip.dll
 DEF_FILE = Explorer.def
 LIBS = $(LIBS) user32.lib oleaut32.lib advapi32.lib htmlhelp.lib shell32.lib comctl32.lib ole32.lib comdlg32.lib
-CFLAGS = $(CFLAGS) -I ../../../ \
+CFLAGS = $(CFLAGS) -I ../../../ -Ob2 \
   -DLANG \
-  -DNEW_FOLDER_INTERFACE \
   -DWIN_LONG_PATH \
-  -DEXTERNAL_CODECS \
 
 EXPLORER_OBJS = \
   $O\DllExports.obj \
@@ -13,6 +11,8 @@ EXPLORER_OBJS = \
   $O\MyMessages.obj \
   $O\OptionsDialog.obj \
   $O\RegistryContextMenu.obj \
+  $O\SystemPage.obj \
+  $O\FoldersPage.obj \
 
 COMMON_OBJS = \
   $O\IntToString.obj \
@@ -37,8 +37,6 @@ WIN_OBJS = \
   $O\FileIO.obj \
   $O\FileName.obj \
   $O\Menu.obj \
-  $O\PropVariant.obj \
-  $O\PropVariantConversions.obj \
   $O\Registry.obj \
   $O\ResourceString.obj \
   $O\Shell.obj \
@@ -49,40 +47,11 @@ WIN_CTRL_OBJS = \
   $O\Dialog.obj \
   $O\PropertyPage.obj \
 
-7ZIP_COMMON_OBJS = \
-  $O\FilePathAutoRename.obj \
-  $O\FileStreams.obj \
-  $O\StreamUtils.obj \
-
 UI_COMMON_OBJS = \
-  $O\ArchiveExtractCallback.obj \
   $O\ArchiveName.obj \
-  $O\ArchiveOpenCallback.obj \
   $O\CompressCall.obj \
-  $O\DefaultName.obj \
-  $O\EnumDirItems.obj \
-  $O\ExtractingFilePath.obj \
-  $O\LoadCodecs.obj \
-  $O\OpenArchive.obj \
-  $O\PropIDUtils.obj \
-  $O\SortUtils.obj \
-  $O\UpdateAction.obj \
-  $O\UpdateCallback.obj \
-  $O\UpdatePair.obj \
-  $O\UpdateProduce.obj \
-  $O\WorkDir.obj \
   $O\ZipRegistry.obj \
 
-AGENT_OBJS = \
-  $O\Agent.obj \
-  $O\AgentOut.obj \
-  $O\AgentProxy.obj \
-  $O\ArchiveFolder.obj \
-  $O\ArchiveFolderOpen.obj \
-  $O\ArchiveFolderOut.obj \
-  $O\UpdateCallbackAgent.obj \
-
-
 FM_COMMON_OBJS = \
   $O\FormatUtils.obj \
   $O\HelpUtils.obj \
@@ -91,8 +60,6 @@ FM_COMMON_OBJS = \
   $O\RegistryUtils.obj \
 
 C_OBJS = \
-  $O\Alloc.obj \
-  $O\Sort.obj \
   $O\Threads.obj \
 
 OBJS = \
@@ -101,14 +68,9 @@ OBJS = \
   $(COMMON_OBJS) \
   $(WIN_OBJS) \
   $(WIN_CTRL_OBJS) \
-  $(7ZIP_COMMON_OBJS) \
   $(UI_COMMON_OBJS) \
-  $(AGENT_OBJS) \
   $(FM_COMMON_OBJS)\
   $(C_OBJS) \
-  $O\SystemPage.obj \
-  $O\FoldersPage.obj \
-  $O\CopyCoder.obj \
   $O\resource.res
 
 !include "../../../Build.mak"
@@ -121,19 +83,9 @@ $(WIN_OBJS): ../../../Windows/$(*B).cpp
 	$(COMPL)
 $(WIN_CTRL_OBJS): ../../../Windows/Control/$(*B).cpp
 	$(COMPL)
-$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
-	$(COMPL)
 $(UI_COMMON_OBJS): ../Common/$(*B).cpp
 	$(COMPL)
-$(AGENT_OBJS): ../Agent/$(*B).cpp
-	$(COMPL)
-$(FM_COMMON_OBJS): ../../FileManager/$(*B).cpp
-	$(COMPL)
-$O\SystemPage.obj: SystemPage/$(*B).cpp
-	$(COMPL)
-$O\FoldersPage.obj: FoldersPage/$(*B).cpp
-	$(COMPL)
-$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
+$(FM_COMMON_OBJS): ../FileManager/$(*B).cpp
 	$(COMPL)
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
diff --git a/CPP/7zip/UI/Explorer/resource.rc b/CPP/7zip/UI/Explorer/resource.rc
index bf7601d9..157fa4cc 100755
--- a/CPP/7zip/UI/Explorer/resource.rc
+++ b/CPP/7zip/UI/Explorer/resource.rc
@@ -33,6 +33,6 @@ BEGIN
   IDS_CONFIG_DIALOG_CAPTION "7-Zip Options"
 END
 
-#include "FoldersPage/resource.rc"
-#include "SystemPage/resource.rc"
+#include "FoldersPage.rc"
+#include "SystemPage.rc"