easy 7-zip mod for 23.01: rebased from 19.00

.gitattributes

@@ -0,0 +1,13 @@
+# Set default behavior to automatically normalize line endings.
+* text=crlf
+
+# These files are text and should be normalized (Convert crlf => lf)
+
+*.txt text
+*.vcproj text
+*.cpp text
+*.h text
+*.def text
+*.rc text
+*.cmd
+

.gitignore

@@ -1 +1,7 @@
 *.o
+errorfile.txt
+*.user
+*.obj
+out/
+*.vcxproj
+*.db

CPP/7zip/Bundles/SFXWin/resource.rc

@@ -7,8 +7,11 @@
 
 MY_VERSION_INFO_APP("7z SFX", "7z.sfx")
 
-#define xc 240
+#define xc 270
-#define yc 64
+#define yc 75
+
+#define bxsOpen 30
+#define xsSpace 4
 
 IDI_ICON ICON "7z.ico"
 
@@ -16,9 +19,13 @@ IDD_EXTRACT  DIALOG  0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT
 CAPTION "7-Zip self-extracting archive"
 BEGIN
   LTEXT          "E&xtract to:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8
-  EDITTEXT       IDC_EXTRACT_PATH, m, 21, xc - bxsDots - 12, 14, ES_AUTOHSCROLL
+  EDITTEXT       IDC_EXTRACT_PATH, m, m + 12 - 1, xc - bxsDots - xsSpace - bxsOpen - xsSpace, 14, ES_AUTOHSCROLL
-  PUSHBUTTON     "...", IDB_EXTRACT_SET_PATH, xs - m - bxsDots, 20, bxsDots, bys, WS_GROUP
+  PUSHBUTTON     "...", IDB_EXTRACT_SET_PATH, xs - m - bxsDots - xsSpace - bxsOpen, m + 12 - 1, bxsDots, bys-1, WS_GROUP
-  DEFPUSHBUTTON  "Extract", IDOK,     bx2, by, bxs, bys, WS_GROUP
+  PUSHBUTTON     "&Open", IDC_EXTRACT_BUTTON_OPEN_PATH, xs - m - bxsOpen, m + 12 - 1, bxsOpen, bys-1, WS_GROUP
+  LTEXT          "",    IDC_STATIC_EXTRACT_FREE_SPACE, m, m + 12 + 14 + 1, xc, 8
+  CONTROL        "O&pen output folder after extracting", IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER, MY_CHECKBOX, m, m + 12 + 14 + 1 + 8 + 6, xc, 10
+
+  DEFPUSHBUTTON  "&Extract", IDOK,     bx2, by, bxs, bys, WS_GROUP
   PUSHBUTTON     "Cancel",  IDCANCEL, bx1, by, bxs, bys
 END
 

CPP/7zip/UI/Console/makefile

@@ -17,6 +17,7 @@ COMMON_OBJS = \
   $O\UTFConvert.obj \
   $O\MyVector.obj \
   $O\Wildcard.obj \
+  $O\ResourceString.obj \
 
 WIN_OBJS = \
   $O\DLL.obj \
@@ -34,6 +35,7 @@ WIN_OBJS = \
   $O\System.obj \
   $O\SystemInfo.obj \
   $O\TimeUtils.obj \
+  $O\LoadCodecs.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \

CPP/7zip/UI/FileManager/AboutEasy7ZipDialog.cpp

@@ -0,0 +1,42 @@
+// AboutEasy7ZipDialog.cpp
+
+#include "StdAfx.h"
+#include "AboutEasy7ZipDialog.h"
+
+#include "HelpUtils.h"
+
+static LPCSTR kHelpTopic = "start.htm";
+
+bool CAboutEasy7ZipDialog::OnInit()
+{
+  NormalizePosition();
+  return CModalDialog::OnInit();
+}
+
+void CAboutEasy7ZipDialog::OnHelp()
+{
+  ShowHelpWindow(kHelpTopic);
+}
+
+bool CAboutEasy7ZipDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+{
+  LPCTSTR url;
+  switch(buttonID)
+  {
+    case IDC_ABOUT_BUTTON_EASY7ZIP_HOMEPAGE: url = TEXT("http://www.e7z.org/"); break;
+    default:
+      return CModalDialog::OnButtonClicked(buttonID, buttonHWND);
+  }
+
+  #ifdef UNDER_CE
+  SHELLEXECUTEINFO s;
+  memset(&s, 0, sizeof(s));
+  s.cbSize = sizeof(s);
+  s.lpFile = url;
+  ::ShellExecuteEx(&s);
+  #else
+  ::ShellExecute(NULL, NULL, url, NULL, NULL, SW_SHOWNORMAL);
+  #endif
+
+  return true;
+}

CPP/7zip/UI/FileManager/AboutEasy7ZipDialog.h

@@ -0,0 +1,18 @@
+// AboutEasy7ZipDialog.h
+ 
+#ifndef __ABOUT_EASY7ZIP_DIALOG_H
+#define __ABOUT_EASY7ZIP_DIALOG_H
+
+#include "AboutEasy7ZipDialogRes.h"
+#include "../../../Windows/Control/Dialog.h"
+
+class CAboutEasy7ZipDialog: 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_EASY_7ZIP, wndParent); }
+};
+
+#endif

CPP/7zip/UI/FileManager/AboutEasy7ZipDialog.rc

@@ -0,0 +1,16 @@
+#include "AboutEasy7ZipDialogRes.h"
+#include "../../GuiCommon.rc"
+#include "../../MyVersion.h"
+
+#define xc 165
+#define yc 85
+
+IDD_ABOUT_EASY_7ZIP DIALOG 0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT
+CAPTION "About Easy 7-Zip"
+{
+  DEFPUSHBUTTON  "OK", IDOK, bx1, by, bxs, bys
+  PUSHBUTTON  MY_EASY7ZIP_HOMEPAGE, IDC_ABOUT_BUTTON_EASY7ZIP_HOMEPAGE, bx2, by, bxs, bys
+  LTEXT  MY_EASY7ZIP_7ZIP_VERSION, -1, m, m, xc, 8
+  LTEXT  MY_EASY7ZIP_COPYRIGHT, -1, m, m + 8 + 4, xc, 8
+  LTEXT  "Easy 7-Zip is a free software made by James Hoo. The software was built based on 7-Zip 16.04.", -1, m, m + 8 + 4 + 8 + 12, xc, (yc - bys - 36)
+}

CPP/7zip/UI/FileManager/AboutEasy7ZipDialogRes.h

@@ -0,0 +1,2 @@
+#define IDD_ABOUT_EASY_7ZIP             515
+#define IDC_ABOUT_BUTTON_EASY7ZIP_HOMEPAGE       1001

CPP/7zip/UI/FileManager/App.cpp

@@ -39,6 +39,7 @@ extern DWORD g_ComCtl32Version;
 extern HINSTANCE g_hInstance;
 
 #define kTempDirPrefix FTEXT("7zE")
+extern bool g_bProcessError;
 
 void CPanelCallbackImp::OnTab()
 {
@@ -282,6 +283,9 @@ void CApp::SaveToolbarChanges()
 }
 
 
