shell/source/win32/zipfile/zipfile.cxx | 115 ++++++++++++++++++++++----------- 1 file changed, 78 insertions(+), 37 deletions(-)
New commits: commit e09cfff67b021efd04235987f9c27cea3da5c72b Author: Mathieu Parent <mathieu.par...@nantesmetropole.fr> Date: Mon Oct 14 22:23:05 2013 +0100 fdo#56007 - Read more bytes on Zip read (for thumbnails) Change-Id: Ia8c6caa44ed8019a8139beb5a855f0f28805544d Signed-off-by: Andras Timar <andras.ti...@collabora.com> diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index cf05a56..270fbe1 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -118,18 +118,42 @@ static unsigned char readByte(StreamInterface *stream) static unsigned short readShort(StreamInterface *stream) { - unsigned short p0 = (unsigned short)readByte(stream); - unsigned short p1 = (unsigned short)readByte(stream); - return (unsigned short)(p0|(p1<<8)); + if (!stream || stream->stell() == -1) + throw IOException(-1); + unsigned short tmpBuf; + unsigned long numBytesRead = stream->sread( + reinterpret_cast<unsigned char *>( &tmpBuf ), 2); + if (numBytesRead != 2) + throw IOException(-1); + return tmpBuf; } static unsigned readInt(StreamInterface *stream) { - unsigned p0 = (unsigned)readByte(stream); - unsigned p1 = (unsigned)readByte(stream); - unsigned p2 = (unsigned)readByte(stream); - unsigned p3 = (unsigned)readByte(stream); - return (unsigned)(p0|(p1<<8)|(p2<<16)|(p3<<24)); + if (!stream || stream->stell() == -1) + throw IOException(-1); + unsigned tmpBuf; + unsigned long numBytesRead = stream->sread( + reinterpret_cast<unsigned char *>( &tmpBuf ), 4); + if (numBytesRead != 4) + throw IOException(-1); + return tmpBuf; +} + +static std::string readString(StreamInterface *stream, unsigned long size) +{ + if (!stream || stream->stell() == -1) + throw IOException(-1); + unsigned char *tmp = new unsigned char[size]; + if (!tmp) + throw IOException(-1); + unsigned long numBytesRead = stream->sread(tmp, size); + if (numBytesRead != size) + throw IOException(-1); + + std::string aStr((char *)tmp, size); + delete [] tmp; + return aStr; } static bool readCentralDirectoryEnd(StreamInterface *stream, CentralDirectoryEnd &end) @@ -147,9 +171,7 @@ static bool readCentralDirectoryEnd(StreamInterface *stream, CentralDirectoryEnd end.cdir_size = readInt(stream); end.cdir_offset = readInt(stream); end.comment_size = readShort(stream); - end.comment.clear(); - for (unsigned short i = 0; i < end.comment_size; i++) - end.comment.append(1,(char)readByte(stream)); + end.comment.assign(readString(stream, end.comment_size)); } catch (...) { @@ -183,15 +205,9 @@ static bool readCentralDirectoryEntry(StreamInterface *stream, CentralDirectoryE entry.external_attr = readInt(stream); entry.offset = readInt(stream); unsigned short i = 0; - entry.filename.clear(); - for (i=0; i < entry.filename_size; i++) - entry.filename.append(1,(char)readByte(stream)); - entry.extra_field.clear(); - for (i=0; i < entry.extra_field_size; i++) - entry.extra_field.append(1,(char)readByte(stream)); - entry.file_comment.clear(); - for (i=0; i < entry.file_comment_size; i++) - entry.file_comment.append(1,(char)readByte(stream)); + entry.filename.assign(readString(stream, entry.filename_size)); + entry.extra_field.assign(readString(stream, entry.extra_field_size)); + entry.file_comment.assign(readString(stream, entry.file_comment_size)); } catch (...) { @@ -219,12 +235,8 @@ static bool readLocalFileHeader(StreamInterface *stream, LocalFileHeader &header header.filename_size = readShort(stream); header.extra_field_size = readShort(stream); unsigned short i = 0; - header.filename.clear(); - for (i=0; i < header.filename_size; i++) - header.filename.append(1,(char)readByte(stream)); - header.extra_field.clear(); - for (i=0; i < header.extra_field_size; i++) - header.extra_field.append(1,(char)readByte(stream)); + header.filename.assign(readString(stream, header.filename_size)); + header.extra_field.assign(readString(stream, header.extra_field_size)); } catch (...) { commit 0540be231b0a10ed97da911462874a329bd089f7 Author: Michael Meeks <michael.me...@collabora.com> Date: Fri Oct 11 17:43:19 2013 +0100 fdo#56007 - fast zip directory find to accelerate Windows Explorer thumbnail. Change-Id: Id9436def56f40d2bb54dea35bea916bd99964653 Signed-off-by: Andras Timar <andras.ti...@collabora.com> diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index fb7dc88..cf05a56 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -102,6 +102,9 @@ struct CentralDirectoryEnd #define LOC_FILE_HEADER_SIG 0x04034b50 #define CDIR_END_SIG 0x06054b50 +// This little lot performs in a truly appalling way without +// buffering eg. on an IStream. + static unsigned char readByte(StreamInterface *stream) { if (!stream || stream->stell() == -1) @@ -250,31 +253,57 @@ static bool areHeadersConsistent(const LocalFileHeader &header, const CentralDir return true; } +#define BLOCK_SIZE 0x800 + +static bool findSignatureAtOffset(StreamInterface *stream, unsigned long nOffset) +{ + // read in reasonably sized chunk, and read more, to get overlapping sigs + unsigned char aBuffer[ BLOCK_SIZE + 4 ]; + + stream->sseek(nOffset, SEEK_SET); + + unsigned long nBytesRead = stream->sread(aBuffer, sizeof(aBuffer)); + if (nBytesRead < 0) + return false; + + for (long n = nBytesRead - 4; n >= 0; n--) + { + if (aBuffer[n ] == 0x50 && aBuffer[n+1] == 0x4b && + aBuffer[n+2] == 0x05 && aBuffer[n+3] == 0x06) + { // a palpable hit ... + stream->sseek(nOffset + n, SEEK_SET); + return true; + } + } + + return false; +} + static bool findCentralDirectoryEnd(StreamInterface *stream) { if (!stream) return false; - stream->sseek(0, SEEK_SET); - if (stream->sseek(-1024, SEEK_END)) stream->sseek(0, SEEK_SET); + + stream->sseek(0,SEEK_END); + + long nLength = stream->stell(); + if (nLength == -1) + return false; + try { - while (stream->stell() != -1) + for (long nOffset = nLength - BLOCK_SIZE; + nOffset > 0; nOffset -= BLOCK_SIZE) { - unsigned signature = readInt(stream); - if (signature == CDIR_END_SIG) - { - stream->sseek(-4, SEEK_CUR); + if (findSignatureAtOffset(stream, nOffset)) return true; - } - else - stream->sseek(-3, SEEK_CUR); } + return findSignatureAtOffset(stream, 0); } catch (...) { return false; } - return false; } static bool isZipStream(StreamInterface *stream) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits