From 9b0198b2442bc749491d0f1e5e2c811346e5d568 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 21 Sep 2012 13:09:29 +0100 Subject: package: convert internal ZIP handling data-types to 64bit Prepare for a ZIP64 implementation. Audit all "Size" property fetches through Anys. Audit all uses of nSize, nCompressedSize, nOffset through the code. Add FIXME64: comments to all points requiring future work. --- package/inc/CRC32.hxx | 2 +- package/inc/ZipEntry.hxx | 6 +++--- package/inc/ZipFile.hxx | 6 +++--- package/inc/ZipPackageStream.hxx | 4 ++-- package/inc/package/Deflater.hxx | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'package/inc') diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 444c385cbb76..183c1befb906 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -33,7 +33,7 @@ public: CRC32(); ~CRC32(); - sal_Int32 SAL_CALL updateStream (::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > & xStream) + sal_Int64 SAL_CALL updateStream (::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > & xStream) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL updateSegment(const ::com::sun::star::uno::Sequence< sal_Int8 > &b, sal_Int32 off, sal_Int32 len) throw(::com::sun::star::uno::RuntimeException); diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx index 31469b07a7a8..98de664cce17 100644 --- a/package/inc/ZipEntry.hxx +++ b/package/inc/ZipEntry.hxx @@ -28,9 +28,9 @@ struct ZipEntry sal_Int16 nMethod; sal_Int32 nTime; sal_Int32 nCrc; - sal_Int32 nCompressedSize; - sal_Int32 nSize; - sal_Int32 nOffset; + sal_Int64 nCompressedSize; + sal_Int64 nSize; + sal_Int64 nOffset; sal_Int16 nPathLen; sal_Int16 nExtraLen; ::rtl::OUString sPath; diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 31ab8b432229..e438156cee0c 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -93,9 +93,9 @@ protected: sal_Bool checkSizeAndCRC( const ZipEntry& aEntry ); - sal_Int32 getCRC( sal_Int32 nOffset, sal_Int32 nSize ); + sal_Int32 getCRC( sal_Int64 nOffset, sal_Int64 nSize ); - void getSizeAndCRC( sal_Int32 nOffset, sal_Int32 nCompressedSize, sal_Int32 *nSize, sal_Int32 *nCRC ); + void getSizeAndCRC( sal_Int64 nOffset, sal_Int64 nCompressedSize, sal_Int64 *nSize, sal_Int32 *nCRC ); public: @@ -136,7 +136,7 @@ public: bool bEncrypt ); static void StaticFillHeader ( const ::rtl::Reference < EncryptionData > & rData, - sal_Int32 nSize, + sal_Int64 nSize, const ::rtl::OUString& aMediaType, sal_Int8 * & pHeader ); diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index b7e528661eb8..a9943c19a7e0 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -98,7 +98,7 @@ public: { return m_xBaseEncryptionData->m_aSalt;} sal_Int32 getIterationCount () const { return m_xBaseEncryptionData->m_nIterationCount;} - sal_Int32 getSize () const + sal_Int64 getSize () const { return aEntry.nSize;} sal_uInt8 GetStreamMode() const { return m_nStreamMode; } @@ -133,7 +133,7 @@ public: { m_xBaseEncryptionData->m_aDigest = rNewDigest;} void setIterationCount (const sal_Int32 nNewCount) { m_xBaseEncryptionData->m_nIterationCount = nNewCount;} - void setSize (const sal_Int32 nNewSize); + void setSize (const sal_Int64 nNewSize); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetOwnStreamNoWrap() { return xStream; } diff --git a/package/inc/package/Deflater.hxx b/package/inc/package/Deflater.hxx index 3bfca03cb32c..7531e3a1ac66 100644 --- a/package/inc/package/Deflater.hxx +++ b/package/inc/package/Deflater.hxx @@ -37,7 +37,7 @@ protected: sal_Bool bFinished; sal_Bool bSetParams; sal_Int32 nLevel, nStrategy; - sal_Int32 nOffset, nLength; + sal_Int64 nOffset, nLength; z_stream* pStream; void init (sal_Int32 nLevel, sal_Int32 nStrategy, sal_Bool bNowrap); @@ -52,8 +52,8 @@ public: void SAL_CALL finish( ); sal_Bool SAL_CALL finished( ); sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - sal_Int32 SAL_CALL getTotalIn( ); - sal_Int32 SAL_CALL getTotalOut( ); + sal_Int64 SAL_CALL getTotalIn( ); + sal_Int64 SAL_CALL getTotalOut( ); void SAL_CALL reset( ); void SAL_CALL end( ); }; -- cgit