9.10 beta

This commit is contained in:
Igor Pavlov
2009-12-22 00:00:00 +00:00
committed by Kornel Lesiński
parent 1fbaf0aac5
commit db5eb6d638
8 changed files with 15 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 9 #define MY_VER_MAJOR 9
#define MY_VER_MINOR 9 #define MY_VER_MINOR 10
#define MY_VER_BUILD 0 #define MY_VER_BUILD 0
#define MY_VERSION "9.09 beta" #define MY_VERSION "9.10 beta"
#define MY_DATE "2009-12-12" #define MY_DATE "2009-12-22"
#define MY_COPYRIGHT ": Igor Pavlov : Public domain" #define MY_COPYRIGHT ": Igor Pavlov : Public domain"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE

View File

@@ -162,19 +162,15 @@ HRESULT CAddCommon::Compress(
{ {
_cryptoStreamSpec->Filter = _filterAesSpec = new NCrypto::NWzAes::CEncoder; _cryptoStreamSpec->Filter = _filterAesSpec = new NCrypto::NWzAes::CEncoder;
_filterAesSpec->SetKeyMode(_options.AesKeyMode); _filterAesSpec->SetKeyMode(_options.AesKeyMode);
RINOK(_filterAesSpec->CryptoSetPassword( RINOK(_filterAesSpec->CryptoSetPassword((const Byte *)(const char *)_options.Password, _options.Password.Length()));
(const Byte *)(const char *)_options.Password, _options.Password.Length()));
} }
RINOK(_filterAesSpec->WriteHeader(outStream)); RINOK(_filterAesSpec->WriteHeader(outStream));
} }
else else
{ {
if (!_cryptoStreamSpec->Filter) if (!_cryptoStreamSpec->Filter)
{
_cryptoStreamSpec->Filter = _filterSpec = new NCrypto::NZip::CEncoder; _cryptoStreamSpec->Filter = _filterSpec = new NCrypto::NZip::CEncoder;
RINOK(_filterSpec->CryptoSetPassword( RINOK(_filterSpec->CryptoSetPassword((const Byte *)(const char *)_options.Password, _options.Password.Length()));
(const Byte *)(const char *)_options.Password, _options.Password.Length()));
}
UInt32 crc = 0; UInt32 crc = 0;
RINOK(GetStreamCRC(inStream, crc)); RINOK(GetStreamCRC(inStream, crc));
RINOK(inCrcStreamSpec->Seek(0, STREAM_SEEK_SET, NULL)); RINOK(inCrcStreamSpec->Seek(0, STREAM_SEEK_SET, NULL));

View File

@@ -1,8 +1,8 @@
#define MY_VER_MAJOR 9 #define MY_VER_MAJOR 9
#define MY_VER_MINOR 9 #define MY_VER_MINOR 10
#define MY_VER_BUILD 0 #define MY_VER_BUILD 0
#define MY_VERSION "9.09 beta" #define MY_VERSION "9.10 beta"
#define MY_7ZIP_VERSION "7-Zip 9.09 beta" #define MY_7ZIP_VERSION "7-Zip 9.10 beta"
#define MY_DATE "2009-12-12" #define MY_DATE "2009-12-22"
#define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov" #define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE

View File

@@ -10,8 +10,8 @@ AppName = "7-Zip"
InstallDir = %CE1%\%AppName% InstallDir = %CE1%\%AppName%
[Strings] [Strings]
AppVer = "9.09" AppVer = "9.10"
AppDate = "2009-12-12" AppDate = "2009-12-22"
[CEDevice] [CEDevice]
; ProcessorType = 2577 ; ARM ; ProcessorType = 2577 ; ARM

View File

@@ -2,7 +2,7 @@
;Defines ;Defines
!define VERSION_MAJOR 9 !define VERSION_MAJOR 9
!define VERSION_MINOR 09 !define VERSION_MINOR 10
!define VERSION_POSTFIX_FULL " beta" !define VERSION_POSTFIX_FULL " beta"
!ifdef WIN64 !ifdef WIN64
!ifdef IA64 !ifdef IA64

View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?define VerMajor = "9" ?> <?define VerMajor = "9" ?>
<?define VerMinor = "09" ?> <?define VerMinor = "10" ?>
<?define VerBuild = "00" ?> <?define VerBuild = "00" ?>
<?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?> <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
<?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?> <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>

View File

@@ -1,4 +1,4 @@
LZMA SDK 9.09 LZMA SDK 9.10
------------- -------------
LZMA SDK provides the documentation, samples, header files, libraries, LZMA SDK provides the documentation, samples, header files, libraries,

View File

@@ -1,4 +1,4 @@
7-Zip 9.07 Sources 7-Zip 9.10 Sources
------------------ ------------------
7-Zip is a file archiver for Windows. 7-Zip is a file archiver for Windows.