+void MyLoadMenu();
+
+
 HRESULT CApp::Create(HWND hwnd, const UString &mainPath, const UString &arcFormat, int xSizes[2], bool needOpenArc, COpenResult &openRes)
 {
   _window.Attach(hwnd);
@@ -543,6 +547,12 @@ UString CPanel::GetItemsInfoString(const CRecordVector<UInt32> &indices)
 
 bool IsCorrectFsName(const UString &name);
 
+static bool IsDirectory(LPCWSTR lpszPathFile)
+{
+	DWORD	dwAttr;
+	dwAttr = GetFileAttributesW(lpszPathFile);
+	return (dwAttr != (DWORD)-1) && ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) != 0);
+}
 
 
 /* Returns true, if path is path that can be used as path for File System functions
@@ -579,6 +589,9 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
 
   CRecordVector<UInt32> indices;
   UString destPath;
+  bool openOutputFolder;
+  bool deleteSourceFile;
+  bool close7Zip;
   bool useDestPanel = false;
 
   {
@@ -617,10 +630,15 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
     LangString(move ? IDS_MOVE : IDS_COPY, copyDialog.Title);
     LangString(move ? IDS_MOVE_TO : IDS_COPY_TO, copyDialog.Static);
     copyDialog.Info = srcPanel.GetItemsInfoString(indices);
+	copyDialog.m_currentFolderPrefix = srcPanel._currentFolderPrefix;
 
     if (copyDialog.Create(srcPanel.GetParent()) != IDOK)
       return;
 
+	openOutputFolder = copyDialog.m_bOpenOutputFolder;
+	deleteSourceFile = copyDialog.m_bDeleteSourceFile;
+	close7Zip = copyDialog.m_bClose7Zip;
+
     destPath = copyDialog.Value;
   }
 
@@ -714,7 +732,7 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
             UString name = destPath.Ptr(pos + 1);
             if (name.Find(L':') >= 0)
             {
-              srcPanel.MessageBox_Error_UnsupportOperation();
+              srcPanel.MessageBoxErrorLang(IDS_OPERATION_IS_NOT_SUPPORTED);
               return;
             }
             #endif
@@ -752,6 +770,8 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
     SaveCopyHistory(copyFolders);
   }
 
+  g_bProcessError = false;
+
   bool useSrcPanel = !useDestPanel || !srcPanel.Is_IO_FS_Folder();
 
   bool useTemp = useSrcPanel && useDestPanel;
@@ -847,6 +867,62 @@ void CApp::OnCopy(bool move, bool copyToSame, unsigned srcPanelIndex)
   disableNotify1.Restore();
   disableNotify2.Restore();
   srcPanel.SetFocusToList();
+
+  if (!g_bProcessError && result == S_OK)
+  {
+	  if (openOutputFolder && IsDirectory(destPath))
+	  {
+		StartApplicationDontWait(destPath, destPath, (HWND)_window);
+	  }
+	  if (deleteSourceFile)
+	  {
+		  DWORD	dwAttr;
+
+		  UString srcFilePath(srcPanel._currentFolderPrefix);
+		  srcPanel.OpenParentFolder();
+
+		  while (!srcFilePath.IsEmpty())
+		  {
+			  if (srcFilePath.Back() == '\\')
+			  {
+				  srcFilePath.DeleteBack();
+			  }
+			  dwAttr = GetFileAttributesW(srcFilePath);
+
+			  if (dwAttr == INVALID_FILE_ATTRIBUTES)
+			  {
+				  int n = srcFilePath.ReverseFind(L'\\');
+				  if (n != -1)
+				  {
+					  srcPanel.OpenParentFolder();
+					  srcFilePath.ReleaseBuf_SetEnd(n);
+				  }
+				  else
+				  {
+					  break;
+				  }
+			  }
+			  else if (dwAttr & FILE_ATTRIBUTE_ARCHIVE)
+			  {
+				  if (dwAttr & FILE_ATTRIBUTE_READONLY)
+				  {
+					  dwAttr &= (~FILE_ATTRIBUTE_READONLY);
+					  SetFileAttributesW(srcFilePath, dwAttr);
+				  }
+				  ::DeleteFileW(srcFilePath);
+				  break;
+			  }
+			  else //if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
+			  {
+				  break;
+			  }
+		  } // while
+	  }
+	  if (close7Zip)
+	  {
+        PostMessage (_window, WM_CLOSE, 0, 0);
+	  }
+  }
 }
 
 void CApp::OnSetSameFolder(unsigned srcPanelIndex)
@@ -888,7 +964,7 @@ void CApp::OnSetSubFolder(unsigned srcPanelIndex)
       }
       destPanel.RefreshListCtrl();
       return;
-    }
+  }
   }
   else
   {

CPP/7zip/UI/FileManager/CopyDialog.cpp

@@ -8,10 +8,29 @@
 
 #include "BrowseDialog.h"
 #include "CopyDialog.h"
+#include <wchar.h>
+#include "Panel.h"
+#include "ViewSettings.h"
+#ifdef LANG
 #include "LangUtils.h"
 
 using namespace NWindows;
 
+static bool IsFileExistentAndNotDir(const wchar_t * lpszFile)
+{
+	DWORD	dwAttr;
+	dwAttr = GetFileAttributesW(lpszFile);
+	return (dwAttr != INVALID_FILE_ATTRIBUTES) 
+		&& ((dwAttr & FILE_ATTRIBUTE_ARCHIVE) != 0)
+		&& ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) == 0);
+}
+static bool IsDirectory(LPCWSTR lpszPathFile)
+{
+	DWORD	dwAttr;
+	dwAttr = GetFileAttributesW(lpszPathFile);
+	return (dwAttr != (DWORD)-1) && ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) != 0);
+}
+
 bool CCopyDialog::OnInit()
 {
   #ifdef Z7_LANG
@@ -20,6 +39,8 @@ bool CCopyDialog::OnInit()
   _path.Attach(GetItem(IDC_COPY));
   SetText(Title);
 
+  _freeSpace.Attach(GetItem(IDC_FREE_SPACE));
+  _freeSpace.SetText(L"");
   NControl::CStatic staticContol;
   staticContol.Attach(GetItem(IDT_COPY));
   staticContol.SetText(Static);
@@ -30,8 +51,63 @@ bool CCopyDialog::OnInit()
   FOR_VECTOR (i, Strings)
     _path.AddString(Strings[i]);
   _path.SetText(Value);
+  ShowPathFreeSpace(Value);
+  m_bOpenOutputFolder = ReadOptOpenOutputFolder();
+  m_bClose7Zip = ReadOptClose7Zip();
+  CheckButton(IDC_CHECK_OPEN_OUTPUT_FOLDER, m_bOpenOutputFolder);
+  CheckButton(IDC_CHECK_CLOSE_7ZIP, m_bClose7Zip);
   SetItemText(IDT_COPY_INFO, Info);
   NormalizeSize(true);
+  RECT rc;
+  GetWindowRect(&rc);
+  m_sizeMinWindow.cx = (RECT_SIZE_X(rc))*4/5;
+  m_sizeMinWindow.cy = (RECT_SIZE_Y(rc))*4/5;
+  /////////////////////////////////////////////////////////
+  m_strRealFileName.Empty();
+  if (IsDirectory(m_currentFolderPrefix))
+  {
+	  EnableItem(IDC_COPY_ADD_FILE_NAME, false);
+	  EnableItem(IDC_CHECK_DELETE_SOURCE_FILE, false);
+  }
+  else
+  {
+	  while (!m_currentFolderPrefix.IsEmpty())
+	  {
+		  if (m_currentFolderPrefix.Back() == '\\')
+		  {
+			  m_currentFolderPrefix.DeleteBack();
+		  }
+
+		  if (IsFileExistentAndNotDir(m_currentFolderPrefix))
+		  {
+			  int n = m_currentFolderPrefix.ReverseFind(L'\\');
+			  int m = m_currentFolderPrefix.ReverseFind(L'.');
+			  if (n != -1)
+			  {
+				  n++;
+			  }
+			  else
+			  {
+				  n = 0;
+			  }
+			  if (m == -1 || m <= n) m = m_currentFolderPrefix.Len();
+			  m_strRealFileName = m_currentFolderPrefix.Mid(n, m - n);
+			  break;
+		  }
+		  else
+		  {
+			  int n = m_currentFolderPrefix.ReverseFind(L'\\');
+			  if (n != -1)
+			  {
+				  m_currentFolderPrefix.ReleaseBuf_SetEnd(n);
+			  }
+			  else
+			  {
+				  break;
+			  }
+		  }
+	  }
+  }
   return CModalDialog::OnInit();
 }
 
@@ -45,28 +121,48 @@ bool CCopyDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   const int y = ySize - my - by;
   const int x = xSize - mx - bx1;
 
-  InvalidateRect(NULL);
+//  InvalidateRect(NULL);
-
   {
     RECT r;
-    GetClientRectOfItem(IDB_COPY_SET_PATH, r);
+
-    const int bx = RECT_SIZE_X(r);
+    GetClientRectOfItem(IDC_COPY_ADD_FILE_NAME, r);
-    MoveItem(IDB_COPY_SET_PATH, xSize - mx - bx, r.top, bx, RECT_SIZE_Y(r));
+    int bxAddFileName = r.right - r.left;
-    ChangeSubWindowSizeX(_path, xSize - mx - mx - bx - mx);
+    int byAddFileName = r.bottom - r.top;
+    MoveItem(IDC_COPY_ADD_FILE_NAME, xSize - mx - bxAddFileName, r.top, bxAddFileName, byAddFileName, false);
+
+    GetClientRectOfItem(IDC_COPY_OPEN_PATH, r);
+    int bxOpen = r.right - r.left;
+    int byOpen = r.bottom - r.top;
+    MoveItem(IDC_COPY_OPEN_PATH, xSize - mx - bxOpen - mx/2 - bxAddFileName, r.top, bxOpen, byOpen, false);
+
+	GetClientRectOfItem(IDB_COPY_SET_PATH, r);
+//    const int bx = RECT_SIZE_X(r);
+    int bxSet = RECT_SIZE_X(r);
+    int bySet = RECT_SIZE_Y(r);
+//    MoveItem(IDB_COPY_SET_PATH, xSize - mx - bx, r.top, bx, RECT_SIZE_Y(r));
+//    ChangeSubWindowSizeX(_path, xSize - mx - mx - bx - mx);
+    MoveItem(IDB_COPY_SET_PATH, xSize - mx - bxSet - bxOpen - mx - bxAddFileName, r.top, bxSet, bySet, false);
+    ChangeSubWindowSizeX(_path, xSize - mx - mx - bxSet - bxOpen - mx - mx/2 - bxAddFileName);
   }
 
   {
     RECT r;
     GetClientRectOfItem(IDT_COPY_INFO, r);
-    NControl::CStatic staticContol;
+//    NControl::CStatic staticContol;
-    staticContol.Attach(GetItem(IDT_COPY_INFO));
+//    staticContol.Attach(GetItem(IDT_COPY_INFO));
     const int yPos = r.top;
-    staticContol.Move(mx, yPos, xSize - mx * 2, y - 2 - yPos);
+	int xc = xSize - mx * 2;
+//    staticContol.Move(mx, yPos, xSize - mx * 2, y - 2 - yPos);
+	MoveItem(IDT_COPY_INFO, mx, yPos, xc, y - 2 - yPos, false);
+
+    GetClientRectOfItem(IDC_AFTER_EXTRACT, r);
+	MoveItem(IDC_AFTER_EXTRACT, mx, r.top, xc, r.bottom-r.top, false);
   }
 
-  MoveItem(IDCANCEL, x, y, bx1, by);
+  MoveItem(IDCANCEL, x, y, bx1, by, false);
-  MoveItem(IDOK, x - mx - bx2, y, bx2, by);
+  MoveItem(IDOK, x - mx - bx2, y, bx2, by, false);
 
+  InvalidateRect(NULL);
   return false;
 }
 
@@ -77,6 +173,25 @@ bool CCopyDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
     case IDB_COPY_SET_PATH:
       OnButtonSetPath();
       return true;
+	case IDC_COPY_OPEN_PATH:
+		OnButtonOpenPath();
+		return true;
+
+	case IDC_COPY_ADD_FILE_NAME:
+		OnButtonAddFileName();
+		return true;
+
+	case IDC_CHECK_OPEN_OUTPUT_FOLDER:
+		m_bOpenOutputFolder = IsButtonCheckedBool(IDC_CHECK_OPEN_OUTPUT_FOLDER);
+		return true;
+
+	case IDC_CHECK_DELETE_SOURCE_FILE:
+		m_bDeleteSourceFile = IsButtonCheckedBool(IDC_CHECK_DELETE_SOURCE_FILE);
+		return true;
+
+	case IDC_CHECK_CLOSE_7ZIP:
+		m_bClose7Zip = IsButtonCheckedBool(IDC_CHECK_CLOSE_7ZIP);
+		return true;
   }
   return CModalDialog::OnButtonClicked(buttonID, buttonHWND);
 }
@@ -94,10 +209,190 @@ void CCopyDialog::OnButtonSetPath()
   NFile::NName::NormalizeDirPathPrefix(resultPath);
   _path.SetCurSel(-1);
   _path.SetText(resultPath);
+  ShowPathFreeSpace(resultPath);
 }
 
 void CCopyDialog::OnOK()
 {
+  SaveOptOpenOutputFolder(m_bOpenOutputFolder);
+  SaveOptClose7Zip(m_bClose7Zip);
+
   _path.GetText(Value);
   CModalDialog::OnOK();
 }
+void CCopyDialog::OnButtonOpenPath()
+{
+	UString currentPath;
+	_path.GetText(currentPath);
+
+	if (IsDirectory(currentPath))
+	{
+		StartApplicationDontWait(currentPath, currentPath, (HWND)_window);
+	}
+	else
+	{
+		WCHAR szMsg[1024];
+		wsprintfW(szMsg, L"Folder \"%s\" is not available yet.\n\n"
+			L"Note: the program will create the folder automatically when extracting.", (LPCWSTR)currentPath);
+		MessageBoxW((HWND)_window, szMsg, L"7-Zip", MB_ICONEXCLAMATION);
+	}
+
+}
+
+void CCopyDialog::OnButtonAddFileName()
+{
+	UString currentPath;
+	_path.GetText(currentPath);
+
+	currentPath.Trim();
+	if (currentPath.Back() == '\\')
+	{
+		currentPath.DeleteBack();
+	}
+
+	UString strLastDir;
+	int n = currentPath.ReverseFind(L'\\');
+	if (n != -1)
+	{
+		strLastDir = currentPath.Mid(n+1, MyStringLen(currentPath));
+	}
+	else
+	{
+		strLastDir = currentPath;
+	}
+	if (strLastDir != m_strRealFileName)
+	{
+		currentPath += L'\\';
+		currentPath += m_strRealFileName;
+
+		_path.SetText(currentPath);
+	}
+	_path.SetFocus();
+}
+
+bool CCopyDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	switch(message)
+	{
+	case WM_GETMINMAXINFO:
+		{
+			return OnGetMinMaxInfo((PMINMAXINFO)lParam);
+		}
+	}
+	return CModalDialog::OnMessage(message, wParam, lParam);
+}
+
+bool CCopyDialog::OnGetMinMaxInfo(PMINMAXINFO pMMI)
+{
+	pMMI->ptMinTrackSize.x = m_sizeMinWindow.cx;
+	pMMI->ptMinTrackSize.y = m_sizeMinWindow.cy;
+	return false;
+}
+
+static int MakeByteSizeString64(wchar_t * lpszBuf, size_t ccBuf, unsigned __int64 n64Byte)
+{
+	int nRet = 0;
+
+	if (n64Byte < 1000ui64)
+	{
+		// < 1K
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%I64d B", n64Byte);
+	}
+	else if (n64Byte < 1024000ui64) // 1024 * 1000
+	{
+		// 1K <= n64Byte < 1M
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.1f KB", (double)n64Byte / 1024.0);
+	}
+	else if (n64Byte < 1048576000ui64) //  1024 * 1024 * 1000
+	{
+		// 1M <= n64Byte < 1G
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.2f MB", (double)n64Byte / 1048576.0); // 1024 * 1024
+	}
+	else if (n64Byte < 1073741824000ui64) //  1024 * 1024 * 1024 * 1000
+	{
+		// 1 G <= n64Byte < 1T
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.2f GB", (double)n64Byte / 1073741824.0); // 1024.0F * 1024.0F * 1024.0F
+	}
+	else
+	{
+		// n64Byte >= 1T
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.2f TB", (double)n64Byte / 1099511627776.0);
+									// 1024.0F * 1024.0F * 1024.0F * 1024.0F
+	}
+
+	return nRet;
+}
+
+void CCopyDialog::ShowPathFreeSpace(UString & strPath)
+{
+	bool bBadPath;
+	UString strText;
+
+	strText.Empty();
+
+	bBadPath = false;
+	strPath.Trim();
+	for (; !IsDirectory(strPath); )
+	{
+		int n = strPath.ReverseFind(L'\\');
+		if (n == -1)
+		{
+			bBadPath = true;
+			break;
+		}
+		else
+		{
+			strPath.ReleaseBuf_SetEnd(n);
+		}
+	}
+	if (!bBadPath)
+	{
+		unsigned __int64 n64FreeBytesAvailable;
+		unsigned __int64 n64TotalNumberOfBytes;
+		unsigned __int64 n64TotalNumberOfFreeBytes;
+
+		if (GetDiskFreeSpaceExW(strPath, (PULARGE_INTEGER)&n64FreeBytesAvailable, 
+			(PULARGE_INTEGER)&n64TotalNumberOfBytes, (PULARGE_INTEGER)&n64TotalNumberOfFreeBytes))
+		{
+			wchar_t szFreeBytes[1024];
+			wchar_t szTotalBytes[1024];
+			MakeByteSizeString64(szFreeBytes, 1024-4, n64TotalNumberOfFreeBytes);
+			MakeByteSizeString64(szTotalBytes, 1024-4, n64TotalNumberOfBytes);
+			int nLen = swprintf(strText.GetBuf(1024), 1024-4,  L"%s Free (Total: %s)", szFreeBytes, szTotalBytes);
+			strText.ReleaseBuf_SetEnd(nLen);
+		}
+	}
+	_freeSpace.SetText(strText);
+}
+
+bool CCopyDialog::OnCommand(int code, int itemID, LPARAM lParam)
+{
+	if (itemID == IDC_COPY)
+	{
+		if (code == CBN_EDITCHANGE)
+		{
+			UString strPath;
+			_path.GetText(strPath);
+
+			ShowPathFreeSpace(strPath);
+			return true;
+		}
+		else if (code == CBN_SELCHANGE)
+		{
+			int nSel = _path.GetCurSel();
+			if (nSel != CB_ERR)
+			{
+				UString strPath;
+				_path.GetLBText(nSel, strPath);
+				ShowPathFreeSpace(strPath);
+			}
+			return true;
+		}
+	}
+	return CModalDialog::OnCommand(code, itemID, lParam);
+}

CPP/7zip/UI/FileManager/CopyDialog.h

@@ -8,24 +8,46 @@
 
 #include "CopyDialogRes.h"
 
-const int kCopyDialog_NumInfoLines = 11;
+const int kCopyDialog_NumInfoLines = 14;
 
 class CCopyDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CComboBox _path;
+  NWindows::NControl::CStatic _freeSpace;
   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();
+  void OnButtonOpenPath();
+  void OnButtonAddFileName();
+  bool OnCommand(int code, int itemID, LPARAM lParam);
+  bool OnGetMinMaxInfo(PMINMAXINFO pMMI);
+
+  void ShowPathFreeSpace(UString & strPath);
+
+protected:
+	SIZE m_sizeMinWindow;
+
 public:
+  CCopyDialog(): m_bOpenOutputFolder(false), m_bDeleteSourceFile(false), m_bClose7Zip (false) { m_sizeMinWindow.cx = 0; m_sizeMinWindow.cy = 0; }
+
   UString Title;
   UString Static;
   UString Value;
   UString Info;
   UStringVector Strings;
 
+  bool m_bOpenOutputFolder;
+  bool m_bDeleteSourceFile;
+  bool m_bClose7Zip;
+
+  UString m_currentFolderPrefix;
+  UString m_strRealFileName;
+
   INT_PTR Create(HWND parentWindow = NULL) { return CModalDialog::Create(IDD_COPY, parentWindow); }
+
+  bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
 };
 
 #endif

CPP/7zip/UI/FileManager/CopyDialog.rc

@@ -1,20 +1,75 @@
 #include "CopyDialogRes.h"
 #include "../../GuiCommon.rc"
 
-#define xc 320
+//#define xc 320
-#define yc 144
+//#define yc 144
+//
+//#define y 40
+//
+//IDD_COPY  DIALOG  0, 0, xs, ys  MY_MODAL_RESIZE_DIALOG_STYLE  MY_FONT
+//CAPTION "Copy"
+//{
+//  LTEXT       "",    IDT_COPY, m, m, xc, 8
+//  COMBOBOX           IDC_COPY, m, 20, xc - bxsDots - m, 65, MY_COMBO_WITH_EDIT
+//  PUSHBUTTON  "...", IDB_COPY_SET_PATH, xs - m - bxsDots, 18, bxsDots, bys, WS_GROUP
+//  LTEXT       "",    IDT_COPY_INFO, m, y, xc, by - y - 1, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+//  OK_CANCEL
+//}
 
-#define y 40
+
+
+#define xc 340
+#define yc 190
+
+#define y 78
+
+#define OPEN_XS 28
+#define FILENAME_XS 40
+#define SPACE_XS 4
+
+#define FILENAME_X (xs - m - FILENAME_XS)
+#define OPEN_X (FILENAME_X - OPEN_XS - SPACE_XS)
+#define DOTS_X (OPEN_X - bxsDots - SPACE_XS)
+#define PATH_Y (m + 12)
+#define PATH_XS (DOTS_X - m - SPACE_XS)
+
+#define FREE_SPACE_Y (PATH_Y + 15)
+
+#define AFTER_EXTRACTION_Y (FREE_SPACE_Y + 12)
+
+#define OPTION_SPACE 10
+
+#define OPEN_OUTPUT_FOLDER_X (m + 6)
+#define OPEN_OUTPUT_FOLDER_XS 80
+#define OPEN_OUTPUT_FOLDER_Y (AFTER_EXTRACTION_Y + 12)
+
+#define DELETE_SOURCE_X (OPEN_OUTPUT_FOLDER_X + OPEN_OUTPUT_FOLDER_XS + OPTION_SPACE)
+#define DELETE_SOURCE_XS 88
+
+#define CLOSE_7ZIP_X (DELETE_SOURCE_X + DELETE_SOURCE_XS + OPTION_SPACE)
+#define CLOSE_7ZIP_XS 54
+
+#define INFO_Y (AFTER_EXTRACTION_Y + 27 + 4)
+#define INFO_YS (by - m - 12 - 15 - 12 - 27 - 4 - 1)
 
 IDD_COPY  DIALOG  0, 0, xs, ys  MY_MODAL_RESIZE_DIALOG_STYLE  MY_FONT
 CAPTION "Copy"
 {
-  LTEXT       "",    IDT_COPY, m, m, xc, 8
+  LTEXT       "",    IDT_COPY,   m, m, xc, 9
-  COMBOBOX           IDC_COPY, m, 20, xc - bxsDots - m, 65, MY_COMBO_WITH_EDIT
+  COMBOBOX           IDC_COPY,                      m, PATH_Y, PATH_XS, 160, MY_COMBO_WITH_EDIT
-  PUSHBUTTON  "...", IDB_COPY_SET_PATH, xs - m - bxsDots, 18, bxsDots, bys, WS_GROUP
+    PUSHBUTTON  "...", IDB_COPY_SET_PATH,                 DOTS_X, PATH_Y - 1, bxsDots, bys - 1, WS_GROUP
-  LTEXT       "",    IDT_COPY_INFO, m, y, xc, by - y - 1, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    PUSHBUTTON  "&Open", IDC_COPY_OPEN_PATH,              OPEN_X, PATH_Y - 1, OPEN_XS, bys - 1, WS_GROUP
+    PUSHBUTTON  "&Filename", IDC_COPY_ADD_FILE_NAME,      FILENAME_X, PATH_Y - 1, FILENAME_XS, bys - 1, WS_GROUP
+  LTEXT       "",    IDC_FREE_SPACE,     m, FREE_SPACE_Y, xc, 9
+  GROUPBOX    "After extraction completes successfully", IDC_AFTER_EXTRACT,    m, AFTER_EXTRACTION_Y, xc, 27
+    CONTROL   "O&pen output folder", IDC_CHECK_OPEN_OUTPUT_FOLDER, MY_CHECKBOX,      OPEN_OUTPUT_FOLDER_X, OPEN_OUTPUT_FOLDER_Y, OPEN_OUTPUT_FOLDER_XS, 10
+    CONTROL   "&Delete source archive", IDC_CHECK_DELETE_SOURCE_FILE, MY_CHECKBOX,       DELETE_SOURCE_X, OPEN_OUTPUT_FOLDER_Y, DELETE_SOURCE_XS, 10
+    CONTROL   "&Close 7-Zip", IDC_CHECK_CLOSE_7ZIP, MY_CHECKBOX,                      CLOSE_7ZIP_X, OPEN_OUTPUT_FOLDER_Y, CLOSE_7ZIP_XS, 10
+  LTEXT       "",    IDT_COPY_INFO,     m, INFO_Y, xc, INFO_YS, SS_NOPREFIX | SS_LEFTNOWORDWRAP
   OK_CANCEL
 }
 
+
+
 #undef xc
 #undef yc

CPP/7zip/UI/FileManager/CopyDialogRes.h

@@ -5,4 +5,12 @@
 #define IDB_COPY_SET_PATH  102
 #define IDT_COPY_INFO      103
 
+#define IDC_CHECK_OPEN_OUTPUT_FOLDER   104
+#define IDC_COPY_OPEN_PATH             105
+#define IDC_FREE_SPACE                 106
+#define IDC_COPY_ADD_FILE_NAME         107
+#define IDC_CHECK_DELETE_SOURCE_FILE   108
+#define IDC_CHECK_CLOSE_7ZIP           109
+#define IDC_AFTER_EXTRACT              110
+
 #define IDS_SET_FOLDER    6007

CPP/7zip/UI/FileManager/Panel.h

@@ -198,7 +198,7 @@ enum MyMessages
 };
 
 UString GetFolderPath(IFolderFolder *folder);
-
+void StartApplicationDontWait(const UString &dir, const UString &path, HWND window);
 class CPanel;
 
 class CMyListView Z7_final: public NWindows::NControl::CListView2
@@ -849,6 +849,7 @@ public:
   void MessageBox_LastError() const;
   void MessageBox_Error_LangID(UINT resourceID) const;
   void MessageBox_Error_UnsupportOperation() const;
+  void MessageBoxMyError(LPCWSTR message);
   // void MessageBoxErrorForUpdate(HRESULT errorCode, UINT resourceID);
 
 

CPP/7zip/UI/FileManager/PanelItemOpen.cpp

@@ -906,7 +906,7 @@ static HRESULT StartApplication(const UString &dir, const UString &path, HWND wi
   return S_OK;
 }
 
-static void StartApplicationDontWait(const UString &dir, const UString &path, HWND window)
+void StartApplicationDontWait(const UString &dir, const UString &path, HWND window)
 {
   CProcess process;
   StartApplication(dir, path, window, process);

CPP/7zip/UI/FileManager/ProgressDialog2.cpp

@@ -23,6 +23,7 @@
 using namespace NWindows;
 
 extern HINSTANCE g_hInstance;
+bool g_bProcessError = false;
 
 static const UINT_PTR kTimerID = 3;
 

CPP/7zip/UI/FileManager/ProgressDialog2Icon.rc

@@ -0,0 +1,19 @@
+#include "ProgressDialog2IconRes.h"
+
+IDI_SYSTRAY_0  ICON  "../../UI/FileManager/trayico/tray00.ico"
+IDI_SYSTRAY_1  ICON  "../../UI/FileManager/trayico/tray01.ico"
+IDI_SYSTRAY_2  ICON  "../../UI/FileManager/trayico/tray02.ico"
+IDI_SYSTRAY_3  ICON  "../../UI/FileManager/trayico/tray03.ico"
+IDI_SYSTRAY_4  ICON  "../../UI/FileManager/trayico/tray04.ico"
+IDI_SYSTRAY_5  ICON  "../../UI/FileManager/trayico/tray05.ico"
+IDI_SYSTRAY_6  ICON  "../../UI/FileManager/trayico/tray06.ico"
+IDI_SYSTRAY_7  ICON  "../../UI/FileManager/trayico/tray07.ico"
+IDI_SYSTRAY_8  ICON  "../../UI/FileManager/trayico/tray08.ico"
+IDI_SYSTRAY_9  ICON  "../../UI/FileManager/trayico/tray09.ico"
+IDI_SYSTRAY_10 ICON  "../../UI/FileManager/trayico/tray10.ico"
+IDI_SYSTRAY_11 ICON  "../../UI/FileManager/trayico/tray11.ico"
+IDI_SYSTRAY_12 ICON  "../../UI/FileManager/trayico/tray12.ico"
+IDI_SYSTRAY_13 ICON  "../../UI/FileManager/trayico/tray13.ico"
+IDI_SYSTRAY_14 ICON  "../../UI/FileManager/trayico/tray14.ico"
+//IDI_SYSTRAY_15 ICON  "../../UI/FileManager/trayico/tray15.ico"
+//IDI_SYSTRAY_16 ICON  "../../UI/FileManager/trayico/tray16.ico"

CPP/7zip/UI/FileManager/ProgressDialog2IconRes.h

@@ -0,0 +1,17 @@
+#define IDI_SYSTRAY_0  310
+#define IDI_SYSTRAY_1  311
+#define IDI_SYSTRAY_2  312
+#define IDI_SYSTRAY_3  313
+#define IDI_SYSTRAY_4  314
+#define IDI_SYSTRAY_5  315
+#define IDI_SYSTRAY_6  316
+#define IDI_SYSTRAY_7  317
+#define IDI_SYSTRAY_8  318
+#define IDI_SYSTRAY_9  319
+#define IDI_SYSTRAY_10 320
+#define IDI_SYSTRAY_11 321
+#define IDI_SYSTRAY_12 322
+#define IDI_SYSTRAY_13 323
+#define IDI_SYSTRAY_14 324
+//#define IDI_SYSTRAY_15 325
+//#define IDI_SYSTRAY_16 326

CPP/7zip/UI/FileManager/StdAfx.h

@@ -12,12 +12,12 @@
 Z7_DIAGNOSCTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
 #ifndef _WIN32_WINNT
 // #define _WIN32_WINNT 0x0400
-#define _WIN32_WINNT 0x0500
+//#define _WIN32_WINNT 0x0500
 // #define _WIN32_WINNT 0x0600
 // #define _WIN32_WINNT 0x0A00
 #endif
 #ifndef WINVER
-#define WINVER _WIN32_WINNT
+//#define WINVER _WIN32_WINNT
 #endif
 // #define _WIN32_IE 0x400 // for debug
 Z7_DIAGNOSCTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER

CPP/7zip/UI/FileManager/ViewSettings.cpp

@@ -30,6 +30,8 @@ static LPCTSTR const kListMode = TEXT("ListMode");
 static LPCTSTR const kFolderHistoryValueName = TEXT("FolderHistory");
 static LPCTSTR const kFastFoldersValueName = TEXT("FolderShortcuts");
 static LPCTSTR const kCopyHistoryValueName = TEXT("CopyHistory");
+static LPCTSTR const kOpenOutputFolderValueName = TEXT("OpenOutputFolder");
+static LPCTSTR const kClose7ZipValueName = TEXT("Close7Zip");
 
 static NSynchronization::CCriticalSection g_CS;
 
@@ -312,3 +314,39 @@ void AddUniqueStringToHeadOfList(UStringVector &list, const UString &s)
       i++;
   list.Insert(0, s);
 }
+
+void SaveOptOpenOutputFolder(bool bOpen)
+{
+  CKey key;
+  key.Create(HKEY_CURRENT_USER, kCUBasePath);
+  key.SetValue(kOpenOutputFolderValueName, bOpen);
+}
+
+bool ReadOptOpenOutputFolder()
+{
+  CKey key;
+  if (key.Open(HKEY_CURRENT_USER, kCUBasePath, KEY_READ) != ERROR_SUCCESS)
+    return false;
+  bool bOpen;
+  if (key.QueryValue(kOpenOutputFolderValueName, bOpen) != ERROR_SUCCESS)
+    return false;
+  return bOpen;
+}
+
+void SaveOptClose7Zip(bool bClose7Zip)
+{
+  CKey key;
+  key.Create(HKEY_CURRENT_USER, kCUBasePath);
+  key.SetValue(kClose7ZipValueName, bClose7Zip);
+}
+
+bool ReadOptClose7Zip()
+{
+  CKey key;
+  if (key.Open(HKEY_CURRENT_USER, kCUBasePath, KEY_READ) != ERROR_SUCCESS)
+    return false;
+  bool bOpen;
+  if (key.QueryValue(kClose7ZipValueName, bOpen) != ERROR_SUCCESS)
+    return false;
+  return bOpen;
+}

CPP/7zip/UI/FileManager/ViewSettings.h

@@ -112,4 +112,10 @@ void ReadCopyHistory(UStringVector &folders);
 
 void AddUniqueStringToHeadOfList(UStringVector &list, const UString &s);
 
+void SaveOptOpenOutputFolder(bool bOpen);
+bool ReadOptOpenOutputFolder();
+
+void SaveOptClose7Zip(bool bClose7Zip);
+bool ReadOptClose7Zip();
+
 #endif

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

@@ -12,8 +12,8 @@
 #ifndef Z7_NO_REGISTRY
 #include "../FileManager/HelpUtils.h"
 #endif
-
+#include <stdio.h>
-
+#include "../FileManager/ViewSettings.h"
 #include "../FileManager/BrowseDialog.h"
 #include "../FileManager/LangUtils.h"
 #include "../FileManager/resourceGui.h"
@@ -88,7 +88,7 @@ static const UInt32 kLangIDs[] =
 // static const int kWildcardsButtonIndex = 2;
 
 #ifndef Z7_NO_REGISTRY
-static const unsigned kHistorySize = 16;
+static const unsigned kHistorySize = 30;
 #endif
 
 #ifndef Z7_SFX
@@ -135,6 +135,20 @@ void CExtractDialog::GetButton_Bools(UINT id, CBoolPair &b1, CBoolPair &b2)
 
 #endif
 
+void StartApplication(const UString &dir, const UString &path)
+{
+	SHELLEXECUTEINFOW execInfo;
+	ZeroMemory(&execInfo, sizeof(execInfo));
+	execInfo.cbSize = sizeof(execInfo);
+	execInfo.fMask = SEE_MASK_FLAG_DDEWAIT;
+	execInfo.hwnd = NULL;
+	execInfo.lpVerb = NULL;
+	execInfo.lpFile = path;
+	execInfo.lpParameters = NULL;
+	execInfo.lpDirectory = dir.IsEmpty() ? NULL : (LPCWSTR)dir;
+	execInfo.nShow = SW_SHOWNORMAL;
+	ShellExecuteExW(&execInfo);
+}
 bool CExtractDialog::OnInit()
 {
   #ifdef Z7_LANG
@@ -222,6 +236,16 @@ bool CExtractDialog::OnInit()
     _path.SetCurSel(-1);
   */
 
+#ifndef Z7_SFX
+  m_bOpenOutputFolder = ReadOptOpenOutputFolder();
+  CheckButton(IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER, m_bOpenOutputFolder);
+#endif
+
+#ifndef Z7_SFX
+  m_bOpenOutputFolder = ReadOptOpenOutputFolder();
+  CheckButton(IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER, m_bOpenOutputFolder);
+#endif
+
   #ifndef Z7_SFX
 
   _pathMode.Attach(GetItem(IDC_EXTRACT_PATH_MODE));
@@ -260,6 +284,21 @@ bool CExtractDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
     case IDB_EXTRACT_SET_PATH:
       OnButtonSetPath();
       return true;
+
+	case IDC_EXTRACT_BUTTON_OPEN_PATH:
+		OnButtonOpenPath();
+		return true;
+
+	case IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER:
+		m_bOpenOutputFolder = IsButtonCheckedBool(IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER);
+		return true;
+
+#ifndef Z7_SFX
+	case IDC_CHECK_DELETE_SOURCE_FILE:
+		m_bDeleteSourceFile = IsButtonCheckedBool(IDC_CHECK_DELETE_SOURCE_FILE);
+		return true;
+#endif
+
     #ifndef Z7_SFX
     case IDX_EXTRACT_NAME_ENABLE:
       ShowItem_Bool(IDE_EXTRACT_NAME, IsButtonCheckedBool(IDX_EXTRACT_NAME_ENABLE));
@@ -286,6 +325,7 @@ void CExtractDialog::OnButtonSetPath()
   _path.SetCurSel(-1);
   #endif
   _path.SetText(resultPath);
+  ShowPathFreeSpace(resultPath);
 }
 
 void AddUniqueString(UStringVector &list, const UString &s);
@@ -299,6 +339,10 @@ void AddUniqueString(UStringVector &list, const UString &s)
 
 void CExtractDialog::OnOK()
 {
+#ifndef Z7_SFX
+  SaveOptOpenOutputFolder(m_bOpenOutputFolder);
+#endif
+
   #ifndef Z7_SFX
   int pathMode2 = kPathModeButtonsVals[_pathMode.GetCurSel()];
   if (PathMode != NExtract::NPathMode::kCurPaths ||
@@ -419,3 +463,147 @@ void CExtractDialog::OnHelp()
   CModalDialog::OnHelp();
 }
 #endif
+
+
+BOOL IsDirectory(const wchar_t * lpszPathFile)
+{
+	DWORD	dwAttr;
+
+	dwAttr = GetFileAttributesW(lpszPathFile);
+	return (dwAttr != (DWORD)-1) && (dwAttr & FILE_ATTRIBUTE_DIRECTORY);
+}
+
+void CExtractDialog::OnButtonOpenPath()
+{
+	UString currentPath;
+	_path.GetText(currentPath);
+
+	if (IsDirectory(currentPath))
+	{
+		StartApplication(currentPath, currentPath);
+	}
+	else
+	{
+		wchar_t szMsg[1024];
+		wsprintfW(szMsg, L"Folder \"%s\" is not available yet.\n\n"
+			L"Note: the program will create the folder automatically when extracting.", (LPCWSTR)currentPath);
+		MessageBoxW((HWND)_window, szMsg, L"7-Zip", MB_ICONEXCLAMATION);
+	}
+
+}
+
+static int MakeByteSizeString64(wchar_t * lpszBuf, size_t ccBuf, unsigned __int64 n64Byte)
+{
+	int nRet = 0;
+
+	if (n64Byte < 1000ui64)
+	{
+		// < 1K
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%I64d B", n64Byte);
+	}
+	else if (n64Byte < 1024000ui64) // 1024 * 1000
+	{
+		// 1K <= n64Byte < 1M
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.1f KB", (double)n64Byte / 1024.0);
+	}
+	else if (n64Byte < 1048576000ui64) //  1024 * 1024 * 1000
+	{
+		// 1M <= n64Byte < 1G
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.2f MB", (double)n64Byte / 1048576.0); // 1024 * 1024
+	}
+	else if (n64Byte < 1073741824000ui64) //  1024 * 1024 * 1024 * 1000
+	{
+		// 1 G <= n64Byte < 1T
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.2f GB", (double)n64Byte / 1073741824.0); // 1024.0F * 1024.0F * 1024.0F
+	}
+	else
+	{
+		// n64Byte >= 1T
+		nRet = swprintf(lpszBuf, ccBuf, 
+			L"%.2f TB", (double)n64Byte / 1099511627776.0);
+									// 1024.0F * 1024.0F * 1024.0F * 1024.0F
+	}
+
+	return nRet;
+}
+
+void CExtractDialog::ShowPathFreeSpace(UString & strPath)
+{
+	bool bBadPath;
+	UString strText;
+
+	strText.Empty();
+
+	bBadPath = false;
+	strPath.Trim();
+	for (; !IsDirectory(strPath); )
+	{
+		int n = strPath.ReverseFind(L'\\');
+		if (n == -1)
+		{
+			bBadPath = true;
+			break;
+		}
+		else
+		{
+			strPath.ReleaseBuf_SetEnd(n);
+		}
+	}
+	if (!bBadPath)
+	{
+		unsigned __int64 n64FreeBytesAvailable;
+		unsigned __int64 n64TotalNumberOfBytes;
+		unsigned __int64 n64TotalNumberOfFreeBytes;
+
+		if (GetDiskFreeSpaceExW(strPath, (PULARGE_INTEGER)&n64FreeBytesAvailable, 
+			(PULARGE_INTEGER)&n64TotalNumberOfBytes, (PULARGE_INTEGER)&n64TotalNumberOfFreeBytes))
+		{
+			wchar_t szFreeBytes[1024];
+			wchar_t szTotalBytes[1024];
+			MakeByteSizeString64(szFreeBytes, 1024-4, n64TotalNumberOfFreeBytes);
+			MakeByteSizeString64(szTotalBytes, 1024-4, n64TotalNumberOfBytes);
+			int nLen = swprintf(strText.GetBuf(1024), 1024-4,  L"%s Free (Total: %s)", szFreeBytes, szTotalBytes);
+			strText.ReleaseBuf_SetEnd(nLen);
+		}
+	}
+	_freeSpace.SetText(strText);
+}
+
+
+bool CExtractDialog::OnCommand(int code, int itemID, LPARAM lParam)
+{
+	if (itemID == IDC_EXTRACT_PATH)
+	{
+#ifdef NO_REGISTRY
+		if (code == EN_CHANGE)
+#else
+		if (code == CBN_EDITCHANGE)
+#endif
+		{
+			UString strPath;
+			_path.GetText(strPath);
+
+			ShowPathFreeSpace(strPath);
+			return true;
+		}
+#ifndef NO_REGISTRY
+		else if (code == CBN_SELCHANGE)
+		{
+			int nSel = _path.GetCurSel();
+			if (nSel != CB_ERR)
+			{
+				UString strPath;
+				_path.GetLBText(nSel, strPath);
+				ShowPathFreeSpace(strPath);
+			}
+			return true;
+		}
+#endif
+	}
+	return CModalDialog::OnCommand(code, itemID, lParam);
+}
+

CPP/7zip/UI/GUI/ExtractDialog.h

@@ -7,6 +7,7 @@
 
 #include "../../../Windows/Control/ComboBox.h"
 #include "../../../Windows/Control/Edit.h"
+#include "../../../Windows/Control/Static.h"
 
 #include "../Common/ExtractMode.h"
 
@@ -31,6 +32,7 @@ namespace NExtractionDialog
   */
 }
 
