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

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

COPYING

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

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

@@ -16,6 +16,7 @@ COMMON_OBJS = \
   $O\UTFConvert.obj \
   $O\MyVector.obj \
   $O\Wildcard.obj \
+  $O\ResourceString.obj \
 
 WIN_OBJS = \
   $O\DLL.obj \
@@ -32,6 +33,7 @@ WIN_OBJS = \
   $O\Registry.obj \
   $O\System.obj \
   $O\TimeUtils.obj \
+  $O\LoadCodecs.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \

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

@@ -4,8 +4,8 @@
 #define __STDAFX_H
 
 // #define _WIN32_WINNT 0x0400
-#define _WIN32_WINNT 0x0500
+//#define _WIN32_WINNT 0x0500
-#define WINVER _WIN32_WINNT
+//#define WINVER _WIN32_WINNT
 
 #include "../../../Common/Common.h"
 

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, bool &archiveIsOpened, bool &encrypted)
 {
   _window.Attach(hwnd);
@@ -544,6 +548,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
@@ -580,6 +590,9 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
 
   CRecordVector<UInt32> indices;
   UString destPath;
+  bool openOutputFolder;
+  bool deleteSourceFile;
+  bool close7Zip;
   bool useDestPanel = false;
 
   {
@@ -618,10 +631,15 @@ void CApp::OnCopy(bool move, bool copyToSame, int 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;
   }
 
@@ -715,7 +733,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int 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
@@ -753,6 +771,8 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
     SaveCopyHistory(copyFolders);
   }
 
+  g_bProcessError = false;
+
   bool useSrcPanel = !useDestPanel || !srcPanel.Is_IO_FS_Folder();
 
   bool useTemp = useSrcPanel && useDestPanel;
@@ -848,6 +868,62 @@ void CApp::OnCopy(bool move, bool copyToSame, int 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(int srcPanelIndex)
@@ -887,7 +963,7 @@ void CApp::OnSetSubFolder(int srcPanelIndex)
       destPanel.BindToPath(parentPrefix, UString(), archiveIsOpened, encrypted);
       destPanel.RefreshListCtrl();
       return;
-    }
+  }
   }
   else
   {

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

@@ -8,13 +8,30 @@
 
 #include "BrowseDialog.h"
 #include "CopyDialog.h"
-
+#include <wchar.h>
+#include "Panel.h"
+#include "ViewSettings.h"
 #ifdef LANG
 #include "LangUtils.h"
 #endif
 
 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 LANG
@@ -23,6 +40,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);
@@ -33,8 +52,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();
 }
 
@@ -48,28 +122,48 @@ bool CCopyDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   int y = ySize - my - by;
   int x = xSize - mx - bx1;
 
-  InvalidateRect(NULL);
+//  InvalidateRect(NULL);
-
   {
     RECT r;
-    GetClientRectOfItem(IDB_COPY_SET_PATH, r);
+
-    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);
+//    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));
     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;
 }
 
@@ -80,6 +174,25 @@ bool CCopyDialog::OnButtonClicked(int 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);
 }
@@ -97,10 +210,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();
   virtual bool OnInit();
   virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
   void OnButtonSetPath();
+  void OnButtonOpenPath();
+  void OnButtonAddFileName();
   bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  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 = 0) { 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

@@ -190,7 +190,7 @@ enum MyMessages
 };
 
 UString GetFolderPath(IFolderFolder *folder);
-
+void StartApplicationDontWait(const UString &dir, const UString &path, HWND window);
 class CPanel;
 
 class CMyListView: public NWindows::NControl::CListView2
@@ -756,6 +756,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

@@ -951,7 +951,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

@@ -19,6 +19,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

@@ -7,8 +7,8 @@
    But now menu problem is fixed. So it's OK to use 0x0500 (Windows 2000) */
 
 // #define _WIN32_WINNT 0x0400
-#define _WIN32_WINNT 0x0500
+//#define _WIN32_WINNT 0x0500
-#define WINVER _WIN32_WINNT
+//#define WINVER _WIN32_WINNT
 
 #include "../../../Common/Common.h"
 

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;
 
@@ -311,3 +313,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 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 NO_REGISTRY
-static const unsigned kHistorySize = 16;
+static const unsigned kHistorySize = 30;
 #endif
 
 #ifndef _SFX
