9.21

2025-12-10 08:07:09 -06:00 · 2011-04-11 00:00:00 +00:00
parent de4f8c22fe
commit 35596517f2
322 changed files with 9989 additions and 7759 deletions
--- a/DOC/7zip.inf
+++ b/DOC/7zip.inf
@@ -10,8 +10,8 @@ AppName = "7-Zip"
 InstallDir = %CE1%\%AppName%

 [Strings]
-AppVer = "9.20"
-AppDate = "2010-11-18"
+AppVer = "9.21"
+AppDate = "2011-04-11"

 [CEDevice]
 ; ProcessorType = 2577 ; ARM
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,8 +2,8 @@
 ;Defines

 !define VERSION_MAJOR 9
-!define VERSION_MINOR 20
-!define VERSION_POSTFIX_FULL ""
+!define VERSION_MINOR 21
+!define VERSION_POSTFIX_FULL "beta"
 !ifdef WIN64
 !ifdef IA64
 !define VERSION_SYS_POSTFIX_FULL " for Windows IA-64"
@@ -49,7 +49,7 @@
  InstallDir "$PROGRAMFILES\7-Zip"
  
  ;Get install folder from registry if available
-  InstallDirRegKey HKLM "Software\7-Zip" "Path"
+  InstallDirRegKey HKCU "Software\7-Zip" "Path32"

  ;Compressor
 !ifndef NO_COMPRESSION
@@ -190,6 +190,7 @@ Section
  File bn.txt
  File br.txt
  File ca.txt
+  File co.txt
  File cs.txt
  File cy.txt
  File da.txt
@@ -222,6 +223,8 @@ Section
  File ko.txt
  File ku.txt
  File ku-ckb.txt
+  File ky.txt
+  File lij.txt
  File lt.txt
  File lv.txt
  File mk.txt
@@ -293,8 +296,10 @@ Section
  noScErrors:

  # store install folder
-  WriteRegStr HKLM "Software\7-Zip" "Path" $INSTDIR
-  WriteRegStr HKCU "Software\7-Zip" "Path" $INSTDIR
+  WriteRegStr HKLM "Software\7-Zip" "Path32" $INSTDIR
+  WriteRegStr HKLM "Software\7-Zip" "Path"   $INSTDIR
+  WriteRegStr HKCU "Software\7-Zip" "Path32" $INSTDIR
+  WriteRegStr HKCU "Software\7-Zip" "Path"   $INSTDIR

  # write reg entries
  WriteRegStr HKCR "CLSID\${CLSID_CONTEXT_MENU}" "" "7-Zip Shell Extension"
@@ -384,6 +389,7 @@ Section "Uninstall"
  Delete $INSTDIR\Lang\bn.txt
  Delete $INSTDIR\Lang\br.txt
  Delete $INSTDIR\Lang\ca.txt
+  Delete $INSTDIR\Lang\co.txt
  Delete $INSTDIR\Lang\cs.txt
  Delete $INSTDIR\Lang\cy.txt
  Delete $INSTDIR\Lang\da.txt
@@ -416,6 +422,8 @@ Section "Uninstall"
  Delete $INSTDIR\Lang\ko.txt
  Delete $INSTDIR\Lang\ku.txt
  Delete $INSTDIR\Lang\ku-ckb.txt
+  Delete $INSTDIR\Lang\ky.txt
+  Delete $INSTDIR\Lang\lij.txt
  Delete $INSTDIR\Lang\lt.txt
  Delete $INSTDIR\Lang\lv.txt
  Delete $INSTDIR\Lang\mk.txt
@@ -496,6 +504,7 @@ Section "Uninstall"
  DeleteRegKey HKCR "Directory\shellex\ContextMenuHandlers\7-Zip"
  DeleteRegKey HKCR "Folder\shellex\ContextMenuHandlers\7-Zip"

+  DeleteRegKey HKCR "Drive\shellex\DragDropHandlers\7-Zip"
  DeleteRegKey HKCR "Directory\shellex\DragDropHandlers\7-Zip"
  DeleteRegKey HKCR "Folder\shellex\DragDropHandlers\7-Zip"

@@ -512,6 +521,7 @@ Section "Uninstall"
  DeleteRegKey HKCR "7-Zip.cpio"
  DeleteRegKey HKCR "7-Zip.deb"
  DeleteRegKey HKCR "7-Zip.dmg"
+  DeleteRegKey HKCR "7-Zip.fat"
  DeleteRegKey HKCR "7-Zip.gz"
  DeleteRegKey HKCR "7-Zip.gzip"
  DeleteRegKey HKCR "7-Zip.hfs"