+void StartApplication(const UString &dir, const UString &path);
 class CExtractDialog: public NWindows::NControl::CModalDialog
 {
   #ifdef Z7_NO_REGISTRY
@@ -45,7 +47,7 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
   NWindows::NControl::CComboBox _pathMode;
   NWindows::NControl::CComboBox _overwriteMode;
   #endif
-
+  NWindows::NControl::CStatic _freeSpace;
   #ifndef Z7_SFX
   // int GetFilesMode() const;
   void UpdatePasswordControl();
@@ -58,6 +60,8 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
   virtual bool OnInit() Z7_override;
   virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   virtual void OnOK() Z7_override;
+  void OnButtonOpenPath();
+  virtual bool OnCommand(int code, int itemID, LPARAM lParam);
   
   #ifndef Z7_NO_REGISTRY
 
@@ -67,6 +71,7 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
   
   #endif
   
+  void ShowPathFreeSpace(UString & strPath);
   bool IsShowPasswordChecked() const { return IsButtonCheckedBool(IDX_PASSWORD_SHOW); }
 public:
   // bool _enableSelectedFilesButton;
@@ -84,6 +89,8 @@ public:
   NExtract::NPathMode::EEnum PathMode;
   NExtract::NOverwriteMode::EEnum OverwriteMode;
 
+  bool m_bOpenOutputFolder;
+  bool m_bDeleteSourceFile;
   #ifndef Z7_SFX
   // CBoolPair AltStreams;
   CBoolPair NtSecurity;
@@ -101,10 +108,12 @@ public:
     return CModalDialog::Create(SIZED_DIALOG(IDD_EXTRACT), aWndParent);
   }
 
