4.25 beta

2025-12-09 02:07:06 -06:00 · 2005-08-01 00:00:00 +00:00
parent 47f4915611
commit af1fe52701
359 changed files with 5969 additions and 9853 deletions
--- a/7zip/UI/Agent/AgentOut.cpp
+++ b/7zip/UI/Agent/AgentOut.cpp
@@ -1,4 +1,4 @@
-// AgentOutcpp
+// AgentOut.cpp

 #include "StdAfx.h"

@@ -161,8 +161,13 @@ STDMETHODIMP CAgent::DoOperation(

  UString folderPrefix = _folderPrefix;
  NFile::NName::NormalizeDirPathPrefix(folderPrefix);
-  UString errorPath;
-  RINOK(::EnumerateDirItems(folderPrefix, _names, _archiveNamePrefix, dirItems, errorPath));
+  UStringVector errorPaths;
+  CRecordVector<DWORD> errorCodes;
+  ::EnumerateDirItems(folderPrefix, _names, _archiveNamePrefix, dirItems, errorPaths, errorCodes);
+  if (errorCodes.Size() > 0)
+  {
+    return errorCodes.Front();
+  }

  NWindows::NDLL::CLibrary library;

--- a/7zip/UI/Common/ArchiveCommandLine.cpp
+++ b/7zip/UI/Common/ArchiveCommandLine.cpp
@@ -546,7 +546,7 @@ static bool ParseComplexSize(const UString &src, UInt64 &result)
  const wchar_t *start = s;
  const wchar_t *end;
  UInt64 number = ConvertStringToUInt64(start, &end);
-  int numDigits = end - start;
+  int numDigits = (int)(end - start);
  if (numDigits == 0 || s.Length() > numDigits + 1)
    return false;
  if (s.Length() == numDigits)
@@ -789,9 +789,13 @@ void CArchiveCommandLineParser::Parse2(CArchiveCommandLineOptions &options)
    #endif

    CObjectVector<CDirItem> dirItems;
-    UString errorPath;
-    if (EnumerateItems(archiveWildcardCensor, dirItems, NULL, errorPath) != S_OK)
-      throw "cannot find archive";
+    {
+      UStringVector errorPaths;
+      CRecordVector<DWORD> errorCodes;
+      HRESULT res = EnumerateItems(archiveWildcardCensor, dirItems, NULL, errorPaths, errorCodes);
+      if (res != S_OK || errorPaths.Size() > 0)
+        throw "cannot find archive";
+    }
    UStringVector archivePaths;
    int i;
    for (i = 0; i < dirItems.Size(); i++)
--- a/7zip/UI/Common/CompressCall.cpp
+++ b/7zip/UI/Common/CompressCall.cpp
@@ -25,6 +25,7 @@ static LPCWSTR kArchiveMapSwitch = L" -ai#";
 static LPCWSTR kStopSwitchParsing = L" --";


+#ifndef _WIN64
 static bool IsItWindowsNT()
 {
  OSVERSIONINFO versionInfo;
@@ -33,6 +34,7 @@ static bool IsItWindowsNT()
    return false;
  return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
 }
+#endif

 HRESULT MyCreateProcess(const UString &params, 
    LPCTSTR curDir, bool waitFinish,
@@ -82,10 +84,12 @@ static UString Get7zGuiPath()
  UString folder;
  if (GetProgramFolderPath(folder))
    path += folder;
+  path += L"7zG";
+  #ifndef _WIN64
  if (IsItWindowsNT())
-    path += L"7zgn.exe";
-  else
-    path += L"7zg.exe";
+    path += L"n";
+  #endif
+  path += L".exe";
  // path += L"7z.exe";
  return GetQuotedString(path);
 }
--- a/7zip/UI/Common/EnumDirItems.cpp
+++ b/7zip/UI/Common/EnumDirItems.cpp
@@ -29,12 +29,13 @@ void AddDirFileInfo(
  dirItems.Add(item);
 }

-static HRESULT EnumerateDirectory(
+static void EnumerateDirectory(
    const UString &baseFolderPrefix,  // base (disk) prefix for scanning  
    const UString &directory,         // additional disk prefix starting from baseFolderPrefix
    const UString &prefix,            // logical prefix
    CObjectVector<CDirItem> &dirItems,
-    UString &errorPath)
+    UStringVector &errorPaths,
+    CRecordVector<DWORD> &errorCodes)
 {
  NFind::CEnumeratorW enumerator(baseFolderPrefix + directory + wchar_t(kAnyStringWildcard));
  while (true)
@@ -43,28 +44,28 @@ static HRESULT EnumerateDirectory(
    bool found;
    if (!enumerator.Next(fileInfo, found))
    {
-      HRESULT error = ::GetLastError();
-      errorPath = baseFolderPrefix + directory;
-      return error;
+      errorCodes.Add(::GetLastError());
+      errorPaths.Add(baseFolderPrefix + directory);
+      return;
    }
    if (!found)
      break;
    AddDirFileInfo(prefix, directory + fileInfo.Name, fileInfo, dirItems);
    if (fileInfo.IsDirectory())
    {
-      RINOK(EnumerateDirectory(baseFolderPrefix, directory + fileInfo.Name + wchar_t(kDirDelimiter), 
-          prefix + fileInfo.Name + wchar_t(kDirDelimiter), dirItems, errorPath));
+      EnumerateDirectory(baseFolderPrefix, directory + fileInfo.Name + wchar_t(kDirDelimiter), 
+          prefix + fileInfo.Name + wchar_t(kDirDelimiter), dirItems, errorPaths, errorCodes);
    }
  }
-  return S_OK;
 }

-HRESULT EnumerateDirItems(
+void EnumerateDirItems(
    const UString &baseFolderPrefix,   // base (disk) prefix for scanning  
    const UStringVector &fileNames,    // names relative to baseFolderPrefix
    const UString &archiveNamePrefix, 
    CObjectVector<CDirItem> &dirItems,
-    UString &errorPath)
+    UStringVector &errorPaths,
+    CRecordVector<DWORD> &errorCodes)
 {
  for(int i = 0; i < fileNames.Size(); i++)
  {
@@ -72,19 +73,18 @@ HRESULT EnumerateDirItems(
    NFind::CFileInfoW fileInfo;
    if (!NFind::FindFile(baseFolderPrefix + fileName, fileInfo))
    {
-      HRESULT error = ::GetLastError();
-      errorPath = baseFolderPrefix + fileName;
-      return error;
+      errorCodes.Add(::GetLastError());
+      errorPaths.Add(baseFolderPrefix + fileName);
+      continue;
    }
    AddDirFileInfo(archiveNamePrefix, fileName, fileInfo, dirItems);
    if (fileInfo.IsDirectory())
    {
-      RINOK(EnumerateDirectory(baseFolderPrefix, fileName + wchar_t(kDirDelimiter), 
+      EnumerateDirectory(baseFolderPrefix, fileName + wchar_t(kDirDelimiter), 
          archiveNamePrefix + fileInfo.Name +  wchar_t(kDirDelimiter), 
-          dirItems, errorPath));
+          dirItems, errorPaths, errorCodes);
    }
  }
-  return S_OK;
 }

 static HRESULT EnumerateDirItems(
@@ -95,7 +95,8 @@ static HRESULT EnumerateDirItems(
    CObjectVector<CDirItem> &dirItems, 
    bool enterToSubFolders,
    IEnumDirItemCallback *callback,
-    UString &errorPath)
+    UStringVector &errorPaths,
+    CRecordVector<DWORD> &errorCodes)
 {
  if (!enterToSubFolders)
    if (curNode.NeedCheckSubDirs())
@@ -130,15 +131,16 @@ static HRESULT EnumerateDirItems(
        NFind::CFileInfoW fileInfo;
        if (!NFind::FindFile(fullPath, fileInfo))
        {
-          HRESULT error = ::GetLastError();
-          errorPath = fullPath;
-          return error;
+          errorCodes.Add(::GetLastError());
+          errorPaths.Add(fullPath);
+          continue;
        }
        bool isDir = fileInfo.IsDirectory();
        if (isDir && !item.ForDir || !isDir && !item.ForFile)
        {
-          errorPath = fullPath;
-          return E_FAIL;
+          errorCodes.Add(E_FAIL);
+          errorPaths.Add(fullPath);
+          continue;
        }
        const UString realName = fileInfo.Name;
        const UString realDiskPath = diskPrefix + realName;
@@ -170,7 +172,7 @@ static HRESULT EnumerateDirItems(
        RINOK(EnumerateDirItems(*nextNode,   
            realDiskPath + wchar_t(kDirDelimiter), 
            archivePrefix + realName + wchar_t(kDirDelimiter), 
-            addArchivePrefixNew, dirItems, true, callback, errorPath));
+            addArchivePrefixNew, dirItems, true, callback, errorPaths, errorCodes));
      }
      for (i = 0; i < curNode.SubNodes.Size(); i++)
      {
@@ -184,19 +186,20 @@ static HRESULT EnumerateDirItems(
        {
          if (!nextNode.AreThereIncludeItems())
            continue;
-          HRESULT error = ::GetLastError();
-          errorPath = fullPath;
-          return error;
+          errorCodes.Add(::GetLastError());
+          errorPaths.Add(fullPath);
+          continue;
        }
        if (!fileInfo.IsDirectory())
        {
-          errorPath = fullPath;
-          return E_FAIL;
+          errorCodes.Add(E_FAIL);
+          errorPaths.Add(fullPath);
+          continue;
        }
        RINOK(EnumerateDirItems(nextNode, 
            diskPrefix + fileInfo.Name + wchar_t(kDirDelimiter), 
            archivePrefix + fileInfo.Name + wchar_t(kDirDelimiter), 
-            UStringVector(), dirItems, false, callback, errorPath));
+            UStringVector(), dirItems, false, callback, errorPaths, errorCodes));
      }
      return S_OK;
    }
@@ -210,9 +213,9 @@ static HRESULT EnumerateDirItems(
    bool found;
    if (!enumerator.Next(fileInfo, found))
    {
-      HRESULT error = ::GetLastError();
-      errorPath = diskPrefix;
-      return error;
+      errorCodes.Add(::GetLastError());
+      errorPaths.Add(diskPrefix);
+      break;
    }
    if (!found)
      break;
@@ -253,7 +256,7 @@ static HRESULT EnumerateDirItems(
    RINOK(EnumerateDirItems(*nextNode,   
        diskPrefix + name + wchar_t(kDirDelimiter), 
        archivePrefix + name + wchar_t(kDirDelimiter), 
-        addArchivePrefixNew, dirItems, enterToSubFolders2, callback, errorPath));
+        addArchivePrefixNew, dirItems, enterToSubFolders2, callback, errorPaths, errorCodes));
  }
  return S_OK;
 }
@@ -262,14 +265,14 @@ HRESULT EnumerateItems(
    const NWildcard::CCensor &censor, 
    CObjectVector<CDirItem> &dirItems, 
    IEnumDirItemCallback *callback,
-    UString &errorPath)
+    UStringVector &errorPaths,
+    CRecordVector<DWORD> &errorCodes)
 {
  for (int i = 0; i < censor.Pairs.Size(); i++)
  {
-    if (callback)
-      RINOK(callback->CheckBreak());
    const NWildcard::CPair &pair = censor.Pairs[i];
-    RINOK(EnumerateDirItems(pair.Head, pair.Prefix, L"", UStringVector(), dirItems, false, callback, errorPath));
+    RINOK(EnumerateDirItems(pair.Head, pair.Prefix, L"", UStringVector(), dirItems, false, 
+        callback, errorPaths, errorCodes));
  }
  return S_OK;
 }
--- a/7zip/UI/Common/EnumDirItems.h
+++ b/7zip/UI/Common/EnumDirItems.h
@@ -15,12 +15,13 @@ void AddDirFileInfo(
    CObjectVector<CDirItem> &dirItems);


-HRESULT EnumerateDirItems(
+void EnumerateDirItems(
    const UString &baseFolderPrefix,
    const UStringVector &fileNames,
    const UString &archiveNamePrefix, 
    CObjectVector<CDirItem> &dirItems, 
-    UString &errorPath);
+    UStringVector &errorPaths,
+    CRecordVector<DWORD> &errorCodes);

 struct IEnumDirItemCallback
 {
@@ -32,6 +33,7 @@ HRESULT EnumerateItems(
    const NWildcard::CCensor &censor, 
    CObjectVector<CDirItem> &dirItems, 
    IEnumDirItemCallback *callback, 
-    UString &errorPath);
+    UStringVector &errorPaths,
+    CRecordVector<DWORD> &errorCodes);

 #endif
--- a/7zip/UI/Common/OpenArchive.cpp
+++ b/7zip/UI/Common/OpenArchive.cpp
@@ -127,9 +127,9 @@ HRESULT ReOpenArchive(IInArchive *archive, const UString &fileName)
 }

 #ifndef _SFX