@@ -519,16 +529,21 @@ Section "Uninstall"
  DeleteRegKey HKCR "7-Zip.lha"
  DeleteRegKey HKCR "7-Zip.lzh"
  DeleteRegKey HKCR "7-Zip.lzma"
+  DeleteRegKey HKCR "7-Zip.ntfs"
  DeleteRegKey HKCR "7-Zip.rar"
  DeleteRegKey HKCR "7-Zip.rpm"
  DeleteRegKey HKCR "7-Zip.split"
+  DeleteRegKey HKCR "7-Zip.squashfs"
  DeleteRegKey HKCR "7-Zip.swm"
  DeleteRegKey HKCR "7-Zip.tar"
  DeleteRegKey HKCR "7-Zip.taz"
  DeleteRegKey HKCR "7-Zip.tgz"
  DeleteRegKey HKCR "7-Zip.tpz"
+  DeleteRegKey HKCR "7-Zip.txz"
+  DeleteRegKey HKCR "7-Zip.vhd"
  DeleteRegKey HKCR "7-Zip.wim"
  DeleteRegKey HKCR "7-Zip.xar"
+  DeleteRegKey HKCR "7-Zip.xz"
  DeleteRegKey HKCR "7-Zip.z"
  DeleteRegKey HKCR "7-Zip.zip"

--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>

 <?define VerMajor = "9" ?>
-<?define VerMinor = "20" ?>
+<?define VerMinor = "21" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
@@ -20,18 +20,21 @@
  <?define Platforms = "x64" ?>
  <?define CpuPostfix = " (x64 edition)" ?>
  <?define Is64 = "yes" ?>
+  <?define NumBits = "64" ?>
 <?elseif $(var.MyCPU) = "ia64" ?>
  <?define CpuId = "3" ?>
  <?define PFilesFolder = "ProgramFiles64Folder" ?>
  <?define Platforms = "Intel64" ?>
  <?define CpuPostfix = " (ia64 edition)" ?>
  <?define Is64 = "yes" ?>
+  <?define NumBits = "64" ?>
 <?else ?>
  <?define CpuId = "1" ?>
  <?define PFilesFolder = "ProgramFilesFolder" ?>
  <?define Platforms = "Intel" ?>
  <?define CpuPostfix = "" ?>
  <?define Is64 = "no" ?>
+  <?define NumBits = "32" ?>
 <?endif ?>


@@ -100,7 +103,10 @@
    <Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="high" />

    <Property Id="INSTALLDIR">
-      <RegistrySearch Id="My7zipPath" Type="raw" Root="HKCU" Key="Software\7-Zip" Name="Path" />
+      <RegistrySearch Id="My7zipPathLM"  Type="raw" Root="HKLM" Key="Software\7-Zip" Name="Path" />
+      <RegistrySearch Id="My7zipPathLM2" Type="raw" Root="HKLM" Key="Software\7-Zip" Name="Path$(var.NumBits)" />
+      <RegistrySearch Id="My7zipPath"    Type="raw" Root="HKCU" Key="Software\7-Zip" Name="Path" />
+      <RegistrySearch Id="My7zipPath2"   Type="raw" Root="HKCU" Key="Software\7-Zip" Name="Path$(var.NumBits)" />
    </Property>

    <Property Id="ALLUSERS">2</Property>
@@ -116,13 +122,13 @@
        <Directory Id="INSTALLDIR" Name="7-Zip">

          <Component Id="InstallRegCU" Guid="$(var.CompInstallRegCU)" DiskId="1" Win64="$(var.Is64)">
-            <Registry Id="MyInstallRegCU" Root="HKCU" Key="Software\7-Zip" Name="Path"
-               Action="write" Type="string" Value="[INSTALLDIR]" />
+            <Registry Id="MyInstallRegCU"  Root="HKCU" Key="Software\7-Zip" Name="Path" Action="write" Type="string" Value="[INSTALLDIR]" />
+            <Registry Id="MyInstallRegCU2" Root="HKCU" Key="Software\7-Zip" Name="Path$(var.NumBits)" Action="write" Type="string" Value="[INSTALLDIR]" />
          </Component>
          <Component Id="InstallRegLM" Guid="$(var.CompInstallRegLM)" DiskId="1" Win64="$(var.Is64)">
            <Condition>Privileged</Condition>
