23.0123.01

124 files changed, 6443 insertions, 3287 deletions

diff --git a/CPP/7zip/UI/FileManager/7zFM.exe.manifest b/CPP/7zip/UI/FileManager/7zFM.exe.manifest
index 6a13c92..69c7f0b 100644
--- a/CPP/7zip/UI/FileManager/7zFM.exe.manifest
+++ b/CPP/7zip/UI/FileManager/7zFM.exe.manifest
@@ -17,4 +17,7 @@
       <dpiAware>true</dpiAware>
     </asmv3:windowsSettings>
   </asmv3:application>
+<application xmlns="urn:schemas-microsoft-com:asm.v3">
+<windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+<ws2:longPathAware>true</ws2:longPathAware></windowsSettings></application>
 </assembly>
diff --git a/CPP/7zip/UI/FileManager/AboutDialog.cpp b/CPP/7zip/UI/FileManager/AboutDialog.cpp
index 082902e..efc74cc 100644
--- a/CPP/7zip/UI/FileManager/AboutDialog.cpp
+++ b/CPP/7zip/UI/FileManager/AboutDialog.cpp
@@ -14,10 +14,12 @@
 #include "HelpUtils.h"
 #include "LangUtils.h"
 
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_ABOUT_INFO
 };
+#endif
 
 #define kHomePageURL TEXT("https://www.7-zip.org/")
 #define kHelpTopic "start.htm"
@@ -29,7 +31,7 @@ extern CCodecs *g_CodecsObj;
 
 bool CAboutDialog::OnInit()
 {
-  #ifdef EXTERNAL_CODECS
+  #ifdef Z7_EXTERNAL_CODECS
   if (g_CodecsObj)
   {
     UString s;
@@ -39,11 +41,13 @@ bool CAboutDialog::OnInit()
   }
   #endif
 
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  #ifdef Z7_LANG
+  LangSetWindowText(*this, IDD_ABOUT);
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+  #endif
   SetItemText(IDT_ABOUT_VERSION, UString("7-Zip " MY_VERSION_CPU));
   SetItemText(IDT_ABOUT_DATE, LLL(MY_DATE));
   
-  LangSetWindowText(*this, IDD_ABOUT);
   NormalizePosition();
   return CModalDialog::OnInit();
 }
@@ -53,7 +57,7 @@ void CAboutDialog::OnHelp()
   ShowHelpWindow(kHelpTopic);
 }
 
-bool CAboutDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CAboutDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   LPCTSTR url;
   switch (buttonID)
diff --git a/CPP/7zip/UI/FileManager/AboutDialog.h b/CPP/7zip/UI/FileManager/AboutDialog.h
index 39fd3ba..1d11d74 100644
--- a/CPP/7zip/UI/FileManager/AboutDialog.h
+++ b/CPP/7zip/UI/FileManager/AboutDialog.h
@@ -1,7 +1,7 @@
 // AboutDialog.h
  
-#ifndef __ABOUT_DIALOG_H
-#define __ABOUT_DIALOG_H
+#ifndef ZIP7_INC_ABOUT_DIALOG_H
+#define ZIP7_INC_ABOUT_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 
@@ -10,10 +10,10 @@
 class CAboutDialog: public NWindows::NControl::CModalDialog
 {
 public:
-  virtual bool OnInit();
-  virtual void OnHelp();
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
-  INT_PTR Create(HWND wndParent = 0) { return CModalDialog::Create(IDD_ABOUT, wndParent); }
+  virtual bool OnInit() Z7_override;
+  virtual void OnHelp() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  INT_PTR Create(HWND wndParent = NULL) { return CModalDialog::Create(IDD_ABOUT, wndParent); }
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/AltStreamsFolder.cpp b/CPP/7zip/UI/FileManager/AltStreamsFolder.cpp
index e1c99d3..b3d354d 100644
--- a/CPP/7zip/UI/FileManager/AltStreamsFolder.cpp
+++ b/CPP/7zip/UI/FileManager/AltStreamsFolder.cpp
@@ -2,10 +2,32 @@
 
 #include "StdAfx.h"
 
+#ifdef __MINGW32_VERSION
+// #if !defined(_MSC_VER) && (__GNUC__) && (__GNUC__ < 10)
+// for old mingw
+#include <ddk/ntddk.h>
+#else
+#ifndef Z7_OLD_WIN_SDK
+  #if !defined(_M_IA64)
+    #include <winternl.h>
+  #endif
+#else
+typedef LONG NTSTATUS;
+typedef struct _IO_STATUS_BLOCK {
+    union {
+        NTSTATUS Status;
+        PVOID Pointer;
+    };
+    ULONG_PTR Information;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
+#endif
+#endif
+
 #include "../../../Common/ComTry.h"
 #include "../../../Common/StringConvert.h"
 #include "../../../Common/Wildcard.h"
 
+#include "../../../Windows/DLL.h"
 #include "../../../Windows/ErrorMsg.h"
 #include "../../../Windows/FileDir.h"
 #include "../../../Windows/FileIO.h"
@@ -54,7 +76,7 @@ static unsigned GetFsParentPrefixSize(const FString &path)
 {
   if (IsNetworkShareRootPath(path))
     return 0;
-  unsigned prefixSize = GetRootPrefixSize(path);
+  const unsigned prefixSize = GetRootPrefixSize(path);
   if (prefixSize == 0 || prefixSize >= path.Len())
     return 0;
   FString parentPath = path;
@@ -70,7 +92,7 @@ static unsigned GetFsParentPrefixSize(const FString &path)
   }
   if ((unsigned)pos + 1 < prefixSize)
     return 0;
-  return pos + 1;
+  return (unsigned)pos + 1;
 }
 
 HRESULT CAltStreamsFolder::Init(const FString &path /* , IFolderFolder *parentFolder */)
@@ -115,7 +137,7 @@ HRESULT CAltStreamsFolder::Init(const FString &path /* , IFolderFolder *parentFo
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::LoadItems()
+Z7_COM7F_IMF(CAltStreamsFolder::LoadItems())
 {
   Int32 dummy;
   WasChanged(&dummy);
@@ -152,7 +174,7 @@ STDMETHODIMP CAltStreamsFolder::LoadItems()
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::GetNumberOfItems(UInt32 *numItems)
+Z7_COM7F_IMF(CAltStreamsFolder::GetNumberOfItems(UInt32 *numItems))
 {
   *numItems = Streams.Size();
   return S_OK;
@@ -160,16 +182,16 @@ STDMETHODIMP CAltStreamsFolder::GetNumberOfItems(UInt32 *numItems)
 
 #ifdef USE_UNICODE_FSTRING
 
-STDMETHODIMP CAltStreamsFolder::GetItemPrefix(UInt32 /* index */, const wchar_t **name, unsigned *len)
+Z7_COM7F_IMF(CAltStreamsFolder::GetItemPrefix(UInt32 /* index */, const wchar_t **name, unsigned *len))
 {
-  *name = 0;
+  *name = NULL;
   *len = 0;
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::GetItemName(UInt32 index, const wchar_t **name, unsigned *len)
+Z7_COM7F_IMF(CAltStreamsFolder::GetItemName(UInt32 index, const wchar_t **name, unsigned *len))
 {
-  *name = 0;
+  *name = NULL;
   *len = 0;
   {
     const CAltStream &ss = Streams[index];
@@ -179,7 +201,7 @@ STDMETHODIMP CAltStreamsFolder::GetItemName(UInt32 index, const wchar_t **name,
   return S_OK;
 }
 
-STDMETHODIMP_(UInt64) CAltStreamsFolder::GetItemSize(UInt32 index)
+Z7_COM7F_IMF2(UInt64, CAltStreamsFolder::GetItemSize(UInt32 index))
 {
   return Streams[index].Size;
 }
@@ -187,7 +209,7 @@ STDMETHODIMP_(UInt64) CAltStreamsFolder::GetItemSize(UInt32 index)
 #endif
 
 
-STDMETHODIMP CAltStreamsFolder::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CAltStreamsFolder::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value))
 {
   NCOM::CPropVariant prop;
   {
@@ -223,11 +245,11 @@ STDMETHODIMP CAltStreamsFolder::GetProperty(UInt32 index, PROPID propID, PROPVAR
 
 static inline const wchar_t *GetExtensionPtr(const UString &name)
 {
-  int dotPos = name.ReverseFind_Dot();
-  return name.Ptr((dotPos < 0) ? name.Len() : dotPos);
+  const int dotPos = name.ReverseFind_Dot();
+  return name.Ptr(dotPos < 0 ? name.Len() : (unsigned)dotPos);
 }
 
-STDMETHODIMP_(Int32) CAltStreamsFolder::CompareItems(UInt32 index1, UInt32 index2, PROPID propID, Int32 /* propIsRaw */)
+Z7_COM7F_IMF2(Int32, CAltStreamsFolder::CompareItems(UInt32 index1, UInt32 index2, PROPID propID, Int32 /* propIsRaw */))
 {
   const CAltStream &ss1 = Streams[index1];
   const CAltStream &ss2 = Streams[index2];
@@ -262,23 +284,23 @@ STDMETHODIMP_(Int32) CAltStreamsFolder::CompareItems(UInt32 index1, UInt32 index
   return 0;
 }
 
-STDMETHODIMP CAltStreamsFolder::BindToFolder(UInt32 /* index */, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CAltStreamsFolder::BindToFolder(UInt32 /* index */, IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   return E_INVALIDARG;
 }
 
-STDMETHODIMP CAltStreamsFolder::BindToFolder(const wchar_t * /* name */, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CAltStreamsFolder::BindToFolder(const wchar_t * /* name */, IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   return E_INVALIDARG;
 }
 
 // static CFSTR const kSuperPrefix = FTEXT("\\\\?\\");
 
-STDMETHODIMP CAltStreamsFolder::BindToParentFolder(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CAltStreamsFolder::BindToParentFolder(IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   /*
   if (_parentFolder)
   {
@@ -338,15 +360,9 @@ STDMETHODIMP CAltStreamsFolder::BindToParentFolder(IFolderFolder **resultFolder)
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::GetNumberOfProperties(UInt32 *numProperties)
-{
-  *numProperties = ARRAY_SIZE(kProps);
-  return S_OK;
-}
-
-STDMETHODIMP CAltStreamsFolder::GetPropertyInfo IMP_IFolderFolder_GetProp(kProps)
+IMP_IFolderFolder_Props(CAltStreamsFolder)
 
-STDMETHODIMP CAltStreamsFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CAltStreamsFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value))
 {
   COM_TRY_BEGIN
   NWindows::NCOM::CPropVariant prop;
@@ -360,7 +376,7 @@ STDMETHODIMP CAltStreamsFolder::GetFolderProperty(PROPID propID, PROPVARIANT *va
   COM_TRY_END
 }
 
-STDMETHODIMP CAltStreamsFolder::WasChanged(Int32 *wasChanged)
+Z7_COM7F_IMF(CAltStreamsFolder::WasChanged(Int32 *wasChanged))
 {
   bool wasChangedMain = false;
   for (;;)
@@ -385,7 +401,7 @@ STDMETHODIMP CAltStreamsFolder::WasChanged(Int32 *wasChanged)
   return S_OK;
 }
  
-STDMETHODIMP CAltStreamsFolder::Clone(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CAltStreamsFolder::Clone(IFolderFolder **resultFolder))
 {
   CAltStreamsFolder *folderSpec = new CAltStreamsFolder;
   CMyComPtr<IFolderFolder> folderNew = folderSpec;
@@ -436,39 +452,31 @@ static HRESULT SendMessageError(IFolderArchiveUpdateCallback *callback,
 }
 */
 
-STDMETHODIMP CAltStreamsFolder::CreateFolder(const wchar_t * /* name */, IProgress * /* progress */)
+Z7_COM7F_IMF(CAltStreamsFolder::CreateFolder(const wchar_t * /* name */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CAltStreamsFolder::CreateFile(const wchar_t *name, IProgress * /* progress */)
+Z7_COM7F_IMF(CAltStreamsFolder::CreateFile(const wchar_t *name, IProgress * /* progress */))
 {
   FString absPath;
   GetAbsPath(name, absPath);
   NIO::COutFile outFile;
   if (!outFile.Create(absPath, false))
-    return ::GetLastError();
+    return GetLastError_noZero_HRESULT();
   return S_OK;
 }
 
-static DWORD Return_LastError_or_FAIL()
-{
-  DWORD errorCode = GetLastError();
-  if (errorCode == 0)
-    errorCode = (DWORD)E_FAIL;
-  return errorCode;
-}
-
 static UString GetLastErrorMessage()
 {
-  return NError::MyFormatMessage(Return_LastError_or_FAIL());
+  return NError::MyFormatMessage(GetLastError_noZero_HRESULT());
 }
 
 static HRESULT UpdateFile(NFsFolder::CCopyStateIO &state, CFSTR inPath, CFSTR outPath, IFolderArchiveUpdateCallback *callback)
 {
   if (NFind::DoesFileOrDirExist(outPath))
   {
-    RINOK(SendMessageError(callback, NError::MyFormatMessage(ERROR_ALREADY_EXISTS), FString(outPath)));
+    RINOK(SendMessageError(callback, NError::MyFormatMessage(ERROR_ALREADY_EXISTS), FString(outPath)))
     CFileInfo fi;
     if (fi.Find(inPath))
     {
@@ -480,8 +488,8 @@ static HRESULT UpdateFile(NFsFolder::CCopyStateIO &state, CFSTR inPath, CFSTR ou
 
   {
     if (callback)
-      RINOK(callback->CompressOperation(fs2us(inPath)));
-    RINOK(state.MyCopyFile(inPath, outPath));
+      RINOK(callback->CompressOperation(fs2us(inPath)))
+    RINOK(state.MyCopyFile(inPath, outPath))
     if (state.ErrorFileIndex >= 0)
     {
       if (state.ErrorMessage.IsEmpty())
@@ -492,31 +500,136 @@ static HRESULT UpdateFile(NFsFolder::CCopyStateIO &state, CFSTR inPath, CFSTR ou
       else
         errorName = outPath;
       if (callback)
-        RINOK(SendMessageError(callback, state.ErrorMessage, errorName));
+        RINOK(SendMessageError(callback, state.ErrorMessage, errorName))
     }
     if (callback)
-      RINOK(callback->OperationResult(0));
+      RINOK(callback->OperationResult(0))
   }
 
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::Rename(UInt32 index, const wchar_t *newName, IProgress *progress)
+EXTERN_C_BEGIN
+
+typedef enum
 {
-  CMyComPtr<IFolderArchiveUpdateCallback> callback;
-  if (progress)
+  Z7_WIN_FileRenameInformation = 10
+}
+Z7_WIN_FILE_INFORMATION_CLASS;
+
+
+typedef struct
+{
+  // #if (_WIN32_WINNT >= _WIN32_WINNT_WIN10_RS1)
+  union
   {
-    RINOK(progress->QueryInterface(IID_IFolderArchiveUpdateCallback, (void **)&callback));
-  }
+    BOOLEAN ReplaceIfExists;  // FileRenameInformation
+    ULONG Flags;              // FileRenameInformationEx
+  } DUMMYUNIONNAME;
+  // #else
+  // BOOLEAN ReplaceIfExists;
+  // #endif
+  HANDLE RootDirectory;
+  ULONG FileNameLength;
+  WCHAR FileName[1];
+} Z7_WIN_FILE_RENAME_INFORMATION;
+
+#if (_WIN32_WINNT >= 0x0500) && !defined(_M_IA64)
+#define Z7_WIN_NTSTATUS  NTSTATUS
+#define Z7_WIN_IO_STATUS_BLOCK  IO_STATUS_BLOCK
+#else
+typedef LONG Z7_WIN_NTSTATUS;
+typedef struct
+{
+  union
+  {
+    Z7_WIN_NTSTATUS Status;
+    PVOID Pointer;
+  } DUMMYUNIONNAME;
+  ULONG_PTR Information;
+} Z7_WIN_IO_STATUS_BLOCK;
+#endif
+
+typedef Z7_WIN_NTSTATUS (WINAPI *Func_NtSetInformationFile)(
+    HANDLE FileHandle,
+    Z7_WIN_IO_STATUS_BLOCK *IoStatusBlock,
+    PVOID FileInformation,
+    ULONG Length,
+    Z7_WIN_FILE_INFORMATION_CLASS FileInformationClass);
+
+// NTAPI
+typedef ULONG (WINAPI *Func_RtlNtStatusToDosError)(Z7_WIN_NTSTATUS Status);
+
+#define MY_STATUS_SUCCESS 0
+
+EXTERN_C_END
+
+// static Func_NtSetInformationFile f_NtSetInformationFile;
+// static bool g_NtSetInformationFile_WasRequested = false;
 
-  FString destPath = _pathPrefix + us2fs(newName);
 
+Z7_COM7F_IMF(CAltStreamsFolder::Rename(UInt32 index, const wchar_t *newName, IProgress *progress))
+{
   const CAltStream &ss = Streams[index];
+  const FString srcPath = _pathPrefix + us2fs(ss.Name);
+
+  const HMODULE ntdll = ::GetModuleHandleW(L"ntdll.dll");
+  // if (!g_NtSetInformationFile_WasRequested) {
+  // g_NtSetInformationFile_WasRequested = true;
+  const
+   Func_NtSetInformationFile
+      f_NtSetInformationFile = Z7_GET_PROC_ADDRESS(
+   Func_NtSetInformationFile, ntdll,
+       "NtSetInformationFile");
+  if (f_NtSetInformationFile)
+  {
+    NIO::CInFile inFile;
+    if (inFile.Open_for_FileRenameInformation(srcPath))
+    {
+      UString destPath (':');
+      destPath += newName;
+      const ULONG len = (ULONG)sizeof(wchar_t) * destPath.Len();
+      CByteBuffer buffer(sizeof(Z7_WIN_FILE_RENAME_INFORMATION) + len);
+      // buffer is 4 bytes larger than required.
+      Z7_WIN_FILE_RENAME_INFORMATION *fri = (Z7_WIN_FILE_RENAME_INFORMATION *)(void *)(Byte *)buffer;
+      memset(fri, 0, sizeof(Z7_WIN_FILE_RENAME_INFORMATION));
+      /* DOCS: If ReplaceIfExists is set to TRUE, the rename operation will succeed only
+         if a stream with the same name does not exist or is a zero-length data stream. */
+      fri->ReplaceIfExists = FALSE;
+      fri->RootDirectory = NULL;
+      fri->FileNameLength = len;
+      memcpy(fri->FileName, destPath.Ptr(), len);
+      Z7_WIN_IO_STATUS_BLOCK iosb;
+      const Z7_WIN_NTSTATUS status = f_NtSetInformationFile (inFile.GetHandle(),
+          &iosb, fri, (ULONG)buffer.Size(), Z7_WIN_FileRenameInformation);
+      if (status != MY_STATUS_SUCCESS)
+      {
+        const
+         Func_RtlNtStatusToDosError
+            f_RtlNtStatusToDosError = Z7_GET_PROC_ADDRESS(
+         Func_RtlNtStatusToDosError, ntdll,
+             "RtlNtStatusToDosError");
+        if (f_RtlNtStatusToDosError)
+        {
+          const ULONG res = f_RtlNtStatusToDosError(status);
+          if (res != ERROR_MR_MID_NOT_FOUND)
+            return HRESULT_FROM_WIN32(res);
+        }
+      }
+      return status;
+    }
+  }
+
+  CMyComPtr<IFolderArchiveUpdateCallback> callback;
+  if (progress)
+  {
+    RINOK(progress->QueryInterface(IID_IFolderArchiveUpdateCallback, (void **)&callback))
+  }
 
   if (callback)
   {
-    RINOK(callback->SetNumFiles(1));
-    RINOK(callback->SetTotal(ss.Size));
+    RINOK(callback->SetNumFiles(1))
+    RINOK(callback->SetTotal(ss.Size))
   }
 
   NFsFolder::CCopyStateIO state;
@@ -524,32 +637,33 @@ STDMETHODIMP CAltStreamsFolder::Rename(UInt32 index, const wchar_t *newName, IPr
   state.TotalSize = 0;
   state.DeleteSrcFile = true;
 
-  return UpdateFile(state, _pathPrefix + us2fs(ss.Name), destPath, callback);
+  const FString destPath = _pathPrefix + us2fs(newName);
+  return UpdateFile(state, srcPath, destPath, callback);
 }
 
-STDMETHODIMP CAltStreamsFolder::Delete(const UInt32 *indices, UInt32 numItems,IProgress *progress)
+Z7_COM7F_IMF(CAltStreamsFolder::Delete(const UInt32 *indices, UInt32 numItems,IProgress *progress))
 {
-  RINOK(progress->SetTotal(numItems));
+  RINOK(progress->SetTotal(numItems))
   for (UInt32 i = 0; i < numItems; i++)
   {
     const CAltStream &ss = Streams[indices[i]];
     const FString fullPath = _pathPrefix + us2fs(ss.Name);
-    bool result = DeleteFileAlways(fullPath);
+    const bool result = DeleteFileAlways(fullPath);
     if (!result)
-      return Return_LastError_or_FAIL();
-    UInt64 completed = i;
-    RINOK(progress->SetCompleted(&completed));
+      return GetLastError_noZero_HRESULT();
+    const UInt64 completed = i;
+    RINOK(progress->SetCompleted(&completed))
   }
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::SetProperty(UInt32 /* index */, PROPID /* propID */,
-    const PROPVARIANT * /* value */, IProgress * /* progress */)
+Z7_COM7F_IMF(CAltStreamsFolder::SetProperty(UInt32 /* index */, PROPID /* propID */,
+    const PROPVARIANT * /* value */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CAltStreamsFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
+Z7_COM7F_IMF(CAltStreamsFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex))
 {
   const CAltStream &ss = Streams[index];
   *iconIndex = 0;
@@ -561,30 +675,28 @@ STDMETHODIMP CAltStreamsFolder::GetSystemIconIndex(UInt32 index, Int32 *iconInde
     *iconIndex = iconIndexTemp;
     return S_OK;
   }
-  return Return_LastError_or_FAIL();
+  return GetLastError_noZero_HRESULT();
 }
 
 /*
-class CGetProp:
-  public IGetProp,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_COM_1(
+  CGetProp
+  , IGetProp
+)
 public:
   // const CArc *Arc;
   // UInt32 IndexInArc;
   UString Name; // relative path
   UInt64 Size;
-
-  MY_UNKNOWN_IMP1(IGetProp)
-  INTERFACE_IGetProp(;)
 };
 
-STDMETHODIMP CGetProp::GetProp(PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CGetProp::GetProp(PROPID propID, PROPVARIANT *value))
 {
   if (propID == kpidName)
   {
     COM_TRY_BEGIN
-    NCOM::CPropVariant prop = Name;
+    NCOM::CPropVariant prop;
+    prop = Name;
     prop.Detach(value);
     return S_OK;
     COM_TRY_END
@@ -612,7 +724,7 @@ static HRESULT CopyStream(
   FString destPath = destPathSpec;
   if (CompareFileNames(destPath, srcPath) == 0)
   {
-    RINOK(SendMessageError(callback, "Cannot copy file onto itself", destPath));
+    RINOK(SendMessageError(callback, "Cannot copy file onto itself", destPath))
     return E_ABORT;
   }
 
@@ -624,13 +736,13 @@ static HRESULT CopyStream(
       &srcFileInfo.MTime, &srcAltStream.Size,
       fs2us(destPath),
       &destPathResult,
-      &writeAskResult));
+      &writeAskResult))
 
   if (IntToBool(writeAskResult))
   {
-    RINOK(callback->SetCurrentFilePath(fs2us(srcPath)));
+    RINOK(callback->SetCurrentFilePath(fs2us(srcPath)))
     FString destPathNew (us2fs((LPCOLESTR)destPathResult));
-    RINOK(state.MyCopyFile(srcPath, destPathNew));
+    RINOK(state.MyCopyFile(srcPath, destPathNew))
     if (state.ErrorFileIndex >= 0)
     {
       if (state.ErrorMessage.IsEmpty())
@@ -640,7 +752,7 @@ static HRESULT CopyStream(
         errorName = srcPath;
       else
         errorName = destPathNew;
-      RINOK(SendMessageError(callback, state.ErrorMessage, errorName));
+      RINOK(SendMessageError(callback, state.ErrorMessage, errorName))
       return E_ABORT;
     }
     state.StartPos += state.CurrentSize;
@@ -650,22 +762,23 @@ static HRESULT CopyStream(
     if (state.TotalSize >= srcAltStream.Size)
     {
       state.TotalSize -= srcAltStream.Size;
-      RINOK(state.Progress->SetTotal(state.TotalSize));
+      RINOK(state.Progress->SetTotal(state.TotalSize))
     }
   }
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems,
+Z7_COM7F_IMF(CAltStreamsFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems,
     Int32 /* includeAltStreams */, Int32 /* replaceAltStreamColon */,
-    const wchar_t *path, IFolderOperationsExtractCallback *callback)
+    const wchar_t *path, IFolderOperationsExtractCallback *callback))
 {
   if (numItems == 0)
     return S_OK;
 
   /*
-  CMyComPtr<IFolderExtractToStreamCallback> ExtractToStreamCallback;
-  RINOK(callback->QueryInterface(IID_IFolderExtractToStreamCallback, (void **)&ExtractToStreamCallback));
+  Z7_DECL_CMyComPtr_QI_FROM(
+      IFolderExtractToStreamCallback,
+      ExtractToStreamCallback, callback)
   if (ExtractToStreamCallback)
   {
     Int32 useStreams = 0;
@@ -683,8 +796,8 @@ STDMETHODIMP CAltStreamsFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UI
     {
       totalSize += Streams[indices[i]].Size;
     }
-    RINOK(callback->SetTotal(totalSize));
-    RINOK(callback->SetNumFiles(numItems));
+    RINOK(callback->SetTotal(totalSize))
+    RINOK(callback->SetNumFiles(numItems))
   }
 
   /*
@@ -716,8 +829,8 @@ STDMETHODIMP CAltStreamsFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UI
   if (destPath.IsEmpty() /* && !ExtractToStreamCallback */)
     return E_INVALIDARG;
 
-  bool isAltDest = NName::IsAltPathPrefix(destPath);
-  bool isDirectPath = (!isAltDest && !IsPathSepar(destPath.Back()));
+  const bool isAltDest = NName::IsAltPathPrefix(destPath);
+  const bool isDirectPath = (!isAltDest && !IsPathSepar(destPath.Back()));
 
   if (isDirectPath)
   {
@@ -727,7 +840,7 @@ STDMETHODIMP CAltStreamsFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UI
 
   CFileInfo fi;
   if (!fi.Find(_pathBaseFile))
-    return GetLastError();
+    return GetLastError_noZero_HRESULT();
 
   NFsFolder::CCopyStateIO state;
   state.Progress = callback;
@@ -736,21 +849,21 @@ STDMETHODIMP CAltStreamsFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UI
 
   for (UInt32 i = 0; i < numItems; i++)
   {
-    UInt32 index = indices[i];
+    const UInt32 index = indices[i];
     const CAltStream &ss = Streams[index];
     FString destPath2 = destPath;
     if (!isDirectPath)
       destPath2 += us2fs(Get_Correct_FsFile_Name(ss.Name));
     FString srcPath;
     GetFullPath(ss, srcPath);
-    RINOK(CopyStream(state, srcPath, fi, ss, destPath2, callback));
+    RINOK(CopyStream(state, srcPath, fi, ss, destPath2, callback))
   }
 
   return S_OK;
 }
 
-STDMETHODIMP CAltStreamsFolder::CopyFrom(Int32 /* moveMode */, const wchar_t * /* fromFolderPath */,
-    const wchar_t * const * /* itemsPaths */, UInt32 /* numItems */, IProgress * /* progress */)
+Z7_COM7F_IMF(CAltStreamsFolder::CopyFrom(Int32 /* moveMode */, const wchar_t * /* fromFolderPath */,
+    const wchar_t * const * /* itemsPaths */, UInt32 /* numItems */, IProgress * /* progress */))
 {
   /*
   if (numItems == 0)
@@ -831,7 +944,7 @@ STDMETHODIMP CAltStreamsFolder::CopyFrom(Int32 /* moveMode */, const wchar_t * /
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CAltStreamsFolder::CopyFromFile(UInt32 /* index */, const wchar_t * /* fullFilePath */, IProgress * /* progress */)
+Z7_COM7F_IMF(CAltStreamsFolder::CopyFromFile(UInt32 /* index */, const wchar_t * /* fullFilePath */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
diff --git a/CPP/7zip/UI/FileManager/AltStreamsFolder.h b/CPP/7zip/UI/FileManager/AltStreamsFolder.h
index ccd0a58..ccb6d6f 100644
--- a/CPP/7zip/UI/FileManager/AltStreamsFolder.h
+++ b/CPP/7zip/UI/FileManager/AltStreamsFolder.h
@@ -1,7 +1,7 @@
 // AltStreamsFolder.h
 
-#ifndef __ALT_STREAMS_FOLDER_H
-#define __ALT_STREAMS_FOLDER_H
+#ifndef ZIP7_INC_ALT_STREAMS_FOLDER_H
+#define ZIP7_INC_ALT_STREAMS_FOLDER_H
 
 #include "../../../Common/MyCom.h"
 
@@ -24,12 +24,12 @@ struct CAltStream
 };
 
 
-class CAltStreamsFolder:
+class CAltStreamsFolder Z7_final:
   public IFolderFolder,
   public IFolderCompare,
-  #ifdef USE_UNICODE_FSTRING
+ #ifdef USE_UNICODE_FSTRING
   public IFolderGetItemName,
-  #endif
+ #endif
   public IFolderWasChanged,
   public IFolderOperations,
   // public IFolderOperationsDeleteToRecycleBin,
@@ -37,35 +37,29 @@ class CAltStreamsFolder:
   public IFolderGetSystemIconIndex,
   public CMyUnknownImp
 {
-public:
-  MY_QUERYINTERFACE_BEGIN2(IFolderFolder)
-    MY_QUERYINTERFACE_ENTRY(IFolderCompare)
+  Z7_COM_QI_BEGIN2(IFolderFolder)
+    Z7_COM_QI_ENTRY(IFolderCompare)
     #ifdef USE_UNICODE_FSTRING
-    MY_QUERYINTERFACE_ENTRY(IFolderGetItemName)
+    Z7_COM_QI_ENTRY(IFolderGetItemName)
     #endif
-    MY_QUERYINTERFACE_ENTRY(IFolderWasChanged)
-    // MY_QUERYINTERFACE_ENTRY(IFolderOperationsDeleteToRecycleBin)
-    MY_QUERYINTERFACE_ENTRY(IFolderOperations)
-    MY_QUERYINTERFACE_ENTRY(IFolderClone)
-    MY_QUERYINTERFACE_ENTRY(IFolderGetSystemIconIndex)
-  MY_QUERYINTERFACE_END
-  MY_ADDREF_RELEASE
-
-
-  INTERFACE_FolderFolder(;)
-  INTERFACE_FolderOperations(;)
-
-  STDMETHOD_(Int32, CompareItems)(UInt32 index1, UInt32 index2, PROPID propID, Int32 propIsRaw);
+    Z7_COM_QI_ENTRY(IFolderWasChanged)
+    // Z7_COM_QI_ENTRY(IFolderOperationsDeleteToRecycleBin)
+    Z7_COM_QI_ENTRY(IFolderOperations)
+    Z7_COM_QI_ENTRY(IFolderClone)
+    Z7_COM_QI_ENTRY(IFolderGetSystemIconIndex)
+  Z7_COM_QI_END
+  Z7_COM_ADDREF_RELEASE
+
+  Z7_IFACE_COM7_IMP(IFolderFolder)
+  Z7_IFACE_COM7_IMP(IFolderCompare)
+ #ifdef USE_UNICODE_FSTRING
+  Z7_IFACE_COM7_IMP(IFolderGetItemName)
+ #endif
+  Z7_IFACE_COM7_IMP(IFolderWasChanged)
+  Z7_IFACE_COM7_IMP(IFolderOperations)
+  Z7_IFACE_COM7_IMP(IFolderClone)
+  Z7_IFACE_COM7_IMP(IFolderGetSystemIconIndex)
 
-  #ifdef USE_UNICODE_FSTRING
-  INTERFACE_IFolderGetItemName(;)
-  #endif
-  STDMETHOD(WasChanged)(Int32 *wasChanged);
-  STDMETHOD(Clone)(IFolderFolder **resultFolder);
-
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
-
-private:
   FString _pathBaseFile;  // folder
   FString _pathPrefix;    // folder:
   
@@ -81,8 +75,6 @@ public:
   // path must be with ':' at tail
   HRESULT Init(const FString &path /* , IFolderFolder *parentFolder */);
 
-  CAltStreamsFolder() {}
-
   void GetFullPath(const CAltStream &item, FString &path) const
   {
     path = _pathPrefix;
diff --git a/CPP/7zip/UI/FileManager/App.cpp b/CPP/7zip/UI/FileManager/App.cpp
index 512acc5..3461c92 100644
--- a/CPP/7zip/UI/FileManager/App.cpp
+++ b/CPP/7zip/UI/FileManager/App.cpp
@@ -49,7 +49,7 @@ void CPanelCallbackImp::OnTab()
 
 void CPanelCallbackImp::SetFocusToPath(unsigned index)
 {
-  int newPanelIndex = index;
+  unsigned newPanelIndex = index;
   if (g_App.NumPanels == 1)
     newPanelIndex = g_App.LastFocusedPanel;
   _app->RefreshTitle();
@@ -66,7 +66,7 @@ void CPanelCallbackImp::DragBegin() { _app->DragBegin(_index); }
 void CPanelCallbackImp::DragEnd() { _app->DragEnd(); }
 void CPanelCallbackImp::RefreshTitle(bool always) { _app->RefreshTitlePanel(_index, always); }
 
-void CApp::ReloadLang()
+void CApp::ReloadLangItems()
 {
   LangString(IDS_N_SELECTED_ITEMS, LangString_N_SELECTED_ITEMS);
 }
@@ -101,11 +101,11 @@ void CApp::SetListSettings()
     panel._showRealFileIcons = st.ShowRealFileIcons;
     panel._exStyle = extendedStyle;
 
-    DWORD style = (DWORD)panel._listView.GetStyle();
+    LONG_PTR style = panel._listView.GetStyle();
     if (st.AlternativeSelection)
       style |= LVS_SINGLESEL;
     else
-      style &= ~LVS_SINGLESEL;
+      style &= ~(LONG_PTR)(DWORD)LVS_SINGLESEL;
     panel._listView.SetStyle(style);
     panel.SetExtendedStyle();
   }
@@ -115,7 +115,7 @@ void CApp::SetListSettings()
 #define ILC_COLOR32 0x0020
 #endif
 
-HRESULT CApp::CreateOnePanel(int panelIndex, const UString &mainPath, const UString &arcFormat,
+HRESULT CApp::CreateOnePanel(unsigned panelIndex, const UString &mainPath, const UString &arcFormat,
     bool needOpenArc,
     COpenResult &openRes)
 {
@@ -133,7 +133,7 @@ HRESULT CApp::CreateOnePanel(int panelIndex, const UString &mainPath, const UStr
   else
     path = mainPath;
   
-  int id = 1000 + 100 * panelIndex;
+  const unsigned id = 1000 + 100 * panelIndex; // check it
 
   return Panels[panelIndex].Create(_window, _window,
       id, path, arcFormat, &m_PanelCallbackImp[panelIndex], &AppState,
@@ -214,9 +214,9 @@ static bool SetButtonText(int commandID, const CButtonInfo *buttons, unsigned nu
 
 static void SetButtonText(int commandID, UString &s)
 {
-  if (SetButtonText(commandID, g_StandardButtons, ARRAY_SIZE(g_StandardButtons), s))
+  if (SetButtonText(commandID, g_StandardButtons, Z7_ARRAY_SIZE(g_StandardButtons), s))
     return;
-  SetButtonText(commandID, g_ArchiveButtons, ARRAY_SIZE(g_ArchiveButtons), s);
+  SetButtonText(commandID, g_ArchiveButtons, Z7_ARRAY_SIZE(g_ArchiveButtons), s);
 }
 
 static void AddButton(
@@ -241,7 +241,7 @@ static void AddButton(
       large ?
       MAKEINTRESOURCE(butInfo.BitmapResID):
       MAKEINTRESOURCE(butInfo.Bitmap2ResID));
-  if (b != 0)
+  if (b)
   {
     imageList.AddMasked(b, RGB(255, 0, 255));
     ::DeleteObject(b);
@@ -264,10 +264,10 @@ void CApp::ReloadToolbars()
     CreateToolbar(_window, _buttonsImageList, _toolBar, LargeButtons);
     unsigned i;
     if (ShowArchiveToolbar)
-      for (i = 0; i < ARRAY_SIZE(g_ArchiveButtons); i++)
+      for (i = 0; i < Z7_ARRAY_SIZE(g_ArchiveButtons); i++)
         AddButton(_buttonsImageList, _toolBar, g_ArchiveButtons[i], ShowButtonsLables, LargeButtons);
     if (ShowStandardToolbar)
-      for (i = 0; i < ARRAY_SIZE(g_StandardButtons); i++)
+      for (i = 0; i < Z7_ARRAY_SIZE(g_StandardButtons); i++)
         AddButton(_buttonsImageList, _toolBar, g_StandardButtons[i], ShowButtonsLables, LargeButtons);
 
     _toolBar.AutoSize();
@@ -290,7 +290,7 @@ HRESULT CApp::Create(HWND hwnd, const UString &mainPath, const UString &arcForma
   _commandBar.Create(g_hInstance, hwnd, 1);
   #endif
 
-  MyLoadMenu();
+  MyLoadMenu(false);  // needResetMenu
   
   #ifdef UNDER_CE
   _commandBar.AutoSize();
@@ -317,7 +317,7 @@ HRESULT CApp::Create(HWND hwnd, const UString &mainPath, const UString &arcForma
   for (i = 0; i < kNumPanelsMax; i++)
   {
     CPanel &panel = Panels[i];
-    panel._ListViewMode = listMode.Panels[i];
+    panel._listViewMode = listMode.Panels[i];
     panel._xSize = xSizes[i];
     panel._flatModeForArc = ReadFlatView(i);
   }
@@ -342,7 +342,7 @@ HRESULT CApp::Create(HWND hwnd, const UString &mainPath, const UString &arcForma
       
       RINOK(CreateOnePanel(panelIndex, path, arcFormat,
           isMainPanel && needOpenArc,
-          *(isMainPanel ? &openRes : &openRes2)));
+          *(isMainPanel ? &openRes : &openRes2)))
       
       if (isMainPanel)
       {
@@ -366,7 +366,7 @@ HRESULT CApp::SwitchOnOffOnePanel()
     COpenResult openRes;
     RINOK(CreateOnePanel(1 - LastFocusedPanel, UString(), UString(),
         false, // needOpenArc
-        openRes));
+        openRes))
     Panels[1 - LastFocusedPanel].Enable(true);
     Panels[1 - LastFocusedPanel].Show(SW_SHOWNORMAL);
   }
@@ -479,7 +479,7 @@ void AddValuePair2(UString &s, UINT resourceID, UInt64 num, UInt64 size)
   s.Add_LF();
 }
 
-static void AddPropValueToSum(IFolderFolder *folder, int index, PROPID propID, UInt64 &sum)
+static void AddPropValueToSum(IFolderFolder *folder, UInt32 index, PROPID propID, UInt64 &sum)
 {
   if (sum == (UInt64)(Int64)-1)
     return;
@@ -501,7 +501,7 @@ UString CPanel::GetItemsInfoString(const CRecordVector<UInt32> &indices)
   unsigned i;
   for (i = 0; i < indices.Size(); i++)
   {
-    int index = indices[i];
+    const UInt32 index = indices[i];
     if (IsItem_Folder(index))
     {
       AddPropValueToSum(_folder, index, kpidSize, foldersSize);
@@ -528,7 +528,7 @@ UString CPanel::GetItemsInfoString(const CRecordVector<UInt32> &indices)
   {
     info.Add_LF();
     info += "  ";
-    int index = indices[i];
+    const UInt32 index = indices[i];
     info += GetItemRelPath(index);
     if (IsItem_Folder(index))
       info.Add_PathSepar();
@@ -557,9 +557,9 @@ static bool IsFsPath(const FString &path)
 }
 */
 
-void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
+void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
 {
-  unsigned destPanelIndex = (NumPanels <= 1) ? srcPanelIndex : (1 - srcPanelIndex);
+  const unsigned destPanelIndex = (NumPanels <= 1) ? srcPanelIndex : (1 - srcPanelIndex);
   CPanel &srcPanel = Panels[srcPanelIndex];
   CPanel &destPanel = Panels[destPanelIndex];
 
@@ -584,10 +584,10 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
   {
     if (copyToSame)
     {
-      int focusedItem = srcPanel._listView.GetFocusedItem();
+      const int focusedItem = srcPanel._listView.GetFocusedItem();
       if (focusedItem < 0)
         return;
-      int realIndex = srcPanel.GetRealItemIndex(focusedItem);
+      const unsigned realIndex = srcPanel.GetRealItemIndex(focusedItem);
       if (realIndex == kParentIndex)
         return;
       indices.Add(realIndex);
@@ -595,7 +595,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
     }
     else
     {
-      srcPanel.GetOperatedIndicesSmart(indices);
+      srcPanel.Get_ItemIndices_OperSmart(indices);
       if (indices.Size() == 0)
         return;
       destPath = destPanel.GetFsPath();
@@ -607,7 +607,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
   UStringVector copyFolders;
   ReadCopyHistory(copyFolders);
   
-  bool useFullItemPaths = srcPanel.Is_IO_FS_Folder(); // maybe we need flat also here ??
+  const bool useFullItemPaths = srcPanel.Is_IO_FS_Folder(); // maybe we need flat also here ??
 
   {
     CCopyDialog copyDialog;
@@ -722,7 +722,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
             UString prefix = destPath.Left(pos + 1);
             if (!CreateComplexDir(us2fs(prefix)))
             {
-              DWORD lastError = ::GetLastError();
+              const HRESULT lastError = GetLastError_noZero_HRESULT();
               srcPanel.MessageBox_Error_2Lines_Message_HRESULT(prefix, lastError);
               return;
             }
@@ -734,7 +734,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
           NName::NormalizeDirPathPrefix(destPath);
           if (!CreateComplexDir(us2fs(destPath)))
           {
-            DWORD lastError = ::GetLastError();
+            const HRESULT lastError = GetLastError_noZero_HRESULT();
             srcPanel.MessageBox_Error_2Lines_Message_HRESULT(destPath, lastError);
             return;
           }
@@ -815,7 +815,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
       filePaths.AddInReserved(s);
     }
     
-    result = destPanel.CopyFrom(move, folderPrefix, filePaths, true, 0);
+    result = destPanel.CopyFrom(move, folderPrefix, filePaths, true, NULL);
   }
   
   if (result != S_OK)
@@ -849,7 +849,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
   srcPanel.SetFocusToList();
 }
 
-void CApp::OnSetSameFolder(int srcPanelIndex)
+void CApp::OnSetSameFolder(unsigned srcPanelIndex)
 {
   if (NumPanels <= 1)
     return;
@@ -858,17 +858,17 @@ void CApp::OnSetSameFolder(int srcPanelIndex)
   destPanel.BindToPathAndRefresh(srcPanel._currentFolderPrefix);
 }
 
-void CApp::OnSetSubFolder(int srcPanelIndex)
+void CApp::OnSetSubFolder(unsigned srcPanelIndex)
 {
   if (NumPanels <= 1)
     return;
   const CPanel &srcPanel = Panels[srcPanelIndex];
   CPanel &destPanel = Panels[1 - srcPanelIndex];
 
-  int focusedItem = srcPanel._listView.GetFocusedItem();
+  const int focusedItem = srcPanel._listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int realIndex = srcPanel.GetRealItemIndex(focusedItem);
+  const unsigned realIndex = srcPanel.GetRealItemIndex(focusedItem);
   if (!srcPanel.IsItem_Folder(realIndex))
     return;
 
@@ -933,7 +933,7 @@ void CApp::OnNotify(int /* ctrlID */, LPNMHDR pnmh)
     if (pnmh->code == TTN_GETDISPINFO)
     {
       LPNMTTDISPINFO info = (LPNMTTDISPINFO)pnmh;
-      info->hinst = 0;
+      info->hinst = NULL;
       g_ToolTipBuffer.Empty();
       SetButtonText((int)info->hdr.idFrom, g_ToolTipBuffer);
       g_ToolTipBufferSys = GetSystemString(g_ToolTipBuffer);
@@ -944,7 +944,7 @@ void CApp::OnNotify(int /* ctrlID */, LPNMHDR pnmh)
     if (pnmh->code == TTN_GETDISPINFOW)
     {
       LPNMTTDISPINFOW info = (LPNMTTDISPINFOW)pnmh;
-      info->hinst = 0;
+      info->hinst = NULL;
       g_ToolTipBuffer.Empty();
       SetButtonText((int)info->hdr.idFrom, g_ToolTipBuffer);
       info->lpszText = g_ToolTipBuffer.Ptr_non_const();
diff --git a/CPP/7zip/UI/FileManager/App.h b/CPP/7zip/UI/FileManager/App.h
index 3c3c5ef..fc54501 100644
--- a/CPP/7zip/UI/FileManager/App.h
+++ b/CPP/7zip/UI/FileManager/App.h
@@ -1,7 +1,7 @@
 // App.h
 
-#ifndef __APP_H
-#define __APP_H
+#ifndef ZIP7_INC_APP_H
+#define ZIP7_INC_APP_H
 
 #include "../../../Windows/Control/CommandBar.h"
 #include "../../../Windows/Control/ImageList.h"
@@ -30,7 +30,7 @@ enum
   kMenuCmdID_Toolbar_End
 };
 
-class CPanelCallbackImp: public CPanelCallback
+class CPanelCallbackImp Z7_final: public CPanelCallback
 {
   CApp *_app;
   unsigned _index;
@@ -40,79 +40,26 @@ public:
     _app = app;
     _index = index;
   }
-  virtual void OnTab();
-  virtual void SetFocusToPath(unsigned index);
-  virtual void OnCopy(bool move, bool copyToSame);
-  virtual void OnSetSameFolder();
-  virtual void OnSetSubFolder();
-  virtual void PanelWasFocused();
-  virtual void DragBegin();
-  virtual void DragEnd();
-  virtual void RefreshTitle(bool always);
+  virtual void OnTab() Z7_override;
+  virtual void SetFocusToPath(unsigned index) Z7_override;
+  virtual void OnCopy(bool move, bool copyToSame) Z7_override;
+  virtual void OnSetSameFolder() Z7_override;
+  virtual void OnSetSubFolder() Z7_override;
+  virtual void PanelWasFocused() Z7_override;
+  virtual void DragBegin() Z7_override;
+  virtual void DragEnd() Z7_override;
+  virtual void RefreshTitle(bool always) Z7_override;
 };
 
-class CApp;
-
-class CDropTarget:
-  public IDropTarget,
-  public CMyUnknownImp
-{
-  CMyComPtr<IDataObject> m_DataObject;
-  UStringVector m_SourcePaths;
-  int m_SelectionIndex;
-  bool m_DropIsAllowed;      // = true, if data contain fillist
-  bool m_PanelDropIsAllowed; // = false, if current target_panel is source_panel.
-                             // check it only if m_DropIsAllowed == true
-  int m_SubFolderIndex;
-  UString m_SubFolderName;
-
-  CPanel *m_Panel;
-  bool m_IsAppTarget;        // true, if we want to drop to app window (not to panel).
-
-  bool m_SetPathIsOK;
-
-  bool IsItSameDrive() const;
-
-  void QueryGetData(IDataObject *dataObject);
-  bool IsFsFolderPath() const;
-  DWORD GetEffect(DWORD keyState, POINTL pt, DWORD allowedEffect);
-  void RemoveSelection();
-  void PositionCursor(POINTL ptl);
-  UString GetTargetPath() const;
-  bool SetPath(bool enablePath) const;
-  bool SetPath();
-
-public:
-  MY_UNKNOWN_IMP1_MT(IDropTarget)
-  STDMETHOD(DragEnter)(IDataObject * dataObject, DWORD keyState, POINTL pt, DWORD *effect);
-  STDMETHOD(DragOver)(DWORD keyState, POINTL pt, DWORD * effect);
-  STDMETHOD(DragLeave)();
-  STDMETHOD(Drop)(IDataObject * dataObject, DWORD keyState, POINTL pt, DWORD *effect);
-
-  CDropTarget():
-      m_SelectionIndex(-1),
-      m_DropIsAllowed(false),
-      m_PanelDropIsAllowed(false),
-      m_SubFolderIndex(-1),
-      m_Panel(NULL),
-      m_IsAppTarget(false),
-      m_SetPathIsOK(false),
-      App(NULL),
-      SrcPanelIndex(-1),
-      TargetPanelIndex(-1)
-      {}
-
-  CApp *App;
-  int SrcPanelIndex;              // index of D&D source_panel
-  int TargetPanelIndex;           // what panel to use as target_panel of Application
-};
 
+class CDropTarget;
 
 class CApp
 {
 public:
   NWindows::CWindow _window;
   bool ShowSystemMenu;
+  bool AutoRefresh_Mode;
   // bool ShowDeletedFiles;
   unsigned NumPanels;
   unsigned LastFocusedPanel;
@@ -138,45 +85,27 @@ public:
 
   UString LangString_N_SELECTED_ITEMS;
   
-  void ReloadLang();
+  void ReloadLangItems();
 
-  CApp(): _window(0), NumPanels(2), LastFocusedPanel(0),
-    AutoRefresh_Mode(true)
+  CApp():
+    _window(NULL),
+    AutoRefresh_Mode(true),
+    NumPanels(2),
+    LastFocusedPanel(0)
   {
     SetPanels_AutoRefresh_Mode();
   }
 
-  void CreateDragTarget()
-  {
-    _dropTargetSpec = new CDropTarget();
-    _dropTarget = _dropTargetSpec;
-    _dropTargetSpec->App = (this);
-  }
-
-  void SetFocusedPanel(unsigned index)
-  {
-    LastFocusedPanel = index;
-    _dropTargetSpec->TargetPanelIndex = LastFocusedPanel;
-  }
-
-  void DragBegin(unsigned panelIndex)
-  {
-    _dropTargetSpec->TargetPanelIndex = (NumPanels > 1) ? 1 - panelIndex : panelIndex;
-    _dropTargetSpec->SrcPanelIndex = panelIndex;
-  }
-
-  void DragEnd()
-  {
-    _dropTargetSpec->TargetPanelIndex = LastFocusedPanel;
-    _dropTargetSpec->SrcPanelIndex = -1;
-  }
-
+  void CreateDragTarget();
+  void SetFocusedPanel(unsigned index);
+  void DragBegin(unsigned panelIndex);
+  void DragEnd();
   
-  void OnCopy(bool move, bool copyToSame, int srcPanelIndex);
-  void OnSetSameFolder(int srcPanelIndex);
-  void OnSetSubFolder(int srcPanelIndex);
+  void OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex);
+  void OnSetSameFolder(unsigned srcPanelIndex);
+  void OnSetSubFolder(unsigned srcPanelIndex);
 
-  HRESULT CreateOnePanel(int panelIndex, const UString &mainPath, const UString &arcFormat, bool needOpenArc, COpenResult &openRes);
+  HRESULT CreateOnePanel(unsigned panelIndex, const UString &mainPath, const UString &arcFormat, bool needOpenArc, COpenResult &openRes);
   HRESULT Create(HWND hwnd, const UString &mainPath, const UString &arcFormat, int xSizes[2], bool needOpenArc, COpenResult &openRes);
   void Read();
   void Save();
@@ -290,7 +219,6 @@ public:
   // void Change_ShowNtfsStrems_Mode() { Panels[LastFocusedPanel].Change_ShowNtfsStrems_Mode(); }
   // void Change_ShowDeleted() { ShowDeletedFiles = !ShowDeletedFiles; }
 
-  bool AutoRefresh_Mode;
   bool Get_AutoRefresh_Mode()
   {
     // return Panels[LastFocusedPanel].Get_ShowNtfsStrems_Mode();
@@ -307,13 +235,13 @@ public:
       Panels[i].Set_AutoRefresh_Mode(AutoRefresh_Mode);
   }
 
-  void OpenBookmark(int index) { GetFocusedPanel().OpenBookmark(index); }
-  void SetBookmark(int index) { GetFocusedPanel().SetBookmark(index); }
+  void OpenBookmark(unsigned index) { GetFocusedPanel().OpenBookmark(index); }
+  void SetBookmark(unsigned index) { GetFocusedPanel().SetBookmark(index); }
 
   void ReloadToolbars();
   void ReadToolbar()
   {
-    UInt32 mask = ReadToolbarsMask();
+    const UInt32 mask = ReadToolbarsMask();
     if (mask & ((UInt32)1 << 31))
     {
       ShowButtonsLables = !g_IsSmallScreen;
diff --git a/CPP/7zip/UI/FileManager/AppState.h b/CPP/7zip/UI/FileManager/AppState.h
index cc88715..6630b96 100644
--- a/CPP/7zip/UI/FileManager/AppState.h
+++ b/CPP/7zip/UI/FileManager/AppState.h
@@ -1,7 +1,7 @@
 // AppState.h
 
-#ifndef __APP_STATE_H
-#define __APP_STATE_H
+#ifndef ZIP7_INC_APP_STATE_H
+#define ZIP7_INC_APP_STATE_H
 
 #include "../../../Windows/Synchronization.h"
 
diff --git a/CPP/7zip/UI/FileManager/BrowseDialog.cpp b/CPP/7zip/UI/FileManager/BrowseDialog.cpp
index 6d2b6b5..5170302 100644
--- a/CPP/7zip/UI/FileManager/BrowseDialog.cpp
+++ b/CPP/7zip/UI/FileManager/BrowseDialog.cpp
@@ -4,7 +4,7 @@
 
 #include "../../../Common/MyWindows.h"
 
-#include <CommCtrl.h>
+#include "../../../Common/IntToString.h"
 
 #ifndef UNDER_CE
 #include "../../../Windows/CommonDialog.h"
@@ -25,7 +25,6 @@
 #ifdef USE_MY_BROWSE_DIALOG
 
 #include "../../../Common/Defs.h"
-#include "../../../Common/IntToString.h"
 #include "../../../Common/Wildcard.h"
 
 #include "../../../Windows/FileDir.h"
@@ -40,11 +39,11 @@
 #include "PropertyNameRes.h"
 #include "SysIconUtils.h"
 
-#ifndef _SFX
+#ifndef Z7_SFX
 #include "RegistryUtils.h"
 #endif
 
-#endif
+#endif // USE_MY_BROWSE_DIALOG
 
 #include "ComboDialog.h"
 #include "LangUtils.h"
@@ -56,6 +55,11 @@ using namespace NFile;
 using namespace NName;
 using namespace NFind;
 
+static void MessageBox_Error_Global(HWND wnd, const wchar_t *message)
+{
+  ::MessageBoxW(wnd, message, L"7-Zip", MB_ICONERROR);
+}
+
 #ifdef USE_MY_BROWSE_DIALOG
 
 extern bool g_LVN_ITEMACTIVATE_Support;
@@ -63,19 +67,8 @@ extern bool g_LVN_ITEMACTIVATE_Support;
 static const int kParentIndex = -1;
 static const UINT k_Message_RefreshPathEdit = WM_APP + 1;
 
-static HRESULT GetNormalizedError()
-{
-  DWORD errorCode = GetLastError();
-  return errorCode == 0 ? E_FAIL : errorCode;
-}
-
 extern UString HResultToMessage(HRESULT errorCode);
 
-static void MessageBox_Error_Global(HWND wnd, const wchar_t *message)
-{
-  ::MessageBoxW(wnd, message, L"7-Zip", MB_ICONERROR);
-}
-
 static void MessageBox_HResError(HWND wnd, HRESULT errorCode, const wchar_t *name)
 {
   UString s = HResultToMessage(errorCode);
@@ -98,17 +91,21 @@ class CBrowseDialog: public NControl::CModalDialog
   CExtToIconMap _extToIconMap;
   int _sortIndex;
   bool _ascending;
+ #ifndef Z7_SFX
   bool _showDots;
+ #endif
   UString _topDirPrefix; // we don't open parent of that folder
   UString DirPrefix;
 
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
-  virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
-  virtual bool OnNotify(UINT controlID, LPNMHDR header);
-  virtual bool OnKeyDown(LPNMLVKEYDOWN keyDownInfo);
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
-  virtual void OnOK();
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
+  virtual bool OnNotify(UINT controlID, LPNMHDR header) Z7_override;
+  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM lParam) Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  virtual void OnOK() Z7_override;
+
+  bool OnKeyDown(LPNMLVKEYDOWN keyDownInfo);
 
   void Post_RefreshPathEdit() { PostMsg(k_Message_RefreshPathEdit); }
 
@@ -126,59 +123,37 @@ class CBrowseDialog: public NControl::CModalDialog
   int GetRealItemIndex(int indexInListView) const
   {
     LPARAM param;
-    if (!_list.GetItemParam(indexInListView, param))
+    if (!_list.GetItemParam((unsigned)indexInListView, param))
       return (int)-1;
     return (int)param;
   }
 
 public:
+
+  bool SaveMode;
   bool FolderMode;
+  int FilterIndex;  // [in / out]
+  CObjectVector<CBrowseFilterInfo> Filters;
+
+  UString FilePath;   // [in / out]
   UString Title;
-  UString FilePath;  // input/ result path
-  bool ShowAllFiles;
-  UStringVector Filters;
-  UString FilterDescription;
-
-  CBrowseDialog(): _showDots(false), FolderMode(false), ShowAllFiles(true) {}
-  void SetFilter(const UString &s);
-  INT_PTR Create(HWND parent = 0) { return CModalDialog::Create(IDD_BROWSE, parent); }
-  int CompareItems(LPARAM lParam1, LPARAM lParam2);
+
+  CBrowseDialog():
+   #ifndef Z7_SFX
+      _showDots(false),
+   #endif
+      SaveMode(false)
+      , FolderMode(false)
+      , FilterIndex(-1)
+    {}
+  INT_PTR Create(HWND parent = NULL) { return CModalDialog::Create(IDD_BROWSE, parent); }
+  int CompareItems(LPARAM lParam1, LPARAM lParam2) const;
 };
 
-void CBrowseDialog::SetFilter(const UString &s)
-{
-  Filters.Clear();
-  UString mask;
-  unsigned i;
-  for (i = 0; i < s.Len(); i++)
-  {
-    wchar_t c = s[i];
-    if (c == ';')
-    {
-      if (!mask.IsEmpty())
-        Filters.Add(mask);
-      mask.Empty();
-    }
-    else
-      mask += c;
-  }
-  if (!mask.IsEmpty())
-    Filters.Add(mask);
-  ShowAllFiles = Filters.IsEmpty();
-  for (i = 0; i < Filters.Size(); i++)
-  {
-    const UString &f = Filters[i];
-    if (f == L"*.*" || f == L"*")
-    {
-      ShowAllFiles = true;
-      break;
-    }
-  }
-}
 
 bool CBrowseDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
   if (!Title.IsEmpty())
@@ -187,16 +162,11 @@ bool CBrowseDialog::OnInit()
   _filterCombo.Attach(GetItem(IDC_BROWSE_FILTER));
   _pathEdit.Attach(GetItem(IDE_BROWSE_PATH));
 
-  if (FolderMode)
-    HideItem(IDC_BROWSE_FILTER);
-  else
-    EnableItem(IDC_BROWSE_FILTER, false);
-
   #ifndef UNDER_CE
   _list.SetUnicodeFormat();
   #endif
 
-  #ifndef _SFX
+  #ifndef Z7_SFX
   CFmSettings st;
   st.Load();
   if (st.SingleClick)
@@ -205,22 +175,34 @@ bool CBrowseDialog::OnInit()
   #endif
 
   {
-    UString s;
-    if (!FilterDescription.IsEmpty())
-      s = FilterDescription;
-    else if (ShowAllFiles)
-      s = "*.*";
-    else
+    /*
+    Filters.Clear(); // for debug
+    if (Filters.IsEmpty() && !FolderMode)
     {
-      FOR_VECTOR (i, Filters)
-      {
-        if (i != 0)
-          s.Add_Space();
-        s += Filters[i];
-      }
+      CBrowseFilterInfo &f = Filters.AddNew();
+      const UString mask("*.*");
+      f.Masks.Add(mask);
+      // f.Description = "(";
+      f.Description += mask;
+      // f.Description += ")";
+    }
+    */
+
+    FOR_VECTOR (i, Filters)
+    {
+      _filterCombo.AddString(Filters[i].Description);
+    }
+
+    if (Filters.Size() <= 1)
+    {
+      if (FolderMode)
+        HideItem(IDC_BROWSE_FILTER);
+      else
+        EnableItem(IDC_BROWSE_FILTER, false);
     }
-    _filterCombo.AddString(s);
-    _filterCombo.SetCurSel(0);
+    
+    if (/* FilterIndex >= 0 && */ (unsigned)FilterIndex < Filters.Size())
+      _filterCombo.SetCurSel(FilterIndex);
   }
 
   _list.SetImageList(GetSysImageList(true), LVSIL_SMALL);
@@ -261,7 +243,7 @@ bool CBrowseDialog::OnInit()
 
   _topDirPrefix.Empty();
   {
-    int rootSize = GetRootPrefixSize(FilePath);
+    unsigned rootSize = GetRootPrefixSize(FilePath);
     #if defined(_WIN32) && !defined(UNDER_CE)
     // We can go up from root folder to drives list
     if (IsDrivePath(FilePath))
@@ -301,7 +283,7 @@ bool CBrowseDialog::OnInit()
   #ifndef UNDER_CE
   /* If we clear UISF_HIDEFOCUS, the focus rectangle in ListView will be visible,
      even if we use mouse for pressing the button to open this dialog. */
-  PostMsg(MY__WM_UPDATEUISTATE, MAKEWPARAM(MY__UIS_CLEAR, MY__UISF_HIDEFOCUS));
+  PostMsg(Z7_WIN_WM_UPDATEUISTATE, MAKEWPARAM(Z7_WIN_UIS_CLEAR, Z7_WIN_UISF_HIDEFOCUS));
   #endif
 
   return CModalDialog::OnInit();
@@ -368,6 +350,24 @@ bool CBrowseDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   return CModalDialog::OnMessage(message, wParam, lParam);
 }
 
+
+bool CBrowseDialog::OnCommand(unsigned code, unsigned itemID, LPARAM lParam)
+{
+  if (code == CBN_SELCHANGE)
+  {
+    switch (itemID)
+    {
+      case IDC_BROWSE_FILTER:
+      {
+        Reload();
+        return true;
+      }
+    }
+  }
+  return CModalDialog::OnCommand(code, itemID, lParam);
+}
+
+
 bool CBrowseDialog::OnNotify(UINT /* controlID */, LPNMHDR header)
 {
   if (header->hwndFrom != _list)
@@ -385,7 +385,7 @@ bool CBrowseDialog::OnNotify(UINT /* controlID */, LPNMHDR header)
       break;
     case LVN_COLUMNCLICK:
     {
-      int index = LPNMLISTVIEW(header)->iSubItem;
+      const int index = LPNMLISTVIEW(header)->iSubItem;
       if (index == _sortIndex)
         _ascending = !_ascending;
       else
@@ -413,7 +413,7 @@ bool CBrowseDialog::OnNotify(UINT /* controlID */, LPNMHDR header)
 
 bool CBrowseDialog::OnKeyDown(LPNMLVKEYDOWN keyDownInfo)
 {
-  bool ctrl = IsKeyDown(VK_CONTROL);
+  const bool ctrl = IsKeyDown(VK_CONTROL);
 
   switch (keyDownInfo->wVKey)
   {
@@ -434,7 +434,8 @@ bool CBrowseDialog::OnKeyDown(LPNMLVKEYDOWN keyDownInfo)
   return false;
 }
 
-bool CBrowseDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+
+bool CBrowseDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -474,21 +475,21 @@ bool CBrowseDialog::GetParentPath(const UString &path, UString &parentPrefix, US
     return false;
   if (IS_PATH_SEPAR(s.Back()))
     return false;
-  int pos = s.ReverseFind_PathSepar();
-  parentPrefix.SetFrom(s, pos + 1);
-  name = s.Ptr((unsigned)(pos + 1));
+  const unsigned pos1 = (unsigned)(s.ReverseFind_PathSepar() + 1);
+  parentPrefix.SetFrom(s, pos1);
+  name = s.Ptr(pos1);
   return true;
 }
 
-int CBrowseDialog::CompareItems(LPARAM lParam1, LPARAM lParam2)
+int CBrowseDialog::CompareItems(LPARAM lParam1, LPARAM lParam2) const
 {
   if (lParam1 == kParentIndex) return -1;
   if (lParam2 == kParentIndex) return 1;
   const CFileInfo &f1 = _files[(int)lParam1];
   const CFileInfo &f2 = _files[(int)lParam2];
 
-  bool isDir1 = f1.IsDir();
-  bool isDir2 = f2.IsDir();
+  const bool isDir1 = f1.IsDir();
+  const bool isDir2 = f2.IsDir();
   if (isDir1 && !isDir2) return -1;
   if (isDir2 && !isDir1) return 1;
   
@@ -509,16 +510,16 @@ static int CALLBACK CompareItems2(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
 
 static void ConvertSizeToString(UInt64 v, wchar_t *s)
 {
-  Byte c = 0;
+  char c = 0;
        if (v >= ((UInt64)10000 << 20)) { v >>= 30; c = 'G'; }
   else if (v >= ((UInt64)10000 << 10)) { v >>= 20; c = 'M'; }
   else if (v >= ((UInt64)10000 <<  0)) { v >>= 10; c = 'K'; }
-  ConvertUInt64ToString(v, s);
+  s = ConvertUInt64ToString(v, s);
   if (c != 0)
   {
-    s += MyStringLen(s);
     *s++ = ' ';
-    *s++ = c;
+    *s++ = (wchar_t)c;
+    *s++ = 'B';
     *s++ = 0;
   }
 }
@@ -536,42 +537,57 @@ HRESULT CBrowseDialog::Reload(const UString &pathPrefix, const UString &selected
     isDrive = true;
     FStringVector drives;
     if (!MyGetLogicalDriveStrings(drives))
-      return GetNormalizedError();
+      return GetLastError_noZero_HRESULT();
     FOR_VECTOR (i, drives)
     {
-      FString d = drives[i];
-      if (d.Len() < 3 || d.Back() != '\\')
+      const FString &d = drives[i];
+      if (d.Len() < 2 || d.Back() != '\\')
         return E_FAIL;
-      d.DeleteBack();
       CFileInfo &fi = files.AddNew();
       fi.SetAsDir();
       fi.Name = d;
+      fi.Name.DeleteBack();
     }
   }
   else
   #endif
   {
+    const UStringVector *masks = NULL;
+    if (!Filters.IsEmpty() && _filterCombo.GetCount() > 0)
+    {
+      const int selected = _filterCombo.GetCurSel();
+            // GetItemData_of_CurSel(); // we don't use data field
+      if (/* selected >= 0 && */ (unsigned)selected < Filters.Size())
+      {
+        const UStringVector &m = Filters[selected].Masks;
+        if (m.Size() > 1 || (m.Size() == 1
+              && !m[0].IsEqualTo("*.*")
+              && !m[0].IsEqualTo("*")))
+          masks = &m;
+      }
+    }
     CEnumerator enumerator;
     enumerator.SetDirPrefix(us2fs(pathPrefix));
+    CFileInfo fi;
     for (;;)
     {
       bool found;
-      CFileInfo fi;
       if (!enumerator.Next(fi, found))
-        return GetNormalizedError();
+        return GetLastError_noZero_HRESULT();
       if (!found)
         break;
       if (!fi.IsDir())
       {
         if (FolderMode)
           continue;
-        if (!ShowAllFiles)
+        if (masks)
         {
           unsigned i;
-          for (i = 0; i < Filters.Size(); i++)
-            if (DoesWildcardMatchName(Filters[i], fs2us(fi.Name)))
+          const unsigned numMasks = masks->Size();
+          for (i = 0; i < numMasks; i++)
+            if (DoesWildcardMatchName((*masks)[i], fs2us(fi.Name)))
               break;
-          if (i == Filters.Size())
+          if (i == numMasks)
             continue;
         }
       }
@@ -590,19 +606,19 @@ HRESULT CBrowseDialog::Reload(const UString &pathPrefix, const UString &selected
 
   LVITEMW item;
 
-  int index = 0;
+  unsigned index = 0;
   int cursorIndex = -1;
 
-  #ifndef _SFX
+  #ifndef Z7_SFX
   if (_showDots && _topDirPrefix != DirPrefix)
   {
-    item.iItem = index;
+    item.iItem = (int)index;
     const UString itemName ("..");
     if (selectedName.IsEmpty())
-      cursorIndex = index;
+      cursorIndex = (int)index;
     item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
-    int subItem = 0;
-    item.iSubItem = subItem++;
+    unsigned subItem = 0;
+    item.iSubItem = (int)(subItem++);
     item.lParam = kParentIndex;
     item.pszText = itemName.Ptr_non_const();
     item.iImage = _extToIconMap.GetIconIndex(FILE_ATTRIBUTE_DIRECTORY, DirPrefix);
@@ -617,15 +633,15 @@ HRESULT CBrowseDialog::Reload(const UString &pathPrefix, const UString &selected
 
   for (unsigned i = 0; i < _files.Size(); i++, index++)
   {
-    item.iItem = index;
+    item.iItem = (int)index;
     const CFileInfo &fi = _files[i];
     const UString name = fs2us(fi.Name);
     if (!selectedName.IsEmpty() && CompareFileNames(name, selectedName) == 0)
-      cursorIndex = index;
+      cursorIndex = (int)index;
     item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
-    int subItem = 0;
-    item.iSubItem = subItem++;
-    item.lParam = i;
+    unsigned subItem = 0;
+    item.iSubItem = (int)(subItem++);
+    item.lParam = (LPARAM)i;
     item.pszText = name.Ptr_non_const();
 
     const UString fullPath = DirPrefix + name;
@@ -675,14 +691,14 @@ HRESULT CBrowseDialog::Reload(const UString &pathPrefix, const UString &selected
 HRESULT CBrowseDialog::Reload()
 {
   UString selected;
-  int index = _list.GetNextSelectedItem(-1);
+  const int index = _list.GetNextSelectedItem(-1);
   if (index >= 0)
   {
-    int fileIndex = GetRealItemIndex(index);
+    const int fileIndex = GetRealItemIndex(index);
     if (fileIndex != kParentIndex)
       selected = fs2us(_files[fileIndex].Name);
   }
-  UString dirPathTemp = DirPrefix;
+  const UString dirPathTemp = DirPrefix;
   return Reload(dirPathTemp, selected);
 }
 
@@ -698,14 +714,14 @@ void CBrowseDialog::OpenParentFolder()
 
 void CBrowseDialog::SetPathEditText()
 {
-  int index = _list.GetNextSelectedItem(-1);
+  const int index = _list.GetNextSelectedItem(-1);
   if (index < 0)
   {
     if (FolderMode)
       _pathEdit.SetText(DirPrefix);
     return;
   }
-  int fileIndex = GetRealItemIndex(index);
+  const int fileIndex = GetRealItemIndex(index);
   if (fileIndex == kParentIndex)
   {
     if (FolderMode)
@@ -745,7 +761,7 @@ void CBrowseDialog::OnCreateDir()
   {
     if (!NDir::CreateComplexDir(destPath))
     {
-      MessageBox_HResError((HWND)*this, GetNormalizedError(), fs2us(destPath));
+      MessageBox_HResError((HWND)*this, GetLastError_noZero_HRESULT(), fs2us(destPath));
     }
     else
     {
@@ -759,10 +775,10 @@ void CBrowseDialog::OnCreateDir()
 
 void CBrowseDialog::OnItemEnter()
 {
-  int index = _list.GetNextSelectedItem(-1);
+  const int index = _list.GetNextSelectedItem(-1);
   if (index < 0)
     return;
-  int fileIndex = GetRealItemIndex(index);
+  const int fileIndex = GetRealItemIndex(index);
   if (fileIndex == kParentIndex)
     OpenParentFolder();
   else
@@ -782,7 +798,7 @@ void CBrowseDialog::OnItemEnter()
     UString s = DirPrefix;
     s += fs2us(file.Name);
     s.Add_PathSepar();
-    HRESULT res = Reload(s, UString());
+    const HRESULT res = Reload(s, UString());
     if (res != S_OK)
       MessageBox_HResError(*this, res, s);
     SetPathEditText();
@@ -802,10 +818,13 @@ void CBrowseDialog::FinishOnOK()
   FilePath = fs2us(destPath);
   if (FolderMode)
     NormalizeDirPathPrefix(FilePath);
+  FilterIndex = _filterCombo.GetCurSel();
   End(IDOK);
 }
 
-#endif
+#endif // USE_MY_BROWSE_DIALOG
+
+
 
 bool MyBrowseForFolder(HWND owner, LPCWSTR title, LPCWSTR path, UString &resultPath)
 {
@@ -813,12 +832,13 @@ bool MyBrowseForFolder(HWND owner, LPCWSTR title, LPCWSTR path, UString &resultP
 
   #ifndef UNDER_CE
 
-  #ifdef USE_MY_BROWSE_DIALOG
+#ifdef USE_MY_BROWSE_DIALOG
   if (!IsSuperOrDevicePath(path))
-  #endif
+  if (MyStringLen(path) < MAX_PATH)
+#endif
     return NShell::BrowseForFolder(owner, title, path, resultPath);
 
-  #endif
+  #endif //  UNDER_CE
 
   #ifdef USE_MY_BROWSE_DIALOG
 
@@ -831,64 +851,107 @@ bool MyBrowseForFolder(HWND owner, LPCWSTR title, LPCWSTR path, UString &resultP
   if (dialog.Create(owner) != IDOK)
     return false;
   resultPath = dialog.FilePath;
-  #endif
-
   return true;
+
+  #endif
 }
 
-bool MyBrowseForFile(HWND owner, LPCWSTR title, LPCWSTR path,
-    LPCWSTR filterDescription, LPCWSTR filter, UString &resultPath)
-{
-  resultPath.Empty();
 
-  #ifndef UNDER_CE
+// LPCWSTR filterDescription, LPCWSTR filter,
 
-  #ifdef USE_MY_BROWSE_DIALOG
-  if (!IsSuperOrDevicePath(path))
-  #endif
+bool CBrowseInfo::BrowseForFile(const CObjectVector<CBrowseFilterInfo> &filters)
+{
+#ifndef UNDER_CE
+#ifdef USE_MY_BROWSE_DIALOG
+  /* win10:
+     GetOpenFileName() for FilePath doesn't support super prefix "\\\\?\\"
+     GetOpenFileName() for FilePath doesn't support long path
+  */
+  if (!IsSuperOrDevicePath(FilePath))
+  // if (filters.Size() > 100) // for debug
+#endif
   {
-    if (MyGetOpenFileName(owner, title, NULL, path, filterDescription, filter, resultPath))
+    const UString filePath_Store = FilePath;
+    UString dirPrefix;
+    {
+      FString prefix, name;
+      if (NDir::GetFullPathAndSplit(us2fs(FilePath), prefix, name))
+      {
+        dirPrefix = fs2us(prefix);
+        FilePath = fs2us(name);
+      }
+    }
+    UStringVector filters2;
+    FOR_VECTOR (i, filters)
+    {
+      const CBrowseFilterInfo &fi = filters[i];
+      filters2.Add(fi.Description);
+      UString s;
+      FOR_VECTOR (k, fi.Masks)
+      {
+        if (k != 0)
+          s += ";";
+        s += fi.Masks[k];
+      }
+      filters2.Add(s);
+    }
+    if (CommonDlg_BrowseForFile(!dirPrefix.IsEmpty() ? dirPrefix.Ptr(): NULL, filters2))
       return true;
-    #ifdef UNDER_CE
+    FilePath = filePath_Store;
+
+  #ifdef UNDER_CE
     return false;
-    #else
+  #else
     // maybe we must use GetLastError in WinCE.
-    DWORD errorCode = CommDlgExtendedError();
-    const char *errorMessage = NULL;
-    switch (errorCode)
-    {
-      case 0: return false; // cancel or close obn dialog
-      case FNERR_INVALIDFILENAME: errorMessage = "Invalid File Name"; break;
-      default: errorMessage = "Open Dialog Error";
-    }
-    if (!errorMessage)
-      return false;
+    const DWORD errorCode = CommDlgExtendedError();
+  #ifdef USE_MY_BROWSE_DIALOG
+    // FNERR_INVALIDFILENAME is expected error, if long path was used
+    if (errorCode != FNERR_INVALIDFILENAME
+        || FilePath.Len() < MAX_PATH)
+  #endif
     {
-      UString s (errorMessage);
+      if (errorCode == 0)  // cancel or close on dialog
+        return false;
+      const char *message = NULL;
+      if (errorCode == FNERR_INVALIDFILENAME)
+        message = "Invalid file name";
+      UString s ("Open Dialog Error:");
+      s.Add_LF();
+      if (message)
+        s += message;
+      else
+      {
+        char temp[16];
+        ConvertUInt32ToHex8Digits(errorCode, temp);
+        s += "Error #";
+        s += temp;
+      }
       s.Add_LF();
-      s += path;
-      MessageBox_Error_Global(owner, s);
+      s += FilePath;
+      MessageBox_Error_Global(hwndOwner, s);
     }
-    #endif
+  #endif // UNDER_CE
   }
 
-  #endif
+#endif // UNDER_CE
   
-  #ifdef USE_MY_BROWSE_DIALOG
+#ifdef USE_MY_BROWSE_DIALOG
+
   CBrowseDialog dialog;
-  if (title)
-    dialog.Title = title;
-  if (path)
-    dialog.FilePath = path;
+
   dialog.FolderMode = false;
-  if (filter)
-    dialog.SetFilter(filter);
-  if (filterDescription)
-    dialog.FilterDescription = filterDescription;
-  if (dialog.Create(owner) != IDOK)
+  dialog.SaveMode = SaveMode;
+  dialog.FilterIndex = FilterIndex;
+  dialog.Filters = filters;
+
+  if (lpstrTitle)
+    dialog.Title = lpstrTitle;
+  dialog.FilePath = FilePath;
+  if (dialog.Create(hwndOwner) != IDOK)
     return false;
-  resultPath = dialog.FilePath;
-  #endif
+  FilePath = dialog.FilePath;
+  FilterIndex = dialog.FilterIndex;
+#endif
 
   return true;
 }
@@ -913,7 +976,9 @@ bool CorrectFsPath(const UString &relBase, const UString &path2, UString &result
   result.Empty();
 
   UString path = path2;
+  #ifdef _WIN32
   path.Replace(L'/', WCHAR_PATH_SEPARATOR);
+  #endif
   unsigned start = 0;
   UString base;
   
@@ -926,9 +991,7 @@ bool CorrectFsPath(const UString &relBase, const UString &path2, UString &result
       return true;
     }
     #endif
-    int pos = GetRootPrefixSize(path);
-    if (pos > 0)
-      start = pos;
+    start = GetRootPrefixSize(path);
   }
   else
   {
@@ -973,8 +1036,8 @@ bool CorrectFsPath(const UString &relBase, const UString &path2, UString &result
   {
     if (start == path.Len())
       break;
-    int slashPos = path.Find(WCHAR_PATH_SEPARATOR, start);
-    cur.SetFrom(path.Ptr(start), (slashPos < 0 ? path.Len() : slashPos) - start);
+    const int slashPos = path.Find(WCHAR_PATH_SEPARATOR, start);
+    cur.SetFrom(path.Ptr(start), (slashPos < 0 ? path.Len() : (unsigned)slashPos) - start);
     if (checkExist)
     {
       CFileInfo fi;
@@ -994,8 +1057,8 @@ bool CorrectFsPath(const UString &relBase, const UString &path2, UString &result
     result += cur;
     if (slashPos < 0)
       break;
+    start = (unsigned)(slashPos + 1);
     result.Add_PathSepar();
-    start = slashPos + 1;
   }
   
   return true;
diff --git a/CPP/7zip/UI/FileManager/BrowseDialog.h b/CPP/7zip/UI/FileManager/BrowseDialog.h
index 957af2e..2ad8d54 100644
--- a/CPP/7zip/UI/FileManager/BrowseDialog.h
+++ b/CPP/7zip/UI/FileManager/BrowseDialog.h
@@ -1,12 +1,23 @@
 // BrowseDialog.h
 
-#ifndef __BROWSE_DIALOG_H
-#define __BROWSE_DIALOG_H
+#ifndef ZIP7_INC_BROWSE_DIALOG_H
+#define ZIP7_INC_BROWSE_DIALOG_H
 
-#include "../../../Common/MyString.h"
+#include "../../../Windows/CommonDialog.h"
 
 bool MyBrowseForFolder(HWND owner, LPCWSTR title, LPCWSTR path, UString &resultPath);
-bool MyBrowseForFile(HWND owner, LPCWSTR title, LPCWSTR path, LPCWSTR filterDescription, LPCWSTR filter, UString &resultPath);
+
+struct CBrowseFilterInfo
+{
+  UStringVector Masks;
+  UString Description;
+};
+
+struct CBrowseInfo: public NWindows::CCommonDialogInfo
+{
+  bool BrowseForFile(const CObjectVector<CBrowseFilterInfo> &filters);
+};
+
 
 /* CorrectFsPath removes undesirable characters in names (dots and spaces at the end of file)
    But it doesn't change "bad" name in any of the following cases:
diff --git a/CPP/7zip/UI/FileManager/ComboDialog.cpp b/CPP/7zip/UI/FileManager/ComboDialog.cpp
index 729743e..921972e 100644
--- a/CPP/7zip/UI/FileManager/ComboDialog.cpp
+++ b/CPP/7zip/UI/FileManager/ComboDialog.cpp
@@ -5,7 +5,7 @@
 
 #include "../../../Windows/Control/Static.h"
 
-#ifdef LANG
+#ifdef Z7_LANG
 #include "LangUtils.h"
 #endif
 
@@ -13,7 +13,7 @@ using namespace NWindows;
 
 bool CComboDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
   _comboBox.Attach(GetItem(IDC_COMBO));
diff --git a/CPP/7zip/UI/FileManager/ComboDialog.h b/CPP/7zip/UI/FileManager/ComboDialog.h
index 29b28b5..bb0fda8 100644
--- a/CPP/7zip/UI/FileManager/ComboDialog.h
+++ b/CPP/7zip/UI/FileManager/ComboDialog.h
@@ -1,7 +1,7 @@
 // ComboDialog.h
 
-#ifndef __COMBO_DIALOG_H
-#define __COMBO_DIALOG_H
+#ifndef ZIP7_INC_COMBO_DIALOG_H
+#define ZIP7_INC_COMBO_DIALOG_H
 
 #include "../../../Windows/Control/ComboBox.h"
 #include "../../../Windows/Control/Dialog.h"
@@ -11,9 +11,9 @@
 class CComboDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CComboBox _comboBox;
-  virtual void OnOK();
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
+  virtual void OnOK() Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
 public:
   // bool Sorted;
   UString Title;
@@ -22,7 +22,7 @@ public:
   UStringVector Strings;
   
   // CComboDialog(): Sorted(false) {};
-  INT_PTR Create(HWND parentWindow = 0) { return CModalDialog::Create(IDD_COMBO, parentWindow); }
+  INT_PTR Create(HWND parentWindow = NULL) { return CModalDialog::Create(IDD_COMBO, parentWindow); }
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/CopyDialog.cpp b/CPP/7zip/UI/FileManager/CopyDialog.cpp
index 4b17110..9bc01d0 100644
--- a/CPP/7zip/UI/FileManager/CopyDialog.cpp
+++ b/CPP/7zip/UI/FileManager/CopyDialog.cpp
@@ -8,16 +8,13 @@
 
 #include "BrowseDialog.h"
 #include "CopyDialog.h"
-
-#ifdef LANG
 #include "LangUtils.h"
-#endif
 
 using namespace NWindows;
 
 bool CCopyDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
   _path.Attach(GetItem(IDC_COPY));
@@ -45,15 +42,15 @@ bool CCopyDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   int bx1, bx2, by;
   GetItemSizes(IDCANCEL, bx1, by);
   GetItemSizes(IDOK, bx2, by);
-  int y = ySize - my - by;
-  int x = xSize - mx - bx1;
+  const int y = ySize - my - by;
+  const int x = xSize - mx - bx1;
 
   InvalidateRect(NULL);
 
   {
     RECT r;
     GetClientRectOfItem(IDB_COPY_SET_PATH, r);
-    int bx = RECT_SIZE_X(r);
+    const int bx = RECT_SIZE_X(r);
     MoveItem(IDB_COPY_SET_PATH, xSize - mx - bx, r.top, bx, RECT_SIZE_Y(r));
     ChangeSubWindowSizeX(_path, xSize - mx - mx - bx - mx);
   }
@@ -63,7 +60,7 @@ bool CCopyDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
     GetClientRectOfItem(IDT_COPY_INFO, r);
     NControl::CStatic staticContol;
     staticContol.Attach(GetItem(IDT_COPY_INFO));
-    int yPos = r.top;
+    const int yPos = r.top;
     staticContol.Move(mx, yPos, xSize - mx * 2, y - 2 - yPos);
   }
 
@@ -73,7 +70,7 @@ bool CCopyDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   return false;
 }
 
-bool CCopyDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CCopyDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
diff --git a/CPP/7zip/UI/FileManager/CopyDialog.h b/CPP/7zip/UI/FileManager/CopyDialog.h
index 30fde71..3782420 100644
--- a/CPP/7zip/UI/FileManager/CopyDialog.h
+++ b/CPP/7zip/UI/FileManager/CopyDialog.h
@@ -1,7 +1,7 @@
 // CopyDialog.h
 
-#ifndef __COPY_DIALOG_H
-#define __COPY_DIALOG_H
+#ifndef ZIP7_INC_COPY_DIALOG_H
+#define ZIP7_INC_COPY_DIALOG_H
 
 #include "../../../Windows/Control/ComboBox.h"
 #include "../../../Windows/Control/Dialog.h"
@@ -13,11 +13,11 @@ const int kCopyDialog_NumInfoLines = 11;
 class CCopyDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CComboBox _path;
-  virtual void OnOK();
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
+  virtual void OnOK() Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   void OnButtonSetPath();
-  bool OnButtonClicked(int buttonID, HWND buttonHWND);
 public:
   UString Title;
   UString Static;
@@ -25,7 +25,7 @@ public:
   UString Info;
   UStringVector Strings;
 
-  INT_PTR Create(HWND parentWindow = 0) { return CModalDialog::Create(IDD_COPY, parentWindow); }
+  INT_PTR Create(HWND parentWindow = NULL) { return CModalDialog::Create(IDD_COPY, parentWindow); }
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/DialogSize.h b/CPP/7zip/UI/FileManager/DialogSize.h
index 504541b..9f2270b 100644
--- a/CPP/7zip/UI/FileManager/DialogSize.h
+++ b/CPP/7zip/UI/FileManager/DialogSize.h
@@ -1,7 +1,7 @@
 // DialogSize.h
 
-#ifndef __DIALOG_SIZE_H
-#define __DIALOG_SIZE_H
+#ifndef ZIP7_INC_DIALOG_SIZE_H
+#define ZIP7_INC_DIALOG_SIZE_H
 
 #include "../../../Windows/Control/Dialog.h"
 
diff --git a/CPP/7zip/UI/FileManager/EditDialog.cpp b/CPP/7zip/UI/FileManager/EditDialog.cpp
index 7f59672..e97d9ea 100644
--- a/CPP/7zip/UI/FileManager/EditDialog.cpp
+++ b/CPP/7zip/UI/FileManager/EditDialog.cpp
@@ -4,13 +4,13 @@
 
 #include "EditDialog.h"
 
-#ifdef LANG
+#ifdef Z7_LANG
 #include "LangUtils.h"
 #endif
 
 bool CEditDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
   _edit.Attach(GetItem(IDE_EDIT));
@@ -22,21 +22,21 @@ bool CEditDialog::OnInit()
   return CModalDialog::OnInit();
 }
 
-// #define MY_CLOSE_BUTTON__ID IDCANCEL
-#define MY_CLOSE_BUTTON__ID IDCLOSE
+// #define MY_CLOSE_BUTTON_ID IDCANCEL
+#define MY_CLOSE_BUTTON_ID IDCLOSE
  
 bool CEditDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
 {
   int mx, my;
   GetMargins(8, mx, my);
   int bx1, by;
-  GetItemSizes(MY_CLOSE_BUTTON__ID, bx1, by);
+  GetItemSizes(MY_CLOSE_BUTTON_ID, bx1, by);
 
   // int bx2;
   // GetItemSizes(IDOK, bx2, by);
 
-  int y = ySize - my - by;
-  int x = xSize - mx - bx1;
+  const int y = ySize - my - by;
+  const int x = xSize - mx - bx1;
 
   /*
   RECT rect;
@@ -46,7 +46,7 @@ bool CEditDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   */
   InvalidateRect(NULL);
 
-  MoveItem(MY_CLOSE_BUTTON__ID, x, y, bx1, by);
+  MoveItem(MY_CLOSE_BUTTON_ID, x, y, bx1, by);
   // MoveItem(IDOK, x - mx - bx2, y, bx2, by);
   /*
   if (wParam == SIZE_MAXSHOW || wParam == SIZE_MAXIMIZED || wParam == SIZE_MAXHIDE)
diff --git a/CPP/7zip/UI/FileManager/EditDialog.h b/CPP/7zip/UI/FileManager/EditDialog.h
index d820516..6970b14 100644
--- a/CPP/7zip/UI/FileManager/EditDialog.h
+++ b/CPP/7zip/UI/FileManager/EditDialog.h
@@ -1,7 +1,7 @@
 // EditDialog.h
 
-#ifndef __EDIT_DIALOG_H
-#define __EDIT_DIALOG_H
+#ifndef ZIP7_INC_EDIT_DIALOG_H
+#define ZIP7_INC_EDIT_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/Edit.h"
@@ -11,13 +11,13 @@
 class CEditDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CEdit _edit;
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
 public:
   UString Title;
   UString Text;
 
-  INT_PTR Create(HWND wndParent = 0) { return CModalDialog::Create(IDD_EDIT_DLG, wndParent); }
+  INT_PTR Create(HWND wndParent = NULL) { return CModalDialog::Create(IDD_EDIT_DLG, wndParent); }
 
   CEditDialog() {}
 };
diff --git a/CPP/7zip/UI/FileManager/EditPage.cpp b/CPP/7zip/UI/FileManager/EditPage.cpp
index 0108904..a2a0321 100644
--- a/CPP/7zip/UI/FileManager/EditPage.cpp
+++ b/CPP/7zip/UI/FileManager/EditPage.cpp
@@ -12,6 +12,7 @@
 
 using namespace NWindows;
 
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_EDIT_EDITOR,
@@ -22,6 +23,7 @@ static const UInt32 kLangIDs_Colon[] =
 {
   IDT_EDIT_VIEWER
 };
+#endif
 
 #define kEditTopic "FM/options.htm#editor"
 
@@ -29,8 +31,10 @@ bool CEditPage::OnInit()
 {
   _initMode = true;
 
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
-  LangSetDlgItems_Colon(*this, kLangIDs_Colon, ARRAY_SIZE(kLangIDs_Colon));
+  #ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems_Colon(*this, kLangIDs_Colon, Z7_ARRAY_SIZE(kLangIDs_Colon));
+  #endif
 
   _ctrls[0].Ctrl = IDE_EDIT_VIEWER; _ctrls[0].Button = IDB_EDIT_VIEWER;
   _ctrls[1].Ctrl = IDE_EDIT_EDITOR; _ctrls[1].Button = IDB_EDIT_EDITOR;
@@ -91,12 +95,20 @@ static void Edit_BrowseForFile(NWindows::NControl::CEdit &edit, HWND hwnd)
   
   SplitCmdLineSmart(cmd, prg, param);
 
-  UString resPath;
-  
-  if (MyBrowseForFile(hwnd, 0, prg, NULL, L"*.exe", resPath))
+  CObjectVector<CBrowseFilterInfo> filters;
+  CBrowseFilterInfo &bfi = filters.AddNew();
+  bfi.Description = "*.exe";
+  bfi.Masks.Add(UString("*.exe"));
+
+  CBrowseInfo bi;
+  bi.FilterIndex = 0;
+  bi.FilePath = prg;
+  bi.hwndOwner = hwnd;
+
+  if (bi.BrowseForFile(filters))
   {
-    resPath.Trim();
-    cmd = resPath;
+    cmd = bi.FilePath;
+    cmd.Trim();
     /*
     if (!param.IsEmpty() && !resPath.IsEmpty())
     {
@@ -112,7 +124,7 @@ static void Edit_BrowseForFile(NWindows::NControl::CEdit &edit, HWND hwnd)
   }
 }
 
-bool CEditPage::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CEditPage::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   for (unsigned i = 0; i < 3; i++)
   {
@@ -127,7 +139,7 @@ bool CEditPage::OnButtonClicked(int buttonID, HWND buttonHWND)
   return CPropertyPage::OnButtonClicked(buttonID, buttonHWND);
 }
 
-bool CEditPage::OnCommand(int code, int itemID, LPARAM param)
+bool CEditPage::OnCommand(unsigned code, unsigned itemID, LPARAM param)
 {
   if (!_initMode && code == EN_CHANGE)
   {
diff --git a/CPP/7zip/UI/FileManager/EditPage.h b/CPP/7zip/UI/FileManager/EditPage.h
index 208edd8..a70fad7 100644
--- a/CPP/7zip/UI/FileManager/EditPage.h
+++ b/CPP/7zip/UI/FileManager/EditPage.h
@@ -1,7 +1,7 @@
 // EditPage.h
  
-#ifndef __EDIT_PAGE_H
-#define __EDIT_PAGE_H
+#ifndef ZIP7_INC_EDIT_PAGE_H
+#define ZIP7_INC_EDIT_PAGE_H
 
 #include "../../../Windows/Control/PropertyPage.h"
 #include "../../../Windows/Control/Edit.h"
@@ -10,8 +10,8 @@ struct CEditPageCtrl
 {
   NWindows::NControl::CEdit Edit;
   bool WasChanged;
-  int Ctrl;
-  int Button;
+  unsigned Ctrl;
+  unsigned Button;
 };
 
 class CEditPage: public NWindows::NControl::CPropertyPage
@@ -20,11 +20,11 @@ class CEditPage: public NWindows::NControl::CPropertyPage
 
   bool _initMode;
 public:
-  virtual bool OnInit();
-  virtual void OnNotifyHelp();
-  virtual bool OnCommand(int code, int itemID, LPARAM param);
-  virtual LONG OnApply();
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual bool OnInit() Z7_override;
+  virtual void OnNotifyHelp() Z7_override;
+  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM param) Z7_override;
+  virtual LONG OnApply() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/EnumFormatEtc.cpp b/CPP/7zip/UI/FileManager/EnumFormatEtc.cpp
index 389aa3e..fc2fd6c 100644
--- a/CPP/7zip/UI/FileManager/EnumFormatEtc.cpp
+++ b/CPP/7zip/UI/FileManager/EnumFormatEtc.cpp
@@ -3,28 +3,27 @@
 #include "StdAfx.h"
 
 #include "EnumFormatEtc.h"
+#include "../../IDecl.h"
 #include "MyCom2.h"
 
-class CEnumFormatEtc :
-public IEnumFORMATETC,
-public CMyUnknownImp
+class CEnumFormatEtc Z7_final:
+  public IEnumFORMATETC,
+  public CMyUnknownImp
 {
-public:
-  MY_UNKNOWN_IMP1_MT(IEnumFORMATETC)
+  Z7_COM_UNKNOWN_IMP_1_MT(IEnumFORMATETC)
     
-  STDMETHOD(Next)(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched);
-  STDMETHOD(Skip)(ULONG celt);
-  STDMETHOD(Reset)(void);
-  STDMETHOD(Clone)(IEnumFORMATETC **ppEnumFormatEtc);
-  
-  CEnumFormatEtc(const FORMATETC *pFormatEtc, ULONG numFormats);
-  ~CEnumFormatEtc();
-  
-private:
+  STDMETHOD(Next)(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) Z7_override;
+  STDMETHOD(Skip)(ULONG celt) Z7_override;
+  STDMETHOD(Reset)(void) Z7_override;
+  STDMETHOD(Clone)(IEnumFORMATETC **ppEnumFormatEtc) Z7_override;
+
   LONG m_RefCount;
   ULONG m_NumFormats;
   FORMATETC *m_Formats;
   ULONG m_Index;
+public:
+  CEnumFormatEtc(const FORMATETC *pFormatEtc, ULONG numFormats);
+  ~CEnumFormatEtc();
 };
 
 static void DeepCopyFormatEtc(FORMATETC *dest, const FORMATETC *src)
@@ -62,10 +61,10 @@ CEnumFormatEtc::~CEnumFormatEtc()
   }
 }
 
-STDMETHODIMP CEnumFormatEtc::Next(ULONG celt, FORMATETC *pFormatEtc, ULONG *pceltFetched)
+Z7_COMWF_B CEnumFormatEtc::Next(ULONG celt, FORMATETC *pFormatEtc, ULONG *pceltFetched)
 {
   ULONG copied  = 0;
-  if (celt == 0 || pFormatEtc == 0)
+  if (celt == 0 || !pFormatEtc)
     return E_INVALIDARG;
   while (m_Index < m_NumFormats && copied < celt)
   {
@@ -73,24 +72,24 @@ STDMETHODIMP CEnumFormatEtc::Next(ULONG celt, FORMATETC *pFormatEtc, ULONG *pcel
     copied++;
     m_Index++;
   }
-  if (pceltFetched != 0)
+  if (pceltFetched)
     *pceltFetched = copied;
   return (copied == celt) ? S_OK : S_FALSE;
 }
 
-STDMETHODIMP CEnumFormatEtc::Skip(ULONG celt)
+Z7_COMWF_B CEnumFormatEtc::Skip(ULONG celt)
 {
   m_Index += celt;
   return (m_Index <= m_NumFormats) ? S_OK : S_FALSE;
 }
 
-STDMETHODIMP CEnumFormatEtc::Reset(void)
+Z7_COMWF_B CEnumFormatEtc::Reset(void)
 {
   m_Index = 0;
   return S_OK;
 }
 
-STDMETHODIMP CEnumFormatEtc::Clone(IEnumFORMATETC ** ppEnumFormatEtc)
+Z7_COMWF_B CEnumFormatEtc::Clone(IEnumFORMATETC ** ppEnumFormatEtc)
 {
   HRESULT hResult = CreateEnumFormatEtc(m_NumFormats, m_Formats, ppEnumFormatEtc);
   if (hResult == S_OK)
@@ -101,7 +100,7 @@ STDMETHODIMP CEnumFormatEtc::Clone(IEnumFORMATETC ** ppEnumFormatEtc)
 // replacement for SHCreateStdEnumFmtEtc
 HRESULT CreateEnumFormatEtc(UINT numFormats, const FORMATETC *formats, IEnumFORMATETC **enumFormat)
 {
-  if (numFormats == 0 || formats == 0 || enumFormat == 0)
+  if (numFormats == 0 || !formats || !enumFormat)
     return E_INVALIDARG;
   *enumFormat = new CEnumFormatEtc(formats, numFormats);
   return (*enumFormat) ? S_OK : E_OUTOFMEMORY;
diff --git a/CPP/7zip/UI/FileManager/EnumFormatEtc.h b/CPP/7zip/UI/FileManager/EnumFormatEtc.h
index 93a53cb..12df225 100644
--- a/CPP/7zip/UI/FileManager/EnumFormatEtc.h
+++ b/CPP/7zip/UI/FileManager/EnumFormatEtc.h
@@ -1,7 +1,7 @@
 // EnumFormatEtc.h
 
-#ifndef __ENUMFORMATETC_H
-#define __ENUMFORMATETC_H
+#ifndef ZIP7_INC_ENUMFORMATETC_H
+#define ZIP7_INC_ENUMFORMATETC_H
 
 #include "../../../Common/MyWindows.h"
 
diff --git a/CPP/7zip/UI/FileManager/ExtractCallback.cpp b/CPP/7zip/UI/FileManager/ExtractCallback.cpp
index 232717f..f674044 100644
--- a/CPP/7zip/UI/FileManager/ExtractCallback.cpp
+++ b/CPP/7zip/UI/FileManager/ExtractCallback.cpp
@@ -17,7 +17,7 @@
 #include "../../Common/StreamUtils.h"
 #include "../Common/ExtractingFilePath.h"
 
-#ifndef _SFX
+#ifndef Z7_SFX
 #include "../Common/ZipRegistry.h"
 #endif
 
@@ -28,7 +28,7 @@
 #include "FormatUtils.h"
 #include "LangUtils.h"
 #include "OverwriteDialog.h"
-#ifndef _NO_CRYPTO
+#ifndef Z7_NO_CRYPTO
 #include "PasswordDialog.h"
 #endif
 #include "PropertyName.h"
@@ -48,7 +48,7 @@ void CExtractCallbackImp::Init()
 
   NumArchiveErrors = 0;
   ThereAreMessageErrors = false;
-  #ifndef _SFX
+  #ifndef Z7_SFX
   NumFolders = NumFiles = 0;
   NeedAddFile = false;
   #endif
@@ -60,29 +60,27 @@ void CExtractCallbackImp::AddError_Message(LPCWSTR s)
   ProgressDialog->Sync.AddError_Message(s);
 }
 
-#ifndef _SFX
+#ifndef Z7_SFX
 
-STDMETHODIMP CExtractCallbackImp::SetNumFiles(UInt64
-  #ifndef _SFX
-  numFiles
-  #endif
-  )
+Z7_COM7F_IMF(CExtractCallbackImp::SetNumFiles(UInt64 numFiles))
 {
-  #ifndef _SFX
+ #ifdef Z7_SFX
+  UNUSED_VAR(numFiles)
+ #else
   ProgressDialog->Sync.Set_NumFilesTotal(numFiles);
-  #endif
+ #endif
   return S_OK;
 }
 
 #endif
 
-STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 total)
+Z7_COM7F_IMF(CExtractCallbackImp::SetTotal(UInt64 total))
 {
   ProgressDialog->Sync.Set_NumBytesTotal(total);
   return S_OK;
 }
 
-STDMETHODIMP CExtractCallbackImp::SetCompleted(const UInt64 *value)
+Z7_COM7F_IMF(CExtractCallbackImp::SetCompleted(const UInt64 *value))
 {
   return ProgressDialog->Sync.Set_NumBytesCur(value);
 }
@@ -139,7 +137,7 @@ HRESULT CExtractCallbackImp::Open_Finished()
   return ProgressDialog->Sync.CheckStop();
 }
 
-#ifndef _NO_CRYPTO
+#ifndef Z7_NO_CRYPTO
 
 HRESULT CExtractCallbackImp::Open_CryptoGetTextPassword(BSTR *password)
 {
@@ -168,8 +166,8 @@ void CExtractCallbackImp::Open_Clear_PasswordWasAsked_Flag()
 #endif
 
 
-#ifndef _SFX
-STDMETHODIMP CExtractCallbackImp::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
+#ifndef Z7_SFX
+Z7_COM7F_IMF(CExtractCallbackImp::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize))
 {
   ProgressDialog->Sync.Set_Ratio(inSize, outSize);
   return S_OK;
@@ -177,13 +175,13 @@ STDMETHODIMP CExtractCallbackImp::SetRatioInfo(const UInt64 *inSize, const UInt6
 #endif
 
 /*
-STDMETHODIMP CExtractCallbackImp::SetTotalFiles(UInt64 total)
+Z7_COM7F_IMF(CExtractCallbackImp::SetTotalFiles(UInt64 total)
 {
   ProgressDialog->Sync.SetNumFilesTotal(total);
   return S_OK;
 }
 
-STDMETHODIMP CExtractCallbackImp::SetCompletedFiles(const UInt64 *value)
+Z7_COM7F_IMF(CExtractCallbackImp::SetCompletedFiles(const UInt64 *value)
 {
   if (value != NULL)
     ProgressDialog->Sync.SetNumFilesCur(*value);
@@ -191,10 +189,10 @@ STDMETHODIMP CExtractCallbackImp::SetCompletedFiles(const UInt64 *value)
 }
 */
 
-STDMETHODIMP CExtractCallbackImp::AskOverwrite(
+Z7_COM7F_IMF(CExtractCallbackImp::AskOverwrite(
     const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize,
     const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize,
-    Int32 *answer)
+    Int32 *answer))
 {
   COverwriteDialog dialog;
 
@@ -223,7 +221,7 @@ STDMETHODIMP CExtractCallbackImp::AskOverwrite(
 }
 
 
-STDMETHODIMP CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 * /* position */)
+Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 * /* position */))
 {
   _isFolder = IntToBool(isFolder);
   _currentFilePath = name;
@@ -241,7 +239,7 @@ STDMETHODIMP CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 is
   return ProgressDialog->Sync.Set_Status2(*msg, name, IntToBool(isFolder));
 }
 
-STDMETHODIMP CExtractCallbackImp::MessageError(const wchar_t *s)
+Z7_COM7F_IMF(CExtractCallbackImp::MessageError(const wchar_t *s))
 {
   AddError_Message(s);
   return S_OK;
@@ -254,9 +252,9 @@ HRESULT CExtractCallbackImp::MessageError(const char *message, const FString &pa
   return S_OK;
 }
 
-#ifndef _SFX
+#ifndef Z7_SFX
 
-STDMETHODIMP CExtractCallbackImp::ShowMessage(const wchar_t *s)
+Z7_COM7F_IMF(CExtractCallbackImp::ShowMessage(const wchar_t *s))
 {
   AddError_Message(s);
   return S_OK;
@@ -272,25 +270,33 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
   if (opRes == NArchive::NExtract::NOperationResult::kOK)
     return;
 
+ #ifndef Z7_SFX
   UINT messageID = 0;
+ #endif
   UINT id = 0;
 
   switch (opRes)
   {
     case NArchive::NExtract::NOperationResult::kUnsupportedMethod:
+     #ifndef Z7_SFX
       messageID = IDS_EXTRACT_MESSAGE_UNSUPPORTED_METHOD;
+     #endif
       id = IDS_EXTRACT_MSG_UNSUPPORTED_METHOD;
       break;
     case NArchive::NExtract::NOperationResult::kDataError:
+     #ifndef Z7_SFX
       messageID = encrypted ?
           IDS_EXTRACT_MESSAGE_DATA_ERROR_ENCRYPTED:
           IDS_EXTRACT_MESSAGE_DATA_ERROR;
+     #endif
       id = IDS_EXTRACT_MSG_DATA_ERROR;
       break;
     case NArchive::NExtract::NOperationResult::kCRCError:
+     #ifndef Z7_SFX
       messageID = encrypted ?
           IDS_EXTRACT_MESSAGE_CRC_ERROR_ENCRYPTED:
           IDS_EXTRACT_MESSAGE_CRC_ERROR;
+     #endif
       id = IDS_EXTRACT_MSG_CRC_ERROR;
       break;
     case NArchive::NExtract::NOperationResult::kUnavailable:
@@ -319,18 +325,19 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
   }
 
   UString msg;
-  UString msgOld;
 
-  #ifndef _SFX
+ #ifndef Z7_SFX
+  UString msgOld;
+ #ifdef Z7_LANG
   if (id != 0)
     LangString_OnlyFromLangFile(id, msg);
   if (messageID != 0 && msg.IsEmpty())
     LangString_OnlyFromLangFile(messageID, msgOld);
-  #endif
-
+ #endif
   if (msg.IsEmpty() && !msgOld.IsEmpty())
     s = MyFormatNew(msgOld, fileName);
   else
+ #endif
   {
     if (msg.IsEmpty() && id != 0)
       LangString(id, msg);
@@ -339,7 +346,7 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
     else
     {
       s += "Error #";
-      s.Add_UInt32(opRes);
+      s.Add_UInt32((UInt32)opRes);
     }
 
     if (encrypted && opRes != NArchive::NExtract::NOperationResult::kWrongPassword)
@@ -354,7 +361,7 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
   }
 }
 
-STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypted)
+Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypted))
 {
   switch (opRes)
   {
@@ -369,7 +376,7 @@ STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypte
     }
   }
   
-  #ifndef _SFX
+  #ifndef Z7_SFX
   if (_isFolder)
     NumFolders++;
   else
@@ -380,7 +387,7 @@ STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypte
   return S_OK;
 }
 
-STDMETHODIMP CExtractCallbackImp::ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name)
+Z7_COM7F_IMF(CExtractCallbackImp::ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name))
 {
   if (opRes != NArchive::NExtract::NOperationResult::kOK)
   {
@@ -397,8 +404,8 @@ STDMETHODIMP CExtractCallbackImp::ReportExtractResult(Int32 opRes, Int32 encrypt
 
 HRESULT CExtractCallbackImp::BeforeOpen(const wchar_t *name, bool /* testMode */)
 {
-  #ifndef _SFX
-  RINOK(ProgressDialog->Sync.CheckStop());
+  #ifndef Z7_SFX
+  RINOK(ProgressDialog->Sync.CheckStop())
   ProgressDialog->Sync.Set_TitleFileName(name);
   #endif
   _currentArchivePath = name;
@@ -408,17 +415,17 @@ HRESULT CExtractCallbackImp::BeforeOpen(const wchar_t *name, bool /* testMode */
 HRESULT CExtractCallbackImp::SetCurrentFilePath2(const wchar_t *path)
 {
   _currentFilePath = path;
-  #ifndef _SFX
+  #ifndef Z7_SFX
   ProgressDialog->Sync.Set_FilePath(path);
   #endif
   return S_OK;
 }
 
-#ifndef _SFX
+#ifndef Z7_SFX
 
-HRESULT CExtractCallbackImp::SetCurrentFilePath(const wchar_t *path)
+Z7_COM7F_IMF(CExtractCallbackImp::SetCurrentFilePath(const wchar_t *path))
 {
-  #ifndef _SFX
+  #ifndef Z7_SFX
   if (NeedAddFile)
     NumFiles++;
   NeedAddFile = true;
@@ -457,7 +464,7 @@ UString GetOpenArcErrorMessage(UInt32 errorFlags)
 {
   UString s;
 
-  for (unsigned i = 0; i < ARRAY_SIZE(k_ErrorFlagsIds); i++)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(k_ErrorFlagsIds); i++)
   {
     UInt32 f = ((UInt32)1 << i);
     if ((errorFlags & f) == 0)
@@ -649,7 +656,7 @@ HRESULT CExtractCallbackImp::ExtractResult(HRESULT result)
   return S_OK;
 }
 
-#ifndef _NO_CRYPTO
+#ifndef Z7_NO_CRYPTO
 
 HRESULT CExtractCallbackImp::SetPassword(const UString &password)
 {
@@ -658,14 +665,14 @@ HRESULT CExtractCallbackImp::SetPassword(const UString &password)
   return S_OK;
 }
 
-STDMETHODIMP CExtractCallbackImp::CryptoGetTextPassword(BSTR *password)
+Z7_COM7F_IMF(CExtractCallbackImp::CryptoGetTextPassword(BSTR *password))
 {
   PasswordWasAsked = true;
   if (!PasswordIsDefined)
   {
     CPasswordDialog dialog;
-    #ifndef _SFX
-    bool showPassword = NExtract::Read_ShowPassword();
+    #ifndef Z7_SFX
+    const bool showPassword = NExtract::Read_ShowPassword();
     dialog.ShowPassword = showPassword;
     #endif
     ProgressDialog->WaitCreating();
@@ -673,7 +680,7 @@ STDMETHODIMP CExtractCallbackImp::CryptoGetTextPassword(BSTR *password)
       return E_ABORT;
     Password = dialog.Password;
     PasswordIsDefined = true;
-    #ifndef _SFX
+    #ifndef Z7_SFX
     if (dialog.ShowPassword != showPassword)
       NExtract::Save_ShowPassword(dialog.ShowPassword);
     #endif
@@ -683,24 +690,24 @@ STDMETHODIMP CExtractCallbackImp::CryptoGetTextPassword(BSTR *password)
 
 #endif
 
-#ifndef _SFX
+#ifndef Z7_SFX
 
-STDMETHODIMP CExtractCallbackImp::AskWrite(
+Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
     const wchar_t *srcPath, Int32 srcIsFolder,
     const FILETIME *srcTime, const UInt64 *srcSize,
     const wchar_t *destPath,
     BSTR *destPathResult,
-    Int32 *writeAnswer)
+    Int32 *writeAnswer))
 {
   UString destPathResultTemp = destPath;
 
   // RINOK(StringToBstr(destPath, destPathResult));
 
-  *destPathResult = 0;
+  *destPathResult = NULL;
   *writeAnswer = BoolToInt(false);
 
   FString destPathSys = us2fs(destPath);
-  bool srcIsFolderSpec = IntToBool(srcIsFolder);
+  const bool srcIsFolderSpec = IntToBool(srcIsFolder);
   CFileInfo destFileInfo;
   
   if (destFileInfo.Find(destPathSys))
@@ -709,7 +716,7 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
     {
       if (!destFileInfo.IsDir())
       {
-        RINOK(MessageError("Cannot replace file with folder with same name", destPathSys));
+        RINOK(MessageError("Cannot replace file with folder with same name", destPathSys))
         return E_ABORT;
       }
       *writeAnswer = BoolToInt(false);
@@ -718,12 +725,12 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
   
     if (destFileInfo.IsDir())
     {
-      RINOK(MessageError("Cannot replace folder with file with same name", destPathSys));
+      RINOK(MessageError("Cannot replace folder with file with same name", destPathSys))
       *writeAnswer = BoolToInt(false);
       return S_OK;
     }
 
-    switch (OverwriteMode)
+    switch ((int)OverwriteMode)
     {
       case NExtract::NOverwriteMode::kSkip:
         return S_OK;
@@ -731,7 +738,7 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
       {
         Int32 overwriteResult;
         UString destPathSpec = destPath;
-        int slashPos = destPathSpec.ReverseFind_PathSepar();
+        const int slashPos = destPathSpec.ReverseFind_PathSepar();
         destPathSpec.DeleteFrom((unsigned)(slashPos + 1));
         destPathSpec += fs2us(destFileInfo.Name);
 
@@ -740,7 +747,7 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
             &destFileInfo.MTime, &destFileInfo.Size,
             srcPath,
             srcTime, srcSize,
-            &overwriteResult));
+            &overwriteResult))
         
         switch (overwriteResult)
         {
@@ -763,7 +770,7 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
     {
       if (!AutoRenamePath(destPathSys))
       {
-        RINOK(MessageError("Cannot create name for file", destPathSys));
+        RINOK(MessageError("Cannot create name for file", destPathSys))
         return E_ABORT;
       }
       destPathResultTemp = fs2us(destPathSys);
@@ -774,7 +781,7 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
       if (!NDir::DeleteFileAlways(destPathSys))
       if (GetLastError() != ERROR_FILE_NOT_FOUND)
       {
-        RINOK(MessageError("Cannot delete output file", destPathSys));
+        RINOK(MessageError("Cannot delete output file", destPathSys))
         return E_ABORT;
       }
     }
@@ -784,7 +791,7 @@ STDMETHODIMP CExtractCallbackImp::AskWrite(
 }
 
 
-STDMETHODIMP CExtractCallbackImp::UseExtractToStream(Int32 *res)
+Z7_COM7F_IMF(CExtractCallbackImp::UseExtractToStream(Int32 *res))
 {
   *res = BoolToInt(StreamMode);
   return S_OK;
@@ -794,7 +801,7 @@ static HRESULT GetTime(IGetProp *getProp, PROPID propID, FILETIME &ft, bool &ftD
 {
   ftDefined = false;
   NCOM::CPropVariant prop;
-  RINOK(getProp->GetProp(propID, &prop));
+  RINOK(getProp->GetProp(propID, &prop))
   if (prop.vt == VT_FILETIME)
   {
     ft = prop.filetime;
@@ -810,7 +817,7 @@ static HRESULT GetItemBoolProp(IGetProp *getProp, PROPID propID, bool &result)
 {
   NCOM::CPropVariant prop;
   result = false;
-  RINOK(getProp->GetProp(propID, &prop));
+  RINOK(getProp->GetProp(propID, &prop))
   if (prop.vt == VT_BOOL)
     result = VARIANT_BOOLToBool(prop.boolVal);
   else if (prop.vt != VT_EMPTY)
@@ -819,13 +826,13 @@ static HRESULT GetItemBoolProp(IGetProp *getProp, PROPID propID, bool &result)
 }
 
 
-STDMETHODIMP CExtractCallbackImp::GetStream7(const wchar_t *name,
+Z7_COM7F_IMF(CExtractCallbackImp::GetStream7(const wchar_t *name,
     Int32 isDir,
     ISequentialOutStream **outStream, Int32 askExtractMode,
-    IGetProp *getProp)
+    IGetProp *getProp))
 {
   COM_TRY_BEGIN
-  *outStream = 0;
+  *outStream = NULL;
   _newVirtFileWasAdded = false;
   _hashStreamWasUsed = false;
   _needUpdateStat = false;
@@ -841,20 +848,20 @@ STDMETHODIMP CExtractCallbackImp::GetStream7(const wchar_t *name,
   _filePath = name;
   _isFolder = IntToBool(isDir);
   _curSize = 0;
-  _curSizeDefined = false;
+  _curSize_Defined = false;
 
   UInt64 size = 0;
   bool sizeDefined;
   {
     NCOM::CPropVariant prop;
-    RINOK(getProp->GetProp(kpidSize, &prop));
+    RINOK(getProp->GetProp(kpidSize, &prop))
     sizeDefined = ConvertPropVariantToUInt64(prop, size);
   }
 
   if (sizeDefined)
   {
     _curSize = size;
-    _curSizeDefined = true;
+    _curSize_Defined = true;
   }
 
   if (askExtractMode != NArchive::NExtract::NAskMode::kExtract &&
@@ -874,12 +881,12 @@ STDMETHODIMP CExtractCallbackImp::GetStream7(const wchar_t *name,
     file.IsAltStream = _isAltStream;
     file.Size = 0;
 
-    RINOK(GetTime(getProp, kpidCTime, file.CTime, file.CTimeDefined));
-    RINOK(GetTime(getProp, kpidATime, file.ATime, file.ATimeDefined));
-    RINOK(GetTime(getProp, kpidMTime, file.MTime, file.MTimeDefined));
+    RINOK(GetTime(getProp, kpidCTime, file.CTime, file.CTimeDefined))
+    RINOK(GetTime(getProp, kpidATime, file.ATime, file.ATimeDefined))
+    RINOK(GetTime(getProp, kpidMTime, file.MTime, file.MTimeDefined))
 
     NCOM::CPropVariant prop;
-    RINOK(getProp->GetProp(kpidAttrib, &prop));
+    RINOK(getProp->GetProp(kpidAttrib, &prop))
     if (prop.vt == VT_UI4)
     {
       file.Attrib = prop.ulVal;
@@ -909,7 +916,7 @@ STDMETHODIMP CExtractCallbackImp::GetStream7(const wchar_t *name,
   COM_TRY_END
 }
 
-STDMETHODIMP CExtractCallbackImp::PrepareOperation7(Int32 askExtractMode)
+Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation7(Int32 askExtractMode))
 {
   COM_TRY_BEGIN
   _needUpdateStat = (
@@ -934,21 +941,21 @@ STDMETHODIMP CExtractCallbackImp::PrepareOperation7(Int32 askExtractMode)
   COM_TRY_END
 }
 
-STDMETHODIMP CExtractCallbackImp::SetOperationResult8(Int32 opRes, Int32 encrypted, UInt64 size)
+Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult8(Int32 opRes, Int32 encrypted, UInt64 size))
 {
   COM_TRY_BEGIN
   if (VirtFileSystem && _newVirtFileWasAdded)
   {
     // FIXME: probably we must request file size from VirtFileSystem
     // _curSize = VirtFileSystem->GetLastFileSize()
-    // _curSizeDefined = true;
-    RINOK(VirtFileSystemSpec->CloseMemFile());
+    // _curSize_Defined = true;
+    RINOK(VirtFileSystemSpec->CloseMemFile())
   }
   if (_hashStream && _hashStreamWasUsed)
   {
     _hashStreamSpec->_hash->Final(_isFolder, _isAltStream, _filePath);
     _curSize = _hashStreamSpec->GetSize();
-    _curSizeDefined = true;
+    _curSize_Defined = true;
     _hashStreamSpec->ReleaseStream();
     _hashStreamWasUsed = false;
   }
@@ -965,7 +972,7 @@ STDMETHODIMP CExtractCallbackImp::SetOperationResult8(Int32 opRes, Int32 encrypt
 
 // static const UInt32 kBlockSize = ((UInt32)1 << 31);
 
-STDMETHODIMP CVirtFileSystem::Write(const void *data, UInt32 size, UInt32 *processedSize)
+Z7_COM7F_IMF(CVirtFileSystem::Write(const void *data, UInt32 size, UInt32 *processedSize))
 {
   if (processedSize)
     *processedSize = 0;
@@ -1002,7 +1009,7 @@ STDMETHODIMP CVirtFileSystem::Write(const void *data, UInt32 size, UInt32 *proce
     }
     _fileMode = true;
   }
-  RINOK(FlushToDisk(false));
+  RINOK(FlushToDisk(false))
   return _outFileStream->Write(data, size, processedSize);
 }
 
@@ -1026,7 +1033,7 @@ HRESULT CVirtFileSystem::FlushToDisk(bool closeLast)
         // MessageBoxMyError(UString("Can't create file ") + fs2us(tempFilePath));
       }
       _fileIsOpen = true;
-      RINOK(WriteStream(_outFileStream, file.Data, (size_t)file.Size));
+      RINOK(WriteStream(_outFileStream, file.Data, (size_t)file.Size))
     }
     if (_numFlushed == Files.Size() - 1 && !closeLast)
       break;
diff --git a/CPP/7zip/UI/FileManager/ExtractCallback.h b/CPP/7zip/UI/FileManager/ExtractCallback.h
index 02578bb..c2aa470 100644
--- a/CPP/7zip/UI/FileManager/ExtractCallback.h
+++ b/CPP/7zip/UI/FileManager/ExtractCallback.h
@@ -1,42 +1,42 @@
 // ExtractCallback.h
 
-#ifndef __EXTRACT_CALLBACK_H
-#define __EXTRACT_CALLBACK_H
+#ifndef ZIP7_INC_EXTRACT_CALLBACK_H
+#define ZIP7_INC_EXTRACT_CALLBACK_H
 
 #include "../../../../C/Alloc.h"
 
 #include "../../../Common/MyCom.h"
 #include "../../../Common/StringConvert.h"
 
-#ifndef _SFX
+#ifndef Z7_SFX
 #include "../Agent/IFolderArchive.h"
 #endif
 
 #include "../Common/ArchiveExtractCallback.h"
 #include "../Common/ArchiveOpenCallback.h"
 
-#ifndef _NO_CRYPTO
+#ifndef Z7_NO_CRYPTO
 #include "../../IPassword.h"
 #endif
 
-#ifndef _SFX
+#ifndef Z7_SFX
 #include "IFolder.h"
 #endif
 
 #include "ProgressDialog2.h"
 
-#ifdef LANG
-#include "LangUtils.h"
+#ifdef Z7_LANG
+// #include "LangUtils.h"
 #endif
 
-#ifndef _SFX
+#ifndef Z7_SFX
 
 class CGrowBuf
 {
   Byte *_items;
   size_t _size;
 
-  CLASS_NO_COPY(CGrowBuf);
+  Z7_CLASS_NO_COPY(CGrowBuf)
 
 public:
   bool ReAlloc_KeepData(size_t newSize, size_t keepSize)
@@ -52,7 +52,7 @@ public:
     return true;
   }
 
-  CGrowBuf(): _items(0), _size(0) {}
+  CGrowBuf(): _items(NULL), _size(0) {}
   ~CGrowBuf() { MyFree(_items); }
 
   operator Byte *() { return _items; }
@@ -92,10 +92,11 @@ struct CVirtFile
     IsAltStream(false) {}
 };
 
-class CVirtFileSystem:
-  public ISequentialOutStream,
-  public CMyUnknownImp
-{
+
+Z7_CLASS_IMP_NOQIB_1(
+  CVirtFileSystem,
+  ISequentialOutStream
+)
   UInt64 _totalAllocSize;
 
   size_t _pos;
@@ -156,104 +157,86 @@ public:
   HRESULT CloseFile(const FString &path);
   HRESULT FlushToDisk(bool closeLast);
   size_t GetPos() const { return _pos; }
-
-  MY_UNKNOWN_IMP
-  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
 };
 
 #endif
   
-class CExtractCallbackImp:
-  public IExtractCallbackUI, // it includes IFolderArchiveExtractCallback
-  public IOpenCallbackUI,
+class CExtractCallbackImp Z7_final:
+  public IFolderArchiveExtractCallback,
+  /* IExtractCallbackUI:
+       before v23.00 : it         included IFolderArchiveExtractCallback
+       since  v23.00 : it doesn't include  IFolderArchiveExtractCallback
+  */
+  public IExtractCallbackUI, // NON-COM interface since 23.00
+  public IOpenCallbackUI,    // NON-COM interface
   public IFolderArchiveExtractCallback2,
-  #ifndef _SFX
+ #ifndef Z7_SFX
   public IFolderOperationsExtractCallback,
   public IFolderExtractToStreamCallback,
   public ICompressProgressInfo,
-  #endif
-  #ifndef _NO_CRYPTO
+ #endif
+ #ifndef Z7_NO_CRYPTO
   public ICryptoGetTextPassword,
-  #endif
+ #endif
   public CMyUnknownImp
 {
-  HRESULT MessageError(const char *message, const FString &path);
-  void Add_ArchiveName_Error();
-public:
-  MY_QUERYINTERFACE_BEGIN2(IFolderArchiveExtractCallback)
-  MY_QUERYINTERFACE_ENTRY(IFolderArchiveExtractCallback2)
-  #ifndef _SFX
-  MY_QUERYINTERFACE_ENTRY(IFolderOperationsExtractCallback)
-  MY_QUERYINTERFACE_ENTRY(IFolderExtractToStreamCallback)
-  MY_QUERYINTERFACE_ENTRY(ICompressProgressInfo)
-  #endif
-  #ifndef _NO_CRYPTO
-  MY_QUERYINTERFACE_ENTRY(ICryptoGetTextPassword)
-  #endif
-  MY_QUERYINTERFACE_END
-  MY_ADDREF_RELEASE
-
-  INTERFACE_IProgress(;)
-  INTERFACE_IOpenCallbackUI(;)
-  INTERFACE_IFolderArchiveExtractCallback(;)
-  INTERFACE_IFolderArchiveExtractCallback2(;)
-  // STDMETHOD(SetTotalFiles)(UInt64 total);
-  // STDMETHOD(SetCompletedFiles)(const UInt64 *value);
-
-  INTERFACE_IExtractCallbackUI(;)
-
-  #ifndef _SFX
-  // IFolderOperationsExtractCallback
-  STDMETHOD(AskWrite)(
-      const wchar_t *srcPath,
-      Int32 srcIsFolder,
-      const FILETIME *srcTime,
-      const UInt64 *srcSize,
-      const wchar_t *destPathRequest,
-      BSTR *destPathResult,
-      Int32 *writeAnswer);
-  STDMETHOD(ShowMessage)(const wchar_t *message);
-  STDMETHOD(SetCurrentFilePath)(const wchar_t *filePath);
-  STDMETHOD(SetNumFiles)(UInt64 numFiles);
-  INTERFACE_IFolderExtractToStreamCallback(;)
-  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
-  #endif
+  Z7_COM_QI_BEGIN2(IFolderArchiveExtractCallback)
+  Z7_COM_QI_ENTRY(IFolderArchiveExtractCallback2)
+ #ifndef Z7_SFX
+  Z7_COM_QI_ENTRY(IFolderOperationsExtractCallback)
+  Z7_COM_QI_ENTRY(IFolderExtractToStreamCallback)
+  Z7_COM_QI_ENTRY(ICompressProgressInfo)
+ #endif
+ #ifndef Z7_NO_CRYPTO
+  Z7_COM_QI_ENTRY(ICryptoGetTextPassword)
+ #endif
+  Z7_COM_QI_END
+  Z7_COM_ADDREF_RELEASE
+
+  Z7_IFACE_IMP(IExtractCallbackUI)
+  Z7_IFACE_IMP(IOpenCallbackUI)
+  Z7_IFACE_COM7_IMP(IProgress)
+  Z7_IFACE_COM7_IMP(IFolderArchiveExtractCallback)
+  Z7_IFACE_COM7_IMP(IFolderArchiveExtractCallback2)
+ #ifndef Z7_SFX
+  Z7_IFACE_COM7_IMP(IFolderOperationsExtractCallback)
+  Z7_IFACE_COM7_IMP(IFolderExtractToStreamCallback)
+  Z7_IFACE_COM7_IMP(ICompressProgressInfo)
+ #endif
+ #ifndef Z7_NO_CRYPTO
+  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword)
+ #endif
 
-  // ICryptoGetTextPassword
-  #ifndef _NO_CRYPTO
-  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
-  #endif
 
-private:
   UString _currentArchivePath;
   bool _needWriteArchivePath;
 
-  UString _currentFilePath;
   bool _isFolder;
+  UString _currentFilePath;
+  UString _filePath;
 
+ #ifndef Z7_SFX
+  bool _needUpdateStat;
+  bool _newVirtFileWasAdded;
   bool _isAltStream;
+  bool _curSize_Defined;
   UInt64 _curSize;
-  bool _curSizeDefined;
-  UString _filePath;
   // bool _extractMode;
   // bool _testMode;
-  bool _newVirtFileWasAdded;
-  bool _needUpdateStat;
-
-
-  HRESULT SetCurrentFilePath2(const wchar_t *filePath);
-  void AddError_Message(LPCWSTR message);
-
-  #ifndef _SFX
   bool _hashStreamWasUsed;
   COutStreamWithHash *_hashStreamSpec;
   CMyComPtr<ISequentialOutStream> _hashStream;
   IHashCalc *_hashCalc; // it's for stat in Test operation
-  #endif
+ #endif
+
+  HRESULT SetCurrentFilePath2(const wchar_t *filePath);
+  void AddError_Message(LPCWSTR message);
+  HRESULT MessageError(const char *message, const FString &path);
+  void Add_ArchiveName_Error();
 
 public:
 
-  #ifndef _SFX
+  #ifndef Z7_SFX
   CVirtFileSystem *VirtFileSystemSpec;
   CMyComPtr<ISequentialOutStream> VirtFileSystem;
   #endif
@@ -263,7 +246,7 @@ public:
   bool StreamMode;
 
   CProgressDialog *ProgressDialog;
-  #ifndef _SFX
+  #ifndef Z7_SFX
   UInt64 NumFolders;
   UInt64 NumFiles;
   bool NeedAddFile;
@@ -272,7 +255,7 @@ public:
   bool ThereAreMessageErrors;
   NExtract::NOverwriteMode::EEnum OverwriteMode;
 
-  #ifndef _NO_CRYPTO
+  #ifndef Z7_NO_CRYPTO
   bool PasswordIsDefined;
   bool PasswordWasAsked;
   UString Password;
@@ -290,13 +273,13 @@ public:
   bool MultiArcMode;
 
   CExtractCallbackImp():
-    #ifndef _SFX
+    #ifndef Z7_SFX
     _hashCalc(NULL),
     #endif
     ProcessAltStreams(true),
     StreamMode(false),
     OverwriteMode(NExtract::NOverwriteMode::kAsk),
-    #ifndef _NO_CRYPTO
+    #ifndef Z7_NO_CRYPTO
     PasswordIsDefined(false),
     PasswordWasAsked(false),
     #endif
@@ -308,7 +291,7 @@ public:
   ~CExtractCallbackImp();
   void Init();
 
-  #ifndef _SFX
+  #ifndef Z7_SFX
   void SetHashCalc(IHashCalc *hashCalc) { _hashCalc = hashCalc; }
 
   void SetHashMethods(IHashCalc *hash)
diff --git a/CPP/7zip/UI/FileManager/FM.cpp b/CPP/7zip/UI/FileManager/FM.cpp
index 812eff6..13189a7 100644
--- a/CPP/7zip/UI/FileManager/FM.cpp
+++ b/CPP/7zip/UI/FileManager/FM.cpp
@@ -4,8 +4,13 @@
 
 #include "../../../Common/MyWindows.h"
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <shlwapi.h>
+#else
 #include <Shlwapi.h>
+#endif
 
+#include "../../../../C/Compiler.h"
 #include "../../../../C/Alloc.h"
 #ifdef _WIN32
 #include "../../../../C/DllSecur.h"
@@ -46,7 +51,9 @@ extern
 bool g_RAM_Size_Defined;
 bool g_RAM_Size_Defined;
 
-static bool g_LargePagesMode = false;
+extern
+bool g_LargePagesMode;
+bool g_LargePagesMode = false;
 // static bool g_OpenArchive = false;
 
 static bool g_Maximized = false;
@@ -78,20 +85,23 @@ DWORD g_ComCtl32Version;
 static DWORD GetDllVersion(LPCTSTR dllName)
 {
   DWORD dwVersion = 0;
-  HINSTANCE hinstDll = LoadLibrary(dllName);
-  if (hinstDll)
+  const HMODULE hmodule = LoadLibrary(dllName);
+  if (hmodule)
   {
-    DLLGETVERSIONPROC pDllGetVersion = (DLLGETVERSIONPROC)(void *)GetProcAddress(hinstDll, "DllGetVersion");
-    if (pDllGetVersion)
+    const
+     DLLGETVERSIONPROC f_DllGetVersion = Z7_GET_PROC_ADDRESS(
+     DLLGETVERSIONPROC, hmodule,
+    "DllGetVersion");
+    if (f_DllGetVersion)
     {
       DLLVERSIONINFO dvi;
       ZeroMemory(&dvi, sizeof(dvi));
       dvi.cbSize = sizeof(dvi);
-      HRESULT hr = (*pDllGetVersion)(&dvi);
+      const HRESULT hr = f_DllGetVersion(&dvi);
       if (SUCCEEDED(hr))
-        dwVersion = MAKELONG(dvi.dwMinorVersion, dvi.dwMajorVersion);
+        dwVersion = (DWORD)MAKELONG(dvi.dwMinorVersion, dvi.dwMajorVersion);
     }
-    FreeLibrary(hinstDll);
+    FreeLibrary(hmodule);
   }
   return dwVersion;
 }
@@ -180,7 +190,7 @@ CApp g_App;
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
-static const wchar_t * const kWindowClass = L"FM";
+static const wchar_t * const kWindowClass = L"7-Zip::FM";
 
 #ifdef UNDER_CE
 #define WS_OVERLAPPEDWINDOW ( \
@@ -222,7 +232,7 @@ static BOOL InitInstance(int nCmdShow)
   wc.hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_ICON));
 
   // wc.hCursor = LoadCursor (NULL, IDC_ARROW);
-  wc.hCursor = ::LoadCursor(0, IDC_SIZEWE);
+  wc.hCursor = ::LoadCursor(NULL, IDC_SIZEWE);
   // wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
   wc.hbrBackground = (HBRUSH) (COLOR_BTNFACE + 1);
 
@@ -236,7 +246,8 @@ static BOOL InitInstance(int nCmdShow)
 
   wc.lpszClassName = kWindowClass;
 
-  MyRegisterClass(&wc);
+  if (MyRegisterClass(&wc) == 0)
+    return FALSE;
 
   // RECT rect;
   // GetClientRect(hWnd, &rect);
@@ -305,7 +316,7 @@ static BOOL InitInstance(int nCmdShow)
   {
     if (windowPosIsRead)
       placement.rcNormalPosition = info.rect;
-    placement.showCmd = nCmdShow;
+    placement.showCmd = (UINT)nCmdShow;
     wnd.SetPlacement(&placement);
   }
   else
@@ -343,6 +354,8 @@ static void GetCommands(const UString &aCommandLine, UString &aCommands)
 
 #if defined(_WIN32) && !defined(_WIN64) && !defined(UNDER_CE)
 
+extern
+bool g_Is_Wow64;
 bool g_Is_Wow64;
 
 typedef BOOL (WINAPI *Func_IsWow64Process)(HANDLE, PBOOL);
@@ -350,18 +363,27 @@ typedef BOOL (WINAPI *Func_IsWow64Process)(HANDLE, PBOOL);
 static void Set_Wow64()
 {
   g_Is_Wow64 = false;
-  Func_IsWow64Process fnIsWow64Process = (Func_IsWow64Process)(void *)GetProcAddress(
-      GetModuleHandleA("kernel32.dll"), "IsWow64Process");
-  if (fnIsWow64Process)
+  const
+  Func_IsWow64Process fn = Z7_GET_PROC_ADDRESS(
+  Func_IsWow64Process, GetModuleHandleA("kernel32.dll"),
+      "IsWow64Process");
+  if (fn)
   {
     BOOL isWow;
-    if (fnIsWow64Process(GetCurrentProcess(), &isWow))
+    if (fn(GetCurrentProcess(), &isWow))
       g_Is_Wow64 = (isWow != FALSE);
   }
 }
 
 #endif
 
+#if _MSC_VER > 1400 /* && _MSC_VER <= 1900 */
+  // GetVersion was declared deprecated
+  #pragma warning(disable : 4996)
+#endif
+#ifdef __clang__
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 
 bool IsLargePageSupported();
 bool IsLargePageSupported()
@@ -369,18 +391,17 @@ bool IsLargePageSupported()
   #ifdef _WIN64
   return true;
   #else
-  OSVERSIONINFO vi;
-  vi.dwOSVersionInfoSize = sizeof(vi);
-  if (!::GetVersionEx(&vi))
-    return false;
-  if (vi.dwPlatformId != VER_PLATFORM_WIN32_NT)
-    return false;
-  if (vi.dwMajorVersion < 5) return false;
-  if (vi.dwMajorVersion > 5) return true;
-  if (vi.dwMinorVersion < 1) return false;
-  if (vi.dwMinorVersion > 1) return true;
-  // return g_Is_Wow64;
-  return false;
+
+  DWORD v = GetVersion();
+  // low byte is major version:
+  // next byte is minor version:
+  v = ((v & 0xff) << 8) | ((v >> 8) & 0xFF);
+  return (v > 0x501);
+  // if ((Byte)v < 5) return false;
+  // if ((Byte)v > 5) return true;
+  // return ((Byte)(v >> 8) > 1);
+  /* large pages work in 5.1 (XP-32bit) if it's (g_Is_Wow64) mode;
+     but here we don't enable them in (XP-32bit). */
   #endif
 }
 
@@ -407,12 +428,10 @@ bool g_SymLink_Supported = false;
 
 static void Set_SymLink_Supported()
 {
-  g_SymLink_Supported = false;
-  OSVERSIONINFO vi;
-  vi.dwOSVersionInfoSize = sizeof(vi);
-  if (!::GetVersionEx(&vi))
-    return;
-  if (vi.dwPlatformId != VER_PLATFORM_WIN32_NT || vi.dwMajorVersion < 6)
+  // g_SymLink_Supported = false;
+  const DWORD v = GetVersion();
+  // low byte is major version:
+  if ((Byte)v < 6)
     return;
   g_SymLink_Supported = true;
   // if (g_SymLink_Supported)
@@ -444,7 +463,7 @@ static const CSwitchForm kSwitchForms[kNumSwitches] =
 
 static void ErrorMessage(const wchar_t *s)
 {
-  MessageBoxW(0, s, L"7-Zip", MB_ICONERROR);
+  MessageBoxW(NULL, s, L"7-Zip", MB_ICONERROR);
 }
 
 static void ErrorMessage(const char *s)
@@ -488,11 +507,15 @@ static int WINAPI WinMain2(int nCmdShow)
   */
 
   NT_CHECK
+  #ifdef Z7_LARGE_PAGES
   SetLargePageSize();
+  #endif
 
   #endif
 
+  #ifdef Z7_LANG
   LoadLangOneTime();
+  #endif
 
   InitCommonControls();
 
@@ -516,7 +539,7 @@ static int WINAPI WinMain2(int nCmdShow)
   // NCOM::CComInitializer comInitializer;
 
   UString commandsString;
-  // MessageBoxW(0, GetCommandLineW(), L"", 0);
+  // MessageBoxW(NULL, GetCommandLineW(), L"", 0);
 
   #ifdef UNDER_CE
   commandsString = GetCommandLineW();
@@ -577,7 +600,7 @@ static int WINAPI WinMain2(int nCmdShow)
     g_MainPath = paramString;
     // return WinMain2(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
 
-    // MessageBoxW(0, paramString, L"", 0);
+    // MessageBoxW(NULL, paramString, L"", 0);
   }
   /*
   UStringVector commandStrings;
@@ -608,7 +631,7 @@ static int WINAPI WinMain2(int nCmdShow)
   Set_SymLink_Supported();
   #endif
 
-  g_App.ReloadLang();
+  g_App.ReloadLangItems();
 
   MSG msg;
   if (!InitInstance (nCmdShow))
@@ -654,7 +677,7 @@ static int WINAPI WinMain2(int nCmdShow)
   // But we suppose that it's better to release DLLs here (before destructor).
   FreeGlobalCodecs();
 
-  g_HWND = 0;
+  g_HWND = NULL;
   #ifndef UNDER_CE
   OleUninitialize();
   #endif
@@ -714,7 +737,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
   catch(int v)
   {
     AString e ("Error: ");
-    e.Add_UInt32(v);
+    e.Add_UInt32((unsigned)v);
     ErrorMessage(e);
     return 1;
   }
@@ -748,7 +771,7 @@ static void SaveWindowInfo(HWND aWnd)
   
   info.numPanels = g_App.NumPanels;
   info.currentPanel = g_App.LastFocusedPanel;
-  info.splitterPos = g_Splitter.GetPos();
+  info.splitterPos = (unsigned)g_Splitter.GetPos();
 
   info.Save();
 }
@@ -825,23 +848,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         WS_CHILD | WS_BORDER | WS_VISIBLE | TBSTYLE_TOOLTIPS, //  | TBSTYLE_FLAT
         baseID + 2, 11,
         (HINSTANCE)HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR,
-        (LPCTBBUTTON)&tbb, ARRAY_SIZE(tbb),
+        (LPCTBBUTTON)&tbb, Z7_ARRAY_SIZE(tbb),
         0, 0, 100, 30, sizeof (TBBUTTON)));
       */
       // HCURSOR cursor = ::LoadCursor(0, IDC_SIZEWE);
       // ::SetCursor(cursor);
 
       if (g_PanelsInfoDefined)
-        g_Splitter.SetPos(hWnd, g_SplitterPos);
+        g_Splitter.SetPos(hWnd, (int)g_SplitterPos);
       else
       {
         g_Splitter.SetRatio(hWnd, kSplitterRateMax / 2);
-        g_SplitterPos = g_Splitter.GetPos();
+        g_SplitterPos = (unsigned)g_Splitter.GetPos();
       }
 
       RECT rect;
       ::GetClientRect(hWnd, &rect);
-      int xSize = rect.right;
+      const int xSize = rect.right;
       int xSizes[2];
       xSizes[0] = g_Splitter.GetPos();
       xSizes[1] = xSize - kSplitterWidth - xSizes[0];
@@ -954,7 +977,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         g_Splitter.SetPosFromRatio(hWnd);
       else
       {
-        g_Splitter.SetPos(hWnd, g_SplitterPos );
+        g_Splitter.SetPos(hWnd, (int)g_SplitterPos );
         g_CanChangeSplitter = true;
       }
       
@@ -1047,7 +1070,7 @@ void CApp::MoveSubWindows()
 {
   HWND hWnd = _window;
   RECT rect;
-  if (hWnd == 0)
+  if (!hWnd)
     return;
   ::GetClientRect(hWnd, &rect);
   int xSize = rect.right;
diff --git a/CPP/7zip/UI/FileManager/FM.dsp b/CPP/7zip/UI/FileManager/FM.dsp
index a12d330..1ae054d 100644
--- a/CPP/7zip/UI/FileManager/FM.dsp
+++ b/CPP/7zip/UI/FileManager/FM.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /D "SUPPORT_DEVICE_FILE" /FAcs /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS" /D "Z7_DEVICE_FILE" /FAcs /Yu"StdAfx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -99,7 +99,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"StdAfx.h" /FD /c
-# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -127,7 +127,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c
-# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -707,6 +707,10 @@ SOURCE=..\..\..\..\C\7zTypes.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\7zWindows.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\Alloc.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -716,6 +720,10 @@ SOURCE=..\..\..\..\C\Alloc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\Compiler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\CpuArch.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -1112,6 +1120,10 @@ SOURCE=..\..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyInitGuid.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyString.cpp
 # End Source File
 # Begin Source File
@@ -1132,6 +1144,10 @@ SOURCE=..\..\..\Common\MyVector.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyWindows.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -1431,6 +1447,14 @@ SOURCE=..\Explorer\MyExplorerCommand.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\Explorer\MyMessages.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\Explorer\MyMessages.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\Explorer\RegistryContextMenu.cpp
 # End Source File
 # Begin Source File
diff --git a/CPP/7zip/UI/FileManager/FM.mak b/CPP/7zip/UI/FileManager/FM.mak
index 8b3d97a..8331285 100644
--- a/CPP/7zip/UI/FileManager/FM.mak
+++ b/CPP/7zip/UI/FileManager/FM.mak
@@ -1,12 +1,11 @@
 CFLAGS = $(CFLAGS) \
-  -DLANG \
-  -DNEW_FOLDER_INTERFACE \
+  -DZ7_LANG \
 
 !IFDEF UNDER_CE
 LIBS = $(LIBS) ceshell.lib Commctrl.lib
 !ELSE
 LIBS = $(LIBS) comctl32.lib htmlhelp.lib comdlg32.lib Mpr.lib Gdi32.lib
-CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -DSUPPORT_DEVICE_FILE
+CFLAGS = $(CFLAGS) -DZ7_LONG_PATH -DZ7_DEVICE_FILE
 LFLAGS = $(LFLAGS) /DELAYLOAD:mpr.dll
 LIBS = $(LIBS) delayimp.lib
 !ENDIF
@@ -47,7 +46,6 @@ FM_OBJS = \
   $O\ProgramLocation.obj \
   $O\PropertyName.obj \
   $O\RegistryAssociations.obj \
-  $O\RegistryPlugins.obj \
   $O\RegistryUtils.obj \
   $O\RootFolder.obj \
   $O\SplitUtils.obj \
@@ -98,3 +96,5 @@ AGENT_OBJS = \
   $O\ArchiveFolderOpen.obj \
   $O\ArchiveFolderOut.obj \
   $O\UpdateCallbackAgent.obj \
+
+# we need empty line after last line above
diff --git a/CPP/7zip/UI/FileManager/FSDrives.cpp b/CPP/7zip/UI/FileManager/FSDrives.cpp
index c563907..985d7c4 100644
--- a/CPP/7zip/UI/FileManager/FSDrives.cpp
+++ b/CPP/7zip/UI/FileManager/FSDrives.cpp
@@ -41,7 +41,7 @@ FString CDriveInfo::GetDeviceFileIoName() const
 struct CPhysTempBuffer
 {
   void *buffer;
-  CPhysTempBuffer(): buffer(0) {}
+  CPhysTempBuffer(): buffer(NULL) {}
   ~CPhysTempBuffer() { MidFree(buffer); }
 };
 
@@ -50,22 +50,22 @@ static HRESULT CopyFileSpec(CFSTR fromPath, CFSTR toPath, bool writeToDisk, UInt
 {
   NIO::CInFile inFile;
   if (!inFile.Open(fromPath))
-    return GetLastError();
+    return GetLastError_noZero_HRESULT();
   if (fileSize == (UInt64)(Int64)-1)
   {
     if (!inFile.GetLength(fileSize))
-      ::GetLastError();
+      return GetLastError_noZero_HRESULT();
   }
   
   NIO::COutFile outFile;
   if (writeToDisk)
   {
     if (!outFile.Open(toPath, FILE_SHARE_WRITE, OPEN_EXISTING, 0))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
   }
   else
     if (!outFile.Create(toPath, true))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
   
   CPhysTempBuffer tempBuffer;
   tempBuffer.buffer = MidAlloc(bufferSize);
@@ -75,12 +75,12 @@ static HRESULT CopyFileSpec(CFSTR fromPath, CFSTR toPath, bool writeToDisk, UInt
   for (UInt64 pos = 0; pos < fileSize;)
   {
     UInt64 progressCur = progressStart + pos;
-    RINOK(progress->SetCompleted(&progressCur));
+    RINOK(progress->SetCompleted(&progressCur))
     UInt64 rem = fileSize - pos;
     UInt32 curSize = (UInt32)MyMin(rem, (UInt64)bufferSize);
     UInt32 processedSize;
     if (!inFile.Read(tempBuffer.buffer, curSize, processedSize))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
     if (processedSize == 0)
       break;
     curSize = processedSize;
@@ -93,7 +93,7 @@ static HRESULT CopyFileSpec(CFSTR fromPath, CFSTR toPath, bool writeToDisk, UInt
     }
 
     if (!outFile.Write(tempBuffer.buffer, curSize, processedSize))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
     if (curSize != processedSize)
       return E_FAIL;
     pos += curSize;
@@ -125,7 +125,7 @@ static const char * const kDriveTypes[] =
   , "RAM disk"
 };
 
-STDMETHODIMP CFSDrives::LoadItems()
+Z7_COM7F_IMF(CFSDrives::LoadItems())
 {
   _drives.Clear();
 
@@ -209,13 +209,13 @@ STDMETHODIMP CFSDrives::LoadItems()
   return S_OK;
 }
 
-STDMETHODIMP CFSDrives::GetNumberOfItems(UInt32 *numItems)
+Z7_COM7F_IMF(CFSDrives::GetNumberOfItems(UInt32 *numItems))
 {
   *numItems = _drives.Size();
   return S_OK;
 }
 
-STDMETHODIMP CFSDrives::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CFSDrives::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value))
 {
   if (itemIndex >= (UInt32)_drives.Size())
     return E_INVALIDARG;
@@ -239,7 +239,7 @@ STDMETHODIMP CFSDrives::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT
     case kpidFreeSpace:   if (di.KnownSizes) prop = di.FreeSpace; break;
     case kpidClusterSize: if (di.KnownSizes) prop = di.ClusterSize; break;
     case kpidType:
-      if (di.DriveType < ARRAY_SIZE(kDriveTypes))
+      if (di.DriveType < Z7_ARRAY_SIZE(kDriveTypes))
         prop = kDriveTypes[di.DriveType];
       break;
     case kpidVolumeName:  prop = di.VolumeName; break;
@@ -251,7 +251,7 @@ STDMETHODIMP CFSDrives::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT
 
 HRESULT CFSDrives::BindToFolderSpec(CFSTR name, IFolderFolder **resultFolder)
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   if (_volumeMode)
     return S_OK;
   NFsFolder::CFSFolder *fsFolderSpec = new NFsFolder::CFSFolder;
@@ -260,14 +260,14 @@ HRESULT CFSDrives::BindToFolderSpec(CFSTR name, IFolderFolder **resultFolder)
   if (_superMode)
     path = kSuperPrefix;
   path += name;
-  RINOK(fsFolderSpec->Init(path));
+  RINOK(fsFolderSpec->Init(path))
   *resultFolder = subFolder.Detach();
   return S_OK;
 }
 
-STDMETHODIMP CFSDrives::BindToFolder(UInt32 index, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSDrives::BindToFolder(UInt32 index, IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   if (index >= (UInt32)_drives.Size())
     return E_INVALIDARG;
   const CDriveInfo &di = _drives[index];
@@ -285,20 +285,20 @@ STDMETHODIMP CFSDrives::BindToFolder(UInt32 index, IFolderFolder **resultFolder)
   return BindToFolderSpec(di.FullSystemName, resultFolder);
 }
 
-STDMETHODIMP CFSDrives::BindToFolder(const wchar_t *name, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSDrives::BindToFolder(const wchar_t *name, IFolderFolder **resultFolder))
 {
   return BindToFolderSpec(us2fs(name), resultFolder);
 }
 
-STDMETHODIMP CFSDrives::BindToParentFolder(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSDrives::BindToParentFolder(IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   return S_OK;
 }
 
 IMP_IFolderFolder_Props(CFSDrives)
 
-STDMETHODIMP CFSDrives::GetFolderProperty(PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CFSDrives::GetFolderProperty(PROPID propID, PROPVARIANT *value))
 {
   COM_TRY_BEGIN
   NCOM::CPropVariant prop;
@@ -320,7 +320,7 @@ STDMETHODIMP CFSDrives::GetFolderProperty(PROPID propID, PROPVARIANT *value)
 }
 
 
-STDMETHODIMP CFSDrives::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
+Z7_COM7F_IMF(CFSDrives::GetSystemIconIndex(UInt32 index, Int32 *iconIndex))
 {
   *iconIndex = 0;
   const CDriveInfo &di = _drives[index];
@@ -332,39 +332,64 @@ STDMETHODIMP CFSDrives::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
     *iconIndex = iconIndexTemp;
     return S_OK;
   }
-  return GetLastError();
+  return GetLastError_noZero_HRESULT();
 }
 
 void CFSDrives::AddExt(FString &s, unsigned index) const
 {
-  s += '.';
+  s.Add_Dot();
   const CDriveInfo &di = _drives[index];
+  UString n = di.FileSystemName;
+  n.MakeLower_Ascii();
   const char *ext;
   if (di.DriveType == DRIVE_CDROM)
     ext = "iso";
-  else if (di.FileSystemName.IsPrefixedBy_Ascii_NoCase("NTFS"))
-    ext = "ntfs";
-  else if (di.FileSystemName.IsPrefixedBy_Ascii_NoCase("FAT"))
-    ext = "fat";
   else
+  {
+    unsigned i;
+    for (i = 0; i < n.Len(); i++)
+    {
+      const wchar_t c = n[i];
+      if (c < 'a' || c > 'z')
+        break;
+    }
+    if (i != 0)
+    {
+      n.DeleteFrom(i);
+      s += us2fs(n);
+      return;
+    }
     ext = "img";
+  }
+  /*
+       if (n.IsPrefixedBy_Ascii_NoCase("NTFS")) ext = "ntfs";
+  else if (n.IsPrefixedBy_Ascii_NoCase("UDF")) ext = "udf";
+  else if (n.IsPrefixedBy_Ascii_NoCase("exFAT")) ext = "exfat";
+  */
   s += ext;
 }
 
-HRESULT CFSDrives::GetFileSize(unsigned index, UInt64 &fileSize) const
+HRESULT CFSDrives::GetFileSize(unsigned index, UInt64& fileSize) const
 {
+#ifdef Z7_DEVICE_FILE
   NIO::CInFile inFile;
   if (!inFile.Open(_drives[index].GetDeviceFileIoName()))
-    return GetLastError();
-  if (!inFile.SizeDefined)
-    return E_FAIL;
-  fileSize = inFile.Size;
-  return S_OK;
+    return GetLastError_noZero_HRESULT();
+  if (inFile.SizeDefined)
+  {
+    fileSize = inFile.Size;
+    return S_OK;
+  }
+#else
+  UNUSED_VAR(index)
+#endif
+  fileSize = 0;
+  return E_FAIL;
 }
 
-STDMETHODIMP CFSDrives::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems,
+Z7_COM7F_IMF(CFSDrives::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems,
     Int32 /* includeAltStreams */, Int32 /* replaceAltStreamColon */,
-    const wchar_t *path, IFolderOperationsExtractCallback *callback)
+    const wchar_t *path, IFolderOperationsExtractCallback *callback))
 {
   if (numItems == 0)
     return S_OK;
@@ -383,8 +408,8 @@ STDMETHODIMP CFSDrives::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 num
     if (di.KnownSize)
       totalSize += di.DriveSize;
   }
-  RINOK(callback->SetTotal(totalSize));
-  RINOK(callback->SetNumFiles(numItems));
+  RINOK(callback->SetTotal(totalSize))
+  RINOK(callback->SetNumFiles(numItems))
   
   FString destPath = us2fs(path);
   if (destPath.IsEmpty())
@@ -400,8 +425,7 @@ STDMETHODIMP CFSDrives::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 num
   }
 
   UInt64 completedSize = 0;
-  RINOK(callback->SetCompleted(&completedSize));
-  
+  RINOK(callback->SetCompleted(&completedSize))
   for (i = 0; i < numItems; i++)
   {
     unsigned index = indices[i];
@@ -429,66 +453,66 @@ STDMETHODIMP CFSDrives::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 num
     if (!di.KnownSize)
     {
       totalSize += fileSize;
-      RINOK(callback->SetTotal(totalSize));
+      RINOK(callback->SetTotal(totalSize))
     }
     
     Int32 writeAskResult;
     CMyComBSTR destPathResult;
     RINOK(callback->AskWrite(fs2us(srcPath), BoolToInt(false), NULL, &fileSize,
-        fs2us(destPath2), &destPathResult, &writeAskResult));
+        fs2us(destPath2), &destPathResult, &writeAskResult))
 
     if (!IntToBool(writeAskResult))
     {
       if (totalSize >= fileSize)
         totalSize -= fileSize;
-      RINOK(callback->SetTotal(totalSize));
+      RINOK(callback->SetTotal(totalSize))
       continue;
     }
     
-    RINOK(callback->SetCurrentFilePath(fs2us(srcPath)));
+    RINOK(callback->SetCurrentFilePath(fs2us(srcPath)))
     
-    static const UInt32 kBufferSize = (4 << 20);
-    UInt32 bufferSize = (di.DriveType == DRIVE_REMOVABLE) ? (18 << 10) * 4 : kBufferSize;
-    RINOK(CopyFileSpec(srcPath, us2fs(destPathResult), false, fileSize, bufferSize, completedSize, callback));
+    const UInt32 kBufferSize = (4 << 20);
+    const UInt32 bufferSize = (di.DriveType == DRIVE_REMOVABLE) ? (18 << 10) * 4 : kBufferSize;
+    RINOK(CopyFileSpec(srcPath, us2fs(destPathResult), false, fileSize, bufferSize, completedSize, callback))
     completedSize += fileSize;
   }
 
   return S_OK;
 }
 
-STDMETHODIMP CFSDrives::CopyFrom(Int32 /* moveMode */, const wchar_t * /* fromFolderPath */,
-    const wchar_t * const * /* itemsPaths */, UInt32 /* numItems */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::CopyFrom(Int32 /* moveMode */, const wchar_t * /* fromFolderPath */,
+    const wchar_t * const * /* itemsPaths */, UInt32 /* numItems */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSDrives::CopyFromFile(UInt32 /* index */, const wchar_t * /* fullFilePath */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::CopyFromFile(UInt32 /* index */, const wchar_t * /* fullFilePath */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSDrives::CreateFolder(const wchar_t * /* name */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::CreateFolder(const wchar_t * /* name */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSDrives::CreateFile(const wchar_t * /* name */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::CreateFile(const wchar_t * /* name */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSDrives::Rename(UInt32 /* index */, const wchar_t * /* newName */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::Rename(UInt32 /* index */, const wchar_t * /* newName */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSDrives::Delete(const UInt32 * /* indices */, UInt32 /* numItems */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::Delete(const UInt32 * /* indices */, UInt32 /* numItems */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSDrives::SetProperty(UInt32 /* index */, PROPID /* propID */,
-    const PROPVARIANT * /* value */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSDrives::SetProperty(UInt32 /* index */, PROPID /* propID */,
+    const PROPVARIANT * /* value */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
diff --git a/CPP/7zip/UI/FileManager/FSDrives.h b/CPP/7zip/UI/FileManager/FSDrives.h
index f12e4da..8ae831c 100644
--- a/CPP/7zip/UI/FileManager/FSDrives.h
+++ b/CPP/7zip/UI/FileManager/FSDrives.h
@@ -1,7 +1,7 @@
 // FSDrives.h
 
-#ifndef __FS_DRIVES_H
-#define __FS_DRIVES_H
+#ifndef ZIP7_INC_FS_DRIVES_H
+#define ZIP7_INC_FS_DRIVES_H
 
 #include "../../../Common/MyCom.h"
 #include "../../../Common/MyString.h"
@@ -28,12 +28,12 @@ struct CDriveInfo
   CDriveInfo(): KnownSize(false), KnownSizes(false), IsPhysicalDrive(false) {}
 };
 
-class CFSDrives:
-  public IFolderFolder,
-  public IFolderOperations,
-  public IFolderGetSystemIconIndex,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_NOQIB_3(
+  CFSDrives
+  , IFolderFolder
+  , IFolderOperations
+  , IFolderGetSystemIconIndex
+)
   CObjectVector<CDriveInfo> _drives;
   bool _volumeMode;
   bool _superMode;
@@ -42,13 +42,6 @@ class CFSDrives:
   void AddExt(FString &s, unsigned index) const;
   HRESULT GetFileSize(unsigned index, UInt64 &fileSize) const;
 public:
-  MY_UNKNOWN_IMP2(IFolderGetSystemIconIndex, IFolderOperations)
-
-  INTERFACE_FolderFolder(;)
-  INTERFACE_FolderOperations(;)
-
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
-
   void Init(bool volMode = false, bool superMode = false)
   {
     _volumeMode = volMode;
diff --git a/CPP/7zip/UI/FileManager/FSFolder.cpp b/CPP/7zip/UI/FileManager/FSFolder.cpp
index f603061..06c572d 100644
--- a/CPP/7zip/UI/FileManager/FSFolder.cpp
+++ b/CPP/7zip/UI/FileManager/FSFolder.cpp
@@ -2,15 +2,24 @@
 
 #include "StdAfx.h"
 
-#if defined(_MSC_VER)
-#include <winternl.h>
+#ifdef __MINGW32_VERSION
+// #if !defined(_MSC_VER) && (__GNUC__) && (__GNUC__ < 10)
+// for old mingw
+#include <ddk/ntddk.h>
 #else
-#if defined(__GNUC__) && (__GNUC__ >= 10)
-    // new mingw:
+#ifndef Z7_OLD_WIN_SDK
+  #if !defined(_M_IA64)
     #include <winternl.h>
+  #endif
 #else
-    // old mingw:
-    #include <ddk/winddk.h>
+typedef LONG NTSTATUS;
+typedef struct _IO_STATUS_BLOCK {
+    union {
+        NTSTATUS Status;
+        PVOID Pointer;
+    };
+    ULONG_PTR Information;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
 #endif
 #endif
 
@@ -106,7 +115,7 @@ HRESULT CFSFolder::Init(const FString &path /* , IFolderFolder *parentFolder */)
 
   if (!_findChangeNotification.IsHandleAllocated())
   {
-    DWORD lastError = GetLastError();
+    const HRESULT lastError = GetLastError_noZero_HRESULT();
     CFindFile findFile;
     CFileInfo fi;
     FString path2 = _path;
@@ -125,7 +134,7 @@ HRESULT CFsFolderStat::Enumerate()
 {
   if (Progress)
   {
-    RINOK(Progress->SetCompleted(NULL));
+    RINOK(Progress->SetCompleted(NULL))
   }
   Path.Add_PathSepar();
   const unsigned len = Path.Len();
@@ -139,7 +148,7 @@ HRESULT CFsFolderStat::Enumerate()
       NumFolders++;
       Path.DeleteFrom(len);
       Path += fi.Name;
-      RINOK(Enumerate());
+      RINOK(Enumerate())
     }
     else
     {
@@ -166,7 +175,7 @@ bool MyGetCompressedFileSizeW(CFSTR path, UInt64 &size)
       return true;
     }
   }
-  #ifdef WIN_LONG_PATH
+  #ifdef Z7_LONG_PATH
   if (USE_SUPER_PATH)
   {
     UString superPath;
@@ -285,16 +294,16 @@ HRESULT CFSFolder::LoadSubItems(int dirItem, const FString &relPrefix)
 
   const unsigned endIndex = Folders.Size();
   for (unsigned i = startIndex; i < endIndex; i++)
-    LoadSubItems(i, Folders[i]);
+    LoadSubItems((int)i, Folders[i]);
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::LoadItems()
+Z7_COM7F_IMF(CFSFolder::LoadItems())
 {
   Int32 dummy;
   WasChanged(&dummy);
   Clear();
-  RINOK(LoadSubItems(-1, FString()));
+  RINOK(LoadSubItems(-1, FString()))
   _commentsAreLoaded = false;
   return S_OK;
 }
@@ -356,7 +365,7 @@ bool CFSFolder::SaveComments()
   return true;
 }
 
-STDMETHODIMP CFSFolder::GetNumberOfItems(UInt32 *numItems)
+Z7_COM7F_IMF(CFSFolder::GetNumberOfItems(UInt32 *numItems))
 {
   *numItems = Files.Size() /* + Streams.Size() */;
   return S_OK;
@@ -364,9 +373,9 @@ STDMETHODIMP CFSFolder::GetNumberOfItems(UInt32 *numItems)
 
 #ifdef USE_UNICODE_FSTRING
 
-STDMETHODIMP CFSFolder::GetItemPrefix(UInt32 index, const wchar_t **name, unsigned *len)
+Z7_COM7F_IMF(CFSFolder::GetItemPrefix(UInt32 index, const wchar_t **name, unsigned *len))
 {
-  *name = 0;
+  *name = NULL;
   *len = 0;
   /*
   if (index >= Files.Size())
@@ -383,9 +392,9 @@ STDMETHODIMP CFSFolder::GetItemPrefix(UInt32 index, const wchar_t **name, unsign
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetItemName(UInt32 index, const wchar_t **name, unsigned *len)
+Z7_COM7F_IMF(CFSFolder::GetItemName(UInt32 index, const wchar_t **name, unsigned *len))
 {
-  *name = 0;
+  *name = NULL;
   *len = 0;
   if (index < Files.Size())
   {
@@ -405,7 +414,7 @@ STDMETHODIMP CFSFolder::GetItemName(UInt32 index, const wchar_t **name, unsigned
   return S_OK;
 }
 
-STDMETHODIMP_(UInt64) CFSFolder::GetItemSize(UInt32 index)
+Z7_COM7F_IMF2(UInt64, CFSFolder::GetItemSize(UInt32 index))
 {
   /*
   if (index >= Files.Size())
@@ -434,6 +443,8 @@ bool CFSFolder::ReadFileInfo(CDirItem &di)
 }
 
 
+EXTERN_C_BEGIN
+
 typedef struct
 {
   LARGE_INTEGER CreationTime;
@@ -443,37 +454,57 @@ typedef struct
   ULONG FileAttributes;
   UInt32 Reserved; // it's expected for alignment
 }
-MY__FILE_BASIC_INFORMATION;
+Z7_WIN_FILE_BASIC_INFORMATION;
 
 
 typedef enum
 {
-  MY__FileDirectoryInformation = 1,
-  MY__FileFullDirectoryInformation,
-  MY__FileBothDirectoryInformation,
-  MY__FileBasicInformation
+  Z7_WIN_FileDirectoryInformation = 1,
+  Z7_WIN_FileFullDirectoryInformation,
+  Z7_WIN_FileBothDirectoryInformation,
+  Z7_WIN_FileBasicInformation
 }
-MY__FILE_INFORMATION_CLASS;
+Z7_WIN_FILE_INFORMATION_CLASS;
+
 
+#if (_WIN32_WINNT >= 0x0500) && !defined(_M_IA64)
+#define Z7_WIN_NTSTATUS  NTSTATUS
+#define Z7_WIN_IO_STATUS_BLOCK  IO_STATUS_BLOCK
+#else
+typedef LONG Z7_WIN_NTSTATUS;
+typedef struct
+{
+  union
+  {
+    Z7_WIN_NTSTATUS Status;
+    PVOID Pointer;
+  } DUMMYUNIONNAME;
+  ULONG_PTR Information;
+} Z7_WIN_IO_STATUS_BLOCK;
+#endif
 
-typedef NTSTATUS (WINAPI * Func_NtQueryInformationFile)(
-    HANDLE handle, IO_STATUS_BLOCK *io,
-    void *ptr, LONG len, MY__FILE_INFORMATION_CLASS cls);
 
-#define MY__STATUS_SUCCESS 0
+typedef Z7_WIN_NTSTATUS (WINAPI * Func_NtQueryInformationFile)(
+    HANDLE handle, Z7_WIN_IO_STATUS_BLOCK *io,
+    void *ptr, LONG len, Z7_WIN_FILE_INFORMATION_CLASS cls);
+
+#define MY_STATUS_SUCCESS 0
+
+EXTERN_C_END
 
 static Func_NtQueryInformationFile f_NtQueryInformationFile;
 static bool g_NtQueryInformationFile_WasRequested = false;
 
+
 void CFSFolder::ReadChangeTime(CDirItem &di)
 {
   di.ChangeTime_WasRequested = true;
 
   if (!g_NtQueryInformationFile_WasRequested)
   {
-    g_NtQueryInformationFile_WasRequested = true;
-    f_NtQueryInformationFile = (Func_NtQueryInformationFile)
-        My_GetProcAddress(::GetModuleHandleW(L"ntdll.dll"),
+       g_NtQueryInformationFile_WasRequested = true;
+       f_NtQueryInformationFile = Z7_GET_PROC_ADDRESS(
+    Func_NtQueryInformationFile, ::GetModuleHandleW(L"ntdll.dll"),
         "NtQueryInformationFile");
   }
   if (!f_NtQueryInformationFile)
@@ -482,23 +513,23 @@ void CFSFolder::ReadChangeTime(CDirItem &di)
   NIO::CInFile file;
   if (!file.Open_for_ReadAttributes(_path + GetRelPath(di)))
     return;
-  MY__FILE_BASIC_INFORMATION fbi;
-  IO_STATUS_BLOCK IoStatusBlock;
-  const NTSTATUS status = f_NtQueryInformationFile(file.GetHandle(), &IoStatusBlock,
-      &fbi, sizeof(fbi), MY__FileBasicInformation);
-  if (status != MY__STATUS_SUCCESS)
+  Z7_WIN_FILE_BASIC_INFORMATION fbi;
+  Z7_WIN_IO_STATUS_BLOCK IoStatusBlock;
+  const Z7_WIN_NTSTATUS status = f_NtQueryInformationFile(file.GetHandle(), &IoStatusBlock,
+      &fbi, sizeof(fbi), Z7_WIN_FileBasicInformation);
+  if (status != MY_STATUS_SUCCESS)
     return;
   if (IoStatusBlock.Information != sizeof(fbi))
     return;
   di.ChangeTime.dwLowDateTime = fbi.ChangeTime.u.LowPart;
-  di.ChangeTime.dwHighDateTime = fbi.ChangeTime.u.HighPart;
+  di.ChangeTime.dwHighDateTime = (DWORD)fbi.ChangeTime.u.HighPart;
   di.ChangeTime_Defined = true;
 }
 
 #endif // FS_SHOW_LINKS_INFO
 
 
-STDMETHODIMP CFSFolder::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CFSFolder::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value))
 {
   NCOM::CPropVariant prop;
   /*
@@ -622,34 +653,32 @@ STDMETHODIMP CFSFolder::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *va
 // ---------- IArchiveGetRawProps ----------
 
 
-STDMETHODIMP CFSFolder::GetNumRawProps(UInt32 *numProps)
+Z7_COM7F_IMF(CFSFolder::GetNumRawProps(UInt32 *numProps))
 {
   *numProps = 1;
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetRawPropInfo(UInt32 /* index */, BSTR *name, PROPID *propID)
+Z7_COM7F_IMF(CFSFolder::GetRawPropInfo(UInt32 /* index */, BSTR *name, PROPID *propID))
 {
   *name = NULL;
   *propID = kpidNtReparse;
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetParent(UInt32 /* index */, UInt32 * /* parent */, UInt32 * /* parentType */)
+Z7_COM7F_IMF(CFSFolder::GetParent(UInt32 /* index */, UInt32 * /* parent */, UInt32 * /* parentType */))
 {
   return E_FAIL;
 }
 
-STDMETHODIMP CFSFolder::GetRawProp(UInt32
-  #ifndef UNDER_CE
-  index
-  #endif
-  , PROPID
-  #ifndef UNDER_CE
-  propID
-  #endif
-  , const void **data, UInt32 *dataSize, UInt32 *propType)
+Z7_COM7F_IMF(CFSFolder::GetRawProp(UInt32 index, PROPID propID,
+    const void **data, UInt32 *dataSize, UInt32 *propType))
 {
+  #ifdef UNDER_CE
+  UNUSED(index)
+  UNUSED(propID)
+  #endif
+
   *data = NULL;
   *dataSize = 0;
   *propType = 0;
@@ -676,11 +705,11 @@ STDMETHODIMP CFSFolder::GetRawProp(UInt32
 
 static inline CFSTR GetExtensionPtr(const FString &name)
 {
-  int dotPos = name.ReverseFind_Dot();
-  return name.Ptr((dotPos < 0) ? name.Len() : dotPos);
+  const int dotPos = name.ReverseFind_Dot();
+  return name.Ptr((dotPos < 0) ? name.Len() : (unsigned)dotPos);
 }
 
-STDMETHODIMP_(Int32) CFSFolder::CompareItems(UInt32 index1, UInt32 index2, PROPID propID, Int32 /* propIsRaw */)
+Z7_COM7F_IMF2(Int32, CFSFolder::CompareItems(UInt32 index1, UInt32 index2, PROPID propID, Int32 /* propIsRaw */))
 {
   /*
   const CAltStream *ss1 = NULL;
@@ -695,7 +724,7 @@ STDMETHODIMP_(Int32) CFSFolder::CompareItems(UInt32 index1, UInt32 index2, PROPI
   {
     case kpidName:
     {
-      int comp = CompareFileNames_ForFolderList(fi1.Name, fi2.Name);
+      const int comp = CompareFileNames_ForFolderList(fi1.Name, fi2.Name);
       /*
       if (comp != 0)
         return comp;
@@ -783,10 +812,10 @@ STDMETHODIMP_(Int32) CFSFolder::CompareItems(UInt32 index1, UInt32 index2, PROPI
 
 HRESULT CFSFolder::BindToFolderSpec(CFSTR name, IFolderFolder **resultFolder)
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   CFSFolder *folderSpec = new CFSFolder;
   CMyComPtr<IFolderFolder> subFolder = folderSpec;
-  RINOK(folderSpec->Init(_path + name + FCHAR_PATH_SEPARATOR));
+  RINOK(folderSpec->Init(_path + name + FCHAR_PATH_SEPARATOR))
   *resultFolder = subFolder.Detach();
   return S_OK;
 }
@@ -836,23 +865,23 @@ FString CFSFolder::GetRelPath(const CDirItem &item) const
   return Folders[item.Parent] + item.Name;
 }
 
-STDMETHODIMP CFSFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   const CDirItem &fi = Files[index];
   if (!fi.IsDir())
     return E_INVALIDARG;
   return BindToFolderSpec(GetRelPath(fi), resultFolder);
 }
 
-STDMETHODIMP CFSFolder::BindToFolder(const wchar_t *name, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSFolder::BindToFolder(const wchar_t *name, IFolderFolder **resultFolder))
 {
   return BindToFolderSpec(us2fs(name), resultFolder);
 }
 
-STDMETHODIMP CFSFolder::BindToParentFolder(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSFolder::BindToParentFolder(IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   /*
   if (_parentFolder)
   {
@@ -914,17 +943,17 @@ STDMETHODIMP CFSFolder::BindToParentFolder(IFolderFolder **resultFolder)
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetNumberOfProperties(UInt32 *numProperties)
+Z7_COM7F_IMF(CFSFolder::GetNumberOfProperties(UInt32 *numProperties))
 {
-  *numProperties = ARRAY_SIZE(kProps);
+  *numProperties = Z7_ARRAY_SIZE(kProps);
   if (!_flatMode)
     (*numProperties)--;
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetPropertyInfo IMP_IFolderFolder_GetProp(kProps)
+IMP_IFolderFolder_GetProp(CFSFolder::GetPropertyInfo, kProps)
 
-STDMETHODIMP CFSFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CFSFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value))
 {
   COM_TRY_BEGIN
   NWindows::NCOM::CPropVariant prop;
@@ -938,7 +967,7 @@ STDMETHODIMP CFSFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
   COM_TRY_END
 }
 
-STDMETHODIMP CFSFolder::WasChanged(Int32 *wasChanged)
+Z7_COM7F_IMF(CFSFolder::WasChanged(Int32 *wasChanged))
 {
   bool wasChangedMain = false;
 
@@ -961,7 +990,7 @@ STDMETHODIMP CFSFolder::WasChanged(Int32 *wasChanged)
   return S_OK;
 }
  
-STDMETHODIMP CFSFolder::Clone(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CFSFolder::Clone(IFolderFolder **resultFolder))
 {
   CFSFolder *fsFolderSpec = new CFSFolder;
   CMyComPtr<IFolderFolder> folderNew = fsFolderSpec;
@@ -970,35 +999,6 @@ STDMETHODIMP CFSFolder::Clone(IFolderFolder **resultFolder)
   return S_OK;
 }
 
-HRESULT CFSFolder::GetItemsFullSize(const UInt32 *indices, UInt32 numItems, CFsFolderStat &stat)
-{
-  for (UInt32 i = 0; i < numItems; i++)
-  {
-    UInt32 index = indices[i];
-    /*
-    if (index >= Files.Size())
-    {
-      size += Streams[index - Files.Size()].Size;
-      // numFiles++;
-      continue;
-    }
-    */
-    const CDirItem &fi = Files[index];
-    if (fi.IsDir())
-    {
-      stat.Path = _path;
-      stat.Path += GetRelPath(fi);
-      RINOK(stat.Enumerate());
-      stat.NumFolders++;
-    }
-    else
-    {
-      stat.NumFiles++;
-      stat.Size += fi.Size;
-    }
-  }
-  return S_OK;
-}
 
 /*
 HRESULT CFSFolder::GetItemFullSize(unsigned index, UInt64 &size, IProgress *progress)
@@ -1019,7 +1019,7 @@ HRESULT CFSFolder::GetItemFullSize(unsigned index, UInt64 &size, IProgress *prog
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetItemFullSize(UInt32 index, PROPVARIANT *value, IProgress *progress)
+Z7_COM7F_IMF(CFSFolder::GetItemFullSize(UInt32 index, PROPVARIANT *value, IProgress *progress)
 {
   NCOM::CPropVariant prop;
   UInt64 size = 0;
@@ -1030,7 +1030,7 @@ STDMETHODIMP CFSFolder::GetItemFullSize(UInt32 index, PROPVARIANT *value, IProgr
 }
 */
 
-STDMETHODIMP CFSFolder::CalcItemFullSize(UInt32 index, IProgress *progress)
+Z7_COM7F_IMF(CFSFolder::CalcItemFullSize(UInt32 index, IProgress *progress))
 {
   if (index >= (UInt32)Files.Size())
     return S_OK;
@@ -1038,7 +1038,7 @@ STDMETHODIMP CFSFolder::CalcItemFullSize(UInt32 index, IProgress *progress)
   if (!fi.IsDir())
     return S_OK;
   CFsFolderStat stat(_path + GetRelPath(fi), progress);
-  RINOK(stat.Enumerate());
+  RINOK(stat.Enumerate())
   fi.Size = stat.Size;
   fi.NumFolders = stat.NumFolders;
   fi.NumFiles = stat.NumFiles;
@@ -1054,30 +1054,29 @@ void CFSFolder::GetAbsPath(const wchar_t *name, FString &absPath)
   absPath += us2fs(name);
 }
 
-STDMETHODIMP CFSFolder::CreateFolder(const wchar_t *name, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSFolder::CreateFolder(const wchar_t *name, IProgress * /* progress */))
 {
   FString absPath;
   GetAbsPath(name, absPath);
   if (CreateDir(absPath))
     return S_OK;
-  if (::GetLastError() == ERROR_ALREADY_EXISTS)
-    return ::GetLastError();
-  if (!CreateComplexDir(absPath))
-    return ::GetLastError();
-  return S_OK;
+  if (::GetLastError() != ERROR_ALREADY_EXISTS)
+    if (CreateComplexDir(absPath))
+      return S_OK;
+  return GetLastError_noZero_HRESULT();
 }
 
-STDMETHODIMP CFSFolder::CreateFile(const wchar_t *name, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSFolder::CreateFile(const wchar_t *name, IProgress * /* progress */))
 {
   FString absPath;
   GetAbsPath(name, absPath);
   NIO::COutFile outFile;
   if (!outFile.Create(absPath, false))
-    return ::GetLastError();
+    return GetLastError_noZero_HRESULT();
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::Rename(UInt32 index, const wchar_t *newName, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSFolder::Rename(UInt32 index, const wchar_t *newName, IProgress * /* progress */))
 {
   if (index >= (UInt32)Files.Size())
     return E_NOTIMPL;
@@ -1088,13 +1087,13 @@ STDMETHODIMP CFSFolder::Rename(UInt32 index, const wchar_t *newName, IProgress *
   if (fi.Parent >= 0)
     fullPrefix += Folders[fi.Parent];
   if (!MyMoveFile(fullPrefix + fi.Name, fullPrefix + us2fs(newName)))
-    return GetLastError();
+    return GetLastError_noZero_HRESULT();
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::Delete(const UInt32 *indices, UInt32 numItems,IProgress *progress)
+Z7_COM7F_IMF(CFSFolder::Delete(const UInt32 *indices, UInt32 numItems,IProgress *progress))
 {
-  RINOK(progress->SetTotal(numItems));
+  RINOK(progress->SetTotal(numItems))
   // int prevDeletedFileIndex = -1;
   for (UInt32 i = 0; i < numItems; i++)
   {
@@ -1123,15 +1122,15 @@ STDMETHODIMP CFSFolder::Delete(const UInt32 *indices, UInt32 numItems,IProgress
         result = DeleteFileAlways(fullPath);
     }
     if (!result)
-      return GetLastError();
-    UInt64 completed = i;
-    RINOK(progress->SetCompleted(&completed));
+      return GetLastError_noZero_HRESULT();
+    const UInt64 completed = i;
+    RINOK(progress->SetCompleted(&completed))
   }
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::SetProperty(UInt32 index, PROPID propID,
-    const PROPVARIANT *value, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSFolder::SetProperty(UInt32 index, PROPID propID,
+    const PROPVARIANT *value, IProgress * /* progress */))
 {
   if (index >= (UInt32)Files.Size())
     return E_INVALIDARG;
@@ -1169,7 +1168,7 @@ STDMETHODIMP CFSFolder::SetProperty(UInt32 index, PROPID propID,
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
+Z7_COM7F_IMF(CFSFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex))
 {
   if (index >= (UInt32)Files.Size())
     return E_INVALIDARG;
@@ -1181,17 +1180,17 @@ STDMETHODIMP CFSFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
     *iconIndex = iconIndexTemp;
     return S_OK;
   }
-  return GetLastError();
+  return GetLastError_noZero_HRESULT();
 }
 
-STDMETHODIMP CFSFolder::SetFlatMode(Int32 flatMode)
+Z7_COM7F_IMF(CFSFolder::SetFlatMode(Int32 flatMode))
 {
   _flatMode = IntToBool(flatMode);
   return S_OK;
 }
 
 /*
-STDMETHODIMP CFSFolder::SetShowNtfsStreamsMode(Int32 showStreamsMode)
+Z7_COM7F_IMF(CFSFolder::SetShowNtfsStreamsMode(Int32 showStreamsMode)
 {
   _scanAltStreams = IntToBool(showStreamsMode);
   return S_OK;
diff --git a/CPP/7zip/UI/FileManager/FSFolder.h b/CPP/7zip/UI/FileManager/FSFolder.h
index 4f8c344..fe8538a 100644
--- a/CPP/7zip/UI/FileManager/FSFolder.h
+++ b/CPP/7zip/UI/FileManager/FSFolder.h
@@ -1,7 +1,7 @@
 // FSFolder.h
 
-#ifndef __FS_FOLDER_H
-#define __FS_FOLDER_H
+#ifndef ZIP7_INC_FS_FOLDER_H
+#define ZIP7_INC_FS_FOLDER_H
 
 #include "../../../Common/MyCom.h"
 #include "../../../Common/MyBuffer.h"
@@ -78,7 +78,7 @@ struct CFsFolderStat
   HRESULT Enumerate();
 };
 
-class CFSFolder:
+class CFSFolder Z7_final:
   public IFolderFolder,
   public IArchiveGetRawProps,
   public IFolderCompare,
@@ -95,42 +95,36 @@ class CFSFolder:
   // public IFolderSetShowNtfsStreamsMode,
   public CMyUnknownImp
 {
-public:
-  MY_QUERYINTERFACE_BEGIN2(IFolderFolder)
-    MY_QUERYINTERFACE_ENTRY(IArchiveGetRawProps)
-    MY_QUERYINTERFACE_ENTRY(IFolderCompare)
+  Z7_COM_QI_BEGIN2(IFolderFolder)
+    Z7_COM_QI_ENTRY(IArchiveGetRawProps)
+    Z7_COM_QI_ENTRY(IFolderCompare)
     #ifdef USE_UNICODE_FSTRING
-    MY_QUERYINTERFACE_ENTRY(IFolderGetItemName)
+    Z7_COM_QI_ENTRY(IFolderGetItemName)
     #endif
-    MY_QUERYINTERFACE_ENTRY(IFolderWasChanged)
-    // MY_QUERYINTERFACE_ENTRY(IFolderOperationsDeleteToRecycleBin)
-    MY_QUERYINTERFACE_ENTRY(IFolderOperations)
-    MY_QUERYINTERFACE_ENTRY(IFolderCalcItemFullSize)
-    MY_QUERYINTERFACE_ENTRY(IFolderClone)
-    MY_QUERYINTERFACE_ENTRY(IFolderGetSystemIconIndex)
-    MY_QUERYINTERFACE_ENTRY(IFolderSetFlatMode)
-    // MY_QUERYINTERFACE_ENTRY(IFolderSetShowNtfsStreamsMode)
-  MY_QUERYINTERFACE_END
-  MY_ADDREF_RELEASE
-
-
-  INTERFACE_FolderFolder(;)
-  INTERFACE_IArchiveGetRawProps(;)
-  INTERFACE_FolderOperations(;)
-
-  STDMETHOD_(Int32, CompareItems)(UInt32 index1, UInt32 index2, PROPID propID, Int32 propIsRaw);
-
+    Z7_COM_QI_ENTRY(IFolderWasChanged)
+    // Z7_COM_QI_ENTRY(IFolderOperationsDeleteToRecycleBin)
+    Z7_COM_QI_ENTRY(IFolderOperations)
+    Z7_COM_QI_ENTRY(IFolderCalcItemFullSize)
+    Z7_COM_QI_ENTRY(IFolderClone)
+    Z7_COM_QI_ENTRY(IFolderGetSystemIconIndex)
+    Z7_COM_QI_ENTRY(IFolderSetFlatMode)
+    // Z7_COM_QI_ENTRY(IFolderSetShowNtfsStreamsMode)
+  Z7_COM_QI_END
+  Z7_COM_ADDREF_RELEASE
+
+  Z7_IFACE_COM7_IMP(IFolderFolder)
+  Z7_IFACE_COM7_IMP(IArchiveGetRawProps)
+  Z7_IFACE_COM7_IMP(IFolderCompare)
   #ifdef USE_UNICODE_FSTRING
-  INTERFACE_IFolderGetItemName(;)
+  Z7_IFACE_COM7_IMP(IFolderGetItemName)
   #endif
-  STDMETHOD(WasChanged)(Int32 *wasChanged);
-  STDMETHOD(Clone)(IFolderFolder **resultFolder);
-  STDMETHOD(CalcItemFullSize)(UInt32 index, IProgress *progress);
-
-  STDMETHOD(SetFlatMode)(Int32 flatMode);
-  // STDMETHOD(SetShowNtfsStreamsMode)(Int32 showStreamsMode);
-
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
+  Z7_IFACE_COM7_IMP(IFolderWasChanged)
+  Z7_IFACE_COM7_IMP(IFolderOperations)
+  Z7_IFACE_COM7_IMP(IFolderCalcItemFullSize)
+  Z7_IFACE_COM7_IMP(IFolderClone)
+  Z7_IFACE_COM7_IMP(IFolderGetSystemIconIndex)
+  Z7_IFACE_COM7_IMP(IFolderSetFlatMode)
+  // Z7_IFACE_COM7_IMP(IFolderSetShowNtfsStreamsMode)
 
 private:
   FString _path;
@@ -150,9 +144,7 @@ private:
   NWindows::NFile::NFind::CFindChangeNotification _findChangeNotification;
   #endif
 
-  HRESULT GetItemsFullSize(const UInt32 *indices, UInt32 numItems, CFsFolderStat &stat);
-
-  HRESULT GetItemFullSize(unsigned index, UInt64 &size, IProgress *progress);
+  // HRESULT GetItemFullSize(unsigned index, UInt64 &size, IProgress *progress);
   void GetAbsPath(const wchar_t *name, FString &absPath);
   HRESULT BindToFolderSpec(CFSTR name, IFolderFolder **resultFolder);
 
@@ -215,6 +207,15 @@ struct CCopyStateIO
 
 HRESULT SendLastErrorMessage(IFolderOperationsExtractCallback *callback, const FString &fileName);
 
+/* destDirPrefix is allowed to be:
+   "full_path\" or "full_path:" for alt streams */
+
+HRESULT CopyFileSystemItems(
+    const UStringVector &itemsPaths,
+    const FString &destDirPrefix,
+    bool moveMode,
+    IFolderOperationsExtractCallback *callback);
+
 }
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/FSFolderCopy.cpp b/CPP/7zip/UI/FileManager/FSFolderCopy.cpp
index 4ca931b..db4ae0a 100644
--- a/CPP/7zip/UI/FileManager/FSFolderCopy.cpp
+++ b/CPP/7zip/UI/FileManager/FSFolderCopy.cpp
@@ -4,8 +4,6 @@
 
 #include "../../../Common/MyWindows.h"
 
-#include <WinBase.h>
-
 #include "../../../Common/Defs.h"
 #include "../../../Common/StringConvert.h"
 #include "../../../Common/Wildcard.h"
@@ -29,11 +27,11 @@ using namespace NFind;
 extern bool g_IsNT;
 #endif
 
-#define MY_CAST_FUNC  (void(*)())
-// #define MY_CAST_FUNC
-
 namespace NFsFolder {
 
+static const char * const k_CannotCopyDirToAltStream = "Cannot copy folder as alternate stream";
+
+
 HRESULT CCopyStateIO::MyCopyFile(CFSTR inPath, CFSTR outPath, DWORD attrib)
 {
   ErrorFileIndex = -1;
@@ -85,11 +83,15 @@ HRESULT CCopyStateIO::MyCopyFile(CFSTR inPath, CFSTR outPath, DWORD attrib)
       if (Progress)
       {
         UInt64 completed = StartPos + CurrentSize;
-        RINOK(Progress->SetCompleted(&completed));
+        RINOK(Progress->SetCompleted(&completed))
       }
     }
   }
 
+  /* SetFileAttrib("path:alt_stream_name") sets attributes for main file "path".
+     But we don't want to change attributes of main file, when we write alt stream.
+     So we need INVALID_FILE_ATTRIBUTES for alt stream here */
+  
   if (attrib != INVALID_FILE_ATTRIBUTES)
     SetFileAttrib(outPath, attrib);
 
@@ -177,7 +179,7 @@ static DWORD CALLBACK CopyProgressRoutine(
     pi.FileSize = (UInt64)TotalFileSize.QuadPart;
     pi.ProgressResult = pi.Progress->SetTotal(pi.TotalSize);
   }
-  UInt64 completed = pi.StartPos + TotalBytesTransferred.QuadPart;
+  const UInt64 completed = pi.StartPos + (UInt64)TotalBytesTransferred.QuadPart;
   pi.ProgressResult = pi.Progress->SetCompleted(&completed);
   return (pi.ProgressResult == S_OK ? PROGRESS_CONTINUE : PROGRESS_CANCEL);
 }
@@ -214,6 +216,7 @@ struct CCopyState
   IFolderOperationsExtractCallback *Callback;
   bool MoveMode;
   bool UseReadWriteMode;
+  bool IsAltStreamsDest;
 
   Func_CopyFileExW my_CopyFileExW;
   #ifndef UNDER_CE
@@ -248,23 +251,27 @@ void CCopyState::Prepare()
   my_CopyFileExA = NULL;
   if (!g_IsNT)
   {
-    my_CopyFileExA = (Func_CopyFileExA)
-      MY_CAST_FUNC
-      ::GetProcAddress(::GetModuleHandleA("kernel32.dll"), "CopyFileExA");
+      my_CopyFileExA = Z7_GET_PROC_ADDRESS(
+    Func_CopyFileExA, ::GetModuleHandleA("kernel32.dll"),
+        "CopyFileExA");
   }
   else
   #endif
   {
-    HMODULE module = ::GetModuleHandleW(
+    const HMODULE module = ::GetModuleHandleW(
       #ifdef UNDER_CE
         L"coredll.dll"
       #else
         L"kernel32.dll"
       #endif
         );
-    my_CopyFileExW = (Func_CopyFileExW)My_GetProcAddress(module, "CopyFileExW");
+      my_CopyFileExW = Z7_GET_PROC_ADDRESS(
+    Func_CopyFileExW, module,
+        "CopyFileExW");
     #ifndef UNDER_CE
-    my_MoveFileWithProgressW = (Func_MoveFileWithProgressW)My_GetProcAddress(module, "MoveFileWithProgressW");
+      my_MoveFileWithProgressW = Z7_GET_PROC_ADDRESS(
+    Func_MoveFileWithProgressW, module,
+        "MoveFileWithProgressW");
     #endif
   }
 }
@@ -308,7 +315,7 @@ bool CCopyState::CopyFile_Sys(CFSTR oldFile, CFSTR newFile)
       if (CopyFile_NT(fs2us(oldFile), fs2us(newFile)))
         return true;
     }
-    #ifdef WIN_LONG_PATH
+    #ifdef Z7_LONG_PATH
     if (USE_SUPER_PATH_2)
     {
       if (IsCallbackProgressError())
@@ -337,7 +344,7 @@ bool CCopyState::MoveFile_Sys(CFSTR oldFile, CFSTR newFile)
             &ProgressInfo, MOVEFILE_COPY_ALLOWED))
           return true;
       }
-      #ifdef WIN_LONG_PATH
+      #ifdef Z7_LONG_PATH
       if ((!(USE_MAIN_PATH_2) || ::GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) && USE_SUPER_PATH_2)
       {
         if (IsCallbackProgressError())
@@ -404,7 +411,7 @@ static HRESULT CopyFile_Ask(
         state.MoveMode ?
           "Cannot move file onto itself" :
           "Cannot copy file onto itself"
-        , destPath));
+        , destPath))
     return E_ABORT;
   }
 
@@ -416,12 +423,12 @@ static HRESULT CopyFile_Ask(
       &srcFileInfo.MTime, &srcFileInfo.Size,
       fs2us(destPath),
       &destPathResult,
-      &writeAskResult));
+      &writeAskResult))
   
   if (IntToBool(writeAskResult))
   {
     FString destPathNew = us2fs((LPCOLESTR)destPathResult);
-    RINOK(state.Callback->SetCurrentFilePath(fs2us(srcPath)));
+    RINOK(state.Callback->SetCurrentFilePath(fs2us(srcPath)))
 
     if (state.UseReadWriteMode)
     {
@@ -431,7 +438,8 @@ static HRESULT CopyFile_Ask(
       state2.TotalSize = state.ProgressInfo.TotalSize;
       state2.StartPos = state.ProgressInfo.StartPos;
 
-      RINOK(state2.MyCopyFile(srcPath, destPathNew, srcFileInfo.Attrib));
+      RINOK(state2.MyCopyFile(srcPath, destPathNew,
+          state.IsAltStreamsDest ? INVALID_FILE_ATTRIBUTES: srcFileInfo.Attrib))
       
       if (state2.ErrorFileIndex >= 0)
       {
@@ -442,7 +450,7 @@ static HRESULT CopyFile_Ask(
           errorName = srcPath;
         else
           errorName = destPathNew;
-        RINOK(SendMessageError(state.Callback, state2.ErrorMessage, errorName));
+        RINOK(SendMessageError(state.Callback, state2.ErrorMessage, errorName))
         return E_ABORT;
       }
       state.ProgressInfo.StartPos += state2.CurrentSize;
@@ -455,11 +463,11 @@ static HRESULT CopyFile_Ask(
         res = state.MoveFile_Sys(srcPath, destPathNew);
       else
         res = state.CopyFile_Sys(srcPath, destPathNew);
-      RINOK(state.ProgressInfo.ProgressResult);
+      RINOK(state.ProgressInfo.ProgressResult)
       if (!res)
       {
         // GetLastError() is ERROR_REQUEST_ABORTED in case of PROGRESS_CANCEL.
-        RINOK(SendMessageError(state.Callback, GetLastErrorMessage(), destPathNew));
+        RINOK(SendMessageError(state.Callback, GetLastErrorMessage(), destPathNew))
         return E_ABORT;
       }
       state.ProgressInfo.StartPos += state.ProgressInfo.FileSize;
@@ -470,7 +478,7 @@ static HRESULT CopyFile_Ask(
     if (state.ProgressInfo.TotalSize >= srcFileInfo.Size)
     {
       state.ProgressInfo.TotalSize -= srcFileInfo.Size;
-      RINOK(state.ProgressInfo.Progress->SetTotal(state.ProgressInfo.TotalSize));
+      RINOK(state.ProgressInfo.Progress->SetTotal(state.ProgressInfo.TotalSize))
     }
   }
   return state.CallProgress();
@@ -499,7 +507,7 @@ static HRESULT CopyFolder(
     const FString &srcPath,   // without TAIL separator
     const FString &destPath)  // without TAIL separator
 {
-  RINOK(state.CallProgress());
+  RINOK(state.CallProgress())
 
   if (IsDestChild(srcPath, destPath))
   {
@@ -507,7 +515,7 @@ static HRESULT CopyFolder(
         state.MoveMode ?
           "Cannot copy folder onto itself" :
           "Cannot move folder onto itself"
-        , destPath));
+        , destPath))
     return E_ABORT;
   }
 
@@ -521,7 +529,7 @@ static HRESULT CopyFolder(
 
   if (!CreateComplexDir(destPath))
   {
-    RINOK(SendMessageError(state.Callback, "Cannot create folder", destPath));
+    RINOK(SendMessageError(state.Callback, "Cannot create folder", destPath))
     return E_ABORT;
   }
 
@@ -547,7 +555,7 @@ static HRESULT CopyFolder(
     }
     else
     {
-      RINOK(CopyFile_Ask(state, srcPath2, fi, destPath2));
+      RINOK(CopyFile_Ask(state, srcPath2, fi, destPath2))
     }
   }
 
@@ -555,7 +563,7 @@ static HRESULT CopyFolder(
   {
     if (!RemoveDir(srcPath))
     {
-      RINOK(SendMessageError(state.Callback, "Cannot remove folder", srcPath));
+      RINOK(SendMessageError(state.Callback, "Cannot remove folder", srcPath))
       return E_ABORT;
     }
   }
@@ -563,38 +571,67 @@ static HRESULT CopyFolder(
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems,
+Z7_COM7F_IMF(CFSFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems,
     Int32 /* includeAltStreams */, Int32 /* replaceAltStreamColon */,
-    const wchar_t *path, IFolderOperationsExtractCallback *callback)
+    const wchar_t *path, IFolderOperationsExtractCallback *callback))
 {
   if (numItems == 0)
     return S_OK;
 
-  FString destPath = us2fs(path);
+  const FString destPath = us2fs(path);
   if (destPath.IsEmpty())
     return E_INVALIDARG;
 
-  bool isAltDest = NName::IsAltPathPrefix(destPath);
-  bool isDirectPath = (!isAltDest && !IsPathSepar(destPath.Back()));
+  const bool isAltDest = NName::IsAltPathPrefix(destPath);
+  const bool isDirectPath = (!isAltDest && !IsPathSepar(destPath.Back()));
 
   if (isDirectPath)
-  {
     if (numItems > 1)
       return E_INVALIDARG;
-  }
 
   CFsFolderStat stat;
   stat.Progress = callback;
-  RINOK(GetItemsFullSize(indices, numItems, stat));
 
+  UInt32 i;
+  for (i = 0; i < numItems; i++)
+  {
+    const UInt32 index = indices[i];
+    /*
+    if (index >= Files.Size())
+    {
+      size += Streams[index - Files.Size()].Size;
+      // numFiles++;
+      continue;
+    }
+    */
+    const CDirItem &fi = Files[index];
+    if (fi.IsDir())
+    {
+      if (!isAltDest)
+      {
+        stat.Path = _path;
+        stat.Path += GetRelPath(fi);
+        RINOK(stat.Enumerate())
+      }
+      stat.NumFolders++;
+    }
+    else
+    {
+      stat.NumFiles++;
+      stat.Size += fi.Size;
+    }
+  }
+
+  /*
   if (stat.NumFolders != 0 && isAltDest)
     return E_NOTIMPL;
+  */
 
-  RINOK(callback->SetTotal(stat.Size));
-  RINOK(callback->SetNumFiles(stat.NumFiles));
+  RINOK(callback->SetTotal(stat.Size))
+  RINOK(callback->SetNumFiles(stat.NumFiles))
 
   UInt64 completedSize = 0;
-  RINOK(callback->SetCompleted(&completedSize));
+  RINOK(callback->SetCompleted(&completedSize))
 
   CCopyState state;
   state.ProgressInfo.TotalSize = stat.Size;
@@ -603,12 +640,16 @@ STDMETHODIMP CFSFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 num
   state.ProgressInfo.Init();
   state.Callback = callback;
   state.MoveMode = IntToBool(moveMode);
+  state.IsAltStreamsDest = isAltDest;
+  /* CopyFileW(fromFile, toFile:altStream) returns ERROR_INVALID_PARAMETER,
+       if there are alt streams in fromFile.
+     So we don't use CopyFileW() for alt Streams. */
   state.UseReadWriteMode = isAltDest;
   state.Prepare();
 
-  for (UInt32 i = 0; i < numItems; i++)
+  for (i = 0; i < numItems; i++)
   {
-    UInt32 index = indices[i];
+    const UInt32 index = indices[i];
     if (index >= (UInt32)Files.Size())
       continue;
     const CDirItem &fi = Files[index];
@@ -620,57 +661,148 @@ STDMETHODIMP CFSFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 num
   
     if (fi.IsDir())
     {
-      RINOK(CopyFolder(state, srcPath, destPath2));
+      if (isAltDest)
+      {
+        RINOK(SendMessageError(callback, k_CannotCopyDirToAltStream, srcPath))
+      }
+      else
+      {
+        RINOK(CopyFolder(state, srcPath, destPath2))
+      }
     }
     else
     {
-      RINOK(CopyFile_Ask(state, srcPath, fi, destPath2));
+      RINOK(CopyFile_Ask(state, srcPath, fi, destPath2))
     }
   }
   return S_OK;
 }
 
-STDMETHODIMP CFSFolder::CopyFrom(Int32 /* moveMode */, const wchar_t * /* fromFolderPath */,
-    const wchar_t * const * /* itemsPaths */, UInt32 /* numItems */, IProgress * /* progress */)
+
+
+/* we can call CopyFileSystemItems() from CDropTarget::Drop() */
+
+HRESULT CopyFileSystemItems(
+    const UStringVector &itemsPaths,
+    const FString &destDirPrefix,
+    bool moveMode,
+    IFolderOperationsExtractCallback *callback)
 {
-  /*
-  UInt64 numFolders, numFiles, totalSize;
-  numFiles = numFolders = totalSize = 0;
-  UInt32 i;
-  for (i = 0; i < numItems; i++)
-  {
-    UString path = (UString)fromFolderPath + itemsPaths[i];
+  if (itemsPaths.IsEmpty())
+    return S_OK;
+
+  if (destDirPrefix.IsEmpty())
+    return E_INVALIDARG;
 
+  const bool isAltDest = NName::IsAltPathPrefix(destDirPrefix);
+
+  CFsFolderStat stat;
+  stat.Progress = callback;
+
+ {
+  FOR_VECTOR (i, itemsPaths)
+  {
+    const UString &path = itemsPaths[i];
     CFileInfo fi;
-    if (!FindFile(path, fi))
-      return ::GetLastError();
+    if (!fi.Find(us2fs(path)))
+      continue;
     if (fi.IsDir())
     {
-      UInt64 subFolders, subFiles, subSize;
-      RINOK(GetFolderSize(CombinePath(path, fi.Name), subFolders, subFiles, subSize, progress));
-      numFolders += subFolders;
-      numFolders++;
-      numFiles += subFiles;
-      totalSize += subSize;
+      if (!isAltDest)
+      {
+        stat.Path = us2fs(path);
+        RINOK(stat.Enumerate())
+      }
+      stat.NumFolders++;
     }
     else
     {
-      numFiles++;
-      totalSize += fi.Size;
+      stat.NumFiles++;
+      stat.Size += fi.Size;
     }
   }
-  RINOK(progress->SetTotal(totalSize));
-  RINOK(callback->SetNumFiles(numFiles));
-  for (i = 0; i < numItems; i++)
+ }
+
+  /*
+  if (stat.NumFolders != 0 && isAltDest)
+    return E_NOTIMPL;
+  */
+
+  RINOK(callback->SetTotal(stat.Size))
+  // RINOK(progress->SetNumFiles(stat.NumFiles));
+
+  UInt64 completedSize = 0;
+  RINOK(callback->SetCompleted(&completedSize))
+
+  CCopyState state;
+  state.ProgressInfo.TotalSize = stat.Size;
+  state.ProgressInfo.StartPos = 0;
+  state.ProgressInfo.Progress = callback;
+  state.ProgressInfo.Init();
+  state.Callback = callback;
+  state.MoveMode = moveMode;
+  state.IsAltStreamsDest = isAltDest;
+  /* CopyFileW(fromFile, toFile:altStream) returns ERROR_INVALID_PARAMETER,
+       if there are alt streams in fromFile.
+     So we don't use CopyFileW() for alt Streams. */
+  state.UseReadWriteMode = isAltDest;
+  state.Prepare();
+
+  FOR_VECTOR (i, itemsPaths)
   {
-    UString path = (UString)fromFolderPath + itemsPaths[i];
+    const UString path = itemsPaths[i];
+    CFileInfo fi;
+  
+    if (!fi.Find(us2fs(path)))
+    {
+      RINOK(SendMessageError(callback, "Cannot find the file", us2fs(path)))
+      continue;
+    }
+
+    FString destPath = destDirPrefix;
+    destPath += fi.Name;
+  
+    if (fi.IsDir())
+    {
+      if (isAltDest)
+      {
+        RINOK(SendMessageError(callback, k_CannotCopyDirToAltStream, us2fs(path)))
+      }
+      else
+      {
+        RINOK(CopyFolder(state, us2fs(path), destPath))
+      }
+    }
+    else
+    {
+      RINOK(CopyFile_Ask(state, us2fs(path), fi, destPath))
+    }
   }
   return S_OK;
+}
+
+
+/* we don't use CFSFolder::CopyFrom() because the caller of CopyFrom()
+   is optimized for IFolderArchiveUpdateCallback interface,
+   but we want to use IFolderOperationsExtractCallback interface instead */
+
+Z7_COM7F_IMF(CFSFolder::CopyFrom(Int32 /* moveMode */, const wchar_t * /* fromFolderPath */,
+    const wchar_t * const * /* itemsPaths */, UInt32 /* numItems */, IProgress * /* progress */))
+{
+  /*
+  Z7_DECL_CMyComPtr_QI_FROM(
+      IFolderOperationsExtractCallback,
+      callback, progress)
+  if (!callback)
+    return E_NOTIMPL;
+  return CopyFileSystemItems(_path,
+      moveMode, fromDirPrefix,
+      itemsPaths, numItems, callback);
   */
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CFSFolder::CopyFromFile(UInt32 /* index */, const wchar_t * /* fullFilePath */, IProgress * /* progress */)
+Z7_COM7F_IMF(CFSFolder::CopyFromFile(UInt32 /* index */, const wchar_t * /* fullFilePath */, IProgress * /* progress */))
 {
   return E_NOTIMPL;
 }
diff --git a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
index a7873fe..e4e9997 100644
--- a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
+++ b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
@@ -26,8 +26,15 @@ struct CThreadArchiveOpen
   UString ArcFormat;
   CMyComPtr<IInStream> InStream;
   CMyComPtr<IFolderManager> FolderManager;
-  CMyComPtr<IProgress> OpenCallback;
+  CMyComPtr<IProgress> OpenCallbackProgress;
+  
   COpenArchiveCallback *OpenCallbackSpec;
+  /*
+  CMyComPtr<IUnknown>
+  // CMyComPtr<IProgress>
+  // CMyComPtr<IArchiveOpenCallback>
+    OpenCallbackSpec_Ref;
+  */
 
   CMyComPtr<IFolderFolder> Folder;
   HRESULT Result;
@@ -37,7 +44,7 @@ struct CThreadArchiveOpen
     try
     {
       CProgressCloser closer(OpenCallbackSpec->ProgressDialog);
-      Result = FolderManager->OpenFolderFile(InStream, Path, ArcFormat, &Folder, OpenCallback);
+      Result = FolderManager->OpenFolderFile(InStream, Path, ArcFormat, &Folder, OpenCallbackProgress);
     }
     catch(...) { Result = E_FAIL; }
   }
@@ -62,7 +69,7 @@ static int FindPlugin(const CObjectVector<CPluginInfo> &plugins, const UString &
 static void SplitNameToPureNameAndExtension(const FString &fullName,
     FString &pureName, FString &extensionDelimiter, FString &extension)
 {
-  int index = fullName.ReverseFind_Dot();
+  const int index = fullName.ReverseFind_Dot();
   if (index < 0)
   {
     pureName = fullName;
@@ -71,7 +78,7 @@ static void SplitNameToPureNameAndExtension(const FString &fullName,
   }
   else
   {
-    pureName.SetFrom(fullName, index);
+    pureName.SetFrom(fullName, (unsigned)index);
     extensionDelimiter = '.';
     extension = fullName.Ptr((unsigned)index + 1);
   }
@@ -229,16 +236,21 @@ static void GetFolderError(CMyComPtr<IFolderFolder> &folder, UString &open_Error
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(error : 4702) // unreachable code
+#endif
 
 HRESULT CFfpOpen::OpenFileFolderPlugin(IInStream *inStream,
     const FString &path, const UString &arcFormat, HWND parentWindow)
 {
+  /*
   CObjectVector<CPluginInfo> plugins;
   ReadFileFolderPluginInfoList(plugins);
+  */
 
   FString extension, name, pureName, dot;
 
-  int slashPos = path.ReverseFind_PathSepar();
+  const int slashPos = path.ReverseFind_PathSepar();
   FString dirPrefix;
   FString fileName;
   if (slashPos >= 0)
@@ -273,31 +285,48 @@ HRESULT CFfpOpen::OpenFileFolderPlugin(IInStream *inStream,
 
   ErrorMessage.Empty();
 
-  FOR_VECTOR (i, plugins)
-  {
+  // FOR_VECTOR (i, plugins)
+  // {
+    /*
     const CPluginInfo &plugin = plugins[i];
-    if (!plugin.ClassIDDefined)
+    if (!plugin.ClassID_Defined && !plugin.FilePath.IsEmpty())
       continue;
+    */
     CPluginLibrary library;
 
     CThreadArchiveOpen t;
 
-    if (plugin.FilePath.IsEmpty())
+    // if (plugin.FilePath.IsEmpty())
       t.FolderManager = new CArchiveFolderManager;
+    /*
     else if (library.LoadAndCreateManager(plugin.FilePath, plugin.ClassID, &t.FolderManager) != S_OK)
       continue;
+    */
 
+    COpenArchiveCallback OpenCallbackSpec_loc;
+    t.OpenCallbackSpec = &OpenCallbackSpec_loc;
+    /*
     t.OpenCallbackSpec = new COpenArchiveCallback;
-    t.OpenCallback = t.OpenCallbackSpec;
+    t.OpenCallbackSpec_Ref = t.OpenCallbackSpec;
+    */
     t.OpenCallbackSpec->PasswordIsDefined = Encrypted;
     t.OpenCallbackSpec->Password = Password;
     t.OpenCallbackSpec->ParentWindow = parentWindow;
 
+    /* COpenCallbackImp object will exist after Open stage for multivolume archives */
+    COpenCallbackImp *openCallbackSpec = new COpenCallbackImp;
+    t.OpenCallbackProgress = openCallbackSpec;
+    // openCallbackSpec->Callback_Ref = t.OpenCallbackSpec;
+    // we set pointer without reference counter:
+    openCallbackSpec->Callback =
+    // openCallbackSpec->ReOpenCallback =
+      t.OpenCallbackSpec;
+
     if (inStream)
-      t.OpenCallbackSpec->SetSubArchiveName(fs2us(fileName));
+      openCallbackSpec->SetSubArchiveName(fs2us(fileName));
     else
     {
-      RINOK(t.OpenCallbackSpec->LoadFileInfo2(dirPrefix, fileName));
+      RINOK(openCallbackSpec->Init2(dirPrefix, fileName))
     }
 
     t.InStream = inStream;
@@ -315,10 +344,20 @@ HRESULT CFfpOpen::OpenFileFolderPlugin(IInStream *inStream,
 
     {
       NWindows::CThread thread;
-      RINOK(thread.Create(CThreadArchiveOpen::MyThreadFunction, &t));
+      const WRes wres = thread.Create(CThreadArchiveOpen::MyThreadFunction, &t);
+      if (wres != 0)
+        return HRESULT_FROM_WIN32(wres);
       t.OpenCallbackSpec->StartProgressDialog(progressTitle, thread);
     }
 
+    /*
+      if archive is multivolume:
+      COpenCallbackImp object will exist after Open stage.
+      COpenCallbackImp object will be deleted when last reference
+      from each volume object (CInFileStreamVol) will be closed (when archive will be closed).
+    */
+    t.OpenCallbackProgress.Release();
+
     if (t.Result != S_FALSE && t.Result != S_OK)
       return t.Result;
 
@@ -351,7 +390,5 @@ HRESULT CFfpOpen::OpenFileFolderPlugin(IInStream *inStream,
     }
     
     return t.Result;
-  }
-
-  return S_FALSE;
+  // }
 }
diff --git a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.h b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.h
index a1f2f10..8802765 100644
--- a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.h
+++ b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.h
@@ -1,13 +1,13 @@
 // FileFolderPluginOpen.h
 
-#ifndef __FILE_FOLDER_PLUGIN_OPEN_H
-#define __FILE_FOLDER_PLUGIN_OPEN_H
+#ifndef ZIP7_INC_FILE_FOLDER_PLUGIN_OPEN_H
+#define ZIP7_INC_FILE_FOLDER_PLUGIN_OPEN_H
 
 #include "../../../Windows/DLL.h"
 
 struct CFfpOpen
 {
-  CLASS_NO_COPY(CFfpOpen)
+  Z7_CLASS_NO_COPY(CFfpOpen)
 public:
   // out:
   bool Encrypted;
diff --git a/CPP/7zip/UI/FileManager/FilePlugins.cpp b/CPP/7zip/UI/FileManager/FilePlugins.cpp
index 4600030..cf20970 100644
--- a/CPP/7zip/UI/FileManager/FilePlugins.cpp
+++ b/CPP/7zip/UI/FileManager/FilePlugins.cpp
@@ -8,28 +8,37 @@
 #include "PluginLoader.h"
 #include "StringUtils.h"
 
-int CExtDatabase::FindExt(const UString &ext)
+int CExtDatabase::FindExt(const UString &ext) const
 {
   FOR_VECTOR (i, Exts)
     if (Exts[i].Ext.IsEqualTo_NoCase(ext))
-      return i;
+      return (int)i;
   return -1;
 }
 
 void CExtDatabase::Read()
 {
+  /*
   ReadFileFolderPluginInfoList(Plugins);
   FOR_VECTOR (pluginIndex, Plugins)
+  */
   {
-    const CPluginInfo &plugin = Plugins[pluginIndex];
+    // const CPluginInfo &plugin = Plugins[pluginIndex];
 
     CPluginLibrary pluginLib;
     CMyComPtr<IFolderManager> folderManager;
 
-    if (plugin.FilePath.IsEmpty())
+    // if (plugin.FilePath.IsEmpty())
       folderManager = new CArchiveFolderManager;
-    else if (pluginLib.LoadAndCreateManager(plugin.FilePath, plugin.ClassID, &folderManager) != S_OK)
-      continue;
+    /*
+    else
+    {
+      if (!plugin.ClassID_Defined)
+        continue;
+      if (pluginLib.LoadAndCreateManager(plugin.FilePath, plugin.ClassID, &folderManager) != S_OK)
+        continue;
+    }
+    */
     CMyComBSTR extBSTR;
     if (folderManager->GetExtensions(&extBSTR) != S_OK)
       return;
@@ -46,15 +55,15 @@ void CExtDatabase::Read()
       Int32 iconIndex;
       CMyComBSTR iconPath;
       CPluginToIcon plugPair;
-      plugPair.PluginIndex = pluginIndex;
+      // plugPair.PluginIndex = pluginIndex;
       if (folderManager->GetIconPath(ext, &iconPath, &iconIndex) == S_OK)
-        if (iconPath != 0)
+        if (iconPath)
         {
           plugPair.IconPath = (const wchar_t *)iconPath;
           plugPair.IconIndex = iconIndex;
         }
 
-      int index = FindExt(ext);
+      const int index = FindExt(ext);
       if (index >= 0)
         Exts[index].Plugins.Add(plugPair);
       else
diff --git a/CPP/7zip/UI/FileManager/FilePlugins.h b/CPP/7zip/UI/FileManager/FilePlugins.h
index 43b05f9..db8ec39 100644
--- a/CPP/7zip/UI/FileManager/FilePlugins.h
+++ b/CPP/7zip/UI/FileManager/FilePlugins.h
@@ -1,15 +1,15 @@
 // FilePlugins.h
 
-#ifndef __FILE_PLUGINS_H
-#define __FILE_PLUGINS_H
+#ifndef ZIP7_INC_FILE_PLUGINS_H
+#define ZIP7_INC_FILE_PLUGINS_H
 
 #include "RegistryPlugins.h"
 
 struct CPluginToIcon
 {
-  int PluginIndex;
-  UString IconPath;
+  // unsigned PluginIndex;
   int IconIndex;
+  UString IconPath;
   
   CPluginToIcon(): IconIndex(-1) {}
 };
@@ -22,10 +22,10 @@ struct CExtPlugins
 
 class CExtDatabase
 {
-  int FindExt(const UString &ext);
+  int FindExt(const UString &ext) const;
 public:
   CObjectVector<CExtPlugins> Exts;
-  CObjectVector<CPluginInfo> Plugins;
+  // CObjectVector<CPluginInfo> Plugins;
   
   void Read();
 };
diff --git a/CPP/7zip/UI/FileManager/FoldersPage.cpp b/CPP/7zip/UI/FileManager/FoldersPage.cpp
index d019bab..7e74635 100644
--- a/CPP/7zip/UI/FileManager/FoldersPage.cpp
+++ b/CPP/7zip/UI/FileManager/FoldersPage.cpp
@@ -11,6 +11,7 @@
 
 using namespace NWindows;
 
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_FOLDERS_WORKING_FOLDER,
@@ -19,8 +20,9 @@ static const UInt32 kLangIDs[] =
   IDR_FOLDERS_WORK_SPECIFIED,
   IDX_FOLDERS_WORK_FOR_REMOVABLE
 };
+#endif
 
-static const int kWorkModeButtons[] =
+static const unsigned kWorkModeButtons[] =
 {
   IDR_FOLDERS_WORK_SYSTEM,
   IDR_FOLDERS_WORK_CURRENT,
@@ -29,19 +31,23 @@ static const int kWorkModeButtons[] =
 
 #define kFoldersTopic "fm/options.htm#folders"
 
-static const unsigned kNumWorkModeButtons = ARRAY_SIZE(kWorkModeButtons);
+static const unsigned kNumWorkModeButtons = Z7_ARRAY_SIZE(kWorkModeButtons);
  
 bool CFoldersPage::OnInit()
 {
   _initMode = true;
   _needSave = false;
 
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  #ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+  #endif
   m_WorkDirInfo.Load();
 
   CheckButton(IDX_FOLDERS_WORK_FOR_REMOVABLE, m_WorkDirInfo.ForRemovableOnly);
   
-  CheckRadioButton(kWorkModeButtons[0], kWorkModeButtons[kNumWorkModeButtons - 1],
+  CheckRadioButton(
+      kWorkModeButtons[0],
+      kWorkModeButtons[kNumWorkModeButtons - 1],
       kWorkModeButtons[m_WorkDirInfo.Mode]);
 
   m_WorkPath.Init(*this, IDE_FOLDERS_WORK_PATH);
@@ -58,7 +64,7 @@ int CFoldersPage::GetWorkMode() const
 {
   for (unsigned i = 0; i < kNumWorkModeButtons; i++)
     if (IsButtonCheckedBool(kWorkModeButtons[i]))
-      return i;
+      return (int)i;
   throw 0;
 }
 
@@ -104,7 +110,7 @@ void CFoldersPage::ModifiedEvent()
   */
 }
 
-bool CFoldersPage::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CFoldersPage::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   for (unsigned i = 0; i < kNumWorkModeButtons; i++)
     if (buttonID == kWorkModeButtons[i])
@@ -129,7 +135,7 @@ bool CFoldersPage::OnButtonClicked(int buttonID, HWND buttonHWND)
   return true;
 }
 
-bool CFoldersPage::OnCommand(int code, int itemID, LPARAM lParam)
+bool CFoldersPage::OnCommand(unsigned code, unsigned itemID, LPARAM lParam)
 {
   if (code == EN_CHANGE && itemID == IDE_FOLDERS_WORK_PATH)
   {
diff --git a/CPP/7zip/UI/FileManager/FoldersPage.h b/CPP/7zip/UI/FileManager/FoldersPage.h
index 71c7bfc..09b6cdd 100644
--- a/CPP/7zip/UI/FileManager/FoldersPage.h
+++ b/CPP/7zip/UI/FileManager/FoldersPage.h
@@ -1,7 +1,7 @@
 // FoldersPage.h
  
-#ifndef __FOLDERS_PAGE_H
-#define __FOLDERS_PAGE_H
+#ifndef ZIP7_INC_FOLDERS_PAGE_H
+#define ZIP7_INC_FOLDERS_PAGE_H
 
 #include "../../../Windows/Control/PropertyPage.h"
 
@@ -22,11 +22,11 @@ class CFoldersPage : public NWindows::NControl::CPropertyPage
   int GetWorkMode() const;
   void GetWorkDir(NWorkDir::CInfo &workDirInfo);
   // bool WasChanged();
-  virtual bool OnInit();
-  virtual bool OnCommand(int code, int itemID, LPARAM lParam);
-  virtual void OnNotifyHelp();
-  virtual LONG OnApply();
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual bool OnInit() Z7_override;
+  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM lParam) Z7_override;
+  virtual void OnNotifyHelp() Z7_override;
+  virtual LONG OnApply() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/FormatUtils.h b/CPP/7zip/UI/FileManager/FormatUtils.h
index 993e803..1db08ef 100644
--- a/CPP/7zip/UI/FileManager/FormatUtils.h
+++ b/CPP/7zip/UI/FileManager/FormatUtils.h
@@ -1,7 +1,7 @@
 // FormatUtils.h
 
-#ifndef __FORMAT_UTILS_H
-#define __FORMAT_UTILS_H
+#ifndef ZIP7_INC_FORMAT_UTILS_H
+#define ZIP7_INC_FORMAT_UTILS_H
 
 #include "../../../Common/MyTypes.h"
 #include "../../../Common/MyString.h"
diff --git a/CPP/7zip/UI/FileManager/HelpUtils.cpp b/CPP/7zip/UI/FileManager/HelpUtils.cpp
index 5cb78fc..d5b6a58 100644
--- a/CPP/7zip/UI/FileManager/HelpUtils.cpp
+++ b/CPP/7zip/UI/FileManager/HelpUtils.cpp
@@ -4,7 +4,7 @@
 
 #include "HelpUtils.h"
 
-#if defined(UNDER_CE) || !defined(_WIN32) /* || !defined(_MSC_VER) */
+#if defined(UNDER_CE) || defined(__MINGW32_VERSION)
 
 void ShowHelpWindow(LPCSTR)
 {
@@ -12,11 +12,15 @@ void ShowHelpWindow(LPCSTR)
 
 #else
 
-// #define USE_EXTERNAL_HELP
+/* USE_EXTERNAL_HELP creates new help process window for each HtmlHelp() call.
+   HtmlHelp() call uses one window. */
 
-#if defined(_MSC_VER)
+#if defined(__MINGW32_VERSION) /* || defined(Z7_OLD_WIN_SDK) */
+#define USE_EXTERNAL_HELP
 #endif
 
+// #define USE_EXTERNAL_HELP
+
 #ifdef USE_EXTERNAL_HELP
 
 #include "../../../Windows/ProcessUtils.h"
diff --git a/CPP/7zip/UI/FileManager/HelpUtils.h b/CPP/7zip/UI/FileManager/HelpUtils.h
index 90c5f7d..d7bdf45 100644
--- a/CPP/7zip/UI/FileManager/HelpUtils.h
+++ b/CPP/7zip/UI/FileManager/HelpUtils.h
@@ -1,7 +1,7 @@
 // HelpUtils.h
 
-#ifndef __HELP_UTILS_H
-#define __HELP_UTILS_H
+#ifndef ZIP7_INC_HELP_UTILS_H
+#define ZIP7_INC_HELP_UTILS_H
 
 #include "../../../Common/MyString.h"
 
diff --git a/CPP/7zip/UI/FileManager/IFolder.h b/CPP/7zip/UI/FileManager/IFolder.h
index c5cff06..1ebdf7e 100644
--- a/CPP/7zip/UI/FileManager/IFolder.h
+++ b/CPP/7zip/UI/FileManager/IFolder.h
@@ -1,13 +1,19 @@
 // IFolder.h
 
-#ifndef __IFOLDER_H
-#define __IFOLDER_H
+#ifndef ZIP7_INC_IFOLDER_H
+#define ZIP7_INC_IFOLDER_H
 
 #include "../../IProgress.h"
 #include "../../IStream.h"
 
-#define FOLDER_INTERFACE_SUB(i, b, x) DECL_INTERFACE_SUB(i, b, 8, x)
-#define FOLDER_INTERFACE(i, x) FOLDER_INTERFACE_SUB(i, IUnknown, x)
+Z7_PURE_INTERFACES_BEGIN
+
+#define Z7_IFACE_CONSTR_FOLDER_SUB(i, base, n) \
+  Z7_DECL_IFACE_7ZIP_SUB(i, base, 8, n) \
+  { Z7_IFACE_COM7_PURE(i) };
+
+#define Z7_IFACE_CONSTR_FOLDER(i, n) \
+        Z7_IFACE_CONSTR_FOLDER_SUB(i, IUnknown, n)
 
 namespace NPlugin
 {
@@ -20,199 +26,162 @@ namespace NPlugin
   };
 }
 
-#define INTERFACE_FolderFolder(x) \
-  STDMETHOD(LoadItems)() x; \
-  STDMETHOD(GetNumberOfItems)(UInt32 *numItems) x; \
-  STDMETHOD(GetProperty)(UInt32 itemIndex, PROPID propID, PROPVARIANT *value) x; \
-  STDMETHOD(BindToFolder)(UInt32 index, IFolderFolder **resultFolder) x; \
-  STDMETHOD(BindToFolder)(const wchar_t *name, IFolderFolder **resultFolder) x; \
-  STDMETHOD(BindToParentFolder)(IFolderFolder **resultFolder) x; \
-  STDMETHOD(GetNumberOfProperties)(UInt32 *numProperties) x; \
-  STDMETHOD(GetPropertyInfo)(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) x; \
-  STDMETHOD(GetFolderProperty)(PROPID propID, PROPVARIANT *value) x; \
-
-FOLDER_INTERFACE(IFolderFolder, 0x00)
-{
-  INTERFACE_FolderFolder(PURE)
-};
+#define Z7_IFACEM_IFolderFolder(x) \
+  x(LoadItems()) \
+  x(GetNumberOfItems(UInt32 *numItems)) \
+  x(GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value)) \
+  x(BindToFolder(UInt32 index, IFolderFolder **resultFolder)) \
+  x(BindToFolder(const wchar_t *name, IFolderFolder **resultFolder)) \
+  x(BindToParentFolder(IFolderFolder **resultFolder)) \
+  x(GetNumberOfProperties(UInt32 *numProperties)) \
+  x(GetPropertyInfo(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
+  x(GetFolderProperty(PROPID propID, PROPVARIANT *value)) \
+
+Z7_IFACE_CONSTR_FOLDER(IFolderFolder, 0x00)
 
 /*
   IFolderAltStreams::
     BindToAltStreams((UInt32)(Int32)-1, ... ) means alt streams of that folder
 */
 
-#define INTERFACE_FolderAltStreams(x) \
-  STDMETHOD(BindToAltStreams)(UInt32 index, IFolderFolder **resultFolder) x; \
-  STDMETHOD(BindToAltStreams)(const wchar_t *name, IFolderFolder **resultFolder) x; \
-  STDMETHOD(AreAltStreamsSupported)(UInt32 index, Int32 *isSupported) x; \
-
-FOLDER_INTERFACE(IFolderAltStreams, 0x17)
-{
-  INTERFACE_FolderAltStreams(PURE)
-};
-
-FOLDER_INTERFACE(IFolderWasChanged, 0x04)
-{
-  STDMETHOD(WasChanged)(Int32 *wasChanged) PURE;
-};
-
-FOLDER_INTERFACE_SUB(IFolderOperationsExtractCallback, IProgress, 0x0B)
-{
-  // STDMETHOD(SetTotalFiles)(UInt64 total) PURE;
-  // STDMETHOD(SetCompletedFiles)(const UInt64 *completedValue) PURE;
-  STDMETHOD(AskWrite)(
-      const wchar_t *srcPath,
-      Int32 srcIsFolder,
-      const FILETIME *srcTime,
-      const UInt64 *srcSize,
-      const wchar_t *destPathRequest,
-      BSTR *destPathResult,
-      Int32 *writeAnswer) PURE;
-  STDMETHOD(ShowMessage)(const wchar_t *message) PURE;
-  STDMETHOD(SetCurrentFilePath)(const wchar_t *filePath) PURE;
-  STDMETHOD(SetNumFiles)(UInt64 numFiles) PURE;
-};
-
-#define INTERFACE_FolderOperations(x) \
-  STDMETHOD(CreateFolder)(const wchar_t *name, IProgress *progress) x; \
-  STDMETHOD(CreateFile)(const wchar_t *name, IProgress *progress) x; \
-  STDMETHOD(Rename)(UInt32 index, const wchar_t *newName, IProgress *progress) x; \
-  STDMETHOD(Delete)(const UInt32 *indices, UInt32 numItems, IProgress *progress) x; \
-  STDMETHOD(CopyTo)(Int32 moveMode, const UInt32 *indices, UInt32 numItems, \
+#define Z7_IFACEM_IFolderAltStreams(x) \
+  x(BindToAltStreams(UInt32 index, IFolderFolder **resultFolder)) \
+  x(BindToAltStreams(const wchar_t *name, IFolderFolder **resultFolder)) \
+  x(AreAltStreamsSupported(UInt32 index, Int32 *isSupported)) \
+
+Z7_IFACE_CONSTR_FOLDER(IFolderAltStreams, 0x17)
+
+#define Z7_IFACEM_IFolderWasChanged(x) \
+  x(WasChanged(Int32 *wasChanged))
+Z7_IFACE_CONSTR_FOLDER(IFolderWasChanged, 0x04)
+
+  /* x(SetTotalFiles(UInt64 total)) */ \
+  /* x(SetCompletedFiles(const UInt64 *completedValue)) */ \
+#define Z7_IFACEM_IFolderOperationsExtractCallback(x) \
+  x(AskWrite( \
+      const wchar_t *srcPath, \
+      Int32 srcIsFolder, \
+      const FILETIME *srcTime, \
+      const UInt64 *srcSize, \
+      const wchar_t *destPathRequest, \
+      BSTR *destPathResult, \
+      Int32 *writeAnswer)) \
+  x(ShowMessage(const wchar_t *message)) \
+  x(SetCurrentFilePath(const wchar_t *filePath)) \
+  x(SetNumFiles(UInt64 numFiles)) \
+
+Z7_IFACE_CONSTR_FOLDER_SUB(IFolderOperationsExtractCallback, IProgress, 0x0B)
+
+
+#define Z7_IFACEM_IFolderOperations(x) \
+  x(CreateFolder(const wchar_t *name, IProgress *progress)) \
+  x(CreateFile(const wchar_t *name, IProgress *progress)) \
+  x(Rename(UInt32 index, const wchar_t *newName, IProgress *progress)) \
+  x(Delete(const UInt32 *indices, UInt32 numItems, IProgress *progress)) \
+  x(CopyTo(Int32 moveMode, const UInt32 *indices, UInt32 numItems, \
       Int32 includeAltStreams, Int32 replaceAltStreamCharsMode, \
-      const wchar_t *path, IFolderOperationsExtractCallback *callback) x; \
-  STDMETHOD(CopyFrom)(Int32 moveMode, const wchar_t *fromFolderPath, \
-      const wchar_t * const *itemsPaths, UInt32 numItems, IProgress *progress) x; \
-  STDMETHOD(SetProperty)(UInt32 index, PROPID propID, const PROPVARIANT *value, IProgress *progress) x; \
-  STDMETHOD(CopyFromFile)(UInt32 index, const wchar_t *fullFilePath, IProgress *progress) x; \
+      const wchar_t *path, IFolderOperationsExtractCallback *callback)) \
+  x(CopyFrom(Int32 moveMode, const wchar_t *fromFolderPath, \
+      const wchar_t * const *itemsPaths, UInt32 numItems, IProgress *progress)) \
+  x(SetProperty(UInt32 index, PROPID propID, const PROPVARIANT *value, IProgress *progress)) \
+  x(CopyFromFile(UInt32 index, const wchar_t *fullFilePath, IProgress *progress)) \
 
-FOLDER_INTERFACE(IFolderOperations, 0x13)
-{
-  INTERFACE_FolderOperations(PURE)
-};
+Z7_IFACE_CONSTR_FOLDER(IFolderOperations, 0x13)
 
 /*
 FOLDER_INTERFACE2(IFolderOperationsDeleteToRecycleBin, 0x06, 0x03)
 {
-  STDMETHOD(DeleteToRecycleBin)(const UInt32 *indices, UInt32 numItems, IProgress *progress) PURE;
+  x(DeleteToRecycleBin(const UInt32 *indices, UInt32 numItems, IProgress *progress)) \
 };
 */
 
-FOLDER_INTERFACE(IFolderGetSystemIconIndex, 0x07)
-{
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex) PURE;
-};
+#define Z7_IFACEM_IFolderGetSystemIconIndex(x) \
+  x(GetSystemIconIndex(UInt32 index, Int32 *iconIndex))
+Z7_IFACE_CONSTR_FOLDER(IFolderGetSystemIconIndex, 0x07)
 
-FOLDER_INTERFACE(IFolderGetItemFullSize, 0x08)
-{
-  STDMETHOD(GetItemFullSize)(UInt32 index, PROPVARIANT *value, IProgress *progress) PURE;
-};
+#define Z7_IFACEM_IFolderGetItemFullSize(x) \
+  x(GetItemFullSize(UInt32 index, PROPVARIANT *value, IProgress *progress))
+Z7_IFACE_CONSTR_FOLDER(IFolderGetItemFullSize, 0x08)
 
-FOLDER_INTERFACE(IFolderCalcItemFullSize, 0x14)
-{
-  STDMETHOD(CalcItemFullSize)(UInt32 index, IProgress *progress) PURE;
-};
+#define Z7_IFACEM_IFolderCalcItemFullSize(x) \
+  x(CalcItemFullSize(UInt32 index, IProgress *progress))
+Z7_IFACE_CONSTR_FOLDER(IFolderCalcItemFullSize, 0x14)
 
-FOLDER_INTERFACE(IFolderClone, 0x09)
-{
-  STDMETHOD(Clone)(IFolderFolder **resultFolder) PURE;
-};
+#define Z7_IFACEM_IFolderClone(x) \
+  x(Clone(IFolderFolder **resultFolder))
+Z7_IFACE_CONSTR_FOLDER(IFolderClone, 0x09)
 
-FOLDER_INTERFACE(IFolderSetFlatMode, 0x0A)
-{
-  STDMETHOD(SetFlatMode)(Int32 flatMode) PURE;
-};
+#define Z7_IFACEM_IFolderSetFlatMode(x) \
+  x(SetFlatMode(Int32 flatMode))
+Z7_IFACE_CONSTR_FOLDER(IFolderSetFlatMode, 0x0A)
 
 /*
-FOLDER_INTERFACE(IFolderSetShowNtfsStreamsMode, 0xFA)
-{
-  STDMETHOD(SetShowNtfsStreamsMode)(Int32 showStreamsMode) PURE;
-};
+#define Z7_IFACEM_IFolderSetShowNtfsStreamsMode(x) \
+  x(SetShowNtfsStreamsMode(Int32 showStreamsMode))
+Z7_IFACE_CONSTR_FOLDER(IFolderSetShowNtfsStreamsMode, 0xFA)
 */
 
-#define INTERFACE_FolderProperties(x) \
-  STDMETHOD(GetNumberOfFolderProperties)(UInt32 *numProperties) x; \
-  STDMETHOD(GetFolderPropertyInfo)(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) x; \
+#define Z7_IFACEM_IFolderProperties(x) \
+  x(GetNumberOfFolderProperties(UInt32 *numProperties)) \
+  x(GetFolderPropertyInfo(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
 
-FOLDER_INTERFACE(IFolderProperties, 0x0E)
-{
-  INTERFACE_FolderProperties(PURE)
-};
+Z7_IFACE_CONSTR_FOLDER(IFolderProperties, 0x0E)
 
-#define INTERFACE_IFolderArcProps(x) \
-  STDMETHOD(GetArcNumLevels)(UInt32 *numLevels) x; \
-  STDMETHOD(GetArcProp)(UInt32 level, PROPID propID, PROPVARIANT *value) x; \
-  STDMETHOD(GetArcNumProps)(UInt32 level, UInt32 *numProps) x; \
-  STDMETHOD(GetArcPropInfo)(UInt32 level, UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) x; \
-  STDMETHOD(GetArcProp2)(UInt32 level, PROPID propID, PROPVARIANT *value) x; \
-  STDMETHOD(GetArcNumProps2)(UInt32 level, UInt32 *numProps) x; \
-  STDMETHOD(GetArcPropInfo2)(UInt32 level, UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) x; \
+#define Z7_IFACEM_IFolderArcProps(x) \
+  x(GetArcNumLevels(UInt32 *numLevels)) \
+  x(GetArcProp(UInt32 level, PROPID propID, PROPVARIANT *value)) \
+  x(GetArcNumProps(UInt32 level, UInt32 *numProps)) \
+  x(GetArcPropInfo(UInt32 level, UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
+  x(GetArcProp2(UInt32 level, PROPID propID, PROPVARIANT *value)) \
+  x(GetArcNumProps2(UInt32 level, UInt32 *numProps)) \
+  x(GetArcPropInfo2(UInt32 level, UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
 
-FOLDER_INTERFACE(IFolderArcProps, 0x10)
-{
-  INTERFACE_IFolderArcProps(PURE)
-};
+Z7_IFACE_CONSTR_FOLDER(IFolderArcProps, 0x10)
 
-FOLDER_INTERFACE(IGetFolderArcProps, 0x11)
-{
-  STDMETHOD(GetFolderArcProps)(IFolderArcProps **object) PURE;
-};
+#define Z7_IFACEM_IGetFolderArcProps(x) \
+  x(GetFolderArcProps(IFolderArcProps **object))
+Z7_IFACE_CONSTR_FOLDER(IGetFolderArcProps, 0x11)
 
-FOLDER_INTERFACE(IFolderCompare, 0x15)
-{
-  STDMETHOD_(Int32, CompareItems)(UInt32 index1, UInt32 index2, PROPID propID, Int32 propIsRaw) PURE;
-};
+#define Z7_IFACEM_IFolderCompare(x) \
+  x##2(Int32, CompareItems(UInt32 index1, UInt32 index2, PROPID propID, Int32 propIsRaw))
+Z7_IFACE_CONSTR_FOLDER(IFolderCompare, 0x15)
 
-#define INTERFACE_IFolderGetItemName(x) \
-  STDMETHOD(GetItemName)(UInt32 index, const wchar_t **name, unsigned *len) x; \
-  STDMETHOD(GetItemPrefix)(UInt32 index, const wchar_t **name, unsigned *len) x; \
-  STDMETHOD_(UInt64, GetItemSize)(UInt32 index) x; \
+#define Z7_IFACEM_IFolderGetItemName(x) \
+  x(GetItemName(UInt32 index, const wchar_t **name, unsigned *len)) \
+  x(GetItemPrefix(UInt32 index, const wchar_t **name, unsigned *len)) \
+  x##2(UInt64, GetItemSize(UInt32 index)) \
 
-FOLDER_INTERFACE(IFolderGetItemName, 0x16)
-{
-  INTERFACE_IFolderGetItemName(PURE)
-};
+Z7_IFACE_CONSTR_FOLDER(IFolderGetItemName, 0x16)
 
-#define FOLDER_MANAGER_INTERFACE(i, x)  DECL_INTERFACE(i, 9, x)
 
-#define INTERFACE_IFolderManager(x) \
-  STDMETHOD(OpenFolderFile)(IInStream *inStream, const wchar_t *filePath, const wchar_t *arcFormat, IFolderFolder **resultFolder, IProgress *progress) x; \
-  STDMETHOD(GetExtensions)(BSTR *extensions) x; \
-  STDMETHOD(GetIconPath)(const wchar_t *ext, BSTR *iconPath, Int32 *iconIndex) x; \
+#define Z7_IFACEM_IFolderManager(x) \
+  x(OpenFolderFile(IInStream *inStream, const wchar_t *filePath, const wchar_t *arcFormat, IFolderFolder **resultFolder, IProgress *progress)) \
+  x(GetExtensions(BSTR *extensions)) \
+  x(GetIconPath(const wchar_t *ext, BSTR *iconPath, Int32 *iconIndex)) \
   
-  // STDMETHOD(GetTypes)(BSTR *types) PURE;
-  // STDMETHOD(CreateFolderFile)(const wchar_t *type, const wchar_t *filePath, IProgress *progress) PURE;
-            
-FOLDER_MANAGER_INTERFACE(IFolderManager, 0x05)
-{
-  INTERFACE_IFolderManager(PURE);
-};
+  // x(GetTypes(BSTR *types))
+  // x(CreateFolderFile(const wchar_t *type, const wchar_t *filePath, IProgress *progress))
+  
+Z7_DECL_IFACE_7ZIP(IFolderManager, 9, 5)
+  { Z7_IFACE_COM7_PURE(IFolderManager) };
 
 /*
-#define IMP_IFolderFolder_GetProp(k) \
-  (UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) \
-    { if (index >= ARRAY_SIZE(k)) return E_INVALIDARG; \
     const CMy_STATPROPSTG_2 &srcItem = k[index]; \
     *propID = srcItem.propid; *varType = srcItem.vt; *name = 0; return S_OK; } \
-
-#define IMP_IFolderFolder_Props(c) \
-  STDMETHODIMP c::GetNumberOfProperties(UInt32 *numProperties) \
-    { *numProperties = ARRAY_SIZE(kProps); return S_OK; } \
-  STDMETHODIMP c::GetPropertyInfo IMP_IFolderFolder_GetProp(kProps)
 */
-
-#define IMP_IFolderFolder_GetProp(k) \
-  (UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) \
-    { if (index >= ARRAY_SIZE(k)) return E_INVALIDARG; \
-    *propID = k[index]; *varType = k7z_PROPID_To_VARTYPE[(unsigned)*propID]; *name = 0; return S_OK; } \
+#define IMP_IFolderFolder_GetProp(fn, k) \
+  Z7_COM7F_IMF(fn(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
+    { if (index >= Z7_ARRAY_SIZE(k)) return E_INVALIDARG; \
+    *propID = k[index]; *varType = k7z_PROPID_To_VARTYPE[(unsigned)*propID]; *name = NULL; return S_OK; } \
 
 #define IMP_IFolderFolder_Props(c) \
-  STDMETHODIMP c::GetNumberOfProperties(UInt32 *numProperties) \
-    { *numProperties = ARRAY_SIZE(kProps); return S_OK; } \
-  STDMETHODIMP c::GetPropertyInfo IMP_IFolderFolder_GetProp(kProps)
+  Z7_COM7F_IMF(c::GetNumberOfProperties(UInt32 *numProperties)) \
+    { *numProperties = Z7_ARRAY_SIZE(kProps); return S_OK; } \
+  IMP_IFolderFolder_GetProp(c::GetPropertyInfo, kProps)
 
 
 int CompareFileNames_ForFolderList(const wchar_t *s1, const wchar_t *s2);
 // int CompareFileNames_ForFolderList(const FChar *s1, const FChar *s2);
 
+Z7_PURE_INTERFACES_END
 #endif
diff --git a/CPP/7zip/UI/FileManager/LangPage.cpp b/CPP/7zip/UI/FileManager/LangPage.cpp
index 47e7894..ec1dd2e 100644
--- a/CPP/7zip/UI/FileManager/LangPage.cpp
+++ b/CPP/7zip/UI/FileManager/LangPage.cpp
@@ -15,13 +15,37 @@
 
 using namespace NWindows;
 
+
+static const unsigned k_NumLangLines_EN = 429;
+
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_LANG_LANG
 };
+#endif
 
 #define kLangTopic "fm/options.htm#language"
 
+
+struct CLangListRecord
+{
+  int Order;
+  unsigned LangInfoIndex;
+  bool IsSelected;
+  UString Mark;
+  UString Name;
+
+  CLangListRecord(): Order (10), IsSelected(false) {}
+  int Compare(const CLangListRecord &a) const
+  {
+    if (Order < a.Order) return -1;
+    if (Order > a.Order) return 1;
+    return MyStringCompareNoCase(Name, a.Name);
+  }
+};
+
+
 static void NativeLangString(UString &dest, const wchar_t *s)
 {
   dest += " (";
@@ -33,23 +57,51 @@ bool LangOpen(CLang &lang, CFSTR fileName);
 
 bool CLangPage::OnInit()
 {
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
-
+#ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+#endif
   _langCombo.Attach(GetItem(IDC_LANG_LANG));
 
-  UString temp = MyLoadString(IDS_LANG_ENGLISH);
-  NativeLangString(temp, MyLoadString(IDS_LANG_NATIVE));
-  int index = (int)_langCombo.AddString(temp);
-  _langCombo.SetItemData(index, _paths.Size());
-  _paths.Add(L"-");
-  _langCombo.SetCurSel(0);
+
+  unsigned listRecords_SelectedIndex = 0;
+
+  CObjectVector<CLangListRecord> listRecords;
+  {
+    CLangListRecord listRecord;
+    listRecord.Order = 0;
+    listRecord.Mark = "---";
+    listRecord.Name = MyLoadString(IDS_LANG_ENGLISH);
+    NativeLangString(listRecord.Name, MyLoadString(IDS_LANG_NATIVE));
+    listRecord.LangInfoIndex = _langs.Size();
+    listRecords.Add(listRecord);
+  }
+
+  AStringVector names;
+  unsigned subLangIndex = 0;
+  Lang_GetShortNames_for_DefaultLang(names, subLangIndex);
 
   const FString dirPrefix = GetLangDirPrefix();
   NFile::NFind::CEnumerator enumerator;
   enumerator.SetDirPrefix(dirPrefix);
   NFile::NFind::CFileInfo fi;
+
+  CLang lang_en;
+  {
+    CLangInfo &langInfo = _langs.AddNew();
+    langInfo.Name = "-";
+    if (LangOpen(lang_en, dirPrefix + FTEXT("en.ttt")))
+    {
+      langInfo.NumLines = lang_en._ids.Size();
+      // langInfo.Comments = lang_en.Comments;
+    }
+    else
+      langInfo.NumLines = k_NumLangLines_EN;
+    NumLangLines_EN = langInfo.NumLines;
+  }
+
   CLang lang;
   UString error;
+  UString n;
   
   while (enumerator.Next(fi))
   {
@@ -73,6 +125,39 @@ bool CLangPage::OnInit()
     }
     
     const UString shortName = fs2us(fi.Name.Left(pos));
+
+    CLangListRecord listRecord;
+    if (!names.IsEmpty())
+    {
+      for (unsigned i = 0; i < names.Size(); i++)
+        if (shortName.IsEqualTo_Ascii_NoCase(names[i]))
+        {
+          if (subLangIndex == i || names.Size() == 1)
+          {
+            listRecord.Mark = "***";
+            // listRecord.Order = 1;
+          }
+          else
+          {
+            listRecord.Mark = "+++";
+            // listRecord.Order = 2;
+          }
+          break;
+        }
+      if (listRecord.Mark.IsEmpty())
+      {
+        const int minusPos = shortName.Find(L'-');
+        if (minusPos >= 0)
+        {
+          const UString shortName2 = shortName.Left(minusPos);
+          if (shortName2.IsEqualTo_Ascii_NoCase(names[0]))
+          {
+            listRecord.Mark = "+++";
+            // listRecord.Order = 3;
+          }
+        }
+      }
+    }
     UString s = shortName;
     const wchar_t *eng = lang.Get(IDS_LANG_ENGLISH);
     if (eng)
@@ -80,25 +165,119 @@ bool CLangPage::OnInit()
     const wchar_t *native = lang.Get(IDS_LANG_NATIVE);
     if (native)
       NativeLangString(s, native);
-    index = (int)_langCombo.AddString(s);
-    _langCombo.SetItemData(index, _paths.Size());
-    _paths.Add(shortName);
+    
+    listRecord.Name = s;
+    listRecord.LangInfoIndex = _langs.Size();
+    listRecords.Add(listRecord);
     if (g_LangID.IsEqualTo_NoCase(shortName))
+      listRecords_SelectedIndex = listRecords.Size() - 1;
+
+    CLangInfo &langInfo = _langs.AddNew();
+    langInfo.Comments = lang.Comments;
+    langInfo.Name = shortName;
+    unsigned numLines = lang._ids.Size();
+    if (!lang_en.IsEmpty())
+    {
+      numLines = 0;
+      unsigned i1 = 0;
+      unsigned i2 = 0;
+      for (;;)
+      {
+        UInt32 id1 = (UInt32)0 - 1;
+        UInt32 id2 = (UInt32)0 - 1;
+        bool id1_defined = false;
+        bool id2_defined = false;
+        if (i1 < lang_en._ids.Size())
+        {
+          id1 = lang_en._ids[i1];
+          id1_defined = true;
+        }
+        if (i2 < lang._ids.Size())
+        {
+          id2 = lang._ids[i2];
+          id2_defined = true;
+        }
+        
+        bool id1_is_smaller = true;
+        if (id1_defined)
+        {
+          if (id2_defined)
+          {
+            if (id1 == id2)
+            {
+              i1++;
+              i2++;
+              numLines++;
+              continue;
+            }
+            if (id1 > id2)
+              id1_is_smaller = false;
+          }
+        }
+        else if (!id2_defined)
+          break;
+        else
+          id1_is_smaller = false;
+
+        n.Empty();
+        if (id1_is_smaller)
+        {
+          n.Add_UInt32(id1);
+          n += " : ";
+          n += lang_en.Get_by_index(i1);
+          langInfo.MissingLines.Add(n);
+          i1++;
+        }
+        else
+        {
+          n.Add_UInt32(id2);
+          n += " : ";
+          n += lang.Get_by_index(i2);
+          langInfo.ExtraLines.Add(n);
+          i2++;
+        }
+      }
+    }
+    langInfo.NumLines = numLines + langInfo.ExtraLines.Size();
+  }
+
+  listRecords[listRecords_SelectedIndex].IsSelected = true;
+
+  listRecords.Sort();
+  FOR_VECTOR (i, listRecords)
+  {
+    const CLangListRecord &rec= listRecords[i];
+    UString temp = rec.Name;
+    if (!rec.Mark.IsEmpty())
+    {
+      temp += "  ";
+      temp += rec.Mark;
+    }
+    const int index = (int)_langCombo.AddString(temp);
+    _langCombo.SetItemData(index, (LPARAM)rec.LangInfoIndex);
+    if (rec.IsSelected)
       _langCombo.SetCurSel(index);
   }
+
+  ShowLangInfo();
   
   if (!error.IsEmpty())
-    MessageBoxW(0, error, L"Error in Lang file", MB_ICONERROR);
+    MessageBoxW(NULL, error, L"Error in Lang file", MB_ICONERROR);
   return CPropertyPage::OnInit();
 }
 
 LONG CLangPage::OnApply()
 {
-  int pathIndex = (int)_langCombo.GetItemData_of_CurSel();
   if (_needSave)
-    SaveRegLang(_paths[pathIndex]);
+  {
+    const int pathIndex = (int)_langCombo.GetItemData_of_CurSel();
+    if ((unsigned)pathIndex < _langs.Size())
+      SaveRegLang(_langs[pathIndex].Name);
+  }
   _needSave = false;
+  #ifdef Z7_LANG
   ReloadLang();
+  #endif
   LangWasChanged = true;
   return PSNRET_NOERROR;
 }
@@ -108,13 +287,75 @@ void CLangPage::OnNotifyHelp()
   ShowHelpWindow(kLangTopic);
 }
 
-bool CLangPage::OnCommand(int code, int itemID, LPARAM param)
+bool CLangPage::OnCommand(unsigned code, unsigned itemID, LPARAM param)
 {
   if (code == CBN_SELCHANGE && itemID == IDC_LANG_LANG)
   {
     _needSave = true;
     Changed();
+    ShowLangInfo();
     return true;
   }
   return CPropertyPage::OnCommand(code, itemID, param);
 }
+
+static void AddVectorToString(UString &s, const UStringVector &v)
+{
+  UString a;
+  FOR_VECTOR (i, v)
+  {
+    if (i >= 50)
+      break;
+    a = v[i];
+    if (a.Len() > 1500)
+      continue;
+    if (a[0] == ';')
+    {
+      a.DeleteFrontal(1);
+      a.Trim();
+    }
+    s += a;
+    s.Add_LF();
+  }
+}
+
+static void AddVectorToString2(UString &s, const char *name, const UStringVector &v)
+{
+  if (v.IsEmpty())
+    return;
+  s.Add_LF();
+  s += "------ ";
+  s += name;
+  s += ": ";
+  s.Add_UInt32(v.Size());
+  s += " :";
+  s.Add_LF();
+  AddVectorToString(s, v);
+}
+
+void CLangPage::ShowLangInfo()
+{
+  UString s;
+  const int pathIndex = (int)_langCombo.GetItemData_of_CurSel();
+  if ((unsigned)pathIndex < _langs.Size())
+  {
+    const CLangInfo &langInfo = _langs[pathIndex];
+    const unsigned numLines = langInfo.NumLines;
+    s += langInfo.Name;
+    s += " : ";
+    s.Add_UInt32(numLines);
+    if (NumLangLines_EN != 0)
+    {
+      s += " / ";
+      s.Add_UInt32(NumLangLines_EN);
+      s += " = ";
+      s.Add_UInt32(numLines * 100 / NumLangLines_EN);
+      s += "%";
+    }
+    s.Add_LF();
+    AddVectorToString(s, langInfo.Comments);
+    AddVectorToString2(s, "Missing lines", langInfo.MissingLines);
+    AddVectorToString2(s, "Extra lines", langInfo.ExtraLines);
+  }
+  SetItemText(IDT_LANG_INFO, s);
+}
diff --git a/CPP/7zip/UI/FileManager/LangPage.h b/CPP/7zip/UI/FileManager/LangPage.h
index b806257..e37ba05 100644
--- a/CPP/7zip/UI/FileManager/LangPage.h
+++ b/CPP/7zip/UI/FileManager/LangPage.h
@@ -1,25 +1,36 @@
 // LangPage.h
  
-#ifndef __LANG_PAGE_H
-#define __LANG_PAGE_H
+#ifndef ZIP7_INC_LANG_PAGE_H
+#define ZIP7_INC_LANG_PAGE_H
 
 #include "../../../Windows/Control/PropertyPage.h"
 #include "../../../Windows/Control/ComboBox.h"
 
+struct CLangInfo
+{
+  unsigned NumLines;
+  UString Name;
+  UStringVector Comments;
+  UStringVector MissingLines;
+  UStringVector ExtraLines;
+};
+
 class CLangPage: public NWindows::NControl::CPropertyPage
 {
   NWindows::NControl::CComboBox _langCombo;
-  UStringVector _paths;
-
+  CObjectVector<CLangInfo> _langs;
+  unsigned NumLangLines_EN;
   bool _needSave;
+  
+  void ShowLangInfo();
 public:
   bool LangWasChanged;
   
   CLangPage(): _needSave(false), LangWasChanged(false) {}
-  virtual bool OnInit();
-  virtual void OnNotifyHelp();
-  virtual bool OnCommand(int code, int itemID, LPARAM param);
-  virtual LONG OnApply();
+  virtual bool OnInit() Z7_override;
+  virtual void OnNotifyHelp() Z7_override;
+  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM param) Z7_override;
+  virtual LONG OnApply() Z7_override;
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/LangPage.rc b/CPP/7zip/UI/FileManager/LangPage.rc
index 164e2d3..506f102 100644
--- a/CPP/7zip/UI/FileManager/LangPage.rc
+++ b/CPP/7zip/UI/FileManager/LangPage.rc
@@ -1,14 +1,17 @@
 #include "LangPageRes.h"
 #include "../../GuiCommon.rc"
 
-#define xc 160
-#define yc 100
+#define xc 240
+#define yc 252
+
+#define y 32
 
 IDD_LANG  DIALOG  0, 0, xs, ys  MY_PAGE_STYLE  MY_FONT
 CAPTION "Language"
 {
   LTEXT     "Language:", IDT_LANG_LANG, m, m, xc, 8
-  COMBOBOX  IDC_LANG_LANG, m, 20, xc, yc - 20, MY_COMBO_SORTED
+  COMBOBOX  IDC_LANG_LANG, m, 20, 160, yc - 20, MY_COMBO // MY_COMBO_SORTED
+  LTEXT     "", IDT_LANG_INFO, m, m + y, xc, yc - y, SS_NOPREFIX
 }
 
 
@@ -24,7 +27,7 @@ IDD_LANG_2  MY_PAGE
 CAPTION "Language"
 {
   LTEXT     "Language:", IDT_LANG_LANG, m, m, xc, 8
-  COMBOBOX  IDC_LANG_LANG, m, 20, xc, yc - 20, MY_COMBO_SORTED
+  COMBOBOX  IDC_LANG_LANG, m, 20, xc, yc - 20, MY_COMBO // MY_COMBO_SORTED
 }
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/LangPageRes.h b/CPP/7zip/UI/FileManager/LangPageRes.h
index d7a39d7..a1ad30f 100644
--- a/CPP/7zip/UI/FileManager/LangPageRes.h
+++ b/CPP/7zip/UI/FileManager/LangPageRes.h
@@ -6,3 +6,4 @@
 
 #define IDT_LANG_LANG   2102
 #define IDC_LANG_LANG    100
+#define IDT_LANG_INFO    101
diff --git a/CPP/7zip/UI/FileManager/LangUtils.cpp b/CPP/7zip/UI/FileManager/LangUtils.cpp
index 83d5aa7..4c9d16f 100644
--- a/CPP/7zip/UI/FileManager/LangUtils.cpp
+++ b/CPP/7zip/UI/FileManager/LangUtils.cpp
@@ -19,7 +19,8 @@ extern bool g_IsNT;
 
 UString g_LangID;
 
-static CLang g_Lang;
+// static
+CLang g_Lang;
 static bool g_Loaded = false;
 static NSynchronization::CCriticalSection g_CriticalSection;
 
@@ -34,6 +35,8 @@ FString GetLangDirPrefix()
   return NDLL::GetModuleDirPrefix() + FTEXT("Lang") FSTRING_PATH_SEPARATOR;
 }
 
+#ifdef Z7_LANG
+
 void LoadLangOneTime()
 {
   NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
@@ -48,7 +51,7 @@ void LangSetDlgItemText(HWND dialog, UInt32 controlID, UInt32 langID)
   const wchar_t *s = g_Lang.Get(langID);
   if (s)
   {
-    CWindow window(GetDlgItem(dialog, controlID));
+    CWindow window(GetDlgItem(dialog, (int)controlID));
     window.SetText(s);
   }
 }
@@ -67,10 +70,10 @@ static const CIDLangPair kLangPairs[] =
 void LangSetDlgItems(HWND dialog, const UInt32 *ids, unsigned numItems)
 {
   unsigned i;
-  for (i = 0; i < ARRAY_SIZE(kLangPairs); i++)
+  for (i = 0; i < Z7_ARRAY_SIZE(kLangPairs); i++)
   {
     const CIDLangPair &pair = kLangPairs[i];
-    CWindow window(GetDlgItem(dialog, pair.ControlID));
+    CWindow window(GetDlgItem(dialog, (int)pair.ControlID));
     if (window)
     {
       const wchar_t *s = g_Lang.Get(pair.LangID);
@@ -81,7 +84,7 @@ void LangSetDlgItems(HWND dialog, const UInt32 *ids, unsigned numItems)
 
   for (i = 0; i < numItems; i++)
   {
-    UInt32 id = ids[i];
+    const UInt32 id = ids[i];
     LangSetDlgItemText(dialog, id, id);
   }
 }
@@ -90,11 +93,11 @@ void LangSetDlgItems_Colon(HWND dialog, const UInt32 *ids, unsigned numItems)
 {
   for (unsigned i = 0; i < numItems; i++)
   {
-    UInt32 id = ids[i];
+    const UInt32 id = ids[i];
     const wchar_t *s = g_Lang.Get(id);
     if (s)
     {
-      CWindow window(GetDlgItem(dialog, id));
+      CWindow window(GetDlgItem(dialog, (int)id));
       UString s2 = s;
       s2 += ':';
       window.SetText(s2);
@@ -102,6 +105,23 @@ void LangSetDlgItems_Colon(HWND dialog, const UInt32 *ids, unsigned numItems)
   }
 }
 
+void LangSetDlgItems_RemoveColon(HWND dialog, const UInt32 *ids, unsigned numItems)
+{
+  for (unsigned i = 0; i < numItems; i++)
+  {
+    const UInt32 id = ids[i];
+    const wchar_t *s = g_Lang.Get(id);
+    if (s)
+    {
+      CWindow window(GetDlgItem(dialog, (int)id));
+      UString s2 = s;
+      if (!s2.IsEmpty() && s2.Back() == ':')
+        s2.DeleteBack();
+      window.SetText(s2);
+    }
+  }
+}
+
 void LangSetWindowText(HWND window, UInt32 langID)
 {
   const wchar_t *s = g_Lang.Get(langID);
@@ -214,14 +234,18 @@ static struct CC1Lang
 
 // typedef LANGID (WINAPI *GetUserDefaultUILanguageP)();
 
-static void OpenDefaultLang()
+void Lang_GetShortNames_for_DefaultLang(AStringVector &names, unsigned &subLang)
 {
-  LANGID sysLang = GetSystemDefaultLangID(); // "Language for non-Unicode programs" in XP64
-  LANGID userLang = GetUserDefaultLangID(); // "Standards and formats" language in XP64
+  names.Clear();
+  subLang = 0;
+  const LANGID sysLang = GetSystemDefaultLangID(); // "Language for non-Unicode programs" in XP64
+  const LANGID userLang = GetUserDefaultLangID(); // "Standards and formats" language in XP64
 
   if (sysLang != userLang)
     return;
-  LANGID langID = userLang;
+  const LANGID langID = userLang;
+
+  // const LANGID langID = MAKELANGID(0x1a, 1); // for debug
   
   /*
   LANGID sysUILang; // english  in XP64
@@ -237,15 +261,22 @@ static void OpenDefaultLang()
     sysUILang = fn();
   */
 
-  WORD primLang = (WORD)(PRIMARYLANGID(langID));
-  WORD subLang = (WORD)(SUBLANGID(langID));
+  const WORD primLang = (WORD)(PRIMARYLANGID(langID));
+  subLang = SUBLANGID(langID);
+  FindShortNames(primLang, names);
+}
+
+
+static void OpenDefaultLang()
+{
+  AStringVector names;
+  unsigned subLang;
+  Lang_GetShortNames_for_DefaultLang(names, subLang);
   {
-    AStringVector names;
-    FindShortNames(primLang, names);
     const FString dirPrefix (GetLangDirPrefix());
     for (unsigned i = 0; i < 2; i++)
     {
-      unsigned index = (i == 0 ? subLang : 0);
+      const unsigned index = (i == 0 ? subLang : 0);
       if (index < names.Size())
       {
         const AString &name = names[index];
@@ -282,12 +313,14 @@ void ReloadLang()
   if (g_LangID.Len() > 1 || g_LangID[0] != L'-')
   {
     FString s = us2fs(g_LangID);
-    if (s.Find(FCHAR_PATH_SEPARATOR) < 0)
+    if (s.ReverseFind_PathSepar() < 0)
     {
-      if (s.Find(FTEXT('.')) < 0)
+      if (s.ReverseFind_Dot() < 0)
         s += ".txt";
       s.Insert(0, GetLangDirPrefix());
+      LangOpen(g_Lang, s);
     }
-    LangOpen(g_Lang, s);
   }
 }
+
+#endif
diff --git a/CPP/7zip/UI/FileManager/LangUtils.h b/CPP/7zip/UI/FileManager/LangUtils.h
index d63a443..d53d270 100644
--- a/CPP/7zip/UI/FileManager/LangUtils.h
+++ b/CPP/7zip/UI/FileManager/LangUtils.h
@@ -1,13 +1,16 @@
 // LangUtils.h
 
-#ifndef __LANG_UTILS_H
-#define __LANG_UTILS_H
+#ifndef ZIP7_INC_LANG_UTILS_H
+#define ZIP7_INC_LANG_UTILS_H
 
-#include "../../../Windows/ResourceString.h"
+#include "../../../Common/Lang.h"
 
-#ifdef LANG
+#include "../../../Windows/ResourceString.h"
 
 extern UString g_LangID;
+extern CLang g_Lang;
+
+#ifdef Z7_LANG
 
 struct CIDLangPair
 {
@@ -17,11 +20,11 @@ struct CIDLangPair
 
 void ReloadLang();
 void LoadLangOneTime();
-FString GetLangDirPrefix();
 
 void LangSetDlgItemText(HWND dialog, UInt32 controlID, UInt32 langID);
 void LangSetDlgItems(HWND dialog, const UInt32 *ids, unsigned numItems);
 void LangSetDlgItems_Colon(HWND dialog, const UInt32 *ids, unsigned numItems);
+void LangSetDlgItems_RemoveColon(HWND dialog, const UInt32 *ids, unsigned numItems);
 void LangSetWindowText(HWND window, UInt32 langID);
 
 UString LangString(UInt32 langID);
@@ -37,4 +40,9 @@ inline void AddLangString(UString &s, UInt32 langID) { s += NWindows::MyLoadStri
 
 #endif
 
+FString GetLangDirPrefix();
+// bool LangOpen(CLang &lang, CFSTR fileName);
+
+void Lang_GetShortNames_for_DefaultLang(AStringVector &names, unsigned &subLang);
+
 #endif
diff --git a/CPP/7zip/UI/FileManager/LinkDialog.cpp b/CPP/7zip/UI/FileManager/LinkDialog.cpp
index 07f1f06..0f24761 100644
--- a/CPP/7zip/UI/FileManager/LinkDialog.cpp
+++ b/CPP/7zip/UI/FileManager/LinkDialog.cpp
@@ -8,9 +8,7 @@
 #include "../../../Windows/FileIO.h"
 #include "../../../Windows/FileName.h"
 
-#ifdef LANG
 #include "LangUtils.h"
-#endif
 
 #include "BrowseDialog.h"
 #include "CopyDialogRes.h"
@@ -26,7 +24,7 @@ extern bool g_SymLink_Supported;
 using namespace NWindows;
 using namespace NFile;
 
-#ifdef LANG
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDB_LINK_LINK,
@@ -73,7 +71,7 @@ static bool GetSymLink(CFSTR path, CReparseAttr &attr, UString &errorMessage)
 }
 
 
-static const int k_LinkType_Buttons[] =
+static const unsigned k_LinkType_Buttons[] =
 {
   IDR_LINK_TYPE_HARD,
   IDR_LINK_TYPE_SYM_FILE,
@@ -82,16 +80,19 @@ static const int k_LinkType_Buttons[] =
   IDR_LINK_TYPE_WSL
 };
 
-void CLinkDialog::Set_LinkType_Radio(int idb)
+void CLinkDialog::Set_LinkType_Radio(unsigned idb)
 {
-  CheckRadioButton(k_LinkType_Buttons[0], k_LinkType_Buttons[ARRAY_SIZE(k_LinkType_Buttons) - 1], idb);
+  CheckRadioButton(
+      k_LinkType_Buttons[0],
+      k_LinkType_Buttons[Z7_ARRAY_SIZE(k_LinkType_Buttons) - 1],
+      idb);
 }
 
 bool CLinkDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetWindowText(*this, IDD_LINK);
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
   #endif
   
   _pathFromCombo.Attach(GetItem(IDC_LINK_PATH_FROM));
@@ -100,7 +101,7 @@ bool CLinkDialog::OnInit()
   if (!FilePath.IsEmpty())
   {
     NFind::CFileInfo fi;
-    int linkType = 0;
+    unsigned linkType = 0;
     if (!fi.Find(us2fs(FilePath)))
       linkType = IDR_LINK_TYPE_SYM_FILE;
     else
@@ -109,7 +110,7 @@ bool CLinkDialog::OnInit()
       {
         CReparseAttr attr;
         UString error;
-        bool res = GetSymLink(us2fs(FilePath), attr, error);
+        const bool res = GetSymLink(us2fs(FilePath), attr, error);
         if (!res && error.IsEmpty())
         {
           DWORD lastError = GetLastError();
@@ -138,7 +139,7 @@ bool CLinkDialog::OnInit()
         
         SetItemText(IDT_LINK_PATH_TO_CUR, s);
         
-        UString destPath = attr.GetPath();
+        const UString destPath = attr.GetPath();
         _pathFromCombo.SetText(FilePath);
         _pathToCombo.SetText(destPath);
         
@@ -215,7 +216,7 @@ bool CLinkDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   return false;
 }
 
-bool CLinkDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CLinkDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -240,7 +241,7 @@ void CLinkDialog::OnButton_SetPath(bool to)
     _pathFromCombo;
   combo.GetText(currentPath);
   // UString title = "Specify a location for output folder";
-  UString title = LangString(IDS_SET_FOLDER);
+  const UString title = LangString(IDS_SET_FOLDER);
 
   UString resultPath;
   if (!MyBrowseForFolder(*this, title, currentPath, resultPath))
@@ -271,10 +272,10 @@ void CLinkDialog::OnButton_Link()
   if (!NName::IsAbsolutePath(from))
     from.Insert(0, CurDirPrefix);
 
-  int idb = -1;
+  unsigned idb = 0;
   for (unsigned i = 0;; i++)
   {
-    if (i >= ARRAY_SIZE(k_LinkType_Buttons))
+    if (i >= Z7_ARRAY_SIZE(k_LinkType_Buttons))
       return;
     idb = k_LinkType_Buttons[i];
     if (IsButtonCheckedBool(idb))
@@ -355,7 +356,7 @@ void CLinkDialog::OnButton_Link()
 
 void CApp::Link()
 {
-  unsigned srcPanelIndex = GetFocusedPanelIndex();
+  const unsigned srcPanelIndex = GetFocusedPanelIndex();
   CPanel &srcPanel = Panels[srcPanelIndex];
   if (!srcPanel.IsFSFolder())
   {
@@ -363,7 +364,7 @@ void CApp::Link()
     return;
   }
   CRecordVector<UInt32> indices;
-  srcPanel.GetOperatedItemIndices(indices);
+  srcPanel.Get_ItemIndices_Operated(indices);
   if (indices.IsEmpty())
     return;
   if (indices.Size() != 1)
@@ -371,14 +372,14 @@ void CApp::Link()
     srcPanel.MessageBox_Error_LangID(IDS_SELECT_ONE_FILE);
     return;
   }
-  int index = indices[0];
+  const UInt32 index = indices[0];
   const UString itemName = srcPanel.GetItemName(index);
 
   const UString fsPrefix = srcPanel.GetFsPath();
   const UString srcPath = fsPrefix + srcPanel.GetItemPrefix(index);
   UString path = srcPath;
   {
-    unsigned destPanelIndex = (NumPanels <= 1) ? srcPanelIndex : (1 - srcPanelIndex);
+    const unsigned destPanelIndex = (NumPanels <= 1) ? srcPanelIndex : (1 - srcPanelIndex);
     CPanel &destPanel = Panels[destPanelIndex];
     if (NumPanels > 1)
       if (destPanel.IsFSFolder())
diff --git a/CPP/7zip/UI/FileManager/LinkDialog.h b/CPP/7zip/UI/FileManager/LinkDialog.h
index 56deec9..dd768f7 100644
--- a/CPP/7zip/UI/FileManager/LinkDialog.h
+++ b/CPP/7zip/UI/FileManager/LinkDialog.h
@@ -1,7 +1,7 @@
 // LinkDialog.h
 
-#ifndef __LINK_DIALOG_H
-#define __LINK_DIALOG_H
+#ifndef ZIP7_INC_LINK_DIALOG_H
+#define ZIP7_INC_LINK_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/ComboBox.h"
@@ -13,21 +13,21 @@ class CLinkDialog: public NWindows::NControl::CModalDialog
   NWindows::NControl::CComboBox _pathFromCombo;
   NWindows::NControl::CComboBox _pathToCombo;
   
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   void OnButton_SetPath(bool to);
   void OnButton_Link();
 
   void ShowLastErrorMessage();
   void ShowError(const wchar_t *s);
-  void Set_LinkType_Radio(int idb);
+  void Set_LinkType_Radio(unsigned idb);
 public:
   UString CurDirPrefix;
   UString FilePath;
   UString AnotherPath;
   
-  INT_PTR Create(HWND parentWindow = 0)
+  INT_PTR Create(HWND parentWindow = NULL)
     { return CModalDialog::Create(IDD_LINK, parentWindow); }
 };
 
diff --git a/CPP/7zip/UI/FileManager/ListViewDialog.cpp b/CPP/7zip/UI/FileManager/ListViewDialog.cpp
index a42e790..6767e4c 100644
--- a/CPP/7zip/UI/FileManager/ListViewDialog.cpp
+++ b/CPP/7zip/UI/FileManager/ListViewDialog.cpp
@@ -8,7 +8,7 @@
 #include "ListViewDialog.h"
 #include "RegistryUtils.h"
 
-#ifdef LANG
+#ifdef Z7_LANG
 #include "LangUtils.h"
 #endif
 
@@ -26,14 +26,14 @@ static void ListView_GetSelected(NControl::CListView &listView, CUIntVector &vec
     index = listView.GetNextSelectedItem(index);
     if (index < 0)
       break;
-    vector.Add(index);
+    vector.Add((unsigned)index);
   }
 }
 
 
 bool CListViewDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
   _listView.Attach(GetItem(IDL_LISTVIEW));
@@ -227,17 +227,17 @@ void CListViewDialog::DeleteItems()
 {
   for (;;)
   {
-    int index = _listView.GetNextSelectedItem(-1);
+    const int index = _listView.GetNextSelectedItem(-1);
     if (index < 0)
       break;
     StringsWereChanged = true;
-    _listView.DeleteItem(index);
+    _listView.DeleteItem((unsigned)index);
     if ((unsigned)index < Strings.Size())
-      Strings.Delete(index);
+      Strings.Delete((unsigned)index);
     if ((unsigned)index < Values.Size())
-      Values.Delete(index);
+      Values.Delete((unsigned)index);
   }
-  int focusedIndex = _listView.GetFocusedItem();
+  const int focusedIndex = _listView.GetFocusedItem();
   if (focusedIndex >= 0)
     _listView.SetItemState_FocusedSelected(focusedIndex);
   _listView.SetColumnWidthAuto(0);
diff --git a/CPP/7zip/UI/FileManager/ListViewDialog.h b/CPP/7zip/UI/FileManager/ListViewDialog.h
index 00206af..5f0b66d 100644
--- a/CPP/7zip/UI/FileManager/ListViewDialog.h
+++ b/CPP/7zip/UI/FileManager/ListViewDialog.h
@@ -1,7 +1,7 @@
 // ListViewDialog.h
 
-#ifndef __LISTVIEW_DIALOG_H
-#define __LISTVIEW_DIALOG_H
+#ifndef ZIP7_INC_LISTVIEW_DIALOG_H
+#define ZIP7_INC_LISTVIEW_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/ListView.h"
@@ -11,10 +11,10 @@
 class CListViewDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CListView _listView;
-  virtual void OnOK();
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
-  virtual bool OnNotify(UINT controlID, LPNMHDR header);
+  virtual void OnOK() Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual bool OnNotify(UINT controlID, LPNMHDR header) Z7_override;
   void CopyToClipboard();
   void DeleteItems();
   void ShowItemInfo();
@@ -32,7 +32,7 @@ public:
   int FocusedItemIndex;
   unsigned NumColumns;
 
-  INT_PTR Create(HWND wndParent = 0) { return CModalDialog::Create(IDD_LISTVIEW, wndParent); }
+  INT_PTR Create(HWND wndParent = NULL) { return CModalDialog::Create(IDD_LISTVIEW, wndParent); }
 
   CListViewDialog():
     SelectFirst(false),
diff --git a/CPP/7zip/UI/FileManager/MenuPage.cpp b/CPP/7zip/UI/FileManager/MenuPage.cpp
index 32dabae..2da7f3a 100644
--- a/CPP/7zip/UI/FileManager/MenuPage.cpp
+++ b/CPP/7zip/UI/FileManager/MenuPage.cpp
@@ -26,6 +26,7 @@
 using namespace NWindows;
 using namespace NContextMenuFlags;
 
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDX_SYSTEM_INTEGRATE_TO_MENU,
@@ -35,12 +36,13 @@ static const UInt32 kLangIDs[] =
   IDT_SYSTEM_ZONE,
   IDT_SYSTEM_CONTEXT_MENU_ITEMS
 };
+#endif
 
 #define kMenuTopic "fm/options.htm#sevenZip"
 
 struct CContextMenuItem
 {
-  int ControlID;
+  unsigned ControlID;
   UInt32 Flag;
 };
 
@@ -97,7 +99,9 @@ bool CMenuPage::OnInit()
 
   Clear_MenuChanged();
   
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+#ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+#endif
 
   #ifdef UNDER_CE
 
@@ -219,7 +223,7 @@ bool CMenuPage::OnInit()
       if (i == 0)
         s.Insert(0, L"* ");
       const int index = (int)_zoneCombo.AddString(s);
-      _zoneCombo.SetItemData(index, val);
+      _zoneCombo.SetItemData(index, (LPARAM)val);
       if (val == wz)
         _zoneCombo.SetCurSel(index);
     }
@@ -231,7 +235,7 @@ bool CMenuPage::OnInit()
 
   _listView.InsertColumn(0, L"", 200);
 
-  for (unsigned i = 0; i < ARRAY_SIZE(kMenuItems); i++)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(kMenuItems); i++)
   {
     const CContextMenuItem &menuItem = kMenuItems[i];
 
@@ -272,8 +276,8 @@ bool CMenuPage::OnInit()
       }
     }
 
-    int itemIndex = _listView.InsertItem(i, s);
-    _listView.SetCheckState(itemIndex, ((ci.Flags & menuItem.Flag) != 0));
+    const int itemIndex = _listView.InsertItem(i, s);
+    _listView.SetCheckState((unsigned)itemIndex, ((ci.Flags & menuItem.Flag) != 0));
   }
 
   _listView.SetColumnWidthAuto(0);
@@ -303,8 +307,8 @@ LONG CMenuPage::OnApply()
     CShellDll &dll = _dlls[d];
     if (dll.wasChanged && !dll.Path.IsEmpty())
     {
-      bool newVal = IsButtonCheckedBool(dll.ctrl);
-      LONG res = SetContextMenuHandler(newVal, fs2us(dll.Path), dll.wow);
+      const bool newVal = IsButtonCheckedBool(dll.ctrl);
+      const LONG res = SetContextMenuHandler(newVal, fs2us(dll.Path), dll.wow);
       if (res != ERROR_SUCCESS && (dll.prevValue != newVal || newVal))
         ShowMenuErrorMessage(NError::MyFormatMessage(res), *this);
       dll.prevValue = CheckContextMenuHandler(fs2us(dll.Path), dll.wow);
@@ -340,7 +344,7 @@ LONG CMenuPage::OnApply()
 
     ci.Flags = 0;
     
-    for (unsigned i = 0; i < ARRAY_SIZE(kMenuItems); i++)
+    for (unsigned i = 0; i < Z7_ARRAY_SIZE(kMenuItems); i++)
       if (_listView.GetCheckState(i))
         ci.Flags |= kMenuItems[i].Flag;
     
@@ -360,7 +364,7 @@ void CMenuPage::OnNotifyHelp()
   ShowHelpWindow(kMenuTopic);
 }
 
-bool CMenuPage::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CMenuPage::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -392,7 +396,7 @@ bool CMenuPage::OnButtonClicked(int buttonID, HWND buttonHWND)
 }
 
 
-bool CMenuPage::OnCommand(int code, int itemID, LPARAM param)
+bool CMenuPage::OnCommand(unsigned code, unsigned itemID, LPARAM param)
 {
   if (code == CBN_SELCHANGE && itemID == IDC_SYSTEM_ZONE)
   {
diff --git a/CPP/7zip/UI/FileManager/MenuPage.h b/CPP/7zip/UI/FileManager/MenuPage.h
index 02aee6d..3b62a8b 100644
--- a/CPP/7zip/UI/FileManager/MenuPage.h
+++ b/CPP/7zip/UI/FileManager/MenuPage.h
@@ -1,7 +1,7 @@
 // MenuPage.h
  
-#ifndef __MENU_PAGE_H
-#define __MENU_PAGE_H
+#ifndef ZIP7_INC_MENU_PAGE_H
+#define ZIP7_INC_MENU_PAGE_H
 
 #include "../../../Windows/Control/PropertyPage.h"
 #include "../../../Windows/Control/ComboBox.h"
@@ -12,7 +12,7 @@ struct CShellDll
   FString Path;
   bool wasChanged;
   bool prevValue;
-  int ctrl;
+  unsigned ctrl;
   UInt32 wow;
 
   CShellDll(): wasChanged (false), prevValue(false), ctrl(0), wow(0) {}
@@ -44,14 +44,14 @@ class CMenuPage: public NWindows::NControl::CPropertyPage
   NWindows::NControl::CListView _listView;
   NWindows::NControl::CComboBox _zoneCombo;
 
-  virtual bool OnInit();
-  virtual void OnNotifyHelp();
-  virtual bool OnNotify(UINT controlID, LPNMHDR lParam);
-  virtual bool OnItemChanged(const NMLISTVIEW *info);
-  virtual LONG OnApply();
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
-  virtual bool OnCommand(int code, int itemID, LPARAM param);
-public:
+  virtual bool OnInit() Z7_override;
+  virtual void OnNotifyHelp() Z7_override;
+  virtual bool OnNotify(UINT controlID, LPNMHDR lParam) Z7_override;
+  virtual LONG OnApply() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM param) Z7_override;
+
+  bool OnItemChanged(const NMLISTVIEW* info);
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/MessagesDialog.cpp b/CPP/7zip/UI/FileManager/MessagesDialog.cpp
index 4124827..57e56bc 100644
--- a/CPP/7zip/UI/FileManager/MessagesDialog.cpp
+++ b/CPP/7zip/UI/FileManager/MessagesDialog.cpp
@@ -16,9 +16,9 @@ using namespace NWindows;
 
 void CMessagesDialog::AddMessageDirect(LPCWSTR message)
 {
-  int i = _messageList.GetItemCount();
+  const unsigned i = (unsigned)_messageList.GetItemCount();
   wchar_t sz[16];
-  ConvertUInt32ToString((UInt32)i, sz);
+  ConvertUInt32ToString(i, sz);
   _messageList.InsertItem(i, sz);
   _messageList.SetSubItem(i, 1, message);
 }
@@ -28,18 +28,18 @@ void CMessagesDialog::AddMessage(LPCWSTR message)
   UString s = message;
   while (!s.IsEmpty())
   {
-    int pos = s.Find(L'\n');
+    const int pos = s.Find(L'\n');
     if (pos < 0)
       break;
     AddMessageDirect(s.Left(pos));
-    s.DeleteFrontal(pos + 1);
+    s.DeleteFrontal((unsigned)pos + 1);
   }
   AddMessageDirect(s);
 }
 
 bool CMessagesDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetWindowText(*this, IDD_MESSAGES);
   LangSetDlgItems(*this, NULL, 0);
   SetItemText(IDOK, LangString(IDS_CLOSE));
diff --git a/CPP/7zip/UI/FileManager/MessagesDialog.h b/CPP/7zip/UI/FileManager/MessagesDialog.h
index 5c017eb..40b0379 100644
--- a/CPP/7zip/UI/FileManager/MessagesDialog.h
+++ b/CPP/7zip/UI/FileManager/MessagesDialog.h
@@ -1,7 +1,7 @@
 // MessagesDialog.h
 
-#ifndef __MESSAGES_DIALOG_H
-#define __MESSAGES_DIALOG_H
+#ifndef ZIP7_INC_MESSAGES_DIALOG_H
+#define ZIP7_INC_MESSAGES_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/ListView.h"
@@ -14,12 +14,12 @@ class CMessagesDialog: public NWindows::NControl::CModalDialog
   
   void AddMessageDirect(LPCWSTR message);
   void AddMessage(LPCWSTR message);
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
 public:
   const UStringVector *Messages;
   
-  INT_PTR Create(HWND parent = 0) { return CModalDialog::Create(IDD_MESSAGES, parent); }
+  INT_PTR Create(HWND parent = NULL) { return CModalDialog::Create(IDD_MESSAGES, parent); }
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/MyCom2.h b/CPP/7zip/UI/FileManager/MyCom2.h
index 5fe1ef7..d3b49fe 100644
--- a/CPP/7zip/UI/FileManager/MyCom2.h
+++ b/CPP/7zip/UI/FileManager/MyCom2.h
@@ -1,48 +1,55 @@
 // MyCom2.h
 
-#ifndef __MYCOM2_H
-#define __MYCOM2_H
+#ifndef ZIP7_INC_MYCOM2_H
+#define ZIP7_INC_MYCOM2_H
 
 #include "../../../Common/MyCom.h"
 
-#define MY_ADDREF_RELEASE_MT \
-STDMETHOD_(ULONG, AddRef)() { InterlockedIncrement((LONG *)&__m_RefCount); return __m_RefCount; } \
-STDMETHOD_(ULONG, Release)() { InterlockedDecrement((LONG *)&__m_RefCount); \
-  if (__m_RefCount != 0) return __m_RefCount; \
-  delete this; return 0; }
-
-#define MY_UNKNOWN_IMP_SPEC_MT2(i1, i) \
-  MY_QUERYINTERFACE_BEGIN \
-  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+#define Z7_COM_ADDREF_RELEASE_MT \
+  private: \
+  STDMETHOD_(ULONG, AddRef)() Z7_override Z7_final \
+    { return (ULONG)InterlockedIncrement((LONG *)&_m_RefCount); } \
+  STDMETHOD_(ULONG, Release)() Z7_override Z7_final \
+    { const LONG v = InterlockedDecrement((LONG *)&_m_RefCount); \
+      if (v != 0) return (ULONG)v; \
+      delete this; return 0; }
+
+#define Z7_COM_UNKNOWN_IMP_SPEC_MT2(i1, i) \
+  Z7_COM_QI_BEGIN \
+  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
   i \
-  MY_QUERYINTERFACE_END \
-  MY_ADDREF_RELEASE_MT
+  Z7_COM_QI_END \
+  Z7_COM_ADDREF_RELEASE_MT
 
 
-#define MY_UNKNOWN_IMP1_MT(i) MY_UNKNOWN_IMP_SPEC_MT2( \
+#define Z7_COM_UNKNOWN_IMP_1_MT(i) \
+  Z7_COM_UNKNOWN_IMP_SPEC_MT2( \
   i, \
-  MY_QUERYINTERFACE_ENTRY(i) \
+  Z7_COM_QI_ENTRY(i) \
   )
 
-#define MY_UNKNOWN_IMP2_MT(i1, i2) MY_UNKNOWN_IMP_SPEC_MT2( \
+#define Z7_COM_UNKNOWN_IMP_2_MT(i1, i2) \
+  Z7_COM_UNKNOWN_IMP_SPEC_MT2( \
   i1, \
-  MY_QUERYINTERFACE_ENTRY(i1) \
-  MY_QUERYINTERFACE_ENTRY(i2) \
+  Z7_COM_QI_ENTRY(i1) \
+  Z7_COM_QI_ENTRY(i2) \
   )
 
-#define MY_UNKNOWN_IMP3_MT(i1, i2, i3) MY_UNKNOWN_IMP_SPEC_MT2( \
+#define Z7_COM_UNKNOWN_IMP_3_MT(i1, i2, i3) \
+  Z7_COM_UNKNOWN_IMP_SPEC_MT2( \
   i1, \
-  MY_QUERYINTERFACE_ENTRY(i1) \
-  MY_QUERYINTERFACE_ENTRY(i2) \
-  MY_QUERYINTERFACE_ENTRY(i3) \
+  Z7_COM_QI_ENTRY(i1) \
+  Z7_COM_QI_ENTRY(i2) \
+  Z7_COM_QI_ENTRY(i3) \
   )
 
-#define MY_UNKNOWN_IMP4_MT(i1, i2, i3, i4) MY_UNKNOWN_IMP_SPEC_MT2( \
+#define Z7_COM_UNKNOWN_IMP_4_MT(i1, i2, i3, i4) \
+  Z7_COM_UNKNOWN_IMP_SPEC_MT2( \
   i1, \
-  MY_QUERYINTERFACE_ENTRY(i1) \
-  MY_QUERYINTERFACE_ENTRY(i2) \
-  MY_QUERYINTERFACE_ENTRY(i3) \
-  MY_QUERYINTERFACE_ENTRY(i4) \
+  Z7_COM_QI_ENTRY(i1) \
+  Z7_COM_QI_ENTRY(i2) \
+  Z7_COM_QI_ENTRY(i3) \
+  Z7_COM_QI_ENTRY(i4) \
   )
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/MyLoadMenu.cpp b/CPP/7zip/UI/FileManager/MyLoadMenu.cpp
index 3973bb2..9453536 100644
--- a/CPP/7zip/UI/FileManager/MyLoadMenu.cpp
+++ b/CPP/7zip/UI/FileManager/MyLoadMenu.cpp
@@ -17,14 +17,15 @@
 #include "MyLoadMenu.h"
 #include "RegistryUtils.h"
 
+#include "PropertyNameRes.h"
 #include "resource.h"
 
 using namespace NWindows;
 
-static const UINT kOpenBookmarkMenuID = 830;
-static const UINT kSetBookmarkMenuID = 810;
-static const UINT kMenuID_Time_Parent = 760;
-static const UINT kMenuID_Time = 761;
+static const UINT k_MenuID_OpenBookmark = 830;
+static const UINT k_MenuID_SetBookmark = 810;
+static const UINT k_MenuID_TimePopup = IDM_VIEW_TIME_POPUP;
+static const UINT k_MenuID_Time = IDM_VIEW_TIME;
 
 extern HINSTANCE g_hInstance;
 
@@ -34,35 +35,45 @@ extern void OptionsDialog(HWND hwndOwner, HINSTANCE hInstance);
 
 enum
 {
-  kMenuIndex_File = 0,
-  kMenuIndex_Edit,
-  kMenuIndex_View,
-  kMenuIndex_Bookmarks
+  k_MenuIndex_File = 0,
+  k_MenuIndex_Edit,
+  k_MenuIndex_View,
+  k_MenuIndex_Bookmarks
 };
 
-static const UInt32 kTopMenuLangIDs[] = { 500, 501, 502, 503, 504, 505 };
+#ifdef Z7_LANG
+static const UInt32 k_LangID_TopMenuItems[] =
+{
+  IDM_FILE,
+  IDM_EDIT,
+  IDM_VIEW,
+  IDM_FAVORITES,
+  IDM_TOOLS,
+  IDM_HELP
+};
 
-static const UInt32 kAddToFavoritesLangID = 800;
-static const UInt32 kToolbarsLangID = 733;
+static const UInt32 k_LangID_Toolbars = IDM_VIEW_TOOLBARS;
+static const UInt32 k_LangID_AddToFavorites = IDM_ADD_TO_FAVORITES;
 
 static const CIDLangPair kIDLangPairs[] =
 {
-  { IDCLOSE, 557 },
-  { IDM_VIEW_ARANGE_BY_NAME, 1004 },
-  { IDM_VIEW_ARANGE_BY_TYPE, 1020 },
-  { IDM_VIEW_ARANGE_BY_DATE, 1012 },
-  { IDM_VIEW_ARANGE_BY_SIZE, 1007 }
+  { IDCLOSE, 557 }, // IDM_EXIT
+  { IDM_VIEW_ARANGE_BY_NAME, IDS_PROP_NAME },
+  { IDM_VIEW_ARANGE_BY_TYPE, IDS_PROP_FILE_TYPE },
+  { IDM_VIEW_ARANGE_BY_DATE, IDS_PROP_MTIME },
+  { IDM_VIEW_ARANGE_BY_SIZE, IDS_PROP_SIZE }
 };
 
 static int FindLangItem(unsigned controlID)
 {
-  for (unsigned i = 0; i < ARRAY_SIZE(kIDLangPairs); i++)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(kIDLangPairs); i++)
     if (kIDLangPairs[i].ControlID == controlID)
-      return i;
+      return (int)i;
   return -1;
 }
+#endif
 
-static int GetSortControlID(PROPID propID)
+static unsigned GetSortControlID(PROPID propID)
 {
   switch (propID)
   {
@@ -72,54 +83,55 @@ static int GetSortControlID(PROPID propID)
     case kpidSize:       return IDM_VIEW_ARANGE_BY_SIZE;
     case kpidNoProperty: return IDM_VIEW_ARANGE_NO_SORT;
   }
-  return -1;
+  return IDM_VIEW_ARANGE_BY_NAME;
+  // IDM_VIEW_ARANGE_NO_SORT;
+  // return -1;
 }
 
 /*
-static bool g_IsNew_fMask = true;
+#if _MSC_VER > 1400
+// GetVersion was declared deprecated
+#pragma warning(disable : 4996)
+#endif
 
-class CInit_fMask
+static bool g_IsNew_fMask = false;
+static class CInit_fMask
 {
 public:
   CInit_fMask()
   {
-    g_IsNew_fMask = false;
-    OSVERSIONINFO vi;
-    vi.dwOSVersionInfoSize = sizeof(vi);
-    if (::GetVersionEx(&vi))
-    {
-      g_IsNew_fMask = (vi.dwMajorVersion > 4 ||
-        (vi.dwMajorVersion == 4 && vi.dwMinorVersion > 0));
-    }
-    g_IsNew_fMask = false;
+    DWORD v = GetVersion();
+    v = ((v & 0xff) << 8) | ((v >> 8) & 0xFF);
+    g_IsNew_fMask = (v > 0x400); // (win98/win2000) or newer
   }
 } g_Init_fMask;
-
-// it's hack for supporting Windows NT
-// constants are from WinUser.h
-
-#if (WINVER < 0x0500)
-#define MIIM_STRING      0x00000040
-#define MIIM_BITMAP      0x00000080
-#define MIIM_FTYPE       0x00000100
-#endif
-
 static UINT Get_fMask_for_String()
-{
-  return g_IsNew_fMask ? MIIM_STRING : MIIM_TYPE;
-}
-
+  { return g_IsNew_fMask ? MIIM_STRING : MIIM_TYPE; }
 static UINT Get_fMask_for_FType_and_String()
-{
-  return g_IsNew_fMask ? (MIIM_STRING | MIIM_FTYPE) : MIIM_TYPE;
-}
+  { return g_IsNew_fMask ? (MIIM_STRING | MIIM_FTYPE) : MIIM_TYPE; }
 */
 
+/*
+We can use new MIIM_STRING / MIIM_FTYPE flags in the following conditions:
+  1) we run at new Windows (win98/win2000) or newer
+  2) also we probably must set MENUITEMINFO::cbSize as sizeof of full
+     (MENUITEMINFO) that was compiled with (WINVER >= 0x0500)
+But it's simpler to use old MIIM_TYPE without these complex checks.
+*/
+
+// /*
 static inline UINT Get_fMask_for_String() { return MIIM_TYPE; }
 static inline UINT Get_fMask_for_FType_and_String() { return MIIM_TYPE; }
+// */
 
+static bool Is_MenuItem_TimePopup(const CMenuItem &item)
+{
+  return item.wID == k_MenuID_TimePopup ||
+    item.StringValue.IsPrefixedBy_Ascii_NoCase("20");
+}
 
-static void MyChangeMenu(HMENU menuLoc, int level, int menuIndex)
+#ifdef Z7_LANG
+static void MyChangeMenu(HMENU menuLoc, unsigned menuID, unsigned level, unsigned menuIndex)
 {
   CMenu menu;
   menu.Attach(menuLoc);
@@ -127,55 +139,90 @@ static void MyChangeMenu(HMENU menuLoc, int level, int menuIndex)
   for (unsigned i = 0;; i++)
   {
     CMenuItem item;
-    item.fMask = Get_fMask_for_String() | MIIM_SUBMENU | MIIM_ID;
-    item.fType = MFT_STRING;
+    /* here we can use
+         Get_fMask_for_String() or
+         Get_fMask_for_FType_and_String()
+       We want to change only String of menu item.
+       It's not required to change (fType) of menu item.
+       We can look (fType) to check for SEPARATOR item.
+       But String of separator is empty and (wID == 0).
+       So we can check for SEPARATOR without (fType) requesting.
+       So it's enough to use Get_fMask_for_String() here */
+    item.fMask =
+        Get_fMask_for_String()
+        // Get_fMask_for_FType_and_String()
+        | MIIM_SUBMENU | MIIM_ID;
     if (!menu.GetItem(i, true, item))
       break;
     {
       UString newString;
       if (item.hSubMenu)
       {
-        UInt32 langID = 0;
-        if (level == 1 && menuIndex == kMenuIndex_Bookmarks)
-          langID = kAddToFavoritesLangID;
-        else
+        /* in win10:
+           MENU+POPUP:
+             (wID == item.hSubMenu)
+           MENUEX+POPUP where ID is not set:
+             (wID == 0)
+           MENU+SEPARATOR
+             (wID == 0)
+        */
+        UInt32 langID = item.wID;
+        if (langID >= (1 << 16))
+        {
+          // here we try to exclude the case (wID == item.hSubMenu) if (MENU+POPUP)
+          continue;
+        }
+        if (langID == 0)
         {
-          MyChangeMenu(item.hSubMenu, level + 1, i);
-          if (level == 1 && menuIndex == kMenuIndex_View)
+          if (level == 0)
           {
-            if (item.wID == kMenuID_Time_Parent || item.StringValue.IsPrefixedBy_Ascii_NoCase("20"))
-              continue;
-            else
-              langID = kToolbarsLangID;
+            if (i < Z7_ARRAY_SIZE(k_LangID_TopMenuItems))
+              langID = k_LangID_TopMenuItems[i];
+          }
+          else if (level == 1)
+          {
+            if (menuID == IDM_FAVORITES || (menuID == 0 && menuIndex == k_MenuIndex_Bookmarks))
+              langID = k_LangID_AddToFavorites;
+            else if (menuID == IDM_VIEW || (menuID == 0 && menuIndex == k_MenuIndex_View))
+            {
+              if (Is_MenuItem_TimePopup(item))
+                langID = k_MenuID_TimePopup;
+              else
+                langID = k_LangID_Toolbars;
+            }
           }
-          else if (level == 0 && i < ARRAY_SIZE(kTopMenuLangIDs))
-            langID = kTopMenuLangIDs[i];
-          else
-            continue;
         }
-        
+        if (langID == k_MenuID_TimePopup)
+          continue;
+        if (langID != k_LangID_AddToFavorites)
+          MyChangeMenu(item.hSubMenu, langID, level + 1, i);
+        if (langID == 0)
+          continue;
         LangString_OnlyFromLangFile(langID, newString);
-        
         if (newString.IsEmpty())
           continue;
       }
       else
       {
+        if (item.fMask & (MIIM_TYPE | MIIM_FTYPE))
         if (item.IsSeparator())
           continue;
-        int langPos = FindLangItem(item.wID);
-
+        if (item.StringValue.IsEmpty())
+          continue;
+        const int langPos = FindLangItem(item.wID);
         // we don't need lang change for CRC items!!!
+        const UInt32 langID = langPos >= 0 ? kIDLangPairs[langPos].LangID : item.wID;
+        if (langID == 0)
+          continue;
 
-        UInt32 langID = langPos >= 0 ? kIDLangPairs[langPos].LangID : item.wID;
-        
-        if (langID == IDM_OPEN_INSIDE_ONE || langID == IDM_OPEN_INSIDE_PARSER)
+        if (langID == IDM_OPEN_INSIDE_ONE ||
+            langID == IDM_OPEN_INSIDE_PARSER)
         {
           LangString_OnlyFromLangFile(IDM_OPEN_INSIDE, newString);
           if (newString.IsEmpty())
             continue;
           newString.Replace(L"&", L"");
-          int tabPos = newString.Find(L"\t");
+          const int tabPos = newString.Find(L"\t");
           if (tabPos >= 0)
             newString.DeleteFrom(tabPos);
           newString += (langID == IDM_OPEN_INSIDE_ONE ? " *" : " #");
@@ -186,37 +233,40 @@ static void MyChangeMenu(HMENU menuLoc, int level, int menuIndex)
           if (newString.IsEmpty())
             continue;
           newString.Replace(L"&", L"");
-          int tabPos = newString.Find(L"\t");
+          const int tabPos = newString.Find(L"\t");
           if (tabPos >= 0)
             newString.DeleteFrom(tabPos);
           newString += " 2";
         }
         else
+        {
           LangString_OnlyFromLangFile(langID, newString);
+        }
 
         if (newString.IsEmpty())
           continue;
 
-        int tabPos = item.StringValue.ReverseFind(L'\t');
+        const int tabPos = item.StringValue.ReverseFind(L'\t');
         if (tabPos >= 0)
           newString += item.StringValue.Ptr(tabPos);
       }
 
       {
         item.StringValue = newString;
+        // we want to change only String
         item.fMask = Get_fMask_for_String();
-        item.fType = MFT_STRING;
         menu.SetItem(i, true, item);
       }
     }
   }
 }
+#endif
 
 static CMenu g_FileMenu;
 
 static struct CFileMenuDestroyer
 {
-  ~CFileMenuDestroyer() { if ((HMENU)g_FileMenu != 0) g_FileMenu.Destroy(); }
+  ~CFileMenuDestroyer() { if ((HMENU)g_FileMenu) g_FileMenu.Destroy(); }
 } g_FileMenuDestroyer;
 
 
@@ -224,6 +274,12 @@ static void CopyMenu(HMENU srcMenuSpec, HMENU destMenuSpec);
 
 static void CopyPopMenu_IfRequired(CMenuItem &item)
 {
+  /* if (item.hSubMenu) is defined
+  {
+    - it creates new (popup) menu
+    - it copies menu items from old item.hSubMenu menu to new (popup) menu
+    - it sets item.hSubMenu to handle of created (popup) menu
+  } */
   if (item.hSubMenu)
   {
     CMenu popup;
@@ -233,64 +289,91 @@ static void CopyPopMenu_IfRequired(CMenuItem &item)
   }
 }
 
+/* destMenuSpec must be non-NULL handle to created empty popup menu */
 static void CopyMenu(HMENU srcMenuSpec, HMENU destMenuSpec)
 {
   CMenu srcMenu;
   srcMenu.Attach(srcMenuSpec);
   CMenu destMenu;
   destMenu.Attach(destMenuSpec);
-  int startPos = 0;
-  for (int i = 0;; i++)
+  unsigned startPos = 0;
+  for (unsigned i = 0;; i++)
   {
     CMenuItem item;
     item.fMask = MIIM_SUBMENU | MIIM_STATE | MIIM_ID | Get_fMask_for_FType_and_String();
-    item.fType = MFT_STRING;
-
     if (!srcMenu.GetItem(i, true, item))
       break;
-
     CopyPopMenu_IfRequired(item);
     if (destMenu.InsertItem(startPos, true, item))
       startPos++;
   }
 }
 
-void MyLoadMenu()
-{
-  HMENU baseMenu;
 
+/* use for (needResetMenu):
+    false : for call from program window creation code
+    true  : for another calls : (from Options language change)
+*/
+void MyLoadMenu(bool needResetMenu)
+{
   #ifdef UNDER_CE
 
-  HMENU oldMenu = g_App._commandBar.GetMenu(0);
+  const HMENU oldMenu = g_App._commandBar.GetMenu(0);
   if (oldMenu)
     ::DestroyMenu(oldMenu);
   /* BOOL b = */ g_App._commandBar.InsertMenubar(g_hInstance, IDM_MENU, 0);
-  baseMenu = g_App._commandBar.GetMenu(0);
+  const HMENU baseMenu = g_App._commandBar.GetMenu(0);
   // if (startInit)
-  // SetIdsForSubMenes(baseMenu, 0, 0);
+  // SetIdsForSubMenus(baseMenu, 0, 0);
   if (!g_LangID.IsEmpty())
     MyChangeMenu(baseMenu, 0, 0);
   g_App._commandBar.DrawMenuBar(0);
  
-  #else
-
-  HWND hWnd = g_HWND;
-  HMENU oldMenu = ::GetMenu(hWnd);
-  ::SetMenu(hWnd, ::LoadMenu(g_hInstance, MAKEINTRESOURCE(IDM_MENU)));
-  ::DestroyMenu(oldMenu);
-  baseMenu = ::GetMenu(hWnd);
+  #else // UNDER_CE
+
+  const HWND hWnd = g_HWND;
+  bool menuWasChanged = false;
+  /*
+     We must reload to english default menu for at least two cases:
+     - if some submenu was changed (File or another submenu can be changed after menu activating).
+     - for change from non-english lang to another partial non-english lang,
+       where we still need some english strings.
+     But we reload menu to default menu everytime except of program starting stage.
+     That scheme is simpler than complex checks for exact conditions for menu reload.
+  */
+  if (needResetMenu)
+  {
+    const HMENU oldMenu = ::GetMenu(hWnd);
+    const HMENU newMenu = ::LoadMenu(g_hInstance, MAKEINTRESOURCE(IDM_MENU));
+    // docs for SetMenu(): the window is redrawn to reflect the menu change.
+    if (newMenu && ::SetMenu(hWnd, newMenu))
+      ::DestroyMenu(oldMenu);
+    menuWasChanged = true;
+  }
+  const HMENU baseMenu = ::GetMenu(hWnd);
   // if (startInit)
-  // SetIdsForSubMenes(baseMenu, 0, 0);
-  if (!g_LangID.IsEmpty())
-    MyChangeMenu(baseMenu, 0, 0);
-  ::DrawMenuBar(hWnd);
-
+  // SetIdsForSubMenus(baseMenu, 0, 0);
+  #ifdef Z7_LANG
+  if (!g_Lang.IsEmpty()) // !g_LangID.IsEmpty() &&
+  {
+    MyChangeMenu(baseMenu, 0, 0, 0);
+    menuWasChanged = true;
+  }
   #endif
 
-  if ((HMENU)g_FileMenu != 0)
-    g_FileMenu.Destroy();
-  g_FileMenu.CreatePopup();
-  CopyMenu(::GetSubMenu(baseMenu, 0), g_FileMenu);
+  if (menuWasChanged)
+    ::DrawMenuBar(hWnd);
+
+  #endif // UNDER_CE
+
+  // menuWasChanged = false; // for debug
+  if (menuWasChanged || !(HMENU)g_FileMenu)
+  {
+    if ((HMENU)g_FileMenu)
+      g_FileMenu.Destroy();
+    g_FileMenu.CreatePopup();
+    CopyMenu(::GetSubMenu(baseMenu, k_MenuIndex_File), g_FileMenu);
+  }
 }
 
 void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
@@ -306,14 +389,14 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
   if (::GetSubMenu(mainMenu, position) != hMenu)
     return;
   
-  if (position == kMenuIndex_File)
+  if (position == k_MenuIndex_File)
   {
     CMenu menu;
     menu.Attach(hMenu);
     menu.RemoveAllItems();
     g_App.GetFocusedPanel().CreateFileMenu(hMenu);
   }
-  else if (position == kMenuIndex_Edit)
+  else if (position == k_MenuIndex_Edit)
   {
     /*
     CMenu menu;
@@ -323,16 +406,20 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
     menu.EnableItem(IDM_EDIT_PASTE, IsClipboardFormatAvailableHDROP() ? MF_ENABLED : MF_GRAYED);
     */
   }
-  else if (position == kMenuIndex_View)
+  else if (position == k_MenuIndex_View)
   {
     // View;
     CMenu menu;
     menu.Attach(hMenu);
-    menu.CheckRadioItem(IDM_VIEW_LARGE_ICONS, IDM_VIEW_DETAILS,
-      IDM_VIEW_LARGE_ICONS + g_App.GetListViewMode(), MF_BYCOMMAND);
-
-    menu.CheckRadioItem(IDM_VIEW_ARANGE_BY_NAME, IDM_VIEW_ARANGE_NO_SORT,
-        GetSortControlID(g_App.GetSortID()), MF_BYCOMMAND);
+    menu.CheckRadioItem(
+        IDM_VIEW_LARGE_ICONS, IDM_VIEW_DETAILS,
+        IDM_VIEW_LARGE_ICONS + g_App.GetListViewMode(), MF_BYCOMMAND);
+
+    menu.CheckRadioItem(
+        IDM_VIEW_ARANGE_BY_NAME,
+        IDM_VIEW_ARANGE_NO_SORT,
+        GetSortControlID(g_App.GetSortID()),
+        MF_BYCOMMAND);
     
     menu.CheckItemByID(IDM_VIEW_TWO_PANELS, g_App.NumPanels == 2);
     menu.CheckItemByID(IDM_VIEW_FLAT_VIEW, g_App.GetFlatMode());
@@ -344,16 +431,14 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
     // menu.CheckItemByID(IDM_VIEW_SHOW_STREAMS, g_App.Get_ShowNtfsStrems_Mode());
     // menu.CheckItemByID(IDM_VIEW_SHOW_DELETED, g_App.ShowDeletedFiles);
 
-    for (int i = 0;; i++)
+    for (unsigned i = 0;; i++)
     {
       CMenuItem item;
       item.fMask = Get_fMask_for_String() | MIIM_SUBMENU | MIIM_ID;
       item.fType = MFT_STRING;
       if (!menu.GetItem(i, true, item))
         break;
-      if (item.hSubMenu && (item.wID == kMenuID_Time_Parent
-          || item.StringValue.IsPrefixedBy_Ascii_NoCase("20")
-          ))
+      if (item.hSubMenu && Is_MenuItem_TimePopup(item))
       {
         FILETIME ft;
         NTime::GetCurUtcFileTime(ft);
@@ -367,11 +452,11 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
 
         item.fMask = Get_fMask_for_String() | MIIM_ID;
         item.fType = MFT_STRING;
-        item.wID = kMenuID_Time_Parent;
+        item.wID = k_MenuID_TimePopup;
         menu.SetItem(i, true, item);
 
         CMenu subMenu;
-        subMenu.Attach(menu.GetSubMenu(i));
+        subMenu.Attach(menu.GetSubMenu((int)i));
         subMenu.RemoveAllItems();
         
         const int k_TimeLevels[] =
@@ -384,16 +469,16 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
           kTimestampPrintLevel_NS
         };
 
-        unsigned last = kMenuID_Time;
+        unsigned last = k_MenuID_Time;
         unsigned selectedCommand = 0;
         g_App._timestampLevels.Clear();
-        unsigned id = kMenuID_Time;
+        unsigned id = k_MenuID_Time;
         
-        for (unsigned k = 0; k < ARRAY_SIZE(k_TimeLevels); k++)
+        for (unsigned k = 0; k < Z7_ARRAY_SIZE(k_TimeLevels); k++)
         {
           wchar_t s[64];
           s[0] = 0;
-          int timestampLevel = k_TimeLevels[k];
+          const int timestampLevel = k_TimeLevels[k];
           if (ConvertUtcFileTimeToString(ft, s, timestampLevel))
           {
             if (subMenu.AppendItem(MF_STRING, id, s))
@@ -407,11 +492,11 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
           }
         }
         if (selectedCommand != 0)
-          menu.CheckRadioItem(kMenuID_Time, last, selectedCommand, MF_BYCOMMAND);
+          menu.CheckRadioItem(k_MenuID_Time, last, selectedCommand, MF_BYCOMMAND);
       }
     }
   }
-  else if (position == kMenuIndex_Bookmarks)
+  else if (position == k_MenuIndex_Bookmarks)
   {
     CMenu menu;
     menu.Attach(hMenu);
@@ -419,17 +504,17 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
     CMenu subMenu;
     subMenu.Attach(menu.GetSubMenu(0));
     subMenu.RemoveAllItems();
-    int i;
+    unsigned i;
     
     for (i = 0; i < 10; i++)
     {
       UString s = LangString(IDS_BOOKMARK);
       s.Add_Space();
-      char c = (char)(L'0' + i);
+      const char c = (char)(L'0' + i);
       s += c;
       s += "\tAlt+Shift+";
       s += c;
-      subMenu.AppendItem(MF_STRING, kSetBookmarkMenuID + i, s);
+      subMenu.AppendItem(MF_STRING, k_MenuID_SetBookmark + i, s);
     }
 
     menu.RemoveAllItemsFrom(2);
@@ -448,7 +533,7 @@ void OnMenuActivating(HWND /* hWnd */, HMENU hMenu, int position)
         s = '-';
       s += "\tAlt+";
       s += (char)('0' + i);
-      menu.AppendItem(MF_STRING, kOpenBookmarkMenuID + i, s);
+      menu.AppendItem(MF_STRING, k_MenuID_OpenBookmark + i, s);
     }
   }
 }
@@ -596,7 +681,7 @@ void CFileMenu::Load(HMENU hMenu, unsigned startPos)
     NFile::NFind::CFileInfo fi;
     if (fi.Find(FilePath) && fi.Size < ((UInt32)1 << 31) && !fi.IsDir())
     {
-      for (unsigned k = 0; k < ARRAY_SIZE(g_Zvc_IDs); k++)
+      for (unsigned k = 0; k < Z7_ARRAY_SIZE(g_Zvc_IDs); k++)
       {
         const unsigned id = g_Zvc_IDs[k];
         if (fi.IsReadOnly())
@@ -756,7 +841,7 @@ bool OnMenuCommand(HWND hWnd, unsigned id)
         g_App.SetListViewMode(index);
         /*
         CMenu menu;
-        menu.Attach(::GetSubMenu(::GetMenu(hWnd), kMenuIndex_View));
+        menu.Attach(::GetSubMenu(::GetMenu(hWnd), k_MenuIndex_View));
         menu.CheckRadioItem(IDM_VIEW_LARGE_ICONS, IDM_VIEW_DETAILS,
             id, MF_BYCOMMAND);
         */
@@ -811,20 +896,19 @@ bool OnMenuCommand(HWND hWnd, unsigned id)
     }
     default:
     {
-      if (id >= kOpenBookmarkMenuID && id <= kOpenBookmarkMenuID + 9)
+      if (id >= k_MenuID_OpenBookmark && id <= k_MenuID_OpenBookmark + 9)
       {
-        g_App.OpenBookmark(id - kOpenBookmarkMenuID);
+        g_App.OpenBookmark(id - k_MenuID_OpenBookmark);
         return true;
       }
-      else if (id >= kSetBookmarkMenuID && id <= kSetBookmarkMenuID + 9)
+      else if (id >= k_MenuID_SetBookmark && id <= k_MenuID_SetBookmark + 9)
       {
-        g_App.SetBookmark(id - kSetBookmarkMenuID);
+        g_App.SetBookmark(id - k_MenuID_SetBookmark);
         return true;
       }
-      else if (id >= kMenuID_Time && (unsigned)id <= kMenuID_Time + g_App._timestampLevels.Size())
+      else if (id >= k_MenuID_Time && (unsigned)id < k_MenuID_Time + g_App._timestampLevels.Size())
       {
-        unsigned index = id - kMenuID_Time;
-        g_App.SetTimestampLevel(g_App._timestampLevels[index]);
+        g_App.SetTimestampLevel(g_App._timestampLevels[id - k_MenuID_Time]);
         return true;
       }
       return false;
diff --git a/CPP/7zip/UI/FileManager/MyLoadMenu.h b/CPP/7zip/UI/FileManager/MyLoadMenu.h
index 764bf7c..e71dbbf 100644
--- a/CPP/7zip/UI/FileManager/MyLoadMenu.h
+++ b/CPP/7zip/UI/FileManager/MyLoadMenu.h
@@ -1,14 +1,14 @@
 // MyLoadMenu.h
 
-#ifndef __MY_LOAD_MENU_H
-#define __MY_LOAD_MENU_H
+#ifndef ZIP7_INC_MY_LOAD_MENU_H
+#define ZIP7_INC_MY_LOAD_MENU_H
 
 void OnMenuActivating(HWND hWnd, HMENU hMenu, int position);
 // void OnMenuUnActivating(HWND hWnd, HMENU hMenu, int id);
 // void OnMenuUnActivating(HWND hWnd);
 
 bool OnMenuCommand(HWND hWnd, unsigned id);
-void MyLoadMenu();
+void MyLoadMenu(bool needResetMenu);
 
 struct CFileMenu
 {
@@ -18,7 +18,7 @@ struct CFileMenu
   bool isFsFolder;
   bool allAreFiles;
   bool isAltStreamsSupported;
-  int numItems;
+  unsigned numItems;
   
   FString FilePath;
 
diff --git a/CPP/7zip/UI/FileManager/MyWindowsNew.h b/CPP/7zip/UI/FileManager/MyWindowsNew.h
index 48a9535..325babc 100644
--- a/CPP/7zip/UI/FileManager/MyWindowsNew.h
+++ b/CPP/7zip/UI/FileManager/MyWindowsNew.h
@@ -1,11 +1,54 @@
 // MyWindowsNew.h
 
-#ifndef __MY_WINDOWS_NEW_H
-#define __MY_WINDOWS_NEW_H
+#ifndef ZIP7_INC_MY_WINDOWS_NEW_H
+#define ZIP7_INC_MY_WINDOWS_NEW_H
 
-#ifdef _MSC_VER
+#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__MINGW32_VERSION)
+#include <shobjidl.h>
 
+#if defined(__MINGW32_VERSION) && !defined(__ITaskbarList3_INTERFACE_DEFINED__)
+// for old mingw
+extern "C" {
+DEFINE_GUID(IID_ITaskbarList3, 0xEA1AFB91, 0x9E28, 0x4B86, 0x90, 0xE9, 0x9E, 0x9F, 0x8A, 0x5E, 0xEF, 0xAF);
+DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344, 0xfd6d, 0x11d0, 0x95,0x8a, 0x00,0x60,0x97,0xc9,0xa0,0x90);
+}
+#endif
+
+#else // is not __MINGW*
+
+#ifndef Z7_OLD_WIN_SDK
 #include <ShObjIdl.h>
+#else
+
+#ifndef HIMAGELIST
+struct _IMAGELIST;
+typedef struct _IMAGELIST* HIMAGELIST;
+#endif
+
+#ifndef __ITaskbarList_INTERFACE_DEFINED__
+#define __ITaskbarList_INTERFACE_DEFINED__
+DEFINE_GUID(IID_ITaskbarList, 0x56FDF342, 0xFD6D, 0x11d0, 0x95, 0x8A, 0x00, 0x60, 0x97, 0xC9, 0xA0, 0x90);
+struct ITaskbarList: public IUnknown
+{
+  STDMETHOD(HrInit)(void) = 0;
+  STDMETHOD(AddTab)(HWND hwnd) = 0;
+  STDMETHOD(DeleteTab)(HWND hwnd) = 0;
+  STDMETHOD(ActivateTab)(HWND hwnd) = 0;
+  STDMETHOD(SetActiveAlt)(HWND hwnd) = 0;
+};
+#endif // __ITaskbarList_INTERFACE_DEFINED__
+
+#ifndef __ITaskbarList2_INTERFACE_DEFINED__
+#define __ITaskbarList2_INTERFACE_DEFINED__
+DEFINE_GUID(IID_ITaskbarList2, 0x602D4995, 0xB13A, 0x429b, 0xA6, 0x6E, 0x19, 0x35, 0xE4, 0x4F, 0x43, 0x17);
+struct ITaskbarList2: public ITaskbarList
+{
+  STDMETHOD(MarkFullscreenWindow)(HWND hwnd, BOOL fFullscreen) = 0;
+};
+#endif // __ITaskbarList2_INTERFACE_DEFINED__
+
+#endif // Z7_OLD_WIN_SDK
+
 
 #ifndef __ITaskbarList3_INTERFACE_DEFINED__
 #define __ITaskbarList3_INTERFACE_DEFINED__
@@ -69,8 +112,8 @@ struct ITaskbarList3: public ITaskbarList2
   STDMETHOD(SetThumbnailClip)(HWND hwnd, RECT *prcClip) = 0;
 };
 
-#endif
+#endif // __ITaskbarList3_INTERFACE_DEFINED__
 
-#endif
+#endif // __MINGW*
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/NetFolder.cpp b/CPP/7zip/UI/FileManager/NetFolder.cpp
index a941e73..879f1db 100644
--- a/CPP/7zip/UI/FileManager/NetFolder.cpp
+++ b/CPP/7zip/UI/FileManager/NetFolder.cpp
@@ -55,9 +55,9 @@ void CNetFolder::Init(const UString &path)
   UString systemPathPart;
   DWORD result = GetResourceInformation(resource, destResource, systemPathPart);
   if (result == NO_ERROR)
-    Init(&destResource, 0, path);
+    Init(&destResource, NULL, path);
   else
-    Init(0, 0 , L"");
+    Init(NULL, NULL , L"");
   return;
 }
 
@@ -65,8 +65,8 @@ void CNetFolder::Init(const NWindows::NNet::CResourceW *netResource,
       IFolderFolder *parentFolder, const UString &path)
 {
   _path = path;
-  if (netResource == 0)
-    _netResourcePointer = 0;
+  if (!netResource)
+    _netResourcePointer = NULL;
   else
   {
     _netResource = *netResource;
@@ -86,7 +86,7 @@ void CNetFolder::Init(const NWindows::NNet::CResourceW *netResource,
   _parentFolder = parentFolder;
 }
 
-STDMETHODIMP CNetFolder::LoadItems()
+Z7_COM7F_IMF(CNetFolder::LoadItems())
 {
   _items.Clear();
   CEnum enumerator;
@@ -102,35 +102,35 @@ STDMETHODIMP CNetFolder::LoadItems()
     if (result == NO_ERROR)
       break;
     if (result != ERROR_ACCESS_DENIED)
-      return result;
-    if (_netResourcePointer != 0)
+      return HRESULT_FROM_WIN32(result);
+    if (_netResourcePointer)
     result = AddConnection2(_netResource,
-        0, 0, CONNECT_INTERACTIVE);
+        NULL, NULL, CONNECT_INTERACTIVE);
     if (result != NO_ERROR)
-      return result;
+      return HRESULT_FROM_WIN32(result);
   }
 
   for (;;)
   {
     CResourceEx resource;
-    DWORD result = enumerator.Next(resource);
+    const DWORD result = enumerator.Next(resource);
     if (result == NO_ERROR)
     {
       if (!resource.RemoteNameIsDefined) // For Win 98, I don't know what's wrong
         resource.RemoteName = resource.Comment;
       resource.Name = resource.RemoteName;
-      int pos = resource.Name.ReverseFind_PathSepar();
+      const int pos = resource.Name.ReverseFind_PathSepar();
       if (pos >= 0)
       {
         // _path = resource.Name.Left(pos + 1);
-        resource.Name.DeleteFrontal(pos + 1);
+        resource.Name.DeleteFrontal((unsigned)pos + 1);
       }
       _items.Add(resource);
     }
     else if (result == ERROR_NO_MORE_ITEMS)
       break;
     else
-      return result;
+      return HRESULT_FROM_WIN32(result);
   }
 
   /*
@@ -160,13 +160,13 @@ STDMETHODIMP CNetFolder::LoadItems()
 }
 
 
-STDMETHODIMP CNetFolder::GetNumberOfItems(UInt32 *numItems)
+Z7_COM7F_IMF(CNetFolder::GetNumberOfItems(UInt32 *numItems))
 {
   *numItems = _items.Size();
   return S_OK;
 }
 
-STDMETHODIMP CNetFolder::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CNetFolder::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value))
 {
   NCOM::CPropVariant prop;
   const CResourceEx &item = _items[itemIndex];
@@ -185,16 +185,16 @@ STDMETHODIMP CNetFolder::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIAN
   return S_OK;
 }
 
-STDMETHODIMP CNetFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CNetFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   const CResourceEx &resource = _items[index];
   if (resource.Usage == RESOURCEUSAGE_CONNECTABLE ||
       resource.DisplayType == RESOURCEDISPLAYTYPE_SHARE)
   {
     NFsFolder::CFSFolder *fsFolderSpec = new NFsFolder::CFSFolder;
     CMyComPtr<IFolderFolder> subFolder = fsFolderSpec;
-    RINOK(fsFolderSpec->Init(us2fs(resource.RemoteName + WCHAR_PATH_SEPARATOR))); // , this
+    RINOK(fsFolderSpec->Init(us2fs(resource.RemoteName + WCHAR_PATH_SEPARATOR))) // , this
     *resultFolder = subFolder.Detach();
   }
   else
@@ -207,32 +207,32 @@ STDMETHODIMP CNetFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder
   return S_OK;
 }
 
-STDMETHODIMP CNetFolder::BindToFolder(const wchar_t * /* name */, IFolderFolder ** /* resultFolder */)
+Z7_COM7F_IMF(CNetFolder::BindToFolder(const wchar_t * /* name */, IFolderFolder ** /* resultFolder */))
 {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP CNetFolder::BindToParentFolder(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CNetFolder::BindToParentFolder(IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   if (_parentFolder)
   {
     CMyComPtr<IFolderFolder> parentFolder = _parentFolder;
     *resultFolder = parentFolder.Detach();
     return S_OK;
   }
-  if (_netResourcePointer != 0)
+  if (_netResourcePointer)
   {
     CResourceW resourceParent;
-    DWORD result = GetResourceParent(_netResource, resourceParent);
+    const DWORD result = GetResourceParent(_netResource, resourceParent);
     if (result != NO_ERROR)
-      return result;
+      return HRESULT_FROM_WIN32(result);
     if (!_netResource.RemoteNameIsDefined)
       return S_OK;
 
     CNetFolder *netFolder = new CNetFolder;
     CMyComPtr<IFolderFolder> subFolder = netFolder;
-    netFolder->Init(&resourceParent, 0, WSTRING_PATH_SEPARATOR);
+    netFolder->Init(&resourceParent, NULL, WSTRING_PATH_SEPARATOR);
     *resultFolder = subFolder.Detach();
   }
   return S_OK;
@@ -240,7 +240,7 @@ STDMETHODIMP CNetFolder::BindToParentFolder(IFolderFolder **resultFolder)
 
 IMP_IFolderFolder_Props(CNetFolder)
 
-STDMETHODIMP CNetFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CNetFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value))
 {
   NWindows::NCOM::CPropVariant prop;
   switch (propID)
@@ -252,7 +252,7 @@ STDMETHODIMP CNetFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
   return S_OK;
 }
 
-STDMETHODIMP CNetFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
+Z7_COM7F_IMF(CNetFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex))
 {
   if (index >= (UInt32)_items.Size())
     return E_INVALIDARG;
@@ -277,5 +277,5 @@ STDMETHODIMP CNetFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
     }
     // *anIconIndex = GetRealIconIndex(0, L"\\\\HOME");
   }
-  return GetLastError();
+  return GetLastError_noZero_HRESULT();
 }
diff --git a/CPP/7zip/UI/FileManager/NetFolder.h b/CPP/7zip/UI/FileManager/NetFolder.h
index 151dd09..352f5bd 100644
--- a/CPP/7zip/UI/FileManager/NetFolder.h
+++ b/CPP/7zip/UI/FileManager/NetFolder.h
@@ -1,7 +1,7 @@
 // NetFolder.h
 
-#ifndef __NET_FOLDER_H
-#define __NET_FOLDER_H
+#ifndef ZIP7_INC_NET_FOLDER_H
+#define ZIP7_INC_NET_FOLDER_H
 
 #include "../../../Common/MyCom.h"
 
@@ -14,11 +14,11 @@ struct CResourceEx: public NWindows::NNet::CResourceW
   UString Name;
 };
 
-class CNetFolder:
-  public IFolderFolder,
-  public IFolderGetSystemIconIndex,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_NOQIB_2(
+  CNetFolder
+  , IFolderFolder
+  , IFolderGetSystemIconIndex
+)
   NWindows::NNet::CResourceW _netResource;
   NWindows::NNet::CResourceW *_netResourcePointer;
 
@@ -27,11 +27,7 @@ class CNetFolder:
   CMyComPtr<IFolderFolder> _parentFolder;
   UString _path;
 public:
-  MY_UNKNOWN_IMP1(IFolderGetSystemIconIndex)
-  INTERFACE_FolderFolder(;)
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
-
-  CNetFolder(): _netResourcePointer(0) {}
+  CNetFolder(): _netResourcePointer(NULL) {}
   void Init(const UString &path);
   void Init(const NWindows::NNet::CResourceW *netResource,
       IFolderFolder *parentFolder, const UString &path);
diff --git a/CPP/7zip/UI/FileManager/OpenCallback.cpp b/CPP/7zip/UI/FileManager/OpenCallback.cpp
index e2e03f5..5b6df50 100644
--- a/CPP/7zip/UI/FileManager/OpenCallback.cpp
+++ b/CPP/7zip/UI/FileManager/OpenCallback.cpp
@@ -17,9 +17,11 @@
 
 using namespace NWindows;
 
-STDMETHODIMP COpenArchiveCallback::SetTotal(const UInt64 *numFiles, const UInt64 *numBytes)
+HRESULT COpenArchiveCallback::Open_SetTotal(const UInt64 *numFiles, const UInt64 *numBytes)
+// Z7_COM7F_IMF(COpenArchiveCallback::SetTotal(const UInt64 *numFiles, const UInt64 *numBytes))
 {
-  RINOK(ProgressDialog.Sync.CheckStop());
+  // COM_TRY_BEGIN
+  RINOK(ProgressDialog.Sync.CheckStop())
   {
     // NSynchronization::CCriticalSectionLock lock(_criticalSection);
     ProgressDialog.Sync.Set_NumFilesTotal(numFiles ? *numFiles : (UInt64)(Int64)-1);
@@ -31,83 +33,37 @@ STDMETHODIMP COpenArchiveCallback::SetTotal(const UInt64 *numFiles, const UInt64
       ProgressDialog.Sync.Set_NumBytesTotal(*numBytes);
   }
   return S_OK;
+  // COM_TRY_END
 }
 
-STDMETHODIMP COpenArchiveCallback::SetCompleted(const UInt64 *numFiles, const UInt64 *numBytes)
+HRESULT COpenArchiveCallback::Open_SetCompleted(const UInt64 *numFiles, const UInt64 *numBytes)
+// Z7_COM7F_IMF(COpenArchiveCallback::SetCompleted(const UInt64 *numFiles, const UInt64 *numBytes))
 {
+  // COM_TRY_BEGIN
   // NSynchronization::CCriticalSectionLock lock(_criticalSection);
   if (numFiles)
     ProgressDialog.Sync.Set_NumFilesCur(*numFiles);
   if (numBytes)
     ProgressDialog.Sync.Set_NumBytesCur(*numBytes);
   return ProgressDialog.Sync.CheckStop();
+  // COM_TRY_END
 }
 
-STDMETHODIMP COpenArchiveCallback::SetTotal(const UInt64 total)
+HRESULT COpenArchiveCallback::Open_CheckBreak()
 {
-  RINOK(ProgressDialog.Sync.CheckStop());
-  ProgressDialog.Sync.Set_NumBytesTotal(total);
-  return S_OK;
-}
-
-STDMETHODIMP COpenArchiveCallback::SetCompleted(const UInt64 *completed)
-{
-  return ProgressDialog.Sync.Set_NumBytesCur(completed);
-}
-
-STDMETHODIMP COpenArchiveCallback::GetProperty(PROPID propID, PROPVARIANT *value)
-{
-  NCOM::CPropVariant prop;
-  if (_subArchiveMode)
-  {
-    switch (propID)
-    {
-      case kpidName: prop = _subArchiveName; break;
-    }
-  }
-  else
-  {
-    switch (propID)
-    {
-      case kpidName:  prop = fs2us(_fileInfo.Name); break;
-      case kpidIsDir:  prop = _fileInfo.IsDir(); break;
-      case kpidSize:  prop = _fileInfo.Size; break;
-      case kpidAttrib:  prop = (UInt32)_fileInfo.Attrib; break;
-      case kpidCTime:  prop = _fileInfo.CTime; break;
-      case kpidATime:  prop = _fileInfo.ATime; break;
-      case kpidMTime:  prop = _fileInfo.MTime; break;
-    }
-  }
-  prop.Detach(value);
-  return S_OK;
+  return ProgressDialog.Sync.CheckStop();
 }
 
-STDMETHODIMP COpenArchiveCallback::GetStream(const wchar_t *name, IInStream **inStream)
+HRESULT COpenArchiveCallback::Open_Finished()
 {
-  COM_TRY_BEGIN
-  *inStream = NULL;
-  if (_subArchiveMode)
-    return S_FALSE;
-
-  FString fullPath;
-  if (!NFile::NName::GetFullPath(_folderPrefix, us2fs(name), fullPath))
-    return S_FALSE;
-  if (!_fileInfo.Find_FollowLink(fullPath))
-    return S_FALSE;
-  if (_fileInfo.IsDir())
-    return S_FALSE;
-  CInFileStream *inFile = new CInFileStream;
-  CMyComPtr<IInStream> inStreamTemp = inFile;
-  if (!inFile->Open(fullPath))
-    return ::GetLastError();
-  *inStream = inStreamTemp.Detach();
-  return S_OK;
-  COM_TRY_END
+  return ProgressDialog.Sync.CheckStop();
 }
 
-STDMETHODIMP COpenArchiveCallback::CryptoGetTextPassword(BSTR *password)
+#ifndef Z7_NO_CRYPTO
+HRESULT COpenArchiveCallback::Open_CryptoGetTextPassword(BSTR *password)
+// Z7_COM7F_IMF(COpenArchiveCallback::CryptoGetTextPassword(BSTR *password))
 {
-  COM_TRY_BEGIN
+  // COM_TRY_BEGIN
   PasswordWasAsked = true;
   if (!PasswordIsDefined)
   {
@@ -125,5 +81,6 @@ STDMETHODIMP COpenArchiveCallback::CryptoGetTextPassword(BSTR *password)
       NExtract::Save_ShowPassword(dialog.ShowPassword);
   }
   return StringToBstr(Password, password);
-  COM_TRY_END
+  // COM_TRY_END
 }
+#endif
diff --git a/CPP/7zip/UI/FileManager/OpenCallback.h b/CPP/7zip/UI/FileManager/OpenCallback.h
index 9aa5d43..8f4638c 100644
--- a/CPP/7zip/UI/FileManager/OpenCallback.h
+++ b/CPP/7zip/UI/FileManager/OpenCallback.h
@@ -1,37 +1,28 @@
 // OpenCallback.h
 
-#ifndef __OPEN_CALLBACK_H
-#define __OPEN_CALLBACK_H
+#ifndef ZIP7_INC_OPEN_CALLBACK_H
+#define ZIP7_INC_OPEN_CALLBACK_H
 
-#include "../../../Common/MyCom.h"
+#include "../Common/ArchiveOpenCallback.h"
 
-#include "../../../Windows/FileFind.h"
-
-#include "../../IPassword.h"
-
-#include "../../Archive/IArchive.h"
-
-#ifdef _SFX
+#ifdef Z7_SFX
 #include "ProgressDialog.h"
 #else
 #include "ProgressDialog2.h"
 #endif
 
+/* we can use IArchiveOpenCallback or IOpenCallbackUI here */
 
-class COpenArchiveCallback:
+class COpenArchiveCallback Z7_final:
+  /*
   public IArchiveOpenCallback,
-  public IArchiveOpenVolumeCallback,
-  public IArchiveOpenSetSubArchiveName,
   public IProgress,
   public ICryptoGetTextPassword,
   public CMyUnknownImp
+  */
+  public IOpenCallbackUI
 {
-  FString _folderPrefix;
-  NWindows::NFile::NFind::CFileInfo _fileInfo;
   // NWindows::NSynchronization::CCriticalSection _criticalSection;
-  bool _subArchiveMode;
-  UString _subArchiveName;
-
 public:
   bool PasswordIsDefined;
   bool PasswordWasAsked;
@@ -39,31 +30,25 @@ public:
   HWND ParentWindow;
   CProgressDialog ProgressDialog;
 
-  MY_UNKNOWN_IMP5(
-    IArchiveOpenCallback,
+  /*
+  Z7_COM_UNKNOWN_IMP_3(
     IArchiveOpenVolumeCallback,
-    IArchiveOpenSetSubArchiveName,
-    IProgress,
-    ICryptoGetTextPassword)
-
-  INTERFACE_IProgress(;)
-  INTERFACE_IArchiveOpenCallback(;)
-  INTERFACE_IArchiveOpenVolumeCallback(;)
+    IProgress
+    ICryptoGetTextPassword
+    )
 
+  Z7_IFACE_COM7_IMP(IProgress)
+  Z7_IFACE_COM7_IMP(IArchiveOpenCallback)
   // ICryptoGetTextPassword
-  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
+  Z7_COM7F_IMP(CryptoGetTextPassword(BSTR *password))
+  */
 
-  STDMETHOD(SetSubArchiveName(const wchar_t *name))
-  {
-    _subArchiveMode = true;
-    _subArchiveName = name;
-    return S_OK;
-  }
+  Z7_IFACE_IMP(IOpenCallbackUI)
 
   COpenArchiveCallback():
-    ParentWindow(0)
+      ParentWindow(NULL)
   {
-    _subArchiveMode = false;
+    // _subArchiveMode = false;
     PasswordIsDefined = false;
     PasswordWasAsked = false;
   }
@@ -75,18 +60,6 @@ public:
   }
   */
   
-  HRESULT LoadFileInfo2(const FString &folderPrefix, const FString &fileName)
-  {
-    _folderPrefix = folderPrefix;
-    if (!_fileInfo.Find_FollowLink(_folderPrefix + fileName))
-    {
-      return GetLastError_noZero_HRESULT();
-    }
-    return S_OK;
-  }
-
-  void ShowMessage(const UInt64 *completed);
-
   INT_PTR StartProgressDialog(const UString &title, NWindows::CThread &thread)
   {
     return ProgressDialog.Create(title, thread, ParentWindow);
diff --git a/CPP/7zip/UI/FileManager/OptionsDialog.cpp b/CPP/7zip/UI/FileManager/OptionsDialog.cpp
index c42e0f8..b71c323 100644
--- a/CPP/7zip/UI/FileManager/OptionsDialog.cpp
+++ b/CPP/7zip/UI/FileManager/OptionsDialog.cpp
@@ -51,25 +51,27 @@ void OptionsDialog(HWND hwndOwner, HINSTANCE /* hInstance */)
 
   NControl::CPropertyPage *pagePointers[] = { &systemPage,  &menuPage, &foldersPage, &editPage, &settingsPage, &langPage };
   
-  for (unsigned i = 0; i < ARRAY_SIZE(pageIDs); i++)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(pageIDs); i++)
   {
     NControl::CPageInfo &page = pages.AddNew();
     page.ID = pageIDs[i];
+    #ifdef Z7_LANG
     LangString_OnlyFromLangFile(page.ID, page.Title);
+    #endif
     page.Page = pagePointers[i];
   }
 
-  INT_PTR res = NControl::MyPropertySheet(pages, hwndOwner, LangString(IDS_OPTIONS));
+  const INT_PTR res = NControl::MyPropertySheet(pages, hwndOwner, LangString(IDS_OPTIONS));
   
   if (res != -1 && res != 0)
   {
     if (langPage.LangWasChanged)
     {
       // g_App._window.SetText(LangString(IDS_APP_TITLE, 0x03000000));
-      MyLoadMenu();
+      MyLoadMenu(true); // needResetMenu
       g_App.ReloadToolbars();
       g_App.MoveSubWindows(); // we need it to change list window aafter _toolBar.AutoSize();
-      g_App.ReloadLang();
+      g_App.ReloadLangItems();
     }
   
     /*
diff --git a/CPP/7zip/UI/FileManager/OverwriteDialog.cpp b/CPP/7zip/UI/FileManager/OverwriteDialog.cpp
index b455b14..096527c 100644
--- a/CPP/7zip/UI/FileManager/OverwriteDialog.cpp
+++ b/CPP/7zip/UI/FileManager/OverwriteDialog.cpp
@@ -17,7 +17,7 @@
 
 using namespace NWindows;
 
-#ifdef LANG
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_OVERWRITE_HEADER,
@@ -48,7 +48,7 @@ void COverwriteDialog::ReduceString(UString &s)
   }
 }
 
-void COverwriteDialog::SetFileInfoControl(int textID, int iconID,
+void COverwriteDialog::SetFileInfoControl(unsigned textID, unsigned iconID,
     const NOverwriteDialog::CFileInfo &fileInfo)
 {
   UString sizeString;
@@ -96,9 +96,9 @@ void COverwriteDialog::SetFileInfoControl(int textID, int iconID,
 
 bool COverwriteDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetWindowText(*this, IDD_OVERWRITE);
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
   #endif
   SetFileInfoControl(IDT_OVERWRITE_OLD_FILE_SIZE_TIME, IDI_OVERWRITE_OLD_FILE, OldFileInfo);
   SetFileInfoControl(IDT_OVERWRITE_NEW_FILE_SIZE_TIME, IDI_OVERWRITE_NEW_FILE, NewFileInfo);
@@ -122,7 +122,7 @@ bool COverwriteDialog::OnInit()
   return CModalDialog::OnInit();
 }
 
-bool COverwriteDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool COverwriteDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -131,7 +131,7 @@ bool COverwriteDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
     case IDB_YES_TO_ALL:
     case IDB_NO_TO_ALL:
     case IDB_AUTO_RENAME:
-      End(buttonID);
+      End((INT_PTR)buttonID);
       return true;
   }
   return CModalDialog::OnButtonClicked(buttonID, buttonHWND);
diff --git a/CPP/7zip/UI/FileManager/OverwriteDialog.h b/CPP/7zip/UI/FileManager/OverwriteDialog.h
index 24e56ca..a9ca991 100644
--- a/CPP/7zip/UI/FileManager/OverwriteDialog.h
+++ b/CPP/7zip/UI/FileManager/OverwriteDialog.h
@@ -1,7 +1,7 @@
 // OverwriteDialog.h
 
-#ifndef __OVERWRITE_DIALOG_H
-#define __OVERWRITE_DIALOG_H
+#ifndef ZIP7_INC_OVERWRITE_DIALOG_H
+#define ZIP7_INC_OVERWRITE_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 
@@ -49,9 +49,9 @@ class COverwriteDialog: public NWindows::NControl::CModalDialog
 {
   bool _isBig;
 
-  void SetFileInfoControl(int textID, int iconID, const NOverwriteDialog::CFileInfo &fileInfo);
-  virtual bool OnInit();
-  bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  void SetFileInfoControl(unsigned textID, unsigned iconID, const NOverwriteDialog::CFileInfo &fileInfo);
+  virtual bool OnInit() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   void ReduceString(UString &s);
 
 public:
@@ -61,7 +61,7 @@ public:
 
   COverwriteDialog(): ShowExtraButtons(true), DefaultButton_is_NO(false) {}
 
-  INT_PTR Create(HWND parent = 0)
+  INT_PTR Create(HWND parent = NULL)
   {
     BIG_DIALOG_SIZE(280, 200);
     #ifdef UNDER_CE
diff --git a/CPP/7zip/UI/FileManager/Panel.cpp b/CPP/7zip/UI/FileManager/Panel.cpp
index f7cdb5b..72b72c6 100644
--- a/CPP/7zip/UI/FileManager/Panel.cpp
+++ b/CPP/7zip/UI/FileManager/Panel.cpp
@@ -2,8 +2,7 @@
 
 #include "StdAfx.h"
 
-#include <WindowsX.h>
-// #include <stdio.h>
+#include <windowsx.h>
 
 #include "../../../Common/IntToString.h"
 #include "../../../Common/StringConvert.h"
@@ -28,6 +27,7 @@
 #include "ExtractCallback.h"
 #include "FSFolder.h"
 #include "FormatUtils.h"
+#include "LangUtils.h"
 #include "Panel.h"
 #include "RootFolder.h"
 
@@ -65,8 +65,8 @@ CPanel::~CPanel()
 
 HWND CPanel::GetParent() const
 {
-  HWND h = CWindow2::GetParent();
-  return (h == 0) ? _mainWindow : h;
+  const HWND h = CWindow2::GetParent();
+  return h ? h : _mainWindow;
 }
 
 #define kClassName L"7-Zip::Panel"
@@ -101,12 +101,12 @@ HRESULT CPanel::Create(HWND mainWindow, HWND parentWindow, UINT id,
         cfp = fs2us(cfpF);
     }
 
-  RINOK(BindToPath(cfp, arcFormat, openRes));
+  RINOK(BindToPath(cfp, arcFormat, openRes))
 
   if (needOpenArc && !openRes.ArchiveIsOpened)
     return S_OK;
 
-  if (!CreateEx(0, kClassName, 0, WS_CHILD | WS_VISIBLE,
+  if (!CreateEx(0, kClassName, NULL, WS_CHILD | WS_VISIBLE,
       0, 0, _xSize, 260,
       parentWindow, (HMENU)(UINT_PTR)id, g_hInstance))
     return E_FAIL;
@@ -318,6 +318,16 @@ LRESULT CMyComboBoxEdit::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
           }
           break;
         }
+        case 'W':
+        {
+          bool ctrl = IsKeyDown(VK_CONTROL);
+          if (ctrl)
+          {
+            PostMessage(g_HWND, WM_COMMAND, IDCLOSE, 0);
+            return 0;
+          }
+          break;
+        }
       }
       break;
     case WM_CHAR:
@@ -336,6 +346,40 @@ LRESULT CMyComboBoxEdit::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
     return CallWindowProc(_origWindowProc, *this, message, wParam, lParam);
 }
 
+
+/*
+  REBARBANDINFO in vista (_WIN32_WINNT >= 0x0600) has additional fields
+  we want 2000/xp compatibility.
+  so we must use reduced structure, if we compile with (_WIN32_WINNT >= 0x0600)
+  Also there are additional fields, if (_WIN32_IE >= 0x0400).
+    but (_WIN32_IE >= 0x0400) is expected.
+  note:
+  in x64 (64-bit):
+  {
+    (108 == REBARBANDINFO_V6_SIZE)
+    (112 == sizeof(REBARBANDINFO) // for (_WIN32_WINNT <  0x0600)
+    (128 == sizeof(REBARBANDINFO) // for (_WIN32_WINNT >= 0x0600)
+    there is difference in sizes, because REBARBANDINFO size was
+    not aligned for 8-bytes in (_WIN32_WINNT < 0x0600).
+    We hope that WinVista+ support support both (108 and 112) sizes.
+    But does WinXP-x64 support (108 == REBARBANDINFO_V6_SIZE)?
+    {
+         96   LPARAM  lParam;
+        104   UINT    cxHeader;
+      #if (_WIN32_WINNT >= 0x0600)
+        108   RECT    rcChevronLocation;
+        124   UINT    uChevronState;
+      #endif
+    }
+*/
+
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) && defined(REBARBANDINFOA_V6_SIZE)
+  #define my_compatib_REBARBANDINFO_size  REBARBANDINFO_V6_SIZE
+#else
+  #define my_compatib_REBARBANDINFO_size  sizeof(REBARBANDINFO)
+#endif
+
+
 bool CPanel::OnCreate(CREATESTRUCT * /* createStruct */)
 {
   // _virtualMode = false;
@@ -351,11 +395,11 @@ bool CPanel::OnCreate(CREATESTRUCT * /* createStruct */)
   style |= WS_CLIPCHILDREN;
   style |= WS_CLIPSIBLINGS;
 
-  const UInt32 kNumListModes = ARRAY_SIZE(kStyles);
-  if (_ListViewMode >= kNumListModes)
-    _ListViewMode = kNumListModes - 1;
+  const UInt32 kNumListModes = Z7_ARRAY_SIZE(kStyles);
+  if (_listViewMode >= kNumListModes)
+    _listViewMode = kNumListModes - 1;
 
-  style |= kStyles[_ListViewMode]
+  style |= kStyles[_listViewMode]
     | WS_TABSTOP
     | LVS_EDITLABELS;
   if (_mySelectMode)
@@ -397,7 +441,7 @@ bool CPanel::OnCreate(CREATESTRUCT * /* createStruct */)
   icex.dwICC  = ICC_BAR_CLASSES;
   InitCommonControlsEx(&icex);
 
-  TBBUTTON tbb [ ] =
+  const TBBUTTON tbb[] =
   {
     // {0, 0, TBSTATE_ENABLED, BTNS_SEP, 0L, 0},
     {VIEW_PARENTFOLDER, kParentFolderID, TBSTATE_ENABLED, BTNS_BUTTON, { 0, 0 }, 0, 0 },
@@ -445,7 +489,7 @@ bool CPanel::OnCreate(CREATESTRUCT * /* createStruct */)
       _baseID + 2, 11,
       (HINSTANCE)HINST_COMMCTRL,
       IDB_VIEW_SMALL_COLOR,
-      (LPCTBBUTTON)&tbb, ARRAY_SIZE(tbb),
+      (LPCTBBUTTON)&tbb, Z7_ARRAY_SIZE(tbb),
       0, 0, 0, 0, sizeof (TBBUTTON)));
 
   #ifndef UNDER_CE
@@ -464,7 +508,7 @@ bool CPanel::OnCreate(CREATESTRUCT * /* createStruct */)
       , NULL,
     WS_BORDER | WS_VISIBLE |WS_CHILD | CBS_DROPDOWN | CBS_AUTOHSCROLL,
       0, 0, 100, 520,
-      ((_headerReBar == 0) ? (HWND)*this : _headerToolBar),
+      (_headerReBar ? _headerToolBar : (HWND)*this),
       (HMENU)(UINT_PTR)(_comboBoxID),
       g_hInstance, NULL);
   #ifndef UNDER_CE
@@ -513,20 +557,23 @@ bool CPanel::OnCreate(CREATESTRUCT * /* createStruct */)
     _headerToolBar.GetMaxSize(&size);
     
     REBARBANDINFO rbBand;
-    rbBand.cbSize = sizeof(REBARBANDINFO);  // Required
+    memset(&rbBand, 0, sizeof(rbBand));
+    // rbBand.cbSize = sizeof(rbBand);  // for debug
+    // rbBand.cbSize = REBARBANDINFO_V3_SIZE; // for debug
+    rbBand.cbSize = my_compatib_REBARBANDINFO_size;
     rbBand.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE;
     rbBand.fStyle = RBBS_NOGRIPPER;
-    rbBand.cxMinChild = size.cx;
-    rbBand.cyMinChild = size.cy;
-    rbBand.cyChild = size.cy;
-    rbBand.cx = size.cx;
+    rbBand.cxMinChild = (UINT)size.cx;
+    rbBand.cyMinChild = (UINT)size.cy;
+    rbBand.cyChild = (UINT)size.cy;
+    rbBand.cx = (UINT)size.cx;
     rbBand.hwndChild  = _headerToolBar;
     _headerReBar.InsertBand(-1, &rbBand);
 
     RECT rc;
     ::GetWindowRect(_headerComboBox, &rc);
     rbBand.cxMinChild = 30;
-    rbBand.cyMinChild = rc.bottom - rc.top;
+    rbBand.cyMinChild = (UINT)(rc.bottom - rc.top);
     rbBand.cx = 1000;
     rbBand.hwndChild  = _headerComboBox;
     _headerReBar.InsertBand(-1, &rbBand);
@@ -562,7 +609,7 @@ void CPanel::OnDestroy()
 
 void CPanel::ChangeWindowSize(int xSize, int ySize)
 {
-  if ((HWND)*this == 0)
+  if (!(HWND)*this)
     return;
   int kHeaderSize;
   int kStatusBarSize;
@@ -601,7 +648,7 @@ void CPanel::ChangeWindowSize(int xSize, int ySize)
 
 bool CPanel::OnSize(WPARAM /* wParam */, int xSize, int ySize)
 {
-  if ((HWND)*this == 0)
+  if (!(HWND)*this)
     return true;
   if (_headerReBar)
     _headerReBar.Move(0, 0, xSize, 0);
@@ -682,7 +729,7 @@ bool CPanel::OnNotify(UINT /* controlID */, LPNMHDR header, LRESULT &result)
   return false;
 }
 
-bool CPanel::OnCommand(int code, int itemID, LPARAM lParam, LRESULT &result)
+bool CPanel::OnCommand(unsigned code, unsigned itemID, LPARAM lParam, LRESULT &result)
 {
   if (itemID == kParentFolderID)
   {
@@ -745,7 +792,7 @@ void CPanel::MessageBox_Error_2Lines_Message_HRESULT(LPCWSTR message, HRESULT er
 }
 
 void CPanel::MessageBox_LastError(LPCWSTR caption) const
-  { MessageBox_Error_HRESULT_Caption(::GetLastError(), caption); }
+  { MessageBox_Error_HRESULT_Caption(GetLastError_noZero_HRESULT(), caption); }
 
 void CPanel::MessageBox_LastError() const
   { MessageBox_LastError(L"7-Zip"); }
@@ -830,13 +877,13 @@ void CPanel::SetListViewMode(UInt32 index)
 {
   if (index >= 4)
     return;
-  _ListViewMode = index;
-  DWORD oldStyle = (DWORD)_listView.GetStyle();
-  DWORD newStyle = kStyles[index];
+  _listViewMode = index;
+  const LONG_PTR oldStyle = _listView.GetStyle();
+  const DWORD newStyle = kStyles[index];
 
   // DWORD tickCount1 = GetTickCount();
-  if ((oldStyle & LVS_TYPEMASK) != newStyle)
-    _listView.SetStyle((oldStyle & ~LVS_TYPEMASK) | newStyle);
+  if ((oldStyle & LVS_TYPEMASK) != (LONG_PTR)newStyle)
+    _listView.SetStyle((oldStyle & ~(LONG_PTR)(DWORD)LVS_TYPEMASK) | (LONG_PTR)newStyle);
   // RefreshListCtrlSaveFocused();
   /*
   DWORD tickCount2 = GetTickCount();
@@ -879,33 +926,34 @@ void CPanel::Post_Refresh_StatusBar()
 
 void CPanel::AddToArchive()
 {
-  CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
   if (!Is_IO_FS_Folder())
   {
     MessageBox_Error_UnsupportOperation();
     return;
   }
+  CRecordVector<UInt32> indices;
+  Get_ItemIndices_Operated(indices);
   if (indices.Size() == 0)
   {
     MessageBox_Error_LangID(IDS_SELECT_FILES);
     return;
   }
-  UStringVector names;
-
-  const UString curPrefix = GetFsPath();
-  UString destCurDirPrefix = curPrefix;
+  UString destCurDirPrefix = GetFsPath();
   if (IsFSDrivesFolder())
     destCurDirPrefix = ROOT_FS_FOLDER;
-
-  FOR_VECTOR (i, indices)
-    names.Add(curPrefix + GetItemRelPath2(indices[i]));
-  
-  const UString arcName = CreateArchiveName(names);
-  
-  HRESULT res = CompressFiles(destCurDirPrefix, arcName, L"",
-      true, // addExtension
-      names, false, true, false);
+  UStringVector names;
+  GetFilePaths(indices, names);
+  UString baseName;
+  const UString arcName = CreateArchiveName(names,
+      false, // isHash
+      NULL,  // CFileInfo *fi
+      baseName);
+  const HRESULT res = CompressFiles(destCurDirPrefix, arcName, L"",
+      true,   // addExtension
+      names,
+      false,  // email
+      true,   // showDialog
+      false); // waitFinish
   if (res != S_OK)
   {
     if (destCurDirPrefix.Len() >= MAX_PATH)
@@ -931,26 +979,37 @@ static UString GetSubFolderNameForExtract2(const UString &arcPath)
   return s;
 }
 
-void CPanel::GetFilePaths(const CRecordVector<UInt32> &indices, UStringVector &paths, bool allowFolders)
+
+int CPanel::FindDir_InOperatedList(const CRecordVector<UInt32> &operatedIndices) const
 {
-  const UString prefix = GetFsPath();
-  FOR_VECTOR (i, indices)
-  {
-    int index = indices[i];
-    if (!allowFolders && IsItem_Folder(index))
-    {
-      paths.Clear();
-      break;
-    }
-    paths.Add(prefix + GetItemRelPath2(index));
-  }
-  if (paths.Size() == 0)
+  const bool *isDirVector = &_isDirVector.Front();
+  const UInt32 *indices = &operatedIndices.Front();
+  const unsigned numItems = operatedIndices.Size();
+  for (unsigned i = 0; i < numItems; i++)
+    if (isDirVector[indices[i]])
+      return (int)i;
+  return -1;
+}
+
+
+void CPanel::GetFilePaths(const CRecordVector<UInt32> &operatedIndices, UStringVector &paths) const
+{
+  paths.ClearAndReserve(operatedIndices.Size());
+  UString path = GetFsPath();
+  const unsigned prefixLen = path.Len();
+  const UInt32 *indices = &operatedIndices.Front();
+  const unsigned numItems = operatedIndices.Size();
+  // for (unsigned y = 0; y < 10000; y++, paths.Clear())
+  for (unsigned i = 0; i < numItems; i++)
   {
-    MessageBox_Error_LangID(IDS_SELECT_FILES);
-    return;
+    path.DeleteFrom(prefixLen);
+    Add_ItemRelPath2_To_String(indices[i], path);
+    // ODS_U(path)
+    paths.AddInReserved(path);
   }
 }
 
+
 void CPanel::ExtractArchives()
 {
   if (_parentFolders.Size() > 0)
@@ -959,12 +1018,14 @@ void CPanel::ExtractArchives()
     return;
   }
   CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
+  Get_ItemIndices_Operated(indices);
+  if (indices.IsEmpty() || FindDir_InOperatedList(indices) != -1)
+  {
+    MessageBox_Error_LangID(IDS_SELECT_FILES);
+    return;
+  }
   UStringVector paths;
   GetFilePaths(indices, paths);
-  if (paths.IsEmpty())
-    return;
-  
   UString outFolder = GetFsPath();
   if (indices.Size() == 1)
     outFolder += GetSubFolderNameForExtract2(GetItemRelPath(indices[0]));
@@ -976,8 +1037,8 @@ void CPanel::ExtractArchives()
   ci.Load();
 
   ::ExtractArchives(paths, outFolder
-      , true // showDialog
-      , false // elimDup
+      , true   // showDialog
+      , false  // elimDup
       , ci.WriteZone
       );
 }
@@ -1047,7 +1108,7 @@ static void AddSizePair(UInt32 langID, UInt64 value, UString &s)
 void CPanel::TestArchives()
 {
   CRecordVector<UInt32> indices;
-  GetOperatedIndicesSmart(indices);
+  Get_ItemIndices_OperSmart(indices);
   CMyComPtr<IArchiveFolder> archiveFolder;
   _folder.QueryInterface(IID_IArchiveFolder, &archiveFolder);
   if (archiveFolder)
@@ -1086,7 +1147,7 @@ void CPanel::TestArchives()
 
     extracter.Indices = indices;
     
-    UString title = LangString(IDS_PROGRESS_TESTING);
+    const UString title = LangString(IDS_PROGRESS_TESTING);
     
     extracter.ProgressDialog.CompressingMode = false;
     extracter.ProgressDialog.MainWindow = GetParent();
@@ -1111,8 +1172,11 @@ void CPanel::TestArchives()
     return;
   }
   UStringVector paths;
-  GetFilePaths(indices, paths, true);
+  GetFilePaths(indices, paths);
   if (paths.IsEmpty())
+  {
+    MessageBox_Error_LangID(IDS_SELECT_FILES);
     return;
+  }
   ::TestArchives(paths);
 }
diff --git a/CPP/7zip/UI/FileManager/Panel.h b/CPP/7zip/UI/FileManager/Panel.h
index 4755678..e512cad 100644
--- a/CPP/7zip/UI/FileManager/Panel.h
+++ b/CPP/7zip/UI/FileManager/Panel.h
@@ -1,11 +1,15 @@
 // Panel.h
 
-#ifndef __PANEL_H
-#define __PANEL_H
+#ifndef ZIP7_INC_PANEL_H
+#define ZIP7_INC_PANEL_H
 
 #include "../../../Common/MyWindows.h"
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <shlobj.h>
+#else
 #include <ShlObj.h>
+#endif
 
 #include "../../../../C/Alloc.h"
 
@@ -47,7 +51,7 @@
 
 const int kParentFolderID = 100;
 
-const int kParentIndex = -1;
+const unsigned kParentIndex = (unsigned)(int)-1;
 const UInt32 kParentIndex_UInt32 = (UInt32)(Int32)kParentIndex;
 
 #if !defined(_WIN32) || defined(UNDER_CE)
@@ -56,7 +60,9 @@ const UInt32 kParentIndex_UInt32 = (UInt32)(Int32)kParentIndex;
 #define ROOT_FS_FOLDER L"C:\\"
 #endif
 
-struct CPanelCallback
+Z7_PURE_INTERFACES_BEGIN
+
+DECLARE_INTERFACE(CPanelCallback)
 {
   virtual void OnTab() = 0;
   virtual void SetFocusToPath(unsigned index) = 0;
@@ -68,6 +74,7 @@ struct CPanelCallback
   virtual void DragEnd() = 0;
   virtual void RefreshTitle(bool always) = 0;
 };
+Z7_PURE_INTERFACES_END
 
 void PanelCopyItems();
 
@@ -116,7 +123,7 @@ public:
   {
     FOR_VECTOR (i, (*this))
       if ((*this)[i].ID == id)
-        return i;
+        return (int)i;
     return -1;
   }
 
@@ -194,11 +201,15 @@ UString GetFolderPath(IFolderFolder *folder);
 
 class CPanel;
 
-class CMyListView: public NWindows::NControl::CListView2
+class CMyListView Z7_final: public NWindows::NControl::CListView2
 {
+  // ~CMyListView() ZIP7_eq_delete;
+  // CMyListView() ZIP7_eq_delete;
 public:
+  // CMyListView() {}
+  // ~CMyListView() Z7_DESTRUCTOR_override {} // change it
   CPanel *_panel;
-  LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
+  LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
 };
 
 /*
@@ -223,10 +234,16 @@ struct CSelectedState
   int FocusedItem;
   bool SelectFocused;
   bool FocusedName_Defined;
+  bool CalledFromTimer;
   UString FocusedName;
   UStringVector SelectedNames;
-  
-  CSelectedState(): FocusedItem(-1), SelectFocused(true), FocusedName_Defined(false) {}
+
+  CSelectedState():
+      FocusedItem(-1),
+      SelectFocused(true),
+      FocusedName_Defined(false),
+      CalledFromTimer(false)
+    {}
 };
 
 #ifdef UNDER_CE
@@ -286,21 +303,21 @@ struct COpenResult
 
 
 
-class CPanel: public NWindows::NControl::CWindow2
+class CPanel Z7_final: public NWindows::NControl::CWindow2
 {
   CExtToIconMap _extToIconMap;
   UINT _baseID;
-  int _comboBoxID;
+  unsigned _comboBoxID;
   UINT _statusBarID;
 
   CAppState *_appState;
 
-  bool OnCommand(int code, int itemID, LPARAM lParam, LRESULT &result);
-  LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
-  virtual bool OnCreate(CREATESTRUCT *createStruct);
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
-  virtual void OnDestroy();
-  virtual bool OnNotify(UINT controlID, LPNMHDR lParam, LRESULT &result);
+  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM lParam, LRESULT &result) Z7_override;
+  virtual LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
+  virtual bool OnCreate(CREATESTRUCT *createStruct) Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual void OnDestroy() Z7_override;
+  virtual bool OnNotify(UINT controlID, LPNMHDR lParam, LRESULT &result) Z7_override;
 
   void AddComboBoxItem(const UString &name, int iconIndex, int indent, bool addToList);
 
@@ -321,7 +338,7 @@ class CPanel: public NWindows::NControl::CWindow2
   void OnItemChanged(NMLISTVIEW *item);
   void OnNotifyActivateItems();
   bool OnNotifyList(LPNMHDR lParam, LRESULT &result);
-  void OnDrag(LPNMLISTVIEW nmListView);
+  void OnDrag(LPNMLISTVIEW nmListView, bool isRightButton = false);
   bool OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result);
   BOOL OnBeginLabelEdit(LV_DISPINFOW * lpnmh);
   BOOL OnEndLabelEdit(LV_DISPINFOW * lpnmh);
@@ -437,19 +454,19 @@ public:
     return (UInt32)item.lParam;
   }
   
-  int GetRealItemIndex(int indexInListView) const
+  unsigned GetRealItemIndex(int indexInListView) const
   {
     /*
     if (_virtualMode)
       return indexInListView;
     */
     LPARAM param;
-    if (!_listView.GetItemParam(indexInListView, param))
+    if (!_listView.GetItemParam((unsigned)indexInListView, param))
       throw 1;
-    return (int)param;
+    return (unsigned)param;
   }
 
-  UInt32 _ListViewMode;
+  UInt32 _listViewMode;
   int _xSize;
 
   bool _flatMode;
@@ -469,12 +486,19 @@ public:
   NWindows::NDLL::CLibrary _library;
   
   CMyComPtr<IFolderFolder> _folder;
+  CBoolVector _isDirVector;
   CMyComPtr<IFolderCompare> _folderCompare;
   CMyComPtr<IFolderGetItemName> _folderGetItemName;
   CMyComPtr<IArchiveGetRawProps> _folderRawProps;
   CMyComPtr<IFolderAltStreams> _folderAltStreams;
   CMyComPtr<IFolderOperations> _folderOperations;
 
+
+  // for drag and drop highliting
+  int m_DropHighlighted_SelectionIndex;
+  // int m_SubFolderIndex;      // realIndex of item in m_Panel list (if drop cursor to that item)
+  UString m_DropHighlighted_SubFolderName;   // name of folder in m_Panel list (if drop cursor to that folder)
+
   void ReleaseFolder();
   void SetNewFolder(IFolderFolder *newFolder);
 
@@ -485,22 +509,28 @@ public:
   void GetSelectedNames(UStringVector &selectedNames);
   void SaveSelectedState(CSelectedState &s);
   HRESULT RefreshListCtrl(const CSelectedState &s);
-  HRESULT RefreshListCtrl_SaveFocused();
+  HRESULT RefreshListCtrl_SaveFocused(bool onTimer = false);
+
+  // UInt32 GetItem_Attrib(UInt32 itemIndex) const;
 
   bool GetItem_BoolProp(UInt32 itemIndex, PROPID propID) const;
-  bool IsItem_Deleted(int itemIndex) const;
-  bool IsItem_Folder(int itemIndex) const;
-  bool IsItem_AltStream(int itemIndex) const;
-
-  UString GetItemName(int itemIndex) const;
-  UString GetItemName_for_Copy(int itemIndex) const;
-  void GetItemName(int itemIndex, UString &s) const;
-  UString GetItemPrefix(int itemIndex) const;
-  UString GetItemRelPath(int itemIndex) const;
-  UString GetItemRelPath2(int itemIndex) const;
-  UString GetItemFullPath(int itemIndex) const;
-  UInt64 GetItem_UInt64Prop(int itemIndex, PROPID propID) const;
-  UInt64 GetItemSize(int itemIndex) const;
+  
+  bool IsItem_Deleted(unsigned itemIndex) const;
+  bool IsItem_Folder(unsigned itemIndex) const;
+  bool IsItem_AltStream(unsigned itemIndex) const;
+
+  UString GetItemName(unsigned itemIndex) const;
+  UString GetItemName_for_Copy(unsigned itemIndex) const;
+  void GetItemName(unsigned itemIndex, UString &s) const;
+  UString GetItemPrefix(unsigned itemIndex) const;
+  UString GetItemRelPath(unsigned itemIndex) const;
+  UString GetItemRelPath2(unsigned itemIndex) const;
+
+  void Add_ItemRelPath2_To_String(unsigned itemIndex, UString &s) const;
+
+  UString GetItemFullPath(unsigned itemIndex) const;
+  UInt64 GetItem_UInt64Prop(unsigned itemIndex, PROPID propID) const;
+  UInt64 GetItemSize(unsigned itemIndex) const;
 
   ////////////////////////
   // PanelFolderChange.cpp
@@ -552,7 +582,7 @@ public:
       _markDeletedItems(true),
       PanelCreated(false),
 
-      _ListViewMode(3),
+      _listViewMode(3),
       _xSize(300),
 
       _flatMode(false),
@@ -565,6 +595,8 @@ public:
 
       _dontShowMode(false),
 
+      m_DropHighlighted_SelectionIndex(-1),
+
       _needSaveInfo(false),
       _startGroupSelect(0),
       _selectionIsDefined(false)
@@ -572,7 +604,7 @@ public:
 
   void SetExtendedStyle()
   {
-    if (_listView != 0)
+    if (_listView)
       _listView.SetExtendedListViewStyle(_exStyle);
   }
 
@@ -592,30 +624,38 @@ public:
   void SetSortRawStatus();
 
   void Release();
-  ~CPanel();
+  ~CPanel() Z7_DESTRUCTOR_override;
   void OnLeftClick(MY_NMLISTVIEW_NMITEMACTIVATE *itemActivate);
   bool OnRightClick(MY_NMLISTVIEW_NMITEMACTIVATE *itemActivate, LRESULT &result);
   void ShowColumnsContextMenu(int x, int y);
 
   void OnTimer();
-  void OnReload();
+  void OnReload(bool onTimer = false);
   bool OnContextMenu(HANDLE windowHandle, int xPos, int yPos);
 
   CMyComPtr<IContextMenu> _sevenZipContextMenu;
   CMyComPtr<IContextMenu> _systemContextMenu;
+  
   HRESULT CreateShellContextMenu(
       const CRecordVector<UInt32> &operatedIndices,
       CMyComPtr<IContextMenu> &systemContextMenu);
+  
   void CreateSystemMenu(HMENU menu,
+      bool showExtendedVerbs,
       const CRecordVector<UInt32> &operatedIndices,
       CMyComPtr<IContextMenu> &systemContextMenu);
+  
   void CreateSevenZipMenu(HMENU menu,
+      bool showExtendedVerbs,
       const CRecordVector<UInt32> &operatedIndices,
+      int firstDirIndex,
       CMyComPtr<IContextMenu> &sevenZipContextMenu);
+  
   void CreateFileMenu(HMENU menu,
       CMyComPtr<IContextMenu> &sevenZipContextMenu,
       CMyComPtr<IContextMenu> &systemContextMenu,
       bool programMenu);
+  
   void CreateFileMenu(HMENU menu);
   bool InvokePluginCommand(unsigned id);
   bool InvokePluginCommand(unsigned id, IContextMenu *sevenZipContextMenu,
@@ -637,10 +677,10 @@ public:
   // void SortItems(int index);
   void SortItemsWithPropID(PROPID propID);
 
-  void GetSelectedItemsIndices(CRecordVector<UInt32> &indices) const;
-  void GetOperatedItemIndices(CRecordVector<UInt32> &indices) const;
-  void GetAllItemIndices(CRecordVector<UInt32> &indices) const;
-  void GetOperatedIndicesSmart(CRecordVector<UInt32> &indices) const;
+  void Get_ItemIndices_Selected(CRecordVector<UInt32> &indices) const;
+  void Get_ItemIndices_Operated(CRecordVector<UInt32> &indices) const;
+  void Get_ItemIndices_All(CRecordVector<UInt32> &indices) const;
+  void Get_ItemIndices_OperSmart(CRecordVector<UInt32> &indices) const;
   // void GetOperatedListViewIndices(CRecordVector<UInt32> &indices) const;
   void KillSelection();
 
@@ -712,12 +752,11 @@ public:
 
   class CDisableTimerProcessing
   {
-    CLASS_NO_COPY(CDisableTimerProcessing);
+    Z7_CLASS_NO_COPY(CDisableTimerProcessing)
 
     bool _processTimer;
-
     CPanel &_panel;
-    
+   
     public:
 
     CDisableTimerProcessing(CPanel &panel): _panel(panel) { Disable(); }
@@ -733,9 +772,38 @@ public:
     }
   };
 
+  class CDisableTimerProcessing2
+  {
+    Z7_CLASS_NO_COPY(CDisableTimerProcessing2)
+
+    bool _processTimer;
+    CPanel *_panel;
+   
+    public:
+
+    CDisableTimerProcessing2(CPanel *panel): _processTimer(true), _panel(panel) { Disable(); }
+    ~CDisableTimerProcessing2() { Restore(); }
+    void Disable()
+    {
+      if (_panel)
+      {
+        _processTimer = _panel->_processTimer;
+        _panel->_processTimer = false;
+      }
+    }
+    void Restore()
+    {
+      if (_panel)
+      {
+        _panel->_processTimer = _processTimer;
+        _panel = NULL;
+      }
+    }
+  };
+
   class CDisableNotify
   {
-    CLASS_NO_COPY(CDisableNotify);
+    Z7_CLASS_NO_COPY(CDisableNotify)
 
     bool _processNotify;
     bool _processStatusBar;
@@ -789,9 +857,9 @@ public:
   void OpenFocusedItemAsInternal(const wchar_t *type = NULL);
   void OpenSelectedItems(bool internal);
 
-  void OpenFolderExternal(int index);
+  void OpenFolderExternal(unsigned index);
 
-  void OpenFolder(int index);
+  void OpenFolder(unsigned index);
   HRESULT OpenParentArchiveFolder();
   
   HRESULT OpenAsArc(IInStream *inStream,
@@ -810,26 +878,26 @@ public:
   HRESULT OpenAsArc_Name(const UString &relPath, const UString &arcFormat
       // , bool showErrorMessage
       );
-  HRESULT OpenAsArc_Index(int index, const wchar_t *type /* = NULL */
+  HRESULT OpenAsArc_Index(unsigned index, const wchar_t *type /* = NULL */
       // , bool showErrorMessage
       );
   
-  void OpenItemInArchive(int index, bool tryInternal, bool tryExternal,
+  void OpenItemInArchive(unsigned index, bool tryInternal, bool tryExternal,
       bool editMode, bool useEditor, const wchar_t *type = NULL);
   
   HRESULT OnOpenItemChanged(UInt32 index, const wchar_t *fullFilePath, bool usePassword, const UString &password);
   LRESULT OnOpenItemChanged(LPARAM lParam);
 
   bool IsVirus_Message(const UString &name);
-  void OpenItem(int index, bool tryInternal, bool tryExternal, const wchar_t *type = NULL);
+  void OpenItem(unsigned index, bool tryInternal, bool tryExternal, const wchar_t *type = NULL);
   void EditItem(bool useEditor);
-  void EditItem(int index, bool useEditor);
+  void EditItem(unsigned index, bool useEditor);
 
   void RenameFile();
   void ChangeComment();
 
   void SetListViewMode(UInt32 index);
-  UInt32 GetListViewMode() const { return _ListViewMode; }
+  UInt32 GetListViewMode() const { return _listViewMode; }
   PROPID GetSortID() const { return _sortID; }
 
   void ChangeFlatMode();
@@ -848,16 +916,21 @@ public:
 
   void AddToArchive();
 
-  void GetFilePaths(const CRecordVector<UInt32> &indices, UStringVector &paths, bool allowFolders = false);
+  int FindDir_InOperatedList(const CRecordVector<UInt32> &indices) const;
+  void GetFilePaths(const CRecordVector<UInt32> &indices, UStringVector &paths) const;
   void ExtractArchives();
   void TestArchives();
 
+
   HRESULT CopyTo(CCopyToOptions &options,
       const CRecordVector<UInt32> &indices,
       UStringVector *messages,
-      bool &usePassword, UString &password);
+      bool &usePassword, UString &password,
+      const UStringVector *filePaths = NULL);
 
-  HRESULT CopyTo(CCopyToOptions &options, const CRecordVector<UInt32> &indices, UStringVector *messages)
+  HRESULT CopyTo(CCopyToOptions &options,
+      const CRecordVector<UInt32> &indices,
+      UStringVector *messages)
   {
     bool usePassword = false;
     UString password;
@@ -870,17 +943,29 @@ public:
     return CopyTo(options, indices, messages, usePassword, password);
   }
 
+  HRESULT CopyFsItems(CCopyToOptions &options,
+      const UStringVector &filePaths,
+      UStringVector *messages)
+  {
+    bool usePassword = false;
+    UString password;
+    CRecordVector<UInt32> indices;
+    return CopyTo(options, indices, messages, usePassword, password, &filePaths);
+  }
+
+
   HRESULT CopyFrom(bool moveMode, const UString &folderPrefix, const UStringVector &filePaths,
       bool showErrorMessages, UStringVector *messages);
 
-  void CopyFromNoAsk(const UStringVector &filePaths);
-  void CopyFromAsk(const UStringVector &filePaths);
-
-  // empty folderPath means create new Archive to path of first fileName.
-  void DropObject(IDataObject * dataObject, const UString &folderPath);
+  void CopyFromNoAsk(bool moveMode, const UStringVector &filePaths);
 
-  // empty folderPath means create new Archive to path of first fileName.
-  void CompressDropFiles(const UStringVector &fileNames, const UString &folderPath);
+  void CompressDropFiles(
+      const UStringVector &filePaths,
+      const UString &folderPath,
+      bool createNewArchive,
+      bool moveMode,
+      UInt32 sourceFlags,
+      UInt32 &targetFlags);
 
   void RefreshTitle(bool always = false) { _panelCallback->RefreshTitle(always);  }
   void RefreshTitleAlways() { RefreshTitle(true);  }
@@ -892,14 +977,14 @@ class CMyBuffer
 {
   void *_data;
 public:
-  CMyBuffer(): _data(0) {}
+  CMyBuffer(): _data(NULL) {}
   operator void *() { return _data; }
   bool Allocate(size_t size)
   {
-    if (_data != 0)
+    if (_data)
       return false;
     _data = ::MidAlloc(size);
-    return _data != 0;
+    return _data != NULL;
   }
   ~CMyBuffer() { ::MidFree(_data); }
 };
@@ -919,7 +1004,7 @@ public:
       throw 9387173;
     _needExit = true;
     _numActiveThreads = 0;
-  };
+  }
 
   ~CExitEventLauncher() { Exit(true); }
 
diff --git a/CPP/7zip/UI/FileManager/PanelCopy.cpp b/CPP/7zip/UI/FileManager/PanelCopy.cpp
index 2ea3e3b..de3d764 100644
--- a/CPP/7zip/UI/FileManager/PanelCopy.cpp
+++ b/CPP/7zip/UI/FileManager/PanelCopy.cpp
@@ -2,29 +2,29 @@
 
 #include "StdAfx.h"
 
-#include "../../../Common/MyException.h"
-
 #include "../Common/ZipRegistry.h"
 
 #include "../GUI/HashGUI.h"
 
+#include "FSFolder.h"
 #include "ExtractCallback.h"
 #include "LangUtils.h"
 #include "Panel.h"
-#include "resource.h"
 #include "UpdateCallback100.h"
 
-using namespace NWindows;
+#include "resource.h"
+
 
 class CPanelCopyThread: public CProgressThreadVirt
 {
   bool ResultsWereShown;
   bool NeedShowRes;
 
-  HRESULT ProcessVirt();
-  virtual void ProcessWasFinished_GuiVirt();
+  HRESULT ProcessVirt() Z7_override;
+  virtual void ProcessWasFinished_GuiVirt() Z7_override;
 public:
   const CCopyToOptions *options;
+  const UStringVector *CopyFrom_Paths;
   CMyComPtr<IFolderOperations> FolderOperations;
   CRecordVector<UInt32> Indices;
   CExtractCallbackImp *ExtractCallbackSpec;
@@ -39,7 +39,8 @@ public:
   
   CPanelCopyThread():
     ResultsWereShown(false),
-    NeedShowRes(false)
+    NeedShowRes(false),
+    CopyFrom_Paths(NULL)
     // , Result2(E_FAIL)
     {}
 };
@@ -72,23 +73,32 @@ HRESULT CPanelCopyThread::ProcessVirt()
 
   HRESULT result2;
 
+  if (FolderOperations)
   {
     CMyComPtr<IFolderSetZoneIdMode> setZoneMode;
     FolderOperations.QueryInterface(IID_IFolderSetZoneIdMode, &setZoneMode);
     if (setZoneMode)
     {
-      RINOK(setZoneMode->SetZoneIdMode(options->ZoneIdMode));
+      RINOK(setZoneMode->SetZoneIdMode(options->ZoneIdMode))
     }
   }
 
-  if (options->testMode)
+  if (CopyFrom_Paths)
+  {
+    result2 = NFsFolder::CopyFileSystemItems(
+        *CopyFrom_Paths,
+        us2fs(options->folder),
+        options->moveMode,
+        (IFolderOperationsExtractCallback *)ExtractCallbackSpec);
+  }
+  else if (options->testMode)
   {
     CMyComPtr<IArchiveFolder> archiveFolder;
     FolderOperations.QueryInterface(IID_IArchiveFolder, &archiveFolder);
     if (!archiveFolder)
       return E_NOTIMPL;
     CMyComPtr<IFolderArchiveExtractCallback> extractCallback2;
-    RINOK(ExtractCallback.QueryInterface(IID_IFolderArchiveExtractCallback, &extractCallback2));
+    RINOK(ExtractCallback.QueryInterface(IID_IFolderArchiveExtractCallback, &extractCallback2))
     NExtract::NPathMode::EEnum pathMode =
         NExtract::NPathMode::kCurPaths;
         // NExtract::NPathMode::kFullPathnames;
@@ -122,7 +132,7 @@ HRESULT CPanelCopyThread::ProcessVirt()
 
 
 /*
-#ifdef EXTERNAL_CODECS
+#ifdef Z7_EXTERNAL_CODECS
 
 static void ThrowException_if_Error(HRESULT res)
 {
@@ -133,9 +143,11 @@ static void ThrowException_if_Error(HRESULT res)
 #endif
 */
 
-HRESULT CPanel::CopyTo(CCopyToOptions &options, const CRecordVector<UInt32> &indices,
+HRESULT CPanel::CopyTo(CCopyToOptions &options,
+    const CRecordVector<UInt32> &indices,
     UStringVector *messages,
-    bool &usePassword, UString &password)
+    bool &usePassword, UString &password,
+    const UStringVector *filePaths)
 {
   if (options.NeedRegistryZone && !options.testMode)
   {
@@ -151,9 +163,10 @@ HRESULT CPanel::CopyTo(CCopyToOptions &options, const CRecordVector<UInt32> &ind
       return E_NOTIMPL;
   }
   
+  if (!filePaths)
   if (!_folderOperations)
   {
-    UString errorMessage = LangString(IDS_OPERATION_IS_NOT_SUPPORTED);
+    const UString errorMessage = LangString(IDS_OPERATION_IS_NOT_SUPPORTED);
     if (options.showErrorMessages)
       MessageBox_Error(errorMessage);
     else if (messages)
@@ -165,7 +178,7 @@ HRESULT CPanel::CopyTo(CCopyToOptions &options, const CRecordVector<UInt32> &ind
 
   {
   /*
-  #ifdef EXTERNAL_CODECS
+  #ifdef Z7_EXTERNAL_CODECS
   CExternalCodecs g_ExternalCodecs;
   #endif
   */
@@ -203,7 +216,7 @@ HRESULT CPanel::CopyTo(CCopyToOptions &options, const CRecordVector<UInt32> &ind
        But new code uses global codecs so we don't need to call LoadGlobalCodecs again */
 
     /*
-    #ifdef EXTERNAL_CODECS
+    #ifdef Z7_EXTERNAL_CODECS
     ThrowException_if_Error(LoadGlobalCodecs());
     #endif
     */
@@ -248,13 +261,18 @@ HRESULT CPanel::CopyTo(CCopyToOptions &options, const CRecordVector<UInt32> &ind
     
   extracter.ExtractCallbackSpec->OverwriteMode = NExtract::NOverwriteMode::kAsk;
   extracter.ExtractCallbackSpec->Init();
-  extracter.Indices = indices;
-  extracter.FolderOperations = _folderOperations;
+  
+  extracter.CopyFrom_Paths = filePaths;
+  if (!filePaths)
+  {
+    extracter.Indices = indices;
+    extracter.FolderOperations = _folderOperations;
+  }
 
   extracter.ExtractCallbackSpec->PasswordIsDefined = usePassword;
   extracter.ExtractCallbackSpec->Password = password;
   
-  RINOK(extracter.Create(title, GetParent()));
+  RINOK(extracter.Create(title, GetParent()))
   
 
   if (messages)
@@ -335,8 +353,8 @@ HRESULT CPanel::CopyFrom(bool moveMode, const UString &folderPrefix, const UStri
 
   updater.UpdateCallbackSpec->ProgressDialog = &updater.ProgressDialog;
 
-  UString title = LangString(IDS_COPYING);
-  UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE);
+  const UString title = LangString(IDS_COPYING);
+  const UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE);
 
   updater.ProgressDialog.MainWindow = GetParent();
   updater.ProgressDialog.MainTitle = progressWindowTitle;
@@ -363,7 +381,9 @@ HRESULT CPanel::CopyFrom(bool moveMode, const UString &folderPrefix, const UStri
 
   {
     NWindows::CThread thread;
-    RINOK(thread.Create(CThreadUpdate::MyThreadFunction, &updater));
+    const WRes wres = thread.Create(CThreadUpdate::MyThreadFunction, &updater);
+    if (wres != 0)
+      return HRESULT_FROM_WIN32(wres);
     updater.ProgressDialog.Create(title, thread, GetParent());
   }
 
@@ -375,7 +395,7 @@ HRESULT CPanel::CopyFrom(bool moveMode, const UString &folderPrefix, const UStri
 
   if (res == E_NOINTERFACE)
   {
-    UString errorMessage = LangString(IDS_OPERATION_IS_NOT_SUPPORTED);
+    const UString errorMessage = LangString(IDS_OPERATION_IS_NOT_SUPPORTED);
     if (showErrorMessages)
       MessageBox_Error(errorMessage);
     else if (messages)
@@ -387,7 +407,7 @@ HRESULT CPanel::CopyFrom(bool moveMode, const UString &folderPrefix, const UStri
   return res;
 }
 
-void CPanel::CopyFromNoAsk(const UStringVector &filePaths)
+void CPanel::CopyFromNoAsk(bool moveMode, const UStringVector &filePaths)
 {
   CDisableTimerProcessing disableTimerProcessing(*this);
 
@@ -396,7 +416,7 @@ void CPanel::CopyFromNoAsk(const UStringVector &filePaths)
 
   CDisableNotify disableNotify(*this);
 
-  HRESULT result = CopyFrom(false, L"", filePaths, true, 0);
+  const HRESULT result = CopyFrom(moveMode, L"", filePaths, true, NULL);
 
   if (result != S_OK)
   {
@@ -413,17 +433,3 @@ void CPanel::CopyFromNoAsk(const UStringVector &filePaths)
   disableNotify.Restore();
   SetFocusToList();
 }
-
-void CPanel::CopyFromAsk(const UStringVector &filePaths)
-{
-  UString title = LangString(IDS_CONFIRM_FILE_COPY);
-  UString message = LangString(IDS_WANT_TO_COPY_FILES);
-  message += "\n\'";
-  message += _currentFolderPrefix;
-  message += "\' ?";
-  int res = ::MessageBoxW(*(this), message, title, MB_YESNOCANCEL | MB_ICONQUESTION);
-  if (res != IDYES)
-    return;
-
-  CopyFromNoAsk(filePaths);
-}
diff --git a/CPP/7zip/UI/FileManager/PanelCrc.cpp b/CPP/7zip/UI/FileManager/PanelCrc.cpp
index 32948d8..df0b733 100644
--- a/CPP/7zip/UI/FileManager/PanelCrc.cpp
+++ b/CPP/7zip/UI/FileManager/PanelCrc.cpp
@@ -20,7 +20,7 @@
 using namespace NWindows;
 using namespace NFile;
 
-#ifdef EXTERNAL_CODECS
+#ifdef Z7_EXTERNAL_CODECS
 extern CExternalCodecs g_ExternalCodecs;
 HRESULT LoadGlobalCodecs();
 #endif
@@ -38,7 +38,7 @@ struct CDirEnumerator
   FStringVector Prefixes;
   unsigned Index;
 
-  CDirEnumerator(): EnterToDirs(false), Index(0) {};
+  CDirEnumerator(): EnterToDirs(false), Index(0) {}
 
   void Init();
   DWORD GetNextFile(NFind::CFileInfo &fi, bool &filled, FString &resPath);
@@ -53,8 +53,8 @@ void CDirEnumerator::Init()
 
 static DWORD GetNormalizedError()
 {
-  DWORD error = GetLastError();
-  return (error == 0) ? E_FAIL : error;
+  const DWORD error = GetLastError();
+  return (error == 0) ? (DWORD)E_FAIL : error;
 }
 
 DWORD CDirEnumerator::GetNextFile(NFind::CFileInfo &fi, bool &filled, FString &resPath)
@@ -73,9 +73,9 @@ DWORD CDirEnumerator::GetNextFile(NFind::CFileInfo &fi, bool &filled, FString &r
       if (Index >= FilePaths.Size())
         return S_OK;
       const FString &path = FilePaths[Index++];
-      int pos = path.ReverseFind_PathSepar();
+      const int pos = path.ReverseFind_PathSepar();
       if (pos >= 0)
-        resPath.SetFrom(path, pos + 1);
+        resPath.SetFrom(path, (unsigned)pos + 1);
 
       #if defined(_WIN32) && !defined(UNDER_CE)
       if (isRootPrefix && path.Len() == 2 && NName::IsDrivePath2(path))
@@ -90,7 +90,7 @@ DWORD CDirEnumerator::GetNextFile(NFind::CFileInfo &fi, bool &filled, FString &r
       #endif
       if (!fi.Find(BasePrefix + path))
       {
-        DWORD error = GetNormalizedError();
+        const DWORD error = GetNormalizedError();
         resPath = path;
         return error;
       }
@@ -110,7 +110,7 @@ DWORD CDirEnumerator::GetNextFile(NFind::CFileInfo &fi, bool &filled, FString &r
     }
     else
     {
-      DWORD error = GetNormalizedError();
+      const DWORD error = GetNormalizedError();
       resPath = Prefixes.Back();
       Enumerators.DeleteBack();
       Prefixes.DeleteBack();
@@ -142,8 +142,8 @@ class CThreadCrc: public CProgressThreadVirt
   bool ResultsWereShown;
   bool WasFinished;
 
-  HRESULT ProcessVirt();
-  virtual void ProcessWasFinished_GuiVirt();
+  HRESULT ProcessVirt() Z7_override;
+  virtual void ProcessWasFinished_GuiVirt() Z7_override;
 public:
   CDirEnumerator Enumerator;
   CHashBundle Hash;
@@ -176,7 +176,7 @@ void CThreadCrc::ProcessWasFinished_GuiVirt()
 
 void CThreadCrc::AddErrorMessage(DWORD systemError, const FChar *name)
 {
-  Sync.AddError_Code_Name(systemError, fs2us(Enumerator.BasePrefix + name));
+  Sync.AddError_Code_Name(HRESULT_FROM_WIN32(systemError), fs2us(Enumerator.BasePrefix + name));
   Hash.NumErrors++;
 }
 
@@ -214,7 +214,7 @@ HRESULT CThreadCrc::ProcessVirt()
   for (;;)
   {
     bool filled;
-    DWORD error = Enumerator.GetNextFile(fi, filled, path);
+    const DWORD error = Enumerator.GetNextFile(fi, filled, path);
     if (error != 0)
     {
       AddErrorMessage(error, path);
@@ -246,10 +246,10 @@ HRESULT CThreadCrc::ProcessVirt()
     */
     if (needPrint)
     {
-      RINOK(sync.ScanProgress(numFiles, totalSize, path, fi.IsDir()));
+      RINOK(sync.ScanProgress(numFiles, totalSize, path, fi.IsDir()))
     }
   }
-  RINOK(sync.ScanProgress(numFiles, totalSize, FString(), false));
+  RINOK(sync.ScanProgress(numFiles, totalSize, FString(), false))
   // sync.SetNumFilesTotal(numFiles);
   // sync.SetProgress(totalSize, 0);
   // SetStatus(LangString(IDS_CHECKSUM_CALCULATING));
@@ -312,16 +312,16 @@ HRESULT CThreadCrc::ProcessVirt()
         Hash.Update(buf, size);
         if (Hash.CurSize - progress_Prev >= ((UInt32)1 << 21))
         {
-          RINOK(sync.Set_NumBytesCur(errorsFilesSize + Hash.FilesSize + Hash.CurSize));
+          RINOK(sync.Set_NumBytesCur(errorsFilesSize + Hash.FilesSize + Hash.CurSize))
           progress_Prev = Hash.CurSize;
         }
       }
     }
     if (error == 0)
       Hash.Final(fi.IsDir(), false, fs2us(path));
-    RINOK(sync.Set_NumBytesCur(errorsFilesSize + Hash.FilesSize));
+    RINOK(sync.Set_NumBytesCur(errorsFilesSize + Hash.FilesSize))
   }
-  RINOK(sync.Set_NumBytesCur(errorsFilesSize + Hash.FilesSize));
+  RINOK(sync.Set_NumBytesCur(errorsFilesSize + Hash.FilesSize))
   sync.Set_NumFilesCur(Hash.NumFiles);
   if (Hash.NumFiles != 1)
     sync.Set_FilePath(L"");
@@ -341,7 +341,7 @@ HRESULT CApp::CalculateCrc2(const UString &methodName)
   CPanel &srcPanel = Panels[srcPanelIndex];
 
   CRecordVector<UInt32> indices;
-  srcPanel.GetOperatedIndicesSmart(indices);
+  srcPanel.Get_ItemIndices_OperSmart(indices);
   if (indices.IsEmpty())
     return S_OK;
 
@@ -357,7 +357,7 @@ HRESULT CApp::CalculateCrc2(const UString &methodName)
     return srcPanel.CopyTo(options, indices, &messages);
   }
 
-  #ifdef EXTERNAL_CODECS
+  #ifdef Z7_EXTERNAL_CODECS
 
   LoadGlobalCodecs();
     
@@ -369,7 +369,7 @@ HRESULT CApp::CalculateCrc2(const UString &methodName)
     {
       UStringVector methods;
       methods.Add(methodName);
-      RINOK(t.Hash.SetMethods(EXTERNAL_CODECS_VARS_G methods));
+      RINOK(t.Hash.SetMethods(EXTERNAL_CODECS_VARS_G methods))
     }
     
     FOR_VECTOR (i, indices)
@@ -382,7 +382,7 @@ HRESULT CApp::CalculateCrc2(const UString &methodName)
     UString basePrefix2 = basePrefix;
     if (basePrefix2.Back() == ':')
     {
-      int pos = basePrefix2.ReverseFind_PathSepar();
+      const int pos = basePrefix2.ReverseFind_PathSepar();
       if (pos >= 0)
         basePrefix2.DeleteFrom((unsigned)(pos + 1));
     }
@@ -394,14 +394,14 @@ HRESULT CApp::CalculateCrc2(const UString &methodName)
     
     t.ShowCompressionInfo = false;
     
-    UString title = LangString(IDS_CHECKSUM_CALCULATING);
+    const UString title = LangString(IDS_CHECKSUM_CALCULATING);
     
     t.MainWindow = _window;
     t.MainTitle = "7-Zip"; // LangString(IDS_APP_TITLE);
     t.MainAddTitle = title;
     t.MainAddTitle.Add_Space();
     
-    RINOK(t.Create(title, _window));
+    RINOK(t.Create(title, _window))
 
     t.ShowFinalResults(_window);
   }
diff --git a/CPP/7zip/UI/FileManager/PanelDrag.cpp b/CPP/7zip/UI/FileManager/PanelDrag.cpp
index af8799c..040444c 100644
--- a/CPP/7zip/UI/FileManager/PanelDrag.cpp
+++ b/CPP/7zip/UI/FileManager/PanelDrag.cpp
@@ -6,10 +6,15 @@
 #include <winuserm.h>
 #endif
 
+#include "../../../../C/7zVersion.h"
+#include "../../../../C/CpuArch.h"
+
 #include "../../../Common/StringConvert.h"
 #include "../../../Common/Wildcard.h"
 
+#include "../../../Windows/COM.h"
 #include "../../../Windows/MemoryGlobal.h"
+#include "../../../Windows/Menu.h"
 #include "../../../Windows/FileDir.h"
 #include "../../../Windows/FileName.h"
 #include "../../../Windows/Shell.h"
@@ -22,6 +27,11 @@
 
 #include "App.h"
 #include "EnumFormatEtc.h"
+#include "FormatUtils.h"
+#include "LangUtils.h"
+
+#include "resource.h"
+#include "../Explorer/resource.h"
 
 using namespace NWindows;
 using namespace NFile;
@@ -31,88 +41,1003 @@ using namespace NDir;
 extern bool g_IsNT;
 #endif
 
-#define kTempDirPrefix FTEXT("7zE")
+#define PRF(x)
+#define PRF_W(x)
+// #define PRF2(x)
+#define PRF3(x)
+#define PRF3_W(x)
+#define PRF4(x)
+// #define PRF4(x) OutputDebugStringA(x)
+// #define PRF4_W(x) OutputDebugStringW(x)
 
-static LPCTSTR const kSvenZipSetFolderFormat = TEXT("7-Zip::SetTargetFolder");
+// #define SHOW_DEBUG_DRAG
 
-////////////////////////////////////////////////////////
+#ifdef SHOW_DEBUG_DRAG
+
+#define PRF_(x) { x; }
+
+static void Print_Point(const char *name, DWORD keyState, const POINTL &pt, DWORD effect)
+{
+  AString s (name);
+  s += " x=";  s.Add_UInt32((unsigned)pt.x);
+  s += " y=";  s.Add_UInt32((unsigned)pt.y);
+  s += " k=";  s.Add_UInt32(keyState);
+  s += " e=";  s.Add_UInt32(effect);
+  PRF4(s);
+}
+
+#else
+
+#define PRF_(x)
+
+#endif
+
+
+#define kTempDirPrefix  FTEXT("7zE")
+
+// all versions: k_Format_7zip_SetTargetFolder format to transfer folder path from target to source
+static LPCTSTR const k_Format_7zip_SetTargetFolder = TEXT("7-Zip::SetTargetFolder");
+// new v23 formats:
+static LPCTSTR const k_Format_7zip_SetTransfer = TEXT("7-Zip::SetTransfer");
+static LPCTSTR const k_Format_7zip_GetTransfer = TEXT("7-Zip::GetTransfer");
+
+/*
+  Win10: clipboard formats.
+  There are about 16K free ids (formats) per system that can be
+  registered with RegisterClipboardFormat() with different names.
+  Probably that 16K ids space is common for ids registering for both
+  formats: RegisterClipboardFormat(), and registered window classes:
+  RegisterClass(). But ids for window classes will be deleted from
+  the list after process finishing. And registered clipboard
+  formats probably will be deleted from the list only after reboot.
+*/
+
+// static bool const g_CreateArchive_for_Drag_from_7zip = false;
+// static bool const g_CreateArchive_for_Drag_from_Explorer = true;
+    // = false; // for debug
+
+/*
+How DoDragDrop() works:
+{
+  IDropSource::QueryContinueDrag()  (keyState & MK_LBUTTON) != 0
+  IDropTarget::Enter()
+    IDropSource::GiveFeedback()
+  IDropTarget::DragOver()
+    IDropSource::GiveFeedback()
+
+  for()
+  {
+    IDropSource::QueryContinueDrag()  (keyState & MK_LBUTTON) != 0
+    IDropTarget::DragOver()           (keyState & MK_LBUTTON) != 0
+      IDropSource::GiveFeedback()
+  }
+
+  {
+    // DoDragDrop() in Win10 before calling // QueryContinueDrag()
+    // with (*(keyState & MK_LBUTTON) == 0) probably calls:
+    //   1) IDropTarget::DragOver() with same point values (x,y), but (keyState & MK_LBUTTON) != 0)
+    //   2) IDropSource::GiveFeedback().
+    // so DropSource can know exact GiveFeedback(effect) mode just before LBUTTON releasing.
+
+    if (IDropSource::QueryContinueDrag() for (keyState & MK_LBUTTON) == 0
+      returns DRAGDROP_S_DROP), it will call
+    IDropTarget::Drop()
+  }
+  or
+  {
+    IDropSource::QueryContinueDrag()
+    IDropTarget::DragLeave()
+    IDropSource::GiveFeedback(0)
+  }
+  or
+  {
+    if (IDropSource::QueryContinueDrag()
+      returns DRAGDROP_S_CANCEL)
+    IDropTarget::DragLeave()
+  }
+}
+*/
+
+
+// ---------- CDropTarget ----------
+
+static const UInt32 k_Struct_Id_SetTranfer = 2;  // it's our selected id
+static const UInt32 k_Struct_Id_GetTranfer = 3;  // it's our selected id
+
+static const UInt64 k_Program_Id = 1; // "7-Zip"
+
+enum E_Program_ISA
+{
+  k_Program_ISA_x86   = 2,
+  k_Program_ISA_x64   = 3,
+  k_Program_ISA_armt  = 4,
+  k_Program_ISA_arm64 = 5,
+  k_Program_ISA_arm32 = 6,
+  k_Program_ISA_ia64  = 9
+};
+
+#define k_Program_Ver ((MY_VER_MAJOR << 16) | MY_VER_MINOR)
+
+
+// k_SourceFlags_* are flags that are sent from Source to Target
+
+static const UInt32 k_SourceFlags_DoNotProcessInTarget = 1 << 1;
+/* Do not process in Target. Source will process operation instead of Target.
+   By default Target processes Drop opearation. */
+// static const UInt32 k_SourceFlags_ProcessInTarget      = 1 << 2;
+
+static const UInt32 k_SourceFlags_DoNotWaitFinish   = 1 << 3;
+static const UInt32 k_SourceFlags_WaitFinish        = 1 << 4;
+/* usually Source needs WaitFinish, if temp files were created. */
+
+static const UInt32 k_SourceFlags_TempFiles         = 1 << 6;
+static const UInt32 k_SourceFlags_NamesAreParent    = 1 << 7;
+/* if returned path list for GetData(CF_HDROP) contains
+   path of parent temp folder instead of final paths of items
+   that will be extracted later from archive */
+
+static const UInt32 k_SourceFlags_SetTargetFolder   = 1 << 8;
+/* SetData::("SetTargetFolder") was called (with empty or non-empty string) */
+
+static const UInt32 k_SourceFlags_SetTargetFolder_NonEmpty  = 1 << 9;
+/* SetData::("SetTargetFolder") was called with non-empty string */
+
+static const UInt32 k_SourceFlags_NeedExtractOpToFs = 1 << 10;
+
+static const UInt32 k_SourceFlags_Copy_WasCalled = 1 << 11;
+
+static const UInt32 k_SourceFlags_LeftButton        = 1 << 14;
+static const UInt32 k_SourceFlags_RightButton       = 1 << 15;
+
+
+static const UInt32 k_TargetFlags_WasCanceled = 1 << 0;
+static const UInt32 k_TargetFlags_MustBeProcessedBySource = 1 << 1;
+static const UInt32 k_TargetFlags_WasProcessed    = 1 << 2;
+static const UInt32 k_TargetFlags_DoNotWaitFinish = 1 << 3;
+static const UInt32 k_TargetFlags_WaitFinish      = 1 << 4;
+static const UInt32 k_TargetFlags_MenuWasShown    = 1 << 16;
+
+struct CDataObject_TransferBase
+{
+  UInt32 Struct_Id;
+  UInt32 Struct_Size;
+
+  UInt64 Program_Id;
+  UInt32 Program_Ver_Main;
+  UInt32 Program_Ver_Build;
+  UInt32 Program_ISA;
+  UInt32 Program_Flags;
+
+  UInt32 ProcessId;
+  UInt32 _reserved1[7];
+
+protected:
+  void Init_Program();
+};
+
+
+void CDataObject_TransferBase::Init_Program()
+{
+  Program_Id = k_Program_Id;
+  Program_ISA =
+    #if defined(MY_CPU_AMD64)
+      k_Program_ISA_x64
+    #elif defined(MY_CPU_X86)
+      k_Program_ISA_x86
+    #elif defined(MY_CPU_ARM64)
+      k_Program_ISA_arm64
+    #elif defined(MY_CPU_ARM32)
+      k_Program_ISA_arm32
+    #elif defined(MY_CPU_ARMT) || defined(MY_CPU_ARM)
+      k_Program_ISA_armt
+    #elif defined(MY_CPU_IA64)
+      k_Program_ISA_ia64
+    #else
+      0
+    #endif
+      ;
+  Program_Flags = sizeof(size_t);
+  Program_Ver_Main = k_Program_Ver;
+  // Program_Ver_Build = 0;
+  ProcessId = GetCurrentProcessId();
+}
+
+
+#if defined(__GNUC__) && !defined(__clang__)
+/* 'void* memset(void*, int, size_t)' clearing an object
+    of non-trivial type 'struct CDataObject_SetTransfer' */
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
+#endif
+
+
+struct CDataObject_GetTransfer:
+public CDataObject_TransferBase
+{
+  UInt32 Flags;
+
+  UInt32 _reserved2[11];
+
+  CDataObject_GetTransfer()
+  {
+    memset(this, 0, sizeof(*this));
+    Init_Program();
+    Struct_Id = k_Struct_Id_GetTranfer;
+    Struct_Size = sizeof(*this);
+  }
+
+  bool Check() const
+  {
+    return Struct_Size >= sizeof(*this) && Struct_Id == k_Struct_Id_GetTranfer;
+  }
+};
+
+
+enum Enum_FolderType
+{
+  k_FolderType_None,
+  k_FolderType_Unknown = 1,
+  k_FolderType_Fs = 2,
+  k_FolderType_AltStreams = 3,
+  k_FolderType_Archive = 4
+};
+
+struct CTargetTransferInfo
+{
+  UInt32 Flags;
+  UInt32 FuncType;
+  
+  UInt32 KeyState;
+  UInt32 OkEffects;
+  POINTL Point;
+
+  UInt32 Cmd_Effect;
+  UInt32 Cmd_Type;
+  UInt32 FolderType;
+  UInt32 _reserved3[3];
+
+  CTargetTransferInfo()
+  {
+    memset(this, 0, sizeof(*this));
+  }
+};
+
+struct CDataObject_SetTransfer:
+public CDataObject_TransferBase
+{
+  CTargetTransferInfo Target;
+
+  void Init()
+  {
+    memset(this, 0, sizeof(*this));
+    Init_Program();
+    Struct_Id = k_Struct_Id_SetTranfer;
+    Struct_Size = sizeof(*this);
+  }
+
+  bool Check() const
+  {
+    return Struct_Size >= sizeof(*this) && Struct_Id == k_Struct_Id_SetTranfer;
+  }
+};
+
+
+
+
+
+enum Enum_DragTargetMode
+{
+  k_DragTargetMode_None   = 0,
+  k_DragTargetMode_Leave  = 1,
+  k_DragTargetMode_Enter  = 2,
+  k_DragTargetMode_Over   = 3,
+  k_DragTargetMode_Drop_Begin = 4,
+  k_DragTargetMode_Drop_End   = 5
+};
+
+
+// ---- menu ----
+
+namespace NDragMenu {
+
+enum Enum_CmdId
+{
+  k_None          = 0,
+  k_Cancel        = 1,
+  k_Copy_Base     = 2, // to fs
+  k_Copy_ToArc    = 3,
+  k_AddToArc      = 4
+  /*
+  k_OpenArc       = 8,
+  k_TestArc       = 9,
+  k_ExtractFiles  = 10,
+  k_ExtractHere   = 11
+  */
+};
+
+struct CCmdLangPair
+{
+  unsigned CmdId_and_Flags;
+  unsigned LangId;
+};
+
+static const UInt32 k_MenuFlags_CmdMask = (1 << 7) - 1;
+static const UInt32 k_MenuFlag_Copy = 1 << 14;
+static const UInt32 k_MenuFlag_Move = 1 << 15;
+// #define IDS_CANCEL (IDCANCEL + 400)
+#define IDS_CANCEL 402
+
+static const CCmdLangPair g_Pairs[] =
+{
+  { k_Copy_Base  | k_MenuFlag_Copy,  IDS_COPY },
+  { k_Copy_Base  | k_MenuFlag_Move,  IDS_MOVE },
+  { k_Copy_ToArc | k_MenuFlag_Copy,  IDS_COPY_TO },
+  // { k_Copy_ToArc | k_MenuFlag_Move,  IDS_MOVE_TO }, // IDS_CONTEXT_COMPRESS_TO
+  // { k_OpenArc,      IDS_CONTEXT_OPEN },
+  // { k_ExtractFiles, IDS_CONTEXT_EXTRACT },
+  // { k_ExtractHere,  IDS_CONTEXT_EXTRACT_HERE },
+  // { k_TestArc,      IDS_CONTEXT_TEST },
+  { k_AddToArc   | k_MenuFlag_Copy,  IDS_CONTEXT_COMPRESS },
+  { k_Cancel, IDS_CANCEL }
+};
+ 
+}
+
+
+class CDropTarget Z7_final:
+  public IDropTarget,
+  public CMyUnknownImp
+{
+  Z7_COM_UNKNOWN_IMP_1_MT(IDropTarget)
+  STDMETHOD(DragEnter)(IDataObject *dataObject, DWORD keyState, POINTL pt, DWORD *effect) Z7_override;
+  STDMETHOD(DragOver)(DWORD keyState, POINTL pt, DWORD *effect) Z7_override;
+  STDMETHOD(DragLeave)() Z7_override;
+  STDMETHOD(Drop)(IDataObject *dataObject, DWORD keyState, POINTL pt, DWORD *effect) Z7_override;
+
+  bool m_IsRightButton;
+  bool m_GetTransfer_WasSuccess;
+  bool m_DropIsAllowed;      // = true, if data IDataObject can return CF_HDROP (so we can get list of paths)
+  bool m_PanelDropIsAllowed; // = false, if current target_panel is source_panel.
+                             // check it only if m_DropIsAllowed == true
+                             // we use it to show icon effect that drop is not allowed here.
+  
+  CMyComPtr<IDataObject> m_DataObject; // we set it in DragEnter()
+  UStringVector m_SourcePaths;
+  
+  // int m_DropHighlighted_SelectionIndex;
+  // int m_SubFolderIndex;      // realIndex of item in m_Panel list (if drop cursor to that item)
+  // UString m_DropHighlighted_SubFolderName;   // name of folder in m_Panel list (if drop cursor to that folder)
+
+  CPanel *m_Panel;
+  bool m_IsAppTarget;        // true, if we want to drop to app window (not to panel)
+
+  bool m_TargetPath_WasSent_ToDataObject;           // true, if TargetPath was sent
+  bool m_TargetPath_NonEmpty_WasSent_ToDataObject;  // true, if non-empty TargetPath was sent
+  bool m_Transfer_WasSent_ToDataObject;  // true, if Transfer was sent
+  UINT m_Format_7zip_SetTargetFolder;
+  UINT m_Format_7zip_SetTransfer;
+  UINT m_Format_7zip_GetTransfer;
+
+  UInt32 m_ProcessId; // for sending
+
+  bool IsItSameDrive() const;
+
+  // void Try_QueryGetData(IDataObject *dataObject);
+  void LoadNames_From_DataObject(IDataObject *dataObject);
+
+  UInt32 GetFolderType() const;
+  bool IsFsFolderPath() const;
+  DWORD GetEffect(DWORD keyState, POINTL pt, DWORD allowedEffect) const;
+  void RemoveSelection();
+  void PositionCursor(const POINTL &ptl);
+  UString GetTargetPath() const;
+  bool SendToSource_TargetPath_enable(IDataObject *dataObject, bool enablePath);
+  bool SendToSource_UInt32(IDataObject *dataObject, UINT format, UInt32 value);
+  bool SendToSource_TransferInfo(IDataObject *dataObject,
+      const CTargetTransferInfo &info);
+  void SendToSource_auto(IDataObject *dataObject,
+      const CTargetTransferInfo &info);
+  void SendToSource_Drag(CTargetTransferInfo &info)
+  {
+    SendToSource_auto(m_DataObject, info);
+  }
+
+  void ClearState();
+
+public:
+  CDropTarget();
+
+  CApp *App;
+  int SrcPanelIndex;     // index of D&D source_panel
+  int TargetPanelIndex;  // what panel to use as target_panel of Application
+};
+
+
+
+
+// ---------- CDataObject ----------
+
+/*
+  Some programs (like Sticky Notes in Win10) do not like
+  virtual non-existing items (files/dirs) in CF_HDROP format.
+  So we use two versions of CF_HDROP data:
+    m_hGlobal_HDROP_Pre   : the list contains only destination path of temp directory.
+        That directory later will be filled with extracted items.
+    m_hGlobal_HDROP_Final : the list contains paths of all root items that
+        will be created in temp directory by archive extraction operation,
+        or the list of existing fs items, if source is filesystem directory.
+     
+  The DRAWBACK: some programs (like Edge in Win10) can use names from IDataObject::GetData()
+  call that was called before IDropSource::QueryContinueDrag() where we set (UseFinalGlobal = true)
+  So such programs will use non-relevant m_hGlobal_HDROP_Pre item,
+  instead of m_hGlobal_HDROP_Final items.
+*/
 
-class CDataObject:
+class CDataObject Z7_final:
   public IDataObject,
   public CMyUnknownImp
 {
+  Z7_COM_UNKNOWN_IMP_1_MT(IDataObject)
+
+  Z7_COMWF_B GetData(LPFORMATETC pformatetcIn, LPSTGMEDIUM medium) Z7_override;
+  Z7_COMWF_B GetDataHere(LPFORMATETC pformatetc, LPSTGMEDIUM medium) Z7_override;
+  Z7_COMWF_B QueryGetData(LPFORMATETC pformatetc) Z7_override;
+
+  Z7_COMWF_B GetCanonicalFormatEtc(LPFORMATETC /* pformatetc */, LPFORMATETC pformatetcOut) Z7_override
+  {
+    if (!pformatetcOut)
+      return E_INVALIDARG;
+    pformatetcOut->ptd = NULL;
+    return E_NOTIMPL;
+  }
+
+  Z7_COMWF_B SetData(LPFORMATETC etc, STGMEDIUM *medium, BOOL release) Z7_override;
+  Z7_COMWF_B EnumFormatEtc(DWORD drection, LPENUMFORMATETC *enumFormatEtc) Z7_override;
+  
+  Z7_COMWF_B DAdvise(FORMATETC * /* etc */, DWORD /* advf */, LPADVISESINK /* pAdvSink */, DWORD * /* pdwConnection */) Z7_override
+    { return OLE_E_ADVISENOTSUPPORTED; }
+  Z7_COMWF_B DUnadvise(DWORD /* dwConnection */) Z7_override
+    { return OLE_E_ADVISENOTSUPPORTED; }
+  Z7_COMWF_B EnumDAdvise(LPENUMSTATDATA *ppenumAdvise) Z7_override
+  {
+    if (ppenumAdvise)
+      *ppenumAdvise = NULL;
+    return OLE_E_ADVISENOTSUPPORTED;
+  }
+
+  bool m_PerformedDropEffect_WasSet;
+  bool m_LogicalPerformedDropEffect_WasSet;
+  bool m_DestDirPrefix_FromTarget_WasSet;
+public:
+  bool m_Transfer_WasSet;
 private:
+  // GetData formats (source to target):
   FORMATETC m_Etc;
-  UINT m_SetFolderFormat;
+  // UINT m_Format_FileOpFlags;
+  // UINT m_Format_PreferredDropEffect;
+
+  // SetData() formats (target to source):
+  // 7-Zip's format:
+  UINT m_Format_7zip_SetTargetFolder;
+  UINT m_Format_7zip_SetTransfer;
+  UINT m_Format_7zip_GetTransfer; // for GetData()
+
+  UINT m_Format_PerformedDropEffect;
+  UINT m_Format_LogicalPerformedDropEffect;
+  UINT m_Format_DisableDragText;
+  UINT m_Format_IsShowingLayered;
+  UINT m_Format_IsShowingText;
+  UINT m_Format_DropDescription;
+  UINT m_Format_TargetCLSID;
+
+  DWORD m_PerformedDropEffect;
+  DWORD m_LogicalPerformedDropEffect;
+
+  void CopyFromPanelTo_Folder();
+  HRESULT SetData2(const FORMATETC *formatetc, const STGMEDIUM *medium);
 
 public:
-  MY_UNKNOWN_IMP1_MT(IDataObject)
+  bool IsRightButton;
+  bool IsTempFiles;
 
-  STDMETHODIMP GetData(LPFORMATETC pformatetcIn, LPSTGMEDIUM medium);
-  STDMETHODIMP GetDataHere(LPFORMATETC pformatetc, LPSTGMEDIUM medium);
-  STDMETHODIMP QueryGetData(LPFORMATETC pformatetc );
+  bool UsePreGlobal;
+  bool DoNotProcessInTarget;
 
-  STDMETHODIMP GetCanonicalFormatEtc ( LPFORMATETC /* pformatetc */, LPFORMATETC pformatetcOut)
-    { pformatetcOut->ptd = NULL; return ResultFromScode(E_NOTIMPL); }
+  bool NeedCall_Copy;
+  bool Copy_WasCalled;
 
-  STDMETHODIMP SetData(LPFORMATETC etc, STGMEDIUM *medium, BOOL release);
-  STDMETHODIMP EnumFormatEtc(DWORD drection, LPENUMFORMATETC *enumFormatEtc);
+  NMemory::CGlobal m_hGlobal_HDROP_Pre;
+  NMemory::CGlobal m_hGlobal_HDROP_Final;
+  // NMemory::CGlobal m_hGlobal_FileOpFlags;
+  // NMemory::CGlobal m_hGlobal_PreferredDropEffect;
   
-  STDMETHODIMP DAdvise(FORMATETC * /* etc */, DWORD /* advf */, LPADVISESINK /* pAdvSink */, DWORD * /* pdwConnection */)
-    { return OLE_E_ADVISENOTSUPPORTED; }
-  STDMETHODIMP DUnadvise(DWORD /* dwConnection */) { return OLE_E_ADVISENOTSUPPORTED; }
-  STDMETHODIMP EnumDAdvise( LPENUMSTATDATA * /* ppenumAdvise */) { return OLE_E_ADVISENOTSUPPORTED; }
+  CPanel *Panel;
+  CRecordVector<UInt32> Indices;
 
-  CDataObject();
+  UString SrcDirPrefix_Temp; // FS directory with source files or Temp
+  UString DestDirPrefix_FromTarget;
+  /* destination Path that was sent by Target via SetData().
+     it can be altstreams prefix.
+     if (!DestDirPrefix_FromTarget.IsEmpty()) m_Panel->CompressDropFiles() was not called by Target.
+     So we must do drop actions in Source */
+  HRESULT Copy_HRESULT;
+  UStringVector Messages;
 
-  NMemory::CGlobal hGlobal;
-  UString Path;
+  CDataObject();
+public:
+  CDataObject_SetTransfer m_Transfer;
 };
 
+
+// for old mingw:
+#ifndef CFSTR_LOGICALPERFORMEDDROPEFFECT
+#define CFSTR_LOGICALPERFORMEDDROPEFFECT    TEXT("Logical Performed DropEffect")
+#endif
+#ifndef CFSTR_TARGETCLSID
+#define CFSTR_TARGETCLSID                   TEXT("TargetCLSID")                         // HGLOBAL with a CLSID of the drop target
+#endif
+
+
+
 CDataObject::CDataObject()
 {
-  m_SetFolderFormat = RegisterClipboardFormat(kSvenZipSetFolderFormat);
+  // GetData formats (source to target):
+  // and we use CF_HDROP format to transfer file paths from source to target:
   m_Etc.cfFormat = CF_HDROP;
   m_Etc.ptd = NULL;
   m_Etc.dwAspect = DVASPECT_CONTENT;
   m_Etc.lindex = -1;
   m_Etc.tymed = TYMED_HGLOBAL;
+
+  // m_Format_FileOpFlags          = RegisterClipboardFormat(TEXT("FileOpFlags"));
+  // m_Format_PreferredDropEffect  = RegisterClipboardFormat(CFSTR_PREFERREDDROPEFFECT); // "Preferred DropEffect"
+
+  // SetData() formats (target to source):
+  m_Format_7zip_SetTargetFolder = RegisterClipboardFormat(k_Format_7zip_SetTargetFolder);
+  m_Format_7zip_SetTransfer     = RegisterClipboardFormat(k_Format_7zip_SetTransfer);
+  m_Format_7zip_GetTransfer     = RegisterClipboardFormat(k_Format_7zip_GetTransfer);
+  
+  m_Format_PerformedDropEffect  = RegisterClipboardFormat(CFSTR_PERFORMEDDROPEFFECT); // "Performed DropEffect"
+  m_Format_LogicalPerformedDropEffect = RegisterClipboardFormat(CFSTR_LOGICALPERFORMEDDROPEFFECT); // "Logical Performed DropEffect"
+  m_Format_DisableDragText      = RegisterClipboardFormat(TEXT("DisableDragText"));
+  m_Format_IsShowingLayered     = RegisterClipboardFormat(TEXT("IsShowingLayered"));
+  m_Format_IsShowingText        = RegisterClipboardFormat(TEXT("IsShowingText"));
+  m_Format_DropDescription      = RegisterClipboardFormat(TEXT("DropDescription"));
+  m_Format_TargetCLSID          = RegisterClipboardFormat(CFSTR_TARGETCLSID);
+
+  m_PerformedDropEffect = 0;
+  m_LogicalPerformedDropEffect = 0;
+
+  m_PerformedDropEffect_WasSet = false;
+  m_LogicalPerformedDropEffect_WasSet = false;
+  
+  m_DestDirPrefix_FromTarget_WasSet = false;
+  m_Transfer_WasSet = false;
+
+  IsRightButton = false;
+  IsTempFiles = false;
+  
+  UsePreGlobal = false;
+  DoNotProcessInTarget = false;
+
+  NeedCall_Copy = false;
+  Copy_WasCalled = false;
+
+  Copy_HRESULT = S_OK;
 }
 
-STDMETHODIMP CDataObject::SetData(LPFORMATETC etc, STGMEDIUM *medium, BOOL /* release */)
+
+
+void CDataObject::CopyFromPanelTo_Folder()
 {
-  if (etc->cfFormat == m_SetFolderFormat
-      && etc->tymed == TYMED_HGLOBAL
-      && etc->dwAspect == DVASPECT_CONTENT
-      && medium->tymed == TYMED_HGLOBAL)
+  try
   {
-    Path.Empty();
-    if (!medium->hGlobal)
-      return S_OK;
-    size_t size = GlobalSize(medium->hGlobal) / sizeof(wchar_t);
-    const wchar_t *src = (const wchar_t *)GlobalLock(medium->hGlobal);
-    if (src)
+    CCopyToOptions options;
+    options.folder = SrcDirPrefix_Temp;
+    /* 15.13: fixed problem with mouse cursor for password window.
+       DoDragDrop() probably calls SetCapture() to some hidden window.
+       But it's problem, if we show some modal window, like MessageBox.
+       So we return capture to our window.
+       If you know better way to solve the problem, please notify 7-Zip developer.
+    */
+    // MessageBoxW(*Panel, L"test", L"test", 0);
+    /* HWND oldHwnd = */ SetCapture(*Panel);
+    Copy_WasCalled = true;
+    Copy_HRESULT = E_FAIL;
+    Copy_HRESULT = Panel->CopyTo(options, Indices, &Messages);
+    // do we need to restore capture?
+    // ReleaseCapture();
+    // oldHwnd = SetCapture(oldHwnd);
+  }
+  catch(...)
+  {
+    Copy_HRESULT = E_FAIL;
+  }
+}
+
+
+#ifdef SHOW_DEBUG_DRAG
+
+static void PrintFormat2(AString &s, unsigned format)
+{
+  s += " ";
+  s += "= format=";
+  s.Add_UInt32(format);
+  s += " ";
+  const int k_len = 512;
+  CHAR temp[k_len];
+  if (GetClipboardFormatNameA(format, temp, k_len) && strlen(temp) != 0)
+    s += temp;
+}
+
+static void PrintFormat(const char *title, unsigned format)
+{
+  AString s (title);
+  PrintFormat2(s, format);
+  PRF4(s);
+}
+
+static void PrintFormat_AndData(const char *title, unsigned format, const void *data, size_t size)
+{
+  AString s (title);
+  PrintFormat2(s, format);
+  s += " size=";
+  s.Add_UInt32((UInt32)size);
+  for (size_t i = 0; i < size && i < 16; i++)
+  {
+    s += " ";
+    s.Add_UInt32(((const Byte *)data)[i]);
+  }
+  PRF4(s);
+}
+
+static void PrintFormat_GUIDToStringW(const void *p)
+{
+  const GUID *guid = (const GUID *)p;
+  UString s;
+  const unsigned kSize = 48;
+  StringFromGUID2(*guid, s.GetBuf(kSize), kSize);
+  s.ReleaseBuf_CalcLen(kSize);
+  PRF3_W(s);
+}
+
+// Vista
+typedef enum
+{
+  MY_DROPIMAGE_INVALID  = -1,                // no image preference (use default)
+  MY_DROPIMAGE_NONE     = 0,                 // red "no" circle
+  MY_DROPIMAGE_COPY     = DROPEFFECT_COPY,   // plus for copy
+  MY_DROPIMAGE_MOVE     = DROPEFFECT_MOVE,   // movement arrow for move
+  MY_DROPIMAGE_LINK     = DROPEFFECT_LINK,   // link arrow for link
+  MY_DROPIMAGE_LABEL    = 6,                 // tag icon to indicate metadata will be changed
+  MY_DROPIMAGE_WARNING  = 7,                 // yellow exclamation, something is amiss with the operation
+  MY_DROPIMAGE_NOIMAGE  = 8                  // no image at all
+} MY_DROPIMAGETYPE;
+
+typedef struct {
+  MY_DROPIMAGETYPE type;
+  WCHAR szMessage[MAX_PATH];
+  WCHAR szInsert[MAX_PATH];
+} MY_DROPDESCRIPTION;
+
+#endif
+
+
+/*
+IDataObject::SetData(LPFORMATETC etc, STGMEDIUM *medium, BOOL release)
+======================================================================
+
+  Main purpose of CDataObject is to transfer data from source to target
+  of drag and drop operation.
+  But also CDataObject can be used to transfer data in backward direction
+  from target to source (even if target and source are different processes).
+  There are some predefined Explorer's formats to transfer some data from target to source.
+  And 7-Zip uses 7-Zip's format k_Format_7zip_SetTargetFolder to transfer
+  destination directory path from target to source.
+
+  Our CDataObject::SetData() function here is used only to transfer data from target to source.
+  Usual source_to_target data is filled to m_hGlobal_* objects directly without SetData() calling.
+
+The main problem of SetData() is ownership of medium for (release == TRUE) case.
+
+SetData(,, release = TRUE) from different processes (DropSource and DropTarget)
+===============================================================================
+{
+  MS DOCs about (STGMEDIUM *medium) ownership:
+    The data object called does not take ownership of the data
+    until it has successfully received it and no error code is returned.
+
+  Each of processes (Source and Target) has own copy of medium allocated.
+  Windows code creates proxy IDataObject object in Target process to transferr
+  SetData() call between Target and Source processes via special proxies:
+    DropTarget ->
+    proxy_DataObject_in_Target ->
+    proxy_in_Source ->
+    DataObject_in_Source
+  when Target calls SetData() with proxy_DataObject_in_Target,
+  the system and proxy_in_Source
+   - allocates proxy-medium-in-Source process
+   - copies medium data from Target to that proxy-medium-in-Source
+   - sends proxy-medium-in-Source to DataObject_in_Source->SetData().
+  
+  after returning from SetData() to Target process:
+    Win10 proxy_DataObject_in_Target releases original medium in Target process,
+    only if SetData() in Source returns S_OK. It's consistent with DOCs above.
+
+  for unsupported cfFormat:
+  [DropSource is 7-Zip 22.01 (old) : (etc->cfFormat != m_Format_7zip_SetTargetFolder && release == TRUE)]
+  (DropSource is WinRAR case):
+  Source doesn't release medium and returns error (for example, E_NOTIMPL)
+  {
+    Then Win10 proxy_in_Source also doesn't release proxy-medium-in-Source.
+    So there is memory leak in Source process.
+    Probably Win10 proxy_in_Source tries to avoid possible double releasing
+    that can be more fatal than memory leak.
+    
+    Then Win10 proxy_DataObject_in_Target also doesn't release
+    original medium, that was allocated by DropTarget.
+    So if DropTarget also doesn't release medium, there is memory leak in
+    DropTarget process too.
+    DropTarget is Win10-Explorer probably doesn't release medium in that case.
+  }
+
+  [DropSource is 7-Zip 22.01 (old) : (etc->cfFormat == m_Format_7zip_SetTargetFolder && release == TRUE)]
+  DropSource returns S_OK and doesn't release medium:
+  {
+    then there is memory leak in DropSource process only.
+  }
+
+  (DropSource is 7-Zip v23 (new)):
+  (DropSource is Win10-Explorer case)
+  {
+    Win10-Explorer-DropSource probably always releases medium,
+    and then it always returns S_OK.
+    So Win10 proxy_DataObject_in_Target also releases
+    original medium, that was allocated by DropTarget.
+    So there is no memory leak in Source and Target processes.
+  }
+
+  if (DropTarget is Win10-Explorer)
+  {
+    Explorer Target uses SetData(,, (release = TRUE)) and
+    Explorer Target probably doesn't free memory after SetData(),
+      even if SetData(,, (release = TRUE)) returns E_NOTIMPL;
+  }
+
+  if (DropSource is Win10-Explorer)
+  {
+    (release == FALSE) doesn't work, and SetData() returns E_NOTIMPL;
+    (release == TRUE)  works, and SetData() returns S_OK, and
+                       it returns S_OK even for formats unsupported by Explorer.
+  }
+  
+  To be more compatible with DOCs and Win10-Explorer and to avoid memory leaks,
+  we use the following scheme for our IDataObject::SetData(,, release == TRUE)
+  in DropSource code:
+  if (release == TRUE) { our SetData() always releases medium
+      with ReleaseStgMedium() and returns S_OK; }
+  The DRAWBACK of that scheme:
+    The caller always receives S_OK,
+    so the caller doesn't know about any error in SetData() in that case.
+
+for 7zip-Target to 7zip-Source calls:
+  we use (release == FALSE)
+  So we avoid (release == TRUE) memory leak problems,
+  and we can get real return code from SetData().
+
+for 7zip-Target to Explorer-Source calls:
+  we use (release == TRUE).
+  beacuse Explorer-Source doesn't accept (release == FALSE).
+}
+*/
+
+/*
+https://github.com/MicrosoftDocs/win32/blob/docs/desktop-src/shell/datascenarios.md
+CFSTR_PERFORMEDDROPEFFECT:
+  is used by the target to inform the data object through its
+  IDataObject::SetData method of the outcome of a data transfer.
+CFSTR_PREFERREDDROPEFFECT:
+  is used by the source to specify whether its preferred method of data transfer is move or copy.
+*/
+
+Z7_COMWF_B CDataObject::SetData(LPFORMATETC etc, STGMEDIUM *medium, BOOL release)
+{
+  try {
+  const HRESULT hres = SetData2(etc, medium);
+  // PrintFormat(release ? "SetData RELEASE=TRUE" : "SetData RELEASE=FALSE" , etc->cfFormat);
+  if (release)
+  {
+    /*
+    const DWORD tymed = medium->tymed;
+    IUnknown *pUnkForRelease = medium->pUnkForRelease;
+    */
+    // medium->tymed = NULL; // for debug
+    // return E_NOTIMPL;  // for debug
+    ReleaseStgMedium(medium);
+    /* ReleaseStgMedium() will change STGMEDIUM::tymed to (TYMED_NULL = 0).
+       but we also can clear (medium.hGlobal = NULL),
+       to prevent some incorrect releasing, if the caller will try to release the data  */
+    /*
+    if (medium->tymed == TYMED_NULL && tymed == TYMED_HGLOBAL && !pUnkForRelease)
+      medium->hGlobal = NULL;
+    */
+    // do we need return S_OK; for (tymed != TYMED_HGLOBAL) cases ?
+    /* we return S_OK here to shows that we take ownership of the data in (medium),
+       so the caller will not try to release (medium) */
+    return S_OK; // to be more compatible with Win10-Explorer and DOCs.
+  }
+  return hres;
+  } catch(...) { return E_FAIL; }
+}
+
+
+
+HRESULT CDataObject::SetData2(const FORMATETC *etc, const STGMEDIUM *medium)
+{
+  // PRF3("== CDataObject::SetData()");
+
+  HRESULT hres = S_OK;
+
+  if (etc->cfFormat == 0)
+    return DV_E_FORMATETC;
+  if (etc->tymed != TYMED_HGLOBAL)
+    return E_NOTIMPL; // DV_E_TYMED;
+  if (etc->dwAspect != DVASPECT_CONTENT)
+    return E_NOTIMPL; // DV_E_DVASPECT;
+  if (medium->tymed != TYMED_HGLOBAL)
+    return E_NOTIMPL; // DV_E_TYMED;
+
+  if (!medium->hGlobal)
+    return S_OK;
+
+  if (etc->cfFormat == m_Format_7zip_SetTargetFolder)
+  {
+    DestDirPrefix_FromTarget.Empty();
+    m_DestDirPrefix_FromTarget_WasSet = true;
+  }
+  else if (etc->cfFormat == m_Format_7zip_SetTransfer)
+    m_Transfer_WasSet = false;
+
+  const size_t size = GlobalSize(medium->hGlobal);
+  // GlobalLock() can return NULL, if memory block has a zero size
+  if (size == 0)
+    return S_OK;
+  const void *src = (const Byte *)GlobalLock(medium->hGlobal);
+  if (!src)
+    return E_FAIL;
+
+  PRF_(PrintFormat_AndData("SetData", etc->cfFormat, src, size))
+
+  if (etc->cfFormat == m_Format_7zip_SetTargetFolder)
+  {
+    /* this is our registered k_Format_7zip_SetTargetFolder format.
+       so it's call from 7-zip's CDropTarget */
+    /* 7-zip's CDropTarget calls SetData() for m_Format_7zip_SetTargetFolder
+       with (release == FALSE) */
+    const size_t num = size / sizeof(wchar_t);
+    if (size != num * sizeof(wchar_t))
+      return E_FAIL;
+    // if (num == 0) return S_OK;
+    // GlobalLock() can return NULL, if memory block has a zero-byte size
+    const wchar_t *s = (const wchar_t *)src;
+    UString &dest = DestDirPrefix_FromTarget;
+    for (size_t i = 0; i < num; i++)
+    {
+      const wchar_t c = s[i];
+      if (c == 0)
+        break;
+      dest += c;
+    }
+    // PRF_(PrintFormat_AndData("SetData", etc->cfFormat, src, size))
+    PRF3_W(DestDirPrefix_FromTarget);
+  }
+  else if (etc->cfFormat == m_Format_7zip_SetTransfer)
+  {
+    /* 7-zip's CDropTarget calls SetData() for m_Format_7zip_SetTransfer
+       with (release == FALSE) */
+    if (size < sizeof(CDataObject_SetTransfer))
+      return E_FAIL;
+    const CDataObject_SetTransfer *t = (const CDataObject_SetTransfer *)src;
+    if (!t->Check())
+      return E_FAIL;
+    m_Transfer = *t;
+    if (t->Target.FuncType != k_DragTargetMode_Leave)
+      m_Transfer_WasSet = true;
+    bool needProcessBySource = !DestDirPrefix_FromTarget.IsEmpty();
+    if (t->Target.FuncType == k_DragTargetMode_Drop_Begin)
+    {
+      if (t->Target.Cmd_Type != NDragMenu::k_Copy_Base
+          // || t->Target.Cmd_Effect != DROPEFFECT_COPY
+          )
+        needProcessBySource = false;
+    }
+    if (t->Target.FuncType == k_DragTargetMode_Drop_End)
     {
-      for (size_t i = 0; i < size; i++)
+      if (t->Target.Flags & k_TargetFlags_MustBeProcessedBySource)
+        needProcessBySource = true;
+      else if (t->Target.Flags & k_TargetFlags_WasProcessed)
+        needProcessBySource = false;
+    }
+    DoNotProcessInTarget = needProcessBySource;
+  }
+  else
+  {
+    // SetData() from Explorer Target:
+    if (etc->cfFormat == m_Format_PerformedDropEffect)
+    {
+      m_PerformedDropEffect_WasSet = false;
+      if (size == sizeof(DWORD))
       {
-        wchar_t c = src[i];
-        if (c == 0)
-          break;
-        Path += c;
+        m_PerformedDropEffect = *(const DWORD *)src;
+        m_PerformedDropEffect_WasSet = true;
+      }
+    }
+    else if (etc->cfFormat == m_Format_LogicalPerformedDropEffect)
+    {
+      m_LogicalPerformedDropEffect_WasSet = false;
+      if (size == sizeof(DWORD))
+      {
+        m_LogicalPerformedDropEffect = *(const DWORD *)src;
+        m_LogicalPerformedDropEffect_WasSet = true;
       }
-      GlobalUnlock(medium->hGlobal);
-      return S_OK;
     }
+    else if (etc->cfFormat == m_Format_DropDescription)
+    {
+      // drop description contains only name of dest folder without full path
+      #ifdef SHOW_DEBUG_DRAG
+      if (size == sizeof(MY_DROPDESCRIPTION))
+      {
+        // const MY_DROPDESCRIPTION *s = (const MY_DROPDESCRIPTION *)src;
+        // PRF3_W(s->szMessage);
+        // PRF3_W(s->szInsert);
+      }
+      #endif
+    }
+    else if (etc->cfFormat == m_Format_TargetCLSID)
+    {
+      // it's called after call QueryContinueDrag() (keyState & MK_LBUTTON) == 0
+      // Shell File System Folder (explorer) guid: F3364BA0-65B9-11CE-A9BA-00AA004AE837
+      #ifdef SHOW_DEBUG_DRAG
+      if (size == 16)
+      {
+        PrintFormat_GUIDToStringW((const Byte *)src);
+      }
+      #endif
+    }
+    else if (etc->cfFormat == m_Format_DisableDragText)
+    {
+      // (size == 4) (UInt32 value)
+      //    value==0 : if drag to folder item or folder
+      //    value==1 : if drag to file or non list_view */
+    }
+    else if (
+        etc->cfFormat == m_Format_IsShowingLayered ||
+        etc->cfFormat == m_Format_IsShowingText)
+    {
+      // (size == 4) (UInt32 value) value==0 :
+    }
+    else
+      hres = DV_E_FORMATETC;
+    // hres = E_NOTIMPL; // for debug
+    // hres = DV_E_FORMATETC; // for debug
   }
-  return E_NOTIMPL;
+
+  GlobalUnlock(medium->hGlobal);
+  return hres;
 }
 
+
+
 static HGLOBAL DuplicateGlobalMem(HGLOBAL srcGlobal)
 {
-  SIZE_T size = GlobalSize(srcGlobal);
+  /* GlobalSize() returns 0: If the specified handle
+     is not valid or if the object has been discarded */
+  const SIZE_T size = GlobalSize(srcGlobal);
+  if (size == 0)
+    return NULL;
+  // GlobalLock() can return NULL, if memory block has a zero-byte size
   const void *src = GlobalLock(srcGlobal);
   if (!src)
-    return 0;
+    return NULL;
   HGLOBAL destGlobal = GlobalAlloc(GHND | GMEM_SHARE, size);
   if (destGlobal)
   {
@@ -120,7 +1045,7 @@ static HGLOBAL DuplicateGlobalMem(HGLOBAL srcGlobal)
     if (!dest)
     {
       GlobalFree(destGlobal);
-      destGlobal = 0;
+      destGlobal = NULL;
     }
     else
     {
@@ -132,118 +1057,370 @@ static HGLOBAL DuplicateGlobalMem(HGLOBAL srcGlobal)
   return destGlobal;
 }
 
-STDMETHODIMP CDataObject::GetData(LPFORMATETC etc, LPSTGMEDIUM medium)
+
+static bool Medium_CopyFrom(LPSTGMEDIUM medium, const void *data, size_t size)
 {
-  RINOK(QueryGetData(etc));
+  medium->tymed = TYMED_NULL;
+  medium->pUnkForRelease = NULL;
+  medium->hGlobal = NULL;
+  const HGLOBAL global = GlobalAlloc(GHND | GMEM_SHARE, size);
+  if (!global)
+    return false;
+  void *dest = GlobalLock(global);
+  if (!dest)
+  {
+    GlobalFree(global);
+    return false;
+  }
+  memcpy(dest, data, size);
+  GlobalUnlock(global);
+  medium->hGlobal = global;
+  medium->tymed = TYMED_HGLOBAL;
+  return true;
+}
+
+
+Z7_COMWF_B CDataObject::GetData(LPFORMATETC etc, LPSTGMEDIUM medium)
+{
+  try {
+  PRF_(PrintFormat("-- GetData", etc->cfFormat))
+
+  medium->tymed = TYMED_NULL;
+  medium->pUnkForRelease = NULL;
+  medium->hGlobal = NULL;
+
+  if (NeedCall_Copy && !Copy_WasCalled)
+    CopyFromPanelTo_Folder();
+
+  // PRF3("+ CDataObject::GetData");
+  // PrintFormat(etc->cfFormat);
+  HGLOBAL global;
+  RINOK(QueryGetData(etc))
+  
+  /*
+  if (etc->cfFormat == m_Format_FileOpFlags)
+    global = m_hGlobal_FileOpFlags;
+  else if (etc->cfFormat == m_Format_PreferredDropEffect)
+  {
+    // Explorer requests PreferredDropEffect only if Move/Copy selection is possible:
+    //   Shift is not pressed and Ctrl is not pressed
+    PRF3("------ CDataObject::GetData() PreferredDropEffect");
+    global = m_hGlobal_PreferredDropEffect;
+  }
+  else
+  */
+  if (etc->cfFormat == m_Etc.cfFormat) // CF_HDROP
+    global = UsePreGlobal ? m_hGlobal_HDROP_Pre : m_hGlobal_HDROP_Final;
+  else if (etc->cfFormat == m_Format_7zip_GetTransfer)
+  {
+    CDataObject_GetTransfer transfer;
+    if (m_DestDirPrefix_FromTarget_WasSet)
+    {
+      transfer.Flags |= k_SourceFlags_SetTargetFolder;
+    }
+    if (!DestDirPrefix_FromTarget.IsEmpty())
+    {
+      transfer.Flags |= k_SourceFlags_SetTargetFolder_NonEmpty;
+    }
+    if (IsTempFiles)
+    {
+      transfer.Flags |= k_SourceFlags_TempFiles;
+      transfer.Flags |= k_SourceFlags_WaitFinish;
+      transfer.Flags |= k_SourceFlags_NeedExtractOpToFs;
+      if (UsePreGlobal)
+        transfer.Flags |= k_SourceFlags_NamesAreParent;
+    }
+    else
+      transfer.Flags |= k_SourceFlags_DoNotWaitFinish;
+    
+    if (IsRightButton)
+      transfer.Flags |= k_SourceFlags_RightButton;
+    else
+      transfer.Flags |= k_SourceFlags_LeftButton;
+
+    if (DoNotProcessInTarget)
+      transfer.Flags |= k_SourceFlags_DoNotProcessInTarget;
+    if (Copy_WasCalled)
+      transfer.Flags |= k_SourceFlags_Copy_WasCalled;
+
+    if (Medium_CopyFrom(medium, &transfer, sizeof(transfer)))
+      return S_OK;
+    return E_OUTOFMEMORY;
+  }
+  else
+    return DV_E_FORMATETC;
+  
+  if (!global)
+    return DV_E_FORMATETC;
   medium->tymed = m_Etc.tymed;
-  medium->pUnkForRelease = 0;
-  medium->hGlobal = DuplicateGlobalMem(hGlobal);
+  medium->hGlobal = DuplicateGlobalMem(global);
   if (!medium->hGlobal)
     return E_OUTOFMEMORY;
   return S_OK;
+  } catch(...) { return E_FAIL; }
 }
 
-STDMETHODIMP CDataObject::GetDataHere(LPFORMATETC /* etc */, LPSTGMEDIUM /* medium */)
+Z7_COMWF_B CDataObject::GetDataHere(LPFORMATETC /* etc */, LPSTGMEDIUM /* medium */)
 {
+  PRF3("CDataObject::GetDataHere()");
   // Seems Windows doesn't call it, so we will not implement it.
   return E_UNEXPECTED;
 }
 
 
-STDMETHODIMP CDataObject::QueryGetData(LPFORMATETC etc)
+/*
+  IDataObject::QueryGetData() Determines whether the data object is capable of
+  rendering the data as specified. Objects attempting a paste or drop
+  operation can call this method before calling IDataObject::GetData
+  to get an indication of whether the operation may be successful.
+  
+  The client of a data object calls QueryGetData to determine whether
+  passing the specified FORMATETC structure to a subsequent call to
+  IDataObject::GetData is likely to be successful.
+
+  we check Try_QueryGetData with CF_HDROP
+*/
+
+Z7_COMWF_B CDataObject::QueryGetData(LPFORMATETC etc)
 {
-  if ((m_Etc.tymed & etc->tymed) &&
-       m_Etc.cfFormat == etc->cfFormat &&
-       m_Etc.dwAspect == etc->dwAspect)
-    return S_OK;
-  return DV_E_FORMATETC;
+  PRF3("-- CDataObject::QueryGetData()");
+  if (    etc->cfFormat == m_Etc.cfFormat // CF_HDROP
+      ||  etc->cfFormat == m_Format_7zip_GetTransfer
+      // || (etc->cfFormat == m_Format_FileOpFlags && (HGLOBAL)m_hGlobal_FileOpFlags)
+      // || (etc->cfFormat == m_Format_PreferredDropEffect && (HGLOBAL)m_hGlobal_PreferredDropEffect)
+      )
+  {
+  }
+  else
+    return DV_E_FORMATETC;
+  if (etc->dwAspect != m_Etc.dwAspect)
+    return DV_E_DVASPECT;
+  /* GetData(): It is possible to specify more than one medium by using the Boolean OR
+     operator, allowing the method to choose the best medium among those specified. */
+  if ((etc->tymed & m_Etc.tymed) == 0)
+    return DV_E_TYMED;
+  return S_OK;
 }
 
-STDMETHODIMP CDataObject::EnumFormatEtc(DWORD direction, LPENUMFORMATETC FAR* enumFormatEtc)
+Z7_COMWF_B CDataObject::EnumFormatEtc(DWORD direction, LPENUMFORMATETC FAR* enumFormatEtc)
 {
+  // we don't enumerate for DATADIR_SET. Seems it can work without it.
   if (direction != DATADIR_GET)
     return E_NOTIMPL;
+  // we don't enumerate for m_Format_FileOpFlags also. Seems it can work without it.
   return CreateEnumFormatEtc(1, &m_Etc, enumFormatEtc);
 }
 
+
+
 ////////////////////////////////////////////////////////
 
-class CDropSource:
+class CDropSource Z7_final:
   public IDropSource,
   public CMyUnknownImp
 {
+  Z7_COM_UNKNOWN_IMP_1_MT(IDropSource)
+  STDMETHOD(QueryContinueDrag)(BOOL escapePressed, DWORD keyState) Z7_override;
+  STDMETHOD(GiveFeedback)(DWORD effect) Z7_override;
+
   DWORD m_Effect;
 public:
-  MY_UNKNOWN_IMP1_MT(IDropSource)
-  STDMETHOD(QueryContinueDrag)(BOOL escapePressed, DWORD keyState);
-  STDMETHOD(GiveFeedback)(DWORD effect);
-
-
-  bool NeedExtract;
-  CPanel *Panel;
-  CRecordVector<UInt32> Indices;
-  UString Folder;
   CDataObject *DataObjectSpec;
   CMyComPtr<IDataObject> DataObject;
   
-  bool NeedPostCopy;
-  HRESULT Result;
-  UStringVector Messages;
-
-  CDropSource(): m_Effect(DROPEFFECT_NONE), Panel(NULL), NeedPostCopy(false), Result(S_OK) {}
+  HRESULT DragProcessing_HRESULT;
+  bool DragProcessing_WasFinished;
+
+  CDropSource():
+      m_Effect(DROPEFFECT_NONE),
+      // Panel(NULL),
+      DragProcessing_HRESULT(S_OK),
+      DragProcessing_WasFinished(false)
+      {}
 };
 
-STDMETHODIMP CDropSource::QueryContinueDrag(BOOL escapePressed, DWORD keyState)
+// static bool g_Debug = 0;
+
+
+Z7_COMWF_B CDropSource::QueryContinueDrag(BOOL escapePressed, DWORD keyState)
 {
-  if (escapePressed == TRUE)
-    return DRAGDROP_S_CANCEL;
+  // try {
+
+  /* Determines whether a drag-and-drop operation should be continued, canceled, or completed.
+     escapePressed : Indicates whether the Esc key has been pressed
+       since the previous call to QueryContinueDrag
+       or to DoDragDrop if this is the first call to QueryContinueDrag:
+         TRUE  : the end user has pressed the escape key;
+         FALSE : it has not been pressed.
+     keyState : The current state of the keyboard modifier keys on the keyboard.
+      Possible values can be a combination of any of the flags:
+      MK_CONTROL, MK_SHIFT, MK_ALT, MK_BUTTON, MK_LBUTTON, MK_MBUTTON, and MK_RBUTTON.
+  */
+  #ifdef SHOW_DEBUG_DRAG
+  {
+    AString s ("CDropSource::QueryContinueDrag()");
+    s.Add_Space();
+    s += "keystate=";
+    s.Add_UInt32(keyState);
+    PRF4(s);
+  }
+  #endif
+    
+  /*
   if ((keyState & MK_LBUTTON) == 0)
   {
-    if (m_Effect == DROPEFFECT_NONE)
-      return DRAGDROP_S_CANCEL;
-    Result = S_OK;
-    bool needExtract = NeedExtract;
-    // MoveMode = (((keyState & MK_SHIFT) != 0) && MoveIsAllowed);
-    if (!DataObjectSpec->Path.IsEmpty())
-    {
-      needExtract = false;
-      NeedPostCopy = true;
-    }
-    if (needExtract)
-    {
-      CCopyToOptions options;
-      options.folder = Folder;
+    // PRF4("CDropSource::QueryContinueDrag() (keyState & MK_LBUTTON) == 0");
+    g_Debug = true;
+  }
+  else
+  {
+    // PRF4("CDropSource::QueryContinueDrag() (keyState & MK_LBUTTON) != 0");
+  }
+  */
 
-      // 15.13: fixed problem with mouse cursor for password window.
-      // DoDragDrop() probably calls SetCapture() to some hidden window.
-      // But it's problem, if we show some modal window, like MessageBox.
-      // So we return capture to our window.
-      // If you know better way to solve the problem, please notify 7-Zip developer.
-      
-      // MessageBoxW(*Panel, L"test", L"test", 0);
+  if (escapePressed)
+  {
+    // The drag operation should be canceled with no drop operation occurring.
+    DragProcessing_WasFinished = true;
+    DragProcessing_HRESULT = DRAGDROP_S_CANCEL;
+    return DRAGDROP_S_CANCEL;
+  }
 
-      /* HWND oldHwnd = */ SetCapture(*Panel);
+  if (DragProcessing_WasFinished)
+    return DragProcessing_HRESULT;
 
-      Result = Panel->CopyTo(options, Indices, &Messages);
+  if ((keyState & MK_RBUTTON) != 0)
+  {
+    if (!DataObjectSpec->IsRightButton)
+    {
+      DragProcessing_WasFinished = true;
+      DragProcessing_HRESULT = DRAGDROP_S_CANCEL;
+      return DRAGDROP_S_CANCEL;
+    }
+    return S_OK;
+  }
+  
+  if ((keyState & MK_LBUTTON) != 0)
+  {
+    if (DataObjectSpec->IsRightButton)
+    {
+      DragProcessing_WasFinished = true;
+      DragProcessing_HRESULT = DRAGDROP_S_CANCEL;
+      return DRAGDROP_S_CANCEL;
+    }
+    /* The drag operation should continue. This result occurs if no errors are detected,
+       the mouse button starting the drag-and-drop operation has not been released,
+       and the Esc key has not been detected. */
+    return S_OK;
+  }
+  {
+    // the mouse button starting the drag-and-drop operation has been released.
+    
+    /* Win10 probably calls DragOver()/GiveFeedback() just before LBUTTON releasing.
+       so m_Effect is effect returned by DropTarget::DragOver()
+       just before LBUTTON releasing.
+       So here we can use Effect sent to last GiveFeedback() */
 
-      // do we need to restore capture?
-      // ReleaseCapture();
-      // oldHwnd = SetCapture(oldHwnd);
+    if (m_Effect == DROPEFFECT_NONE)
+    {
+      DragProcessing_WasFinished = true;
+      DragProcessing_HRESULT = DRAGDROP_S_CANCEL;
+      // Drop target cannot accept the data. So we cancel drag and drop
+      // maybe return DRAGDROP_S_DROP also OK here ?
+      // return DRAGDROP_S_DROP; // for debug
+      return DRAGDROP_S_CANCEL;
+    }
 
-      if (Result != S_OK || !Messages.IsEmpty())
-        return DRAGDROP_S_CANCEL;
+    // we switch to real names for items that will be created in temp folder
+    DataObjectSpec->UsePreGlobal = false;
+    DataObjectSpec->Copy_HRESULT = S_OK;
+    // MoveMode = (((keyState & MK_SHIFT) != 0) && MoveIsAllowed);
+    /*
+    if (DataObjectSpec->IsRightButton)
+      return DRAGDROP_S_DROP;
+    */
+   
+    if (DataObjectSpec->IsTempFiles)
+    {
+      if (!DataObjectSpec->DestDirPrefix_FromTarget.IsEmpty())
+      {
+        /* we know the destination Path.
+           So we can copy or extract items later in Source with simpler code. */
+        DataObjectSpec->DoNotProcessInTarget = true;
+        // return DRAGDROP_S_CANCEL;
+      }
+      else
+      {
+        DataObjectSpec->NeedCall_Copy = true;
+        /*
+        if (Copy_HRESULT != S_OK || !Messages.IsEmpty())
+        {
+          DragProcessing_WasFinished = true;
+          DragProcessing_HRESULT = DRAGDROP_S_CANCEL;
+          return DRAGDROP_S_CANCEL;
+        }
+        */
+      }
     }
+    DragProcessing_HRESULT = DRAGDROP_S_DROP;
+    DragProcessing_WasFinished = true;
     return DRAGDROP_S_DROP;
   }
-  return S_OK;
+  // } catch(...) { return E_FAIL; }
 }
 
-STDMETHODIMP CDropSource::GiveFeedback(DWORD effect)
+
+Z7_COMWF_B CDropSource::GiveFeedback(DWORD effect)
 {
+  // PRF3("CDropSource::GiveFeedback");
+  /* Enables a source application to give visual feedback to the end user
+     during a drag-and-drop operation by providing the DoDragDrop function
+     with an enumeration value specifying the visual effect.
+  in (effect):
+     The DROPEFFECT value returned by the most recent call to
+        IDropTarget::DragEnter,
+        IDropTarget::DragOver,
+     or DROPEFFECT_NONE after IDropTarget::DragLeave.
+    0: DROPEFFECT_NONE
+    1: DROPEFFECT_COPY
+    2: DROPEFFECT_MOVE
+    4: DROPEFFECT_LINK
+    0x80000000: DROPEFFECT_SCROLL
+    The dwEffect parameter can include DROPEFFECT_SCROLL, indicating that the
+    source should put up the drag-scrolling variation of the appropriate pointer.
+  */
   m_Effect = effect;
+
+ #ifdef SHOW_DEBUG_DRAG
+  AString w ("GiveFeedback effect=");
+  if (effect & DROPEFFECT_SCROLL)
+    w += " SCROLL ";
+  w.Add_UInt32(effect & ~DROPEFFECT_SCROLL);
+  // if (g_Debug)
+  PRF4(w);
+ #endif
+
+  /* S_OK : no special drag and drop cursors.
+            Maybe it's for case where we created custom custom cursors.
+     DRAGDROP_S_USEDEFAULTCURSORS: Indicates successful completion of the method,
+       and requests OLE to update the cursor using the OLE-provided default cursors. */
+  // return S_OK; // for debug
   return DRAGDROP_S_USEDEFAULTCURSORS;
 }
 
+
+
+/*
+static bool Global_SetUInt32(NMemory::CGlobal &hg, const UInt32 v)
+{
+  if (!hg.Alloc(GHND | GMEM_SHARE, sizeof(v)))
+    return false;
+  NMemory::CGlobalLock dropLock(hg);
+  *(UInt32 *)dropLock.GetPointer() = v;
+  return true;
+}
+*/
+
 static bool CopyNamesToHGlobal(NMemory::CGlobal &hgDrop, const UStringVector &names)
 {
   size_t totalLen = 1;
@@ -255,14 +1432,14 @@ static bool CopyNamesToHGlobal(NMemory::CGlobal &hgDrop, const UStringVector &na
     unsigned i;
     for (i = 0; i < names.Size(); i++)
       namesA.Add(GetSystemString(names[i]));
-    for (i = 0; i < names.Size(); i++)
+    for (i = 0; i < namesA.Size(); i++)
       totalLen += namesA[i].Len() + 1;
     
     if (!hgDrop.Alloc(GHND | GMEM_SHARE, totalLen * sizeof(CHAR) + sizeof(DROPFILES)))
       return false;
     
     NMemory::CGlobalLock dropLock(hgDrop);
-    DROPFILES* dropFiles = (DROPFILES*)dropLock.GetPointer();
+    DROPFILES *dropFiles = (DROPFILES *)dropLock.GetPointer();
     if (!dropFiles)
       return false;
     dropFiles->fNC = FALSE;
@@ -270,11 +1447,11 @@ static bool CopyNamesToHGlobal(NMemory::CGlobal &hgDrop, const UStringVector &na
     dropFiles->pt.y = 0;
     dropFiles->pFiles = sizeof(DROPFILES);
     dropFiles->fWide = FALSE;
-    CHAR *p = (CHAR *)((BYTE *)dropFiles + sizeof(DROPFILES));
-    for (i = 0; i < names.Size(); i++)
+    CHAR *p = (CHAR *) (void *) ((BYTE *)dropFiles + sizeof(DROPFILES));
+    for (i = 0; i < namesA.Size(); i++)
     {
       const AString &s = namesA[i];
-      unsigned fullLen = s.Len() + 1;
+      const unsigned fullLen = s.Len() + 1;
       MyStringCopy(p, (const char *)s);
       p += fullLen;
       totalLen -= fullLen;
@@ -292,9 +1469,13 @@ static bool CopyNamesToHGlobal(NMemory::CGlobal &hgDrop, const UStringVector &na
       return false;
     
     NMemory::CGlobalLock dropLock(hgDrop);
-    DROPFILES* dropFiles = (DROPFILES*)dropLock.GetPointer();
+    DROPFILES *dropFiles = (DROPFILES *)dropLock.GetPointer();
     if (!dropFiles)
       return false;
+    /* fNC:
+        TRUE  : pt specifies the screen coordinates of a point in a window's nonclient area.
+        FALSE : pt specifies the client coordinates of a point in the client area.
+    */
     dropFiles->fNC = FALSE;
     dropFiles->pt.x = 0;
     dropFiles->pt.y = 0;
@@ -304,38 +1485,74 @@ static bool CopyNamesToHGlobal(NMemory::CGlobal &hgDrop, const UStringVector &na
     for (i = 0; i < names.Size(); i++)
     {
       const UString &s = names[i];
-      unsigned fullLen = s.Len() + 1;
+      const unsigned fullLen = s.Len() + 1;
       MyStringCopy(p, (const WCHAR *)s);
       p += fullLen;
       totalLen -= fullLen;
     }
     *p = 0;
   }
+  // if (totalLen != 1) return false;
   return true;
 }
 
-void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
+
+void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */, bool isRightButton)
 {
+  PRF("CPanel::OnDrag");
   if (!DoesItSupportOperations())
     return;
 
   CDisableTimerProcessing disableTimerProcessing2(*this);
   
   CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
+  Get_ItemIndices_Operated(indices);
   if (indices.Size() == 0)
     return;
 
   // CSelectedState selState;
   // SaveSelectedState(selState);
 
-  // FString dirPrefix2;
-  FString dirPrefix;
+  const bool isFSFolder = IsFSFolder();
+  // why we don't allow drag with rightButton from archive?
+  if (!isFSFolder && isRightButton)
+    return;
+
+  UString dirPrefix;
   CTempDir tempDirectory;
 
-  bool isFSFolder = IsFSFolder();
+  CDataObject *dataObjectSpec = new CDataObject;
+  CMyComPtr<IDataObject> dataObject = dataObjectSpec;
+  dataObjectSpec->IsRightButton = isRightButton;
+
+  {
+    /* we can change confirmation mode and another options.
+       Explorer target requests that FILEOP_FLAGS value. */
+    /*
+    const FILEOP_FLAGS fopFlags =
+        FOF_NOCONFIRMATION
+      | FOF_NOCONFIRMMKDIR
+      | FOF_NOERRORUI
+      | FOF_SILENT;
+      // | FOF_SIMPLEPROGRESS; // it doesn't work as expected in Win10
+    Global_SetUInt32(dataObjectSpec->m_hGlobal_FileOpFlags, fopFlags);
+    // dataObjectSpec->m_hGlobal_FileOpFlags.Free(); // for debug : disable these options
+    */
+  }
+  {
+    /* we can change Preferred DropEffect.
+       Explorer target requests that FILEOP_FLAGS value. */
+    /*
+    const DWORD effect = DROPEFFECT_MOVE; // DROPEFFECT_COPY;
+    Global_SetUInt32(dataObjectSpec->m_hGlobal_PreferredDropEffect, effect);
+    */
+  }
   if (isFSFolder)
-    dirPrefix = us2fs(GetFsPath());
+  {
+    dirPrefix = GetFsPath(); // why this in 22.01 ?
+    dataObjectSpec->UsePreGlobal = false;
+    // dataObjectSpec->IsTempFiles = false;
+  }
   else
   {
     if (!tempDirectory.Create(kTempDirPrefix))
@@ -343,23 +1560,32 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
       MessageBox_Error(L"Can't create temp folder");
       return;
     }
-    dirPrefix = tempDirectory.GetPath();
-    // dirPrefix2 = dirPrefix;
+    dirPrefix = fs2us(tempDirectory.GetPath());
+    {
+      UStringVector names;
+      names.Add(dirPrefix);
+      dataObjectSpec->IsTempFiles = true;
+      dataObjectSpec->UsePreGlobal = true;
+      if (!CopyNamesToHGlobal(dataObjectSpec->m_hGlobal_HDROP_Pre, names))
+        return;
+    }
     NFile::NName::NormalizeDirPathPrefix(dirPrefix);
+    /*
+    {
+      FString path2 = dirPrefix;
+      path2 += "1.txt";
+      CopyFileW(L"C:\\1\\1.txt", path2, FALSE);
+    }
+    */
   }
 
-  CDataObject *dataObjectSpec = new CDataObject;
-  CMyComPtr<IDataObject> dataObject = dataObjectSpec;
-
   {
     UStringVector names;
-
     // names variable is     USED for drag and drop from 7-zip to Explorer or to 7-zip archive folder.
     // names variable is NOT USED for drag and drop from 7-zip to 7-zip File System folder.
-
     FOR_VECTOR (i, indices)
     {
-      UInt32 index = indices[i];
+      const UInt32 index = indices[i];
       UString s;
       if (isFSFolder)
         s = GetItemRelPath(index);
@@ -370,14 +1596,12 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
         // We use (keepAndReplaceEmptyPrefixes = true) in CAgentFolder::Extract
         // So the following code is not required.
         // Maybe we also can change IFolder interface and send some flag also.
-  
         if (s.IsEmpty())
         {
           // Correct_FsFile_Name("") returns "_".
           // If extracting code removes empty folder prefixes from path (as it was in old version),
           // Explorer can't find "_" folder in temp folder.
           // We can ask Explorer to copy parent temp folder "7zE" instead.
-
           names.Clear();
           names.Add(dirPrefix2);
           break;
@@ -385,18 +1609,18 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
         */
         s = Get_Correct_FsFile_Name(s);
       }
-      names.Add(fs2us(dirPrefix) + s);
+      names.Add(dirPrefix + s);
     }
-    if (!CopyNamesToHGlobal(dataObjectSpec->hGlobal, names))
+    if (!CopyNamesToHGlobal(dataObjectSpec->m_hGlobal_HDROP_Final, names))
       return;
   }
-
+  
   CDropSource *dropSourceSpec = new CDropSource;
   CMyComPtr<IDropSource> dropSource = dropSourceSpec;
-  dropSourceSpec->NeedExtract = !isFSFolder;
-  dropSourceSpec->Panel = this;
-  dropSourceSpec->Indices = indices;
-  dropSourceSpec->Folder = fs2us(dirPrefix);
+  dataObjectSpec->Panel = this;
+  dataObjectSpec->Indices = indices;
+  dataObjectSpec->SrcDirPrefix_Temp = dirPrefix;
+
   dropSourceSpec->DataObjectSpec = dataObjectSpec;
   dropSourceSpec->DataObject = dataObjectSpec;
 
@@ -404,17 +1628,17 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
   /*
   CTime - file creation timestamp.
   There are two operations in Windows with Drag and Drop:
-    COPY_OPERATION - icon with    Plus sign - CTime will be set as current_time.
-    MOVE_OPERATION - icon without Plus sign - CTime will be preserved
+    COPY_OPERATION : icon with    Plus sign : CTime will be set as current_time.
+    MOVE_OPERATION : icon without Plus sign : CTime will be preserved.
 
   Note: if we call DoDragDrop() with (effectsOK = DROPEFFECT_MOVE), then
-        it will use MOVE_OPERATION and CTime will be preserved.
-        But MoveFile() function doesn't preserve CTime, if different volumes are used.
-        Why it's so?
-        Does DoDragDrop() use some another function (not MoveFile())?
+    it will use MOVE_OPERATION and CTime will be preserved.
+    But MoveFile() function doesn't preserve CTime, if different volumes are used.
+    Why it's so?
+    Does DoDragDrop() use some another function (not MoveFile())?
 
   if (effectsOK == DROPEFFECT_COPY) it works as COPY_OPERATION
-    
+   
   if (effectsOK == DROPEFFECT_MOVE) drag works as MOVE_OPERATION
 
   if (effectsOK == (DROPEFFECT_COPY | DROPEFFECT_MOVE))
@@ -431,7 +1655,7 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
   We want to use MOVE_OPERATION for extracting from archive (open in 7-Zip) to Explorer:
   It has the following advantages:
     1) it uses fast MOVE_OPERATION instead of slow COPY_OPERATION and DELETE, if same volume.
-    2) it preserved CTime
+    2) it preserves CTime
 
   Some another programs support only COPY_OPERATION.
   So we can use (DROPEFFECT_COPY | DROPEFFECT_MOVE)
@@ -444,252 +1668,401 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
     IDropSource *dropSource
     IDataObject *dataObject
   if DropTarget is 7-Zip window, then 7-Zip's
-    IDropTarget::DragOver() sets Path in IDataObject.
+    IDropTarget::DragOver() sets DestDirPrefix_FromTarget in IDataObject.
   and
-    IDropSource::QueryContinueDrag() sets NeedPostCopy, if Path is not epmty.
+    IDropSource::QueryContinueDrag() sets DoNotProcessInTarget, if DestDirPrefix_FromTarget is not empty.
   So we can detect destination path after DoDragDrop().
   Now we don't know any good way to detect destination path for D&D to Explorer.
   */
 
-  bool moveIsAllowed = isFSFolder;
   /*
   DWORD effectsOK = DROPEFFECT_COPY;
   if (moveIsAllowed)
     effectsOK |= DROPEFFECT_MOVE;
   */
-
-  // 18.04: was changed
-  DWORD effectsOK = DROPEFFECT_MOVE | DROPEFFECT_COPY;
-
-  DWORD effect;
+  const bool moveIsAllowed = isFSFolder;
   _panelCallback->DragBegin();
-  
-  HRESULT res = DoDragDrop(dataObject, dropSource, effectsOK, &effect);
-  
+  PRF("=== DoDragDrop()");
+  DWORD effect = 0;
+  // 18.04: was changed
+  const DWORD effectsOK = DROPEFFECT_MOVE | DROPEFFECT_COPY;
+  // effectsOK |= (1 << 8); // for debug
+  HRESULT res = ::DoDragDrop(dataObject, dropSource, effectsOK, &effect);
+  PRF("=== After DoDragDrop()");
   _panelCallback->DragEnd();
-  bool canceled = (res == DRAGDROP_S_CANCEL);
+
+  /*
+    Win10 drag and drop to Explorer:
+      DoDragDrop() output variables:
+       for MOVE operation:
+       {
+         effect == DROPEFFECT_NONE;
+         dropSourceSpec->m_PerformedDropEffect == DROPEFFECT_MOVE;
+       }
+       for COPY operation:
+       {
+         effect == DROPEFFECT_COPY;
+         dropSourceSpec->m_PerformedDropEffect == DROPEFFECT_COPY;
+       }
+    DOCs: The source inspects the two values that can be returned by the target.
+       If both are set to DROPEFFECT_MOVE, it completes the unoptimized move
+       by deleting the original data. Otherwise, the target did an optimized
+       move and the original data has been deleted.
+
+    We didn't see "unoptimized move" case (two values of DROPEFFECT_MOVE),
+    where we still need to delete source files.
+    So we don't delete files after DoDragDrop().
+
+    Also DOCs say for "optimized move":
+      The target also calls the data object's IDataObject::SetData method and passes
+      it a CFSTR_PERFORMEDDROPEFFECT format identifier set to DROPEFFECT_NONE.
+    but actually in Win10 we always have
+      (dropSourceSpec->m_PerformedDropEffect == DROPEFFECT_MOVE)
+    for any MOVE operation.
+  */
+
+  const bool canceled = (res == DRAGDROP_S_CANCEL);
   
   CDisableNotify disableNotify(*this);
   
   if (res == DRAGDROP_S_DROP)
   {
-    res = dropSourceSpec->Result;
-    if (dropSourceSpec->NeedPostCopy)
-      if (!dataObjectSpec->Path.IsEmpty())
+    /* DRAGDROP_S_DROP is returned. It means that
+         - IDropTarget::Drop() was called,
+         - IDropTarget::Drop() returned (ret_code >= 0)
+    */
+    res = dataObjectSpec->Copy_HRESULT;
+    bool need_Process = dataObjectSpec->DoNotProcessInTarget;
+    if (dataObjectSpec->m_Transfer_WasSet)
+    {
+      if (dataObjectSpec->m_Transfer.Target.FuncType == k_DragTargetMode_Drop_End)
+      {
+        if (dataObjectSpec->m_Transfer.Target.Flags & k_TargetFlags_MustBeProcessedBySource)
+          need_Process = true;
+      }
+    }
+
+    if (need_Process)
+      if (!dataObjectSpec->DestDirPrefix_FromTarget.IsEmpty())
       {
-        NFile::NName::NormalizeDirPathPrefix(dataObjectSpec->Path);
+        if (!NFile::NName::IsAltStreamPrefixWithColon(dataObjectSpec->DestDirPrefix_FromTarget))
+          NFile::NName::NormalizeDirPathPrefix(dataObjectSpec->DestDirPrefix_FromTarget);
         CCopyToOptions options;
-        options.folder = dataObjectSpec->Path;
+        options.folder = dataObjectSpec->DestDirPrefix_FromTarget;
         // if MOVE is not allowed, we just use COPY operation
-        options.moveMode = (effect == DROPEFFECT_MOVE && moveIsAllowed);
-        res = CopyTo(options, indices, &dropSourceSpec->Messages);
+        /* it was 7-zip's Target that set non-empty dataObjectSpec->DestDirPrefix_FromTarget.
+           it means that target didn't completed operation,
+           and we can use (effect) value returned by target via DoDragDrop().
+           as indicator of type of operation
+        */
+        // options.moveMode = (moveIsAllowed && effect == DROPEFFECT_MOVE) // before v23.00:
+        options.moveMode = moveIsAllowed;
+        if (moveIsAllowed)
+        {
+          if (dataObjectSpec->m_Transfer_WasSet)
+            options.moveMode = (
+              dataObjectSpec->m_Transfer.Target.Cmd_Effect == DROPEFFECT_MOVE);
+          else
+            options.moveMode = (effect == DROPEFFECT_MOVE);
+            // we expect (DROPEFFECT_MOVE) as indicator of move operation for Drag&Drop MOVE ver 22.01.
+        }
+        res = CopyTo(options, indices, &dataObjectSpec->Messages);
       }
     /*
-    if (effect == DROPEFFECT_MOVE)
+    if (effect & DROPEFFECT_MOVE)
       RefreshListCtrl(selState);
     */
   }
   else
   {
     // we ignore E_UNEXPECTED that is returned if we drag file to printer
-    if (res != DRAGDROP_S_CANCEL && res != S_OK
+    if (res != DRAGDROP_S_CANCEL
+        && res != S_OK
         && res != E_UNEXPECTED)
       MessageBox_Error_HRESULT(res);
-
-    res = dropSourceSpec->Result;
+    res = dataObjectSpec->Copy_HRESULT;
   }
 
-  if (!dropSourceSpec->Messages.IsEmpty())
+  if (!dataObjectSpec->Messages.IsEmpty())
   {
     CMessagesDialog messagesDialog;
-    messagesDialog.Messages = &dropSourceSpec->Messages;
+    messagesDialog.Messages = &dataObjectSpec->Messages;
     messagesDialog.Create((*this));
   }
   
   if (res != S_OK && res != E_ABORT)
   {
-    // we restore Notify before MessageBox_Error_HRESULT. So we will se files selection
+    // we restore Notify before MessageBox_Error_HRESULT. So we will see files selection
     disableNotify.Restore();
     // SetFocusToList();
     MessageBox_Error_HRESULT(res);
   }
-  if (res == S_OK && dropSourceSpec->Messages.IsEmpty() && !canceled)
+  if (res == S_OK && dataObjectSpec->Messages.IsEmpty() && !canceled)
     KillSelection();
 }
 
-void CDropTarget::QueryGetData(IDataObject *dataObject)
+
+
+
+
+CDropTarget::CDropTarget():
+      m_IsRightButton(false),
+      m_GetTransfer_WasSuccess(false),
+      m_DropIsAllowed(false),
+      m_PanelDropIsAllowed(false),
+      // m_DropHighlighted_SelectionIndex(-1),
+      // m_SubFolderIndex(-1),
+      m_Panel(NULL),
+      m_IsAppTarget(false),
+      m_TargetPath_WasSent_ToDataObject(false),
+      m_TargetPath_NonEmpty_WasSent_ToDataObject(false),
+      m_Transfer_WasSent_ToDataObject(false),
+      App(NULL),
+      SrcPanelIndex(-1),
+      TargetPanelIndex(-1)
+{
+  m_Format_7zip_SetTargetFolder = RegisterClipboardFormat(k_Format_7zip_SetTargetFolder);
+  m_Format_7zip_SetTransfer     = RegisterClipboardFormat(k_Format_7zip_SetTransfer);
+  m_Format_7zip_GetTransfer     = RegisterClipboardFormat(k_Format_7zip_GetTransfer);
+
+  m_ProcessId = GetCurrentProcessId();
+  // m_TransactionId = ((UInt64)m_ProcessId << 32) + 1;
+  // ClearState();
+}
+
+// clear internal state
+void CDropTarget::ClearState()
+{
+  m_DataObject.Release();
+  m_SourcePaths.Clear();
+
+  m_IsRightButton = false;
+
+  m_GetTransfer_WasSuccess = false;
+  m_DropIsAllowed = false;
+
+  m_PanelDropIsAllowed = false;
+  // m_SubFolderIndex = -1;
+  // m_DropHighlighted_SubFolderName.Empty();
+  m_Panel = NULL;
+  m_IsAppTarget = false;
+  m_TargetPath_WasSent_ToDataObject = false;
+  m_TargetPath_NonEmpty_WasSent_ToDataObject = false;
+  m_Transfer_WasSent_ToDataObject = false;
+}
+
+/*
+  IDataObject::QueryGetData() Determines whether the data object is capable of
+  rendering the data as specified. Objects attempting a paste or drop
+  operation can call this method before calling IDataObject::GetData
+  to get an indication of whether the operation may be successful.
+  
+  The client of a data object calls QueryGetData to determine whether
+  passing the specified FORMATETC structure to a subsequent call to
+  IDataObject::GetData is likely to be successful.
+
+  We check Try_QueryGetData with CF_HDROP
+*/
+/*
+void CDropTarget::Try_QueryGetData(IDataObject *dataObject)
 {
   FORMATETC etc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
   m_DropIsAllowed = (dataObject->QueryGetData(&etc) == S_OK);
-
 }
+*/
 
-static void MySetDropHighlighted(HWND hWnd, int index, bool enable)
+static void ListView_SetItemState_DropHighlighted(
+    NControl::CListView &listView, int index, bool highlighted)
 {
+  // LVIS_DROPHILITED : The item is highlighted as a drag-and-drop target
+  /*
   LVITEM item;
   item.mask = LVIF_STATE;
   item.iItem = index;
   item.iSubItem = 0;
   item.state = enable ? LVIS_DROPHILITED : 0;
   item.stateMask = LVIS_DROPHILITED;
-  item.pszText = 0;
-  ListView_SetItem(hWnd, &item);
+  item.pszText = NULL;
+  listView.SetItem(&item);
+  */
+  listView.SetItemState(index, highlighted ? LVIS_DROPHILITED : 0, LVIS_DROPHILITED);
 }
 
+// Removes DropHighlighted state in ListView item, if it was set before
 void CDropTarget::RemoveSelection()
 {
-  if (m_SelectionIndex >= 0 && m_Panel)
-    MySetDropHighlighted(m_Panel->_listView, m_SelectionIndex, false);
-  m_SelectionIndex = -1;
+  if (m_Panel)
+  {
+    m_Panel->m_DropHighlighted_SubFolderName.Empty();
+    if (m_Panel->m_DropHighlighted_SelectionIndex >= 0)
+    {
+      ListView_SetItemState_DropHighlighted(m_Panel->_listView,
+          m_Panel->m_DropHighlighted_SelectionIndex, false);
+      m_Panel->m_DropHighlighted_SelectionIndex = -1;
+    }
+  }
 }
 
 #ifdef UNDER_CE
 #define ChildWindowFromPointEx(hwndParent, pt, uFlags) ChildWindowFromPoint(hwndParent, pt)
 #endif
 
-void CDropTarget::PositionCursor(POINTL ptl)
-{
-  m_SubFolderIndex = -1;
-  POINT pt;
-  pt.x = ptl.x;
-  pt.y = ptl.y;
 
+/*
+   PositionCursor() function sets m_Panel under cursor drop, and
+   m_SubFolderIndex/m_DropHighlighted_SubFolderName, if drop to some folder in Panel list.
+*/
+/*
+PositionCursor() uses as input variables:
+  m_DropIsAllowed must be set before PositionCursor()
+  if (m_DropHighlighted_SelectionIndex >= 0 && m_Panel) it uses m_Panel and removes previous selection
+PositionCursor() sets
+  m_PanelDropIsAllowed
+  m_Panel
+  m_IsAppTarget
+  m_SubFolderIndex
+  m_DropHighlighted_SubFolderName
+  m_DropHighlighted_SelectionIndex
+*/
+void CDropTarget::PositionCursor(const POINTL &ptl)
+{
   RemoveSelection();
+
+  // m_SubFolderIndex = -1;
+  // m_DropHighlighted_SubFolderName.Empty();
   m_IsAppTarget = true;
   m_Panel = NULL;
+  m_PanelDropIsAllowed = false;
 
-  m_PanelDropIsAllowed = true;
   if (!m_DropIsAllowed)
     return;
+
+  POINT pt;
+  pt.x = ptl.x;
+  pt.y = ptl.y;
   {
     POINT pt2 = pt;
-    App->_window.ScreenToClient(&pt2);
-    for (unsigned i = 0; i < kNumPanelsMax; i++)
-      if (App->IsPanelVisible(i))
-        if (App->Panels[i].IsEnabled())
-          if (ChildWindowFromPointEx(App->_window, pt2,
-              CWP_SKIPINVISIBLE | CWP_SKIPDISABLED) == (HWND)App->Panels[i])
+    if (App->_window.ScreenToClient(&pt2))
+      for (unsigned i = 0; i < kNumPanelsMax; i++)
+        if (App->IsPanelVisible(i))
+        {
+          CPanel *panel = &App->Panels[i];
+          if (panel->IsEnabled())
+          if (::ChildWindowFromPointEx(App->_window, pt2,
+              CWP_SKIPINVISIBLE | CWP_SKIPDISABLED) == (HWND)*panel)
           {
-            m_Panel = &App->Panels[i];
+            m_Panel = panel;
             m_IsAppTarget = false;
             if ((int)i == SrcPanelIndex)
-            {
-              m_PanelDropIsAllowed = false;
-              return;
-            }
+              return; // we don't allow to drop to source panel
             break;
           }
-    if (m_IsAppTarget)
-    {
-      if (TargetPanelIndex >= 0)
-        m_Panel = &App->Panels[TargetPanelIndex];
-      return;
-    }
+        }
+  }
+
+  m_PanelDropIsAllowed = true;
+
+  if (!m_Panel)
+  {
+    if (TargetPanelIndex >= 0)
+      m_Panel = &App->Panels[TargetPanelIndex];
+    // we don't need to find item in panel
+    return;
   }
 
+  // we will try to find and highlight drop folder item in listView under cursor
   /*
   m_PanelDropIsAllowed = m_Panel->DoesItSupportOperations();
   if (!m_PanelDropIsAllowed)
     return;
   */
-
+  /* now we don't allow drop to subfolder under cursor, if dest panel is archive.
+     Another code must be fixed for that case, where we must use m_SubFolderIndex/m_DropHighlighted_SubFolderName */
   if (!m_Panel->IsFsOrPureDrivesFolder())
     return;
 
-  if (WindowFromPoint(pt) != (HWND)m_Panel->_listView)
+  if (::WindowFromPoint(pt) != (HWND)m_Panel->_listView)
     return;
 
   LVHITTESTINFO info;
   m_Panel->_listView.ScreenToClient(&pt);
   info.pt = pt;
-  int index = ListView_HitTest(m_Panel->_listView, &info);
+  const int index = ListView_HitTest(m_Panel->_listView, &info);
   if (index < 0)
     return;
-  int realIndex = m_Panel->GetRealItemIndex(index);
+  const unsigned realIndex = m_Panel->GetRealItemIndex(index);
   if (realIndex == kParentIndex)
     return;
   if (!m_Panel->IsItem_Folder(realIndex))
     return;
-  m_SubFolderIndex = realIndex;
-  m_SubFolderName = m_Panel->GetItemName(m_SubFolderIndex);
-  MySetDropHighlighted(m_Panel->_listView, index, true);
-  m_SelectionIndex = index;
+  // m_SubFolderIndex = (int)realIndex;
+  m_Panel->m_DropHighlighted_SubFolderName = m_Panel->GetItemName(realIndex);
+  ListView_SetItemState_DropHighlighted(m_Panel->_listView, index, true);
+  m_Panel->m_DropHighlighted_SelectionIndex = index;
 }
 
-bool CDropTarget::IsFsFolderPath() const
-{
-  if (!m_IsAppTarget && m_Panel)
-    return (m_Panel->IsFSFolder() || (m_Panel->IsFSDrivesFolder() && m_SelectionIndex >= 0));
-  return false;
-}
 
-static void ReadUnicodeStrings(const wchar_t *p, size_t size, UStringVector &names)
+/* returns true, if !m_IsAppTarget
+   and target is FS folder or altStream folder
+*/
+
+UInt32 CDropTarget::GetFolderType() const
 {
-  names.Clear();
-  UString name;
-  for (;size > 0; size--)
-  {
-    wchar_t c = *p++;
-    if (c == 0)
-    {
-      if (name.IsEmpty())
-        break;
-      names.Add(name);
-      name.Empty();
-    }
-    else
-      name += c;
-  }
+  if (m_IsAppTarget || !m_Panel)
+    return k_FolderType_None;
+  if (m_Panel->IsFSFolder() ||
+      (m_Panel->IsFSDrivesFolder()
+       && m_Panel->m_DropHighlighted_SelectionIndex >= 0))
+    return k_FolderType_Fs;
+  if (m_Panel->IsAltStreamsFolder())
+    return k_FolderType_AltStreams;
+  if (m_Panel->IsArcFolder())
+    return k_FolderType_Archive;
+  return k_FolderType_Unknown;
 }
 
-static void ReadAnsiStrings(const char *p, size_t size, UStringVector &names)
+bool CDropTarget::IsFsFolderPath() const
 {
-  names.Clear();
-  AString name;
-  for (;size > 0; size--)
-  {
-    char c = *p++;
-    if (c == 0)
-    {
-      if (name.IsEmpty())
-        break;
-      names.Add(GetUnicodeString(name));
-      name.Empty();
-    }
-    else
-      name += c;
-  }
+  if (m_IsAppTarget || !m_Panel)
+    return false;
+  if (m_Panel->IsFSFolder())
+    return true;
+  if (m_Panel->IsAltStreamsFolder())
+    return true;
+  return m_Panel->IsFSDrivesFolder() &&
+      m_Panel->m_DropHighlighted_SelectionIndex >= 0;
 }
 
-static void GetNamesFromDataObject(IDataObject *dataObject, UStringVector &names)
+
+#define INIT_FORMATETC_HGLOBAL(type) { (type), NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }
+
+static bool DataObject_GetData_GetTransfer(IDataObject *dataObject,
+    UINT a_Format_7zip_GetTransfer, CDataObject_GetTransfer &transfer)
 {
-  names.Clear();
-  FORMATETC etc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-  STGMEDIUM medium;
-  HRESULT res = dataObject->GetData(&etc, &medium);
+  FORMATETC etc = INIT_FORMATETC_HGLOBAL((CLIPFORMAT)a_Format_7zip_GetTransfer);
+  NCOM::CStgMedium medium;
+  const HRESULT res = dataObject->GetData(&etc, &medium);
   if (res != S_OK)
-    return;
+    return false;
   if (medium.tymed != TYMED_HGLOBAL)
-    return;
-  {
-    NMemory::CGlobal global;
-    global.Attach(medium.hGlobal);
-    size_t blockSize = GlobalSize(medium.hGlobal);
-    NMemory::CGlobalLock dropLock(medium.hGlobal);
-    const DROPFILES* dropFiles = (DROPFILES*)dropLock.GetPointer();
-    if (!dropFiles)
-      return;
-    if (blockSize < dropFiles->pFiles)
-      return;
-    size_t size = blockSize - dropFiles->pFiles;
-    const void *namesData = (const Byte *)dropFiles + dropFiles->pFiles;
-    if (dropFiles->fWide)
-      ReadUnicodeStrings((const wchar_t *)namesData, size / sizeof(wchar_t), names);
-    else
-      ReadAnsiStrings((const char *)namesData, size, names);
-  }
+    return false;
+  const size_t size = GlobalSize(medium.hGlobal);
+  if (size < sizeof(transfer))
+    return false;
+  NMemory::CGlobalLock dropLock(medium.hGlobal);
+  const CDataObject_GetTransfer *t = (const CDataObject_GetTransfer *)dropLock.GetPointer();
+  if (!t)
+    return false;
+  if (!t->Check()) // isSetData
+    return false;
+  transfer = *t;
+  return true;
 }
 
+/*
+  returns true, if all m_SourcePaths[] items are same drive
+  as destination drop path in m_Panel
+*/
 bool CDropTarget::IsItSameDrive() const
 {
   if (!m_Panel)
@@ -705,9 +2078,10 @@ bool CDropTarget::IsItSameDrive() const
     if (drive.IsEmpty())
       return false;
   }
-  else if (m_Panel->IsFSDrivesFolder() && m_SelectionIndex >= 0)
+  else if (m_Panel->IsFSDrivesFolder()
+      && m_Panel->m_DropHighlighted_SelectionIndex >= 0)
   {
-    drive = m_SubFolderName;
+    drive = m_Panel->m_DropHighlighted_SubFolderName;
     drive.Add_PathSepar();
   }
   else
@@ -721,16 +2095,18 @@ bool CDropTarget::IsItSameDrive() const
     if (!m_SourcePaths[i].IsPrefixedBy_NoCase(drive))
       return false;
   }
-  
   return true;
 }
 
 
 /*
   There are 2 different actions, when we drag to 7-Zip:
-  1) Drag from any external program except of Explorer to "7-Zip" FS folder.
-     We want to create new archive for that operation.
-  2) all another operation work as usual file COPY/MOVE
+  1) if target panel is "7-Zip" FS and any of the 2 cases:
+     - Drag from any non "7-Zip" program;
+     or
+     - Drag from "7-Zip" to non-panel area of "7-Zip".
+     We want to create new archive for that operation with "Add to Archive" window.
+  2) all another operations work as usual file COPY/MOVE
     - Drag from "7-Zip" FS to "7-Zip" FS.
         COPY/MOVE are supported.
     - Drag to open archive in 7-Zip.
@@ -740,217 +2116,891 @@ bool CDropTarget::IsItSameDrive() const
         We replace COPY to MOVE.
 */
 
-DWORD CDropTarget::GetEffect(DWORD keyState, POINTL /* pt */, DWORD allowedEffect)
+// we try to repeat Explorer's effects.
+// out: 0 - means that use default effect
+static DWORD GetEffect_ForKeys(DWORD keyState)
 {
-  if (!m_DropIsAllowed || !m_PanelDropIsAllowed)
-    return DROPEFFECT_NONE;
+  if (keyState & MK_CONTROL)
+  {
+    if (keyState & MK_ALT)
+      return 0;
+    if (keyState & MK_SHIFT)
+      return DROPEFFECT_LINK; // CONTROL + SHIFT
+    return DROPEFFECT_COPY;   // CONTROL
+  }
+  // no CONTROL
+  if (keyState & MK_SHIFT)
+  {
+    if (keyState & MK_ALT)
+      return 0;
+    return DROPEFFECT_MOVE; // SHIFT
+  }
+  // no CONTROL, no SHIFT
+  if (keyState & MK_ALT)
+    return DROPEFFECT_LINK; // ALT
+  return 0;
+}
 
-  if (!IsFsFolderPath() || !m_SetPathIsOK)
-    allowedEffect &= ~DROPEFFECT_MOVE;
 
-  DWORD effect = 0;
-  
-  if (keyState & MK_CONTROL)
-    effect = allowedEffect & DROPEFFECT_COPY;
-  else if (keyState & MK_SHIFT)
-    effect = allowedEffect & DROPEFFECT_MOVE;
-  
+/* GetEffect() uses m_TargetPath_WasSentToDataObject
+   to disale MOVE operation, if Source is not 7-Zip
+*/
+DWORD CDropTarget::GetEffect(DWORD keyState, POINTL /* pt */, DWORD allowedEffect) const
+{
+  // (DROPEFFECT_NONE == 0)
+  if (!m_DropIsAllowed || !m_PanelDropIsAllowed)
+    return 0;
+  if (!IsFsFolderPath() || !m_TargetPath_WasSent_ToDataObject)
+  {
+    // we don't allow MOVE, if Target is archive or Source is not 7-Zip
+    // disabled for debug:
+    // allowedEffect &= ~DROPEFFECT_MOVE;
+  }
+  DWORD effect;
+  {
+    effect = GetEffect_ForKeys(keyState);
+    if (effect == DROPEFFECT_LINK)
+      return 0;
+    effect &= allowedEffect;
+  }
   if (effect == 0)
   {
     if (allowedEffect & DROPEFFECT_COPY)
-    effect = DROPEFFECT_COPY;
+      effect = DROPEFFECT_COPY;
     if (allowedEffect & DROPEFFECT_MOVE)
     {
+      /* MOVE operation can be optimized. So MOVE is preferred way
+         for default action, if Source and Target are at same drive */
       if (IsItSameDrive())
         effect = DROPEFFECT_MOVE;
     }
   }
-  if (effect == 0)
-    return DROPEFFECT_NONE;
   return effect;
 }
 
+
+/* returns:
+    - target folder path prefix, if target is FS folder
+    - empty string, if target is not FS folder
+*/
 UString CDropTarget::GetTargetPath() const
 {
   if (!IsFsFolderPath())
     return UString();
   UString path = m_Panel->GetFsPath();
-  if (m_SubFolderIndex >= 0 && !m_SubFolderName.IsEmpty())
+  if (/* m_SubFolderIndex >= 0 && */
+      !m_Panel->m_DropHighlighted_SubFolderName.IsEmpty())
   {
-    path += m_SubFolderName;
+    path += m_Panel->m_DropHighlighted_SubFolderName;
     path.Add_PathSepar();
   }
   return path;
 }
 
-bool CDropTarget::SetPath(bool enablePath) const
+
+/*
+if IDropSource is Win10-Explorer
+--------------------------------
+  As in MS DOCs:
+  The source inspects the two (effect) values that can be returned by the target:
+    1) SetData(CFSTR_PERFORMEDDROPEFFECT)
+    2) returned value  (*effect) by
+        CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
+        POINTL pt, DWORD *effect)
+  If both are set to DROPEFFECT_MOVE, Explorer completes the unoptimized move by deleting
+  the original data.
+  // Otherwise, the target did an optimized move and the original data has been deleted.
+*/
+
+
+/*
+  Send targetPath from target to dataObject (to Source)
+  input: set (enablePath = false) to send empty path
+  returns true,  if SetData()         returns S_OK : (source is 7-zip)
+  returns false, if SetData() doesn't return  S_OK : (source is Explorer)
+*/
+bool CDropTarget::SendToSource_TargetPath_enable(IDataObject *dataObject, bool enablePath)
 {
-  UINT setFolderFormat = RegisterClipboardFormat(kSvenZipSetFolderFormat);
-  
-  FORMATETC etc = { (CLIPFORMAT)setFolderFormat, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-  STGMEDIUM medium;
-  medium.tymed = etc.tymed;
-  medium.pUnkForRelease = 0;
+  m_TargetPath_NonEmpty_WasSent_ToDataObject = false;
   UString path;
   if (enablePath)
     path = GetTargetPath();
-  size_t size = path.Len() + 1;
-  medium.hGlobal = GlobalAlloc(GHND | GMEM_SHARE, size * sizeof(wchar_t));
+  PRF("CDropTarget::SetPath");
+  PRF_W(path);
+  if (!dataObject || m_Format_7zip_SetTargetFolder == 0)
+    return false;
+  FORMATETC etc = INIT_FORMATETC_HGLOBAL((CLIPFORMAT)m_Format_7zip_SetTargetFolder);
+  STGMEDIUM medium;
+  medium.tymed = etc.tymed;
+  medium.pUnkForRelease = NULL;
+  const size_t num = path.Len() + 1; // + (1 << 19) // for debug
+  medium.hGlobal = GlobalAlloc(GHND | GMEM_SHARE, num * sizeof(wchar_t));
   if (!medium.hGlobal)
     return false;
+  // Sleep(1000);
   wchar_t *dest = (wchar_t *)GlobalLock(medium.hGlobal);
-  if (!dest)
+  // Sleep(1000);
+  bool res = false;
+  if (dest)
+  {
+    MyStringCopy(dest, (const wchar_t *)path);
+    GlobalUnlock(medium.hGlobal);
+    // OutputDebugString("m_DataObject->SetData");
+    const BOOL release = FALSE; // that way is more simple for correct releasing.
+        // TRUE; // for debug : is not good for some cases.
+    /* If DropSource is Win10-Explorer, dataObject->SetData() returns E_NOTIMPL; */
+    const HRESULT hres = dataObject->SetData(&etc, &medium, release);
+    // Sleep(1000);
+    res = (hres == S_OK);
+  }
+
+  ReleaseStgMedium(&medium);
+  if (res && !path.IsEmpty())
+    m_TargetPath_NonEmpty_WasSent_ToDataObject = true;
+  // Sleep(1000);
+  return res;
+}
+
+
+void CDropTarget::SendToSource_auto(IDataObject *dataObject,
+    const CTargetTransferInfo &info)
+{
+  /* we try to send target path to Source.
+     If Source is 7-Zip, then it will accept k_Format_7zip_SetTargetFolder.
+     That sent path will be non-Empty, if this target is FS folder and drop is allowed */
+  bool need_Send = false;
+  if (   info.FuncType == k_DragTargetMode_Enter
+      || info.FuncType == k_DragTargetMode_Over
+      || (info.FuncType == k_DragTargetMode_Drop_Begin
+        // && targetOp_Cmd != NDragMenu::k_None
+        && info.Cmd_Type != NDragMenu::k_Cancel))
+  // if (!g_CreateArchive_for_Drag_from_7zip)
+      need_Send = m_DropIsAllowed && m_PanelDropIsAllowed && IsFsFolderPath();
+  m_TargetPath_WasSent_ToDataObject = SendToSource_TargetPath_enable(dataObject, need_Send);
+  SendToSource_TransferInfo(dataObject, info);
+}
+
+
+bool CDropTarget::SendToSource_TransferInfo(IDataObject *dataObject,
+    const CTargetTransferInfo &info)
+{
+  m_Transfer_WasSent_ToDataObject = false;
+  PRF("CDropTarget::SendToSource_TransferInfo");
+
+  if (!dataObject || m_Format_7zip_SetTransfer == 0)
+    return false;
+  FORMATETC etc = INIT_FORMATETC_HGLOBAL((CLIPFORMAT)m_Format_7zip_SetTransfer);
+  STGMEDIUM medium;
+  medium.tymed = etc.tymed;
+  medium.pUnkForRelease = NULL;
+  CDataObject_SetTransfer transfer;
+  const size_t size = sizeof(transfer); // + (1 << 19) // for debug
+  // OutputDebugString("GlobalAlloc");
+  medium.hGlobal = GlobalAlloc(GHND | GMEM_SHARE, size);
+  // Sleep(1000);
+  if (!medium.hGlobal)
+    return false;
+  // OutputDebugString("GlobalLock");
+  void *dest = (wchar_t *)GlobalLock(medium.hGlobal);
+  // Sleep(1000);
+  bool res = false;
+  if (dest)
   {
+    transfer.Init();
+    transfer.Target = info;
+
+    memcpy(dest, &transfer, sizeof(transfer));
     GlobalUnlock(medium.hGlobal);
+    // OutputDebugString("m_DataObject->SetData");
+    const BOOL release = FALSE; // that way is more simple for correct releasing.
+        // TRUE; // for debug : is not good for some cases
+    const HRESULT hres = dataObject->SetData(&etc, &medium, release);
+    res = (hres == S_OK);
+  }
+
+  ReleaseStgMedium(&medium);
+  if (res)
+    m_Transfer_WasSent_ToDataObject = true;
+  return res;
+}
+
+
+bool CDropTarget::SendToSource_UInt32(IDataObject *dataObject, UINT format, UInt32 value)
+{
+  PRF("CDropTarget::Send_UInt32 (Performed)");
+
+  if (!dataObject || format == 0)
     return false;
+  FORMATETC etc = INIT_FORMATETC_HGLOBAL((CLIPFORMAT)format);
+  STGMEDIUM medium;
+  medium.tymed = etc.tymed;
+  medium.pUnkForRelease = NULL;
+  const size_t size = 4;
+  medium.hGlobal = GlobalAlloc(GHND | GMEM_SHARE, size);
+  if (!medium.hGlobal)
+    return false;
+  void *dest = GlobalLock(medium.hGlobal);
+  bool res = false;
+  if (dest)
+  {
+    *(UInt32 *)dest = value;
+    GlobalUnlock(medium.hGlobal);
+    // OutputDebugString("m_DataObject->SetData");
+    const BOOL release = TRUE;
+        // FALSE; // for debug
+    /* If DropSource is Win10-Explorer, then (release == FALSE) doesn't work
+       and dataObject->SetData() returns E_NOTIMPL;
+       So we use release = TRUE; here */
+    const HRESULT hres = dataObject->SetData(&etc, &medium, release);
+    // we return here without calling ReleaseStgMedium().
+    return (hres == S_OK);
+    // Sleep(1000);
+    /*
+      if (we use release = TRUE), we expect that
+          - SetData() will release medium, and
+          - SetData() will set STGMEDIUM::tymed to (TYMED_NULL = 0).
+      but some "incorrect" SetData() implementations can keep STGMEDIUM::tymed unchanged.
+      And it's not safe to call ReleaseStgMedium() here for that case,
+      because DropSource also could release medium.
+      We can reset (medium.tymed = TYMED_NULL) manually here to disable
+      unsafe medium releasing in ReleaseStgMedium().
+    */
+    /*
+    if (release)
+    {
+      medium.tymed = TYMED_NULL;
+      medium.pUnkForRelease = NULL;
+      medium.hGlobal = NULL;
+    }
+    res = (hres == S_OK);
+    */
   }
-  MyStringCopy(dest, (const wchar_t *)path);
-  GlobalUnlock(medium.hGlobal);
-  bool res = m_DataObject->SetData(&etc, &medium, FALSE) == S_OK;
-  GlobalFree(medium.hGlobal);
+  ReleaseStgMedium(&medium);
   return res;
 }
 
-bool CDropTarget::SetPath()
+
+void CDropTarget::LoadNames_From_DataObject(IDataObject *dataObject)
 {
-  m_SetPathIsOK = SetPath(m_DropIsAllowed && m_PanelDropIsAllowed && IsFsFolderPath());
-  return m_SetPathIsOK;
+  // "\\\\.\\" prefix is possible for long names
+  m_DropIsAllowed = NShell::DataObject_GetData_HDROP_or_IDLIST_Names(dataObject, m_SourcePaths) == S_OK;
 }
 
-STDMETHODIMP CDropTarget::DragEnter(IDataObject * dataObject, DWORD keyState,
-      POINTL pt, DWORD *effect)
+
+Z7_COMWF_B CDropTarget::DragEnter(IDataObject *dataObject, DWORD keyState, POINTL pt, DWORD *effect)
 {
-  GetNamesFromDataObject(dataObject, m_SourcePaths);
-  QueryGetData(dataObject);
+  /* *(effect):
+       - on input  : value of the dwOKEffects parameter of the DoDragDrop() function.
+       - on return : must contain one of the DROPEFFECT flags, which indicates
+                     what the result of the drop operation would be.
+     (pt): the current cursor coordinates in screen coordinates.
+  */
+  PRF_(Print_Point("CDropTarget::DragEnter", keyState, pt, *effect))
+  try {
+
+  if ((keyState & (MK_RBUTTON | MK_MBUTTON)) != 0)
+    m_IsRightButton = true;
+
+  LoadNames_From_DataObject(dataObject);
+  // Try_QueryGetData(dataObject);
+  // we will use (m_DataObject) later in DragOver() and DragLeave().
   m_DataObject = dataObject;
-  return DragOver(keyState, pt, effect);
+  // return DragOver(keyState, pt, effect);
+  PositionCursor(pt);
+  CTargetTransferInfo target;
+  target.FuncType = k_DragTargetMode_Enter;
+  target.KeyState = keyState;
+  target.Point = pt;
+  target.OkEffects = *effect;
+  SendToSource_Drag(target);
+
+  CDataObject_GetTransfer transfer;
+  m_GetTransfer_WasSuccess = DataObject_GetData_GetTransfer(
+      dataObject, m_Format_7zip_GetTransfer, transfer);
+  if (m_GetTransfer_WasSuccess)
+  {
+    if (transfer.Flags & k_SourceFlags_LeftButton)
+      m_IsRightButton = false;
+    else if (transfer.Flags & k_SourceFlags_RightButton)
+      m_IsRightButton = true;
+  }
+
+  *effect = GetEffect(keyState, pt, *effect);
+  return S_OK;
+  } catch(...) { return E_FAIL; }
 }
 
 
-STDMETHODIMP CDropTarget::DragOver(DWORD keyState, POINTL pt, DWORD *effect)
+Z7_COMWF_B CDropTarget::DragOver(DWORD keyState, POINTL pt, DWORD *effect)
 {
+  PRF_(Print_Point("CDropTarget::DragOver", keyState, pt, *effect))
+  /*
+    For efficiency reasons, a data object is not passed in IDropTarget::DragOver.
+    The data object passed in the most recent call to IDropTarget::DragEnter
+    is available and can be used.
+  
+    When IDropTarget::DragOver has completed its operation, the DoDragDrop
+    function calls IDropSource::GiveFeedback so the source application can display
+    the appropriate visual feedback to the user.
+  */
+  /*
+    we suppose that it's unexpected that (keyState) shows that mouse
+    button is not pressed, because such cases will be processed by
+    IDropSource::QueryContinueDrag() that returns DRAGDROP_S_DROP or DRAGDROP_S_CANCEL.
+    So DragOver() will not be called.
+  */
+
+  if ((keyState & MK_LBUTTON) == 0)
+  {
+    PRF4("CDropTarget::DragOver() (keyState & MK_LBUTTON) == 0");
+    // g_Debug = true;
+  }
+
+  try {
+  /* we suppose that source names were not changed after DragEnter()
+     so we don't request GetNames_From_DataObject() for each call of DragOver() */
   PositionCursor(pt);
-  SetPath();
+  CTargetTransferInfo target;
+  target.FuncType = k_DragTargetMode_Over;
+  target.KeyState = keyState;
+  target.Point = pt;
+  target.OkEffects = *effect;
+  SendToSource_Drag(target);
   *effect = GetEffect(keyState, pt, *effect);
+  // *effect = 1 << 8; // for debug
   return S_OK;
+  } catch(...) { return E_FAIL; }
 }
 
 
-STDMETHODIMP CDropTarget::DragLeave()
+Z7_COMWF_B CDropTarget::DragLeave()
 {
+  PRF4("CDropTarget::DragLeave");
+  try {
   RemoveSelection();
-  SetPath(false);
-  m_DataObject.Release();
+  // we send empty TargetPath to 7-Zip Source to clear value of TargetPath that was sent before
+
+  CTargetTransferInfo target;
+  target.FuncType = k_DragTargetMode_Leave;
+  /*
+  target.KeyState = 0;
+  target.Point = pt;
+  pt.x = 0; // -1
+  pt.y = 0; // -1
+  target.Effect = 0;
+  */
+  SendToSource_Drag(target);
+  ClearState();
   return S_OK;
+  } catch(...) { return E_FAIL; }
 }
 
-// We suppose that there was ::DragOver for same POINTL_pt before ::Drop
-// So SetPath() is same as in Drop.
 
-STDMETHODIMP CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
-      POINTL pt, DWORD * effect)
+static unsigned Drag_OnContextMenu(int xPos, int yPos, UInt32 cmdFlags);
+
+/*
+  We suppose that there was DragEnter/DragOver for same (POINTL pt) before Drop().
+  But we can work without DragEnter/DragOver too.
+*/
+Z7_COMWF_B CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
+    POINTL pt, DWORD *effect)
 {
-  QueryGetData(dataObject);
+  PRF_(Print_Point("CDropTarget::Drop", keyState, pt, *effect))
+  /* Drop() is called after SourceDrop::QueryContinueDrag() returned DRAGDROP_S_DROP.
+     So it's possible that Source have done some operations already.
+  */
+  HRESULT hres = S_OK;
+  bool needDrop_by_Source = false;
+  DWORD opEffect = DROPEFFECT_NONE;
+
+  try {
+  // we don't need m_DataObject reference anymore, because we use local (dataObject)
+  m_DataObject.Release();
+
+  /* in normal case : we called LoadNames_From_DataObject() in DragEnter() already.
+     But if by some reason DragEnter() was not called,
+     we need to call LoadNames_From_DataObject() before PositionCursor().
+  */
+  if (!m_DropIsAllowed) LoadNames_From_DataObject(dataObject);
   PositionCursor(pt);
-  m_DataObject = dataObject;
-  bool needDrop = true;
-  if (m_DropIsAllowed && m_PanelDropIsAllowed)
-    if (IsFsFolderPath())
-      needDrop = !SetPath();
-  *effect = GetEffect(keyState, pt, *effect);
-  if (m_DropIsAllowed && m_PanelDropIsAllowed)
+  
+  CPanel::CDisableTimerProcessing2 disableTimerProcessing(m_Panel);
+  // CDisableNotify disableNotify2(m_Panel);
+
+  UInt32 cmd = NDragMenu::k_None;
+  UInt32 cmdEffect = DROPEFFECT_NONE;
+  bool menu_WasShown = false;
+  if (m_IsRightButton && m_Panel)
   {
-    if (needDrop)
+    UInt32 flagsMask;
+    if (m_Panel->IsArcFolder())
+      flagsMask = (UInt32)1 << NDragMenu::k_Copy_ToArc;
+    else
     {
-      UString path = GetTargetPath();
-      if (m_IsAppTarget && m_Panel)
-        if (m_Panel->IsFSFolder())
-          path = m_Panel->GetFsPath();
-      m_Panel->DropObject(dataObject, path);
+      flagsMask = (UInt32)1 << NDragMenu::k_AddToArc;
+      if (IsFsFolderPath())
+        flagsMask |= (UInt32)1 << NDragMenu::k_Copy_Base;
     }
+    // flagsMask |= (UInt32)1 << NDragMenu::k_Cancel;
+    const UInt32 cmd32 = Drag_OnContextMenu(pt.x, pt.y, flagsMask);
+    cmd = cmd32 & NDragMenu::k_MenuFlags_CmdMask;
+    if (cmd32 & NDragMenu::k_MenuFlag_Copy)
+      cmdEffect = DROPEFFECT_COPY;
+    else if (cmd32 & NDragMenu::k_MenuFlag_Move)
+      cmdEffect = DROPEFFECT_MOVE;
+    opEffect = cmdEffect;
+    menu_WasShown = true;
+  }
+  else
+  {
+    opEffect = GetEffect(keyState, pt, *effect);
+    if (m_IsAppTarget)
+      cmd = NDragMenu::k_AddToArc;
+    else if (m_Panel)
+    {
+      if (IsFsFolderPath())
+      {
+        const bool is7zip = m_TargetPath_WasSent_ToDataObject;
+        bool createNewArchive = false;
+        if (is7zip)
+          createNewArchive = false; // g_CreateArchive_for_Drag_from_7zip;
+        else
+          createNewArchive = true; // g_CreateArchive_for_Drag_from_Explorer;
+        
+        if (createNewArchive)
+          cmd = NDragMenu::k_AddToArc;
+        else
+        {
+          if (opEffect != 0)
+            cmd = NDragMenu::k_Copy_Base;
+          cmdEffect = opEffect;
+        }
+      }
+      else
+      {
+        /* if we are inside open archive:
+           if archive support operations         -> we will call operations
+           if archive doesn't support operations -> we will create new archove
+        */
+        if (m_Panel->IsArcFolder()
+            || m_Panel->DoesItSupportOperations())
+        {
+          cmd = NDragMenu::k_Copy_ToArc;
+          // we don't want move to archive operation here.
+          // so we force to DROPEFFECT_COPY.
+          if (opEffect != DROPEFFECT_NONE)
+            opEffect = DROPEFFECT_COPY;
+          cmdEffect = opEffect;
+        }
+        else
+          cmd = NDragMenu::k_AddToArc;
+      }
+    }
+  }
+
+  if (cmd == 0)
+    cmd = NDragMenu::k_AddToArc;
+
+  if (cmd == NDragMenu::k_AddToArc)
+  {
+    opEffect = DROPEFFECT_COPY;
+    cmdEffect = DROPEFFECT_COPY;
+  }
+
+  if (m_Panel)
+  if (cmd == NDragMenu::k_Copy_ToArc)
+  {
+    const UString title = LangString(IDS_CONFIRM_FILE_COPY);
+    UString s = LangString(cmdEffect == DROPEFFECT_MOVE ?
+        IDS_MOVE_TO : IDS_COPY_TO);
+    s.Add_LF();
+    s += "\'";
+    s += m_Panel->_currentFolderPrefix;
+    s += "\'";
+    s.Add_LF();
+    s += LangString(IDS_WANT_TO_COPY_FILES);
+    s += " ?";
+    const int res = ::MessageBoxW(*m_Panel, s, title, MB_YESNOCANCEL | MB_ICONQUESTION);
+    if (res != IDYES)
+      cmd = NDragMenu::k_Cancel;
+  }
+
+  CTargetTransferInfo target;
+  target.FuncType = k_DragTargetMode_Drop_Begin;
+  target.KeyState = keyState;
+  target.Point = pt;
+  target.OkEffects = *effect;
+  target.Flags = 0;
+
+  target.Cmd_Effect = cmdEffect;
+  target.Cmd_Type = cmd;
+  target.FolderType = GetFolderType();
+
+  if (cmd == NDragMenu::k_Cancel)
+    target.Flags |= k_TargetFlags_WasCanceled;
+  if (menu_WasShown)
+    target.Flags |= k_TargetFlags_MenuWasShown;
+ 
+  SendToSource_auto(dataObject, target);
+
+  CDataObject_GetTransfer transfer;
+  m_GetTransfer_WasSuccess = DataObject_GetData_GetTransfer(
+      dataObject, m_Format_7zip_GetTransfer, transfer);
+
+  /* The Source (for example, 7-zip) could change file names when drop was confirmed.
+     So we must reload source file paths here */
+  if (cmd != NDragMenu::k_Cancel)
+    LoadNames_From_DataObject(dataObject);
+
+  if (cmd == NDragMenu::k_Cancel)
+  {
+    opEffect = DROPEFFECT_NONE;
+    cmdEffect = DROPEFFECT_NONE;
+  }
+  else
+  {
+    if (m_GetTransfer_WasSuccess)
+      needDrop_by_Source = ((transfer.Flags & k_SourceFlags_DoNotProcessInTarget) != 0);
+    if (!needDrop_by_Source)
+    {
+      bool moveMode = (cmdEffect == DROPEFFECT_MOVE);
+      bool needDrop = false;
+      if (m_IsRightButton && m_Panel)
+        needDrop = true;
+      if (m_DropIsAllowed && m_PanelDropIsAllowed)
+      {
+        /* if non-empty TargetPath was sent successfully to DataObject,
+           then the Source is 7-Zip, and that 7zip-Source can copy to FS operation.
+           So we can disable Drop operation here for such case.
+        */
+        needDrop_by_Source = (cmd != NDragMenu::k_AddToArc
+            && m_TargetPath_WasSent_ToDataObject
+            && m_TargetPath_NonEmpty_WasSent_ToDataObject);
+        needDrop = !(needDrop_by_Source);
+      }
+      if (needDrop)
+      {
+        UString path = GetTargetPath();
+        if (m_IsAppTarget && m_Panel)
+          if (m_Panel->IsFSFolder())
+            path = m_Panel->GetFsPath();
+
+        UInt32 sourceFlags = 0;
+        if (m_GetTransfer_WasSuccess)
+          sourceFlags = transfer.Flags;
+
+        if (menu_WasShown)
+          target.Flags |= k_TargetFlags_MenuWasShown;
+
+        target.Flags |= k_TargetFlags_WasProcessed;
+
+        RemoveSelection();
+        // disableTimerProcessing.Restore();
+        m_Panel->CompressDropFiles(m_SourcePaths, path,
+            (cmd == NDragMenu::k_AddToArc),  // createNewArchive,
+            moveMode, sourceFlags,
+            target.Flags
+            );
+      }
+    }
+  } // end of if (cmd != NDragMenu::k_Cancel)
+  {
+    /* note that, if (we send CFSTR_PERFORMEDDROPEFFECT as DROPEFFECT_MOVE
+            and Drop() returns (*effect == DROPEFFECT_MOVE), then
+       Win10-Explorer-Source will try to remove files just after Drop() exit.
+       But our CompressFiles() could be run without waiting finishing.
+       DOCs say, that we must send CFSTR_PERFORMEDDROPEFFECT
+         - DROPEFFECT_NONE : for   optimized move
+         - DROPEFFECT_MOVE : for unoptimized move.
+       But actually Win10-Explorer-Target sends (DROPEFFECT_MOVE) for move operation.
+       And it still works as in optimized mode, because "unoptimized" deleting by Source will be performed
+       if both conditions are met:
+          1) DROPEFFECT_MOVE is sent to (CFSTR_PERFORMEDDROPEFFECT) and
+          2) (*effect == DROPEFFECT_MOVE) is returend by Drop().
+       We don't want to send DROPEFFECT_MOVE here to protect from
+       deleting file by Win10-Explorer.
+       We are not sure that allfile fieree processed by move.
+    */
+
+    // for debug: we test the case when source tries to delete original files
+    // bool res;
+    // only CFSTR_PERFORMEDDROPEFFECT affects file removing in Win10-Explorer.
+    // res = SendToSource_UInt32(dataObject, RegisterClipboardFormat(CFSTR_LOGICALPERFORMEDDROPEFFECT), DROPEFFECT_MOVE); // for debug
+    /* res = */ SendToSource_UInt32(dataObject,
+        RegisterClipboardFormat(CFSTR_PERFORMEDDROPEFFECT),
+        cmd == NDragMenu::k_Cancel ? DROPEFFECT_NONE : DROPEFFECT_COPY);
+    // res = res;
   }
   RemoveSelection();
-  m_DataObject.Release();
-  return S_OK;
-}
 
-void CPanel::DropObject(IDataObject *dataObject, const UString &folderPath)
-{
-  UStringVector names;
-  GetNamesFromDataObject(dataObject, names);
-  CompressDropFiles(names, folderPath);
-}
+  target.FuncType = k_DragTargetMode_Drop_End;
+  target.Cmd_Type = cmd;
+  if (needDrop_by_Source)
+    target.Flags |= k_TargetFlags_MustBeProcessedBySource;
 
-/*
-void CPanel::CompressDropFiles(HDROP dr)
-{
-  UStringVector fileNames;
+  SendToSource_TransferInfo(dataObject, target);
+  } catch(...) { hres = E_FAIL; }
+  
+  ClearState();
+  // *effect |= (1 << 10); // for debug
+  // *effect = DROPEFFECT_COPY; // for debug
+
+  /*
+    if we return (*effect == DROPEFFECT_MOVE) here,
+    Explorer-Source at some conditions can treat it as (unoptimized move) mode,
+    and Explorer-Source will remove source files after DoDragDrop()
+    in that (unoptimized move) mode.
+    We want to avoid such (unoptimized move) cases.
+    So we don't return (*effect == DROPEFFECT_MOVE), here if Source is not 7-Zip.
+    If source is 7-Zip that will do acual opeartion, then we can return DROPEFFECT_MOVE.
+  */
+  if (hres != S_OK || (opEffect == DROPEFFECT_MOVE && !needDrop_by_Source))
   {
-    NShell::CDrop drop(true);
-    drop.Attach(dr);
-    drop.QueryFileNames(fileNames);
+    // opEffect = opEffect;
+    // opEffect = DROPEFFECT_NONE; // for debug disabled
   }
-  CompressDropFiles(fileNamesUnicode);
+
+  *effect = opEffect;
+  /* if (hres <  0), DoDragDrop() also will return (hres).
+     if (hres >= 0), DoDragDrop() will return DRAGDROP_S_DROP;
+  */
+  return hres;
 }
-*/
 
-static bool IsFolderInTemp(const FString &path)
+
+
+// ---------- CPanel ----------
+
+
+static bool Is_Path1_Prefixed_by_Path2(const UString &path, const UString &prefix)
 {
-  FString tempPath;
-  if (!MyGetTempPath(tempPath))
+  const unsigned len = prefix.Len();
+  if (path.Len() < len)
     return false;
-  if (tempPath.IsEmpty())
+  return CompareFileNames(path.Left(len), prefix) == 0;
+}
+
+static bool IsFolderInTemp(const UString &path)
+{
+  FString tempPathF;
+  if (!MyGetTempPath(tempPathF))
     return false;
-  unsigned len = tempPath.Len();
-  if (path.Len() < len)
+  const UString tempPath = fs2us(tempPathF);
+  if (tempPath.IsEmpty())
     return false;
-  return CompareFileNames(path.Left(len), tempPath) == 0;
+  return Is_Path1_Prefixed_by_Path2(path, tempPath);
 }
 
-static bool AreThereNamesFromTemp(const UStringVector &fileNames)
+static bool AreThereNamesFromTemp(const UStringVector &filePaths)
 {
   FString tempPathF;
   if (!MyGetTempPath(tempPathF))
     return false;
-  UString tempPath = fs2us(tempPathF);
+  const UString tempPath = fs2us(tempPathF);
   if (tempPath.IsEmpty())
     return false;
-  FOR_VECTOR (i, fileNames)
-    if (fileNames[i].IsPrefixedBy_NoCase(tempPath))
+  FOR_VECTOR (i, filePaths)
+    if (Is_Path1_Prefixed_by_Path2(filePaths[i], tempPath))
       return true;
   return false;
 }
 
-void CPanel::CompressDropFiles(const UStringVector &fileNames, const UString &folderPath)
+
+/*
+  empty folderPath means create new Archive to path of first fileName.
+  createNewArchive == true : show "Add to archive ..." dialog with external program
+    folderPath.IsEmpty()  : create archive in folder of filePaths[0].
+  createNewArchive == false :
+    folderPath.IsEmpty()  : copy to archive folder that is open in panel
+    !folderPath.IsEmpty()  : CopyFsItems() to folderPath.
+*/
+void CPanel::CompressDropFiles(
+    const UStringVector &filePaths,
+    const UString &folderPath,
+    bool createNewArchive,
+    bool moveMode,
+    UInt32 sourceFlags,
+    UInt32 &targetFlags
+    )
 {
-  if (fileNames.Size() == 0)
+  if (filePaths.Size() == 0)
     return;
-  bool createNewArchive = true;
-  if (!IsFSFolder())
-    createNewArchive = !DoesItSupportOperations();
+  // createNewArchive = false; // for debug
 
   if (createNewArchive)
   {
     UString folderPath2 = folderPath;
+    // folderPath2.Empty(); // for debug
     if (folderPath2.IsEmpty())
     {
-      FString folderPath2F;
-      GetOnlyDirPrefix(us2fs(fileNames.Front()), folderPath2F);
-      folderPath2 = fs2us(folderPath2F);
-      if (IsFolderInTemp(folderPath2F))
+      {
+        FString folderPath2F;
+        GetOnlyDirPrefix(us2fs(filePaths.Front()), folderPath2F);
+        folderPath2 = fs2us(folderPath2F);
+      }
+      if (IsFolderInTemp(folderPath2))
+      {
+        /* we don't want archive to be created in temp directory.
+           so we change the path to root folder (non-temp) */
         folderPath2 = ROOT_FS_FOLDER;
+      }
     }
+
+    UString arcName_base;
+    const UString arcName = CreateArchiveName(filePaths,
+        false, // isHash
+        NULL,  // CFileInfo *fi
+        arcName_base);
     
-    const UString arcName = CreateArchiveName(fileNames);
-    
-    CompressFiles(folderPath2, arcName, L"",
-      true, // addExtension
-      fileNames,
-      false, // email
-      true, // showDialog
-      AreThereNamesFromTemp(fileNames) // waitFinish
-      );
+    bool needWait;
+    if (sourceFlags & k_SourceFlags_WaitFinish)
+      needWait = true;
+    else if (sourceFlags & k_SourceFlags_DoNotWaitFinish)
+      needWait = false;
+    else if (sourceFlags & k_SourceFlags_TempFiles)
+      needWait = true;
+    else
+      needWait = AreThereNamesFromTemp(filePaths);
+
+    targetFlags |= (needWait ?
+        k_TargetFlags_WaitFinish :
+        k_TargetFlags_DoNotWaitFinish);
+
+    CompressFiles(folderPath2, arcName,
+        L"",      // arcType
+        true,     // addExtension
+        filePaths,
+        false,    // email
+        true,     // showDialog
+        needWait);
   }
   else
-    CopyFromAsk(fileNames);
+  {
+    targetFlags |= k_TargetFlags_WaitFinish;
+    if (!folderPath.IsEmpty())
+    {
+      CCopyToOptions options;
+      options.moveMode = moveMode;
+      options.folder = folderPath;
+      options.showErrorMessages = true; // showErrorMessages is not used for this operation
+      options.NeedRegistryZone = false;
+      options.ZoneIdMode = NExtract::NZoneIdMode::kNone;
+      // maybe we need more options here: FIXME
+      /* HRESULT hres = */ CopyFsItems(options,
+          filePaths,
+          NULL // UStringVector *messages
+          );
+      // hres = hres;
+    }
+    else
+    {
+      CopyFromNoAsk(moveMode, filePaths);
+    }
+  }
+}
+
+
+
+static unsigned Drag_OnContextMenu(int xPos, int yPos, UInt32 cmdFlags)
+{
+  CMenu menu;
+  CMenuDestroyer menuDestroyer(menu);
+  /*
+    Esc key in shown menu doesn't work if we call Drag_OnContextMenu from ::Drop().
+    We call SetFocus() tp solve that problem.
+    But the focus will be changed to Target Window after Drag and Drop.
+    Is it OK to use SetFocus() here ?
+    Is there another way to enable Esc key ?
+  */
+  // _listView.SetFocus(); // for debug
+  ::SetFocus(g_HWND);
+  menu.CreatePopup();
+  /*
+  int defaultCmd; // = NDragMenu::k_Move;
+  defaultCmd = NDragMenu::k_None;
+  */
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(NDragMenu::g_Pairs); i++)
+  {
+    const NDragMenu::CCmdLangPair &pair = NDragMenu::g_Pairs[i];
+    const UInt32 cmdAndFlags = pair.CmdId_and_Flags;
+    const UInt32 cmdId = cmdAndFlags & NDragMenu::k_MenuFlags_CmdMask;
+    if (cmdId != NDragMenu::k_Cancel)
+    if ((cmdFlags & ((UInt32)1 << cmdId)) == 0)
+      continue;
+    const UINT flags = MF_STRING;
+    /*
+    if (prop.IsVisible)
+      flags |= MF_CHECKED;
+    if (i == 0)
+      flags |= MF_GRAYED;
+    */
+    // MF_DEFAULT doesn't work
+    // if (i == 2) flags |= MF_DEFAULT;
+    // if (i == 4) flags |= MF_HILITE;
+    // if (cmd == defaultCmd) flags |= MF_HILITE;
+    UString name = LangString(pair.LangId);
+    if (name.IsEmpty())
+    {
+      if (cmdId == NDragMenu::k_Cancel)
+        name = "Cancel";
+      else
+        name.Add_UInt32(pair.LangId);
+    }
+    if (cmdId == NDragMenu::k_Copy_ToArc)
+    {
+      // UString destPath = _currentFolderPrefix;
+      /*
+      UString destPath = LangString(IDS_CONTEXT_ARCHIVE);
+      name = MyFormatNew(name, destPath);
+      */
+      name.Add_Space();
+      name += LangString(IDS_CONTEXT_ARCHIVE);
+    }
+    if (cmdId == NDragMenu::k_Cancel)
+      menu.AppendItem(MF_SEPARATOR, 0, (LPCTSTR)NULL);
+    menu.AppendItem(flags, cmdAndFlags, name);
+  }
+  /*
+  if (defaultCmd != 0)
+    SetMenuDefaultItem(menu, (unsigned)defaultCmd,
+        FALSE); // byPos
+  */
+  int menuResult = menu.Track(
+      TPM_LEFTALIGN | TPM_RETURNCMD | TPM_NONOTIFY,
+      xPos, yPos,
+      g_HWND
+      // _listView // for debug
+      );
+  /* menu.Track() return value is zero, if the user cancels
+     the menu without making a selection, or if an error occurs */
+  if (menuResult <= 0)
+    menuResult = NDragMenu::k_Cancel;
+  return (unsigned)menuResult;
+}
+
+
+
+void CApp::CreateDragTarget()
+{
+  _dropTargetSpec = new CDropTarget();
+  _dropTarget = _dropTargetSpec;
+  _dropTargetSpec->App = (this);
+}
+
+void CApp::SetFocusedPanel(unsigned index)
+{
+  LastFocusedPanel = index;
+  _dropTargetSpec->TargetPanelIndex = (int)LastFocusedPanel;
+}
+
+void CApp::DragBegin(unsigned panelIndex)
+{
+  _dropTargetSpec->TargetPanelIndex = (int)(NumPanels > 1 ? 1 - panelIndex : panelIndex);
+  _dropTargetSpec->SrcPanelIndex = (int)panelIndex;
+}
+
+void CApp::DragEnd()
+{
+  _dropTargetSpec->TargetPanelIndex = (int)LastFocusedPanel;
+  _dropTargetSpec->SrcPanelIndex = -1;
 }
diff --git a/CPP/7zip/UI/FileManager/PanelFolderChange.cpp b/CPP/7zip/UI/FileManager/PanelFolderChange.cpp
index b91195f..a13b88d 100644
--- a/CPP/7zip/UI/FileManager/PanelFolderChange.cpp
+++ b/CPP/7zip/UI/FileManager/PanelFolderChange.cpp
@@ -133,8 +133,9 @@ HRESULT CPanel::BindToPath(const UString &fullPath, const UString &arcFormat, CO
 
     CloseOpenFolders();
     UString sysPath = path;
-    
-    unsigned prefixSize = NName::GetRootPrefixSize(sysPath);
+    /* we will Empty() sysPath variable, if we need to BindToFolder()
+       directly with (path) variable */
+    const unsigned prefixSize = NName::GetRootPrefixSize(sysPath);
     if (prefixSize == 0 || sysPath[prefixSize] == 0)
       sysPath.Empty();
     
@@ -142,6 +143,7 @@ HRESULT CPanel::BindToPath(const UString &fullPath, const UString &arcFormat, CO
     if (!sysPath.IsEmpty() && sysPath.Back() == ':' &&
       (sysPath.Len() != 2 || !NName::IsDrivePath2(sysPath)))
     {
+      // if base item for alt streams prefix "base:" exists, we will use it
       UString baseFile = sysPath;
       baseFile.DeleteBack();
       if (NFind::DoesFileOrDirExist(us2fs(baseFile)))
@@ -153,22 +155,50 @@ HRESULT CPanel::BindToPath(const UString &fullPath, const UString &arcFormat, CO
     
     while (!sysPath.IsEmpty())
     {
+      if (sysPath.Len() <= prefixSize)
+      {
+        path.DeleteFrom(prefixSize);
+        sysPath.Empty();
+        break;
+      }
+
+      fileInfo.ClearBase();
+      if (IsPathSepar(sysPath.Back()))
+      {
+        /* Windows 10 by default doesn't allow look "Local Settings" that is junction to "AppData\Local",
+           but it does allow look "Local Settings\Temp\*"
+           22.02: at first we try to use paths with slashes "path\" */
+        CFileInfo fi;
+        // CFindFile findFile;
+        // FString path2 = us2fs(sysPath);
+        // path2 += '*'; // CHAR_ANY_MASK;
+        // if (findFile.FindFirst(path2, fi))
+        CEnumerator enumerator;
+        enumerator.SetDirPrefix(us2fs(sysPath));
+        bool found = false;
+        if (enumerator.Next(fi, found))
+        {
+          // sysPath.DeleteBack();
+          fileInfo.SetAsDir();
+          fileInfo.Size = 0;
+          fileInfo.Name.Empty();
+          break;
+        }
+        sysPath.DeleteBack();
+        continue;
+      }
+
       if (fileInfo.Find(us2fs(sysPath)))
         break;
       int pos = sysPath.ReverseFind_PathSepar();
       if (pos < 0)
+      {
         sysPath.Empty();
-      else
+        break;
+      }
       {
-        /*
-        if (reducedParts.Size() > 0 || pos < (int)sysPath.Len() - 1)
-          reducedParts.Add(sysPath.Ptr(pos + 1));
-        */
-        #if defined(_WIN32) && !defined(UNDER_CE)
-        if (pos == 2 && NName::IsDrivePath2(sysPath) && sysPath.Len() > 3)
+        if ((unsigned)pos != sysPath.Len() - 1)
           pos++;
-        #endif
-
         sysPath.DeleteFrom((unsigned)pos);
       }
     }
@@ -225,7 +255,7 @@ HRESULT CPanel::BindToPath(const UString &fullPath, const UString &arcFormat, CO
         _folder->BindToFolder(fs2us(dirPrefix), &newFolder);
       else
       {
-        RINOK(res);
+        RINOK(res)
         openRes.ArchiveIsOpened = true;
         _parentFolders.Back().ParentFolderPath = fs2us(dirPrefix);
         path.DeleteFrontal(sysPath.Len());
@@ -248,12 +278,12 @@ HRESULT CPanel::BindToPath(const UString &fullPath, const UString &arcFormat, CO
     for (unsigned curPos = 0; curPos != path.Len();)
     {
       UString s = path.Ptr(curPos);
-      int slashPos = NName::FindSepar(s);
+      const int slashPos = NName::FindSepar(s);
       unsigned skipLen = s.Len();
       if (slashPos >= 0)
       {
         s.DeleteFrom((unsigned)slashPos);
-        skipLen = slashPos + 1;
+        skipLen = (unsigned)slashPos + 1;
       }
 
       CMyComPtr<IFolderFolder> newFolder;
@@ -262,13 +292,13 @@ HRESULT CPanel::BindToPath(const UString &fullPath, const UString &arcFormat, CO
         curPos += skipLen;
       else if (_folderAltStreams)
       {
-        int pos = s.Find(L':');
+        const int pos = s.Find(L':');
         if (pos >= 0)
         {
           UString baseName = s;
           baseName.DeleteFrom((unsigned)pos);
           if (_folderAltStreams->BindToAltStreams(baseName, &newFolder) == S_OK && newFolder)
-            curPos += pos + 1;
+            curPos += (unsigned)pos + 1;
         }
       }
       
@@ -516,14 +546,18 @@ bool CPanel::OnComboBoxCommand(UINT code, LPARAM /* param */, LRESULT &result)
         pathParts.DeleteBack();
       for (i = 0; i < pathParts.Size(); i++)
       {
-        UString name = pathParts[i];
+        const UString name = pathParts[i];
         sumPass += name;
         sumPass.Add_PathSepar();
         CFileInfo info;
         DWORD attrib = FILE_ATTRIBUTE_DIRECTORY;
         if (info.Find(us2fs(sumPass)))
           attrib = info.Attrib;
-        AddComboBoxItem(name.IsEmpty() ? L"\\" : name, GetRealIconIndex(us2fs(sumPass), attrib), i, false);
+        AddComboBoxItem(
+            name.IsEmpty() ? L"\\" : name,
+            GetRealIconIndex(us2fs(sumPass), attrib),
+            (int)i, // iIndent
+            false); // addToList
         ComboBoxPaths.Add(sumPass);
       }
 
@@ -633,7 +667,7 @@ void CPanel::FoldersHistory()
   if (listViewDialog.StringsWereChanged)
   {
     _appState->FolderHistory.RemoveAll();
-    for (int i = listViewDialog.Strings.Size() - 1; i >= 0; i--)
+    for (int i = (int)listViewDialog.Strings.Size() - 1; i >= 0; i--)
       _appState->FolderHistory.AddString(listViewDialog.Strings[i]);
     if (listViewDialog.FocusedItemIndex >= 0)
       selectString = listViewDialog.Strings[listViewDialog.FocusedItemIndex];
@@ -695,12 +729,12 @@ void CPanel::OpenParentFolder()
       if (focusedName != L"\\\\." &&
           focusedName != L"\\\\?")
       {
-        int pos = focusedName.ReverseFind_PathSepar();
+        const int pos = focusedName.ReverseFind_PathSepar();
         if (pos >= 0)
         {
           parentFolderPrefix = focusedName;
           parentFolderPrefix.DeleteFrom((unsigned)(pos + 1));
-          focusedName.DeleteFrontal(pos + 1);
+          focusedName.DeleteFrontal((unsigned)(pos + 1));
         }
       }
     }
@@ -812,7 +846,7 @@ void CPanel::OpenDrivesFolder()
   RefreshListCtrl();
 }
 
-void CPanel::OpenFolder(int index)
+void CPanel::OpenFolder(unsigned index)
 {
   if (index == kParentIndex)
   {
@@ -820,7 +854,7 @@ void CPanel::OpenFolder(int index)
     return;
   }
   CMyComPtr<IFolderFolder> newFolder;
-  HRESULT res = _folder->BindToFolder(index, &newFolder);
+  const HRESULT res = _folder->BindToFolder((unsigned)index, &newFolder);
   if (res != 0)
   {
     MessageBox_Error_HRESULT(res);
@@ -839,17 +873,17 @@ void CPanel::OpenFolder(int index)
 void CPanel::OpenAltStreams()
 {
   CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
+  Get_ItemIndices_Operated(indices);
   Int32 realIndex = -1;
   if (indices.Size() > 1)
     return;
   if (indices.Size() == 1)
-    realIndex = indices[0];
+    realIndex = (Int32)indices[0];
 
   if (_folderAltStreams)
   {
     CMyComPtr<IFolderFolder> newFolder;
-    _folderAltStreams->BindToAltStreams(realIndex, &newFolder);
+    _folderAltStreams->BindToAltStreams((UInt32)realIndex, &newFolder);
     if (newFolder)
     {
       CDisableTimerProcessing disableTimerProcessing(*this);
@@ -864,7 +898,7 @@ void CPanel::OpenAltStreams()
   #if defined(_WIN32) && !defined(UNDER_CE)
   UString path;
   if (realIndex >= 0)
-    path = GetItemFullPath(realIndex);
+    path = GetItemFullPath((UInt32)realIndex);
   else
   {
     path = GetFsPath();
diff --git a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
index 17301b5..bd65aef 100644
--- a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
+++ b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
@@ -68,7 +68,7 @@ class CProcessSnapshot
 {
   HANDLE _handle;
 public:
-  CProcessSnapshot(): _handle(INVALID_HANDLE_VALUE) {};
+  CProcessSnapshot(): _handle(INVALID_HANDLE_VALUE) {}
   ~CProcessSnapshot() { Close(); }
 
   bool Close()
@@ -136,7 +136,7 @@ public:
   void SetFromExtension(const char *ext) // ext must be low case
   {
     ProgNames.Clear();
-    for (unsigned i = 0; i < ARRAY_SIZE(g_Progs); i++)
+    for (unsigned i = 0; i < Z7_ARRAY_SIZE(g_Progs); i++)
       if (FindExtProg(g_Progs[i].Ext, ext))
       {
         ProgNames.Add(g_Progs[i].Prog);
@@ -220,22 +220,25 @@ static void My_GetProcessFileName(HANDLE hProcess, UString &path)
   const unsigned maxPath = 1024;
   WCHAR temp[maxPath + 1];
   
-  const char *func_name = "GetProcessImageFileNameW";
-  Func_GetProcessImageFileNameW my_func = (Func_GetProcessImageFileNameW)
-    (void *)::GetProcAddress(::GetModuleHandleA("kernel32.dll"), func_name);
+  const char *func_name =
+      "GetProcessImageFileNameW";
+  Func_GetProcessImageFileNameW my_func = Z7_GET_PROC_ADDRESS(
+  Func_GetProcessImageFileNameW, ::GetModuleHandleA("kernel32.dll"), func_name);
   
   if (!my_func)
   {
     if (!g_Psapi_dll_module)
       g_Psapi_dll_module = LoadLibraryW(L"Psapi.dll");
     if (g_Psapi_dll_module)
-      my_func = (Func_GetProcessImageFileNameW)(void *)::GetProcAddress(g_Psapi_dll_module, func_name);
+      my_func = Z7_GET_PROC_ADDRESS(
+        Func_GetProcessImageFileNameW, g_Psapi_dll_module, func_name);
   }
   
   if (my_func)
   {
-    // DWORD num = GetProcessImageFileNameW(hProcess, temp, maxPath);
-    DWORD num = my_func(hProcess, temp, maxPath);
+    const DWORD num =
+    // GetProcessImageFileNameW(hProcess, temp, maxPath);
+    my_func(hProcess, temp, maxPath);
     if (num != 0)
       path = temp;
   }
@@ -318,11 +321,13 @@ public:
   void SetMainProcess(HANDLE h)
   {
     #ifndef UNDER_CE
-
-    Func_GetProcessId func = (Func_GetProcessId)(void *)::GetProcAddress(::GetModuleHandleA("kernel32.dll"), "GetProcessId");
+    const
+    Func_GetProcessId func = Z7_GET_PROC_ADDRESS(
+    Func_GetProcessId, ::GetModuleHandleA("kernel32.dll"),
+        "GetProcessId");
     if (func)
     {
-      DWORD id = func(h);
+      const DWORD id = func(h);
       if (id != 0)
         _ids.AddToUniqueSorted(id);
     }
@@ -462,7 +467,7 @@ HRESULT CPanel::OpenAsArc(IInStream *inStream,
   else
   {
     if (!folderLink.FileInfo.Find(folderLink.FilePath))
-      return ::GetLastError();
+      return GetLastError_noZero_HRESULT();
     if (folderLink.FileInfo.IsDir())
       return S_FALSE;
     folderLink.IsVirtual = false;
@@ -471,14 +476,14 @@ HRESULT CPanel::OpenAsArc(IInStream *inStream,
   folderLink.VirtualPath = virtualFilePath;
 
   CFfpOpen ffp;
-  HRESULT res = ffp.OpenFileFolderPlugin(inStream,
+  const HRESULT res = ffp.OpenFileFolderPlugin(inStream,
       folderLink.FilePath.IsEmpty() ? us2fs(virtualFilePath) : folderLink.FilePath,
       arcFormat, GetParent());
 
   openRes.Encrypted = ffp.Encrypted;
   openRes.ErrorMessage = ffp.ErrorMessage;
 
-  RINOK(res);
+  RINOK(res)
  
   folderLink.Password = ffp.Password;
   folderLink.UsePassword = ffp.Encrypted;
@@ -571,7 +576,7 @@ HRESULT CPanel::OpenAsArc_Name(const UString &relPath, const UString &arcFormat
 }
 
 
-HRESULT CPanel::OpenAsArc_Index(int index, const wchar_t *type
+HRESULT CPanel::OpenAsArc_Index(unsigned index, const wchar_t *type
     // , bool showErrorMessage
     )
 {
@@ -653,36 +658,13 @@ static const char * const kStartExtensions =
   " mak clw csproj vcproj sln dsp dsw"
   " ";
 
-static bool FindExt(const char *p, const UString &name)
-{
-  int dotPos = name.ReverseFind_Dot();
-  if (dotPos < 0 || dotPos == (int)name.Len() - 1)
-    return false;
-
-  AString s;
-  for (unsigned pos = dotPos + 1;; pos++)
-  {
-    wchar_t c = name[pos];
-    if (c == 0)
-      break;
-    if (c >= 0x80)
-      return false;
-    s += (char)MyCharLower_Ascii((char)c);
-  }
-  for (unsigned i = 0; p[i] != 0;)
-  {
-    unsigned j;
-    for (j = i; p[j] != ' '; j++);
-    if (s.Len() == j - i && memcmp(p + i, (const char *)s, s.Len()) == 0)
-      return true;
-    i = j + 1;
-  }
-  return false;
-}
+// bool FindExt(const char *p, const UString &name, AString &s);
+bool FindExt(const char *p, const UString &name, CStringFinder &finder);
 
 static bool DoItemAlwaysStart(const UString &name)
 {
-  return FindExt(kStartExtensions, name);
+  CStringFinder finder;
+  return FindExt(kStartExtensions, name, finder);
 }
 
 UString GetQuotedString(const UString &s);
@@ -754,10 +736,10 @@ static HRESULT StartEditApplication(const UString &path, bool useEditor, HWND wi
   UStringVector params;
   params.Add(path);
 
-  HRESULT res = StartAppWithParams(command, params, process);
-  if (res != SZ_OK)
+  const WRes res = StartAppWithParams(command, params, process);
+  if (res != 0)
     ::MessageBoxW(window, LangString(IDS_CANNOT_START_EDITOR), L"7-Zip", MB_OK  | MB_ICONSTOP);
-  return res;
+  return HRESULT_FROM_WIN32(res);
 }
 
 
@@ -772,7 +754,7 @@ void CApp::DiffFiles()
   }
 
   CRecordVector<UInt32> indices;
-  panel.GetSelectedItemsIndices(indices);
+  panel.Get_ItemIndices_Selected(indices);
 
   UString path1, path2;
   if (indices.Size() == 2)
@@ -792,7 +774,7 @@ void CApp::DiffFiles()
 
     path1 = panel.GetItemFullPath(indices[0]);
     CRecordVector<UInt32> indices2;
-    destPanel.GetSelectedItemsIndices(indices2);
+    destPanel.Get_ItemIndices_Selected(indices2);
     if (indices2.Size() == 1)
       path2 = destPanel.GetItemFullPath(indices2[0]);
     else
@@ -820,19 +802,19 @@ void CApp::DiffFiles(const UString &path1, const UString &path2)
   params.Add(path1);
   params.Add(path2);
 
-  HRESULT res;
+  WRes res;
   {
     CProcess process;
     res = StartAppWithParams(command, params, process);
   }
-  if (res == SZ_OK)
+  if (res == 0)
     return;
   ::MessageBoxW(_window, LangString(IDS_CANNOT_START_EDITOR), L"7-Zip", MB_OK  | MB_ICONSTOP);
 }
 
 
 #ifndef _UNICODE
-typedef BOOL (WINAPI * ShellExecuteExWP)(LPSHELLEXECUTEINFOW lpExecInfo);
+typedef BOOL (WINAPI * Func_ShellExecuteExW)(LPSHELLEXECUTEINFOW lpExecInfo);
 #endif
 
 static HRESULT StartApplication(const UString &dir, const UString &path, HWND window, CProcess &process)
@@ -844,7 +826,7 @@ static HRESULT StartApplication(const UString &dir, const UString &path, HWND wi
     int dot = path2.ReverseFind_Dot();
     int separ = path2.ReverseFind_PathSepar();
     if (dot < 0 || dot < separ)
-      path2 += '.';
+      path2.Add_Dot();
   }
   #endif
 
@@ -862,12 +844,15 @@ static HRESULT StartApplication(const UString &dir, const UString &path, HWND wi
     execInfo.lpParameters = NULL;
     execInfo.lpDirectory = dir.IsEmpty() ? NULL : (LPCWSTR)dir;
     execInfo.nShow = SW_SHOWNORMAL;
-    execInfo.hProcess = 0;
-    ShellExecuteExWP shellExecuteExW = (ShellExecuteExWP)
-    (void *)::GetProcAddress(::GetModuleHandleW(L"shell32.dll"), "ShellExecuteExW");
-    if (!shellExecuteExW)
+    execInfo.hProcess = NULL;
+    const
+    Func_ShellExecuteExW
+       f_ShellExecuteExW = Z7_GET_PROC_ADDRESS(
+    Func_ShellExecuteExW, ::GetModuleHandleW(L"shell32.dll"),
+        "ShellExecuteExW");
+    if (!f_ShellExecuteExW)
       return 0;
-    shellExecuteExW(&execInfo);
+    f_ShellExecuteExW(&execInfo);
     result = (UINT32)(UINT_PTR)execInfo.hInstApp;
     process.Attach(execInfo.hProcess);
   }
@@ -895,7 +880,7 @@ static HRESULT StartApplication(const UString &dir, const UString &path, HWND wi
       #endif
       ;
     execInfo.nShow = SW_SHOWNORMAL;
-    execInfo.hProcess = 0;
+    execInfo.hProcess = NULL;
     ::ShellExecuteEx(&execInfo);
     result = (UINT32)(UINT_PTR)execInfo.hInstApp;
     process.Attach(execInfo.hProcess);
@@ -927,7 +912,7 @@ static void StartApplicationDontWait(const UString &dir, const UString &path, HW
   StartApplication(dir, path, window, process);
 }
 
-void CPanel::EditItem(int index, bool useEditor)
+void CPanel::EditItem(unsigned index, bool useEditor)
 {
   if (!_parentFolders.IsEmpty())
   {
@@ -939,7 +924,7 @@ void CPanel::EditItem(int index, bool useEditor)
 }
 
 
-void CPanel::OpenFolderExternal(int index)
+void CPanel::OpenFolderExternal(unsigned index)
 {
   UString prefix = GetFsPath();
   UString path = prefix;
@@ -1010,9 +995,10 @@ bool CPanel::IsVirus_Message(const UString &name)
     }
     if (i != name2.Len())
     {
+      CStringFinder finder;
       UString name3 = name2;
       name3.DeleteFrom(i);
-      if (FindExt(kExeExtensions, name3))
+      if (FindExt(kExeExtensions, name3, finder))
         isVirus = true;
     }
   }
@@ -1025,13 +1011,13 @@ bool CPanel::IsVirus_Message(const UString &name)
   
   if (!isSpaceError)
   {
-    int pos1 = s.Find(L'(');
+    const int pos1 = s.Find(L'(');
     if (pos1 >= 0)
     {
-      int pos2 = s.Find(L')', pos1 + 1);
+      const int pos2 = s.Find(L')', (unsigned)pos1 + 1);
       if (pos2 >= 0)
       {
-        s.Delete(pos1, pos2 + 1 - pos1);
+        s.Delete((unsigned)pos1, (unsigned)pos2 + 1 - (unsigned)pos1);
         if (pos1 > 0 && s[pos1 - 1] == ' ' && s[pos1] == '.')
           s.Delete(pos1 - 1);
       }
@@ -1050,10 +1036,10 @@ bool CPanel::IsVirus_Message(const UString &name)
 }
 
 
-void CPanel::OpenItem(int index, bool tryInternal, bool tryExternal, const wchar_t *type)
+void CPanel::OpenItem(unsigned index, bool tryInternal, bool tryExternal, const wchar_t *type)
 {
   CDisableTimerProcessing disableTimerProcessing(*this);
-  UString name = GetItemRelPath2(index);
+  const UString name = GetItemRelPath2(index);
   
   if (tryExternal)
     if (IsVirus_Message(name))
@@ -1096,7 +1082,7 @@ void CPanel::OpenItem(int index, bool tryInternal, bool tryExternal, const wchar
 
 class CThreadCopyFrom: public CProgressThreadVirt
 {
-  HRESULT ProcessVirt();
+  HRESULT ProcessVirt() Z7_override;
 public:
   UString FullPath;
   UInt32 ItemIndex;
@@ -1133,7 +1119,7 @@ HRESULT CPanel::OnOpenItemChanged(UInt32 index, const wchar_t *fullFilePath,
   t.UpdateCallbackSpec->Password = password;
 
 
-  RINOK(t.Create(GetItemName(index), (HWND)*this));
+  RINOK(t.Create(GetItemName(index), (HWND)*this))
   return t.Result;
 }
 
@@ -1292,7 +1278,7 @@ static THREAD_FUNC_DECL MyThreadFunction(void *param)
 
       if (firstPass && indices.Size() == 1)
       {
-        DWORD curTime = GetTickCount() - startTime;
+        const DWORD curTime = GetTickCount() - startTime;
 
         /*
         if (curTime > 5 * 1000)
@@ -1312,7 +1298,7 @@ static THREAD_FUNC_DECL MyThreadFunction(void *param)
         DEBUG_PRINT_NUM(" -- firstPass -- time = ", curTime)
       }
       
-      processes.DisableWait(indices[waitResult]);
+      processes.DisableWait(indices[(unsigned)waitResult]);
     }
 
     firstPass = false;
@@ -1324,7 +1310,7 @@ static THREAD_FUNC_DECL MyThreadFunction(void *param)
   }
 
 
-  DWORD curTime = GetTickCount() - startTime;
+  const DWORD curTime = GetTickCount() - startTime;
 
   DEBUG_PRINT_NUM("after time = ", curTime)
 
@@ -1444,15 +1430,14 @@ static bool WriteZoneFile(CFSTR fileName, const CByteBuffer &buf)
 */
 
 /*
-class CBufSeqOutStream_WithFile:
-  public ISequentialOutStream,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_COM_1(
+  CBufSeqOutStream_WithFile
+  , ISequentialOutStream
+)
   Byte *_buffer;
   size_t _size;
   size_t _pos;
 
-
   size_t _fileWritePos;
   bool fileMode;
 public:
@@ -1478,9 +1463,6 @@ public:
 
   HRESULT FlushToFile();
   size_t GetPos() const { return _pos; }
-
-  MY_UNKNOWN_IMP
-  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
 };
 
 static const UInt32 kBlockSize = ((UInt32)1 << 31);
@@ -1565,7 +1547,7 @@ tryInternal tryExternal
                       alwaysStart(name)  : external
 */
 
-void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal, bool editMode, bool useEditor, const wchar_t *type)
+void CPanel::OpenItemInArchive(unsigned index, bool tryInternal, bool tryExternal, bool editMode, bool useEditor, const wchar_t *type)
 {
   // we don't want to change hash data here
   if (IsHashFolder())
@@ -1830,7 +1812,7 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal, bo
     // win7 / win10 work so for some extensions (pdf, html ..);
     DEBUG_PRINT("#### (HANDLE)process == 0");
     // return;
-    if (res != SZ_OK)
+    if (res != S_OK)
       return;
   }
 
@@ -1839,7 +1821,7 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal, bo
   tpi->FileIndex = index;
   tpi->RelPath = relPath;
   
-  if ((HANDLE)process != 0)
+  if ((HANDLE)process)
     tpi->Processes.SetMainProcess(process.Detach());
 
   ::CThread th;
diff --git a/CPP/7zip/UI/FileManager/PanelItems.cpp b/CPP/7zip/UI/FileManager/PanelItems.cpp
index 3cccf27..0cb33d8 100644
--- a/CPP/7zip/UI/FileManager/PanelItems.cpp
+++ b/CPP/7zip/UI/FileManager/PanelItems.cpp
@@ -41,7 +41,7 @@ static bool GetColumnVisible(PROPID propID, bool isFsFolder)
   return true;
 }
 
-static int GetColumnWidth(PROPID propID, VARTYPE /* varType */)
+static unsigned GetColumnWidth(PROPID propID, VARTYPE /* varType */)
 {
   switch (propID)
   {
@@ -216,7 +216,7 @@ HRESULT CPanel::InitColumns()
       item.IsVisible = isVisible;
       item.Width = columnInfo.Width;
       if (isVisible)
-        item.Order = order++;
+        item.Order = (int)(order++);
       continue;
     }
   }
@@ -225,14 +225,14 @@ HRESULT CPanel::InitColumns()
   {
     CPropColumn &item = _columns[i];
     if (item.IsVisible && item.Order < 0)
-      item.Order = order++;
+      item.Order = (int)(order++);
   }
   
   for (i = 0; i < _columns.Size(); i++)
   {
     CPropColumn &item = _columns[i];
     if (item.Order < 0)
-      item.Order = order++;
+      item.Order = (int)(order++);
   }
 
   CPropColumns newColumns;
@@ -285,14 +285,14 @@ HRESULT CPanel::InitColumns()
   {
     const CPropColumn &prop = newColumns[i];
     if (prop.Order < (int)newColumns.Size() && columns[prop.Order] == -1)
-      columns[prop.Order] = i;
+      columns[prop.Order] = (int)i;
     else
       orderError = true;
   }
 
   for (;;)
   {
-    unsigned numColumns = _visibleColumns.Size();
+    const unsigned numColumns = _visibleColumns.Size();
     if (numColumns == 0)
       break;
     DeleteColumn(numColumns - 1);
@@ -319,14 +319,14 @@ void CPanel::DeleteColumn(unsigned index)
 
 void CPanel::AddColumn(const CPropColumn &prop)
 {
-  const int index = _visibleColumns.Size();
+  const unsigned index = _visibleColumns.Size();
   
   LV_COLUMNW column;
   column.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_ORDER;
-  column.cx = prop.Width;
+  column.cx = (int)prop.Width;
   column.fmt = GetColumnAlign(prop.ID, prop.Type);
-  column.iOrder = index; // must be <= _listView.ItemCount
-  column.iSubItem = index; // must be <= _listView.ItemCount
+  column.iOrder = (int)index; // must be <= _listView.ItemCount
+  column.iSubItem = (int)index; // must be <= _listView.ItemCount
   column.pszText = const_cast<wchar_t *>((const wchar_t *)prop.Name);
 
   _visibleColumns.Add(prop);
@@ -346,7 +346,7 @@ int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData);
 void CPanel::GetSelectedNames(UStringVector &selectedNames)
 {
   CRecordVector<UInt32> indices;
-  GetSelectedItemsIndices(indices);
+  Get_ItemIndices_Selected(indices);
   selectedNames.ClearAndReserve(indices.Size());
   FOR_VECTOR (i, indices)
     selectedNames.AddInReserved(GetItemRelPath(indices[i]));
@@ -364,7 +364,7 @@ void CPanel::GetSelectedNames(UStringVector &selectedNames)
     item.mask = LVIF_TEXT | LVIF_PARAM;
     if (!_listView.GetItem(&item))
       continue;
-    int realIndex = GetRealIndex(item);
+    const unsigned realIndex = GetRealIndex(item);
     if (realIndex == kParentIndex)
       continue;
     if (_selectedStatusVector[realIndex])
@@ -384,7 +384,7 @@ void CPanel::SaveSelectedState(CSelectedState &s)
   {
     if (s.FocusedItem >= 0)
     {
-      int realIndex = GetRealItemIndex(s.FocusedItem);
+      const unsigned realIndex = GetRealItemIndex(s.FocusedItem);
       if (realIndex != kParentIndex)
       {
         s.FocusedName = GetItemRelPath(realIndex);
@@ -422,10 +422,11 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &s)
 }
 */
 
-HRESULT CPanel::RefreshListCtrl_SaveFocused()
+HRESULT CPanel::RefreshListCtrl_SaveFocused(bool onTimer)
 {
   CSelectedState state;
   SaveSelectedState(state);
+  state.CalledFromTimer = onTimer;
   return RefreshListCtrl(state);
 }
 
@@ -437,7 +438,7 @@ void CPanel::SetFocusedSelectedItem(int index, bool select)
   _listView.SetItemState(index, state, state);
   if (!_mySelectMode && select)
   {
-    int realIndex = GetRealItemIndex(index);
+    const unsigned realIndex = GetRealItemIndex(index);
     if (realIndex != kParentIndex)
       _selectedStatusVector[realIndex] = true;
   }
@@ -464,6 +465,9 @@ extern UInt32 g_NumMessages;
 
 HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
 {
+  m_DropHighlighted_SelectionIndex = -1;
+  m_DropHighlighted_SubFolderName.Empty();
+
   if (!_folder)
     return S_OK;
 
@@ -474,7 +478,8 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
   */
 
   _dontShowMode = false;
-  LoadFullPathAndShow();
+  if (!state.CalledFromTimer)
+    LoadFullPathAndShow();
   // OutputDebugStringA("=======\n");
   // OutputDebugStringA("s1 \n");
   CDisableTimerProcessing timerProcessing(*this);
@@ -506,11 +511,13 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
   
   // m_Files.Clear();
 
+  /*
   if (!_folder)
   {
     // throw 1;
     SetToRootFolder();
   }
+  */
   
   _headerToolBar.EnableButton(kParentFolderID, !IsRootFolder());
 
@@ -530,16 +537,44 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
   }
   */
 
+  _isDirVector.Clear();
   // DWORD tickCount1 = GetTickCount();
-  RINOK(_folder->LoadItems());
+  IFolderFolder *folder = _folder;
+  RINOK(_folder->LoadItems())
   // DWORD tickCount2 = GetTickCount();
-  RINOK(InitColumns());
-
   // OutputDebugString(TEXT("Start Dir\n"));
+  RINOK(InitColumns())
+
   UInt32 numItems;
   _folder->GetNumberOfItems(&numItems);
+  {
+    NCOM::CPropVariant prop;
+    _isDirVector.ClearAndSetSize(numItems);
+    bool *vec = (bool *)&_isDirVector.Front();
+    HRESULT hres = S_OK;
+    unsigned i;
+    for (i = 0; i < numItems; i++)
+    {
+      hres = folder->GetProperty(i, kpidIsDir, &prop);
+      if (hres != S_OK)
+        break;
+      bool v = false;
+      if (prop.vt == VT_BOOL)
+        v = VARIANT_BOOLToBool(prop.boolVal);
+      else if (prop.vt != VT_EMPTY)
+        break;
+      vec[i] = v;
+    }
+    if (i != numItems)
+    {
+      _isDirVector.Clear();
+      if (hres == S_OK)
+        hres = E_FAIL;
+    }
+    RINOK(hres)
+  }
 
-  bool showDots = _showDots && !IsRootFolder();
+  const bool showDots = _showDots && !IsRootFolder();
 
   _listView.SetItemCount(numItems + (showDots ? 1 : 0));
 
@@ -582,20 +617,20 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
 
   if (showDots)
   {
-    UString itemName ("..");
+    const UString itemName ("..");
     item.iItem = listViewItemCount;
     if (itemName == state.FocusedName)
       cursorIndex = listViewItemCount;
     item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
     int subItem = 0;
     item.iSubItem = subItem++;
-    item.lParam = kParentIndex;
+    item.lParam = (LPARAM)(int)kParentIndex;
     #ifdef USE_EMBED_ITEM
     item.pszText = const_cast<wchar_t *>((const wchar_t *)itemName);
     #else
     item.pszText = LPSTR_TEXTCALLBACKW;
     #endif
-    UInt32 attrib = FILE_ATTRIBUTE_DIRECTORY;
+    const UInt32 attrib = FILE_ATTRIBUTE_DIRECTORY;
     item.iImage = _extToIconMap.GetIconIndex(attrib, itemName);
     if (item.iImage < 0)
       item.iImage = 0;
@@ -671,7 +706,7 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
     item.iItem = listViewItemCount;
     
     item.iSubItem = subItem++;
-    item.lParam = i;
+    item.lParam = (LPARAM)i;
     
     /*
     int finish = nameLen - 4;
@@ -731,7 +766,7 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
       UInt32 attrib = 0;
       {
         NCOM::CPropVariant prop;
-        RINOK(_folder->GetProperty(i, kpidAttrib, &prop));
+        RINOK(_folder->GetProperty(i, kpidAttrib, &prop))
         if (prop.vt == VT_UI4)
           attrib = prop.ulVal;
       }
@@ -844,7 +879,7 @@ HRESULT CPanel::RefreshListCtrl(const CSelectedState &state)
 }
 
 
-void CPanel::GetSelectedItemsIndices(CRecordVector<UInt32> &indices) const
+void CPanel::Get_ItemIndices_Selected(CRecordVector<UInt32> &indices) const
 {
   indices.Clear();
   /*
@@ -858,46 +893,49 @@ void CPanel::GetSelectedItemsIndices(CRecordVector<UInt32> &indices) const
   HeapSort(&indices.Front(), indices.Size());
   */
   const bool *v = &_selectedStatusVector.Front();
-  unsigned size = _selectedStatusVector.Size();
+  const unsigned size = _selectedStatusVector.Size();
   for (unsigned i = 0; i < size; i++)
     if (v[i])
       indices.Add(i);
 }
 
 
-void CPanel::GetOperatedItemIndices(CRecordVector<UInt32> &indices) const
+void CPanel::Get_ItemIndices_Operated(CRecordVector<UInt32> &indices) const
 {
-  GetSelectedItemsIndices(indices);
+  Get_ItemIndices_Selected(indices);
   if (!indices.IsEmpty())
     return;
   if (_listView.GetSelectedCount() == 0)
     return;
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem >= 0)
   {
     if (_listView.IsItemSelected(focusedItem))
     {
-      int realIndex = GetRealItemIndex(focusedItem);
+      const unsigned realIndex = GetRealItemIndex(focusedItem);
       if (realIndex != kParentIndex)
         indices.Add(realIndex);
     }
   }
 }
 
-void CPanel::GetAllItemIndices(CRecordVector<UInt32> &indices) const
+void CPanel::Get_ItemIndices_All(CRecordVector<UInt32> &indices) const
 {
   indices.Clear();
   UInt32 numItems;
-  if (_folder->GetNumberOfItems(&numItems) == S_OK)
-    for (UInt32 i = 0; i < numItems; i++)
-      indices.Add(i);
+  if (_folder->GetNumberOfItems(&numItems) != S_OK)
+    return;
+  indices.ClearAndSetSize(numItems);
+  UInt32 *vec = (UInt32 *)&indices.Front();
+  for (UInt32 i = 0; i < numItems; i++)
+    vec[i] = i;
 }
 
-void CPanel::GetOperatedIndicesSmart(CRecordVector<UInt32> &indices) const
+void CPanel::Get_ItemIndices_OperSmart(CRecordVector<UInt32> &indices) const
 {
-  GetOperatedItemIndices(indices);
+  Get_ItemIndices_Operated(indices);
   if (indices.IsEmpty() || (indices.Size() == 1 && indices[0] == (UInt32)(Int32)-1))
-    GetAllItemIndices(indices);
+    Get_ItemIndices_All(indices);
 }
 
 /*
@@ -907,14 +945,14 @@ void CPanel::GetOperatedListViewIndices(CRecordVector<UInt32> &indices) const
   int numItems = _listView.GetItemCount();
   for (int i = 0; i < numItems; i++)
   {
-    int realIndex = GetRealItemIndex(i);
+    const unsigned realIndex = GetRealItemIndex(i);
     if (realIndex >= 0)
       if (_selectedStatusVector[realIndex])
         indices.Add(i);
   }
   if (indices.IsEmpty())
   {
-    int focusedItem = _listView.GetFocusedItem();
+    const int focusedItem = _listView.GetFocusedItem();
       if (focusedItem >= 0)
         indices.Add(focusedItem);
   }
@@ -931,7 +969,7 @@ void CPanel::EditItem(bool useEditor)
     {
       bool needRefresh = false;
       CRecordVector<UInt32> indices;
-      GetOperatedItemIndices(indices);
+      Get_ItemIndices_Operated(indices);
       FOR_VECTOR (i, indices)
       {
         UInt32 index = indices[i];
@@ -952,10 +990,10 @@ void CPanel::EditItem(bool useEditor)
   }
 
 
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int realIndex = GetRealItemIndex(focusedItem);
+  const unsigned realIndex = GetRealItemIndex(focusedItem);
   if (realIndex == kParentIndex)
     return;
   if (!IsItem_Folder(realIndex))
@@ -964,10 +1002,10 @@ void CPanel::EditItem(bool useEditor)
 
 void CPanel::OpenFocusedItemAsInternal(const wchar_t *type)
 {
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int realIndex = GetRealItemIndex(focusedItem);
+  const unsigned realIndex = GetRealItemIndex(focusedItem);
   if (IsItem_Folder(realIndex))
     OpenFolder(realIndex);
   else
@@ -977,17 +1015,17 @@ void CPanel::OpenFocusedItemAsInternal(const wchar_t *type)
 void CPanel::OpenSelectedItems(bool tryInternal)
 {
   CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
+  Get_ItemIndices_Operated(indices);
   if (indices.Size() > 20)
   {
     MessageBox_Error_LangID(IDS_TOO_MANY_ITEMS);
     return;
   }
   
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem >= 0)
   {
-    int realIndex = GetRealItemIndex(focusedItem);
+    const unsigned realIndex = GetRealItemIndex(focusedItem);
     if (realIndex == kParentIndex && (tryInternal || indices.Size() == 0) && _listView.IsItemSelected(focusedItem))
       indices.Insert(0, realIndex);
   }
@@ -1016,7 +1054,7 @@ void CPanel::OpenSelectedItems(bool tryInternal)
   }
 }
 
-UString CPanel::GetItemName(int itemIndex) const
+UString CPanel::GetItemName(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return L"..";
@@ -1028,7 +1066,7 @@ UString CPanel::GetItemName(int itemIndex) const
   return prop.bstrVal;
 }
 
-UString CPanel::GetItemName_for_Copy(int itemIndex) const
+UString CPanel::GetItemName_for_Copy(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return L"..";
@@ -1048,7 +1086,7 @@ UString CPanel::GetItemName_for_Copy(int itemIndex) const
   return Get_Correct_FsFile_Name(s);
 }
 
-void CPanel::GetItemName(int itemIndex, UString &s) const
+void CPanel::GetItemName(unsigned itemIndex, UString &s) const
 {
   if (itemIndex == kParentIndex)
   {
@@ -1063,7 +1101,7 @@ void CPanel::GetItemName(int itemIndex, UString &s) const
   s.SetFromBstr(prop.bstrVal);
 }
 
-UString CPanel::GetItemPrefix(int itemIndex) const
+UString CPanel::GetItemPrefix(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return UString();
@@ -1076,12 +1114,12 @@ UString CPanel::GetItemPrefix(int itemIndex) const
   return prefix;
 }
 
-UString CPanel::GetItemRelPath(int itemIndex) const
+UString CPanel::GetItemRelPath(unsigned itemIndex) const
 {
   return GetItemPrefix(itemIndex) + GetItemName(itemIndex);
 }
 
-UString CPanel::GetItemRelPath2(int itemIndex) const
+UString CPanel::GetItemRelPath2(unsigned itemIndex) const
 {
   UString s = GetItemRelPath(itemIndex);
   #if defined(_WIN32) && !defined(UNDER_CE)
@@ -1094,7 +1132,50 @@ UString CPanel::GetItemRelPath2(int itemIndex) const
   return s;
 }
 
-UString CPanel::GetItemFullPath(int itemIndex) const
+
+void CPanel::Add_ItemRelPath2_To_String(unsigned itemIndex, UString &s) const
+{
+  if (itemIndex == kParentIndex)
+  {
+    s += "..";
+    return;
+  }
+
+  const unsigned start = s.Len();
+  NCOM::CPropVariant prop;
+  if (_folder->GetProperty(itemIndex, kpidPrefix, &prop) != S_OK)
+    throw 2723400;
+  if (prop.vt == VT_BSTR)
+    s += prop.bstrVal;
+
+  const wchar_t *name = NULL;
+  unsigned nameLen = 0;
+    
+  if (_folderGetItemName)
+    _folderGetItemName->GetItemName(itemIndex, &name, &nameLen);
+  if (name)
+    s += name;
+  else
+  {
+    prop.Clear();
+    if (_folder->GetProperty(itemIndex, kpidName, &prop) != S_OK)
+      throw 2723400;
+    if (prop.vt != VT_BSTR)
+      throw 2723401;
+    s += prop.bstrVal;
+  }
+
+  #if defined(_WIN32) && !defined(UNDER_CE)
+    if (s.Len() - start == 2 && NFile::NName::IsDrivePath2(s.Ptr(start)))
+    {
+      if (IsFSDrivesFolder() && !IsDeviceDrivesPrefix())
+        s.Add_PathSepar();
+    }
+  #endif
+}
+
+
+UString CPanel::GetItemFullPath(unsigned itemIndex) const
 {
   return GetFsPath() + GetItemRelPath2(itemIndex);
 }
@@ -1111,28 +1192,30 @@ bool CPanel::GetItem_BoolProp(UInt32 itemIndex, PROPID propID) const
   throw 2723401;
 }
 
-bool CPanel::IsItem_Deleted(int itemIndex) const
+bool CPanel::IsItem_Deleted(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return false;
   return GetItem_BoolProp(itemIndex, kpidIsDeleted);
 }
 
-bool CPanel::IsItem_Folder(int itemIndex) const
+bool CPanel::IsItem_Folder(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return true;
+  if (itemIndex < _isDirVector.Size())
+    return _isDirVector[itemIndex];
   return GetItem_BoolProp(itemIndex, kpidIsDir);
 }
 
-bool CPanel::IsItem_AltStream(int itemIndex) const
+bool CPanel::IsItem_AltStream(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return false;
   return GetItem_BoolProp(itemIndex, kpidIsAltStream);
 }
 
-UInt64 CPanel::GetItem_UInt64Prop(int itemIndex, PROPID propID) const
+UInt64 CPanel::GetItem_UInt64Prop(unsigned itemIndex, PROPID propID) const
 {
   if (itemIndex == kParentIndex)
     return 0;
@@ -1145,7 +1228,7 @@ UInt64 CPanel::GetItem_UInt64Prop(int itemIndex, PROPID propID) const
   return 0;
 }
 
-UInt64 CPanel::GetItemSize(int itemIndex) const
+UInt64 CPanel::GetItemSize(unsigned itemIndex) const
 {
   if (itemIndex == kParentIndex)
     return 0;
@@ -1169,7 +1252,7 @@ void CPanel::SaveListViewInfo()
     if (!_listView.GetColumn(i, &winColumnInfo))
       throw 1;
     prop.Order = winColumnInfo.iOrder;
-    prop.Width = winColumnInfo.cx;
+    prop.Width = (UInt32)(Int32)winColumnInfo.cx;
   }
 
   CListViewInfo viewInfo;
@@ -1247,22 +1330,22 @@ void CPanel::ShowColumnsContextMenu(int x, int y)
     menu.AppendItem(flags, kCommandStart + i, prop.Name);
   }
   
-  int menuResult = menu.Track(TPM_LEFTALIGN | TPM_RETURNCMD | TPM_NONOTIFY, x, y, _listView);
+  const int menuResult = menu.Track(TPM_LEFTALIGN | TPM_RETURNCMD | TPM_NONOTIFY, x, y, _listView);
   
   if (menuResult >= kCommandStart && menuResult <= kCommandStart + (int)_columns.Size())
   {
-    int index = menuResult - kCommandStart;
+    const unsigned index = (unsigned)(menuResult - kCommandStart);
     CPropColumn &prop = _columns[index];
     prop.IsVisible = !prop.IsVisible;
 
     if (prop.IsVisible)
     {
-      prop.Order = _visibleColumns.Size();
+      prop.Order = (int)_visibleColumns.Size();
       AddColumn(prop);
     }
     else
     {
-      int visibleIndex = _visibleColumns.FindItem_for_PropID(prop.ID);
+      const int visibleIndex = _visibleColumns.FindItem_for_PropID(prop.ID);
       if (visibleIndex >= 0)
       {
         /*
@@ -1277,15 +1360,15 @@ void CPanel::ShowColumnsContextMenu(int x, int y)
           _sortID = kpidName;
           _ascending = true;
         }
-        DeleteColumn(visibleIndex);
+        DeleteColumn((unsigned)visibleIndex);
       }
     }
   }
 }
 
-void CPanel::OnReload()
+void CPanel::OnReload(bool onTimer)
 {
-  HRESULT res = RefreshListCtrl_SaveFocused();
+  const HRESULT res = RefreshListCtrl_SaveFocused(onTimer);
   if (res != S_OK)
     MessageBox_Error_HRESULT(res);
 }
@@ -1304,5 +1387,5 @@ void CPanel::OnTimer()
     return;
   if (wasChanged == 0)
     return;
-  OnReload();
+  OnReload(true); // onTimer
 }
diff --git a/CPP/7zip/UI/FileManager/PanelKey.cpp b/CPP/7zip/UI/FileManager/PanelKey.cpp
index 3ab478e..a4ea489 100644
--- a/CPP/7zip/UI/FileManager/PanelKey.cpp
+++ b/CPP/7zip/UI/FileManager/PanelKey.cpp
@@ -29,9 +29,9 @@ static const CVKeyPropIDPair g_VKeyPropIDPairs[] =
 
 static int FindVKeyPropIDPair(WORD vKey)
 {
-  for (unsigned i = 0; i < ARRAY_SIZE(g_VKeyPropIDPairs); i++)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(g_VKeyPropIDPairs); i++)
     if (g_VKeyPropIDPairs[i].VKey == vKey)
-      return i;
+      return (int)i;
   return -1;
 }
 
@@ -43,17 +43,18 @@ bool CPanel::OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result)
     _panelCallback->OnTab();
     return false;
   }
-  bool alt = IsKeyDown(VK_MENU);
-  bool ctrl = IsKeyDown(VK_CONTROL);
-  // bool leftCtrl = IsKeyDown(VK_LCONTROL);
-  bool rightCtrl = IsKeyDown(VK_RCONTROL);
-  bool shift = IsKeyDown(VK_SHIFT);
+  const bool alt = IsKeyDown(VK_MENU);
+  const bool ctrl = IsKeyDown(VK_CONTROL);
+  // const bool leftCtrl = IsKeyDown(VK_LCONTROL);
+  const bool rightCtrl = IsKeyDown(VK_RCONTROL);
+  const bool shift = IsKeyDown(VK_SHIFT);
   result = 0;
 
-  if (keyDownInfo->wVKey >= '0' && keyDownInfo->wVKey <= '9' &&
+  if (keyDownInfo->wVKey >= '0' &&
+      keyDownInfo->wVKey <= '9' &&
       (rightCtrl || alt))
   {
-    int index = keyDownInfo->wVKey - '0';
+    const unsigned index = (unsigned)(keyDownInfo->wVKey - '0');
     if (shift)
     {
       SetBookmark(index);
@@ -67,7 +68,8 @@ bool CPanel::OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result)
   }
 
   if ((keyDownInfo->wVKey == VK_F2 ||
-    keyDownInfo->wVKey == VK_F1) && alt && !ctrl && !shift)
+       keyDownInfo->wVKey == VK_F1)
+       && alt && !ctrl && !shift)
   {
     _panelCallback->SetFocusToPath(keyDownInfo->wVKey == VK_F1 ? 0 : 1);
     return true;
@@ -80,7 +82,7 @@ bool CPanel::OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result)
 
   if (keyDownInfo->wVKey >= VK_F3 && keyDownInfo->wVKey <= VK_F12 && ctrl)
   {
-    int index = FindVKeyPropIDPair(keyDownInfo->wVKey);
+    const int index = FindVKeyPropIDPair(keyDownInfo->wVKey);
     if (index >= 0)
       SortItemsWithPropID(g_VKeyPropIDPairs[index].PropID);
   }
@@ -313,6 +315,14 @@ bool CPanel::OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result)
         return true;
       }
       return false;
+    case 'W':
+      if (ctrl)
+      {
+        // SendMessage();
+        PostMessage(g_HWND, WM_COMMAND, IDCLOSE, 0);
+        return true;
+      }
+      return false;
     case 'Z':
       if (ctrl)
       {
@@ -326,7 +336,7 @@ bool CPanel::OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result)
     case '4':
       if (ctrl)
       {
-        int styleIndex = keyDownInfo->wVKey - '1';
+        const unsigned styleIndex = (unsigned)(keyDownInfo->wVKey - '1');
         SetListViewMode(styleIndex);
         return true;
       }
diff --git a/CPP/7zip/UI/FileManager/PanelListNotify.cpp b/CPP/7zip/UI/FileManager/PanelListNotify.cpp
index d2114f1..2fb0e87 100644
--- a/CPP/7zip/UI/FileManager/PanelListNotify.cpp
+++ b/CPP/7zip/UI/FileManager/PanelListNotify.cpp
@@ -289,8 +289,8 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
     const void *data;
     UInt32 dataSize;
     UInt32 propType;
-    RINOK(_folderRawProps->GetRawProp(realIndex, propID, &data, &dataSize, &propType));
-    unsigned limit = item.cchTextMax - 1;
+    RINOK(_folderRawProps->GetRawProp(realIndex, propID, &data, &dataSize, &propType))
+    const unsigned limit = (unsigned)item.cchTextMax - 1;
     if (dataSize == 0)
     {
       text[0] = 0;
@@ -425,11 +425,11 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
       if (name)
       {
         unsigned dest = 0;
-        unsigned limit = item.cchTextMax - 1;
+        const unsigned limit = (unsigned)item.cchTextMax - 1;
         
         for (unsigned i = 0; dest < limit;)
         {
-          wchar_t c = name[i++];
+          const wchar_t c = name[i++];
           if (c == 0)
             break;
           text[dest++] = c;
@@ -488,10 +488,10 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
       if (name)
       {
         unsigned dest = 0;
-        unsigned limit = item.cchTextMax - 1;
+        const unsigned limit = (unsigned)item.cchTextMax - 1;
         for (unsigned i = 0; dest < limit;)
         {
-          wchar_t c = name[i++];
+          const wchar_t c = name[i++];
           if (c == 0)
             break;
           text[dest++] = c;
@@ -502,7 +502,7 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
     }
   }
   
-  HRESULT res = _folder->GetProperty(realIndex, propID, &prop);
+  const HRESULT res = _folder->GetProperty(realIndex, propID, &prop);
   
   if (res != S_OK)
   {
@@ -517,7 +517,7 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
   }
   else if (prop.vt == VT_BSTR)
   {
-    unsigned limit = item.cchTextMax - 1;
+    const unsigned limit = (unsigned)item.cchTextMax - 1;
     const wchar_t *src = prop.bstrVal;
     unsigned i;
     for (i = 0; i < limit; i++)
@@ -535,10 +535,10 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
     char temp[64];
     ConvertPropertyToShortString2(temp, prop, propID, _timestampLevel);
     unsigned i;
-    unsigned limit = item.cchTextMax - 1;
+    const unsigned limit = (unsigned)item.cchTextMax - 1;
     for (i = 0; i < limit; i++)
     {
-      wchar_t c = (Byte)temp[i];
+      const wchar_t c = (Byte)temp[i];
       if (c == 0)
         break;
       text[i] = c;
@@ -555,11 +555,11 @@ extern DWORD g_ComCtl32Version;
 
 void CPanel::OnItemChanged(NMLISTVIEW *item)
 {
-  int index = (int)item->lParam;
+  const unsigned index = (unsigned)item->lParam;
   if (index == kParentIndex)
     return;
-  bool oldSelected = (item->uOldState & LVIS_SELECTED) != 0;
-  bool newSelected = (item->uNewState & LVIS_SELECTED) != 0;
+  const bool oldSelected = (item->uOldState & LVIS_SELECTED) != 0;
+  const bool newSelected = (item->uNewState & LVIS_SELECTED) != 0;
   // Don't change this code. It works only with such check
   if (oldSelected != newSelected)
     _selectedStatusVector[index] = newSelected;
@@ -712,7 +712,13 @@ bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
     }
     case LVN_BEGINDRAG:
     {
-      OnDrag((LPNMLISTVIEW)header);
+      OnDrag((LPNMLISTVIEW)header, false);
+      Post_Refresh_StatusBar();
+      break;
+    }
+    case LVN_BEGINRDRAG:
+    {
+      OnDrag((LPNMLISTVIEW)header, true);
       Post_Refresh_StatusBar();
       break;
     }
@@ -739,7 +745,7 @@ bool CPanel::OnCustomDraw(LPNMLVCUSTOMDRAW lplvcd, LRESULT &result)
     lplvcd->clrTextBk = GetBkColorForItem(lplvcd->nmcd.dwItemSpec,
     lplvcd->nmcd.lItemlParam);
     */
-    int realIndex = (int)lplvcd->nmcd.lItemlParam;
+    const unsigned realIndex = (unsigned)lplvcd->nmcd.lItemlParam;
     lplvcd->clrTextBk = _listView.GetBkColor();
     if (_mySelectMode)
     {
@@ -793,40 +799,44 @@ void CPanel::Refresh_StatusBar()
   // DWORD dw = GetTickCount();
 
   CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
-
-  wchar_t temp[32];
-  ConvertUInt32ToString(indices.Size(), temp);
-  wcscat(temp, L" / ");
-  ConvertUInt32ToString(_selectedStatusVector.Size(), temp + wcslen(temp));
-
-  // UString s1 = MyFormatNew(g_App.LangString_N_SELECTED_ITEMS, NumberToString(indices.Size()));
-  // UString s1 = MyFormatNew(IDS_N_SELECTED_ITEMS, NumberToString(indices.Size()));
-  _statusBar.SetText(0, MyFormatNew(g_App.LangString_N_SELECTED_ITEMS, temp));
-  // _statusBar.SetText(0, MyFormatNew(IDS_N_SELECTED_ITEMS, NumberToString(indices.Size())));
+  Get_ItemIndices_Operated(indices);
 
-  wchar_t selectSizeString[32];
-  selectSizeString[0] = 0;
+  {
+    UString s;
+    s.Add_UInt32(indices.Size());
+    s += " / ";
+    s.Add_UInt32(_selectedStatusVector.Size());
+
+    // UString s1 = MyFormatNew(g_App.LangString_N_SELECTED_ITEMS, NumberToString(indices.Size()));
+    // UString s1 = MyFormatNew(IDS_N_SELECTED_ITEMS, NumberToString(indices.Size()));
+    _statusBar.SetText(0, MyFormatNew(g_App.LangString_N_SELECTED_ITEMS, s));
+    // _statusBar.SetText(0, MyFormatNew(IDS_N_SELECTED_ITEMS, NumberToString(indices.Size())));
+  }
 
-  if (indices.Size() > 0)
   {
-    // for (unsigned ttt = 0; ttt < 1000; ttt++) {
-    UInt64 totalSize = 0;
-    FOR_VECTOR (i, indices)
-      totalSize += GetItemSize(indices[i]);
-    ConvertSizeToString(totalSize, selectSizeString);
-    // }
+    wchar_t selectSizeString[32];
+    selectSizeString[0] = 0;
+    
+    if (indices.Size() > 0)
+    {
+      // for (unsigned ttt = 0; ttt < 1000; ttt++) {
+      UInt64 totalSize = 0;
+      FOR_VECTOR (i, indices)
+        totalSize += GetItemSize(indices[i]);
+      ConvertSizeToString(totalSize, selectSizeString);
+      // }
+    }
+    _statusBar.SetText(1, selectSizeString);
   }
-  _statusBar.SetText(1, selectSizeString);
 
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   wchar_t sizeString[32];
   sizeString[0] = 0;
   wchar_t dateString[32];
   dateString[0] = 0;
   if (focusedItem >= 0 && _listView.GetSelectedCount() > 0)
   {
-    int realIndex = GetRealItemIndex(focusedItem);
+    const unsigned realIndex = GetRealItemIndex(focusedItem);
     if (realIndex != kParentIndex)
     {
       ConvertSizeToString(GetItemSize(realIndex), sizeString);
diff --git a/CPP/7zip/UI/FileManager/PanelMenu.cpp b/CPP/7zip/UI/FileManager/PanelMenu.cpp
index 9e86951..f0afe15 100644
--- a/CPP/7zip/UI/FileManager/PanelMenu.cpp
+++ b/CPP/7zip/UI/FileManager/PanelMenu.cpp
@@ -20,8 +20,10 @@
 #include "MyLoadMenu.h"
 #include "PropertyName.h"
 
-#include "resource.h"
 #include "PropertyNameRes.h"
+#include "resource.h"
+
+// #define SHOW_DEBUG_PANEL_MENU
 
 using namespace NWindows;
 
@@ -32,13 +34,33 @@ LONG g_DllRefCount = 0;
 static const UINT kSevenZipStartMenuID = kMenuCmdID_Plugin_Start;
 static const UINT kSystemStartMenuID = kMenuCmdID_Plugin_Start + 400;
 
+
+#ifdef SHOW_DEBUG_PANEL_MENU
+static void Print_Ptr(void *p, const char *s)
+{
+  char temp[32];
+  ConvertUInt64ToHex((UInt64)(void *)p, temp);
+  AString m;
+  m += temp;
+  m.Add_Space();
+  m += s;
+  OutputDebugStringA(m);
+}
+#define ODS(sz) { Print_Ptr(this, sz); }
+#define ODS_U(s) { OutputDebugStringW(s); }
+#else
+#define ODS(sz)
+#define ODS_U(s)
+#endif
+
+
 void CPanel::InvokeSystemCommand(const char *command)
 {
   NCOM::CComInitializer comInitializer;
   if (!IsFsOrPureDrivesFolder())
     return;
   CRecordVector<UInt32> operatedIndices;
-  GetOperatedItemIndices(operatedIndices);
+  Get_ItemIndices_Operated(operatedIndices);
   if (operatedIndices.IsEmpty())
     return;
   CMyComPtr<IContextMenu> contextMenu;
@@ -173,7 +195,7 @@ void CPanel::Properties()
     // message.SelectFirst = false;
 
     CRecordVector<UInt32> operatedIndices;
-    GetOperatedItemIndices(operatedIndices);
+    Get_ItemIndices_Operated(operatedIndices);
     
     if (operatedIndices.Size() == 1)
     {
@@ -346,7 +368,7 @@ void CPanel::Properties()
             UInt32 numProps;
             if (getProps->GetArcNumProps(level, &numProps) == S_OK)
             {
-              const int kNumSpecProps = ARRAY_SIZE(kSpecProps);
+              const int kNumSpecProps = Z7_ARRAY_SIZE(kSpecProps);
 
               AddSeparator(message);
               
@@ -357,7 +379,7 @@ void CPanel::Properties()
                 VARTYPE vt;
                 if (i < 0)
                   propID = kSpecProps[i + kNumSpecProps];
-                else if (getProps->GetArcPropInfo(level, i, &name, &propID, &vt) != S_OK)
+                else if (getProps->GetArcPropInfo(level, (UInt32)i, &name, &propID, &vt) != S_OK)
                   continue;
                 NCOM::CPropVariant prop;
                 if (getProps->GetArcProp(level, propID, &prop) != S_OK)
@@ -369,12 +391,12 @@ void CPanel::Properties()
           
           if (level2 < numLevels - 1)
           {
-            UInt32 level = numLevels - 1 - level2;
+            const UInt32 level = numLevels - 1 - level2;
             UInt32 numProps;
             if (getProps->GetArcNumProps2(level, &numProps) == S_OK)
             {
               AddSeparatorSmall(message);
-              for (Int32 i = 0; i < (Int32)numProps; i++)
+              for (UInt32 i = 0; i < numProps; i++)
               {
                 CMyComBSTR name;
                 PROPID propID;
@@ -393,11 +415,11 @@ void CPanel::Properties()
         {
           // we ERROR message for NonOpen level
               bool needSep = true;
-              const int kNumSpecProps = ARRAY_SIZE(kSpecProps);
+              const int kNumSpecProps = Z7_ARRAY_SIZE(kSpecProps);
               for (Int32 i = -(int)kNumSpecProps; i < 0; i++)
               {
                 CMyComBSTR name;
-                PROPID propID = kSpecProps[i + kNumSpecProps];
+                const PROPID propID = kSpecProps[i + kNumSpecProps];
                 NCOM::CPropVariant prop;
                 if (getProps->GetArcProp(numLevels, propID, &prop) != S_OK)
                   continue;
@@ -440,7 +462,7 @@ void CPanel::EditCopy()
   */
   UString s;
   CRecordVector<UInt32> indices;
-  GetSelectedItemsIndices(indices);
+  Get_ItemIndices_Selected(indices);
   FOR_VECTOR (i, indices)
   {
     if (i != 0)
@@ -486,15 +508,25 @@ struct CFolderPidls
 };
 
 
+static HRESULT ShellFolder_ParseDisplayName(IShellFolder *shellFolder,
+    HWND hwnd, const UString &path, LPITEMIDLIST *ppidl)
+{
+  ULONG eaten = 0;
+  return shellFolder->ParseDisplayName(hwnd, NULL,
+      path.Ptr_non_const(), &eaten, ppidl, NULL);
+}
+
+
 HRESULT CPanel::CreateShellContextMenu(
     const CRecordVector<UInt32> &operatedIndices,
     CMyComPtr<IContextMenu> &systemContextMenu)
 {
+  ODS("==== CPanel::CreateShellContextMenu");
   systemContextMenu.Release();
-  const UString folderPath = GetFsPath();
+  UString folderPath = GetFsPath();
 
   CMyComPtr<IShellFolder> desktopFolder;
-  RINOK(::SHGetDesktopFolder(&desktopFolder));
+  RINOK(::SHGetDesktopFolder(&desktopFolder))
   if (!desktopFolder)
   {
     // ShowMessage("Failed to get Desktop folder");
@@ -502,24 +534,37 @@ HRESULT CPanel::CreateShellContextMenu(
   }
   
   CFolderPidls pidls;
-  DWORD eaten;
-
+  // NULL is allowed for parentHWND in ParseDisplayName()
+  const HWND parentHWND_for_ParseDisplayName = GetParent();
   // if (folderPath.IsEmpty()), then ParseDisplayName returns pidls of "My Computer"
-  RINOK(desktopFolder->ParseDisplayName(
-      GetParent(), NULL, folderPath.Ptr_non_const(),
-      &eaten, &pidls.parent, NULL));
+  /* win10: ParseDisplayName() supports folder path with tail slash
+    ParseDisplayName() returns {
+      E_INVALIDARG         : path with super path prefix "\\\\?\\"
+      ERROR_FILE_NOT_FOUND : path for network share (\\server\path1\long path2") larger than MAX_PATH
+    } */
+  const HRESULT res = ShellFolder_ParseDisplayName(desktopFolder,
+      parentHWND_for_ParseDisplayName,
+      folderPath, &pidls.parent);
+  if (res != S_OK)
+  {
+    ODS_U(folderPath);
+    if (res != E_INVALIDARG)
+      return res;
+    if (!NFile::NName::If_IsSuperPath_RemoveSuperPrefix(folderPath))
+      return res;
+    RINOK(ShellFolder_ParseDisplayName(desktopFolder,
+        parentHWND_for_ParseDisplayName,
+        folderPath, &pidls.parent))
+  }
+  if (!pidls.parent)
+    return E_FAIL;
 
   /*
-  STRRET pName;
-  res = desktopFolder->GetDisplayNameOf(pidls.parent,  SHGDN_NORMAL, &pName);
-  WCHAR dir[MAX_PATH];
-  if (!SHGetPathFromIDListW(pidls.parent, dir))
-    dir[0] = 0;
+  UString path2;
+  NShell::GetPathFromIDList(pidls.parent, path2);
+  ODS_U(path2);
   */
 
-  if (!pidls.parent)
-    return E_FAIL;
-
   if (operatedIndices.IsEmpty())
   {
     // how to get IContextMenu, if there are no selected files?
@@ -549,28 +594,37 @@ HRESULT CPanel::CreateShellContextMenu(
   
   CMyComPtr<IShellFolder> parentFolder;
   RINOK(desktopFolder->BindToObject(pidls.parent,
-      NULL, IID_IShellFolder, (void**)&parentFolder));
+      NULL, IID_IShellFolder, (void**)&parentFolder))
   if (!parentFolder)
-  {
-    // ShowMessage("Invalid file name");
     return E_FAIL;
-  }
+
+  ODS("==== CPanel::CreateShellContextMenu pidls START");
   
   pidls.items.ClearAndReserve(operatedIndices.Size());
+  UString fileName;
   FOR_VECTOR (i, operatedIndices)
   {
-    LPITEMIDLIST pidl;
-    const UString fileName = GetItemRelPath2(operatedIndices[i]);
-    RINOK(parentFolder->ParseDisplayName(GetParent(), 0,
-        fileName.Ptr_non_const(), &eaten, &pidl, 0));
+    fileName.Empty();
+    Add_ItemRelPath2_To_String(operatedIndices[i], fileName);
+    /* ParseDisplayName() in win10 returns:
+         E_INVALIDARG : if empty name, or path with dots only: "." , ".."
+         HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) : if there is no such file
+    */
+    LPITEMIDLIST pidl = NULL;
+    RINOK(ShellFolder_ParseDisplayName(parentFolder,
+        parentHWND_for_ParseDisplayName,
+        fileName, &pidl))
+    if (!pidl)
+      return E_FAIL;
     pidls.items.AddInReserved(pidl);
   }
-  
-  // Get IContextMenu for items
 
-  RINOK(parentFolder->GetUIObjectOf(GetParent(), pidls.items.Size(),
-      (LPCITEMIDLIST *)(void *)&pidls.items.Front(), IID_IContextMenu, 0, (void**)&systemContextMenu));
-  
+  ODS("==== CPanel::CreateShellContextMenu pidls END");
+  // Get IContextMenu for items
+  RINOK(parentFolder->GetUIObjectOf(GetParent(),
+      pidls.items.Size(), (LPCITEMIDLIST *)(void *)&pidls.items.Front(),
+      IID_IContextMenu, NULL, (void**)&systemContextMenu))
+  ODS("==== CPanel::CreateShellContextMenu GetUIObjectOf finished");
   if (!systemContextMenu)
   {
     // ShowMessage("Unable to get context menu interface");
@@ -579,14 +633,11 @@ HRESULT CPanel::CreateShellContextMenu(
   return S_OK;
 }
 
+
 // #define SHOW_DEBUG_FM_CTX_MENU
 
 #ifdef SHOW_DEBUG_FM_CTX_MENU
 
-#include <stdio.h>
-
-// #include Common/IntToString.h"
-
 static void PrintHex(UString &s, UInt32 v)
 {
   char sz[32];
@@ -597,16 +648,14 @@ static void PrintHex(UString &s, UInt32 v)
 static void PrintContextStr(UString &s, IContextMenu *ctxm, unsigned i, unsigned id, const char *name)
 {
   s += " | ";
-  name = name;
-  // s += name;
-  // s += ": ";
-
+  s += name;
+  s += ": ";
   UString s1;
   {
     char buf[256];
     buf[0] = 0;
-    HRESULT res = ctxm->GetCommandString(i, id,
-        NULL, buf, ARRAY_SIZE(buf) - 1);
+    const HRESULT res = ctxm->GetCommandString(i, id,
+        NULL, buf, Z7_ARRAY_SIZE(buf) - 1);
     if (res != S_OK)
     {
       PrintHex(s1, res);
@@ -614,13 +663,12 @@ static void PrintContextStr(UString &s, IContextMenu *ctxm, unsigned i, unsigned
     }
     s1 += GetUnicodeString(buf);
   }
-
   UString s2;
   {
     wchar_t buf2[256];
     buf2[0] = 0;
-    HRESULT res = ctxm->GetCommandString(i, id | GCS_UNICODE,
-        NULL, (char *)buf2, ARRAY_SIZE(buf2) - 1);
+    const HRESULT res = ctxm->GetCommandString(i, id | GCS_UNICODE,
+        NULL, (char *)buf2, Z7_ARRAY_SIZE(buf2) - sizeof(wchar_t));
     if (res != S_OK)
     {
       PrintHex(s2, res);
@@ -628,7 +676,6 @@ static void PrintContextStr(UString &s, IContextMenu *ctxm, unsigned i, unsigned
     }
     s2 += buf2;
   }
-  
   s += s1;
   if (s2.Compare(s1) != 0)
   {
@@ -637,7 +684,6 @@ static void PrintContextStr(UString &s, IContextMenu *ctxm, unsigned i, unsigned
   }
 }
 
-
 static void PrintAllContextItems(IContextMenu *ctxm, unsigned num)
 {
   for (unsigned i = 0; i < num; i++)
@@ -645,35 +691,18 @@ static void PrintAllContextItems(IContextMenu *ctxm, unsigned num)
     UString s;
     s.Add_UInt32(i);
     s += ": ";
-
-    /*
-    UString valid;
-    {
-      char name[256];
-      HRESULT res = ctxm->GetCommandString(i, GCS_VALIDATEA,
-        NULL, name, ARRAY_SIZE(name) - 1);
-      
-      if (res == S_OK)
-      {
-        // valid = "valid";
-      }
-      else if (res == S_FALSE)
-        valid = "non-valid";
-      else
-        PrintHex(valid, res);
-    }
-    s += valid;
-    */
-
     PrintContextStr(s, ctxm, i, GCS_VALIDATEA, "valid");
-    PrintContextStr(s, ctxm, i, GCS_VERBA, "v");
-    PrintContextStr(s, ctxm, i, GCS_HELPTEXTA, "h");
+    PrintContextStr(s, ctxm, i, GCS_VERBA, "verb");
+    PrintContextStr(s, ctxm, i, GCS_HELPTEXTA, "helptext");
     OutputDebugStringW(s);
   }
 }
+
 #endif
 
+
 void CPanel::CreateSystemMenu(HMENU menuSpec,
+    bool showExtendedVerbs,
     const CRecordVector<UInt32> &operatedIndices,
     CMyComPtr<IContextMenu> &systemContextMenu)
 {
@@ -722,19 +751,13 @@ void CPanel::CreateSystemMenu(HMENU menuSpec,
     CMenuDestroyer menuDestroyer(popupMenu);
     if (!popupMenu.CreatePopup())
       throw 210503;
-
-    HMENU hMenu = popupMenu;
-
-    DWORD Flags = CMF_EXPLORE;
-    // Optionally the shell will show the extended
-    // context menu on some operating systems when
-    // the shift key is held down at the time the
-    // context menu is invoked. The following is
-    // commented out but you can uncommnent this
-    // line to show the extended context menu.
-    // Flags |= 0x00000080;
-    HRESULT res = systemContextMenu->QueryContextMenu(hMenu, 0, kSystemStartMenuID, 0x7FFF, Flags);
-
+    const HMENU hMenu = popupMenu;
+    DWORD flags = CMF_EXPLORE;
+    if (showExtendedVerbs)
+      flags |= Z7_WIN_CMF_EXTENDEDVERBS;
+    ODS("=== systemContextMenu->QueryContextMenu START");
+    const HRESULT res = systemContextMenu->QueryContextMenu(hMenu, 0, kSystemStartMenuID, 0x7FFF, flags);
+    ODS("=== systemContextMenu->QueryContextMenu END");
     if (SUCCEEDED(res))
     {
       #ifdef SHOW_DEBUG_FM_CTX_MENU
@@ -779,11 +802,13 @@ void CPanel::CreateSystemMenu(HMENU menuSpec,
 
 void CPanel::CreateFileMenu(HMENU menuSpec)
 {
-  CreateFileMenu(menuSpec, _sevenZipContextMenu, _systemContextMenu, true);
+  CreateFileMenu(menuSpec, _sevenZipContextMenu, _systemContextMenu, true); // programMenu
 }
 
 void CPanel::CreateSevenZipMenu(HMENU menuSpec,
+    bool showExtendedVerbs,
     const CRecordVector<UInt32> &operatedIndices,
+    int firstDirIndex,
     CMyComPtr<IContextMenu> &sevenZipContextMenu)
 {
   sevenZipContextMenu.Release();
@@ -802,22 +827,23 @@ void CPanel::CreateSevenZipMenu(HMENU menuSpec,
     if (contextMenu.QueryInterface(IID_IInitContextMenu, &initContextMenu) != S_OK)
       return;
     */
-    UString currentFolderUnicode = GetFsPath();
-    UStringVector names;
-    unsigned i;
-    for (i = 0; i < operatedIndices.Size(); i++)
-      names.Add(currentFolderUnicode + GetItemRelPath2(operatedIndices[i]));
-    CRecordVector<const wchar_t *> namePointers;
-    for (i = 0; i < operatedIndices.Size(); i++)
-      namePointers.Add(names[i]);
-    
-    // NFile::NDirectory::MySetCurrentDirectory(currentFolderUnicode);
-    if (contextMenuSpec->InitContextMenu(currentFolderUnicode, &namePointers.Front(),
-        operatedIndices.Size()) == S_OK)
+    ODS("=== FileName List Add START")
+    // for (unsigned y = 0; y < 10000; y++, contextMenuSpec->_fileNames.Clear())
+    GetFilePaths(operatedIndices, contextMenuSpec->_fileNames);
+    ODS("=== FileName List Add END")
+    contextMenuSpec->Init_For_7zFM();
+    contextMenuSpec->_attribs.FirstDirIndex = firstDirIndex;
     {
-      HRESULT res = contextMenu->QueryContextMenu(menu, 0, kSevenZipStartMenuID,
-          kSystemStartMenuID - 1, 0);
-      bool sevenZipMenuCreated = SUCCEEDED(res);
+      DWORD flags = CMF_EXPLORE;
+      if (showExtendedVerbs)
+        flags |= Z7_WIN_CMF_EXTENDEDVERBS;
+      const HRESULT res = contextMenu->QueryContextMenu(menu,
+          0, // indexMenu
+          kSevenZipStartMenuID, // first
+          kSystemStartMenuID - 1, // last
+          flags);
+      ODS("=== contextMenu->QueryContextMenu END")
+      const bool sevenZipMenuCreated = SUCCEEDED(res);
       if (sevenZipMenuCreated)
       {
         // if (res != 0)
@@ -834,7 +860,6 @@ void CPanel::CreateSevenZipMenu(HMENU menuSpec,
       {
         // MessageBox_Error_HRESULT_Caption(res, L"QueryContextMenu");
       }
-
       // int code = HRESULT_CODE(res);
       // int nextItemID = code;
     }
@@ -917,19 +942,22 @@ void CPanel::CreateFileMenu(HMENU menuSpec,
   sevenZipContextMenu.Release();
   systemContextMenu.Release();
 
+  const bool showExtendedVerbs = IsKeyDown(VK_SHIFT);
+
   CRecordVector<UInt32> operatedIndices;
-  GetOperatedItemIndices(operatedIndices);
+  Get_ItemIndices_Operated(operatedIndices);
+  const int firstDirIndex = FindDir_InOperatedList(operatedIndices);
 
   CMenu menu;
   menu.Attach(menuSpec);
 
   if (!IsArcFolder())
   {
-    CreateSevenZipMenu(menu, operatedIndices, sevenZipContextMenu);
+    CreateSevenZipMenu(menu, showExtendedVerbs, operatedIndices, firstDirIndex, sevenZipContextMenu);
     // CreateSystemMenu is very slow if you call it inside ZIP archive with big number of files
     // Windows probably can parse items inside ZIP archive.
     if (g_App.ShowSystemMenu)
-      CreateSystemMenu(menu, operatedIndices, systemContextMenu);
+      CreateSystemMenu(menu, showExtendedVerbs, operatedIndices, systemContextMenu);
   }
 
   /*
@@ -937,19 +965,13 @@ void CPanel::CreateFileMenu(HMENU menuSpec,
     menu.AppendItem(MF_SEPARATOR, 0, (LPCTSTR)0);
   */
 
-  unsigned i;
-  for (i = 0; i < operatedIndices.Size(); i++)
-    if (IsItem_Folder(operatedIndices[i]))
-      break;
-  bool allAreFiles = (i == operatedIndices.Size());
-
   CFileMenu fm;
   
   fm.readOnly = IsThereReadOnlyFolder();
   fm.isHashFolder = IsHashFolder();
   fm.isFsFolder = Is_IO_FS_Folder();
   fm.programMenu = programMenu;
-  fm.allAreFiles = allAreFiles;
+  fm.allAreFiles = (firstDirIndex == -1);
   fm.numItems = operatedIndices.Size();
 
   fm.isAltStreamsSupported = false;
@@ -961,7 +983,7 @@ void CPanel::CreateFileMenu(HMENU menuSpec,
   {
     if (operatedIndices.Size() <= 1)
     {
-      Int32 realIndex = -1;
+      UInt32 realIndex = (UInt32)(Int32)-1;
       if (operatedIndices.Size() == 1)
         realIndex = operatedIndices[0];
       Int32 val = 0;
@@ -977,7 +999,7 @@ void CPanel::CreateFileMenu(HMENU menuSpec,
       fm.isAltStreamsSupported = IsFolder_with_FsItems();
   }
 
-  fm.Load(menu, menu.GetItemCount());
+  fm.Load(menu, (unsigned)menu.GetItemCount());
 }
 
 bool CPanel::InvokePluginCommand(unsigned id)
@@ -987,6 +1009,7 @@ bool CPanel::InvokePluginCommand(unsigned id)
 
 #if defined(_MSC_VER) && !defined(UNDER_CE)
 #define use_CMINVOKECOMMANDINFOEX
+/* CMINVOKECOMMANDINFOEX depends from (_WIN32_IE >= 0x0400) */
 #endif
 
 bool CPanel::InvokePluginCommand(unsigned id,
@@ -1096,7 +1119,7 @@ bool CPanel::OnContextMenu(HANDLE windowHandle, int xPos, int yPos)
   */
 
   CRecordVector<UInt32> operatedIndices;
-  GetOperatedItemIndices(operatedIndices);
+  Get_ItemIndices_Operated(operatedIndices);
 
   // negative x,y are possible for multi-screen modes.
   // x=-1 && y=-1 for keyboard call (SHIFT+F10 and others).
@@ -1130,9 +1153,9 @@ bool CPanel::OnContextMenu(HANDLE windowHandle, int xPos, int yPos)
 
   CMyComPtr<IContextMenu> sevenZipContextMenu;
   CMyComPtr<IContextMenu> systemContextMenu;
-  CreateFileMenu(menu, sevenZipContextMenu, systemContextMenu, false);
+  CreateFileMenu(menu, sevenZipContextMenu, systemContextMenu, false); // programMenu
 
-  unsigned id = menu.Track(TPM_LEFTALIGN
+  const unsigned id = (unsigned)menu.Track(TPM_LEFTALIGN
       #ifndef UNDER_CE
       | TPM_RIGHTBUTTON
       #endif
diff --git a/CPP/7zip/UI/FileManager/PanelOperations.cpp b/CPP/7zip/UI/FileManager/PanelOperations.cpp
index a683b5e..b61f4e9 100644
--- a/CPP/7zip/UI/FileManager/PanelOperations.cpp
+++ b/CPP/7zip/UI/FileManager/PanelOperations.cpp
@@ -24,9 +24,6 @@ using namespace NWindows;
 using namespace NFile;
 using namespace NName;
 
-#define MY_CAST_FUNC  (void(*)())
-// #define MY_CAST_FUNC
-
 #ifndef _UNICODE
 extern bool g_IsNT;
 #endif
@@ -40,7 +37,7 @@ enum EFolderOpType
 
 class CThreadFolderOperations: public CProgressThreadVirt
 {
-  HRESULT ProcessVirt();
+  HRESULT ProcessVirt() Z7_override;
 public:
   EFolderOpType OpType;
   UString Name;
@@ -58,7 +55,7 @@ public:
 HRESULT CThreadFolderOperations::ProcessVirt()
 {
   NCOM::CComInitializer comInitializer;
-  switch (OpType)
+  switch ((int)OpType)
   {
     case FOLDER_TYPE_CREATE_FOLDER:
       return FolderOperations->CreateFolder(Name, UpdateCallback);
@@ -94,7 +91,7 @@ HRESULT CThreadFolderOperations::DoOperation(CPanel &panel, const UString &progr
   MainTitle = "7-Zip"; // LangString(IDS_APP_TITLE);
   MainAddTitle = progressTitle + L' ';
 
-  RINOK(Create(progressTitle, MainWindow));
+  RINOK(Create(progressTitle, MainWindow))
   return Result;
 }
 
@@ -116,7 +113,7 @@ void CPanel::DeleteItems(bool NON_CE_VAR(toRecycleBin))
 {
   CDisableTimerProcessing disableTimerProcessing(*this);
   CRecordVector<UInt32> indices;
-  GetOperatedItemIndices(indices);
+  Get_ItemIndices_Operated(indices);
   if (indices.IsEmpty())
     return;
   CSelectedState state;
@@ -141,7 +138,7 @@ void CPanel::DeleteItems(bool NON_CE_VAR(toRecycleBin))
       fo.hwnd = GetParent();
       fo.wFunc = FO_DELETE;
       fo.pFrom = (const CHAR *)buffer;
-      fo.pTo = 0;
+      fo.pTo = NULL;
       fo.fFlags = 0;
       if (toRecycleBin)
         fo.fFlags |= FOF_ALLOWUNDO;
@@ -150,8 +147,8 @@ void CPanel::DeleteItems(bool NON_CE_VAR(toRecycleBin))
       // fo.fFlags |= FOF_SILENT;
       // fo.fFlags |= FOF_WANTNUKEWARNING;
       fo.fAnyOperationsAborted = FALSE;
-      fo.hNameMappings = 0;
-      fo.lpszProgressTitle = 0;
+      fo.hNameMappings = NULL;
+      fo.lpszProgressTitle = NULL;
       /* int res = */ ::SHFileOperationA(&fo);
     }
     else
@@ -184,23 +181,24 @@ void CPanel::DeleteItems(bool NON_CE_VAR(toRecycleBin))
         fo.hwnd = GetParent();
         fo.wFunc = FO_DELETE;
         fo.pFrom = (const WCHAR *)buffer;
-        fo.pTo = 0;
+        fo.pTo = NULL;
         fo.fFlags = 0;
         if (toRecycleBin)
           fo.fFlags |= FOF_ALLOWUNDO;
         fo.fAnyOperationsAborted = FALSE;
-        fo.hNameMappings = 0;
-        fo.lpszProgressTitle = 0;
+        fo.hNameMappings = NULL;
+        fo.lpszProgressTitle = NULL;
         // int res;
         #ifdef _UNICODE
         /* res = */ ::SHFileOperationW(&fo);
         #else
-        Func_SHFileOperationW shFileOperationW = (Func_SHFileOperationW)
-          MY_CAST_FUNC
-          ::GetProcAddress(::GetModuleHandleW(L"shell32.dll"), "SHFileOperationW");
-        if (!shFileOperationW)
+        Func_SHFileOperationW
+           f_SHFileOperationW = Z7_GET_PROC_ADDRESS(
+        Func_SHFileOperationW, ::GetModuleHandleW(L"shell32.dll"),
+            "SHFileOperationW");
+        if (!f_SHFileOperationW)
           return;
-        /* res = */ shFileOperationW(&fo);
+        /* res = */ f_SHFileOperationW(&fo);
         #endif
       }
     }
@@ -225,7 +223,7 @@ void CPanel::DeleteItems(bool NON_CE_VAR(toRecycleBin))
   UString messageParam;
   if (indices.Size() == 1)
   {
-    int index = indices[0];
+    const unsigned index = indices[0];
     messageParam = GetItemRelPath2(index);
     if (IsItem_Folder(index))
     {
@@ -262,7 +260,7 @@ void CPanel::DeleteItems(bool NON_CE_VAR(toRecycleBin))
 
 BOOL CPanel::OnBeginLabelEdit(LV_DISPINFOW * lpnmh)
 {
-  int realIndex = GetRealIndex(lpnmh->item);
+  const unsigned realIndex = GetRealIndex(lpnmh->item);
   if (realIndex == kParentIndex)
     return TRUE;
   if (IsThereReadOnlyFolder())
@@ -314,7 +312,7 @@ BOOL CPanel::OnEndLabelEdit(LV_DISPINFOW * lpnmh)
 
   SaveSelectedState(_selectedState);
 
-  int realIndex = GetRealIndex(lpnmh->item);
+  const unsigned realIndex = GetRealIndex(lpnmh->item);
   if (realIndex == kParentIndex)
     return FALSE;
   const UString prefix = GetItemPrefix(realIndex);
@@ -454,14 +452,14 @@ void CPanel::CreateFile()
     newName = correctName;
   }
 
-  HRESULT result = _folderOperations->CreateFile(newName, 0);
+  const HRESULT result = _folderOperations->CreateFile(newName, NULL);
   if (result != S_OK)
   {
     MessageBox_Error_HRESULT_Caption(result, LangString(IDS_CREATE_FILE_ERROR));
     // MessageBoxErrorForUpdate(result, IDS_CREATE_FILE_ERROR);
     return;
   }
-  int pos = newName.Find(WCHAR_PATH_SEPARATOR);
+  const int pos = newName.Find(WCHAR_PATH_SEPARATOR);
   if (pos >= 0)
     newName.DeleteFrom((unsigned)pos);
   if (!_mySelectMode)
@@ -488,10 +486,10 @@ void CPanel::ChangeComment()
   if (!CheckBeforeUpdate(IDS_COMMENT))
     return;
   CDisableTimerProcessing disableTimerProcessing2(*this);
-  int index = _listView.GetFocusedItem();
+  const int index = _listView.GetFocusedItem();
   if (index < 0)
     return;
-  int realIndex = GetRealItemIndex(index);
+  const unsigned realIndex = GetRealItemIndex(index);
   if (realIndex == kParentIndex)
     return;
   CSelectedState state;
@@ -506,7 +504,7 @@ void CPanel::ChangeComment()
     else if (propVariant.vt != VT_EMPTY)
       return;
   }
-  UString name = GetItemRelPath2(realIndex);
+  const UString name = GetItemRelPath2(realIndex);
   CComboDialog dlg;
   dlg.Title = name;
   dlg.Title += " : ";
@@ -518,7 +516,7 @@ void CPanel::ChangeComment()
   NCOM::CPropVariant propVariant (dlg.Value);
 
   CDisableNotify disableNotify(*this);
-  HRESULT result = _folderOperations->SetProperty(realIndex, kpidComment, &propVariant, NULL);
+  const HRESULT result = _folderOperations->SetProperty(realIndex, kpidComment, &propVariant, NULL);
   if (result != S_OK)
   {
     if (result == E_NOINTERFACE)
diff --git a/CPP/7zip/UI/FileManager/PanelSelect.cpp b/CPP/7zip/UI/FileManager/PanelSelect.cpp
index eab9e1a..f7a16dd 100644
--- a/CPP/7zip/UI/FileManager/PanelSelect.cpp
+++ b/CPP/7zip/UI/FileManager/PanelSelect.cpp
@@ -15,7 +15,7 @@ void CPanel::OnShiftSelectMessage()
 {
   if (!_mySelectMode)
     return;
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
   if (!_selectionIsDefined)
@@ -26,7 +26,7 @@ void CPanel::OnShiftSelectMessage()
   int numItems = _listView.GetItemCount();
   for (int i = 0; i < numItems; i++)
   {
-    int realIndex = GetRealItemIndex(i);
+    const unsigned realIndex = GetRealItemIndex(i);
     if (realIndex == kParentIndex)
       continue;
     if (i >= startItem && i <= finishItem)
@@ -44,10 +44,10 @@ void CPanel::OnArrowWithShift()
 {
   if (!_mySelectMode)
     return;
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int realIndex = GetRealItemIndex(focusedItem);
+  const unsigned realIndex = GetRealItemIndex(focusedItem);
   
   if (_selectionIsDefined)
   {
@@ -84,11 +84,11 @@ void CPanel::OnInsert()
   // _listView.SetItemState_Selected(focusedItem);
   */
 
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
   
-  int realIndex = GetRealItemIndex(focusedItem);
+  const unsigned realIndex = GetRealItemIndex(focusedItem);
   if (realIndex != kParentIndex)
   {
     bool isSelected = !_selectedStatusVector[realIndex];
@@ -109,10 +109,10 @@ void CPanel::OnInsert()
 /*
 void CPanel::OnUpWithShift()
 {
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int index = GetRealItemIndex(focusedItem);
+  const int index = GetRealItemIndex(focusedItem);
   if (index == kParentIndex)
     return;
   _selectedStatusVector[index] = !_selectedStatusVector[index];
@@ -121,10 +121,10 @@ void CPanel::OnUpWithShift()
 
 void CPanel::OnDownWithShift()
 {
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int index = GetRealItemIndex(focusedItem);
+  const int index = GetRealItemIndex(focusedItem);
   if (index == kParentIndex)
     return;
   _selectedStatusVector[index] = !_selectedStatusVector[index];
@@ -141,7 +141,7 @@ void CPanel::UpdateSelection()
     int numItems = _listView.GetItemCount();
     for (int i = 0; i < numItems; i++)
     {
-      int realIndex = GetRealItemIndex(i);
+      const unsigned realIndex = GetRealItemIndex(i);
       if (realIndex != kParentIndex)
         _listView.SetItemState_Selected(i, _selectedStatusVector[realIndex]);
     }
@@ -168,10 +168,10 @@ void CPanel::SelectSpec(bool selectMode)
 
 void CPanel::SelectByType(bool selectMode)
 {
-  int focusedItem = _listView.GetFocusedItem();
+  const int focusedItem = _listView.GetFocusedItem();
   if (focusedItem < 0)
     return;
-  int realIndex = GetRealItemIndex(focusedItem);
+  const unsigned realIndex = GetRealItemIndex(focusedItem);
   UString name = GetItemName(realIndex);
   bool isItemFolder = IsItem_Folder(realIndex);
 
@@ -214,10 +214,12 @@ void CPanel::InvertSelection()
 {
   if (!_mySelectMode)
   {
+    /*
     unsigned numSelected = 0;
     FOR_VECTOR (i, _selectedStatusVector)
       if (_selectedStatusVector[i])
         numSelected++;
+    */
     // 17.02: fixed : now we invert item even, if single item is selected
     /*
     if (numSelected == 1)
@@ -225,7 +227,7 @@ void CPanel::InvertSelection()
       int focused = _listView.GetFocusedItem();
       if (focused >= 0)
       {
-        int realIndex = GetRealItemIndex(focused);
+        const unsigned realIndex = GetRealItemIndex(focused);
         if (realIndex >= 0)
           if (_selectedStatusVector[realIndex])
             _selectedStatusVector[realIndex] = false;
@@ -251,7 +253,7 @@ void CPanel::KillSelection()
     {
       // CPanel::OnItemChanged notify for LVIS_SELECTED change doesn't work here. Why?
       // so we change _selectedStatusVector[realIndex] here.
-      int realIndex = GetRealItemIndex(focused);
+      const unsigned realIndex = GetRealItemIndex(focused);
       if (realIndex != kParentIndex)
         _selectedStatusVector[realIndex] = true;
       _listView.SetItemState_Selected(focused);
@@ -273,19 +275,19 @@ void CPanel::OnLeftClick(MY_NMLISTVIEW_NMITEMACTIVATE *itemActivate)
   if ((itemActivate->uKeyFlags & LVKF_SHIFT) != 0)
   {
     // int focusedIndex = _listView.GetFocusedItem();
-    int focusedIndex = _startGroupSelect;
+    const int focusedIndex = _startGroupSelect;
     if (focusedIndex < 0)
       return;
-    int startItem = MyMin(focusedIndex, indexInList);
-    int finishItem = MyMax(focusedIndex, indexInList);
+    const int startItem = MyMin(focusedIndex, indexInList);
+    const int finishItem = MyMax(focusedIndex, indexInList);
 
-    int numItems = _listView.GetItemCount();
+    const int numItems = _listView.GetItemCount();
     for (int i = 0; i < numItems; i++)
     {
-      int realIndex = GetRealItemIndex(i);
+      const unsigned realIndex = GetRealItemIndex(i);
       if (realIndex == kParentIndex)
         continue;
-      bool selected = (i >= startItem && i <= finishItem);
+      const bool selected = (i >= startItem && i <= finishItem);
       if (_selectedStatusVector[realIndex] != selected)
       {
         _selectedStatusVector[realIndex] = selected;
@@ -301,7 +303,7 @@ void CPanel::OnLeftClick(MY_NMLISTVIEW_NMITEMACTIVATE *itemActivate)
     #ifndef UNDER_CE
     if ((itemActivate->uKeyFlags & LVKF_CONTROL) != 0)
     {
-      int realIndex = GetRealItemIndex(indexInList);
+      const unsigned realIndex = GetRealItemIndex(indexInList);
       if (realIndex != kParentIndex)
       {
         _selectedStatusVector[realIndex] = !_selectedStatusVector[realIndex];
diff --git a/CPP/7zip/UI/FileManager/PanelSort.cpp b/CPP/7zip/UI/FileManager/PanelSort.cpp
index d26acb7..f95f8ee 100644
--- a/CPP/7zip/UI/FileManager/PanelSort.cpp
+++ b/CPP/7zip/UI/FileManager/PanelSort.cpp
@@ -52,8 +52,8 @@ int CompareFileNames_ForFolderList(const wchar_t *s1, const wchar_t *s2)
 
 static int CompareFileNames_Le16(const Byte *s1, unsigned size1, const Byte *s2, unsigned size2)
 {
-  size1 &= ~1;
-  size2 &= ~1;
+  size1 &= ~1u;
+  size2 &= ~1u;
   for (unsigned i = 0;; i += 2)
   {
     if (i >= size1)
@@ -76,8 +76,8 @@ static int CompareFileNames_Le16(const Byte *s1, unsigned size1, const Byte *s2,
 
 static inline const wchar_t *GetExtensionPtr(const UString &name)
 {
-  int dotPos = name.ReverseFind_Dot();
-  return name.Ptr((dotPos < 0) ? name.Len() : dotPos);
+  const int dotPos = name.ReverseFind_Dot();
+  return name.Ptr(dotPos < 0 ? name.Len() : (unsigned)dotPos);
 }
 
 void CPanel::SetSortRawStatus()
@@ -142,9 +142,9 @@ static int CALLBACK CompareItems2(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
     // if (panel->_sortIndex == 0)
     case kpidName:
     {
-      const UString name1 = panel->GetItemName((int)lParam1);
-      const UString name2 = panel->GetItemName((int)lParam2);
-      int res = CompareFileNames_ForFolderList(name1, name2);
+      const UString name1 = panel->GetItemName((unsigned)lParam1);
+      const UString name2 = panel->GetItemName((unsigned)lParam2);
+      const int res = CompareFileNames_ForFolderList(name1, name2);
       /*
       if (res != 0 || !panel->_flatMode)
         return res;
@@ -156,8 +156,8 @@ static int CALLBACK CompareItems2(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
     }
     case kpidExtension:
     {
-      const UString name1 = panel->GetItemName((int)lParam1);
-      const UString name2 = panel->GetItemName((int)lParam2);
+      const UString name1 = panel->GetItemName((unsigned)lParam1);
+      const UString name2 = panel->GetItemName((unsigned)lParam2);
       return CompareFileNames_ForFolderList(
           GetExtensionPtr(name1),
           GetExtensionPtr(name2));
@@ -186,18 +186,18 @@ int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData);
 int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
 {
   if (lpData == 0) return 0;
-  if (lParam1 == kParentIndex) return -1;
-  if (lParam2 == kParentIndex) return 1;
+  if (lParam1 == (int)kParentIndex) return -1;
+  if (lParam2 == (int)kParentIndex) return 1;
 
   CPanel *panel = (CPanel*)lpData;
 
-  bool isDir1 = panel->IsItem_Folder((int)lParam1);
-  bool isDir2 = panel->IsItem_Folder((int)lParam2);
+  const bool isDir1 = panel->IsItem_Folder((unsigned)lParam1);
+  const bool isDir2 = panel->IsItem_Folder((unsigned)lParam2);
   
   if (isDir1 && !isDir2) return -1;
   if (isDir2 && !isDir1) return 1;
 
-  int result = CompareItems2(lParam1, lParam2, lpData);
+  const int result = CompareItems2(lParam1, lParam2, lpData);
   return panel->_ascending ? result: (-result);
 }
 
diff --git a/CPP/7zip/UI/FileManager/PanelSplitFile.cpp b/CPP/7zip/UI/FileManager/PanelSplitFile.cpp
index 00a0d80..64aa039 100644
--- a/CPP/7zip/UI/FileManager/PanelSplitFile.cpp
+++ b/CPP/7zip/UI/FileManager/PanelSplitFile.cpp
@@ -30,7 +30,7 @@ struct CVolSeqName
 {
   UString UnchangedPart;
   UString ChangedPart;
-  CVolSeqName(): ChangedPart("000") {};
+  CVolSeqName(): ChangedPart("000") {}
 
   void SetNumDigits(UInt64 numVolumes)
   {
@@ -64,13 +64,13 @@ UString CVolSeqName::GetNextName()
 {
   for (int i = (int)ChangedPart.Len() - 1; i >= 0; i--)
   {
-    wchar_t c = ChangedPart[i];
+    const wchar_t c = ChangedPart[i];
     if (c != L'9')
     {
-      ChangedPart.ReplaceOneCharAtPos(i, (wchar_t)(c + 1));
+      ChangedPart.ReplaceOneCharAtPos((unsigned)i, (wchar_t)(c + 1));
       break;
     }
-    ChangedPart.ReplaceOneCharAtPos(i, L'0');
+    ChangedPart.ReplaceOneCharAtPos((unsigned)i, L'0');
     if (i == 0)
       ChangedPart.InsertAtFront(L'1');
   }
@@ -79,7 +79,7 @@ UString CVolSeqName::GetNextName()
 
 class CThreadSplit: public CProgressThreadVirt
 {
-  HRESULT ProcessVirt();
+  HRESULT ProcessVirt() Z7_override;
 public:
   FString FilePath;
   FString VolBasePath;
@@ -142,7 +142,7 @@ HRESULT CThreadSplit::ProcessVirt()
 {
   NIO::CInFile inFile;
   if (!inFile.Open(FilePath))
-    return GetLastError();
+    return GetLastError_noZero_HRESULT();
 
   CPreAllocOutFile outFile;
   
@@ -155,7 +155,7 @@ HRESULT CThreadSplit::ProcessVirt()
   
   UInt64 length;
   if (!inFile.GetLength(length))
-    return GetLastError();
+    return GetLastError_noZero_HRESULT();
   
   CProgressSync &sync = Sync;
   sync.Set_NumBytesTotal(length);
@@ -181,7 +181,7 @@ HRESULT CThreadSplit::ProcessVirt()
     }
     UInt32 processedSize;
     if (!inFile.Read(buffer, needSize, processedSize))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
     if (processedSize == 0)
       return S_OK;
     needSize = processedSize;
@@ -189,12 +189,12 @@ HRESULT CThreadSplit::ProcessVirt()
     if (outFile.Written == 0)
     {
       FString name = VolBasePath;
-      name += '.';
+      name.Add_Dot();
       name += us2fs(seqName.GetNextName());
       sync.Set_FilePath(fs2us(name));
       if (!outFile.File.Create(name, false))
       {
-        HRESULT res = GetLastError();
+        const HRESULT res = GetLastError_noZero_HRESULT();
         AddErrorPath(name);
         return res;
       }
@@ -209,7 +209,7 @@ HRESULT CThreadSplit::ProcessVirt()
     }
     
     if (!outFile.Write(buffer, needSize, processedSize))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
     if (needSize != processedSize)
       throw g_Message_FileWriteError;
     
@@ -225,7 +225,7 @@ HRESULT CThreadSplit::ProcessVirt()
 
     if (pos - prev >= ((UInt32)1 << 22) || outFile.Written == 0)
     {
-      RINOK(sync.Set_NumBytesCur(pos));
+      RINOK(sync.Set_NumBytesCur(pos))
       prev = pos;
     }
   }
@@ -234,7 +234,7 @@ HRESULT CThreadSplit::ProcessVirt()
 
 void CApp::Split()
 {
-  int srcPanelIndex = GetFocusedPanelIndex();
+  const unsigned srcPanelIndex = GetFocusedPanelIndex();
   CPanel &srcPanel = Panels[srcPanelIndex];
   if (!srcPanel.Is_IO_FS_Folder())
   {
@@ -242,7 +242,7 @@ void CApp::Split()
     return;
   }
   CRecordVector<UInt32> indices;
-  srcPanel.GetOperatedItemIndices(indices);
+  srcPanel.Get_ItemIndices_Operated(indices);
   if (indices.IsEmpty())
     return;
   if (indices.Size() != 1)
@@ -250,7 +250,7 @@ void CApp::Split()
     srcPanel.MessageBox_Error_LangID(IDS_SELECT_ONE_FILE);
     return;
   }
-  int index = indices[0];
+  const unsigned index = indices[0];
   if (srcPanel.IsItem_Folder(index))
   {
     srcPanel.MessageBox_Error_LangID(IDS_SELECT_ONE_FILE);
@@ -258,7 +258,7 @@ void CApp::Split()
   }
   const UString itemName = srcPanel.GetItemName(index);
 
-  UString srcPath = srcPanel.GetFsPath() + srcPanel.GetItemPrefix(index);
+  const UString srcPath = srcPanel.GetFsPath() + srcPanel.GetItemPrefix(index);
   UString path = srcPath;
   unsigned destPanelIndex = (NumPanels <= 1) ? srcPanelIndex : (1 - srcPanelIndex);
   CPanel &destPanel = Panels[destPanelIndex];
@@ -297,7 +297,7 @@ void CApp::Split()
   NName::NormalizeDirPathPrefix(path);
   if (!CreateComplexDir(us2fs(path)))
   {
-    DWORD lastError = ::GetLastError();
+    const HRESULT lastError = GetLastError_noZero_HRESULT();
     srcPanel.MessageBox_Error_2Lines_Message_HRESULT(MyFormatNew(IDS_CANNOT_CREATE_FOLDER, path), lastError);
     return;
   }
@@ -308,8 +308,8 @@ void CApp::Split()
 
   CProgressDialog &progressDialog = spliter;
 
-  UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE, 0x03000000);
-  UString title = LangString(IDS_SPLITTING);
+  const UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE, 0x03000000);
+  const UString title = LangString(IDS_SPLITTING);
 
   progressDialog.ShowCompressionInfo = false;
 
@@ -344,7 +344,7 @@ void CApp::Split()
 
 class CThreadCombine: public CProgressThreadVirt
 {
-  HRESULT ProcessVirt();
+  HRESULT ProcessVirt() Z7_override;
 public:
   FString InputDirPrefix;
   FStringVector Names;
@@ -357,7 +357,7 @@ HRESULT CThreadCombine::ProcessVirt()
   NIO::COutFile outFile;
   if (!outFile.Create(OutputPath, false))
   {
-    HRESULT res = GetLastError();
+    const HRESULT res = GetLastError_noZero_HRESULT();
     AddErrorPath(OutputPath);
     return res;
   }
@@ -376,7 +376,7 @@ HRESULT CThreadCombine::ProcessVirt()
     const FString nextName = InputDirPrefix + Names[i];
     if (!inFile.Open(nextName))
     {
-      HRESULT res = GetLastError();
+      const HRESULT res = GetLastError_noZero_HRESULT();
       AddErrorPath(nextName);
       return res;
     }
@@ -386,23 +386,23 @@ HRESULT CThreadCombine::ProcessVirt()
       UInt32 processedSize;
       if (!inFile.Read(buffer, kBufSize, processedSize))
       {
-        HRESULT res = GetLastError();
+        const HRESULT res = GetLastError_noZero_HRESULT();
         AddErrorPath(nextName);
         return res;
       }
       if (processedSize == 0)
         break;
-      UInt32 needSize = processedSize;
+      const UInt32 needSize = processedSize;
       if (!outFile.Write(buffer, needSize, processedSize))
       {
-        HRESULT res = GetLastError();
+        const HRESULT res = GetLastError_noZero_HRESULT();
         AddErrorPath(OutputPath);
         return res;
       }
       if (needSize != processedSize)
         throw g_Message_FileWriteError;
       pos += processedSize;
-      RINOK(sync.Set_NumBytesCur(pos));
+      RINOK(sync.Set_NumBytesCur(pos))
     }
   }
   return S_OK;
@@ -418,7 +418,7 @@ static void AddInfoFileName(UString &dest, const UString &name)
 
 void CApp::Combine()
 {
-  int srcPanelIndex = GetFocusedPanelIndex();
+  const unsigned srcPanelIndex = GetFocusedPanelIndex();
   CPanel &srcPanel = Panels[srcPanelIndex];
   if (!srcPanel.IsFSFolder())
   {
@@ -426,10 +426,10 @@ void CApp::Combine()
     return;
   }
   CRecordVector<UInt32> indices;
-  srcPanel.GetOperatedItemIndices(indices);
+  srcPanel.Get_ItemIndices_Operated(indices);
   if (indices.IsEmpty())
     return;
-  int index = indices[0];
+  const unsigned index = indices[0];
   if (indices.Size() != 1 || srcPanel.IsItem_Folder(index))
   {
     srcPanel.MessageBox_Error_LangID(IDS_COMBINE_SELECT_ONE_FILE);
@@ -510,7 +510,7 @@ void CApp::Combine()
   NName::NormalizeDirPathPrefix(path);
   if (!CreateComplexDir(us2fs(path)))
   {
-    DWORD lastError = ::GetLastError();
+    const HRESULT lastError = GetLastError_noZero_HRESULT();
     srcPanel.MessageBox_Error_2Lines_Message_HRESULT(MyFormatNew(IDS_CANNOT_CREATE_FOLDER, path), lastError);
     return;
   }
@@ -537,8 +537,8 @@ void CApp::Combine()
     CProgressDialog &progressDialog = combiner;
     progressDialog.ShowCompressionInfo = false;
   
-    UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE, 0x03000000);
-    UString title = LangString(IDS_COMBINING);
+    const UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE, 0x03000000);
+    const UString title = LangString(IDS_COMBINING);
     
     progressDialog.MainWindow = _window;
     progressDialog.MainTitle = progressWindowTitle;
diff --git a/CPP/7zip/UI/FileManager/PasswordDialog.cpp b/CPP/7zip/UI/FileManager/PasswordDialog.cpp
index 6ead39c..bf99580 100644
--- a/CPP/7zip/UI/FileManager/PasswordDialog.cpp
+++ b/CPP/7zip/UI/FileManager/PasswordDialog.cpp
@@ -4,11 +4,11 @@
 
 #include "PasswordDialog.h"
 
-#ifdef LANG
+#ifdef Z7_LANG
 #include "LangUtils.h"
 #endif
 
-#ifdef LANG
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_PASSWORD_ENTER,
@@ -30,9 +30,9 @@ void CPasswordDialog::SetTextSpec()
 
 bool CPasswordDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetWindowText(*this, IDD_PASSWORD);
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
   #endif
   _passwordEdit.Attach(GetItem(IDE_PASSWORD_PASSWORD));
   CheckButton(IDX_PASSWORD_SHOW, ShowPassword);
@@ -40,7 +40,7 @@ bool CPasswordDialog::OnInit()
   return CModalDialog::OnInit();
 }
 
-bool CPasswordDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CPasswordDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   if (buttonID == IDX_PASSWORD_SHOW)
   {
diff --git a/CPP/7zip/UI/FileManager/PasswordDialog.h b/CPP/7zip/UI/FileManager/PasswordDialog.h
index 339ebda..e05c4ad 100644
--- a/CPP/7zip/UI/FileManager/PasswordDialog.h
+++ b/CPP/7zip/UI/FileManager/PasswordDialog.h
@@ -1,7 +1,7 @@
 // PasswordDialog.h
 
-#ifndef __PASSWORD_DIALOG_H
-#define __PASSWORD_DIALOG_H
+#ifndef ZIP7_INC_PASSWORD_DIALOG_H
+#define ZIP7_INC_PASSWORD_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/Edit.h"
@@ -12,9 +12,9 @@ class CPasswordDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CEdit _passwordEdit;
 
-  virtual void OnOK();
-  virtual bool OnInit();
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual void OnOK() Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   void SetTextSpec();
   void ReadControls();
 public:
@@ -22,7 +22,7 @@ public:
   bool ShowPassword;
   
   CPasswordDialog(): ShowPassword(false) {}
-  INT_PTR Create(HWND parentWindow = 0) { return CModalDialog::Create(IDD_PASSWORD, parentWindow); }
+  INT_PTR Create(HWND parentWindow = NULL) { return CModalDialog::Create(IDD_PASSWORD, parentWindow); }
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/PluginInterface.h b/CPP/7zip/UI/FileManager/PluginInterface.h
index 37654a0..dcb1b4b 100644
--- a/CPP/7zip/UI/FileManager/PluginInterface.h
+++ b/CPP/7zip/UI/FileManager/PluginInterface.h
@@ -1,31 +1,32 @@
 // PluginInterface.h
 
-#ifndef __PLUGIN_INTERFACE_H
-#define __PLUGIN_INTERFACE_H
+#ifndef ZIP7_INC_PLUGIN_INTERFACE_H
+#define ZIP7_INC_PLUGIN_INTERFACE_H
 
 /*
-#include "../../../Common/Types.h"
+#include "../../../../C/7zTypes.h"
 #include "../../IDecl.h"
 
-#define PLUGIN_INTERFACE(i, x) DECL_INTERFACE(i, 0x0A, x)
-
-PLUGIN_INTERFACE(IInitContextMenu, 0x00)
-{
-  STDMETHOD(InitContextMenu)(const wchar_t *folder, const wchar_t * const *names, UInt32 numFiles) PURE;
-};
-
-PLUGIN_INTERFACE(IPluginOptionsCallback, 0x01)
-{
-  STDMETHOD(GetProgramFolderPath)(BSTR *value) PURE;
-  STDMETHOD(GetProgramPath)(BSTR *value) PURE;
-  STDMETHOD(GetRegistryCUPath)(BSTR *value) PURE;
-};
-
-PLUGIN_INTERFACE(IPluginOptions, 0x02)
-{
-  STDMETHOD(PluginOptions)(HWND hWnd, IPluginOptionsCallback *callback) PURE;
-  // STDMETHOD(GetFileExtensions)(BSTR *extensions) PURE;
-};
-*/
+#define Z7_IFACE_CONSTR_PLUGIN(i, n) \
+  Z7_DECL_IFACE_7ZIP(i, 0x0A, n) \
+  { Z7_IFACE_COM7_PURE(i) };
+
+#define Z7_IFACEM_IInitContextMenu(x) \
+  x(InitContextMenu(const wchar_t *folder, const wchar_t * const *names, UInt32 numFiles)) \
+
+Z7_IFACE_CONSTR_PLUGIN(IInitContextMenu, 0x00)
+
+#define Z7_IFACEM_IPluginOptionsCallback(x) \
+  x(GetProgramFolderPath(BSTR *value)) \
+  x(GetProgramPath(BSTR *value)) \
+  x(GetRegistryCUPath(BSTR *value)) \
 
+Z7_IFACE_CONSTR_PLUGIN(IPluginOptionsCallback, 0x01)
+
+#define Z7_IFACEM_IPluginOptions(x) \
+  x(PluginOptions(HWND hWnd, IPluginOptionsCallback *callback)) \
+  // x(GetFileExtensions(BSTR *extensions))
+
+Z7_IFACE_CONSTR_PLUGIN(IPluginOptions, 0x02)
+*/
 #endif
diff --git a/CPP/7zip/UI/FileManager/PluginLoader.h b/CPP/7zip/UI/FileManager/PluginLoader.h
index fed38d6..d9309f2 100644
--- a/CPP/7zip/UI/FileManager/PluginLoader.h
+++ b/CPP/7zip/UI/FileManager/PluginLoader.h
@@ -1,7 +1,7 @@
 // PluginLoader.h
 
-#ifndef __PLUGIN_LOADER_H
-#define __PLUGIN_LOADER_H
+#ifndef ZIP7_INC_PLUGIN_LOADER_H
+#define ZIP7_INC_PLUGIN_LOADER_H
 
 #include "../../../Windows/DLL.h"
 
@@ -12,15 +12,18 @@ class CPluginLibrary: public NWindows::NDLL::CLibrary
 public:
   HRESULT CreateManager(REFGUID clsID, IFolderManager **manager)
   {
-    Func_CreateObject createObject = (Func_CreateObject)GetProc("CreateObject");
+    const
+    Func_CreateObject createObject =  Z7_GET_PROC_ADDRESS(
+    Func_CreateObject, Get_HMODULE(),
+        "CreateObject");
     if (!createObject)
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
     return createObject(&clsID, &IID_IFolderManager, (void **)manager);
   }
   HRESULT LoadAndCreateManager(CFSTR filePath, REFGUID clsID, IFolderManager **manager)
   {
     if (!Load(filePath))
-      return GetLastError();
+      return GetLastError_noZero_HRESULT();
     return CreateManager(clsID, manager);
   }
 };
diff --git a/CPP/7zip/UI/FileManager/ProgramLocation.h b/CPP/7zip/UI/FileManager/ProgramLocation.h
index 6bfb711..0cd9c74 100644
--- a/CPP/7zip/UI/FileManager/ProgramLocation.h
+++ b/CPP/7zip/UI/FileManager/ProgramLocation.h
@@ -1,6 +1,6 @@
 // ProgramLocation.h
 
-#ifndef __PROGRAM_LOCATION_H
-#define __PROGRAM_LOCATION_H
+#ifndef ZIP7_INC_PROGRAM_LOCATION_H
+#define ZIP7_INC_PROGRAM_LOCATION_H
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/ProgressDialog.cpp b/CPP/7zip/UI/FileManager/ProgressDialog.cpp
index b688a90..fc6f559 100644
--- a/CPP/7zip/UI/FileManager/ProgressDialog.cpp
+++ b/CPP/7zip/UI/FileManager/ProgressDialog.cpp
@@ -15,7 +15,7 @@ extern HINSTANCE g_hInstance;
 static const UINT_PTR kTimerID = 3;
 static const UINT kTimerElapse = 100;
 
-#ifdef LANG
+#ifdef Z7_LANG
 #include "LangUtils.h"
 #endif
 
@@ -32,7 +32,7 @@ HRESULT CProgressSync::ProcessStopAndPause()
   return S_OK;
 }
 
-#ifndef _SFX
+#ifndef Z7_SFX
 CProgressDialog::~CProgressDialog()
 {
   AddToTitle(L"");
@@ -45,15 +45,17 @@ void CProgressDialog::AddToTitle(LPCWSTR s)
 #endif
 
 
+#define UNDEFINED_VAL ((UInt64)(Int64)-1)
+
 bool CProgressDialog::OnInit()
 {
-  _range = (UInt64)(Int64)-1;
-  _prevPercentValue = -1;
+  _range = UNDEFINED_VAL;
+  _prevPercentValue = UNDEFINED_VAL;
 
   _wasCreated = true;
   _dialogCreatedEvent.Set();
 
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
 
@@ -114,7 +116,7 @@ bool CProgressDialog::OnTimer(WPARAM /* timerID */, LPARAM /* callback */)
   if (total == 0)
     total = 1;
 
-  int percentValue = (int)(completed * 100 / total);
+  const UInt64 percentValue = completed * 100 / total;
   if (percentValue != _prevPercentValue)
   {
     wchar_t s[64];
@@ -122,7 +124,7 @@ bool CProgressDialog::OnTimer(WPARAM /* timerID */, LPARAM /* callback */)
     UString title = s;
     title += "% ";
     SetText(title + _title);
-    #ifndef _SFX
+    #ifndef Z7_SFX
     AddToTitle(title + MainAddTitle);
     #endif
     _prevPercentValue = percentValue;
@@ -159,7 +161,7 @@ bool CProgressDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   return CModalDialog::OnMessage(message, wParam, lParam);
 }
 
-bool CProgressDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CProgressDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
diff --git a/CPP/7zip/UI/FileManager/ProgressDialog.h b/CPP/7zip/UI/FileManager/ProgressDialog.h
index 35c182a..1fe9587 100644
--- a/CPP/7zip/UI/FileManager/ProgressDialog.h
+++ b/CPP/7zip/UI/FileManager/ProgressDialog.h
@@ -1,7 +1,7 @@
 // ProgressDialog.h
 
-#ifndef __PROGRESS_DIALOG_H
-#define __PROGRESS_DIALOG_H
+#ifndef ZIP7_INC_PROGRESS_DIALOG_H
+#define ZIP7_INC_PROGRESS_DIALOG_H
 
 #include "../../../Windows/Synchronization.h"
 #include "../../../Windows/Thread.h"
@@ -85,24 +85,27 @@ private:
   UInt64 _range;
   NWindows::NControl::CProgressBar m_ProgressBar;
 
-  int _prevPercentValue;
+  UInt64 _prevPercentValue;
 
   bool _wasCreated;
   bool _needClose;
   bool _inCancelMessageBox;
   bool _externalCloseMessageWasReceived;
 
-  bool OnTimer(WPARAM timerID, LPARAM callback);
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  virtual bool OnTimer(WPARAM timerID, LPARAM callback) Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual void OnCancel() Z7_override;
+  virtual void OnOK() Z7_override;
+  virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
+
   void SetRange(UInt64 range);
   void SetPos(UInt64 pos);
-  virtual bool OnInit();
-  virtual void OnCancel();
-  virtual void OnOK();
+
   NWindows::NSynchronization::CManualResetEvent _dialogCreatedEvent;
-  #ifndef _SFX
+  #ifndef Z7_SFX
   void AddToTitle(LPCWSTR string);
   #endif
-  bool OnButtonClicked(int buttonID, HWND buttonHWND);
 
   void WaitCreating() { _dialogCreatedEvent.Lock(); }
   void CheckNeedClose();
@@ -111,7 +114,7 @@ public:
   CProgressSync Sync;
   int IconID;
 
-  #ifndef _SFX
+  #ifndef Z7_SFX
   HWND MainWindow;
   UString MainTitle;
   UString MainAddTitle;
@@ -119,8 +122,8 @@ public:
   #endif
 
   CProgressDialog(): _timer(0)
-    #ifndef _SFX
-    ,MainWindow(0)
+    #ifndef Z7_SFX
+    ,MainWindow(NULL)
     #endif
   {
     IconID = -1;
@@ -133,7 +136,7 @@ public:
       throw 1334987;
   }
 
-  INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = 0)
+  INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = NULL)
   {
     _title = title;
     INT_PTR res = CModalDialog::Create(IDD_PROGRESS, wndParent);
@@ -146,8 +149,6 @@ public:
     kCloseMessage = WM_APP + 1
   };
 
-  virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
-
   void ProcessWasFinished()
   {
     WaitCreating();
@@ -155,7 +156,7 @@ public:
       PostMsg(kCloseMessage);
     else
       _needClose = true;
-  };
+  }
 };
 
 
diff --git a/CPP/7zip/UI/FileManager/ProgressDialog2.cpp b/CPP/7zip/UI/FileManager/ProgressDialog2.cpp
index 54273d0..1521d83 100644
--- a/CPP/7zip/UI/FileManager/ProgressDialog2.cpp
+++ b/CPP/7zip/UI/FileManager/ProgressDialog2.cpp
@@ -2,6 +2,10 @@
 
 #include "StdAfx.h"
 
+#ifdef Z7_OLD_WIN_SDK
+#include <ShlGuid.h>
+#endif
+
 #include "../../../Common/IntToString.h"
 #include "../../../Common/StringConvert.h"
 
@@ -43,7 +47,7 @@ static const UINT kCreateDelay =
 
 static const DWORD kPauseSleepTime = 100;
 
-#ifdef LANG
+#ifdef Z7_LANG
 
 static const UInt32 kLangIDs[] =
 {
@@ -67,19 +71,19 @@ static const UInt32 kLangIDs_Colon[] =
 #endif
 
 
-#define UNDEFINED_VAL ((UInt64)(Int64)-1)
-#define INIT_AS_UNDEFINED(v) v = UNDEFINED_VAL;
-#define IS_UNDEFINED_VAL(v) ((v) == UNDEFINED_VAL)
-#define IS_DEFINED_VAL(v) ((v) != UNDEFINED_VAL)
+#define UNDEFINED_VAL         ((UInt64)(Int64)-1)
+#define INIT_AS_UNDEFINED(v)  v = UNDEFINED_VAL;
+#define IS_UNDEFINED_VAL(v)   ((v) == UNDEFINED_VAL)
+#define IS_DEFINED_VAL(v)     ((v) != UNDEFINED_VAL)
 
 CProgressSync::CProgressSync():
     _stopped(false), _paused(false),
     _bytesProgressMode(true),
+    _isDir(false),
     _totalBytes(UNDEFINED_VAL), _completedBytes(0),
     _totalFiles(UNDEFINED_VAL), _curFiles(0),
     _inSize(UNDEFINED_VAL),
-    _outSize(UNDEFINED_VAL),
-    _isDir(false)
+    _outSize(UNDEFINED_VAL)
     {}
 
 #define CHECK_STOP  if (_stopped) return E_ABORT; if (!_paused) return S_OK;
@@ -228,7 +232,7 @@ void CProgressSync::AddError_Message_Name(const wchar_t *message, const wchar_t
   AddError_Message(s);
 }
 
-void CProgressSync::AddError_Code_Name(DWORD systemError, const wchar_t *name)
+void CProgressSync::AddError_Code_Name(HRESULT systemError, const wchar_t *name)
 {
   UString s = NError::MyFormatMessage(systemError);
   if (systemError == 0)
@@ -262,20 +266,20 @@ CProgressDialog::CProgressDialog():
     throw 1334987;
   if (_createDialogEvent.Create() != S_OK)
     throw 1334987;
-  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (void**)&_taskbarList);
   if (_taskbarList)
     _taskbarList->HrInit();
-  #endif
+  // #endif
 }
 
-#ifndef _SFX
+#ifndef Z7_SFX
 
 CProgressDialog::~CProgressDialog()
 {
-  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   SetTaskbarProgressState(TBPF_NOPROGRESS);
-  #endif
+  // #endif
   AddToTitle(L"");
 }
 void CProgressDialog::AddToTitle(LPCWSTR s)
@@ -292,7 +296,7 @@ void CProgressDialog::AddToTitle(LPCWSTR s)
 
 void CProgressDialog::SetTaskbarProgressState()
 {
-  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   if (_taskbarList && _hwndForTaskbar)
   {
     TBPFLAG tbpFlags;
@@ -302,7 +306,7 @@ void CProgressDialog::SetTaskbarProgressState()
       tbpFlags = _errorsWereDisplayed ? TBPF_ERROR: TBPF_NORMAL;
     SetTaskbarProgressState(tbpFlags);
   }
-  #endif
+  // #endif
 }
 
 static const unsigned kTitleFileNameSizeLimit = 36;
@@ -331,23 +335,23 @@ bool CProgressDialog::OnInit()
   if (!_hwndForTaskbar)
     _hwndForTaskbar = *this;
 
-  INIT_AS_UNDEFINED(_progressBar_Range);
-  INIT_AS_UNDEFINED(_progressBar_Pos);
+  INIT_AS_UNDEFINED(_progressBar_Range)
+  INIT_AS_UNDEFINED(_progressBar_Pos)
 
-  INIT_AS_UNDEFINED(_prevPercentValue);
-  INIT_AS_UNDEFINED(_prevElapsedSec);
-  INIT_AS_UNDEFINED(_prevRemainingSec);
+  INIT_AS_UNDEFINED(_prevPercentValue)
+  INIT_AS_UNDEFINED(_prevElapsedSec)
+  INIT_AS_UNDEFINED(_prevRemainingSec)
 
-  INIT_AS_UNDEFINED(_prevSpeed);
+  INIT_AS_UNDEFINED(_prevSpeed)
   _prevSpeed_MoveBits = 0;
   
   _prevTime = ::GetTickCount();
   _elapsedTime = 0;
 
-  INIT_AS_UNDEFINED(_totalBytes_Prev);
-  INIT_AS_UNDEFINED(_processed_Prev);
-  INIT_AS_UNDEFINED(_packed_Prev);
-  INIT_AS_UNDEFINED(_ratio_Prev);
+  INIT_AS_UNDEFINED(_totalBytes_Prev)
+  INIT_AS_UNDEFINED(_processed_Prev)
+  INIT_AS_UNDEFINED(_packed_Prev)
+  INIT_AS_UNDEFINED(_ratio_Prev)
   
   _filesStr_Prev.Empty();
   _filesTotStr_Prev.Empty();
@@ -362,9 +366,9 @@ bool CProgressDialog::OnInit()
   _wasCreated = true;
   _dialogCreatedEvent.Set();
 
-  #ifdef LANG
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
-  LangSetDlgItems_Colon(*this, kLangIDs_Colon, ARRAY_SIZE(kLangIDs_Colon));
+  #ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems_Colon(*this, kLangIDs_Colon, Z7_ARRAY_SIZE(kLangIDs_Colon));
   #endif
 
   CWindow window(GetItem(IDB_PROGRESS_BACKGROUND));
@@ -453,12 +457,12 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
 
   InvalidateRect(NULL);
 
-  int xSizeClient = xSize - mx * 2;
+  const int xSizeClient = xSize - mx * 2;
 
   {
-    int i;
+    unsigned i;
     for (i = 800; i > 40; i = i * 9 / 10)
-      if (Units_To_Pixels_X(i) <= xSizeClient)
+      if (Units_To_Pixels_X((int)i) <= xSizeClient)
         break;
     _numReduceSymbols = i / 4;
   }
@@ -473,7 +477,7 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   int mx2 = mx;
   for (;; mx2--)
   {
-    int bSize2 = bSizeX * 3 + mx2 * 2;
+    const int bSize2 = bSizeX * 3 + mx2 * 2;
     if (bSize2 <= xSizeClient)
       break;
     if (mx2 < 5)
@@ -488,7 +492,7 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   {
     RECT r;
     GetClientRectOfItem(IDL_PROGRESS_MESSAGES, r);
-    int y = r.top;
+    const int y = r.top;
     int ySize2 = yPos - my - y;
     const int kMinYSize = _buttonSizeY + _buttonSizeY * 3 / 4;
     int xx = xSize - mx * 2;
@@ -519,13 +523,13 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   labelSize = Units_To_Pixels_X(MY_PROGRESS_LABEL_UNITS_MIN);
   valueSize = Units_To_Pixels_X(MY_PROGRESS_VAL_UNITS);
   padSize = Units_To_Pixels_X(MY_PROGRESS_PAD_UNITS);
-  int requiredSize = (labelSize + valueSize) * 2 + padSize;
+  const int requiredSize = (labelSize + valueSize) * 2 + padSize;
 
   int gSize;
   {
     if (requiredSize < xSizeClient)
     {
-      int incr = (xSizeClient - requiredSize) / 3;
+      const int incr = (xSizeClient - requiredSize) / 3;
       labelSize += incr;
     }
     else
@@ -540,7 +544,7 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   labelSize = gSize - valueSize;
 
   yPos = my;
-  for (unsigned i = 0; i < ARRAY_SIZE(kIDs); i += 2)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(kIDs); i += 2)
   {
     int x = mx;
     const unsigned kNumColumn1Items = 5 * 2;
@@ -566,7 +570,7 @@ void CProgressDialog::SetProgressRange(UInt64 range)
   if (range == _progressBar_Range)
     return;
   _progressBar_Range = range;
-  INIT_AS_UNDEFINED(_progressBar_Pos);
+  INIT_AS_UNDEFINED(_progressBar_Pos)
   _progressConv.Init(range);
   m_ProgressBar.SetRange32(0, _progressConv.Count(range));
 }
@@ -578,10 +582,10 @@ void CProgressDialog::SetProgressPos(UInt64 pos)
       pos - _progressBar_Pos >= (_progressBar_Range >> 10))
   {
     m_ProgressBar.SetPos(_progressConv.Count(pos));
-    #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+    // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
     if (_taskbarList && _hwndForTaskbar)
       _taskbarList->SetProgressValue(_hwndForTaskbar, pos, _progressBar_Range);
-    #endif
+    // #endif
     _progressBar_Pos = pos;
   }
 }
@@ -603,10 +607,10 @@ void GetTimeString(UInt64 timeValue, wchar_t *s)
   else
   {
     UInt32 hours32 = (UInt32)hours;
-    UINT_TO_STR_2(hours32);
+    UINT_TO_STR_2(hours32)
   }
-  *s++ = ':'; UINT_TO_STR_2(minutes);
-  *s++ = ':'; UINT_TO_STR_2(seconds);
+  *s++ = ':'; UINT_TO_STR_2(minutes)
+  *s++ = ':'; UINT_TO_STR_2(seconds)
   *s = 0;
 }
 
@@ -627,7 +631,7 @@ static void ConvertSizeToString(UInt64 v, wchar_t *s)
   }
 }
 
-void CProgressDialog::ShowSize(int id, UInt64 val, UInt64 &prev)
+void CProgressDialog::ShowSize(unsigned id, UInt64 val, UInt64 &prev)
 {
   if (val == prev)
     return;
@@ -771,7 +775,7 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
       {
         if (IS_DEFINED_VAL(_prevRemainingSec))
         {
-          INIT_AS_UNDEFINED(_prevRemainingSec);
+          INIT_AS_UNDEFINED(_prevRemainingSec)
           SetItemText(IDT_PROGRESS_REMAINING_VAL, L"");
         }
       }
@@ -790,8 +794,9 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
         }
       }
       {
-        UInt64 elapsedTime = (_elapsedTime == 0) ? 1 : _elapsedTime;
-        UInt64 v = (progressCompleted * 1000) / elapsedTime;
+        const UInt64 elapsedTime = (_elapsedTime == 0) ? 1 : _elapsedTime;
+        // 22.02: progressCompleted can be for number of files
+        UInt64 v = (completed * 1000) / elapsedTime;
         Byte c = 0;
         unsigned moveBits = 0;
              if (v >= ((UInt64)10000 << 10)) { moveBits = 20; c = 'M'; }
@@ -957,7 +962,7 @@ INT_PTR CProgressDialog::Create(const UString &title, NWindows::CThread &thread,
       CWaitCursor waitCursor;
       HANDLE h[] = { thread, _createDialogEvent };
       
-      DWORD res2 = WaitForMultipleObjects(ARRAY_SIZE(h), h, FALSE, kCreateDelay);
+      const DWORD res2 = WaitForMultipleObjects(Z7_ARRAY_SIZE(h), h, FALSE, kCreateDelay);
       if (res2 == WAIT_OBJECT_0 && !Sync.ThereIsMessage())
         return 0;
     }
@@ -979,9 +984,9 @@ INT_PTR CProgressDialog::Create(const UString &title, NWindows::CThread &thread,
 bool CProgressDialog::OnExternalCloseMessage()
 {
   // it doesn't work if there is MessageBox.
-  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   SetTaskbarProgressState(TBPF_NOPROGRESS);
-  #endif
+  // #endif
   // AddToTitle(L"Finished ");
   // SetText(L"Finished2 ");
 
@@ -1088,7 +1093,7 @@ void CProgressDialog::SetTitleText()
   }
 
   s.Add_Space();
-  #ifndef _SFX
+  #ifndef Z7_SFX
   {
     unsigned len = s.Len();
     s += MainAddTitle;
@@ -1150,9 +1155,9 @@ void CProgressDialog::AddMessageDirect(LPCWSTR message, bool needNumber)
   if (needNumber)
     ConvertUInt32ToString(_numMessages + 1, sz);
   const unsigned itemIndex = _messageStrings.Size(); // _messageList.GetItemCount();
-  if (_messageList.InsertItem((int)itemIndex, sz) == (int)itemIndex)
+  if (_messageList.InsertItem(itemIndex, sz) == (int)itemIndex)
   {
-    _messageList.SetSubItem((int)itemIndex, 1, message);
+    _messageList.SetSubItem(itemIndex, 1, message);
     _messageStrings.Add(message);
   }
 }
@@ -1163,12 +1168,12 @@ void CProgressDialog::AddMessage(LPCWSTR message)
   bool needNumber = true;
   while (!s.IsEmpty())
   {
-    int pos = s.Find(L'\n');
+    const int pos = s.Find(L'\n');
     if (pos < 0)
       break;
-    AddMessageDirect(s.Left(pos), needNumber);
+    AddMessageDirect(s.Left((unsigned)pos), needNumber);
     needNumber = false;
-    s.DeleteFrontal(pos + 1);
+    s.DeleteFrontal((unsigned)pos + 1);
   }
   AddMessageDirect(s, needNumber);
   _numMessages++;
@@ -1210,7 +1215,7 @@ void CProgressDialog::UpdateMessagesDialog()
 }
 
 
-bool CProgressDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CProgressDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -1340,7 +1345,7 @@ static void ListView_GetSelected(NControl::CListView &listView, CUIntVector &vec
     index = listView.GetNextSelectedItem(index);
     if (index < 0)
       break;
-    vector.Add(index);
+    vector.Add((unsigned)index);
   }
 }
 
@@ -1352,7 +1357,7 @@ void CProgressDialog::CopyToClipboard()
   UString s;
   unsigned numIndexes = indexes.Size();
   if (numIndexes == 0)
-    numIndexes = _messageList.GetItemCount();
+    numIndexes = (unsigned)_messageList.GetItemCount();
   
   for (unsigned i = 0; i < numIndexes; i++)
   {
@@ -1391,7 +1396,9 @@ static THREAD_FUNC_DECL MyThreadFunction(void *param)
 HRESULT CProgressThreadVirt::Create(const UString &title, HWND parentWindow)
 {
   NWindows::CThread thread;
-  RINOK(thread.Create(MyThreadFunction, this));
+  const WRes wres = thread.Create(MyThreadFunction, this);
+  if (wres != 0)
+    return HRESULT_FROM_WIN32(wres);
   CProgressDialog::Create(title, thread, parentWindow);
   return S_OK;
 }
@@ -1417,7 +1424,7 @@ void CProgressThreadVirt::Process()
   catch(int v)
   {
     m = "Error #";
-    m.Add_UInt32(v);
+    m.Add_UInt32((unsigned)v);
   }
   catch(...) { m = "Error"; }
   if (Result != E_ABORT)
diff --git a/CPP/7zip/UI/FileManager/ProgressDialog2.h b/CPP/7zip/UI/FileManager/ProgressDialog2.h
index d8259d6..4ca9be7 100644
--- a/CPP/7zip/UI/FileManager/ProgressDialog2.h
+++ b/CPP/7zip/UI/FileManager/ProgressDialog2.h
@@ -1,7 +1,7 @@
 // ProgressDialog2.h
 
-#ifndef __PROGRESS_DIALOG_2_H
-#define __PROGRESS_DIALOG_2_H
+#ifndef ZIP7_INC_PROGRESS_DIALOG_2_H
+#define ZIP7_INC_PROGRESS_DIALOG_2_H
 
 #include "../../../Common/MyCom.h"
 
@@ -36,6 +36,7 @@ class CProgressSync
 
 public:
   bool _bytesProgressMode;
+  bool _isDir;
   UInt64 _totalBytes;
   UInt64 _completedBytes;
   UInt64 _totalFiles;
@@ -46,7 +47,6 @@ public:
   UString _titleFileName;
   UString _status;
   UString _filePath;
-  bool _isDir;
 
   UStringVector Messages;
   CProgressFinalMessage FinalMessage;
@@ -96,7 +96,8 @@ public:
 
   void AddError_Message(const wchar_t *message);
   void AddError_Message_Name(const wchar_t *message, const wchar_t *name);
-  void AddError_Code_Name(DWORD systemError, const wchar_t *name);
+  // void AddError_Code_Name(DWORD systemError, const wchar_t *name);
+  void AddError_Code_Name(HRESULT systemError, const wchar_t *name);
 
   bool ThereIsMessage() const { return !Messages.IsEmpty() || FinalMessage.ThereIsMessage(); }
 };
@@ -151,12 +152,12 @@ class CProgressDialog: public NWindows::NControl::CModalDialog
   NWindows::NControl::CProgressBar m_ProgressBar;
   NWindows::NControl::CListView _messageList;
   
-  int _numMessages;
+  unsigned _numMessages;
   UStringVector _messageStrings;
 
-  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   CMyComPtr<ITaskbarList3> _taskbarList;
-  #endif
+  // #endif
   HWND _hwndForTaskbar;
 
   UInt32 _prevTime;
@@ -196,29 +197,29 @@ class CProgressDialog: public NWindows::NControl::CModalDialog
   bool _externalCloseMessageWasReceived;
 
 
-  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   void SetTaskbarProgressState(TBPFLAG tbpFlags)
   {
     if (_taskbarList && _hwndForTaskbar)
       _taskbarList->SetProgressState(_hwndForTaskbar, tbpFlags);
   }
-  #endif
+  // #endif
   void SetTaskbarProgressState();
 
   void UpdateStatInfo(bool showAll);
-  bool OnTimer(WPARAM timerID, LPARAM callback);
   void SetProgressRange(UInt64 range);
   void SetProgressPos(UInt64 pos);
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
-  virtual void OnCancel();
-  virtual void OnOK();
-  virtual bool OnNotify(UINT /* controlID */, LPNMHDR header);
+  virtual bool OnTimer(WPARAM timerID, LPARAM callback) Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual void OnCancel() Z7_override;
+  virtual void OnOK() Z7_override;
+  virtual bool OnNotify(UINT /* controlID */, LPNMHDR header) Z7_override;
   void CopyToClipboard();
 
   NWindows::NSynchronization::CManualResetEvent _createDialogEvent;
   NWindows::NSynchronization::CManualResetEvent _dialogCreatedEvent;
-  #ifndef _SFX
+  #ifndef Z7_SFX
   void AddToTitle(LPCWSTR string);
   #endif
 
@@ -226,11 +227,11 @@ class CProgressDialog: public NWindows::NControl::CModalDialog
   void SetPriorityText();
   void OnPauseButton();
   void OnPriorityButton();
-  bool OnButtonClicked(int buttonID, HWND buttonHWND);
-  bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
+  bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
 
   void SetTitleText();
-  void ShowSize(int id, UInt64 val, UInt64 &prev);
+  void ShowSize(unsigned id, UInt64 val, UInt64 &prev);
 
   void UpdateMessagesDialog();
 
@@ -252,10 +253,10 @@ public:
   int IconID;
 
   HWND MainWindow;
-  #ifndef _SFX
+  #ifndef Z7_SFX
   UString MainTitle;
   UString MainAddTitle;
-  ~CProgressDialog();
+  ~CProgressDialog() Z7_DESTRUCTOR_override;
   #endif
 
   CProgressDialog();
@@ -265,7 +266,7 @@ public:
     _dialogCreatedEvent.Lock();
   }
 
-  INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = 0);
+  INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = NULL);
 
 
   /* how it works:
@@ -306,7 +307,7 @@ public:
   void Process();
   void AddErrorPath(const FString &path) { ErrorPaths.Add(path); }
 
-  HRESULT Create(const UString &title, HWND parentWindow = 0);
+  HRESULT Create(const UString &title, HWND parentWindow = NULL);
   CProgressThreadVirt(): Result(E_FAIL), ThreadFinishedOK(false) {}
 
   CProgressMessageBoxPair &GetMessagePair(bool isError) { return isError ? FinalMessage.ErrorMessage : FinalMessage.OkMessage; }
diff --git a/CPP/7zip/UI/FileManager/PropertyName.h b/CPP/7zip/UI/FileManager/PropertyName.h
index 4f0d6dc..fa6e5c5 100644
--- a/CPP/7zip/UI/FileManager/PropertyName.h
+++ b/CPP/7zip/UI/FileManager/PropertyName.h
@@ -1,7 +1,7 @@
 // PropertyName.h
 
-#ifndef __PROPERTY_NAME_H
-#define __PROPERTY_NAME_H
+#ifndef ZIP7_INC_PROPERTY_NAME_H
+#define ZIP7_INC_PROPERTY_NAME_H
 
 #include "../../../Common/MyString.h"
 
diff --git a/CPP/7zip/UI/FileManager/PropertyName.rc b/CPP/7zip/UI/FileManager/PropertyName.rc
index e16c526..618875b 100644
--- a/CPP/7zip/UI/FileManager/PropertyName.rc
+++ b/CPP/7zip/UI/FileManager/PropertyName.rc
@@ -104,4 +104,6 @@ BEGIN
   IDS_PROP_GROUP_ID     "Group ID"
   IDS_PROP_DEVICE_MAJOR "Device Major"
   IDS_PROP_DEVICE_MINOR "Device Minor"
+  IDS_PROP_DEV_MAJOR    "Dev Major"
+  IDS_PROP_DEV_MINOR    "Dev Minor"
 END
diff --git a/CPP/7zip/UI/FileManager/PropertyNameRes.h b/CPP/7zip/UI/FileManager/PropertyNameRes.h
index e3d08db..913887e 100644
--- a/CPP/7zip/UI/FileManager/PropertyNameRes.h
+++ b/CPP/7zip/UI/FileManager/PropertyNameRes.h
@@ -100,3 +100,5 @@
 #define IDS_PROP_GROUP_ID         1100
 #define IDS_PROP_DEVICE_MAJOR     1101
 #define IDS_PROP_DEVICE_MINOR     1102
+#define IDS_PROP_DEV_MAJOR        1103
+#define IDS_PROP_DEV_MINOR        1104
diff --git a/CPP/7zip/UI/FileManager/RegistryAssociations.cpp b/CPP/7zip/UI/FileManager/RegistryAssociations.cpp
index e48dbb4..16e4675 100644
--- a/CPP/7zip/UI/FileManager/RegistryAssociations.cpp
+++ b/CPP/7zip/UI/FileManager/RegistryAssociations.cpp
@@ -65,18 +65,18 @@ bool CShellExtInfo::ReadFromRegistry(HKEY hkey, const CSysString &ext)
       UString value;
       if (iconKey.QueryValue(NULL, value) == ERROR_SUCCESS)
       {
-        int pos = value.ReverseFind(L',');
+        const int pos = value.ReverseFind(L',');
         IconPath = value;
         if (pos >= 0)
         {
           const wchar_t *end;
-          Int32 index = ConvertStringToInt32((const wchar_t *)value + pos + 1, &end);
+          const Int32 index = ConvertStringToInt32((const wchar_t *)value + pos + 1, &end);
           if (*end == 0)
           {
             // 9.31: if there is no icon index, we use -1. Is it OK?
             if (pos != (int)value.Len() - 1)
               IconIndex = (int)index;
-            IconPath.SetFrom(value, pos);
+            IconPath.SetFrom(value, (unsigned)pos);
           }
         }
       }
diff --git a/CPP/7zip/UI/FileManager/RegistryAssociations.h b/CPP/7zip/UI/FileManager/RegistryAssociations.h
index 975c9d5..3d7b63d 100644
--- a/CPP/7zip/UI/FileManager/RegistryAssociations.h
+++ b/CPP/7zip/UI/FileManager/RegistryAssociations.h
@@ -1,7 +1,7 @@
 // RegistryAssociations.h
 
-#ifndef __REGISTRY_ASSOCIATIONS_H
-#define __REGISTRY_ASSOCIATIONS_H
+#ifndef ZIP7_INC_REGISTRY_ASSOCIATIONS_H
+#define ZIP7_INC_REGISTRY_ASSOCIATIONS_H
 
 #include "../../../Common/MyString.h"
 
diff --git a/CPP/7zip/UI/FileManager/RegistryPlugins.cpp b/CPP/7zip/UI/FileManager/RegistryPlugins.cpp
index 76a5787..87e5fa1 100644
--- a/CPP/7zip/UI/FileManager/RegistryPlugins.cpp
+++ b/CPP/7zip/UI/FileManager/RegistryPlugins.cpp
@@ -2,138 +2,144 @@
 
 #include "StdAfx.h"
 
+/*
 #include "../../../Windows/DLL.h"
 #include "../../../Windows/FileFind.h"
 #include "../../../Windows/PropVariant.h"
 
 #include "IFolder.h"
+*/
 #include "RegistryPlugins.h"
 
-using namespace NWindows;
-using namespace NFile;
+// using namespace NWindows;
+// using namespace NFile;
 
 /*
-static LPCTSTR const kLMBasePath = TEXT("Software\\7-Zip\\FM");
+typedef UINT32 (WINAPI * Func_GetPluginProperty)(PROPID propID, PROPVARIANT *value);
 
-static LPCTSTR const kPluginsKeyName = TEXT("Plugins");
-static LPCTSTR const kPluginsOpenClassIDValue = TEXT("CLSID");
-static LPCTSTR const kPluginsOptionsClassIDValue = TEXT("Options");
-static LPCTSTR const kPluginsTypeValue = TEXT("Type");
-
-static CSysString GetFileFolderPluginsKeyName()
-{
-  return CSysString(kLMBasePath) + CSysString(TEXT('\\')) +
-      CSysString(kPluginsKeyName);
-}
-
-*/
-
-typedef UINT32 (WINAPI * GetPluginPropertyFunc)(PROPID propID, PROPVARIANT *value);
-
-static bool ReadPluginInfo(CPluginInfo &pluginInfo, bool needCheckDll)
+static bool ReadPluginInfo(CPluginInfo &plugin, bool needCheckDll)
 {
   if (needCheckDll)
   {
     NDLL::CLibrary lib;
-    if (!lib.LoadEx(pluginInfo.FilePath, LOAD_LIBRARY_AS_DATAFILE))
+    if (!lib.LoadEx(plugin.FilePath, LOAD_LIBRARY_AS_DATAFILE))
       return false;
   }
   NDLL::CLibrary lib;
-  if (!lib.Load(pluginInfo.FilePath))
+  if (!lib.Load(plugin.FilePath))
     return false;
-  GetPluginPropertyFunc getPluginProperty = (GetPluginPropertyFunc)lib.GetProc("GetPluginProperty");
-  if (getPluginProperty == NULL)
+  const
+  Func_GetPluginProperty
+     f_GetPluginProperty = ZIP7_GET_PROC_ADDRESS(
+  Func_GetPluginProperty, lib.Get_HMODULE(),
+      "GetPluginProperty");
+  if (!f_GetPluginProperty)
     return false;
-  
+
   NCOM::CPropVariant prop;
-  if (getPluginProperty(NPlugin::kName, &prop) != S_OK)
+  if (f_GetPluginProperty(NPlugin::kType, &prop) != S_OK)
+    return false;
+  if (prop.vt == VT_EMPTY)
+    plugin.Type = kPluginTypeFF;
+  else if (prop.vt == VT_UI4)
+    plugin.Type = (EPluginType)prop.ulVal;
+  else
+    return false;
+  prop.Clear();
+  
+  if (f_GetPluginProperty(NPlugin::kName, &prop) != S_OK)
     return false;
   if (prop.vt != VT_BSTR)
     return false;
-  pluginInfo.Name = prop.bstrVal;
+  plugin.Name = prop.bstrVal;
   prop.Clear();
   
-  if (getPluginProperty(NPlugin::kClassID, &prop) != S_OK)
+  if (f_GetPluginProperty(NPlugin::kClassID, &prop) != S_OK)
     return false;
   if (prop.vt == VT_EMPTY)
-    pluginInfo.ClassIDDefined = false;
+    plugin.ClassID_Defined = false;
   else if (prop.vt != VT_BSTR)
     return false;
   else
   {
-    pluginInfo.ClassIDDefined = true;
-    pluginInfo.ClassID = *(const GUID *)(const void *)prop.bstrVal;
+    plugin.ClassID_Defined = true;
+    plugin.ClassID = *(const GUID *)(const void *)prop.bstrVal;
   }
   prop.Clear();
+  return true;
+*/
   
-  if (getPluginProperty(NPlugin::kOptionsClassID, &prop) != S_OK)
+/*
+{
+  if (f_GetPluginProperty(NPlugin::kOptionsClassID, &prop) != S_OK)
     return false;
   if (prop.vt == VT_EMPTY)
-    pluginInfo.OptionsClassIDDefined = false;
+    plugin.OptionsClassID_Defined = false;
   else if (prop.vt != VT_BSTR)
     return false;
   else
   {
-    pluginInfo.OptionsClassIDDefined = true;
-    pluginInfo.OptionsClassID = *(const GUID *)(const void *)prop.bstrVal;
+    plugin.OptionsClassID_Defined = true;
+    plugin.OptionsClassID = *(const GUID *)(const void *)prop.bstrVal;
   }
-  prop.Clear();
-
-  if (getPluginProperty(NPlugin::kType, &prop) != S_OK)
-    return false;
-  if (prop.vt == VT_EMPTY)
-    pluginInfo.Type = kPluginTypeFF;
-  else if (prop.vt == VT_UI4)
-    pluginInfo.Type = (EPluginType)prop.ulVal;
-  else
-    return false;
-  return true;
 }
+*/
 
-void ReadPluginInfoList(CObjectVector<CPluginInfo> &plugins)
-{
-  plugins.Clear();
+    /*
+    {
+      // very old 7-zip used agent plugin in "7-zip.dll"
+      // but then agent code was moved to 7zfm.
+      // so now we don't need to load "7-zip.dll" here
+      CPluginInfo plugin;
+      plugin.FilePath = baseFolderPrefix + FTEXT("7-zip.dll");
+      if (::ReadPluginInfo(plugin, false))
+      if (plugin.Type == kPluginTypeFF)
+        plugins.Add(plugin);
+    }
+    */
+    /*
+    FString folderPath = NDLL::GetModuleDirPrefix();
+    folderPath += "Plugins" STRING_PATH_SEPARATOR;
+    NFind::CEnumerator enumerator;
+    enumerator.SetDirPrefix(folderPath);
+    NFind::CFileInfo fi;
+    while (enumerator.Next(fi))
+    {
+      if (fi.IsDir())
+        continue;
+      CPluginInfo plugin;
+      plugin.FilePath = folderPath + fi.Name;
+      if (::ReadPluginInfo(plugin, true))
+      if (plugin.Type == kPluginTypeFF)
+        plugins.Add(plugin);
+    }
+    */
 
-  FString baseFolderPrefix = NDLL::GetModuleDirPrefix();
-  {
-    CPluginInfo pluginInfo;
-    pluginInfo.FilePath = baseFolderPrefix + FTEXT("7-zip.dll");
-    if (::ReadPluginInfo(pluginInfo, false))
-      plugins.Add(pluginInfo);
-  }
-  FString folderPath = baseFolderPrefix;
-  folderPath += "Plugins" STRING_PATH_SEPARATOR;
-  NFind::CEnumerator enumerator;
-  enumerator.SetDirPrefix(folderPath);
-  NFind::CFileInfo fileInfo;
-  while (enumerator.Next(fileInfo))
-  {
-    if (fileInfo.IsDir())
-      continue;
-    CPluginInfo pluginInfo;
-    pluginInfo.FilePath = folderPath + fileInfo.Name;
-    if (::ReadPluginInfo(pluginInfo, true))
-      plugins.Add(pluginInfo);
-  }
-}
-
-void ReadFileFolderPluginInfoList(CObjectVector<CPluginInfo> &plugins)
-{
+  /*
   ReadPluginInfoList(plugins);
   for (unsigned i = 0; i < plugins.Size();)
     if (plugins[i].Type != kPluginTypeFF)
       plugins.Delete(i);
     else
       i++;
+  */
+
+/*
+void ReadFileFolderPluginInfoList(CObjectVector<CPluginInfo> &plugins)
+{
+  plugins.Clear();
+  {
+  }
+
   {
-    CPluginInfo p;
+    CPluginInfo &plugin = plugins.AddNew();
     // p.FilePath.Empty();
-    p.Type = kPluginTypeFF;
-    p.Name = "7-Zip";
-    // p.ClassID = CLSID_CAgentArchiveHandler;
-    p.ClassIDDefined = true;
-    // p.OptionsClassID;
-    p.OptionsClassIDDefined = false;
-    plugins.Add(p);
+    plugin.Type = kPluginTypeFF;
+    plugin.Name = "7-Zip";
+    // plugin.ClassID = CLSID_CAgentArchiveHandler;
+    // plugin.ClassID_Defined = true;
+    // plugin.ClassID_Defined = false;
+    // plugin.OptionsClassID_Defined = false;
   }
 }
+*/
diff --git a/CPP/7zip/UI/FileManager/RegistryPlugins.h b/CPP/7zip/UI/FileManager/RegistryPlugins.h
index dfa6de5..1cb765a 100644
--- a/CPP/7zip/UI/FileManager/RegistryPlugins.h
+++ b/CPP/7zip/UI/FileManager/RegistryPlugins.h
@@ -1,10 +1,11 @@
 // RegistryPlugins.h
 
-#ifndef __REGISTRY_PLUGINS_H
-#define __REGISTRY_PLUGINS_H
+#ifndef ZIP7_INC_REGISTRY_PLUGINS_H
+#define ZIP7_INC_REGISTRY_PLUGINS_H
 
 #include "../../../Common/MyString.h"
 
+/*
 enum EPluginType
 {
   kPluginTypeFF = 0
@@ -12,21 +13,17 @@ enum EPluginType
 
 struct CPluginInfo
 {
-  FString FilePath;
   EPluginType Type;
-  UString Name;
-  CLSID ClassID;
-  CLSID OptionsClassID;
-  bool ClassIDDefined;
-  bool OptionsClassIDDefined;
-
-  // CSysString Extension;
-  // CSysString AddExtension;
-  // bool UpdateEnabled;
-  // bool KeepName;
+  // bool ClassID_Defined;
+  // bool OptionsClassID_Defined;
+  // FString FilePath;
+  // UString Name;
+  // CLSID ClassID;
+  // CLSID OptionsClassID;
 };
 
-void ReadPluginInfoList(CObjectVector<CPluginInfo> &plugins);
-void ReadFileFolderPluginInfoList(CObjectVector<CPluginInfo> &plugins);
+// void ReadPluginInfoList(CObjectVector<CPluginInfo> &plugins);
+// void ReadFileFolderPluginInfoList(CObjectVector<CPluginInfo> &plugins);
+*/
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/RegistryUtils.cpp b/CPP/7zip/UI/FileManager/RegistryUtils.cpp
index a2fc201..7e61998 100644
--- a/CPP/7zip/UI/FileManager/RegistryUtils.cpp
+++ b/CPP/7zip/UI/FileManager/RegistryUtils.cpp
@@ -137,6 +137,11 @@ void CFmSettings::Load()
 {
   ShowDots = false;
   ShowRealFileIcons = false;
+  /* if (FullRow == false), we can use mouse click on another columns
+     to select group of files. We need to implement additional
+     way to select files in any column as in Explorer.
+     Then we can enable (FullRow == true) default mode. */
+  // FullRow = true;
   FullRow = false;
   ShowGrid = false;
   SingleClick = false;
diff --git a/CPP/7zip/UI/FileManager/RegistryUtils.h b/CPP/7zip/UI/FileManager/RegistryUtils.h
index b85d670..8b4cdf0 100644
--- a/CPP/7zip/UI/FileManager/RegistryUtils.h
+++ b/CPP/7zip/UI/FileManager/RegistryUtils.h
@@ -1,7 +1,7 @@
 // RegistryUtils.h
 
-#ifndef __REGISTRY_UTILS_H
-#define __REGISTRY_UTILS_H
+#ifndef ZIP7_INC_REGISTRY_UTILS_H
+#define ZIP7_INC_REGISTRY_UTILS_H
 
 #include "../../../Common/MyTypes.h"
 #include "../../../Common/MyString.h"
diff --git a/CPP/7zip/UI/FileManager/RootFolder.cpp b/CPP/7zip/UI/FileManager/RootFolder.cpp
index 84844c7..34dd638 100644
--- a/CPP/7zip/UI/FileManager/RootFolder.cpp
+++ b/CPP/7zip/UI/FileManager/RootFolder.cpp
@@ -4,7 +4,11 @@
 
 #include "../../../Common/MyWindows.h"
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <shlobj.h>
+#else
 #include <ShlObj.h>
+#endif
 
 #include "../../../Common/StringConvert.h"
 
@@ -96,19 +100,19 @@ void CRootFolder::Init()
   #endif
 }
 
-STDMETHODIMP CRootFolder::LoadItems()
+Z7_COM7F_IMF(CRootFolder::LoadItems())
 {
   Init();
   return S_OK;
 }
 
-STDMETHODIMP CRootFolder::GetNumberOfItems(UInt32 *numItems)
+Z7_COM7F_IMF(CRootFolder::GetNumberOfItems(UInt32 *numItems))
 {
   *numItems = kNumRootFolderItems;
   return S_OK;
 }
 
-STDMETHODIMP CRootFolder::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CRootFolder::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIANT *value))
 {
   NCOM::CPropVariant prop;
   switch (propID)
@@ -120,28 +124,31 @@ STDMETHODIMP CRootFolder::GetProperty(UInt32 itemIndex, PROPID propID, PROPVARIA
   return S_OK;
 }
 
-typedef BOOL (WINAPI *SHGetSpecialFolderPathWp)(HWND hwnd, LPWSTR pszPath, int csidl, BOOL fCreate);
-typedef BOOL (WINAPI *SHGetSpecialFolderPathAp)(HWND hwnd, LPSTR pszPath, int csidl, BOOL fCreate);
+typedef BOOL (WINAPI *Func_SHGetSpecialFolderPathW)(HWND hwnd, LPWSTR pszPath, int csidl, BOOL fCreate);
+typedef BOOL (WINAPI *Func_SHGetSpecialFolderPathA)(HWND hwnd, LPSTR pszPath, int csidl, BOOL fCreate);
 
 static UString GetMyDocsPath()
 {
   UString us;
   WCHAR s[MAX_PATH + 1];
-  SHGetSpecialFolderPathWp getW = (SHGetSpecialFolderPathWp)
-      #ifdef UNDER_CE
-      My_GetProcAddress(GetModuleHandle(TEXT("coredll.dll")), "SHGetSpecialFolderPath");
-      #else
-      My_GetProcAddress(GetModuleHandle(TEXT("shell32.dll")), "SHGetSpecialFolderPathW");
-      #endif
-  if (getW && getW(0, s, CSIDL_PERSONAL, FALSE))
+#ifdef UNDER_CE
+  #define shell_name TEXT("coredll.dll")
+#else
+  #define shell_name TEXT("shell32.dll")
+#endif
+  Func_SHGetSpecialFolderPathW getW = Z7_GET_PROC_ADDRESS(
+  Func_SHGetSpecialFolderPathW, GetModuleHandle(shell_name),
+      "SHGetSpecialFolderPathW");
+  if (getW && getW(NULL, s, CSIDL_PERSONAL, FALSE))
     us = s;
   #ifndef _UNICODE
   else
   {
-    SHGetSpecialFolderPathAp getA = (SHGetSpecialFolderPathAp)
-        (void *)::GetProcAddress(::GetModuleHandleA("shell32.dll"), "SHGetSpecialFolderPathA");
+    Func_SHGetSpecialFolderPathA getA = Z7_GET_PROC_ADDRESS(
+    Func_SHGetSpecialFolderPathA, ::GetModuleHandleA("shell32.dll"),
+        "SHGetSpecialFolderPathA");
     CHAR s2[MAX_PATH + 1];
-    if (getA && getA(0, s2, CSIDL_PERSONAL, FALSE))
+    if (getA && getA(NULL, s2, CSIDL_PERSONAL, FALSE))
       us = GetUnicodeString(s2);
   }
   #endif
@@ -149,7 +156,7 @@ static UString GetMyDocsPath()
   return us;
 }
 
-STDMETHODIMP CRootFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CRootFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolder))
 {
   *resultFolder = NULL;
   CMyComPtr<IFolderFolder> subFolder;
@@ -165,7 +172,7 @@ STDMETHODIMP CRootFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolde
   {
     CNetFolder *netFolderSpec = new CNetFolder;
     subFolder = netFolderSpec;
-    netFolderSpec->Init(0, 0, _names[ROOT_INDEX_NETWORK] + WCHAR_PATH_SEPARATOR);
+    netFolderSpec->Init(NULL, NULL, _names[ROOT_INDEX_NETWORK] + WCHAR_PATH_SEPARATOR);
   }
   else if (index == ROOT_INDEX_DOCUMENTS)
   {
@@ -174,7 +181,7 @@ STDMETHODIMP CRootFolder::BindToFolder(UInt32 index, IFolderFolder **resultFolde
     {
       NFsFolder::CFSFolder *fsFolderSpec = new NFsFolder::CFSFolder;
       subFolder = fsFolderSpec;
-      RINOK(fsFolderSpec->Init(us2fs(s)));
+      RINOK(fsFolderSpec->Init(us2fs(s)))
     }
   }
   #else
@@ -202,9 +209,9 @@ static bool AreEqualNames(const UString &path, const wchar_t *name)
   return path.IsPrefixedBy(name);
 }
 
-STDMETHODIMP CRootFolder::BindToFolder(const wchar_t *name, IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CRootFolder::BindToFolder(const wchar_t *name, IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   UString name2 = name;
   name2.Trim();
   
@@ -259,7 +266,8 @@ STDMETHODIMP CRootFolder::BindToFolder(const wchar_t *name, IFolderFolder **resu
     subFolder = folderSpec;
     folderSpec->Init(false, true);
   }
-  else if (name2.Back() == ':')
+  else if (name2.Back() == ':'
+      && (name2.Len() != 2 || !NFile::NName::IsDrivePath2(name2)))
   {
     NAltStreamsFolder::CAltStreamsFolder *folderSpec = new NAltStreamsFolder::CAltStreamsFolder;
     subFolder = folderSpec;
@@ -291,15 +299,15 @@ STDMETHODIMP CRootFolder::BindToFolder(const wchar_t *name, IFolderFolder **resu
   return S_OK;
 }
 
-STDMETHODIMP CRootFolder::BindToParentFolder(IFolderFolder **resultFolder)
+Z7_COM7F_IMF(CRootFolder::BindToParentFolder(IFolderFolder **resultFolder))
 {
-  *resultFolder = 0;
+  *resultFolder = NULL;
   return S_OK;
 }
 
 IMP_IFolderFolder_Props(CRootFolder)
 
-STDMETHODIMP CRootFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
+Z7_COM7F_IMF(CRootFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value))
 {
   NCOM::CPropVariant prop;
   switch (propID)
@@ -311,7 +319,7 @@ STDMETHODIMP CRootFolder::GetFolderProperty(PROPID propID, PROPVARIANT *value)
   return S_OK;
 }
 
-STDMETHODIMP CRootFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex)
+Z7_COM7F_IMF(CRootFolder::GetSystemIconIndex(UInt32 index, Int32 *iconIndex))
 {
   *iconIndex = _iconIndices[index];
   return S_OK;
diff --git a/CPP/7zip/UI/FileManager/RootFolder.h b/CPP/7zip/UI/FileManager/RootFolder.h
index e253783..3f0a31b 100644
--- a/CPP/7zip/UI/FileManager/RootFolder.h
+++ b/CPP/7zip/UI/FileManager/RootFolder.h
@@ -1,26 +1,23 @@
 // RootFolder.h
 
-#ifndef __ROOT_FOLDER_H
-#define __ROOT_FOLDER_H
+#ifndef ZIP7_INC_ROOT_FOLDER_H
+#define ZIP7_INC_ROOT_FOLDER_H
 
+#include "../../../Common/MyCom.h"
 #include "../../../Common/MyString.h"
 
 #include "IFolder.h"
 
 const unsigned kNumRootFolderItems_Max = 4;
 
-class CRootFolder:
-  public IFolderFolder,
-  public IFolderGetSystemIconIndex,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_NOQIB_2(
+  CRootFolder
+  , IFolderFolder
+  , IFolderGetSystemIconIndex
+)
   UString _names[kNumRootFolderItems_Max];
   int _iconIndices[kNumRootFolderItems_Max];
-
 public:
-  MY_UNKNOWN_IMP1(IFolderGetSystemIconIndex)
-  INTERFACE_FolderFolder(;)
-  STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
   void Init();
 };
 
diff --git a/CPP/7zip/UI/FileManager/SettingsPage.cpp b/CPP/7zip/UI/FileManager/SettingsPage.cpp
index 2868721..784b8c7 100644
--- a/CPP/7zip/UI/FileManager/SettingsPage.cpp
+++ b/CPP/7zip/UI/FileManager/SettingsPage.cpp
@@ -20,6 +20,7 @@
 
 using namespace NWindows;
 
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDX_SETTINGS_SHOW_DOTS,
@@ -32,6 +33,7 @@ static const UInt32 kLangIDs[] =
   IDX_SETTINGS_LARGE_PAGES
   // , IDT_COMPRESS_MEMORY
 };
+#endif
 
 #define kSettingsTopic "FM/options.htm#settings"
 
@@ -112,7 +114,9 @@ bool CSettingsPage::OnInit()
   _memCombo.Attach(GetItem(IDC_SETTINGS_MEM));
   */
 
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+#ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+#endif
 
   CFmSettings st;
   st.Load();
@@ -225,7 +229,7 @@ LONG CSettingsPage::OnApply()
   {
     if (IsLargePageSupported())
     {
-      bool enable = IsButtonCheckedBool(IDX_SETTINGS_LARGE_PAGES);
+      const bool enable = IsButtonCheckedBool(IDX_SETTINGS_LARGE_PAGES);
       NSecurity::EnablePrivilege_LockMemory(enable);
       SaveLockMemoryEnable(enable);
     }
@@ -301,7 +305,7 @@ void CSettingsPage::OnNotifyHelp()
 }
 
 /*
-bool CSettingsPage::OnCommand(int code, int itemID, LPARAM param)
+bool CSettingsPage::OnCommand(unsigned code, unsigned itemID, LPARAM param)
 {
   if (code == CBN_SELCHANGE)
   {
@@ -319,7 +323,7 @@ bool CSettingsPage::OnCommand(int code, int itemID, LPARAM param)
 }
 */
 
-bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CSettingsPage::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
diff --git a/CPP/7zip/UI/FileManager/SettingsPage.h b/CPP/7zip/UI/FileManager/SettingsPage.h
index f3f57a4..91b9828 100644
--- a/CPP/7zip/UI/FileManager/SettingsPage.h
+++ b/CPP/7zip/UI/FileManager/SettingsPage.h
@@ -1,7 +1,7 @@
 // SettingsPage.h
  
-#ifndef __SETTINGS_PAGE_H
-#define __SETTINGS_PAGE_H
+#ifndef ZIP7_INC_SETTINGS_PAGE_H
+#define ZIP7_INC_SETTINGS_PAGE_H
 
 #include "../../../Windows/Control/PropertyPage.h"
 #include "../../../Windows/Control/ComboBox.h"
@@ -22,11 +22,11 @@ class CSettingsPage: public NWindows::NControl::CPropertyPage
   */
 
   // void EnableSubItems();
-  // bool OnCommand(int code, int itemID, LPARAM param);
-  bool OnButtonClicked(int buttonID, HWND buttonHWND);
-  virtual bool OnInit();
-  virtual void OnNotifyHelp();
-  virtual LONG OnApply();
+  // bool OnCommand(unsigned code, unsigned itemID, LPARAM param) Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual void OnNotifyHelp() Z7_override;
+  virtual LONG OnApply() Z7_override;
 public:
 };
 
diff --git a/CPP/7zip/UI/FileManager/SplitDialog.cpp b/CPP/7zip/UI/FileManager/SplitDialog.cpp
index 0c9fdd1..21d812c 100644
--- a/CPP/7zip/UI/FileManager/SplitDialog.cpp
+++ b/CPP/7zip/UI/FileManager/SplitDialog.cpp
@@ -4,9 +4,7 @@
 
 #include "../../../Windows/FileName.h"
 
-#ifdef LANG
 #include "LangUtils.h"
-#endif
 
 #include "BrowseDialog.h"
 #include "CopyDialogRes.h"
@@ -16,7 +14,7 @@
 
 using namespace NWindows;
 
-#ifdef LANG
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_SPLIT_PATH,
@@ -27,9 +25,9 @@ static const UInt32 kLangIDs[] =
 
 bool CSplitDialog::OnInit()
 {
-  #ifdef LANG
+  #ifdef Z7_LANG
   LangSetWindowText(*this, IDD_SPLIT);
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
   #endif
   _pathCombo.Attach(GetItem(IDC_SPLIT_PATH));
   _volumeCombo.Attach(GetItem(IDC_SPLIT_VOLUME));
@@ -75,7 +73,7 @@ bool CSplitDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   return false;
 }
 
-bool CSplitDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CSplitDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -91,7 +89,7 @@ void CSplitDialog::OnButtonSetPath()
   UString currentPath;
   _pathCombo.GetText(currentPath);
   // UString title = "Specify a location for output folder";
-  UString title = LangString(IDS_SET_FOLDER);
+  const UString title = LangString(IDS_SET_FOLDER);
 
   UString resultPath;
   if (!MyBrowseForFolder(*this, title, currentPath, resultPath))
diff --git a/CPP/7zip/UI/FileManager/SplitDialog.h b/CPP/7zip/UI/FileManager/SplitDialog.h
index 00aae65..f897136 100644
--- a/CPP/7zip/UI/FileManager/SplitDialog.h
+++ b/CPP/7zip/UI/FileManager/SplitDialog.h
@@ -1,7 +1,7 @@
 // SplitDialog.h
 
-#ifndef __SPLIT_DIALOG_H
-#define __SPLIT_DIALOG_H
+#ifndef ZIP7_INC_SPLIT_DIALOG_H
+#define ZIP7_INC_SPLIT_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/ComboBox.h"
@@ -12,16 +12,16 @@ class CSplitDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CComboBox _pathCombo;
   NWindows::NControl::CComboBox _volumeCombo;
-  virtual void OnOK();
-  virtual bool OnInit();
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual void OnOK() Z7_override;
+  virtual bool OnInit() Z7_override;
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   void OnButtonSetPath();
 public:
   UString FilePath;
   UString Path;
   CRecordVector<UInt64> VolumeSizes;
-  INT_PTR Create(HWND parentWindow = 0)
+  INT_PTR Create(HWND parentWindow = NULL)
     { return CModalDialog::Create(IDD_SPLIT, parentWindow); }
 };
 
diff --git a/CPP/7zip/UI/FileManager/SplitUtils.cpp b/CPP/7zip/UI/FileManager/SplitUtils.cpp
index 4b6235b..1982afb 100644
--- a/CPP/7zip/UI/FileManager/SplitUtils.cpp
+++ b/CPP/7zip/UI/FileManager/SplitUtils.cpp
@@ -74,7 +74,7 @@ static const char * const k_Sizes[] =
 
 void AddVolumeItems(NWindows::NControl::CComboBox &combo)
 {
-  for (unsigned i = 0; i < ARRAY_SIZE(k_Sizes); i++)
+  for (unsigned i = 0; i < Z7_ARRAY_SIZE(k_Sizes); i++)
     combo.AddString(CSysString(k_Sizes[i]));
 }
 
diff --git a/CPP/7zip/UI/FileManager/SplitUtils.h b/CPP/7zip/UI/FileManager/SplitUtils.h
index 641dfe6..d1d44e4 100644
--- a/CPP/7zip/UI/FileManager/SplitUtils.h
+++ b/CPP/7zip/UI/FileManager/SplitUtils.h
@@ -1,7 +1,7 @@
 // SplitUtils.h
 
-#ifndef __SPLIT_UTILS_H
-#define __SPLIT_UTILS_H
+#ifndef ZIP7_INC_SPLIT_UTILS_H
+#define ZIP7_INC_SPLIT_UTILS_H
 
 #include "../../../Common/MyTypes.h"
 #include "../../../Common/MyString.h"
diff --git a/CPP/7zip/UI/FileManager/StdAfx.h b/CPP/7zip/UI/FileManager/StdAfx.h
index 0e6d446..789cc6e 100644
--- a/CPP/7zip/UI/FileManager/StdAfx.h
+++ b/CPP/7zip/UI/FileManager/StdAfx.h
@@ -1,21 +1,83 @@
-// stdafx.h
+// StdAfx.h
 
-#ifndef __STDAFX_H
-#define __STDAFX_H
+#ifndef ZIP7_INC_STDAFX_H
+#define ZIP7_INC_STDAFX_H
 
-/* we used 0x0400 for Windows NT supporting (MENUITEMINFOW)
-   But now menu problem is fixed. So it's OK to use 0x0500 (Windows 2000) */
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+#pragma warning(disable : 4464) // relative include path contains '..'
+#endif
+
+#include "../../../../C/Compiler.h"
 
+Z7_DIAGNOSCTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
+#ifndef _WIN32_WINNT
 // #define _WIN32_WINNT 0x0400
 #define _WIN32_WINNT 0x0500
+// #define _WIN32_WINNT 0x0600
+// #define _WIN32_WINNT 0x0A00
+#endif
+#ifndef WINVER
 #define WINVER _WIN32_WINNT
+#endif
+// #define _WIN32_IE 0x400 // for debug
+Z7_DIAGNOSCTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER
 
 #include "../../../Common/Common.h"
+#include "../../../Common/MyWindows.h"
+
+#endif
 
-// #include "../../../Common/MyWindows.h"
+/*
+WINVER and _WIN32_WINNT
 
-// #include <CommCtrl.h>
-// #include <ShlObj.h>
-// #include <Shlwapi.h>
+MSVC6 / 2003sdk:
+{
+  <windows.h> doesn't set _WIN32_WINNT
+  if WINVER is not set <windows.h> sets WINVER to value:
+    0x0400 : MSVC6
+    0x0501 : Windows Server 2003 PSDK / 2003 R2 PSDK
+}
 
+SDK for Win7 (and later)
+{
+  <windows.h> sets _WIN32_WINNT if it's not set.
+  <windows.h> sets WINVER if it's not set.
+<windows.h> includes <sdkddkver.h> that does:
+#if !defined(_WIN32_WINNT) && !defined(_CHICAGO_)
+  #define _WIN32_WINNT 0x0601  // in win7 sdk
+  #define _WIN32_WINNT 0x0A00  // in win10 sdk
 #endif
+#ifndef WINVER
+ #ifdef _WIN32_WINNT
+  #define WINVER _WIN32_WINNT
+ else
+  #define WINVER 0x0601 // in win7 sdk
+  #define WINVER 0x0A00 // in win10 sdk
+ endif
+#endif
+}
+
+Some GUI structures defined by windows will be larger,
+If (_WIN32_WINNT) value is larger.
+
+Also if we send sizeof(win_gui_struct) to some windows function,
+and we compile that code with big (_WIN32_WINNT) value,
+the window function in old Windows can fail, if that old Windows
+doesn't understand new big version of (win_gui_struct) compiled
+with big (_WIN32_WINNT) value.
+
+So it's better to define smallest (_WIN32_WINNT) value here.
+In 7-Zip FM we use some functions that require (_WIN32_WINNT == 0x0500).
+So it's simpler to define (_WIN32_WINNT == 0x0500) here.
+If we define (_WIN32_WINNT == 0x0400) here, we need some manual
+declarations for functions and macros that require (0x0500) functions.
+Also libs must contain these (0x0500+) functions.
+
+Some code in 7-zip FM uses also CommCtrl.h structures
+that depend from (_WIN32_IE) value. But default
+(_WIN32_IE) value from <windows.h> probably is OK for us.
+So we don't set _WIN32_IE here.
+default _WIN32_IE value set by <windows.h>:
+  0x501 2003sdk
+  0xa00 win10 sdk
+*/
diff --git a/CPP/7zip/UI/FileManager/StringUtils.cpp b/CPP/7zip/UI/FileManager/StringUtils.cpp
index 0478399..4641d15 100644
--- a/CPP/7zip/UI/FileManager/StringUtils.cpp
+++ b/CPP/7zip/UI/FileManager/StringUtils.cpp
@@ -24,35 +24,9 @@ void SplitStringToTwoStrings(const UString &src, UString &dest1, UString &dest2)
   }
 }
 
-void SplitString(const UString &srcString, UStringVector &destStrings)
-{
-  destStrings.Clear();
-  unsigned len = srcString.Len();
-  if (len == 0)
-    return;
-  UString s;
-  for (unsigned i = 0; i < len; i++)
-  {
-    wchar_t c = srcString[i];
-    if (c == ' ')
-    {
-      if (!s.IsEmpty())
-      {
-        destStrings.Add(s);
-        s.Empty();
-      }
-    }
-    else
-      s += c;
-  }
-  if (!s.IsEmpty())
-    destStrings.Add(s);
-}
-
 /*
 UString JoinStrings(const UStringVector &srcStrings)
 {
-
   UString s;
   FOR_VECTOR (i, srcStrings)
   {
diff --git a/CPP/7zip/UI/FileManager/StringUtils.h b/CPP/7zip/UI/FileManager/StringUtils.h
index fc070de..37aad3a 100644
--- a/CPP/7zip/UI/FileManager/StringUtils.h
+++ b/CPP/7zip/UI/FileManager/StringUtils.h
@@ -1,13 +1,11 @@
 // StringUtils.h
 
-#ifndef __STRING_UTILS_H
-#define __STRING_UTILS_H
+#ifndef ZIP7_INC_STRING_UTILS_H
+#define ZIP7_INC_STRING_UTILS_H
 
 #include "../../../Common/MyString.h"
 
 void SplitStringToTwoStrings(const UString &src, UString &dest1, UString &dest2);
-
-void SplitString(const UString &srcString, UStringVector &destStrings);
-UString JoinStrings(const UStringVector &srcStrings);
+// UString JoinStrings(const UStringVector &srcStrings);
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/SysIconUtils.cpp b/CPP/7zip/UI/FileManager/SysIconUtils.cpp
index d8e0f8b..1c7cab0 100644
--- a/CPP/7zip/UI/FileManager/SysIconUtils.cpp
+++ b/CPP/7zip/UI/FileManager/SysIconUtils.cpp
@@ -10,10 +10,11 @@
 
 #include "SysIconUtils.h"
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <shlobj.h>
+#else
 #include <ShlObj.h>
-
-#define MY_CAST_FUNC  (void(*)())
-// #define MY_CAST_FUNC
+#endif
 
 #ifndef _UNICODE
 extern bool g_IsNT;
@@ -21,49 +22,55 @@ extern bool g_IsNT;
 
 int GetIconIndexForCSIDL(int csidl)
 {
-  LPITEMIDLIST pidl = 0;
+  LPITEMIDLIST pidl = NULL;
   SHGetSpecialFolderLocation(NULL, csidl, &pidl);
   if (pidl)
   {
     SHFILEINFO shellInfo;
-    SHGetFileInfo((LPCTSTR)(const void *)(pidl), FILE_ATTRIBUTE_NORMAL,
-      &shellInfo, sizeof(shellInfo),
-      SHGFI_PIDL | SHGFI_SYSICONINDEX);
-    IMalloc  *pMalloc;
+    shellInfo.iIcon = 0;
+    const DWORD_PTR res = SHGetFileInfo((LPCTSTR)(const void *)(pidl), FILE_ATTRIBUTE_NORMAL,
+        &shellInfo, sizeof(shellInfo),
+        SHGFI_PIDL | SHGFI_SYSICONINDEX);
+    /*
+    IMalloc *pMalloc;
     SHGetMalloc(&pMalloc);
     if (pMalloc)
     {
       pMalloc->Free(pidl);
       pMalloc->Release();
     }
-    return shellInfo.iIcon;
+    */
+    // we use OLE2.dll function here
+    CoTaskMemFree(pidl);
+    if (res)
+      return shellInfo.iIcon;
   }
   return 0;
 }
 
 #ifndef _UNICODE
-typedef int (WINAPI * Func_SHGetFileInfoW)(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags);
+typedef DWORD_PTR (WINAPI * Func_SHGetFileInfoW)(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags);
 
-static struct CSHGetFileInfoInit
+static struct C_SHGetFileInfo_Init
 {
-  Func_SHGetFileInfoW shGetFileInfoW;
-  CSHGetFileInfoInit()
+  Func_SHGetFileInfoW f_SHGetFileInfoW;
+  C_SHGetFileInfo_Init()
   {
-    shGetFileInfoW = (Func_SHGetFileInfoW)
-        MY_CAST_FUNC
-        ::GetProcAddress(::GetModuleHandleW(L"shell32.dll"), "SHGetFileInfoW");
+       f_SHGetFileInfoW = Z7_GET_PROC_ADDRESS(
+    Func_SHGetFileInfoW, ::GetModuleHandleW(L"shell32.dll"),
+        "SHGetFileInfoW");
   }
-} g_SHGetFileInfoInit;
+} g_SHGetFileInfo_Init;
 #endif
 
-static DWORD_PTR MySHGetFileInfoW(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags)
+static DWORD_PTR My_SHGetFileInfoW(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags)
 {
   #ifdef _UNICODE
   return SHGetFileInfo
   #else
-  if (g_SHGetFileInfoInit.shGetFileInfoW == 0)
+  if (!g_SHGetFileInfo_Init.f_SHGetFileInfoW)
     return 0;
-  return g_SHGetFileInfoInit.shGetFileInfoW
+  return g_SHGetFileInfo_Init.f_SHGetFileInfoW
   #endif
   (pszPath, attrib, psfi, cbFileInfo, uFlags);
 }
@@ -74,7 +81,7 @@ DWORD_PTR GetRealIconIndex(CFSTR path, DWORD attrib, int &iconIndex)
   if (!g_IsNT)
   {
     SHFILEINFO shellInfo;
-    DWORD_PTR res = ::SHGetFileInfo(fs2fas(path), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+    const DWORD_PTR res = ::SHGetFileInfo(fs2fas(path), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
       sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX);
     iconIndex = shellInfo.iIcon;
     return res;
@@ -83,7 +90,7 @@ DWORD_PTR GetRealIconIndex(CFSTR path, DWORD attrib, int &iconIndex)
   #endif
   {
     SHFILEINFOW shellInfo;
-    DWORD_PTR res = ::MySHGetFileInfoW(fs2us(path), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+    const DWORD_PTR res = ::My_SHGetFileInfoW(fs2us(path), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
       sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX);
     iconIndex = shellInfo.iIcon;
     return res;
@@ -110,7 +117,7 @@ DWORD_PTR GetRealIconIndex(const UString &fileName, DWORD attrib, int &iconIndex
   {
     SHFILEINFOW shellInfo;
     shellInfo.szTypeName[0] = 0;
-    DWORD_PTR res = ::MySHGetFileInfoW(fileName, FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+    DWORD_PTR res = ::My_SHGetFileInfoW(fileName, FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
         sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_TYPENAME);
     if (typeName)
       *typeName = shellInfo.szTypeName;
@@ -120,15 +127,15 @@ DWORD_PTR GetRealIconIndex(const UString &fileName, DWORD attrib, int &iconIndex
 }
 */
 
-static int FindInSorted_Attrib(const CRecordVector<CAttribIconPair> &vect, DWORD attrib, int &insertPos)
+static int FindInSorted_Attrib(const CRecordVector<CAttribIconPair> &vect, DWORD attrib, unsigned &insertPos)
 {
   unsigned left = 0, right = vect.Size();
   while (left != right)
   {
-    unsigned mid = (left + right) / 2;
-    DWORD midAttrib = vect[mid].Attrib;
+    const unsigned mid = (left + right) / 2;
+    const DWORD midAttrib = vect[mid].Attrib;
     if (attrib == midAttrib)
-      return mid;
+      return (int)mid;
     if (attrib < midAttrib)
       right = mid;
     else
@@ -138,15 +145,15 @@ static int FindInSorted_Attrib(const CRecordVector<CAttribIconPair> &vect, DWORD
   return -1;
 }
 
-static int FindInSorted_Ext(const CObjectVector<CExtIconPair> &vect, const wchar_t *ext, int &insertPos)
+static int FindInSorted_Ext(const CObjectVector<CExtIconPair> &vect, const wchar_t *ext, unsigned &insertPos)
 {
   unsigned left = 0, right = vect.Size();
   while (left != right)
   {
-    unsigned mid = (left + right) / 2;
-    int compare = MyStringCompareNoCase(ext, vect[mid].Ext);
+    const unsigned mid = (left + right) / 2;
+    const int compare = MyStringCompareNoCase(ext, vect[mid].Ext);
     if (compare == 0)
-      return mid;
+      return (int)mid;
     if (compare < 0)
       right = mid;
     else
@@ -162,11 +169,11 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
   unsigned i;
   for (i = 0;; i++)
   {
-    wchar_t c = fileName[i];
+    const wchar_t c = fileName[i];
     if (c == 0)
       break;
     if (c == '.')
-      dotPos = i;
+      dotPos = (int)i;
   }
 
   /*
@@ -181,12 +188,12 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
 
   if ((attrib & FILE_ATTRIBUTE_DIRECTORY) != 0 || dotPos < 0)
   {
-    int insertPos = 0;
-    int index = FindInSorted_Attrib(_attribMap, attrib, insertPos);
+    unsigned insertPos = 0;
+    const int index = FindInSorted_Attrib(_attribMap, attrib, insertPos);
     if (index >= 0)
     {
       // if (typeName) *typeName = _attribMap[index].TypeName;
-      return _attribMap[index].IconIndex;
+      return _attribMap[(unsigned)index].IconIndex;
     }
     CAttribIconPair pair;
     GetRealIconIndex(
@@ -211,8 +218,8 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
   }
 
   const wchar_t *ext = fileName + dotPos + 1;
-  int insertPos = 0;
-  int index = FindInSorted_Ext(_extMap, ext, insertPos);
+  unsigned insertPos = 0;
+  const int index = FindInSorted_Ext(_extMap, ext, insertPos);
   if (index >= 0)
   {
     const CExtIconPair &pa = _extMap[index];
@@ -222,7 +229,7 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
 
   for (i = 0;; i++)
   {
-    wchar_t c = ext[i];
+    const wchar_t c = ext[i];
     if (c == 0)
       break;
     if (c < L'0' || c > L'9')
@@ -257,3 +264,15 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const UString &fileName)
   return GetIconIndex(attrib, fileName, NULL);
 }
 */
+
+HIMAGELIST GetSysImageList(bool smallIcons)
+{
+  SHFILEINFO shellInfo;
+  return (HIMAGELIST)SHGetFileInfo(TEXT(""),
+      FILE_ATTRIBUTE_NORMAL |
+      FILE_ATTRIBUTE_DIRECTORY,
+      &shellInfo, sizeof(shellInfo),
+      SHGFI_USEFILEATTRIBUTES |
+      SHGFI_SYSICONINDEX |
+      (smallIcons ? SHGFI_SMALLICON : SHGFI_ICON));
+}
diff --git a/CPP/7zip/UI/FileManager/SysIconUtils.h b/CPP/7zip/UI/FileManager/SysIconUtils.h
index fde16e4..1d34ef6 100644
--- a/CPP/7zip/UI/FileManager/SysIconUtils.h
+++ b/CPP/7zip/UI/FileManager/SysIconUtils.h
@@ -1,7 +1,7 @@
 // SysIconUtils.h
 
-#ifndef __SYS_ICON_UTILS_H
-#define __SYS_ICON_UTILS_H
+#ifndef ZIP7_INC_SYS_ICON_UTILS_H
+#define ZIP7_INC_SYS_ICON_UTILS_H
 
 #include "../../../Common/MyWindows.h"
 
@@ -50,13 +50,6 @@ public:
 DWORD_PTR GetRealIconIndex(CFSTR path, DWORD attrib, int &iconIndex);
 int GetIconIndexForCSIDL(int csidl);
 
-inline HIMAGELIST GetSysImageList(bool smallIcons)
-{
-  SHFILEINFO shellInfo;
-  return (HIMAGELIST)SHGetFileInfo(TEXT(""),
-      FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY,
-      &shellInfo, sizeof(shellInfo),
-      SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | (smallIcons ? SHGFI_SMALLICON : SHGFI_ICON));
-}
+HIMAGELIST GetSysImageList(bool smallIcons);
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/SystemPage.cpp b/CPP/7zip/UI/FileManager/SystemPage.cpp
index a95999f..09d8a72 100644
--- a/CPP/7zip/UI/FileManager/SystemPage.cpp
+++ b/CPP/7zip/UI/FileManager/SystemPage.cpp
@@ -4,7 +4,11 @@
 
 #include "../../../Common/MyWindows.h"
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <shlobj.h>
+#else
 #include <ShlObj.h>
+#endif
 
 #include "../../../Common/Defs.h"
 #include "../../../Common/StringConvert.h"
@@ -25,10 +29,12 @@ using namespace NWindows;
 extern bool g_IsNT;
 #endif
 
+#ifdef Z7_LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_SYSTEM_ASSOCIATE
 };
+#endif
 
 #define kSystemTopic "FM/options.htm#system"
 
@@ -44,7 +50,7 @@ CSysString CModifiedExtInfo::GetString() const
   else
     return ProgramKey;
   return CSysString (s);
-};
+}
 
 
 int CSystemPage::AddIcon(const UString &iconPath, int iconIndex)
@@ -62,19 +68,19 @@ int CSystemPage::AddIcon(const UString &iconPath, int iconIndex)
   #else
   // we expand path from REG_EXPAND_SZ registry item.
   UString path;
-  DWORD size = MAX_PATH + 10;
-  DWORD needLen = ::ExpandEnvironmentStringsW(iconPath, path.GetBuf(size + 2), size);
+  const DWORD size = MAX_PATH + 10;
+  const DWORD needLen = ::ExpandEnvironmentStringsW(iconPath, path.GetBuf(size + 2), size);
   path.ReleaseBuf_CalcLen(size);
   if (needLen == 0 || needLen >= size)
     path = iconPath;
-  int num = ExtractIconExW(path, iconIndex, NULL, &hicon, 1);
+  const UINT num = ExtractIconExW(path, iconIndex, NULL, &hicon, 1);
   if (num != 1 || !hicon)
   #endif
     return -1;
   
   _imageList.AddIcon(hicon);
   DestroyIcon(hicon);
-  return _numIcons++;
+  return (int)(_numIcons++);
 }
 
 
@@ -84,7 +90,7 @@ void CSystemPage::RefreshListItem(unsigned group, unsigned listIndex)
   _listView.SetSubItem(listIndex, group + 1, assoc.Pair[group].GetString());
   LVITEMW newItem;
   memset(&newItem, 0, sizeof(newItem));
-  newItem.iItem = listIndex;
+  newItem.iItem = (int)listIndex;
   newItem.mask = LVIF_IMAGE;
   newItem.iImage = assoc.GetIconIndex();
   _listView.SetItem(&newItem);
@@ -151,7 +157,9 @@ bool CSystemPage::OnInit()
 {
   _needSave = false;
 
-  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+#ifdef Z7_LANG
+  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+#endif
 
   _listView.Attach(GetItem(IDL_SYSTEM_ASSOCIATE));
   _listView.SetUnicodeFormat();
@@ -221,9 +229,9 @@ bool CSystemPage::OnInit()
     const CExtPlugins &extInfo = _extDB.Exts[i];
 
     LVITEMW item;
-    item.iItem = i;
+    item.iItem = (int)i;
     item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
-    item.lParam = i;
+    item.lParam = (LPARAM)i;
     item.iSubItem = 0;
     // ListView always uses internal iImage that is 0 by default?
     // so we always use LVIF_IMAGE.
@@ -245,9 +253,9 @@ bool CSystemPage::OnInit()
       texts[g] = mi.GetString();
     }
     item.iImage = assoc.GetIconIndex();
-    int itemIndex = _listView.InsertItem(&item);
+    const int itemIndex = _listView.InsertItem(&item);
     for (g = 0; g < NUM_EXT_GROUPS; g++)
-      _listView.SetSubItem(itemIndex, 1 + g, texts[g]);
+      _listView.SetSubItem((unsigned)itemIndex, 1 + g, texts[g]);
     _items.Add(assoc);
   }
   
@@ -334,7 +342,7 @@ void CSystemPage::OnNotifyHelp()
 }
 
 
-bool CSystemPage::OnButtonClicked(int buttonID, HWND buttonHWND)
+bool CSystemPage::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -379,7 +387,7 @@ bool CSystemPage::OnNotify(UINT controlID, LPNMHDR lParam)
             if (item->iSubItem >= 1 && item->iSubItem <= 2)
             {
               CUIntVector indices;
-              indices.Add(item->iItem);
+              indices.Add((unsigned)item->iItem);
               ChangeState(item->iSubItem < 2 ? 0 : 1, indices);
             }
           }
@@ -414,7 +422,7 @@ void CSystemPage::ChangeState(unsigned group)
   
   int itemIndex = -1;
   while ((itemIndex = _listView.GetNextSelectedItem(itemIndex)) != -1)
-    indices.Add(itemIndex);
+    indices.Add((unsigned)itemIndex);
   
   if (indices.IsEmpty())
     FOR_VECTOR (i, _items)
diff --git a/CPP/7zip/UI/FileManager/SystemPage.h b/CPP/7zip/UI/FileManager/SystemPage.h
index 765214c..6f2ed0c 100644
--- a/CPP/7zip/UI/FileManager/SystemPage.h
+++ b/CPP/7zip/UI/FileManager/SystemPage.h
@@ -1,7 +1,7 @@
 // SystemPage.h
  
-#ifndef __SYSTEM_PAGE_H
-#define __SYSTEM_PAGE_H
+#ifndef ZIP7_INC_SYSTEM_PAGE_H
+#define ZIP7_INC_SYSTEM_PAGE_H
 
 #include "../../../Windows/Control/ImageList.h"
 #include "../../../Windows/Control/ListView.h"
@@ -49,7 +49,7 @@ struct CModifiedExtInfo: public NRegistryAssoc::CShellExtInfo
       }
     }
     OldState = State;
-  };
+  }
 };
 
 struct CAssoc
@@ -116,11 +116,11 @@ public:
   
   CSystemPage(): WasChanged(false) {}
 
-  virtual bool OnInit();
-  virtual void OnNotifyHelp();
-  virtual bool OnNotify(UINT controlID, LPNMHDR lParam);
-  virtual LONG OnApply();
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual bool OnInit() Z7_override;
+  virtual void OnNotifyHelp() Z7_override;
+  virtual bool OnNotify(UINT controlID, LPNMHDR lParam) Z7_override;
+  virtual LONG OnApply() Z7_override;
+  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/TextPairs.cpp b/CPP/7zip/UI/FileManager/TextPairs.cpp
index 4edf025..1ac7098 100644
--- a/CPP/7zip/UI/FileManager/TextPairs.cpp
+++ b/CPP/7zip/UI/FileManager/TextPairs.cpp
@@ -100,9 +100,9 @@ static int ComparePairItems(const CTextPair &p1, const CTextPair &p2)
 static int ComparePairItems(void *const *a1, void *const *a2, void * /* param */)
   { return ComparePairItems(**(const CTextPair *const *)a1, **(const CTextPair *const *)a2); }
 
-void CPairsStorage::Sort() { Pairs.Sort(ComparePairItems, 0); }
+void CPairsStorage::Sort() { Pairs.Sort(ComparePairItems, NULL); }
 
-int CPairsStorage::FindID(const UString &id, int &insertPos) const
+int CPairsStorage::FindID(const UString &id, unsigned &insertPos) const
 {
   unsigned left = 0, right = Pairs.Size();
   while (left != right)
@@ -112,7 +112,7 @@ int CPairsStorage::FindID(const UString &id, int &insertPos) const
     if (compResult == 0)
     {
       insertPos = mid; // to disable GCC warning
-      return mid;
+      return (int)mid;
     }
     if (compResult < 0)
       right = mid;
@@ -125,13 +125,13 @@ int CPairsStorage::FindID(const UString &id, int &insertPos) const
 
 int CPairsStorage::FindID(const UString &id) const
 {
-  int pos;
+  unsigned pos;
   return FindID(id, pos);
 }
 
 void CPairsStorage::AddPair(const CTextPair &pair)
 {
-  int insertPos;
+  unsigned insertPos;
   const int pos = FindID(pair.ID, insertPos);
   if (pos >= 0)
     Pairs[pos] = pair;
@@ -143,7 +143,7 @@ void CPairsStorage::DeletePair(const UString &id)
 {
   const int pos = FindID(id);
   if (pos >= 0)
-    Pairs.Delete(pos);
+    Pairs.Delete((unsigned)pos);
 }
 
 bool CPairsStorage::GetValue(const UString &id, UString &value) const
@@ -185,7 +185,7 @@ void CPairsStorage::SaveToString(UString &text) const
     text += pair.ID;
     if (multiWord)
       text += '\"';
-    text += ' ';
+    text.Add_Space();
     text += pair.Value;
     text += '\x0D';
     text.Add_LF();
diff --git a/CPP/7zip/UI/FileManager/TextPairs.h b/CPP/7zip/UI/FileManager/TextPairs.h
index 0a71d04..d18233d 100644
--- a/CPP/7zip/UI/FileManager/TextPairs.h
+++ b/CPP/7zip/UI/FileManager/TextPairs.h
@@ -1,7 +1,7 @@
 // TextPairs.h
 
-#ifndef __FM_TEXT_PAIRS_H
-#define __FM_TEXT_PAIRS_H
+#ifndef ZIP7_INC_FM_TEXT_PAIRS_H
+#define ZIP7_INC_FM_TEXT_PAIRS_H
 
 #include "../../../Common/MyString.h"
 
@@ -15,7 +15,7 @@ class CPairsStorage
 {
   CObjectVector<CTextPair> Pairs;
   
-  int FindID(const UString &id, int &insertPos) const;
+  int FindID(const UString &id, unsigned &insertPos) const;
   int FindID(const UString &id) const;
   void Sort();
 public:
diff --git a/CPP/7zip/UI/FileManager/UpdateCallback100.cpp b/CPP/7zip/UI/FileManager/UpdateCallback100.cpp
index 67e70fb..71ad710 100644
--- a/CPP/7zip/UI/FileManager/UpdateCallback100.cpp
+++ b/CPP/7zip/UI/FileManager/UpdateCallback100.cpp
@@ -9,50 +9,50 @@
 #include "LangUtils.h"
 #include "UpdateCallback100.h"
 
-STDMETHODIMP CUpdateCallback100Imp::ScanProgress(UInt64 /* numFolders */, UInt64 numFiles, UInt64 totalSize, const wchar_t *path, Int32 /* isDir */)
+Z7_COM7F_IMF(CUpdateCallback100Imp::ScanProgress(UInt64 /* numFolders */, UInt64 numFiles, UInt64 totalSize, const wchar_t *path, Int32 /* isDir */))
 {
   return ProgressDialog->Sync.ScanProgress(numFiles, totalSize, us2fs(path));
 }
 
-STDMETHODIMP CUpdateCallback100Imp::ScanError(const wchar_t *path, HRESULT errorCode)
+Z7_COM7F_IMF(CUpdateCallback100Imp::ScanError(const wchar_t *path, HRESULT errorCode))
 {
   ProgressDialog->Sync.AddError_Code_Name(errorCode, path);
   return S_OK;
 }
 
-STDMETHODIMP CUpdateCallback100Imp::SetNumFiles(UInt64 numFiles)
+Z7_COM7F_IMF(CUpdateCallback100Imp::SetNumFiles(UInt64 numFiles))
 {
   return ProgressDialog->Sync.Set_NumFilesTotal(numFiles);
 }
 
-STDMETHODIMP CUpdateCallback100Imp::SetTotal(UInt64 size)
+Z7_COM7F_IMF(CUpdateCallback100Imp::SetTotal(UInt64 size))
 {
   ProgressDialog->Sync.Set_NumBytesTotal(size);
   return S_OK;
 }
 
-STDMETHODIMP CUpdateCallback100Imp::SetCompleted(const UInt64 *completed)
+Z7_COM7F_IMF(CUpdateCallback100Imp::SetCompleted(const UInt64 *completed))
 {
   return ProgressDialog->Sync.Set_NumBytesCur(completed);
 }
 
-STDMETHODIMP CUpdateCallback100Imp::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
+Z7_COM7F_IMF(CUpdateCallback100Imp::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize))
 {
   ProgressDialog->Sync.Set_Ratio(inSize, outSize);
   return S_OK;
 }
 
-STDMETHODIMP CUpdateCallback100Imp::CompressOperation(const wchar_t *name)
+Z7_COM7F_IMF(CUpdateCallback100Imp::CompressOperation(const wchar_t *name))
 {
   return SetOperation_Base(NUpdateNotifyOp::kAdd, name, false);
 }
 
-STDMETHODIMP CUpdateCallback100Imp::DeleteOperation(const wchar_t *name)
+Z7_COM7F_IMF(CUpdateCallback100Imp::DeleteOperation(const wchar_t *name))
 {
   return SetOperation_Base(NUpdateNotifyOp::kDelete, name, false);
 }
 
-STDMETHODIMP CUpdateCallback100Imp::OperationResult(Int32 /* operationResult */)
+Z7_COM7F_IMF(CUpdateCallback100Imp::OperationResult(Int32 /* operationResult */))
 {
   ProgressDialog->Sync.Set_NumFilesCur(++NumFiles);
   return S_OK;
@@ -60,7 +60,7 @@ STDMETHODIMP CUpdateCallback100Imp::OperationResult(Int32 /* operationResult */)
 
 void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileName, UString &s);
 
-HRESULT CUpdateCallback100Imp::ReportExtractResult(Int32 opRes, Int32 isEncrypted, const wchar_t *name)
+Z7_COM7F_IMF(CUpdateCallback100Imp::ReportExtractResult(Int32 opRes, Int32 isEncrypted, const wchar_t *name))
 {
   if (opRes != NArchive::NExtract::NOperationResult::kOK)
   {
@@ -71,30 +71,30 @@ HRESULT CUpdateCallback100Imp::ReportExtractResult(Int32 opRes, Int32 isEncrypte
   return S_OK;
 }
 
-HRESULT CUpdateCallback100Imp::ReportUpdateOperation(UInt32 notifyOp, const wchar_t *name, Int32 isDir)
+Z7_COM7F_IMF(CUpdateCallback100Imp::ReportUpdateOperation(UInt32 notifyOp, const wchar_t *name, Int32 isDir))
 {
   return SetOperation_Base(notifyOp, name, IntToBool(isDir));
 }
 
-STDMETHODIMP CUpdateCallback100Imp::UpdateErrorMessage(const wchar_t *message)
+Z7_COM7F_IMF(CUpdateCallback100Imp::UpdateErrorMessage(const wchar_t *message))
 {
   ProgressDialog->Sync.AddError_Message(message);
   return S_OK;
 }
 
-HRESULT CUpdateCallback100Imp::OpenFileError(const wchar_t *path, HRESULT errorCode)
+Z7_COM7F_IMF(CUpdateCallback100Imp::OpenFileError(const wchar_t *path, HRESULT errorCode))
 {
   ProgressDialog->Sync.AddError_Code_Name(errorCode, path);
   return S_OK;
 }
 
-STDMETHODIMP CUpdateCallback100Imp::ReadingFileError(const wchar_t *path, HRESULT errorCode)
+Z7_COM7F_IMF(CUpdateCallback100Imp::ReadingFileError(const wchar_t *path, HRESULT errorCode))
 {
   ProgressDialog->Sync.AddError_Code_Name(errorCode, path);
   return S_OK;
 }
 
-STDMETHODIMP CUpdateCallback100Imp::CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password)
+Z7_COM7F_IMF(CUpdateCallback100Imp::CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password))
 {
   *password = NULL;
   *passwordIsDefined = BoolToInt(PasswordIsDefined);
@@ -103,17 +103,17 @@ STDMETHODIMP CUpdateCallback100Imp::CryptoGetTextPassword2(Int32 *passwordIsDefi
   return StringToBstr(Password, password);
 }
 
-STDMETHODIMP CUpdateCallback100Imp::SetTotal(const UInt64 * /* files */, const UInt64 * /* bytes */)
+Z7_COM7F_IMF(CUpdateCallback100Imp::SetTotal(const UInt64 * /* files */, const UInt64 * /* bytes */))
 {
   return S_OK;
 }
 
-STDMETHODIMP CUpdateCallback100Imp::SetCompleted(const UInt64 * /* files */, const UInt64 * /* bytes */)
+Z7_COM7F_IMF(CUpdateCallback100Imp::SetCompleted(const UInt64 * /* files */, const UInt64 * /* bytes */))
 {
   return ProgressDialog->Sync.CheckStop();
 }
 
-STDMETHODIMP CUpdateCallback100Imp::CryptoGetTextPassword(BSTR *password)
+Z7_COM7F_IMF(CUpdateCallback100Imp::CryptoGetTextPassword(BSTR *password))
 {
   *password = NULL;
   if (!PasswordIsDefined)
diff --git a/CPP/7zip/UI/FileManager/UpdateCallback100.h b/CPP/7zip/UI/FileManager/UpdateCallback100.h
index 7cbc11e..5d56dfb 100644
--- a/CPP/7zip/UI/FileManager/UpdateCallback100.h
+++ b/CPP/7zip/UI/FileManager/UpdateCallback100.h
@@ -1,7 +1,7 @@
 // UpdateCallback100.h
 
-#ifndef __UPDATE_CALLBACK100_H
-#define __UPDATE_CALLBACK100_H
+#ifndef ZIP7_INC_UPDATE_CALLBACK100_H
+#define ZIP7_INC_UPDATE_CALLBACK100_H
 
 #include "../../../Common/MyCom.h"
 
@@ -13,7 +13,7 @@
 
 #include "ProgressDialog2.h"
 
-class CUpdateCallback100Imp:
+class CUpdateCallback100Imp Z7_final:
   public IFolderArchiveUpdateCallback,
   public IFolderArchiveUpdateCallback2,
   public IFolderScanProgress,
@@ -24,11 +24,7 @@ class CUpdateCallback100Imp:
   public CUpdateCallbackGUI2,
   public CMyUnknownImp
 {
-public:
-
-  // CUpdateCallback100Imp() {}
-
-  MY_UNKNOWN_IMP7(
+  Z7_COM_UNKNOWN_IMP_7(
     IFolderArchiveUpdateCallback,
     IFolderArchiveUpdateCallback2,
     IFolderScanProgress,
@@ -37,16 +33,14 @@ public:
     IArchiveOpenCallback,
     ICompressProgressInfo)
 
-  INTERFACE_IProgress(;)
-  INTERFACE_IArchiveOpenCallback(;)
-  INTERFACE_IFolderArchiveUpdateCallback(;)
-  INTERFACE_IFolderArchiveUpdateCallback2(;)
-  INTERFACE_IFolderScanProgress(;)
-
-  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
-
-  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
-  STDMETHOD(CryptoGetTextPassword2)(Int32 *passwordIsDefined, BSTR *password);
+  Z7_IFACE_COM7_IMP(IProgress)
+  Z7_IFACE_COM7_IMP(IFolderArchiveUpdateCallback)
+  Z7_IFACE_COM7_IMP(IFolderArchiveUpdateCallback2)
+  Z7_IFACE_COM7_IMP(IFolderScanProgress)
+  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword2)
+  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword)
+  Z7_IFACE_COM7_IMP(IArchiveOpenCallback)
+  Z7_IFACE_COM7_IMP(ICompressProgressInfo)
 };
 
 #endif
diff --git a/CPP/7zip/UI/FileManager/VerCtrl.cpp b/CPP/7zip/UI/FileManager/VerCtrl.cpp
index 4bb034f..0c894b8 100644
--- a/CPP/7zip/UI/FileManager/VerCtrl.cpp
+++ b/CPP/7zip/UI/FileManager/VerCtrl.cpp
@@ -149,7 +149,7 @@ void CApp::VerCtrl(unsigned id)
   }
 
   CRecordVector<UInt32> indices;
-  panel.GetSelectedItemsIndices(indices);
+  panel.Get_ItemIndices_Selected(indices);
 
   if (indices.Size() != 1)
   {
@@ -223,7 +223,7 @@ void CApp::VerCtrl(unsigned id)
           if (!ParseNumberString(fi.Name, val))
             continue;
           if ((Int32)val > maxVal)
-            maxVal = val;
+            maxVal = (Int32)val;
         }
 
         UInt32 next = (UInt32)maxVal + 1;
@@ -320,7 +320,7 @@ void CApp::VerCtrl(unsigned id)
       const UInt64 k_Ntfs_prec = 10000000;
       UInt64 timeStamp = timeStampOriginal;
       const UInt32 k_precs[] = { 60 * 60, 60, 2, 1 };
-      for (unsigned i = 0; i < ARRAY_SIZE(k_precs); i++)
+      for (unsigned i = 0; i < Z7_ARRAY_SIZE(k_precs); i++)
       {
         timeStamp = timeStampOriginal;
         const UInt64 prec = k_Ntfs_prec * k_precs[i];
diff --git a/CPP/7zip/UI/FileManager/ViewSettings.cpp b/CPP/7zip/UI/FileManager/ViewSettings.cpp
index 0f87711..3d64602 100644
--- a/CPP/7zip/UI/FileManager/ViewSettings.cpp
+++ b/CPP/7zip/UI/FileManager/ViewSettings.cpp
@@ -36,7 +36,8 @@ static NSynchronization::CCriticalSection g_CS;
 #define Set32(p, v) SetUi32(((Byte *)p), v)
 #define SetBool(p, v) Set32(p, ((v) ? 1 : 0))
 
-#define Get32(p, dest) dest = GetUi32((const Byte *)p)
+#define Get32(p, dest) dest = GetUi32((const Byte *)p);
+#define Get32_LONG(p, dest) dest = (LONG)GetUi32((const Byte *)p);
 #define GetBool(p, dest) dest = (GetUi32(p) != 0);
 
 /*
@@ -57,16 +58,16 @@ void CListViewInfo::Save(const UString &id) const
   const UInt32 dataSize = kListViewHeaderSize + kColumnInfoSize * Columns.Size();
   CByteArr buf(dataSize);
 
-  Set32(buf, kListViewVersion);
-  Set32(buf + 4, SortID);
-  SetBool(buf + 8, Ascending);
+  Set32(buf, kListViewVersion)
+  Set32(buf + 4, SortID)
+  SetBool(buf + 8, Ascending)
   FOR_VECTOR (i, Columns)
   {
     const CColumnInfo &column = Columns[i];
     Byte *p = buf + kListViewHeaderSize + i * kColumnInfoSize;
-    Set32(p, column.PropID);
-    SetBool(p + 4, column.IsVisible);
-    Set32(p + 8, column.Width);
+    Set32(p, column.PropID)
+    SetBool(p + 4, column.IsVisible)
+    Set32(p + 8, column.Width)
   }
   {
     NSynchronization::CCriticalSectionLock lock(g_CS);
@@ -92,11 +93,11 @@ void CListViewInfo::Read(const UString &id)
   if (size < kListViewHeaderSize)
     return;
   UInt32 version;
-  Get32(buf, version);
+  Get32(buf, version)
   if (version != kListViewVersion)
     return;
-  Get32(buf + 4, SortID);
-  GetBool(buf + 8, Ascending);
+  Get32(buf + 4, SortID)
+  GetBool(buf + 8, Ascending)
 
   IsLoaded = true;
 
@@ -109,9 +110,9 @@ void CListViewInfo::Read(const UString &id)
   {
     CColumnInfo column;
     const Byte *p = buf + kListViewHeaderSize + i * kColumnInfoSize;
-    Get32(p, column.PropID);
-    GetBool(p + 4, column.IsVisible);
-    Get32(p + 8, column.Width);
+    Get32(p, column.PropID)
+    GetBool(p + 4, column.IsVisible)
+    Get32(p + 8, column.Width)
     Columns.AddInReserved(column);
   }
 }
@@ -142,18 +143,18 @@ void CWindowInfo::Save() const
   key.Create(HKEY_CURRENT_USER, kCUBasePath);
   {
     Byte buf[kWindowPositionHeaderSize];
-    Set32(buf,      rect.left);
-    Set32(buf +  4, rect.top);
-    Set32(buf +  8, rect.right);
-    Set32(buf + 12, rect.bottom);
-    SetBool(buf + 16, maximized);
+    Set32(buf,      (UInt32)rect.left)
+    Set32(buf +  4, (UInt32)rect.top)
+    Set32(buf +  8, (UInt32)rect.right)
+    Set32(buf + 12, (UInt32)rect.bottom)
+    SetBool(buf + 16, maximized)
     key.SetValue(kPositionValueName, buf, kWindowPositionHeaderSize);
   }
   {
     Byte buf[kPanelsInfoHeaderSize];
-    Set32(buf,      numPanels);
-    Set32(buf +  4, currentPanel);
-    Set32(buf +  8, splitterPos);
+    Set32(buf,      numPanels)
+    Set32(buf +  4, currentPanel)
+    Set32(buf +  8, splitterPos)
     key.SetValue(kPanelsInfoValueName, buf, kPanelsInfoHeaderSize);
   }
 }
@@ -175,18 +176,18 @@ void CWindowInfo::Read(bool &windowPosDefined, bool &panelInfoDefined)
   CByteBuffer buf;
   if (QueryBuf(key, kPositionValueName, buf, kWindowPositionHeaderSize))
   {
-    Get32(buf,      rect.left);
-    Get32(buf +  4, rect.top);
-    Get32(buf +  8, rect.right);
-    Get32(buf + 12, rect.bottom);
-    GetBool(buf + 16, maximized);
+    Get32_LONG(buf,      rect.left)
+    Get32_LONG(buf +  4, rect.top)
+    Get32_LONG(buf +  8, rect.right)
+    Get32_LONG(buf + 12, rect.bottom)
+    GetBool(buf + 16, maximized)
     windowPosDefined = true;
   }
   if (QueryBuf(key, kPanelsInfoValueName, buf, kPanelsInfoHeaderSize))
   {
-    Get32(buf,      numPanels);
-    Get32(buf +  4, currentPanel);
-    Get32(buf +  8, splitterPos);
+    Get32(buf,      numPanels)
+    Get32(buf +  4, currentPanel)
+    Get32(buf +  8, splitterPos)
     panelInfoDefined = true;
   }
   return;
diff --git a/CPP/7zip/UI/FileManager/ViewSettings.h b/CPP/7zip/UI/FileManager/ViewSettings.h
index aeb6897..02af0a1 100644
--- a/CPP/7zip/UI/FileManager/ViewSettings.h
+++ b/CPP/7zip/UI/FileManager/ViewSettings.h
@@ -1,7 +1,7 @@
 // ViewSettings.h
 
-#ifndef __VIEW_SETTINGS_H
-#define __VIEW_SETTINGS_H
+#ifndef ZIP7_INC_VIEW_SETTINGS_H
+#define ZIP7_INC_VIEW_SETTINGS_H
 
 #include "../../../Common/MyTypes.h"
 #include "../../../Common/MyString.h"
diff --git a/CPP/7zip/UI/FileManager/makefile b/CPP/7zip/UI/FileManager/makefile
index dd2a2f2..df08c98 100644
--- a/CPP/7zip/UI/FileManager/makefile
+++ b/CPP/7zip/UI/FileManager/makefile
@@ -1,6 +1,6 @@
 PROG = 7zFM.exe
 CFLAGS = $(CFLAGS) \
-  -DEXTERNAL_CODECS \
+  -DZ7_EXTERNAL_CODECS \
 
 !include "FM.mak"
 
@@ -85,6 +85,7 @@ UI_COMMON_OBJS = \
 
 EXPLORER_OBJS = \
   $O\ContextMenu.obj \
+  $O\MyMessages.obj \
   $O\RegistryContextMenu.obj \
 
 GUI_OBJS = \
diff --git a/CPP/7zip/UI/FileManager/resource.h b/CPP/7zip/UI/FileManager/resource.h
index 98cb4fd..9d605c6 100644
--- a/CPP/7zip/UI/FileManager/resource.h
+++ b/CPP/7zip/UI/FileManager/resource.h
@@ -26,6 +26,14 @@
 #define IDM_SHA1                 104
 #define IDM_SHA256               105
 
+
+#define IDM_FILE                 500
+#define IDM_EDIT                 501
+#define IDM_VIEW                 502
+#define IDM_FAVORITES            503
+#define IDM_TOOLS                504
+#define IDM_HELP                 505
+
 #define IDM_OPEN                 540
 #define IDM_OPEN_INSIDE          541
 #define IDM_OPEN_OUTSIDE         542
@@ -90,8 +98,10 @@
 #define IDM_VIEW_TOOLBARS_LARGE_BUTTONS     752
 #define IDM_VIEW_TOOLBARS_SHOW_BUTTONS_TEXT 753
 
+#define IDM_VIEW_TIME_POPUP      760
 #define IDM_VIEW_TIME            761
 
+#define IDM_ADD_TO_FAVORITES     800
 #define IDS_BOOKMARK             801
 
 #define IDM_OPTIONS              900
diff --git a/CPP/7zip/UI/FileManager/resource.rc b/CPP/7zip/UI/FileManager/resource.rc
index fc2c840..002265a 100644
--- a/CPP/7zip/UI/FileManager/resource.rc
+++ b/CPP/7zip/UI/FileManager/resource.rc
@@ -12,10 +12,27 @@ BEGIN
 //  VK_F7,   IDM_CREATE_FOLDER,    VIRTKEY, NOINVERT
 END
 
+// for MENUEX:
+// /*
+#define MY_MENUITEM_SEPARATOR  MENUITEM "", 0, MFT_SEPARATOR
+#define MY_MFT_MENUBREAK       MFT_MENUBREAK
+#define MY_MFT_MENUBARBREAK    MFT_MENUBARBREAK
+#define MY_MFS_CHECKED         MFT_STRING, MFS_CHECKED
+#define MY_MENUITEM_ID(x)      , x
+// */
 
-IDM_MENU MENU
+// for MENU:
+/*
+#define MY_MENUITEM_SEPARATOR  MENUITEM SEPARATOR
+#define MY_MFT_MENUBREAK       MENUBREAK
+#define MY_MFT_MENUBARBREAK    MENUBARBREAK
+#define MY_MFS_CHECKED         CHECKED
+#define MY_MENUITEM_ID(x)
+*/
+
+IDM_MENU MENUEX
 BEGIN
-  POPUP "&File"
+  POPUP "&File" MY_MENUITEM_ID(IDM_FILE)
   BEGIN
     MENUITEM "&Open\tEnter",                IDM_OPEN
     MENUITEM "Open &Inside\tCtrl+PgDn",     IDM_OPEN_INSIDE
@@ -24,19 +41,19 @@ BEGIN
     MENUITEM "Open O&utside\tShift+Enter",  IDM_OPEN_OUTSIDE
     MENUITEM "&View\tF3",                   IDM_FILE_VIEW
     MENUITEM "&Edit\tF4",                   IDM_FILE_EDIT
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "Rena&me\tF2",                 IDM_RENAME
     MENUITEM "&Copy To...\tF5",             IDM_COPY_TO
     MENUITEM "&Move To...\tF6",             IDM_MOVE_TO
     MENUITEM "&Delete\tDel",                IDM_DELETE
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "&Split file...",              IDM_SPLIT
     MENUITEM "Com&bine files...",           IDM_COMBINE
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "P&roperties\tAlt+Enter",      IDM_PROPERTIES
     MENUITEM "Comme&nt...\tCtrl+Z",         IDM_COMMENT
     // MENUITEM "Calculate checksum",          IDM_CRC
-    POPUP "CRC"
+    POPUP "CRC" MY_MENUITEM_ID(0)
     BEGIN
       MENUITEM "CRC-32",                    IDM_CRC32
       MENUITEM "CRC-64",                    IDM_CRC64
@@ -45,55 +62,56 @@ BEGIN
       MENUITEM "*",                         IDM_HASH_ALL
     END
     MENUITEM "Di&ff",                       IDM_DIFF
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "Create Folder\tF7",           IDM_CREATE_FOLDER
     MENUITEM "Create File\tCtrl+N",         IDM_CREATE_FILE
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "&Link...",                    IDM_LINK
     MENUITEM "&Alternate streams",          IDM_ALT_STREAMS
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "E&xit\tAlt+F4",               IDCLOSE
   END
-  POPUP "&Edit"
+  POPUP "&Edit" MY_MENUITEM_ID(IDM_EDIT)
   BEGIN
     // MENUITEM "Cu&t\tCtrl+X",                IDM_EDIT_CUT, GRAYED
     // MENUITEM "&Copy\tCtrl+C",               IDM_EDIT_COPY, GRAYED
     // MENUITEM "&Paste\tCtrl+V",              IDM_EDIT_PASTE, GRAYED
-    // MENUITEM SEPARATOR
+    // MY_MENUITEM_SEPARATOR
     MENUITEM "Select &All\tShift+[Grey +]", IDM_SELECT_ALL
     MENUITEM "Deselect All\tShift+[Grey -]", IDM_DESELECT_ALL
     MENUITEM "&Invert Selection\tGrey *",   IDM_INVERT_SELECTION
     MENUITEM "Select...\tGrey +",           IDM_SELECT
     MENUITEM "Deselect...\tGrey -",         IDM_DESELECT
+    MENUITEM "", 0, MY_MFT_MENUBARBREAK
     MENUITEM "Select by Type\tAlt+[Grey+]", IDM_SELECT_BY_TYPE
     MENUITEM "Deselect by Type\tAlt+[Grey -]", IDM_DESELECT_BY_TYPE
   END
-  POPUP "&View"
+  POPUP "&View" MY_MENUITEM_ID(IDM_VIEW)
   BEGIN
     MENUITEM "Lar&ge Icons\tCtrl+1",        IDM_VIEW_LARGE_ICONS
     MENUITEM "S&mall Icons\tCtrl+2",        IDM_VIEW_SMALL_ICONS
     MENUITEM "&List\tCtrl+3",               IDM_VIEW_LIST
-    MENUITEM "&Details\tCtrl+4",            IDM_VIEW_DETAILS, CHECKED
-    MENUITEM SEPARATOR
+    MENUITEM "&Details\tCtrl+4",            IDM_VIEW_DETAILS, MY_MFS_CHECKED
+    MY_MENUITEM_SEPARATOR
     MENUITEM "Name\tCtrl+F3",               IDM_VIEW_ARANGE_BY_NAME
     MENUITEM "Type\tCtrl+F4",               IDM_VIEW_ARANGE_BY_TYPE
     MENUITEM "Date\tCtrl+F5",               IDM_VIEW_ARANGE_BY_DATE
     MENUITEM "Size\tCtrl+F6",               IDM_VIEW_ARANGE_BY_SIZE
     MENUITEM "Unsorted\tCtrl+F7",           IDM_VIEW_ARANGE_NO_SORT
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "Flat View",                   IDM_VIEW_FLAT_VIEW
     MENUITEM "&2 Panels\tF9",               IDM_VIEW_TWO_PANELS
 
-    POPUP "2017"
+    POPUP "2017" MY_MENUITEM_ID(IDM_VIEW_TIME_POPUP)
     BEGIN
       MENUITEM "Time",                      IDM_VIEW_TIME
     END
 
-    POPUP "Toolbars"
+    POPUP "Toolbars" MY_MENUITEM_ID(IDM_VIEW_TOOLBARS)
     BEGIN
       MENUITEM "Archive Toolbar",           IDM_VIEW_ARCHIVE_TOOLBAR
       MENUITEM "Standard Toolbar",          IDM_VIEW_STANDARD_TOOLBAR
-      MENUITEM SEPARATOR
+      MY_MENUITEM_SEPARATOR
       MENUITEM "Large Buttons",             IDM_VIEW_TOOLBARS_LARGE_BUTTONS
       MENUITEM "Show Buttons Text",         IDM_VIEW_TOOLBARS_SHOW_BUTTONS_TEXT
     END
@@ -107,29 +125,29 @@ BEGIN
     // MENUITEM "Show deleted files",          IDM_VIEW_SHOW_DELETED
 
   END
-  POPUP "F&avorites"
+  POPUP "F&avorites" MY_MENUITEM_ID(IDM_FAVORITES)
   BEGIN
-    POPUP "&Add folder to Favorites as"
+    POPUP "&Add folder to Favorites as" MY_MENUITEM_ID(IDM_ADD_TO_FAVORITES)
     BEGIN
-        MENUITEM SEPARATOR
+        MY_MENUITEM_SEPARATOR
     END
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
   END
-  POPUP "&Tools"
+  POPUP "&Tools" MY_MENUITEM_ID(IDM_TOOLS)
   BEGIN
     MENUITEM "&Options...",                 IDM_OPTIONS
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
     MENUITEM "&Benchmark",                  IDM_BENCHMARK
   #ifdef UNDER_CE
     MENUITEM "Benchmark 2",                 IDM_BENCHMARK2
   #endif
   #ifndef UNDER_CE
   END
-  POPUP "&Help"
+  POPUP "&Help" MY_MENUITEM_ID(IDM_HELP)
   BEGIN
     MENUITEM "&Contents...\tF1",            IDM_HELP_CONTENTS
   #endif
-    MENUITEM SEPARATOR
+    MY_MENUITEM_SEPARATOR
   MENUITEM "&About 7-Zip...",               IDM_ABOUT
   END
 END
@@ -172,7 +190,7 @@ BEGIN
   IDS_VIRUS                "The file looks like a virus (the file name contains long spaces in name)."
   IDS_MESSAGE_UNSUPPORTED_OPERATION_FOR_LONG_PATH_FOLDER "The operation cannot be called from a folder that has a long path."
   IDS_SELECT_ONE_FILE      "You must select one file"
-  IDS_SELECT_FILES         "You must select one or more files"
+  // IDS_SELECT_FILES         "You must select one or more files"
   IDS_TOO_MANY_ITEMS       "Too many items"
 
   IDS_COPY      "Copy"