-  CExtractDialog():
+  CExtractDialog()
-    PathMode_Force(false),
-    OverwriteMode_Force(false)
   {
+	  PathMode_Force = false;
+	  OverwriteMode_Force = false;
+	  m_bOpenOutputFolder = false;
+	  m_bDeleteSourceFile = false;
     ElimDup.Val = true;
   }
 

CPP/7zip/UI/GUI/ExtractDialog.rc

@@ -2,7 +2,7 @@
 #include "../../GuiCommon.rc"
 
 #define xc 336
-#define yc 168
+#define yc 200
 
 #undef g1xs
 #undef g2x
@@ -18,6 +18,13 @@
 #define g2xs (xc - g1xs - gSpace)
 #define g2xs2 (g2xs - m - m)
 
+#define bxsOpen 30
+#define xsSpace 4
+
+#define e7zYbase 58
+#define newControlHeight 42
+#define newControlHeight2 58
+
 #undef GROUP_Y_SIZE
 #ifdef UNDER_CE
 #define GROUP_Y_SIZE 8
@@ -29,30 +36,36 @@ IDD_EXTRACT  DIALOG  0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT
 CAPTION "Extract"
 BEGIN
   LTEXT     "E&xtract to:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8
-  COMBOBOX  IDC_EXTRACT_PATH, m, m + 12, xc - bxsDots - 12, 100, MY_COMBO_WITH_EDIT
+  COMBOBOX  IDC_EXTRACT_PATH, m, m + 12, xc - bxsDots - xsSpace - bxsOpen - xsSpace, 160, MY_COMBO_WITH_EDIT
-  PUSHBUTTON  "...", IDB_EXTRACT_SET_PATH, xs - m - bxsDots, m + 12 - 2, bxsDots, bys, WS_GROUP
+  PUSHBUTTON  "...", IDB_EXTRACT_SET_PATH, xs - m - bxsDots - xsSpace - bxsOpen, m + 12 - 1, bxsDots, bys-1, WS_GROUP
+  PUSHBUTTON  "&Open", IDC_EXTRACT_BUTTON_OPEN_PATH, xs - m - bxsOpen, m + 12 - 1, bxsOpen, bys-1, WS_GROUP
 
   CONTROL   "", IDX_EXTRACT_NAME_ENABLE, MY_CHECKBOX, m, m + 34, 12, 10
-  EDITTEXT  IDE_EXTRACT_NAME, m + 12 + 2, m + 32, g1xs - 12 - 2, 14, ES_AUTOHSCROLL
+  EDITTEXT  IDE_EXTRACT_NAME, m + 12 + 2, m + 32, xc - 12 - 2, 14, ES_AUTOHSCROLL
 
