github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: XmlNode::Remove, plugin/zip: Fixed

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6802 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-01-21 11:40:50 +00:00
parent dd7aefb1b7
commit 1c0026f81d
7 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/plugin/zip/UnZip.cpp
View file

@ -43,7 +43,8 @@ void UnZip::SkipFile()
ReadHeader();
}
int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool gzip, bool compress, dword *crc);
int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool gzip,
bool compress, dword *crc, bool hdr);
bool UnZip::ReadFile(Stream& out, Gate2<int, int> progress)
{
@ -68,7 +69,7 @@ bool UnZip::ReadFile(Stream& out, Gate2<int, int> progress)
}
else
if(method == 8)
l = (int)zPress(out, *zip, csize, AsGate64(progress), true, false, &crc);
l = (int)zPress(out, *zip, csize, AsGate64(progress), false, false, &crc, false);
else {
SetError();
return false;

5
uppsrc/plugin/zip/Zip.cpp
View file

@ -10,7 +10,8 @@ void Zip::WriteFolder(const char *path, Time tm)
WriteFile(~p, 0, p, false, tm);
}
int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool gzip, bool compress, dword *crc);
int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool gzip,
bool compress, dword *crc, bool hdr);
void Zip::WriteFile(const void *ptr, int size, const char *path, Gate2<int, int> progress, Time tm)
{
@ -19,7 +20,7 @@ void Zip::WriteFile(const void *ptr, int size, const char *path, Gate2<int, int>
StringStream ss;
MemReadStream ms(ptr, size);
dword crc;
zPress(ss, ms, size, AsGate64(progress), true, true, &crc);
zPress(ss, ms, size, AsGate64(progress), false, true, &crc, false);
String data = ss.GetResult();
const void *r = ~data;
int csize = data.GetLength();