diff options
author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-24 14:27:53 +0200 |
commit | 3e5c51e1f7b99eda252e06968520d212eb5f5fe4 (patch) | |
tree | a04e2034316e024f0648a657369772c7f46bb0a8 /src/libs/7zip/win/CPP/7zip/Archive/Zip | |
parent | f9814b28ce934541f16d12d54534bea543143c01 (diff) |
Revert "Fixes required for errorless MinGW-w64 compilation are done."wip/componentview
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Archive/Zip')
-rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp | 2 | ||||
-rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp | 2 | ||||
-rw-r--r-- | src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp index 06ae08644..bd1563226 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandler.cpp @@ -265,7 +265,7 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val bool finded = false; if (item.CentralExtra.GetStrongCryptoField(f)) { - for (unsigned int i = 0; i < sizeof(g_StrongCryptoPairs) / sizeof(g_StrongCryptoPairs[0]); i++) // PQR for MinGW-w64: Signed < Unsigned comparison. + for (int i = 0; i < sizeof(g_StrongCryptoPairs) / sizeof(g_StrongCryptoPairs[0]); i++) { const CStrongCryptoPair &pair = g_StrongCryptoPairs[i]; if (f.AlgId == pair.Id) diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp index a8ce40962..a5e0f59d7 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp @@ -263,7 +263,7 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt return E_INVALIDARG; if (options.IsAesMode) { - if (options.Password.Length() > (int)NCrypto::NWzAes::kPasswordSizeMax) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (options.Password.Length() > NCrypto::NWzAes::kPasswordSizeMax) return E_INVALIDARG; } options.Password = UnicodeStringToMultiByte((const wchar_t *)password, CP_OEMCP); diff --git a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp index 792a244be..b36b61be7 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/Zip/ZipIn.cpp @@ -521,7 +521,7 @@ HRESULT CInArchive::FindCd(CCdInfo &cdInfo) { if (Get32(buf + i) == NSignature::kEndOfCentralDir) { - if (i >= (int)kZip64EcdLocatorSize) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (i >= kZip64EcdLocatorSize) { const Byte *locator = buf + i - kZip64EcdLocatorSize; if (Get32(locator) == NSignature::kZip64EndOfCentralDirLocator) |