-static inline bool TestSignature(const Byte *p1, const Byte *p2, UInt32 size)
+static inline bool TestSignature(const Byte *p1, const Byte *p2, size_t size)
 {
-  for (UInt32 i = 0; i < size; i++)
+  for (size_t i = 0; i < size; i++)
    if (p1[i] != p2[i])
      return false;
  return true;
--- a/7zip/UI/Common/SortUtils.cpp
+++ b/7zip/UI/Common/SortUtils.cpp
@@ -26,7 +26,7 @@ void SortStringsToIndices(const UStringVector &strings, CIntVector &indices)
  void **stringsBase  = (void **)pointers[0];
  qsort(&pointers[0], numItems, sizeof(void *), CompareStrings);
  for(i = 0; i < numItems; i++)
-    indices.Add((void **)pointers[i] - stringsBase);
+    indices.Add((int)((void **)pointers[i] - stringsBase));
 }

 void SortStrings(const UStringVector &src, UStringVector &dest)
--- a/7zip/UI/Common/StdAfx.h
+++ b/7zip/UI/Common/StdAfx.h
@@ -3,6 +3,7 @@
 #ifndef __STDAFX_H
 #define __STDAFX_H

-#include <windows.h>
+#include "../../../Common/MyWindows.h"
+#include "../../../Common/NewHandler.h"

 #endif 
