4.61 beta

6 files changed, 23 insertions, 73 deletions

diff --git a/DOC/7zC.txt b/DOC/7zC.txt
index 9a239c6c..5966e0c0 100755
--- a/DOC/7zC.txt
+++ b/DOC/7zC.txt
@@ -1,8 +1,6 @@
-7z ANSI-C Decoder 4.58
+7z ANSI-C Decoder 4.61
 ----------------------
 
-7z ANSI-C Decoder 4.58 Copyright (C) 1999-2008 Igor Pavlov
-
 7z ANSI-C provides 7z/LZMA decoding.
 7z ANSI-C version is simplified version ported from C++ code.
 
@@ -95,7 +93,7 @@ Steps for using 7z decoder
 Use code at 7zMain.c as example.
 
 1) Declare variables:
-  inStream                 /* implements ISzInStream interface */
+  inStream                 /* implements ILookInStream interface */
   CSzArEx db;              /* 7z archive database structure */
   ISzAlloc allocImp;       /* memory functions for main pool */
   ISzAlloc allocTempImp;   /* memory functions for temporary pool */
@@ -128,7 +126,7 @@ SzArEx_Open function allocates and frees temporary structures by "allocTemp" fun
 
   SZ_RESULT SzAr_Extract(
     CArchiveDatabaseEx *db,
-    ISzInStream *inStream, 
+    ILookInStream *inStream, 
     UInt32 fileIndex,         /* index of file */
     UInt32 *blockIndex,       /* index of solid block */
     Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */
@@ -192,4 +190,3 @@ _SZ_ALLOC_DEBUG   - define it if you want to debug alloc/free operations to stde
 ---
 
 http://www.7-zip.org
-http://www.7-zip.org/support.html
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index e9982206..dcb9cc8a 100755
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,7 +2,7 @@
 ;Defines
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 59
+!define VERSION_MINOR 61
 !define VERSION_POSTFIX_FULL " beta"
 !ifdef WIN64
 !ifdef IA64
@@ -240,6 +240,7 @@ Section
   File pt-br.txt
   File ro.txt
   File ru.txt
+  File si.txt
   File sk.txt
   File sl.txt
   File sq.txt
@@ -319,6 +320,8 @@ Section
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\7-Zip" "NoRepair" 1
   WriteUninstaller $INSTDIR\Uninstall.exe
 
+  DeleteRegValue HKCR "CLSID\${CLSID_CONTEXT_MENU}\InprocServer32" "InprocServer32"
+
   !ifdef WIN64
   ExecWait 'regsvr32 /s "$INSTDIR\7-zip.dll"'
   !endif
@@ -426,6 +429,7 @@ Section "Uninstall"
   Delete $INSTDIR\Lang\pt-br.txt
   Delete $INSTDIR\Lang\ro.txt
   Delete $INSTDIR\Lang\ru.txt
+  Delete $INSTDIR\Lang\si.txt
   Delete $INSTDIR\Lang\sk.txt
   Delete $INSTDIR\Lang\sl.txt
   Delete $INSTDIR\Lang\sq.txt
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index 59a2f450..eeeb439e 100755
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "4" ?>
-<?define VerMinor = "60" ?>
+<?define VerMinor = "61" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
@@ -279,6 +279,7 @@
               <File Id="pt_br.txt" Name="pt-br.txt" />
               <File Id="ro.txt" Name="ro.txt" />
               <File Id="ru.txt" Name="ru.txt" />
+              <File Id="si.txt" Name="si.txt" />
               <File Id="sk.txt" Name="sk.txt" />
               <File Id="sl.txt" Name="sl.txt" />
               <File Id="sq.txt" Name="sq.txt" />
diff --git a/DOC/Methods.txt b/DOC/Methods.txt
index bba9f10e..0503ca79 100755
--- a/DOC/Methods.txt
+++ b/DOC/Methods.txt
@@ -1,4 +1,4 @@
-7-Zip method IDs (4.58)
+7-Zip method IDs (4.61)
 -----------------------
 
 Each compression or crypto method in 7z has unique binary value (ID).
@@ -8,9 +8,9 @@ If you want to add some new ID, you have two ways:
 1) Write request for allocating IDs to 7-zip developers.
 2) Generate 8-bytes ID:
 