-  LTEXT     "Path mode:", IDT_EXTRACT_PATH_MODE, m, m + 52, g1xs, 8
+  LTEXT       "",    IDC_STATIC_EXTRACT_FREE_SPACE,     m, e7zYbase, xc, 8
-  COMBOBOX  IDC_EXTRACT_PATH_MODE, m, m + 64, g1xs, 140, MY_COMBO
+  GROUPBOX    "After extraction completes successfully", IDC_GUI_AFTER_EXTRACT,    m, e7zYbase+12, xc, 27
+    CONTROL  "O&pen output folder", IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER, MY_CHECKBOX, 14, e7zYbase+24, 100, 10
+    CONTROL   "&Delete source archives", IDC_CHECK_DELETE_SOURCE_FILE, MY_CHECKBOX, 125, e7zYbase+24, 120, 10
+
+  LTEXT     "Path mode:", IDT_EXTRACT_PATH_MODE, m, m + 52 + newControlHeight, g1xs, 8
+  COMBOBOX  IDC_EXTRACT_PATH_MODE, m, m + 64 + newControlHeight, g1xs, 140, MY_COMBO
 
   CONTROL   "Eliminate duplication of root folder", IDX_EXTRACT_ELIM_DUP, MY_CHECKBOX,
-            m, m + 84, g1xs, 10
+            m, m + 84 + newControlHeight, g1xs, 10
 
-  LTEXT     "Overwrite mode:", IDT_EXTRACT_OVERWRITE_MODE, m, m + 104, g1xs, 8
+  LTEXT     "Overwrite mode:", IDT_EXTRACT_OVERWRITE_MODE, m, m + 104 + newControlHeight, g1xs, 8
-  COMBOBOX  IDC_EXTRACT_OVERWRITE_MODE, m, m + 116, g1xs, 140, MY_COMBO
+  COMBOBOX  IDC_EXTRACT_OVERWRITE_MODE, m, m + 116 + newControlHeight, g1xs, 140, MY_COMBO
 
 
-  GROUPBOX  "Password", IDG_PASSWORD, g2x, m + 36, g2xs, GROUP_Y_SIZE
+  GROUPBOX  "Password", IDG_PASSWORD, g2x, m + 36 + newControlHeight2, g2xs, GROUP_Y_SIZE
-  EDITTEXT  IDE_EXTRACT_PASSWORD, g2x2, m + 50, g2xs2, 14, ES_PASSWORD | ES_AUTOHSCROLL
+  EDITTEXT  IDE_EXTRACT_PASSWORD, g2x2, m + 50 + newControlHeight2, g2xs2, 14, ES_PASSWORD | ES_AUTOHSCROLL
-  CONTROL   "Show Password", IDX_PASSWORD_SHOW, MY_CHECKBOX, g2x2, m + 72, g2xs2, 10
+  CONTROL   "Show Password", IDX_PASSWORD_SHOW, MY_CHECKBOX, g2x2, m + 72 + newControlHeight2, g2xs2, 10
 
 //  CONTROL   "Restore alternate data streams", IDX_EXTRACT_ALT_STREAMS, MY_CHECKBOX,
 //            g2x, m + 104, g2xs, 10
   CONTROL   "Restore file security", IDX_EXTRACT_NT_SECUR, MY_CHECKBOX,
-            g2x, m + 104, g2xs, 10
+            g2x, m + 100 + newControlHeight2, g2xs, 10
   
   DEFPUSHBUTTON  "OK",     IDOK,     bx3, by, bxs, bys, WS_GROUP
   PUSHBUTTON     "Cancel", IDCANCEL, bx2, by, bxs, bys

CPP/7zip/UI/GUI/ExtractDialogRes.h

@@ -6,6 +6,12 @@
 #define IDC_EXTRACT_PATH_MODE        102
 #define IDC_EXTRACT_OVERWRITE_MODE   103
 
+#define IDC_EXTRACT_BUTTON_OPEN_PATH    105
+#define IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER    106
+#define IDC_STATIC_EXTRACT_FREE_SPACE           107
+#define IDC_CHECK_DELETE_SOURCE_FILE   108
+#define IDC_GUI_AFTER_EXTRACT              109
+
 #define IDE_EXTRACT_PASSWORD         120
 
 #define IDE_EXTRACT_NAME             130

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

@@ -15,6 +15,7 @@
 #include "../FileManager/LangUtils.h"
 #include "../FileManager/resourceGui.h"
 #include "../FileManager/OverwriteDialogRes.h"
+#include "../FileManager/ViewSettings.h"
 
 #include "../Common/ArchiveExtractCallback.h"
 #include "../Common/PropIDUtils.h"
@@ -33,6 +34,7 @@
 using namespace NWindows;
 using namespace NFile;
 using namespace NDir;
+extern bool g_bProcessError;
 
 static const wchar_t * const kIncorrectOutDir = L"Incorrect output directory path";
 
@@ -152,10 +154,10 @@ HRESULT CThreadExtracting::ProcessVirt()
         AddSizePair(s, IDS_PROP_ALT_STREAMS_SIZE, Stat.AltStreams_UnpackSize);
       }
       s.Add_LF();
-      AddLangString(s, IDS_MESSAGE_NO_ERRORS);
+    AddLangString(s, IDS_MESSAGE_NO_ERRORS);
-      FinalMessage.OkMessage.Title = Title;
+    FinalMessage.OkMessage.Title = Title;
-      FinalMessage.OkMessage.Message = s;
+    FinalMessage.OkMessage.Message = s;
-    }
+  }
   }
   #endif
 