--- a/7zip/UI/Common/Update.cpp
+++ b/7zip/UI/Common/Update.cpp
@@ -99,7 +99,7 @@ class COutMultiVolStream:
  public IOutStream,
  public CMyUnknownImp
 {
-  size_t _streamIndex; // required stream
+  int _streamIndex; // required stream
  UInt64 _offsetPos; // offset from start of _streamIndex index
  UInt64 _absPos;
  UInt64 _length;
@@ -142,7 +142,7 @@ STDMETHODIMP COutMultiVolStream::Write(const void *data, UInt32 size, UInt32 *pr
    *processedSize = 0;
  while(size > 0)
  {
-    if (_streamIndex >= (size_t)Streams.Size())
+    if (_streamIndex >= Streams.Size())
    {
      CSubStreamInfo subStream;

@@ -694,12 +694,17 @@ HRESULT UpdateArchive(const NWildcard::CCensor &censor,
      CEnumDirItemUpdateCallback enumCallback;
      enumCallback.Callback = callback;
      RINOK(callback->StartScanning());
-      UString errorPath;
-      HRESULT res = EnumerateItems(censor, dirItems, &enumCallback, errorPath);
+      UStringVector errorPaths;
+      CRecordVector<DWORD> errorCodes;
+      HRESULT res = EnumerateItems(censor, dirItems, &enumCallback, errorPaths, errorCodes);
+      for (int i = 0; i < errorPaths.Size(); i++)
+      {
+        RINOK(callback->CanNotFindError(errorPaths[i], errorCodes[i]));
+      }
      if(res != S_OK) 
      {
        errorInfo.Message = L"Scanning error";
-        errorInfo.FileName = errorPath;
+        // errorInfo.FileName = errorPath;
        return res;
      }
      RINOK(callback->FinishScanning());
--- a/7zip/UI/Common/Update.h
+++ b/7zip/UI/Common/Update.h
@@ -130,6 +130,8 @@ struct CErrorInfo
  UString FileName;
  UString FileName2;
  UString Message;
+  // UStringVector ErrorPaths;
+  // CRecordVector<DWORD> ErrorCodes;
  CErrorInfo(): SystemError(0) {};
 };

@@ -142,6 +144,7 @@ struct IUpdateCallbackUI2: public IUpdateCallbackUI
  virtual HRESULT OpenResult(const wchar_t *name, HRESULT result) = 0;

  virtual HRESULT StartScanning() = 0;
+  virtual HRESULT CanNotFindError(const wchar_t *name, DWORD systemError) = 0;
  virtual HRESULT FinishScanning() = 0;

  virtual HRESULT StartArchive(const wchar_t *name, bool updating) = 0;
--- a/7zip/UI/Common/ZipRegistry.cpp
+++ b/7zip/UI/Common/ZipRegistry.cpp
@@ -377,7 +377,7 @@ static bool ReadOption(const TCHAR *value, bool defaultValue)
 void SaveCascadedMenu(bool show)
  { SaveOption(kCascadedMenuValueName, show); }
 bool ReadCascadedMenu()
-  { return ReadOption(kCascadedMenuValueName, false); }
+  { return ReadOption(kCascadedMenuValueName, true); }


 static void SaveValue(const TCHAR *value, UInt32 valueToWrite)
--- a/7zip/UI/Console/Console.dsp
+++ b/7zip/UI/Console/Console.dsp
@@ -52,7 +52,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"C:\UTIL\7z.exe"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"C:\UTIL\7z.exe" /OPT:NOWIN98
+# SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "Console - Win32 Debug"

@@ -101,7 +102,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"C:\UTIL\7z.exe"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"C:\UTIL\7zn.exe"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"C:\UTIL\7zn.exe" /OPT:NOWIN98
+# SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "Console - Win32 DebugU"

--- a/7zip/UI/Console/ExtractCallbackConsole.cpp
+++ b/7zip/UI/Console/ExtractCallbackConsole.cpp
@@ -202,7 +202,8 @@ HRESULT CExtractCallbackConsole::ExtractResult(HRESULT result)
  }
  if (result == S_OK)
    return result;
-  if (result == E_ABORT)
+  NumArchiveErrors++;
+  if (result == E_ABORT || result == ERROR_DISK_FULL)
    return result;
  (*OutStream) << endl << kError;
  if (result == E_OUTOFMEMORY)
@@ -214,8 +215,6 @@ HRESULT CExtractCallbackConsole::ExtractResult(HRESULT result)
    (*OutStream) << message;
  }
  (*OutStream) << endl;
-
-  NumArchiveErrors++;
  return S_OK;
 }

--- a/7zip/UI/Console/Main.cpp
+++ b/7zip/UI/Console/Main.cpp
@@ -34,6 +34,8 @@
 #include "ExtractCallbackConsole.h"
 #include "UpdateCallbackConsole.h"

+#include "../../MyVersion.h"
+
 #ifndef EXCLUDE_COM
 #include "Windows/DLL.h"
 #endif
@@ -54,7 +56,7 @@ static const char *kCopyrightString = "\n7-Zip"
 " [NT]"
 #endif

-" 4.24 beta  Copyright (c) 1999-2005 Igor Pavlov  2005-07-06\n";
+" " MY_VERSION_COPYRIGHT_DATE "\n";

 static const char *kHelpString = 
    "\nUsage: 7z"
@@ -274,10 +276,28 @@ int Main2(

    CUpdateErrorInfo errorInfo;

-    HRESULT result = UpdateArchive(
-        options.WildcardCensor, uo, 
+    HRESULT result = UpdateArchive(options.WildcardCensor, uo, 
        errorInfo, &openCallback, &callback);

+    int exitCode = NExitCode::kSuccess;
+    if (callback.CantFindFiles.Size() > 0)
+    {
+      stdStream << endl;
+      stdStream << "WARNINGS for files:" << endl << endl;
+      int numErrors = callback.CantFindFiles.Size();
+      for (int i = 0; i < numErrors; i++)
+      {
+        stdStream << callback.CantFindFiles[i] << " : ";
+        stdStream << NError::MyFormatMessageW(callback.CantFindCodes[i]) << endl;
+      }
+      stdStream << "----------------" << endl;
+      stdStream << "WARNING: Cannot find " << numErrors << " file";
+      if (numErrors > 1)
+        stdStream << "s";
+      stdStream << endl;
+      exitCode = NExitCode::kWarning;
+    }
+
    if (result != S_OK)
    {
      stdStream << "\nError:\n";
@@ -291,10 +311,12 @@ int Main2(
        stdStream << NError::MyFormatMessageW(errorInfo.SystemError) << endl;
      throw CSystemException(result);
    }
-    int exitCode = NExitCode::kSuccess;
    int numErrors = callback.FailedFiles.Size();
    if (numErrors == 0)
-      stdStream << kEverythingIsOk << endl;
+    {
+      if (callback.CantFindFiles.Size() == 0)
+        stdStream << kEverythingIsOk << endl;
+    }
    else
    {
      stdStream << endl;
--- a/7zip/UI/Console/PercentPrinter.cpp
+++ b/7zip/UI/Console/PercentPrinter.cpp
@@ -66,7 +66,7 @@ void CPercentPrinter::RePrintRatio()
  UInt64 ratio = m_CurValue * 100 / m_Total;
  char temp[32 + kNumDigits] = "    "; // for 4 digits;
  ConvertUInt64ToString(ratio, temp + kNumDigits);
-  int len = strlen(temp + kNumDigits);
+  int len = (int)strlen(temp + kNumDigits);
  strcat(temp, "%");
  int pos = (len > kNumDigits)? kNumDigits : len;
  (*OutStream) << kPercentFormatString1;
--- a/7zip/UI/Console/UpdateCallbackConsole.cpp
+++ b/7zip/UI/Console/UpdateCallbackConsole.cpp
@@ -31,6 +31,24 @@ HRESULT CUpdateCallbackConsole::StartScanning()
  return S_OK;
 }

+HRESULT CUpdateCallbackConsole::CanNotFindError(const wchar_t *name, DWORD systemError)
+{
+  CantFindFiles.Add(name);
+  CantFindCodes.Add(systemError);
+  // m_PercentPrinter.ClosePrint();
+  if (!m_WarningsMode)
+  {
+    (*OutStream) << endl << endl;
+    m_PercentPrinter.PrintNewLine();
+    m_WarningsMode = true;
+  }
+  m_PercentPrinter.PrintString(name);
+  m_PercentPrinter.PrintString(":  WARNING: ");
+  m_PercentPrinter.PrintString(NError::MyFormatMessageW(systemError));
+  m_PercentPrinter.PrintNewLine();
+  return S_OK;
+}
+
 HRESULT CUpdateCallbackConsole::FinishScanning()
 {
  (*OutStream) << endl << endl;
--- a/7zip/UI/Console/UpdateCallbackConsole.h
+++ b/7zip/UI/Console/UpdateCallbackConsole.h
@@ -14,6 +14,8 @@ class CUpdateCallbackConsole: public IUpdateCallbackUI2
  bool m_PercentCanBePrint;
  bool m_NeedBeClosed;

+  bool m_WarningsMode;
+
  CStdOutStream *OutStream;
 public:
  bool EnablePercents;
@@ -29,7 +31,8 @@ public:
      PasswordIsDefined(false),
      AskPassword(false),
      StdOutMode(false),
-      EnablePercents(true)
+      EnablePercents(true),
+      m_WarningsMode(false)
      {}
  
  ~CUpdateCallbackConsole() { Finilize(); }
@@ -46,6 +49,7 @@ public:
  HRESULT OpenResult(const wchar_t *name, HRESULT result);

  HRESULT StartScanning();
+  HRESULT CanNotFindError(const wchar_t *name, DWORD systemError);
  HRESULT FinishScanning();

  HRESULT StartArchive(const wchar_t *name, bool updating);
@@ -63,6 +67,9 @@ public:

  UStringVector FailedFiles;
  CRecordVector<HRESULT> FailedCodes;
+
+  UStringVector CantFindFiles;
+  CRecordVector<HRESULT> CantFindCodes;
 };

 #endif
--- a/7zip/UI/Console/makefile
+++ b/7zip/UI/Console/makefile
@@ -0,0 +1,90 @@
+PROG = 7z.exe
+LIBS = $(LIBS) user32.lib oleaut32.lib advapi32.lib
+CFLAGS = $(CFLAGS) -I ../../../
+
+CONSOLE_OBJS = \
+  $O\ConsoleClose.obj \
+  $O\ExtractCallbackConsole.obj \
+  $O\List.obj \
+  $O\Main.obj \
+  $O\MainAr.obj \
+  $O\OpenCallbackConsole.obj \
+  $O\PercentPrinter.obj \
+  $O\UpdateCallbackConsole.obj \
+  $O\UserInputUtils.obj \
+
+COMMON_OBJS = \
+  $O\Alloc.obj \
+  $O\CommandLineParser.obj \
+  $O\IntToString.obj \
+  $O\ListFileUtils.obj \
+  $O\NewHandler.obj \
+  $O\StdInStream.obj \
+  $O\StdOutStream.obj \
+  $O\String.obj \
+  $O\StringConvert.obj \
+  $O\StringToInt.obj \
+  $O\UTFConvert.obj \
+  $O\Vector.obj \
+  $O\Wildcard.obj \
+
+WIN_OBJS = \
+  $O\DLL.obj \
+  $O\Error.obj \
+  $O\FileDir.obj \
+  $O\FileFind.obj \
+  $O\FileIO.obj \
+  $O\FileName.obj \
+  $O\PropVariant.obj \
+  $O\PropVariantConversions.obj \
+  $O\Registry.obj \
+
+7ZIP_COMMON_OBJS = \
+  $O\FilePathAutoRename.obj \
+  $O\FileStreams.obj \
+
+UI_COMMON_OBJS = \
+  $O\ArchiveCommandLine.obj \
+  $O\ArchiveExtractCallback.obj \
+  $O\ArchiveOpenCallback.obj \
+  $O\ArchiverInfo.obj \
+  $O\DefaultName.obj \
+  $O\EnumDirItems.obj \
+  $O\Extract.obj \
+  $O\ExtractingFilePath.obj \
+  $O\OpenArchive.obj \
+  $O\PropIDUtils.obj \
+  $O\SortUtils.obj \
+  $O\TempFiles.obj \
+  $O\Update.obj \
+  $O\UpdateAction.obj \
+  $O\UpdateCallback.obj \
+  $O\UpdatePair.obj \
+  $O\UpdateProduce.obj \
+  $O\WorkDir.obj \
+
+
+OBJS = \
+  $O\StdAfx.obj \
+  $(CONSOLE_OBJS) \
+  $(COMMON_OBJS) \
+  $(WIN_OBJS) \
+  $(7ZIP_COMMON_OBJS) \
+  $(UI_COMMON_OBJS) \
+  $O\CopyCoder.obj \
+  $O\resource.res
+
+!include "../../../Build.mak"
+
+$(CONSOLE_OBJS): $(*B).cpp
+	$(COMPL)
+$(COMMON_OBJS): ../../../Common/$(*B).cpp
+	$(COMPL)
+$(WIN_OBJS): ../../../Windows/$(*B).cpp
+	$(COMPL)
+$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
+	$(COMPL)
+$(UI_COMMON_OBJS): ../Common/$(*B).cpp
+	$(COMPL)
+$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
+	$(COMPL)
--- a/7zip/UI/Console/resource.h
+++ b/7zip/UI/Console/resource.h
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/7zip/UI/Console/resource.rc
+++ b/7zip/UI/Console/resource.rc
@@ -1,121 +1,3 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,24,0,0
- PRODUCTVERSION 4,24,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Igor Pavlov\0"
-            VALUE "FileDescription", "7-Zip Console version\0"
-            VALUE "FileVersion", "4, 24, 0, 0\0"
-            VALUE "InternalName", "7z\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2005 Igor Pavlov\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "7z.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "7-Zip\0"
-            VALUE "ProductVersion", "4, 24, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
+#include "../../MyVersionInfo.rc"

+MY_VERSION_INFO_APP("7-Zip Console", "7z")
--- a/7zip/UI/Explorer/7-zip.dll.manifest
+++ b/7zip/UI/Explorer/7-zip.dll.manifest
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="7-Zip.7-Zip.7-zip" type="win32"/><description>7-Zip Extension.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="7-Zip.7-Zip.7-zip" type="win32"/><description>7-Zip Extension.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
--- a/7zip/UI/Explorer/ContextMenu.cpp
+++ b/7zip/UI/Explorer/ContextMenu.cpp
@@ -418,11 +418,12 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
        UString s;
        FillCommand2(kExtractTo, s, commandMapItem);
        UString folder;
+        folder += UString(L"\"");
        if (_fileNames.Size() == 1)
-          folder = GetSubFolderNameForExtract(fileInfo.Name);
+          folder += GetSubFolderNameForExtract(fileInfo.Name);
        else
-          folder = L'*'; 
-        folder += L'\\';
+          folder += L'*'; 
+        folder += L"\\\"";

        if (_dropMode)
          commandMapItem.Folder = _dropPath;
@@ -728,7 +729,7 @@ static void MyCopyString(void *dest, const wchar_t *src, bool writeInUnicode)
    lstrcpyA((char *)dest, GetAnsiString(src));
 }

-STDMETHODIMP CZipContextMenu::GetCommandString(UINT commandOffset, UINT uType, 
+STDMETHODIMP CZipContextMenu::GetCommandString(UINT_PTR commandOffset, UINT uType, 
    UINT *pwReserved, LPSTR pszName, UINT cchMax)
 {
  switch(uType)
--- a/7zip/UI/Explorer/ContextMenu.h
+++ b/7zip/UI/Explorer/ContextMenu.h
@@ -59,7 +59,7 @@ public:
  STDMETHOD(QueryContextMenu)(HMENU hmenu, UINT indexMenu,
      UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
  STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO lpici);
-  STDMETHOD(GetCommandString)(UINT idCmd, UINT uType, UINT *pwReserved,
+  STDMETHOD(GetCommandString)(UINT_PTR idCmd, UINT uType, UINT *pwReserved,
      LPSTR pszName, UINT cchMax);


--- a/7zip/UI/Explorer/Explorer.def
+++ b/7zip/UI/Explorer/Explorer.def
@@ -3,8 +3,8 @@
 LIBRARY "7-zip"

 EXPORTS
-	DllCanUnloadNow PRIVATE
-	DllGetClassObject PRIVATE
+  DllCanUnloadNow PRIVATE
+  DllGetClassObject PRIVATE
  DllRegisterServer PRIVATE
  DllUnregisterServer PRIVATE

--- a/7zip/UI/Explorer/Explorer.dsp
+++ b/7zip/UI/Explorer/Explorer.dsp
@@ -320,10 +320,6 @@ SOURCE=..\Common\ZipRegistry.cpp

 SOURCE=..\Common\ZipRegistry.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\Common\ZipSettings.h
-# End Source File
 # End Group
 # Begin Group "Engine"

@@ -356,15 +352,6 @@ SOURCE=.\MyMessages.h
 # PROP Default_Filter ""
 # Begin Source File

-SOURCE=.\SystemPage\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SystemPage\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
 SOURCE=.\SystemPage\SystemPage.cpp
 # End Source File
 # Begin Source File
@@ -383,15 +370,6 @@ SOURCE=.\FoldersPage\FoldersPage.cpp

 SOURCE=.\FoldersPage\FoldersPage.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\FoldersPage\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\FoldersPage\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
 # End Group
 # End Group
 # End Group
@@ -571,6 +549,14 @@ SOURCE=..\..\..\Common\StringConvert.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\..\Common\StringToInt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\StringToInt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\TextConfig.cpp
 # End Source File
 # Begin Source File
@@ -671,10 +657,6 @@ SOURCE=..\..\..\Windows\FileIO.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\Windows\FileMapping.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\FileMapping.h
 # End Source File
 # Begin Source File
--- a/7zip/UI/Explorer/FoldersPage/FoldersPage.cpp
+++ b/7zip/UI/Explorer/FoldersPage/FoldersPage.cpp
@@ -1,4 +1,4 @@
-// FoldersDialog.cpp
+// FoldersPage.cpp

 #include "StdAfx.h"

--- a/7zip/UI/Explorer/FoldersPage/resource.h
+++ b/7zip/UI/Explorer/FoldersPage/resource.h
@@ -1,27 +1,12 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
 #define IDD_FOLDERS                     900

 #define IDS_FOLDERS_SET_WORK_PATH_TITLE  103

-#define IDC_FOLDERS_WORK_RADIO_SYSTEM    1002
-#define IDC_FOLDERS_WORK_EDIT_PATH       1003
-#define IDC_FOLDERS_WORK_BUTTON_PATH     1004
-#define IDC_FOLDERS_WORK_RADIO_CURRENT   1005
-#define IDC_FOLDERS_WORK_RADIO_SPECIFIED     1006
-#define IDC_FOLDERS_WORK_CHECK_FOR_REMOVABLE 1007
+#define IDC_FOLDERS_STATIC_WORKING_FOLDER 1001

-#define IDC_FOLDERS_STATIC_WORKING_FOLDER 1019
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        135
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1020
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+#define IDC_FOLDERS_WORK_RADIO_SYSTEM    1011
+#define IDC_FOLDERS_WORK_RADIO_CURRENT   1012
+#define IDC_FOLDERS_WORK_RADIO_SPECIFIED 1013
+#define IDC_FOLDERS_WORK_EDIT_PATH       1014
+#define IDC_FOLDERS_WORK_BUTTON_PATH     1015
+#define IDC_FOLDERS_WORK_CHECK_FOR_REMOVABLE 1017
--- a/7zip/UI/Explorer/FoldersPage/resource.rc
+++ b/7zip/UI/Explorer/FoldersPage/resource.rc
@@ -1,109 +1,36 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
+#include "../../../GuiCommon.rc"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
+#define xSize2 196
+#define ySize2 140
+#define xSize (xSize2 + marg + marg)
+#define ySize (ySize2 + marg + marg)

-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
+#define marg2 marg
+#define marg3 10
+#define gPos (marg + marg2)
+#define gSize (xSize2 - marg2 - marg2)
+#define gPos2 (gPos + marg3)


-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_FOLDERS DIALOG DISCARDABLE  0, 0, 210, 154
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_FOLDERS  DIALOG  0, 0, xSize, ySize  MY_PAGE_STYLE
 CAPTION "Folders"
-FONT 8, "MS Shell Dlg"
+MY_FONT
 BEGIN
-    GROUPBOX        "&Working folder",IDC_FOLDERS_STATIC_WORKING_FOLDER,7,7,
-                    196,98
-    CONTROL         "&System temp folder",IDC_FOLDERS_WORK_RADIO_SYSTEM,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP,19,20,150,10
-    CONTROL         "&Current",IDC_FOLDERS_WORK_RADIO_CURRENT,"Button",
-                    BS_AUTORADIOBUTTON,19,34,150,10
-    CONTROL         "Specified:",IDC_FOLDERS_WORK_RADIO_SPECIFIED,"Button",
-                    BS_AUTORADIOBUTTON,19,48,151,10
-    EDITTEXT        IDC_FOLDERS_WORK_EDIT_PATH,39,63,130,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_FOLDERS_WORK_BUTTON_PATH,178,63,18,14
-    CONTROL         "Use for removable drives only",
-                    IDC_FOLDERS_WORK_CHECK_FOR_REMOVABLE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,19,87,180,10
+  GROUPBOX   "&Working folder", IDC_FOLDERS_STATIC_WORKING_FOLDER, marg, marg, xSize2, 98
+  CONTROL    "&System temp folder", IDC_FOLDERS_WORK_RADIO_SYSTEM,    "Button", BS_AUTORADIOBUTTON | WS_GROUP, 
+              gPos, 20, gSize, 10
+  CONTROL    "&Current",            IDC_FOLDERS_WORK_RADIO_CURRENT,   "Button", BS_AUTORADIOBUTTON, 
+              gPos, 34, gSize, 10
+  CONTROL    "Specified:",          IDC_FOLDERS_WORK_RADIO_SPECIFIED, "Button", BS_AUTORADIOBUTTON, 
+              gPos, 48, gSize, 10
+  EDITTEXT    IDC_FOLDERS_WORK_EDIT_PATH, gPos2, 63, gSize - marg3 - bDotsSize - 10, 14, ES_AUTOHSCROLL
+  PUSHBUTTON  "...", IDC_FOLDERS_WORK_BUTTON_PATH, xSize - marg - marg2 - bDotsSize, 63, bDotsSize, bYSize
+  CONTROL     "Use for removable drives only", IDC_FOLDERS_WORK_CHECK_FOR_REMOVABLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 
+              gPos, 87, gSize, 10
 END

-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+STRINGTABLE  
 BEGIN
-    IDD_FOLDERS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 203
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 147
-    END
+  IDS_FOLDERS_SET_WORK_PATH_TITLE  "Specify a location for temporary archive files."
 END
-#endif    // APSTUDIO_INVOKED
-
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
--- a/7zip/UI/Explorer/RegistryContextMenu.cpp
+++ b/7zip/UI/Explorer/RegistryContextMenu.cpp
@@ -19,16 +19,22 @@ static NSynchronization::CCriticalSection g_RegistryOperationsCriticalSection;
 ///////////////////////////
 // ContextMenu

-static const TCHAR *kContextMenuKeyName = TEXT("\\shellex\\ContextMenuHandlers\\7-ZIP");
-static const TCHAR *kContextMenuHandlerCLASSIDValue = 
-    TEXT("{23170F69-40C1-278A-1000-000100020000}");
+static const TCHAR *kContextMenuKeyName  = TEXT("\\shellex\\ContextMenuHandlers\\7-ZIP");
+static const TCHAR *kDragDropMenuKeyName = TEXT("\\shellex\\DragDropHandlers\\7-ZIP");
+
+static const TCHAR *kExtensionCLSID = TEXT("{23170F69-40C1-278A-1000-000100020000}");
+
 static const TCHAR *kRootKeyNameForFile = TEXT("*");
 static const TCHAR *kRootKeyNameForFolder = TEXT("Folder");
 static const TCHAR *kRootKeyNameForDirectory = TEXT("Directory");
+static const TCHAR *kRootKeyNameForDrive = TEXT("Drive");

 static CSysString GetFullContextMenuKeyName(const CSysString &keyName)
  { return (keyName + kContextMenuKeyName); }

+static CSysString GetFullDragDropMenuKeyName(const CSysString &keyName)
+  { return (keyName + kDragDropMenuKeyName); }
+
 static bool CheckContextMenuHandlerCommon(const CSysString &keyName)
 {
  NSynchronization::CCriticalSectionLock lock(g_RegistryOperationsCriticalSection);
@@ -39,14 +45,28 @@ static bool CheckContextMenuHandlerCommon(const CSysString &keyName)
  CSysString value;
  if (key.QueryValue(NULL, value) != ERROR_SUCCESS)
    return false;
-  return (value.CollateNoCase(kContextMenuHandlerCLASSIDValue) == 0);
+  return (value.CollateNoCase(kExtensionCLSID) == 0);
+}
+
+static bool CheckDragDropMenuHandlerCommon(const CSysString &keyName)
+{
+  NSynchronization::CCriticalSectionLock lock(g_RegistryOperationsCriticalSection);
+  CKey key;
+  if (key.Open(HKEY_CLASSES_ROOT, GetFullDragDropMenuKeyName(keyName), KEY_READ) != ERROR_SUCCESS)
+    return false;
+  CSysString value;
+  if (key.QueryValue(NULL, value) != ERROR_SUCCESS)
+    return false;
+  return (value.CollateNoCase(kExtensionCLSID) == 0);
 }

 bool CheckContextMenuHandler()
 { 
  return CheckContextMenuHandlerCommon(kRootKeyNameForFile) &&
-    CheckContextMenuHandlerCommon(kRootKeyNameForFolder) &&
-    CheckContextMenuHandlerCommon(kRootKeyNameForDirectory);
+    // CheckContextMenuHandlerCommon(kRootKeyNameForFolder) &&
+    CheckContextMenuHandlerCommon(kRootKeyNameForDirectory)  &&
+    CheckDragDropMenuHandlerCommon(kRootKeyNameForDirectory)  &&
+    CheckDragDropMenuHandlerCommon(kRootKeyNameForDrive);
 }

 static void DeleteContextMenuHandlerCommon(const CSysString &keyName)
@@ -57,11 +77,24 @@ static void DeleteContextMenuHandlerCommon(const CSysString &keyName)
  rootKey.Detach();
 }

+static void DeleteDragDropMenuHandlerCommon(const CSysString &keyName)
+{
+  CKey rootKey;
+  rootKey.Attach(HKEY_CLASSES_ROOT);
+  rootKey.RecurseDeleteKey(GetFullDragDropMenuKeyName(keyName));
+  rootKey.Detach();
+}
+
 void DeleteContextMenuHandler()
 { 
  DeleteContextMenuHandlerCommon(kRootKeyNameForFile); 
  DeleteContextMenuHandlerCommon(kRootKeyNameForFolder);
  DeleteContextMenuHandlerCommon(kRootKeyNameForDirectory);
+  DeleteContextMenuHandlerCommon(kRootKeyNameForDrive);
+  DeleteDragDropMenuHandlerCommon(kRootKeyNameForFile); 
+  DeleteDragDropMenuHandlerCommon(kRootKeyNameForFolder);
+  DeleteDragDropMenuHandlerCommon(kRootKeyNameForDirectory);
+  DeleteDragDropMenuHandlerCommon(kRootKeyNameForDrive);
 }

 static void AddContextMenuHandlerCommon(const CSysString &keyName)
@@ -70,14 +103,26 @@ static void AddContextMenuHandlerCommon(const CSysString &keyName)
  NSynchronization::CCriticalSectionLock lock(g_RegistryOperationsCriticalSection);
  CKey key;
  key.Create(HKEY_CLASSES_ROOT, GetFullContextMenuKeyName(keyName));
-  key.SetValue(NULL, kContextMenuHandlerCLASSIDValue);
+  key.SetValue(NULL, kExtensionCLSID);
+}
+
+static void AddDragDropMenuHandlerCommon(const CSysString &keyName)
+{
+  DeleteDragDropMenuHandlerCommon(keyName);
+  NSynchronization::CCriticalSectionLock lock(g_RegistryOperationsCriticalSection);
+  CKey key;
+  key.Create(HKEY_CLASSES_ROOT, GetFullDragDropMenuKeyName(keyName));
+  key.SetValue(NULL, kExtensionCLSID);
 }

 void AddContextMenuHandler()
 { 
  AddContextMenuHandlerCommon(kRootKeyNameForFile); 
-  AddContextMenuHandlerCommon(kRootKeyNameForFolder);
+  // AddContextMenuHandlerCommon(kRootKeyNameForFolder);
  AddContextMenuHandlerCommon(kRootKeyNameForDirectory);
+
+  AddDragDropMenuHandlerCommon(kRootKeyNameForDirectory);
+  AddDragDropMenuHandlerCommon(kRootKeyNameForDrive);
 }

 }
--- a/7zip/UI/Explorer/SystemPage/SystemPage.cpp
+++ b/7zip/UI/Explorer/SystemPage/SystemPage.cpp
@@ -1,4 +1,4 @@
-// SystemDialog.cpp
+// SystemPage.cpp

 #include "StdAfx.h"
 #include "resource.h"
--- a/7zip/UI/Explorer/SystemPage/resource.h
+++ b/7zip/UI/Explorer/SystemPage/resource.h
@@ -1,20 +1,6 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
 #define IDD_SYSTEM                      102
+
 #define IDC_SYSTEM_INTEGRATE_TO_CONTEXT_MENU 1010
 #define IDC_SYSTEM_CASCADED_MENU        1011
 #define IDC_SYSTEM_STATIC_CONTEXT_MENU_ITEMS 1020
 #define IDC_SYSTEM_OPTIONS_LIST         1022
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        135
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1025
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/7zip/UI/Explorer/SystemPage/resource.rc
+++ b/7zip/UI/Explorer/SystemPage/resource.rc
@@ -1,105 +1,24 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
+#include "../../../GuiCommon.rc"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
+#define xSize2 196
+#define ySize2 164
+#define xSize (xSize2 + marg + marg)
+#define ySize (ySize2 + marg + marg)

-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_SYSTEM DIALOG DISCARDABLE  0, 0, 210, 178
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_SYSTEM  DIALOG  0, 0, xSize, ySize  MY_PAGE_STYLE
 CAPTION "System"
-FONT 8, "MS Shell Dlg"
+MY_FONT
 BEGIN
-    CONTROL         "Integrate 7-Zip to shell context menu",
-                    IDC_SYSTEM_INTEGRATE_TO_CONTEXT_MENU,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,196,10
-    CONTROL         "Cascaded context menu",IDC_SYSTEM_CASCADED_MENU,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,21,196,10
-    CONTROL         "List1",IDC_SYSTEM_OPTIONS_LIST,"SysListView32",
-                    LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | 
-                    WS_BORDER | WS_TABSTOP,7,50,196,121
-    LTEXT           "Context menu items:",
-                    IDC_SYSTEM_STATIC_CONTEXT_MENU_ITEMS,7,37,196,8
+  CONTROL  "Integrate 7-Zip to shell context menu",  IDC_SYSTEM_INTEGRATE_TO_CONTEXT_MENU, 
+           "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 
+           marg, marg, xSize2, 10
+  CONTROL  "Cascaded context menu", IDC_SYSTEM_CASCADED_MENU, 
+           "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 
+           marg, 21, xSize2, 10
+  LTEXT    "Context menu items:", IDC_SYSTEM_STATIC_CONTEXT_MENU_ITEMS, 
+           marg, 37, xSize2, 8
+  CONTROL  "List1", IDC_SYSTEM_OPTIONS_LIST, "SysListView32", 
+           LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 
+           marg, 50, xSize2, ySize - marg - 50
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_SYSTEM, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 203
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 171
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
--- a/7zip/UI/Explorer/makefile
+++ b/7zip/UI/Explorer/makefile
@@ -0,0 +1,128 @@
+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 ../../../ \
+  -DLANG \
+  -DNEW_FOLDER_INTERFACE
+
+EXPLORER_OBJS = \
+  $O\DllExports.obj \
+  $O\ContextMenu.obj \
+  $O\MyMessages.obj \
+  $O\OptionsDialog.obj \
+  $O\RegistryContextMenu.obj \
+
+COMMON_OBJS = \
+  $O\Alloc.obj \
+  $O\IntToString.obj \
+  $O\Lang.obj \
+  $O\ListFileUtils.obj \
+  $O\NewHandler.obj \
+  $O\Random.obj \
+  $O\StdInStream.obj \
+  $O\String.obj \
+  $O\StringConvert.obj \
+  $O\StringToInt.obj \
+  $O\TextConfig.obj \
+  $O\UTFConvert.obj \
+  $O\Vector.obj \
+  $O\Wildcard.obj \
+
+WIN_OBJS = \
+  $O\DLL.obj \
+  $O\Error.obj \
+  $O\FileDir.obj \
+  $O\FileFind.obj \
+  $O\FileIO.obj \
+  $O\FileName.obj \
+  $O\PropVariant.obj \
+  $O\PropVariantConversions.obj \
+  $O\Registry.obj \
+  $O\ResourceString.obj \
+  $O\Shell.obj \
+  $O\Synchronization.obj \
+  $O\Window.obj \
+
+WIN_CTRL_OBJS = \
+  $O\Dialog.obj \
+  $O\PropertyPage.obj \
+
+7ZIP_COMMON_OBJS = \
+  $O\FilePathAutoRename.obj \
+  $O\FileStreams.obj \
+
+UI_COMMON_OBJS = \
+  $O\ArchiveExtractCallback.obj \
+  $O\ArchiveName.obj \
+  $O\ArchiveOpenCallback.obj \
+  $O\ArchiverInfo.obj \
+  $O\CompressCall.obj \
+  $O\DefaultName.obj \
+  $O\EnumDirItems.obj \
+  $O\ExtractingFilePath.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 \
+  $O\LangUtils.obj \
+  $O\ProgramLocation.obj \
+  $O\RegistryUtils.obj \
+
+OBJS = \
+  $O\StdAfx.obj \
+  $(EXPLORER_OBJS) \
+  $(COMMON_OBJS) \
+  $(WIN_OBJS) \
+  $(WIN_CTRL_OBJS) \
+  $(7ZIP_COMMON_OBJS) \
+  $(UI_COMMON_OBJS) \
+  $(AGENT_OBJS) \
+  $(FM_COMMON_OBJS)\
+  $O\SystemPage.obj \
+  $O\FoldersPage.obj \
+  $O\CopyCoder.obj \
+  $O\resource.res
+
+!include "../../../Build.mak"
+
+$(EXPLORER_OBJS): $(*B).cpp
+	$(COMPL)
+$(COMMON_OBJS): ../../../Common/$(*B).cpp
+	$(COMPL)
+$(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
+	$(COMPL)
--- a/7zip/UI/Explorer/resource.h
+++ b/7zip/UI/Explorer/resource.h
@@ -1,7 +1,3 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
 #define IDS_CONTEXT_EXTRACT             42
 #define IDS_CONTEXT_EXTRACT_HELP        43
 #define IDS_CONTEXT_COMPRESS            44
@@ -31,17 +27,5 @@
 #define IDS_CONTEXT_FOLDER  70
 #define IDS_CONTEXT_ARCHIVE 71

-
 #define IDS_ERROR                       100
 #define IDS_CONFIG_DIALOG_CAPTION       102
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1110
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/7zip/UI/Explorer/resource.rc
+++ b/7zip/UI/Explorer/resource.rc
@@ -1,181 +1,38 @@
-//Microsoft Developer Studio generated resource script.
-//
+#include "../../MyVersionInfo.rc"
 #include "resource.h"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
+MY_VERSION_INFO_DLL("7-Zip Shell Extension", "7-zip")

-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+1 24 MOVEABLE PURE "7-zip.dll.manifest"

-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
+STRINGTABLE
 BEGIN
-    "resource.h\0"
+  IDS_CONTEXT_EXTRACT     "Extract files..."
+  IDS_CONTEXT_EXTRACT_HELP "Extracts files from the selected archive."
+  IDS_CONTEXT_COMPRESS    "Add to archive..."
+  IDS_CONTEXT_COMPRESS_HELP "Adds the selected items to archive."
+  IDS_CONTEXT_OPEN        "Open archive"
+  IDS_CONTEXT_OPEN_HELP   "Opens the selected archive."
+  IDS_CONTEXT_TEST        "Test archive"
+  IDS_CONTEXT_TEST_HELP   "Tests integrity of the selected archive."
+  IDS_CONTEXT_CAPTION_HELP "7-Zip commands"
+  IDS_CONTEXT_POPUP_CAPTION "7-Zip"
+  IDS_CONTEXT_EXTRACT_HERE "Extract Here"
+  IDS_CONTEXT_EXTRACT_HERE_HELP "Extracts files from the selected archive to current folder."
+  IDS_CONTEXT_EXTRACT_TO  "Extract to {0}"
+  IDS_CONTEXT_EXTRACT_TO_HELP "Extracts files to subfolder."
+  IDS_CONTEXT_COMPRESS_TO "Add to {0}"
+  IDS_CONTEXT_COMPRESS_TO_HELP "Adds the selected items to archive."
+  IDS_CONTEXT_COMPRESS_EMAIL "Compress and email..."
+  IDS_CONTEXT_COMPRESS_EMAIL_HELP "Compresses the selected items to archive and sends archive via email."
+  IDS_CONTEXT_COMPRESS_TO_EMAIL "Compress to {0} and email"
+  IDS_CONTEXT_COMPRESS_TO_EMAIL_HELP "Compresses the selected items to archive and sends archive via email."
+  IDS_CONTEXT_FOLDER      "<Folder>"
+  IDS_CONTEXT_ARCHIVE     "<Archive>"
+  IDS_ERROR               "Error"
+  IDS_CONFIG_DIALOG_CAPTION "7-Zip Options"
 END

-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""FoldersPage\\resource.rc""\r\n"
-    "#include ""SystemPage\\resource.rc""\r\n"
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,24,0,0
- PRODUCTVERSION 4,24,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Igor Pavlov\0"
-            VALUE "FileDescription", "7-Zip Shell Extension\0"
-            VALUE "FileVersion", "4, 24, 0, 0\0"
-            VALUE "InternalName", "7-zip\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2005 Igor Pavlov\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "7-zip.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "7-Zip\0"
-            VALUE "ProductVersion", "4, 24, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-1                       24      MOVEABLE PURE   "7-zip.dll.manifest"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CONTEXT_EXTRACT     "Extract files..."
-    IDS_CONTEXT_EXTRACT_HELP "Extracts files from the selected archive."
-    IDS_CONTEXT_COMPRESS    "Add to archive..."
-    IDS_CONTEXT_COMPRESS_HELP "Adds the selected items to archive."
-    IDS_CONTEXT_OPEN        "Open archive"
-    IDS_CONTEXT_OPEN_HELP   "Opens the selected archive."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CONTEXT_TEST        "Test archive"
-    IDS_CONTEXT_TEST_HELP   "Tests integrity of the selected archive."
-    IDS_CONTEXT_CAPTION_HELP "7-Zip commands"
-    IDS_CONTEXT_POPUP_CAPTION "7-Zip"
-    IDS_CONTEXT_EXTRACT_HERE "Extract Here"
-    IDS_CONTEXT_EXTRACT_HERE_HELP 
-                            "Extracts files from the selected archive to current folder."
-    IDS_CONTEXT_EXTRACT_TO  "Extract to {0}"
-    IDS_CONTEXT_EXTRACT_TO_HELP "Extracts files to subfolder."
-    IDS_CONTEXT_COMPRESS_TO "Add to {0}"
-    IDS_CONTEXT_COMPRESS_TO_HELP "Adds the selected items to archive."
-    IDS_CONTEXT_COMPRESS_EMAIL "Compress and email..."
-    IDS_CONTEXT_COMPRESS_EMAIL_HELP 
-                            "Compresses the selected items to archive and sends archive via email."
-    IDS_CONTEXT_COMPRESS_TO_EMAIL "Compress to {0} and email"
-    IDS_CONTEXT_COMPRESS_TO_EMAIL_HELP 
-                            "Compresses the selected items to archive and sends archive via email."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CONTEXT_FOLDER      "<Folder>"
-    IDS_CONTEXT_ARCHIVE     "<Archive>"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_ERROR               "Error"
-    IDS_CONFIG_DIALOG_CAPTION "7-Zip Options"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "FoldersPage\resource.rc"
-#include "SystemPage\resource.rc"
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
+#include "FoldersPage/resource.rc"
+#include "SystemPage/resource.rc"

--- a/7zip/UI/Far/Far.dsp
+++ b/7zip/UI/Far/Far.dsp
@@ -101,7 +101,7 @@ SOURCE=.\Far.def
 # End Source File
 # Begin Source File

-SOURCE=.\Far.rc
+SOURCE=.\resource.rc
 # End Source File
 # Begin Source File

--- a/7zip/UI/Far/Far.rc
+++ b/7zip/UI/Far/Far.rc
@@ -1,121 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,24,0,0
- PRODUCTVERSION 4,24,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Igor Pavlov\0"
-            VALUE "FileDescription", "7-Zip FAR Plugin\0"
-            VALUE "FileVersion", "4, 24, 0, 0\0"
-            VALUE "InternalName", "7-ZipFar\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2005 Igor Pavlov\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "7-ZipFar.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "7-Zip\0"
-            VALUE "ProductVersion", "4, 24, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
--- a/7zip/UI/Far/makefile
+++ b/7zip/UI/Far/makefile
@@ -0,0 +1,95 @@
+PROG = 7-ZipFar.dll
+DEF_FILE = Far.def
+LIBS = $(LIBS) user32.lib oleaut32.lib advapi32.lib ole32.lib
+CFLAGS = $(CFLAGS) -I ../../../
+
+FAR_OBJS = \
+  $O\CLSIDConst.obj \
+  $O\ExtractEngine.obj \
+  $O\FarUtils.obj \
+  $O\Main.obj \
+  $O\OverwriteDialog.obj \
+  $O\Plugin.obj \
+  $O\PluginCommon.obj \
+  $O\PluginDelete.obj \
+  $O\PluginRead.obj \
+  $O\PluginWrite.obj \
+  $O\ProgressBox.obj \
+  $O\UpdateCallback100.obj \
+
+COMMON_OBJS = \
+  $O\Alloc.obj \
+  $O\IntToString.obj \
+  $O\NewHandler.obj \
+  $O\String.obj \
+  $O\StringConvert.obj \
+  $O\StringToInt.obj \
+  $O\Vector.obj \
+  $O\Wildcard.obj \
+
+WIN_OBJS = \
+  $O\DLL.obj \
+  $O\Error.obj \
+  $O\FileDir.obj \
+  $O\FileFind.obj \
+  $O\FileIO.obj \
+  $O\FileName.obj \
+  $O\PropVariant.obj \
+  $O\PropVariantConversions.obj \
+  $O\Registry.obj \
+  $O\Synchronization.obj \
+
+7ZIP_COMMON_OBJS = \
+  $O\FilePathAutoRename.obj \
+  $O\FileStreams.obj \
+
+UI_COMMON_OBJS = \
+  $O\ArchiveExtractCallback.obj \
+  $O\ArchiveOpenCallback.obj \
+  $O\ArchiverInfo.obj \
+  $O\DefaultName.obj \
+  $O\EnumDirItems.obj \
+  $O\ExtractingFilePath.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\UpdateCallbackAgent.obj \
+
+OBJS = \
+  $O\StdAfx.obj \
+  $(FAR_OBJS) \
+  $(COMMON_OBJS) \
+  $(WIN_OBJS) \
+  $(7ZIP_COMMON_OBJS) \
+  $(UI_COMMON_OBJS) \
+  $(AGENT_OBJS) \
+  $O\CopyCoder.obj \
+  $O\resource.res
+
+!include "../../../Build.mak"
+
+$(FAR_OBJS): $(*B).cpp
+	$(COMPL)
+$(COMMON_OBJS): ../../../Common/$(*B).cpp
+	$(COMPL)
+$(WIN_OBJS): ../../../Windows/$(*B).cpp
+	$(COMPL)
+$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
+	$(COMPL)
+$(UI_COMMON_OBJS): ../Common/$(*B).cpp
+	$(COMPL)
+$(AGENT_OBJS): ../Agent/$(*B).cpp
+	$(COMPL)
+$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
+	$(COMPL)
--- a/7zip/UI/Far/resource.h
+++ b/7zip/UI/Far/resource.h
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Far.rc
-//
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/7zip/UI/Far/resource.rc
+++ b/7zip/UI/Far/resource.rc
@@ -0,0 +1,3 @@
+#include "../../MyVersionInfo.rc"
+
+MY_VERSION_INFO_DLL("7-Zip Plugin for FAR Manager", "7-ZipFar")
--- a/7zip/UI/GUI/7zG.exe.manifest
+++ b/7zip/UI/GUI/7zG.exe.manifest
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="7-Zip.7-Zip.7zG" type="win32"/><description>7-Zip GUI.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="7-Zip.7-Zip.7zG" type="win32"/><description>7-Zip GUI.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
--- a/7zip/UI/GUI/CompressDialog.cpp
+++ b/7zip/UI/GUI/CompressDialog.cpp
@@ -149,6 +149,7 @@ struct CFormatInfo
  UInt32 LevelsMask;
  const EMethodID *MathodIDs;
  int NumMethods;
+  bool Filter;
  bool Solid;
  bool MultiThread;
  bool SFX;
@@ -162,25 +163,25 @@ static const CFormatInfo g_Formats[] =
    L"", 
    (1 << 0) | (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9), 
    0, 0,
-    false, false, false, false, false
+    false, false, false, false, false, false
  },
  { 
    k7zFormat, 
    (1 << 0) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9), 
    g_7zMethods, MY_SIZE_OF_ARRAY(g_7zMethods),
-    true, true, true, true, true
+    true, true, true, true, true, true
  },
  { 
    L"Zip", 
-    (1 << 0) | (1 << 5) | (1 << 9), 
+    (1 << 0) | (1 << 5) | (1 << 7) | (1 << 9), 
    g_ZipMethods, MY_SIZE_OF_ARRAY(g_ZipMethods) ,
-    false, false, false, true, false
+    false, false, false, false, true, false
  },
  { 
    L"GZip", 
    (1 << 5) | (1 << 9), 
    g_GZipMethods, MY_SIZE_OF_ARRAY(g_GZipMethods),
-    false, false, false, false, false
+    false, false, false, false, false, false
  },
  { 
    L"BZip2", 
@@ -193,7 +194,7 @@ static const CFormatInfo g_Formats[] =
    L"Tar", 
    (1 << 0), 
    0, 0,
-    false, false, false, false, false
+    false, false, false, false, false, false
  }
 };

@@ -916,12 +917,19 @@ void CCompressDialog::SetDictionary()
      }
      int i;
      AddDictionarySize(32 << 10);
