diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-10-05 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:56 +0300 |
| commit | 6543c280208393fa32cb0094f770d14c1cfb13b2 (patch) | |
| tree | beb90f5e81e85e7957463ee5ad89cab0b3566560 /CPP/7zip/Archive/Wim | |
| parent | f6444c32568553e0261ca0105083658f12be6284 (diff) | |
15.0815.08
Diffstat (limited to 'CPP/7zip/Archive/Wim')
| -rw-r--r-- | CPP/7zip/Archive/Wim/WimHandler.cpp | 6 | ||||
| -rw-r--r-- | CPP/7zip/Archive/Wim/WimIn.cpp | 2 | ||||
| -rw-r--r-- | CPP/7zip/Archive/Wim/WimIn.h | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp index 0c635eae..6c07f37c 100644 --- a/CPP/7zip/Archive/Wim/WimHandler.cpp +++ b/CPP/7zip/Archive/Wim/WimHandler.cpp @@ -56,7 +56,7 @@ enum kpidBootImage }; -static const STATPROPSTG kArcProps[] = +static const CStatProp kArcProps[] = { { NULL, kpidSize, VT_UI8}, { NULL, kpidPackSize, VT_UI8}, @@ -69,8 +69,8 @@ static const STATPROPSTG kArcProps[] = { NULL, kpidIsVolume, VT_BOOL}, { NULL, kpidVolume, VT_UI4}, { NULL, kpidNumVolumes, VT_UI4}, - { (LPOLESTR)L"Images", kpidNumImages, VT_UI4}, - { (LPOLESTR)L"Boot Image", kpidBootImage, VT_UI4} + { "Images", kpidNumImages, VT_UI4}, + { "Boot Image", kpidBootImage, VT_UI4} }; diff --git a/CPP/7zip/Archive/Wim/WimIn.cpp b/CPP/7zip/Archive/Wim/WimIn.cpp index 2c1ec5de..1da6ca98 100644 --- a/CPP/7zip/Archive/Wim/WimIn.cpp +++ b/CPP/7zip/Archive/Wim/WimIn.cpp @@ -21,7 +21,7 @@ #include "../../Common/StreamObjects.h" #include "../../Common/StreamUtils.h" -#include "../../Compress/XPressDecoder.h" +#include "../../Compress/XpressDecoder.h" #include "../Common/OutStreamWithSha1.h" diff --git a/CPP/7zip/Archive/Wim/WimIn.h b/CPP/7zip/Archive/Wim/WimIn.h index ac4a2bd8..6a387212 100644 --- a/CPP/7zip/Archive/Wim/WimIn.h +++ b/CPP/7zip/Archive/Wim/WimIn.h @@ -221,6 +221,7 @@ namespace NHeaderFlags const UInt32 kXPRESS = (UInt32)1 << 17; const UInt32 kLZX = (UInt32)1 << 18; const UInt32 kLZMS = (UInt32)1 << 19; + const UInt32 kXPRESS2 = (UInt32)1 << 21; // XPRESS with nonstandard chunk size ? const UInt32 kMethodMask = 0xFFFE0000; } @@ -277,7 +278,8 @@ struct CHeader return (!IsCompressed() || (Flags & NHeaderFlags::kLZX) != 0 || (Flags & NHeaderFlags::kXPRESS) != 0 - || (Flags & NHeaderFlags::kLZMS) != 0); + || (Flags & NHeaderFlags::kLZMS) != 0 + || (Flags & NHeaderFlags::kXPRESS2) != 0); } unsigned GetMethod() const @@ -289,6 +291,7 @@ struct CHeader if (mask == NHeaderFlags::kXPRESS) return NMethod::kXPRESS; if (mask == NHeaderFlags::kLZX) return NMethod::kLZX; if (mask == NHeaderFlags::kLZMS) return NMethod::kLZMS; + if (mask == NHeaderFlags::kXPRESS2) return NMethod::kXPRESS; return mask; } |