xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 15:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.04 beta

Browse Source
This commit is contained in:
Igor Pavlov
2009-06-02 00:00:00 +00:00
committed by Kornel Lesiński
parent 8874e4fbc9
commit 829409452d
440 changed files with 19803 additions and 9941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CPP/7zip/Archive/Wim/WimIn.cpp
View File

@@ -2,7 +2,8 @@
#include "StdAfx.h"
#include "Common/MyCom.h"
#include "../../../../C/CpuArch.h"
#include "Common/IntToString.h"
#include "../../Common/StreamUtils.h"
@@ -11,8 +12,6 @@
#include "../Common/OutStreamWithSha1.h"
#include "../../../../C/CpuArch.h"
#include "WimIn.h"
#define Get16(p) GetUi16(p)
@@ -354,7 +353,7 @@ static HRESULT ParseDir(const Byte *base, size_t size,
sum += len;
pos += 8;
}
pos += sum; // skeep security descriptors
pos += sum; // skip security descriptors
while ((pos & 7) != 0)
pos++;
if (pos != totalLength)
@@ -498,8 +497,8 @@ HRESULT OpenArchive(IInStream *inStream, const CHeader &h, CByteBuffer &xml, CDa
RINOK(UnpackData(inStream, si.Resource, h.IsLzxMode(), metadata, hash));
if (memcmp(hash, si.Hash, kHashSize) != 0)
return S_FALSE;
wchar_t sz[32];
ConvertUInt64ToString(imageIndex++, sz);
wchar_t sz[16];
ConvertUInt32ToString(imageIndex++, sz);
UString s = sz;
s += WCHAR_PATH_SEPARATOR;
RINOK(ParseDir(metadata, metadata.GetCapacity(), s, db.Items));