@@ -133,6 +133,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 LANG
@@ -220,6 +234,11 @@ bool CExtractDialog::OnInit()
     _path.SetCurSel(-1);
   */
 
+#ifndef _SFX
+  m_bOpenOutputFolder = ReadOptOpenOutputFolder();
+  CheckButton(IDC_EXTRACT_CHECK_OPEN_OUTPUT_FOLDER, m_bOpenOutputFolder);
+#endif
+
   #ifndef _SFX
 
   _pathMode.Attach(GetItem(IDC_EXTRACT_PATH_MODE));
@@ -258,6 +277,21 @@ bool CExtractDialog::OnButtonClicked(int 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 _SFX
+	case IDC_CHECK_DELETE_SOURCE_FILE:
+		m_bDeleteSourceFile = IsButtonCheckedBool(IDC_CHECK_DELETE_SOURCE_FILE);
+		return true;
+#endif
+
     #ifndef _SFX
     case IDX_EXTRACT_NAME_ENABLE:
       ShowItem_Bool(IDE_EXTRACT_NAME, IsButtonCheckedBool(IDX_EXTRACT_NAME_ENABLE));
@@ -284,6 +318,7 @@ void CExtractDialog::OnButtonSetPath()
   _path.SetCurSel(-1);
   #endif
   _path.SetText(resultPath);
+  ShowPathFreeSpace(resultPath);
 }
 
 void AddUniqueString(UStringVector &list, const UString &s)
@@ -296,6 +331,10 @@ void AddUniqueString(UStringVector &list, const UString &s)
 
 void CExtractDialog::OnOK()
 {
+#ifndef _SFX
+  SaveOptOpenOutputFolder(m_bOpenOutputFolder);
+#endif
+
   #ifndef _SFX
   int pathMode2 = kPathModeButtonsVals[_pathMode.GetCurSel()];
   if (PathMode != NExtract::NPathMode::kCurPaths ||
@@ -416,3 +455,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 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 _SFX
   // int GetFilesMode() const;
   void UpdatePasswordControl();
@@ -58,6 +60,8 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
   virtual bool OnInit();
   virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
   virtual void OnOK();
+  void OnButtonOpenPath();
+  virtual bool OnCommand(int code, int itemID, LPARAM lParam);
   
   #ifndef 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 _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";
 
@@ -141,10 +143,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
 
@@ -169,7 +171,11 @@ HRESULT ExtractGUI(
     CExtractCallbackImp *extractCallback,
     HWND hwndParent)
 {
+  bool openOutputFolder = false;
+  bool deleteSourceFile = false;
+
   messageWasDisplayed = false;
+  g_bProcessError = false;
 
   CThreadExtracting extracter;
   extracter.codecs = codecs;
@@ -222,6 +228,9 @@ HRESULT ExtractGUI(
       options.PathMode = dialog.PathMode;
       options.ElimDup = dialog.ElimDup;
       
+      openOutputFolder = dialog.m_bOpenOutputFolder;
+	  deleteSourceFile = dialog.m_bDeleteSourceFile;
+
       #ifndef _SFX
       // options.NtOptions.AltStreams = dialog.AltStreams;
       options.NtOptions.NtSecurity = dialog.NtSecurity;
@@ -238,7 +247,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,
@@ -276,5 +285,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/StdAfx.h

@@ -4,8 +4,8 @@
 #define __STDAFX_H
 
 // #define _WIN32_WINNT 0x0400
-#define _WIN32_WINNT 0x0500
+//#define _WIN32_WINNT 0x0500
-#define WINVER _WIN32_WINNT
+//#define WINVER _WIN32_WINNT
 
 #include "../../../Common/Common.h"
 

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 \

README.md

@@ -0,0 +1,5 @@
+# Git archive of 7-zip releases
+
+Because 7-zip [doesn't](https://github.com/7z) have a public repository, and their code is released only as archives on SourceForge, I maintain a git-ified copy here.
+
+The [tagged releases](https://github.com/pornel/7z/releases) and the [original branch](https://github.com/pornel/7z/tree/original) contain pure 7-zip releases, without any modifications like this readme.

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