diff options
-rwxr-xr-x | C/7zVersion.h | 6 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Zip/ZipAddCommon.cpp | 8 | ||||
-rwxr-xr-x | CPP/7zip/MyVersion.h | 8 | ||||
-rwxr-xr-x | DOC/7zip.inf | 4 | ||||
-rwxr-xr-x | DOC/7zip.nsi | 2 | ||||
-rwxr-xr-x | DOC/7zip.wxs | 2 | ||||
-rwxr-xr-x | DOC/lzma.txt | 2 | ||||
-rwxr-xr-x | DOC/readme.txt | 2 |
8 files changed, 15 insertions, 19 deletions
diff --git a/C/7zVersion.h b/C/7zVersion.h index ade65b5d..049445a6 100755 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -1,7 +1,7 @@ #define MY_VER_MAJOR 9 -#define MY_VER_MINOR 9 +#define MY_VER_MINOR 10 #define MY_VER_BUILD 0 -#define MY_VERSION "9.09 beta" -#define MY_DATE "2009-12-12" +#define MY_VERSION "9.10 beta" +#define MY_DATE "2009-12-22" #define MY_COPYRIGHT ": Igor Pavlov : Public domain" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE diff --git a/CPP/7zip/Archive/Zip/ZipAddCommon.cpp b/CPP/7zip/Archive/Zip/ZipAddCommon.cpp index 8800270b..0a74a3d1 100755 --- a/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +++ b/CPP/7zip/Archive/Zip/ZipAddCommon.cpp @@ -162,19 +162,15 @@ HRESULT CAddCommon::Compress( { _cryptoStreamSpec->Filter = _filterAesSpec = new NCrypto::NWzAes::CEncoder; _filterAesSpec->SetKeyMode(_options.AesKeyMode); - RINOK(_filterAesSpec->CryptoSetPassword( - (const Byte *)(const char *)_options.Password, _options.Password.Length())); + RINOK(_filterAesSpec->CryptoSetPassword((const Byte *)(const char *)_options.Password, _options.Password.Length())); } RINOK(_filterAesSpec->WriteHeader(outStream)); } else { if (!_cryptoStreamSpec->Filter) - { _cryptoStreamSpec->Filter = _filterSpec = new NCrypto::NZip::CEncoder; - RINOK(_filterSpec->CryptoSetPassword( - (const Byte *)(const char *)_options.Password, _options.Password.Length())); - } + RINOK(_filterSpec->CryptoSetPassword((const Byte *)(const char *)_options.Password, _options.Password.Length())); UInt32 crc = 0; RINOK(GetStreamCRC(inStream, crc)); RINOK(inCrcStreamSpec->Seek(0, STREAM_SEEK_SET, NULL)); diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h index c9ebe92b..28fbfaaa 100755 --- a/CPP/7zip/MyVersion.h +++ b/CPP/7zip/MyVersion.h @@ -1,8 +1,8 @@ #define MY_VER_MAJOR 9 -#define MY_VER_MINOR 9 +#define MY_VER_MINOR 10 #define MY_VER_BUILD 0 -#define MY_VERSION "9.09 beta" -#define MY_7ZIP_VERSION "7-Zip 9.09 beta" -#define MY_DATE "2009-12-12" +#define MY_VERSION "9.10 beta" +#define MY_7ZIP_VERSION "7-Zip 9.10 beta" +#define MY_DATE "2009-12-22" #define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE diff --git a/DOC/7zip.inf b/DOC/7zip.inf index 52fcf36a..9caf8ffb 100755 --- a/DOC/7zip.inf +++ b/DOC/7zip.inf @@ -10,8 +10,8 @@ AppName = "7-Zip" InstallDir = %CE1%\%AppName% [Strings] -AppVer = "9.09" -AppDate = "2009-12-12" +AppVer = "9.10" +AppDate = "2009-12-22" [CEDevice] ; ProcessorType = 2577 ; ARM diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi index fb6db17b..5e996885 100755 --- a/DOC/7zip.nsi +++ b/DOC/7zip.nsi @@ -2,7 +2,7 @@ ;Defines !define VERSION_MAJOR 9 -!define VERSION_MINOR 09 +!define VERSION_MINOR 10 !define VERSION_POSTFIX_FULL " beta" !ifdef WIN64 !ifdef IA64 diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs index 89cf83fc..809ab0fc 100755 --- a/DOC/7zip.wxs +++ b/DOC/7zip.wxs @@ -1,7 +1,7 @@ <?xml version="1.0"?> <?define VerMajor = "9" ?> -<?define VerMinor = "09" ?> +<?define VerMinor = "10" ?> <?define VerBuild = "00" ?> <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?> <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?> diff --git a/DOC/lzma.txt b/DOC/lzma.txt index f96b5423..a38a8e02 100755 --- a/DOC/lzma.txt +++ b/DOC/lzma.txt @@ -1,4 +1,4 @@ -LZMA SDK 9.09 +LZMA SDK 9.10 ------------- LZMA SDK provides the documentation, samples, header files, libraries, diff --git a/DOC/readme.txt b/DOC/readme.txt index 4a76c242..5cab8f42 100755 --- a/DOC/readme.txt +++ b/DOC/readme.txt @@ -1,4 +1,4 @@ -7-Zip 9.07 Sources +7-Zip 9.10 Sources ------------------ 7-Zip is a file archiver for Windows. |