-    7F ZZ ZZ ZZ ZZ ZZ MM MM 
+    3F ZZ ZZ ZZ ZZ ZZ MM MM 
 
-    7F              - Prefix for random IDs (1 byte)
+    3F              - Prefix for random IDs (1 byte)
     ZZ ZZ ZZ ZZ ZZ  - Developer ID (5 bytes). Use real random bytes. 
                       
     MM MM           - Method ID (2 bytes)
diff --git a/DOC/history.txt b/DOC/history.txt
index ae91c726..896f3913 100755
--- a/DOC/history.txt
+++ b/DOC/history.txt
@@ -1,6 +1,14 @@
 Sources history of the 7-Zip
 ----------------------------
 
+4.61           2008-11-23
+-------------------------
+- Bug in ver. 4.58+ was fixed:
+   7-Zip didn't use any -m* switch after -mtc, -mcl or -mcu for .zip archives. 
+- Bug in .CAB code was fixed. 7-Zip didn't show some empty files,
+  if .CAB archive contains more than one empty file.
+   
+
 4.59           2008-07-27
 -------------------------
 - Bug was fixed:
diff --git a/DOC/lzma.txt b/DOC/lzma.txt
index 159b593b..292849b1 100755
--- a/DOC/lzma.txt
+++ b/DOC/lzma.txt
@@ -1,8 +1,6 @@
-LZMA SDK 4.60 beta
+LZMA SDK 4.61 beta
 ------------------
 
-LZMA SDK   Copyright (C) 1999-2008 Igor Pavlov
-
 LZMA SDK provides the documentation, samples, header files, libraries, 
 and tools you need to develop applications that use LZMA compression.
 
@@ -20,62 +18,7 @@ decompressing.
 LICENSE
 -------
 
-LZMA SDK is available under any of the following licenses:
-
-1) GNU Lesser General Public License (GNU LGPL)
-2) Common Public License (CPL)
-3) Common Development and Distribution License (CDDL) Version 1.0 
-4) Simplified license for unmodified code (read SPECIAL EXCEPTION) 
-
-It means that you can select one of these options and follow rules of that license.
-
-
-1,2,3) GNU LGPL, CPL and CDDL licenses are classified as 
- - "Free software licenses" at http://www.gnu.org/ 
- - "OSI-approved" at http://www.opensource.org/
-
-4) Simplified license for unmodified code (read SPECIAL EXCEPTION) 
-
-Igor Pavlov, as the author of this code, expressly permits you 
-to statically or dynamically link your code (or bind by name) 
-to the files from LZMA SDK. 
-
-SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code, 
-while you keep LZMA SDK code unmodified.
-
-
-SPECIAL EXCEPTION #2: Igor Pavlov, as the author of this code, expressly permits 
-you to use this code under the same terms and conditions contained in the License 
-Agreement you have for any previous version of LZMA SDK developed by Igor Pavlov.
-
-SPECIAL EXCEPTION #2 allows owners of proprietary licenses to use latest version 
-of LZMA SDK as update for previous versions.
-
-Some files in LZMA SDK are placed in public domain.
-Some of these "public domain" files:
-C\Types.h,
-C\LzmaLib.*
-C\LzmaLibUtil.*
-LzmaAlone.cpp, 
-LzmaAlone.cs, 
-LzmaAlone.java
-
-So you can change them as you want and use "SPECIAL EXCEPTION" 
-for other unmodified files. For example, you can edit C\Types.h to solve some 
-compatibility problems with your compiler.
-
-
------
-
-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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You should have received a copy of the Common Public License
-along with this library.
-
-You should have received a copy of the Common Development and Distribution 
-License Version 1.0 along with this library.
+LZMA SDK is written and placed in the public domain by Igor Pavlov.
 
 
 LZMA SDK Contents
@@ -107,9 +50,6 @@ lzma.txt     - LZMA SDK description (this file)
 methods.txt  - Compression method IDs for .7z
 lzma.exe     - Compiled file->file LZMA encoder/decoder for Windows
 history.txt  - history of the LZMA SDK
-LGPL.txt     - GNU Lesser General Public License
-CPL.html     - Common Public License
-CDDL.html    - Common Development and Distribution License (CDDL)
 
 
 Source code structure