-            <Registry Id="MyInstallRegLM" Root="HKLM" Key="Software\7-Zip" Name="Path"
-               Action="write" Type="string" Value="[INSTALLDIR]" />
+            <Registry Id="MyInstallRegLM"  Root="HKLM" Key="Software\7-Zip" Name="Path" Action="write" Type="string" Value="[INSTALLDIR]" />
+            <Registry Id="MyInstallRegLM2" Root="HKLM" Key="Software\7-Zip" Name="Path$(var.NumBits)" Action="write" Type="string" Value="[INSTALLDIR]" />
          </Component>
          

@@ -174,6 +180,21 @@
            </File>
          </Component>

+          <?if $(var.MyCPU) = "x64" ?>
+
+          <Component Id="ShellExt32" Guid="$(var.CompShellExt)" DiskId="1" Win64="no">
+            <File Id="_7zip32.dll" Name="7-zip32.dll" />
+            <Registry Id="shellReg0_32" Action="write" Type="string" Root="HKCR"
+               Key="CLSID\$(var.ShellExtId)\InprocServer32"
+               Value="[INSTALLDIR]7-zip32.dll" />
+            <Registry Id="shellReg1_32" Action="write" Type="string" Root="HKCR"
+               Key="CLSID\$(var.ShellExtId)\InprocServer32"
+               Name="ThreadingModel"
+               Value="Apartment" />
+          </Component>
+
+          <?endif ?>
+
          <Component Id="ShellExt" Guid="$(var.CompShellExt)" DiskId="1" Win64="$(var.Is64)">
            <File Id="_7zip.dll" Name="7-zip.dll" />
            <Registry Id="shellReg0" Action="write" Type="string" Root="HKCR"
@@ -232,6 +253,7 @@
              <File Id="bn.txt" Name="bn.txt" />
              <File Id="br.txt" Name="br.txt" />
              <File Id="ca.txt" Name="ca.txt" />
+              <File Id="co.txt" Name="co.txt" />
              <File Id="cs.txt" Name="cs.txt" />
              <File Id="cy.txt" Name="cy.txt" />
              <File Id="da.txt" Name="da.txt" />
@@ -264,6 +286,8 @@
              <File Id="ko.txt" Name="ko.txt" />
              <File Id="ku.txt" Name="ku.txt" />
              <File Id="ku_ckb.txt" Name="ku-ckb.txt" />
+              <File Id="ky.txt" Name="ky.txt" />
+              <File Id="lij.txt" Name="lij.txt" />
              <File Id="lt.txt" Name="lt.txt" />
              <File Id="lv.txt" Name="lv.txt" />
              <File Id="mk.txt" Name="mk.txt" />
@@ -319,6 +343,9 @@
         Absent="disallow" AllowAdvertise="no">
        <ComponentRef Id="Fm" />
        <ComponentRef Id="ShellExt" />
+        <?if $(var.MyCPU) = "x64" ?>
+        <ComponentRef Id="ShellExt32" />
+        <?endif ?>
        <ComponentRef Id="CmdLine" />
        <ComponentRef Id="Gui" />
        <ComponentRef Id="GuiSfx" />
--- a/DOC/history.txt
+++ b/DOC/history.txt
@@ -1,6 +1,12 @@
 Sources history of the 7-Zip
 ----------------------------

+9.21           2011-04-11
+-------------------------	
+- New class FString for file names at file systems.
+- Speed optimization in CRC code for big-endian CPUs.
+
+
 9.18           2010-11-02
 -------------------------	
 - New small SFX module for installers (C/Util/SfxSetup).
--- a/DOC/lzma.txt
+++ b/DOC/lzma.txt
@@ -1,4 +1,4 @@
-LZMA SDK 9.20
+LZMA SDK 9.21
 -------------

 LZMA SDK provides the documentation, samples, header files, libraries, 
@@ -24,6 +24,12 @@ Some code in LZMA SDK is based on public domain code from another developers:
  1) PPMd var.H (2001): Dmitry Shkarin
  2) SHA-256: Wei Dai (Crypto++ library)

+You can copy, modify, distribute and perform LZMA SDK code, even for commercial purposes, 
+all without asking permission.
+
+LZMA SDK code is compatible with open source licenses, for example, you can 
+include it to GNU GPL or GNU LGPL code.
+

 LZMA SDK Contents
 -----------------
--- a/DOC/readme.txt
+++ b/DOC/readme.txt
@@ -1,4 +1,4 @@
-7-Zip 9.20 Sources
+7-Zip 9.21 Sources
 ------------------

 7-Zip is a file archiver for Windows.