@@ -181,7 +183,11 @@ HRESULT ExtractGUI(
     CExtractCallbackImp *extractCallback,
     HWND hwndParent)
 {
+  bool openOutputFolder = false;
+  bool deleteSourceFile = false;
+
   messageWasDisplayed = false;
+  g_bProcessError = false;
 
   CThreadExtracting extracter;
   /*
@@ -239,6 +245,9 @@ HRESULT ExtractGUI(
       options.PathMode = dialog.PathMode;
       options.ElimDup = dialog.ElimDup;
       
+      openOutputFolder = dialog.m_bOpenOutputFolder;
+	  deleteSourceFile = dialog.m_bDeleteSourceFile;
+
       #ifndef Z7_SFX
       // options.NtOptions.AltStreams = dialog.AltStreams;
       options.NtOptions.NtSecurity = dialog.NtSecurity;
@@ -255,7 +264,7 @@ HRESULT ExtractGUI(
     NName::NormalizeDirPathPrefix(options.OutputDir);
     
     /*
-    if (!CreateComplexDirectory(options.OutputDir))
+    if(!CreateComplexDirectory(options.OutputDir))
     {
       UString s = GetUnicodeString(NError::MyFormatMessage(GetLastError()));
       UString s2 = MyFormatNew(IDS_CANNOT_CREATE_FOLDER,
@@ -293,5 +302,33 @@ HRESULT ExtractGUI(
 
   RINOK(extracter.Create(title, hwndParent))
   messageWasDisplayed = extracter.ThreadFinishedOK && extracter.MessagesDisplayed;
+  if (extracter.ThreadFinishedOK && !g_bProcessError)
+  {
+	  if (openOutputFolder)
+	  {
+		 StartApplication(options.OutputDir, options.OutputDir);
+	  }
+	  if (deleteSourceFile)
+	  {
+		  DWORD	dwAttr;
+		  UString strFilePath;
+		  for (unsigned i = 0; i < archivePathsFull.Size(); i++)
+		  {
+			  strFilePath = archivePathsFull[i];
+			  dwAttr = GetFileAttributesW(strFilePath);
+
+			  if ((dwAttr != INVALID_FILE_ATTRIBUTES)
+				  && (dwAttr & FILE_ATTRIBUTE_ARCHIVE))
+			  {
+				  if (dwAttr & FILE_ATTRIBUTE_READONLY)
+				  {
+					  dwAttr &= (~FILE_ATTRIBUTE_READONLY);
+					  SetFileAttributesW(strFilePath, dwAttr);
+				  }
+				  ::DeleteFileW(strFilePath);
+			  }
+		  }
+	  }
+  }
   return extracter.Result;
 }

CPP/7zip/UI/GUI/makefile

@@ -20,6 +20,7 @@ GUI_OBJS = \
   $O\UpdateCallbackGUI.obj \
   $O\UpdateCallbackGUI2.obj \
   $O\UpdateGUI.obj \
+  $O\ViewSettings.obj \
 
 COMMON_OBJS = \
   $O\CommandLineParser.obj \

build.cmd

@@ -0,0 +1,131 @@
+@echo off
+set OPTS=_SFX=1 PLATFORM=x64
+set LFLAGS=/DEBUG /SUBSYSTEM:WINDOWS,"5.02"
+
+@echo   ^_^_^_^_^_ ^_ ^_      ^_^_  ^_^_
+@echo  ^|  ^_^_^_(^_) ^| ^_^_^_^|  \^/  ^| ^_^_ ^_ ^_ ^_^_   ^_^_ ^_  ^_^_ ^_  ^_^_^_ ^_ ^_^_
+@echo  ^| ^|^_  ^| ^| ^|^/ ^_ \ ^|\^/^| ^|^/ ^_^` ^| '^_ \ ^/ ^_^` ^|^/ ^_^` ^|^/ ^_ \ '^_^_^|
+@echo  ^|  ^_^| ^| ^| ^|  ^_^_^/ ^|  ^| ^| (^_^| ^| ^| ^| ^| (^_^| ^| (^_^| ^|  ^_^_^/ ^|
+@echo  ^|^_^|   ^|^_^|^_^|\^_^_^_^|^_^|  ^|^_^|\^_^_,^_^|^_^| ^|^_^|\^_^_,^_^|\^_^_, ^|\^_^_^_^|^_^|
+@echo                                           ^|^_^_^_^/
+@echo
+
+set O=%~dp0out\FileManager
+mkdir %O%
+pushd %~dp0CPP\7zip\UI\FileManager
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> errorfile.txt
+popd
+
+@echo  ^_^_^_^_^_     ^_^_^_^_ ^_   ^_ ^_^_^_
+@echo ^|^_^_^_  ^|^_^_^_^/ ^_^_^_^| ^| ^| ^|^_ ^_^|
+@echo    ^/ ^/^_  ^/ ^|  ^_^| ^| ^| ^|^| ^|
+@echo   ^/ ^/ ^/ ^/^| ^|^_^| ^| ^|^_^| ^|^| ^|
+@echo  ^/^_^/ ^/^_^_^_^|\^_^_^_^_^|\^_^_^_^/^|^_^_^_^|
+
+set O=%~dp0out\GUI
+mkdir %O%
+pushd %~dp0CPP\7zip\UI\GUI
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> errorfile.txt
+popd
+
+@echo  ^_^_^_^_^_    ^_^_^_^_^_            ^_
+@echo ^|^_^_^_  ^|^_^_^| ^_^_^_^_^|^_  ^_^_^_ ^_^_ ^| ^| ^_^_^_  ^_ ^_^_ ^_^_^_ ^_ ^_^_
+@echo    ^/ ^/^_  ^/  ^_^| \ \^/ ^/ '^_ \^| ^|^/ ^_ \^| '^_^_^/ ^_ \ '^_^_^|
+@echo   ^/ ^/ ^/ ^/^| ^|^_^_^_ ^>  ^<^| ^|^_) ^| ^| (^_) ^| ^| ^|  ^_^_^/ ^|
+@echo  ^/^_^/ ^/^_^_^_^|^_^_^_^_^_^/^_^/\^_\ .^_^_^/^|^_^|\^_^_^_^/^|^_^|  \^_^_^_^|^_^|
+@echo                     ^|^_^|
+
+set O=%~dp0out\Explorer
+mkdir %O%
+pushd %~dp0CPP\7zip\UI\Explorer
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> errorfile.txt
+popd
+
+@echo  ^_^_^_^_   ^_^_     ^_^_        ^_^_^_
+@echo ^/ ^_^_^_^| ^/ ^_^|^_  ^_\ \      ^/ (^_)^_ ^_^_
+@echo \^_^_^_ \^| ^|^_\ \^/ ^/\ \ ^/\ ^/ ^/^| ^| '^_ \
+@echo  ^_^_^_) ^|  ^_^|^>  ^<  \ V  V ^/ ^| ^| ^| ^| ^|
+@echo ^|^_^_^_^_^/^|^_^| ^/^_^/\^_\  \^_^/\^_^/  ^|^_^|^_^| ^|^_^|
+
+
+set O=%~dp0out\SFXWin
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\SFXWin
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> errorfile.txt
+popd
+
+@echo  ^_^_^_^_^_    ^_      ^_^_^_           ^_        ^_ ^_
+@echo ^|^_^_^_  ^|^_^_(^_)^_ ^_^_^|^_ ^_^|^_ ^_^_  ^_^_^_^| ^|^_ ^_^_ ^_^| ^| ^|
+@echo    ^/ ^/^_  ^/ ^| '^_ \^| ^|^| '^_ \^/ ^_^_^| ^_^_^/ ^_^` ^| ^| ^|
+@echo   ^/ ^/ ^/ ^/^| ^| ^|^_) ^| ^|^| ^| ^| \^_^_ \ ^|^| (^_^| ^| ^| ^|
+@echo  ^/^_^/ ^/^_^_^_^|^_^| .^_^_^/^_^_^_^|^_^| ^|^_^|^_^_^_^/\^_^_\^_^_,^_^|^_^|^_^|
+@echo            ^|^_^|
+
+set O=%~dp0out\7zipInstall
+mkdir %O%
+pushd %~dp0C\Util\7zipInstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> errorfile.txt
+popd
+
+@echo  ^_^_^_^_^_    ^_       ^_   ^_       ^_^_^_           ^_        ^_ ^_
+@echo ^|^_^_^_  ^|^_^_(^_)^_ ^_^_ ^| ^| ^| ^|^_ ^_^_ ^|^_ ^_^|^_ ^_^_  ^_^_^_^| ^|^_ ^_^_ ^_^| ^| ^|
+@echo    ^/ ^/^_  ^/ ^| '^_ \^| ^| ^| ^| '^_ \ ^| ^|^| '^_ \^/ ^_^_^| ^_^_^/ ^_^` ^| ^| ^|
+@echo   ^/ ^/ ^/ ^/^| ^| ^|^_) ^| ^|^_^| ^| ^| ^| ^|^| ^|^| ^| ^| \^_^_ \ ^|^| (^_^| ^| ^| ^|
+@echo  ^/^_^/ ^/^_^_^_^|^_^| .^_^_^/ \^_^_^_^/^|^_^| ^|^_^|^_^_^_^|^_^| ^|^_^|^_^_^_^/\^_^_\^_^_,^_^|^_^|^_^|
+@echo            ^|^_^|
+
+set O=%~dp0out\7zipUninstall
+mkdir %O%
+pushd %~dp0C\Util\7zipUninstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> errorfile.txt
+popd
+
+set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02"
+
+@echo  ^_^_^_^_^_     ^_^_^_^_                      ^_
+@echo ^|^_^_^_  ^|^_^_^_^/ ^_^_^_^|^_^_^_  ^_ ^_^_  ^_^_^_  ^_^_^_ ^| ^| ^_^_^_
+@echo    ^/ ^/^_  ^/ ^|   ^/ ^_ \^| '^_ \^/ ^_^_^|^/ ^_ \^| ^|^/ ^_ \
+@echo   ^/ ^/ ^/ ^/^| ^|^_^_^| (^_) ^| ^| ^| \^_^_ \ (^_) ^| ^|  ^_^_^/
+@echo  ^/^_^/ ^/^_^_^_^|\^_^_^_^_\^_^_^_^/^|^_^| ^|^_^|^_^_^_^/\^_^_^_^/^|^_^|\^_^_^_^|
+
+set O=%~dp0out\Console
+mkdir %O%
+pushd %~dp0CPP\7zip\UI\Console
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> errorfile.txt
+popd
+
+@echo       ^_^_                               ^_
+@echo  ^_^_^_ ^/ ^_^|^_  ^_^_^_^_^_ ^_^_^_  ^_ ^_^_  ^_^_^_  ^_^_^_ ^| ^| ^_^_^_
+@echo ^/ ^_^_^| ^|^_\ \^/ ^/ ^_^_^/ ^_ \^| '^_ \^/ ^_^_^|^/ ^_ \^| ^|^/ ^_ \
+@echo \^_^_ \  ^_^|^>  ^< (^_^| (^_) ^| ^| ^| \^_^_ \ (^_) ^| ^|  ^_^_^/
+@echo ^|^_^_^_^/^_^| ^/^_^/\^_\^_^_^_\^_^_^_^/^|^_^| ^|^_^|^_^_^_^/\^_^_^_^/^|^_^|\^_^_^_^|
+
+set O=%~dp0out\SFXCon
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\SFXCon
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> errorfile.txt
+popd
+
+@echo   ^_^_                            ^_  ^_^_^_^_^_
+@echo  ^/ ^_^| ^_^_^_  ^_ ^_^_ ^_ ^_^_ ^_^_^_   ^_^_ ^_^| ^|^|^_^_^_  ^|^_^_^_
+@echo ^| ^|^_ ^/ ^_ \^| '^_^_^| '^_ ^` ^_ \ ^/ ^_^` ^| ^_^_^| ^/ ^/^_  ^/
+@echo ^|  ^_^| (^_) ^| ^|  ^| ^| ^| ^| ^| ^| (^_^| ^| ^|^_ ^/ ^/ ^/ ^/
+@echo ^|^_^|  \^_^_^_^/^|^_^|  ^|^_^| ^|^_^| ^|^_^|\^_^_,^_^|\^_^_^/^_^/ ^/^_^_^_^|
+
+set O=%~dp0out\Format7zF
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\Format7zF
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> errorfile.txt
+popd
+
+powershell -Command Copy-Item .\out\*\*.exe,.\out\*\*.dll,.\out\*\*.pdb,.\out\*\*.sfx -Destination .\out\ -Verbose -Force
+explorer.exe %~dp0out