Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

9.22 2011-04-19

md5: 24ab2c96f58d85b85407e61a3e6ca373 lzma922.tar.bz2
sha1: fbe4d6c02202d65fae75c2db0e3cdc542ca41e6d lzma922.tar.bz2
  • Loading branch information...
commit 553e5d08ae9a605ae6acb3bf8badea0f849b6b26 1 parent 88bb9c0
Igor Pavlov authored committed
View
BIN  7zr.exe
Binary file not shown
View
7 C/7zVersion.h
@@ -1,7 +1,8 @@
#define MY_VER_MAJOR 9
-#define MY_VER_MINOR 21
+#define MY_VER_MINOR 22
#define MY_VER_BUILD 00
-#define MY_VERSION "9.21 beta"
-#define MY_DATE "2011-04-11"
+#define MY_VERSION "9.22 beta"
+#define MY_7ZIP_VERSION "9.22 beta"
+#define MY_DATE "2011-04-18"
#define MY_COPYRIGHT ": Igor Pavlov : Public domain"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE
View
55 C/7zVersion.rc
@@ -0,0 +1,55 @@
+#define MY_VS_FFI_FILEFLAGSMASK 0x0000003FL
+#define MY_VOS_NT_WINDOWS32 0x00040004L
+#define MY_VOS_CE_WINDOWS32 0x00050004L
+
+#define MY_VFT_APP 0x00000001L
+#define MY_VFT_DLL 0x00000002L
+
+// #include <WinVer.h>
+
+#ifndef MY_VERSION
+#include "7zVersion.h"
+#endif
+
+#define MY_VER MY_VER_MAJOR,MY_VER_MINOR,MY_VER_BUILD,0
+
+#ifdef DEBUG
+#define DBG_FL VS_FF_DEBUG
+#else
+#define DBG_FL 0
+#endif
+
+#define MY_VERSION_INFO(fileType, descr, intName, origName) \
+LANGUAGE 9, 1 \
+1 VERSIONINFO \
+ FILEVERSION MY_VER \
+ PRODUCTVERSION MY_VER \
+ FILEFLAGSMASK MY_VS_FFI_FILEFLAGSMASK \
+ FILEFLAGS DBG_FL \
+ FILEOS MY_VOS_NT_WINDOWS32 \
+ FILETYPE fileType \
+ FILESUBTYPE 0x0L \
+BEGIN \
+ BLOCK "StringFileInfo" \
+ BEGIN \
+ BLOCK "040904b0" \
+ BEGIN \
+ VALUE "CompanyName", "Igor Pavlov" \
+ VALUE "FileDescription", descr \
+ VALUE "FileVersion", MY_VERSION \
+ VALUE "InternalName", intName \
+ VALUE "LegalCopyright", MY_COPYRIGHT \
+ VALUE "OriginalFilename", origName \
+ VALUE "ProductName", "7-Zip" \
+ VALUE "ProductVersion", MY_VERSION \
+ END \
+ END \
+ BLOCK "VarFileInfo" \
+ BEGIN \
+ VALUE "Translation", 0x409, 1200 \
+ END \
+END
+
+#define MY_VERSION_INFO_APP(descr, intName) MY_VERSION_INFO(MY_VFT_APP, descr, intName, intName ".exe")
+
+#define MY_VERSION_INFO_DLL(descr, intName) MY_VERSION_INFO(MY_VFT_DLL, descr, intName, intName ".dll")
View
3  C/Util/LzmaLib/resource.rc
@@ -1,4 +1,3 @@
-#include "../../../CPP/7zip/MyVersionInfo.rc"
+#include "../../7zVersion.rc"
MY_VERSION_INFO_DLL("LZMA library", "LZMA")
-
View
1  C/Util/SfxSetup/SfxSetup.c
@@ -24,6 +24,7 @@
static const char *kExts[] =
{
"bat",
+ "cmd",
"exe",
"inf",
"msi",
View
3  C/Util/SfxSetup/resource.rc
@@ -1,6 +1,5 @@
-#include "../../../CPP/7zip/MyVersionInfo.rc"
+#include "../../7zVersion.rc"
MY_VERSION_INFO_APP("7z Setup SFX small", "7zS2.sfx")
1 ICON "setup.ico"
-
View
4 CPP/7zip/Bundles/Alone7z/resource.rc
@@ -1,3 +1,3 @@
-#include "../../MyVersionInfo.rc"
+#include "../../../../C/7zVersion.rc"
-MY_VERSION_INFO_APP("7-Zip Standalone Console", "7zr")
+MY_VERSION_INFO_APP("7-Zip Reduced Standalone Console", "7zr")
View
4 CPP/7zip/Bundles/Format7zExtractR/resource.rc
@@ -1,5 +1,5 @@
-#include "../../MyVersionInfo.rc"
+#include "../../../../C/7zVersion.rc"
-MY_VERSION_INFO_DLL("7z Standalone Extracting Plugin", "7zxr")
+MY_VERSION_INFO_DLL("7z Extracting Reduced Standalone Plugin", "7zxr")
101 ICON "../../Archive/Icons/7z.ico"
View
4 CPP/7zip/Bundles/Format7zR/resource.rc
@@ -1,5 +1,5 @@
-#include "../../MyVersionInfo.rc"
+#include "../../../../C/7zVersion.rc"
-MY_VERSION_INFO_DLL("7z Standalone Plugin", "7zr")
+MY_VERSION_INFO_DLL("7z Reduced Standalone Plugin", "7zr")
101 ICON "../../Archive/Icons/7z.ico"
View
10 CPP/7zip/MyVersion.h
@@ -1,8 +1,6 @@
-#define MY_VER_MAJOR 9
-#define MY_VER_MINOR 21
-#define MY_VER_BUILD 00
-#define MY_VERSION "9.21 beta"
-#define MY_7ZIP_VERSION "7-Zip 9.21 beta"
-#define MY_DATE "2011-04-11"
+#include "..\..\C\7zVersion.h"
+
+#undef MY_COPYRIGHT
+#undef MY_VERSION_COPYRIGHT_DATE
#define MY_COPYRIGHT "Copyright (c) 1999-2011 Igor Pavlov"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE
View
52 CPP/7zip/MyVersionInfo.rc
@@ -1,52 +1,2 @@
-#define MY_VS_FFI_FILEFLAGSMASK 0x0000003FL
-#define MY_VOS_NT_WINDOWS32 0x00040004L
-#define MY_VOS_CE_WINDOWS32 0x00050004L
-
-#define MY_VFT_APP 0x00000001L
-#define MY_VFT_DLL 0x00000002L
-
-// #include <WinVer.h>
#include "MyVersion.h"
-
-#define MY_VER MY_VER_MAJOR,MY_VER_MINOR,MY_VER_BUILD,0
-
-#ifdef DEBUG
-#define DBG_FL VS_FF_DEBUG
-#else
-#define DBG_FL 0
-#endif
-
-#define MY_VERSION_INFO(fileType, descr, intName, origName) \
-LANGUAGE 9, 1 \
-1 VERSIONINFO \
- FILEVERSION MY_VER \
- PRODUCTVERSION MY_VER \
- FILEFLAGSMASK MY_VS_FFI_FILEFLAGSMASK \
- FILEFLAGS DBG_FL \
- FILEOS MY_VOS_NT_WINDOWS32 \
- FILETYPE fileType \
- FILESUBTYPE 0x0L \
-BEGIN \
- BLOCK "StringFileInfo" \
- BEGIN \
- BLOCK "040904b0" \
- BEGIN \
- VALUE "CompanyName", "Igor Pavlov" \
- VALUE "FileDescription", descr \
- VALUE "FileVersion", MY_VERSION \
- VALUE "InternalName", intName \
- VALUE "LegalCopyright", MY_COPYRIGHT \
- VALUE "OriginalFilename", origName \
- VALUE "ProductName", "7-Zip" \
- VALUE "ProductVersion", MY_VERSION \
- END \
- END \
- BLOCK "VarFileInfo" \
- BEGIN \
- VALUE "Translation", 0x409, 1200 \
- END \
-END
-
-#define MY_VERSION_INFO_APP(descr, intName) MY_VERSION_INFO(MY_VFT_APP, descr, intName, intName ".exe")
-
-#define MY_VERSION_INFO_DLL(descr, intName) MY_VERSION_INFO(MY_VFT_DLL, descr, intName, intName ".dll")
+#include "..\..\C\7zVersion.rc"
View
18 CPP/7zip/UI/Console/Main.cpp
@@ -33,7 +33,15 @@
#include "OpenCallbackConsole.h"
#include "UpdateCallbackConsole.h"
+#if !defined(EXTERNAL_CODECS) && defined(_NO_CRYPTO)
+#define IT_IS_REDUCED_VERSION
+#endif
+
+#ifdef IT_IS_REDUCED_VERSION
+#include "../../../../C/7zVersion.h"
+#else
#include "../../MyVersion.h"
+#endif
using namespace NWindows;
using namespace NFile;
@@ -46,7 +54,11 @@ extern CStdOutStream *g_StdStream;
static const char *kCopyrightString = "\n7-Zip"
#ifndef EXTERNAL_CODECS
-" (A)"
+#ifdef IT_IS_REDUCED_VERSION
+" (r)"
+#else
+" (a)"
+#endif
#endif
#ifdef _WIN64
@@ -57,10 +69,10 @@ static const char *kCopyrightString = "\n7-Zip"
static const char *kHelpString =
"\nUsage: 7z"
-#ifdef _NO_CRYPTO
+#ifndef EXTERNAL_CODECS
+#ifdef IT_IS_REDUCED_VERSION
"r"
#else
-#ifndef EXTERNAL_CODECS
"a"
#endif
#endif
View
BIN  lzma.exe
Binary file not shown
View
4 lzma.txt
@@ -1,4 +1,4 @@
-LZMA SDK 9.21
+LZMA SDK 9.22
-------------
LZMA SDK provides the documentation, samples, header files, libraries,
@@ -24,7 +24,7 @@ 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,
+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
Please sign in to comment.
Something went wrong with that request. Please try again.