-      for (i = 20; i < 28; i++)
+      for (i = 20; i <= 28; i++)
        for (int j = 0; j < 2; j++)
        {
          if (i == 20 && j > 0)
            continue;
          UInt32 dictionary = (1 << i) + (j << (i - 1));
+          #ifdef _WIN64
+          if (dictionary > (1 << 28))
+            continue;
+          #else
+          if (dictionary >= (1 << 28))
+            continue;
+          #endif
          AddDictionarySize(dictionary);
        }
      SetNearestSelectComboBox(m_Dictionary, defaultDictionary);
@@ -1133,28 +1141,32 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt64 &decompressMemory)
    decompressMemory = (1 << 20);
    return decompressMemory;
  }
+  UInt64 size = 0;
+
+  const CFormatInfo &fi = g_Formats[GetStaticFormatIndex()];
+  if (fi.Filter && level >= 9)
+    size += (12 << 20) * 2 + (5 << 20);
  switch (GetMethodID())
  {
    case kLZMA:
    {
-      UInt64 size;
      if (level >= 5)
      {
-        size = ((UInt64)dictionary * 19 / 2) + (2 << 20);
+        size += ((UInt64)dictionary * 19 / 2) + (2 << 20);
        if (level >= 9)
-          size += (34 << 20) + (12 << 20) * 2 + (5 << 20);
+          size += (34 << 20);
        else
          size += (6 << 20);
      }
      else 
-        size = ((UInt64)dictionary * 11 / 2) + (2 << 20);
+        size += ((UInt64)dictionary * 11 / 2) + (2 << 20);
      decompressMemory = dictionary + (2 << 20);
      return size;
    }
    case kPPMd:
    {
      decompressMemory = dictionary + (2 << 20);
-      return decompressMemory;
+      return size + decompressMemory;
    }
    case kDeflate:
    case kDeflate64:
@@ -1162,9 +1174,8 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt64 &decompressMemory)
      UInt32 order = GetOrder();
      if (order == UInt32(-1))
        order = 32;
