From d14d4dcdefbef6695a618c3cdac05ba2ede5572e Mon Sep 17 00:00:00 2001
From: Igor Pavlov <ipavlov@users.sourceforge.net>
Date: Wed, 25 Jul 2007 00:00:00 +0000
Subject: [PATCH] 4.51 beta

---
 CPP/7zip/Archive/7z/7zIn.cpp    | 2 +-
 CPP/7zip/Crypto/RarAES/RarAES.h | 2 +-
 CPP/7zip/MyVersion.h            | 8 ++++----
 DOC/7zip.nsi                    | 2 +-
 DOC/7zip.wxs                    | 4 ++--
 DOC/readme.txt                  | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp
index 4f867708..e04313be 100755
--- a/CPP/7zip/Archive/7z/7zIn.cpp
+++ b/CPP/7zip/Archive/7z/7zIn.cpp
@@ -188,7 +188,7 @@ UInt64 CInByte2::ReadUInt64()
 void CInByte2::ReadString(UString &s)
 {
   const Byte *buf = _buffer + _pos;
-  size_t rem = (_size - _pos) / 2;
+  size_t rem = (_size - _pos) / 2 * 2;
   {
     size_t i;
     for (i = 0; i < rem; i += 2)
diff --git a/CPP/7zip/Crypto/RarAES/RarAES.h b/CPP/7zip/Crypto/RarAES/RarAES.h
index 6d960d76..aea948d8 100755
--- a/CPP/7zip/Crypto/RarAES/RarAES.h
+++ b/CPP/7zip/Crypto/RarAES/RarAES.h
@@ -18,7 +18,7 @@ extern "C"
 namespace NCrypto {
 namespace NRar29 {
 
-const kRarAesKeySize = 16;
+const UInt32 kRarAesKeySize = 16;
 
 class CDecoder: 
   public ICompressFilter,
diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h
index c6f952ac..44feed92 100755
--- a/CPP/7zip/MyVersion.h
+++ b/CPP/7zip/MyVersion.h
@@ -1,8 +1,8 @@
 #define MY_VER_MAJOR 4
-#define MY_VER_MINOR 50
+#define MY_VER_MINOR 51
 #define MY_VER_BUILD 0
-#define MY_VERSION "4.50 beta"
-#define MY_7ZIP_VERSION "7-Zip 4.50 beta"
-#define MY_DATE "2007-07-24"
+#define MY_VERSION "4.51 beta"
+#define MY_7ZIP_VERSION "7-Zip 4.51 beta"
+#define MY_DATE "2007-07-25"
 #define MY_COPYRIGHT "Copyright (c) 1999-2007 Igor Pavlov"
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION "  " MY_COPYRIGHT "  " MY_DATE
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index 9c46aead..7d2d1cc3 100755
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,7 +2,7 @@
 ;Defines
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 50
+!define VERSION_MINOR 51
 !define VERSION_POSTFIX_FULL " beta"
 !ifdef WIN64
 !ifdef IA64
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index 5a9e6071..a1a74e12 100755
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "4" ?>
-<?define VerMinor = "50" ?>
+<?define VerMinor = "51" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
@@ -343,7 +343,7 @@
         <ComponentRef Id="InstallRegAppPath" />
 
       </Feature>
-      <Feature Id="LanguageFiles" Title="Localization files" Description="Localization files for 63 languages." 
+      <Feature Id="LanguageFiles" Title="Localization files" Description="Localization files for 71 languages." 
           Level="1" AllowAdvertise="no">
         <ComponentRef Id="Lang" />
       </Feature>
diff --git a/DOC/readme.txt b/DOC/readme.txt
index 3ba8ba2f..da1acdfa 100755
--- a/DOC/readme.txt
+++ b/DOC/readme.txt
@@ -1,4 +1,4 @@
-7-Zip 4.50 Sources
+7-Zip 4.51 Sources
 ------------------
 
 7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP/Vista.