diff options
| -rw-r--r-- | C/7zVersion.h | 6 | ||||
| -rw-r--r-- | CPP/7zip/Archive/Cab/CabHandler.cpp | 13 | ||||
| -rw-r--r-- | DOC/7zip.inf | 2 | ||||
| -rw-r--r-- | DOC/7zip.nsi | 2 | ||||
| -rw-r--r-- | DOC/7zip.wxs | 2 | ||||
| -rw-r--r-- | DOC/readme.txt | 2 |
6 files changed, 13 insertions, 14 deletions
diff --git a/C/7zVersion.h b/C/7zVersion.h index 3e5c9bd5..c4f5c8e9 100644 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -1,8 +1,8 @@ #define MY_VER_MAJOR 15 -#define MY_VER_MINOR 13 +#define MY_VER_MINOR 14 #define MY_VER_BUILD 0 -#define MY_VERSION_NUMBERS "15.13" -#define MY_VERSION "15.13" +#define MY_VERSION_NUMBERS "15.14" +#define MY_VERSION "15.14" #define MY_DATE "2015-12-31" #undef MY_COPYRIGHT #undef MY_VERSION_COPYRIGHT_DATE diff --git a/CPP/7zip/Archive/Cab/CabHandler.cpp b/CPP/7zip/Archive/Cab/CabHandler.cpp index e31de4fe..9c841545 100644 --- a/CPP/7zip/Archive/Cab/CabHandler.cpp +++ b/CPP/7zip/Archive/Cab/CabHandler.cpp @@ -572,6 +572,7 @@ public: HRESULT FlushCorrupted(unsigned folderIndex); HRESULT Unsupported(); + bool NeedMoreWrite() const { return (m_FolderSize > m_PosInFolder); } UInt64 GetRemain() const { return m_FolderSize - m_PosInFolder; } UInt64 GetPosInFolder() const { return m_PosInFolder; } }; @@ -831,9 +832,7 @@ STDMETHODIMP CFolderOutStream::Write(const void *data, UInt32 size, UInt32 *proc HRESULT CFolderOutStream::FlushCorrupted(unsigned folderIndex) { - UInt64 remain = GetRemain(); - - if (remain == 0) + if (!NeedMoreWrite()) { CMyComPtr<IArchiveExtractCallbackMessage> callbackMessage; m_ExtractCallback.QueryInterface(IID_IArchiveExtractCallbackMessage, &callbackMessage); @@ -851,9 +850,9 @@ HRESULT CFolderOutStream::FlushCorrupted(unsigned folderIndex) for (;;) { - UInt64 remain = GetRemain(); - if (remain == 0) + if (!NeedMoreWrite()) return S_OK; + UInt64 remain = GetRemain(); UInt32 size = (remain < kBufSize ? (UInt32)remain : (UInt32)kBufSize); UInt32 processedSizeLocal = 0; RINOK(Write2(buf, size, &processedSizeLocal, false)); @@ -1075,7 +1074,7 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems, bool keepInputBuffer = false; bool thereWasNotAlignedChunk = false; - for (UInt32 bl = 0; cabFolderOutStream->GetRemain() != 0;) + for (UInt32 bl = 0; cabFolderOutStream->NeedMoreWrite();) { if (volIndex >= m_Database.Volumes.Size()) { @@ -1217,7 +1216,7 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems, } } - if (res != S_OK || cabFolderOutStream->GetRemain() != 0) + if (res != S_OK || cabFolderOutStream->NeedMoreWrite()) { RINOK(cabFolderOutStream->FlushCorrupted(folderIndex2)); } diff --git a/DOC/7zip.inf b/DOC/7zip.inf index aabe2246..54e27431 100644 --- a/DOC/7zip.inf +++ b/DOC/7zip.inf @@ -10,7 +10,7 @@ AppName = "7-Zip" InstallDir = %CE1%\%AppName% [Strings] -AppVer = "15.13" +AppVer = "15.14" AppDate = "2015-12-31" [CEDevice] diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi index b166b429..05b274cf 100644 --- a/DOC/7zip.nsi +++ b/DOC/7zip.nsi @@ -2,7 +2,7 @@ ;Defines !define VERSION_MAJOR 15 -!define VERSION_MINOR 13 +!define VERSION_MINOR 14 !define VERSION_POSTFIX_FULL "" !ifdef WIN64 !ifdef IA64 diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs index 2f9e01fc..b0787b61 100644 --- a/DOC/7zip.wxs +++ b/DOC/7zip.wxs @@ -1,7 +1,7 @@ <?xml version="1.0"?> <?define VerMajor = "15" ?> -<?define VerMinor = "13" ?> +<?define VerMinor = "14" ?> <?define VerBuild = "00" ?> <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?> <?define MmHex = "$(var.VerMajor)$(var.VerMinor)" ?> diff --git a/DOC/readme.txt b/DOC/readme.txt index b1f8d93f..fec95d72 100644 --- a/DOC/readme.txt +++ b/DOC/readme.txt @@ -1,4 +1,4 @@ -7-Zip 15.13 Sources +7-Zip 15.14 Sources ------------------- 7-Zip is a file archiver for Windows. |