-      UInt64 size = 0;
      if (level >= 7)
-        size = (order * 2 + 4) * (64 << 10);
+        size += (order * 2 + 4) * (64 << 10);
      size += 3 << 20;
      decompressMemory = (2 << 20);
      return size;
@@ -1172,7 +1183,7 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt64 &decompressMemory)
    case kBZip2:
    {
      decompressMemory = (7 << 20);
-      return 10 << 20;
+      return size + (10 << 20);
    }
  }
  return UInt64(Int64(-1));
--- a/7zip/UI/GUI/CompressDialog.h
+++ b/7zip/UI/GUI/CompressDialog.h
@@ -109,8 +109,8 @@ class CCompressDialog: public NWindows::NControl::CModalDialog
  int GetMethodID();
  CSysString GetMethodSpec();

-  AddDictionarySize(UInt32 size, bool kilo, bool maga);
-  AddDictionarySize(UInt32 size);
+  int AddDictionarySize(UInt32 size, bool kilo, bool maga);
+  int AddDictionarySize(UInt32 size);
  
  void SetDictionary();
  UInt32 GetDictionary();
--- a/7zip/UI/GUI/ExtractGUI.cpp
+++ b/7zip/UI/GUI/ExtractGUI.cpp
@@ -156,7 +156,9 @@ HRESULT ExtractGUI(
  if (!thread.Create(CThreadExtracting::MyThreadFunction, &extracter))
    throw 271824;
  extracter.ExtractCallbackSpec->StartProgressDialog(title);
-  if (extracter.Result == S_OK && options.TestMode && extracter.ExtractCallbackSpec->Messages.IsEmpty())
+  if (extracter.Result == S_OK && options.TestMode && 
+      extracter.ExtractCallbackSpec->Messages.IsEmpty() &&
+      extracter.ExtractCallbackSpec->NumArchiveErrors == 0)
  {
    #ifndef _SFX
    MessageBoxW(0, LangLoadStringW(IDS_MESSAGE_NO_ERRORS, 0x02000608),
@@ -164,10 +166,8 @@ HRESULT ExtractGUI(
    #endif
  }
  if (extracter.Result != S_OK)
-  {
    if (!extracter.ErrorMessage.IsEmpty())
      throw extracter.ErrorMessage;
-  }
  return extracter.Result;
 }

--- a/7zip/UI/GUI/GUI.cpp
+++ b/7zip/UI/GUI/GUI.cpp
@@ -99,14 +99,9 @@ int Main2()
          options.ArchivePathsFullSorted,
          options.WildcardCensor.Pairs.Front().Head, 
          eo, options.ShowDialog, &openCallback, ecs);
-    if (result == S_FALSE)
-    {
-      MyMessageBox(IDS_OPEN_IS_NOT_SUPORTED_ARCHIVE, 0x02000604);
-      return NExitCode::kFatalError;    
-    }
-    else if (result != S_OK)
+    if (result != S_OK)
      throw CSystemException(result);
-    if (ecs->Messages.Size() > 0)
+    if (ecs->Messages.Size() > 0 || ecs->NumArchiveErrors != 0)
      return NExitCode::kFatalError;    
  }
  else if (options.Command.IsFromUpdateGroup())
--- a/7zip/UI/GUI/GUI.dsp
+++ b/7zip/UI/GUI/GUI.dsp
@@ -638,15 +638,6 @@ SOURCE=..\..\FileManager\Resource\ProgressDialog2\ProgressDialog.cpp

 SOURCE=..\..\FileManager\Resource\ProgressDialog2\ProgressDialog.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\Resource\ProgressDialog2\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\Resource\ProgressDialog2\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
 # End Group
 # Begin Group "Messages"

@@ -659,15 +650,6 @@ SOURCE=..\..\FileManager\Resource\MessagesDialog\MessagesDialog.cpp

 SOURCE=..\..\FileManager\Resource\MessagesDialog\MessagesDialog.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\Resource\MessagesDialog\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\Resource\MessagesDialog\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
 # End Group
 # Begin Group "Overwtite"

@@ -692,15 +674,6 @@ SOURCE=..\..\FileManager\Resource\PasswordDialog\PasswordDialog.cpp

 SOURCE=..\..\FileManager\Resource\PasswordDialog\PasswordDialog.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\Resource\PasswordDialog\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\Resource\PasswordDialog\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
 # End Group
 # Begin Group "Compress Dialog"

@@ -713,15 +686,6 @@ SOURCE=.\CompressDialog.cpp

 SOURCE=.\CompressDialog.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\Resource\CompressDialog\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource\CompressDialog\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
 # End Group
 # Begin Group "Extract Dialog"

@@ -734,15 +698,6 @@ SOURCE=.\ExtractDialog.cpp

 SOURCE=.\ExtractDialog.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\Resource\ExtractDialog\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource\ExtractDialog\resource.rc
-# PROP Exclude_From_Build 1
-# End Source File
 # End Group
 # End Group
 # Begin Group "FM Common"
--- a/7zip/UI/GUI/UpdateCallbackGUI.cpp
+++ b/7zip/UI/GUI/UpdateCallbackGUI.cpp
@@ -37,6 +37,15 @@ void CUpdateCallbackGUI::AddErrorMessage(LPCWSTR message)
  Messages.Add(message);
 }

+void CUpdateCallbackGUI::AddErrorMessage(const wchar_t *name, DWORD systemError)
+{
+  AddErrorMessage(
+      UString(L"WARNING: ") + 
+      NError::MyFormatMessageW(systemError) + 
+      UString(L": ") + 
+      UString(name));
+}
+
 HRESULT CUpdateCallbackGUI::OpenResult(const wchar_t *name, HRESULT result)
 {
  if (result != S_OK)
@@ -52,6 +61,13 @@ HRESULT CUpdateCallbackGUI::StartScanning()
  return S_OK;
 }

+HRESULT CUpdateCallbackGUI::CanNotFindError(const wchar_t *name, DWORD systemError)
+{
+  FailedFiles.Add(name);
+  AddErrorMessage(name, systemError);
+  return S_OK;
+}
+
 HRESULT CUpdateCallbackGUI::FinishScanning()
 {
  return S_OK;
@@ -111,11 +127,7 @@ HRESULT CUpdateCallbackGUI::OpenFileError(const wchar_t *name, DWORD systemError
  FailedFiles.Add(name);
  // if (systemError == ERROR_SHARING_VIOLATION)
  {
-    AddErrorMessage(
-      UString(L"WARNING: ") + 
-      NError::MyFormatMessageW(systemError) + 
-      UString(L": ") + 
-      UString(name));
+    AddErrorMessage(name, systemError);
    return S_FALSE;
  }
  return systemError;
--- a/7zip/UI/GUI/UpdateCallbackGUI.h
+++ b/7zip/UI/GUI/UpdateCallbackGUI.h
@@ -27,6 +27,7 @@ public:
  HRESULT OpenResult(const wchar_t *name, HRESULT result);

  HRESULT StartScanning();
+  HRESULT CanNotFindError(const wchar_t *name, DWORD systemError);
  HRESULT FinishScanning();

  HRESULT StartArchive(const wchar_t *name, bool updating);
@@ -56,6 +57,7 @@ public:
  UStringVector Messages;
  int NumArchiveErrors;
  void AddErrorMessage(LPCWSTR message);
+  void AddErrorMessage(const wchar_t *name, DWORD systemError);
 };

 #endif
--- a/7zip/UI/GUI/makefile
+++ b/7zip/UI/GUI/makefile
@@ -0,0 +1,131 @@
+PROG = 7zG.exe
+LIBS = $(LIBS) user32.lib advapi32.lib oleaut32.lib shell32.lib comctl32.lib htmlhelp.lib ole32.lib comdlg32.lib
+CFLAGS = $(CFLAGS) -I ../../../ -DLANG
+
+GUI_OBJS = \
+  $O\CompressDialog.obj \
+  $O\ExtractDialog.obj \
+  $O\ExtractGUI.obj \
+  $O\GUI.obj \
+  $O\OpenCallbackGUI.obj \
+  $O\UpdateCallbackGUI.obj \
+  $O\UpdateGUI.obj \
+
+COMMON_OBJS = \
+  $O\Alloc.obj \
+  $O\CommandLineParser.obj \
+  $O\IntToString.obj \
+  $O\Lang.obj \
+  $O\ListFileUtils.obj \
+  $O\NewHandler.obj \
+  $O\StdInStream.obj \
+  $O\String.obj \
+  $O\StringConvert.obj \
+  $O\StringToInt.obj \
+  $O\TextConfig.obj \
+  $O\UTFConvert.obj \
+  $O\Vector.obj \
+  $O\Wildcard.obj \
+
+WIN_OBJS = \
+  $O\DLL.obj \
+  $O\Error.obj \
+  $O\FileDir.obj \
+  $O\FileFind.obj \
+  $O\FileIO.obj \
+  $O\FileName.obj \
+  $O\PropVariant.obj \
+  $O\PropVariantConversions.obj \
+  $O\Registry.obj \
+  $O\ResourceString.obj \
+  $O\Shell.obj \
+  $O\Synchronization.obj \
+  $O\Window.obj \
+
+WIN_CTRL_OBJS = \
+  $O\ComboBox.obj \
+  $O\Dialog.obj \
+  $O\ListView.obj \
+
+7ZIP_COMMON_OBJS = \
+  $O\FilePathAutoRename.obj \
+  $O\FileStreams.obj \
+
+UI_COMMON_OBJS = \
+  $O\ArchiveCommandLine.obj \
+  $O\ArchiveExtractCallback.obj \
+  $O\ArchiveOpenCallback.obj \
+  $O\ArchiverInfo.obj \
+  $O\DefaultName.obj \
+  $O\EnumDirItems.obj \
+  $O\Extract.obj \
+  $O\ExtractingFilePath.obj \
+  $O\OpenArchive.obj \
+  $O\PropIDUtils.obj \
+  $O\SortUtils.obj \
+  $O\TempFiles.obj \
+  $O\Update.obj \
+  $O\UpdateAction.obj \
+  $O\UpdateCallback.obj \
+  $O\UpdatePair.obj \
+  $O\UpdateProduce.obj \
+  $O\WorkDir.obj \
+  $O\ZipRegistry.obj \
+
+FM_OBJS = \
+  $O\ExtractCallback.obj \
+  $O\FormatUtils.obj \
+  $O\HelpUtils.obj \
+  $O\LangUtils.obj \
+  $O\OpenCallback.obj \
+  $O\ProgramLocation.obj \
+  $O\RegistryUtils.obj \
+  $O\SplitUtils.obj \
+  $O\StringUtils.obj \
+  $O\UpdateCallback100.obj \
+
+OBJS = \
+  $O\StdAfx.obj \
+  $(GUI_OBJS) \
+  $(COMMON_OBJS) \
+  $(WIN_OBJS) \
+  $(WIN_CTRL_OBJS) \
+  $(7ZIP_COMMON_OBJS) \
+  $(UI_COMMON_OBJS) \
+  $(FM_OBJS)\
+  $O\MyMessages.obj \
+  $O\MessagesDialog.obj \
+  $O\OverwriteDialog.obj \
+  $O\PasswordDialog.obj \
+  $O\ProgressDialog.obj \
+  $O\CopyCoder.obj \
+  $O\resource.res
+
+!include "../../../Build.mak"
+
+$(GUI_OBJS): $(*B).cpp
+	$(COMPL)
+$(COMMON_OBJS): ../../../Common/$(*B).cpp
+	$(COMPL)
+$(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)
+$(FM_OBJS): ../../FileManager/$(*B).cpp
+	$(COMPL)
+$O\MyMessages.obj: ../Explorer/MyMessages.cpp
+	$(COMPL)
+$O\MessagesDialog.obj: ../../FileManager/Resource/MessagesDialog/$(*B).cpp
+	$(COMPL)
+$O\OverwriteDialog.obj: ../../FileManager/Resource/OverwriteDialog./$(*B).cpp
+	$(COMPL)
+$O\PasswordDialog.obj: ../../FileManager/Resource/PasswordDialog/$(*B).cpp
+	$(COMPL)
+$O\ProgressDialog.obj: ../../FileManager/Resource/ProgressDialog2/$(*B).cpp
+	$(COMPL)
+$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
+	$(COMPL)
--- a/7zip/UI/GUI/resource.h
+++ b/7zip/UI/GUI/resource.h
@@ -1,7 +1,3 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
 #define IDS_CONTEXT_EXTRACT             42
 #define IDS_CONTEXT_EXTRACT_HELP        43
 #define IDS_CONTEXT_COMPRESS            44
@@ -41,13 +37,3 @@
 #define IDC_LIST1                       1067
 #define IDC_COLUMN_EDIT_WIDTH           1068

-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1110
-#define _APS_NEXT_SYMED_VALUE           150
-#endif
-#endif
--- a/7zip/UI/GUI/resource.rc
+++ b/7zip/UI/GUI/resource.rc
@@ -1,140 +1,14 @@
-//Microsoft Developer Studio generated resource script.
-//
+#include "../../MyVersionInfo.rc"
+#include <winnt.h>
 #include "resource.h"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
+MY_VERSION_INFO_APP("7-Zip GUI", "7zg")

-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+IDI_ICON1 ICON "FM.ico"

-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+1 24 MOVEABLE PURE "7zG.exe.manifest"

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""..\\..\\FileManager\\Resource\\PropertyName\\resource.rc""\r\n"
-    "#include ""..\\..\\FileManager\\Resource\\OverwriteDialog\\resource.rc""\r\n"
-    "#include ""..\\..\\FileManager\\Resource\\PasswordDialog\\resource.rc""\r\n"
-    "#include ""..\\..\\FileManager\\Resource\\MessagesDialog\\resource.rc""\r\n"
-    "#include ""..\\..\\FileManager\\Resource\\ProgressDialog2\\resource.rc""\r\n"
-    "#include ""..\\Resource\\Extract\\resource.rc""\r\n"
-    "#include ""..\\Resource\\ExtractDialog\\resource.rc""\r\n"
-    "#include ""..\\Resource\\CompressDialog\\resource.rc""\r\n"
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,24,0,0
- PRODUCTVERSION 4,24,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Igor Pavlov\0"
-            VALUE "FileDescription", "7-Zip GUI Module\0"
-            VALUE "FileVersion", "4, 24, 0, 0\0"
-            VALUE "InternalName", "7zg\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2005 Igor Pavlov\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "7zg.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "7-Zip\0"
-            VALUE "ProductVersion", "4, 24, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "FM.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-1                       24      MOVEABLE PURE   "7zG.exe.manifest"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
    IDS_CONTEXT_EXTRACT     "Extract files..."
    IDS_CONTEXT_EXTRACT_HELP "Extracts files from the selected archive."
@@ -142,18 +16,10 @@ BEGIN
    IDS_CONTEXT_COMPRESS_HELP "Adds the selected items to archive."
    IDS_CONTEXT_OPEN        "Open"
    IDS_CONTEXT_OPEN_HELP   "Opens the selected archive."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
    IDS_CONTEXT_TEST        "Test archive"
    IDS_CONTEXT_TEST_HELP   "Tests integrity of the selected archive."
    IDS_CONTEXT_CAPTION_HELP "7-Zip commands"
    IDS_CONTEXT_POPUP_CAPTION "7-Zip"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
    IDS_OPEN_TYPE_ALL_FILES "All Files"
    IDS_METHOD_STORE        "Store"
    IDS_METHOD_NORMAL       "Normal"
@@ -165,10 +31,6 @@ BEGIN
    IDS_COMPRESS_UPDATE_MODE_UPDATE "Update and add files"
    IDS_COMPRESS_UPDATE_MODE_FRESH "Freshen existing files"
    IDS_COMPRESS_UPDATE_MODE_SYNCHRONIZE "Synchronize files"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
    IDS_COMPRESS_SET_ARCHIVE_DIALOG_TITLE "Browse"
    IDS_CANT_UPDATE_ARCHIVE "Can not update archive '{0}'"
    IDS_PROGRESS_COMPRESSING "Compressing"
@@ -178,26 +40,11 @@ BEGIN
    IDS_CONFIG_DIALOG_CAPTION "7-Zip Options"
 END

-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "..\..\FileManager\Resource\PropertyName\resource.rc"
-#include "..\..\FileManager\Resource\OverwriteDialog\resource.rc"
-#include "..\..\FileManager\Resource\PasswordDialog\resource.rc"
-#include "..\..\FileManager\Resource\MessagesDialog\resource.rc"
-#include "..\..\FileManager\Resource\ProgressDialog2\resource.rc"
-#include "..\Resource\Extract\resource.rc"
-#include "..\Resource\ExtractDialog\resource.rc"
-#include "..\Resource\CompressDialog\resource.rc"
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+#include "../../FileManager/Resource/PropertyName/resource.rc"
+#include "../../FileManager/Resource/OverwriteDialog/resource.rc"
+#include "../../FileManager/Resource/PasswordDialog/resource.rc"
+#include "../../FileManager/Resource/MessagesDialog/resource.rc"
+#include "../../FileManager/Resource/ProgressDialog2/resource.rc"
+#include "../Resource/Extract/resource.rc"
+#include "../Resource/ExtractDialog/resource.rc"
+#include "../Resource/CompressDialog/resource.rc"
--- a/7zip/UI/Resource/CompressDialog/resource.h
+++ b/7zip/UI/Resource/CompressDialog/resource.h
@@ -1,7 +1,3 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
 #define IDD_DIALOG_COMPRESS             152
 #define IDC_STATIC_COMPRESS_MEMORY      1022
 #define IDC_STATIC_COMPRESS_MEMORY_DE   1023
@@ -34,14 +30,3 @@
 #define IDC_COMPRESS_EDIT_PASSWORD      1108
 #define IDC_COMPRESS_CHECK_SHOW_PASSWORD 1109
 #define IDC_COMPRESS_CHECK_ENCRYPT_FILE_NAMES 1110
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1110
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/7zip/UI/Resource/CompressDialog/resource.rc
+++ b/7zip/UI/Resource/CompressDialog/resource.rc
@@ -1,160 +1,108 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
+#include "../../../GuiCommon.rc"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
+#define xSize2 344
+#define ySize2 260

-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define xSize (xSize2 + marg + marg)
+#define ySize (ySize2 + marg + marg)

-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+#undef gSize
+#undef gSpace
+#undef g0XSize
+#undef g1XPos
+#undef g1XSize
+#undef g2XSize
+#undef g3XPos
+#undef g3XSize
+#undef g4XPos
+#undef g4XPos2
+#undef g4XSize
+#undef g4XSize2
+#undef bXPos1
+#undef bXPos2
+#undef bXPos3
+#undef bYPos

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
+#define gSize 160
+#define gSpace 24

-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
+#define g0XSize 82
+#define g1XPos  (marg + g0XSize)
+#define g1XSize (gSize - g0XSize)

-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
+#define g2XSize 122
+#define g3XPos  (marg + g2XSize)
+#define g3XSize (gSize - g2XSize)

-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
+#define g4XPos (marg + gSize + gSpace)
+#define g4XPos2 (g4XPos + 7)
+#define g4XSize (xSize2 - gSize - gSpace)
+#define g4XSize2 (g4XSize - 14)

-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
+#define bXPos1 (xSize - marg - bXSize)
+#define bXPos2 (bXPos1 - 10 - bXSize)
+#define bXPos3 (bXPos2 - 10 - bXSize)

-#endif    // APSTUDIO_INVOKED
+#define bYPos (ySize - marg - bYSize)

-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG_COMPRESS DIALOG DISCARDABLE  0, 0, 335, 277
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+IDD_DIALOG_COMPRESS DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
 CAPTION "Add to Archive"
-FONT 8, "MS Shell Dlg"
+MY_FONT
 BEGIN
-    LTEXT           "&Archive:",IDC_STATIC_COMPRESS_ARCHIVE,7,7,283,8
-    COMBOBOX        IDC_COMPRESS_COMBO_ARCHIVE,7,18,290,126,CBS_DROPDOWN | 
-                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_COMPRESS_BUTTON_SET_ARCHIVE,308,17,20,14,
-                    WS_GROUP
-    LTEXT           "Archive &format:",IDC_STATIC_COMPRESS_FORMAT,7,41,79,8
-    COMBOBOX        IDC_COMPRESS_COMBO_FORMAT,88,39,76,80,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Compression &level:",IDC_STATIC_COMPRESS_LEVEL,7,62,79,
-                    8
-    COMBOBOX        IDC_COMPRESS_COMBO_LEVEL,88,60,76,80,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Compression &method:",IDC_STATIC_COMPRESS_METHOD,7,83,
-                    79,8
-    COMBOBOX        IDC_COMPRESS_COMBO_METHOD,88,81,76,80,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Dictionary size:",IDC_STATIC_COMPRESS_DICTIONARY,7,104,
-                    79,8
-    COMBOBOX        IDC_COMPRESS_COMBO_DICTIONARY,88,102,76,167,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Word size:",IDC_STATIC_COMPRESS_ORDER,7,127,79,8
-    COMBOBOX        IDC_COMPRESS_COMBO_ORDER,88,125,76,141,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Memory usage for Compressing:",
-                    IDC_STATIC_COMPRESS_MEMORY,7,149,121,8
-    RTEXT           "0",IDC_STATIC_COMPRESS_MEMORY_VALUE,128,149,36,8
-    LTEXT           "Memory usage for Decompressing:",
-                    IDC_STATIC_COMPRESS_MEMORY_DE,7,163,121,8
-    RTEXT           "0",IDC_STATIC_COMPRESS_MEMORY_DE_VALUE,128,163,36,8
-    CONTROL         "Create &Solid archive",IDC_COMPRESS_SOLID,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,181,157,10
-    CONTROL         "Multi-threading",IDC_COMPRESS_MULTI_THREAD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,195,157,10
-    LTEXT           "Split to &volumes, bytes:",IDC_STATIC_COMPRESS_VOLUME,
-                    186,183,142,8
-    COMBOBOX        IDC_COMPRESS_COMBO_VOLUME,186,196,142,73,CBS_DROPDOWN | 
-                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Parameters:",IDC_STATIC_COMPRESS_PARAMETERS,7,214,157,
-                    8
-    EDITTEXT        IDC_COMPRESS_EDIT_PARAMETERS,7,225,321,14,ES_AUTOHSCROLL
-    LTEXT           "&Update mode:",IDC_STATIC_COMPRESS_UPDATE_MODE,186,39,
-                    104,8
-    COMBOBOX        IDC_COMPRESS_COMBO_UPDATE_MODE,186,50,142,80,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Options",IDC_STATIC_COMPRESS_OPTIONS,186,73,142,32
-    CONTROL         "Create SF&X archive",IDC_COMPRESS_SFX,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,194,87,127,10
-    GROUPBOX        "Password",IDC_COMPRESS_PASSWORD,186,113,142,63
-    EDITTEXT        IDC_COMPRESS_EDIT_PASSWORD,194,127,127,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    CONTROL         "Show Password",IDC_COMPRESS_CHECK_SHOW_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,194,145,127,10
-    CONTROL         "Encrypt file &names",
-                    IDC_COMPRESS_CHECK_ENCRYPT_FILE_NAMES,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,194,159,127,10
-    DEFPUSHBUTTON   "OK",IDOK,109,256,64,14
-    PUSHBUTTON      "Cancel",IDCANCEL,181,256,64,14
-    PUSHBUTTON      "Help",IDHELP,264,256,64,14
+  LTEXT    "&Archive:", IDC_STATIC_COMPRESS_ARCHIVE, marg, marg, xSize2, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_ARCHIVE, marg, 18, xSize2 - bDotsSize - 12, 126, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+  PUSHBUTTON  "...", IDC_COMPRESS_BUTTON_SET_ARCHIVE, xSize - marg - bDotsSize, 17, bDotsSize, bYSize, WS_GROUP
+
+  LTEXT     "Archive &format:", IDC_STATIC_COMPRESS_FORMAT,     marg,  41, g0XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_FORMAT,     g1XPos, 39,  g1XSize , 80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  
+  LTEXT     "Compression &level:",IDC_STATIC_COMPRESS_LEVEL,    marg,  62, g0XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_LEVEL,      g1XPos, 60,  g1XSize,  80,CBS_DROPDOWNLIST |  WS_VSCROLL | WS_TABSTOP
+  
+  LTEXT     "Compression &method:",IDC_STATIC_COMPRESS_METHOD,  marg,  83, g0XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_METHOD,     g1XPos, 81,  g1XSize,  80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+  LTEXT     "&Dictionary size:",IDC_STATIC_COMPRESS_DICTIONARY, marg, 104, g0XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_DICTIONARY, g1XPos, 102, g1XSize,  167, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+  LTEXT     "&Word size:",IDC_STATIC_COMPRESS_ORDER,            marg, 125, g0XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_ORDER,      g1XPos, 123, g1XSize,  141, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+  
+  LTEXT     "Memory usage for Compressing:", IDC_STATIC_COMPRESS_MEMORY,      marg, 149, g2XSize, 8
+  RTEXT     "0", IDC_STATIC_COMPRESS_MEMORY_VALUE,   g3XPos, 149, g3XSize, 8
+  
+  LTEXT     "Memory usage for Decompressing:", IDC_STATIC_COMPRESS_MEMORY_DE, marg, 163, g2XSize, 8
+  RTEXT     "0",IDC_STATIC_COMPRESS_MEMORY_DE_VALUE, g3XPos, 163, g3XSize, 8
+
+
+  CONTROL   "Create &Solid archive", IDC_COMPRESS_SOLID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 
+            marg, 181, gSize, 10
+  CONTROL   "Multi-threading", IDC_COMPRESS_MULTI_THREAD, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 
+            marg, 195, gSize, 10
+
+  LTEXT     "Split to &volumes, bytes:", IDC_STATIC_COMPRESS_VOLUME, g4XPos, 184, g4XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_VOLUME, g4XPos, 196, g4XSize, 73, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+
+  LTEXT     "&Parameters:",IDC_STATIC_COMPRESS_PARAMETERS, marg, 214, xSize2, 8
+  EDITTEXT  IDC_COMPRESS_EDIT_PARAMETERS, marg, 225, xSize2, 14, ES_AUTOHSCROLL
+
+  LTEXT     "&Update mode:",IDC_STATIC_COMPRESS_UPDATE_MODE, g4XPos, 39, g4XSize, 8
+  COMBOBOX  IDC_COMPRESS_COMBO_UPDATE_MODE, g4XPos, 51, g4XSize, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+  GROUPBOX  "Options",IDC_STATIC_COMPRESS_OPTIONS, g4XPos, 73, g4XSize, 32
+  CONTROL   "Create SF&X archive",IDC_COMPRESS_SFX, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 
+            g4XPos2, 87, g4XSize2, 10
+  
+  GROUPBOX  "Password",IDC_COMPRESS_PASSWORD, g4XPos, 113, g4XSize, 63
+  EDITTEXT  IDC_COMPRESS_EDIT_PASSWORD, g4XPos2, 127, g4XSize2, 14, ES_PASSWORD | ES_AUTOHSCROLL
+  CONTROL   "Show Password",IDC_COMPRESS_CHECK_SHOW_PASSWORD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+            g4XPos2, 145, g4XSize2, 10
+  CONTROL   "Encrypt file &names", IDC_COMPRESS_CHECK_ENCRYPT_FILE_NAMES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+            g4XPos2, 159, g4XSize2, 10
+  
+  DEFPUSHBUTTON  "OK",         IDOK, bXPos3, bYPos, bXSize, bYSize, WS_GROUP
+  PUSHBUTTON     "Cancel", IDCANCEL, bXPos2, bYPos, bXSize, bYSize
+  PUSHBUTTON     "Help",     IDHELP, bXPos1, bYPos, bXSize, bYSize
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG_COMPRESS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 328
-        VERTGUIDE, 86
-        VERTGUIDE, 88
-        VERTGUIDE, 128
-        VERTGUIDE, 164
-        VERTGUIDE, 186
-        VERTGUIDE, 194
-        VERTGUIDE, 321
-        BOTTOMMARGIN, 270
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
--- a/7zip/UI/Resource/Extract/resource.h
+++ b/7zip/UI/Resource/Extract/resource.h
@@ -1,26 +1,10 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
+#define IDS_CANNOT_CREATE_FOLDER  200
+#define IDS_OPEN_IS_NOT_SUPORTED_ARCHIVE  201

-#define IDS_CANNOT_CREATE_FOLDER        200
-#define IDS_OPEN_IS_NOT_SUPORTED_ARCHIVE 201
+#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC  202
+#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR  203
+#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_UNSUPPORTED_METHOD  204

-#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC 202
-#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR 203
-#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_UNSUPPORTED_METHOD 204
-
-#define IDS_EXTRACT_SET_FOLDER          205
-#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CANNOT_OPEN_FILE 206
-#define IDS_PROGRESS_EXTRACTING         207
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        208
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           208
-#endif
-#endif
+#define IDS_EXTRACT_SET_FOLDER  205
+#define IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CANNOT_OPEN_FILE  206
+#define IDS_PROGRESS_EXTRACTING  207
--- a/7zip/UI/Resource/Extract/resource.rc
+++ b/7zip/UI/Resource/Extract/resource.rc
@@ -1,113 +1,15 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//

 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_CANNOT_CREATE_FOLDER "Cannot create folder '{0}'"
-    IDS_OPEN_IS_NOT_SUPORTED_ARCHIVE "File is not supported archive."
-    IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC 
-                            "CRC failed in '{0}'. File is broken."
-    IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR 
-                            "Data error in '{0}'. File is broken."
+  IDS_CANNOT_CREATE_FOLDER "Cannot create folder '{0}'"
+  IDS_OPEN_IS_NOT_SUPORTED_ARCHIVE "File is not supported archive."
+  IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC "CRC failed in '{0}'. File is broken."
+  IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR  "Data error in '{0}'. File is broken."
+  IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_UNSUPPORTED_METHOD  "Unsupported compression method for '{0}'."
+  IDS_EXTRACT_SET_FOLDER  "Specify a location for extracted files."
+  IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CANNOT_OPEN_FILE  "Can not open output file '{0}'."
+  IDS_PROGRESS_EXTRACTING "Extracting"
 END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_UNSUPPORTED_METHOD 
-                            "Unsupported compression method for '{0}'."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_EXTRACT_SET_FOLDER  "Specify a location for extracted files."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CANNOT_OPEN_FILE 
-                            "Can not open output file '{0}'."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_PROGRESS_EXTRACTING "Extracting"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
--- a/7zip/UI/Resource/ExtractDialog/resource.h
+++ b/7zip/UI/Resource/ExtractDialog/resource.h
@@ -1,7 +1,3 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
 #define IDC_STATIC_EXTRACT_EXTRACT_TO   1020
 #define IDC_EXTRACT_COMBO_PATH          1021
 #define IDC_EXTRACT_BUTTON_SET_PATH     1022
@@ -28,13 +24,3 @@
 #define IDC_EXTRACT_EDIT_PASSWORD       1101
 #define IDC_EXTRACT_CHECK_SHOW_PASSWORD 1102

-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1110
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/7zip/UI/Resource/ExtractDialog/resource.rc
+++ b/7zip/UI/Resource/ExtractDialog/resource.rc
@@ -1,139 +1,80 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
+#include "../../../GuiCommon.rc"

-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
+#define xSize2 285
+#define ySize2 204

-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define xSize (xSize2 + marg + marg)
+#define ySize (ySize2 + marg + marg)

-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+#undef g1XSize
+#undef g1XSize2
+#undef g1XPos2
+#undef g2XPos
+#undef g2XPos2
+#undef g2XSize
+#undef g2XSize2

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
+#define bYPos (ySize - marg - bYSize)

-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
+#define g1XSize 127
+#define g1XSize2 (g1XSize - 13)
+#define g1XPos2 (marg + 7)

-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
+#define gSpace 14
+#define g2XPos (marg + g1XSize + gSpace)
+#define g2XPos2 (g2XPos + 7)
+#define g2XSize (xSize2 - g1XSize - gSpace)
+#define g2XSize2 (g2XSize - 14)

-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
+#define bXPos1 (xSize - marg - bXSize)
+#define bXPos2 (bXPos1 - 10 - bXSize)
+#define bXPos3 (bXPos2 - 10 - bXSize)

-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG_EXTRACT DIALOG DISCARDABLE  0, 0, 299, 218
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+IDD_DIALOG_EXTRACT DIALOG DISCARDABLE  0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
 CAPTION "Extract"
-FONT 8, "MS Shell Dlg"
+MY_FONT
 BEGIN
-    LTEXT           "E&xtract to:",IDC_STATIC_EXTRACT_EXTRACT_TO,7,7,127,8
-    COMBOBOX        IDC_EXTRACT_COMBO_PATH,7,21,252,126,CBS_DROPDOWN | 
-                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_EXTRACT_BUTTON_SET_PATH,272,20,20,14,WS_GROUP
-    GROUPBOX        "Path mode",IDC_EXTRACT_PATH_MODE,7,44,127,57
-    CONTROL         "Full pathnames",IDC_EXTRACT_RADIO_FULL_PATHNAMES,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,13,57,114,10
-    CONTROL         "Current pathnames",IDC_EXTRACT_RADIO_CURRENT_PATHNAMES,
-                    "Button",BS_AUTORADIOBUTTON,13,71,114,10
-    CONTROL         "No pathnames",IDC_EXTRACT_RADIO_NO_PATHNAMES,"Button",
-                    BS_AUTORADIOBUTTON,13,85,114,10
-    GROUPBOX        "Overwrite mode",IDC_EXTRACT_OVERWRITE_MODE,148,44,144,
-                    88,WS_GROUP
-    CONTROL         "Ask before overwrite",
-                    IDC_EXTRACT_RADIO_ASK_BEFORE_OVERWRITE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,154,57,130,10
-    CONTROL         "Overwrite without prompt",
-                    IDC_EXTRACT_RADIO_OVERWRITE_WITHOUT_PROMPT,"Button",
-                    BS_AUTORADIOBUTTON,154,71,130,10
-    CONTROL         "Skip existing files",
-                    IDC_EXTRACT_RADIO_SKIP_EXISTING_FILES,"Button",
-                    BS_AUTORADIOBUTTON,154,85,130,10
-    CONTROL         "Auto rename",IDC_EXTRACT_RADIO_AUTO_RENAME,"Button",
-                    BS_AUTORADIOBUTTON,154,99,130,10
-    CONTROL         "Auto rename existing files",
-                    IDC_EXTRACT_RADIO_AUTO_RENAME_EXISTING,"Button",
-                    BS_AUTORADIOBUTTON,154,113,130,10
-    GROUPBOX        "Files",IDC_EXTRACT_FILES,7,140,127,48,NOT WS_VISIBLE | 
-                    WS_DISABLED | WS_GROUP
-    CONTROL         "&Selected files",IDC_EXTRACT_RADIO_SELECTED_FILES,
-                    "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | 
-                    WS_DISABLED | WS_GROUP,13,153,114,10
-    CONTROL         "&All files",IDC_EXTRACT_RADIO_ALL_FILES,"Button",
-                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,13,166,
-                    114,10
-    GROUPBOX        "Password",IDC_EXTRACT_PASSWORD,148,142,144,46
-    EDITTEXT        IDC_EXTRACT_EDIT_PASSWORD,154,153,130,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    CONTROL         "Show Password",IDC_EXTRACT_CHECK_SHOW_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,154,172,129,10
-    DEFPUSHBUTTON   "OK",IDOK,80,197,64,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,154,197,64,14
-    PUSHBUTTON      "Help",IDHELP,228,197,64,14
+  LTEXT    "E&xtract to:", IDC_STATIC_EXTRACT_EXTRACT_TO, marg, marg, xSize2, 8
+  
+  COMBOBOX   IDC_EXTRACT_COMBO_PATH, marg, 21, xSize2 - bDotsSize - 13, 126, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+
+  PUSHBUTTON  "...", IDC_EXTRACT_BUTTON_SET_PATH, xSize - marg - bDotsSize, 20, bDotsSize, bYSize, WS_GROUP
+
+  GROUPBOX  "Path mode",IDC_EXTRACT_PATH_MODE, marg, 44, g1XSize, 57
+  CONTROL  "Full pathnames", IDC_EXTRACT_RADIO_FULL_PATHNAMES,"Button", BS_AUTORADIOBUTTON | WS_GROUP,
+           g1XPos2, 57, g1XSize2, 10
+  CONTROL  "Current pathnames",IDC_EXTRACT_RADIO_CURRENT_PATHNAMES, "Button", BS_AUTORADIOBUTTON,
+           g1XPos2, 71, g1XSize2, 10
+  CONTROL  "No pathnames", IDC_EXTRACT_RADIO_NO_PATHNAMES, "Button", BS_AUTORADIOBUTTON,
+           g1XPos2, 85, g1XSize2, 10
+
+  GROUPBOX "Overwrite mode",IDC_EXTRACT_OVERWRITE_MODE, g2XPos, 44, g2XSize, 88, WS_GROUP
+  CONTROL  "Ask before overwrite", IDC_EXTRACT_RADIO_ASK_BEFORE_OVERWRITE, "Button", BS_AUTORADIOBUTTON | WS_GROUP,
+	   g2XPos2, 57, g2XSize2, 10
+  CONTROL  "Overwrite without prompt", IDC_EXTRACT_RADIO_OVERWRITE_WITHOUT_PROMPT, "Button", BS_AUTORADIOBUTTON,
+           g2XPos2, 71, g2XSize2, 10
+  CONTROL  "Skip existing files", IDC_EXTRACT_RADIO_SKIP_EXISTING_FILES, "Button", BS_AUTORADIOBUTTON,
+           g2XPos2, 85, g2XSize2, 10
+  CONTROL  "Auto rename", IDC_EXTRACT_RADIO_AUTO_RENAME, "Button", BS_AUTORADIOBUTTON,
+           g2XPos2, 99, g2XSize2, 10
+  CONTROL  "Auto rename existing files", IDC_EXTRACT_RADIO_AUTO_RENAME_EXISTING, "Button", BS_AUTORADIOBUTTON,
+           g2XPos2,113, g2XSize2, 10
+
+  GROUPBOX "Files",IDC_EXTRACT_FILES, marg, 140, 127, 48, NOT WS_VISIBLE | WS_DISABLED | WS_GROUP
+  CONTROL  "&Selected files",IDC_EXTRACT_RADIO_SELECTED_FILES, "Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP,
+           g1XPos2, 153, g1XSize2, 10
+  CONTROL  "&All files",IDC_EXTRACT_RADIO_ALL_FILES, "Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,
+           g1XPos2, 166, g1XSize2, 10
+
+  GROUPBOX "Password",IDC_EXTRACT_PASSWORD, g2XPos, 142, g2XSize, 46
+  EDITTEXT IDC_EXTRACT_EDIT_PASSWORD,154,153,130,14, ES_PASSWORD | ES_AUTOHSCROLL
+  CONTROL         "Show Password",IDC_EXTRACT_CHECK_SHOW_PASSWORD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+           g2XPos2, 172, g2XSize2, 10
+  
+  DEFPUSHBUTTON  "OK",         IDOK, bXPos3, bYPos, bXSize, bYSize, WS_GROUP
+  PUSHBUTTON     "Cancel", IDCANCEL, bXPos2, bYPos, bXSize, bYSize
+  PUSHBUTTON     "Help",     IDHELP, bXPos1, bYPos, bXSize, bYSize
 END


-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    "IDD_DIALOG_EXTRACT", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 292
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 211
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
--- a/7zip/UI/makefile
+++ b/7zip/UI/makefile
@@ -0,0 +1,9 @@
+DIRS = \
+  Console\~ \
+  Explorer\~ \
+  GUI\~ \
+
+all: $(DIRS)
+
+$(DIRS):
+!include "../SubBuild.mak"